github-jwinterm/myriadcoin
1
0
Fork 0
mirror of https://github.com/jwinterm/myriadcoin.git synced 2026-10-17 05:41:34 +02:00
Code Issues Packages Projects Releases Wiki Activity

Revert "increase consecutive-same-algo limit to 6 blocks"

Browse Source 
This reverts commit 59ccce6a1f.
This commit is contained in:
nzsquirrell
2015-08-23 19:34:02 +12:00
parent 4154954077
commit a37536e980
2 changed files with 0 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main.cpp
-5
View File
@@ -2702,11 +2702,6 @@ 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"),
src/main.h
-2
View File
@@ -708,10 +708,8 @@ 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