From ada173a3c787d9947af8fba970c555e818d81ff6 Mon Sep 17 00:00:00 2001
From: jfldde <168934971+jfldde@users.noreply.github.com>
Date: Wed, 9 Oct 2024 11:28:15 +0100
Subject: [PATCH] Bump bitcoind docker version (#17)

---
 Cargo.toml            | 2 +-
 src/bitcoin.rs        | 5 ++++-
 src/config/bitcoin.rs | 2 +-
 src/config/docker.rs  | 2 +-
 4 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/Cargo.toml b/Cargo.toml
index 1e9c73f..353b79c 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -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" }
diff --git a/src/bitcoin.rs b/src/bitcoin.rs
index 0e2489b..4f61478 100644
--- a/src/bitcoin.rs
+++ b/src/bitcoin.rs
@@ -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")
diff --git a/src/config/bitcoin.rs b/src/config/bitcoin.rs
index 2337d77..2410934 100644
--- a/src/config/bitcoin.rs
+++ b/src/config/bitcoin.rs
@@ -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,
         }
diff --git a/src/config/docker.rs b/src/config/docker.rs
index 8212703..d8b2e7d 100644
--- a/src/config/docker.rs
+++ b/src/config/docker.rs
@@ -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 {