Merge pull request #1 from ElementsProject/master

Wizgucci

Author: wizgucci

.dockerignore

@@ -1,3 +1,6 @@
 Dockerfile
 contrib/docker/Dockerfile.*
 target
+config.vars
+release/
+.venv/

.github/PULL_REQUEST_TEMPLATE.md

@@ -1,10 +1,10 @@
 > [!IMPORTANT]
 >
-> 25.09 FREEZE July 28TH: Non-bugfix PRs not ready by this date will wait for 25.12.
+> 25.12 FREEZE October 27th: Non-bugfix PRs not ready by this date will wait for 26.03.
 >
-> RC1 is scheduled on _August 11th_
+> RC1 is scheduled on _November 10th_
 >
-> The final release is scheduled for September 1st.
+> The final release is scheduled for December 1st.
 
 
 ## Checklist

.github/workflows/ci.yaml

@@ -5,7 +5,7 @@ on:
     branches:
       - "master"
   pull_request:
-
+    types: [opened, synchronize, edited]
 concurrency:
   group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.ref }}
   cancel-in-progress: true
@@ -22,6 +22,9 @@ jobs:
     name: Pre-build checks
     runs-on: ubuntu-22.04
     timeout-minutes: 30
+    if: |
+      github.event.action != 'edited' || 
+      contains(github.event.pull_request.body, 'Changelog')
     env:
       BOLTDIR: bolts
     strategy:
@@ -594,25 +597,6 @@ jobs:
           cat config.vars
           VALGRIND=0 uv run eatmydata pytest tests/ -vvv -n ${PYTEST_PAR} ${PYTEST_OPTS}
 
-  check-flake:
-    name: Check Nix Flake
-    runs-on: ubuntu-22.04
-    strategy:
-      fail-fast: true
-    steps:
-      - name: Checkout
-        uses: actions/checkout@v4
-        with:
-          submodules: "recursive"
-      - name: Check Nix flake inputs
-        uses: DeterminateSystems/flake-checker-action@v8
-      - name: Install Nix
-        uses: cachix/install-nix-action@V27
-        with:
-          nix_path: nixpkgs=channel:nixos-24.05
-      - name: Check flake
-        run: nix flake check .?submodules=1#
-
   gather:
     # A dummy task that depends on the full matrix of tests, and
     # signals successful completion. Used for the PR status to pass
@@ -625,19 +609,17 @@ jobs:
       - integration-valgrind
       - integration-sanitizers
       - min-btc-support
-      - check-flake
     if: ${{ always() }}
     steps:
       - name: Complete
         env:
-          JOB_NAMES: "INTEGRATION CHECK_UNITS VALGRIND SANITIZERS BTC FLAKE"
+          JOB_NAMES: "INTEGRATION CHECK_UNITS VALGRIND SANITIZERS BTC"
           INTEGRATION: ${{ needs.integration.result }}
           CHECK_UNITS: ${{ needs['check-units'].result }}
           VALGRIND: ${{ needs['integration-valgrind'].result }}
           SANITIZERS: ${{ needs['integration-sanitizers'].result }}
           DOCS: ${{ needs['update-docs-examples'].result }}
           BTC: ${{ needs['min-btc-support'].result }}
-          FLAKE: ${{ needs['check-flake'].result }}
         run: |
           failed=""
           for name in $JOB_NAMES; do

.github/workflows/pypi.yml

@@ -67,6 +67,13 @@ jobs:
     - name: Install uv
       uses: astral-sh/setup-uv@v5
 
+    - name: Update pyln versions
+      id: update-versions
+      run: |
+        export VERSION=$(git describe --tags --abbrev=0)
+        echo "Pyln VERSION: $VERSION"
+        make update-pyln-versions NEW_VERSION=$VERSION
+
     - name: Publish distribution 📦 to Test PyPI
       if: github.repository == 'ElementsProject/lightning' && steps.set-values.outputs.DISTLOCATION == 'test'
       env:
@@ -75,7 +82,7 @@ jobs:
       run: |
         echo "Pyln VERSION: $VERSION"
         uv build --package ${{ matrix.PACKAGE }}
-        uv publish --package ${{ matrix.PACKAGE }} --publish-url https://test.pypi.org/legacy/ --skip-existing
+        uv publish --publish-url https://test.pypi.org/legacy/ --check-url https://test.pypi.org/simple/
 
     - name: Publish distribution 📦 to PyPI
       if: github.repository == 'ElementsProject/lightning' && steps.set-values.outputs.DISTLOCATION == 'prod'
@@ -84,10 +91,6 @@ jobs:
         WORKDIR: ${{ matrix.WORKDIR }}
       run: |
         echo "UV VERSION PUBLISH: $(uv --version)"
-        cd ${{ env.WORKDIR }}
-        export VERSION=$(git describe --tags --abbrev=0)
         echo "Pyln VERSION: $VERSION"
-        make upgrade-version NEW_VERSION=$VERSION
-        cd /github/workspace
         uv build --package ${{ matrix.PACKAGE }}
-        uv publish --package ${{ matrix.PACKAGE }}
+        uv publish

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

@@ -29,6 +29,9 @@ jobs:
       run: |
         python -m pip install requests mako grpcio-tools
 
+    - name: Install uv
+      uses: astral-sh/setup-uv@v5
+
     - name: Install dependencies
       run: bash -x .github/scripts/setup.sh
 

.github/workflows/release.yml

@@ -31,8 +31,6 @@ jobs:
         uses: actions/checkout@v4
         with:
           ref: ${{ github.ref }}
-          fetch-depth: 0
-          fetch-tags: true
 
       - name: Determine version
         run: |
@@ -69,8 +67,6 @@ jobs:
     steps:
       - name: Git checkout
         uses: actions/checkout@v4
-        with:
-          fetch-tags: true
 
       # tools/build-release.sh requires lowdown
       - name: Prepare base environment
@@ -129,8 +125,6 @@ jobs:
     steps:
       - name: Git checkout
         uses: actions/checkout@v4
-        with:
-          fetch-tags: true
 
       - name: Download artifact
         uses: actions/download-artifact@v4
@@ -154,7 +148,7 @@ jobs:
           sudo apt-get install -y lowdown
           ./configure
           tools/build-release.sh --without-zip sign
-          mv release/SHA256SUMS.asc${{ steps.gpg.outputs.keyid  }} release/SHA256SUMS.asc
+          mv release/SHA256SUMS.${{ env.version }}.asc${{ steps.gpg.outputs.keyid  }} release/SHA256SUMS.${{ env.version }}.asc
 
       - name: Upload signed artifact
         uses: actions/upload-artifact@v4

.msggen.json

@@ -439,7 +439,8 @@
             "ipv6": 2,
             "local socket": 0,
             "torv2": 3,
-            "torv3": 4
+            "torv3": 4,
+            "websocket": 5
         },
         "PeerConnectDirection": {
             "in": 0,
@@ -547,6 +548,8 @@
             "pending": 0
         },
         "WaitSubsystem": {
+            "chainmoves": 4,
+            "channelmoves": 5,
             "forwards": 1,
             "htlcs": 3,
             "invoices": 0,
@@ -3143,6 +3146,8 @@
             "Offer.description": 2,
             "Offer.issuer": 3,
             "Offer.label": 4,
+            "Offer.optional_recurrence": 14,
+            "Offer.proportional_amount": 13,
             "Offer.quantity_max": 5,
             "Offer.recurrence": 7,
             "Offer.recurrence_base": 8,
@@ -3714,6 +3719,16 @@
             "UtxoPsbt.psbt": 1,
             "UtxoPsbt.reservations[]": 6
         },
+        "WaitChainmoves": {
+            "Wait.chainmoves.account": 1,
+            "Wait.chainmoves.credit_msat": 2,
+            "Wait.chainmoves.debit_msat": 3
+        },
+        "WaitChannelmoves": {
+            "Wait.channelmoves.account": 1,
+            "Wait.channelmoves.credit_msat": 2,
+            "Wait.channelmoves.debit_msat": 3
+        },
         "WaitDetails": {
             "Wait.details.bolt11": 4,
             "Wait.details.bolt12": 5,
@@ -3757,6 +3772,8 @@
             "Wait.subsystem": 1
         },
         "WaitResponse": {
+            "Wait.chainmoves": 10,
+            "Wait.channelmoves": 11,
             "Wait.created": 2,
             "Wait.deleted": 4,
             "Wait.details": 5,
@@ -11323,6 +11340,14 @@
             "added": "pre-v0.10.1",
             "deprecated": null
         },
+        "Offer.optional_recurrence": {
+            "added": "v25.09",
+            "deprecated": null
+        },
+        "Offer.proportional_amount": {
+            "added": "v25.09",
+            "deprecated": null
+        },
         "Offer.quantity_max": {
             "added": "pre-v0.10.1",
             "deprecated": null
@@ -12891,6 +12916,38 @@
             "added": "v23.08",
             "deprecated": null
         },
+        "Wait.chainmoves": {
+            "added": "v25.09",
+            "deprecated": null
+        },
+        "Wait.chainmoves.account": {
+            "added": "v25.09",
+            "deprecated": null
+        },
+        "Wait.chainmoves.credit_msat": {
+            "added": "v25.09",
+            "deprecated": null
+        },
+        "Wait.chainmoves.debit_msat": {
+            "added": "v25.09",
+            "deprecated": null
+        },
+        "Wait.channelmoves": {
+            "added": "v25.09",
+            "deprecated": null
+        },
+        "Wait.channelmoves.account": {
+            "added": "v25.09",
+            "deprecated": null
+        },
+        "Wait.channelmoves.credit_msat": {
+            "added": "v25.09",
+            "deprecated": null
+        },
+        "Wait.channelmoves.debit_msat": {
+            "added": "v25.09",
+            "deprecated": null
+        },
         "Wait.created": {
             "added": "pre-v0.10.1",
             "deprecated": null

.version

@@ -1 +1 @@
-25.05
+25.09