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

fix logic for consecutive-same-algo limit change

Browse Source
This commit is contained in:
nzsquirrell
2015-08-18 20:02:02 +12:00
parent 6694e610cd
commit 519a398b26
1 changed files with 14 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main.cpp
+14 -9
View File
@@ -2689,8 +2689,7 @@ 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;
@@ -2702,17 +2701,23 @@ bool AcceptBlock(CBlock& block, CValidationState& state, CDiskBlockPos* dbp)
nAlgoCount++;
piPrev = piPrev->pprev;
}
if ((nHeight > nBlockSequentialAlgoRuleStart3) && (nAlgoCount > nBlockSequentialAlgoMaxCount3))
if (nHeight > nBlockSequentialAlgoRuleStart3)
{
return state.DoS(100, error("AcceptBlock() : too many blocks from same algo"),
if(nAlgoCount > nBlockSequentialAlgoMaxCount3)
{
return state.DoS(100, error("AcceptBlock() : too many blocks from same algo"),
REJECT_INVALID, "algo-toomany");
} else
if ((nHeight > nBlockSequentialAlgoRuleStart2) && (nAlgoCount > nBlockSequentialAlgoMaxCount2))
}
}
else if (nHeight > nBlockSequentialAlgoRuleStart2)
{
return state.DoS(100, error("AcceptBlock() : too many blocks from same algo"),
if(nAlgoCount > nBlockSequentialAlgoMaxCount2)
{
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");