aljaz/lightning
1
0
Fork 0
mirror of https://github.com/aljazceru/lightning.git synced 2025-12-22 16:44:20 +01:00
Code Issues Packages Projects Releases Wiki Activity

wallet: wrap missing last_processed_block handling in COMPAT_V052.

Browse Source 
Our testing also reveals a bug: we start lightningd and shut it down
before fully processing the blockchain, so we don't set
last_processed_block.  Fix that by setting it immediately once we have
a block: worst case it goes backwards a little.

Signed-off-by: Rusty Russell <rusty@rustcorp.com.au>
This commit is contained in:
Rusty Russell
2018-03-07 05:00:21 +10:30
committed by Christian Decker
parent 328786ffeb
commit 9d9c1c3db6
2 changed files with 11 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
lightningd/chaintopology.c
View File

@@ -483,6 +483,10 @@ static void init_topo(struct bitcoind *bitcoind UNUSED,
block_map_add(&topo->block_map, topo->root); block_map_add(&topo->block_map, topo->root);
topo->tip = topo->prev_tip = topo->root; topo->tip = topo->prev_tip = topo->root;
/* In case we don't get all the way to updates_complete */
db_set_intvar(topo->bitcoind->ld->wallet->db,
"last_processed_block", topo->tip->height);
io_break(topo); io_break(topo);
} }

7
wallet/wallet.c
View File

@@ -720,6 +720,7 @@ bool wallet_channels_load_active(const tal_t *ctx, struct wallet *w)
return ok; return ok;
} }
#ifdef COMPAT_V052
/* Upgrade of db (or initial create): do we have anything to scan for? */ /* Upgrade of db (or initial create): do we have anything to scan for? */
static bool wallet_ever_used(struct wallet *w) static bool wallet_ever_used(struct wallet *w)
{ {
@@ -740,6 +741,7 @@ static bool wallet_ever_used(struct wallet *w)
return channel_utxos; return channel_utxos;
} }
#endif
/* We want the earlier of either: /* We want the earlier of either:
* 1. The first channel we're still watching (it might have closed), * 1. The first channel we're still watching (it might have closed),
@@ -764,6 +766,8 @@ u32 wallet_first_blocknum(struct wallet *w, u32 first_possible)
first_channel = UINT32_MAX; first_channel = UINT32_MAX;
sqlite3_finalize(stmt); sqlite3_finalize(stmt);
#ifdef COMPAT_V052
/* This field was missing in older databases. */
first_utxo = db_get_intvar(w->db, "last_processed_block", 0); first_utxo = db_get_intvar(w->db, "last_processed_block", 0);
if (first_utxo == 0) { if (first_utxo == 0) {
/* Don't know? New db, or upgraded. */ /* Don't know? New db, or upgraded. */
@@ -773,6 +777,9 @@ u32 wallet_first_blocknum(struct wallet *w, u32 first_possible)
else else
first_utxo = UINT32_MAX; first_utxo = UINT32_MAX;
} }
#else
first_utxo = db_get_intvar(w->db, "last_processed_block", UINT32_MAX);
#endif
if (first_utxo < first_channel) if (first_utxo < first_channel)
return first_utxo; return first_utxo;