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

txwatch: hand ld to callback, don't assume channel is non-NULL.

Browse Source 
We're about to use the txwatch facility for UTXOs, where there's no channel,
so allow that the be NULL, and hand the struct lightningd which callers
want anyway.

Signed-off-by: Rusty Russell <rusty@rustcorp.com.au>
This commit is contained in:
Rusty Russell
2018-08-13 12:35:33 +09:30
committed by Christian Decker
parent 5d23698665
commit 05f12edf60
5 changed files with 36 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
lightningd/onchain_control.c
View File

@@ -75,11 +75,12 @@ static void onchain_tx_depth(struct channel *channel,
/**
* Entrypoint for the txwatch callback, calls onchain_tx_depth.
*/
static enum watch_result onchain_tx_watched(struct channel *channel,
static enum watch_result onchain_tx_watched(struct lightningd *ld,
struct channel *channel,
const struct bitcoin_txid *txid,
unsigned int depth)
{
u32 blockheight = channel->peer->ld->topology->tip->height;
u32 blockheight = get_block_height(ld->topology);
if (depth == 0) {
log_unusual(channel->log, "Chain reorganization!");
channel_set_owner(channel, NULL, false);
@@ -93,7 +94,7 @@ static enum watch_result onchain_tx_watched(struct channel *channel,
}
/* Store the channeltx so we can replay later */
wallet_channeltxs_add(channel->peer->ld->wallet, channel,
wallet_channeltxs_add(ld->wallet, channel,
WIRE_ONCHAIN_DEPTH, txid, 0, blockheight);
onchain_tx_depth(channel, txid, depth);