kvazar/kevacoin
1
0
Fork 0
mirror of https://github.com/kvazar-network/kevacoin.git synced 2025-01-18 19:10:11 +00:00
Code Issues Projects Releases Wiki Activity

Merge #8378: [Wallet]Move SetMinVersion for FEATURE_HD to SetHDMasterKey

Browse Source 
6523fca Move SetMinVersion for FEATURE_HD to SetHDMasterKey (Patrick Strateman)
This commit is contained in:
Wladimir J. van der Laan 2016-07-20 11:57:22 +02:00
commit 8e048f40cc
No known key found for this signature in database
GPG Key ID: 74810B012346C9A6
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/wallet/wallet.cpp
View File

@ -1170,6 +1170,9 @@ bool CWallet::SetHDMasterKey(const CKey& key)
{ {
LOCK(cs_wallet); 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 // store the key as normal "key"/"ckey" object
// in the database // in the database
// key metadata is not required // key metadata is not required
@ -3299,9 +3302,6 @@ bool CWallet::InitLoadWallet()
key.MakeNewKey(true); key.MakeNewKey(true);
if (!walletInstance->SetHDMasterKey(key)) if (!walletInstance->SetHDMasterKey(key))
throw std::runtime_error("CWallet::GenerateNewKey(): Storing master key failed"); 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; CPubKey newDefaultKey;
if (walletInstance->GetKeyFromPool(newDefaultKey)) { if (walletInstance->GetKeyFromPool(newDefaultKey)) {