Skip to content

closingd: implement option_simple_close (BOLT2) #9104

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
nGoline wants to merge 7 commits into
base: master
Choose a base branch
from
Open

closingd: implement option_simple_close (BOLT2) #9104

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
7d5b641
tests: `add option_simple_close` integration tests
nGoline May 14, 2026
66cda50
common: add `OPT_SIMPLE_CLOSE` feature bit (60/61)
nGoline May 12, 2026
13edbf3
common/close_tx: add `create_simple_close_tx()` for `option_simple_cl…
nGoline May 1, 2026
edba7c5
channeld: reject `closing_complete` and `closing_sig` with a clear error
nGoline May 1, 2026
ce2d1e4
closingd: add `lightning_simpleclosed` for `option_simple_close`
nGoline May 1, 2026
1db4760
lightningd: wire up `option_simple_close` master-side handling
nGoline May 1, 2026
aa8a412
test: add run-close_tx to validate simple-close transaction functiona…
nGoline May 4, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 17 additions & 0 deletions .msggen.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2463,6 +2463,7 @@
"ListConfigs.configs.experimental-onion-messages": 23,
"ListConfigs.configs.experimental-peer-storage": 26,
"ListConfigs.configs.experimental-shutdown-wrong-funding": 25,
"ListConfigs.configs.experimental-simple-close": 76,
"ListConfigs.configs.experimental-splicing": 22,
"ListConfigs.configs.fee-base": 39,
"ListConfigs.configs.fee-per-satoshi": 41,
Expand Down Expand Up @@ -2652,6 +2653,10 @@
"ListConfigs.configs.experimental-shutdown-wrong-funding.set": 1,
"ListConfigs.configs.experimental-shutdown-wrong-funding.source": 2
},
"ListconfigsConfigsExperimental-simple-close": {
"ListConfigs.configs.experimental-simple-close.set": 1,
"ListConfigs.configs.experimental-simple-close.source": 2
},
"ListconfigsConfigsExperimental-splicing": {
"ListConfigs.configs.experimental-splicing.set": 1,
"ListConfigs.configs.experimental-splicing.source": 2
Expand Down Expand Up @@ -10005,6 +10010,18 @@
"added": "pre-v0.10.1",
"deprecated": null
},
"ListConfigs.configs.experimental-simple-close": {
"added": "v26.08",
"deprecated": null
},
"ListConfigs.configs.experimental-simple-close.set": {
"added": "v26.08",
"deprecated": null
},
"ListConfigs.configs.experimental-simple-close.source": {
"added": "v26.08",
"deprecated": null
},
"ListConfigs.configs.experimental-splicing": {
"added": "v23.08",
"deprecated": "v26.04"
Expand Down
9 changes: 7 additions & 2 deletions channeld/channeld.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5205,21 +5205,26 @@ static void peer_in(struct peer *peer, const u8 *msg)
case WIRE_TX_ABORT:
check_tx_abort(peer, msg, NULL);
return;
case WIRE_CLOSING_COMPLETE:
case WIRE_CLOSING_SIG:
case WIRE_INIT:
case WIRE_OPEN_CHANNEL:
case WIRE_ACCEPT_CHANNEL:
case WIRE_FUNDING_CREATED:
case WIRE_FUNDING_SIGNED:
case WIRE_CLOSING_SIGNED:
case WIRE_CLOSING_COMPLETE:
case WIRE_CLOSING_SIG:
case WIRE_TX_ADD_INPUT:
case WIRE_TX_REMOVE_INPUT:
case WIRE_TX_ADD_OUTPUT:
case WIRE_TX_REMOVE_OUTPUT:
case WIRE_TX_COMPLETE:
case WIRE_OPEN_CHANNEL2:
case WIRE_ACCEPT_CHANNEL2:
peer_failed_warn(peer->pps, &peer->channel_id,
"Peer sent unexpected message %s",
peer_wire_name(type));
return;

case WIRE_TX_SIGNATURES:
handle_unexpected_tx_sigs(peer, msg);
return;
Expand Down
6 changes: 6 additions & 0 deletions cln-grpc/proto/node.proto
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

11 changes: 11 additions & 0 deletions cln-grpc/src/convert.rs
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

9 changes: 9 additions & 0 deletions cln-rpc/src/model.rs
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

21 changes: 16 additions & 5 deletions closingd/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,15 +8,26 @@ CLOSINGD_SRC := closingd/closingd.c \
CLOSINGD_OBJS := $(CLOSINGD_SRC:.c=.o)
$(CLOSINGD_OBJS): $(CLOSINGD_HEADERS)

# Simple close daemon
SIMPLECLOSED_HEADERS := closingd/simpleclosed_wiregen.h

SIMPLECLOSED_SRC := closingd/simpleclosed.c \
$(SIMPLECLOSED_HEADERS:.h=.c)

SIMPLECLOSED_OBJS := $(SIMPLECLOSED_SRC:.c=.o)
$(SIMPLECLOSED_OBJS): $(SIMPLECLOSED_HEADERS)

# Make sure these depend on everything.
ALL_C_SOURCES += $(CLOSINGD_SRC)
ALL_C_HEADERS += $(CLOSINGD_HEADERS)
ALL_PROGRAMS += lightningd/lightning_closingd
ALL_C_SOURCES += $(CLOSINGD_SRC) $(SIMPLECLOSED_SRC)
ALL_C_HEADERS += $(CLOSINGD_HEADERS) $(SIMPLECLOSED_HEADERS)
ALL_PROGRAMS += lightningd/lightning_closingd lightningd/lightning_simpleclosed

# Here's what lightningd depends on
LIGHTNINGD_CONTROL_HEADERS += closingd/closingd_wiregen.h
LIGHTNINGD_CONTROL_OBJS += closingd/closingd_wiregen.o
LIGHTNINGD_CONTROL_HEADERS += closingd/closingd_wiregen.h closingd/simpleclosed_wiregen.h
LIGHTNINGD_CONTROL_OBJS += closingd/closingd_wiregen.o closingd/simpleclosed_wiregen.o

lightningd/lightning_closingd: $(CLOSINGD_OBJS) $(HSMD_CLIENT_OBJS) libcommon.a

lightningd/lightning_simpleclosed: $(SIMPLECLOSED_OBJS) $(HSMD_CLIENT_OBJS) libcommon.a

-include closingd/test/Makefile
Loading
Loading