From b4449ab55f1eb17c5b95c42b2fd0a202904af4c6 Mon Sep 17 00:00:00 2001
From: Oliver Gugger <gugger@gmail.com>
Date: Fri, 15 Mar 2024 12:54:29 +0100
Subject: [PATCH] GitHub: use bitcoind v26.0 for CI, remove default value

To make it less confusing what version of bitcoind is actually
installed, we now require the version to be specified as a command line
argument.

Because we tag the version in the docker image tag as bitcoin-core:XX
but the binary internally is located under /opt/bitcoin-XX.Y/, we
manually set Y to 0.
---
 .github/workflows/main.yml  |  6 +++---
 .travis.yml                 |  4 ++--
 scripts/install_bitcoind.sh | 10 ++++++++--
 3 files changed, 13 insertions(+), 7 deletions(-)

diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index 4a87854bf..61fbeef58 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -21,7 +21,7 @@ defaults:
     shell: bash
 
 env:
-  BITCOIN_VERSION: "23.0"
+  BITCOIN_VERSION: "26"
 
   # If you change this value, please change it in the following files as well:
   # /.travis.yml
@@ -215,7 +215,7 @@ jobs:
           key-prefix: unit-test
 
       - name: install bitcoind
-        run: ./scripts/install_bitcoind.sh
+        run: ./scripts/install_bitcoind.sh $BITCOIN_VERSION
 
       - name: run ${{ matrix.unit_type }}
         run: make log="stdlog debug" ${{ matrix.unit_type }}
@@ -271,7 +271,7 @@ jobs:
           key-prefix: integration-test
 
       - name: install bitcoind
-        run: ./scripts/install_bitcoind.sh
+        run: ./scripts/install_bitcoind.sh $BITCOIN_VERSION
 
       - name: run ${{ matrix.name }}
         run: make itest-parallel ${{ matrix.args }}
diff --git a/.travis.yml b/.travis.yml
index 1d44fe7a6..b7c7734d9 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -26,7 +26,7 @@ go:
 env:
   global:
     - GOCACHE=$HOME/.go-build
-    - BITCOIN_VERSION="22.0"
+    - BITCOIN_VERSION="26"
 
 sudo: required
 
@@ -35,7 +35,7 @@ jobs:
     - stage: Integration Test
       name: Bitcoind Integration ARM
       script:
-        - bash ./scripts/install_bitcoind.sh
+        - bash ./scripts/install_bitcoind.sh $BITCOIN_VERSION
         - GOMEMLIMIT=1024MiB GOARM=7 GOARCH=arm GOOS=linux travis_wait 120 make itest-parallel backend=bitcoind tranches=8
       arch: arm64
 
diff --git a/scripts/install_bitcoind.sh b/scripts/install_bitcoind.sh
index 7e70e4605..5c655a63d 100755
--- a/scripts/install_bitcoind.sh
+++ b/scripts/install_bitcoind.sh
@@ -2,9 +2,15 @@
 
 set -ev
 
-BITCOIND_VERSION=${BITCOIN_VERSION:-25.0}
+BITCOIND_VERSION=$1
+
+if [ -z "$BITCOIND_VERSION" ]; then
+  echo "Must specify a version of bitcoind to install."
+  echo "Usage: install_bitcoind.sh <version>"
+  exit 1
+fi
 
 docker pull lightninglabs/bitcoin-core:$BITCOIND_VERSION
 CONTAINER_ID=$(docker create lightninglabs/bitcoin-core:$BITCOIND_VERSION)
-sudo docker cp $CONTAINER_ID:/opt/bitcoin-$BITCOIND_VERSION/bin/bitcoind /usr/local/bin/bitcoind
+sudo docker cp $CONTAINER_ID:/opt/bitcoin-$BITCOIND_VERSION.0/bin/bitcoind /usr/local/bin/bitcoind
 docker rm $CONTAINER_ID