Skip to content

test: fix two signature-size flakes in wallet_fundrawtransaction.py (incl. bitcoin#28604) #8046

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
PastaPastaPasta merged 2 commits into from
Nov 5, 2026
+9 −7
Merged

test: fix two signature-size flakes in wallet_fundrawtransaction.py (incl. bitcoin#28604) #8046

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
4691cca
Merge bitcoin/bitcoin#28604: test: Use feerate higher than minrelay f…
PastaPastaPasta Nov 4, 2026
75932fa
test: stop test_22670 failing when a signature comes out short
PastaPastaPasta Nov 4, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 9 additions & 7 deletions test/functional/wallet_fundrawtransaction.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1023,19 +1023,19 @@ def test_external_inputs(self):
high_input_weight = input_weight * 2

# Funding should also work if the input weight is provided
funded_tx = wallet.fundrawtransaction(raw_tx, input_sizes=[{"txid": ext_utxo["txid"], "vout": ext_utxo["vout"], "size": input_weight}])
funded_tx = wallet.fundrawtransaction(raw_tx, input_sizes=[{"txid": ext_utxo["txid"], "vout": ext_utxo["vout"], "size": input_weight}], fee_rate=2)
signed_tx = wallet.signrawtransactionwithwallet(funded_tx["hex"])
signed_tx = self.nodes[0].signrawtransactionwithwallet(signed_tx["hex"])
assert_equal(self.nodes[0].testmempoolaccept([signed_tx["hex"]])[0]["allowed"], True)
assert_equal(signed_tx["complete"], True)
# Reducing the weight should have a lower fee
funded_tx2 = wallet.fundrawtransaction(raw_tx, input_sizes=[{"txid": ext_utxo["txid"], "vout": ext_utxo["vout"], "size": low_input_weight}])
funded_tx2 = wallet.fundrawtransaction(raw_tx, input_sizes=[{"txid": ext_utxo["txid"], "vout": ext_utxo["vout"], "size": low_input_weight}], fee_rate=2)
assert_greater_than(funded_tx["fee"], funded_tx2["fee"])
# Increasing the weight should have a higher fee
funded_tx2 = wallet.fundrawtransaction(raw_tx, input_sizes=[{"txid": ext_utxo["txid"], "vout": ext_utxo["vout"], "size": high_input_weight}])
funded_tx2 = wallet.fundrawtransaction(raw_tx, input_sizes=[{"txid": ext_utxo["txid"], "vout": ext_utxo["vout"], "size": high_input_weight}], fee_rate=2)
assert_greater_than(funded_tx2["fee"], funded_tx["fee"])
# The provided weight should override the calculated weight when solving data is provided
funded_tx3 = wallet.fundrawtransaction(raw_tx, solving_data={"descriptors": [desc]}, input_sizes=[{"txid": ext_utxo["txid"], "vout": ext_utxo["vout"], "size": high_input_weight}])
funded_tx3 = wallet.fundrawtransaction(raw_tx, solving_data={"descriptors": [desc]}, input_sizes=[{"txid": ext_utxo["txid"], "vout": ext_utxo["vout"], "size": high_input_weight}], fee_rate=2)
assert_equal(funded_tx2["fee"], funded_tx3["fee"])
# The feerate should be met
funded_tx4 = wallet.fundrawtransaction(raw_tx, input_sizes=[{"txid": ext_utxo["txid"], "vout": ext_utxo["vout"], "size": high_input_weight}], fee_rate=10)
Expand All @@ -1044,8 +1044,8 @@ def test_external_inputs(self):
assert_fee_amount(funded_tx4["fee"], tx4_size, Decimal(0.0001))

# Funding with weight at csuint boundaries should not cause problems
funded_tx = wallet.fundrawtransaction(raw_tx, input_sizes=[{"txid": ext_utxo["txid"], "vout": ext_utxo["vout"], "size": 255}])
funded_tx = wallet.fundrawtransaction(raw_tx, input_sizes=[{"txid": ext_utxo["txid"], "vout": ext_utxo["vout"], "size": 65539}])
funded_tx = wallet.fundrawtransaction(raw_tx, input_sizes=[{"txid": ext_utxo["txid"], "vout": ext_utxo["vout"], "size": 255}], fee_rate=2)
funded_tx = wallet.fundrawtransaction(raw_tx, input_sizes=[{"txid": ext_utxo["txid"], "vout": ext_utxo["vout"], "size": 65539}], fee_rate=2)

self.nodes[2].unloadwallet("extfund")

Expand Down Expand Up @@ -1294,7 +1294,9 @@ def do_fund_send(target):
assert signed_tx["complete"]
decoded_tx = tester.decoderawtransaction(signed_tx["hex"])
assert_equal(len(decoded_tx["vin"]), 3)
assert tester.testmempoolaccept([signed_tx["hex"]])[0]["allowed"]
# The fee pays -minrelaytxfee, which equals the default maxfeerate, on the size the wallet estimates.
# An ECDSA signature can be a byte shorter than estimated, which would exceed maxfeerate.
assert tester.testmempoolaccept([signed_tx["hex"]], maxfeerate=0)[0]["allowed"]

# We want to choose more value than is available in 2 inputs when considering the fee,
# but not enough to need 3 inputs when not considering the fee.
Expand Down
Loading