updating bdk and bdk-reserves to v0.18

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 30c5d6a4dc67f6e7826e7af28210a8713082c341..20e81fb55c26cd026468ad78fbea6fce15f1863e 100644 (file)
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -7,7 +7,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 ## [Unreleased]
 
 - Re-license to dual MIT and Apache 2.0 and update project name to "Bitcoin Dev Kit"
-- Update to bdk and bdk-reserves to `0.17.0`
+- Update to bdk and bdk-reserves to `0.18.0`
 - Add 'verify' feature flag which enables transaction verification against consensus rules during sync.
 - Make `regtest` the default network.
 - Add experimental `regtest-*` features to automatically deploy local regtest nodes

diff --git a/Cargo.lock b/Cargo.lock
index 6616d691fcd43a9c7603a1b0621e8ec2c28ba0e7..b0c245ae0eed837649036c04ca9db6d588792fc0 100644 (file)
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -92,9 +92,9 @@ dependencies = [
 
 [[package]]
 name = "bdk"
-version = "0.17.0"
+version = "0.18.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "00fa2bcfe9debe57f32285ef56cb218b2e0dbf91e476ad22f61a745d4c032a18"
+checksum = "bdfb4ab7649b7ee7e170ea6dc3b7a3fc5d97671600fe40f6ffde3abe52ef4ae5"
 dependencies = [
  "async-trait",
  "bdk-macros",
@@ -154,9 +154,9 @@ dependencies = [
 
 [[package]]
 name = "bdk-reserves"
-version = "0.17.0"
+version = "0.18.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "caf154487aa14256d6f3769baf6c80b56c945a0a1c825a7f3132878acbc8ede0"
+checksum = "a2ba3fcfd24950d05b99b88ab920214534e64f46a9a273c1bf90d56a64012b9f"
 dependencies = [
  "base64 0.11.0",
  "bdk",

diff --git a/Cargo.toml b/Cargo.toml
index af87bad765c6a7ebd367c53c16e244fff111e0c9..26a04b68ba96f8860e5a076a4eefbf7af4b6a786 100644 (file)
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -12,7 +12,7 @@ readme = "README.md"
 license = "MIT"
 
 [dependencies]
-bdk = { version = "0.17", default-features = false, features = ["all-keys"]}
+bdk = { version = "0.18", default-features = false, features = ["all-keys"]}
 bdk-macros = "0.6"
 structopt = "^0.3"
 serde_json = { version = "^1.0" }
@@ -27,7 +27,7 @@ dirs-next = { version = "2.0", optional = true }
 env_logger = { version = "0.7", optional = true }
 clap = { version = "2.33", optional = true }
 regex = { version = "1", optional = true }
-bdk-reserves = { version = "0.17", optional = true}
+bdk-reserves = { version = "0.18", optional = true}
 electrsd = { version= "0.12", features = ["trigger", "bitcoind_22_0"], optional = true}
 
 [features]

diff --git a/build.rs b/build.rs
index 92e49460d05335a8b974293b82fc92c12042aa47..93f94f7ef11bb8de65b5c73e29bffec69229ed2e 100644 (file)
--- a/build.rs
+++ b/build.rs
@@ -9,8 +9,7 @@ fn main() {
 
     let blockchain_features: Vec<String> = vec![electrum, esplora, compact_filters, rpc]
         .iter()
-        .map(|f| f.to_owned())
-        .flatten()
+        .filter_map(|f| f.to_owned())
         .collect();
 
     if blockchain_features.len() > 1 {

diff --git a/src/bdk_cli.rs b/src/bdk_cli.rs
index 24ee81bc787490947ad9d340ba351ac74f0ad8e8..f49dd971a50828fbdbd6b75cb5e9fdc572c0a29e 100644 (file)
--- a/src/bdk_cli.rs
+++ b/src/bdk_cli.rs
@@ -434,7 +434,7 @@ fn handle_command(cli_opts: CliOpts, network: Network, _backend: Backend) -> Res
                             .collect::<Result<Vec<_>, Error>>()?;
                         let repl_subcommand = ReplSubCommand::from_iter_safe(split_line);
                         if let Err(err) = repl_subcommand {
-                            println!("{}", err.to_string());
+                            println!("{}", err);
                             continue;
                         }
                         // if error will be printed above