diff options
| author | Jorge Timón <[email protected]> | 2015-02-15 02:21:42 +0100 |
|---|---|---|
| committer | Jorge Timón <[email protected]> | 2015-03-26 00:47:51 +0100 |
| commit | d698ef690f62c08676dcf9ddc0988e23aa81cbff (patch) | |
| tree | d2c52a3b81167039a3991b0809c958862752a8de /src/main.cpp | |
| parent | Consensus: Refactor: Introduce Consensus::Params class (diff) | |
| download | discoin-d698ef690f62c08676dcf9ddc0988e23aa81cbff.tar.xz discoin-d698ef690f62c08676dcf9ddc0988e23aa81cbff.zip | |
Consensus: Refactor: Decouple pow.o from chainparams.o
Diffstat (limited to 'src/main.cpp')
| -rw-r--r-- | src/main.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/main.cpp b/src/main.cpp index 0ffacc338..1d78eedc1 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -1158,7 +1158,7 @@ bool ReadBlockFromDisk(CBlock& block, const CDiskBlockPos& pos) } // Check the header - if (!CheckProofOfWork(block.GetHash(), block.nBits)) + if (!CheckProofOfWork(block.GetHash(), block.nBits, Params().GetConsensus())) return error("ReadBlockFromDisk: Errors in block header at %s", pos.ToString()); return true; @@ -2462,7 +2462,7 @@ bool FindUndoPos(CValidationState &state, int nFile, CDiskBlockPos &pos, unsigne bool CheckBlockHeader(const CBlockHeader& block, CValidationState& state, bool fCheckPOW) { // Check proof of work matches claimed amount - if (fCheckPOW && !CheckProofOfWork(block.GetHash(), block.nBits)) + if (fCheckPOW && !CheckProofOfWork(block.GetHash(), block.nBits, Params().GetConsensus())) return state.DoS(50, error("CheckBlockHeader(): proof of work failed"), REJECT_INVALID, "high-hash"); @@ -2545,7 +2545,7 @@ bool ContextualCheckBlockHeader(const CBlockHeader& block, CValidationState& sta int nHeight = pindexPrev->nHeight+1; // Check proof of work - if ((block.nBits != GetNextWorkRequired(pindexPrev, &block))) + if (block.nBits != GetNextWorkRequired(pindexPrev, &block, Params().GetConsensus())) return state.DoS(100, error("%s: incorrect proof of work", __func__), REJECT_INVALID, "bad-diffbits"); |