diff options
| author | Wladimir J. van der Laan <[email protected]> | 2014-07-11 15:34:21 +0200 |
|---|---|---|
| committer | Wladimir J. van der Laan <[email protected]> | 2014-07-11 15:34:27 +0200 |
| commit | d3165ed35adde59bdfbe72928b51a039202fa21e (patch) | |
| tree | 9c4138c7e53bbd4607a13de9169dd2d0dabee6be /src/miner.cpp | |
| parent | Merge pull request #4507 (diff) | |
| parent | `getrawchangeaddress` should fail when keypool exhausted (diff) | |
| download | discoin-d3165ed35adde59bdfbe72928b51a039202fa21e.tar.xz discoin-d3165ed35adde59bdfbe72928b51a039202fa21e.zip | |
Merge pull request #4347
6c37f7f `getrawchangeaddress` should fail when keypool exhausted (Wladimir J. van der Laan)
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 17918a128..ec56c7119 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); |