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

htlcswitch: update forwarding policy verification to use new time lock info

Browse Source
This commit is contained in:
Olaoluwa Osuntokun 2018-06-25 20:25:59 -07:00
parent 7b4c150983
commit bdecc5bea9
No known key found for this signature in database
GPG Key ID: 964EA263DD637C21
2 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
htlcswitch/link.go
View File

@ -1807,7 +1807,7 @@ func (l *channelLink) HtlcSatifiesPolicy(payHash [32]byte,
// to the current height. // to the current height.
timeDelta := policy.TimeLockDelta timeDelta := policy.TimeLockDelta
if incomingTimeout-timeDelta <= heightNow { if incomingTimeout-timeDelta <= heightNow {
log.Errorf("htlc(%x) has an expiry that's too soon: "+ l.errorf("htlc(%x) has an expiry that's too soon: "+
"outgoing_expiry=%v, best_height=%v", payHash[:], "outgoing_expiry=%v, best_height=%v", payHash[:],
incomingTimeout-timeDelta, heightNow) incomingTimeout-timeDelta, heightNow)
@ -1829,7 +1829,7 @@ func (l *channelLink) HtlcSatifiesPolicy(payHash [32]byte,
// delta should equal the outgoing time lock. Otherwise, whether the // delta should equal the outgoing time lock. Otherwise, whether the
// sender messed up, or an intermediate node tampered with the HTLC. // sender messed up, or an intermediate node tampered with the HTLC.
if incomingTimeout-timeDelta < outgoingTimeout { if incomingTimeout-timeDelta < outgoingTimeout {
log.Errorf("Incoming htlc(%x) has incorrect time-lock value: "+ l.errorf("Incoming htlc(%x) has incorrect time-lock value: "+
"expected at least %v block delta, got %v block delta", "expected at least %v block delta, got %v block delta",
payHash[:], timeDelta, incomingTimeout-outgoingTimeout) payHash[:], timeDelta, incomingTimeout-outgoingTimeout)

5
htlcswitch/switch.go
View File

@ -964,9 +964,11 @@ func (s *Switch) handlePacketForward(packet *htlcPacket) error {
// Before we check the link's bandwidth, we'll ensure // Before we check the link's bandwidth, we'll ensure
// that the HTLC satisfies the current forwarding // that the HTLC satisfies the current forwarding
// policy of this target link. // policy of this target link.
currentHeight := atomic.LoadUint32(&s.bestHeight)
err := link.HtlcSatifiesPolicy( err := link.HtlcSatifiesPolicy(
htlc.PaymentHash, packet.incomingAmount, htlc.PaymentHash, packet.incomingAmount,
packet.amount, packet.amount, packet.incomingTimeout,
packet.outgoingTimeout, currentHeight,
) )
if err != nil { if err != nil {
linkErrs[link.ShortChanID()] = err linkErrs[link.ShortChanID()] = err
@ -1404,6 +1406,7 @@ out:
} }
atomic.StoreUint32(&s.bestHeight, uint32(blockEpoch.Height)) atomic.StoreUint32(&s.bestHeight, uint32(blockEpoch.Height))
// A local close request has arrived, we'll forward this to the // A local close request has arrived, we'll forward this to the
// relevant link (if it exists) so the channel can be // relevant link (if it exists) so the channel can be
// cooperatively closed (if possible). // cooperatively closed (if possible).