highperfocused/bitcoin
1
0
Fork 0
mirror of https://github.com/bitcoin/bitcoin.git synced 2025-08-03 15:02:30 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge #7816: [Wallet] slighly refactor GetOldestKeyPoolTime()

Browse Source 
9f7336b [Wallet] slightly refactor GetOldestKeyPoolTime() (Jonas Schnelli)
This commit is contained in:
Wladimir J. van der Laan
2016-04-22 08:36:22 +02:00
parent 59ad56851a 9f7336b457
commit 0c95ebce7e
1 changed files with 12 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
src/wallet/wallet.cpp
View File

@@ -2616,12 +2616,19 @@ bool CWallet::GetKeyFromPool(CPubKey& result)
int64_t CWallet::GetOldestKeyPoolTime() int64_t CWallet::GetOldestKeyPoolTime()
{ {
int64_t nIndex = 0; LOCK(cs_wallet);
CKeyPool keypool;
ReserveKeyFromKeyPool(nIndex, keypool); // if the keypool is empty, return <NOW>
if (nIndex == -1) if (setKeyPool.empty())
return GetTime(); return GetTime();
ReturnKey(nIndex);
// load oldest key from keypool, get time and return
CKeyPool keypool;
CWalletDB walletdb(strWalletFile);
int64_t nIndex = *(setKeyPool.begin());
if (!walletdb.ReadPool(nIndex, keypool))
throw runtime_error("GetOldestKeyPoolTime(): read oldest key in keypool failed");
assert(keypool.vchPubKey.IsValid());
return keypool.nTime; return keypool.nTime;
} }