Wallet rescan fixes

firoorg · Aug 12, 2024 · f9df2a0 · f9df2a0
1 parent b1b7ebe
commit f9df2a0
Showing 1 changed file with 9 additions and 4 deletions.
diff --git a/src/wallet/wallet.cpp b/src/wallet/wallet.cpp
@@ -2416,11 +2416,16 @@ CBlockIndex* CWallet::ScanForWalletTransactions(CBlockIndex *pindexStart, bool f
                 pindex = chainActive[chainParams.GetConsensus().nMnemonicBlock];
             }
         } else {
-            if (nTimeFirstKey < mnemonicStartBlock->GetBlockTime())
-                pindex = chainActive.Genesis();
-            else {
-                pindex = chainActive[chainParams.GetConsensus().nMnemonicBlock];
+            bool fRescan = GetBoolArg("-rescan", false);
+            if (fRescan) {
+                if (nTimeFirstKey < mnemonicStartBlock->GetBlockTime())
+                    pindex = chainActive.Genesis();
+                else
+                    pindex = mnemonicStartBlock;
             }
+            else
+                while (pindex && nTimeFirstKey && (pindex->GetBlockTime() < (nTimeFirstKey - 7200)))
+                    pindex = chainActive.Next(pindex);
         }
 
         LogPrintf("Rescanning last %i blocks (from block %i)...\n", chainActive.Height(), pindex->nHeight);