From a279fb486f19bfe97553ec9ab195ae47fae527db Mon Sep 17 00:00:00 2001 From: Matt Date: Wed, 23 Apr 2014 12:53:19 -0600 Subject: [PATCH] Probably fixed negative hashrate issue --- README.md | 1 + init.js | 4 ++-- libs/poolWorker.js | 4 ++-- libs/stats.js | 5 +++-- package.json | 2 +- 5 files changed, 9 insertions(+), 7 deletions(-) diff --git a/README.md b/README.md index acc53e2..0a94830 100644 --- a/README.md +++ b/README.md @@ -108,6 +108,7 @@ If your pool uses NOMP let us know and we will list your website here. * http://suchpool.pw * http://hashfaster.com * http://miningpoolhub.com +* http://teamdoge.com * http://kryptochaos.com * http://pool.uberpools.org diff --git a/init.js b/init.js index a7b15b6..6ff3e74 100644 --- a/init.js +++ b/init.js @@ -296,8 +296,8 @@ var startWebsite = function(portalConfig, poolConfigs){ var startProfitSwitch = function(portalConfig, poolConfigs){ - if (!portalConfig.profitSwitch.enabled){ - logger.error('Master', 'Profit', 'Profit auto switching disabled'); + if (!portalConfig.profitSwitch || !portalConfig.profitSwitch.enabled){ + //logger.error('Master', 'Profit', 'Profit auto switching disabled'); return; } diff --git a/libs/poolWorker.js b/libs/poolWorker.js index 982c710..b1a5d47 100644 --- a/libs/poolWorker.js +++ b/libs/poolWorker.js @@ -219,7 +219,7 @@ module.exports = function(logger){ redisClient.on('ready', function(){ redisClient.hgetall("proxyState", function(error, obj) { if (error || obj == null) { - logger.debug(logSystem, logComponent, logSubCat, 'No last proxy state found in redis'); + //logger.debug(logSystem, logComponent, logSubCat, 'No last proxy state found in redis'); } else { proxyState = obj; @@ -276,7 +276,7 @@ module.exports = function(logger){ }); } else { - logger.debug(logSystem, logComponent, logSubCat, 'Proxy pool for ' + algorithm + ' disabled.'); + //logger.debug(logSystem, logComponent, logSubCat, 'Proxy pool for ' + algorithm + ' disabled.'); } }); }); diff --git a/libs/stats.js b/libs/stats.js index ade763b..1f3c3d6 100644 --- a/libs/stats.js +++ b/libs/stats.js @@ -191,9 +191,10 @@ module.exports = function(logger, portalConfig, poolConfigs){ else coinStats.workers[worker] = workerShares; }); + var shareMultiplier = Math.pow(2, 32) / algos[coinStats.algorithm].multiplier; - var hashratePre = shareMultiplier * coinStats.shares / portalConfig.website.stats.hashrateWindow; - coinStats.hashrate = hashratePre | 0; + coinStats.hashrate = shareMultiplier * coinStats.shares / portalConfig.website.stats.hashrateWindow; + coinStats.workerCount = Object.keys(coinStats.workers).length; portalStats.global.workers += coinStats.workerCount; diff --git a/package.json b/package.json index dc3e7c1..133d279 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "node-open-mining-portal", - "version": "0.0.3", + "version": "0.0.4", "description": "An extremely efficient, highly scalable, all-in-one, easy to setup cryptocurrency mining pool", "keywords": [ "stratum",