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

Auto merge of #1047 - aniemerg:fix/get-difficulty-fix2, r=ebfull

Browse Source 
Update GetDifficulty() to use consensus.powLimit from consensus parameters.

Fixes #1032.
This commit is contained in:
zkbot
2016-07-14 04:18:56 +00:00
parent 331cae91bc 24809b16b6
commit 4bcdd85583
1 changed files with 7 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/rpcblockchain.cpp
View File

@@ -34,16 +34,20 @@ double GetDifficulty(const CBlockIndex* blockindex)
} }
int nShift = (blockindex->nBits >> 24) & 0xff; int nShift = (blockindex->nBits >> 24) & 0xff;
uint32_t powLimit =
UintToArith256(Params().GetConsensus().powLimit).GetCompact();;
int nShiftAmount = (powLimit >> 24) & 0xff;
double dDiff = double dDiff =
(double)0x0000ffff / (double)(blockindex->nBits & 0x00ffffff); (double)(powLimit & 0x00ffffff) /
(double)(blockindex->nBits & 0x00ffffff);
while (nShift < 29) while (nShift < nShiftAmount)
{ {
dDiff *= 256.0; dDiff *= 256.0;
nShift++; nShift++;
} }
while (nShift > 29) while (nShift > nShiftAmount)
{ {
dDiff /= 256.0; dDiff /= 256.0;
nShift--; nShift--;