Avoid reading the old hd master key during wallet encryption

This makes SetHDMasterKey responsible for maintinaing the CHDChain
version instead of always creating it with the latest version and
making EncryptWallet responsible for keeping the version from
changing.

1 files changed, 4 insertions, 3 deletions

diff --git a/src/wallet/wallet.h b/src/wallet/wallet.h
index ccede60097..4e7e1b5797 100644
--- a/src/wallet/wallet.h
+++ b/src/wallet/wallet.h
@@ -1056,9 +1056,10 @@ public:
     CPubKey GenerateNewHDMasterKey();
     
     /* Set the current HD master key (will reset the chain child index counters)
-       If possibleOldChain is provided, the parameters from the old chain (version)
-       will be preserved. */
-    bool SetHDMasterKey(const CPubKey& key, CHDChain *possibleOldChain = nullptr);
+       Sets the master key's version based on the current wallet version (so the
+       caller must ensure the current wallet version is correct before calling
+       this function). */
+    bool SetHDMasterKey(const CPubKey& key);
 };
 
 /** A key allocated from the key pool. */