Add regexes: ethminer, T-Rex, lolMiner, PhoenixMiner; Edit ethash test: diff, blob;

Author: Spudz76

mm.js

@@ -55,6 +55,22 @@ const hashrate_regexes = [
   [1,       2, /Total\s+:\s+([\d\.]+) gps/],                                 // MoneroVMiner
   [1,       2, /([\d\.]+) G\/s/],                                            // gminer
   [1000000, 2, /([\d\.]+) MH\/s/],                                           // gminer
+  [1,       2, /ethminer .* ([\d\.]+) h - /],                                // ethminer (h/s)
+  [1e3,     2, /ethminer .* ([\d\.]+) Kh - /],                               // ethminer (kh/s)
+  [1e6,     2, /ethminer .* ([\d\.]+) Mh - /],                               // ethminer (mh/s)
+  [1e9,     2, /ethminer .* ([\d\.]+) Gh - /],                               // ethminer (gh/s)
+  [1,       2, /^GPU #\d+: .* - ([\d\.]+) H\/s/],                            // T-Rex (h/s)
+  [1e3,     2, /^GPU #\d+: .* - ([\d\.]+) KH\/s/],                           // T-Rex (kh/s)
+  [1e6,     2, /^GPU #\d+: .* - ([\d\.]+) MH\/s/],                           // T-Rex (mh/s)
+  [1e9,     2, /^GPU #\d+: .* - ([\d\.]+) GH\/s/],                           // T-Rex (gh/s)
+  [1,       2, /^Average speed \(30s\): ([\d\.]+) h\/s/],                    // lolMiner (h/s)
+  [1e3,     2, /^Average speed \(30s\): ([\d\.]+) kh\/s/],                   // lolMiner (kh/s)
+  [1e6,     2, /^Average speed \(30s\): ([\d\.]+) mh\/s/],                   // lolMiner (mh/s)
+  [1e9,     2, /^Average speed \(30s\): ([\d\.]+) gh\/s/],                   // lolMiner (gh/s)
+  [1,       2, /^Eth speed: ([\d\.]+) H\/s, shares: [\d]+/[\d]+/[\d]+, time: [\d]+:[\d]+$/],  // PhoenixMiner (h/s)
+  [1e3,     2, /^Eth speed: ([\d\.]+) KH\/s, shares: [\d]+/[\d]+/[\d]+, time: [\d]+:[\d]+$/], // PhoenixMiner (kh/s)
+  [1e6,     2, /^Eth speed: ([\d\.]+) MH\/s, shares: [\d]+/[\d]+/[\d]+, time: [\d]+:[\d]+$/], // PhoenixMiner (mh/s)
+  [1e9,     2, /^Eth speed: ([\d\.]+) GH\/s, shares: [\d]+/[\d]+/[\d]+, time: [\d]+:[\d]+$/], // PhoenixMiner (gh/s)
 ];
 
 function algo_hashrate_factor(algo) {
@@ -841,15 +857,15 @@ function do_miner_perf_runs(cb) {
               jsonrpc:  "2.0",
               method:   "mining.set_difficulty",
               params: [
-                1000000
+                10.24
               ],
             }) + "\n" + JSON.stringify({
               jsonrpc:  "2.0",
               method:   "mining.notify",
               params: [
                 "benchmark1", // job_id
-                "e79f0f63030bf691445c2b9d0266b24a9619e355194067f2ad2c73a8e0a26c65", // seed hash
-                "feb4243b885cd1af5337979f5d81849335cab197b4993e5c61ea4b43b43dbbc6", // hash
+                "ffaad0781cfec93fee66657ef8a9f132f422becba3626b5d936ad3cb1f8228d4", // seed hash
+                "a917c993b27e4a15c6ed3611bcaa7e5eee5c9b984053f6c1270032c0c4d6dc83", // hash
                 true,
               ]
             }) + "\n");