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

lnwallet: properly reject new commitment if next revocation point isn't known

Browse Source
This commit is contained in:
Olaoluwa Osuntokun 2017-12-11 15:32:24 -08:00
parent 4f2a8fd533
commit 62da377f78
No known key found for this signature in database
GPG Key ID: 964EA263DD637C21
2 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
lnwallet/channel.go
View File

@ -2935,8 +2935,8 @@ func (lc *LightningChannel) SignNextCommitment() (*btcec.Signature, []*btcec.Sig
// don't yet have the initial next revocation point of the remote // don't yet have the initial next revocation point of the remote
// party, then we're unable to create new states. Each time we create a // party, then we're unable to create new states. Each time we create a
// new state, we consume a prior revocation point. // new state, we consume a prior revocation point.
if lc.remoteCommitChain.hasUnackedCommitment() || commitPoint := lc.channelState.RemoteNextRevocation
lc.channelState.RemoteCurrentRevocation == nil { if lc.remoteCommitChain.hasUnackedCommitment() || commitPoint == nil {
return nil, nil, ErrNoWindow return nil, nil, ErrNoWindow
} }
@ -2958,7 +2958,6 @@ func (lc *LightningChannel) SignNextCommitment() (*btcec.Signature, []*btcec.Sig
// Grab the next commitment point for the remote party. This will be // Grab the next commitment point for the remote party. This will be
// used within fetchCommitmentView to derive all the keys necessary to // used within fetchCommitmentView to derive all the keys necessary to
// construct the commitment state. // construct the commitment state.
commitPoint := lc.channelState.RemoteNextRevocation
keyRing := deriveCommitmentKeys(commitPoint, false, lc.localChanCfg, keyRing := deriveCommitmentKeys(commitPoint, false, lc.localChanCfg,
lc.remoteChanCfg) lc.remoteChanCfg)

2
lnwallet/channel_test.go
View File

@ -3859,7 +3859,7 @@ func TestSignCommitmentFailNotLockedIn(t *testing.T) {
// Next, we'll modify Alice's internal state to omit knowledge of Bob's // Next, we'll modify Alice's internal state to omit knowledge of Bob's
// next revocation point. // next revocation point.
aliceChannel.channelState.RemoteCurrentRevocation = nil aliceChannel.channelState.RemoteNextRevocation = nil
// If we now try to initiate a state update, then it should fail as // If we now try to initiate a state update, then it should fail as
// Alice is unable to actually create a new state. // Alice is unable to actually create a new state.