Merge branch 'master' into flake-update

Author: JosephGoulden

.github/workflows/pypi.yml

@@ -75,7 +75,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'
@@ -87,7 +87,7 @@ jobs:
         cd ${{ env.WORKDIR }}
         export VERSION=$(git describe --tags --abbrev=0)
         echo "Pyln VERSION: $VERSION"
-        make upgrade-version NEW_VERSION=$VERSION
+        make update-pyln-versions NEW_VERSION=$VERSION
         cd /github/workspace
         uv build --package ${{ matrix.PACKAGE }}
-        uv publish --package ${{ matrix.PACKAGE }}
+        uv publish

.version

@@ -1 +1 @@
-25.09rc4
+25.09

CHANGELOG.md

@@ -3,7 +3,7 @@
 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/).
-## [25.09rc4] - 2025-08-28: "Hot Wallet Guardian"
+## [25.09] - 2025-09-01: "Hot Wallet Guardian"
 
 This release named by @king-11.
 
@@ -119,7 +119,7 @@ Note: You should always set `allow-deprecated-apis=false` to test for changes.
 [#7344]: https://github.com/ElementsProject/lightning/pull/7344
 [#8410]: https://github.com/ElementsProject/lightning/pull/8410
 [#8249]: https://github.com/ElementsProject/lightning/pull/8249
-[25.09rc4]: https://github.com/ElementsProject/lightning/releases/tag/v25.09rc4
+[25.09]: https://github.com/ElementsProject/lightning/releases/tag/v25.09
 
 
 

Dockerfile

@@ -89,14 +89,9 @@ RUN apt-get update -qq && \
         tclsh
 
 ENV PATH="/root/.local/bin:$PATH" \
-    PYTHON_VERSION=3 \
-    POETRY_VERSION=2.0.1
-RUN curl -sSL https://install.python-poetry.org | python3 - && \
-    poetry self add poetry-plugin-export
-RUN mkdir -p /root/.venvs && \
-    python3 -m venv /root/.venvs/cln && \
-    . /root/.venvs/cln/bin/activate && \
-    pip3 install --upgrade pip setuptools wheel
+    PYTHON_VERSION=3
+RUN wget -qO- https://astral.sh/uv/install.sh | sh && \
+    && uv sync --all-extras --all-groups
 
 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 && \
@@ -108,13 +103,6 @@ RUN git clone --recursive /tmp/lightning . && \
     git checkout $(git --work-tree=/tmp/lightning --git-dir=/tmp/lightning/.git rev-parse HEAD)
 
 # Do not build python plugins here, python doesn't support cross compilation.
-RUN poetry lock && \
-    poetry export -o requirements.txt --without-hashes
-RUN mkdir -p /root/.venvs && \
-    python3 -m venv /root/.venvs/cln && \
-    . /root/.venvs/cln/bin/activate && \
-    pip3 install -r requirements.txt && \
-    pip3 cache purge
 WORKDIR /
 
 FROM base-builder AS base-builder-linux-amd64
@@ -228,46 +216,14 @@ RUN ( ! [ -n "${target_host}" ] ) || \
 RUN ( ! [ "${target_host}" = "arm-linux-gnueabihf" ] ) || \
     (sed -i '/documentation = "https:\/\/docs.rs\/cln-grpc"/a include = ["**\/*.*"]' cln-grpc/Cargo.toml)
 
-# Ensure that the desired grpcio-tools & protobuf versions are installed
-# https://github.com/ElementsProject/lightning/pull/7376#issuecomment-2161102381
-RUN poetry lock && poetry install && \
-    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
 RUN git reset --hard HEAD
 
-RUN ./configure --prefix=/tmp/lightning_install --enable-static && poetry run make install
+RUN ./configure --prefix=/tmp/lightning_install --enable-static && uv run make install
 
 WORKDIR /opt/lightningd
 RUN echo 'RUSTUP_INSTALL_OPTS="${RUSTUP_INSTALL_OPTS}"' > /tmp/rustup_install_opts.txt
 
-# We need to build python plugins on the target's arch because python doesn't support cross build
-FROM ${BASE_DISTRO} AS builder-python
-RUN apt-get update -qq && \
-    apt-get install -qq -y --no-install-recommends \
-        git \
-        curl \
-        libtool \
-        pkg-config \
-        autoconf \
-        automake \
-        build-essential \
-        libffi-dev \
-        libssl-dev \
-        python3 \
-        python3-dev \
-        python3-pip \
-        python3-venv && \
-    apt-get clean && \
-    rm -rf /var/lib/apt/lists/*
-
-ENV PYTHON_VERSION=3
-RUN mkdir -p /root/.venvs && \
-    python3 -m venv /root/.venvs/cln && \
-    . /root/.venvs/cln/bin/activate && \
-    pip3 install --upgrade pip setuptools wheel
-
 # Copy rustup_install_opts.txt file from builder
 COPY --from=builder /tmp/rustup_install_opts.txt /tmp/rustup_install_opts.txt
 # Setup ENV $RUSTUP_INSTALL_OPTS for this stage
@@ -286,7 +242,6 @@ RUN apt-get update && \
       inotify-tools \
       jq \
       python3 \
-      python3-pip && \
     apt-get clean && \
     rm -rf /var/lib/apt/lists/*
 

Makefile

@@ -756,13 +756,16 @@ clean: obsclean
 
 # See doc/contribute-to-core-lightning/contributor-workflow.md
 PYLNS=client proto testing
-update-versions: update-pyln-versions update-reckless-version update-dot-version update-doc-examples
+update-versions: update-pyln-versions update-reckless-version update-dot-version # FIXME: update-doc-examples
+	@uv lock
+
 update-pyln-versions: $(PYLNS:%=update-pyln-version-%)
 
 update-pyln-version-%:
 	@if [ -z "$(NEW_VERSION)" ]; then echo "Set NEW_VERSION!" >&2; exit 1; fi
 	@echo "Updating contrib/pyln-$* to $(NEW_VERSION)"
 	@sed -i.bak 's/^version = .*/version = "$(NEW_VERSION)"/' contrib/pyln-$*/pyproject.toml && rm contrib/pyln-$*/pyproject.toml.bak
+	@sed -i.bak 's/^__version__ = .*/__version__ = "$(NEW_VERSION)"/' contrib/pyln-$*/pyln/$*/__init__.py && rm contrib/pyln-$*/pyln/$*/__init__.py.bak
 
 pyln-release:  $(PYLNS:%=pyln-release-%)
 

connectd/multiplex.c

@@ -1093,6 +1093,7 @@ static struct io_plan *write_to_peer(struct io_conn *peer_conn,
 		if (!msg) {
 			/* Tell them to read again, */
 			io_wake(&peer->subds);
+			io_wake(&peer->peer_in);
 
 			/* Wait for them to wake us */
 			return msg_queue_wait(peer_conn, peer->peer_outq,
@@ -1266,8 +1267,11 @@ static struct io_plan *read_body_from_peer_done(struct io_conn *peer_conn,
 	       return next_read(peer_conn, peer);
 
        /* If we swallow this, just try again. */
-       if (handle_message_locally(peer, decrypted))
-	       return next_read(peer_conn, peer);
+       if (handle_message_locally(peer, decrypted)) {
+	       /* Make sure to update peer->peer_in_lastmsg so we blame correct msg! */
+	       io_wake(peer->peer_outq);
+	       goto out;
+       }
 
        /* After this we should be able to match to subd by channel_id */
        if (!extract_channel_id(decrypted, &channel_id)) {
@@ -1334,6 +1338,7 @@ static struct io_plan *read_body_from_peer_done(struct io_conn *peer_conn,
 
        /* Wait for them to wake us */
        peer->peer_in_lastmsg = type;
+out:
        peer->peer_in_lasttime = time_mono();
 
        return io_wait(peer_conn, &peer->peer_in, next_read, peer);

contrib/docker/Dockerfile.builder.fedora

@@ -1,6 +1,8 @@
 FROM fedora:35
 
+ENV UV_PYTHON=3.12
 ENV BITCOIN_VERSION=27.1
+
 WORKDIR /tmp
 
 RUN dnf update -y && \
@@ -10,11 +12,6 @@ RUN dnf update -y && \
 	dnf install -y \
 		clang \
 		libsq3-devel \
-		python3-devel \
-		python3-mako \
-        python3-pip \
-        python3-virtualenv \
-		python3-setuptools \
 		redhat-lsb \
 		net-tools \
 		valgrind \
@@ -26,18 +23,15 @@ RUN dnf update -y && \
 		cargo && \
 	dnf clean all
 
-RUN python3 -m pip install uv
-
-RUN wget https://bitcoincore.org/bin/bitcoin-core-$BITCOIN_VERSION/bitcoin-$BITCOIN_VERSION-x86_64-linux-gnu.tar.gz -O bitcoin.tar.gz && \
+RUN wget https://storage.googleapis.com/c-lightning-tests/bitcoind/bitcoin-${BITCOIN_VERSION}-x86_64-linux-gnu.tar.gz \
+    -O bitcoin.tar.gz && \
     tar -xvzf bitcoin.tar.gz && \
     mv bitcoin-$BITCOIN_VERSION/bin/bitcoin* /usr/local/bin/ && \
     mv bitcoin-$BITCOIN_VERSION/lib/* /usr/local/lib/ && \
     mv bitcoin-$BITCOIN_VERSION/include/* /usr/local/include/ && \
     mv bitcoin-$BITCOIN_VERSION/share/man/man1/* /usr/share/man/man1 && \
     rm -rf bitcoin.tar.gz bitcoin-$BITCOIN_VERSION
 
-ENV PATH=/opt/venv/bin:${PATH}
-RUN python3 -m pip install pip wheel && \
-    python3 -m virtualenv /opt/venv && \
-    /opt/venv/bin/python3 -m pip install --force-reinstall -U pip poetry wheel
-RUN poetry self add poetry-plugin-export
+# Ensure `uv` can be found
+ENV PATH=${PATH}:/root/.local/bin
+RUN wget -qO- https://astral.sh/uv/install.sh | sh

contrib/keys/madel.txt

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

contrib/pyln-client/pyln/client/__init__.py

@@ -4,7 +4,7 @@
 from .gossmapstats import GossmapStats
 from .version import NodeVersion
 
-__version__ = "25.09rc4"
+__version__ = "25.09"
 
 __all__ = [
     "LightningRpc",

contrib/pyln-client/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "pyln-client"
-version = "25.09rc4"
+version = "25.09"
 description = "Client library and plugin library for Core Lightning"
 authors = [{ name = "Christian Decker", email = "decker.christian@gmail.com" }]
 license = { text = "BSD-MIT" }