bump rust-bitcoin 0.32

[edouardparis]

No description provided.

[jp1ac4]

I was able to test this using Liana GUI with a Ledger to create a wallet (both wsh and tr), register descriptor, confirm address and spend a coin.

However, I think we need the following change since there is no longer "m/" in the string derivation path (this change still covers the case that there is "m/" present in some future version):

diff --git a/src/ledger.rs b/src/ledger.rs
index 00a6f2b..26b14be 100644
--- a/src/ledger.rs
+++ b/src/ledger.rs
@@ -106,9 +115,9 @@ impl<T: Transport + Sync + Send> HWI for Ledger<T> {
                 let fg = self.get_master_fingerprint().await?;
                 let xpub = self.get_extended_pubkey(&path).await?;
                 let policy = format!(
-                    "tr([{}{}]{}/**)",
+                    "tr([{}/{}]{}/**)",
                     fg,
-                    path.to_string().trim_start_matches('m'),
+                    path.to_string().trim_start_matches("m/"),
                     xpub
                 );
                 let (descriptor_template, keys) =

This can be confirmed by the following test, which fails without this change:

diff --git a/src/ledger.rs b/src/ledger.rs
index 00a6f2b..26b14be 100644
--- a/src/ledger.rs
+++ b/src/ledger.rs
@@ -75,6 +75,15 @@ impl<T: 'static + Transport + Sync + Send> From<Ledger<T>> for Box<dyn HWI + Sen
     }
 }
 
+fn key_string_from_parts(fg: Fingerprint, path: DerivationPath, xpub: Xpub) -> String {
+    format!(
+        "[{}/{}]{}",
+        fg,
+        path.to_string().trim_start_matches("m/"),
+        xpub
+    )
+}
+
 #[async_trait]
 impl<T: Transport + Sync + Send> HWI for Ledger<T> {
     fn device_kind(&self) -> DeviceKind {
@@ -313,3 +322,17 @@ impl<T: core::fmt::Debug> From<BitcoinClientError<T>> for HWIError {
         HWIError::Device(format!("{:#?}", e))
     }
 }
+
+mod test {
+    use std::str::FromStr;
+
+    use super::*;
+
+    #[test]
+    fn test_key_string_from_parts() {
+        let path = DerivationPath::from_str("m/48'/1'/0'/2'").unwrap();
+        let fg = Fingerprint::from_hex("aabbccdd").unwrap();
+        let xpub = Xpub::from_str("tpubDExA3EC3iAsPxPhFn4j6gMiVup6V2eH3qKyk69RcTc9TTNRfFYVPad8bJD5FCHVQxyBT4izKsvr7Btd2R4xmQ1hZkvsqGBaeE82J71uTK4N").unwrap();
+        assert_eq!(key_string_from_parts(fg, path, xpub), "[aabbccdd/48'/1'/0'/2']tpubDExA3EC3iAsPxPhFn4j6gMiVup6V2eH3qKyk69RcTc9TTNRfFYVPad8bJD5FCHVQxyBT4izKsvr7Btd2R4xmQ1hZkvsqGBaeE82J71uTK4N");
+    }
+}

[pythcoiner]

humm, i'm wondering we can maybe overlook smth here, instead blindly adding a / can we check first we do NOT have m/?

[jp1ac4]

humm, i'm wondering we can maybe overlook smth here, instead blindly adding a / can we check first we do NOT have m/?

I'm not sure we need to check that explicitly as the .trim_start_matches("m/") should handle both cases and if we add the unit test, we'll catch any changes in behaviour when composing the parts. We could add an assertion about path.to_string() to show the absence of "m/".

[jp1ac4]

ACK 1fbc5be.

[jp1ac4]

ACK f59f447.