deps: bump bdk to beta-1

Author: rustaceanrob

bdk-ffi/Cargo.lock

@@ -18,14 +18,13 @@ path = "uniffi-bindgen.rs"
 default = ["uniffi/cli"]
 
 [dependencies]
-bdk_wallet = { version = "1.0.0-alpha.13", features = ["all-keys", "keys-bip39"] }
-bdk_esplora = { version = "0.15.0", default-features = false, features = ["std", "blocking", "blocking-https-rustls"] }
+bdk_wallet = { version = "1.0.0-beta.1", features = ["all-keys", "keys-bip39", "rusqlite"] }
+bdk_esplora = { version = "0.16.0", default-features = false, features = ["std", "blocking", "blocking-https-rustls"] }
 # NOTE: This is a temporary workaround to use the electrum-client with the use-rustls-ring feature. It points to a fork
 #       of bdk in which the bdk_electrum library uses the electrum-client with the use-rustls-ring feature.
-bdk_electrum = { git = "https://github.com/thunderbiscuit/bdk/", package = "bdk_electrum", branch = "feature/electrum-client-ring-ffi-alpha13", default-features = false, features = ["use-rustls-ring"] }
+bdk_electrum = { git = "https://github.com/thunderbiscuit/bdk/", package = "bdk_electrum", branch = "feature/electrum-client-ring", default-features = false, features = ["use-rustls-ring"] }
 # bdk_electrum = { version = "0.15.0" }
-bdk_sqlite = { version = "0.2.0" }
-bdk_bitcoind_rpc = { version = "0.12.0" }
+bdk_bitcoind_rpc = { version = "0.13.0" }
 bitcoin-internals = { version = "0.2.0", features = ["alloc"] }
 
 uniffi = { version = "=0.28.0" }

bdk-ffi/Cargo.toml

@@ -360,10 +360,10 @@ enum ChangeSpendPolicy {
 
 interface Wallet {
   [Throws=WalletCreationError]
-  constructor(Descriptor descriptor, Descriptor change_descriptor, Network network);
+  constructor(Descriptor descriptor, Descriptor change_descriptor, Network network, Connection connection);
 
-  [Name=new_or_load, Throws=WalletCreationError]
-  constructor(Descriptor descriptor, Descriptor change_descriptor, ChangeSet? change_set, Network network);
+  [Name=load, Throws=WalletCreationError]
+  constructor(Descriptor descriptor, Descriptor change_descriptor, Network network, Connection connection);
 
   AddressInfo reveal_next_address(KeychainKind keychain);
 
@@ -400,7 +400,8 @@ interface Wallet {
 
   SyncRequest start_sync_with_revealed_spks();
 
-  ChangeSet? take_staged();
+  [Throws=PersistenceError]
+  void persist(Connection connection);
 };
 
 interface Update {};
@@ -457,15 +458,9 @@ interface BumpFeeTxBuilder {
 // bdk_sqlite crate
 // ------------------------------------------------------------------------
 
-interface SqliteStore {
+interface Connection {
   [Throws=SqliteError]
   constructor(string path);
-
-  [Throws=SqliteError]
-  void write([ByRef] ChangeSet change_set);
-
-  [Throws=SqliteError]
-  ChangeSet? read();
 };
 
 // ------------------------------------------------------------------------

bdk-ffi/src/bdk.udl

@@ -3,14 +3,14 @@ use crate::error::ElectrumError;
 use crate::types::{FullScanRequest, SyncRequest};
 use crate::wallet::Update;
 
+use bdk_electrum::bdk_chain::spk_client::{FullScanResult, SyncResult};
 use bdk_electrum::BdkElectrumClient as BdkBdkElectrumClient;
-use bdk_electrum::{ElectrumFullScanResult, ElectrumSyncResult};
 use bdk_wallet::bitcoin::Transaction as BdkTransaction;
 use bdk_wallet::chain::spk_client::FullScanRequest as BdkFullScanRequest;
 use bdk_wallet::chain::spk_client::FullScanResult as BdkFullScanResult;
 use bdk_wallet::chain::spk_client::SyncRequest as BdkSyncRequest;
 use bdk_wallet::chain::spk_client::SyncResult as BdkSyncResult;
-use bdk_wallet::wallet::Update as BdkUpdate;
+use bdk_wallet::Update as BdkUpdate;
 use bdk_wallet::KeychainKind;
 
 use std::collections::BTreeMap;
@@ -44,7 +44,7 @@ impl ElectrumClient {
             .take()
             .ok_or(ElectrumError::RequestAlreadyConsumed)?;
 
-        let electrum_result: ElectrumFullScanResult<KeychainKind> = self.0.full_scan(
+        let electrum_result: FullScanResult<KeychainKind> = self.0.full_scan(
             request,
             stop_gap as usize,
             batch_size as usize,
@@ -76,7 +76,7 @@ impl ElectrumClient {
             .take()
             .ok_or(ElectrumError::RequestAlreadyConsumed)?;
 
-        let electrum_result: ElectrumSyncResult =
+        let electrum_result: SyncResult =
             self.0
                 .sync(request, batch_size as usize, fetch_prev_txouts)?;
         let sync_result: BdkSyncResult =