From 650101525d890f50290989bd58c367024a69115c Mon Sep 17 00:00:00 2001
From: Antoine Poinsot <darosior@protonmail.com>
Date: Tue, 13 Dec 2022 16:10:22 +0100
Subject: [PATCH] bitcoind: set minimum required version to 24.0

---
 .cirrus.yml          | 9 ++++-----
 src/bitcoin/d/mod.rs | 2 +-
 src/lib.rs           | 4 ++--
 3 files changed, 7 insertions(+), 8 deletions(-)

diff --git a/.cirrus.yml b/.cirrus.yml
index 95f3413f..3857f2dd 100644
--- a/.cirrus.yml
+++ b/.cirrus.yml
@@ -43,11 +43,10 @@ task:
     set -xe
 
     # Download the bitcoind binary
-    # TODO: cleanup by using env variables like in revaultd once 24.0 is out.
-    ARCHIVE_NAME="bitcoin-core-24.0rc1.tar.gz"
-    curl https://bitcoincore.org/bin/bitcoin-core-24.0/test.rc1/bitcoin-24.0rc1-x86_64-linux-gnu.tar.gz -o $ARCHIVE_NAME
-    tar -xzf $ARCHIVE_NAME
-    export BITCOIND_PATH=bitcoin-24.0rc1/bin/bitcoind
+    curl -O https://bitcoincore.org/bin/bitcoin-core-24.0.1/bitcoin-24.0.1-x86_64-linux-gnu.tar.gz
+    echo "49df6e444515d457ea0b885d66f521f2a26ca92ccf73d5296082e633544253bf bitcoin-24.0.1-x86_64-linux-gnu.tar.gz" | sha256sum -c
+    tar -xzf bitcoin-24.0.1-x86_64-linux-gnu.tar.gz
+    export BITCOIND_PATH=bitcoin-24.0.1/bin/bitcoind
 
     # Run the functional tests
     LIANAD_PATH=$PWD/target/release/lianad pytest $TEST_GROUP -vvv -n 2
diff --git a/src/bitcoin/d/mod.rs b/src/bitcoin/d/mod.rs
index 412abaea..2978564e 100644
--- a/src/bitcoin/d/mod.rs
+++ b/src/bitcoin/d/mod.rs
@@ -35,7 +35,7 @@ const RPC_SOCKET_TIMEOUT: u64 = 180;
 const BITCOIND_RETRY_LIMIT: usize = 60;
 
 // The minimum bitcoind version that can be used with lianad.
-const MIN_BITCOIND_VERSION: u64 = 239900;
+const MIN_BITCOIND_VERSION: u64 = 240000;
 
 /// An error in the bitcoind interface.
 #[derive(Debug)]
diff --git a/src/lib.rs b/src/lib.rs
index ec96ad09..a12932f5 100644
--- a/src/lib.rs
+++ b/src/lib.rs
@@ -433,10 +433,10 @@ mod tests {
         stream.flush().unwrap();
     }
 
-    // Send them a pruned getblockchaininfo telling them we are at version 23.99
+    // Send them a pruned getblockchaininfo telling them we are at version 24.0
     fn complete_version_check(server: &net::TcpListener) {
         let net_resp =
-            "HTTP/1.1 200\n\r\n{\"jsonrpc\":\"2.0\",\"id\":1,\"result\":{\"version\":239900}}\n"
+            "HTTP/1.1 200\n\r\n{\"jsonrpc\":\"2.0\",\"id\":1,\"result\":{\"version\":240000}}\n"
                 .as_bytes();
         let (mut stream, _) = server.accept().unwrap();
         read_til_json_end(&mut stream);