mirrors/core-lightning
1
0
Fork 0
mirror of https://github.com/ElementsProject/lightning.git synced 2025-01-18 13:25:43 +01:00
Code Issues Projects Releases Wiki Activity

rbf: when a peer is activated, also keep track of all of its inflights

Browse Source 
We weren't watching for all inflights after the node is restarted.
Yikes.
This commit is contained in:
niftynei 2021-05-20 16:53:48 -05:00 committed by Rusty Russell
parent d04c373283
commit 85ec604238
1 changed files with 25 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
lightningd/peer_control.c
View File

@ -1473,6 +1473,19 @@ void channel_watch_funding(struct lightningd *ld, struct channel *channel)
channel_watch_wrong_funding(ld, channel);
}
static void channel_watch_inflight(struct lightningd *ld,
struct channel *channel,
struct channel_inflight *inflight)
{
/* FIXME: Remove arg from cb? */
watch_txid(channel, ld->topology, channel,
&inflight->funding->txid, funding_depth_cb);
watch_txo(channel, ld->topology, channel,
&inflight->funding->txid,
inflight->funding->outnum,
funding_spent);
}
static void json_add_peer(struct lightningd *ld,
struct json_stream *response,
struct peer *p,
@ -1837,6 +1850,7 @@ static void activate_peer(struct peer *peer, u32 delay)
{
u8 *msg;
struct channel *channel;
struct channel_inflight *inflight;
struct lightningd *ld = peer->ld;
/* We can only have one active channel: make sure connectd
@ -1870,6 +1884,17 @@ static void activate_peer(struct peer *peer, u32 delay)
continue;
/* Watching lockin may be unnecessary, but it's harmless. */
channel_watch_funding(ld, channel);
/* Also watch any inflight txs */
list_for_each(&channel->inflights, inflight, list) {
/* Don't double watch the txid that's also in
* channel->funding_txid */
if (bitcoin_txid_eq(&channel->funding_txid,
&inflight->funding->txid))
continue;
channel_watch_inflight(ld, channel, inflight);
}
}
}