Wallet: avoid scanning after the last known block

psgreco · psgreco · commit f138566ad3d8 · 2024-12-17T05:35:31.000-08:00
diff --git a/src/wallet/wallet.cpp b/src/wallet/wallet.cpp
@@ -1689,6 +1689,11 @@ CWallet::ScanResult CWallet::ScanForWalletTransactions(const uint256& start_bloc
         if (max_height && block_height >= *max_height) {
             break;
         }
+        if (block_height >= WITH_LOCK(cs_wallet, return GetLastBlockHeight())) {
+            WalletLogPrintf("Stopping scan. At block %d. Progress=%f\n", block_height, progress_current);
+            break;
+        }
+
         {
             if (!next_block) {
                 // break successfully when rescan has reached the tip, or

Original file line number	Diff line number	Diff line change
`@@ -1689,6 +1689,11 @@ CWallet::ScanResult CWallet::ScanForWalletTransactions(const uint256& start_bloc`
`1689`	`1689`	`if (max_height && block_height >= *max_height) {`
`1690`	`1690`	`break;`
`1691`	`1691`	`}`
	`1692`	`+ if (block_height >= WITH_LOCK(cs_wallet, return GetLastBlockHeight())) {`
	`1693`	`+ WalletLogPrintf("Stopping scan. At block %d. Progress=%f\n", block_height, progress_current);`
	`1694`	`+ break;`
	`1695`	`+ }`
	`1696`	`+`
`1692`	`1697`	`{`
`1693`	`1698`	`if (!next_block) {`
`1694`	`1699`	`// break successfully when rescan has reached the tip, or`