From ea56a87b4b494d8f76723c2aa55c2219fb062c3e Mon Sep 17 00:00:00 2001 From: Steve Myers Date: Tue, 17 Aug 2021 17:52:07 +0200 Subject: [PATCH] Change dependencies bitcoincore-rpc to core-rpc, update bitcoin to ^0.27 and miniscript to ^6.0 --- Cargo.toml | 14 +++++++------- src/blockchain/rpc.rs | 12 ++++++------ src/error.rs | 4 ++-- src/lib.rs | 2 +- src/testutils/blockchain_tests.rs | 4 ++-- 5 files changed, 18 insertions(+), 18 deletions(-) diff --git a/Cargo.toml b/Cargo.toml index 84a4acdf..52af2ae6 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -14,20 +14,20 @@ license = "MIT OR Apache-2.0" [dependencies] bdk-macros = { path = "macros"} # TODO: Change this to version number after next release. log = "^0.4" -miniscript = "5.1" -bitcoin = { version = "~0.26.2", features = ["use-serde", "base64"] } +miniscript = "^6.0" +bitcoin = { version = "^0.27", features = ["use-serde", "base64"] } serde = { version = "^1.0", features = ["derive"] } serde_json = { version = "^1.0" } rand = "^0.7" # Optional dependencies sled = { version = "0.34", optional = true } -electrum-client = { version = "0.7", optional = true } +electrum-client = { version = "0.8", optional = true } reqwest = { version = "0.11", optional = true, features = ["json"] } ureq = { version = "2.1", default-features = false, features = ["json"], optional = true } futures = { version = "0.3", optional = true } async-trait = { version = "0.1", optional = true } -rocksdb = { version = "0.14", default-features = false, fetures = ["snappy"], optional = true } +rocksdb = { version = "0.14", default-features = false, features = ["snappy"], optional = true } cc = { version = ">=1.0.64", optional = true } socks = { version = "0.3", optional = true } lazy_static = { version = "1.4", optional = true } @@ -36,7 +36,7 @@ zeroize = { version = "<1.4.0", optional = true } bitcoinconsensus = { version = "0.19.0-3", optional = true } # Needed by bdk_blockchain_tests macro -bitcoincore-rpc = { version = "0.13", optional = true } +core-rpc = { version = "0.14", optional = true } [target.'cfg(target_arch = "wasm32")'.dependencies] async-trait = "0.1" @@ -52,7 +52,7 @@ compact_filters = ["rocksdb", "socks", "lazy_static", "cc"] key-value-db = ["sled"] all-keys = ["keys-bip39"] keys-bip39 = ["tiny-bip39", "zeroize"] -rpc = ["bitcoincore-rpc"] +rpc = ["core-rpc"] # We currently provide mulitple implementations of `Blockchain`, all are # blocking except for the `EsploraBlockchain` which can be either async or @@ -77,7 +77,7 @@ esplora = [] # Debug/Test features -test-blockchains = ["bitcoincore-rpc", "electrum-client"] +test-blockchains = ["core-rpc", "electrum-client"] test-electrum = ["electrum", "electrsd/electrs_0_8_10", "test-blockchains"] test-rpc = ["rpc", "electrsd/electrs_0_8_10", "test-blockchains"] test-esplora = ["esplora", "ureq", "electrsd/legacy", "electrsd/esplora_a33e97e1", "test-blockchains"] diff --git a/src/blockchain/rpc.rs b/src/blockchain/rpc.rs index fd06dcf1..050e5ca0 100644 --- a/src/blockchain/rpc.rs +++ b/src/blockchain/rpc.rs @@ -38,13 +38,13 @@ use crate::database::{BatchDatabase, DatabaseUtils}; use crate::descriptor::{get_checksum, IntoWalletDescriptor}; use crate::wallet::utils::SecpCtx; use crate::{ConfirmationTime, Error, FeeRate, KeychainKind, LocalUtxo, TransactionDetails}; -use bitcoincore_rpc::json::{ +use core_rpc::json::{ GetAddressInfoResultLabel, ImportMultiOptions, ImportMultiRequest, ImportMultiRequestScriptPubkey, ImportMultiRescanSince, }; -use bitcoincore_rpc::jsonrpc::serde_json::Value; -use bitcoincore_rpc::Auth as RpcAuth; -use bitcoincore_rpc::{Client, RpcApi}; +use core_rpc::jsonrpc::serde_json::Value; +use core_rpc::Auth as RpcAuth; +use core_rpc::{Client, RpcApi}; use log::debug; use serde::{Deserialize, Serialize}; use std::collections::{HashMap, HashSet}; @@ -82,7 +82,7 @@ pub struct RpcConfig { pub skip_blocks: Option, } -/// This struct is equivalent to [bitcoincore_rpc::Auth] but it implements [serde::Serialize] +/// This struct is equivalent to [core_rpc::Auth] but it implements [serde::Serialize] /// To be removed once upstream equivalent is implementing Serialize (json serialization format /// should be the same) https://github.com/rust-bitcoin/rust-bitcoincore-rpc/pull/181 #[derive(Clone, Debug, Hash, Eq, PartialEq, Ord, PartialOrd, Serialize, Deserialize)] @@ -357,7 +357,7 @@ impl ConfigurableBlockchain for RpcBlockchain { let wallet_url = format!("{}/wallet/{}", config.url, &wallet_name); debug!("connecting to {} auth:{:?}", wallet_url, config.auth); - let client = Client::new(wallet_url, config.auth.clone().into())?; + let client = Client::new(wallet_url.as_str(), config.auth.clone().into())?; let loaded_wallets = client.list_wallets()?; if loaded_wallets.contains(&wallet_name) { debug!("wallet already loaded {:?}", wallet_name); diff --git a/src/error.rs b/src/error.rs index 73bf7119..ebbd2745 100644 --- a/src/error.rs +++ b/src/error.rs @@ -139,7 +139,7 @@ pub enum Error { Sled(sled::Error), #[cfg(feature = "rpc")] /// Rpc client error - Rpc(bitcoincore_rpc::Error), + Rpc(core_rpc::Error), } impl fmt::Display for Error { @@ -193,7 +193,7 @@ impl_error!(electrum_client::Error, Electrum); #[cfg(feature = "key-value-db")] impl_error!(sled::Error, Sled); #[cfg(feature = "rpc")] -impl_error!(bitcoincore_rpc::Error, Rpc); +impl_error!(core_rpc::Error, Rpc); #[cfg(feature = "compact_filters")] impl From for Error { diff --git a/src/lib.rs b/src/lib.rs index 0a7d61b3..ddf58f79 100644 --- a/src/lib.rs +++ b/src/lib.rs @@ -236,7 +236,7 @@ extern crate bdk_macros; extern crate lazy_static; #[cfg(feature = "rpc")] -pub extern crate bitcoincore_rpc; +pub extern crate core_rpc; #[cfg(feature = "electrum")] pub extern crate electrum_client; diff --git a/src/testutils/blockchain_tests.rs b/src/testutils/blockchain_tests.rs index cc15533d..0d1b9167 100644 --- a/src/testutils/blockchain_tests.rs +++ b/src/testutils/blockchain_tests.rs @@ -3,9 +3,9 @@ use bitcoin::consensus::encode::{deserialize, serialize}; use bitcoin::hashes::hex::{FromHex, ToHex}; use bitcoin::hashes::sha256d; use bitcoin::{Address, Amount, Script, Transaction, Txid}; -pub use bitcoincore_rpc::bitcoincore_rpc_json::AddressType; -pub use bitcoincore_rpc::{Auth, Client as RpcClient, RpcApi}; use core::str::FromStr; +pub use core_rpc::core_rpc_json::AddressType; +pub use core_rpc::{Auth, Client as RpcClient, RpcApi}; use electrsd::bitcoind::BitcoinD; use electrsd::{bitcoind, Conf, ElectrsD}; pub use electrum_client::{Client as ElectrumClient, ElectrumApi};