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.

Sign up for GitHub

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

Use bitcoincore-rpc reqwest transport #1195

Merged
merged 2 commits into from
Sep 17, 2024
Merged

Use bitcoincore-rpc reqwest transport #1195

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
f96239a
Use bitcoincore-rpc reqwest transport
jfldde Sep 17, 2024
c57d619
Merge branch 'nightly' into fix/bitcoincore-rpc-client
jfldde Sep 17, 2024
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: 4 additions & 2 deletions Cargo.lock
View file
Open in desktop

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

2 changes: 1 addition & 1 deletion Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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" }
2 changes: 2 additions & 0 deletions bin/citrea/tests/bitcoin_e2e/config/bitcoin.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,6 +47,8 @@ impl BitcoinConfig {
"-daemon".to_string(),
"-txindex".to_string(),
"-addresstype=bech32m".to_string(),
"-debug=net".to_string(),
"-debug=rpc".to_string(),
]
}

Expand Down
6 changes: 3 additions & 3 deletions bin/citrea/tests/bitcoin_e2e/test_case.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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()
},
Expand Down Expand Up @@ -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()
},
Expand All @@ -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
),
Expand Down
3 changes: 1 addition & 2 deletions crates/bitcoin-da/src/service.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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};
Expand Down
Loading