Skip to content

plugins/bcli: update minimum required bitcoind version. #6433

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
rustyrussell merged 2 commits into from
Aug 7, 2023
Merged

plugins/bcli: update minimum required bitcoind version. #6433

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
0feab60
docker: bitcoin and elements version update
ShahanaFarooqui Aug 5, 2023
2365df1
plugins/bcli: update minimum required bitcoind version.
rustyrussell Jul 24, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
30 changes: 15 additions & 15 deletions contrib/docker/Dockerfile.tester
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
FROM ubuntu:18.04
MAINTAINER Christian Decker <decker.christian@gmail.com>
FROM ubuntu:22.04
LABEL mantainer="Christian Decker <decker.christian@gmail.com>"

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
Expand Down Expand Up @@ -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
15 changes: 7 additions & 8 deletions contrib/docker/scripts/setup.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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"

Expand Down Expand Up @@ -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
)

Expand Down
2 changes: 1 addition & 1 deletion plugins/bcli.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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));
Expand Down