Release v0.2.3 [Live]

package.json

@@ -1,7 +1,7 @@
 {
   "name": "keeper-desktop",
   "private": true,
-  "version": "0.2.2",
+  "version": "0.2.3",
   "type": "module",
   "scripts": {
     "dev": "vite",

src-tauri/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "keeper-desktop"
-version = "0.2.2"
+version = "0.2.3"
 description = "Bitcoin Keeper Desktop App"
 authors = ["Ben Kaufman"]
 repository = "https://github.com/bithyve/keeper-desktop"
@@ -23,8 +23,8 @@ hex = "0.4.3"
 log = "0.4"
 thiserror = "1.0"
 env_logger = "0.10"
-bitcoin = { version = "0.31", features = ["serde", "base64"] }
-async-hwi = "0.0.25"
+bitcoin = { version = "0.32", features = ["serde", "base64"] }
+async-hwi = "0.0.27"
 x25519-dalek = "2.0.1"
 
 [features]

src-tauri/src/device.rs

@@ -30,11 +30,11 @@ pub fn get_xpubs(
     }
 
     Ok(json!({
-        "singleSigPath": ss_path.to_string(),
+        "singleSigPath": format!("m/{}", ss_path.to_string()),
         "singleSigXpub": single_sig_xpub.to_string(),
-        "multiSigPath": ms_path.to_string(),
+        "multiSigPath": format!("m/{}", ms_path.to_string()),
         "multiSigXpub": multi_sig_xpub.to_string(),
-        "taprootPath": tr_path.to_string(),
+        "taprootPath": format!("m/{}", tr_path.to_string()),
         "taprootXpub": taproot_xpub.to_string(),
         "mfp": hwi_state.fingerprint.as_ref().unwrap().to_string().to_uppercase(),
     }))

src-tauri/src/hwi/interface.rs

@@ -145,7 +145,8 @@ impl<T: HWIImplementation> HWIClient<T> {
         path: &DerivationPath,
         expert: bool,
     ) -> Result<HWIExtendedPubKey, Error> {
-        let output = self.implementation.get_xpub(&path.to_string(), expert)?;
+        let prefixed_path = format!("m/{}", path);
+        let output = self.implementation.get_xpub(&prefixed_path, expert)?;
         deserialize_obj!(&output)
     }
 
@@ -155,9 +156,8 @@ impl<T: HWIImplementation> HWIClient<T> {
         message: &str,
         path: &DerivationPath,
     ) -> Result<HWISignature, Error> {
-        let output = self
-            .implementation
-            .sign_message(message, &path.to_string())?;
+        let prefixed_path = format!("m/{}", path);
+        let output = self.implementation.sign_message(message, &prefixed_path)?;
         deserialize_obj!(&output)
     }
 
@@ -183,7 +183,7 @@ impl<T: HWIImplementation> HWIClient<T> {
         start: u32,
         end: u32,
     ) -> Result<Vec<HWIKeyPoolElement>, Error> {
-        let path_str = path.map(|p| p.to_string());
+        let path_str = path.map(|p| format!("m/{}/*", p));
         let output = self.implementation.get_keypool(
             keypool,
             internal,
@@ -222,9 +222,10 @@ impl<T: HWIImplementation> HWIClient<T> {
         path: &DerivationPath,
         address_type: HWIAddressType,
     ) -> Result<HWIAddress, Error> {
+        let prefixed_path = format!("m/{}", path);
         let output = self
             .implementation
-            .display_address_with_path(&path.to_string(), address_type)?;
+            .display_address_with_path(&prefixed_path, address_type)?;
         deserialize_obj!(&output)
     }
 

src-tauri/src/main.rs

@@ -241,6 +241,8 @@ async fn hwi_sign_tx(
         )
         .await?;
 
+        let mut psbt_obj = bitcoin::Psbt::from_str(&psbt).map_err(|e| e.to_string())?;
+
         if hwi_state.device_type != HWIDeviceType::Coldcard {
             let is_registered = device
                 .is_wallet_registered(&wallet_name.clone().unwrap_or_default(), &policy)
@@ -274,10 +276,11 @@ async fn hwi_sign_tx(
                     .await?;
                 }
             }
+        } else {
+            // Coldcard change verification gives an error when xpubs are included for Miniscript scheme
+            psbt_obj.xpub.clear();
         }
 
-        let mut psbt_obj = bitcoin::Psbt::from_str(&psbt).map_err(|e| e.to_string())?;
-
         device
             .sign_tx(&mut psbt_obj)
             .await

src-tauri/tauri.conf.json

@@ -7,7 +7,7 @@
   },
   "package": {
     "productName": "Keeper Desktop (Dev)",
-    "version": "0.2.2"
+    "version": "0.2.3"
   },
   "tauri": {
     "allowlist": {

src-tauri/tauri.release.conf.json

@@ -8,7 +8,7 @@
   },
   "package": {
     "productName": "Keeper Desktop",
-    "version": "0.2.2"
+    "version": "0.2.3"
   },
   "tauri": {
     "allowlist": {