create keypool in LoadWallet()

14 years ago · ca81b168d9
parent e104c79374
commit ca81b168d9
1 changed files with 5 additions and 6 deletions
--- 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);