aboutsummaryrefslogtreecommitdiff
path: root/src/wallet.h
diff options
context:
space:
mode:
authorGavin Andresen <gavinandresen@gmail.com>2011-08-12 16:32:07 -0400
committerGavin Andresen <gavinandresen@gmail.com>2011-09-01 10:12:59 -0400
commit7db3b75b3e38c2088596f49cb51fe1c9c7e8b433 (patch)
tree9484ca192506ab645ca1764d5993bd6ddce88b44 /src/wallet.h
parentf662cefd8552f07548dcca9dcf84a952650fab6f (diff)
downloadbitcoin-7db3b75b3e38c2088596f49cb51fe1c9c7e8b433.tar.xz
Logic running with -keypool=0 was wrong (empty keys were being returned). Fixes #445
Renames GetOrReuseKeyFromKeyPool to GetKeyFromPool, with fAllowReuse arg and bool result.
Diffstat (limited to 'src/wallet.h')
-rw-r--r--src/wallet.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/wallet.h b/src/wallet.h
index 032284dd3a..1dd2e51260 100644
--- a/src/wallet.h
+++ b/src/wallet.h
@@ -85,7 +85,7 @@ public:
void ReserveKeyFromKeyPool(int64& nIndex, CKeyPool& keypool);
void KeepKey(int64 nIndex);
void ReturnKey(int64 nIndex);
- std::vector<unsigned char> GetOrReuseKeyFromPool();
+ bool GetKeyFromPool(std::vector<unsigned char> &key, bool fAllowReuse=true);
int64 GetOldestKeyPoolTime();
bool IsMine(const CTxIn& txin) const;