Browse Source

wallet: Store the description in the database for invoices

ppa-0.6.1
Christian Decker 7 years ago
committed by Rusty Russell
parent
commit
7f45947523
  1. 1
      lightningd/invoice.c
  2. 6
      wallet/invoices.c
  3. 1
      wallet/invoices.h
  4. 1
      wallet/test/run-wallet.c
  5. 3
      wallet/wallet.c
  6. 1
      wallet/wallet.h

1
lightningd/invoice.c

@ -305,6 +305,7 @@ static void json_invoice(struct command *cmd,
take(label_val),
expiry,
b11enc,
b11->description,
&r,
&rhash);

6
wallet/invoices.c

@ -260,6 +260,7 @@ bool invoices_create(struct invoices *invoices,
const struct json_escaped *label TAKES,
u64 expiry,
const char *b11enc,
const char *description,
const struct preimage *r,
const struct sha256 *rhash)
{
@ -288,11 +289,11 @@ bool invoices_create(struct invoices *invoices,
" ( payment_hash, payment_key, state"
" , msatoshi, label, expiry_time"
" , pay_index, msatoshi_received"
" , paid_timestamp, bolt11)"
" , paid_timestamp, bolt11, description)"
" VALUES ( ?, ?, ?"
" , ?, ?, ?"
" , NULL, NULL"
" , NULL, ?);");
" , NULL, ?, ?);");
sqlite3_bind_blob(stmt, 1, rhash, sizeof(struct sha256), SQLITE_TRANSIENT);
sqlite3_bind_blob(stmt, 2, r, sizeof(struct preimage), SQLITE_TRANSIENT);
@ -304,6 +305,7 @@ bool invoices_create(struct invoices *invoices,
sqlite3_bind_json_escaped(stmt, 5, label);
sqlite3_bind_int64(stmt, 6, expiry_time);
sqlite3_bind_text(stmt, 7, b11enc, strlen(b11enc), SQLITE_TRANSIENT);
sqlite3_bind_text(stmt, 8, description, strlen(description), SQLITE_TRANSIENT);
db_exec_prepared(invoices->db, stmt);

1
wallet/invoices.h

@ -59,6 +59,7 @@ bool invoices_create(struct invoices *invoices,
const struct json_escaped *label TAKES,
u64 expiry,
const char *b11enc,
const char *description,
const struct preimage *r,
const struct sha256 *rhash);

1
wallet/test/run-wallet.c

@ -109,6 +109,7 @@ bool invoices_create(struct invoices *invoices UNNEEDED,
const struct json_escaped *label TAKES UNNEEDED,
u64 expiry UNNEEDED,
const char *b11enc UNNEEDED,
const char *description UNNEEDED,
const struct preimage *r UNNEEDED,
const struct sha256 *rhash UNNEEDED)
{ fprintf(stderr, "invoices_create called!\n"); abort(); }

3
wallet/wallet.c

@ -1402,10 +1402,11 @@ bool wallet_invoice_create(struct wallet *wallet,
const struct json_escaped *label TAKES,
u64 expiry,
const char *b11enc,
const char *description,
const struct preimage *r,
const struct sha256 *rhash)
{
return invoices_create(wallet->invoices, pinvoice, msatoshi, label, expiry, b11enc, r, rhash);
return invoices_create(wallet->invoices, pinvoice, msatoshi, label, expiry, b11enc, description, r, rhash);
}
bool wallet_invoice_find_by_label(struct wallet *wallet,
struct invoice *pinvoice,

1
wallet/wallet.h

@ -501,6 +501,7 @@ bool wallet_invoice_create(struct wallet *wallet,
const struct json_escaped *label TAKES,
u64 expiry,
const char *b11enc,
const char *description,
const struct preimage *r,
const struct sha256 *rhash);

Loading…
Cancel
Save