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

wallet: remove direction column from payments table.

Browse Source 
We simply discard incoming entries.

Signed-off-by: Rusty Russell <rusty@rustcorp.com.au>
This commit is contained in:
Rusty Russell
2018-01-18 06:52:25 +10:30
committed by Christian Decker
parent dea0aef52f
commit 3fbed24b0d
2 changed files with 28 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
wallet/db.c
View File

@@ -126,7 +126,6 @@ char *dbmigrations[] = {
" timestamp INTEGER,"
" status INTEGER,"
" payment_hash BLOB,"
/* FIXME: Direction is now always 1 (OUTGOING), can be removed */
" direction INTEGER,"
" destination BLOB,"
" msatoshi INTEGER,"
@@ -158,6 +157,22 @@ char *dbmigrations[] = {
/* Normally impossible, so at least we'll know if databases are ancient. */
"UPDATE invoices SET msatoshi_received=0 WHERE state=1;",
"ALTER TABLE channels ADD COLUMN last_was_revoke INTEGER;",
/* We no longer record incoming payments: invoices cover that.
* Without ALTER_TABLE DROP COLUMN support we need to do this by
* rename & copy, which works because there are no triggers etc. */
"ALTER TABLE payments RENAME TO temp_payments;",
"CREATE TABLE payments ("
" id INTEGER,"
" timestamp INTEGER,"
" status INTEGER,"
" payment_hash BLOB,"
" destination BLOB,"
" msatoshi INTEGER,"
" PRIMARY KEY (id),"
" UNIQUE (payment_hash)"
");",
"INSERT INTO payments SELECT id, timestamp, status, payment_hash, destination, msatoshi FROM temp_payments WHERE direction=1;",
"DROP TABLE temp_payments;",
NULL,
};

26
wallet/wallet.c
View File

@@ -1253,18 +1253,16 @@ bool wallet_payment_add(struct wallet *wallet,
"INSERT INTO payments ("
" status,"
" payment_hash,"
" direction,"
" destination,"
" msatoshi,"
" timestamp"
") VALUES (?, ?, ?, ?, ?, ?);");
") VALUES (?, ?, ?, ?, ?);");
sqlite3_bind_int(stmt, 1, payment->status);
sqlite3_bind_sha256(stmt, 2, &payment->payment_hash);
sqlite3_bind_int(stmt, 3, DIRECTION_OUTGOING);
sqlite3_bind_pubkey(stmt, 4, &payment->destination);
sqlite3_bind_int64(stmt, 5, payment->msatoshi);
sqlite3_bind_int(stmt, 6, payment->timestamp);
sqlite3_bind_pubkey(stmt, 3, &payment->destination);
sqlite3_bind_int64(stmt, 4, payment->msatoshi);
sqlite3_bind_int(stmt, 5, payment->timestamp);
db_exec_prepared(wallet->db, stmt);
payment->id = sqlite3_last_insert_rowid(wallet->db->sql);
@@ -1278,11 +1276,11 @@ static struct wallet_payment *wallet_stmt2payment(const tal_t *ctx,
payment->id = sqlite3_column_int64(stmt, 0);
payment->status = sqlite3_column_int(stmt, 1);
sqlite3_column_pubkey(stmt, 3, &payment->destination);
payment->msatoshi = sqlite3_column_int64(stmt, 4);
sqlite3_column_sha256(stmt, 5, &payment->payment_hash);
sqlite3_column_pubkey(stmt, 2, &payment->destination);
payment->msatoshi = sqlite3_column_int64(stmt, 3);
sqlite3_column_sha256(stmt, 4, &payment->payment_hash);
payment->timestamp = sqlite3_column_int(stmt, 6);
payment->timestamp = sqlite3_column_int(stmt, 5);
return payment;
}
@@ -1294,10 +1292,10 @@ wallet_payment_by_hash(const tal_t *ctx, struct wallet *wallet,
struct wallet_payment *payment = NULL;
stmt = db_prepare(wallet->db,
"SELECT id, status, direction, destination,"
"msatoshi , payment_hash, timestamp "
"SELECT id, status, destination,"
"msatoshi, payment_hash, timestamp "
"FROM payments "
"WHERE payment_hash = ? AND direction = 1");
"WHERE payment_hash = ?");
sqlite3_bind_sha256(stmt, 1, payment_hash);
if (sqlite3_step(stmt) == SQLITE_ROW) {
@@ -1331,7 +1329,7 @@ const struct wallet_payment **wallet_payment_list(const tal_t *ctx,
payments = tal_arr(ctx, const struct wallet_payment *, 0);
stmt = db_prepare(
wallet->db,
"SELECT id, status, direction, destination, "
"SELECT id, status, destination, "
"msatoshi , payment_hash, timestamp "
"FROM payments;");