Merge bitcoin/bitcoin#30295: #28984 package rbf followups

3f00aae140 package rbf: cpfp structure requires package > parent feerate (Greg Sanders)
ad7f1f697f test package rbf boundary conditions more closely (Greg Sanders)
ff4558d441 doc: reword package RBF documentation (Greg Sanders)
de669a883b doc: replace mention of V3 with TRUC (Greg Sanders)

Pull request description:

  Some suggested nits/changes from #28984

ACKs for top commit:
  glozow:
    ACK 3f00aae140
  murchandamus:
    ACK 3f00aae140

Tree-SHA512: 79434cc8aba25a43e99793298cdc99cad807db2c3a2e780a31953f244b95eecd97b90559abd67fbf30996c00966675fa257253a7812ec4727420226162c629ae
This commit is contained in:
merge-script
2024-07-12 17:15:27 +01:00
3 changed files with 23 additions and 11 deletions

View File

@@ -38,11 +38,11 @@ The following rules are enforced for all packages:
* Only limited package replacements are currently considered. (#28984)
- All direct conflicts must signal replacement (or have `-mempoolfullrbf=1` set).
- All direct conflicts must signal replacement (or the node must have `-mempoolfullrbf=1` set).
- Packages are 1-parent-1-child, with no in-mempool ancestors of the package.
- All conflicting clusters(connected components of mempool transactions) must be clusters of up to size 2.
- All conflicting clusters (connected components of mempool transactions) must be clusters of up to size 2.
- No more than MAX_REPLACEMENT_CANDIDATES transactions can be replaced, analogous to
regular [replacement rule](./mempool-replacements.md) 5).
@@ -56,7 +56,7 @@ The following rules are enforced for all packages:
- *Rationale*: Basic support for package RBF can be used by wallets
by making chains of no longer than two, then directly conflicting
those chains when needed. Combined with V3 transactions this can
those chains when needed. Combined with TRUC transactions this can
result in more robust fee bumping. More general package RBF may be
enabled in the future.