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

lnwallet/channel: make validateCommitmentSanity take our/their predict

Browse Source 
add

To ba able to validate the commitment sanity both for remote and local
commitments, and at the same time predict both our and their add, we let
validateCommitmentSanity take an extra payment descriptor to make this
possible.
This commit is contained in:
Johan T. Halseth 2020-02-19 12:27:41 +01:00
parent 92b79f6b6a
commit 05fb272deb
No known key found for this signature in database
GPG Key ID: 15BAADA29DA20D26
1 changed files with 14 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
lnwallet/channel.go
View File

@ -3103,12 +3103,13 @@ func (lc *LightningChannel) getUnsignedAckedUpdates() []channeldb.LogUpdate {
// validateCommitmentSanity is used to validate the current state of the // validateCommitmentSanity is used to validate the current state of the
// commitment transaction in terms of the ChannelConstraints that we and our // commitment transaction in terms of the ChannelConstraints that we and our
// remote peer agreed upon during the funding workflow. The predictAdded // remote peer agreed upon during the funding workflow. The
// parameter should be set to a valid PaymentDescriptor if we are validating // predict[Our|Their]Add should parameters should be set to a valid
// in the state when adding a new HTLC, or nil otherwise. // PaymentDescriptor if we are validating in the state when adding a new HTLC,
// or nil otherwise.
func (lc *LightningChannel) validateCommitmentSanity(theirLogCounter, func (lc *LightningChannel) validateCommitmentSanity(theirLogCounter,
ourLogCounter uint64, remoteChain bool, ourLogCounter uint64, remoteChain bool,
predictAdded *PaymentDescriptor) error { predictOurAdd, predictTheirAdd *PaymentDescriptor) error {
// Fetch all updates not committed. // Fetch all updates not committed.
view := lc.fetchHTLCView(theirLogCounter, ourLogCounter) view := lc.fetchHTLCView(theirLogCounter, ourLogCounter)
@ -3116,14 +3117,11 @@ func (lc *LightningChannel) validateCommitmentSanity(theirLogCounter,
// If we are checking if we can add a new HTLC, we add this to the // If we are checking if we can add a new HTLC, we add this to the
// appropriate update log, in order to validate the sanity of the // appropriate update log, in order to validate the sanity of the
// commitment resulting from _actually adding_ this HTLC to the state. // commitment resulting from _actually adding_ this HTLC to the state.
if predictAdded != nil { if predictOurAdd != nil {
// If the remoteChain bool is true, add to ourUpdates. view.ourUpdates = append(view.ourUpdates, predictOurAdd)
if remoteChain { }
view.ourUpdates = append(view.ourUpdates, predictAdded) if predictTheirAdd != nil {
} else { view.theirUpdates = append(view.theirUpdates, predictTheirAdd)
// Else add to theirUpdates.
view.theirUpdates = append(view.theirUpdates, predictAdded)
}
} }
commitChain := lc.localCommitChain commitChain := lc.localCommitChain
@ -3296,7 +3294,7 @@ func (lc *LightningChannel) SignNextCommitment() (lnwire.Sig, []lnwire.Sig, []ch
// party set up when we initially set up the channel. If we are, then // party set up when we initially set up the channel. If we are, then
// we'll abort this state transition. // we'll abort this state transition.
err := lc.validateCommitmentSanity( err := lc.validateCommitmentSanity(
remoteACKedIndex, lc.localUpdateLog.logIndex, true, nil, remoteACKedIndex, lc.localUpdateLog.logIndex, true, nil, nil,
) )
if err != nil { if err != nil {
return sig, htlcSigs, nil, err return sig, htlcSigs, nil, err
@ -4050,7 +4048,7 @@ func (lc *LightningChannel) ReceiveNewCommitment(commitSig lnwire.Sig,
// the constraints we specified during initial channel setup. If not, // the constraints we specified during initial channel setup. If not,
// then we'll abort the channel as they've violated our constraints. // then we'll abort the channel as they've violated our constraints.
err := lc.validateCommitmentSanity( err := lc.validateCommitmentSanity(
lc.remoteUpdateLog.logIndex, localACKedIndex, false, nil, lc.remoteUpdateLog.logIndex, localACKedIndex, false, nil, nil,
) )
if err != nil { if err != nil {
return err return err
@ -4647,7 +4645,7 @@ func (lc *LightningChannel) AddHTLC(htlc *lnwire.UpdateAddHTLC,
// must keep on our commitment transaction. // must keep on our commitment transaction.
remoteACKedIndex := lc.localCommitChain.tail().theirMessageIndex remoteACKedIndex := lc.localCommitChain.tail().theirMessageIndex
err := lc.validateCommitmentSanity( err := lc.validateCommitmentSanity(
remoteACKedIndex, lc.localUpdateLog.logIndex, true, pd, remoteACKedIndex, lc.localUpdateLog.logIndex, true, pd, nil,
) )
if err != nil { if err != nil {
return 0, err return 0, err
@ -4685,7 +4683,7 @@ func (lc *LightningChannel) ReceiveHTLC(htlc *lnwire.UpdateAddHTLC) (uint64, err
// Clamp down on the number of HTLC's we can receive by checking the // Clamp down on the number of HTLC's we can receive by checking the
// commitment sanity. // commitment sanity.
err := lc.validateCommitmentSanity( err := lc.validateCommitmentSanity(
lc.remoteUpdateLog.logIndex, localACKedIndex, false, pd, lc.remoteUpdateLog.logIndex, localACKedIndex, false, nil, pd,
) )
if err != nil { if err != nil {
return 0, err return 0, err