Commit 4c387cb
committed
Merge 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#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@2fd34ba)
theStack:
re-ACK 2fd34ba
Tree-SHA512: 5071c5b8d9b8d2c9faa278c8c4df31de288cb407a68e4d55544c588caff6c86160cce7825453549c6ed69e29d9ccb5ee2d4a518b18f563bfb12f2ced073fe42aFile tree
3 files changed
+128
-56
lines changed- doc/policy
- src
- test/functional
3 files changed
+128
-56
lines changed| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
48 | 48 | | |
49 | 49 | | |
50 | 50 | | |
51 | | - | |
52 | | - | |
| 51 | + | |
| 52 | + | |
| 53 | + | |
| 54 | + | |
| 55 | + | |
| 56 | + | |
| 57 | + | |
53 | 58 | | |
54 | 59 | | |
55 | 60 | | |
| |||
0 commit comments