highperfocused/bitcoin
1
0
Fork 0
mirror of https://github.com/bitcoin/bitcoin.git synced 2025-05-14 22:00:44 +02:00
Code Issues Packages Projects Releases Wiki Activity

wallet: make KeypoolCountExternalKeys() const

Browse Source 
This method returns the sum of the key pool sizes. It does no modification.
This commit is contained in:
Karl-Johan Alm 2020-03-02 16:33:45 +09:00
parent ddc93557ad
commit 037fa770eb
No known key found for this signature in database
GPG Key ID: 57AF762DB3353322
4 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/wallet/scriptpubkeyman.cpp
View File

@ -459,7 +459,7 @@ int64_t LegacyScriptPubKeyMan::GetOldestKeyPoolTime()
return oldestKey; return oldestKey;
} }
size_t LegacyScriptPubKeyMan::KeypoolCountExternalKeys() size_t LegacyScriptPubKeyMan::KeypoolCountExternalKeys() const
{ {
LOCK(cs_KeyStore); LOCK(cs_KeyStore);
return setExternalKeyPool.size() + set_pre_split_keypool.size(); return setExternalKeyPool.size() + set_pre_split_keypool.size();

4
src/wallet/scriptpubkeyman.h
View File

@ -196,7 +196,7 @@ public:
virtual int64_t GetOldestKeyPoolTime() { return GetTime(); } virtual int64_t GetOldestKeyPoolTime() { return GetTime(); }
virtual size_t KeypoolCountExternalKeys() { return 0; } virtual size_t KeypoolCountExternalKeys() const { return 0; }
virtual unsigned int GetKeyPoolSize() const { return 0; } virtual unsigned int GetKeyPoolSize() const { return 0; }
virtual int64_t GetTimeFirstKey() const { return 0; } virtual int64_t GetTimeFirstKey() const { return 0; }
@ -337,7 +337,7 @@ public:
void RewriteDB() override; void RewriteDB() override;
int64_t GetOldestKeyPoolTime() override; int64_t GetOldestKeyPoolTime() override;
size_t KeypoolCountExternalKeys() override; size_t KeypoolCountExternalKeys() const override;
unsigned int GetKeyPoolSize() const override; unsigned int GetKeyPoolSize() const override;
int64_t GetTimeFirstKey() const override; int64_t GetTimeFirstKey() const override;

2
src/wallet/wallet.cpp
View File

@ -3112,7 +3112,7 @@ bool CWallet::DelAddressBook(const CTxDestination& address)
return WalletBatch(*database).EraseName(EncodeDestination(address)); return WalletBatch(*database).EraseName(EncodeDestination(address));
} }
size_t CWallet::KeypoolCountExternalKeys() size_t CWallet::KeypoolCountExternalKeys() const
{ {
AssertLockHeld(cs_wallet); AssertLockHeld(cs_wallet);

2
src/wallet/wallet.h
View File

@ -968,7 +968,7 @@ public:
/** Absolute maximum transaction fee (in satoshis) used by default for the wallet */ /** Absolute maximum transaction fee (in satoshis) used by default for the wallet */
CAmount m_default_max_tx_fee{DEFAULT_TRANSACTION_MAXFEE}; CAmount m_default_max_tx_fee{DEFAULT_TRANSACTION_MAXFEE};
size_t KeypoolCountExternalKeys() EXCLUSIVE_LOCKS_REQUIRED(cs_wallet); size_t KeypoolCountExternalKeys() const EXCLUSIVE_LOCKS_REQUIRED(cs_wallet);
bool TopUpKeyPool(unsigned int kpSize = 0); bool TopUpKeyPool(unsigned int kpSize = 0);
int64_t GetOldestKeyPoolTime(); int64_t GetOldestKeyPoolTime();