mirrors/core-lightning
1
0
Fork 0
mirror of https://github.com/ElementsProject/lightning.git synced 2025-01-18 21:35:11 +01:00
Code Issues Projects Releases Wiki Activity

invoice: store expiry time in db.

Browse Source 
This is backwards-compat: sets existing expiry for invoices to ~infinity.

Signed-off-by: Rusty Russell <rusty@rustcorp.com.au>
This commit is contained in:
Rusty Russell 2017-11-21 16:57:28 +10:30 committed by Christian Decker
parent 1e6d5d82aa
commit e302d6193c
2 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
wallet/db.c
View File

@ -131,6 +131,9 @@ char *dbmigrations[] = {
" PRIMARY KEY (id)," " PRIMARY KEY (id),"
" UNIQUE (payment_hash)" " UNIQUE (payment_hash)"
");", ");",
/* Add expiry field to invoices (effectively infinite). */
"ALTER TABLE invoices ADD expiry_time INTEGER;",
"UPDATE invoices SET expiry_time=9223372036854775807;",
NULL, NULL,
}; };

6
wallet/wallet.c
View File

@ -1057,13 +1057,14 @@ void wallet_invoice_save(struct wallet *wallet, struct invoice *inv)
sqlite3_stmt *stmt; sqlite3_stmt *stmt;
if (!inv->id) { if (!inv->id) {
stmt = db_prepare(wallet->db, stmt = db_prepare(wallet->db,
"INSERT INTO invoices (payment_hash, payment_key, state, msatoshi, label) VALUES (?, ?, ?, ?, ?);"); "INSERT INTO invoices (payment_hash, payment_key, state, msatoshi, label, expiry_time) VALUES (?, ?, ?, ?, ?, ?);");
sqlite3_bind_blob(stmt, 1, &inv->rhash, sizeof(inv->rhash), SQLITE_TRANSIENT); sqlite3_bind_blob(stmt, 1, &inv->rhash, sizeof(inv->rhash), SQLITE_TRANSIENT);
sqlite3_bind_blob(stmt, 2, &inv->r, sizeof(inv->r), SQLITE_TRANSIENT); sqlite3_bind_blob(stmt, 2, &inv->r, sizeof(inv->r), SQLITE_TRANSIENT);
sqlite3_bind_int(stmt, 3, inv->state); sqlite3_bind_int(stmt, 3, inv->state);
sqlite3_bind_int64(stmt, 4, inv->msatoshi); sqlite3_bind_int64(stmt, 4, inv->msatoshi);
sqlite3_bind_text(stmt, 5, inv->label, strlen(inv->label), SQLITE_TRANSIENT); sqlite3_bind_text(stmt, 5, inv->label, strlen(inv->label), SQLITE_TRANSIENT);
sqlite3_bind_int64(stmt, 6, inv->expiry_time);
db_exec_prepared(wallet->db, stmt); db_exec_prepared(wallet->db, stmt);
@ -1091,6 +1092,7 @@ static bool wallet_stmt2invoice(sqlite3_stmt *stmt, struct invoice *inv)
inv->label = tal_strndup(inv, sqlite3_column_blob(stmt, 4), sqlite3_column_bytes(stmt, 4)); inv->label = tal_strndup(inv, sqlite3_column_blob(stmt, 4), sqlite3_column_bytes(stmt, 4));
inv->msatoshi = sqlite3_column_int64(stmt, 5); inv->msatoshi = sqlite3_column_int64(stmt, 5);
inv->expiry_time = sqlite3_column_int64(stmt, 6);
return true; return true;
} }
@ -1100,7 +1102,7 @@ bool wallet_invoices_load(struct wallet *wallet, struct invoices *invs)
int count = 0; int count = 0;
sqlite3_stmt *stmt = db_query(__func__, wallet->db, sqlite3_stmt *stmt = db_query(__func__, wallet->db,
"SELECT id, state, payment_key, payment_hash, " "SELECT id, state, payment_key, payment_hash, "
"label, msatoshi FROM invoices;"); "label, msatoshi, expiry_time FROM invoices;");
if (!stmt) { if (!stmt) {
log_broken(wallet->log, "Could not load invoices"); log_broken(wallet->log, "Could not load invoices");
return false; return false;