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

channeldb: update CloseChannel to adhere to new disk structure

Browse Source 
In this commit, we update the CloseChannel method to respect the new
on-disk bucket based structure. Additionally, we now ensure that we
delete the new chainBucket.
This commit is contained in:
Olaoluwa Osuntokun 2017-11-09 20:54:50 -08:00
parent 3cf4ac8237
commit 0178920cba
No known key found for this signature in database
GPG Key ID: 964EA263DD637C21
1 changed files with 32 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

65
channeldb/channel.go
View File

@ -1212,74 +1212,73 @@ type ChannelCloseSummary struct {
// TODO(roasbeef): also store short_chan_id? // TODO(roasbeef): also store short_chan_id?
} }
// CloseChannel closes a previously active lightning channel. Closing a channel // CloseChannel closes a previously active Lightning channel. Closing a channel
// entails deleting all saved state within the database concerning this // entails deleting all saved state within the database concerning this
// channel. This method also takes a struct that summarizes the state of the // channel. This method also takes a struct that summarizes the state of the
// channel at closing, this compact representation will be the only component // channel at closing, this compact representation will be the only component
// of a channel left over after a full closing. // of a channel left over after a full closing.
func (c *OpenChannel) CloseChannel(summary *ChannelCloseSummary) error { func (c *OpenChannel) CloseChannel(summary *ChannelCloseSummary) error {
return c.Db.Update(func(tx *bolt.Tx) error { return c.Db.Update(func(tx *bolt.Tx) error {
// First fetch the top level bucket which stores all data openChanBucket := tx.Bucket(openChannelBucket)
// related to current, active channels. if openChanBucket == nil {
chanBucket := tx.Bucket(openChannelBucket)
if chanBucket == nil {
return ErrNoChanDBExists return ErrNoChanDBExists
} }
// Within this top level bucket, fetch the bucket dedicated to
// storing open channel data specific to the remote node.
nodePub := c.IdentityPub.SerializeCompressed() nodePub := c.IdentityPub.SerializeCompressed()
nodeChanBucket := chanBucket.Bucket(nodePub) nodeChanBucket := openChanBucket.Bucket(nodePub)
if nodeChanBucket == nil { if nodeChanBucket == nil {
return ErrNoActiveChannels return ErrNoActiveChannels
} }
// Delete this channel ID from the node's active channel index. chainBucket := nodeChanBucket.Bucket(c.ChainHash[:])
chanIndexBucket := nodeChanBucket.Bucket(chanIDBucket) if chainBucket == nil {
if chanIndexBucket == nil {
return ErrNoActiveChannels return ErrNoActiveChannels
} }
var b bytes.Buffer var chanPointBuf bytes.Buffer
if err := writeOutpoint(&b, &c.FundingOutpoint); err != nil { chanPointBuf.Grow(outPointSize)
err := writeOutpoint(&chanPointBuf, &c.FundingOutpoint)
if err != nil {
return err return err
} }
chanBucket := chainBucket.Bucket(chanPointBuf.Bytes())
// If this channel isn't found within the channel index bucket, if chanBucket == nil {
// then it has already been deleted. So we can exit early as return ErrNoActiveChannels
// there isn't any more work for us to do here.
outPointBytes := b.Bytes()
if chanIndexBucket.Get(outPointBytes) == nil {
return nil
}
// Otherwise, we can safely delete the channel from the index
// without running into any boltdb related errors by repeated
// deletion attempts.
if err := chanIndexBucket.Delete(outPointBytes); err != nil {
return err
} }
// Now that the index to this channel has been deleted, purge // Now that the index to this channel has been deleted, purge
// the remaining channel metadata from the database. // the remaining channel metadata from the database.
if err := deleteOpenChannel(chanBucket, nodeChanBucket, err = deleteOpenChannel(chanBucket, chanPointBuf.Bytes())
outPointBytes, &c.FundingOutpoint); err != nil { if err != nil {
return err return err
} }
// With the base channel data deleted, attempt to delte the // With the base channel data deleted, attempt to delete the
// information stored within the revocation log. // information stored within the revocation log.
logBucket := nodeChanBucket.Bucket(channelLogBucket) logBucket := chanBucket.Bucket(revocationLogBucket)
if logBucket != nil { if logBucket != nil {
err := wipeChannelLogEntries(logBucket, &c.FundingOutpoint) err := wipeChannelLogEntries(logBucket)
if err != nil {
return err
}
err = chanBucket.DeleteBucket(revocationLogBucket)
if err != nil { if err != nil {
return err return err
} }
} }
err = chainBucket.DeleteBucket(chanPointBuf.Bytes())
if err != nil {
return err
}
err = nodeChanBucket.DeleteBucket(c.ChainHash[:])
if err != nil {
return err
}
// Finally, create a summary of this channel in the closed // Finally, create a summary of this channel in the closed
// channel bucket for this node. // channel bucket for this node.
return putChannelCloseSummary(tx, outPointBytes, summary) return putChannelCloseSummary(tx, chanPointBuf.Bytes(), summary)
}) })
} }