[wallet] Add support for aborting wallet transaction rescans.

kallewoof · kallewoof · commit 75a08e7d17da · 2017-04-17T23:35:53.000+09:00
diff --git a/src/wallet/wallet.cpp b/src/wallet/wallet.cpp
@@ -1527,6 +1527,8 @@ CBlockIndex* CWallet::ScanForWalletTransactions(CBlockIndex* pindexStart, bool f
     CBlockIndex* pindex = pindexStart;
     {
         LOCK2(cs_main, cs_wallet);
+        fAbortRescan = false;
+        fScanningWallet = true;
 
         // no need to read and scan block, if block was created before
         // our wallet birthday (as adjusted for block time variability)
@@ -1536,7 +1538,7 @@ CBlockIndex* CWallet::ScanForWalletTransactions(CBlockIndex* pindexStart, bool f
         ShowProgress(_("Rescanning..."), 0); // show rescan progress in GUI as dialog or on splashscreen, if -rescan on startup
         double dProgressStart = GuessVerificationProgress(chainParams.TxData(), pindex);
         double dProgressTip = GuessVerificationProgress(chainParams.TxData(), chainActive.Tip());
-        while (pindex)
+        while (pindex && !fAbortRescan)
         {
             if (pindex->nHeight % 100 == 0 && dProgressTip - dProgressStart > 0.0)
                 ShowProgress(_("Rescanning..."), std::max(1, std::min(99, (int)((GuessVerificationProgress(chainParams.TxData(), pindex) - dProgressStart) / (dProgressTip - dProgressStart) * 100))));
@@ -1558,7 +1560,12 @@ CBlockIndex* CWallet::ScanForWalletTransactions(CBlockIndex* pindexStart, bool f
                 LogPrintf("Still rescanning. At block %d. Progress=%f\n", pindex->nHeight, GuessVerificationProgress(chainParams.TxData(), pindex));
             }
         }
+        if (pindex && fAbortRescan) {
+            LogPrintf("Rescan aborted at block %d. Progress=%f\n", pindex->nHeight, GuessVerificationProgress(chainParams.TxData(), pindex));
+        }
         ShowProgress(_("Rescanning..."), 100); // hide progress dialog in GUI
+
+        fScanningWallet = false;
     }
     return ret;
 }
diff --git a/src/wallet/wallet.h b/src/wallet/wallet.h
@@ -651,6 +651,8 @@ class CWallet : public CCryptoKeyStore, public CValidationInterface
 {
 private:
     static std::atomic<bool> fFlushScheduled;
+    std::atomic<bool> fAbortRescan;
+    std::atomic<bool> fScanningWallet;
 
     /**
      * Select a set of coins such that nValueRet >= nTargetValue and at least
@@ -775,6 +777,8 @@ class CWallet : public CCryptoKeyStore, public CValidationInterface
         nTimeFirstKey = 0;
         fBroadcastTransactions = false;
         nRelockTime = 0;
+        fAbortRescan = false;
+        fScanningWallet = false;
     }
 
     std::map<uint256, CWalletTx> mapWallet;
@@ -819,6 +823,13 @@ class CWallet : public CCryptoKeyStore, public CValidationInterface
     void UnlockAllCoins();
     void ListLockedCoins(std::vector<COutPoint>& vOutpts);
 
+    /*
+     * Rescan abort properties
+     */
+    void AbortRescan() { fAbortRescan = true; }
+    bool IsAbortingRescan() { return fAbortRescan; }
+    bool IsScanning() { return fScanningWallet; }
+
     /**
      * keystore implementation
      * Generate a new key

Original file line number	Diff line number	Diff line change
`@@ -1527,6 +1527,8 @@ CBlockIndex* CWallet::ScanForWalletTransactions(CBlockIndex* pindexStart, bool f`
`1527`	`1527`	`CBlockIndex* pindex = pindexStart;`
`1528`	`1528`	`{`
`1529`	`1529`	`LOCK2(cs_main, cs_wallet);`
	`1530`	`+ fAbortRescan = false;`
	`1531`	`+ fScanningWallet = true;`
`1530`	`1532`
`1531`	`1533`	`// no need to read and scan block, if block was created before`
`1532`	`1534`	`// our wallet birthday (as adjusted for block time variability)`
`@@ -1536,7 +1538,7 @@ CBlockIndex* CWallet::ScanForWalletTransactions(CBlockIndex* pindexStart, bool f`
`1536`	`1538`	`ShowProgress(_("Rescanning..."), 0); // show rescan progress in GUI as dialog or on splashscreen, if -rescan on startup`
`1537`	`1539`	`double dProgressStart = GuessVerificationProgress(chainParams.TxData(), pindex);`
`1538`	`1540`	`double dProgressTip = GuessVerificationProgress(chainParams.TxData(), chainActive.Tip());`
`1539`		`- while (pindex)`
	`1541`	`+ while (pindex && !fAbortRescan)`
`1540`	`1542`	`{`
`1541`	`1543`	`if (pindex->nHeight % 100 == 0 && dProgressTip - dProgressStart > 0.0)`
`1542`	`1544`	`ShowProgress(_("Rescanning..."), std::max(1, std::min(99, (int)((GuessVerificationProgress(chainParams.TxData(), pindex) - dProgressStart) / (dProgressTip - dProgressStart) * 100))));`
`@@ -1558,7 +1560,12 @@ CBlockIndex* CWallet::ScanForWalletTransactions(CBlockIndex* pindexStart, bool f`
`1558`	`1560`	`LogPrintf("Still rescanning. At block %d. Progress=%f\n", pindex->nHeight, GuessVerificationProgress(chainParams.TxData(), pindex));`
`1559`	`1561`	`}`
`1560`	`1562`	`}`
	`1563`	`+ if (pindex && fAbortRescan) {`
	`1564`	`+ LogPrintf("Rescan aborted at block %d. Progress=%f\n", pindex->nHeight, GuessVerificationProgress(chainParams.TxData(), pindex));`
	`1565`	`+ }`
`1561`	`1566`	`ShowProgress(_("Rescanning..."), 100); // hide progress dialog in GUI`
	`1567`	`+`
	`1568`	`+ fScanningWallet = false;`
`1562`	`1569`	`}`
`1563`	`1570`	`return ret;`
`1564`	`1571`	`}`