From 426f523475b9c05c768eeb741999f888c5293cfe Mon Sep 17 00:00:00 2001 From: Wilmer Paulino Date: Wed, 19 Jun 2019 19:59:02 -0700 Subject: [PATCH] wallet: start recovery from the wallet's best height Previously, the wallet would attempt to store the same block it checkpointed during its initial sync when performing a recovery. This would cause the previous block existence validation check to be in place, which would ultimately fail because the previous block was not stored intentionally. To address this, we always start/resume our recovery from the wallet's best height. This also ensures that we do not rescan the same block again when resuming a recovery after a shutdown. --- wallet/wallet.go | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) diff --git a/wallet/wallet.go b/wallet/wallet.go index 7de69e2..569165e 100644 --- a/wallet/wallet.go +++ b/wallet/wallet.go @@ -643,23 +643,24 @@ func (w *Wallet) recovery(chainClient chain.Interface, return err } - // We'll then need to determine the range of our recovery. This properly - // handles the case where we resume a previous recovery attempt after a - // restart. - startHeight, bestHeight, err := w.getSyncRange(chainClient, birthdayBlock) + // Fetch the best height from the backend to determine when we should + // stop. + _, bestHeight, err := chainClient.GetBestBlock() if err != nil { return err } - // Now we can begin scanning the chain from the specified starting - // height. Since the recovery process itself acts as rescan, we'll also - // update our wallet's synced state along the way to reflect the blocks - // we process and prevent rescanning them later on. + // Now we can begin scanning the chain from the wallet's current tip to + // ensure we properly handle restarts. Since the recovery process itself + // acts as rescan, we'll also update our wallet's synced state along the + // way to reflect the blocks we process and prevent rescanning them + // later on. // // NOTE: We purposefully don't update our best height since we assume // that a wallet rescan will be performed from the wallet's tip, which // will be of bestHeight after completing the recovery process. var blocks []*waddrmgr.BlockStamp + startHeight := w.Manager.SyncedTo().Height + 1 for height := startHeight; height <= bestHeight; height++ { hash, err := chainClient.GetBlockHash(int64(height)) if err != nil {