mirror of
https://github.com/dashpay/dash.git
synced 2024-12-27 04:52:59 +01:00
Merge #7816: [Wallet] slighly refactor GetOldestKeyPoolTime()
9f7336b
[Wallet] slightly refactor GetOldestKeyPoolTime() (Jonas Schnelli)
This commit is contained in:
commit
0c95ebce7e
@ -2616,12 +2616,19 @@ bool CWallet::GetKeyFromPool(CPubKey& result)
|
||||
|
||||
int64_t CWallet::GetOldestKeyPoolTime()
|
||||
{
|
||||
int64_t nIndex = 0;
|
||||
CKeyPool keypool;
|
||||
ReserveKeyFromKeyPool(nIndex, keypool);
|
||||
if (nIndex == -1)
|
||||
LOCK(cs_wallet);
|
||||
|
||||
// if the keypool is empty, return <NOW>
|
||||
if (setKeyPool.empty())
|
||||
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;
|
||||
}
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user