Skip to content

Commit ed77653

Browse files
authored
Merge branch 'main' into fix-prover-config-path
2 parents 0f1e640 + ada173a commit ed77653

File tree

4 files changed

+7
-4
lines changed

4 files changed

+7
-4
lines changed

Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,4 +26,4 @@ sov-ledger-rpc = { git = "https://github.com/chainwayxyz/citrea", rev = "82bf52d
2626
sov-rollup-interface = { git = "https://github.com/chainwayxyz/citrea", rev = "82bf52d" }
2727

2828
[patch.crates-io]
29-
bitcoincore-rpc = { version = "0.18.0", git = "https://github.com/chainwayxyz/rust-bitcoincore-rpc.git", rev = "0ae498d" }
29+
bitcoincore-rpc = { version = "0.18.0", git = "https://github.com/chainwayxyz/rust-bitcoincore-rpc.git", rev = "ede8097" }

src/bitcoin.rs

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -359,7 +359,10 @@ async fn wait_for_rpc_ready(client: &Client, timeout: Option<Duration>) -> Resul
359359
while start.elapsed() < timeout {
360360
match client.get_blockchain_info().await {
361361
Ok(_) => return Ok(()),
362-
Err(_) => sleep(Duration::from_millis(500)).await,
362+
Err(e) => {
363+
trace!("[wait_for_rpc_ready] error {e}");
364+
sleep(Duration::from_millis(500)).await
365+
}
363366
}
364367
}
365368
bail!("Timeout waiting for RPC to be ready")

src/config/bitcoin.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ impl Default for BitcoinConfig {
2929
.into_path(),
3030
extra_args: Vec::new(),
3131
network: Network::Regtest,
32-
docker_image: Some("bitcoin/bitcoin:27.1".to_string()),
32+
docker_image: Some("bitcoin/bitcoin:28.0".to_string()),
3333
env: Vec::new(),
3434
idx: 0,
3535
}

src/config/docker.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ impl From<&BitcoinConfig> for DockerConfig {
3434
image: v
3535
.docker_image
3636
.clone()
37-
.unwrap_or_else(|| "bitcoin/bitcoin:27.1".to_string()),
37+
.unwrap_or_else(|| "bitcoin/bitcoin:28.0".to_string()),
3838
cmd: args,
3939
log_path: v.data_dir.join("regtest").join("debug.log"),
4040
volume: VolumeConfig {

0 commit comments

Comments
 (0)