aljaz/lightning
1
0
Fork 0
mirror of https://github.com/aljazceru/lightning.git synced 2026-01-05 07:14:36 +01:00
Code Issues Packages Projects Releases Wiki Activity

wallet: don't scan from worst-case start on first use.

Browse Source 
We only need to do that if it's possible there's something to find:
either we have an unspent output from a unilateral close, or we've
ever handed out an address.

Signed-off-by: Rusty Russell <rusty@rustcorp.com.au>
This commit is contained in:
Rusty Russell
2018-02-16 08:44:44 +10:30
committed by Christian Decker
parent df4c669a60
commit ef9c6cb8c3
1 changed files with 32 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

35
wallet/wallet.c
View File

@@ -667,6 +667,27 @@ bool wallet_channels_load_active(const tal_t *ctx, struct wallet *w)
return ok;
}
/* Upgrade of db (or initial create): do we have anything to scan for? */
static bool wallet_ever_used(struct wallet *w)
{
sqlite3_stmt *stmt;
bool channel_utxos;
/* If we ever handed out an address. */
if (db_get_intvar(w->db, "bip32_max_index", 0) != 0)
return true;
/* Or we could have had a channel terminate unilaterally,
* providing a UTXO. */
stmt = db_query(__func__, w->db,
"SELECT COUNT(*) FROM outputs WHERE commitment_point IS NOT NULL;");
sqlite3_step(stmt);
channel_utxos = (sqlite3_column_int(stmt, 0) != 0);
sqlite3_finalize(stmt);
return channel_utxos;
}
u32 wallet_first_blocknum(struct wallet *w, u32 first_possible)
{
int err;
@@ -675,6 +696,7 @@ u32 wallet_first_blocknum(struct wallet *w, u32 first_possible)
db_query(__func__, w->db,
"SELECT MIN(first_blocknum) FROM channels;");
/* If we ever opened a channel, this will give us the first block. */
err = sqlite3_step(stmt);
if (err == SQLITE_ROW && sqlite3_column_type(stmt, 0) != SQLITE_NULL)
first_channel = sqlite3_column_int(stmt, 0);
@@ -682,9 +704,16 @@ u32 wallet_first_blocknum(struct wallet *w, u32 first_possible)
first_channel = UINT32_MAX;
sqlite3_finalize(stmt);
/* If it's an old database, go back to before c-lightning was cool */
first_utxo = db_get_intvar(w->db, "last_processed_block",
first_possible);
first_utxo = db_get_intvar(w->db, "last_processed_block", 0);
if (first_utxo == 0) {
/* Don't know? New db, or upgraded. */
if (wallet_ever_used(w))
/* Be conservative */
first_utxo = first_possible;
else
first_utxo = UINT32_MAX;
}
if (first_utxo < first_channel)
return first_utxo;
else