From 46fb007ea0070ec2d8074b0ba01259661c4fdd7b Mon Sep 17 00:00:00 2001 From: Rusty Russell Date: Tue, 24 Jun 2025 10:02:39 +0930 Subject: [PATCH] lightningd: remove experimental-anchors / experimental-onion-messages. Changelog-Removed: Config: `experimental-anchors` and `experimental-onion-messages` (deprecated 24.02 / 24.08, disabled v25.05). Signed-off-by: Rusty Russell --- doc/developers-guide/deprecations.md | 2 -- lightningd/options.c | 22 ---------------------- 2 files changed, 24 deletions(-) diff --git a/doc/developers-guide/deprecations.md b/doc/developers-guide/deprecations.md index 1b80b1607..54a5f8e81 100644 --- a/doc/developers-guide/deprecations.md +++ b/doc/developers-guide/deprecations.md @@ -8,8 +8,6 @@ hidden: false | Name | Type | First Deprecated | Last Supported | Description | |--------------------------------------|--------------------|------------------|----------------|---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------| | listpeers.features.option_anchors_zero_fee_htlc_tx | Field | v24.08 | v25.09 | Renamed to `option_anchors` in the spec: check for that in `features` instead | -| experimental-anchors | Config | v24.02 | v25.02 | Now the default | -| experimental-onion-messages | Config | v24.08 | v25.02 | Now the default | | decode.blinding | Field | v24.11 | v25.05 | Renamed to `first_path_key` in BOLT 4 (available in `decode` from v24.11) | | onion_message_recv.blinding | Hook Field | v24.11 | v25.05 | Renamed to `first_path_key` in BOLT 4 (available in hook from v24.11) | | decodepay | Command | v24.11 | v25.12 | Use `decode` which is more powerful (since v23.05) | diff --git a/lightningd/options.c b/lightningd/options.c index b5fd419bb..115c7ded7 100644 --- a/lightningd/options.c +++ b/lightningd/options.c @@ -1233,14 +1233,6 @@ static char *opt_set_splicing(struct lightningd *ld) return NULL; } -static char *opt_set_onion_messages(struct lightningd *ld) -{ - if (!opt_deprecated_ok(ld, "experimental-onion-messages", NULL, - "v24.08", "v25.02")) - return "--experimental-onion-message is now enabled by default"; - return NULL; -} - static char *opt_set_shutdown_wrong_funding(struct lightningd *ld) { feature_set_or(ld->our_features, @@ -1265,14 +1257,6 @@ static char *opt_set_quiesce(struct lightningd *ld) return NULL; } -static char *opt_set_anchor_zero_fee_htlc_tx(struct lightningd *ld) -{ - if (!opt_deprecated_ok(ld, "experimental-anchors", NULL, - "v24.02", "v25.02")) - return "--experimental-anchors is now enabled by default"; - return NULL; -} - static char *opt_set_offers(struct lightningd *ld) { if (!opt_deprecated_ok(ld, "experimental-offers", NULL, @@ -1452,9 +1436,6 @@ static void register_opts(struct lightningd *ld) " channels using splicing"); /* This affects our features, so set early. */ - opt_register_early_noarg("--experimental-onion-messages", - opt_set_onion_messages, ld, - opt_hidden); opt_register_early_noarg("--experimental-offers", opt_set_offers, ld, opt_hidden); @@ -1468,9 +1449,6 @@ static void register_opts(struct lightningd *ld) opt_set_quiesce, ld, "experimental: Advertise ability to quiesce" " channels."); - opt_register_early_noarg("--experimental-anchors", - opt_set_anchor_zero_fee_htlc_tx, ld, - opt_hidden); clnopt_noarg("--help|-h", OPT_EXITS, opt_lightningd_usage, ld, "Print this message.");