diff options
| author | Suhas Daftuar <sdaftuar@gmail.com> | 2015-04-09 13:21:11 -0400 |
|---|---|---|
| committer | Wladimir J. van der Laan <laanwj@gmail.com> | 2015-06-03 16:23:46 +0200 |
| commit | 304892fc03b11bf04286619d2a6fe0ba99ee41fc (patch) | |
| tree | 805452dad8feb420fcf5805d39fe812f2bb7340c /src/rpcmining.cpp | |
| parent | 666e973b2f11e72e91247069adf650a4a575c4bf (diff) | |
| download | bitcoin-304892fc03b11bf04286619d2a6fe0ba99ee41fc.tar.xz | |
Be stricter in processing unrequested blocks
AcceptBlock will no longer process an unrequested block, unless it has not
been previously processed and has more work than chainActive.Tip()
Github-Pull: #5875
Rebased-From: 9be0e6837b878f72bd087ce32b7a2f2ffb2fd544
Diffstat (limited to 'src/rpcmining.cpp')
| -rw-r--r-- | src/rpcmining.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/rpcmining.cpp b/src/rpcmining.cpp index d58d438573..528d5406f4 100644 --- a/src/rpcmining.cpp +++ b/src/rpcmining.cpp @@ -164,7 +164,7 @@ Value generate(const Array& params, bool fHelp) ++pblock->nNonce; } CValidationState state; - if (!ProcessNewBlock(state, NULL, pblock)) + if (!ProcessNewBlock(state, NULL, pblock, true, NULL)) throw JSONRPCError(RPC_INTERNAL_ERROR, "ProcessNewBlock, block not accepted"); ++nHeight; blockHashes.push_back(pblock->GetHash().GetHex()); @@ -650,7 +650,7 @@ Value submitblock(const Array& params, bool fHelp) CValidationState state; submitblock_StateCatcher sc(block.GetHash()); RegisterValidationInterface(&sc); - bool fAccepted = ProcessNewBlock(state, NULL, &block); + bool fAccepted = ProcessNewBlock(state, NULL, &block, true, NULL); UnregisterValidationInterface(&sc); if (fBlockPresent) { |