Skip to content

Commit d7d38f2

Browse files
committed
Merge #214: deps: update bdk_wallet 2.1.0 and related deps
7625422 deps: update bdk_wallet 2.1.0 and related deps (Vihiga Tyonum) Pull request description: <!-- You can erase any parts of this template not applicable to your Pull Request. --> ### Description Update the following dependencies: - 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 <!-- Describe the purpose of this PR, what's being adding and/or fixed --> ### Notes to the reviewers Fixes #213 <!-- In this section you can include notes directed to the reviewers, like explaining why some parts of the PR were done in a specific way --> ## Changelog notice - 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` <!-- Notice the release manager should include in the release tag message changelog --> <!-- See https://keepachangelog.com/en/1.0.0/ for examples --> ### Checklists #### All Submissions: * [x] I've signed all my commits * [x] I followed the [contribution guidelines](https://github.com/bitcoindevkit/bdk-cli/blob/master/CONTRIBUTING.md) * [x] I ran `cargo fmt` and `cargo clippy` before committing #### New Features: * [ ] I've added tests for the new feature * [ ] I've added docs for the new feature * [x] I've updated `CHANGELOG.md` Top commit has no ACKs. Tree-SHA512: f85e90940b1ecb1fb81f7dadedeef8565d47712d584bf7b3db3c80278f999321f1e14ffe046a0425666400f375bb070d5ad2368848ba2ca5736635f0810562ac
2 parents a78cc3b + 7625422 commit d7d38f2

File tree

4 files changed

+21
-15
lines changed

4 files changed

+21
-15
lines changed

CHANGELOG.md

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,8 @@ page. See [DEVELOPMENT_CYCLE.md](DEVELOPMENT_CYCLE.md) for more details.
77

88
- Removed MSRV and bumped Rust Edition to 2024
99
- Add `--pretty` top level flag for formatting commands output in a tabular format
10+
- 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`
11+
1012

1113
## [1.0.0]
1214

Cargo.lock

Lines changed: 6 additions & 6 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Cargo.toml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ readme = "README.md"
1212
license = "MIT"
1313

1414
[dependencies]
15-
bdk_wallet = { version = "2.0.0", features = ["rusqlite", "keys-bip39", "compiler", "std"] }
15+
bdk_wallet = { version = "2.1.0", features = ["rusqlite", "keys-bip39", "compiler", "std"] }
1616
clap = { version = "4.5", features = ["derive","env"] }
1717
dirs = { version = "6.0.0" }
1818
env_logger = "0.11.6"
@@ -23,10 +23,10 @@ tokio = { version = "1", features = ["full"] }
2323
cli-table = "0.5.0"
2424

2525
# Optional dependencies
26-
bdk_bitcoind_rpc = { version = "0.20.0", optional = true }
26+
bdk_bitcoind_rpc = { version = "0.21.0", features = ["std"], optional = true }
2727
bdk_electrum = { version = "0.23.0", optional = true }
28-
bdk_esplora = { version = "0.22.0", features = ["async-https", "tokio"], optional = true }
29-
bdk_kyoto = { version = "0.11.0", optional = true }
28+
bdk_esplora = { version = "0.22.1", features = ["async-https", "tokio"], optional = true }
29+
bdk_kyoto = { version = "0.13.1", optional = true }
3030
bdk_redb = { version = "0.1.0", optional = true }
3131
shlex = { version = "1.3.0", optional = true }
3232
tracing = "0.1.41"

src/handlers.rs

Lines changed: 9 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -78,7 +78,7 @@ use {crate::utils::BlockchainClient::Esplora, bdk_esplora::EsploraAsyncExt};
7878
#[cfg(feature = "rpc")]
7979
use {
8080
crate::utils::BlockchainClient::RpcClient,
81-
bdk_bitcoind_rpc::{Emitter, bitcoincore_rpc::RpcApi},
81+
bdk_bitcoind_rpc::{Emitter, NO_EXPECTED_MEMPOOL_TXS, bitcoincore_rpc::RpcApi},
8282
bdk_wallet::chain::{BlockId, CanonicalizationParams, CheckPoint},
8383
};
8484

@@ -645,8 +645,12 @@ pub(crate) async fn handle_online_wallet_subcommand(
645645
height: 0,
646646
hash: genesis_block.block_hash(),
647647
});
648-
let mut emitter =
649-
Emitter::new(&*client, genesis_cp.clone(), genesis_cp.height(), [].iter());
648+
let mut emitter = Emitter::new(
649+
&*client,
650+
genesis_cp.clone(),
651+
genesis_cp.height(),
652+
NO_EXPECTED_MEMPOOL_TXS,
653+
);
650654

651655
while let Some(block_event) = emitter.next_block()? {
652656
if block_event.block_height() % 10_000 == 0 {
@@ -668,7 +672,7 @@ pub(crate) async fn handle_online_wallet_subcommand(
668672
}
669673

670674
let mempool_txs = emitter.mempool()?;
671-
wallet.apply_unconfirmed_txs(mempool_txs.new_txs.into_iter());
675+
wallet.apply_unconfirmed_txs(mempool_txs.update);
672676
}
673677
#[cfg(feature = "cbf")]
674678
KyotoClient { client } => {
@@ -748,7 +752,7 @@ pub(crate) async fn handle_online_wallet_subcommand(
748752
}
749753

750754
let mempool_txs = emitter.mempool()?;
751-
wallet.apply_unconfirmed_txs(mempool_txs.new_txs.into_iter());
755+
wallet.apply_unconfirmed_txs(mempool_txs.update);
752756
}
753757
#[cfg(feature = "cbf")]
754758
KyotoClient { client } => {

0 commit comments

Comments
 (0)