DragonX/hush3
1
1
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 1 Wiki Activity

Auto merge of #1338 - str4d:147-tweak-difficulty-adjustment-algorithm, r=ebfull

Browse Source 
Tweaks to difficulty adjustment algorithm

This PR changes the difficulty algorithm to adjust from the average difficulty over the
block window instead of from the last difficulty. It also removes the special rules for the
testnet, which are incompatible with difficulty averaging.

Closes #147 again.
This commit is contained in:
zkbot
2016-09-08 02:21:13 +00:00
parent 0372ce1f92 622ced8a74
commit 2271d3feda
9 changed files with 249 additions and 224 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
src/rpcblockchain.cpp
View File

@@ -33,29 +33,21 @@ double GetDifficultyINTERNAL(const CBlockIndex* blockindex, bool networkDifficul
blockindex = chainActive.Tip();
}
uint32_t powLimit =
UintToArith256(Params().GetConsensus().powLimit).GetCompact();;
{
if (networkDifficulty && Params().GetConsensus().fPowAllowMinDifficultyBlocks)
{
// Special difficulty rule for testnet:
// If a block's timestamp is more than 2*nPowTargetSpacing minutes after
// the previous block, then it is permitted to be min-difficulty. So
// get the last non-min-difficulty (or at worst the genesis difficulty).
auto window = Params().GetConsensus().nPowTargetSpacing*2;
while (blockindex->pprev && blockindex->nBits == powLimit &&
blockindex->GetBlockTime() > blockindex->pprev->GetBlockTime() + window) {
blockindex = blockindex->pprev;
}
}
uint32_t bits;
if (networkDifficulty) {
bits = GetNextWorkRequired(blockindex, nullptr, Params().GetConsensus());
} else {
bits = blockindex->nBits;
}
int nShift = (blockindex->nBits >> 24) & 0xff;
uint32_t powLimit =
UintToArith256(Params().GetConsensus().powLimit).GetCompact();
int nShift = (bits >> 24) & 0xff;
int nShiftAmount = (powLimit >> 24) & 0xff;
double dDiff =
(double)(powLimit & 0x00ffffff) /
(double)(blockindex->nBits & 0x00ffffff);
(double)(bits & 0x00ffffff);
while (nShift < nShiftAmount)
{