refactor: Handle first run in CWallet::AttachChain

bitcoin · Dec 30, 2020 · b20c1e5 · b20c1e5
1 parent b528485
commit b20c1e5
Showing 1 changed file with 4 additions and 2 deletions.
diff --git a/src/wallet/wallet.cpp b/src/wallet/wallet.cpp
@@ -3859,8 +3859,6 @@ std::shared_ptr<CWallet> CWallet::Create(interfaces::Chain& chain, const std::st
                 }
             }
         }
-
-        walletInstance->chainStateFlushed(chain.getTipLocator());
     } else if (wallet_creation_flags & WALLET_FLAG_DISABLE_PRIVATE_KEYS) {
         // Make it impossible to disable private keys after creation
         error = strprintf(_("Error loading %s: Private keys can only be disabled during creation"), walletFile);
@@ -4036,6 +4034,10 @@ CWallet::ScanStatus CWallet::AttachChain(std::shared_ptr<CWallet> wallet, bool s
     auto& walletInstance = wallet;
     LOCK(walletInstance->cs_wallet);
 
+    if (walletInstance->m_first_run) {
+        walletInstance->chainStateFlushed(chain.getTipLocator());
+    }
+
     // Register wallet with validationinterface. It's done before rescan to avoid
     // missing block connections between end of rescan and validation subscribing.
     // Because of wallet lock being hold, block connection notifications are going to