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

pay: Aggregate completed_at in listpays and pay

Browse Source 
The completion of a successful payment is defined as the first
completion of a successful part, hence we just collect the minimum
completion time of successes.

Changelog-Added: JSON-RPC: `pay` and `listpays` now lists the completion time.
This commit is contained in:
Christian Decker
2022-07-04 18:02:10 +02:00
parent 246e1fb0b3
commit f64d755e43
1 changed files with 22 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
plugins/pay.c
View File

@@ -290,6 +290,10 @@ struct pay_mpp {
/* Timestamp of the first part */ /* Timestamp of the first part */
u32 timestamp; u32 timestamp;
/* Completion timestamp. The lowest `completed_at` value for a
* successful part. */
u64 success_at;
/* The destination of the payment, if specified. */ /* The destination of the payment, if specified. */
const jsmntok_t *destination; const jsmntok_t *destination;
@@ -391,6 +395,9 @@ static void add_new_entry(struct json_stream *ret,
json_add_u32(ret, "created_at", pm->timestamp); json_add_u32(ret, "created_at", pm->timestamp);
if (pm->success_at < UINT64_MAX)
json_add_u64(ret, "completed_at", pm->success_at);
if (pm->label) if (pm->label)
json_add_tok(ret, "label", pm->label, buf); json_add_tok(ret, "label", pm->label, buf);
if (pm->preimage) if (pm->preimage)
@@ -430,10 +437,12 @@ static struct command_result *listsendpays_done(struct command *cmd,
"Unexpected non-array result from listsendpays"); "Unexpected non-array result from listsendpays");
json_for_each_arr(i, t, arr) { json_for_each_arr(i, t, arr) {
const jsmntok_t *status, *invstrtok, *hashtok, *createdtok, *grouptok; const jsmntok_t *status, *invstrtok, *hashtok, *createdtok,
*completedtok, *grouptok;
const char *invstr = invstring; const char *invstr = invstring;
struct sha256 payment_hash; struct sha256 payment_hash;
u32 created_at; u32 created_at;
u64 completed_at;
u64 groupid; u64 groupid;
struct pay_sort_key key; struct pay_sort_key key;
@@ -442,9 +451,15 @@ static struct command_result *listsendpays_done(struct command *cmd,
invstrtok = json_get_member(buf, t, "bolt12"); invstrtok = json_get_member(buf, t, "bolt12");
hashtok = json_get_member(buf, t, "payment_hash"); hashtok = json_get_member(buf, t, "payment_hash");
createdtok = json_get_member(buf, t, "created_at"); createdtok = json_get_member(buf, t, "created_at");
completedtok = json_get_member(buf, t, "completed_at");
assert(hashtok != NULL); assert(hashtok != NULL);
assert(createdtok != NULL); assert(createdtok != NULL);
if (completedtok != NULL)
json_to_u64(buf, completedtok, &completed_at);
else
completed_at = UINT64_MAX;
grouptok = json_get_member(buf, t, "groupid"); grouptok = json_get_member(buf, t, "groupid");
if (grouptok != NULL) if (grouptok != NULL)
json_to_u64(buf, grouptok, &groupid); json_to_u64(buf, grouptok, &groupid);
@@ -475,6 +490,7 @@ static struct command_result *listsendpays_done(struct command *cmd,
pm->timestamp = created_at; pm->timestamp = created_at;
pm->sortkey.payment_hash = pm->payment_hash; pm->sortkey.payment_hash = pm->payment_hash;
pm->sortkey.groupid = groupid; pm->sortkey.groupid = groupid;
pm->success_at = UINT64_MAX;
pay_map_add(&pay_map, pm); pay_map_add(&pay_map, pm);
// First time we see the groupid we add it to the order // First time we see the groupid we add it to the order
// array, so we can retrieve them in the correct order. // array, so we can retrieve them in the correct order.
@@ -495,6 +511,11 @@ static struct command_result *listsendpays_done(struct command *cmd,
pm->preimage pm->preimage
= json_get_member(buf, t, "payment_preimage"); = json_get_member(buf, t, "payment_preimage");
pm->state |= PAYMENT_COMPLETE; pm->state |= PAYMENT_COMPLETE;
/* We count down from UINT64_MAX. */
if (pm->success_at > completed_at)
pm->success_at = completed_at;
} else if (json_tok_streq(buf, status, "pending")) { } else if (json_tok_streq(buf, status, "pending")) {
add_amount_sent(cmd->plugin, pm->invstring, pm, buf, t); add_amount_sent(cmd->plugin, pm->invstring, pm, buf, t);
pm->num_nonfailed_parts++; pm->num_nonfailed_parts++;