diff options
author | Wladimir J. van der Laan <laanwj@gmail.com> | 2014-06-16 14:45:32 +0200 |
---|---|---|
committer | Wladimir J. van der Laan <laanwj@gmail.com> | 2014-07-11 15:24:29 +0200 |
commit | 6c37f7fd78832442a26e56bd0787974927df4fb2 (patch) | |
tree | 9c4138c7e53bbd4607a13de9169dd2d0dabee6be /src/miner.cpp | |
parent | 6ad2c2402e694d0052f8f1688181a80fe3eef2e7 (diff) |
`getrawchangeaddress` should fail when keypool exhausted
An user on IRC reported an issue where `getrawchangeaddress`
keeps returning a single address when the keypool is exhausted.
In my opinion this is strange behaviour.
- Change CReserveKey to fail when running out of keys in the keypool.
- Make `getrawchangeaddress` return RPC_WALLET_KEYPOOL_RAN_OUT when
unable to create an address.
- Add a Python RPC test for checking the keypool behaviour in combination
with encrypted wallets.
Diffstat (limited to 'src/miner.cpp')
-rw-r--r-- | src/miner.cpp | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/src/miner.cpp b/src/miner.cpp index 17918a1280..ec56c71192 100644 --- a/src/miner.cpp +++ b/src/miner.cpp @@ -467,7 +467,10 @@ void static BitcoinMiner(CWallet *pwallet) auto_ptr<CBlockTemplate> pblocktemplate(CreateNewBlockWithKey(reservekey)); if (!pblocktemplate.get()) + { + LogPrintf("Error in BitcoinMiner: Keypool ran out, please call keypoolrefill before restarting the mining thread\n"); return; + } CBlock *pblock = &pblocktemplate->block; IncrementExtraNonce(pblock, pindexPrev, nExtraNonce); |