RanchiMall/node-stratum-pool
3
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master'

Browse Source
This commit is contained in:
Matt 2014-04-30 20:42:32 -06:00
commit 64d832e1a2
1 changed files with 12 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
lib/varDiff.js
View File

@ -40,6 +40,10 @@ function RingBuffer(maxSize){
}; };
} }
// Truncate a number to a fixed amount of decimal places
function toFixed(num, len) {
return parseFloat(num.toFixed(len));
}
var varDiff = module.exports = function varDiff(port, varDiffOptions){ var varDiff = module.exports = function varDiff(port, varDiffOptions){
var _this = this; var _this = this;
@ -96,16 +100,19 @@ var varDiff = module.exports = function varDiff(port, varDiffOptions){
lastRtc = ts; lastRtc = ts;
var avg = timeBuffer.avg(); var avg = timeBuffer.avg();
var ddiff; var ddiff = options.targetTime / avg;
if (avg > tMax && client.difficulty > options.minDiff) { if (avg > tMax && client.difficulty > options.minDiff) {
ddiff = 0.5; if (options.x2mode) {
ddiff = 0.5;
}
if (ddiff * client.difficulty < options.minDiff) { if (ddiff * client.difficulty < options.minDiff) {
ddiff = options.minDiff / client.difficulty; ddiff = options.minDiff / client.difficulty;
} }
} else if (avg < tMin) { } else if (avg < tMin) {
ddiff = 2; if (options.x2mode) {
ddiff = 2;
}
//var diffMax = networkDifficulty < options.maxDiff ? networkDifficulty : options.maxDiff; //var diffMax = networkDifficulty < options.maxDiff ? networkDifficulty : options.maxDiff;
var diffMax = options.maxDiff; var diffMax = options.maxDiff;
if (ddiff * client.difficulty > diffMax) { if (ddiff * client.difficulty > diffMax) {
@ -116,7 +123,7 @@ var varDiff = module.exports = function varDiff(port, varDiffOptions){
return; return;
} }
var newDiff = client.difficulty * ddiff; var newDiff = toFixed(client.difficulty * ddiff, 8);
timeBuffer.clear(); timeBuffer.clear();
_this.emit('newDifficulty', client, newDiff); _this.emit('newDifficulty', client, newDiff);
}); });