client_rs: bump bitcoin 0.32 and miniscript 12.2

LedgerHQ · Aug 22, 2024 · 083e37d · 083e37d
1 parent 0d4106d
commit 083e37d
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 5 deletions.
diff --git a/bitcoin_client_rs/Cargo.toml b/bitcoin_client_rs/Cargo.toml
@@ -21,8 +21,8 @@ paranoid_client = ["miniscript"]
 
 [dependencies]
 async-trait = { version = "0.1", optional = true }
-bitcoin = { version = "0.31", default-features = false, features = ["no-std"] }
-miniscript = { version = "11.0", optional = true, default-features = false, features = ["no-std"] }
+bitcoin = { version = "0.32", default-features = false }
+miniscript = { version = "12.2", optional = true, default-features = false, features = ["no-std"] }
 
 [workspace]
 members = ["examples/ledger_hwi"]

diff --git a/bitcoin_client_rs/src/async_client.rs b/bitcoin_client_rs/src/async_client.rs
@@ -91,7 +91,7 @@ impl<T: Transport> BitcoinClient<T> {
                 BitcoinClientError::ClientError("Failed to derive descriptor".to_string())
             })?
             .script_pubkey()
-            != expected_address.payload().script_pubkey()
+            != expected_address.assume_checked_ref().script_pubkey()
         {
             return Err(BitcoinClientError::InvalidResponse("Invalid address. Please update your Bitcoin app. If the problem persists, report a bug at https://github.com/LedgerHQ/app-bitcoin-new".to_string()));
         }

diff --git a/bitcoin_client_rs/src/client.rs b/bitcoin_client_rs/src/client.rs
@@ -86,7 +86,7 @@ impl<T: Transport> BitcoinClient<T> {
                 BitcoinClientError::ClientError("Failed to derive descriptor".to_string())
             })?
             .script_pubkey()
-            != expected_address.payload().script_pubkey()
+            != expected_address.assume_checked_ref().script_pubkey()
         {
             return Err(BitcoinClientError::InvalidResponse("Invalid address. Please update your Bitcoin app. If the problem persists, report a bug at https://github.com/LedgerHQ/app-bitcoin-new".to_string()));
         }

diff --git a/bitcoin_client_rs/src/psbt.rs b/bitcoin_client_rs/src/psbt.rs
@@ -8,7 +8,7 @@ use bitcoin::{
     consensus::encode::{deserialize, serialize, VarInt},
     ecdsa,
     hashes::Hash,
-    key::Error as KeyError,
+    key::FromSliceError as KeyError,
     psbt::{raw, Input, Output, Psbt},
     secp256k1::{self, XOnlyPublicKey},
     taproot,