Merge remote-tracking branch 'origin/master'

README.md

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

coins/darkcoin.json

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

coins/hirocoin.json

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

libs/mposCompatibility.js

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