ssl: http to https (#670 )

bech32 for litecoin (#667 )
Merge pull request #660 from lubuzzo/dev
2019-10-06 10:08:22 -04:00 · 2019-07-01 11:20:17 -04:00 · 2019-03-24 18:58:06 +01:00 · 2019-03-24 12:40:08 -03:00 · 2019-03-23 18:00:12 -03:00 · 2018-05-29 18:06:55 +03:00
14 changed files with 204 additions and 30 deletions
--- a/coins/00_example.json
+++ b/coins/00_example.json
@ -0,0 +1,25 @@
+{
+    "name": "Example",
+    "symbol": "EXM",
+    "algorithm": "x99",
+    "peerMagic": "0f0f0f0f",
+    "peerMagicTestnet": "f0f0f0f0",
+
+    "mainnet": {
+      "bech32": "ex",
+      "bip32": {
+        "public": "0f0f0f0f"
+      },
+      "pubKeyHash": "00",
+      "scriptHash": "ff"
+    },
+
+    "testnet": {
+      "bech32": "tex",
+      "bip32": {
+        "public": "f0f0f0f0"
+      },
+      "pubKeyHash": "0f",
+      "scriptHash": "f0"
+    }
+}
--- a/coins/chaincoin.json
+++ b/coins/chaincoin.json
@ -0,0 +1,25 @@
+{
+    "name": "Chaincoin",
+    "symbol": "CHC",
+    "algorithm": "c11",
+    "peerMagic": "a3d27a03",
+    "peerMagicTestnet": "fbc21102",
+
+    "mainnet": {
+      "bech32": "chc",
+      "bip32": {
+        "public": "0488b21e"
+      },
+      "pubKeyHash": "1c",
+      "scriptHash": "04"
+    },
+
+    "testnet": {
+      "bech32": "tchc",
+      "bip32": {
+        "public": "043587cf"
+      },
+      "pubKeyHash": "50",
+      "scriptHash": "2c"
+    }
+}
--- a/coins/fastcoin.json
+++ b/coins/fastcoin.json
@ -2,5 +2,5 @@
    "name": "Fastcoin",
    "symbol": "FST",
    "algorithm": "scrypt",
-    "peerMagic": "fdc2b5dc"
-}
+    "peerMagic": "fbc0b6db"
+}
--- a/coins/litecoin.json
+++ b/coins/litecoin.json
@ -1,7 +1,25 @@
 {
-    "name": "Litecoin",
-    "symbol": "LTC",
-    "algorithm": "scrypt",
-    "peerMagic": "fbc0b6db",
-    "peerMagicTestnet": "fdd2c8f1"
+  "name": "Litecoin",
+  "symbol": "LTC",
+  "algorithm": "scrypt",
+  "peerMagic": "fbc0b6db",
+  "peerMagicTestnet": "fdd2c8f1",
+  
+  "mainnet": {
+    "bech32": "ltc",
+    "bip32": {
+      "public": "0488B21E"
+    },
+    "pubKeyHash": "30",
+    "scriptHash": "05"
+  },
+  
+  "testnet": {
+    "bech32": "tltc",
+    "bip32": {
+      "public": "043587CF"
+    },
+    "pubKeyHash": "6F",
+    "scriptHash": "C4"
+  }
 }
--- a/config_example.json
+++ b/config_example.json
@ -40,7 +40,7 @@
            "hashrateWindow": 300
        },
        "adminCenter": {
-            "enabled": false,
+            "enabled": true,
            "password": "password"
        }
    },
--- a/init.js
+++ b/init.js
@ -82,6 +82,10 @@ if (cluster.isWorker){
        case 'profitSwitch':
            new ProfitSwitch(logger);
            break;
+        case 'switchingPaymentProcessor':
+            var SwitchingPaymentProcessor = require('./libs/switchingPaymentProcessor.js');
+            new SwitchingPaymentProcessor(logger);
+            break;
    }

    return;
@ -143,6 +147,17 @@ var buildPoolConfigs = function(){
        var coinProfile = JSON.parse(JSON.minify(fs.readFileSync(coinFilePath, {encoding: 'utf8'})));
        poolOptions.coin = coinProfile;
        poolOptions.coin.name = poolOptions.coin.name.toLowerCase();
+        if (coinProfile.mainnet) {
+            poolOptions.coin.mainnet.bip32.public = Buffer.from(coinProfile.mainnet.bip32.public, 'hex').readUInt32LE(0);
+            poolOptions.coin.mainnet.pubKeyHash = Buffer.from(coinProfile.mainnet.pubKeyHash, 'hex').readUInt8(0);
+            poolOptions.coin.mainnet.scriptHash = Buffer.from(coinProfile.mainnet.scriptHash, 'hex').readUInt8(0);
+        }
+        if (coinProfile.testnet) {
+            poolOptions.coin.testnet.bip32.public = Buffer.from(coinProfile.testnet.bip32.public, 'hex').readUInt32LE(0);
+            poolOptions.coin.testnet.pubKeyHash = Buffer.from(coinProfile.testnet.pubKeyHash, 'hex').readUInt8(0);
+            poolOptions.coin.testnet.scriptHash = Buffer.from(coinProfile.testnet.scriptHash, 'hex').readUInt8(0);
+        }
+

        if (poolOptions.coin.name in configs){

@ -356,7 +371,21 @@ var processCoinSwitchCommand = function(params, options, reply){

 };

+var startSwitchingPaymentProcessor = function(){
+    if (!fs.existsSync('libs/switchingPaymentProcessor.js')) return;

+    var worker = cluster.fork({
+        workerType: 'switchingPaymentProcessor',
+        pools: JSON.stringify(poolConfigs),
+        portalConfig: JSON.stringify(portalConfig)
+    });
+    worker.on('exit', function(code, signal){
+        logger.error('Master', 'Switching Payment Processor', 'Died, spawning replacement...');
+        setTimeout(function(){
+            startSwitchingPaymentProcessor();
+        }, 2000);
+    });
+};

 var startPaymentProcessor = function(){

@ -434,6 +463,8 @@ var startProfitSwitch = function(){

    startPaymentProcessor();

+    startSwitchingPaymentProcessor();
+
    startWebsite();

    startProfitSwitch();
--- a/libs/apiCoinWarz.js
+++ b/libs/apiCoinWarz.js
@ -8,7 +8,7 @@ module.exports = function() {

    // Constants
    var version         = '0.0.1',
-        PUBLIC_API_URL  = 'http://www.coinwarz.com/v1/api/profitability/?apikey=YOUR_API_KEY&algo=all',
+        PUBLIC_API_URL  = 'https://www.coinwarz.com/v1/api/profitability/?apikey=YOUR_API_KEY&algo=all',
        USER_AGENT      = 'nomp/node-open-mining-portal'

    // Constructor
--- a/libs/apiCryptsy.js
+++ b/libs/apiCryptsy.js
@ -8,7 +8,7 @@ module.exports = function() {

    // Constants
    var version         = '0.1.0',
-        PUBLIC_API_URL  = 'http://pubapi.cryptsy.com/api.php',
+        PUBLIC_API_URL  = 'https://pubapi.cryptsy.com/api.php',
        PRIVATE_API_URL = 'https://api.cryptsy.com/api',
        USER_AGENT      = 'nomp/node-open-mining-portal'

--- a/libs/mposCompatibility.js
+++ b/libs/mposCompatibility.js
@ -85,7 +85,7 @@ module.exports = function(logger, poolConfig){
            shareData.worker,
            isValidShare ? 'Y' : 'N',
            isValidBlock ? 'Y' : 'N',
-            shareData.difficulty * (poolConfig.coin.mposDiffMultiplier || 1),
+            shareData.shareDiff,
            typeof(shareData.error) === 'undefined' ? null : shareData.error,
            shareData.blockHash ? shareData.blockHash : (shareData.blockHashInvalid ? shareData.blockHashInvalid : '')
        ];
--- a/libs/paymentProcessor.js
+++ b/libs/paymentProcessor.js
@ -64,6 +64,7 @@ function SetupForPool(logger, poolOptions, setupFinished){

    async.parallel([
        function(callback){
+          if (poolOptions.address != false) {
            daemon.cmd('validateaddress', [poolOptions.address], function(result) {
                if (result.error){
                    logger.error(logSystem, logComponent, 'Error with payment processing daemon ' + JSON.stringify(result.error));
@ -90,6 +91,8 @@ function SetupForPool(logger, poolOptions, setupFinished){
                    callback()
                }
            }, true);
+          }
+          else callback();
        },
        function(callback){
            daemon.cmd('getbalance', [], function(result){
@ -529,12 +532,37 @@ function SetupForPool(logger, poolOptions, setupFinished){
        });
    };

+    function handleAddress(address) {
+      if (address.length === 40){
+          return util.addressFromEx(poolOptions.address, address);
+      }
+      else return address;
+    }

    var getProperAddress = function(address){
-        if (address.length === 40){
-            return util.addressFromEx(poolOptions.address, address);
-        }
-        else return address;
+      if (address != false) {
+        return handleAddress(address);
+      } else {
+        var addressToPay = '';
+
+        daemon.cmd('getnewaddress', [], function(result){
+            if (result.error){
+                callback(true);
+                return;
+            }
+            try {
+                addressToPay = result.data;
+            }
+            catch(e){
+                logger.error(logSystem, logComponent, 'Error getting a new address. Got: ' + result.data);
+                callback(true);
+            }
+
+        }, true, true);
+
+        return handleAddress(addressToPay);
+
+      }
    };


--- a/libs/poolWorker.js
+++ b/libs/poolWorker.js
@ -18,6 +18,33 @@ module.exports = function(logger){

    var proxySwitch = {};

+    var switchingDaemons = (function(){
+        var daemons = {};
+
+        for (var switchName in portalConfig.switching){
+            if (!portalConfig.switching[switchName].singleCoinPayout) continue;
+            var daemonConfig = portalConfig.switching[switchName].singleCoinPayout.daemon;
+            var daemon = new Stratum.daemon.interface([daemonConfig], function(severity, message){
+                logger[severity](logSystem, logComponent, message);
+            });
+            daemons[switchName] = daemon;
+        }
+
+        return daemons;
+    })();
+
+    var singleCoinPayoutPorts = (function(){
+        var ports = {};
+        for (var switchName in portalConfig.switching){
+            if (!portalConfig.switching[switchName].singleCoinPayout) continue;
+            for (var port in portalConfig.switching[switchName].ports){
+                ports[parseInt(port)] = switchName;
+            }
+        }
+        return ports;
+    })();
+
+
    var redisClient = redis.createClient(portalConfig.redis.port, portalConfig.redis.host);

    //Handle messages from master process sent via IPC
@ -128,10 +155,13 @@ module.exports = function(logger){
        //Functions required for internal payment processing
        else{

-            var shareProcessor = new ShareProcessor(logger, poolOptions);
+            var shareProcessor = new ShareProcessor(logger, portalConfig, poolOptions, singleCoinPayoutPorts);

            handlers.auth = function(port, workerName, password, authCallback){
-                if (poolOptions.validateWorkerUsername !== true)
+
+                var switchDaemon = switchingDaemons[singleCoinPayoutPorts[port]];
+
+                if (!switchDaemon && poolOptions.validateWorkerUsername !== true)
                    authCallback(true);
                else {
                    if (workerName.length === 40) {
@ -144,7 +174,9 @@ module.exports = function(logger){
                        }
                    }
                    else {
-                        pool.daemon.cmd('validateaddress', [workerName], function (results) {
+                        var daemon = switchDaemon || pool.daemon;
+
+                        daemon.cmd('validateaddress', [workerName], function (results) {
                            var isValid = results.filter(function (r) {
                                return r.response.isvalid
                            }).length > 0;
--- a/libs/shareProcessor.js
+++ b/libs/shareProcessor.js
@ -15,7 +15,7 @@ value: a hash with..



-module.exports = function(logger, poolConfig){
+module.exports = function(logger, portalConfig, poolConfig, singleCoinPayoutPorts){

    var redisConfig = poolConfig.redis;
    var coin = poolConfig.coin.name;
@ -68,10 +68,25 @@ module.exports = function(logger, poolConfig){

    this.handleShare = function(isValidShare, isValidBlock, shareData){

+
+        /*var shareKey = (function(){
+            var port = shareData.port.toString();
+            for (var switchName in portalConfig.switching){
+                if (!portalConfig.switching[switchName]['singleCoinPayout']) continue;
+                var ports = Object.keys(portalConfig.switching[switchName].ports);
+                if (ports.indexOf(port) !== -1) return switchName;
+            }
+            return coin;
+        })();*/
+
+        var shareKey = singleCoinPayoutPorts[shareData.port] || coin;
+
+        console.log('share key ' + shareKey);
+
        var redisCommands = [];

        if (isValidShare){
-            redisCommands.push(['hincrbyfloat', coin + ':shares:roundCurrent', shareData.worker, shareData.difficulty]);
+            redisCommands.push(['hincrbyfloat', shareKey + ':shares:roundCurrent', shareData.worker, shareData.difficulty]);
            redisCommands.push(['hincrby', coin + ':stats', 'validShares', 1]);
        }
        else{
--- a/package.json
+++ b/package.json
@ -12,9 +12,9 @@
        "litecoin",
        "scrypt"
    ],
-    "homepage": "https://github.com/ranchimall/node-open-mining-portal",
+    "homepage": "https://github.com/zone117x/node-open-mining-portal",
    "bugs": {
-        "url": "https://github.com/ranchimall/node-open-mining-portal/issues"
+        "url": "https://github.com/zone117x/node-open-mining-portal/issues"
    },
    "license": "GPL-2.0",
    "author": "Matthew Little",
@ -28,10 +28,10 @@
    },
    "repository": {
        "type": "git",
-        "url": "https://github.com/ranchimall/node-open-mining-portal.git"
+        "url": "https://github.com/zone117x/node-open-mining-portal.git"
    },
    "dependencies": {
-        "stratum-pool": "git://github.com/ranchimall/node-stratum-pool.git",
+        "stratum-pool": "git://github.com/zone117x/node-stratum-pool.git#dev",
        "dateformat": "1.0.12",
        "node-json-minify": "*",
        "redis": "0.12.1",
@ -42,10 +42,10 @@
        "compression": "*",
        "dot": "*",
        "colors": "*",
-        "node-watch": "0.5.9",
+        "node-watch": "*",
        "request": "2.69.0",
        "nonce": "*",
-        "bignum": "0.12.1",
+        "bignum": "0.13.0",
        "extend": "*"
    },
    "engines": {
--- a/website/index.html
+++ b/website/index.html
@ -6,7 +6,7 @@

    <link rel="icon" type="image/png" href="/static/favicon.png"/>

-    <link href='http://fonts.googleapis.com/css?family=Open+Sans' rel='stylesheet' type='text/css'>
+    <link href='https://fonts.googleapis.com/css?family=Open+Sans' rel='stylesheet' type='text/css'>

    <link rel="stylesheet" href="//cdnjs.cloudflare.com/ajax/libs/font-awesome/4.0.3/css/font-awesome.min.css">
    <link rel="stylesheet" href="//cdnjs.cloudflare.com/ajax/libs/normalize/3.0.1/normalize.min.css">
@ -76,7 +76,7 @@

    <div>
        This site is powered by the open source&nbsp;<a target="_blank" href="https://github.com/zone117x/node-open-mining-portal/">NOMP</a>&nbsp;
-        project created by Matthew Little and licensed under the&nbsp;<a href="http://www.gnu.org/licenses/gpl-2.0.html">GPL</a>
+        project created by Matthew Little and licensed under the&nbsp;<a href="https://www.gnu.org/licenses/gpl-2.0.html">GPL</a>
    </div>
    <div>
        <i class="fa fa-heart"></i>&nbsp; Support this project by donating&nbsp;<i class="fa fa-btc"></i>&nbsp;BTC: 1KRotMnQpxu3sePQnsVLRy3EraRFYfJQFR
@ -84,9 +84,9 @@
    <div id="communityFooter">
        Community&nbsp;<i class="fa fa-comment"></i>&nbsp;: &nbsp;<a target="_blank" href="https://kiwiirc.com/client/irc.freenode.net/nomp">#nomp IRC</a>
        &nbsp;&nbsp;|&nbsp;&nbsp;
-        <a target="_blank" href="http://reddit.com/r/nomp">/r/nomp</a>
+        <a target="_blank" href="https://reddit.com/r/nomp">/r/nomp</a>
        &nbsp;&nbsp;|&nbsp;&nbsp;
-        <iframe src="http://ghbtns.com/github-btn.html?user=zone117x&repo=node-open-mining-portal&type=watch&count=true" allowtransparency="true" frameborder="0" scrolling="0" width="140" height="20"></iframe>
+        <iframe src="https://ghbtns.com/github-btn.html?user=zone117x&repo=node-open-mining-portal&type=watch&count=true" allowtransparency="true" frameborder="0" scrolling="0" width="140" height="20"></iframe>
    </div>

 </footer>
Author	SHA1	Message	Date
cryptozeny	2f3a1bc63e	ssl: http to https (#670 )	2019-10-06 10:08:22 -04:00
cryptozeny	81216de5dd	bech32 for litecoin (#667 )	2019-07-01 11:20:17 -04:00
Michael Polzer	f185e971c4	Merge pull request #660 from lubuzzo/dev Allow pool owner to run the pool without explicitly declare the address	2019-03-24 18:58:06 +01:00
lubuzzo	d55efbd227	Allow pool owner to run the pool without explicitly declare the address - Setting the address to false, will generate a new address on startup and after every submission of block	2019-03-24 12:40:08 -03:00
lubuzzo	53432ba8fe	Updated package.json	2019-03-23 18:00:12 -03:00
Michael Polzer	4ebff37820	[deps] fix syntax for git:// branch select	2018-05-29 18:06:55 +03:00
Michael Polzer	2061e666c9	introduce poolOptions for legacy, p2sh and bech32 keys (#604 ) * [MPOS] pass share difficulty to MySQL ++ Additionally to the changes on master we are removing the MPOS difficulty multiplier here. MPOS has been updated (currently development branch) to handle low difficulties nicely. * add config for chaincoin * remove redundant * introduce poolOptions for p2sh and bech32 keys and add coin.json examples	2018-05-26 19:32:18 -07:00
Michael Polzer	0b238adccd	Add config for Chaincoin (#603 ) * [MPOS] pass share difficulty to MySQL ++ Additionally to the changes on master we are removing the MPOS difficulty multiplier here. MPOS has been updated (currently development branch) to handle low difficulties nicely. * add config for chaincoin	2018-05-25 12:58:01 -07:00
Michael Polzer	e41cb8d8f4	[MPOS] pass share difficulty to MySQL ++ (#602 ) Additionally to the changes on master we are removing the MPOS difficulty multiplier here. MPOS has been updated (currently development branch) to handle low difficulties nicely.	2018-05-24 18:31:17 -07:00
Matthew Little	67254f63ba	Update dev branch (#598 ) * modified for my repositry * Revert * add lf * Fixed bug in parsing balances for payment processing * Added fixminer.com pool * New pool Another one using NOMP * Update 21coin.json Added peerMagic needed for p2p block notifications * Update alphacoin.json Added peerMagic. Needed for p2p block notifications * Update benjamins.json Added peerMagic for p2p block notifications * Update mazacoin.json Added peerMagic for p2p block notifications * Update bottlecaps.json * Update bottlecaps.json * Create bunnycoin.json * Update bunnycoin.json * Update casinocoin.json * Create coino.json * Update coino.json * Create cryptogenicbullion.json * Update coino.json * Update bunnycoin.json * Update cryptogenicbullion.json * Create cryptographicanomaly.json * Update cryptographicanomaly.json * Update cryptographicanomaly.json * Fix switching port showing Fix reading of config file to show active switching ports * Update alphacoin.json * Update README.md fixed typo on line 529 node-statum-pool to node-stratum-pool * Update README.md * Valid json to Readme example coin conf * Minor readme change * Marked emark as POS type coin since auto detection fails * created infinitecoin.conf Adding infinitecoin.conf to the coin list. https://github.com/infinitecoin/infinitecoin/blob/master/src/main.cpp#L2524 * fixed capitolization Adjusted InfiniteCoin to Infinitecoin to match the naming practice of all the other coins. * update symbol for Coino * 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 * Add Viacoin support Support for Viacoin - viacoin.org * Add FlutterCoin to coins * Rename viacoin.conf to viacoin.json * 42 coin * Update poolWorker.js var created above is spelled as initalPool not initialPool. * http://poollo.com "service unavailable" * 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. * Added some log info and fixed a typo * Pinned some package versions - included async package Should fix https://github.com/zone117x/node-open-mining-portal/pull/479 * Update litecoin testnet magic Litecoin testnet has been reset `2fcf8079ef (diff-64cbe1ad5465e13bc59ee8bb6f3de2e7R207)` * fix orphan stat source * API does not set the proper header * Update api.js Fix : #554 * Update package.json Pin request npm package version * Update README.md * Update README.md * 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. * Update paymentProcessor.js * Final change * Added GLT Coin * add peer magic for DGB (#592)	2018-05-13 14:02:08 -07:00
Matthew Little	8a725c0438	Fix for file check	2014-05-29 15:59:19 -06:00
Matthew Little	f83f5b371b	Merge pull request #240 from zone117x/master Share merging features	2014-05-29 14:54:55 -06:00
Matthew Little	f84ee142c2	Share merging features	2014-05-29 14:46:37 -06:00