Use bitcoincore-rpc reqwest transport (#1195)

chainwayxyz · Sep 17, 2024 · 6e11ac0 · 6e11ac0
1 parent 184eac1
commit 6e11ac0
Show file tree

Hide file tree

Showing 5 changed files with 11 additions and 8 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -185,4 +185,4 @@ ed25519-dalek = { git = "https://github.com/risc0/curve25519-dalek", tag = "curv
 crypto-bigint = { git = "https://github.com/risc0/RustCrypto-crypto-bigint", tag = "v0.5.5-risczero.0" }
 secp256k1 = { git = "https://github.com/Sovereign-Labs/rust-secp256k1.git", branch = "risc0-compatible-0-29-0" }
 k256 = { git = "https://github.com/risc0/RustCrypto-elliptic-curves", tag = "k256/v0.13.3-risczero.0" }
-bitcoincore-rpc = { version = "0.18.0", git = "https://github.com/chainwayxyz/rust-bitcoincore-rpc.git", rev = "fb809b0" }
+bitcoincore-rpc = { version = "0.18.0", git = "https://github.com/chainwayxyz/rust-bitcoincore-rpc.git", rev = "0ae498d" }
diff --git a/bin/citrea/tests/bitcoin_e2e/config/bitcoin.rs b/bin/citrea/tests/bitcoin_e2e/config/bitcoin.rs
@@ -47,6 +47,8 @@ impl BitcoinConfig {
             "-daemon".to_string(),
             "-txindex".to_string(),
             "-addresstype=bech32m".to_string(),
+            "-debug=net".to_string(),
+            "-debug=rpc".to_string(),
         ]
     }
 

diff --git a/bin/citrea/tests/bitcoin_e2e/test_case.rs b/bin/citrea/tests/bitcoin_e2e/test_case.rs
@@ -153,7 +153,7 @@ impl<T: TestCase> TestCaseRunner<T> {
                         "045FFC81A3C1FDB3AF1359DBF2D114B0B3EFBF7F29CC9C5DA01267AA39D2C78D"
                             .to_string(),
                     ),
-                    node_url: format!("{}/wallet/{}", da_config.node_url, node_kind),
+                    node_url: format!("http://{}/wallet/{}", da_config.node_url, node_kind),
                     tx_backup_dir: get_tx_backup_dir(),
                     ..da_config.clone()
                 },
@@ -188,7 +188,7 @@ impl<T: TestCase> TestCaseRunner<T> {
                         "75BAF964D074594600366E5B111A1DA8F86B2EFE2D22DA51C8D82126A0FCAC72"
                             .to_string(),
                     ),
-                    node_url: format!("{}/wallet/{}", da_config.node_url, node_kind),
+                    node_url: format!("http://{}/wallet/{}", da_config.node_url, node_kind),
                     tx_backup_dir: get_tx_backup_dir(),
                     ..da_config.clone()
                 },
@@ -211,7 +211,7 @@ impl<T: TestCase> TestCaseRunner<T> {
             RollupConfig {
                 da: BitcoinServiceConfig {
                     node_url: format!(
-                        "{}/wallet/{}",
+                        "http://{}/wallet/{}",
                         da_config.node_url,
                         NodeKind::Bitcoin // Use default wallet
                     ),

diff --git a/crates/bitcoin-da/src/service.rs b/crates/bitcoin-da/src/service.rs
@@ -19,8 +19,7 @@ use bitcoin::hashes::Hash;
 use bitcoin::secp256k1::SecretKey;
 use bitcoin::{Amount, BlockHash, CompactTarget, Transaction, Txid, Wtxid};
 use bitcoincore_rpc::json::TestMempoolAcceptResult;
-use bitcoincore_rpc::jsonrpc_async::Error as RpcError;
-use bitcoincore_rpc::{Auth, Client, Error, RpcApi};
+use bitcoincore_rpc::{Auth, Client, Error, RpcApi, RpcError};
 use borsh::BorshDeserialize;
 use serde::{Deserialize, Serialize};
 use sov_rollup_interface::da::{DaData, DaDataBatchProof, DaDataLightClient, DaSpec};