json-rpc: Retrieve the invoice description in listinvoices

This commit is contained in:
Christian Decker
2018-07-24 20:56:21 +02:00
committed by Rusty Russell
parent 7f45947523
commit 259a69994d
2 changed files with 13 additions and 1 deletions

View File

@@ -48,6 +48,10 @@ static void json_add_invoice(struct json_result *response,
inv->msatoshi_received); inv->msatoshi_received);
json_add_u64(response, "paid_at", inv->paid_timestamp); json_add_u64(response, "paid_at", inv->paid_timestamp);
} }
if (inv->description)
json_add_string(response, "description", inv->description);
json_add_u64(response, "expires_at", inv->expiry_time); json_add_u64(response, "expires_at", inv->expiry_time);
json_object_end(response); json_object_end(response);

View File

@@ -114,7 +114,14 @@ static void wallet_stmt2invoice_details(const tal_t *ctx,
dtl->paid_timestamp = sqlite3_column_int64(stmt, 8); dtl->paid_timestamp = sqlite3_column_int64(stmt, 8);
} }
dtl->bolt11 = tal_strndup(ctx, sqlite3_column_blob(stmt, 9), sqlite3_column_bytes(stmt, 9)); dtl->bolt11 = tal_strndup(ctx, sqlite3_column_blob(stmt, 9),
sqlite3_column_bytes(stmt, 9));
if (sqlite3_column_type(stmt, 10) != SQLITE_NULL)
dtl->description = tal_strdup(
ctx, (const char *)sqlite3_column_text(stmt, 10));
else
dtl->description = NULL;
} }
struct invoices *invoices_new(const tal_t *ctx, struct invoices *invoices_new(const tal_t *ctx,
@@ -643,6 +650,7 @@ void invoices_get_details(const tal_t *ctx,
"SELECT state, payment_key, payment_hash" "SELECT state, payment_key, payment_hash"
" , label, msatoshi, expiry_time, pay_index" " , label, msatoshi, expiry_time, pay_index"
" , msatoshi_received, paid_timestamp, bolt11" " , msatoshi_received, paid_timestamp, bolt11"
" , description"
" FROM invoices" " FROM invoices"
" WHERE id = ?;"); " WHERE id = ?;");
sqlite3_bind_int64(stmt, 1, invoice.id); sqlite3_bind_int64(stmt, 1, invoice.id);