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

Update bitcoind to v0.23.0 #613

Closed
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
6 changes: 3 additions & 3 deletions Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -88,16 +88,16 @@ reqwest-default-tls = ["reqwest/default-tls"]

# Debug/Test features
test-blockchains = ["bitcoincore-rpc", "electrum-client"]
test-electrum = ["electrum", "electrsd/electrs_0_8_10", "test-blockchains"]
test-rpc = ["rpc", "electrsd/electrs_0_8_10", "test-blockchains"]
test-electrum = ["electrum", "electrsd/electrs_0_9_1", "test-blockchains"]
test-rpc = ["rpc", "electrsd/electrs_0_9_1", "test-blockchains"]
test-esplora = ["electrsd/legacy", "electrsd/esplora_a33e97e1", "test-blockchains"]
test-md-docs = ["electrum"]

[dev-dependencies]
lazy_static = "1.4"
env_logger = "0.7"
clap = "2.33"
electrsd = { version= "0.19.1", features = ["bitcoind_22_0"] }
electrsd = { version= "0.19.1", features = ["bitcoind_23_0"] }

[[example]]
name = "address_validator"
Expand Down
17 changes: 16 additions & 1 deletion src/blockchain/rpc.rs
Original file line number Diff line number Diff line change
Expand Up @@ -378,7 +378,22 @@ impl ConfigurableBlockchain for RpcBlockchain {
client.load_wallet(&wallet_name)?;
debug!("wallet loaded {:?}", wallet_name);
} else {
client.create_wallet(&wallet_name, Some(true), None, None, None)?;
// this call doesn't work with core v0.23.0
//client.create_wallet(&wallet_name, Some(true), None, None, None)?;
{
// TODO: move back to api call when https://github.com/rust-bitcoin/rust-bitcoincore-rpc/issues/225 is fixed
let args = [
Value::String(wallet_name.clone()),
Value::Bool(true),
Value::Bool(false),
Value::Null,
Value::Bool(false),
Value::Bool(false),
Value::Bool(false),
Value::Bool(false),
];
let _: Value = client.call("createwallet", &args)?;
}
debug!("wallet created {:?}", wallet_name);
}
}
Expand Down
1 change: 1 addition & 0 deletions src/testutils/blockchain_tests.rs
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,7 @@ impl TestClient {

let mut conf = bitcoind::Conf::default();
conf.view_stdout = log_enabled!(Level::Debug);
conf.p2p = bitcoind::P2P::Yes;
let bitcoind = BitcoinD::with_conf(bitcoind_exe, &conf).unwrap();

let mut conf = electrsd::Conf::default();
Expand Down