diff options
| author | Wladimir J. van der Laan <laanwj@gmail.com> | 2014-10-02 15:27:54 +0200 |
|---|---|---|
| committer | Wladimir J. van der Laan <laanwj@gmail.com> | 2014-10-02 15:28:27 +0200 |
| commit | 45c41c05a0d6f173f50045eac90a3008fcba8033 (patch) | |
| tree | 09b962d33a59e925b6fdb1d4df173f616af26e1e /src/main.cpp | |
| parent | 2dc37e7a49a3b1ed61869331561d46016e2b88e4 (diff) | |
| parent | fbd36d8fb5245a5511b2db7a35270fb1250e21d5 (diff) | |
Merge pull request #5030
fbd36d8 Avoid introducing a virtual into CChainParams (Wladimir J. van der Laan)
f0fd00c Switch testing framework from MAIN to new UNITTEST network (SergioDemianLerner)
Diffstat (limited to 'src/main.cpp')
| -rw-r--r-- | src/main.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/main.cpp b/src/main.cpp index a3e36ff872..55485c86ff 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -2305,7 +2305,8 @@ bool AcceptBlockHeader(CBlockHeader& block, CValidationState& state, CBlockIndex nHeight = pindexPrev->nHeight+1; // Check proof of work - if (block.nBits != GetNextWorkRequired(pindexPrev, &block)) + if ((!Params().SkipProofOfWorkCheck()) && + (block.nBits != GetNextWorkRequired(pindexPrev, &block))) return state.DoS(100, error("AcceptBlock() : incorrect proof of work"), REJECT_INVALID, "bad-diffbits"); |