From 594b2c0e10d293498d508caa0e5d26eac6d6d940 Mon Sep 17 00:00:00 2001
From: Sebastian Grewe <sebastian@grewe.ca>
Date: Mon, 30 Sep 2013 13:43:27 +0200
Subject: [PATCH] [FIX] Network Hashrate on Novacoin

---
 public/include/classes/bitcoinwrapper.class.php | 11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)

diff --git a/public/include/classes/bitcoinwrapper.class.php b/public/include/classes/bitcoinwrapper.class.php
index 0c343c8a..a62809ef 100644
--- a/public/include/classes/bitcoinwrapper.class.php
+++ b/public/include/classes/bitcoinwrapper.class.php
@@ -49,15 +49,14 @@ class BitcoinWrapper extends BitcoinClient {
     try {
       $dNetworkHashrate = $this->query('getmininginfo');
       if (is_array($dNetworkHashrate) && array_key_exists('networkhashps', $dNetworkHashrate)) {
-        $dNetworkHashrate = $dNetworkHashrate['networkhashps'];
+        $dNetworkHashrate = $dNetworkHashrate['networkhashps'] / 1000;
       } else if (is_array($dNetworkHashrate) && array_key_exists('hashespersec', $dNetworkHashrate)) {
-        $dNetworkHashrate = $dNetworkHashrate['hashespersec'];
+        $dNetworkHashrate = $dNetworkHashrate['hashespersec'] / 1000;
+      } else if (is_array($dNetworkHashrate) && array_key_exists('netmhashps', $dNetworkHashrate)) {
+        $dNetworkHashrate = $dNetworkHashrate['netmhashps'] / 1000;
       }
     } 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 false;
     }
     return $this->memcache->setCache(__FUNCTION__, $dNetworkHashrate, 30);
   }