increase consecutive-same-algo limit to 6 blocks

This commit is contained in:
nzsquirrell
2015-08-17 19:40:24 +12:00
parent dad2e8b0f9
commit 59ccce6a1f
2 changed files with 7 additions and 0 deletions
+5
View File
@@ -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"),
+2
View File
@@ -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