zcash-hackworks
/
bitcoin
mirror of https://github.com/zcash-hackworks/bitcoin.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge #8443: [Wallet] Trivial cleanup of HD wallet changes 

7e5d94d [Wallet] Trivial cleanup of HD wallet changes (Jonas Schnelli)
This commit is contained in:
Jonas Schnelli 2016-08-19 18:39:08 +02:00
parent f4e777819c 7e5d94df1f
commit 56ac046960
No known key found for this signature in database
GPG Key ID: 29D4BCB6416F53EC
1 changed files with 1 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/wallet/wallet.cpp
View File

@ -1200,7 +1200,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;
@ -3324,7 +3324,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");