Browse Source

Simplify difficulty averaging code

pull/145/head
Jack Grigg 8 years ago
parent
commit
7b173bd80f
  1. 14
      src/pow.cpp

14
src/pow.cpp

@ -26,15 +26,11 @@ unsigned int GetNextWorkRequired(const CBlockIndex* pindexLast, const CBlockHead
// Find the first block in the averaging interval
const CBlockIndex* pindexFirst = pindexLast;
arith_uint256 bnAvg;
arith_uint256 bnTmp;
arith_uint256 bnTot {0};
for (int i = 0; pindexFirst && i < params.nPowAveragingWindow; i++) {
if (i == 0) {
bnAvg.SetCompact(pindexFirst->nBits);
} else {
bnTmp.SetCompact(pindexFirst->nBits);
bnAvg = ((bnAvg * i) + bnTmp) / (i + 1);
}
arith_uint256 bnTmp;
bnTmp.SetCompact(pindexFirst->nBits);
bnTot += bnTmp;
pindexFirst = pindexFirst->pprev;
}
@ -42,6 +38,8 @@ unsigned int GetNextWorkRequired(const CBlockIndex* pindexLast, const CBlockHead
if (pindexFirst == NULL)
return nProofOfWorkLimit;
arith_uint256 bnAvg {bnTot / params.nPowAveragingWindow};
return CalculateNextWorkRequired(bnAvg, pindexLast->GetMedianTimePast(), pindexFirst->GetMedianTimePast(), params);
}

Loading…
Cancel
Save