mirror/bitcoin
1
0 Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Andrew Chow authored and Andrew Chow committed 2023-06-13 15:11:41 -04:00
1 parent e9379f1ffa
commit 43310200dc
2 files changed
+3 -5
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

src/wallet/scriptpubkeyman.cpp
+1 -1
View File
@@ -755,12 +755,12 @@ bool LegacyScriptPubKeyMan::AddKeyPubKeyWithDB(WalletBatch& batch, const CKey& s
RemoveWatchOnly(script); RemoveWatchOnly(script);
} }
m_storage.UnsetBlankWalletFlag(batch);
if (!m_storage.HasEncryptionKeys()) { if (!m_storage.HasEncryptionKeys()) {
return batch.WriteKey(pubkey, return batch.WriteKey(pubkey,
secret.GetPrivKey(), secret.GetPrivKey(),
mapKeyMetadata[pubkey.GetID()]); mapKeyMetadata[pubkey.GetID()]);
} }
m_storage.UnsetBlankWalletFlag(batch);
return true; return true;
} }
test/functional/wallet_blank.py
+2 -4
View File
@@ -72,8 +72,7 @@ class WalletBlankTest(BitcoinTestFramework):
wif = bytes_to_wif(eckey.get_bytes(), eckey.is_compressed) wif = bytes_to_wif(eckey.get_bytes(), eckey.is_compressed)
wallet.importprivkey(wif) wallet.importprivkey(wif)
# FIXME: A bug results in blank remaining set assert_equal(wallet.getwalletinfo()["blank"], False)
assert_equal(wallet.getwalletinfo()["blank"], True)
def test_importmulti(self): def test_importmulti(self):
if self.options.descriptors: if self.options.descriptors:
@@ -121,8 +120,7 @@ class WalletBlankTest(BitcoinTestFramework):
def_wallet.dumpwallet(wallet_dump_path) def_wallet.dumpwallet(wallet_dump_path)
wallet.importwallet(wallet_dump_path) wallet.importwallet(wallet_dump_path)
# FIXME: A bug results in blank remaining set assert_equal(wallet.getwalletinfo()["blank"], False)
assert_equal(wallet.getwalletinfo()["blank"], True)
def test_encrypt_legacy(self): def test_encrypt_legacy(self):
if self.options.descriptors: if self.options.descriptors: