diff --git a/Cargo.lock b/Cargo.lock index b945738c..43810183 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1164,9 +1164,9 @@ dependencies = [ [[package]] name = "rustls" -version = "0.23.40" +version = "0.23.41" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ef86cd5876211988985292b91c96a8f2d298df24e75989a43a3c73f2d4d8168b" +checksum = "6b92b125634d9b795e7beca796cc790df15a7fb38323bf3196fda83292d06b1f" dependencies = [ "aws-lc-rs", "log", @@ -1448,8 +1448,8 @@ version = "0.0.6" dependencies = [ "bip39", "bitcoin_hashes", + "bitcoincore-rpc", "dyn-clone", - "electrsd", "elements-miniscript", "hex", "minreq 3.0.0", diff --git a/Cargo.toml b/Cargo.toml index 3d056428..b5c894ac 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -24,6 +24,7 @@ toml = { version = "0.9.8" } minreq = { version = "3.0.0", features = ["https", "json-using-serde"] } electrsd = { version = "0.29.0", features = ["legacy"] } +bitcoincore-rpc = { version = "0.19.0" } # TODO: Replace git dependency with crates.io version 0.6.0-rc.1 or higher once available simplicityhl = { git = "https://github.com/BlockstreamResearch/SimplicityHL.git" } diff --git a/crates/sdk/Cargo.toml b/crates/sdk/Cargo.toml index 34ce5397..edbfd387 100644 --- a/crates/sdk/Cargo.toml +++ b/crates/sdk/Cargo.toml @@ -15,7 +15,7 @@ thiserror = { workspace = true } sha2 = { workspace = true } minreq = { workspace = true } simplicityhl = { workspace = true } -electrsd = { workspace = true } +bitcoincore-rpc = { workspace = true } serde = { workspace = true } hex = { workspace = true } diff --git a/crates/sdk/src/provider/core.rs b/crates/sdk/src/provider/core.rs index 8a1f8165..dccc0cf7 100644 --- a/crates/sdk/src/provider/core.rs +++ b/crates/sdk/src/provider/core.rs @@ -1,6 +1,6 @@ use std::collections::HashMap; -use electrsd::bitcoind::bitcoincore_rpc::Auth; +use bitcoincore_rpc::Auth; use simplicityhl::elements::{Address, Script, Transaction, Txid}; diff --git a/crates/sdk/src/provider/rpc/elements.rs b/crates/sdk/src/provider/rpc/elements.rs index 5371dc67..82a2632b 100644 --- a/crates/sdk/src/provider/rpc/elements.rs +++ b/crates/sdk/src/provider/rpc/elements.rs @@ -1,6 +1,6 @@ use std::str::FromStr; -use electrsd::bitcoind::bitcoincore_rpc::{Auth, Client, RpcApi}; +use bitcoincore_rpc::{Auth, Client, RpcApi}; use serde_json::Value; diff --git a/crates/sdk/src/provider/rpc/error.rs b/crates/sdk/src/provider/rpc/error.rs index 46cc3513..38316858 100644 --- a/crates/sdk/src/provider/rpc/error.rs +++ b/crates/sdk/src/provider/rpc/error.rs @@ -3,7 +3,7 @@ pub enum RpcError { /// Transparent wrapper mapping underlying errors generated directly from the Core/Elements RPC node client. #[error(transparent)] - ElementsRpcError(#[from] electrsd::bitcoind::bitcoincore_rpc::Error), + ElementsRpcError(#[from] bitcoincore_rpc::Error), /// Error indicating the requested Elements RPC call succeeded but the resulting JSON data payload did not map to the expected type or structure. #[error("Elements RPC returned an unexpected value for call {0}")] diff --git a/crates/sdk/src/provider/simplex.rs b/crates/sdk/src/provider/simplex.rs index 970f2f92..5629bed2 100644 --- a/crates/sdk/src/provider/simplex.rs +++ b/crates/sdk/src/provider/simplex.rs @@ -1,6 +1,6 @@ use std::collections::HashMap; -use electrsd::bitcoind::bitcoincore_rpc::Auth; +use bitcoincore_rpc::Auth; use simplicityhl::elements::{Address, Script, Transaction, Txid}; diff --git a/examples/basic/Cargo.lock b/examples/basic/Cargo.lock index 37d5e8e1..41918f2f 100644 --- a/examples/basic/Cargo.lock +++ b/examples/basic/Cargo.lock @@ -1080,9 +1080,9 @@ dependencies = [ [[package]] name = "rustls" -version = "0.23.40" +version = "0.23.41" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ef86cd5876211988985292b91c96a8f2d298df24e75989a43a3c73f2d4d8168b" +checksum = "6b92b125634d9b795e7beca796cc790df15a7fb38323bf3196fda83292d06b1f" dependencies = [ "aws-lc-rs", "log", @@ -1352,8 +1352,8 @@ version = "0.0.6" dependencies = [ "bip39", "bitcoin_hashes", + "bitcoincore-rpc", "dyn-clone", - "electrsd", "elements-miniscript", "hex", "minreq 3.0.0", diff --git a/fixtures/Cargo.lock b/fixtures/Cargo.lock index edc59e18..97670472 100644 --- a/fixtures/Cargo.lock +++ b/fixtures/Cargo.lock @@ -1080,9 +1080,9 @@ dependencies = [ [[package]] name = "rustls" -version = "0.23.40" +version = "0.23.41" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ef86cd5876211988985292b91c96a8f2d298df24e75989a43a3c73f2d4d8168b" +checksum = "6b92b125634d9b795e7beca796cc790df15a7fb38323bf3196fda83292d06b1f" dependencies = [ "aws-lc-rs", "log", @@ -1352,8 +1352,8 @@ version = "0.0.6" dependencies = [ "bip39", "bitcoin_hashes", + "bitcoincore-rpc", "dyn-clone", - "electrsd", "elements-miniscript", "hex", "minreq 3.0.0",