From 09e03e98effdf1638633484d2f0dd9c4d285bf36 Mon Sep 17 00:00:00 2001 From: Rusty Russell Date: Tue, 17 Jun 2025 03:42:33 +0930 Subject: [PATCH] deprecations: update v25.11 to v25.12. Signed-off-by: Rusty Russell --- contrib/msggen/msggen/schema.json | 6 +++--- doc/developers-guide/deprecations.md | 8 ++++---- doc/schemas/close.json | 4 ++-- doc/schemas/decodepay.json | 2 +- lightningd/closing_control.c | 4 ++-- lightningd/invoice.c | 2 +- lightningd/options.c | 2 +- plugins/xpay/xpay.c | 2 +- 8 files changed, 15 insertions(+), 15 deletions(-) diff --git a/contrib/msggen/msggen/schema.json b/contrib/msggen/msggen/schema.json index 07dbca45b..7c1e7097f 100644 --- a/contrib/msggen/msggen/schema.json +++ b/contrib/msggen/msggen/schema.json @@ -5277,7 +5277,7 @@ "type": "hex", "deprecated": [ "v24.11", - "v25.11" + "v25.12" ], "description": [ "The raw bitcoin transaction used to close the channel (if it was open)." @@ -5287,7 +5287,7 @@ "type": "txid", "deprecated": [ "v24.11", - "v25.11" + "v25.12" ], "description": [ "The transaction id of the *tx* field." @@ -10497,7 +10497,7 @@ "added": "v23.05", "depecated": [ "v24.11", - "v25.11" + "v25.12" ], "rpc": "decodepay", "title": "Command for decoding a bolt11 string (low-level)", diff --git a/doc/developers-guide/deprecations.md b/doc/developers-guide/deprecations.md index c5df82c05..d7058d0a6 100644 --- a/doc/developers-guide/deprecations.md +++ b/doc/developers-guide/deprecations.md @@ -20,11 +20,11 @@ hidden: false | 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.11 | Use `decode` which is more powerful (since v23.05) | -| close.tx | Field | v24.11 | v25.11 | Use txs array instead | -| close.txid | Field | v24.11 | v25.11 | Use txids array instead | +| decodepay | Command | v24.11 | v25.12 | Use `decode` which is more powerful (since v23.05) | +| close.tx | Field | v24.11 | v25.12 | Use txs array instead | +| 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.11 | Try MPP even if the BOLT12 invoice doesn't explicitly allow it (CLN didn't until 25.02) | +| 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 | | 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 | diff --git a/doc/schemas/close.json b/doc/schemas/close.json index ed07ae0c9..2b30fa463 100644 --- a/doc/schemas/close.json +++ b/doc/schemas/close.json @@ -115,7 +115,7 @@ "type": "hex", "deprecated": [ "v24.11", - "v25.11" + "v25.12" ], "description": [ "The raw bitcoin transaction used to close the channel (if it was open)." @@ -125,7 +125,7 @@ "type": "txid", "deprecated": [ "v24.11", - "v25.11" + "v25.12" ], "description": [ "The transaction id of the *tx* field." diff --git a/doc/schemas/decodepay.json b/doc/schemas/decodepay.json index c82236c9b..5ebcd289f 100644 --- a/doc/schemas/decodepay.json +++ b/doc/schemas/decodepay.json @@ -4,7 +4,7 @@ "added": "v23.05", "depecated": [ "v24.11", - "v25.11" + "v25.12" ], "rpc": "decodepay", "title": "Command for decoding a bolt11 string (low-level)", diff --git a/lightningd/closing_control.c b/lightningd/closing_control.c index 66e703d90..bd91a79a4 100644 --- a/lightningd/closing_control.c +++ b/lightningd/closing_control.c @@ -58,12 +58,12 @@ resolve_one_close_command(struct close_command *cc, bool cooperative, struct json_stream *result = json_stream_success(cc->cmd); const struct bitcoin_tx *close_tx = close_txs[tal_count(close_txs) - 1]; - if (command_deprecated_out_ok(cc->cmd, "tx", "v24.11", "v25.11")) + if (command_deprecated_out_ok(cc->cmd, "tx", "v24.11", "v25.12")) json_add_tx(result, "tx", close_tx); if (!invalid_last_tx(close_tx)) { struct bitcoin_txid txid; bitcoin_txid(close_tx, &txid); - if (command_deprecated_out_ok(cc->cmd, "txid", "v24.11", "v25.11")) + if (command_deprecated_out_ok(cc->cmd, "txid", "v24.11", "v25.12")) json_add_txid(result, "txid", &txid); } diff --git a/lightningd/invoice.c b/lightningd/invoice.c index edf15f0a0..31362ab6c 100644 --- a/lightningd/invoice.c +++ b/lightningd/invoice.c @@ -1586,7 +1586,7 @@ static const struct json_command decodepay_command = { "decodepay", json_decodepay, .depr_start = "v24.11", - .depr_end = "v25.11" + .depr_end = "v25.12" }; AUTODATA(json_command, &decodepay_command); diff --git a/lightningd/options.c b/lightningd/options.c index 6ba5d6c4a..492c345f3 100644 --- a/lightningd/options.c +++ b/lightningd/options.c @@ -1261,7 +1261,7 @@ static char *opt_set_shutdown_wrong_funding(struct lightningd *ld) static char *opt_set_peer_storage(struct lightningd *ld) { if (!opt_deprecated_ok(ld, "experimental-peer-storage", NULL, - "v25.05", "v25.11")) + "v25.05", "v25.12")) return "--experimental-peer-storage is now enabled by default"; return NULL; } diff --git a/plugins/xpay/xpay.c b/plugins/xpay/xpay.c index 2bf1c787d..fa8a203ee 100644 --- a/plugins/xpay/xpay.c +++ b/plugins/xpay/xpay.c @@ -1641,7 +1641,7 @@ static struct command_result *json_xpay_core(struct command *cmd, payment->final_cltv = 0; /* We will start honoring this flag in future */ payment->disable_mpp = !feature_offered(b12inv->invoice_features, OPT_BASIC_MPP); - if (payment->disable_mpp && command_deprecated_in_ok(cmd, "ignore_bolt12_mpp", "v25.05", "v25.11")) + if (payment->disable_mpp && command_deprecated_in_ok(cmd, "ignore_bolt12_mpp", "v25.05", "v25.12")) payment->disable_mpp = false; } else { struct bolt11 *b11