Merge #1731: Bump minimum required Bitcoin Core version from 22.0 to …

…24.0.1 b456968 Bump minimum required Bitcoin Core version from 22.0 to 24.0.1 (Kristaps Kaupe) Pull request description: Security vulnerability has been disclosed for versions older than 24.0.1, which are also currently EOL. https://bitcoincore.org/en/2024/09/18/disclose-headers-oom/ Similar to #1719. Top commit has no ACKs. Tree-SHA512: a922aaece30abb116f3155c68484b6bca2a8593d3f462b711cfbd1b03781606eee1e6f348d9e2d35a67b65121a6faaba617d9b6f58502d705c81c43ea145ea31
JoinMarket-Org · Sep 20, 2024 · cd0f46b · cd0f46b
2 parents 75e0bc4 + b456968
commit cd0f46b
Show file tree

Hide file tree

Showing 6 changed files with 6 additions and 10 deletions.
diff --git a/.github/workflows/unittests.yml b/.github/workflows/unittests.yml
@@ -10,7 +10,7 @@ jobs:
       matrix:
         os: [macos-13, ubuntu-latest]
         python-version: ["3.8", "3.12"]
-        bitcoind-version: ["22.0", "27.1"]
+        bitcoind-version: ["24.0.1", "27.1"]
 
     steps:
       - uses: actions/checkout@v3

diff --git a/docs/INSTALL.md b/docs/INSTALL.md
@@ -137,7 +137,7 @@ If (a), then note the following two points:
 
 ##### Installing Bitcoin Core
 
-If you haven't done so yet, install Bitcoin Core, version 22.0 or newer, as described [here](https://bitcoin.org/en/full-node#windows-10). After starting it for the first time, it will start the Initial Block Download. JoinMarket cannot be used until this is finished. More information on that can be found [here](https://bitcoin.org/en/full-node#initial-block-downloadibd).
+If you haven't done so yet, install Bitcoin Core, version 24.0.1 or newer, as described [here](https://bitcoin.org/en/full-node#windows-10). After starting it for the first time, it will start the Initial Block Download. JoinMarket cannot be used until this is finished. More information on that can be found [here](https://bitcoin.org/en/full-node#initial-block-downloadibd).
 
 ##### Configuring Bitcoin Core
 

diff --git a/docs/PAYJOIN.md b/docs/PAYJOIN.md
@@ -39,7 +39,7 @@ So just skip those sections if you already know it.
 
 ### Preparatory step: configuring for Bitcoin Core.
 
-Joinmarket currently requires a Bitcoin Core full node, version 22.0 or newer, although it can be pruned.
+Joinmarket currently requires a Bitcoin Core full node, version 24.0.1 or newer, although it can be pruned.
 
 First thing to do: in `scripts/`, run:
 

diff --git a/docs/TESTING.md b/docs/TESTING.md
@@ -1,6 +1,6 @@
 ### Test instructions (for developers):
 
-Work in your `jmvenv` virtual environment as for all Joinmarket work. Make sure to have [bitcoind](https://bitcoin.org/en/full-node) 22.0 or newer installed. Also need miniircd installed to the root (i.e. in your `joinmarket-clientserver` directory):
+Work in your `jmvenv` virtual environment as for all Joinmarket work. Make sure to have [bitcoind](https://bitcoin.org/en/full-node) 24.0.1 or newer installed. Also need miniircd installed to the root (i.e. in your `joinmarket-clientserver` directory):
 
     (jmvenv)$ cd /path/to/joinmarket-clientserver
     (jmvenv)$ git clone https://github.com/Joinmarket-Org/miniircd

diff --git a/test/Dockerfiles/build_docker.sh b/test/Dockerfiles/build_docker.sh
@@ -15,7 +15,7 @@ build_docker ()
         return 0
     fi
 
-    core_version='22.0'
+    core_version='24.0.1'
     core_dist="bitcoin-${core_version}-x86_64-linux-gnu.tar.gz"
     core_url="https://bitcoincore.org/bin/bitcoin-core-${core_version}/${core_dist}"
     declare -A deps=( [${core_dist}]="${core_url}" )

diff --git a/test/testrunner/install_bitcoind.sh b/test/testrunner/install_bitcoind.sh
@@ -10,11 +10,7 @@ fi
 if [[ "$(uname)" == "Linux" ]]; then
     platform="x86_64-linux-gnu"
 elif [[ "$(uname)" == "Darwin" ]]; then
-    if [[ $(echo "$BITCOIND_VERSION > 23.0" | bc) == 1 || $(echo "$BITCOIND_VERSION == 23.0" | bc) == 1 ]]; then
-        platform="x86_64-apple-darwin"
-    else
-        platform="osx64"
-    fi
+    platform="x86_64-apple-darwin"
 else
     echo "Unsupported platform: $(uname)"
     exit 1