Browse Source

Move SetMinVersion for FEATURE_HD to SetHDMasterKey

0.14
Patrick Strateman 8 years ago
parent
commit
6523fcaab2
  1. 6
      src/wallet/wallet.cpp

6
src/wallet/wallet.cpp

@ -1170,6 +1170,9 @@ bool CWallet::SetHDMasterKey(const CKey& key) @@ -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() @@ -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)) {

Loading…
Cancel
Save