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

plugins/pay: send payment_metadata if provided in invoice.

Browse Source 
Signed-off-by: Rusty Russell <rusty@rustcorp.com.au>
Changelog-Added: Protocol: `pay` (and decode, etc) supports bolt11 payment_metadata a-la https://github.com/lightning/bolts/pull/912
This commit is contained in:
Rusty Russell
2022-03-31 19:40:50 +10:30
parent 7f89763f9e
commit 1c685ce3e8
5 changed files with 48 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
plugins/pay.c
View File

@@ -108,6 +108,9 @@ struct pay_command {
/* Payment secret, if specified by invoice. */
const char *payment_secret;
/* Payment metadata, if specified by invoice. */
const char *payment_metadata;
/* Description, if any. */
const char *label;
@@ -849,6 +852,8 @@ static struct command_result *getroute_done(struct command *cmd,
json_add_string(req->js, "label", pc->label);
if (pc->payment_secret)
json_add_string(req->js, "payment_secret", pc->payment_secret);
if (pc->payment_metadata)
json_add_string(req->js, "payment_metadata", pc->payment_metadata);
return send_outreq(cmd->plugin, req);
}
@@ -1368,6 +1373,11 @@ static struct command_result *json_pay(struct command *cmd,
sizeof(*b11->payment_secret));
else
pc->payment_secret = NULL;
if (b11->metadata)
pc->payment_metadata = tal_hex(pc, b11->metadata);
else
pc->payment_metadata = NULL;
/* We try first without using routehint */
pc->current_routehint = NULL;
pc->routehints = filter_routehints(pc, b11->routes);
@@ -2380,6 +2390,10 @@ static struct command_result *json_paymod(struct command *cmd,
p->payment_hash = tal_dup(p, struct sha256, &b11->payment_hash);
p->payment_secret =
tal_dup_or_null(p, struct secret, b11->payment_secret);
if (b11->metadata)
p->payment_metadata = tal_dup_talarr(p, u8, b11->metadata);
else
p->payment_metadata = NULL;
/* FIXME: libplugin-pay plays with this array, and there are many FIXMEs
* about it. But it looks like a leak, so we suppress it here. */
p->routes = notleak_with_children(tal_steal(p, b11->routes));
@@ -2439,6 +2453,7 @@ static struct command_result *json_paymod(struct command *cmd,
BUILD_ASSERT(sizeof(*p->payment_secret) ==
sizeof(merkle));
}
p->payment_metadata = NULL;
p->routes = NULL;
/* FIXME: paths! */
if (b12->cltv)