sikkienl/dash
1
0
Fork 0
mirror of https://github.com/dashpay/dash.git synced 2024-12-29 13:59:06 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

For getnetworkhashps, use min/max to calculate the block times.

Browse Source
This commit is contained in:
Charlie Lee 2013-09-14 02:06:24 +08:00
parent 603a53712d
commit 08ed7a26a9
1 changed files with 11 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/rpcmining.cpp
View File

@ -32,11 +32,20 @@ Value GetNetworkHashPS(int lookup, int height) {
lookup = pb->nHeight; lookup = pb->nHeight;
CBlockIndex *pb0 = pb; CBlockIndex *pb0 = pb;
for (int i = 0; i < lookup; i++) int64 minTime, maxTime = pb0->GetBlockTime();
for (int i = 0; i < lookup; i++) {
pb0 = pb0->pprev; pb0 = pb0->pprev;
int64 time = pb0->GetBlockTime();
minTime = std::min(time, minTime);
maxTime = std::max(time, maxTime);
}
// In case there's a situation where minTime == maxTime, we don't want a divide by zero exception.
if (minTime == maxTime)
return 0;
uint256 workDiff = pb->nChainWork - pb0->nChainWork; uint256 workDiff = pb->nChainWork - pb0->nChainWork;
int64 timeDiff = pb->GetBlockTime() - pb0->GetBlockTime(); int64 timeDiff = maxTime - minTime;
return (boost::int64_t)(workDiff.getdouble() / timeDiff); return (boost::int64_t)(workDiff.getdouble() / timeDiff);
} }