diff options
| author | Gavin Andresen <gavinandresen@gmail.com> | 2011-09-01 12:01:29 -0700 |
|---|---|---|
| committer | Gavin Andresen <gavinandresen@gmail.com> | 2011-09-01 12:01:29 -0700 |
| commit | 783c636c73182731ca12e6af67516767a989da66 (patch) | |
| tree | 6e160958804c3f0b968a295b3bec7d2ed947b220 /src/wallet.h | |
| parent | dd7868364d9a14349ff82f74fc451db5e6b6b7b9 (diff) | |
| parent | ed02c95d505ce48451b600ff40720841a000fd50 (diff) | |
| download | bitcoin-783c636c73182731ca12e6af67516767a989da66.tar.xz | |
Merge pull request #467 from gavinandresen/keypoolzero
Logic running with -keypool=0 was wrong (empty keys were being returned).
Diffstat (limited to 'src/wallet.h')
| -rw-r--r-- | src/wallet.h | 2 |
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; |