From daa40a3ff97346face9dcc64564010a66c91ccb2 Mon Sep 17 00:00:00 2001 From: glozow Date: Fri, 15 Aug 2025 11:23:46 -0400 Subject: [PATCH] doc fixups for 33106 --- doc/release-notes-33106.md | 3 +-- src/test/miner_tests.cpp | 3 ++- test/functional/feature_rbf.py | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/doc/release-notes-33106.md b/doc/release-notes-33106.md index 95750cedff9..f57ae6e4762 100644 --- a/doc/release-notes-33106.md +++ b/doc/release-notes-33106.md @@ -9,8 +9,7 @@ changed to 100 satoshis per kvB. They can still be changed using their respectiv recommended to change both together if you decide to do so. Other minimum feerates (e.g. the dust feerate, the minimum returned by the fee estimator, and all feerates used by the -wallet) remain unchanged. The mempool minimum feerate still changes in response to high volume but more gradually, as a -result of the change to the incremental relay feerate. +wallet) remain unchanged. The mempool minimum feerate still changes in response to high volume. Note that unless these lower defaults are widely adopted across the network, transactions created with lower fee rates are not guaranteed to propagate or confirm. The wallet feerates remain unchanged; `-mintxfee` must be changed before diff --git a/src/test/miner_tests.cpp b/src/test/miner_tests.cpp index 156f6e5b4a0..652ec25fe89 100644 --- a/src/test/miner_tests.cpp +++ b/src/test/miner_tests.cpp @@ -218,7 +218,8 @@ void MinerTestingSetup::TestPackageSelection(const CScript& scriptPubKey, const tx.vout[0].nValue = 5000000000LL - 100000000; tx.vout[1].nValue = 100000000; // 1BTC output // Increase size to avoid rounding errors: when the feerate is extremely small (i.e. 1sat/kvB), evaluating the fee - // at a smaller transaction size gives us a rounded value of 0. + // at smaller sizes gives us rounded values that are equal to each other, which means we incorrectly include + // hashFreeTx2 + hashLowFeeTx2. BulkTransaction(tx, 4000); Txid hashFreeTx2 = tx.GetHash(); AddToMempool(tx_mempool, entry.Fee(0).SpendsCoinbase(true).FromTx(tx)); diff --git a/test/functional/feature_rbf.py b/test/functional/feature_rbf.py index 6922b5e0f40..443910c0ad5 100755 --- a/test/functional/feature_rbf.py +++ b/test/functional/feature_rbf.py @@ -583,7 +583,7 @@ class ReplaceByFeeTest(BitcoinTestFramework): tx = self.wallet.send_self_transfer(from_node=self.nodes[0])['tx'] # Higher fee, higher feerate, different txid, but the replacement does not provide a relay - # fee conforming to node's `incrementalrelayfee` policy of 1000 sat per KB. + # fee conforming to node's `incrementalrelayfee` policy of 100 sat per KB. assert_equal(self.nodes[0].getmempoolinfo()["incrementalrelayfee"], Decimal("0.000001")) tx.vout[0].nValue -= 1 assert_raises_rpc_error(-26, "insufficient fee", self.nodes[0].sendrawtransaction, tx.serialize().hex())