From: Vihiga Tyonum <withtvpeter@gmail.com>
Date: Mon, 25 Aug 2025 16:51:29 +0000 (+0100)
Subject: deps: update bdk_wallet 2.1.0 and related deps
X-Git-Tag: v2.0.0~3^2
X-Git-Url: http://internal-gitweb-vhost/spk_client/struct.FullScanRequest.html?a=commitdiff_plain;h=7625422df01410ec2a6336210e8a8ca439014991;p=bdk-cli

deps: update bdk_wallet 2.1.0 and related deps

- bdk_wallet to 2.1.0
- bdk_bitcoind_rpc to 0.21.0
- bdk_esplora to 0.22.1
- bdk_kyoto to 0.13.1
- update CHANGELOG
---

diff --git a/CHANGELOG.md b/CHANGELOG.md
index cbc6be0..2d1e9b9 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -7,6 +7,8 @@ page. See [DEVELOPMENT_CYCLE.md](DEVELOPMENT_CYCLE.md) for more details.
 
 - Removed MSRV and bumped Rust Edition to 2024
 - Add `--pretty` top level flag for formatting commands output in a tabular format
+- Updated `bdk_wallet ` to  `2.1.0`,  `bdk_bitcoind_rpc` to `0.21.0`, `bdk_esplora` to `0.22.1`, `bdk_kyoto` to `0.13.1` 
+
 
 ## [1.0.0]
 
diff --git a/Cargo.lock b/Cargo.lock
index 4923a7b..ac653e7 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -202,9 +202,9 @@ dependencies = [
 
 [[package]]
 name = "bdk_bitcoind_rpc"
-version = "0.20.0"
+version = "0.21.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "21c422408ac8720da9d9a3048a32f4a3fdd18e6c82b0fa3b620d92b1ef73df52"
+checksum = "0a52a57cc5e07e207711a5064def0bd04b18e183b9f2247f41561cb12dd393be"
 dependencies = [
  "bdk_core",
  "bitcoin",
@@ -259,9 +259,9 @@ dependencies = [
 
 [[package]]
 name = "bdk_kyoto"
-version = "0.11.0"
+version = "0.13.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9bdb5c2af2da8d0ddef7293835b31191a4ed77ca8fe89d66c442300c8c2c8551"
+checksum = "1bb33172976f7fa26115ad6842f7903a2af325544eac6ddf5a17099e3cd9df3c"
 dependencies = [
  "bdk_wallet",
  "kyoto-cbf",
@@ -1357,9 +1357,9 @@ dependencies = [
 
 [[package]]
 name = "kyoto-cbf"
-version = "0.12.1"
+version = "0.13.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "360f3785e4f7514ed97e0acb94d0c5acb4281441ec1b6c01f2f941c618fe1049"
+checksum = "805f16bcf1d4738529f230404e7d0ab6e9ecf9e265920c212d446a291a93297e"
 dependencies = [
  "bip324",
  "bitcoin",
diff --git a/Cargo.toml b/Cargo.toml
index 9234b1f..3a02c13 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -12,7 +12,7 @@ readme = "README.md"
 license = "MIT"
 
 [dependencies]
-bdk_wallet = { version = "2.0.0", features = ["rusqlite", "keys-bip39", "compiler", "std"] }
+bdk_wallet = { version = "2.1.0", features = ["rusqlite", "keys-bip39", "compiler", "std"] }
 clap = { version = "4.5", features = ["derive","env"] }
 dirs = {  version = "6.0.0" }
 env_logger = "0.11.6"
@@ -23,10 +23,10 @@ tokio = { version = "1", features = ["full"] }
 cli-table = "0.5.0"
 
 # Optional dependencies
-bdk_bitcoind_rpc = { version = "0.20.0", optional = true }
+bdk_bitcoind_rpc = { version = "0.21.0", features = ["std"], optional = true }
 bdk_electrum = { version = "0.23.0", optional = true }
-bdk_esplora = { version = "0.22.0", features = ["async-https", "tokio"], optional = true }
-bdk_kyoto = { version = "0.11.0", optional = true }
+bdk_esplora = { version = "0.22.1", features = ["async-https", "tokio"], optional = true }
+bdk_kyoto = { version = "0.13.1", optional = true }
 bdk_redb = { version = "0.1.0", optional = true }
 shlex = {  version = "1.3.0", optional = true }
 tracing = "0.1.41"
diff --git a/src/handlers.rs b/src/handlers.rs
index a023d3f..9a86b77 100644
--- a/src/handlers.rs
+++ b/src/handlers.rs
@@ -78,7 +78,7 @@ use {crate::utils::BlockchainClient::Esplora, bdk_esplora::EsploraAsyncExt};
 #[cfg(feature = "rpc")]
 use {
     crate::utils::BlockchainClient::RpcClient,
-    bdk_bitcoind_rpc::{Emitter, bitcoincore_rpc::RpcApi},
+    bdk_bitcoind_rpc::{Emitter, NO_EXPECTED_MEMPOOL_TXS, bitcoincore_rpc::RpcApi},
     bdk_wallet::chain::{BlockId, CanonicalizationParams, CheckPoint},
 };
 
@@ -645,8 +645,12 @@ pub(crate) async fn handle_online_wallet_subcommand(
                         height: 0,
                         hash: genesis_block.block_hash(),
                     });
-                    let mut emitter =
-                        Emitter::new(&*client, genesis_cp.clone(), genesis_cp.height(), [].iter());
+                    let mut emitter = Emitter::new(
+                        &*client,
+                        genesis_cp.clone(),
+                        genesis_cp.height(),
+                        NO_EXPECTED_MEMPOOL_TXS,
+                    );
 
                     while let Some(block_event) = emitter.next_block()? {
                         if block_event.block_height() % 10_000 == 0 {
@@ -668,7 +672,7 @@ pub(crate) async fn handle_online_wallet_subcommand(
                     }
 
                     let mempool_txs = emitter.mempool()?;
-                    wallet.apply_unconfirmed_txs(mempool_txs.new_txs.into_iter());
+                    wallet.apply_unconfirmed_txs(mempool_txs.update);
                 }
                 #[cfg(feature = "cbf")]
                 KyotoClient { client } => {
@@ -748,7 +752,7 @@ pub(crate) async fn handle_online_wallet_subcommand(
                     }
 
                     let mempool_txs = emitter.mempool()?;
-                    wallet.apply_unconfirmed_txs(mempool_txs.new_txs.into_iter());
+                    wallet.apply_unconfirmed_txs(mempool_txs.update);
                 }
                 #[cfg(feature = "cbf")]
                 KyotoClient { client } => {