Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -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]

Expand Down
12 changes: 6 additions & 6 deletions Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

8 changes: 4 additions & 4 deletions Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand All @@ -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"
Expand Down
14 changes: 9 additions & 5 deletions src/handlers.rs
Original file line number Diff line number Diff line change
Expand Up @@ -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},
};

Expand Down Expand Up @@ -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 {
Expand All @@ -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 } => {
Expand Down Expand Up @@ -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 } => {
Expand Down
Loading