From 109b915d5760af02830a2bcfa4fc7ea4e74b3206 Mon Sep 17 00:00:00 2001 From: Rusty Russell Date: Mon, 25 Mar 2024 11:07:52 +1030 Subject: [PATCH] lightningd: remove `funding_locked` from channel_opened notification. Changelog-Removed: Plugins: `funding_locked` from channel_opened notification (deprecated v22.11, EOL v24.02) Signed-off-by: Rusty Russell --- doc/developers-guide/deprecations.md | 1 - lightningd/notification.c | 3 --- 2 files changed, 4 deletions(-) diff --git a/doc/developers-guide/deprecations.md b/doc/developers-guide/deprecations.md index 3fd6308d8..dd6f3cc9d 100644 --- a/doc/developers-guide/deprecations.md +++ b/doc/developers-guide/deprecations.md @@ -10,7 +10,6 @@ hidden: false | listconfigs.configlist | Fields | v23.08 | v24.08 | Instead of direct members with names equal the config variable, there's now a `configs` sub-object containing a member with details of each config setting | | connection_notification.rawfields | Notification Field | v23.08 | v24.08 | All notifications now wrap members in an object of the same name | | disconnection_notification.rawfields | Notification Field | v23.08 | v24.08 | All notifications now wrap members in an object of the same name | -| channel_opened.funding_locked | Notification Field | v22.11 | v24.02 | Renamed to `channel_ready`, as per spec change (zero conf channels are ready before locked) | | block_added_notification.block | Notification Field | v23.08 | v24.08 | All notifications now wrap members in an object of the same name | | accept-htlc-tlv-types | Config | v23.08 | v24.08 | New `accept-htlc-tlv-type` can be specified multiple times, which is cleaner | | bind-addr.torv3 | Config | v23.08 | v24.08 | `announce-addr` makes more sense for Tor addresses | diff --git a/lightningd/notification.c b/lightningd/notification.c index 132522a3c..09dddf310 100644 --- a/lightningd/notification.c +++ b/lightningd/notification.c @@ -237,9 +237,6 @@ static void channel_opened_notification_serialize(struct json_stream *stream, json_add_node_id(stream, "id", node_id); json_add_amount_sat_msat(stream, "funding_msat", *funding_sat); json_add_txid(stream, "funding_txid", funding_txid); - if (lightningd_deprecated_out_ok(ld, ld->deprecated_ok, - "channel_opened", "funding_locked", "v22.11", "v24.02")) - json_add_bool(stream, "funding_locked", channel_ready); json_add_bool(stream, "channel_ready", channel_ready); }