wallet: migration, write best locator before unloading wallet

furszy · fjahr · commit 31c0df038909 · 2024-09-20T17:16:38.000+02:00
diff --git a/src/wallet/wallet.cpp b/src/wallet/wallet.cpp
@@ -4398,6 +4398,11 @@ util::Result<MigrationResult> MigrateLegacyToDescriptor(const std::string& walle
             return util::Error{_("Error: This wallet is already a descriptor wallet")};
         }
 
+        // Flush chain state before unloading wallet
+        CBlockLocator locator;
+        WITH_LOCK(wallet->cs_wallet, context.chain->findBlock(wallet->GetLastBlockHash(), FoundBlock().locator(locator)));
+        if (!locator.IsNull()) wallet->chainStateFlushed(ChainstateRole::NORMAL, locator);
+
         if (!RemoveWallet(context, wallet, /*load_on_start=*/std::nullopt, warnings)) {
             return util::Error{_("Unable to unload the wallet before migrating")};
         }

Original file line number	Diff line number	Diff line change
`@@ -4398,6 +4398,11 @@ util::Result<MigrationResult> MigrateLegacyToDescriptor(const std::string& walle`
`4398`	`4398`	`return util::Error{_("Error: This wallet is already a descriptor wallet")};`
`4399`	`4399`	`}`
`4400`	`4400`
	`4401`	`+ // Flush chain state before unloading wallet`
	`4402`	`+ CBlockLocator locator;`
	`4403`	`+ WITH_LOCK(wallet->cs_wallet, context.chain->findBlock(wallet->GetLastBlockHash(), FoundBlock().locator(locator)));`
	`4404`	`+ if (!locator.IsNull()) wallet->chainStateFlushed(ChainstateRole::NORMAL, locator);`
	`4405`	`+`
`4401`	`4406`	`if (!RemoveWallet(context, wallet, /load_on_start=/std::nullopt, warnings)) {`
`4402`	`4407`	`return util::Error{_("Unable to unload the wallet before migrating")};`
`4403`	`4408`	`}`