adding network hashrate to poolstatus

This commit is contained in:
Sebastian Grewe 2013-09-13 10:28:12 +02:00
parent 522e37717b
commit f35c7cedc8

View File

@ -22,14 +22,19 @@ if ($bitcoin->can_connect() === true){
if (is_array($dDifficulty) && array_key_exists('proof-of-work', $dDifficulty))
$dDifficulty = $dDifficulty['proof-of-work'];
$iBlock = $bitcoin->getblockcount();
$dNetworkHashrate = $bitcoin->query('getnetworkhashps');
} else {
$dDifficulty = 1;
$iBlock = 0;
$dNetworkHashrate = 0;
}
// Estimated time to find the next block
$iCurrentPoolHashrate = $statistics->getCurrentHashrate();
// Avoid confusion, ensure our nethash isn't higher than poolhash
if ($iCurrentPoolHashrate > $dNetworkHashrate) $dNetworkHashrate = $iCurrentPoolHashrate;
// Time in seconds, not hours, using modifier in smarty to translate
$iCurrentPoolHashrate > 0 ? $iEstTime = $dDifficulty * pow(2,32) / ($iCurrentPoolHashrate * 1000) : $iEstTime = 0;
$iEstShares = (pow(2, 32 - $config['difficulty']) * $dDifficulty);
@ -56,6 +61,7 @@ echo json_encode(
'esttime' => $iEstTime,
'estshares' => $iEstShares,
'timesincelast' => $dTimeSinceLast,
'nethashrate' => $dNetworkHashrate
)));
// Supress master template