Skip to content

feat(wasm-utxo): rename taproot script type enums to be more descriptive #26

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

Closed
wants to merge 1 commit into from
+42 −34
Closed

feat(wasm-utxo): rename taproot script type enums to be more descriptive #26

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
33 changes: 15 additions & 18 deletions packages/wasm-utxo/src/bitgo_psbt/mod.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -579,27 +579,24 @@ mod tests {
ignore: [BitcoinGold]
);

crate::test_psbt_fixtures!(test_p2tr_script_generation_from_fixture, network, format, {
test_wallet_script_type(fixtures::ScriptType::P2tr, network, format).unwrap();
crate::test_psbt_fixtures!(test_p2tr_legacy_script_path_suite, network, format, {
test_wallet_script_type(fixtures::ScriptType::P2trLegacyScriptPath, network, format)
.unwrap();
});

crate::test_psbt_fixtures!(
test_p2tr_musig2_script_path_generation_from_fixture,
network,
format,
{
test_wallet_script_type(fixtures::ScriptType::P2trMusig2, network, format).unwrap();
}
);
crate::test_psbt_fixtures!(test_p2tr_musig2_script_path_suite, network, format, {
test_wallet_script_type(fixtures::ScriptType::P2trMusig2ScriptPath, network, format)
.unwrap();
});

crate::test_psbt_fixtures!(
test_p2tr_musig2_key_path_spend_script_generation_from_fixture,
network,
format,
{
test_wallet_script_type(fixtures::ScriptType::TaprootKeypath, network, format).unwrap();
}
);
crate::test_psbt_fixtures!(test_p2tr_musig2_key_path_suite, network, format, {
test_wallet_script_type(
fixtures::ScriptType::P2trMusig2TaprootKeypath,
network,
format,
)
.unwrap();
});

crate::test_psbt_fixtures!(test_extract_transaction, network, format, {
let fixture = fixtures::load_psbt_fixture_with_format(
Expand Down
4 changes: 2 additions & 2 deletions packages/wasm-utxo/src/bitgo_psbt/p2tr_musig2_input.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -689,12 +689,12 @@ mod tests {
.expect("Failed to load fixture");

let (input_index, input_fixture) = fixture
.find_input_with_script_type(ScriptType::TaprootKeypath)
.find_input_with_script_type(ScriptType::P2trMusig2TaprootKeypath)
.expect("Failed to find taprootKeyPathSpend input");

let finalized_input_fixture = if signature_state == SignatureState::Fullsigned {
let (finalized_input_index, finalized_input_fixture) = fixture
.find_finalized_input_with_script_type(ScriptType::TaprootKeypath)
.find_finalized_input_with_script_type(ScriptType::P2trMusig2TaprootKeypath)
.expect("Failed to find taprootKeyPathSpend finalized input");
assert_eq!(input_index, finalized_input_index);
Some(finalized_input_fixture)
Expand Down
39 changes: 25 additions & 14 deletions packages/wasm-utxo/src/fixed_script_wallet/test_utils/fixtures.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1001,9 +1001,12 @@ pub enum ScriptType {
P2sh,
P2shP2wsh,
P2wsh,
P2tr,
P2trMusig2,
TaprootKeypath,
// Chain 30 and 31 - we only support script path spending for these
P2trLegacyScriptPath,
// Chain 40 and 41 - script path spend
P2trMusig2ScriptPath,
// Chain 40 and 41 - keypath spend
P2trMusig2TaprootKeypath,
}

impl ScriptType {
Expand All @@ -1013,9 +1016,9 @@ impl ScriptType {
ScriptType::P2sh => "p2sh",
ScriptType::P2shP2wsh => "p2shP2wsh",
ScriptType::P2wsh => "p2wsh",
ScriptType::P2tr => "p2tr",
ScriptType::P2trMusig2 => "p2trMusig2",
ScriptType::TaprootKeypath => "taprootKeypath",
ScriptType::P2trLegacyScriptPath => "p2tr",
ScriptType::P2trMusig2ScriptPath => "p2trMusig2",
ScriptType::P2trMusig2TaprootKeypath => "taprootKeypath",
}
}

Expand All @@ -1026,13 +1029,16 @@ impl ScriptType {
(ScriptType::P2sh, PsbtInputFixture::P2sh(_))
| (ScriptType::P2shP2wsh, PsbtInputFixture::P2shP2wsh(_))
| (ScriptType::P2wsh, PsbtInputFixture::P2wsh(_))
| (ScriptType::P2tr, PsbtInputFixture::P2trLegacy(_))
| (
ScriptType::P2trMusig2,
ScriptType::P2trLegacyScriptPath,
PsbtInputFixture::P2trLegacy(_)
)
| (
ScriptType::P2trMusig2ScriptPath,
PsbtInputFixture::P2trMusig2ScriptPath(_)
)
| (
ScriptType::TaprootKeypath,
ScriptType::P2trMusig2TaprootKeypath,
PsbtInputFixture::P2trMusig2KeyPath(_)
)
)
Expand All @@ -1045,13 +1051,16 @@ impl ScriptType {
(ScriptType::P2sh, PsbtFinalInputFixture::P2sh(_))
| (ScriptType::P2shP2wsh, PsbtFinalInputFixture::P2shP2wsh(_))
| (ScriptType::P2wsh, PsbtFinalInputFixture::P2wsh(_))
| (ScriptType::P2tr, PsbtFinalInputFixture::P2trLegacy(_))
| (
ScriptType::P2trMusig2,
ScriptType::P2trLegacyScriptPath,
PsbtFinalInputFixture::P2trLegacy(_)
)
| (
ScriptType::P2trMusig2ScriptPath,
PsbtFinalInputFixture::P2trMusig2ScriptPath(_)
)
| (
ScriptType::TaprootKeypath,
ScriptType::P2trMusig2TaprootKeypath,
PsbtFinalInputFixture::P2trMusig2KeyPath(_)
)
)
Expand All @@ -1064,7 +1073,9 @@ impl ScriptType {
pub fn is_taproot(&self) -> bool {
matches!(
self,
ScriptType::P2tr | ScriptType::P2trMusig2 | ScriptType::TaprootKeypath
ScriptType::P2trLegacyScriptPath
| ScriptType::P2trMusig2ScriptPath
| ScriptType::P2trMusig2TaprootKeypath
)
}

Expand Down Expand Up @@ -1382,7 +1393,7 @@ mod tests {

// Test finding taproot key path finalized input
let (index, input) = fixture
.find_finalized_input_with_script_type(ScriptType::TaprootKeypath)
.find_finalized_input_with_script_type(ScriptType::P2trMusig2TaprootKeypath)
.expect("Failed to find taproot key path finalized input");
assert_eq!(index, 5);
assert!(matches!(input, PsbtFinalInputFixture::P2trMusig2KeyPath(_)));
Expand Down