From 04ddb472eed27b98941c36a8ec9f4109e215f60b Mon Sep 17 00:00:00 2001 From: Andrea Baccega Date: Thu, 20 Feb 2014 00:09:15 +0100 Subject: [PATCH] Fixed nTime check. We were comparing the nTime(hex) with an int. So string comparison were going on! --- lib/jobManager.js | 8 ++++---- scripts/blockNotify.js | 0 2 files changed, 4 insertions(+), 4 deletions(-) mode change 100644 => 100755 scripts/blockNotify.js diff --git a/lib/jobManager.js b/lib/jobManager.js index 26ad9d7..6b07b75 100644 --- a/lib/jobManager.js +++ b/lib/jobManager.js @@ -17,10 +17,10 @@ var blockTemplate = require('./blockTemplate.js'); var ExtraNonceCounter = function(){ var instanceId = 31; var counter = instanceId << 27; - var size = util.packUInt32BE(counter).length; + var size = util.packUInt32BE(Math.abs(counter)).length; this.next = function(){ - var extraNonce = util.packUInt32BE(counter++); + var extraNonce = util.packUInt32BE(Math.abs(counter++)); return extraNonce.toString('hex'); }; this.size = function(){ @@ -152,7 +152,7 @@ var JobManager = module.exports = function JobManager(options){ }; this.processShare = function(jobId, difficulty, extraNonce1, extraNonce2, nTime, nonce, ipAddress, workerName){ - + console.log(difficulty); var shareError = function(error){ _this.emit('share', { job: jobId, @@ -181,7 +181,7 @@ var JobManager = module.exports = function JobManager(options){ } var nTimeInt = parseInt(nTime, 16); - if (nTimeInt < job.rpcData.curtime || nTime > submitTime + 7200) { + if (nTimeInt < job.rpcData.curtime || nTimeInt > submitTime + 7200) { return shareError([20, 'ntime out of range']); } diff --git a/scripts/blockNotify.js b/scripts/blockNotify.js old mode 100644 new mode 100755