test: add P2SH-P2WSH and P2SH 2of3 multisig integration tests - #49
Merged
Merged
Conversation
There was a problem hiding this comment.
Pull request overview
Note
Copilot was unable to run its full agentic suite in this review.
Adds regression tests to ensure cmd_spend can create PSBTs that spend multisig “dust” UTXOs across multiple script/address types, and that the PSBTs can be finalized via multiple wallet signatures.
Changes:
- Add a 2-of-2 P2SH-P2wSH multisig dust spend test.
- Add a 2-of-3 P2SH-P2wSH multisig dust spend test.
- Add a 2-of-3 legacy P2SH multisig dust spend test.
Comment on lines
+1382
to
+1383
| assert!(result.is_some(), "expected a psbt to be created"); | ||
| let psbt = result.unwrap(); |
Comment on lines
+1362
to
+1381
| let ctx = TestContext::new(); | ||
|
|
||
| let (addr, desc) = ctx.env.create_multisig( | ||
| &[&ctx.wallet1_name, &ctx.wallet2_name], | ||
| 2, | ||
| &AddressType::P2shSegwit, | ||
| ); | ||
|
|
||
| cmd_add(&ctx.secp, &ctx.db, ctx.network, &ctx.rpc_client, desc, 0); | ||
| ctx.env.send_to_address(&addr, Amount::from_sat(555)); | ||
| ctx.env.mine_blocks(1); | ||
|
|
||
| let result = cmd_spend( | ||
| &ctx.db, | ||
| ctx.network, | ||
| &ctx.rpc_client, | ||
| Amount::from_sat(600), | ||
| addr, | ||
| false, | ||
| ); |
Comment on lines
+1419
to
+1424
| // 2-of-3: any 2 of the 3 wallets must sign | ||
| let partially_signed = ctx.env.wallet_process_psbt(&ctx.wallet1_name, &psbt); | ||
| let fully_signed = ctx | ||
| .env | ||
| .wallet_process_psbt(&ctx.wallet2_name, &partially_signed); | ||
| broadcast_and_assert(&ctx, fully_signed, 1); |
Contributor
Author
|
for the 2of3 tests, should I test multiple signer combinations (e.g. wallet1+wallet2 and wallet1+wallet3) or is a single combination enough for now? |
Collaborator
|
A single combination is enough, I don't see any new code paths being triggered by using different signers. |
Collaborator
|
The other copilot suggestions are valid and worth fixing. |
SIDHARTH20K4
force-pushed
the
add-multisig-tests
branch
from
June 10, 2026 12:42
4ac5b98 to
21a23ef
Compare
Contributor
Author
|
@bubb1es71 |
Comment on lines
+976
to
+983
| let dust = cmd_list( | ||
| &ctx.db, | ||
| ctx.network, | ||
| &ctx.rpc_client, | ||
| Amount::from_sat(dust_sats + 50), | ||
| false, | ||
| ); | ||
| debug!("found dust: {:?}", dust.len()); |
Comment on lines
+1398
to
+1423
| let (addr, desc) = ctx.env.create_multisig( | ||
| &[&ctx.wallet1_name, &ctx.wallet2_name, &ctx.wallet3_name], | ||
| 2, | ||
| &AddressType::Bech32, | ||
| &AddressType::P2shSegwit, | ||
| ); | ||
|
|
||
| cmd_add(&ctx.secp, &ctx.db, ctx.network, &ctx.rpc_client, desc, 0); | ||
| ctx.env.send_to_address(&addr, Amount::from_sat(555)); | ||
| ctx.env.mine_blocks(1); | ||
|
|
||
| let result = cmd_spend( | ||
| &ctx.db, | ||
| ctx.network, | ||
| &ctx.rpc_client, | ||
| Amount::from_sat(600), | ||
| addr, | ||
| false, | ||
| ); | ||
| let psbt = result.expect("expected a psbt to be created"); | ||
|
|
||
| // 2-of-3: any 2 of the 3 wallets must sign | ||
| let partially_signed = ctx.env.wallet_process_psbt(&ctx.wallet1_name, &psbt); | ||
| let fully_signed = ctx | ||
| .env | ||
| .wallet_process_psbt(&ctx.wallet2_name, &partially_signed); | ||
| broadcast_and_assert(&ctx, fully_signed, 1); |
| &ctx.db, | ||
| ctx.network, | ||
| &ctx.rpc_client, | ||
| Amount::from_sat(dust_sats + 50), |
| &ctx.db, | ||
| ctx.network, | ||
| &ctx.rpc_client, | ||
| Amount::from_sat(dust_sats + 50), |
SIDHARTH20K4
force-pushed
the
add-multisig-tests
branch
from
June 19, 2026 11:45
21a23ef to
c30a8a6
Compare
SIDHARTH20K4
force-pushed
the
add-multisig-tests
branch
from
June 19, 2026 11:51
c30a8a6 to
693440d
Compare
Collaborator
|
Hi let me know when this is ready for a human re-review. |
Contributor
Author
@bubb1es71 |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
closes #22
adds integration tests for
P2SH-P2WSHandP2SH 2of3 multisigdust inputs:-
test_spend_p2sh_2of3_multisig-
test_spend_p2sh_p2wsh_2of2_multisig-
test_spend_p2sh_p2wsh_2of3_multisig