LBRYFoundation/lbcwallet
1
0
Fork 0
mirror of https://github.com/LBRYFoundation/lbcwallet.git synced 2025-09-07 11:09:45 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

chain: stop SPV rescan immediately when wallet is already caught up

Browse source
This commit is contained in:
Alex 2017-05-24 13:31:05 -06:00 • committed by Olaoluwa Osuntokun
parent 3601b2fa14
commit 4598742465
1 changed files with 19 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
chain/neutrino.go
View file

@ -142,8 +142,8 @@ func (s *SPVChain) SendRawTransaction(tx *wire.MsgTx, allowHighFees bool) (
func (s *SPVChain) Rescan(startHash *chainhash.Hash, addrs []btcutil.Address, func (s *SPVChain) Rescan(startHash *chainhash.Hash, addrs []btcutil.Address,
outPoints []*wire.OutPoint) error { outPoints []*wire.OutPoint) error {
s.clientMtx.Lock() s.clientMtx.Lock()
defer s.clientMtx.Unlock()
if !s.started { if !s.started {
s.clientMtx.Unlock()
return fmt.Errorf("can't do a rescan when the chain client " + return fmt.Errorf("can't do a rescan when the chain client " +
"is not started") "is not started")
} }
@ -154,11 +154,28 @@ func (s *SPVChain) Rescan(startHash *chainhash.Hash, addrs []btcutil.Address,
s.rescanQuit = make(chan struct{}) s.rescanQuit = make(chan struct{})
s.scanning = true s.scanning = true
s.finished = false s.finished = false
s.clientMtx.Unlock()
watchOutPoints := make([]wire.OutPoint, 0, len(outPoints)) watchOutPoints := make([]wire.OutPoint, 0, len(outPoints))
for _, op := range outPoints { for _, op := range outPoints {
watchOutPoints = append(watchOutPoints, *op) watchOutPoints = append(watchOutPoints, *op)
} }
header, height, err := s.CS.LatestBlock()
if err != nil {
return fmt.Errorf("Can't get chain service's best block: %s", err)
}
if header.BlockHash() == *startHash {
s.finished = true
select {
case s.enqueueNotification <- &RescanFinished{
Hash: startHash,
Height: int32(height),
Time: header.Timestamp,
}:
case <-s.quit:
return nil
case <-s.rescanQuit:
return nil
}
}
s.rescan = s.CS.NewRescan( s.rescan = s.CS.NewRescan(
neutrino.NotificationHandlers(btcrpcclient.NotificationHandlers{ neutrino.NotificationHandlers(btcrpcclient.NotificationHandlers{
OnFilteredBlockConnected: s.onFilteredBlockConnected, OnFilteredBlockConnected: s.onFilteredBlockConnected,
@ -273,7 +290,6 @@ func (s *SPVChain) onFilteredBlockConnected(height int32,
return return
case <-s.rescanQuit: case <-s.rescanQuit:
return return
} }
} }
} }