[28.x] backports + 28.3rc1 #33476

glozow · 2025-09-24T19:18:35Z

Includes backports of

DrahtBot · 2025-09-24T19:18:41Z

The following sections might be updated with supplementary metadata relevant to reviewers and maintainers.

Code Coverage & Benchmarks

For details see: https://corecheck.dev/bitcoin/bitcoin/pulls/33476.

Reviews

See the guideline for information on the review process.

Type	Reviewers
ACK	achow101, stickies-v

If your review is incorrectly listed, please react with 👎 to this comment and the bot will ignore it on the next update.

test/functional/test_framework/mempool_util.py

Github-Pull: bitcoin#33106 Rebased-From: e5f896b

Github-Pull: bitcoin#33106 Rebased-From: 85f4988

Github-Pull: bitcoin#33106 Rebased-From: 72dc184

Github-Pull: bitcoin#33106 Rebased-From: 1fbee5d

Github-Pull: bitcoin#33106 Rebased-From: d6213d6

The padding method used matches the one used in MiniWallet, `MiniWallet._bulk_tx`. Github-Pull: bitcoin#30784 Rebased-From: ed7d224

Back when we implemented coin age priority as a miner policy, miners mempools might admit transactions paying very low fees, but then want to set a higher fee for block inclusion. However, since coin age priority was removed in v0.15, the block assembly policy is solely based on fees, so we do not need to apply minimum feerate rules in multiple places. In fact, the block assembly policy ignoring transactions that are added to the mempool is likely undesirable as we waste resources accepting and storing this transaction. Instead, rely on mempool policy to enforce a minimum entry feerate to the mempool (minrelaytxfee). Set the minimum block feerate to the minimum non-zero amount (1sat/kvB) so it collects everything it finds in mempool into the block. Github-Pull: bitcoin#33106 Rebased-From: 5f2df0e

This is needed for the next commit Github-Pull: bitcoin#30948 Rebased-From: fa48be6

Also disable the function, when it is not needed. Github-Pull: bitcoin#30948 Rebased-From: faf8015

Github-Pull: bitcoin#33106 Rebased-From: 3eab8b7

Use a virtual size of 1000 to keep precision when using a feerate (which is rounded to the nearest satoshi per kvb) that isn't just an integer. Github-Pull: bitcoin#33106 Rebased-From: 457cfb6

… explicit Github-Pull: bitcoin#33106 Rebased-From: 2e515d2

…t/kvB Let's say an attacker wants to use/exhaust the network's bandwidth, and has the choice between renting resources from a commercial provider and getting the network to "spam" itself it by sending unconfirmed transactions. We'd like the latter to be more expensive than the former. The bandwidth for relaying a transaction across the network is roughly its serialized size (plus relay overhead) x number of nodes. A 1000vB transaction is 1000-4000B serialized. With 100k nodes, that's 0.1-0.4GB If the going rate for commercial services is 10c/GB, that's like 1-4c per kvB of transaction data, so a 1000vB transaction should pay at least $0.04. At a price of 120k USD/BTC, 100sat is about $0.12. This price allows us to tolerate a large decrease in the conversion rate or increase in the number of nodes. Github-Pull: bitcoin#33106 Rebased-From: 6da5de5

…l page sizes) This aims to complete our test framework BDB parser to reflect our read-only BDB parser in the wallet codebase. This could be useful both for making review of bitcoin#26606 easier and to also possibly improve our functional tests for the BDB parser by comparing with an alternative implementation. Github-Pull: bitcoin#30125 Rebased-From: 01ddd9f

Github-Pull: bitcoin#30125 Rebased-From: d45eb39

glozow · 2025-09-26T14:46:31Z

Ready for review, though I think the tidy job tripped somehow?

achow101 · 2025-09-26T21:56:06Z

Can you do the version bump stuff here?

stickies-v

ACK dcac362 ~~, although I'm a bit confused about one change (see comment) that doesn't seem like a backport (but not necessarily bad by itself).~~

I verified all backports are clean, except for a bunch of test-only merge conflicts in 33106:

cf875f1 backported from 72dc184: addressed merge conflict from c16ae71 and re-added -datacarriersize arg because of 9f36962, no other changes
e3273e0 backported from 1fbee5d: addressed merge conflict from a141e1b, no other changes
27b7755 backported from d6213d6: addressed merge conflict from fa2b529, no other changes
08eeb0d backported from 5f2df0e: addressed merge conflict from 10c9088, no other changes
4d809ef backported from 3eab8b7: addressed merge conflict from tests added in 45c7a4b and 93f48fc, no other changes
a02e0a4 backported from 2e515d2: settxfee RPC was deprecated in bf194c9, no other changes
66559d1 backported from 6da5de5:
- revert usage of AddToMempool which was added in 7fb62f7
- a merge conflict with c876a89
- a bunch more conflicts that I CBA to all list here

I verified the release notes, and was able to produce identical manpages.

nit: e3273e0 and 08eeb0d have two spaces after Rebased-From: instead of the usual one, I'm not sure if that'd break any tooling (it did for me, but was an easy fix)

stickies-v · 2025-09-30T15:32:31Z

test/functional/mempool_limit.py

        cpfp_parent = self.wallet.create_self_transfer(
            utxo_to_spend=mempool_evicted_tx["new_utxo"],
-            fee_rate=mempoolmin_feerate - Decimal('0.00001'),
+            fee_rate=mempoolmin_feerate / 2,


The commit from which this is backported just added an extra zero:

6da5de5#diff-63dc84ee23b871d1f4931c4f261b3c6b815bd8d5a65098a61bce8ea9b6b81965

What's the reason for changing that to dividing by 2 here? It also doesn't seem necessary for the test to complete.

I think you are right that changing the Decimal would have worked - apologies for the confusing change in approach.

This test doesn't exist on master, so it isn't part of the backport. It's a conflict resolution - the test was adapted to make it pass on that commit. I think you're referring to a different line lower down (L315) where it's backported and adds a 0.

Oh I see. The fact that test functions are named slightly differently combined with this patch of code being ~duplicated tripped me up a bit. Thanks for the clarification, can be marked as resolved.

glozow · 2025-09-30T17:38:42Z

nit: e3273e0 and 08eeb0d have two spaces after Rebased-From: instead of the usual one, I'm not sure if that'd break any tooling (it did for me, but was an easy fix)

Sorry about that! I hadn't really thought about the number of spaces, but will keep it in mind in the future.

achow101 · 2025-09-30T19:37:37Z

Can you also do gen-bitcoin-conf.sh since that will need to update for the new defaults as well.

achow101 · 2025-09-30T21:51:50Z

ACK 9968b15

stickies-v

re-ACK 9968b15

Getting the same bitcoin.conf example.

stickies-v · 2025-10-01T11:40:56Z

test/functional/mempool_limit.py

        cpfp_parent = self.wallet.create_self_transfer(
            utxo_to_spend=mempool_evicted_tx["new_utxo"],
-            fee_rate=mempoolmin_feerate - Decimal('0.00001'),
+            fee_rate=mempoolmin_feerate / 2,


Oh I see. The fact that test functions are named slightly differently combined with this patch of code being ~duplicated tripped me up a bit. Thanks for the clarification, can be marked as resolved.

DrahtBot added the Backport label Sep 24, 2025

glozow mentioned this pull request Sep 24, 2025

[28.x] More backports #33415

Merged

glozow force-pushed the 2025-09-28.3-backport branch from ff9de5b to 407a494 Compare September 24, 2025 19:20

fanquake reviewed Sep 24, 2025

View reviewed changes

test/functional/test_framework/mempool_util.py Outdated Show resolved Hide resolved

achow101 added this to the 28.3 milestone Sep 25, 2025

DrahtBot added the Needs rebase label Sep 25, 2025

glozow and others added 16 commits September 26, 2025 10:22

[test] check miner doesn't select 0fee transactions

e779d59

Github-Pull: bitcoin#33106 Rebased-From: e5f896b

[test] check bypass of minrelay for various minrelaytxfee settings

308778b

Github-Pull: bitcoin#33106 Rebased-From: 85f4988

[test] RBF rule 4 for various incrementalrelayfee settings

cf875f1

Github-Pull: bitcoin#33106 Rebased-From: 72dc184

[test] explicitly check default -minrelaytxfee and -incrementalrelayfee

e3273e0

Github-Pull: bitcoin#33106 Rebased-From: 1fbee5d

[doc] assert that default min relay feerate and incremental are the same

27b7755

Github-Pull: bitcoin#33106 Rebased-From: d6213d6

test: add BulkTransaction helper to unit test transaction utils

b7ba016

The padding method used matches the one used in MiniWallet, `MiniWallet._bulk_tx`. Github-Pull: bitcoin#30784 Rebased-From: ed7d224

test: Refactor fill_mempool to extract send_batch helper

a602815

This is needed for the next commit Github-Pull: bitcoin#30948 Rebased-From: fa48be6

test: Add missing sync_mempools() to fill_mempool()

f7dde40

Also disable the function, when it is not needed. Github-Pull: bitcoin#30948 Rebased-From: faf8015

[prep/test] replace magic number 1000 with respective feerate vars

4d809ef

Github-Pull: bitcoin#33106 Rebased-From: 3eab8b7

[prep/util] help MockMempoolMinFee handle more precise feerates

f25fc09

Use a virtual size of 1000 to keep precision when using a feerate (which is rounded to the nearest satoshi per kvb) that isn't just an integer. Github-Pull: bitcoin#33106 Rebased-From: 457cfb6

[prep/test] make wallet_fundrawtransaction's minrelaytxfee assumption…

a02e0a4

… explicit Github-Pull: bitcoin#33106 Rebased-From: 2e515d2

test: compare BDB dumps of test framework parser and wallet tool

18f6430

Github-Pull: bitcoin#30125 Rebased-From: d45eb39

[doc] update release notes for 28.x

d3194cb

glozow force-pushed the 2025-09-28.3-backport branch from 407a494 to 78b9686 Compare September 26, 2025 14:31

This was referenced Sep 26, 2025

test: improve BDB parser (handle internal/overflow pages, support all page sizes) #30125

Merged

policy: lower the default blockmintxfee, incrementalrelayfee, minrelaytxfee #33106

Merged

glozow marked this pull request as ready for review September 26, 2025 14:45

DrahtBot removed the Needs rebase label Sep 26, 2025

glozow added 2 commits September 29, 2025 16:48

[build] bump version to 28.3rc1

df74128

[doc] manpages for 28.3rc1

dcac362

glozow force-pushed the 2025-09-28.3-backport branch from 78b9686 to dcac362 Compare September 29, 2025 20:48

bitcoin deleted a comment Sep 30, 2025

stickies-v approved these changes Sep 30, 2025

View reviewed changes

[doc] update bitcoin.conf example

9968b15

DrahtBot requested a review from stickies-v September 30, 2025 21:51

stickies-v approved these changes Oct 1, 2025

View reviewed changes

achow101 merged commit ed730c5 into bitcoin:28.x Oct 1, 2025
17 checks passed

[28.x] backports + 28.3rc1 #33476

[28.x] backports + 28.3rc1 #33476

Uh oh!

Conversation

glozow commented Sep 24, 2025 • edited by fanquake Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

DrahtBot commented Sep 24, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Code Coverage & Benchmarks

Reviews

Uh oh!

Uh oh!

glozow commented Sep 26, 2025

Uh oh!

achow101 commented Sep 26, 2025

Uh oh!

stickies-v left a comment • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

stickies-v Sep 30, 2025

Choose a reason for hiding this comment

Uh oh!

glozow Sep 30, 2025

Choose a reason for hiding this comment

Uh oh!

stickies-v Oct 1, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

glozow commented Sep 30, 2025

Uh oh!

achow101 commented Sep 30, 2025

Uh oh!

achow101 commented Sep 30, 2025

Uh oh!

stickies-v left a comment

Choose a reason for hiding this comment

Uh oh!

stickies-v Oct 1, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

6 participants

glozow commented Sep 24, 2025 •

edited by fanquake

Loading

DrahtBot commented Sep 24, 2025 •

edited

Loading

stickies-v left a comment •

edited

Loading

stickies-v Oct 1, 2025 •

edited

Loading

stickies-v Oct 1, 2025 •

edited

Loading