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

wallet: remove edgecase around transaction checks

Browse Source 
we don't populate the tx item when we're running a transaction check
from deep chain (prior to a chain replay)
This commit is contained in:
lisa neigut
2019-12-30 17:36:00 -06:00
committed by Christian Decker
parent b2c4d5e952
commit 700b766ce1
4 changed files with 38 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
lightningd/peer_control.c
View File

@@ -990,7 +990,7 @@ static enum watch_result funding_depth_cb(struct lightningd *ld,
struct short_channel_id scid;
/* Sanity check */
if (tx && !check_funding_tx(tx, channel)) {
if (!check_funding_tx(tx, channel)) {
channel_internal_error(channel, "Bad tx %s: %s",
type_to_string(tmpctx,
struct bitcoin_txid, txid),

6
lightningd/watch.c
View File

@@ -300,8 +300,12 @@ void watch_topology_changed(struct chain_topology *topo)
u32 depth;
depth = get_tx_depth(topo, &w->txid);
if (depth)
if (depth) {
if (!w->tx)
w->tx = wallet_transaction_get(w, topo->ld->wallet,
&w->txid);
needs_rerun |= txw_fire(w, &w->txid, depth);
}
}
} while (needs_rerun);
}