diff --git a/public/include/pages/statistics/pool.inc.php b/public/include/pages/statistics/pool.inc.php index c737853c..24506f73 100644 --- a/public/include/pages/statistics/pool.inc.php +++ b/public/include/pages/statistics/pool.inc.php @@ -67,7 +67,7 @@ if (!$iCurrentPoolHashrate = $memcache->get('iCurrentPoolHashrate')) { $iCurrentPoolHashrate = $statistics->getCurrentHashrate(); $memcache->set('iCurrentPoolHashrate', $iCurrentPoolHashrate, 60); } -$iEstTime = (($dDifficulty * bcpow(2,$config['difficulty'])) / $iCurrentPoolHashrate); +$iEstTime = ((($dDifficulty * pow(2,32)) / $iCurrentPoolHashrate) / 3600); $now = new DateTime( "now" ); if (!empty($aBlockData)) { $dTimeSinceLast = ($now->getTimestamp() - $aBlockData['time']); @@ -84,7 +84,6 @@ $smarty->assign("TOPHASHRATES", $aHashData); $smarty->assign("CURRENTBLOCK", $iBlock); $smarty->assign("LASTBLOCK", $aBlockData['height']); $smarty->assign("DIFFICULTY", $dDifficulty); -$smarty->assign("TARGETDIFF", $config['difficulty']); $smarty->assign("REWARD", $config['reward']); if ($_SESSION['AUTHENTICATED']) { diff --git a/public/templates/mmcFE/statistics/pool/authenticated.tpl b/public/templates/mmcFE/statistics/pool/authenticated.tpl index 78aa4d9b..f278fb04 100644 --- a/public/templates/mmcFE/statistics/pool/authenticated.tpl +++ b/public/templates/mmcFE/statistics/pool/authenticated.tpl @@ -17,7 +17,7 @@ {$rank++} {$TOPHASHRATES[hashrate].account} {$TOPHASHRATES[hashrate].hashrate|number_format} - {math equation="round(( 24 / (((diff * pow(2,targetdiff)) / hashrate) / 3600) * reward ),3)" diff=$DIFFICULTY targetdiff=$TARGETDIFF hashrate=$TOPHASHRATES[hashrate].hashrate reward=$REWARD} + {math equation="round(reward / ( diff * pow(2,32) / ( hashrate * 1000 ) / 3600 / 24),3)" diff=$DIFFICULTY reward=$REWARD hashrate=$TOPHASHRATES[hashrate].hashrate} {/section}