Merge branch 'master' into fix-p2tr-dust-limit

Author: Andezion

.github/scripts/setup.sh

@@ -33,18 +33,18 @@ sudo apt-get -qq install --no-install-recommends --allow-unauthenticated -yy \
      libsodium-dev \
      libsqlite3-dev \
      libssl-dev \
+     pkg-config \
      libtool \
      libxml2-utils \
      locales \
      lowdown \
      net-tools \
      postgresql \
-     python-pkg-resources \
      python3 \
      python3-dev \
      python3-pip \
      python3-setuptools \
-     qemu \
+     qemu-system \
      qemu-system-arm \
      qemu-user-static \
      shellcheck \

.github/workflows/ci.yaml

@@ -21,8 +21,8 @@ env:
 jobs:
   prebuild:
     name: Pre-build checks
-    runs-on: ubuntu-22.04
-    timeout-minutes: 30
+    runs-on: ubuntu-24.04
+    timeout-minutes: 120
     if: |
       github.event.action != 'edited' ||
       contains(github.event.pull_request.body, 'Changelog')
@@ -107,7 +107,7 @@ jobs:
 
   compile:
     name: Compile CLN ${{ matrix.cfg }}
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-24.04
     timeout-minutes: 30
     needs:
       - prebuild
@@ -174,7 +174,7 @@ jobs:
     # The unit test checks are not in the critical path (not dependent
     # on the integration tests), so run them with `valgrind`
     name: Run unit tests
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-24.04
     timeout-minutes: 60
     env:
       BOLTDIR: bolts
@@ -219,7 +219,7 @@ jobs:
 
   check-fuzz:
     name: Run fuzz regression tests
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-24.04
     needs:
       - prebuild
     steps:
@@ -245,7 +245,7 @@ jobs:
 
   check-downgrade:
     name: Check we can downgrade the node
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-24.04
     needs:
       - compile
     strategy:
@@ -298,8 +298,8 @@ jobs:
         run: |
           mkdir /tmp/old-cln
           cd /tmp/old-cln
-          wget https://github.com/ElementsProject/lightning/releases/download/v25.09/clightning-v25.09-Ubuntu-22.04-amd64.tar.xz
-          tar -xaf clightning-v25.09-Ubuntu-22.04-amd64.tar.xz
+          wget https://github.com/ElementsProject/lightning/releases/download/v25.09/clightning-v25.09-ubuntu-24.04-amd64.tar.xz
+          tar -xaf clightning-v25.09-ubuntu-24.04-amd64.tar.xz
 
       - name: Switch network
         if: ${{ matrix.TEST_NETWORK == 'liquid-regtest' }}
@@ -333,7 +333,7 @@ jobs:
 
   integration:
     name: Test CLN ${{ matrix.name }}
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-24.04
     timeout-minutes: 120
     env:
       RUST_PROFILE: release # Has to match the one in the compile step
@@ -448,7 +448,7 @@ jobs:
 
   integration-valgrind:
     name: Valgrind Test CLN ${{ matrix.name }}
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-24.04
     timeout-minutes: 120
     env:
       RUST_PROFILE: release # Has to match the one in the compile step
@@ -535,7 +535,7 @@ jobs:
 
   integration-sanitizers:
     name: Sanitizers Test CLN
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-24.04
     timeout-minutes: 120
     env:
       RUST_PROFILE: release
@@ -625,7 +625,7 @@ jobs:
   update-docs-examples:
     name: Update examples in doc schemas (disabled temporarily!)
     if: false
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-24.04
     timeout-minutes: 30
     strategy:
       fail-fast: false
@@ -674,7 +674,7 @@ jobs:
 
   min-btc-support:
     name: Test minimum supported BTC v${{ matrix.MIN_BTC_VERSION }} with ${{ matrix.NAME }}
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-24.04
     timeout-minutes: 120
     env:
       RUST_PROFILE: release # Has to match the one in the compile step
@@ -759,7 +759,7 @@ jobs:
     # signals successful completion. Used for the PR status to pass
     # before merging.  Needs to run even if they failed!
     name: CI completion
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-24.04
     needs:
       - integration
       - check-units

.msggen.json

@@ -1625,6 +1625,7 @@
         "DisableofferResponse": {
             "DisableOffer.active": 2,
             "DisableOffer.bolt12": 4,
+            "DisableOffer.description": 7,
             "DisableOffer.label": 6,
             "DisableOffer.offer_id": 1,
             "DisableOffer.single_use": 3,
@@ -1643,6 +1644,7 @@
         "EnableofferResponse": {
             "EnableOffer.active": 2,
             "EnableOffer.bolt12": 4,
+            "EnableOffer.description": 7,
             "EnableOffer.label": 6,
             "EnableOffer.offer_id": 1,
             "EnableOffer.single_use": 3,
@@ -2859,6 +2861,7 @@
         "ListoffersOffers": {
             "ListOffers.offers[].active": 2,
             "ListOffers.offers[].bolt12": 4,
+            "ListOffers.offers[].description": 7,
             "ListOffers.offers[].label": 6,
             "ListOffers.offers[].offer_id": 1,
             "ListOffers.offers[].single_use": 3,
@@ -7061,6 +7064,10 @@
             "added": "pre-v0.10.1",
             "deprecated": null
         },
+        "DisableOffer.description": {
+            "added": "v26.04",
+            "deprecated": null
+        },
         "DisableOffer.label": {
             "added": "pre-v0.10.1",
             "deprecated": null
@@ -7109,6 +7116,10 @@
             "added": "v24.11",
             "deprecated": null
         },
+        "EnableOffer.description": {
+            "added": "v26.04",
+            "deprecated": null
+        },
         "EnableOffer.label": {
             "added": "v24.11",
             "deprecated": null
@@ -10569,6 +10580,10 @@
             "added": "pre-v0.10.1",
             "deprecated": null
         },
+        "ListOffers.offers[].description": {
+            "added": "v26.04",
+            "deprecated": null
+        },
         "ListOffers.offers[].label": {
             "added": "pre-v0.10.1",
             "deprecated": null

SECURITY.md

@@ -30,7 +30,8 @@ developers, and to validate signatures on releases:
 | Shahana Farooqui | `[email protected]` | 0CCA 8183 C13A 2389 A9C5  FD29 BFB0 1536 0049 CB56 |
 | Madeline Paech | `[email protected]` | 7169 D262 72B5 0A3F 531A  A1C2 A57A FC23 1B58 0804 |
 | Blockstream CLN Release | `[email protected]` | 616C 52F9 9D06 12B2 A151  B107 4129 A994 AA7E 9852 |
+| Sangbida Chaudhuri | `[email protected]` | 1A37 1C2C 3064 5FAA 91AA  6B7D B643 E612 8422 1961 |
 
-You can import a key by running the following command with that individual’s fingerprint: 
-`gpg --keyserver hkps://keys.openpgp.org --recv-keys "<fingerprint>"`. 
+You can import a key by running the following command with that individual’s fingerprint:
+`gpg --keyserver hkps://keys.openpgp.org --recv-keys "<fingerprint>"`.
 Ensure that you put quotes around fingerprints containing spaces.

cln-grpc/proto/node.proto

@@ -0,0 +1,52 @@
+-----BEGIN PGP PUBLIC KEY BLOCK-----
+
+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
+qeDZRbi+hw==
+=AyDJ
+-----END PGP PUBLIC KEY BLOCK-----