update BDK to 3.0.0

Author: zoedberg

Cargo.lock

@@ -20,15 +20,15 @@ members = [".", "migration"]
 base64 = { version = "0.22.1", default-features = false, features = [
     "std",
 ] }
-bdk_wallet = { version = "=2.0.0", default-features = false, features = [
+bdk_wallet = { version = "=3.0.0", default-features = false, features = [
     "file_store",
     "keys-bip39",
     "std",
 ] }
-bdk_electrum = { version = "0.23.0", optional = true, default-features = false, features = [
+bdk_electrum = { version = "0.23.2", optional = true, default-features = false, features = [
     "use-rustls",
 ] }
-bdk_esplora = { version = "0.22.0", optional = true, default-features = false, features = [
+bdk_esplora = { version = "0.22.2", optional = true, default-features = false, features = [
     "blocking-https-rustls",
 ] }
 chacha20poly1305 = { version = "0.10.1", default-features = false, features = [

Cargo.toml

@@ -73,14 +73,13 @@ pub struct Keys {
 
 /// Generate a set of [`Keys`] for the given Bitcoin network and witness version.
 pub fn generate_keys(bitcoin_network: BitcoinNetwork, witness_version: WitnessVersion) -> Keys {
-    let bdk_network = BdkNetwork::from(bitcoin_network);
     let mnemonic = Mnemonic::generate((WordCount::Words12, Language::English))
         .expect("to be able to generate a new mnemonic");
     let xkey: ExtendedKey = mnemonic
         .clone()
         .into_extended_key()
         .expect("a valid key should have been provided");
-    let xpub = &xkey.into_xpub(bdk_network, &Secp256k1::new());
+    let xpub = &xkey.into_xpub(bitcoin_network.network_kind(), &Secp256k1::new());
     let mnemonic_str = mnemonic.to_string();
     let (account_xpub_vanilla, account_xpub_colored) =
         get_account_xpubs(&bitcoin_network, &mnemonic_str, witness_version).unwrap();
@@ -101,15 +100,14 @@ pub fn restore_keys(
     mnemonic: String,
     witness_version: WitnessVersion,
 ) -> Result<Keys, Error> {
-    let bdk_network = BdkNetwork::from(bitcoin_network);
     let (account_xpub_vanilla, account_xpub_colored) =
         get_account_xpubs(&bitcoin_network, &mnemonic, witness_version)?;
     let mnemonic_parsed = Mnemonic::parse_in(Language::English, &mnemonic)?;
     let xkey: ExtendedKey = mnemonic_parsed
         .clone()
         .into_extended_key()
         .expect("a valid key should have been provided");
-    let xpub = &xkey.into_xpub(bdk_network, &Secp256k1::new());
+    let xpub = &xkey.into_xpub(bitcoin_network.network_kind(), &Secp256k1::new());
     let master_fingerprint = xpub.fingerprint().to_string();
     Ok(Keys {
         mnemonic,

bindings/c-ffi/Cargo.lock

@@ -78,6 +78,15 @@ pub enum BitcoinNetwork {
     SignetCustom,
 }
 
+impl BitcoinNetwork {
+    pub(crate) fn network_kind(&self) -> NetworkKind {
+        match self {
+            BitcoinNetwork::Mainnet => NetworkKind::Main,
+            _ => NetworkKind::Test,
+        }
+    }
+}
+
 impl fmt::Display for BitcoinNetwork {
     fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
         write!(f, "{self:?}")
@@ -258,10 +267,10 @@ where
     deserialize_str_or_number(deserializer)
 }
 
-pub(crate) fn str_to_xpub(xpub: &str, bdk_network: &BdkNetwork) -> Result<Xpub, Error> {
+pub(crate) fn str_to_xpub(xpub: &str, network_kind: &NetworkKind) -> Result<Xpub, Error> {
     let pubkey_btc = Xpub::from_str(xpub)?;
     let extended_key_btc: ExtendedKey = ExtendedKey::from(pubkey_btc);
-    Ok(extended_key_btc.into_xpub(*bdk_network, &Secp256k1::new()))
+    Ok(extended_key_btc.into_xpub(*network_kind, &Secp256k1::new()))
 }
 
 pub(crate) fn get_coin_type(bitcoin_network: &BitcoinNetwork, rgb: bool) -> u32 {

bindings/uniffi/Cargo.lock

@@ -875,7 +875,6 @@ impl MultisigWallet {
     /// [`MultisigKeys`].
     pub fn new(wallet_data: WalletData, keys: MultisigKeys) -> Result<Self, Error> {
         let wdata = wallet_data.clone();
-        let bdk_network = BdkNetwork::from(wdata.bitcoin_network);
 
         // wallet keys
         let descs = keys.build_descriptors(wdata.bitcoin_network)?;
@@ -894,7 +893,7 @@ impl MultisigWallet {
             descs.colored,
             descs.vanilla,
             true,
-            bdk_network,
+            BdkNetwork::from(wdata.bitcoin_network),
         )?;
 
         // setup RGB

src/keys.rs

@@ -28,10 +28,10 @@ impl SinglesigKeys {
     pub(crate) fn build_descriptors(
         &self,
         bitcoin_network: &BitcoinNetwork,
-        bdk_network: &BdkNetwork,
     ) -> Result<(WalletDescriptors, bool), Error> {
-        let xpub_rgb = str_to_xpub(&self.account_xpub_colored, bdk_network)?;
-        let xpub_btc = str_to_xpub(&self.account_xpub_vanilla, bdk_network)?;
+        let network_kind = bitcoin_network.network_kind();
+        let xpub_rgb = str_to_xpub(&self.account_xpub_colored, &network_kind)?;
+        let xpub_btc = str_to_xpub(&self.account_xpub_vanilla, &network_kind)?;
         Ok(if let Some(mnemonic) = &self.mnemonic {
             let descs = get_descriptors(
                 bitcoin_network,
@@ -154,10 +154,9 @@ impl Wallet {
     /// [`SinglesigKeys`].
     pub fn new(wallet_data: WalletData, keys: SinglesigKeys) -> Result<Self, Error> {
         let wdata = wallet_data.clone();
-        let bdk_network = BdkNetwork::from(wdata.bitcoin_network);
 
         // wallet keys
-        let (descs, watch_only) = keys.build_descriptors(&wdata.bitcoin_network, &bdk_network)?;
+        let (descs, watch_only) = keys.build_descriptors(&wdata.bitcoin_network)?;
 
         // wallet directory and file logging setup
         let (wallet_dir, logger, _logger_guard) =
@@ -170,7 +169,7 @@ impl Wallet {
             descs.colored,
             descs.vanilla,
             watch_only,
-            bdk_network,
+            BdkNetwork::from(wdata.bitcoin_network),
         )?;
 
         // setup RGB
@@ -204,10 +203,7 @@ impl Wallet {
     /// Return the descriptors of the wallet.
     pub fn get_descriptors(&self) -> WalletDescriptors {
         self.keys
-            .build_descriptors(
-                &self.internals.wallet_data.bitcoin_network,
-                &BdkNetwork::from(self.internals.wallet_data.bitcoin_network),
-            )
+            .build_descriptors(&self.internals.wallet_data.bitcoin_network)
             .expect("already succeeded at wallet creation")
             .0
     }

src/utils.rs

@@ -455,10 +455,7 @@ fn get_descriptors_success() {
     // get descriptors from keys
     let keys = wallet.get_keys();
     let bitcoin_network = wallet.bitcoin_network();
-    let descriptors = keys
-        .build_descriptors(&bitcoin_network, &BdkNetwork::from(bitcoin_network))
-        .unwrap()
-        .0;
+    let descriptors = keys.build_descriptors(&bitcoin_network).unwrap().0;
 
     // get descriptors from wallet
     let wlt_descriptors = wallet.get_descriptors();