feat(wasm-utxo): bump rust-miniscript to v13.0.0-opdrop

Updates miniscript dependency from v12.3.4-opdrop to v13.0.0-opdrop and
adapts code to API changes. Key changes include:
- Updated TapTree representation and handling
- Renamed `parse` method to `decode` for scripts
- Changed `output_key().to_inner()` to `output_key().to_x_only_public_key()`
- Updated error type from `ConversionError` to `NonDefiniteKeyError`

Issue: BTC-2656

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

Author: OttoAllmendinger

packages/wasm-utxo/Cargo.lock

@@ -16,7 +16,7 @@ all = "warn"
 [dependencies]
 wasm-bindgen = "0.2"
 js-sys = "0.3"
-miniscript = { git = "https://github.com/BitGo/rust-miniscript", tag = "miniscript-12.3.4-opdrop" }
+miniscript = { git = "https://github.com/BitGo/rust-miniscript", tag = "miniscript-13.0.0-opdrop" }
 bech32 = "0.11"
 musig2 = { version = "0.3.1", default-features = false, features = ["k256"] }
 getrandom = { version = "0.2", features = ["js"] }

packages/wasm-utxo/Cargo.toml

@@ -32,8 +32,8 @@ impl From<miniscript::Error> for WasmUtxoError {
     }
 }
 
-impl From<miniscript::descriptor::ConversionError> for WasmUtxoError {
-    fn from(err: miniscript::descriptor::ConversionError) -> Self {
+impl From<miniscript::descriptor::NonDefiniteKeyError> for WasmUtxoError {
+    fn from(err: miniscript::descriptor::NonDefiniteKeyError) -> Self {
         WasmUtxoError::StringError(err.to_string())
     }
 }

packages/wasm-utxo/src/error.rs

@@ -88,7 +88,7 @@ impl ScriptP2tr {
     }
 
     pub fn output_script(&self) -> ScriptBuf {
-        let output_key = self.spend_info.output_key().to_inner();
+        let output_key = self.spend_info.output_key().to_x_only_public_key();
 
         Builder::new()
             .push_int(1)

packages/wasm-utxo/src/fixed_script_wallet/wallet_scripts/checksigverify.rs

@@ -75,13 +75,13 @@ impl WrapMiniscript {
         let script = bitcoin::Script::from_bytes(script);
         match context_type {
             "tap" => Ok(WrapMiniscript::from(
-                Miniscript::<XOnlyPublicKey, Tap>::parse(script).map_err(WasmUtxoError::from)?,
+                Miniscript::<XOnlyPublicKey, Tap>::decode(script).map_err(WasmUtxoError::from)?,
             )),
             "segwitv0" => Ok(WrapMiniscript::from(
-                Miniscript::<PublicKey, Segwitv0>::parse(script).map_err(WasmUtxoError::from)?,
+                Miniscript::<PublicKey, Segwitv0>::decode(script).map_err(WasmUtxoError::from)?,
             )),
             "legacy" => Ok(WrapMiniscript::from(
-                Miniscript::<PublicKey, Legacy>::parse(script).map_err(WasmUtxoError::from)?,
+                Miniscript::<PublicKey, Legacy>::decode(script).map_err(WasmUtxoError::from)?,
             )),
             _ => Err(WasmUtxoError::new("Invalid context type")),
         }

packages/wasm-utxo/src/wasm/miniscript.rs

@@ -235,16 +235,27 @@ impl<Pk: MiniscriptKey + TryIntoJsValue> TryIntoJsValue for WshInner<Pk> {
 
 impl<Pk: MiniscriptKey + TryIntoJsValue> TryIntoJsValue for Tr<Pk> {
     fn try_to_js_value(&self) -> Result<JsValue, WasmUtxoError> {
-        Ok(js_arr!(self.internal_key(), self.tap_tree()))
+        let tap_tree_js: JsValue = match self.tap_tree() {
+            Some(tree) => tree.try_to_js_value()?,
+            None => JsValue::NULL,
+        };
+        Ok(js_arr!(self.internal_key(), tap_tree_js))
     }
 }
 
 impl<Pk: MiniscriptKey + TryIntoJsValue> TryIntoJsValue for TapTree<Pk> {
     fn try_to_js_value(&self) -> Result<JsValue, WasmUtxoError> {
-        match self {
-            TapTree::Tree { left, right, .. } => js_obj!("Tree" => js_arr!(left, right)),
-            TapTree::Leaf(ms) => ms.try_to_js_value(),
+        // TapTree is now a flat representation of leaves with depths
+        // Convert to an array of {depth, miniscript} objects
+        let arr = Array::new();
+        for item in self.leaves() {
+            let leaf_obj = js_obj!(
+                "depth" => item.depth() as u32,
+                "miniscript" => item.miniscript()
+            )?;
+            arr.push(&leaf_obj);
         }
+        Ok(arr.into())
     }
 }