Merge remote-tracking branch 'origin/abortrescan' into dev

Conflicts: src/wallet/wallet.cpp
2023-02-05 18:16:36 -08:00
parent 9977e12acf 6fda12612d
commit a7939139b2
3 changed files with 51 additions and 0 deletions
--- a/src/wallet/wallet.h
+++ b/src/wallet/wallet.h
@@ -807,6 +807,13 @@ public:
    bool fSweepEnabled                = false;
    bool fSweepExternalEnabled        = false;
    bool fSweepRunning                = false;
+
+    std::atomic<bool> fAbortRescan{false};
+    // abort current rescan
+    void AbortRescan() { fAbortRescan = true; }
+    // Are we currently aborting a rescan?
+    bool IsAbortingRescan() const { return fAbortRescan; }
+
    // Are we currently rescanning?
    bool fRescanning                  = false;
    // Current height of our rescan