aljaz/lightning
1
0
Fork 0
mirror of https://github.com/aljazceru/lightning.git synced 2025-12-20 07:34:24 +01:00
Code Issues Packages Projects Releases Wiki Activity

lightningd: allow 'style' 'legacy' for clboss compat (with deprecated_apis).

Browse Source 
We keep the parameter around for future use (e.g. PTLC support?), but clboss
master still sets 'style' to "legacy".  Accept, but ignore it.

Reported-by: grubman on #c-lightning (IRC)
Changelog-Deprecated: JSON-RPC: `sendpay` `route` argument `style` "legacy" (don't use it at all, we ignore it now and always use "tlv" anyway).
Signed-off-by: Rusty Russell <rusty@rustcorp.com.au>
This commit is contained in:
Rusty Russell
2022-03-23 10:30:06 +10:30
parent 5aa108f176
commit f7aba31448
5 changed files with 7 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
doc/PLUGINS.md
View File

@@ -1358,7 +1358,6 @@ The payload of the hook call has the following format:
{ {
"onion": { "onion": {
"payload": "", "payload": "",
"type": "legacy",
"short_channel_id": "1x2x3", "short_channel_id": "1x2x3",
"forward_amount": "42msat", "forward_amount": "42msat",
"outgoing_cltv_value": 500014, "outgoing_cltv_value": 500014,
@@ -1379,7 +1378,6 @@ For detailed information about each field please refer to [BOLT 04 of the specif
- `onion`: - `onion`:
- `payload` contains the unparsed payload that was sent to us from the - `payload` contains the unparsed payload that was sent to us from the
sender of the payment. sender of the payment.
- `type` is `legacy` for realm 0 payments, `tlv` for realm > 1.
- `short_channel_id` determines the channel that the sender is hinting - `short_channel_id` determines the channel that the sender is hinting
should be used next. Not present if we're the final destination. should be used next. Not present if we're the final destination.
- `forward_amount` is the amount we should be forwarding to the next hop, - `forward_amount` is the amount we should be forwarding to the next hop,

3
doc/lightning-createonion.7.md
View File

@@ -45,7 +45,6 @@ which the above *hops* parameter was generated:
"msatoshi": 1002, "msatoshi": 1002,
"amount_msat": "1002msat", "amount_msat": "1002msat",
"delay": 21, "delay": 21,
"style": "legacy"
}, { }, {
"id": "035d2b1192dfba134e10e540875d366ebc8bc353d5aa766b80c090b39c3a5d885d", "id": "035d2b1192dfba134e10e540875d366ebc8bc353d5aa766b80c090b39c3a5d885d",
"channel": "103x1x1", "channel": "103x1x1",
@@ -53,7 +52,6 @@ which the above *hops* parameter was generated:
"msatoshi": 1001, "msatoshi": 1001,
"amount_msat": "1001msat", "amount_msat": "1001msat",
"delay": 15, "delay": 15,
"style": "legacy"
}, { }, {
"id": "0382ce59ebf18be7d84677c2e35f23294b9992ceca95491fcf8a56c6cb2d9de199", "id": "0382ce59ebf18be7d84677c2e35f23294b9992ceca95491fcf8a56c6cb2d9de199",
"channel": "103x3x1", "channel": "103x3x1",
@@ -61,7 +59,6 @@ which the above *hops* parameter was generated:
"msatoshi": 1000, "msatoshi": 1000,
"amount_msat": "1000msat", "amount_msat": "1000msat",
"delay": 9, "delay": 9,
"style": "legacy"
} }
] ]
``` ```

4
doc/lightning-getroute.7.md
View File

@@ -284,7 +284,7 @@ On success, an object containing **route** is returned. It is an array of objec
- **direction** (u32): 0 if this channel is traversed from lesser to greater **id**, otherwise 1 - **direction** (u32): 0 if this channel is traversed from lesser to greater **id**, otherwise 1
- **amount_msat** (msat): The amount expected by the node at the end of this hop - **amount_msat** (msat): The amount expected by the node at the end of this hop
- **delay** (u32): The total CLTV expected by the node at the end of this hop - **delay** (u32): The total CLTV expected by the node at the end of this hop
- **style** (string): The features understood by the destination node (one of "legacy", "tlv") - **style** (string): The features understood by the destination node (always "tlv")
[comment]: # (GENERATE-FROM-SCHEMA-END) [comment]: # (GENERATE-FROM-SCHEMA-END)
@@ -309,4 +309,4 @@ RESOURCES
Main web site: <https://github.com/ElementsProject/lightning> Main web site: <https://github.com/ElementsProject/lightning>
[comment]: # ( SHA256STAMP:0c1f92ff24ae0277fed3cf3fd41f2f45e4a57558a4b61fc51a1a698b4f3d8f01) [comment]: # ( SHA256STAMP:3494cb4003abfe32e8942ec5d92d0c464815d5e65edf29087cd2193eb414d694)

1
doc/schemas/getroute.schema.json
View File

@@ -48,7 +48,6 @@
"type": "string", "type": "string",
"description": "The features understood by the destination node", "description": "The features understood by the destination node",
"enum": [ "enum": [
"legacy",
"tlv" "tlv"
] ]
} }

5
lightningd/pay.c
View File

@@ -1,6 +1,7 @@
#include "config.h" #include "config.h"
#include <ccan/tal/str/str.h> #include <ccan/tal/str/str.h>
#include <common/bolt12_merkle.h> #include <common/bolt12_merkle.h>
#include <common/configdir.h>
#include <common/json_command.h> #include <common/json_command.h>
#include <common/json_helpers.h> #include <common/json_helpers.h>
#include <common/json_tok.h> #include <common/json_tok.h>
@@ -1331,6 +1332,10 @@ static struct command_result *param_route_hop_style(struct command *cmd,
return NULL; return NULL;
} }
/* We still let you *specify* this, but we ignore it! */
if (deprecated_apis && json_tok_streq(buffer, tok, "legacy"))
return NULL;
return command_fail_badparam(cmd, name, buffer, tok, return command_fail_badparam(cmd, name, buffer, tok,
"should be 'tlv' ('legacy' not supported)"); "should be 'tlv' ('legacy' not supported)");
} }