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

chanrestore: return error instead of nil if failed derivation

Browse Source 
This commit fixes a bug in the openChannelShell function where,
instead of properly returning an error when failing to derive
the shachain root's private key, nil was returned instead. This
would lead to a panic as the channel shell was then referenced
further down in the callstack. An error is now properly returned.
This commit is contained in:
nsa 2019-06-30 12:42:36 -04:00
parent 6a4179e224
commit 9804caca6d
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
chanrestore.go
View File

@ -41,7 +41,7 @@ func (c *chanDBRestorer) openChannelShell(backup chanbackup.Single) (
// shachain... // shachain...
privKey, err := c.secretKeys.DerivePrivKey(backup.ShaChainRootDesc) privKey, err := c.secretKeys.DerivePrivKey(backup.ShaChainRootDesc)
if err != nil { if err != nil {
return nil, nil return nil, fmt.Errorf("unable to derive shachain root key: %v", err)
} }
revRoot, err := chainhash.NewHash(privKey.Serialize()) revRoot, err := chainhash.NewHash(privKey.Serialize())
if err != nil { if err != nil {