davide/palladum-lightning
1
0
Fork 0
Code Issues Pull Requests Actions 5 Packages Projects Releases Wiki Activity

lightningd: remove the "listpeers.features.option_anchors_zero_fee_htlc_tx" option.

Browse Source 
Everyone should be using the new name.

Changelog-Removed: JSON-RPC: `listpeers` `features` array string "option_anchors_zero_fee_htlc_tx": use "option_anchors" (spec renamed it). Deprecated in 24.08.
Signed-off-by: Rusty Russell <rusty@rustcorp.com.au>
This commit is contained in:
Rusty Russell
2026-01-20 14:56:26 +10:30
parent af1c9640b5
commit 9881e04636
8 changed files with 6 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
contrib/msggen/msggen/schema.json
View File

@@ -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,

1
doc/developers-guide/deprecated-features.md
View File

@@ -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 |

6
doc/schemas/listpeerchannels.json
View File

@@ -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": {

6
doc/schemas/sql-template.json
View File

@@ -285,12 +285,6 @@
0,
"option_static_remotekey"
],
[
29,
23,
1,
"option_anchors_zero_fee_htlc_tx"
],
[
30,
23,

5
lightningd/dual_open_control.c
View File

@@ -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);

5
lightningd/opening_control.c
View File

@@ -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);

5
lightningd/peer_control.c
View File

@@ -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))

2
tests/utils.py
View File

@@ -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