Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

updating bdk and bdk-reserves to v0.18 #89

Merged
merged 1 commit into from
May 11, 2022
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: 1 addition & 1 deletion CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
8 changes: 4 additions & 4 deletions Cargo.lock

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

4 changes: 2 additions & 2 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 = { 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" }
Expand All @@ -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]
Expand Down
3 changes: 1 addition & 2 deletions build.rs
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
2 changes: 1 addition & 1 deletion src/bdk_cli.rs
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down