github-jwinterm/myriadcoin
1
0
Fork 0
mirror of https://github.com/jwinterm/myriadcoin.git synced 2026-10-23 06:38:47 +02:00
Code Issues Packages Projects Releases Wiki Activity

Revert "fix logic for consecutive-same-algo limit change"

Browse Source 
This reverts commit 519a398b26.
This commit is contained in:
nzsquirrell
2015-08-23 19:33:13 +12:00
parent 519a398b26
commit 4154954077
1 changed files with 9 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main.cpp
+9 -14
View File
@@ -2689,7 +2689,8 @@ bool AcceptBlock(CBlock& block, CValidationState& state, CDiskBlockPos* dbp)
nHeight = pindexPrev->nHeight+1;
// Check count of sequence of same algo
if ( (TestNet() && (nHeight > 200)) || (nHeight > nBlockSequentialAlgoRuleStart))
if ( (TestNet() && (nHeight > 200))
|| (nHeight > nBlockSequentialAlgoRuleStart) )
{
int nAlgo = block.GetAlgo();
int nAlgoCount = 1;
@@ -2701,23 +2702,17 @@ bool AcceptBlock(CBlock& block, CValidationState& state, CDiskBlockPos* dbp)
nAlgoCount++;
piPrev = piPrev->pprev;
}
if (nHeight > nBlockSequentialAlgoRuleStart3)
if ((nHeight > nBlockSequentialAlgoRuleStart3) && (nAlgoCount > nBlockSequentialAlgoMaxCount3))
{
if(nAlgoCount > nBlockSequentialAlgoMaxCount3)
{
return state.DoS(100, error("AcceptBlock() : too many blocks from same algo"),
return state.DoS(100, error("AcceptBlock() : too many blocks from same algo"),
REJECT_INVALID, "algo-toomany");
}
}
else if (nHeight > nBlockSequentialAlgoRuleStart2)
} else
if ((nHeight > nBlockSequentialAlgoRuleStart2) && (nAlgoCount > nBlockSequentialAlgoMaxCount2))
{
if(nAlgoCount > nBlockSequentialAlgoMaxCount2)
{
return state.DoS(100, error("AcceptBlock() : too many blocks from same algo"),
return state.DoS(100, error("AcceptBlock() : too many blocks from same algo"),
REJECT_INVALID, "algo-toomany");
}
}
else if (nAlgoCount > nBlockSequentialAlgoMaxCount)
} else
if (nAlgoCount > nBlockSequentialAlgoMaxCount)
{
return state.DoS(100, error("AcceptBlock() : too many blocks from same algo"),
REJECT_INVALID, "algo-toomany");