diff --git a/contrib/msggen/msggen/schema.json b/contrib/msggen/msggen/schema.json index c6c8fc452..f139feb64 100644 --- a/contrib/msggen/msggen/schema.json +++ b/contrib/msggen/msggen/schema.json @@ -24292,12 +24292,11 @@ "option_static_remotekey", "option_anchor_outputs", "option_anchors", - "option_anchors_zero_fee_htlc_tx", "option_scid_alias", "option_zeroconf" ], "description": [ - "BOLT #9 features which apply to this channel. Note that *anchors_zero_fee_htlc_tx* is a deprecated synonym for *anchors*." + "BOLT #9 features which apply to this channel." ] } }, @@ -25366,7 +25365,6 @@ }, "features": [ "option_static_remotekey", - "option_anchors_zero_fee_htlc_tx", "option_anchors" ], "funding": { @@ -25498,7 +25496,6 @@ }, "features": [ "option_static_remotekey", - "option_anchors_zero_fee_htlc_tx", "option_anchors" ], "funding": { @@ -25624,7 +25621,6 @@ }, "features": [ "option_static_remotekey", - "option_anchors_zero_fee_htlc_tx", "option_anchors" ], "funding": { @@ -34534,12 +34530,6 @@ 0, "option_static_remotekey" ], - [ - 29, - 23, - 1, - "option_anchors_zero_fee_htlc_tx" - ], [ 30, 23, diff --git a/doc/developers-guide/deprecated-features.md b/doc/developers-guide/deprecated-features.md index f8cd848a6..93693b089 100644 --- a/doc/developers-guide/deprecated-features.md +++ b/doc/developers-guide/deprecated-features.md @@ -9,7 +9,6 @@ privacy: | 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 | | 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 | diff --git a/doc/schemas/listpeerchannels.json b/doc/schemas/listpeerchannels.json index 95c49bb33..b4749a299 100644 --- a/doc/schemas/listpeerchannels.json +++ b/doc/schemas/listpeerchannels.json @@ -462,12 +462,11 @@ "option_static_remotekey", "option_anchor_outputs", "option_anchors", - "option_anchors_zero_fee_htlc_tx", "option_scid_alias", "option_zeroconf" ], "description": [ - "BOLT #9 features which apply to this channel. Note that *anchors_zero_fee_htlc_tx* is a deprecated synonym for *anchors*." + "BOLT #9 features which apply to this channel." ] } }, @@ -1536,7 +1535,6 @@ }, "features": [ "option_static_remotekey", - "option_anchors_zero_fee_htlc_tx", "option_anchors" ], "funding": { @@ -1668,7 +1666,6 @@ }, "features": [ "option_static_remotekey", - "option_anchors_zero_fee_htlc_tx", "option_anchors" ], "funding": { @@ -1794,7 +1791,6 @@ }, "features": [ "option_static_remotekey", - "option_anchors_zero_fee_htlc_tx", "option_anchors" ], "funding": { diff --git a/doc/schemas/sql-template.json b/doc/schemas/sql-template.json index 0ff348012..758eac7b1 100644 --- a/doc/schemas/sql-template.json +++ b/doc/schemas/sql-template.json @@ -285,12 +285,6 @@ 0, "option_static_remotekey" ], - [ - 29, - 23, - 1, - "option_anchors_zero_fee_htlc_tx" - ], [ 30, 23, diff --git a/lightningd/dual_open_control.c b/lightningd/dual_open_control.c index 388ba47e7..ed75f5d71 100644 --- a/lightningd/dual_open_control.c +++ b/lightningd/dual_open_control.c @@ -162,11 +162,8 @@ void json_add_unsaved_channel(struct command *cmd, if (feature_negotiated(channel->peer->ld->our_features, channel->peer->their_features, - OPT_ANCHORS_ZERO_FEE_HTLC_TX)) { - if (command_deprecated_out_ok(cmd, "features", "v24.08", "v25.09")) - json_add_string(response, NULL, "option_anchors_zero_fee_htlc_tx"); + OPT_ANCHORS_ZERO_FEE_HTLC_TX)) json_add_string(response, NULL, "option_anchors"); - } json_array_end(response); json_object_end(response); diff --git a/lightningd/opening_control.c b/lightningd/opening_control.c index f280ee66d..ae302630f 100644 --- a/lightningd/opening_control.c +++ b/lightningd/opening_control.c @@ -70,11 +70,8 @@ void json_add_uncommitted_channel(struct command *cmd, if (feature_negotiated(uc->peer->ld->our_features, uc->peer->their_features, - OPT_ANCHORS_ZERO_FEE_HTLC_TX)) { - if (command_deprecated_out_ok(cmd, "features", "v24.08", "v25.09")) - json_add_string(response, NULL, "option_anchors_zero_fee_htlc_tx"); + OPT_ANCHORS_ZERO_FEE_HTLC_TX)) json_add_string(response, NULL, "option_anchors"); - } json_array_end(response); json_object_end(response); diff --git a/lightningd/peer_control.c b/lightningd/peer_control.c index 1e9dfa0d9..2751769c2 100644 --- a/lightningd/peer_control.c +++ b/lightningd/peer_control.c @@ -1093,11 +1093,8 @@ static void NON_NULL_ARGS(1, 2, 4, 5) json_add_channel(struct command *cmd, json_add_string(response, NULL, "option_static_remotekey"); if (channel_has(channel, OPT_ANCHOR_OUTPUTS_DEPRECATED)) json_add_string(response, NULL, "option_anchor_outputs"); - if (channel_has(channel, OPT_ANCHORS_ZERO_FEE_HTLC_TX)) { - if (command_deprecated_out_ok(cmd, "features", "v24.08", "v25.09")) - json_add_string(response, NULL, "option_anchors_zero_fee_htlc_tx"); + if (channel_has(channel, OPT_ANCHORS_ZERO_FEE_HTLC_TX)) json_add_string(response, NULL, "option_anchors"); - } if (channel_has(channel, OPT_ZEROCONF)) json_add_string(response, NULL, "option_zeroconf"); if (channel_has(channel, OPT_SCID_ALIAS)) diff --git a/tests/utils.py b/tests/utils.py index d879bf3db..9fc902aac 100644 --- a/tests/utils.py +++ b/tests/utils.py @@ -465,7 +465,7 @@ def first_scidd(n1, n2): def basic_fee(feerate, anchor_expected): if anchor_expected: - # option_anchor_outputs / option_anchors_zero_fee_htlc_tx + # option_anchor_outputs weight = 1124 else: weight = 724