cnct: always set trigger height to close height
Prior to this change, the trigger height for closed channels was set to the current best block height. As this height is in some cases used as a height hint, the spend may have been missed.
This commit is contained in:
parent
29e1489179
commit
c0b1b3be14
@ -354,9 +354,6 @@ func (c *ChannelArbitrator) Start() error {
|
||||
return err
|
||||
}
|
||||
|
||||
log.Infof("ChannelArbitrator(%v): starting state=%v", c.cfg.ChanPoint,
|
||||
c.state)
|
||||
|
||||
_, bestHeight, err := c.cfg.ChainIO.GetBestBlock()
|
||||
if err != nil {
|
||||
c.cfg.BlockEpochs.Cancel()
|
||||
@ -391,14 +388,19 @@ func (c *ChannelArbitrator) Start() error {
|
||||
case channeldb.RemoteForceClose:
|
||||
trigger = remoteCloseTrigger
|
||||
}
|
||||
triggerHeight = c.cfg.ClosingHeight
|
||||
|
||||
log.Warnf("ChannelArbitrator(%v): detected stalled "+
|
||||
"state=%v for closed channel, using "+
|
||||
"trigger=%v", c.cfg.ChanPoint, c.state, trigger)
|
||||
"state=%v for closed channel",
|
||||
c.cfg.ChanPoint, c.state)
|
||||
}
|
||||
|
||||
triggerHeight = c.cfg.ClosingHeight
|
||||
}
|
||||
|
||||
log.Infof("ChannelArbitrator(%v): starting state=%v, trigger=%v, "+
|
||||
"triggerHeight=%v", c.cfg.ChanPoint, c.state, trigger,
|
||||
triggerHeight)
|
||||
|
||||
// Next we'll fetch our confirmed commitment set. This will only exist
|
||||
// if the channel has been closed out on chain for modern nodes. For
|
||||
// older nodes, this won't be found at all, and will rely on the
|
||||
|
Loading…
Reference in New Issue
Block a user