zecfoundation
/
zcashd
mirror of https://github.com/ZcashFoundation/zcashd.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge pull request #293 from tcatm/keypool-fix 

create keypool in LoadWallet()
This commit is contained in:
Gavin Andresen 2011-06-07 11:38:35 -07:00
parent 04bc3f0a63 ca81b168d9
commit 60152827e3
1 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/db.cpp
View File

@ -845,12 +845,11 @@ bool LoadWallet(bool& fFirstRunRet)
{ {
// Create new keyUser and set as default key // Create new keyUser and set as default key
RandAddSeedPerfmon(); RandAddSeedPerfmon();
keyUser.MakeNewKey();
if (!AddKey(keyUser)) CWalletDB walletdb;
return false; vchDefaultKey = GetKeyFromKeyPool();
if (!SetAddressBookName(PubKeyToAddress(keyUser.GetPubKey()), "")) walletdb.WriteDefaultKey(vchDefaultKey);
return false; walletdb.WriteName(PubKeyToAddress(vchDefaultKey), "");
CWalletDB().WriteDefaultKey(keyUser.GetPubKey());
} }
CreateThread(ThreadFlushWalletDB, NULL); CreateThread(ThreadFlushWalletDB, NULL);