diff options
| author | Suhas Daftuar <sdaftuar@gmail.com> | 2017-05-07 14:10:19 -0400 |
|---|---|---|
| committer | Suhas Daftuar <sdaftuar@chaincode.com> | 2017-09-05 15:05:28 -0400 |
| commit | 0311836f6927aec4ba5687ea12af35df3c509682 (patch) | |
| tree | 5d1b35310828f7299e039476a52146140f6bb0fc /src/validation.cpp | |
| parent | e0e3cbbf081b74ed5322176dcda081c64076fd21 (diff) | |
Allow setting nMinimumChainWork on command line
Diffstat (limited to 'src/validation.cpp')
| -rw-r--r-- | src/validation.cpp | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/src/validation.cpp b/src/validation.cpp index 3b9636839d..0edc9bc32a 100644 --- a/src/validation.cpp +++ b/src/validation.cpp @@ -83,6 +83,7 @@ int64_t nMaxTipAge = DEFAULT_MAX_TIP_AGE; bool fEnableReplacement = DEFAULT_ENABLE_REPLACEMENT; uint256 hashAssumeValid; +arith_uint256 nMinimumChainWork; CFeeRate minRelayTxFee = CFeeRate(DEFAULT_MIN_RELAY_TX_FEE); CAmount maxTxFee = DEFAULT_TRANSACTION_MAXFEE; @@ -1035,8 +1036,6 @@ CAmount GetBlockSubsidy(int nHeight, const Consensus::Params& consensusParams) bool IsInitialBlockDownload() { - const CChainParams& chainParams = Params(); - // Once this function has returned false, it must remain false. static std::atomic<bool> latchToFalse{false}; // Optimization: pre-test latch before taking the lock. @@ -1050,7 +1049,7 @@ bool IsInitialBlockDownload() return true; if (chainActive.Tip() == nullptr) return true; - if (chainActive.Tip()->nChainWork < UintToArith256(chainParams.GetConsensus().nMinimumChainWork)) + if (chainActive.Tip()->nChainWork < nMinimumChainWork) return true; if (chainActive.Tip()->GetBlockTime() < (GetTime() - nMaxTipAge)) return true; @@ -1670,7 +1669,7 @@ static bool ConnectBlock(const CBlock& block, CValidationState& state, CBlockInd if (it != mapBlockIndex.end()) { if (it->second->GetAncestor(pindex->nHeight) == pindex && pindexBestHeader->GetAncestor(pindex->nHeight) == pindex && - pindexBestHeader->nChainWork >= UintToArith256(chainparams.GetConsensus().nMinimumChainWork)) { + pindexBestHeader->nChainWork >= nMinimumChainWork) { // This block is a member of the assumed verified chain and an ancestor of the best header. // The equivalent time check discourages hash power from extorting the network via DOS attack // into accepting an invalid block through telling users they must manually set assumevalid. |