aboutsummaryrefslogtreecommitdiff
path: root/src/miner.cpp
diff options
context:
space:
mode:
authorWladimir J. van der Laan <[email protected]>2015-06-03 16:20:30 +0200
committerWladimir J. van der Laan <[email protected]>2015-06-03 16:20:58 +0200
commit9d6060244429c4591e6ca62749f4f73cd981f247 (patch)
treecab29a59fa4c190a4159fb651d244eeac36b4a13 /src/miner.cpp
parentMerge pull request #6218 (diff)
parentP2P regression test for new AcceptBlock behavior (diff)
downloaddiscoin-9d6060244429c4591e6ca62749f4f73cd981f247.tar.xz
discoin-9d6060244429c4591e6ca62749f4f73cd981f247.zip
Merge pull request #5875
aa8c827 P2P regression test for new AcceptBlock behavior (Suhas Daftuar) 9be0e68 Be stricter in processing unrequested blocks (Suhas Daftuar)
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;