highperfocused/lnd
1
0
Fork 0
mirror of https://github.com/lightningnetwork/lnd.git synced 2025-05-20 08:40:09 +02:00
Code Issues Packages Projects Releases Wiki Activity

rpcserver: use HtlcIndex as the unique key

Browse Source
This commit is contained in:
yyforyongyu 2025-03-21 08:30:06 +08:00
parent 70dec8e169
commit 43409c7840
No known key found for this signature in database
GPG Key ID: 9BCD95C4FF296868
1 changed files with 17 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
rpcserver.go
View File

@ -4841,12 +4841,17 @@ func createRPCOpenChannel(r *rpcServer, dbChannel *channeldb.OpenChannel,
) )
} }
// Create a set of the HTLCs found in the remote commitment, which is // Create two sets of the HTLCs found in the remote commitment, which is
// used to decide whether the HTLCs from the local commitment has been // used to decide whether the HTLCs from the local commitment has been
// locked in or not. // locked in or not.
remoteHTLCs := fn.NewSet[[32]byte]() remoteIncomingHTLCs := fn.NewSet[uint64]()
remoteOutgoingHTLCs := fn.NewSet[uint64]()
for _, htlc := range dbChannel.RemoteCommitment.Htlcs { for _, htlc := range dbChannel.RemoteCommitment.Htlcs {
remoteHTLCs.Add(htlc.RHash) if htlc.Incoming {
remoteIncomingHTLCs.Add(htlc.HtlcIndex)
} else {
remoteOutgoingHTLCs.Add(htlc.HtlcIndex)
}
} }
for i, htlc := range localCommit.Htlcs { for i, htlc := range localCommit.Htlcs {
@ -4855,7 +4860,10 @@ func createRPCOpenChannel(r *rpcServer, dbChannel *channeldb.OpenChannel,
circuitMap := r.server.htlcSwitch.CircuitLookup() circuitMap := r.server.htlcSwitch.CircuitLookup()
var forwardingChannel, forwardingHtlcIndex uint64 var (
forwardingChannel, forwardingHtlcIndex uint64
lockedIn bool
)
switch { switch {
case htlc.Incoming: case htlc.Incoming:
circuit := circuitMap.LookupCircuit( circuit := circuitMap.LookupCircuit(
@ -4871,6 +4879,8 @@ func createRPCOpenChannel(r *rpcServer, dbChannel *channeldb.OpenChannel,
forwardingHtlcIndex = circuit.Outgoing.HtlcID forwardingHtlcIndex = circuit.Outgoing.HtlcID
} }
lockedIn = remoteIncomingHTLCs.Contains(htlc.HtlcIndex)
case !htlc.Incoming: case !htlc.Incoming:
circuit := circuitMap.LookupOpenCircuit( circuit := circuitMap.LookupOpenCircuit(
htlcswitch.CircuitKey{ htlcswitch.CircuitKey{
@ -4890,6 +4900,8 @@ func createRPCOpenChannel(r *rpcServer, dbChannel *channeldb.OpenChannel,
forwardingHtlcIndex = circuit.Incoming.HtlcID forwardingHtlcIndex = circuit.Incoming.HtlcID
} }
lockedIn = remoteOutgoingHTLCs.Contains(htlc.HtlcIndex)
} }
channel.PendingHtlcs[i] = &lnrpc.HTLC{ channel.PendingHtlcs[i] = &lnrpc.HTLC{
@ -4900,7 +4912,7 @@ func createRPCOpenChannel(r *rpcServer, dbChannel *channeldb.OpenChannel,
HtlcIndex: htlc.HtlcIndex, HtlcIndex: htlc.HtlcIndex,
ForwardingChannel: forwardingChannel, ForwardingChannel: forwardingChannel,
ForwardingHtlcIndex: forwardingHtlcIndex, ForwardingHtlcIndex: forwardingHtlcIndex,
LockedIn: remoteHTLCs.Contains(rHash), LockedIn: lockedIn,
} }
// Add the Pending Htlc Amount to UnsettledBalance field. // Add the Pending Htlc Amount to UnsettledBalance field.