From aeb626aeebd5ddcbf58fae372dbf9b0af938fd31 Mon Sep 17 00:00:00 2001 From: Patrick Lodder Date: Wed, 23 Jul 2014 13:31:37 +0200 Subject: extracted auxpow consts set testnet start of auxpow to block 158100 --- src/main.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'src/main.cpp') diff --git a/src/main.cpp b/src/main.cpp index 2735fc6d4..9141f86b6 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -2356,9 +2356,9 @@ bool ReceivedBlockTransactions(const CBlock &block, CValidationState& state, CBl int GetAuxPowStartBlock() { if (TestNet()) - return INT_MAX; // never + return AUXPOW_START_TESTNET; else - return INT_MAX; // never + return AUXPOW_START_MAINNET; } bool CBlockHeader::CheckProofOfWork(int nHeight) const @@ -2369,7 +2369,7 @@ bool CBlockHeader::CheckProofOfWork(int nHeight) const // - this block must have our chain ID // - parent block must not have the same chain ID (see CAuxPow::Check) // - index of this chain in chain merkle tree must be pre-determined (see CAuxPow::Check) - if (!TestNet() && nHeight != INT_MAX && GetChainID() != GetOurChainID()) + if (!TestNet() && nHeight != INT_MAX && GetChainID() != AUXPOW_CHAIN_ID) return error("CheckProofOfWork() : block does not have our chain ID"); if (auxpow.get() != NULL) -- cgit v1.2.3