davide/palladum-lightning
1
0
Fork 0
Code Issues Pull Requests Actions 5 Packages Projects Releases Wiki Activity

pay: use correct CLTV values for blinded paths.

Browse Source 
We added twice, which caused spurious failures in real-world cases.

Signed-off-by: Rusty Russell <rusty@rustcorp.com.au>
Reported-by: https://github.com/hMsats
Fixes: https://github.com/ElementsProject/lightning/issues/8119
Changelog-Fixed: `xpay` would double the CLTV values in blinded paths, sometimes causing spurious failures.
This commit is contained in:
Rusty Russell
2025-02-26 17:29:23 +10:30
committed by Alex Myers
parent 69476dbcab
commit 2408233b2e
2 changed files with 4 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
plugins/xpay/xpay.c
View File

@@ -899,7 +899,7 @@ static void append_blinded_payloads(struct sphinx_path *sp,
size_t path_num)
{
const struct blinded_path *path = attempt->payment->paths[path_num];
u32 final_cltv = attempt->payment->final_cltv + effective_bheight;
u32 final_cltv = effective_bheight;
for (size_t i = 0; i < tal_count(path->path); i++) {
bool first = (i == 0);
@@ -1635,12 +1635,10 @@ static struct command_result *json_xpay_core(struct command *cmd,
"Could not resolve any paths: unknown short_channel_id");
}
/* Use worst-case CLTV. */
/* We don't actually know the final_cltv for blinded
* paths, we just know the cltv we use to enter the
* final hop. */
payment->final_cltv = 0;
for (size_t i = 0; i < tal_count(payment->payinfos); i++) {
if (payment->payinfos[i]->cltv_expiry_delta > payment->final_cltv)
payment->final_cltv = payment->payinfos[i]->cltv_expiry_delta;
}
/* We will start honoring this flag in future */
payment->disable_mpp = !feature_offered(b12inv->invoice_features, OPT_BASIC_MPP);
if (payment->disable_mpp && command_deprecated_in_ok(cmd, "ignore_bolt12_mpp", "v25.05", "v25.11"))