Skip to content

Fix listsendpay flake #9241

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

Open
Lagrang3 wants to merge 2 commits into
base: master
Choose a base branch
from
+9 −5
Open

Fix listsendpay flake #9241

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
627e445
pytest: listpays: test grouping by calling xpay
Lagrang3 Jun 22, 2026
232250b
listsendpays: discriminate ongoing payment by groupid
Lagrang3 Jun 22, 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
3 changes: 2 additions & 1 deletion plugins/xpay/listpays.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -159,7 +159,8 @@ static void add_new_entry(struct plugin *plugin,

if (pm->state & PAYMENT_COMPLETE)
json_add_string(ret, "status", "complete");
else if (pm->state & PAYMENT_PENDING || attempt_ongoing(plugin, pm->payment_hash))
else if (pm->state & PAYMENT_PENDING ||
attempt_ongoing(plugin, pm->payment_hash, pm->sortkey.groupid))
json_add_string(ret, "status", "pending");
else
json_add_string(ret, "status", "failed");
Expand Down
6 changes: 4 additions & 2 deletions plugins/xpay/xpay.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2510,13 +2510,15 @@ static struct payment *new_payment(const tal_t *ctx,
return payment;
}

bool attempt_ongoing(struct plugin *plugin, const struct sha256 *payment_hash)
bool attempt_ongoing(struct plugin *plugin, const struct sha256 *payment_hash,
u64 groupid)
{
struct xpay *xpay = xpay_of(plugin);
const struct payment *payment;

list_for_each(&xpay->payments, payment, list) {
if (sha256_eq(&payment->payment_hash, payment_hash))
if (sha256_eq(&payment->payment_hash, payment_hash) &&
payment->group_id == groupid)
return true;
}
return false;
Expand Down
3 changes: 2 additions & 1 deletion plugins/xpay/xpay.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@ struct plugin;
struct sha256;

/* Are we still attempting this payment? If so, we won't list is as failed. */
bool attempt_ongoing(struct plugin *plugin, const struct sha256 *payment_hash);
bool attempt_ongoing(struct plugin *plugin, const struct sha256 *payment_hash,
u64 groupid);

#endif /* LIGHTNING_PLUGINS_XPAY_XPAY_H */
2 changes: 1 addition & 1 deletion tests/test_pay.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5307,7 +5307,7 @@ def test_sendpay_grouping(node_factory, bitcoind):
wait_for(lambda: only_one(l3.rpc.listpeers()['peers'])['connected'] is True)
scid = l3.rpc.listpeerchannels()['channels'][0]['short_channel_id']
wait_for(lambda: [c['active'] for c in l1.rpc.listchannels(scid)['channels']] == [True, True])
l1.rpc.pay(inv, amount_msat='10000msat')
l1.rpc.xpay(inv, amount_msat='10000msat')

# And finally we should have all 3 attempts to pay the invoice
pays = l1.rpc.listpays()['pays']
Expand Down
Loading