mirrors/core-lightning
1
0
Fork 0
mirror of https://github.com/ElementsProject/lightning.git synced 2025-03-01 17:47:30 +01:00
Code Issues Projects Releases Wiki Activity

sendonionmessage: add invoice, invoice_request and invoice_error fields.

Browse source 
Signed-off-by: Rusty Russell <rusty@rustcorp.com.au>
This commit is contained in:
Rusty Russell 2020-12-05 12:51:54 +10:30
parent 2cd93597cc
commit c1bdaa27bc
1 changed files with 45 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

51
lightningd/onion_message.c
View file

@ -164,6 +164,9 @@ struct hop {
struct short_channel_id *scid; struct short_channel_id *scid;
struct pubkey *blinding; struct pubkey *blinding;
u8 *enctlv; u8 *enctlv;
u8 *invoice;
u8 *invoice_req;
u8 *invoice_err;
u8 *rawtlv; u8 *rawtlv;
}; };
@ -182,7 +185,8 @@ static struct command_result *param_hops(struct command *cmd,
*hops = tal_arr(cmd, struct hop, tok->size); *hops = tal_arr(cmd, struct hop, tok->size);
json_for_each_arr(i, t, tok) { json_for_each_arr(i, t, tok) {
const jsmntok_t *tid, *tscid, *tblinding, *tenctlv, *trawtlv; const jsmntok_t *tid, *tscid, *tblinding, *tenctlv, *trawtlv,
*tinvoice, *tinvoicereq, *tinvoiceerr;
tid = json_get_member(buffer, t, "id"); tid = json_get_member(buffer, t, "id");
if (!tid) if (!tid)
@ -192,12 +196,15 @@ static struct command_result *param_hops(struct command *cmd,
tscid = json_get_member(buffer, t, "short_channel_id"); tscid = json_get_member(buffer, t, "short_channel_id");
tblinding = json_get_member(buffer, t, "blinding"); tblinding = json_get_member(buffer, t, "blinding");
tenctlv = json_get_member(buffer, t, "enctlv"); tenctlv = json_get_member(buffer, t, "enctlv");
tinvoice = json_get_member(buffer, t, "invoice");
tinvoicereq = json_get_member(buffer, t, "invoice_request");
tinvoiceerr = json_get_member(buffer, t, "invoice_error");
trawtlv = json_get_member(buffer, t, "rawtlv"); trawtlv = json_get_member(buffer, t, "rawtlv");
if (trawtlv && (tscid || tblinding || tenctlv)) if (trawtlv && (tscid || tblinding || tenctlv || tinvoice || tinvoicereq))
return command_fail(cmd, JSONRPC2_INVALID_PARAMS, return command_fail(cmd, JSONRPC2_INVALID_PARAMS,
"%s[%zu] has 'rawtlv' with other fields", "%s[%zu] has 'rawtlv' with other fields",
name, i); name, i);
if (tblinding) { if (tblinding) {
(*hops)[i].blinding = tal(*hops, struct pubkey); (*hops)[i].blinding = tal(*hops, struct pubkey);
@ -229,6 +236,33 @@ static struct command_result *param_hops(struct command *cmd,
} else } else
(*hops)[i].enctlv = NULL; (*hops)[i].enctlv = NULL;
if (tinvoice) {
(*hops)[i].invoice =
json_tok_bin_from_hex(*hops, buffer, tinvoice);
if (!(*hops)[i].invoice)
return command_fail(cmd, JSONRPC2_INVALID_PARAMS,
"%s[%zu] 'invoice' is invalid", name, i);
} else
(*hops)[i].invoice = NULL;
if (tinvoicereq) {
(*hops)[i].invoice_req =
json_tok_bin_from_hex(*hops, buffer, tinvoicereq);
if (!(*hops)[i].invoice_req)
return command_fail(cmd, JSONRPC2_INVALID_PARAMS,
"%s[%zu] 'invoice_request' is invalid", name, i);
} else
(*hops)[i].invoice_req = NULL;
if (tinvoiceerr) {
(*hops)[i].invoice_err =
json_tok_bin_from_hex(*hops, buffer, tinvoiceerr);
if (!(*hops)[i].invoice_err)
return command_fail(cmd, JSONRPC2_INVALID_PARAMS,
"%s[%zu] 'invoice_request' is invalid", name, i);
} else
(*hops)[i].invoice_err = NULL;
if (trawtlv) { if (trawtlv) {
(*hops)[i].rawtlv = (*hops)[i].rawtlv =
json_tok_bin_from_hex(*hops, buffer, trawtlv); json_tok_bin_from_hex(*hops, buffer, trawtlv);
@ -329,6 +363,11 @@ static void populate_tlvs(struct hop *hops,
} }
/* Note: tal_dup_talarr returns NULL for NULL */ /* Note: tal_dup_talarr returns NULL for NULL */
tlv->enctlv = tal_dup_talarr(tlv, u8, hops[i].enctlv); tlv->enctlv = tal_dup_talarr(tlv, u8, hops[i].enctlv);
tlv->invoice = tal_dup_talarr(tlv, u8, hops[i].invoice);
tlv->invoice_request = tal_dup_talarr(tlv, u8,
hops[i].invoice_req);
tlv->invoice_error = tal_dup_talarr(tlv, u8,
hops[i].invoice_err);
if (i == tal_count(hops)-1 && reply_path) if (i == tal_count(hops)-1 && reply_path)
tlv->reply_path = reply_path; tlv->reply_path = reply_path;
@ -392,7 +431,7 @@ static const struct json_command send_onion_message_command = {
"sendonionmessage", "sendonionmessage",
"utility", "utility",
json_send_onion_message, json_send_onion_message,
"Send message over {hops} (id, [short_channel_id], [blinding], [enctlv], [rawtlv]) with optional {reply_path} (blinding, path[id, enctlv])" "Send message over {hops} (id, [short_channel_id], [blinding], [enctlv], [invoice], [invoice_request], [invoice_error], [rawtlv]) with optional {reply_path} (blinding, path[id, enctlv])"
}; };
AUTODATA(json_command, &send_onion_message_command); AUTODATA(json_command, &send_onion_message_command);
#endif /* EXPERIMENTAL_FEATURES */ #endif /* EXPERIMENTAL_FEATURES */