mirrors/core-lightning
1
0
Fork 0
mirror of https://github.com/ElementsProject/lightning.git synced 2024-11-19 09:54:16 +01:00
Code Issues Projects Releases Wiki Activity

plugins/offers: don't establish_onion_path at start of processing invoice_request

Browse Source 
send_onion_reply() does that for us now, so we don't need to do it up-front.

Simplifies the code quite a bit.

Signed-off-by: Rusty Russell <rusty@rustcorp.com.au>
This commit is contained in:
Rusty Russell 2024-07-17 12:53:24 +09:30 committed by Vincenzo Palazzo
parent a43705194d
commit 386f7ab64c
1 changed files with 27 additions and 59 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

86
plugins/offers_invreq_hook.c
View File

@ -14,7 +14,6 @@
#include <common/onion_message.h> #include <common/onion_message.h>
#include <common/overflows.h> #include <common/overflows.h>
#include <errno.h> #include <errno.h>
#include <plugins/establish_onion_path.h>
#include <plugins/offers.h> #include <plugins/offers.h>
#include <plugins/offers_invreq_hook.h> #include <plugins/offers_invreq_hook.h>
#include <secp256k1_schnorrsig.h> #include <secp256k1_schnorrsig.h>
@ -22,7 +21,10 @@
/* We need to keep the reply path around so we can reply with invoice */ /* We need to keep the reply path around so we can reply with invoice */
struct invreq { struct invreq {
/* The invoice request we're replying to */
struct tlv_invoice_request *invreq; struct tlv_invoice_request *invreq;
/* They reply path they told us to use */
struct blinded_path *reply_path; struct blinded_path *reply_path;
/* The offer id */ /* The offer id */
@ -968,14 +970,34 @@ static struct command_result *listoffers_done(struct command *cmd,
return handle_amount_and_recurrence(cmd, ir, amt); return handle_amount_and_recurrence(cmd, ir, amt);
} }
static struct command_result *invoice_request_path_done(struct command *cmd, struct command_result *handle_invoice_request(struct command *cmd,
const struct pubkey *path, const u8 *invreqbin,
struct invreq *ir) struct blinded_path *reply_path)
{ {
struct out_req *req; struct out_req *req;
int bad_feature; int bad_feature;
size_t len = tal_count(invreqbin);
const u8 *cursor = invreqbin;
struct invreq *ir = tal(cmd, struct invreq);
ir->reply_path = tal_steal(ir, reply_path);
ir->invreq = fromwire_tlv_invoice_request(cmd, &cursor, &len);
/* BOLT-offers #12:
* The reader:
* ...
* - MUST fail the request if any non-signature TLV fields greater or
* equal to 160.
*/
/* BOLT-offers #12:
* Each form is signed using one or more *signature TLV elements*:
* TLV types 240 through 1000 (inclusive)
*/
if (tlv_span(invreqbin, 0, 159, NULL)
+ tlv_span(invreqbin, 240, 1000, NULL) != tal_bytelen(invreqbin))
return fail_invreq(cmd, ir, "Fields beyond 160");
/* Now we can send error replies, because we will have connected. */
if (!ir->invreq) { if (!ir->invreq) {
return fail_invreq(cmd, ir, "Invalid invreq"); return fail_invreq(cmd, ir, "Invalid invreq");
} }
@ -1046,57 +1068,3 @@ static struct command_result *invoice_request_path_done(struct command *cmd,
json_add_sha256(req->js, "offer_id", &ir->offer_id); json_add_sha256(req->js, "offer_id", &ir->offer_id);
return send_outreq(cmd->plugin, req); return send_outreq(cmd->plugin, req);
} }
static struct command_result *invoice_request_path_fail(struct command *cmd,
const char *why,
struct invreq *ir)
{
plugin_log(cmd->plugin, LOG_DBG,
"invoice_request path to %s failed: %s",
fmt_sciddir_or_pubkey(tmpctx, &ir->reply_path->first_node_id),
why);
return command_hook_success(cmd);
}
struct command_result *handle_invoice_request(struct command *cmd,
const u8 *invreqbin,
struct blinded_path *reply_path)
{
size_t len = tal_count(invreqbin);
const u8 *cursor = invreqbin;
struct invreq *ir = tal(cmd, struct invreq);
ir->reply_path = tal_steal(ir, reply_path);
ir->invreq = fromwire_tlv_invoice_request(cmd, &cursor, &len);
/* BOLT-offers #12:
* The reader:
* ...
* - MUST fail the request if any non-signature TLV fields greater or
* equal to 160.
*/
/* BOLT-offers #12:
* Each form is signed using one or more *signature TLV elements*:
* TLV types 240 through 1000 (inclusive)
*/
if (tlv_span(invreqbin, 0, 159, NULL)
+ tlv_span(invreqbin, 240, 1000, NULL) != tal_bytelen(invreqbin))
return fail_invreq(cmd, ir, "Fields beyond 160");
/* If they give us an sciddir, we need to convert now, to connect */
if (!reply_path->first_node_id.is_pubkey
&& !convert_to_scidd(cmd, &reply_path->first_node_id)) {
return fail_invreq(cmd, ir, "first_node_id %s not found",
fmt_sciddir_or_pubkey(tmpctx, &reply_path->first_node_id));
}
/* Before any failure, make sure we can reach first node! */
return establish_onion_path(cmd, get_gossmap(cmd->plugin), &id,
&reply_path->first_node_id.pubkey,
disable_connect,
invoice_request_path_done,
invoice_request_path_fail,
ir);
}