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

offers: make decode command available even without experimental-offers.

Browse Source 
It subsumes `decodepay`, and it's nicer if people can just assume it's
available at all times.

Changelog-Added: JSON-RPC: `decode` now available without `experimental-offers`
Signed-off-by: Rusty Russell <rusty@rustcorp.com.au>
This commit is contained in:
Rusty Russell
2021-08-02 09:26:12 +09:30
committed by neil saitug
parent 0496b0d25b
commit a8b3a1c29c
6 changed files with 22 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
doc/lightning-decode.7 generated
View File

@@ -3,9 +3,6 @@
lightning-decode - Command for decoding an invoice string (low-level)
.SH SYNOPSIS
\fB(WARNING: experimental-offers only)\fR
\fBdecode\fR \fIstring\fR
.SH DESCRIPTION
@@ -414,4 +411,4 @@ Rusty Russell \fI<rusty@rustcorp.com.au\fR> is mainly responsible\.
Main web site: \fIhttps://github.com/ElementsProject/lightning\fR
\" SHA256STAMP:dda6e1cff3e58c38b637c5a11673b5a9f4837cbdf89ed3be52a8bfc874af87d4
\" SHA256STAMP:a455b69caed56afb3bca4263a1cba9fbedbe16a5201b9397cfd0168fb297ea87

2
doc/lightning-decode.7.md
View File

@@ -4,8 +4,6 @@ lightning-decode -- Command for decoding an invoice string (low-level)
SYNOPSIS
--------
**(WARNING: experimental-offers only)**
**decode** *string*
DESCRIPTION

9
plugins/offers.c
View File

@@ -17,6 +17,7 @@
struct pubkey32 id;
u32 cltv_final;
bool offers_enabled;
static struct command_result *finished(struct command *cmd,
const char *buf,
@@ -86,6 +87,9 @@ static struct command_result *onion_message_call(struct command *cmd,
{
const jsmntok_t *om, *invreqtok, *invtok;
if (!offers_enabled)
return command_hook_success(cmd);
om = json_get_member(buf, params, "onion_message");
invreqtok = json_get_member(buf, om, "invoice_request");
@@ -735,7 +739,6 @@ static const char *init(struct plugin *p,
const jsmntok_t *config UNUSED)
{
struct pubkey k;
bool exp_offers;
rpc_scan(p, "getinfo",
take(json_out_obj(NULL, NULL, NULL)),
@@ -748,10 +751,8 @@ static const char *init(struct plugin *p,
take(json_out_obj(NULL, NULL, NULL)),
"{cltv-final:%,experimental-offers:%}",
JSON_SCAN(json_to_number, &cltv_final),
JSON_SCAN(json_to_bool, &exp_offers));
JSON_SCAN(json_to_bool, &offers_enabled));
if (!exp_offers)
return "offers not enabled in config";
return NULL;
}

8
plugins/offers_offer.c
View File

@@ -344,6 +344,10 @@ struct command_result *json_offer(struct command *cmd,
NULL))
return command_param_failed();
if (!offers_enabled)
return command_fail(cmd, LIGHTNINGD,
"experimental-offers not enabled");
/* BOLT-offers #12:
* - MUST NOT set `quantity_min` or `quantity_max` less than 1.
*/
@@ -440,6 +444,10 @@ struct command_result *json_offerout(struct command *cmd,
NULL))
return command_param_failed();
if (!offers_enabled)
return command_fail(cmd, LIGHTNINGD,
"experimental-offers not enabled");
offer->send_invoice = tal(offer, struct tlv_offer_send_invoice);
/* BOLT-offers #12:

1
plugins/offers_offer.h
View File

@@ -4,6 +4,7 @@
#include <plugins/libplugin.h>
extern struct pubkey32 id;
extern bool offers_enabled;
struct command_result *json_offer(struct command *cmd,
const char *buffer,

8
tests/test_pay.py
View File

@@ -3917,11 +3917,17 @@ def test_mpp_overload_payee(node_factory, bitcoind):
def test_offer_needs_option(node_factory):
"""Make sure we don't make offers without offer command"""
l1 = node_factory.get_node()
with pytest.raises(RpcError, match='Unknown command'):
with pytest.raises(RpcError, match='experimental-offers not enabled'):
l1.rpc.call('offer', {'amount': '1msat', 'description': 'test'})
with pytest.raises(RpcError, match='experimental-offers not enabled'):
l1.rpc.call('offerout', {'amount': '2msat',
'description': 'simple test'})
with pytest.raises(RpcError, match='Unknown command'):
l1.rpc.call('fetchinvoice', {'offer': 'aaaa'})
# Decode still works though
assert l1.rpc.decode('lno1qgsqvgnwgcg35z6ee2h3yczraddm72xrfua9uve2rlrm9deu7xyfzrcgqyys5qq7ypnwgkvdr57yzh6h92zg3qctvrm7w38djg67kzcm4yeg8vc4cq633uzqaxlsxzxergsrav494jjrpuy9hcldjeglha57lxvz20fhha6hjwhv69nnzwzjsajntyf0c4z8h9e70dfdlfq8jdvc9rdht8vr955udtg')['valid']
def test_offer(node_factory, bitcoind):
plugin = os.path.join(os.path.dirname(__file__), 'plugins/currencyUSDAUD5000.py')