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

Merge pull request #3576 from Roasbeef/chain-action-cnct-supplement-fix

Browse Source 
contractcourt: use legacy chain actions of commitSet not found
This commit is contained in:
Olaoluwa Osuntokun 2019-10-04 15:04:32 -07:00 committed by GitHub
commit 52c933ed28
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 26 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
contractcourt/channel_arbitrator.go
View File

@ -426,8 +426,7 @@ func (c *ChannelArbitrator) Start() error {
// receive a chain event from the chain watcher than the // receive a chain event from the chain watcher than the
// commitment has been confirmed on chain, and before we // commitment has been confirmed on chain, and before we
// advance our state step, we call InsertConfirmedCommitSet. // advance our state step, we call InsertConfirmedCommitSet.
confCommitSet := commitSet.HtlcSets[*commitSet.ConfCommitKey] if err := c.relaunchResolvers(commitSet); err != nil {
if err := c.relaunchResolvers(confCommitSet); err != nil {
c.cfg.BlockEpochs.Cancel() c.cfg.BlockEpochs.Cancel()
return err return err
} }
@ -443,10 +442,10 @@ func (c *ChannelArbitrator) Start() error {
// starting the ChannelArbitrator. This information should ideally be stored in // starting the ChannelArbitrator. This information should ideally be stored in
// the database, so this only serves as a intermediate work-around to prevent a // the database, so this only serves as a intermediate work-around to prevent a
// migration. // migration.
func (c *ChannelArbitrator) relaunchResolvers(confirmedHTLCs []channeldb.HTLC) error { func (c *ChannelArbitrator) relaunchResolvers(commitSet *CommitSet) error {
// We'll now query our log to see if there are any active // We'll now query our log to see if there are any active unresolved
// unresolved contracts. If this is the case, then we'll // contracts. If this is the case, then we'll relaunch all contract
// relaunch all contract resolvers. // resolvers.
unresolvedContracts, err := c.log.FetchUnresolvedContracts() unresolvedContracts, err := c.log.FetchUnresolvedContracts()
if err != nil { if err != nil {
return err return err
@ -461,6 +460,27 @@ func (c *ChannelArbitrator) relaunchResolvers(confirmedHTLCs []channeldb.HTLC) e
} }
commitHash := contractResolutions.CommitHash commitHash := contractResolutions.CommitHash
// In prior versions of lnd, the information needed to supplement the
// resolvers (in most cases, the full amount of the HTLC) was found in
// the chain action map, which is now deprecated. As a result, if the
// commitSet is nil (an older node with unresolved HTLCs at time of
// upgrade), then we'll use the chain action information in place. The
// chain actions may exclude some information, but we cannot recover it
// for these older nodes at the moment.
var confirmedHTLCs []channeldb.HTLC
if commitSet != nil {
confirmedHTLCs = commitSet.HtlcSets[*commitSet.ConfCommitKey]
} else {
chainActions, err := c.log.FetchChainActions()
if err != nil {
log.Errorf("unable to fetch chain actions: %v", err)
return err
}
for _, htlcs := range chainActions {
confirmedHTLCs = append(confirmedHTLCs, htlcs...)
}
}
// Reconstruct the htlc outpoints and data from the chain action log. // Reconstruct the htlc outpoints and data from the chain action log.
// The purpose of the constructed htlc map is to supplement to // The purpose of the constructed htlc map is to supplement to
// resolvers restored from database with extra data. Ideally this data // resolvers restored from database with extra data. Ideally this data