diff options
| author | Gavin Andresen <[email protected]> | 2011-06-07 11:38:35 -0700 |
|---|---|---|
| committer | Gavin Andresen <[email protected]> | 2011-06-07 11:38:35 -0700 |
| commit | 60152827e35102cd6faf450ba5400ed4364c2e62 (patch) | |
| tree | 4efad3185c35ffec94b1f33839bb7bade3c82b40 /src/db.cpp | |
| parent | Merge pull request #303 from jrmithdobbs/demystify-magic-numbers (diff) | |
| parent | create keypool in LoadWallet() (diff) | |
| download | discoin-60152827e35102cd6faf450ba5400ed4364c2e62.tar.xz discoin-60152827e35102cd6faf450ba5400ed4364c2e62.zip | |
Merge pull request #293 from tcatm/keypool-fix
create keypool in LoadWallet()
Diffstat (limited to 'src/db.cpp')
| -rw-r--r-- | src/db.cpp | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/src/db.cpp b/src/db.cpp index 52c0f5b4c..c2c239db2 100644 --- a/src/db.cpp +++ b/src/db.cpp @@ -845,12 +845,11 @@ bool LoadWallet(bool& fFirstRunRet) { // Create new keyUser and set as default key RandAddSeedPerfmon(); - keyUser.MakeNewKey(); - if (!AddKey(keyUser)) - return false; - if (!SetAddressBookName(PubKeyToAddress(keyUser.GetPubKey()), "")) - return false; - CWalletDB().WriteDefaultKey(keyUser.GetPubKey()); + + CWalletDB walletdb; + vchDefaultKey = GetKeyFromKeyPool(); + walletdb.WriteDefaultKey(vchDefaultKey); + walletdb.WriteName(PubKeyToAddress(vchDefaultKey), ""); } CreateThread(ThreadFlushWalletDB, NULL); |