LBRYCommunity/lbcwallet
1
0
Fork 0
Code Issues 5 Pull requests Projects Releases 14 Packages Wiki Activity

wallet: set wallet birthday properly in rescans and manager

Browse source
This commit is contained in:
Alex 2017-09-20 14:42:12 -06:00 committed by Olaoluwa Osuntokun
parent 1b6d7a7ee3
commit 81a9bb67c1
1 changed files with 24 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

23
wallet/wallet.go
View file

@ -159,6 +159,13 @@ func (w *Wallet) SynchronizeRPC(chainClient chain.Interface) {
return return
} }
w.chainClient = chainClient w.chainClient = chainClient
// If the chain client is a NeutrinoClient instance, set a birthday so
// we don't download all the filters as we go.
switch cc := chainClient.(type) {
case *chain.NeutrinoClient:
cc.SetStartTime(w.Manager.Birthday())
}
w.chainClientLock.Unlock() w.chainClientLock.Unlock()
// TODO: It would be preferable to either run these goroutines // TODO: It would be preferable to either run these goroutines
@ -1918,11 +1925,19 @@ func (w *Wallet) ImportPrivateKey(wif *btcutil.WIF, bs *waddrmgr.BlockStamp,
// The starting block for the key is the genesis block unless otherwise // The starting block for the key is the genesis block unless otherwise
// specified. // specified.
var newBirthday time.Time
if bs == nil { if bs == nil {
bs = &waddrmgr.BlockStamp{ bs = &waddrmgr.BlockStamp{
Hash: *w.chainParams.GenesisHash, Hash: *w.chainParams.GenesisHash,
Height: 0, Height: 0,
} }
} else {
header, err := w.chainClient.GetBlockHeader(&bs.Hash)
// Only update the new birthday time from default value if we
// actually have timestamp info in the header.
if err == nil {
newBirthday = header.Timestamp
}
} }
// Attempt to import private key into wallet. // Attempt to import private key into wallet.
@ -1931,12 +1946,16 @@ func (w *Wallet) ImportPrivateKey(wif *btcutil.WIF, bs *waddrmgr.BlockStamp,
err := walletdb.Update(w.db, func(tx walletdb.ReadWriteTx) error { err := walletdb.Update(w.db, func(tx walletdb.ReadWriteTx) error {
addrmgrNs := tx.ReadWriteBucket(waddrmgrNamespaceKey) addrmgrNs := tx.ReadWriteBucket(waddrmgrNamespaceKey)
maddr, err := w.Manager.ImportPrivateKey(addrmgrNs, wif, bs) maddr, err := w.Manager.ImportPrivateKey(addrmgrNs, wif, bs)
if err == nil { if err != nil {
return err
}
addr = maddr.Address() addr = maddr.Address()
props, err = w.Manager.AccountProperties( props, err = w.Manager.AccountProperties(
addrmgrNs, waddrmgr.ImportedAddrAccount) addrmgrNs, waddrmgr.ImportedAddrAccount)
} if err != nil {
return err return err
}
return w.Manager.SetBirthday(addrmgrNs, newBirthday)
}) })
if err != nil { if err != nil {
return "", err return "", err