diff options
| author | Patrick Lodder <[email protected]> | 2014-07-23 13:31:37 +0200 |
|---|---|---|
| committer | Patrick Lodder <[email protected]> | 2014-08-03 17:05:49 +0200 |
| commit | aeb626aeebd5ddcbf58fae372dbf9b0af938fd31 (patch) | |
| tree | 6e8f8b5e28e4eeb642e8b2c5f6beb95b0b4343d9 /src/main.cpp | |
| parent | send auxpow debug info to debug.log instead of stdout (diff) | |
| download | archived-discoin-aeb626aeebd5ddcbf58fae372dbf9b0af938fd31.tar.xz archived-discoin-aeb626aeebd5ddcbf58fae372dbf9b0af938fd31.zip | |
extracted auxpow consts
set testnet start of auxpow to block 158100
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 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) |