Merge pull request #172 from lubuzzo/dev

Generate a new address after submit a block

README.md

@@ -50,8 +50,6 @@ Features
 * ✓ __Quark__ (Quarkcoin [QRK])
 * ✓ __X11__ (Darkcoin [DRK], Hirocoin, Limecoin)
 * ✓ __X13__ (MaruCoin, BoostCoin)
-* ✓ __X16R__ (PexaCoin, RavenCoin)
-* ✓ __X16RV2__ (PexaCoin, RavenCoin)
 * ✓ __NIST5__ (Talkcoin)
 * ✓ __Keccak__ (Maxcoin [MAX], HelixCoin, CryptoMeth, Galleon, 365coin, Slothcoin, BitcointalkCoin)
 * ✓ __Skein__ (Skeincoin [SKC])

lib/algoProperties.js

@@ -73,7 +73,6 @@ var algos = module.exports = global.algos = {
             }
         }
     },
-
     sha1: {
         hash: function(){
             return function(){
@@ -109,22 +108,6 @@ var algos = module.exports = global.algos = {
             }
         }
     },
-    x16r: {
-        multiplier: Math.pow(2, 8),
-        hash: function(){
-            return function(){
-                return multiHashing.x16r.apply(this, arguments);
-            }
-        }
-    },
-    x16rv2: {
-        multiplier: Math.pow(2, 8),
-        hash: function(){
-            return function(){
-                return multiHashing.x16rv2.apply(this, arguments);
-            }
-        }
-    },
     nist5: {
         hash: function(){
             return function(){
@@ -162,14 +145,6 @@ var algos = module.exports = global.algos = {
             }
         }
     },
-    neoscrypt: {
-        multiplier: Math.pow(2, 5),
-        hash: function(){
-            return function(){
-                return multiHashing.neoscrypt.apply(this, arguments);
-            }
-        }
-    },
     skein: {
         hash: function(){
             return function(){

lib/blockTemplate.js

@@ -9,7 +9,7 @@ var util = require('./util.js');
  * The BlockTemplate class holds a single job.
  * and provides several methods to validate and submit it to the daemon coin
 **/
-var BlockTemplate = module.exports = function BlockTemplate(jobId, rpcData, poolAddressScript, extraNoncePlaceholder, reward, txMessages, recipients){
+var BlockTemplate = module.exports = function BlockTemplate(jobId, rpcData, poolAddressScript, extraNoncePlaceholder, reward, txMessages, recipients, network){
 
     //private members
 
@@ -71,7 +71,8 @@ var BlockTemplate = module.exports = function BlockTemplate(jobId, rpcData, pool
         extraNoncePlaceholder,
         reward,
         txMessages,
-        recipients
+        recipients,
+        network
     );
 
     this.serializeCoinbase = function(extraNonce1, extraNonce2){

lib/daemon.js

@@ -37,7 +37,7 @@ function DaemonInterface(daemons, logger){
     }
 
     function isOnline(callback){
-        cmd('getpeerinfo', [], function(results){
+        cmd('getnetworkinfo', [], function(results){
             var allOnline = results.every(function(result){
                 return !results.error;
             });

lib/jobManager.js

@@ -69,6 +69,7 @@ var JobManager = module.exports = function JobManager(options){
     var coinbaseHasher = (function(){
         switch(options.coin.algorithm){
             case 'keccak':
+            case 'blake':
             case 'fugue':
             case 'groestl':
                 if (options.coin.normalHashing === true)
@@ -89,6 +90,12 @@ var JobManager = module.exports = function JobManager(options){
                         return util.reverseBuffer(hashDigest.apply(this, arguments));
                     };
                 }
+            case 'scrypt-og':
+                if (options.coin.reward === 'POS') {
+                    return function (d) {
+                        return util.reverseBuffer(hashDigest.apply(this, arguments));
+                    };
+                }
             case 'scrypt-jane':
                 if (options.coin.reward === 'POS') {
                     return function (d) {
@@ -96,6 +103,7 @@ var JobManager = module.exports = function JobManager(options){
                     };
                 }
             case 'scrypt-n':
+            case 'sha1':
                 return function (d) {
                     return util.reverseBuffer(util.sha256d(d));
                 };
@@ -115,7 +123,8 @@ var JobManager = module.exports = function JobManager(options){
             _this.extraNoncePlaceholder,
             options.coin.reward,
             options.coin.txMessages,
-            options.recipients
+            options.recipients,
+            options.network
         );
 
         _this.currentJob = tmpBlockTemplate;
@@ -150,7 +159,8 @@ var JobManager = module.exports = function JobManager(options){
             _this.extraNoncePlaceholder,
             options.coin.reward,
             options.coin.txMessages,
-            options.recipients
+            options.recipients,
+            options.network
         );
 
         this.currentJob = tmpBlockTemplate;
@@ -228,13 +238,8 @@ var JobManager = module.exports = function JobManager(options){
         //Check if share is a block candidate (matched network difficulty)
         if (job.target.ge(headerBigNum)){
             blockHex = job.serializeBlock(headerBuffer, coinbaseBuffer).toString('hex');
-            if (options.coin.algorithm === 'blake' || options.coin.algorithm === 'neoscrypt') {                
-                blockHash = util.reverseBuffer(util.sha256d(headerBuffer, nTime)).toString('hex');
-            }
-            else {
             blockHash = blockHasher(headerBuffer, nTime).toString('hex');
         }
-        }
         else {
             if (options.emitInvalidBlockHashes)
                 blockHashInvalid = util.reverseBuffer(util.sha256d(headerBuffer)).toString('hex');

lib/peer.js

@@ -188,9 +188,6 @@ var Peer = module.exports = function (options) {
                     _this.emit('connected');
                 }
                 break;
-            case commands.version.toString():
-                SendMessage(commands.verack, Buffer.alloc(0));
-                break;
             default:
                 break;
         }

lib/pool.js

@@ -20,6 +20,9 @@ var pool = module.exports = function pool(options, authorizeFn){
     var _this = this;
     var blockPollingIntervalId;
 
+    if (!(options.address)) {
+      _this.newAddressOnNewBlock = true;
+    }
 
     var emitLog        = function(text) { _this.emit('log', 'debug'  , text); };
     var emitWarningLog = function(text) { _this.emit('log', 'warning', text); };
@@ -146,8 +149,7 @@ var pool = module.exports = function pool(options, authorizeFn){
 
         var generateProgress = function(){
 
-            var cmd = options.coin.hasGetInfo ? 'getinfo' : 'getblockchaininfo';
+            _this.daemon.cmd('getblockchaininfo', [], function(results) {
-            _this.daemon.cmd(cmd, [], function(results) {
                 var blockCount = results.sort(function (a, b) {
                     return b.response.blocks - a.response.blocks;
                 })[0].response.blocks;
@@ -224,7 +226,6 @@ var pool = module.exports = function pool(options, authorizeFn){
     Coin daemons either use submitblock or getblocktemplate for submitting new blocks
      */
     function SubmitBlock(blockHex, callback){
-
         var rpcCommand, rpcArgs;
         if (options.hasSubmitMethod){
             rpcCommand = 'submitblock';
@@ -235,6 +236,16 @@ var pool = module.exports = function pool(options, authorizeFn){
             rpcArgs = [{'mode': 'submit', 'data': blockHex}];
         }
 
+        if (_this.newAddressOnNewBlock) {
+          _this.daemon.cmd('getnewaddress', [], function(results) {
+
+            options.poolAddressScript = (function(){
+                  return util.addressToScript(options.network, results[0].response);
+            })();
+
+            options.address = results[0].response;
+          });
+        }
 
         _this.daemon.cmd(rpcCommand,
             rpcArgs,
@@ -274,7 +285,7 @@ var pool = module.exports = function pool(options, authorizeFn){
                 if (r.length === 40)
                     rObj.script = util.miningKeyToScript(r);
                 else
-                    rObj.script = util.addressToScript(r);
+                    rObj.script = util.addressToScript(options.network, r);
                 recipients.push(rObj);
                 options.feePercent += percent;
             }
@@ -351,6 +362,12 @@ var pool = module.exports = function pool(options, authorizeFn){
         });
 
         _this.daemon.once('online', function(){
+          if (options.address == false) {
+            _this.daemon.cmd('getnewaddress', [], function(results) {
+              options.address = results[0].response;
+              finishedCallback();
+            })
+          }
           finishedCallback();
 
         }).on('connectionFailed', function(error){
@@ -370,15 +387,12 @@ var pool = module.exports = function pool(options, authorizeFn){
         var batchRpcCalls = [
             ['validateaddress', [options.address]],
             ['getdifficulty', []],
+            ['getblockchaininfo', []],
+            ['getnetworkinfo', []],
             ['getmininginfo', []],
             ['submitblock', []]
         ];
 
-        if (options.coin.hasGetInfo) {
-            batchRpcCalls.push(['getinfo', []]);
-        } else {
-            batchRpcCalls.push(['getblockchaininfo', []], ['getnetworkinfo', []]);
-        }
         _this.daemon.batchCmd(batchRpcCalls, function(error, results){
             if (error || !results){
                 emitErrorLog('Could not start pool, error with init batch RPC call: ' + JSON.stringify(error));
@@ -418,27 +432,24 @@ var pool = module.exports = function pool(options, authorizeFn){
                 return;
             }
 
+            options.testnet = (rpcResults.getblockchaininfo.chain === 'test') ? true : false;
+
+            options.network = (options.testnet ? options.coin.testnet : options.coin.mainnet);
+
             options.poolAddressScript = (function(){
                 switch(options.coin.reward){
                     case 'POS':
                         return util.pubkeyToScript(rpcResults.validateaddress.pubkey);
                     case 'POW':
-                        return util.addressToScript(rpcResults.validateaddress.address);
+                        return util.addressToScript(options.network, rpcResults.validateaddress.address);
                 }
             })();
 
-            options.testnet = options.coin.hasGetInfo ? rpcResults.getinfo.testnet : (rpcResults.getblockchaininfo.chain === 'test') ? true : false;
+            options.protocolVersion = rpcResults.getnetworkinfo.protocolversion;
-
-            options.protocolVersion = options.coin.hasGetInfo ? rpcResults.getinfo.protocolversion : rpcResults.getnetworkinfo.protocolversion;
-
-            var difficulty = options.coin.hasGetInfo ? rpcResults.getinfo.difficulty : rpcResults.getblockchaininfo.difficulty;
-            if (typeof(difficulty) == 'object') {
-                difficulty = difficulty['proof-of-work'];
-            }
 
             options.initStats = {
-                connections: (options.coin.hasGetInfo ? rpcResults.getinfo.connections : rpcResults.getnetworkinfo.connections),
+                connections: rpcResults.getnetworkinfo.connections,
-                difficulty: difficulty * algos[options.coin.algorithm].multiplier,
+                difficulty: rpcResults.getblockchaininfo.difficulty * algos[options.coin.algorithm].multiplier,
                 networkHashRate: rpcResults.getmininginfo.networkhashps
             };
 

lib/transactions.js

@@ -123,7 +123,7 @@ For some (probably outdated and incorrect) documentation about whats kinda going
 see: https://en.bitcoin.it/wiki/Protocol_specification#tx
  */
 
-var generateOutputTransactions = function(poolRecipient, recipients, rpcData){
+var generateOutputTransactions = function(poolRecipient, recipients, rpcData, network){
 
     var reward = rpcData.coinbasevalue;
     var rewardToPool = reward;
@@ -141,7 +141,7 @@ if (rpcData.masternode && rpcData.superblock) {
             reward -= payeeReward;
             rewardToPool -= payeeReward;
 
-        var payeeScript = util.addressToScript(rpcData.masternode.payee);
+            var payeeScript = util.addressToScript(network, rpcData.masternode.payee);
             txOutputBuffers.push(Buffer.concat([
                 util.packInt64LE(payeeReward),
                 util.varIntBuffer(payeeScript.length),
@@ -155,7 +155,7 @@ if (rpcData.masternode && rpcData.superblock) {
                 reward -= payeeReward;
                 rewardToPool -= payeeReward;
 
-            var payeeScript = util.addressToScript(rpcData.superblock[i].payee);
+                var payeeScript = util.addressToScript(network, rpcData.superblock[i].payee);
                 txOutputBuffers.push(Buffer.concat([
                     util.packInt64LE(payeeReward),
                     util.varIntBuffer(payeeScript.length),
@@ -177,7 +177,7 @@ if (rpcData.payee) {
         reward -= payeeReward;
         rewardToPool -= payeeReward;
 
-        var payeeScript = util.addressToScript(rpcData.payee);
+        var payeeScript = util.addressToScript(network, rpcData.payee);
         txOutputBuffers.push(Buffer.concat([
             util.packInt64LE(payeeReward),
             util.varIntBuffer(payeeScript.length),
@@ -222,7 +222,7 @@ if (rpcData.payee) {
 };
 
 
-exports.CreateGeneration = function(rpcData, publicKey, extraNoncePlaceholder, reward, txMessages, recipients){
+exports.CreateGeneration = function(rpcData, publicKey, extraNoncePlaceholder, reward, txMessages, recipients, network){
 
     var txInputsCount = 1;
     var txOutputsCount = 1;
@@ -245,7 +245,7 @@ exports.CreateGeneration = function(rpcData, publicKey, extraNoncePlaceholder, r
 
     var scriptSigPart1 = Buffer.concat([
         util.serializeNumber(rpcData.height),
-        new Buffer([]),
+        new Buffer(rpcData.coinbaseaux.flags, 'hex'),
         util.serializeNumber(Date.now() / 1000 | 0),
         new Buffer([extraNoncePlaceholder.length])
     ]);
@@ -272,7 +272,7 @@ exports.CreateGeneration = function(rpcData, publicKey, extraNoncePlaceholder, r
      */
 
 
-    var outputTransactions = generateOutputTransactions(publicKey, recipients, rpcData);
+    var outputTransactions = generateOutputTransactions(publicKey, recipients, rpcData, network);
 
     var p2 = Buffer.concat([
         scriptSigPart2,

lib/util.js

@@ -2,6 +2,7 @@ var crypto = require('crypto');
 
 var base58 = require('base58-native');
 var bignum = require('bignum');
+var bitcoin = require('bitcoinjs-lib');
 
 
 exports.addressFromEx = function(exAddress, ripdm160Key){
@@ -261,26 +262,16 @@ exports.miningKeyToScript = function(key){
 /*
 For POW coins - used to format wallet address for use in generation transaction's output
  */
-exports.addressToScript = function(addr){
+exports.addressToScript = function(network, addr){
 
-    var decoded = base58.decode(addr);
+    if (typeof network !== 'undefined' && network !== null){
-
+        return bitcoin.address.toOutputScript(addr, network);
-    if (decoded.length != 25){
+    } else {
-        console.error('invalid address length for ' + addr);
+        return Buffer.concat([new Buffer([0x76, 0xa9, 0x14]), bitcoin.address.fromBase58Check(addr).hash, new Buffer([0x88, 0xac])]);
-        throw new Error();
     }
 
-    if (!decoded){
-        console.error('base58 decode failed for ' + addr);
-        throw new Error();
-    }
-
-    var pubkey = decoded.slice(1,-4);
-
-    return Buffer.concat([new Buffer([0x76, 0xa9, 0x14]), pubkey, new Buffer([0x88, 0xac])]);
 };
 
-
 exports.getReadableHashRateString = function(hashrate){
     var i = -1;
     var byteUnits = [ ' KH', ' MH', ' GH', ' TH', ' PH' ];

package.json

@@ -12,9 +12,9 @@
         "litecoin",
         "scrypt"
     ],
-    "homepage": "https://github.com/ranchimall/node-stratum-pool",
+    "homepage": "https://github.com/zone117x/node-stratum-pool",
     "bugs": {
-        "url": "https://github.com/ranchimall/node-stratum-pool/issues"
+        "url": "https://github.com/zone117x/node-stratum-pool/issues"
     },
     "license": "GPL-2.0",
     "author": "Matthew Little",
@@ -25,11 +25,12 @@
     "main": "lib/index.js",
     "repository": {
         "type": "git",
-        "url": "https://github.com/ranchimall/node-stratum-pool.git"
+        "url": "https://github.com/zone117x/node-stratum-pool.git"
     },
     "dependencies": {
         "multi-hashing": "git://github.com/zone117x/node-multi-hashing.git",
-        "bignum": "0.12.1",
+        "bitcoinjs-lib": "*",
+        "bignum": "*",
         "base58-native": "*",
         "async": "*"
     },