Merge branch 'ElementsProject:master' into add-testnet4-support

Author: 2seaq

.github/workflows/bsd.yml

@@ -8,7 +8,7 @@ on:
 
 jobs:
   testfreebsd:
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-22.04
     name: Build and test on FreeBSD
     timeout-minutes: 120
     strategy:

.github/workflows/ci.yaml

@@ -77,6 +77,7 @@ jobs:
         run: |
           bash -x .github/scripts/setup.sh
           pip install -U pip wheel poetry
+          poetry self add poetry-plugin-export
           # Export and then use pip to install into the current env
           poetry export -o /tmp/requirements.txt --without-hashes --with dev
           pip install -r /tmp/requirements.txt
@@ -145,6 +146,7 @@ jobs:
         run: |
           set -e
           pip3 install --user pip wheel poetry
+          poetry self add poetry-plugin-export
           poetry export -o requirements.txt --with dev --without-hashes
           python3 -m pip install -r requirements.txt
           ./configure --enable-debugbuild CC="$COMPILER" ${{ matrix.COPTFLAGS_VAR }}
@@ -193,6 +195,7 @@ jobs:
           sudo apt-get update -qq
           sudo apt-get install -y -qq lowdown
           pip install -U pip wheel poetry
+          poetry self add poetry-plugin-export
           # Export and then use pip to install into the current env
           poetry export -o /tmp/requirements.txt --without-hashes --with dev
           pip install -r /tmp/requirements.txt
@@ -227,6 +230,7 @@ jobs:
         run: |
           bash -x .github/scripts/setup.sh
           pip install -U pip wheel poetry
+          poetry self add poetry-plugin-export
           # Export and then use pip to install into the current env
           poetry export -o /tmp/requirements.txt --without-hashes --with dev
           pip install -r /tmp/requirements.txt
@@ -242,7 +246,7 @@ jobs:
     timeout-minutes: 120
     env:
       RUST_PROFILE: release  # Has to match the one in the compile step
-      PYTEST_OPTS: --timeout=1200 --force-flaky
+      PYTEST_OPTS: --timeout=1200
     needs:
       - compile
     strategy:
@@ -349,7 +353,7 @@ jobs:
     env:
       RUST_PROFILE: release  # Has to match the one in the compile step
       CFG: compile-gcc
-      PYTEST_OPTS: --test-group-random-seed=42 --timeout=1800 --force-flaky
+      PYTEST_OPTS: --test-group-random-seed=42 --timeout=1800
     needs:
       - compile
     strategy:
@@ -418,7 +422,7 @@ jobs:
       RUST_PROFILE: release
       SLOW_MACHINE: 1
       TEST_DEBUG: 1
-      PYTEST_OPTS: --test-group-random-seed=42 --timeout=1800 --force-flaky
+      PYTEST_OPTS: --test-group-random-seed=42 --timeout=1800
     needs:
       - compile
     strategy:
@@ -482,7 +486,7 @@ jobs:
     timeout-minutes: 120
     env:
       RUST_PROFILE: release  # Has to match the one in the compile step
-      PYTEST_OPTS: --timeout=1200 --force-flaky
+      PYTEST_OPTS: --timeout=1200
     needs:
       - compile
     strategy:

.github/workflows/crate-io.yml

@@ -8,7 +8,7 @@ on:
 
 jobs:
   release_rust:
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-22.04
     steps:
       - uses: actions/checkout@v4
       - uses: dtolnay/rust-toolchain@stable

.github/workflows/docker-release.yml

@@ -29,7 +29,7 @@ on:
 
 jobs:
   build:
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-22.04
 
     steps:
     - name: Checkout repository

.github/workflows/macos.yaml

@@ -5,7 +5,7 @@ on:
 jobs:
   smoke-test:
     name: Smoke Test macOS
-    runs-on: macos-latest
+    runs-on: macos-14
     timeout-minutes: 120
     strategy:
       fail-fast: true
@@ -27,26 +27,20 @@ jobs:
 
       - name: Install dependencies
         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:/opt/homebrew/bin/python3.10/bin:$PATH"
 
-          brew install wget autoconf automake libtool [email protected] gnu-sed gettext libsodium protobuf
-
-          python3.10 -m pip install -U --user poetry wheel pip
+          brew install gnu-sed [email protected] autoconf automake libtool protobuf
+          python3.10 -m pip install -U --user poetry==1.8.0 wheel pip mako
           python3.10 -m poetry install
-          python3.10 -m pip install -U --user mako
-
-          sudo ln -s /usr/local/Cellar/gettext/0.20.1/bin/xgettext /usr/local/opt
 
-      - name: Build and install
+      - name: Build and install CLN
         run: |
           export CPATH=/opt/homebrew/include
           export LIBRARY_PATH=/opt/homebrew/lib
 
           python3.10 -m poetry run ./configure --disable-valgrind --disable-compat
           python3.10 -m poetry run make
 
-          # sudo PATH="/usr/local/opt:$PATH" LIBRARY_PATH=/opt/homebrew/lib CPATH=/opt/homebrew/include make install
-
       - name: Start bitcoind in regtest mode
         run: |
           bitcoind -regtest -daemon
@@ -58,11 +52,11 @@ jobs:
           bitcoin-cli -regtest generatetoaddress 1 $(bitcoin-cli -regtest getnewaddress)
           sleep 2
 
-      - name: Start lightningd in regtest mode
+      - name: Start CLN in regtest mode
         run: |
           lightningd/lightningd --network=regtest --log-file=/tmp/l1.log --daemon
           sleep 5
 
-      - name: Verify lightningd is running
+      - name: Verify CLN is running
         run: |
           cli/lightning-cli --regtest getinfo

.github/workflows/rdme-docs-sync.yml

@@ -10,7 +10,7 @@ on:
 
 jobs:
   rdme-docs-sync:  
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-22.04
     steps:
       - name: Check out repo 📚
         uses: actions/checkout@v4

.github/workflows/readme-rpc-sync.yml

@@ -15,7 +15,7 @@ on:
 
 jobs:
   rdme-rpc-sync:
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-22.04
     steps:
     - name: Checkout repository
       uses: actions/checkout@v4

.msggen.json

@@ -1809,6 +1809,7 @@
         "InjectpaymentonionRequest": {
             "InjectPaymentOnion.amount_msat": 3,
             "InjectPaymentOnion.cltv_expiry": 4,
+            "InjectPaymentOnion.destination_msat": 10,
             "InjectPaymentOnion.groupid": 6,
             "InjectPaymentOnion.invstring": 8,
             "InjectPaymentOnion.label": 7,
@@ -1820,7 +1821,8 @@
         "InjectpaymentonionResponse": {
             "InjectPaymentOnion.completed_at": 2,
             "InjectPaymentOnion.created_at": 1,
-            "InjectPaymentOnion.created_index": 3
+            "InjectPaymentOnion.created_index": 3,
+            "InjectPaymentOnion.payment_preimage": 4
         },
         "InvoiceRequest": {
             "Invoice.amount_msat": 10,
@@ -7547,6 +7549,10 @@
             "added": "v24.11",
             "deprecated": null
         },
+        "InjectPaymentOnion.destination_msat": {
+            "added": "v24.11.1",
+            "deprecated": null
+        },
         "InjectPaymentOnion.groupid": {
             "added": "v24.11",
             "deprecated": null
@@ -7575,6 +7581,10 @@
             "added": "v24.11",
             "deprecated": null
         },
+        "InjectPaymentOnion.payment_preimage": {
+            "added": "v24.11",
+            "deprecated": null
+        },
         "Invoice": {
             "added": "pre-v0.10.1",
             "deprecated": null

CHANGELOG.md

@@ -3,6 +3,35 @@ All notable changes to this project will be documented in this file.
 
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).
 
+## [24.11.1] - 2024-12-16: "The lightning-dev Mailing List II"
+
+Minor fixes, particularly for xpay users.
+
+### Changed
+
+ - JSON-RPC: `xpay` now gives the same JSON success return as documented by `pay` when `xpay-handle-pay` is set. ([#7938], [#7952])
+ - JSON-RPC: With `xpay-handle-pay` set, xpay will now be used even if `pay` uses maxfeeprecent or exemptfee parameters (e.g. Zeus) ([#7942])
+ - JSON-RPC: `xpay` now populates more fields, so `listsendpays` and `listpays` show `destination` and `amount_msat` fields for xpay payments. ([#7941])
+ - Logging: we no longer suppress DEBUG messages from subdaemons. ([#7935])
+
+### Fixed
+
+ - JSON-RPC: xpay now works through unannounced channels. ([#7937])
+ - lightning-cli: fix "malformed response" bug ([#7924])
+ - Plugins: `xpay` no longer logs "Got command" at info level. ([#7933])
+ - Build: Alpine/OpenBSD compilation fix  ([#7940])
+
+[#7942]: https://github.com/ElementsProject/lightning/pull/7942
+[#7933]: https://github.com/ElementsProject/lightning/pull/7933
+[#7941]: https://github.com/ElementsProject/lightning/pull/7941
+[#7937]: https://github.com/ElementsProject/lightning/pull/7937
+[#7924]: https://github.com/ElementsProject/lightning/pull/7924
+[#7935]: https://github.com/ElementsProject/lightning/pull/7935
+[#7938]: https://github.com/ElementsProject/lightning/pull/7938
+[#7940]: https://github.com/ElementsProject/lightning/pull/7940
+[#7952]: https://github.com/ElementsProject/lightning/pull/7952
+[24.11.1]: https://github.com/ElementsProject/lightning/releases/tag/v24.11.1
+
 ## [24.11] - 2024-12-09: "The lightning-dev Mailing List"
 
 This release named by Dusty Daemon.

Dockerfile

@@ -92,6 +92,7 @@ ENV PYTHON_VERSION=3
 RUN curl -sSL https://install.python-poetry.org | python3 -
 RUN update-alternatives --install /usr/bin/python python /usr/bin/python3.9 1
 RUN pip3 install --upgrade pip setuptools wheel
+RUN poetry self add poetry-plugin-export
 
 RUN wget -q https://zlib.net/fossils/zlib-1.2.13.tar.gz -O zlib.tar.gz && \
     wget -q https://www.sqlite.org/2019/sqlite-src-3290000.zip -O sqlite.zip
@@ -198,6 +199,7 @@ RUN ( ! [ "${target_host}" = "arm-linux-gnueabihf" ] ) || \
 # Ensure that the desired grpcio-tools & protobuf versions are installed
 # https://github.com/ElementsProject/lightning/pull/7376#issuecomment-2161102381
 RUN poetry lock --no-update && poetry install
+RUN poetry self add poetry-plugin-export
 
 # Ensure that git differences are removed before making bineries, to avoid `-modded` suffix
 # poetry.lock changed due to pyln-client, pyln-proto and pyln-testing version updates