cn/4 support

README.md

@@ -16,7 +16,7 @@ Options:
         --port=<number>:                defines port that will be used for miner connections (3333 by default)
         --user=<wallet> (-u):           <wallet> to use as pool user login (will be taken from the first miner otherwise)
         --pass=<miner_id>:              <miner_id> to use as pool pass login (will be taken from the first miner otherwise)
-        --perf_<algo_class>=<hashrate>  Sets hashrate for perf <algo_class> that is: cn/2, cn, cn/half, cn/gpu, cn/wow, cn-pico, cn-lite, cn-heavy
+        --perf_<algo_class>=<hashrate>  Sets hashrate for perf <algo_class> that is: cn/2, cn/4, cn, cn/half, cn/gpu, cn/wow, cn-pico, cn-lite, cn-heavy
         --algo_min_time=<seconds>       Sets <seconds> minimum time pool should keep our miner on one algo (0 default, set higher for starting miners)
         --miner=<command_line> (-m):    <command_line> to start smart miner that can report algo itself
         --<algo>=<command_line>:        <command_line> to start miner for <algo> that can not report it itself
@@ -42,16 +42,17 @@ Check https://github.com/xmrig/xmrig-proxy/blob/master/doc/STRATUM_EXT.md#14-alg
    "gulf.moneroocean.stream:10001"
  ],
  "algos": {
+   "cn/4": "./xmrig --config=config.json",
+   "cn/0": "./xmrig --config=config.json",
    "cn/1": "./xmrig --config=config.json",
    "cn/2": "./xmrig --config=config.json",
-   "cn/0": "./xmrig --config=config.json",
    "cn/xtl": "./xmrig --config=config.json",
    "cn/msr": "./xmrig --config=config.json",
    "cn/xao": "./xmrig --config=config.json",
    "cn/rto": "./xmrig --config=config.json",
    "cn/half": "./xmrig --config=config.json",
+   "cn/wow": "./xmrig --config=config.json",
    "cn/gpu": "./xmrig --config=config-gpu.json",
-   "cn/wow": "./xmrig --config=config-wow.json",
    "cn-lite/1": "./xmrig --config=config-lite.json",
    "cn-lite/0": "./xmrig --config=config-lite.json",
    "cn-heavy/0": "./xmrig --config=config-heavy.json",
@@ -60,6 +61,7 @@ Check https://github.com/xmrig/xmrig-proxy/blob/master/doc/STRATUM_EXT.md#14-alg
    "cn-pico/trtl": "./xmrig --config=config-pico.json"
  },
  "algo_perf": {
+   "cn/4": 34,
    "cn/2": 37.4,
    "cn": 36.3,
    "cn/half": 73.5,
@@ -102,7 +104,7 @@ Place mm.exe or mm.js (with nodejs installed) into unpacked miner directory eith
 
 ### Usage example with xmrig-amd on Windows
 
-* Download and unpack the lastest xmrig-amd (https://github.com/xmrig/xmrig-amd/releases/download/v2.12.0/xmrig-amd-2.12.0-msvc-win64.zip).
+* Download and unpack the lastest xmrig-amd (https://github.com/xmrig/xmrig-amd/releases/download/v2.13.0/xmrig-amd-2.13.0-msvc-win64.zip).
 
 * Modify config.json file in xmrig-amd directory this way and adjust it for the best threads performance (out of scope of this guide):
 
@@ -117,12 +119,10 @@ Place mm.exe or mm.js (with nodejs installed) into unpacked miner directory eith
 
 * Copy config.json to config-gpu.json, put "algo" to "cryptonight/gpu" in config-gpu.json and adjust it for the best threads performance (out of scope of this guide).
 
-* Copy config.json to config-wow.json, put "algo" to "cryptonight/wow" in config-wow.json and adjust it for the best threads performance (out of scope of this guide).
-
 * Run Meta Miner (or use "node mm.js" instead of mm.exe):
 
 ```shell
-mm.exe -p=gulf.moneroocean.stream:10001 -m="xmrig-amd.exe --config=config.json" -m="xmrig-amd.exe --config=config-heavy.json" -m="xmrig-amd.exe --config=config-lite.json" -m="xmrig-amd.exe --config=config-pico.json" -m="xmrig-amd.exe --config=config-gpu.json" -m="xmrig-amd.exe --config=config-wow.json"
+mm.exe -p=gulf.moneroocean.stream:10001 -m="xmrig-amd.exe --config=config.json" -m="xmrig-amd.exe --config=config-heavy.json" -m="xmrig-amd.exe --config=config-lite.json" -m="xmrig-amd.exe --config=config-pico.json" -m="xmrig-amd.exe --config=config-gpu.json" -m="xmrig-amd.exe --config=config.json"
 ```
 
 ### Usage example with xmr-stak (AMD only) on Windows
@@ -172,9 +172,9 @@ chmod +x mm.js
 * Get xmrig:
 
 ```shell
-wget https://github.com/xmrig/xmrig-amd/releases/download/v2.12.0/xmrig-amd-2.12.0-xenial-x64.tar.gz
-tar xf xmrig-2.12.0-xenial-amd64.tar.gz
-cd xmrig-2.12.0/
+wget https://github.com/xmrig/xmrig-amd/releases/download/v2.13.0/xmrig-amd-2.13.0-xenial-x64.tar.gz
+tar xf xmrig-2.13.0-xenial-amd64.tar.gz
+cd xmrig-2.13.0/
 ```
 
 * Prepare configs for different algorithms (put your Monero address):
@@ -186,18 +186,16 @@ cp config.json config-heavy.json
 cp config.json config-lite.json
 cp config.json config-pico.json
 cp config.json config-gpu.json
-cp config.json config-wow.json
 sed -i 's/"algo": *"[^"]*",/"algo": "cryptonight-heavy\/0",/' config-heavy.json
 sed -i 's/"algo": *"[^"]*",/"algo": "cryptonight-lite\/1",/' config-lite.json
 sed -i 's/"algo": *"[^"]*",/"algo": "cryptonight-pico\/trtl",/' config-pico.json
 sed -i 's/"algo": *"[^"]*",/"algo": "cryptonight\/gpu",/' config-gpu.json
-sed -i 's/"algo": *"[^"]*",/"algo": "cryptonight\/wow",/' config-wow.json
 ```
 
 * Run Meta Miner:
 
 ```shell
-./mm.js -p=gulf.moneroocean.stream:10001 -m="./xmrig --config=config.json" -m="./xmrig --config=config-heavy.json" -m="./xmrig --config=config-lite.json" -m="./xmrig --config=config-pico.json" -m="./xmrig --config=config-gpu.json" -m="./xmrig --config=config-wow.json"
+./mm.js -p=gulf.moneroocean.stream:10001 -m="./xmrig --config=config.json" -m="./xmrig --config=config-heavy.json" -m="./xmrig --config=config-lite.json" -m="./xmrig --config=config-pico.json" -m="./xmrig --config=config-gpu.json" -m="./xmrig --config=config.json"
 ```
 
 ### Usage example with xmr-stak (CPU only) on Linux

mm.js

@@ -48,6 +48,7 @@ const hashrate_regexes = [
 
 // basic algo for each algo class that is used for performance measurements
 const algo_perf_algo = {
+  "cn/4":     "cn/4",
   "cn/2":     "cn/2",
   "cn":       "cn/1",
   "cn/half":  "cn/half",
@@ -66,6 +67,7 @@ function algo_perf_class(algo) { // converts algo to algo class
    if (algo.indexOf("wow")   > -1) return "cn/wow";
    if (algo.indexOf("pico")  > -1) return "cn-pico";
    if (algo.indexOf("cn/2")  > -1) return "cn/2";
+   if (algo.indexOf("cn/4")  > -1) return "cn/4";
    return "cn";
 }
 
@@ -81,6 +83,7 @@ let c = {
   pools: [],
   algos: {},
   algo_perf: {
+    "cn/4":     0,
     "cn/2":     0,
     "cn":       0,
     "cn/half":  0,