Skip to content
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

backport: merge bitcoin#23106, #22067, #23303, #23403, #22513, #17034, #23718, partial bitcoin#21330, #21365, #22514 (psbt backports) #6503

Merged
merged 12 commits into from
Jan 8, 2025
Merged

backport: merge bitcoin#23106, #22067, #23303, #23403, #22513, #17034, #23718, partial bitcoin#21330, #21365, #22514 (psbt backports) #6503

Changes from 1 commit
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
4a08920
partial bitcoin#21330: Deal with missing data in signature hashes mor…
kwvg Mar 2, 2021
b7c7c7b
partial bitcoin#21365: Basic Taproot signing support for descriptor w…
kwvg Dec 21, 2024
3219855
merge bitcoin#23106: Ensure wallet is unlocked before signing PSBT wi…
kwvg Sep 27, 2021
c7a69cc
merge bitcoin#22067: Test and document a basic M-of-N multisig using …
kwvg Dec 21, 2024
ba85b4c
merge bitcoin#23303: Fix wallet_multisig_descriptor_psbt.py
kwvg Oct 18, 2021
193765b
merge bitcoin#23403: Fix segfault in the psbt_wallet_tests/psbt_updat…
kwvg Oct 31, 2021
0c52bfe
merge bitcoin#22513: Allow walletprocesspsbt to sign without finalizing
kwvg Dec 21, 2024
f1ba319
partial bitcoin#22514: Actually use SIGHASH_DEFAULT for PSBT signing
kwvg Nov 15, 2021
c076d02
merge bitcoin#17034: PSBT version, proprietary, and xpub fields (BIP …
kwvg Dec 20, 2024
dc9342b
test: strip `vin.scriptWitness` from PSBT test vectors
kwvg Dec 20, 2024
e4530e6
merge bitcoin#23718: hash preimages fields
kwvg Dec 5, 2021
aba9370
test: strip `vin.scriptWitness` from more PSBT test vectors
kwvg Dec 20, 2024
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
Prev Previous commit
Next Next commit
merge bitcoin#23303: Fix wallet_multisig_descriptor_psbt.py
  • Loading branch information
@kwvg
kwvg committed Dec 21, 2024
commit ba85b4c623590fd3fde306e695e6e298144df51a
8 changes: 4 additions & 4 deletions test/functional/wallet_multisig_descriptor_psbt.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -104,13 +104,13 @@ def run_test(self):

self.log.info("Get a mature utxo to send to the multisig...")
coordinator_wallet = participants["signers"][0]
coordinator_wallet.generatetoaddress(101, coordinator_wallet.getnewaddress())
self.generatetoaddress(self.nodes[0], 101, coordinator_wallet.getnewaddress())

deposit_amount = 6.15
multisig_receiving_address = participants["multisigs"][0].getnewaddress()
self.log.info("Send funds to the resulting multisig receiving address...")
coordinator_wallet.sendtoaddress(multisig_receiving_address, deposit_amount)
self.nodes[0].generate(1)
self.generate(self.nodes[0], 1)
self.sync_all()
for participant in participants["multisigs"]:
assert_approx(participant.getbalance(), deposit_amount, vspan=0.001)
Expand All @@ -136,7 +136,7 @@ def run_test(self):
coordinator_wallet.sendrawtransaction(finalized["hex"])

self.log.info("Check that balances are correct after the transaction has been included in a block.")
self.nodes[0].generate(1)
self.generate(self.nodes[0], 1)
self.sync_all()
assert_approx(participants["multisigs"][0].getbalance(), deposit_amount - value, vspan=0.001)
assert_equal(participants["signers"][self.N - 1].getbalance(), value)
Expand All @@ -153,7 +153,7 @@ def run_test(self):
coordinator_wallet.sendrawtransaction(finalized["hex"])

self.log.info("Check that balances are correct after the transaction has been included in a block.")
self.nodes[0].generate(1)
self.generate(self.nodes[0], 1)
self.sync_all()
assert_approx(participants["multisigs"][0].getbalance(), deposit_amount - (value * 2), vspan=0.001)
assert_equal(participants["signers"][self.N - 1].getbalance(), value * 2)
Expand Down