RanchiMall/php-mpos
3
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix #657, added getmininginfo to wrapper

Browse Source
This commit is contained in:
Sebastian Grewe 2013-09-25 11:29:56 +02:00
parent 65bdd11945
commit abcd62d8e8
1 changed files with 12 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
public/include/classes/bitcoinwrapper.class.php
View File

@ -46,9 +46,18 @@ class BitcoinWrapper extends BitcoinClient {
public function getnetworkhashps() { public function getnetworkhashps() {
$this->oDebug->append("STA " . __METHOD__, 4); $this->oDebug->append("STA " . __METHOD__, 4);
if ($data = $this->memcache->get(__FUNCTION__)) return $data; if ($data = $this->memcache->get(__FUNCTION__)) return $data;
try { $dNetworkHashrate = $this->query('getnetworkhashps') / 1000; } catch (Exception $e) { try {
// Maybe we are SHA $dNetworkHashrate = $this->query('getmininginfo');
try { $dNetworkHashrate = $this->query('gethashespersec') / 1000; } catch (Exception $e) { return false; } if (is_array($dNetworkHashrate) && array_key_exists('networkhashps', $dNetworkHashrate)) {
$dNetworkHashrate = $dNetworkHashrate['networkhashps'];
} else if (is_array($dNetworkHashrate) && array_key_exists('hashespersec', $dNetworkHashrate)) {
$dNetworkHashrate = $dNetworkHashrate['hashespersec'];
}
} catch (Exception $e) {
try { $dNetworkHashrate = $this->query('getnetworkhashps') / 1000; } catch (Exception $e) {
// Maybe we are SHA
try { $dNetworkHashrate = $this->query('gethashespersec') / 1000; } catch (Exception $e) { return false; }
}
} }
return $this->memcache->setCache(__FUNCTION__, $dNetworkHashrate, 30); return $this->memcache->setCache(__FUNCTION__, $dNetworkHashrate, 30);
} }