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

htlcswitch: add new incoming+outgoing timeout fields to htlcPacket

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

36
htlcswitch/link.go
View File

@ -2373,14 +2373,16 @@ func (l *channelLink) processRemoteAdds(fwdPkg *channeldb.FwdPkg,
chanIterator.EncodeNextHop(buf) chanIterator.EncodeNextHop(buf)
updatePacket := &htlcPacket{ updatePacket := &htlcPacket{
incomingChanID: l.ShortChanID(), incomingChanID: l.ShortChanID(),
incomingHTLCID: pd.HtlcIndex, incomingHTLCID: pd.HtlcIndex,
outgoingChanID: fwdInfo.NextHop, outgoingChanID: fwdInfo.NextHop,
sourceRef: pd.SourceRef, sourceRef: pd.SourceRef,
incomingAmount: pd.Amount, incomingAmount: pd.Amount,
amount: addMsg.Amount, amount: addMsg.Amount,
htlc: addMsg, htlc: addMsg,
obfuscator: obfuscator, obfuscator: obfuscator,
incomingTimeout: pd.Timeout,
outgoingTimeout: fwdInfo.OutgoingCTLV,
} }
switchPackets = append( switchPackets = append(
switchPackets, updatePacket, switchPackets, updatePacket,
@ -2439,14 +2441,16 @@ func (l *channelLink) processRemoteAdds(fwdPkg *channeldb.FwdPkg,
// section. // section.
if fwdPkg.State == channeldb.FwdStateLockedIn { if fwdPkg.State == channeldb.FwdStateLockedIn {
updatePacket := &htlcPacket{ updatePacket := &htlcPacket{
incomingChanID: l.ShortChanID(), incomingChanID: l.ShortChanID(),
incomingHTLCID: pd.HtlcIndex, incomingHTLCID: pd.HtlcIndex,
outgoingChanID: fwdInfo.NextHop, outgoingChanID: fwdInfo.NextHop,
sourceRef: pd.SourceRef, sourceRef: pd.SourceRef,
incomingAmount: pd.Amount, incomingAmount: pd.Amount,
amount: addMsg.Amount, amount: addMsg.Amount,
htlc: addMsg, htlc: addMsg,
obfuscator: obfuscator, obfuscator: obfuscator,
incomingTimeout: pd.Timeout,
outgoingTimeout: fwdInfo.OutgoingCTLV,
} }
fwdPkg.FwdFilter.Set(idx) fwdPkg.FwdFilter.Set(idx)

9
htlcswitch/packet.go
View File

@ -80,6 +80,15 @@ type htlcPacket struct {
// circuit holds a reference to an Add's circuit which is persisted in // circuit holds a reference to an Add's circuit which is persisted in
// the switch during successful forwarding. // the switch during successful forwarding.
circuit *PaymentCircuit circuit *PaymentCircuit
// incomingTimeout is the timeout that the incoming HTLC carried. This
// is the timeout of the HTLC applied to the incoming link.
incomingTimeout uint32
// outgoingTimeout is the timeout of the proposed outgoing HTLC. This
// will be extraced from the hop payload recevived by the incoming
// link.
outgoingTimeout uint32
} }
// inKey returns the circuit key used to identify the incoming htlc. // inKey returns the circuit key used to identify the incoming htlc.