mirrors/lnd
1
0
Fork 0
mirror of https://github.com/lightningnetwork/lnd.git synced 2025-02-24 06:47:44 +01:00
Code Issues Projects Releases Wiki Activity

lnwallet: add AddHeight and RemoveHeight funcs

Browse source
This commit is contained in:
Oliver Gugger 2024-04-11 14:20:31 +02:00
parent 26e759423b
commit 1f3f954a02
No known key found for this signature in database
GPG key ID: 8E4256593F177720
1 changed files with 32 additions and 25 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

57
lnwallet/channel.go
View file

@ -385,6 +385,30 @@ type PaymentDescriptor struct {
BlindingPoint lnwire.BlindingPointRecord BlindingPoint lnwire.BlindingPointRecord
} }
// AddHeight returns a pointer to the height at which the HTLC was added to the
// commitment chain. The height is returned based on the chain the HTLC is
// being added to (local or remote chain). It is returned as a pointer, which
// allows the caller to mutate the underlying value if necessary.
func AddHeight(htlc *PaymentDescriptor, remoteChain bool) *uint64 {
if remoteChain {
return &htlc.addCommitHeightRemote
}
return &htlc.addCommitHeightLocal
}
// RemoveHeight returns a pointer to the height at which the HTLC was removed
// from the commitment chain. The height is returned based on the chain the HTLC
// is being removed from (local or remote chain). It is returned as a pointer,
// which allows the caller to mutate the underlying value if necessary.
func RemoveHeight(htlc *PaymentDescriptor, remoteChain bool) *uint64 {
if remoteChain {
return &htlc.removeCommitHeightRemote
}
return &htlc.removeCommitHeightLocal
}
// PayDescsFromRemoteLogUpdates converts a slice of LogUpdates received from the // PayDescsFromRemoteLogUpdates converts a slice of LogUpdates received from the
// remote peer into PaymentDescriptors to inform a link's forwarding decisions. // remote peer into PaymentDescriptors to inform a link's forwarding decisions.
// //
@ -3530,13 +3554,7 @@ func processAddEntry(htlc *PaymentDescriptor, ourBalance, theirBalance *lnwire.M
// a new commitment), then we'll may be updating the height this entry // a new commitment), then we'll may be updating the height this entry
// was added to the chain. Otherwise, we may be updating the entry's // was added to the chain. Otherwise, we may be updating the entry's
// height w.r.t the local chain. // height w.r.t the local chain.
var addHeight *uint64 addHeight := AddHeight(htlc, remoteChain)
if remoteChain {
addHeight = &htlc.addCommitHeightRemote
} else {
addHeight = &htlc.addCommitHeightLocal
}
if *addHeight != 0 { if *addHeight != 0 {
return return
} }
@ -3567,14 +3585,8 @@ func processRemoveEntry(htlc *PaymentDescriptor, ourBalance,
theirBalance *lnwire.MilliSatoshi, nextHeight uint64, theirBalance *lnwire.MilliSatoshi, nextHeight uint64,
remoteChain bool, isIncoming, mutateState bool) { remoteChain bool, isIncoming, mutateState bool) {
var removeHeight *uint64
if remoteChain {
removeHeight = &htlc.removeCommitHeightRemote
} else {
removeHeight = &htlc.removeCommitHeightLocal
}
// Ignore any removal entries which have already been processed. // Ignore any removal entries which have already been processed.
removeHeight := RemoveHeight(htlc, remoteChain)
if *removeHeight != 0 { if *removeHeight != 0 {
return return
} }
@ -3618,15 +3630,8 @@ func processFeeUpdate(feeUpdate *PaymentDescriptor, nextHeight uint64,
// Fee updates are applied for all commitments after they are // Fee updates are applied for all commitments after they are
// sent/received, so we consider them being added and removed at the // sent/received, so we consider them being added and removed at the
// same height. // same height.
var addHeight *uint64 addHeight := AddHeight(feeUpdate, remoteChain)
var removeHeight *uint64 removeHeight := RemoveHeight(feeUpdate, remoteChain)
if remoteChain {
addHeight = &feeUpdate.addCommitHeightRemote
removeHeight = &feeUpdate.removeCommitHeightRemote
} else {
addHeight = &feeUpdate.addCommitHeightLocal
removeHeight = &feeUpdate.removeCommitHeightLocal
}
if *addHeight != 0 { if *addHeight != 0 {
return return
@ -5156,10 +5161,12 @@ func (lc *LightningChannel) computeView(view *HtlcView, remoteChain bool,
// number of outstanding HTLCs has changed. // number of outstanding HTLCs has changed.
if lc.channelState.IsInitiator { if lc.channelState.IsInitiator {
ourBalance += lnwire.NewMSatFromSatoshis( ourBalance += lnwire.NewMSatFromSatoshis(
commitChain.tip().fee) commitChain.tip().fee,
)
} else if !lc.channelState.IsInitiator { } else if !lc.channelState.IsInitiator {
theirBalance += lnwire.NewMSatFromSatoshis( theirBalance += lnwire.NewMSatFromSatoshis(
commitChain.tip().fee) commitChain.tip().fee,
)
} }
nextHeight := commitChain.tip().height + 1 nextHeight := commitChain.tip().height + 1