Move SetMinVersion for FEATURE_HD to SetHDMasterKey

pstratem · laanwj · commit ebea65121e6c · 2016-07-20T11:58:11.000+02:00
Github-Pull: #8378
Rebased-From: 6523fcaab2f0808d4e47b9cb9ebbef7ed69a309e
diff --git a/src/wallet/wallet.cpp b/src/wallet/wallet.cpp
@@ -1170,6 +1170,9 @@ bool CWallet::SetHDMasterKey(const CKey& key)
 {
     LOCK(cs_wallet);
 
+    // ensure this wallet.dat can only be opened by clients supporting HD
+    SetMinVersion(FEATURE_HD);
+
     // store the key as normal "key"/"ckey" object
     // in the database
     // key metadata is not required
@@ -3299,9 +3302,6 @@ bool CWallet::InitLoadWallet()
             key.MakeNewKey(true);
             if (!walletInstance->SetHDMasterKey(key))
                 throw std::runtime_error("CWallet::GenerateNewKey(): Storing master key failed");
-
-            // ensure this wallet.dat can only be opened by clients supporting HD
-            walletInstance->SetMinVersion(FEATURE_HD);
         }
         CPubKey newDefaultKey;
         if (walletInstance->GetKeyFromPool(newDefaultKey)) {
