Merge remote-tracking branch 'origin/master'

This commit is contained in:
Matt 2014-04-15 16:39:02 -06:00
commit 5db8c4997a
4 changed files with 10 additions and 7 deletions

View File

@ -272,6 +272,7 @@ Here is an example of the required fields:
"symbol": "ltc", "symbol": "ltc",
"algorithm": "scrypt", //or "sha256", "scrypt-jane", "scrypt-n", "quark", "x11" "algorithm": "scrypt", //or "sha256", "scrypt-jane", "scrypt-n", "quark", "x11"
"txMessages": false, //or true (not required, defaults to false) "txMessages": false, //or true (not required, defaults to false)
"mposDiffMultiplier": 256, //only for x11 coins in mpos mode, set to 256 (optional)
} }
```` ````

View File

@ -1,5 +1,6 @@
{ {
"name": "Darkcoin", "name": "Darkcoin",
"symbol": "DRK", "symbol": "DRK",
"algorithm": "x11" "algorithm": "x11",
} "mposDiffMultiplier": 256
}

View File

@ -1,5 +1,6 @@
{ {
"name": "Hirocoin", "name": "Hirocoin",
"symbol": "hic", "symbol": "hic",
"algorithm": "x11" "algorithm": "x11",
} "mposDiffMultiplier": 256
}

View File

@ -66,9 +66,9 @@ module.exports = function(logger, poolConfig){
var dbData = [ var dbData = [
shareData.ip, shareData.ip,
shareData.worker, shareData.worker,
isValidShare ? 'Y' : 'N', isValidShare ? 'Y' : 'N',
isValidBlock ? 'Y' : 'N', isValidBlock ? 'Y' : 'N',
shareData.difficulty, shareData.difficulty * (poolConfig.coin.mposDiffMultiplier || 1),
typeof(shareData.error) === 'undefined' ? null : shareData.error, typeof(shareData.error) === 'undefined' ? null : shareData.error,
shareData.blockHash ? shareData.blockHash : (shareData.blockHashInvalid ? shareData.blockHashInvalid : '') shareData.blockHash ? shareData.blockHash : (shareData.blockHashInvalid ? shareData.blockHashInvalid : '')
]; ];
@ -102,4 +102,4 @@ module.exports = function(logger, poolConfig){
}; };
}; };