diff --git a/.github/workflows/unittests.yml b/.github/workflows/unittests.yml index 1581e8e8f..9dd84062e 100644 --- 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 index 24db972e3..483101b79 100644 --- 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 index 3e54899a6..c27df56bb 100644 --- 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 index 471dc28cc..aae1d683f 100644 --- 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 index b7112f55d..05aff8a0b 100755 --- 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 index 434507dc3..36ec599e6 100755 --- 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