From bc800d586f2fb2e487d52fb68a7904ddeac7dfbb Mon Sep 17 00:00:00 2001
From: Antoine A <>
Date: Thu, 1 Feb 2024 16:41:45 +0100
Subject: Test support for bitcoind 26.0 and update dependencies

---
 Cargo.lock                  |  8 ++++----
 README.md                   |  2 +-
 instrumentation/Cargo.toml  |  2 +-
 instrumentation/src/main.rs | 12 ++++++++----
 script/prepare.sh           |  6 +++---
 wire-gateway/Cargo.toml     |  2 +-
 6 files changed, 18 insertions(+), 14 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 95ecf9e..939d2e7 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -614,9 +614,9 @@ dependencies = [
 
 [[package]]
 name = "deadpool-postgres"
-version = "0.11.0"
+version = "0.12.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "40b75ba49590d27f677d3bebaf76cd15889ca8b308bc7ba99bfa25f1d7269c13"
+checksum = "bda39fa1cfff190d8924d447ad04fd22772c250438ca5ce1dfb3c80621c05aaa"
 dependencies = [
  "deadpool",
  "tokio",
@@ -1357,9 +1357,9 @@ dependencies = [
 
 [[package]]
 name = "owo-colors"
-version = "3.5.0"
+version = "4.0.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c1b04fb49957986fdce4d6ee7a65027d55d4b6d2265e5848bbb507b58ccfdb6f"
+checksum = "caff54706df99d2a78a5a4e3455ff45448d81ef1bb63c22cd14052ca0e993a3f"
 
 [[package]]
 name = "parking_lot"
diff --git a/README.md b/README.md
index 823328f..4e8f08b 100644
--- a/README.md
+++ b/README.md
@@ -38,7 +38,7 @@ Depolymerizer require:
 
 #### Bitcoin
 
-[Bitcoind](https://bitcoincore.org/) version 25.1 is expected
+[Bitcoind](https://bitcoincore.org/) version 26.0 is expected
 
 #### Ethereum
 
diff --git a/instrumentation/Cargo.toml b/instrumentation/Cargo.toml
index 8ec2fe0..b06f292 100644
--- a/instrumentation/Cargo.toml
+++ b/instrumentation/Cargo.toml
@@ -26,7 +26,7 @@ tempfile = "3.3.0"
 # RNG
 fastrand = "2.0.1"
 # terminal color
-owo-colors = "3.5.0"
+owo-colors = "4.0.0"
 # Better backtrace
 color-backtrace = "0.6.0"
 # Send signal to child processes
diff --git a/instrumentation/src/main.rs b/instrumentation/src/main.rs
index c31fb71..b787d5f 100644
--- a/instrumentation/src/main.rs
+++ b/instrumentation/src/main.rs
@@ -138,7 +138,7 @@ pub fn main() {
                                 pb.finish();
                             }
                             let out: String = out.lock().unwrap().clone();
-                            (result, start.elapsed(), out)
+                            (result, start.elapsed(), out, pb.message())
                         });
                         (join, name)
                     })
@@ -151,7 +151,12 @@ pub fn main() {
 
             let len = results.len();
             m.clear().unwrap();
-            for ((result, time, out), name) in results {
+            for ((result, _, out, msg), name) in &results {
+                if let Err(_) = result {
+                    println!("{} {}\n{}", name.magenta(), msg.red(), out.bright_black());
+                }
+            }
+            for ((result, time, _, msg), name) in results {
                 match result {
                     Ok(_) => {
                         println!(
@@ -165,10 +170,9 @@ pub fn main() {
                         println!(
                             "{} {} {}",
                             name.magenta(),
-                            "ERR".red(),
+                            msg.red(),
                             format_args!("{}s", time.as_secs()).bright_black()
                         );
-                        println!("{}", out.bright_black());
                     }
                 }
             }
diff --git a/script/prepare.sh b/script/prepare.sh
index 184d74a..3de725f 100755
--- a/script/prepare.sh
+++ b/script/prepare.sh
@@ -20,13 +20,13 @@ echo "Ⅰ - Find installed postgres version"
 PG_VER=`pg_config --version | egrep -o '[0-9]{1,}' | head -1`
 echo "Found version $PG_VER"
 
-echo "Ⅱ - Install bitcoind version 25.1"
+echo "Ⅱ - Install bitcoind version 26.0"
 cd $DIR
-curl -L https://bitcoincore.org/bin/bitcoin-core-25.1/bitcoin-25.1-x86_64-linux-gnu.tar.gz -o btc.tar.gz
+curl -L https://bitcoincore.org/bin/bitcoin-core-26.0/bitcoin-26.0-x86_64-linux-gnu.tar.gz -o btc.tar.gz
 tar xvzf btc.tar.gz
 rm -rfv ~/bitcoin
 mkdir -pv ~/bitcoin
-mv -v bitcoin-25.1/* ~/bitcoin
+mv -v bitcoin-26.0/* ~/bitcoin
 
 echo "Ⅲ - Install Go Ethereum (Geth) v1.13.11"
 cd $DIR
diff --git a/wire-gateway/Cargo.toml b/wire-gateway/Cargo.toml
index 4f44c02..f73af0f 100644
--- a/wire-gateway/Cargo.toml
+++ b/wire-gateway/Cargo.toml
@@ -26,7 +26,7 @@ thiserror = "1.0.38"
 miniz_oxide = "0.7.1"
 # Async postgres client
 tokio-postgres = { version = "0.7.7" }
-deadpool-postgres = "0.11.0"
+deadpool-postgres = "0.12.1"
 # Socket activation
 listenfd = "1.0.0"
 # Common lib
-- 
cgit v1.2.3