Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Offers Part 2: db and invoice infrastructure. #4256

Merged
merged 12 commits into from
Dec 15, 2020
Merged

Offers Part 2: db and invoice infrastructure. #4256

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
a248cf0
common/iso4217: make find_iso4217 a little more usable.
rustyrussell Dec 11, 2020
940927a
db: offer table.
rustyrussell Dec 14, 2020
fd8d26d
invoice: add an optional local_offer_id.
rustyrussell Dec 14, 2020
9103da4
sendpay: optional argument to link local offer.
rustyrussell Dec 14, 2020
54bb21e
lightningd: add low-level offer interfaces.
rustyrussell Dec 14, 2020
7ed9145
bolt11: expose routine to parse bolt11 string except signature.
rustyrussell Dec 14, 2020
08c3ebe
lightningd: createinvoice low-level invoice creation command.
rustyrussell Dec 14, 2020
eba3478
invoice: handle bolt12 strings if EXPERIMENTAL_FEATURES.
rustyrussell Dec 14, 2020
14bb0ad
pay, wallet: rename internal `bolt11` vars to `invstring`.
rustyrussell Dec 14, 2020
7fa3a36
plugins/pay: allow bolt12 invoices (EXPERIMENTAL_FEATURES).
rustyrussell Dec 14, 2020
064004c
common/blindedpath: fix type of enctlv.
rustyrussell Dec 14, 2020
01c92fe
cleanups: feedback from Christian Decker review.
rustyrussell Dec 14, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
70 changes: 47 additions & 23 deletions lightningd/pay.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,10 @@
#include <ccan/str/hex/hex.h>
#include <ccan/tal/str/str.h>
#include <common/bolt11.h>
#if EXPERIMENTAL_FEATURES
#include <common/bolt12.h>
#include <common/bolt12_merkle.h>
#endif
#include <common/json_command.h>
#include <common/json_helpers.h>
#include <common/jsonrpc_errors.h>
Expand Down Expand Up @@ -151,8 +155,14 @@ void json_add_payment_fields(struct json_stream *response,
t->payment_preimage);
if (t->label)
json_add_string(response, "label", t->label);
if (t->bolt11)
json_add_string(response, "bolt11", t->bolt11);
if (t->invstring) {
#if EXPERIMENTAL_FEATURES
if (strstarts(t->invstring, "lni"))
json_add_string(response, "bolt12", t->invstring);
else
#endif
json_add_string(response, "bolt11", t->invstring);
}

if (t->failonion)
json_add_hex(response, "erroronion", t->failonion,
Expand Down Expand Up @@ -858,7 +868,7 @@ send_payment_core(struct lightningd *ld,
struct amount_msat msat,
struct amount_msat total_msat,
const char *label TAKES,
const char *b11str TAKES,
const char *invstring TAKES,
const struct onionpacket *packet,
const struct node_id *destination,
struct node_id *route_nodes TAKES,
Expand Down Expand Up @@ -1078,10 +1088,10 @@ send_payment_core(struct lightningd *ld,
payment->label = tal_strdup(payment, label);
else
payment->label = NULL;
if (b11str != NULL)
payment->bolt11 = tal_strdup(payment, b11str);
if (invstring != NULL)
payment->invstring = tal_strdup(payment, invstring);
else
payment->bolt11 = NULL;
payment->invstring = NULL;
if (local_offer_id)
payment->local_offer_id = tal_dup(payment, struct sha256, local_offer_id);
else
Expand All @@ -1103,7 +1113,7 @@ send_payment(struct lightningd *ld,
struct amount_msat msat,
struct amount_msat total_msat,
const char *label TAKES,
const char *b11str TAKES,
const char *invstring TAKES,
const struct sha256 *local_offer_id,
const struct secret *payment_secret)
{
Expand Down Expand Up @@ -1186,7 +1196,7 @@ send_payment(struct lightningd *ld,
n_hops, type_to_string(tmpctx, struct amount_msat, &msat));
packet = create_onionpacket(tmpctx, path, ROUTING_INFO_SIZE, &path_secrets);
return send_payment_core(ld, cmd, rhash, partid, &route[0],
msat, total_msat, label, b11str,
msat, total_msat, label, invstring,
packet, &ids[n_hops - 1], ids,
channels, path_secrets, local_offer_id);
}
Expand Down Expand Up @@ -1268,7 +1278,7 @@ static struct command_result *json_sendonion(struct command *cmd,
struct route_hop *first_hop;
struct sha256 *payment_hash;
struct lightningd *ld = cmd->ld;
const char *label, *b11str;
const char *label, *invstring;
struct node_id *destination;
struct secret *path_secrets;
struct amount_msat *msat;
Expand All @@ -1282,7 +1292,8 @@ static struct command_result *json_sendonion(struct command *cmd,
p_opt("label", param_escaped_string, &label),
p_opt("shared_secrets", param_secrets_array, &path_secrets),
p_opt_def("partid", param_u64, &partid, 0),
p_opt("bolt11", param_string, &b11str),
/* FIXME: paramter should be invstring now */
cdecker marked this conversation as resolved.
Show resolved Hide resolved
p_opt("bolt11", param_string, &invstring),
p_opt_def("msatoshi", param_msat, &msat, AMOUNT_MSAT(0)),
p_opt("destination", param_node_id, &destination),
#if EXPERIMENTAL_FEATURES
Expand All @@ -1301,7 +1312,7 @@ static struct command_result *json_sendonion(struct command *cmd,

return send_payment_core(ld, cmd, payment_hash, *partid,
first_hop, *msat, AMOUNT_MSAT(0),
label, b11str, packet, destination, NULL, NULL,
label, invstring, packet, destination, NULL, NULL,
path_secrets, local_offer_id);
}

Expand Down Expand Up @@ -1425,7 +1436,7 @@ static struct command_result *json_sendpay(struct command *cmd,
struct sha256 *rhash;
struct route_hop *route;
struct amount_msat *msat;
const char *b11str, *label;
const char *invstring, *label;
u64 *partid;
struct secret *payment_secret;
struct sha256 *local_offer_id = NULL;
Expand All @@ -1436,7 +1447,8 @@ static struct command_result *json_sendpay(struct command *cmd,
p_req("payment_hash", param_sha256, &rhash),
p_opt("label", param_escaped_string, &label),
p_opt("msatoshi", param_msat, &msat),
p_opt("bolt11", param_string, &b11str),
/* FIXME: paramter should be invstring now */
cdecker marked this conversation as resolved.
Show resolved Hide resolved
p_opt("bolt11", param_string, &invstring),
p_opt("payment_secret", param_secret, &payment_secret),
p_opt_def("partid", param_u64, &partid, 0),
#if EXPERIMENTAL_FEATURES
Expand Down Expand Up @@ -1485,7 +1497,7 @@ static struct command_result *json_sendpay(struct command *cmd,
route,
final_amount,
msat ? *msat : final_amount,
label, b11str, local_offer_id, payment_secret);
label, invstring, local_offer_id, payment_secret);
}

static const struct json_command sendpay_command = {
Expand Down Expand Up @@ -1546,31 +1558,43 @@ static struct command_result *json_listsendpays(struct command *cmd,
const struct wallet_payment **payments;
struct json_stream *response;
struct sha256 *rhash;
const char *b11str;
const char *invstring;

if (!param(cmd, buffer, params,
p_opt("bolt11", param_string, &b11str),
/* FIXME: paramter should be invstring now */
cdecker marked this conversation as resolved.
Show resolved Hide resolved
p_opt("bolt11", param_string, &invstring),
p_opt("payment_hash", param_sha256, &rhash),
NULL))
return command_param_failed();

if (rhash && b11str) {
if (rhash && invstring) {
return command_fail(cmd, JSONRPC2_INVALID_PARAMS,
"Can only specify one of"
" {bolt11} or {payment_hash}");
}

if (b11str) {
if (invstring) {
struct bolt11 *b11;
char *fail;

b11 = bolt11_decode(cmd, b11str, cmd->ld->our_features, NULL,
b11 = bolt11_decode(cmd, invstring, cmd->ld->our_features, NULL,
chainparams, &fail);
if (!b11) {
return command_fail(cmd, JSONRPC2_INVALID_PARAMS,
"Invalid bolt11: %s", fail);
if (b11) {
rhash = &b11->payment_hash;
} else {
#if EXPERIMENTAL_FEATURES
struct tlv_invoice *b12;

b12 = invoice_decode(cmd, invstring, strlen(invstring),
cmd->ld->our_features,
chainparams, &fail);
if (b12 && b12->payment_hash)
rhash = b12->payment_hash;
else
#endif
return command_fail(cmd, JSONRPC2_INVALID_PARAMS,
"Invalid invstring: %s", fail);
}
rhash = &b11->payment_hash;
}

payments = wallet_payment_list(cmd, cmd->ld->wallet, rhash);
Expand Down
2 changes: 1 addition & 1 deletion plugins/keysend.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -159,7 +159,7 @@ static struct command_result *json_keysend(struct command *cmd, const char *buf,
p->routes = NULL;
p->min_final_cltv_expiry = DEFAULT_FINAL_CLTV_DELTA;
p->features = NULL;
p->bolt11 = NULL;
p->invstring = NULL;
p->why = "Initial attempt";
p->constraints.cltv_budget = *maxdelay;
p->deadline = timeabs_add(time_now(), time_from_sec(*retryfor));
Expand Down
18 changes: 12 additions & 6 deletions plugins/libplugin-pay.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@ struct payment *payment_new(tal_t *ctx, struct command *cmd,
p->route = NULL;
p->temp_exclusion = NULL;
p->failroute_retry = false;
p->bolt11 = NULL;
p->invstring = NULL;
p->routetxt = NULL;
p->max_htlcs = UINT32_MAX;

Expand All @@ -82,6 +82,7 @@ struct payment *payment_new(tal_t *ctx, struct command *cmd,
p->features = parent->features;
p->id = parent->id;
p->local_id = parent->local_id;
p->local_offer_id = parent->local_offer_id;
} else {
assert(cmd != NULL);
p->partid = 0;
Expand All @@ -92,6 +93,7 @@ struct payment *payment_new(tal_t *ctx, struct command *cmd,
p->id = next_id++;
/* Caller must set this. */
p->local_id = NULL;
p->local_offer_id = NULL;
}

/* Initialize all modifier data so we can point to the fields when
Expand Down Expand Up @@ -1443,12 +1445,16 @@ static struct command_result *payment_createonion_success(struct command *cmd,
if (p->label)
json_add_string(req->js, "label", p->label);

if (p->bolt11)
json_add_string(req->js, "bolt11", p->bolt11);
if (p->invstring)
/* FIXME: rename parameter to invstring */
json_add_string(req->js, "bolt11", p->invstring);

if (p->destination)
json_add_node_id(req->js, "destination", p->destination);

if (p->local_offer_id)
json_add_sha256(req->js, "local_offer_id", p->local_offer_id);

send_outreq(p->plugin, req);
return command_still_pending(cmd);
}
Expand Down Expand Up @@ -1805,8 +1811,8 @@ static void payment_finished(struct payment *p)
json_add_string(ret, "failcodename",
failure->failcodename);

if (p->bolt11)
json_add_string(ret, "bolt11", p->bolt11);
if (p->invstring)
json_add_invstring(ret, p->invstring);

json_add_hex_talarr(ret, "raw_message",
result.failure->raw_message);
Expand Down Expand Up @@ -3265,7 +3271,7 @@ static void presplit_cb(struct presplit_mod_data *d, struct payment *p)
/* Annotate the subpayments with the bolt11 string,
* they'll be used when aggregating the payments
* again. */
c->bolt11 = tal_strdup(c, p->bolt11);
c->invstring = tal_strdup(c, p->invstring);

/* Get ~ target, but don't exceed amt */
c->amount = fuzzed_near(target, amt);
Expand Down
8 changes: 6 additions & 2 deletions plugins/libplugin-pay.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -254,9 +254,13 @@ struct payment {
* true. Set only on the root payment. */
bool abort;

/* Serialized bolt11 string, kept attachd to the root so we can filter
/* Serialized bolt11/12 string, kept attachd to the root so we can filter
* by the invoice. */
const char *bolt11;
const char *invstring;

/* If this is paying a local offer, this is the one (sendpay ensures we
* don't pay twice for single-use offers) */
struct sha256 *local_offer_id;

/* Textual explanation of why this payment was attempted. */
const char *why;
Expand Down
Loading