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

lnwallet: update ReceiveRevocation to use new DB API's

Browse Source 
We no longer need to manually pass in the channel delta to
AppendToRevocationLog (now called AdvanceCommitChainTail) as the
pointers on-disk will be updated atomically.
This commit is contained in:
Olaoluwa Osuntokun 2017-11-09 23:02:56 -08:00
parent 4fa714afce
commit b50a94aeab
No known key found for this signature in database
GPG Key ID: 964EA263DD637C21
1 changed files with 3 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
lnwallet/channel.go
View File

@ -3555,13 +3555,9 @@ func (lc *LightningChannel) ReceiveRevocation(revMsg *lnwire.RevokeAndAck) ([]*P
// At this point, the revocation has been accepted, and we've rotated // At this point, the revocation has been accepted, and we've rotated
// the current revocation key+hash for the remote party. Therefore we // the current revocation key+hash for the remote party. Therefore we
// sync now to ensure the revocation producer state is consistent with // sync now to ensure the revocation producer state is consistent with
// the current commitment height. // the current commitment height and also to advance the on-disk
tail := lc.remoteCommitChain.tail() // commitment chain.
delta, err := tail.toChannelDelta(false) if err := lc.channelState.AdvanceCommitChainTail(); err != nil {
if err != nil {
return nil, err
}
if err := lc.channelState.AppendToRevocationLog(delta); err != nil {
return nil, err return nil, err
} }
@ -3583,13 +3579,8 @@ func (lc *LightningChannel) ReceiveRevocation(revMsg *lnwire.RevokeAndAck) ([]*P
continue continue
} }
// TODO(roasbeef): re-visit after adding persistence to HTLCs
// * either record add height, or set to N - 1
uncomitted := (htlc.addCommitHeightRemote == 0 || uncomitted := (htlc.addCommitHeightRemote == 0 ||
htlc.addCommitHeightLocal == 0) htlc.addCommitHeightLocal == 0)
fmt.Println(remoteChainTail, localChainTail,
htlc.addCommitHeightRemote,
htlc.addCommitHeightLocal)
if htlc.EntryType == Add && uncomitted { if htlc.EntryType == Add && uncomitted {
continue continue
} }