wallet: Write hd{c}key when HAS_HDKEY_RECORDS is set

If WALLET_FLAG_HAS_HDKEY_RECORDS is already set, then it's okay to just use the hd{c}key records.
achow101 · Nov 28, 2023 · 9024317 · 9024317
1 parent 06fa375
commit 9024317
Showing 1 changed file with 8 additions and 0 deletions.
diff --git a/src/wallet/wallet.cpp b/src/wallet/wallet.cpp
@@ -4464,8 +4464,16 @@ bool CWallet::SetActiveHDKey(const CExtKey& xprv)
         if (!EncryptSecret(GetEncryptionKey(), secret, xprv.key.GetPubKey().GetHash(), crypted_key)) {
             return false;
         }
+        // Write the key if HAS_HDKEY_RECORDS is set
+        if (IsWalletFlagSet(WALLET_FLAG_HAS_HDKEY_RECORDS) && !WalletBatch(GetDatabase()).WriteHDCryptedKey(xprv.Neuter(), crypted_key)) {
+            return false;
+        }
     } else {
         key = xprv.key;
+        // Write the key if HAS_HDKEY_RECORDS is set
+        if (IsWalletFlagSet(WALLET_FLAG_HAS_HDKEY_RECORDS) && !WalletBatch(GetDatabase()).WriteHDKey(xprv)) {
+            return false;
+        }
     }
     return SetActiveHDKey(xprv.Neuter(), key, crypted_key);
 }