walletdb: Check that unencrypted and crypted keys are mutually exclusive

achow101 · Dec 11, 2023 · 1bbbb73 · 1bbbb73
1 parent af3667a
commit 1bbbb73
Showing 1 changed file with 5 additions and 0 deletions.
diff --git a/src/wallet/walletdb.cpp b/src/wallet/walletdb.cpp
@@ -991,6 +991,11 @@ static DBErrors LoadDescriptorWalletRecords(CWallet* pwallet, DatabaseBatch& bat
     });
     result = std::max(result, desc_res.m_result);
 
+    if (num_ckeys > 0 && num_keys != 0) {
+        pwallet->WalletLogPrintf("Error: Wallet has both encrypted and unencrypted HD keys\n");
+        return DBErrors::CORRUPT;
+    }
+
     // Load the active hd key
     if (wallet_xpub && !pwallet->LoadActiveHDPubKey(*wallet_xpub, wallet_key, wallet_crypted_key)) {
         pwallet->WalletLogPrintf("Error: Unable to load active hd pubkey\n");