Skip to content

Commit daa40a3

Browse files
committed
doc fixups for 33106
1 parent c568511 commit daa40a3

File tree

3 files changed

+4
-4
lines changed

3 files changed

+4
-4
lines changed

doc/release-notes-33106.md

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,7 @@ changed to 100 satoshis per kvB. They can still be changed using their respectiv
99
recommended to change both together if you decide to do so.
1010

1111
Other minimum feerates (e.g. the dust feerate, the minimum returned by the fee estimator, and all feerates used by the
12-
wallet) remain unchanged. The mempool minimum feerate still changes in response to high volume but more gradually, as a
13-
result of the change to the incremental relay feerate.
12+
wallet) remain unchanged. The mempool minimum feerate still changes in response to high volume.
1413

1514
Note that unless these lower defaults are widely adopted across the network, transactions created with lower fee rates
1615
are not guaranteed to propagate or confirm. The wallet feerates remain unchanged; `-mintxfee` must be changed before

src/test/miner_tests.cpp

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -218,7 +218,8 @@ void MinerTestingSetup::TestPackageSelection(const CScript& scriptPubKey, const
218218
tx.vout[0].nValue = 5000000000LL - 100000000;
219219
tx.vout[1].nValue = 100000000; // 1BTC output
220220
// Increase size to avoid rounding errors: when the feerate is extremely small (i.e. 1sat/kvB), evaluating the fee
221-
// at a smaller transaction size gives us a rounded value of 0.
221+
// at smaller sizes gives us rounded values that are equal to each other, which means we incorrectly include
222+
// hashFreeTx2 + hashLowFeeTx2.
222223
BulkTransaction(tx, 4000);
223224
Txid hashFreeTx2 = tx.GetHash();
224225
AddToMempool(tx_mempool, entry.Fee(0).SpendsCoinbase(true).FromTx(tx));

test/functional/feature_rbf.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -583,7 +583,7 @@ def test_replacement_relay_fee(self):
583583
tx = self.wallet.send_self_transfer(from_node=self.nodes[0])['tx']
584584

585585
# Higher fee, higher feerate, different txid, but the replacement does not provide a relay
586-
# fee conforming to node's `incrementalrelayfee` policy of 1000 sat per KB.
586+
# fee conforming to node's `incrementalrelayfee` policy of 100 sat per KB.
587587
assert_equal(self.nodes[0].getmempoolinfo()["incrementalrelayfee"], Decimal("0.000001"))
588588
tx.vout[0].nValue -= 1
589589
assert_raises_rpc_error(-26, "insufficient fee", self.nodes[0].sendrawtransaction, tx.serialize().hex())

0 commit comments

Comments
 (0)