build(wasm-utxo): update miniscript to bitgo.5 and enforce sane+drop mode

Update rust-miniscript dependency from bitgo.3 to bitgo.5. Change all
descriptor parsing to use `ExtParams::sane().drop()` by default,
allowing r: wrappers while maintaining other safety checks.

The `fromStringExt` method now always enables drop mode, with other
flags remaining opt-in for taproot leaf validation.

Issue: BTC-3357

Co-authored-by: llm-git <llm-git@ttll.de>

Author: OttoAllmendinger

packages/wasm-utxo/Cargo.lock

@@ -27,7 +27,7 @@ inspect = ["dep:num-bigint", "dep:serde", "dep:serde_json", "dep:hex"]
 [dependencies]
 wasm-bindgen = "0.2"
 js-sys = "0.3"
-miniscript = { git = "https://github.com/BitGo/rust-miniscript", tag = "miniscript-13.0.0-bitgo.3" }
+miniscript = { git = "https://github.com/BitGo/rust-miniscript", tag = "miniscript-13.0.0-bitgo.5" }
 bech32 = "0.11"
 musig2 = { version = "0.3.1", default-features = false, features = ["k256"] }
 getrandom = { version = "0.2", features = ["js"] }

packages/wasm-utxo/Cargo.toml

@@ -4,6 +4,7 @@ use crate::wasm::try_into_js_value::TryIntoJsValue;
 use miniscript::bitcoin::secp256k1::{Secp256k1, Signing};
 use miniscript::bitcoin::ScriptBuf;
 use miniscript::descriptor::KeyMap;
+use miniscript::miniscript::analyzable::ExtParams;
 use miniscript::{DefiniteDescriptorKey, Descriptor, DescriptorPublicKey};
 use std::fmt;
 use std::str::FromStr;
@@ -112,12 +113,16 @@ impl WrapDescriptor {
         secp: &Secp256k1<C>,
         descriptor: &str,
     ) -> Result<WrapDescriptor, WasmUtxoError> {
-        let (desc, keys) = Descriptor::parse_descriptor(secp, descriptor)?;
+        let (desc, keys) =
+            Descriptor::parse_descriptor_ext(secp, descriptor, &ExtParams::sane().drop())?;
         Ok(WrapDescriptor(WrapDescriptorEnum::Derivable(desc, keys)))
     }
 
     fn from_string_definite(descriptor: &str) -> Result<WrapDescriptor, WasmUtxoError> {
-        let desc = Descriptor::<DefiniteDescriptorKey>::from_str(descriptor)?;
+        let desc = Descriptor::<DefiniteDescriptorKey>::from_str_ext(
+            descriptor,
+            &ExtParams::sane().drop(),
+        )?;
         Ok(WrapDescriptor(WrapDescriptorEnum::Definite(desc)))
     }
 
@@ -150,31 +155,24 @@ impl WrapDescriptor {
             "derivable" => WrapDescriptor::from_string_derivable(&Secp256k1::new(), descriptor),
             "definite" => WrapDescriptor::from_string_definite(descriptor),
             "string" => {
-                let desc = Descriptor::<String>::from_str(descriptor)?;
+                let desc =
+                    Descriptor::<String>::from_str_ext(descriptor, &ExtParams::sane().drop())?;
                 Ok(WrapDescriptor(WrapDescriptorEnum::String(desc)))
             }
             _ => Err(WasmUtxoError::new("Invalid descriptor type")),
         }
     }
 
-    fn from_string_definite_ext(
-        descriptor: &str,
-        ext_params: &miniscript::miniscript::analyzable::ExtParams,
-    ) -> Result<WrapDescriptor, WasmUtxoError> {
-        let desc = Descriptor::<DefiniteDescriptorKey>::from_str_ext(descriptor, ext_params)?;
-        Ok(WrapDescriptor(WrapDescriptorEnum::Definite(desc)))
-    }
-
     /// Parse a descriptor string with custom ExtParams for taproot leaf validation.
     ///
     /// This allows control over which miniscript analysis checks are applied to
-    /// taproot leaves. All options default to false (sane behavior).
+    /// taproot leaves. The `drop` flag is always enabled; other flags default to false.
     ///
     /// # Arguments
     /// * `descriptor` - A string containing the descriptor to parse
     /// * `pk_type` - The type of public key ("definite" only for now)
     /// * `ext_params_config` - JavaScript object with optional boolean flags:
-    ///   - `drop`: Allow drop operations (r: wrapper)
+    ///   - `drop`: Allow drop operations (r: wrapper) — always enabled
     ///   - `topUnsafe`: Allow scripts without signatures on all paths
     ///   - `resourceLimitations`: Allow scripts exceeding resource limits
     ///   - `timelockMixing`: Allow CSV + CLTV mixing
@@ -184,14 +182,8 @@ impl WrapDescriptor {
     ///
     /// # Example
     /// ```javascript
-    /// // Allow r:older() only (for sBTC)
-    /// Descriptor.fromStringExt(desc, "definite", { drop: true })
-    ///
-    /// // Allow multiple extensions
-    /// Descriptor.fromStringExt(desc, "definite", { drop: true, malleability: true })
-    ///
-    /// // All sane (default)
-    /// Descriptor.fromStringExt(desc, "definite", {})
+    /// // r:older() is always allowed; add extra flags as needed
+    /// Descriptor.fromStringExt(desc, "definite", { malleability: true })
     /// ```
     #[wasm_bindgen(js_name = fromStringExt, skip_typescript)]
     pub fn from_string_ext(
@@ -203,10 +195,7 @@ impl WrapDescriptor {
             Ok(get_field::<Option<bool>>(&ext_params_config, key)?.unwrap_or(false))
         };
 
-        let mut params = miniscript::miniscript::analyzable::ExtParams::sane();
-        if flag("drop")? {
-            params = params.drop();
-        }
+        let mut params = ExtParams::sane().drop();
         if flag("topUnsafe")? {
             params = params.top_unsafe();
         }
@@ -227,7 +216,10 @@ impl WrapDescriptor {
         }
 
         match pk_type {
-            "definite" => WrapDescriptor::from_string_definite_ext(descriptor, &params),
+            "definite" => {
+                let desc = Descriptor::<DefiniteDescriptorKey>::from_str_ext(descriptor, &params)?;
+                Ok(WrapDescriptor(WrapDescriptorEnum::Definite(desc)))
+            }
             _ => Err(WasmUtxoError::new(
                 "fromStringExt only supports 'definite' pk_type",
             )),

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

@@ -1,7 +1,6 @@
 import * as assert from "assert";
 import * as utxolib from "@bitgo/utxo-lib";
 import { Descriptor } from "../js/index.js";
-import type { ExtParamsConfig } from "../js/index.js";
 
 // sBTC protocol uses two taproot script leaves:
 // 1. Deposit leaf: allows the signers to spend with a protocol payload
@@ -43,10 +42,9 @@ type SbtcDescriptorNode = {
 
 describe("sBTC taproot descriptor", function () {
   // Use fromStringExt with { drop: true } to enable r:older() in taproot
-  const descriptor = Descriptor.fromStringExt(
+  const descriptor = Descriptor.fromString(
     getSbtcDescriptor(SIGNERS_KEY, DEPOSIT_LEAF, RECLAIM_LEAF),
     "definite",
-    { drop: true } satisfies ExtParamsConfig,
   );
 
   it("parses successfully with fromStringExt", () => {