LBRYCommunity/lbrycrd
1
0
Fork 0
Code Issues 29 Pull requests 1 Projects Releases 32 Packages Wiki Activity

Merge #8324: [Wallet] keep HD seed during salvagewallet

Browse source 
b993671 [Wallet] keep HD seed during salvagewallet (Jonas Schnelli)
This commit is contained in:
Wladimir J. van der Laan 2016-07-14 11:37:36 +02:00
commit bc94b87487
No known key found for this signature in database
GPG key ID: 74810B012346C9A6
2 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/wallet/wallet.cpp
View file

@ -3291,7 +3291,7 @@ bool CWallet::InitLoadWallet()
if (fFirstRun) if (fFirstRun)
{ {
// Create new keyUser and set as default key // Create new keyUser and set as default key
if (GetBoolArg("-usehd", DEFAULT_USE_HD_WALLET)) { if (GetBoolArg("-usehd", DEFAULT_USE_HD_WALLET) && walletInstance->hdChain.masterKeyID.IsNull()) {
// generate a new master key // generate a new master key
CKey key; CKey key;
key.MakeNewKey(true); key.MakeNewKey(true);

2
src/wallet/walletdb.cpp
View file

@ -977,7 +977,7 @@ bool CWalletDB::Recover(CDBEnv& dbenv, const std::string& filename, bool fOnlyKe
fReadOK = ReadKeyValue(&dummyWallet, ssKey, ssValue, fReadOK = ReadKeyValue(&dummyWallet, ssKey, ssValue,
wss, strType, strErr); wss, strType, strErr);
} }
if (!IsKeyType(strType)) if (!IsKeyType(strType) && strType != "hdchain")
continue; continue;
if (!fReadOK) if (!fReadOK)
{ {