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

lightningd: fix reorg bug where we don't fire watches.

Browse Source 
If the same memory gets reallocated, our "has the tip changed?" test
gets a false negative.  This happened for me about one time in 10,
causing tests/test_misc.py::test_funding_reorg_remote_lags to fail.

Signed-off-by: Rusty Russell <rusty@rustcorp.com.au>
This commit is contained in:
Rusty Russell
2020-01-29 15:20:11 +10:30
parent 8eda489ae2
commit 1273b842d2
2 changed files with 6 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
lightningd/chaintopology.c
View File

@@ -585,7 +585,7 @@ void topology_add_sync_waiter_(const tal_t *ctx,
/* Once we're run out of new blocks to add, call this. */
static void updates_complete(struct chain_topology *topo)
{
if (topo->tip != topo->prev_tip) {
if (!bitcoin_blkid_eq(&topo->tip->blkid, &topo->prev_tip)) {
/* Tell lightningd about new block. */
notify_new_block(topo->bitcoind->ld, topo->tip->height);
@@ -599,7 +599,7 @@ static void updates_complete(struct chain_topology *topo)
db_set_intvar(topo->bitcoind->ld->wallet->db,
"last_processed_block", topo->tip->height);
topo->prev_tip = topo->tip;
topo->prev_tip = topo->tip->blkid;
}
/* If bitcoind is synced, we're now synced. */
@@ -785,7 +785,8 @@ static void init_topo(struct bitcoind *bitcoind UNUSED,
{
topo->root = new_block(topo, blk, topo->max_blockheight);
block_map_add(&topo->block_map, topo->root);
topo->tip = topo->prev_tip = topo->root;
topo->tip = topo->root;
topo->prev_tip = topo->tip->blkid;
/* In case we don't get all the way to updates_complete */
db_set_intvar(topo->bitcoind->ld->wallet->db,

3
lightningd/chaintopology.h
View File

@@ -85,7 +85,8 @@ HTABLE_DEFINE_TYPE(struct block, keyof_block_map, hash_sha, block_eq, block_map)
struct chain_topology {
struct lightningd *ld;
struct block *root;
struct block *prev_tip, *tip;
struct block *tip;
struct bitcoin_blkid prev_tip;
struct block_map block_map;
u32 feerate[NUM_FEERATES];
bool feerate_uninitialized;