Skip to content

Commit 1b41350

Browse files
rustyrussellvincenzopalazzo
authored andcommitted
lightningd: deprecate experimental-offers option.
Signed-off-by: Rusty Russell <[email protected]> Changelog-Deprecated: Config: `experimental-offers` (it's now the default).
1 parent 0cc52bc commit 1b41350

File tree

9 files changed

+44
-39
lines changed

9 files changed

+44
-39
lines changed

.msggen.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7071,7 +7071,7 @@
70717071
},
70727072
"ListConfigs.configs.experimental-offers": {
70737073
"added": "pre-v0.10.1",
7074-
"deprecated": null
7074+
"deprecated": "v24.11"
70757075
},
70767076
"ListConfigs.configs.experimental-offers.set": {
70777077
"added": "pre-v0.10.1",
@@ -7083,7 +7083,7 @@
70837083
},
70847084
"ListConfigs.configs.experimental-onion-messages": {
70857085
"added": "pre-v0.10.1",
7086-
"deprecated": null
7086+
"deprecated": "v24.08"
70877087
},
70887088
"ListConfigs.configs.experimental-onion-messages.set": {
70897089
"added": "pre-v0.10.1",

cln-rpc/src/model.rs

Lines changed: 20 additions & 18 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

contrib/msggen/msggen/schema.json

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18687,6 +18687,10 @@
1868718687
}
1868818688
},
1868918689
"experimental-onion-messages": {
18690+
"deprecated": [
18691+
"v24.08",
18692+
"v25.02"
18693+
],
1869018694
"type": "object",
1869118695
"additionalProperties": false,
1869218696
"required": [
@@ -18711,6 +18715,10 @@
1871118715
"experimental-offers": {
1871218716
"type": "object",
1871318717
"additionalProperties": false,
18718+
"deprecated": [
18719+
"v24.11",
18720+
"v25.05"
18721+
],
1871418722
"required": [
1871518723
"set",
1871618724
"source"

doc/developers-guide/deprecations.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -36,6 +36,7 @@ hidden: false
3636
| decodepay | Command | v24.11 | v25.11 | Use `decode` which is more powerful (since v23.05) |
3737
| close.tx | Field | v24.11 | v25.11 | Use txs array instead |
3838
| close.txid | Field | v24.11 | v25.11 | Use txids array instead |
39+
| experimental-offers | Config | v24.11 | v25.05 | Now the default |
3940

4041
Inevitably there are features which need to change: either to be generalized, or removed when they can no longer be supported.
4142

doc/developers-guide/plugin-development/hooks.md

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -596,8 +596,6 @@ Because this is a chained hook, the daemon expects the result to be `{'result':
596596

597597
### `onion_message_recv` and `onion_message_recv_secret`
598598

599-
> 🚧 experimental-offers only
600-
601599
These two hooks are almost identical, in that they are called when an onion message is received.
602600

603601
`onion_message_recv` is used for unsolicited messages (where the source knows that it is sending to this node), and `onion_message_recv_secret` is used for messages which use a blinded path we supplied. The latter hook will have a `pathsecret` field, the former never will.

doc/getting-started/getting-started/configuration.md

Lines changed: 0 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -492,17 +492,6 @@ Supported features can be listed with `lightningd --list-features-only`
492492

493493
A build _with_ `--enable-experimental-features` flag hard-codes some of below options as enabled, ignoring their command line flag. It may also add support for even more features. The safest way to determine the active configuration is by checking `listconfigs` or by looking at `our_features` (bits) in `getinfo`.
494494

495-
- **experimental-onion-messages**
496-
497-
Specifying this enables sending, forwarding and receiving onion messages, which are in draft status in the [bolt](https://github.com/lightning/bolts) specifications (PR #759). A build with `--enable-experimental-features` usually enables this via
498-
experimental-offers, see below.
499-
500-
- **experimental-offers**
501-
502-
Specifying this enables the `offers` and `fetchinvoice` plugins and corresponding functionality, which are in draft status [bolt](https://github.com/lightning/bolts)#798 as [bolt12](https://github.com/rustyrussell/lightning-rfc/blob/guilt/offers/12-offer-encoding.md).
503-
A build with `--enable-experimental-features` enables this permanently and usually
504-
enables experimental-onion-messages as well.
505-
506495
- **fetchinvoice-noconnect**
507496

508497
Specifying this prevents `fetchinvoice` and `sendinvoice` from trying to connect directly to the offering node as a last resort.

doc/lightningd-config.5.md

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -770,10 +770,6 @@ Experimental options are subject to breakage between releases: they
770770
are made available for advanced users who want to test proposed
771771
features.
772772

773-
* **experimental-offers**
774-
775-
Specifying this enables `offers` functionality, which is in draft status ([bolt][bolt] #798) as [bolt12][bolt12].
776-
777773
* **fetchinvoice-noconnect**
778774

779775
Specifying this prevents `fetchinvoice`, `sendinvoice` and replying

doc/schemas/lightning-listconfigs.json

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -552,6 +552,10 @@
552552
}
553553
},
554554
"experimental-onion-messages": {
555+
"deprecated": [
556+
"v24.08",
557+
"v25.02"
558+
],
555559
"type": "object",
556560
"additionalProperties": false,
557561
"required": [
@@ -576,6 +580,10 @@
576580
"experimental-offers": {
577581
"type": "object",
578582
"additionalProperties": false,
583+
"deprecated": [
584+
"v24.11",
585+
"v25.05"
586+
],
579587
"required": [
580588
"set",
581589
"source"

lightningd/options.c

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1312,7 +1312,10 @@ static char *opt_set_anchor_zero_fee_htlc_tx(struct lightningd *ld)
13121312

13131313
static char *opt_set_offers(struct lightningd *ld)
13141314
{
1315-
/* FIXME: Deprecate */
1315+
if (!opt_deprecated_ok(ld, "experimental-offers", NULL,
1316+
"v24.11", "v25.05"))
1317+
return "--experimental-offers has been deprecated (now the default)";
1318+
13161319
return NULL;
13171320
}
13181321

@@ -1499,7 +1502,7 @@ static void register_opts(struct lightningd *ld)
14991502
opt_hidden);
15001503
opt_register_early_noarg("--experimental-offers",
15011504
opt_set_offers, ld,
1502-
"EXPERIMENTAL: enable send and receive of offers");
1505+
opt_hidden);
15031506
opt_register_early_noarg("--experimental-shutdown-wrong-funding",
15041507
opt_set_shutdown_wrong_funding, ld,
15051508
"EXPERIMENTAL: allow shutdown with alternate txids");

0 commit comments

Comments
 (0)