mirror of
https://github.com/bitcoin/bitcoin.git
synced 2025-03-09 15:37:00 -04:00
Move SetMinVersion for FEATURE_HD to SetHDMasterKey
Github-Pull: #8378
Rebased-From: 6523fcaab2
This commit is contained in:
parent
f0ff08d784
commit
ebea65121e
1 changed files with 3 additions and 3 deletions
|
@ -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)) {
|
||||
|
|
Loading…
Add table
Reference in a new issue