Compare commits

...

87 Commits
dev ... master

Author SHA1 Message Date
Sai Raj
1f892d8275
changing bignum version to 0.12.1 2021-06-03 16:52:04 +05:30
fastcoin-project
8a673b6d7c
fix peer magic for Fastcoin (#687) 2021-02-03 12:49:07 +01:00
Marcos Ramos
fe0b9ecafb
Bug fixing (#683)
Fixing Issue #630
2020-11-18 19:17:04 +01:00
Enzo Gladiadis
18b29033a8 New version of watch is not working properly (#652) 2019-01-07 17:38:42 -05:00
Michael Polzer
3d9eb88ad4
Merge pull request #561 from iliaselmatani/patch-2
Update config_example.json
2018-09-10 09:54:21 +02:00
Michael Polzer
4b4e18e564 Revert "[MPOS] pass share difficulty to MySQL (#601)" (#605)
This reverts commit 2afb47a8c9.
2018-05-26 19:31:29 -07:00
Michael Polzer
2afb47a8c9 [MPOS] pass share difficulty to MySQL (#601)
Miners should be paid by actual shares, this requires the share diff to be known to the payment processor. Worker diff isn't correct here.
2018-05-24 18:31:11 -07:00
Michael Polzer
a1229102ee add peer magic for DGB (#592) 2018-05-08 13:21:33 -07:00
globaltoken
46e5cca125 Added GLT Coin 2018-04-16 10:10:49 -07:00
globaltoken
9cc31a3cd3 Final change 2018-04-16 10:10:49 -07:00
globaltoken
ace7e61f45 Update paymentProcessor.js 2018-04-16 10:10:49 -07:00
globaltoken
a418dcd868 Updated to new Core 0.16 Format (getaddressinfo)
Since the new Wallet release of Bitcoin Core, they introduced a new Validation format for addresses.
Validateaddress is not longer working.
2018-04-16 10:10:49 -07:00
Matthew Little
aa44f3d410
Update README.md 2018-03-23 22:59:03 -07:00
Matthew Little
a2d3654c1b
Update README.md 2018-03-23 11:15:51 -07:00
IeM
a7c4d6d26e
Update config_example.json
Because of the default static password we should disable the admin center to protect installations with the default configuration.
2018-02-06 17:05:50 +01:00
Matthew Little
a20c6350a2
Update package.json
Pin request npm package version
2018-02-05 10:40:29 -07:00
IeM
0ea18d0d66 Update api.js
Fix : #554
2018-01-31 13:04:46 -07:00
wutno
d130958050 API does not set the proper header 2018-01-30 18:49:38 -07:00
unknown
de0b5eb1cd fix orphan stat source 2018-01-29 13:19:49 -07:00
shaolinfry
34375e1f8e Update litecoin testnet magic
Litecoin testnet has been reset

2fcf8079ef (diff-64cbe1ad5465e13bc59ee8bb6f3de2e7R207)
2017-02-13 13:35:24 -07:00
Matthew Little
6d8781de5e Pinned some package versions - included async package
Should fix https://github.com/zone117x/node-open-mining-portal/pull/479
2017-01-23 08:28:47 -07:00
Matthew Little
2d991e4b9d Merge pull request #452 from heldertb/master
Added some log info and fixed a typo
2016-02-22 09:24:29 -07:00
Helder De Baere
9e2006489e Added some log info and fixed a typo 2016-02-22 14:53:21 +01:00
Matthew Little
94ef015a94 Merge pull request #441 from nomp/master
removing dead pools and links to Live Chains  (no longer in business)
2016-02-20 16:46:16 -07:00
nomp
7740d7dc97 Removed the links to dead pools
* http://poollo.com
* http://fixminer.com
* http://pool.trademybit.com/ (all wallets disabled)
* http://www.omargpools.ca/pools.html (dead link)
* http://mining.theminingpools.com (now called "ad depo", no sign of a mining pool).
* http://minr.es (dead link)
* http://onebtcplace.com (link leads nowhere)
* http://uberpools.org (Apache Test Page)
* http://miningwith.us (domain for sale)
* http://teamdoge.com (blank page)
* http://rapidhash.net (domain for sale)
* http://chunkypools.com

Left these three. Are they still nomp?
* http://miningpoolhub.com (Donations to this project are going directly to TheSerapher, the original author of this project. (https://github.com/MPOS/php-mpos) ###
* http://hashfaster.com (MPOS, sign up) ###
* http://suchpool.pw ###

* Removed " LiveChains UK offers full hosting, setup and management of NOMP pools with several different configurations. [...] LiveChains UK however does offer this feature as part of there own customised NOMP called LivePool." Paid Solution." from 'Paid  Solution'. The  company no longer exists and the links lead to a generic type of forum about software.
2015-09-10 15:05:44 +02:00
nomp
f2497dec67 http://poollo.com "service unavailable" 2015-09-10 13:08:39 +02:00
Matthew Little
47a3a79041 Merge pull request #353 from slax0r/master
Add FlutterCoin to coins
2015-07-12 11:05:10 -06:00
Matthew Little
cfddff320b Merge pull request #373 from btcdrak/patch-1
Rename viacoin.conf to viacoin.json
2015-07-12 11:05:00 -06:00
Matthew Little
f7ea01ca63 Merge pull request #395 from Caberhagen/master
42 coin
2015-07-12 11:04:18 -06:00
Matthew Little
6fd667defb Merge pull request #399 from jkoornneef/patch-1
Fix var spelling in poolWorker.js to fix 'undefined' exception
2015-07-12 11:03:49 -06:00
jkoornneef
3036375362 Update poolWorker.js
var created above is spelled as initalPool not initialPool.
2014-10-14 23:02:31 -04:00
Caberhagen
bceb492ada 42 coin 2014-10-11 11:43:43 +02:00
฿tcDrak
26e9640d52 Rename viacoin.conf to viacoin.json 2014-08-25 23:06:06 +01:00
slax0r
4848abda96 Add FlutterCoin to coins 2014-08-11 12:31:48 -04:00
Matthew Little
3a8e470caa Merge pull request #319 from SoreGums/master
update symbol for Coino
2014-08-04 13:21:12 -06:00
Matthew Little
77da8a5693 Merge pull request #312 from ddfault/patch-1
created infinitecoin.conf
2014-08-04 13:21:00 -06:00
Matthew Little
b955c0cc51 Merge pull request #333 from kaosdynamics/patch-1
Wrong hashrate calculation
2014-08-04 13:20:48 -06:00
Matthew Little
baa1d1bf36 Merge pull request #349 from btcdrak/patch-1
Add Viacoin support
2014-08-04 13:19:17 -06:00
฿tcDrak
7c917d82e7 Add Viacoin support
Support for Viacoin - viacoin.org
2014-08-04 09:26:12 +01:00
Kaos Dynamics
c2ca8e4a80 Wrong hashrate calculation
Hashes are not bytes:
> 1 byte = 8 bits
> 1 kilobyte = 1024 bytes

Hashes are the units, and so therefore - as `k`,  `m` only mean *10^3 and *10^6
> 1 hash = 1 hash
> 1 kh     = 1000 hashes
2014-07-16 21:36:27 +01:00
Nicholas Orr
3ecfef0ff4 update symbol for Coino 2014-07-06 00:38:59 +08:00
Capcom
3a8508d68d fixed capitolization
Adjusted InfiniteCoin to Infinitecoin to match the naming practice of all the other coins.
2014-06-29 21:14:41 -05:00
Capcom
490fe51845 created infinitecoin.conf
Adding infinitecoin.conf to the coin list.
https://github.com/infinitecoin/infinitecoin/blob/master/src/main.cpp#L2524
2014-06-29 21:08:21 -05:00
Matthew Little
eadc0fadf1 Marked emark as POS type coin since auto detection fails 2014-06-21 09:20:38 -06:00
Matthew Little
8dbdf7a920 Minor readme change 2014-06-19 12:53:37 -06:00
Matthew Little
1da82420df Merge pull request #296 from lhartikk/master
Valid json to Readme example coin conf
2014-06-19 12:20:52 -06:00
Lauri Hartikka
aa5fc5e28f Valid json to Readme example coin conf 2014-06-19 00:35:46 +03:00
Matthew Little
10e621ca92 Update README.md 2014-06-18 10:53:31 -06:00
Matthew Little
69e821432e Merge pull request #288 from jonnycsolo/master
Update README.md
2014-06-16 11:13:54 -06:00
Jonathan Solomon
69870510d8 Update README.md
fixed typo on line 529 node-statum-pool to node-stratum-pool
2014-06-11 22:34:02 -05:00
Matthew Little
6353e7822a Merge pull request #284 from crackfoo/patch-4
Update alphacoin.json
2014-06-11 11:40:18 -06:00
crackfoo
9b00f2a3cf Update alphacoin.json 2014-06-11 00:59:56 -03:00
Matthew Little
9e6af5adfd Merge pull request #277 from nahy/master
Fix switching port showing
2014-06-09 12:04:23 -06:00
Matthew Little
44528b4518 Merge pull request #260 from crackfoo/patch-1
Update 21coin.json
2014-06-09 12:03:20 -06:00
Matthew Little
138785c2e9 Merge pull request #261 from crackfoo/patch-2
Update alphacoin.json
2014-06-09 12:03:11 -06:00
Matthew Little
27893e227f Merge pull request #262 from crackfoo/patch-3
Update benjamins.json
2014-06-09 12:02:54 -06:00
Matthew Little
bed02e0d4a Merge pull request #263 from crackfoo/master
Update mazacoin.json
2014-06-09 12:02:35 -06:00
nahy
45bddd4804 Fix switching port showing
Fix reading of config file to show active switching ports
2014-06-08 15:01:27 +04:00
crackfoo
a620c635cb Update cryptographicanomaly.json 2014-06-03 16:11:43 -03:00
crackfoo
8828fd222c Update cryptographicanomaly.json 2014-06-03 16:10:25 -03:00
crackfoo
0d2becfe81 Create cryptographicanomaly.json 2014-06-03 16:09:28 -03:00
crackfoo
c9b601d698 Update cryptogenicbullion.json 2014-06-03 16:03:14 -03:00
crackfoo
7cec749db4 Update bunnycoin.json 2014-06-03 16:00:21 -03:00
crackfoo
4c771dd537 Update coino.json 2014-06-03 15:59:40 -03:00
crackfoo
a7bc8e551b Create cryptogenicbullion.json 2014-06-03 15:59:01 -03:00
crackfoo
b576bc5600 Update coino.json 2014-06-03 15:42:04 -03:00
crackfoo
0b559ed4b4 Create coino.json 2014-06-03 15:31:38 -03:00
crackfoo
34d185a8ec Update casinocoin.json 2014-06-03 15:27:46 -03:00
crackfoo
78882305b7 Update bunnycoin.json 2014-06-03 14:45:18 -03:00
crackfoo
f51bb4dc13 Create bunnycoin.json 2014-06-03 14:44:02 -03:00
crackfoo
c7a84fcabd Update bottlecaps.json 2014-06-03 14:40:20 -03:00
crackfoo
c9ab1e8325 Update bottlecaps.json 2014-06-03 14:40:10 -03:00
crackfoo
cc3887fd21 Update mazacoin.json
Added peerMagic for p2p block notifications
2014-06-03 13:50:59 -03:00
crackfoo
00b769814d Update benjamins.json
Added peerMagic for p2p block notifications
2014-06-03 13:39:52 -03:00
crackfoo
509828b30e Update alphacoin.json
Added peerMagic. Needed for p2p block notifications
2014-06-03 13:26:03 -03:00
crackfoo
bea3bd8d20 Update 21coin.json
Added peerMagic needed for p2p block notifications
2014-06-03 13:24:18 -03:00
Matthew Little
d2b6e89c4d Merge pull request #248 from KaTXi/master
New pool
2014-05-31 10:55:54 -06:00
Alejandro Reyero
e3dc331508 New pool
Another one using NOMP
2014-05-30 23:59:34 +02:00
Alejandro Reyero
6acd346ed8 Merge pull request #1 from zone117x/master
update from original
2014-05-30 23:57:57 +02:00
Matthew Little
494e2a13cc Merge pull request #190 from qazzxc/master
Support kumacoin,monacoin etc.
2014-05-30 09:33:44 -06:00
Matthew Little
31fa601539 Merge pull request #244 from DanielDestino/master
Added fixminer.com pool
2014-05-30 09:22:18 -06:00
Daniel Storjordet
952a5cb196 Added fixminer.com pool 2014-05-30 12:23:11 +02:00
Matthew Little
6fbedae7b6 Merge branch 'master' of https://github.com/zone117x/node-open-mining-portal 2014-05-29 16:57:01 -06:00
Matthew Little
f999ebff18 Fixed bug in parsing balances for payment processing 2014-05-29 16:56:36 -06:00
qazzac
7abfb5151b add lf 2014-05-12 10:18:34 +09:00
qazzac
f49728c461 Revert 2014-05-12 10:15:39 +09:00
qazzac
621e13b17f modified for my repositry 2014-05-10 17:23:15 +09:00
32 changed files with 174 additions and 59 deletions

View File

@ -1,3 +1,8 @@
## This repo is looking for maintainers! Please reach out if interested.
--------
# NOMP ![NOMP Logo](http://zone117x.github.io/node-open-mining-portal/logo.svg "NOMP Logo")
#### Node Open Mining Portal
@ -8,6 +13,12 @@ responsive user-friendly front-end website featuring mining instructions, in-dep
#### Production Usage Notice
This is beta software. All of the following are things that can change and break an existing NOMP setup: functionality of any feature, structure of configuration files and structure of redis data. If you use this software in production then *DO NOT* pull new code straight into production usage because it can and often will break your setup and require you to tweak things like config files or redis data.
#### Paid Solution
Usage of this software requires abilities with sysadmin, database admin, coin daemons, and sometimes a bit of programming. Running a production pool can literally be more work than a full-time job.
**Coin switching & auto-exchanging for payouts in BTC/LTC** to miners is a feature that very likely will not be included in this project.
#### Table of Contents
* [Features](#features)
@ -104,21 +115,13 @@ didn't follow the instructions in this README. Please __read the usage instructi
If your pool uses NOMP let us know and we will list your website here.
##### Some pools using NOMP or node-stratum-module:
* http://chunkypools.com
* http://clevermining.com
* http://rapidhash.net
* http://suchpool.pw
* http://hashfaster.com
* http://miningpoolhub.com
* http://teamdoge.com
* http://miningwith.us
* http://kryptochaos.com
* http://uberpools.org
* http://onebtcplace.com
* http://minr.es
* http://mining.theminingpools.com
* http://www.omargpools.ca/pools.html
* http://pool.trademybit.com/
* http://miningpools.tk
* http://umine.co.uk
Usage
=====
@ -348,7 +351,7 @@ Here is an example of the required fields:
source code as the pchMessageStart variable.
For example, litecoin mainnet magic: http://git.io/Bi8YFw
And for litecoin testnet magic: http://git.io/NXBYJA */
"peerMagic": "fbc0b6db" //optional
"peerMagic": "fbc0b6db", //optional
"peerMagicTestnet": "fcc1b7dc" //optional
//"txMessages": false, //options - defaults to false
@ -524,7 +527,7 @@ output from NOMP.
#### Upgrading NOMP
When updating NOMP to the latest code its important to not only `git pull` the latest from this repo, but to also update
the `node-statum-pool` and `node-multi-hashing` modules, and any config files that may have been changed.
the `node-stratum-pool` and `node-multi-hashing` modules, and any config files that may have been changed.
* Inside your NOMP directory (where the init.js script is) do `git pull` to get the latest NOMP code.
* Remove the dependenices by deleting the `node_modules` directory with `rm -r node_modules`.
* Run `npm update` to force updating/reinstalling of the dependencies.

View File

@ -1,5 +1,7 @@
{
"name": "21coin",
"symbol": "21",
"algorithm": "sha256"
"algorithm": "sha256", ·····································
"peerMagic": "21212121", ·····································
"peerMagicTestnet": "01fefe05"
}

5
coins/42.json Normal file
View File

@ -0,0 +1,5 @@
{
"name": "42",
"symbol": "42",
"algorithm": "scrypt"
}

View File

@ -1,5 +1,7 @@
{
"name": "Alphacoin",
"symbol": "ALF",
"algorithm": "scrypt"
}
"algorithm": "scrypt",
"peerMagic": "fbc0b6db",
"peerMagicTestnet": "fcc1b7dc"
}

View File

@ -1,5 +1,7 @@
{
"name": "Benjamins",
"symbol": "BEN",
"algorithm": "sha256"
"algorithm": "sha256",
"peerMagic": "de698778", ·····································
"peerMagicTestnet": "0b110907"
}

View File

@ -1,5 +1,7 @@
{
"name": "Bottlecaps",
"symbol": "CAP",
"algorithm": "scrypt"
}
"algorithm": "scrypt",
"peerMagic": "e4e8e9e5",
"peerMagicTestnet": "cdf2c0ef"
}

7
coins/bunnycoin.json Normal file
View File

@ -0,0 +1,7 @@
{
"name": "BunnyCoin",
"symbol": "BUN",
"algorithm": "scrypt",
"peerMagic": "c0c0c0c0",
"peerMagicTestnet": "fcc1b7dc"
}

View File

@ -1,5 +1,7 @@
{
"name": "Casinocoin",
"symbol": "CSC",
"algorithm": "scrypt"
}
"algorithm": "scrypt",
"peerMagic": "fac3b6da",
"peerMagicTestnet": "fcc1b7dc"
}

7
coins/coino.json Normal file
View File

@ -0,0 +1,7 @@
{
"name": "Coino",
"symbol": "COINO",
"algorithm": "scrypt",
"peerMagic": "f1d1a7d8",
"peerMagicTestnet": "fcc1b7dc"
}

View File

@ -0,0 +1,7 @@
{
"name": "CryptogenicBullion",
"symbol": "CGB",
"algorithm": "scrypt",
"peerMagic": "e4e8e9e5",
"peerMagicTestnet": "cdf2c0ef"
}

View File

@ -0,0 +1,7 @@
{
"name": "CryptographicAnomaly",
"symbol": "CGA",
"algorithm": "scrypt",
"peerMagic": "fbc0b6db",
"peerMagicTestnet": "fcc1b7dc"
}

View File

@ -1,5 +1,7 @@
{
"name": "Digibyte",
"symbol": "DGB",
"algorithm": "scrypt"
"algorithm": "scrypt",
"peerMagic": "fac3b6da",
"peerMagicTestnet": "fdc8bddd"
}

View File

@ -1,5 +1,6 @@
{
"name": "eMark",
"symbol": "DEM",
"algorithm": "sha256"
"algorithm": "sha256",
"reward": "POS"
}

View File

@ -2,5 +2,5 @@
"name": "Fastcoin",
"symbol": "FST",
"algorithm": "scrypt",
"peerMagic": "fbc0b6db"
}
"peerMagic": "fdc2b5dc"
}

5
coins/fluttercoin.json Normal file
View File

@ -0,0 +1,5 @@
{
"name": "FlutterCoin",
"symbol": "FLT",
"algorithm": "scrypt"
}

7
coins/globaltoken.json Normal file
View File

@ -0,0 +1,7 @@
{
"name": "GlobalToken",
"symbol": "GLT",
"algorithm": "sha256",
"peerMagic": "c708d32d",
"peerMagicTestnet": "3a6f375b"
}

7
coins/infinitecoin.conf Normal file
View File

@ -0,0 +1,7 @@
{
"name": "Infinitecoin",
"symbol": "IFC",
"algorithm": "scrypt",
"peerMagic": "fbc0b6db",
"peerMagicTestnet": "fcc1b7dc"
}

6
coins/kumacoin.json Normal file
View File

@ -0,0 +1,6 @@
{
"name": "Kumacoin",
"symbol": "KUMA",
"algorithm": "quark",
"mposDiffMultiplier": 256
}

View File

@ -3,5 +3,5 @@
"symbol": "LTC",
"algorithm": "scrypt",
"peerMagic": "fbc0b6db",
"peerMagicTestnet": "fcc1b7dc"
}
"peerMagicTestnet": "fdd2c8f1"
}

View File

@ -1,5 +1,7 @@
{
"name": "Mazacoin",
"symbol": "MZC",
"algorithm": "sha256"
"algorithm": "sha256",
"peerMagic": "f8b503df", ·····································
"peerMagicTestnet": "05fea901"
}

5
coins/monacoin.json Normal file
View File

@ -0,0 +1,5 @@
{
"name": "Monacoin",
"symbol": "MONA",
"algorithm": "scrypt"
}

5
coins/sayacoin.json Normal file
View File

@ -0,0 +1,5 @@
{
"name": "Sayacoin",
"symbol": "SYC",
"algorithm": "sha256"
}

5
coins/sha1coin.json Normal file
View File

@ -0,0 +1,5 @@
{
"name": "Sha1coin",
"symbol": "SHA",
"algorithm": "sha1coin"
}

7
coins/viacoin.json Normal file
View File

@ -0,0 +1,7 @@
{
"name": "Viacoin",
"symbol": "VIA",
"algorithm": "scrypt",
"peerMagic": "0f68c6cb",
"peerMagicTestnet": "a9c5ef92"
}

View File

@ -40,7 +40,7 @@
"hashrateWindow": 300
},
"adminCenter": {
"enabled": true,
"enabled": false,
"password": "password"
}
},

View File

@ -15,9 +15,11 @@ module.exports = function(logger, portalConfig, poolConfigs){
this.handleApiRequest = function(req, res, next){
switch(req.params.method){
case 'stats':
res.writeHead(200, { 'Content-Type': 'application/json' });
res.end(portalStats.statsString);
return;
case 'pool_stats':
res.writeHead(200, { 'Content-Type': 'application/json' });
res.end(JSON.stringify(portalStats.statPoolHistory));
return;
case 'live_stats':
@ -51,4 +53,4 @@ module.exports = function(logger, portalConfig, poolConfigs){
}
};
};
};

View File

@ -70,10 +70,21 @@ function SetupForPool(logger, poolOptions, setupFinished){
callback(true);
}
else if (!result.response || !result.response.ismine) {
logger.error(logSystem, logComponent,
'Daemon does not own pool address - payment processing can not be done with this daemon, '
+ JSON.stringify(result.response));
callback(true);
daemon.cmd('getaddressinfo', [poolOptions.address], function(result) {
if (result.error){
logger.error(logSystem, logComponent, 'Error with payment processing daemon, getaddressinfo failed ... ' + JSON.stringify(result.error));
callback(true);
}
else if (!result.response || !result.response.ismine) {
logger.error(logSystem, logComponent,
'Daemon does not own pool address - payment processing can not be done with this daemon, '
+ JSON.stringify(result.response));
callback(true);
}
else{
callback()
}
}, true);
}
else{
callback()
@ -169,7 +180,7 @@ function SetupForPool(logger, poolOptions, setupFinished){
var workers = {};
for (var w in results[0]){
workers[w] = {balance: coinsToSatoshies(parseInt(results[0][w]))};
workers[w] = {balance: coinsToSatoshies(parseFloat(results[0][w]))};
}
var rounds = results[1].map(function(r){

View File

@ -184,12 +184,16 @@ module.exports = function(logger){
logger.debug(logSystem, logComponent, logSubCat, 'We thought a block was found but it was rejected by the daemon, share data: ' + shareData);
else if (isValidBlock)
logger.debug(logSystem, logComponent, logSubCat, 'Block found: ' + data.blockHash);
logger.debug(logSystem, logComponent, logSubCat, 'Block found: ' + data.blockHash + ' by ' + data.worker);
if (isValidShare)
if (isValidShare) {
if(data.shareDiff > 1000000000)
logger.debug(logSystem, logComponent, logSubCat, 'Share was found with diff higher than 1.000.000.000!');
else if(data.shareDiff > 1000000)
logger.debug(logSystem, logComponent, logSubCat, 'Share was found with diff higher than 1.000.000!');
logger.debug(logSystem, logComponent, logSubCat, 'Share accepted at diff ' + data.difficulty + '/' + data.shareDiff + ' by ' + data.worker + ' [' + data.ip + ']' );
else if (!isValidShare)
} else if (!isValidShare)
logger.debug(logSystem, logComponent, logSubCat, 'Share rejected: ' + shareData);
handlers.share(isValidShare, isValidBlock, data)
@ -273,7 +277,7 @@ module.exports = function(logger){
if (pools[currentPool])
pools[currentPool].getStratumServer().handleNewClient(socket);
else
pools[initialPool].getStratumServer().handleNewClient(socket);
pools[initalPool].getStratumServer().handleNewClient(socket);
}).listen(parseInt(port), function() {
logger.debug(logSystem, logComponent, logSubCat, 'Switching "' + switchName

View File

@ -36,7 +36,7 @@ module.exports = function(logger, poolConfig){
logger.error(logSystem, logComponent, logSubCat, 'Redis client had an error: ' + JSON.stringify(err))
});
connection.on('end', function(){
logger.error(logSystem, logComponent, logSubCat, 'Connection to redis database as been ended');
logger.error(logSystem, logComponent, logSubCat, 'Connection to redis database has been ended');
});
connection.info(function(error, response){

View File

@ -114,7 +114,7 @@ module.exports = function(logger, portalConfig, poolConfigs){
['hgetall', ':stats'],
['scard', ':blocksPending'],
['scard', ':blocksConfirmed'],
['scard', ':blocksOrphaned']
['scard', ':blocksKicked']
];
var commandsPerCoin = redisCommandTemplates.length;
@ -274,9 +274,9 @@ module.exports = function(logger, portalConfig, poolConfigs){
var i = -1;
var byteUnits = [ ' KH', ' MH', ' GH', ' TH', ' PH' ];
do {
hashrate = hashrate / 1024;
hashrate = hashrate / 1000;
i++;
} while (hashrate > 1024);
} while (hashrate > 1000);
return hashrate.toFixed(2) + byteUnits[i];
};

View File

@ -12,9 +12,9 @@
"litecoin",
"scrypt"
],
"homepage": "https://github.com/zone117x/node-open-mining-portal",
"homepage": "https://github.com/ranchimall/node-open-mining-portal",
"bugs": {
"url": "https://github.com/zone117x/node-open-mining-portal/issues"
"url": "https://github.com/ranchimall/node-open-mining-portal/issues"
},
"license": "GPL-2.0",
"author": "Matthew Little",
@ -28,24 +28,24 @@
},
"repository": {
"type": "git",
"url": "https://github.com/zone117x/node-open-mining-portal.git"
"url": "https://github.com/ranchimall/node-open-mining-portal.git"
},
"dependencies": {
"stratum-pool": "git://github.com/zone117x/node-stratum-pool.git",
"dateformat": "*",
"stratum-pool": "git://github.com/ranchimall/node-stratum-pool.git",
"dateformat": "1.0.12",
"node-json-minify": "*",
"redis": "*",
"redis": "0.12.1",
"mysql": "*",
"async": "*",
"async": "1.5.2",
"express": "*",
"body-parser": "*",
"compression": "*",
"dot": "*",
"colors": "*",
"node-watch": "*",
"request": "*",
"node-watch": "0.5.9",
"request": "2.69.0",
"nonce": "*",
"bignum": "*",
"bignum": "0.12.1",
"extend": "*"
},
"engines": {

View File

@ -185,9 +185,9 @@
<div id="menu">
{{? (function(){
if (!it.portalConfig.proxy) return false;
for (var p in it.portalConfig.proxy){
if (it.portalConfig.proxy[p].enabled)
if (!it.portalConfig.switching) return false;
for (var p in it.portalConfig.switching){
if (it.portalConfig.switching[p].enabled)
return true;
}
return false;
@ -197,14 +197,14 @@
{{?}}
<div class="menuList">
{{ for (var p in it.portalConfig.proxy){
if (!it.portalConfig.proxy[p].enabled) continue;
{{ for (var p in it.portalConfig.switching){
if (!it.portalConfig.switching[p].enabled) continue;
var info = {
algo: p,
ports: {},
host: it.portalConfig.website.stratumHost
};
info.ports[it.portalConfig.proxy[p].port] = {diff: it.portalConfig.proxy[p].diff};
info.ports[it.portalConfig.switching[p].port] = {diff: it.portalConfig.switching[p].diff};
info = JSON.stringify(info).replace(/"/g, '&quot;');
}}
<a href="#" class="poolOption" data-info="{{=info}}">{{=p}}</a>
@ -315,4 +315,4 @@
alert('NOMP App development still in progress...');
return false;
});
</script>
</script>