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

lnwallet: fetch the root key during startup rather than on creation

Browse Source 
This commit modifies the initialization logic of the LightningWallet to
fetch the root key during startup rather than during creation. We make
this change in order to give enough time for the underlying
WalletController to properly boot up before we ask it to do any work.
This commit is contained in:
Olaoluwa Osuntokun 2017-04-23 19:15:26 -07:00
parent c4ea5e1e2c
commit 85b306bb48
No known key found for this signature in database
GPG Key ID: 9CC5B105D03521A2
1 changed files with 14 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
lnwallet/wallet.go
View File

@ -322,24 +322,7 @@ func NewLightningWallet(cdb *channeldb.DB, notifier chainntnfs.ChainNotifier,
wallet WalletController, signer Signer, bio BlockChainIO, wallet WalletController, signer Signer, bio BlockChainIO,
netParams *chaincfg.Params) (*LightningWallet, error) { netParams *chaincfg.Params) (*LightningWallet, error) {
// TODO(roasbeef): need a another wallet level config
// Fetch the root derivation key from the wallet's HD chain. We'll use
// this to generate specific Lightning related secrets on the fly.
rootKey, err := wallet.FetchRootKey()
if err != nil {
return nil, err
}
// TODO(roasbeef): always re-derive on the fly?
rootKeyRaw := rootKey.Serialize()
rootMasterKey, err := hdkeychain.NewMaster(rootKeyRaw, netParams)
if err != nil {
return nil, err
}
return &LightningWallet{ return &LightningWallet{
rootKey: rootMasterKey,
chainNotifier: notifier, chainNotifier: notifier,
Signer: signer, Signer: signer,
WalletController: wallet, WalletController: wallet,
@ -367,6 +350,20 @@ func (l *LightningWallet) Startup() error {
return err return err
} }
// Fetch the root derivation key from the wallet's HD chain. We'll use
// this to generate specific Lightning related secrets on the fly.
rootKey, err := l.FetchRootKey()
if err != nil {
return err
}
// TODO(roasbeef): always re-derive on the fly?
rootKeyRaw := rootKey.Serialize()
l.rootKey, err = hdkeychain.NewMaster(rootKeyRaw, l.netParams)
if err != nil {
return err
}
l.wg.Add(1) l.wg.Add(1)
// TODO(roasbeef): multiple request handlers? // TODO(roasbeef): multiple request handlers?
go l.requestHandler() go l.requestHandler()