|
|
|
@ -1199,7 +1199,7 @@ CPubKey CWallet::GenerateNewHDMasterKey()
@@ -1199,7 +1199,7 @@ CPubKey CWallet::GenerateNewHDMasterKey()
|
|
|
|
|
|
|
|
|
|
// write the key&metadata to the database
|
|
|
|
|
if (!AddKeyPubKey(key, pubkey)) |
|
|
|
|
throw std::runtime_error("CWallet::GenerateNewKey(): AddKey failed"); |
|
|
|
|
throw std::runtime_error(std::string(__func__)+": AddKeyPubKey failed"); |
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
return pubkey; |
|
|
|
@ -3331,7 +3331,6 @@ bool CWallet::InitLoadWallet()
@@ -3331,7 +3331,6 @@ bool CWallet::InitLoadWallet()
|
|
|
|
|
// Create new keyUser and set as default key
|
|
|
|
|
if (GetBoolArg("-usehd", DEFAULT_USE_HD_WALLET) && walletInstance->hdChain.masterKeyID.IsNull()) { |
|
|
|
|
// generate a new master key
|
|
|
|
|
CKey key; |
|
|
|
|
CPubKey masterPubKey = walletInstance->GenerateNewHDMasterKey(); |
|
|
|
|
if (!walletInstance->SetHDMasterKey(masterPubKey)) |
|
|
|
|
throw std::runtime_error("CWallet::GenerateNewKey(): Storing master key failed"); |
|
|
|
|