From 813401b2a6b811a5dfce08ec5d66565fea1fb4d7 Mon Sep 17 00:00:00 2001
From: Greg Sanders <gsanders87@gmail.com>
Date: Tue, 7 Feb 2023 12:27:39 -0500
Subject: [PATCH] Update Bitcoin Core to 24.0.1 in other git ci locations

---
 .github/scripts/install-bitcoind.sh |  6 +++---
 .github/workflows/bsd.yml           | 10 +++++-----
 .github/workflows/ci.yaml           |  4 ++--
 .github/workflows/macos.yaml        |  2 +-
 4 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/.github/scripts/install-bitcoind.sh b/.github/scripts/install-bitcoind.sh
index b27346440..ec716a979 100755
--- a/.github/scripts/install-bitcoind.sh
+++ b/.github/scripts/install-bitcoind.sh
@@ -4,13 +4,13 @@ set -e
 
 DIRNAME="bitcoin-${BITCOIN_VERSION}"
 EDIRNAME="elements-${ELEMENTS_VERSION}"
-FILENAME="${DIRNAME}-x86_64-linux-gnu.tar.bz2"
+FILENAME="${DIRNAME}-x86_64-linux-gnu.tar.gz"
 EFILENAME="${EDIRNAME}-x86_64-linux-gnu.tar.bz2"
 
 cd /tmp/
-wget "https://storage.googleapis.com/c-lightning-tests/$FILENAME"
+wget "https://bitcoincore.org/bin/bitcoin-core-${BITCOIN_VERSION}/${FILENAME}"
 wget -q "https://storage.googleapis.com/c-lightning-tests/${EFILENAME}"
-tar -xaf "${FILENAME}"
+tar -xf "${FILENAME}"
 tar -xaf "${EFILENAME}"
 sudo mv "${DIRNAME}"/bin/* "/usr/local/bin"
 sudo mv "${EDIRNAME}"/bin/* "/usr/local/bin"
diff --git a/.github/workflows/bsd.yml b/.github/workflows/bsd.yml
index fee739519..222dee804 100644
--- a/.github/workflows/bsd.yml
+++ b/.github/workflows/bsd.yml
@@ -45,12 +45,12 @@ jobs:
           curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh -s -- -y --default-toolchain nightly-2021-08-3z1
 
           cd /tmp/ || exit 1
-          wget https://storage.googleapis.com/c-lightning-tests/bitcoin-0.20.1-x86_64-linux-gnu.tar.bz2
-          tar -xjf bitcoin-0.20.1-x86_64-linux-gnu.tar.bz2
-          sudo mv bitcoin-0.20.1/bin/* /usr/local/bin
+          wget https://bitcoincore.org/bin/bitcoin-core-24.0.1/bitcoin-24.0.1-x86_64-linux-gnu.tar.gz
+          tar -xf bitcoin-24.0.1-x86_64-linux-gnu.tar.bz2
+          sudo mv bitcoin-24.0.1/bin/* /usr/local/bin
           rm -rf \
-            bitcoin-0.20.1-x86_64-linux-gnu.tar.gz \
-            bitcoin-0.20.1
+            bitcoin-24.0.1-x86_64-linux-gnu.tar.gz \
+            bitcoin-24.0.1
           
         run: |
           PATH=/root/.local/bin:$PATH
diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml
index e3d8062c3..fa75307a2 100644
--- a/.github/workflows/ci.yaml
+++ b/.github/workflows/ci.yaml
@@ -163,7 +163,7 @@ jobs:
     runs-on: ubuntu-22.04
     env:
       COMPAT: 1
-      BITCOIN_VERSION: 0.20.1
+      BITCOIN_VERSION: 24.0.1
       ELEMENTS_VERSION: 0.18.1.8
       RUST_PROFILE: release  # Has to match the one in the compile step
     needs:
@@ -269,7 +269,7 @@ jobs:
     runs-on: ubuntu-22.04
     env:
       COMPAT: 1
-      BITCOIN_VERSION: 0.20.1
+      BITCOIN_VERSION: 24.0.1
       ELEMENTS_VERSION: 0.18.1.8
       RUST_PROFILE: release  # Has to match the one in the compile step
       VALGRIND: 1
diff --git a/.github/workflows/macos.yaml b/.github/workflows/macos.yaml
index bb8157bcf..b7d76129d 100644
--- a/.github/workflows/macos.yaml
+++ b/.github/workflows/macos.yaml
@@ -21,7 +21,7 @@ jobs:
         run: |
           export PATH="/usr/local/opt:/Users/runner/.local/bin:/Users/runner/Library/Python/3.10/bin:$PATH"
 
-          export BITCOIN_VERSION=0.20.1
+          export BITCOIN_VERSION=24.0.1
           brew install wget autoconf automake libtool python@3.10 gmp gnu-sed gettext libsodium
 
           (