github-jwinterm/nodejs-pool
1
0
Fork 0
mirror of https://github.com/jwinterm/nodejs-pool.git synced 2026-10-17 05:21:27 +02:00
Code Issues Packages Projects Releases Wiki Activity

Update to fix duplicate job ID's being sent from the pool. If a duped job ID is sent, this should throw an error.

Browse Source
This commit is contained in:
Alexander Blair
2017-12-13 08:24:27 -08:00
parent ce1f81c7cb
commit 6a083229b9
1 changed files with 20 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
lib/pool.js
+20 -5
View File
@@ -193,7 +193,7 @@ function newBlockTemplate(template) {
if (activeMiners.hasOwnProperty(minerId)) {
let miner = activeMiners[minerId];
debug(threadName + "Updating worker " + miner.payout + " With new work at height: " + template.height);
miner.messageSender('job', miner.getJob());
miner.sendNewJob();
}
}
}
@@ -350,6 +350,7 @@ function Miner(id, login, pass, ipAddress, startingDiff, messageSender, protoVer
}
this.validJobs = global.support.circularBuffer(4);
this.sentJobs = global.support.circularBuffer(8);
this.cachedJob = null;
@@ -426,7 +427,7 @@ function Miner(id, login, pass, ipAddress, startingDiff, messageSender, protoVer
Math.floor(this.hashes / (Math.floor((Date.now() - this.connectTime) / 1000))) + " hashes/second or: " +
Math.floor(this.hashes / (Math.floor((Date.now() - this.connectTime) / 1000))) * global.config.pool.targetTime + " difficulty versus: " + this.newDiff);
}
this.messageSender('job', this.getJob());
this.sendNewJob();
};
this.checkBan = function (validShare) {
@@ -532,6 +533,20 @@ function Miner(id, login, pass, ipAddress, startingDiff, messageSender, protoVer
}
return this.cachedJob;
};
this.sendNewJob = function() {
let job = this.getJob();
let tempJob = this.sentJobs.toarray().filter(function (intJob) {
return intJob.id === job.job_id;
})[0];
if (tempJob) {
console.error(`Tried sending a duped job to: ${this.address}, stopped by Snipa!`);
return;
}
this.sentJobs.enq(job);
return this.messageSender('job', job);
};
}
}
@@ -611,7 +626,7 @@ function processShare(miner, job, blockTemplate, params) {
miner.newDiff = miner.difficulty - 1;
miner.incremented = false;
}
miner.messageSender('job', miner.getJob());
miner.sendNewJob();
return false;
}
@@ -691,7 +706,7 @@ function handleMinerData(method, params, ip, portData, sendReply, pushMessage) {
return;
}
miner.heartbeat();
sendReply(null, miner.getJob());
miner.sendNewJob();
break;
case 'submit':
if (!miner) {
@@ -758,7 +773,7 @@ function handleMinerData(method, params, ip, portData, sendReply, pushMessage) {
miner.newDiff = miner.difficulty - 1;
miner.incremented = false;
}
miner.messageSender('job', miner.getJob());
miner.sendNewJob();
sendReply('Block expired');
global.database.storeInvalidShare(miner.invalidShareProto);
return;