Skip to content

Commit baccaa2

Browse files
committed
Merge branch 'ElementsProject:master' into bolt-quote-update
2 parents 377d3d7 + eba035f commit baccaa2

13 files changed

Lines changed: 41 additions & 14 deletions

File tree

.github/workflows/ci.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,8 +28,6 @@ jobs:
2828
if: |
2929
github.event.action != 'edited' ||
3030
contains(github.event.pull_request.body, 'Changelog')
31-
env:
32-
BOLTDIR: bolts
3331
strategy:
3432
fail-fast: true
3533
steps:
@@ -197,6 +195,8 @@ jobs:
197195
runs-on: ubuntu-24.04
198196
needs:
199197
- compile
198+
env:
199+
BOLTDIR: bolts
200200
strategy:
201201
matrix:
202202
CFG: [compile-gcc]

.version

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
v26.04
1+
v26.04.1

CHANGELOG.md

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,19 @@ All notable changes to this project will be documented in this file.
44

55
The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).
66

7+
## [26.04.1] - 2026-04-24: "Negative Routing Fees II"
8+
9+
This point release is recommended: it fixes a build failure in some environments and a gossip protocol issue.
10+
11+
### Fixed
12+
13+
- **Protocol:** we now reject `channel_announcement` messages where `node_id_1` is not lexicographically less than `node_id_2` (per BOLT; see [lightning/bolts#1333](https://github.com/lightning/bolts/pull/1333)), so malformed announcements no longer stress the gossip store and other readers. ([#9082])
14+
- **Build:** correct `printf` format for the splice transaction weight log line (`%zu` for `size_t`), fixing a `-Werror` / `-Wformat` failure (for example in the `linux/amd64` Docker image build). ([#9083])
15+
16+
[#9082]: https://github.com/ElementsProject/lightning/pull/9082
17+
[#9083]: https://github.com/ElementsProject/lightning/pull/9083
18+
[26.04.1]: https://github.com/ElementsProject/lightning/releases/tag/v26.04.1
19+
720
## [26.04] - 2026-04-20: Negative Routing Fees
821

922
This release is named by @Chand-ra.

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
from .gossmapstats import GossmapStats
55
from .version import NodeVersion
66

7-
__version__ = "v26.04"
7+
__version__ = "v26.04.1"
88

99
__all__ = [
1010
"LightningRpc",

contrib/pyln-client/pyproject.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
[project]
22
name = "pyln-client"
3-
version = "v26.04"
3+
version = "v26.04.1"
44
description = "Client library and plugin library for Core Lightning"
55
authors = [{ name = "Christian Decker", email = "decker.christian@gmail.com" }]
66
license = { text = "BSD-MIT" }

contrib/pyln-proto/pyln/proto/__init__.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
from .onion import OnionPayload, TlvPayload, LegacyOnionPayload
55
from .wire import LightningConnection, LightningServerSocket
66

7-
__version__ = "v26.04"
7+
__version__ = "v26.04.1"
88

99
__all__ = [
1010
"Invoice",

contrib/pyln-proto/pyproject.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
[project]
22
name = "pyln-proto"
3-
version = "v26.04"
3+
version = "v26.04.1"
44
description = "This package implements some of the Lightning Network protocol in pure python. It is intended for protocol testing and some minor tooling only. It is not deemed secure enough to handle any amount of real funds (you have been warned!)."
55
authors = [
66
{name = "Christian Decker", email = "decker.christian@gmail.com"}

contrib/pyln-testing/pyln/testing/__init__.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
__version__ = "v26.04"
1+
__version__ = "v26.04.1"
22

33
__all__ = [
44
"__version__",

contrib/pyln-testing/pyproject.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
[project]
22
name = "pyln-testing"
3-
version = "v26.04"
3+
version = "v26.04.1"
44
description = "Test your Core Lightning integration, plugins or whatever you want"
55
authors = [{ name = "Christian Decker", email = "decker.christian@gmail.com" }]
66
license = { text = "BSD-MIT" }

gossipd/gossmap_manage.c

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -648,6 +648,20 @@ const char *gossmap_manage_channel_announcement(const tal_t *ctx,
648648
tal_hex(tmpctx, announce));
649649
}
650650

651+
/* BOLT-gossip-node-check #7:
652+
* The receiving node:
653+
*...
654+
* - if `node_id_1` is not lexicographically less than `node_id_2`:
655+
* - SHOULD send a `warning`.
656+
* - MAY close the connection.
657+
* - MUST ignore the message.
658+
*/
659+
if (!(node_id_cmp(&node_id_1, &node_id_2) < 0)) {
660+
return tal_fmt(ctx, "node_id_1 must be the lesser node id! 1=%s, 2=%s",
661+
fmt_node_id(tmpctx, &node_id_1),
662+
fmt_node_id(tmpctx, &node_id_2));
663+
}
664+
651665
/* If a prior txout lookup failed there is little point it trying
652666
* again. Just drop the announcement and walk away whistling.
653667
*

0 commit comments

Comments
 (0)