From 0feab60396e1d04cbcca24836eed39804529bc10 Mon Sep 17 00:00:00 2001 From: ShahanaFarooqui Date: Fri, 4 Aug 2023 17:12:52 -0700 Subject: [PATCH 1/2] docker: bitcoin and elements version update Updated bitcoin and elements versions to 22.0. --- contrib/docker/Dockerfile.tester | 30 +++++++++++++++--------------- contrib/docker/scripts/setup.sh | 15 +++++++-------- 2 files changed, 22 insertions(+), 23 deletions(-) diff --git a/contrib/docker/Dockerfile.tester b/contrib/docker/Dockerfile.tester index 6da1aad543f7..14b61e7b1eb4 100644 --- a/contrib/docker/Dockerfile.tester +++ b/contrib/docker/Dockerfile.tester @@ -1,9 +1,9 @@ -FROM ubuntu:18.04 -MAINTAINER Christian Decker +FROM ubuntu:22.04 +LABEL mantainer="Christian Decker " ENV DEBIAN_FRONTEND noninteractive -ENV BITCOIN_VERSION 0.20.1 -ENV ELEMENTS_VERSION 0.18.1.8 +ENV BITCOIN_VERSION 22.0 +ENV ELEMENTS_VERSION 22.0.2 RUN useradd -ms /bin/bash tester RUN mkdir /build /bolts && chown tester -R /build /bolts @@ -62,16 +62,16 @@ RUN echo "tester ALL=(root) NOPASSWD:ALL" > /etc/sudoers.d/tester && \ chmod 0440 /etc/sudoers.d/tester RUN cd /tmp/ && \ - wget https://storage.googleapis.com/c-lightning-tests/bitcoin-$BITCOIN_VERSION-x86_64-linux-gnu.tar.bz2 && \ - wget -q https://storage.googleapis.com/c-lightning-tests/elements-$ELEMENTS_VERSION-x86_64-linux-gnu.tar.bz2 && \ - tar -xjf bitcoin-$BITCOIN_VERSION-x86_64-linux-gnu.tar.bz2 && \ - tar -xjf elements-$ELEMENTS_VERSION-x86_64-linux-gnu.tar.bz2 && \ - mv bitcoin-$BITCOIN_VERSION/bin/* /usr/local/bin && \ - mv elements-$ELEMENTS_VERSION/bin/* /usr/local/bin && \ - rm -rf \ - bitcoin-$BITCOIN_VERSION-x86_64-linux-gnu.tar.gz \ - bitcoin-$BITCOIN_VERSION \ - elements-$ELEMENTS_VERSION-x86_64-linux-gnu.tar.bz2 \ - elements-$ELEMENTS_VERSION + wget https://bitcoincore.org/bin/bitcoin-core-$BITCOIN_VERSION/bitcoin-$BITCOIN_VERSION-x86_64-linux-gnu.tar.gz && \ + wget https://github.com/ElementsProject/elements/releases/download/elements-$ELEMENTS_VERSION/elements-$ELEMENTS_VERSION-x86_64-linux-gnu.tar.gz && \ + tar -xzf bitcoin-$BITCOIN_VERSION-x86_64-linux-gnu.tar.gz && \ + tar -xzf elements-$ELEMENTS_VERSION-x86_64-linux-gnu.tar.gz && \ + mv bitcoin-$BITCOIN_VERSION/bin/* /usr/local/bin && \ + mv elements-$ELEMENTS_VERSION/bin/* /usr/local/bin && \ + rm -rf \ + bitcoin-$BITCOIN_VERSION-x86_64-linux-gnu.tar.gz \ + bitcoin-$BITCOIN_VERSION \ + elements-$ELEMENTS_VERSION-x86_64-linux-gnu.tar.gz \ + elements-$ELEMENTS_VERSION USER tester diff --git a/contrib/docker/scripts/setup.sh b/contrib/docker/scripts/setup.sh index 6f9cbdb76022..9af49030ee9e 100755 --- a/contrib/docker/scripts/setup.sh +++ b/contrib/docker/scripts/setup.sh @@ -1,8 +1,8 @@ #!/bin/bash export DEBIAN_FRONTEND=noninteractive -export BITCOIN_VERSION=0.20.1 -export ELEMENTS_VERSION=0.18.1.8 +export BITCOIN_VERSION=22.0 +export ELEMENTS_VERSION=22.0.2 export RUST_VERSION=nightly export TZ="Europe/London" @@ -50,19 +50,18 @@ sudo apt-get -qq install --no-install-recommends --allow-unauthenticated -yy \ xsltproc \ zlib1g-dev - ( cd /tmp/ || exit 1 - wget https://storage.googleapis.com/c-lightning-tests/bitcoin-$BITCOIN_VERSION-x86_64-linux-gnu.tar.bz2 - wget -q https://storage.googleapis.com/c-lightning-tests/elements-$ELEMENTS_VERSION-x86_64-linux-gnu.tar.bz2 - tar -xjf bitcoin-$BITCOIN_VERSION-x86_64-linux-gnu.tar.bz2 - tar -xjf elements-$ELEMENTS_VERSION-x86_64-linux-gnu.tar.bz2 + wget https://bitcoincore.org/bin/bitcoin-core-$BITCOIN_VERSION/bitcoin-$BITCOIN_VERSION-x86_64-linux-gnu.tar.gz + wget https://github.com/ElementsProject/elements/releases/download/elements-$ELEMENTS_VERSION/elements-$ELEMENTS_VERSION-x86_64-linux-gnu.tar.gz + tar -xzf bitcoin-$BITCOIN_VERSION-x86_64-linux-gnu.tar.gz + tar -xzf elements-$ELEMENTS_VERSION-x86_64-linux-gnu.tar.gz sudo mv bitcoin-$BITCOIN_VERSION/bin/* /usr/local/bin sudo mv elements-$ELEMENTS_VERSION/bin/* /usr/local/bin rm -rf \ bitcoin-$BITCOIN_VERSION-x86_64-linux-gnu.tar.gz \ bitcoin-$BITCOIN_VERSION \ - elements-$ELEMENTS_VERSION-x86_64-linux-gnu.tar.bz2 \ + elements-$ELEMENTS_VERSION-x86_64-linux-gnu.tar.gz \ elements-$ELEMENTS_VERSION ) From 2365df19ece9b3ffbeb1e78af23e49a26dda4161 Mon Sep 17 00:00:00 2001 From: Rusty Russell Date: Mon, 24 Jul 2023 13:19:56 +0930 Subject: [PATCH 2/2] plugins/bcli: update minimum required bitcoind version. Less than 22 is obsolete anyway, so we should increment this from 16.0 at least! Closes: #6234 Signed-off-by: Rusty Russell --- plugins/bcli.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/plugins/bcli.c b/plugins/bcli.c index 759a21010579..ce07b78a60a7 100644 --- a/plugins/bcli.c +++ b/plugins/bcli.c @@ -918,7 +918,7 @@ static void parse_getnetworkinfo_result(struct plugin *p, const char *buf) { const jsmntok_t *result; bool tx_relay; - u32 min_version = 160000; + u32 min_version = 220000; const char *err; result = json_parse_simple(NULL, buf, strlen(buf));