refactor(wasm-utxo): move bitgo_psbt to fixed_script_wallet module

Move BitGo PSBT functionality from root module to fixed_script_wallet
where it logically belongs. Update imports and paths across files to
maintain functionality. Also move psbt_wallet_input.rs into the
bitgo_psbt module.

Issue: BTC-2652

Co-authored-by: llm-git <[email protected]>

Author: OttoAllmendinger

packages/wasm-utxo/cli/src/parse/node.rs

@@ -3,7 +3,7 @@ use bitcoin::consensus::Decodable;
 use bitcoin::hashes::Hash;
 use bitcoin::psbt::Psbt;
 use bitcoin::{Network, ScriptBuf, Transaction};
-use wasm_utxo::bitgo_psbt::{
+use wasm_utxo::fixed_script_wallet::bitgo_psbt::{
     p2tr_musig2_input::{Musig2PartialSig, Musig2Participants, Musig2PubNonce},
     BitGoKeyValue, ProprietaryKeySubtype, BITGO,
 };
@@ -56,7 +56,7 @@ fn musig2_participants_to_node(participants: &Musig2Participants) -> Node {
 
     let mut participants_node = Node::new("participant_pub_keys", Primitive::U64(2));
     for (i, pub_key) in participants.participant_pub_keys.iter().enumerate() {
-        let pub_key_vec: Vec<u8> = pub_key.to_bytes().to_vec();
+        let pub_key_vec: Vec<u8> = pub_key.to_bytes().as_slice().to_vec();
         participants_node.add_child(Node::new(
             format!("participant_{}", i),
             Primitive::Buffer(pub_key_vec),

packages/wasm-utxo/src/bitgo_psbt/mod.rs …rc/fixed_script_wallet/bitgo_psbt/mod.rspackages/wasm-utxo/src/bitgo_psbt/mod.rs renamed to packages/wasm-utxo/src/fixed_script_wallet/bitgo_psbt/mod.rs packages/wasm-utxo/src/bitgo_psbt/mod.rs renamed to packages/wasm-utxo/src/fixed_script_wallet/bitgo_psbt/mod.rs

@@ -7,14 +7,15 @@ pub mod p2tr_musig2_input;
 #[cfg(test)]
 mod p2tr_musig2_input_utxolib;
 mod propkv;
+mod psbt_wallet_input;
 mod sighash;
 mod zcash_psbt;
 
-use crate::{bitgo_psbt::zcash_psbt::ZcashPsbt, networks::Network};
-
+use crate::Network;
 use miniscript::bitcoin::{psbt::Psbt, secp256k1, CompressedPublicKey};
 pub use propkv::{BitGoKeyValue, ProprietaryKeySubtype, BITGO};
 pub use sighash::validate_sighash_type;
+use zcash_psbt::ZcashPsbt;
 
 #[derive(Debug)]
 pub enum DeserializeError {

…utxo/src/bitgo_psbt/p2tr_musig2_input.rs …t_wallet/bitgo_psbt/p2tr_musig2_input.rspackages/wasm-utxo/src/bitgo_psbt/p2tr_musig2_input.rs renamed to packages/wasm-utxo/src/fixed_script_wallet/bitgo_psbt/p2tr_musig2_input.rs packages/wasm-utxo/src/bitgo_psbt/p2tr_musig2_input.rs renamed to packages/wasm-utxo/src/fixed_script_wallet/bitgo_psbt/p2tr_musig2_input.rs

@@ -4,11 +4,9 @@
 //! key-values in PSBTs, following the format specified in:
 //! https://gist.github.com/sanket1729/4b525c6049f4d9e034d27368c49f28a6
 
-use crate::bitgo_psbt::propkv::{find_kv, is_musig2_key, BitGoKeyValue};
-use crate::fixed_script_wallet::bitgo_musig::key_agg_p2tr_musig2;
-
-use super::propkv::ProprietaryKeySubtype;
+use super::propkv::{find_kv, is_musig2_key, BitGoKeyValue, ProprietaryKeySubtype};
 use crate::bitcoin::{key::UntweakedPublicKey, CompressedPublicKey};
+use crate::fixed_script_wallet::wallet_scripts::bitgo_musig::key_agg_p2tr_musig2;
 use miniscript::bitcoin::hashes::{hex, Hash};
 use miniscript::bitcoin::{
     bip32::{KeySource, Xpriv, Xpub},
@@ -17,6 +15,11 @@ use miniscript::bitcoin::{
 };
 use musig2::PubNonce;
 
+#[cfg(test)]
+use super::BitGoPsbt;
+#[cfg(test)]
+use crate::fixed_script_wallet::test_utils::fixtures::XprvTriple;
+
 pub type TapKeyOrigins = std::collections::BTreeMap<XOnlyPublicKey, (Vec<TapLeafHash>, KeySource)>;
 
 pub fn derive_xpriv_for_input_tap(
@@ -1030,9 +1033,9 @@ impl Musig2Input {
 /// * `input_index` - Index of the MuSig2 input
 #[cfg(test)]
 pub fn assert_set_nonce_and_sign_musig2_keypath(
-    xpriv_triple: &crate::fixed_script_wallet::test_utils::fixtures::XprvTriple,
-    unsigned_bitgo_psbt: &mut crate::bitgo_psbt::BitGoPsbt,
-    halfsigned_bitgo_psbt: &crate::bitgo_psbt::BitGoPsbt,
+    xpriv_triple: &XprvTriple,
+    unsigned_bitgo_psbt: &mut BitGoPsbt,
+    halfsigned_bitgo_psbt: &BitGoPsbt,
     input_index: usize,
 ) -> Result<(), String> {
     // Test 1: Functional API (utxolib-compatible, fixture-validated)
@@ -1074,8 +1077,8 @@ pub fn assert_set_nonce_and_sign_musig2_keypath(
 /// * `input_index` - Index of the MuSig2 input
 #[cfg(test)]
 pub fn assert_set_nonce_and_sign_musig2_keypath_state_machine(
-    xpriv_triple: &crate::fixed_script_wallet::test_utils::fixtures::XprvTriple,
-    unsigned_bitgo_psbt: &mut crate::bitgo_psbt::BitGoPsbt,
+    xpriv_triple: &XprvTriple,
+    unsigned_bitgo_psbt: &mut BitGoPsbt,
     input_index: usize,
 ) -> Result<(), String> {
     // Verify this is actually a MuSig2 input

…/bitgo_psbt/p2tr_musig2_input_utxolib.rs …/bitgo_psbt/p2tr_musig2_input_utxolib.rspackages/wasm-utxo/src/bitgo_psbt/p2tr_musig2_input_utxolib.rs renamed to packages/wasm-utxo/src/fixed_script_wallet/bitgo_psbt/p2tr_musig2_input_utxolib.rs packages/wasm-utxo/src/bitgo_psbt/p2tr_musig2_input_utxolib.rs renamed to packages/wasm-utxo/src/fixed_script_wallet/bitgo_psbt/p2tr_musig2_input_utxolib.rs

@@ -7,9 +7,12 @@
 //! For production use, prefer the State-Machine API in the parent module which
 //! provides better protection against nonce reuse.
 
-use super::p2tr_musig2_input::{
-    collect_prevouts, derive_xpriv_for_input_tap, derive_xpub_for_input_tap, Musig2Context,
-    Musig2Error, Musig2Input, Musig2PubNonce,
+use super::{
+    p2tr_musig2_input::{
+        collect_prevouts, derive_xpriv_for_input_tap, derive_xpub_for_input_tap, Musig2Context,
+        Musig2Error, Musig2Input, Musig2PubNonce,
+    },
+    BitGoPsbt,
 };
 use crate::bitcoin::{
     bip32::Xpriv,
@@ -19,7 +22,6 @@ use crate::bitcoin::{
     sighash::TapSighash,
     taproot::TapNodeHash,
 };
-use crate::bitgo_psbt::BitGoPsbt;
 use crate::fixed_script_wallet::RootWalletKeys;
 use musig2::{secp::Point, PubNonce};
 

…kages/wasm-utxo/src/bitgo_psbt/propkv.rs …fixed_script_wallet/bitgo_psbt/propkv.rspackages/wasm-utxo/src/bitgo_psbt/propkv.rs renamed to packages/wasm-utxo/src/fixed_script_wallet/bitgo_psbt/propkv.rs packages/wasm-utxo/src/bitgo_psbt/propkv.rs renamed to packages/wasm-utxo/src/fixed_script_wallet/bitgo_psbt/propkv.rs

@@ -376,6 +376,8 @@ pub fn validate_psbt_wallet_inputs(
 #[cfg(test)]
 pub mod test_helpers {
     use super::*;
+    use crate::fixed_script_wallet::{RootWalletKeys, XpubTriple};
+    use crate::test_utils::fixtures;
 
     /// Checks if a specific input in a PSBT is protected by replay protection
     pub fn is_replay_protected_input(
@@ -545,13 +547,6 @@ pub mod test_helpers {
             }
         }
     }
-}
-
-#[cfg(test)]
-mod tests {
-    use super::*;
-    use crate::fixed_script_wallet::{RootWalletKeys, XpubTriple};
-    use crate::test_utils::fixtures;
 
     fn get_reversed_wallet_keys(wallet_keys: &RootWalletKeys) -> RootWalletKeys {
         let triple: XpubTriple = wallet_keys
@@ -565,8 +560,6 @@ mod tests {
     }
 
     crate::test_psbt_fixtures!(test_validate_psbt_wallet_inputs, network, format, {
-        use crate::fixed_script_wallet::psbt_wallet_input::test_helpers::*;
-        
         let replay_protection = ReplayProtection::new(vec![
             ScriptBuf::from_hex("a91420b37094d82a513451ff0ccd9db23aba05bc5ef387")
                 .expect("Failed to parse replay protection output script"),

…fixed_script_wallet/psbt_wallet_input.rs …t_wallet/bitgo_psbt/psbt_wallet_input.rspackages/wasm-utxo/src/fixed_script_wallet/psbt_wallet_input.rs renamed to packages/wasm-utxo/src/fixed_script_wallet/bitgo_psbt/psbt_wallet_input.rs packages/wasm-utxo/src/fixed_script_wallet/psbt_wallet_input.rs renamed to packages/wasm-utxo/src/fixed_script_wallet/bitgo_psbt/psbt_wallet_input.rs

@@ -1,6 +1,6 @@
 /// This module contains code for the BitGo Fixed Script Wallets.
 /// These are not based on descriptors.
-pub mod psbt_wallet_input;
+pub mod bitgo_psbt;
 mod wallet_keys;
 pub mod wallet_scripts;
 

…ages/wasm-utxo/src/bitgo_psbt/sighash.rs …ixed_script_wallet/bitgo_psbt/sighash.rspackages/wasm-utxo/src/bitgo_psbt/sighash.rs renamed to packages/wasm-utxo/src/fixed_script_wallet/bitgo_psbt/sighash.rs packages/wasm-utxo/src/bitgo_psbt/sighash.rs renamed to packages/wasm-utxo/src/fixed_script_wallet/bitgo_psbt/sighash.rs

@@ -41,13 +41,16 @@
 use std::str::FromStr;
 
 use crate::{
-    bitcoin::bip32::Xpriv, bitgo_psbt::p2tr_musig2_input, fixed_script_wallet::RootWalletKeys,
+    bitcoin::bip32::Xpriv,
+    fixed_script_wallet::{
+        bitgo_psbt::{p2tr_musig2_input, validate_sighash_type, BitGoPsbt},
+        RootWalletKeys,
+    },
+    Network,
 };
 use miniscript::bitcoin::bip32::Xpub;
 use serde::{Deserialize, Serialize};
 
-use crate::Network;
-
 #[derive(Debug, Clone, PartialEq, Eq)]
 pub struct XprvTriple([Xpriv; 3]);
 
@@ -205,7 +208,7 @@ impl Musig2Participants {
         }
 
         for (i, parsed_key) in parsed.participant_pub_keys.iter().enumerate() {
-            let parsed_key_hex = hex::encode(parsed_key.to_bytes());
+            let parsed_key_hex = hex::encode(parsed_key.to_bytes().as_slice());
             assert_hex_eq(
                 &parsed_key_hex,
                 &self.participant_pub_keys[i],
@@ -659,11 +662,8 @@ impl PsbtFixture {
         Ok(BASE64_STANDARD.decode(&self.psbt_base64)?)
     }
 
-    pub fn to_bitgo_psbt(
-        &self,
-        network: Network,
-    ) -> Result<crate::bitgo_psbt::BitGoPsbt, Box<dyn std::error::Error>> {
-        let psbt = crate::bitgo_psbt::BitGoPsbt::deserialize(&self.to_psbt_bytes()?, network)?;
+    pub fn to_bitgo_psbt(&self, network: Network) -> Result<BitGoPsbt, Box<dyn std::error::Error>> {
+        let psbt = BitGoPsbt::deserialize(&self.to_psbt_bytes()?, network)?;
         Ok(psbt)
     }
 
@@ -880,8 +880,8 @@ pub fn assert_hex_eq(generated: &str, expected: &str, field_name: &str) -> Resul
 }
 
 /// Validates sighash type for the given network
-fn validate_sighash_type(sighash_type: u32, network: Network) -> Result<(), String> {
-    crate::bitgo_psbt::validate_sighash_type(sighash_type, network)
+fn validate_sighash_type_fixture(sighash_type: u32, network: Network) -> Result<(), String> {
+    validate_sighash_type(sighash_type, network)
 }
 
 /// Validates output script from witness UTXO against generated script
@@ -926,7 +926,7 @@ impl P2shInput {
         let redeem_script_hex = scripts.redeem_script.to_hex_string();
         assert_hex_eq(&redeem_script_hex, &self.redeem_script, "Redeem script")?;
 
-        validate_sighash_type(self.sighash_type, network)
+        validate_sighash_type_fixture(self.sighash_type, network)
     }
 }
 
@@ -950,7 +950,7 @@ impl P2shP2wshInput {
         let witness_script_hex = scripts.witness_script.to_hex_string();
         assert_hex_eq(&witness_script_hex, &self.witness_script, "Witness script")?;
 
-        validate_sighash_type(self.sighash_type, network)
+        validate_sighash_type_fixture(self.sighash_type, network)
     }
 }
 
@@ -970,7 +970,7 @@ impl P2wshInput {
         let witness_script_hex = scripts.witness_script.to_hex_string();
         assert_hex_eq(&witness_script_hex, &self.witness_script, "Witness script")?;
 
-        validate_sighash_type(self.sighash_type, network)
+        validate_sighash_type_fixture(self.sighash_type, network)
     }
 }
 
@@ -1017,7 +1017,7 @@ impl P2trScriptPathInput {
             }
         }
 
-        validate_sighash_type(self.sighash_type, network)
+        validate_sighash_type_fixture(self.sighash_type, network)
     }
 
     /// Validates that the generated WalletScripts matches this fixture
@@ -1052,7 +1052,7 @@ impl P2trMusig2KeyPathInput {
         let merkle_root_hex = hex::encode(merkle_root_bytes);
         assert_hex_eq(&merkle_root_hex, &self.tap_merkle_root, "Merkle root")?;
 
-        validate_sighash_type(self.sighash_type, network)
+        validate_sighash_type_fixture(self.sighash_type, network)
     }
 
     /// Validates that the generated WalletScripts matches this fixture