wallet: Ensure that the blank wallet flag is unset after imports

Author: achow101

src/wallet/scriptpubkeyman.cpp

@@ -755,12 +755,12 @@ bool LegacyScriptPubKeyMan::AddKeyPubKeyWithDB(WalletBatch& batch, const CKey& s
         RemoveWatchOnly(script);
     }
 
+    m_storage.UnsetBlankWalletFlag(batch);
     if (!m_storage.HasEncryptionKeys()) {
         return batch.WriteKey(pubkey,
                                                  secret.GetPrivKey(),
                                                  mapKeyMetadata[pubkey.GetID()]);
     }
-    m_storage.UnsetBlankWalletFlag(batch);
     return true;
 }
 

test/functional/wallet_blank.py

@@ -72,8 +72,7 @@ def test_importprivkey(self):
             wif = bytes_to_wif(eckey.get_bytes(), eckey.is_compressed)
 
             wallet.importprivkey(wif)
-            # FIXME: A bug results in blank remaining set
-            assert_equal(wallet.getwalletinfo()["blank"], True)
+            assert_equal(wallet.getwalletinfo()["blank"], False)
 
     def test_importmulti(self):
         if self.options.descriptors:
@@ -121,8 +120,7 @@ def test_importwallet(self):
         def_wallet.dumpwallet(wallet_dump_path)
 
         wallet.importwallet(wallet_dump_path)
-        # FIXME: A bug results in blank remaining set
-        assert_equal(wallet.getwalletinfo()["blank"], True)
+        assert_equal(wallet.getwalletinfo()["blank"], False)
 
     def test_encrypt_legacy(self):
         if self.options.descriptors: