SFT-3392: Update bitcoin to 0.31.

* Cargo.toml (workspace.dependencies) <bitcoin>: Update to 0.31. * test-vectors/src/lib.rs: Adapt to bitcoin 0.31. * urtypes/src/registry/crypto_address.rs: Ditto. * urtypes/src/registry/crypto_hdkey.rs: Ditto. Signed-off-by: Jean-Pierre De Jesus DIAZ <[email protected]>
Foundation-Devices · Feb 19, 2024 · 31aae33 · 31aae33
1 parent 71f4b9e
commit 31aae33
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 13 deletions.
diff --git a/Cargo.toml b/Cargo.toml
@@ -20,7 +20,7 @@ homepage = "https://github.com/Foundation-Devices/foundation-rs"
 arbitrary = { version = "1", features = ["derive"] }
 bech32 = { version = "0.9", default-features = false }
 bip39 = { version = "2", default-features = false }
-bitcoin = { version = "0.30", default-features = false }
+bitcoin = { version = "0.31", default-features = false }
 bitcoin_hashes = { version = "0.13", default-features = false }
 bs58 = "0.5"
 crc = "3"

diff --git a/test-vectors/src/lib.rs b/test-vectors/src/lib.rs
@@ -105,11 +105,11 @@ mod blockchain_commons {
     #[serde(rename_all = "kebab-case")]
     pub enum CryptoHDKeyVector {
         Xpub {
-            key: bitcoin::bip32::ExtendedPubKey,
+            key: bitcoin::bip32::Xpub,
             origin: Option<bitcoin::bip32::DerivationPath>,
         },
         Xprv {
-            key: bitcoin::bip32::ExtendedPrivKey,
+            key: bitcoin::bip32::Xpriv,
         },
     }
 

diff --git a/urtypes/src/registry/crypto_address.rs b/urtypes/src/registry/crypto_address.rs
@@ -47,8 +47,8 @@ impl<'a> TryFrom<&'a bitcoin::Address<bitcoin::address::NetworkUnchecked>> for C
     fn try_from(
         address: &'a bitcoin::Address<bitcoin::address::NetworkUnchecked>,
     ) -> Result<Self, Self::Error> {
-        let kind = AddressKind::try_from(&address.payload).ok();
-        let data = data_from_payload(&address.payload)?;
+        let kind = AddressKind::try_from(address.payload()).ok();
+        let data = data_from_payload(address.payload())?;
 
         Ok(Self {
             info: None,
@@ -66,14 +66,14 @@ impl<'a> TryFrom<&'a bitcoin::Address<bitcoin::address::NetworkChecked>> for Cry
         use crate::registry::CoinType;
         use bitcoin::Network;
 
-        let network = match address.network {
+        let network = match address.network() {
             Network::Bitcoin => CryptoCoinInfo::NETWORK_MAINNET,
             Network::Testnet => CryptoCoinInfo::NETWORK_BTC_TESTNET,
             _ => return Err(InterpretAddressError::UnsupportedNetwork),
         };
         let info = CryptoCoinInfo::new(CoinType::BTC, network);
-        let kind = AddressKind::try_from(&address.payload).ok();
-        let data = data_from_payload(&address.payload)?;
+        let kind = AddressKind::try_from(address.payload()).ok();
+        let data = data_from_payload(address.payload())?;
 
         Ok(Self {
             info: Some(info),
@@ -212,7 +212,7 @@ impl TryFrom<&bitcoin::address::Payload> for AddressKind {
     type Error = UnknownAddressType;
 
     fn try_from(value: &bitcoin::address::Payload) -> Result<Self, Self::Error> {
-        use bitcoin::address::{Payload, WitnessVersion};
+        use bitcoin::{address::Payload, blockdata::script::witness_version::WitnessVersion};
 
         let kind = match value {
             Payload::PubkeyHash(_) => AddressKind::P2PKH,

diff --git a/urtypes/src/registry/crypto_hdkey.rs b/urtypes/src/registry/crypto_hdkey.rs
@@ -26,10 +26,10 @@ impl<'a> CryptoHDKey<'a> {
 }
 
 #[cfg(feature = "bitcoin")]
-impl<'a> TryFrom<&'a bitcoin::bip32::ExtendedPrivKey> for CryptoHDKey<'a> {
+impl<'a> TryFrom<&'a bitcoin::bip32::Xpriv> for CryptoHDKey<'a> {
     type Error = InterpretExtendedKeyError;
 
-    fn try_from(xprv: &'a bitcoin::bip32::ExtendedPrivKey) -> Result<Self, Self::Error> {
+    fn try_from(xprv: &'a bitcoin::bip32::Xpriv) -> Result<Self, Self::Error> {
         use crate::registry::CoinType;
 
         if xprv.depth == 0 {
@@ -67,10 +67,10 @@ impl<'a> TryFrom<&'a bitcoin::bip32::ExtendedPrivKey> for CryptoHDKey<'a> {
 }
 
 #[cfg(feature = "bitcoin")]
-impl<'a> TryFrom<&'a bitcoin::bip32::ExtendedPubKey> for CryptoHDKey<'a> {
+impl<'a> TryFrom<&'a bitcoin::bip32::Xpub> for CryptoHDKey<'a> {
     type Error = InterpretExtendedKeyError;
 
-    fn try_from(xpub: &'a bitcoin::bip32::ExtendedPubKey) -> Result<Self, Self::Error> {
+    fn try_from(xpub: &'a bitcoin::bip32::Xpub) -> Result<Self, Self::Error> {
         use crate::registry::CoinType;
 
         Ok(Self::DerivedKey(DerivedKey {