From bc30e9516324d82bd8540a82544085553a58aabc Mon Sep 17 00:00:00 2001 From: Pol Espinasa Date: Thu, 11 Jun 2026 09:59:45 +0200 Subject: [PATCH 1/2] wallet: move fAbortRescan reset into WalletRescanReserver reserve() Reserving the wallet rescan is the first thing done when starting a rescan. As part of the reservation, clear any leftover state from previous rescans (reset fAbortRescan). This prevents a race condition where an abort request arrives before the rescan loop starts; without this reset, the abort could be ignored and the rescan would proceed. Co-authored-by: w0xlt --- src/wallet/wallet.cpp | 5 ++--- src/wallet/wallet.h | 4 ++++ 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/src/wallet/wallet.cpp b/src/wallet/wallet.cpp index bb79dd471e9..8d502049287 100644 --- a/src/wallet/wallet.cpp +++ b/src/wallet/wallet.cpp @@ -1884,7 +1884,6 @@ CWallet::ScanResult CWallet::ScanForWalletTransactions(const uint256& start_bloc WalletLogPrintf("Rescan started from block %s... (%s)\n", start_block.ToString(), fast_rescan_filter ? "fast variant using block filters" : "slow variant inspecting all blocks"); - fAbortRescan = false; ShowProgress(strprintf("[%s] %s", DisplayName(), _("Rescanning…")), 0); // show rescan progress in GUI as dialog or on splashscreen, if rescan required on startup (e.g. due to corruption) uint256 tip_hash = WITH_LOCK(cs_wallet, return GetLastBlockHash()); uint256 end_hash = tip_hash; @@ -2006,10 +2005,10 @@ CWallet::ScanResult CWallet::ScanForWalletTransactions(const uint256& start_bloc WITH_LOCK(cs_wallet, chain().requestMempoolTransactions(*this)); } ShowProgress(strprintf("[%s] %s", DisplayName(), _("Rescanning…")), 100); // hide progress dialog in GUI - if (block_height && fAbortRescan) { + if (fAbortRescan) { WalletLogPrintf("Rescan aborted at block %d. Progress=%f\n", block_height, progress_current); result.status = ScanResult::USER_ABORT; - } else if (block_height && chain().shutdownRequested()) { + } else if (chain().shutdownRequested()) { WalletLogPrintf("Rescan interrupted by shutdown request at block %d. Progress=%f\n", block_height, progress_current); result.status = ScanResult::USER_ABORT; } else { diff --git a/src/wallet/wallet.h b/src/wallet/wallet.h index 54bc60f5c40..62fba7b4b79 100644 --- a/src/wallet/wallet.h +++ b/src/wallet/wallet.h @@ -1103,6 +1103,10 @@ public: if (m_wallet.fScanningWallet.exchange(true)) { return false; } + // Discard any abort request left over from previous reservation, so + // that an abort requested while the reservation is held always applies + // to abort this rescan, even if it arrives before the scan loop starts. + m_wallet.fAbortRescan = false; m_wallet.m_scanning_with_passphrase.exchange(with_passphrase); m_wallet.m_scanning_start = SteadyClock::now(); m_wallet.m_scanning_progress = 0; From 2818a171c0057d1775d4148b7d76b1fbbbdbb88a Mon Sep 17 00:00:00 2001 From: Pol Espinasa Date: Thu, 11 Jun 2026 12:26:18 +0200 Subject: [PATCH 2/2] test: add abortscan unit test Co-authored-by: w0xlt --- src/wallet/test/wallet_tests.cpp | 30 ++++++++++++++++++++++++++++++ 1 file changed, 30 insertions(+) diff --git a/src/wallet/test/wallet_tests.cpp b/src/wallet/test/wallet_tests.cpp index 9d890c8f997..51b1874065e 100644 --- a/src/wallet/test/wallet_tests.cpp +++ b/src/wallet/test/wallet_tests.cpp @@ -213,6 +213,36 @@ BOOST_FIXTURE_TEST_CASE(scan_for_wallet_transactions, TestChain100Setup) } } +BOOST_FIXTURE_TEST_CASE(scan_for_wallet_transactions_abort, TestChain100Setup) +{ + CWallet wallet(m_node.chain.get(), "", CreateMockableWalletDatabase()); + uint256 genesis_hash; + { + LOCK(wallet.cs_wallet); + LOCK(Assert(m_node.chainman)->GetMutex()); + wallet.SetWalletFlag(WALLET_FLAG_DESCRIPTORS); + wallet.SetLastBlockProcessed(m_node.chainman->ActiveChain().Height(), m_node.chainman->ActiveChain().Tip()->GetBlockHash()); + genesis_hash = m_node.chainman->ActiveChain().Genesis()->GetBlockHash(); + } + + // An abort requested while no rescan is held is stale and must + // not cancel a later scan. + wallet.AbortRescan(); + WalletRescanReserver reserver(wallet); + BOOST_CHECK(reserver.reserve()); + BOOST_CHECK(!wallet.IsAbortingRescan()); + + // An abort requested after the reservation but before the scan starts + // (e.g. while importdescriptors is still deriving keys) must cancel the + // scan. + wallet.AbortRescan(); + CWallet::ScanResult result = wallet.ScanForWalletTransactions(genesis_hash, /*start_height=*/0, /*max_height=*/{}, reserver, /*save_progress=*/false); + BOOST_CHECK_EQUAL(result.status, CWallet::ScanResult::USER_ABORT); + BOOST_CHECK(result.last_scanned_block.IsNull()); + BOOST_CHECK(!result.last_scanned_height); + BOOST_CHECK(result.last_failed_block.IsNull()); +} + // This test verifies that wallet settings can be added and removed // concurrently, ensuring no race conditions occur during either process. BOOST_FIXTURE_TEST_CASE(write_wallet_settings_concurrently, TestingSetup)