diff --git a/Cargo.toml b/Cargo.toml index 942b65c..4acfc6c 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "hwi" -version = "0.8.0" +version = "0.9.0" authors = ["Daniela Brozzoni "] edition = "2018" license = "MIT" @@ -11,12 +11,12 @@ readme = "README.md" # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html [dependencies] -bitcoin = { version = "0.31.0", features = ["serde", "base64"] } +bitcoin = { version = "0.32", features = ["serde", "base64"] } serde = { version = "^1.0", features = ["derive"] } serde_json = { version = "^1.0" } pyo3 = { version = "0.21.2", features = ["auto-initialize"] } -miniscript = { version = "11.0", features = ["serde"], optional = true } +miniscript = { version = "12.0", features = ["serde"], optional = true } [dev-dependencies] serial_test = "0.6.0" diff --git a/src/interface.rs b/src/interface.rs index c816bfb..e324bbe 100644 --- a/src/interface.rs +++ b/src/interface.rs @@ -224,8 +224,9 @@ impl HWIClient { path: &DerivationPath, expert: bool, ) -> Result { + let prefixed_path = format!("m/{}", path); Python::with_gil(|py| { - let func_args = (&self.hw_client, path.to_string(), expert); + let func_args = (&self.hw_client, prefixed_path, expert); let output = self .hwilib .commands @@ -242,8 +243,9 @@ impl HWIClient { message: &str, path: &DerivationPath, ) -> Result { + let prefixed_path = format!("m/{}", path); Python::with_gil(|py| { - let func_args = (&self.hw_client, message, path.to_string()); + let func_args = (&self.hw_client, message, prefixed_path); let output = self .hwilib .commands @@ -279,7 +281,7 @@ impl HWIClient { Python::with_gil(|py| { let mut p_str = py.None(); if let Some(p) = path { - p_str = format!("{}/*", p).into_py(py); + p_str = format!("m/{}/*", p).into_py(py); } let func_args = ( &self.hw_client, @@ -345,8 +347,9 @@ impl HWIClient { address_type: HWIAddressType, ) -> Result { Python::with_gil(|py| { + let prefixed_path = format!("m/{}", path); let descriptor = py.None(); - let func_args = (&self.hw_client, path.to_string(), descriptor, address_type); + let func_args = (&self.hw_client, prefixed_path, descriptor, address_type); let output = self .hwilib .commands diff --git a/src/lib.rs b/src/lib.rs index 69c00cc..d549e92 100644 --- a/src/lib.rs +++ b/src/lib.rs @@ -225,7 +225,7 @@ mod tests { let previous_txin = TxIn { previous_output: bitcoin::OutPoint { - txid: previous_tx.txid(), + txid: previous_tx.compute_txid(), vout: Default::default(), }, ..Default::default()