Skip to content

Commit 4c387cb

Browse files
committed
Merge bitcoin/bitcoin#30072: refactor prep for package rbf
2fd34ba Add sanity checks for various ATMPArgs booleans (Greg Sanders) 20d8936 [refactor] make some members MemPoolAccept-wide (glozow) cbbfe71 cpfp carveout is excluded in packages (glozow) 69f7ab0 Add m_allow_sibling_eviction as separate ATMPArgs flag (Greg Sanders) 57ee302 Add description for m_test_accept (Greg Sanders) Pull request description: First few commits of bitcoin/bitcoin#28984 to set the stage for the package RBF logic. These refactors are preparation for evaluating an RBF in a multi-proposed-transaction context instead of only a single proposed transaction. Also, carveouts and sibling evictions only should work in single RBF cases so add logic to preclude multi-tx cases in the future. No behavior changes aside from bailing earlier from failed carve-outs. ACKs for top commit: glozow: reACK 2fd34ba via range-diff sr-gi: utACK [2fd34ba](bitcoin/bitcoin@2fd34ba) theStack: re-ACK 2fd34ba Tree-SHA512: 5071c5b8d9b8d2c9faa278c8c4df31de288cb407a68e4d55544c588caff6c86160cce7825453549c6ed69e29d9ccb5ee2d4a518b18f563bfb12f2ced073fe42a
2 parents 413844f + 2fd34ba commit 4c387cb

File tree

3 files changed

+128
-56
lines changed

3 files changed

+128
-56
lines changed

doc/policy/packages.md

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -48,8 +48,13 @@ The following rules are enforced for all packages:
4848
heavily connected, i.e. some transaction in the package is the ancestor or descendant of all
4949
the other transactions.
5050

51-
The following rules are only enforced for packages to be submitted to the mempool (not enforced for
52-
test accepts):
51+
* [CPFP Carve Out](./mempool-limits.md#CPFP-Carve-Out) is disabled in packaged contexts. (#21800)
52+
53+
- *Rationale*: This carve out cannot be accurately applied when there are multiple transactions'
54+
ancestors and descendants being considered at the same time.
55+
56+
The following rules are only enforced for packages to be submitted to the mempool (not
57+
enforced for test accepts):
5358

5459
* Packages must be child-with-unconfirmed-parents packages. This also means packages must contain at
5560
least 2 transactions. (#22674)

0 commit comments

Comments
 (0)