foster/bitcoin-bitcoin-core
0
0
Fork 0
mirror of https://github.com/bitcoin/bitcoin.git synced 2025-02-09 10:43:19 -05:00
Code Issues Activity

Merge pull request #293 from tcatm/keypool-fix

Browse source 
create keypool in LoadWallet()
This commit is contained in:
Gavin Andresen 2011-06-07 11:38:35 -07:00
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);