Merge branch 'master' of github.com:ElementsProject/lightning into dd…

…ustin/splice

# Conflicts:
#	common/interactivetx.c
#	common/interactivetx.h
#	lightningd/peer_control.c
#	wallet/db.c

.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/setup.sh

@@ -69,7 +69,17 @@ sudo chmod 0440 /etc/sudoers.d/tester
        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/ci.yaml

@@ -5,6 +5,7 @@ on:
     branches:
       - "master"
   pull_request:
+
 jobs:
   smoke-test:
     name: Smoke Test ${{ matrix.cfg }}
@@ -61,6 +62,8 @@ jobs:
           TEST_GROUP_COUNT: ${{ matrix.TEST_GROUP_COUNT }}
           TEST_GROUP: ${{ matrix.TEST_GROUP }}
         run: |
+          echo $PROTOC
+          which protoc
           bash -x .github/scripts/build.sh
 
       - name: Upload Unit Test Results
@@ -97,44 +100,44 @@ jobs:
           ./configure
           make check-doc
 
-  proto-test:
-    name: Protocol Test Config
-    runs-on: ubuntu-22.04
-    timeout-minutes: 300
-    needs: [smoke-test]
-    strategy:
-      fail-fast: true
-      matrix:
-        include:
-          - {compiler: clang, db: sqlite3}
-          - {compiler: gcc, db: postgres}
-    steps:
-      - name: Checkout
-        uses: actions/checkout@v2.0.0
-      - name: Build and run
-        run: |
-          docker build -f contrib/docker/Dockerfile.ubuntu -t cln-ci-ubuntu .
-          docker run -e ARCH=${{ matrix.arch }} \
-          -e COMPILER=${{ matrix.compiler }} \
-          -e DB=${{ matrix.db }} \
-          -e NETWORK=${{ matrix.network }} \
-          -e TARGET_HOST=${{ matrix.TARGET_HOST }} \
-          -e VALGRIND=${{ matrix.valgrind }} \
-          -e DEVELOPER=1 \
-          -e EXPERIMENTAL_FEATURES=1 \
-          -e COMPAT=0 \
-          -e PYTEST_PAR=2 \
-          -e PYTEST_OPTS="--timeout=300" \
-          -e TEST_CMD="make check-protos" \
-          -e TEST_GROUP=1 \
-          -e TEST_GROUP_COUNT=1 \
-          cln-ci-ubuntu
-      - name: Upload Unit Test Results
-        if: always()
-        uses: actions/upload-artifact@v2
-        with:
-          name: Junit Report ${{ github.run_number }}.{{ matrix.cfg }}
-          path: report.*
+  # proto-test:
+  #   name: Protocol Test Config
+  #   runs-on: ubuntu-22.04
+  #   timeout-minutes: 300
+  #   needs: [smoke-test]
+  #   strategy:
+  #     fail-fast: true
+  #     matrix:
+  #       include:
+  #         - {compiler: clang, db: sqlite3}
+  #         - {compiler: gcc, db: postgres}
+  #   steps:
+  #     - name: Checkout
+  #       uses: actions/checkout@v2.0.0
+  #     - name: Build and run
+  #       run: |
+  #         docker build -f contrib/docker/Dockerfile.ubuntu -t cln-ci-ubuntu .
+  #         docker run -e ARCH=${{ matrix.arch }} \
+  #         -e COMPILER=${{ matrix.compiler }} \
+  #         -e DB=${{ matrix.db }} \
+  #         -e NETWORK=${{ matrix.network }} \
+  #         -e TARGET_HOST=${{ matrix.TARGET_HOST }} \
+  #         -e VALGRIND=${{ matrix.valgrind }} \
+  #         -e DEVELOPER=1 \
+  #         -e EXPERIMENTAL_FEATURES=1 \
+  #         -e COMPAT=0 \
+  #         -e PYTEST_PAR=2 \
+  #         -e PYTEST_OPTS="--timeout=300" \
+  #         -e TEST_CMD="make check-protos" \
+  #         -e TEST_GROUP=1 \
+  #         -e TEST_GROUP_COUNT=1 \
+  #         cln-ci-ubuntu
+  #     - name: Upload Unit Test Results
+  #       if: always()
+  #       uses: actions/upload-artifact@v2
+  #       with:
+  #         name: Junit Report ${{ github.run_number }}.{{ matrix.cfg }}
+  #         path: report.*
 
   normal-test:
     name: Normal Test Config ${{ matrix.cfg }}

.github/workflows/macos.yaml

@@ -20,8 +20,9 @@ jobs:
       - name: Install dependencies
         run: |
           export PATH="/usr/local/opt:/Users/runner/.local/bin:/Users/runner/Library/Python/3.10/bin:$PATH"
+
           export BITCOIN_VERSION=0.20.1
-          brew install wget python autoconf automake libtool python3 gmp gnu-sed gettext libsodium
+          brew install wget autoconf automake libtool python@3.10 gmp gnu-sed gettext libsodium
 
           (
             cd /tmp/
@@ -30,12 +31,11 @@ jobs:
             sudo mv bitcoin-$BITCOIN_VERSION/bin/* /usr/local/bin
           )
 
-          pip3 install --user poetry
-          poetry config virtualenvs.create false --local
-          poetry install
+          python3.10 -m pip install -U --user poetry wheel pip
+          python3.10 -m poetry install
+          python3.10 -m pip install -U --user mako
           
           ln -s /usr/local/Cellar/gettext/0.20.1/bin/xgettext /usr/local/opt
-          export PATH="/usr/local/opt:$PATH"
 
       - name: Build
         env:
@@ -53,7 +53,7 @@ jobs:
           TEST_GROUP_COUNT: ${{ matrix.TEST_GROUP_COUNT }}
           TEST_GROUP: ${{ matrix.TEST_GROUP }}
         run: |
-          export PATH="/usr/local/opt:/Users/runner/.local/bin:/Users/runner/Library/Python/3.10/bin:$PATH"
+          export PATH="/usr/local/opt:/Users/runner/.local/bin:/Users/runner/Library/Python/3.10/bin:/usr/local/opt:$PATH"
           export LDFLAGS="-L/usr/local/opt/sqlite/lib"
           export CPPFLAGS="-I/usr/local/opt/sqlite/include"
 
@@ -64,5 +64,5 @@ jobs:
               slow_test: marks tests as slow (deselect with '-m "not slow_test"')
           EOF
 
-          ./configure
-          make
+          python3.10 -m poetry run ./configure
+          python3.10 -m poetry run make

.gitignore

@@ -58,6 +58,7 @@ tests/plugins/test_selfdisable_after_getmanifest
 # Ignore generated files
 devtools/features
 doc/lightning*.[1578]
+doc/reckless*.[1578]
 *_sqlgen.[ch]
 *_wiregen.[ch]
 *_printgen.[ch]
@@ -70,6 +71,7 @@ tests/primitives_pb2_grpc.py
 # Ignore unrelated stuff
 .DS_Store
 .gdb_history
+.python-version
 
 # Rust targets
 target

.gitmodules

@@ -16,7 +16,7 @@
 	url = https://github.com/valyala/gheap
 [submodule "external/lnprototest"]
 	path = external/lnprototest
-	url = https://github.com/niftynei/lnprototest.git
+	url = https://github.com/rustyrussell/lnprototest.git
 	branch = nifty/ripemd160-fallback
 [submodule "external/lowdown"]
 	path = external/lowdown

.msggen.json

@@ -76,6 +76,7 @@
         },
         "ListfundsOutputsStatus": {
             "confirmed": 1,
+            "immature": 3,
             "spent": 2,
             "unconfirmed": 0
         },
@@ -271,6 +272,7 @@
             "CreateInvoice.bolt12": 3,
             "CreateInvoice.description": 7,
             "CreateInvoice.expires_at": 8,
+            "CreateInvoice.invreq_payer_note": 15,
             "CreateInvoice.label": 1,
             "CreateInvoice.local_offer_id": 13,
             "CreateInvoice.paid_at": 11,
@@ -335,6 +337,7 @@
             "DelInvoice.bolt12": 3,
             "DelInvoice.description": 5,
             "DelInvoice.expires_at": 8,
+            "DelInvoice.invreq_payer_note": 11,
             "DelInvoice.label": 1,
             "DelInvoice.local_offer_id": 9,
             "DelInvoice.payer_note": 10,
@@ -629,6 +632,7 @@
             "ListInvoices.invoices[].bolt12": 8,
             "ListInvoices.invoices[].description": 2,
             "ListInvoices.invoices[].expires_at": 5,
+            "ListInvoices.invoices[].invreq_payer_note": 15,
             "ListInvoices.invoices[].label": 1,
             "ListInvoices.invoices[].local_offer_id": 9,
             "ListInvoices.invoices[].paid_at": 13,
@@ -870,6 +874,7 @@
             "Pay.exclude": 10,
             "Pay.exemptfee": 7,
             "Pay.label": 3,
+            "Pay.localinvreqid": 14,
             "Pay.localofferid": 9,
             "Pay.maxdelay": 6,
             "Pay.maxfee": 11,
@@ -909,6 +914,7 @@
             "SendOnion.first_hop": 2,
             "SendOnion.groupid": 11,
             "SendOnion.label": 4,
+            "SendOnion.localinvreqid": 13,
             "SendOnion.localofferid": 10,
             "SendOnion.msatoshi": 8,
             "SendOnion.onion": 1,
@@ -936,6 +942,7 @@
             "SendPay.bolt11": 5,
             "SendPay.groupid": 9,
             "SendPay.label": 3,
+            "SendPay.localinvreqid": 11,
             "SendPay.localofferid": 8,
             "SendPay.msatoshi": 4,
             "SendPay.partid": 7,