akovalenko/lnd.xprv
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

contractcourt: remove broadcastRedeemMultiplier

Browse Source 
The multiplier doesn't make sense because funds may be equally at risk
by failing to broadcast to chain regardless of whether the HTLC is a
redeem or a timeout.
This commit is contained in:
Jim Posen 2018-11-03 22:48:49 -07:00 committed by Joost Jager
parent 6ad8be25e1
commit d107627145
No known key found for this signature in database
GPG Key ID: A61B9D4C393C59C7
1 changed files with 1 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
contractcourt/channel_arbitrator.go
View File

@ -16,15 +16,6 @@ import (
"github.com/lightningnetwork/lnd/lnwire" "github.com/lightningnetwork/lnd/lnwire"
) )
const (
// broadcastRedeemMultiplier is the additional factor that we'll scale
// the normal broadcastDelta by when deciding whether or not to
// broadcast a commitment to claim an HTLC on-chain. We use a scaled
// value, as when redeeming we want to ensure that we have enough time
// to redeem the HTLC, well before it times out.
broadcastRedeemMultiplier = 2
)
var ( var (
// errAlreadyForceClosed is an error returned when we attempt to force // errAlreadyForceClosed is an error returned when we attempt to force
// close a channel that's already in the process of doing so. // close a channel that's already in the process of doing so.
@ -1101,7 +1092,6 @@ func (c *ChannelArbitrator) checkChainActions(height uint32,
"height=%v", c.cfg.ChanPoint, height) "height=%v", c.cfg.ChanPoint, height)
actionMap := make(ChainActionMap) actionMap := make(ChainActionMap)
redeemCutoff := c.cfg.BroadcastDelta * broadcastRedeemMultiplier
// First, we'll make an initial pass over the set of incoming and // First, we'll make an initial pass over the set of incoming and
// outgoing HTLC's to decide if we need to go on chain at all. // outgoing HTLC's to decide if we need to go on chain at all.
@ -1134,7 +1124,7 @@ func (c *ChannelArbitrator) checkChainActions(height uint32,
continue continue
} }
haveChainActions = haveChainActions || c.shouldGoOnChain( haveChainActions = haveChainActions || c.shouldGoOnChain(
htlc.RefundTimeout, redeemCutoff, height, htlc.RefundTimeout, c.cfg.BroadcastDelta, height,
) )
} }