From 716e11804110cb7d6a02b7f7a7231f898a0316f8 Mon Sep 17 00:00:00 2001 From: Sebastian Grewe Date: Mon, 23 Sep 2013 07:11:43 +0200 Subject: [PATCH 1/7] Update statistics.class.php Fixes #664 --- public/include/classes/statistics.class.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/public/include/classes/statistics.class.php b/public/include/classes/statistics.class.php index d8d55fb6..0ada5d61 100644 --- a/public/include/classes/statistics.class.php +++ b/public/include/classes/statistics.class.php @@ -325,7 +325,7 @@ class Statistics { * @param account_id integer User ID * @return data integer Current Sharerate in shares/s **/ - public function getUserSharerate($account_id, $interval) { + public function getUserSharerate($account_id, $interval=600) { $this->debug->append("STA " . __METHOD__, 4); if ($data = $this->memcache->get(__FUNCTION__ . $account_id)) return $data; $stmt = $this->mysqli->prepare(" From 84bed912d5edcfb8875833623d1c303d5bb0eb5e Mon Sep 17 00:00:00 2001 From: Sebastian Grewe Date: Mon, 23 Sep 2013 13:51:34 +0200 Subject: [PATCH 2/7] Update POOLS.md Removing Stale URLs --- POOLS.md | 10 ---------- 1 file changed, 10 deletions(-) diff --git a/POOLS.md b/POOLS.md index 1bf0c5ab..e6046fce 100644 --- a/POOLS.md +++ b/POOLS.md @@ -9,16 +9,6 @@ tested it on various coins. These tables represent their users pools. Be aware that all values are as of this writing and may have changed since then. -### ahmedbodi - -A helpful tester for features and bug fixes in `mmcfe-ng`, he is running -an active pool for Redcoin. - -| Pool URL | Coin | Avg. Hashrate | Avg. Active Workers | Notes | -| :------- | :--- | ------------: | ------------------: | ----- | -| http://crypto-expert.com/REDpool/public | Redcoin | 10 MHash | 12 | No modifications required | -| http://crypto-expert.com/ANONpool/public | Anoncoin | 0 MHash | 0 | Template Changes | - ### vias79 From eace4b7967929917d47d81b1c9a3169ec441ba43 Mon Sep 17 00:00:00 2001 From: Sebastian Grewe Date: Mon, 23 Sep 2013 13:56:14 +0200 Subject: [PATCH 3/7] Update POOLS.md Removing pools that didn't keep the footer or honor the real author/software. --- POOLS.md | 5 ----- 1 file changed, 5 deletions(-) diff --git a/POOLS.md b/POOLS.md index e6046fce..5b7bcebd 100644 --- a/POOLS.md +++ b/POOLS.md @@ -102,11 +102,6 @@ Small Time Miners are running various stratum only pools for different coins. | http://wdc.nut2pools.com | Worldcoin | 3.5 Mhs | 3 workers | New style, PPLNS | | http://pxc.nut2pools.com | Phenixcoin | 0 | 0 | New style | PPLNS | -### Dids - -| Pool URL | Coin | Avg. Hashrate | Avg. Active Workers | Notes | -| -------- | ---- | ------------: | ------------------: | ----- | -| http://poolmine.it | Litecoin | 0.23 MHash | 5 | PPLNS, Custom Template | ### 4782 From ef64d5ba023cf46a1dfd59b6e20cb1dd39a867c3 Mon Sep 17 00:00:00 2001 From: Sebastian Grewe Date: Mon, 23 Sep 2013 13:57:16 +0200 Subject: [PATCH 4/7] Update POOLS.md Removing pool that misses the footer or doesn't honor the author. --- POOLS.md | 7 ------- 1 file changed, 7 deletions(-) diff --git a/POOLS.md b/POOLS.md index 5b7bcebd..4ec82ed9 100644 --- a/POOLS.md +++ b/POOLS.md @@ -101,10 +101,3 @@ Small Time Miners are running various stratum only pools for different coins. | http://ftc.nut2pools.com | Feathercoin | 45-50Mhs | 25 workers | New style, PPLNS | | http://wdc.nut2pools.com | Worldcoin | 3.5 Mhs | 3 workers | New style, PPLNS | | http://pxc.nut2pools.com | Phenixcoin | 0 | 0 | New style | PPLNS | - - -### 4782 - -| Pool URL | Coin | Avg. Hashrate | Avg. Active Workers | Notes | -| -------- | ---- | ------------: | ------------------: | ----- | -| http://pirate-pool.com | LTC | 0.5 MHash | 2 | | From b06bd3d401c437bf150a4eb341328a4066e46630 Mon Sep 17 00:00:00 2001 From: Sebastian Grewe Date: Mon, 23 Sep 2013 14:33:10 +0200 Subject: [PATCH 5/7] Update README.md Added Fastcoin address. --- README.md | 1 + 1 file changed, 1 insertion(+) diff --git a/README.md b/README.md index 0289c60d..b242e6fa 100644 --- a/README.md +++ b/README.md @@ -26,6 +26,7 @@ with some hard earned coins feel free to donate: * LTC address: `Lge95QR2frp9y1wJufjUPCycVsg5gLJPW8` * FTC address: `6jDgGaUzMVyac5uqBhJCMiFMKCtH1LagTA` * NVC address: `4Guct6z7NVPVALHRAVn517TTmvqQve4WYr` +* FST address: `g17CfFHqNqR5JnUjtG8RNBYh2WrhEirV67` # Website Footer From e46b1c978e6f994763a6cb35370e158252ae39d2 Mon Sep 17 00:00:00 2001 From: ahmedbodi Date: Mon, 23 Sep 2013 15:29:24 +0100 Subject: [PATCH 6/7] Update POOLS.md --- POOLS.md | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/POOLS.md b/POOLS.md index 4ec82ed9..7220099b 100644 --- a/POOLS.md +++ b/POOLS.md @@ -101,3 +101,16 @@ Small Time Miners are running various stratum only pools for different coins. | http://ftc.nut2pools.com | Feathercoin | 45-50Mhs | 25 workers | New style, PPLNS | | http://wdc.nut2pools.com | Worldcoin | 3.5 Mhs | 3 workers | New style, PPLNS | | http://pxc.nut2pools.com | Phenixcoin | 0 | 0 | New style | PPLNS | + +### ahmedbodi + + +| Pool URL | Coin | Avg. Hashrate | Avg. Active Workers | Notes | +| -------- | ---- | ------------: | ------------------: | ----- | +| http://gme.crypto-expert.com | Gamecoin | 1.5Mhs | 3 workers | Custom Template, Prop | +| http://orb.crypto-expert.com | Orbitcoin | 0.2 Mhs | 1 workers | Custom Template, PPLNS | +| http://src.crypto-expert.com | Securecoin | 25 | 20 | Custom Template, Prop | +| http://dgc.crypto-expert.com | Digitalcoin | 0 | 0 | Custom Template, Prop | +| http://arg.crypto-expert.com | Argentum | 0 | 0 | Custom Template, Prop| +| http://crypto-expert.com/TIX | Tix | 0.5 | 1 | Custom Template, Prop| + From abcd62d8e89feb5e35d9ea9e5b8bb9bf828655bb Mon Sep 17 00:00:00 2001 From: Sebastian Grewe Date: Wed, 25 Sep 2013 11:29:56 +0200 Subject: [PATCH 7/7] Fix #657, added getmininginfo to wrapper --- public/include/classes/bitcoinwrapper.class.php | 15 ++++++++++++--- 1 file changed, 12 insertions(+), 3 deletions(-) diff --git a/public/include/classes/bitcoinwrapper.class.php b/public/include/classes/bitcoinwrapper.class.php index 7b4372b4..0c343c8a 100644 --- a/public/include/classes/bitcoinwrapper.class.php +++ b/public/include/classes/bitcoinwrapper.class.php @@ -46,9 +46,18 @@ class BitcoinWrapper extends BitcoinClient { public function getnetworkhashps() { $this->oDebug->append("STA " . __METHOD__, 4); if ($data = $this->memcache->get(__FUNCTION__)) return $data; - try { $dNetworkHashrate = $this->query('getnetworkhashps') / 1000; } catch (Exception $e) { - // Maybe we are SHA - try { $dNetworkHashrate = $this->query('gethashespersec') / 1000; } catch (Exception $e) { return false; } + try { + $dNetworkHashrate = $this->query('getmininginfo'); + 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); }