From 59ccce6a1fd2468ae545b18cd542300b34e1a2b6 Mon Sep 17 00:00:00 2001 From: nzsquirrell Date: Mon, 17 Aug 2015 19:40:24 +1200 Subject: [PATCH] increase consecutive-same-algo limit to 6 blocks --- src/main.cpp | 5 +++++ src/main.h | 2 ++ 2 files changed, 7 insertions(+) diff --git a/src/main.cpp b/src/main.cpp index 45853523..51fc2752 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -2702,6 +2702,11 @@ bool AcceptBlock(CBlock& block, CValidationState& state, CDiskBlockPos* dbp) nAlgoCount++; piPrev = piPrev->pprev; } + if ((nHeight > nBlockSequentialAlgoRuleStart3) && (nAlgoCount > nBlockSequentialAlgoMaxCount3)) + { + return state.DoS(100, error("AcceptBlock() : too many blocks from same algo"), + REJECT_INVALID, "algo-toomany"); + } else if ((nHeight > nBlockSequentialAlgoRuleStart2) && (nAlgoCount > nBlockSequentialAlgoMaxCount2)) { return state.DoS(100, error("AcceptBlock() : too many blocks from same algo"), diff --git a/src/main.h b/src/main.h index 095c3d0c..1f522699 100644 --- a/src/main.h +++ b/src/main.h @@ -708,8 +708,10 @@ const int64_t nBlockAlgoNormalisedWorkDecayStart = 866000; // block where weight const int64_t nBlockAlgoNormalisedWorkDecayStart2 = 932000; // block where weight decay starts const int64_t nBlockSequentialAlgoRuleStart = 740000; // block where sequential algo rule starts const int64_t nBlockSequentialAlgoRuleStart2 = 766000; // block where sequential algo rule starts +const int64_t nBlockSequentialAlgoRuleStart3 = 1400000; // block where sequential algo rule starts const int nBlockSequentialAlgoMaxCount = 6; // maximum sequential blocks of same algo const int nBlockSequentialAlgoMaxCount2 = 3; // maximum sequential blocks of same algo +const int nBlockSequentialAlgoMaxCount3 = 6; // maximum sequential blocks of same algo const int64_t nBlockTimeWarpPreventStart = 740500; // block where time warp 1 prevention starts const int64_t nBlockTimeWarpPreventStart2 = 766000; // block where time warp 2 prevention starts const int64_t nBlockDiffAdjustV2 = 766000; // block where difficulty adjust V2 starts