Merge pull request #2335 from wpaulino/fail-final-expiry-too-soon
htlcswitch/link: return FinalFailExpiryTooSoon for last htlc
This commit is contained in:
commit
bc4c5560cf
@ -2398,19 +2398,16 @@ func (l *channelLink) processRemoteAdds(fwdPkg *channeldb.FwdPkg,
|
|||||||
// computed correctly.
|
// computed correctly.
|
||||||
expectedHeight := heightNow + minCltvDelta
|
expectedHeight := heightNow + minCltvDelta
|
||||||
switch {
|
switch {
|
||||||
|
case !l.cfg.DebugHTLC && pd.Timeout < expectedHeight:
|
||||||
|
log.Errorf("Incoming htlc(%x) has an "+
|
||||||
|
"expiration that is too soon: "+
|
||||||
|
"expected at least %v, got %v",
|
||||||
|
pd.RHash[:], expectedHeight, pd.Timeout)
|
||||||
|
|
||||||
case !l.cfg.DebugHTLC && fwdInfo.OutgoingCTLV < expectedHeight:
|
failure := lnwire.FailFinalExpiryTooSoon{}
|
||||||
log.Errorf("Onion payload of incoming "+
|
|
||||||
"htlc(%x) has incorrect time-lock: "+
|
|
||||||
"expected %v, got %v",
|
|
||||||
pd.RHash[:], expectedHeight,
|
|
||||||
fwdInfo.OutgoingCTLV)
|
|
||||||
|
|
||||||
failure := lnwire.NewFinalIncorrectCltvExpiry(
|
|
||||||
fwdInfo.OutgoingCTLV,
|
|
||||||
)
|
|
||||||
l.sendHTLCError(
|
l.sendHTLCError(
|
||||||
pd.HtlcIndex, failure, obfuscator, pd.SourceRef,
|
pd.HtlcIndex, failure, obfuscator,
|
||||||
|
pd.SourceRef,
|
||||||
)
|
)
|
||||||
|
|
||||||
needUpdate = true
|
needUpdate = true
|
||||||
|
Loading…
Reference in New Issue
Block a user