Skip to content

Fix xpay age flakyness #9214

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

Merged
madelinevibes merged 2 commits into from
Jun 17, 2026
+25 −48
Merged

Fix xpay age flakyness #9214

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
bb9aacb
xpay: clean preapprove*_succeed functions
Lagrang3 Jun 15, 2026
d1b7a99
xpay: age layer before payment instead on timer
Lagrang3 Jun 15, 2026
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
73 changes: 25 additions & 48 deletions plugins/xpay/xpay.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2132,19 +2132,18 @@ static struct command_result *populate_private_layer(struct command *cmd,
return batch_done(aux_cmd, batch);
}

static struct command_result *age_layer(struct command *cmd, struct payment *payment);

static struct command_result *
preapproveinvoice_succeed(struct command *cmd,
const char *method,
const char *buf,
const jsmntok_t *result,
struct payment *payment)
preapprove_succeed(struct command *cmd, const char *method, const char *buf,
const jsmntok_t *result, struct payment *payment)
{
/* Now we can conclude `check` command */
if (command_check_only(cmd)) {
return command_check_done(cmd);
}

return populate_private_layer(cmd, payment);
return age_layer(cmd, payment);
}

static struct command_result *check_offer_payable(struct command *cmd,
Expand Down Expand Up @@ -2782,12 +2781,12 @@ static struct command_result *xpay_core(struct command *cmd,
/* Now preapprove, then start payment. */
if (command_check_only(cmd)) {
req = jsonrpc_request_start(cmd, "check",
&preapproveinvoice_succeed,
&preapprove_succeed,
&forward_error, payment);
json_add_string(req->js, "command_to_check", "preapproveinvoice");
} else {
req = jsonrpc_request_start(cmd, "preapproveinvoice",
&preapproveinvoice_succeed,
&preapprove_succeed,
&forward_error, payment);
}
json_add_string(req->js, "bolt11", payment->invstring);
Expand Down Expand Up @@ -2940,66 +2939,44 @@ static struct command_result *getinfo_done(struct command *aux_cmd,
return aux_command_done(aux_cmd);
}

/* Recursion */
static void start_aging_timer(struct plugin *plugin);
static struct command_result *populate_private_layer(struct command *cmd,
struct payment *payment);

static struct command_result *age_done(struct command *timer_cmd,
const char *method,
const char *buf,
const jsmntok_t *result,
void *unused)
static struct command_result *age_done(struct command *cmd,
const char *method UNUSED,
const char *buf UNUSED,
const jsmntok_t *result UNUSED,
struct payment *payment)
{
start_aging_timer(timer_cmd->plugin);
return timer_complete(timer_cmd);
return populate_private_layer(cmd, payment);
}

static struct command_result *age_layer(struct command *timer_cmd, void *unused)
static struct command_result *age_layer(struct command *cmd, struct payment *payment)
{
struct xpay *xpay = xpay_of(cmd->plugin);

if (xpay->dev_no_age)
return populate_private_layer(cmd, payment);

struct out_req *req;
req = jsonrpc_request_start(timer_cmd, "askrene-age",
req = jsonrpc_request_start(cmd, "askrene-age",
age_done,
plugin_broken_cb,
NULL);
payment);
json_add_string(req->js, "layer", "xpay");
json_add_u64(req->js, "cutoff", clock_time().ts.tv_sec - 3600);
return send_outreq(req);
}

static void start_aging_timer(struct plugin *plugin)
{
struct xpay *xpay = xpay_of(plugin);

if (xpay->dev_no_age)
return;
notleak(global_timer(plugin, time_from_sec(60), age_layer, NULL));
}

static struct command_result *xpay_layer_created(struct command *aux_cmd,
const char *method,
const char *buf,
const jsmntok_t *result,
void *unused)
{
start_aging_timer(aux_cmd->plugin);
return aux_command_done(aux_cmd);
}

static struct command_result *
preapprovekeysend_succeed(struct command *cmd,
const char *method,
const char *buf,
const jsmntok_t *result,
struct payment *payment)
{
/* Now we can conclude `check` command */
if (command_check_only(cmd)) {
return command_check_done(cmd);
}

/* Actually we don't need a private layer, but unification is easy. */
return populate_private_layer(cmd, payment);
}

static struct command_result *json_xkeysend(struct command *cmd,
const char *buf,
const jsmntok_t *params)
Expand Down Expand Up @@ -3083,12 +3060,12 @@ static struct command_result *json_xkeysend(struct command *cmd,
/* We do pre-approval immediately (note: even if command_check_only!) */
if (command_check_only(cmd)) {
req = jsonrpc_request_start(cmd, "check",
preapprovekeysend_succeed,
preapprove_succeed,
forward_error, payment);
json_add_string(req->js, "command_to_check", "preapprovekeysend");
} else {
req = jsonrpc_request_start(cmd, "preapprovekeysend",
preapprovekeysend_succeed,
preapprove_succeed,
forward_error, payment);
}
json_add_pubkey(req->js, "destination", &payment->destination);
Expand Down
Loading