Mercurial > hg > bitcoin

changeset 660:96302a03b89d draft

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
create keypool in LoadWallet()
author Nils Schneider <nils.schneider@gmail.com>
date Fri, 03 Jun 2011 18:03:12 +0200
parents f0e072cc77d0
children 0ffc8101205f
files src/db.cpp
diffstat 1 files changed, 5 insertions(+), 6 deletions(-) [+]
line wrap: on
line diff
--- a/src/db.cpp
+++ b/src/db.cpp
@@ -845,12 +845,11 @@
     {
         // 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);