From 094ac3518fc5f7342f551cae91f7a29fa9a3fd5a Mon Sep 17 00:00:00 2001 From: Rusty Russell Date: Tue, 17 Jun 2025 03:43:33 +0930 Subject: [PATCH] deprecations: update v26.02 to v26.03. Signed-off-by: Rusty Russell --- contrib/msggen/msggen/schema.json | 2 +- doc/developers-guide/deprecations.md | 4 ++-- doc/schemas/notification/channel_state_changed.json | 2 +- lightningd/notification.c | 2 +- lightningd/peer_control.c | 2 +- 5 files changed, 6 insertions(+), 6 deletions(-) diff --git a/contrib/msggen/msggen/schema.json b/contrib/msggen/msggen/schema.json index 7c1e7097f..6e2d05c61 100644 --- a/contrib/msggen/msggen/schema.json +++ b/contrib/msggen/msggen/schema.json @@ -36806,7 +36806,7 @@ ], "description": [ "The channel state, in particular \"CHANNELD_NORMAL\" means the channel can be used normally.", - "The deprecated value 'unknown' is also present for new channels: after 26.02 this field will be omitted instead." + "The deprecated value 'unknown' is also present for new channels: after v26.03 this field will be omitted instead." ], "added": "pre-v0.10.1" }, diff --git a/doc/developers-guide/deprecations.md b/doc/developers-guide/deprecations.md index d7058d0a6..126c71907 100644 --- a/doc/developers-guide/deprecations.md +++ b/doc/developers-guide/deprecations.md @@ -25,9 +25,9 @@ hidden: false | close.txid | Field | v24.11 | v25.12 | Use txids array instead | | experimental-offers | Config | v24.11 | v25.05 | Now the default | | xpay.ignore_bolt12_mpp | Field | v25.05 | v25.12 | Try MPP even if the BOLT12 invoice doesn't explicitly allow it (CLN didn't until 25.02) | -| listpeerchannels.max_total_htlc_in_msat | Field | v25.02 | v26.02 | Use our_max_total_htlc_out_msat | +| listpeerchannels.max_total_htlc_in_msat | Field | v25.02 | v26.03 | Use our_max_total_htlc_out_msat | | wait.details | Field | v25.05 | v26.05 | Use subsystem-specific object instead | -| channel_state_changed.old_state.unknown | Notification Field | v25.05 | v26.02 | Value "unknown" is deprecated: field will be omitted instead | +| channel_state_changed.old_state.unknown | Notification Field | v25.05 | v26.03 | Value "unknown" is deprecated: field will be omitted instead | Inevitably there are features which need to change: either to be generalized, or removed when they can no longer be supported. diff --git a/doc/schemas/notification/channel_state_changed.json b/doc/schemas/notification/channel_state_changed.json index ce3d4b704..6b8fbe20c 100644 --- a/doc/schemas/notification/channel_state_changed.json +++ b/doc/schemas/notification/channel_state_changed.json @@ -68,7 +68,7 @@ ], "description": [ "The channel state, in particular \"CHANNELD_NORMAL\" means the channel can be used normally.", - "The deprecated value 'unknown' is also present for new channels: after 26.02 this field will be omitted instead." + "The deprecated value 'unknown' is also present for new channels: after v26.03 this field will be omitted instead." ], "added": "pre-v0.10.1" }, diff --git a/lightningd/notification.c b/lightningd/notification.c index 8ad458797..1e4a58aa5 100644 --- a/lightningd/notification.c +++ b/lightningd/notification.c @@ -295,7 +295,7 @@ static void channel_state_changed_notification_serialize(struct json_stream *str json_add_timeiso(stream, "timestamp", timestamp); if (old_state != 0 || lightningd_deprecated_out_ok(ld, ld->deprecated_ok, "channel_state_changed", "old_state.unknown", - "v25.05", "v26.02")) + "v25.05", "v26.03")) json_add_string(stream, "old_state", channel_state_str(old_state)); json_add_string(stream, "new_state", channel_state_str(new_state)); json_add_string(stream, "cause", channel_change_state_reason_str(cause)); diff --git a/lightningd/peer_control.c b/lightningd/peer_control.c index 3bdb59182..ae944a691 100644 --- a/lightningd/peer_control.c +++ b/lightningd/peer_control.c @@ -1162,7 +1162,7 @@ static void NON_NULL_ARGS(1, 2, 4, 5) json_add_channel(struct command *cmd, json_add_amount_sat_msat(response, "dust_limit_msat", channel->our_config.dust_limit); if (command_deprecated_out_ok(cmd, "max_total_htlc_in_msat", - "v25.02", "v26.02")) + "v25.02", "v26.03")) json_add_amount_msat(response, "max_total_htlc_in_msat", channel->our_config.max_htlc_value_in_flight); json_add_amount_msat(