Skip to content

Commit

Permalink
Merge branch 'main' into fix-prover-config-path
Browse files Browse the repository at this point in the history
  • Loading branch information
jfldde authored Oct 9, 2024
2 parents 0f1e640 + ada173a commit ed77653
Show file tree
Hide file tree
Showing 4 changed files with 7 additions and 4 deletions.
2 changes: 1 addition & 1 deletion Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -26,4 +26,4 @@ sov-ledger-rpc = { git = "https://github.com/chainwayxyz/citrea", rev = "82bf52d
sov-rollup-interface = { git = "https://github.com/chainwayxyz/citrea", rev = "82bf52d" }

[patch.crates-io]
bitcoincore-rpc = { version = "0.18.0", git = "https://github.com/chainwayxyz/rust-bitcoincore-rpc.git", rev = "0ae498d" }
bitcoincore-rpc = { version = "0.18.0", git = "https://github.com/chainwayxyz/rust-bitcoincore-rpc.git", rev = "ede8097" }
5 changes: 4 additions & 1 deletion src/bitcoin.rs
Original file line number Diff line number Diff line change
Expand Up @@ -359,7 +359,10 @@ async fn wait_for_rpc_ready(client: &Client, timeout: Option<Duration>) -> Resul
while start.elapsed() < timeout {
match client.get_blockchain_info().await {
Ok(_) => return Ok(()),
Err(_) => sleep(Duration::from_millis(500)).await,
Err(e) => {
trace!("[wait_for_rpc_ready] error {e}");
sleep(Duration::from_millis(500)).await
}
}
}
bail!("Timeout waiting for RPC to be ready")
Expand Down
2 changes: 1 addition & 1 deletion src/config/bitcoin.rs
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ impl Default for BitcoinConfig {
.into_path(),
extra_args: Vec::new(),
network: Network::Regtest,
docker_image: Some("bitcoin/bitcoin:27.1".to_string()),
docker_image: Some("bitcoin/bitcoin:28.0".to_string()),
env: Vec::new(),
idx: 0,
}
Expand Down
2 changes: 1 addition & 1 deletion src/config/docker.rs
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ impl From<&BitcoinConfig> for DockerConfig {
image: v
.docker_image
.clone()
.unwrap_or_else(|| "bitcoin/bitcoin:27.1".to_string()),
.unwrap_or_else(|| "bitcoin/bitcoin:28.0".to_string()),
cmd: args,
log_path: v.data_dir.join("regtest").join("debug.log"),
volume: VolumeConfig {
Expand Down

0 comments on commit ed77653

Please sign in to comment.