aboutsummaryrefslogtreecommitdiff
path: root/src/miner.cpp
diff options
context:
space:
mode:
authorSuhas Daftuar <[email protected]>2015-04-09 13:21:11 -0400
committerWladimir J. van der Laan <[email protected]>2015-06-03 16:23:46 +0200
commit304892fc03b11bf04286619d2a6fe0ba99ee41fc (patch)
tree805452dad8feb420fcf5805d39fe812f2bb7340c /src/miner.cpp
parentMerge pull request #6219 (diff)
downloaddiscoin-304892fc03b11bf04286619d2a6fe0ba99ee41fc.tar.xz
discoin-304892fc03b11bf04286619d2a6fe0ba99ee41fc.zip
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/miner.cpp')
-rw-r--r--src/miner.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/miner.cpp b/src/miner.cpp
index dfabfd48d..f5919ca3a 100644
--- a/src/miner.cpp
+++ b/src/miner.cpp
@@ -434,7 +434,7 @@ static bool ProcessBlockFound(CBlock* pblock, CWallet& wallet, CReserveKey& rese
// Process this block the same as if we had received it from another node
CValidationState state;
- if (!ProcessNewBlock(state, NULL, pblock))
+ if (!ProcessNewBlock(state, NULL, pblock, true, NULL))
return error("BitcoinMiner: ProcessNewBlock, block not accepted");
return true;