splicing: Adds the features needed to enable collaborative splicing & resizing of active channels.

.gitattributes

@@ -17,4 +17,4 @@ statements_gettextgen.po linguist-generated=true
 cln-grpc/proto/node.proto -text -diff linguist-generated=true
 cln-grpc/src/convert.rs -text -diff linguist-generated=true
 cln-rpc/src/model.rs -text -diff linguist-generated=true
-contrib/pyln-testing/pyln/testing/node_pb2.py -text -diff linguist-generated=true
+contrib/pyln-testing/pyln/testing/node_pb2.py linguist-generated=true

.github/scripts/build.sh

@@ -54,14 +54,14 @@ then
     export STRIP="$TARGET_HOST"-strip
     export CONFIGURATION_WRAPPER=qemu-"${TARGET_HOST%%-*}"-static
 
-    wget -q https://zlib.net/zlib-1.2.12.tar.gz
-    tar xf zlib-1.2.12.tar.gz
-    cd zlib-1.2.12 || exit 1
+    wget -q https://zlib.net/fossils/zlib-1.2.13.tar.gz
+    tar xf zlib-1.2.13.tar.gz
+    cd zlib-1.2.13 || exit 1
     ./configure --prefix="$QEMU_LD_PREFIX"
     make
     sudo make install
     cd .. || exit 1
-    rm zlib-1.2.12.tar.gz && rm -rf zlib-1.2.12
+    rm zlib-1.2.13.tar.gz && rm -rf zlib-1.2.13
 
     wget -q https://www.sqlite.org/2018/sqlite-src-3260000.zip
     unzip -q sqlite-src-3260000.zip

.github/scripts/install-bitcoind.sh

@@ -0,0 +1,19 @@
+#!/bin/sh
+
+set -e
+
+DIRNAME="bitcoin-${BITCOIN_VERSION}"
+EDIRNAME="elements-${ELEMENTS_VERSION}"
+FILENAME="${DIRNAME}-x86_64-linux-gnu.tar.gz"
+EFILENAME="${EDIRNAME}-x86_64-linux-gnu.tar.gz"
+
+cd /tmp/
+wget "https://bitcoincore.org/bin/bitcoin-core-${BITCOIN_VERSION}/${FILENAME}"
+wget "https://github.com/ElementsProject/elements/releases/download/elements-${ELEMENTS_VERSION}/${EFILENAME}"
+tar -xf "${FILENAME}"
+tar -xf "${EFILENAME}"
+sudo mv "${DIRNAME}"/bin/* "/usr/local/bin"
+sudo mv "${EDIRNAME}"/bin/* "/usr/local/bin"
+
+
+rm -rf "${FILENAME}" "${EFILENAME}" "${DIRNAME}" "${EDIRNAME}"

.github/scripts/setup.sh

@@ -1,8 +1,8 @@
 #!/bin/bash
 set -e
 export DEBIAN_FRONTEND=noninteractive
-export BITCOIN_VERSION=0.20.1
-export ELEMENTS_VERSION=0.18.1.8
+export BITCOIN_VERSION=24.0.1
+export ELEMENTS_VERSION=22.0.2
 export RUST_VERSION=stable
 
 sudo useradd -ms /bin/bash tester
@@ -56,20 +56,30 @@ sudo chmod 0440 /etc/sudoers.d/tester
 
 (
     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
-    sudo mv bitcoin-$BITCOIN_VERSION/bin/* /usr/local/bin
-    sudo mv elements-$ELEMENTS_VERSION/bin/* /usr/local/bin
+    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 -xf bitcoin-${BITCOIN_VERSION}-x86_64-linux-gnu.tar.gz
+    tar -xf 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
+       bitcoin-${BITCOIN_VERSION}-x86_64-linux-gnu.tar.gz \
+       bitcoin-${BITCOIN_VERSION} \
+       elements-${ELEMENTS_VERSION}-x86_64-linux-gnu.tar.gz \
+       elements-${ELEMENTS_VERSION}
 )
 
-if [ "$RUST" == "1" ]; then
-    curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh -s -- \
-      -y --default-toolchain ${RUST_VERSION}
-fi
+curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh -s -- \
+     -y --default-toolchain ${RUST_VERSION}
+
+# We also need a relatively recent protobuf-compiler, at least 3.12.0,
+# in order to support the experimental `optional` flag.
+PROTOC_VERSION=3.15.8
+PB_REL="https://github.com/protocolbuffers/protobuf/releases"
+curl -LO $PB_REL/download/v${PROTOC_VERSION}/protoc-${PROTOC_VERSION}-linux-x86_64.zip
+sudo unzip protoc-3.15.8-linux-x86_64.zip -d /usr/local/
+sudo chmod a+x /usr/local/bin/protoc
+export PROTOC=/usr/local/bin/protoc
+export PATH=$PATH:/usr/local/bin
+env
+ls -lha /usr/local/bin

.github/workflows/bsd.yml

@@ -10,6 +10,7 @@ jobs:
   testfreebsd:
     runs-on: macos-10.15
     name: Build and test on FreeBSD
+    timeout-minutes: 120
     env:
       DEVELOPER: 1
       VALGRIND: 0
@@ -45,12 +46,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