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

listinvoices: add index and start params.

Browse Source 
Now we have defined ordering, we can add a start param.

Signed-off-by: Rusty Russell <rusty@rustcorp.com.au>
Changelog-Added: JSON-RPC: `listinvoices` has `index` and `start` parameters for listing control.
This commit is contained in:
Rusty Russell
2023-07-22 17:21:47 +09:30
parent bbf4f312a4
commit 16c133746b
15 changed files with 426 additions and 275 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
lightningd/invoice.c
View File

@@ -1222,7 +1222,9 @@ static void json_add_invoices(struct json_stream *response,
struct wallet *wallet,
const struct json_escape *label,
const struct sha256 *payment_hash,
const struct sha256 *local_offer_id)
const struct sha256 *local_offer_id,
const enum wait_index *listindex,
u64 liststart)
{
const struct invoice_details *details;
u64 inv_dbid;
@@ -1244,7 +1246,9 @@ static void json_add_invoices(struct json_stream *response,
} else {
struct db_stmt *stmt;
for (stmt = invoices_first(wallet->invoices, &inv_dbid);
for (stmt = invoices_first(wallet->invoices,
listindex, liststart,
&inv_dbid);
stmt;
stmt = invoices_next(wallet->invoices, stmt, &inv_dbid)) {
details = invoices_get_details(tmpctx,
@@ -1271,6 +1275,8 @@ static struct command_result *json_listinvoices(struct command *cmd,
struct wallet *wallet = cmd->ld->wallet;
const char *invstring;
struct sha256 *payment_hash, *offer_id;
enum wait_index *listindex;
u64 *liststart;
char *fail;
if (!param(cmd, buffer, params,
@@ -1278,6 +1284,8 @@ static struct command_result *json_listinvoices(struct command *cmd,
p_opt("invstring", param_invstring, &invstring),
p_opt("payment_hash", param_sha256, &payment_hash),
p_opt("offer_id", param_sha256, &offer_id),
p_opt("index", param_index, &listindex),
p_opt_def("start", param_u64, &liststart, 0),
NULL))
return command_param_failed();
@@ -1288,6 +1296,10 @@ static struct command_result *json_listinvoices(struct command *cmd,
" {label}, {invstring}, {payment_hash}"
" or {offer_id}");
}
if (*liststart != 0 && !listindex) {
return command_fail(cmd, JSONRPC2_INVALID_PARAMS,
"Can only specify {start} with {index}");
}
/* Extract the payment_hash from the invoice. */
if (invstring != NULL) {
@@ -1312,7 +1324,8 @@ static struct command_result *json_listinvoices(struct command *cmd,
response = json_stream_success(cmd);
json_array_start(response, "invoices");
json_add_invoices(response, wallet, label, payment_hash, offer_id);
json_add_invoices(response, wallet, label, payment_hash, offer_id,
listindex, *liststart);
json_array_end(response);
return command_success(cmd, response);
}

8
lightningd/test/run-invoice-select-inchan.c
View File

@@ -399,6 +399,8 @@ bool invoices_find_unpaid(struct invoices *invoices UNNEEDED,
{ fprintf(stderr, "invoices_find_unpaid called!\n"); abort(); }
/* Generated stub for invoices_first */
struct db_stmt *invoices_first(struct invoices *invoices UNNEEDED,
const enum wait_index *listindex UNNEEDED,
u64 liststart UNNEEDED,
u64 *inv_dbid UNNEEDED)
{ fprintf(stderr, "invoices_first called!\n"); abort(); }
/* Generated stub for invoices_get_details */
@@ -720,6 +722,12 @@ struct command_result *param_escaped_string(struct command *cmd UNNEEDED,
const jsmntok_t *tok UNNEEDED,
const char **str UNNEEDED)
{ fprintf(stderr, "param_escaped_string called!\n"); abort(); }
/* Generated stub for param_index */
struct command_result *param_index(struct command *cmd UNNEEDED, const char *name UNNEEDED,
const char *buffer UNNEEDED,
const jsmntok_t *tok UNNEEDED,
enum wait_index **index UNNEEDED)
{ fprintf(stderr, "param_index called!\n"); abort(); }
/* Generated stub for param_invstring */
struct command_result *param_invstring(struct command *cmd UNNEEDED, const char *name UNNEEDED,
const char * buffer UNNEEDED, const jsmntok_t *tok UNNEEDED,