Merged commits from other forks

.gitignore

@@ -1,2 +1,3 @@
 node_modules/
-.idea/
+.idea/
+.vscode/

README.md

@@ -45,6 +45,7 @@ Features
 * ✓ __Quark__ (Quarkcoin [QRK])
 * ✓ __X11__ (Darkcoin [DRK], Hirocoin, Limecoin)
 * ✓ __X13__ (MaruCoin, BoostCoin)
+* ✓ __NIST5__ (Talkcoin)
 * ✓ __Keccak__ (Maxcoin [MAX], HelixCoin, CryptoMeth, Galleon, 365coin, Slothcoin, BitcointalkCoin)
 * ✓ __Skein__ (Skeincoin [SKC])
 * ✓ __Groestl__ (Groestlcoin [GRS])
@@ -53,13 +54,13 @@ May be working (needs additional testing):
 * ? *Blake* (Blakecoin [BLC])
 * ? *Fugue* (Fuguecoin [FC])
 * ? *Qubit* (Qubitcoin [Q2C], Myriadcoin [MYR])
-* ? *Hefty1* (Heavycoin [HVC])
 * ? *SHAvite-3* (INKcoin [INK])
+* ? *Sha1* (Sha1coin [SHA], Yaycoin [YAY])
 
 Not working currently:
 * *Groestl* - for Myriadcoin
 * *Keccak* - for eCoin & Copperlark
-
+* *Hefty1* (Heavycoin [HVC])
 
 
 Requirements
@@ -83,7 +84,7 @@ npm update
 Create the configuration for your coin:
 
 Possible options for `algorithm`: *sha256, scrypt, scrypt-jane, scrypt-n, quark, x11, keccak, blake,
-skein, groestl, fugue, shavite3, hefty1, or qubit*.
+skein, groestl, fugue, shavite3, hefty1, qubit, or sha1*.
 
 ```javascript
 var myCoin = {
@@ -276,7 +277,7 @@ var pool = Stratum.createPool({
 
     }
 
-}, function(ip, workerName, password, callback){ //stratum authorization function
+}, function(ip, port , workerName, password, callback){ //stratum authorization function
     console.log("Authorize " + workerName + ":" + password + "@" + ip);
     callback({
         error: null,

lib/algoProperties.js

@@ -26,6 +26,19 @@ var algos = module.exports = global.algos = {
             }
         }
     },
+    'scrypt-og': {
+        //Aiden settings
+        //Uncomment diff if you want to use hardcoded truncated diff
+        //diff: '0000ffff00000000000000000000000000000000000000000000000000000000',
+        multiplier: Math.pow(2, 16),
+        hash: function(coinConfig){
+            var nValue = coinConfig.nValue || 64;
+            var rValue = coinConfig.rValue || 1;
+            return function(data){
+                return multiHashing.scrypt(data,nValue,rValue);
+            }
+        }
+    },
     'scrypt-jane': {
         multiplier: Math.pow(2, 16),
         hash: function(coinConfig){
@@ -60,6 +73,13 @@ var algos = module.exports = global.algos = {
             }
         }
     },
+    sha1: {
+        hash: function(){
+            return function(){
+                return multiHashing.sha1.apply(this, arguments);
+            }
+        }
+    },
     x11: {
         hash: function(){
             return function(){
@@ -74,6 +94,20 @@ var algos = module.exports = global.algos = {
             }
         }
     },
+    x15: {
+        hash: function(){
+            return function(){
+                return multiHashing.x15.apply(this, arguments);
+            }
+        }
+    },
+    nist5: {
+        hash: function(){
+            return function(){
+                return multiHashing.nist5.apply(this, arguments);
+            }
+        }
+    },
     quark: {
         hash: function(){
             return function(){

lib/blockTemplate.js

@@ -23,18 +23,21 @@ var BlockTemplate = module.exports = function BlockTemplate(jobId, rpcData, pool
 
     function getTransactionBuffers(txs){
         var txHashes = txs.map(function(tx){
+            if (tx.txid !== undefined) {
+                return util.uint256BufferFromHash(tx.txid);
+            }
             return util.uint256BufferFromHash(tx.hash);
         });
         return [null].concat(txHashes);
     }
 
     function getVoteData(){
-        if (!rpcData.masternode_payments) return new Buffer([]);
+        if (!rpcData.masternode_payments) return Buffer.from([]);
 
         return Buffer.concat(
             [util.varIntBuffer(rpcData.votes.length)].concat(
                 rpcData.votes.map(function (vt) {
-                    return new Buffer(vt, 'hex');
+                    return Buffer.from(vt, 'hex');
                 })
             )
         );
@@ -56,9 +59,9 @@ var BlockTemplate = module.exports = function BlockTemplate(jobId, rpcData, pool
 
 
 
-    this.prevHashReversed = util.reverseByteOrder(new Buffer(rpcData.previousblockhash, 'hex')).toString('hex');
+    this.prevHashReversed = util.reverseByteOrder(Buffer.from(rpcData.previousblockhash, 'hex')).toString('hex');
     this.transactionData = Buffer.concat(rpcData.transactions.map(function(tx){
-        return new Buffer(tx.data, 'hex');
+        return Buffer.from(tx.data, 'hex');
     }));
     this.merkleTree = new merkleTree(getTransactionBuffers(rpcData.transactions));
     this.merkleBranch = getMerkleHashes(this.merkleTree.steps);
@@ -84,7 +87,7 @@ var BlockTemplate = module.exports = function BlockTemplate(jobId, rpcData, pool
     //https://en.bitcoin.it/wiki/Protocol_specification#Block_Headers
     this.serializeHeader = function(merkleRoot, nTime, nonce){
 
-        var header =  new Buffer(80);
+        var header = Buffer.alloc(80);
         var position = 0;
         header.write(nonce, position, 4, 'hex');
         header.write(rpcData.bits, position += 4, 4, 'hex');
@@ -107,7 +110,7 @@ var BlockTemplate = module.exports = function BlockTemplate(jobId, rpcData, pool
             getVoteData(),
 
             //POS coins require a zero byte appended to block which the daemon replaces with the signature
-            new Buffer(reward === 'POS' ? [0] : [])
+            Buffer.from(reward === 'POS' ? [0] : [])
         ]);
     };
 
@@ -136,4 +139,4 @@ var BlockTemplate = module.exports = function BlockTemplate(jobId, rpcData, pool
         }
         return this.jobParams;
     };
-};
+};

lib/jobManager.js

@@ -58,7 +58,7 @@ var JobManager = module.exports = function JobManager(options){
     //public members
 
     this.extraNonceCounter = new ExtraNonceCounter(options.instanceId);
-    this.extraNoncePlaceholder = new Buffer('f000000ff111111f', 'hex');
+    this.extraNoncePlaceholder = Buffer.from('f000000ff111111f', 'hex');
     this.extraNonce2Size = this.extraNoncePlaceholder.length - this.extraNonceCounter.size;
 
     this.currentJob;
@@ -90,13 +90,20 @@ 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) {
                         return util.reverseBuffer(hashDigest.apply(this, arguments));
                     };
                 }
             case 'scrypt-n':
+            case 'sha1':
                 return function (d) {
                     return util.reverseBuffer(util.sha256d(d));
                 };
@@ -176,6 +183,18 @@ var JobManager = module.exports = function JobManager(options){
             });
             return {error: error, result: null};
         };
+        /*console.log("processShare - Stuff passed in", {
+            "jobId": jobId, 
+            "previousDifficulty": previousDifficulty, 
+            "difficulty": difficulty, 
+            "extraNonce1": extraNonce1, 
+            "extraNonce2": extraNonce2, 
+            "nTime": nTime, 
+            "nonce": nonce, 
+            "ipAddress": ipAddress, 
+            "port": port, 
+            "workerName": workerName
+        });*/
 
         var submitTime = Date.now() / 1000 | 0;
 
@@ -205,9 +224,8 @@ var JobManager = module.exports = function JobManager(options){
             return shareError([22, 'duplicate share']);
         }
 
-
-        var extraNonce1Buffer = new Buffer(extraNonce1, 'hex');
-        var extraNonce2Buffer = new Buffer(extraNonce2, 'hex');
+        var extraNonce1Buffer = Buffer.from(extraNonce1, 'hex');
+        var extraNonce2Buffer = Buffer.from(extraNonce2, 'hex');
 
         var coinbaseBuffer = job.serializeCoinbase(extraNonce1Buffer, extraNonce2Buffer);
         var coinbaseHash = coinbaseHasher(coinbaseBuffer);
@@ -226,10 +244,31 @@ var JobManager = module.exports = function JobManager(options){
 
         var blockDiffAdjusted = job.difficulty * shareMultiplier;
 
+        /*console.log("processShare - Stuff calculated", {
+            "extraNonce1Buffer": extraNonce1Buffer,
+            "extraNonce2Buffer": extraNonce2Buffer,
+            "coinbaseBuffer": coinbaseBuffer,
+            "coinbaseHash": coinbaseHash,
+            "merkleRoot": merkleRoot,
+            "headerBuffer": headerBuffer,
+            "headerHash": headerHash,
+            "headerBigNum": headerBigNum,
+            "shareDiff": shareDiff,
+            "blockDiffAdjusted": blockDiffAdjusted
+        });*/
+
+        /*console.log("processShare - Globals", {
+            "job.target": job.target
+        });*/
+
         //Check if share is a block candidate (matched network difficulty)
         if (job.target.ge(headerBigNum)){
             blockHex = job.serializeBlock(headerBuffer, coinbaseBuffer).toString('hex');
             blockHash = blockHasher(headerBuffer, nTime).toString('hex');
+            /*console.log("processShare - Block Candidate", {
+                "blockHex": blockHex,
+                "blockHash": blockHash
+            });*/
         }
         else {
             if (options.emitInvalidBlockHashes)

lib/peer.js

@@ -9,7 +9,7 @@ var util = require('./util.js');
 
 
 var fixedLenStringBuffer = function(s, len) {
-    var buff = new Buffer(len);
+    var buff = Buffer.alloc(len);
     buff.fill(0);
     buff.write(s);
     return buff;
@@ -26,7 +26,7 @@ var commandStringBuffer = function (s) {
    - callback returns 1) data buffer and 2) lopped/over-read data */
 var readFlowingBytes = function (stream, amount, preRead, callback) {
 
-    var buff = preRead ? preRead : new Buffer([]);
+    var buff = preRead ? preRead : Buffer.from([]);
 
     var readData = function (data) {
         buff = Buffer.concat([buff, data]);
@@ -39,14 +39,14 @@ var readFlowingBytes = function (stream, amount, preRead, callback) {
             stream.once('data', readData);
     };
 
-    readData(new Buffer([]));
+    readData(Buffer.from([]));
 };
 
 var Peer = module.exports = function (options) {
 
     var _this = this;
     var client;
-    var magic = new Buffer(options.testnet ? options.coin.peerMagicTestnet : options.coin.peerMagic, 'hex');
+    var magic = Buffer.from(options.testnet ? options.coin.peerMagicTestnet : options.coin.peerMagic, 'hex');
     var magicInt = magic.readUInt32LE(0);
     var verack = false;
     var validConnectionConfig = true;
@@ -58,14 +58,14 @@ var Peer = module.exports = function (options) {
         block: 2
     };
 
-    var networkServices = new Buffer('0100000000000000', 'hex'); //NODE_NETWORK services (value 1 packed as uint64)
-    var emptyNetAddress = new Buffer('010000000000000000000000000000000000ffff000000000000', 'hex');
+    var networkServices = Buffer.from('0100000000000000', 'hex'); //NODE_NETWORK services (value 1 packed as uint64)
+    var emptyNetAddress = Buffer.from('010000000000000000000000000000000000ffff000000000000', 'hex');
     var userAgent = util.varStringBuffer('/node-stratum/');
-    var blockStartHeight = new Buffer('00000000', 'hex'); //block start_height, can be empty
+    var blockStartHeight = Buffer.from('00000000', 'hex'); //block start_height, can be empty
 
     //If protocol version is new enough, add do not relay transactions flag byte, outlined in BIP37
     //https://github.com/bitcoin/bips/blob/master/bip-0037.mediawiki#extensions-to-existing-messages
-    var relayTransactions = options.p2p.disableTransactions === true ? new Buffer([false]) : new Buffer([]);
+    var relayTransactions = options.p2p.disableTransactions === true ? Buffer.from([false]) : Buffer.from([]);
 
     var commands = {
         version: commandStringBuffer('version'),
@@ -127,7 +127,7 @@ var Peer = module.exports = function (options) {
                     if (header.readUInt32LE(0) === magicInt) {
                         beginReadingMessage(header);
                     } else {
-                        beginReadingMessage(new Buffer([]));
+                        beginReadingMessage(Buffer.from([]));
                     }
                     return;
                 }

lib/pool.js

@@ -119,7 +119,7 @@ var pool = module.exports = function pool(options, authorizeFn){
     function OnBlockchainSynced(syncedCallback){
 
         var checkSynced = function(displayNotSynced){
-            _this.daemon.cmd('getblocktemplate', [], function(results){
+            _this.daemon.cmd('getblocktemplate', [{"capabilities": [ "coinbasetxn", "workid", "coinbase/append" ], "rules": [ "segwit" ]}], function(results){
                 var synced = results.every(function(r){
                     return !r.error || r.error.code !== -10;
                 });
@@ -231,7 +231,7 @@ var pool = module.exports = function pool(options, authorizeFn){
         }
         else{
             rpcCommand = 'getblocktemplate';
-            rpcArgs = [{'mode': 'submit', 'data': blockHex}];
+            rpcArgs = [{'mode': 'submit', 'data': blockHex}]; // TODO: is mode submit even correct?
         }
 
 
@@ -398,10 +398,12 @@ var pool = module.exports = function pool(options, authorizeFn){
                 return;
             }
 
-            if (isNaN(rpcResults.getdifficulty) && 'proof-of-stake' in rpcResults.getdifficulty)
-                options.coin.reward = 'POS';
-            else
-                options.coin.reward = 'POW';
+            if (!options.coin.reward) {
+                if (isNaN(rpcResults.getdifficulty) && 'proof-of-stake' in rpcResults.getdifficulty)
+                    options.coin.reward = 'POS';
+                else
+                    options.coin.reward = 'POW';
+            }
 
 
             /* POS coins must use the pubkey in coinbase transaction, and pubkey is
@@ -564,9 +566,10 @@ var pool = module.exports = function pool(options, authorizeFn){
 
     function GetBlockTemplate(callback){
         _this.daemon.cmd('getblocktemplate',
-            [{"capabilities": [ "coinbasetxn", "workid", "coinbase/append" ]}],
+            [{"capabilities": [ "coinbasetxn", "workid", "coinbase/append" ], "rules": [ "segwit" ]}],
             function(result){
                 if (result.error){
+                    console.log("GetBlockTemplate()", result);
                     emitErrorLog('getblocktemplate call failed for daemon instance ' +
                         result.instance.index + ' with error ' + JSON.stringify(result.error));
                     callback(result.error);
@@ -625,6 +628,7 @@ var pool = module.exports = function pool(options, authorizeFn){
         Object.keys(origStratumClients).forEach(function (subId) {
             stratumClients.push({subId: subId, client: origStratumClients[subId]});
         });
+        //TODO: Think of a way to use API 8's async/await and promises to replace async lib
         async.filter(
             stratumClients,
             filterFn,
@@ -644,7 +648,8 @@ var pool = module.exports = function pool(options, authorizeFn){
                     );    
                 });
             }
-        )
+        );
+
     };