mirrors/core-lightning
1
0
Fork 0
mirror of https://github.com/ElementsProject/lightning.git synced 2025-01-18 05:12:45 +01:00
Code Issues Projects Releases Wiki Activity

pay: Add functions to tell bolt12 string apart

Browse Source 
The functions just look at the hrp, so they're not guaranteed to guess
right, but for this case it's sufficient.
This commit is contained in:
Christian Decker 2021-03-09 09:50:53 +01:00 committed by Rusty Russell
parent 40e9d60ce0
commit a6c857dadb
3 changed files with 51 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
common/bolt12.c
View File

@ -422,3 +422,24 @@ struct tlv_invoice *invoice_decode(const tal_t *ctx,
}
return invoice;
}
bool bolt12_has_invoice_prefix(const char *str)
{
return strstarts(str, "lni1") || strstarts(str, "LNI1");
}
bool bolt12_has_request_prefix(const char *str)
{
return strstarts(str, "lnr1") || strstarts(str, "LNR1");
}
bool bolt12_has_offer_prefix(const char *str)
{
return strstarts(str, "lno1") || strstarts(str, "LNO1");
}
bool bolt12_has_prefix(const char *str)
{
return bolt12_has_invoice_prefix(str) || bolt12_has_offer_prefix(str) ||
bolt12_has_request_prefix(str);
}

21
common/bolt12.h
View File

@ -122,4 +122,25 @@ void offer_period_paywindow(const struct tlv_offer_recurrence *recurrence,
u64 basetime, u64 period_idx,
u64 *period_start, u64 *period_end);
/**
* Preliminary prefix check to see if the string might be a bolt12 invoice.
*/
bool bolt12_has_invoice_prefix(const char *str);
/**
* Preliminary prefix check to see if the string might be a bolt12 request.
*/
bool bolt12_has_request_prefix(const char *str);
/**
* Preliminary prefix check to see if the string might be a bolt12 offer.
*/
bool bolt12_has_offer_prefix(const char *str);
/**
* Preliminary prefix check to see if the string might be a bolt12 string.
*/
bool bolt12_has_prefix(const char *str);
#endif /* LIGHTNING_COMMON_BOLT12_H */

22
plugins/pay.c
View File

@ -1961,7 +1961,7 @@ static struct command_result *json_paymod(struct command *cmd,
struct payment *p;
const char *b11str;
struct bolt11 *b11;
char *fail;
char *b11_fail, *b12_fail;
u64 *maxfee_pct_millionths;
u32 *maxdelay;
struct amount_msat *exemptfee, *msat;
@ -1973,7 +1973,6 @@ static struct command_result *json_paymod(struct command *cmd,
u64 invexpiry;
struct sha256 *local_offer_id;
const struct tlv_invoice *b12;
bool is_b12;
#if DEVELOPER
bool *use_shadow;
#endif
@ -2004,16 +2003,14 @@ static struct command_result *json_paymod(struct command *cmd,
p = payment_new(cmd, cmd, NULL /* No parent */, paymod_mods);
p->invstring = tal_steal(p, b11str);
is_b12 = strlen(b11str) > 3 &&
(strstarts(b11str, "lni") || strstarts(b11str, "lno") ||
strstarts(b11str, "lnr"));
b11 = bolt11_decode(cmd, b11str, plugin_feature_set(cmd->plugin), NULL,
chainparams, &fail);
if (!is_b12) {
if (!bolt12_has_prefix(b11str)) {
b11 =
bolt11_decode(cmd, b11str, plugin_feature_set(cmd->plugin),
NULL, chainparams, &b11_fail);
if (b11 == NULL)
return command_fail(cmd, JSONRPC2_INVALID_PARAMS,
"Invalid bolt11: %s", fail);
"Invalid bolt11: %s", b11_fail);
invmsat = b11->msat;
invexpiry = b11->timestamp + b11->expiry;
@ -2038,11 +2035,10 @@ static struct command_result *json_paymod(struct command *cmd,
} else {
b12 = invoice_decode(cmd, b11str, strlen(b11str),
plugin_feature_set(cmd->plugin),
chainparams, &fail);
chainparams, &b12_fail);
if (b12 == NULL)
return command_fail(cmd, JSONRPC2_INVALID_PARAMS,
"Invalid bolt12: %s", fail);
"Invalid bolt12: %s", b12_fail);
if (!exp_offers)
return command_fail(cmd, JSONRPC2_INVALID_PARAMS,
"experimental-offers disabled");