Various fixes and gminer doc

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>=<hashrate>        Sets hashrate for algo that is: rx/0, rx/wow, defyx, cn/r, cn-pico/trtl, cn-heavy/xhv, cn/gpu, argon2/chukwa, k12, c29s, c29v
+        --perf_<algo>=<hashrate>        Sets hashrate for algo that is: rx/0, rx/wow, defyx, cn/r, cn-pico/trtl, cn-heavy/xhv, cn/gpu, argon2/chukwa, k12, c29s, c29v, c29b, kawpow, ethash
         --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
@@ -63,12 +63,13 @@ Check https://github.com/xmrig/xmrig-proxy/blob/master/doc/STRATUM_EXT.md#14-alg
   "rx/loki": "./xmrig --config=config.json",
   "rx/arq": "./xmrig --config=config.json",
   "rx/sfx": "./xmrig --config=config.json",
-  "rx/v": "./xmrig --config=config.json",
   "argon2/chukwa": "./xmrig --config=config.json",
   "argon2/wrkz": "./xmrig --config=config.json",
-  "c29b": "./tube4referenceMiner/tube4referenceMinerCLI mode=rolling",
-  "c29s": "./SwapReferenceMiner/SwapReferenceMinerCLI mode=rolling",
-  "c29v": "./MoneroVMiner/bin/MoneroVMiner"
+  "ethash": "./gminer/miner --server localhost:3333 --user 87MKQonkAUsQ9MNGKB3L51PE884cTeJbgcu6zWZPZt13b632huSGu9xPZwQALhLnAadEurYA8npRPZTJUWed95ZAT17brdt --pass gpu_miner --algo ethash --proto stratum",
+  "kawpow": "./gminer/miner --server localhost:3333 --user 87MKQonkAUsQ9MNGKB3L51PE884cTeJbgcu6zWZPZt13b632huSGu9xPZwQALhLnAadEurYA8npRPZTJUWed95ZAT17brdt --pass gpu_miner --algo kawpow",
+  "c29s": "./gminer/miner --server localhost:3333 --user 87MKQonkAUsQ9MNGKB3L51PE884cTeJbgcu6zWZPZt13b632huSGu9xPZwQALhLnAadEurYA8npRPZTJUWed95ZAT17brdt --pass gpu_miner --algo cuckaroo29s",
+  "c29b": "./gminer/miner --server localhost:3333 --user 87MKQonkAUsQ9MNGKB3L51PE884cTeJbgcu6zWZPZt13b632huSGu9xPZwQALhLnAadEurYA8npRPZTJUWed95ZAT17brdt --pass gpu_miner --algo cuckaroo29b",
+  "c29v": "./gminer39/miner --server localhost:3333 --user 87MKQonkAUsQ9MNGKB3L51PE884cTeJbgcu6zWZPZt13b632huSGu9xPZwQALhLnAadEurYA8npRPZTJUWed95ZAT17brdt --pass gpu_miner --algo cuckarood29"
  },
  "algo_perf": {
   "rx/0": 243.6,
@@ -83,7 +84,6 @@ Check https://github.com/xmrig/xmrig-proxy/blob/master/doc/STRATUM_EXT.md#14-alg
   "c29s": 0,
   "c29v": 0,
   "rx/loki": 243.6,
-  "rx/v": 243.6,
   "cn/0": 49.8,
   "cn/1": 49.8,
   "cn/2": 49.8,
@@ -97,12 +97,14 @@ Check https://github.com/xmrig/xmrig-proxy/blob/master/doc/STRATUM_EXT.md#14-alg
   "cn/double": 24.9,
   "cn-heavy/0": 30.5,
   "cn-heavy/tube": 30.5,
-  "c29b": 0.07,
-  "c29s": 0.0953125,
-  "c29v": 0.25125
+  "c29b": 0.1865,
+  "c29s": 0.23375,
+  "c29v": 0.4875,
+  "kawpow": 0.003953464329242706,
+  "ethash": 49860000
  },
  "algo_min_time": 0,
- "user": "44qJYxdbuqSKarYnDSXB6KLbsH4yR65vpJe3ELLDii9i4ZgKpgQXZYR4AMJxBJbfbKZGWUxZU42QyZSsP4AyZZMbJBCrWr1",
+ "user": "89TxfrUmqJJcb1V124WsUzA78Xa3UYHt7Bg8RGMhXVeZYPN8cE5CZEk58Y1m23ZMLHN7wYeJ9da5n5MXharEjrm41hSnWHL",
  "pass": "x",
  "log_file": null,
  "watchdog": 600,
@@ -124,8 +126,9 @@ Check https://github.com/xmrig/xmrig-proxy/blob/master/doc/STRATUM_EXT.md#14-alg
 
 * To rerun benchmark for specific algorithm class use --perf_*algo*=0 option.
 
-The configuration guide below is for stock xmrig. For xmr-stak/rx check [configuration guide for xmr-stak](xmr-stak.md).
-For c29 algo check [configuration guide for cuckaroo29](c29.md).
+The configuration guide below is for stock xmrig. For xmr-stak/rx check [configuration guide for xmr-stak](xmr-stak.md) page.
+For GPU mining setup using gminer algo check [configuration guide for gminer](gminer.md) page.
+For c29 algo reference miner setup check [configuration guide for cuckaroo29](c29.md) page.
 
 ## Usage examples on Windows
 
@@ -142,7 +145,7 @@ Place mm.exe or mm.js (with nodejs installed) into unpacked miner directory eith
 * Modify config.json file in xmrig directory this way and adjust it for the best threads performance (out of scope of this guide):
 
 	* Set "url" to "localhost:3333"
-	* Set "user" to "44qJYxdbuqSKarYnDSXB6KLbsH4yR65vpJe3ELLDii9i4ZgKpgQXZYR4AMJxBJbfbKZGWUxZU42QyZSsP4AyZZMbJBCrWr1" (put your Monero wallet address)
+	* Set "user" to "89TxfrUmqJJcb1V124WsUzA78Xa3UYHt7Bg8RGMhXVeZYPN8cE5CZEk58Y1m23ZMLHN7wYeJ9da5n5MXharEjrm41hSnWHL" (put your Monero wallet address)
 
 * Run Meta Miner (or use "node mm.js" instead of mm.exe):
 
@@ -175,7 +178,7 @@ cd xmrig-5.4.0
 
 ```shell
 sed -i 's/"url": *"[^"]*",/"url": "localhost:3333",/' config.json
-sed -i 's/"user": *"[^"]*",/"user": "44qJYxdbuqSKarYnDSXB6KLbsH4yR65vpJe3ELLDii9i4ZgKpgQXZYR4AMJxBJbfbKZGWUxZU42QyZSsP4AyZZMbJBCrWr1",/' config.json
+sed -i 's/"user": *"[^"]*",/"user": "89TxfrUmqJJcb1V124WsUzA78Xa3UYHt7Bg8RGMhXVeZYPN8cE5CZEk58Y1m23ZMLHN7wYeJ9da5n5MXharEjrm41hSnWHL",/' config.json
 ```
 
 * Run Meta Miner:
@@ -188,7 +191,7 @@ sed -i 's/"user": *"[^"]*",/"user": "44qJYxdbuqSKarYnDSXB6KLbsH4yR65vpJe3ELLDii9
 
 If you'd like to make a one time donation, the addresses are as follows:
 
-* XMR - ```44qJYxdbuqSKarYnDSXB6KLbsH4yR65vpJe3ELLDii9i4ZgKpgQXZYR4AMJxBJbfbKZGWUxZU42QyZSsP4AyZZMbJBCrWr1```
+* XMR - ```89TxfrUmqJJcb1V124WsUzA78Xa3UYHt7Bg8RGMhXVeZYPN8cE5CZEk58Y1m23ZMLHN7wYeJ9da5n5MXharEjrm41hSnWHL```
 * AEON - ```WmsEg3RuUKCcEvFBtXcqRnGYfiqGJLP1FGBYiNMgrcdUjZ8iMcUn2tdcz59T89inWr9Vae4APBNf7Bg2DReFP5jr23SQqaDMT```
 * ETN - ```etnkQMp3Hmsay2p7uxokuHRKANrMDNASwQjDUgFb5L2sDM3jqUkYQPKBkooQFHVWBzEaZVzfzrXoETX6RbMEvg4R4csxfRHLo1```
 * SUMO - ```Sumoo1DGS7c9LEKZNipsiDEqRzaUB3ws7YHfUiiZpx9SQDhdYGEEbZjRET26ewuYEWAZ8uKrz6vpUZkEVY7mDCZyGnQhkLpxKmy```

c29.md

@@ -26,7 +26,7 @@ localhost:3333
 Use TLS? (y/n)         [Note that the pool:port must support TLS]
 n
 Enter your pool login:
-44qJYxdbuqSKarYnDSXB6KLbsH4yR65vpJe3ELLDii9i4ZgKpgQXZYR4AMJxBJbfbKZGWUxZU42QyZSsP4AyZZMbJBCrWr1
+89TxfrUmqJJcb1V124WsUzA78Xa3UYHt7Bg8RGMhXVeZYPN8cE5CZEk58Y1m23ZMLHN7wYeJ9da5n5MXharEjrm41hSnWHL
 Enter your pool password:
 x
 ```
@@ -45,7 +45,7 @@ Detected 1 suitable AMD devices
 Enter your mining pool stratum address (IP:PORT) :
 localhost:3333
 Enter your MoneroV Wallet-Address:
-44qJYxdbuqSKarYnDSXB6KLbsH4yR65vpJe3ELLDii9i4ZgKpgQXZYR4AMJxBJbfbKZGWUxZU42QyZSsP4AyZZMbJBCrWr1
+89TxfrUmqJJcb1V124WsUzA78Xa3UYHt7Bg8RGMhXVeZYPN8cE5CZEk58Y1m23ZMLHN7wYeJ9da5n5MXharEjrm41hSnWHL
 Enter your Rig Name:
 x
 
@@ -68,7 +68,7 @@ cp xmrig-5.4.0/* .
 sed -i '/^ *"cpu":/,/^ *[^:]*:/s/"enabled": true/"enabled": false/' config.json
 sed -i '/^ *"opencl":/,/^ *[^:]*:/s/"enabled": false/"enabled": true/' config.json
 sed -i 's/"url": *"[^"]*",/"url": "localhost:3333",/' config.json
-sed -i 's/"user": *"[^"]*",/"user": "44qJYxdbuqSKarYnDSXB6KLbsH4yR65vpJe3ELLDii9i4ZgKpgQXZYR4AMJxBJbfbKZGWUxZU42QyZSsP4AyZZMbJBCrWr1",/' config.json
+sed -i 's/"user": *"[^"]*",/"user": "89TxfrUmqJJcb1V124WsUzA78Xa3UYHt7Bg8RGMhXVeZYPN8cE5CZEk58Y1m23ZMLHN7wYeJ9da5n5MXharEjrm41hSnWHL",/' config.json
 ```
 
 * Run Meta Miner (adding xmrig for OpenCL for example):

gminer.md

@@ -0,0 +1,30 @@
+### Usage example with gminer on Linux
+
+* Get Meta Miner:
+
+```shell
+sudo apt-get update
+sudo apt-get install -y nodejs
+wget https://raw.githubusercontent.com/MoneroOcean/meta-miner/master/mm.js
+chmod +x mm.js
+```
+
+* Get gminer (and gminer v.2.39 for c29v algo support):
+
+```shell
+wget https://github.com/develsoftware/GMinerRelease/releases/download/2.42/gminer_2_42_linux64.tar.xz
+mkdir gminer
+(cd gminer && tar xf ../gminer_2_42_linux64.tar.xz)
+wget https://github.com/develsoftware/GMinerRelease/releases/download/2.39/gminer_2_39_linux64.tar.xz
+mkdir gminer39
+(cd gminer39 && tar xf ../gminer_2_39_linux64.tar.xz)
+```
+
+* Run Meta Miner:
+
+```shell
+export GMINER_COMMON="--server localhost:3333 --user 89TxfrUmqJJcb1V124WsUzA78Xa3UYHt7Bg8RGMhXVeZYPN8cE5CZEk58Y1m23ZMLHN7wYeJ9da5n5MXharEjrm41hSnWHL --pass gpu_miner"
+export GMINER_LAST="gminer/miner $GMINER_COMMON"
+export GMINER_39="gminer39/miner $GMINER_COMMON"
+./mm.js -p=gulf.moneroocean.stream:11024 --ethash="$GMINER_LAST --algo ethash --proto stratum" --kawpow="$GMINER_LAST --algo kawpow" --c29s="$GMINER_LAST --algo cuckaroo29s" --c29b="$GMINER_LAST --algo cuckaroo29b" --c29v="$GMINER_39 --algo cuckarood29v"
+```

mm.js

@@ -53,6 +53,7 @@ const hashrate_regexes = [
   [1,       1, /Mining at\s+([\d\.]+) gps/],                                 // tube4referenceMiner (use mode=rolling command line option)
   [1,       1, /mining at\s+([\d\.]+) gps/],                                 // SwapReferenceMiner (use mode=rolling command line option)
   [1,       2, /Total\s+:\s+([\d\.]+) gps/],                                 // MoneroVMiner
+  [1,       2, /([\d\.]+) G\/s/],                                            // gminer
   [1000000, 2, /([\d\.]+) MH\/s/],                                           // gminer
 ];
 
@@ -122,7 +123,6 @@ function bench_algo_deps(bench_algo, perf) {
     case "rx/0": return {
       "rx/0":          perf,
       "rx/loki":       perf,
-      "rx/v":          perf,
     };
     case "defyx": return {
       "defyx":         perf,
@@ -785,7 +785,7 @@ function do_miner_perf_runs(cb) {
         tree_kill(miner_proc.pid);
       }, 5*60*1000);
       miner_login_cb = function(json, miner_socket) {
-        curr_miner_protocol = json.method === "mining.authorize" ? "eth" : (json.id === "Stratum" ? "grin" : "default");
+        curr_miner_protocol = json.method === "mining.authorize" ? "eth" : (json.id === "Stratum" || json.params.algorithm === "cuckarood29v" ? "grin" : "default");
         switch (curr_miner_protocol) {
           case "grin": miner_socket_write(miner_socket, grin_json_reply("login", "ok")); break;
           case "eth":  miner_socket_write(miner_socket, json_reply(json, true)); break;
@@ -1072,7 +1072,7 @@ function main() {
 
   miner_login_cb = function(json, miner_socket) {
     if (curr_pool_socket && !curr_miner_socket) log("Pool (" + c.pools[curr_pool_num] + ") <-> miner link was established due to new miner connection");
-    set_curr_miner(miner_socket, json.method === "mining.authorize" ? "eth" : (json.id === "Stratum" ? "grin" : "default"));
+    set_curr_miner(miner_socket, json.method === "mining.authorize" ? "eth" : (json.id === "Stratum" || json.params.algorithm === "cuckarood29v" ? "grin" : "default"));
     switch (curr_miner_protocol) {
       case "grin": miner_socket_write(miner_socket, grin_json_reply("login", "ok")); break;
       case "eth":  miner_socket_write(miner_socket, json_reply(json, true)); break;

xmr-stak.md

@@ -11,7 +11,7 @@ cryptonight_r
 - Pool address: e.g. pool.example.com:3333
 localhost:3333
 - Username (wallet address or pool login):
-44qJYxdbuqSKarYnDSXB6KLbsH4yR65vpJe3ELLDii9i4ZgKpgQXZYR4AMJxBJbfbKZGWUxZU42QyZSsP4AyZZMbJBCrWr1
+89TxfrUmqJJcb1V124WsUzA78Xa3UYHt7Bg8RGMhXVeZYPN8cE5CZEk58Y1m23ZMLHN7wYeJ9da5n5MXharEjrm41hSnWHL
 ```
 
 * Enable faster hashrate output by setting "h_print_time" to 60 in config.txt.
@@ -64,7 +64,7 @@ randomx
 - Pool address: e.g. pool.example.com:3333
 localhost:3333
 - Username (wallet address or pool login):
-44qJYxdbuqSKarYnDSXB6KLbsH4yR65vpJe3ELLDii9i4ZgKpgQXZYR4AMJxBJbfbKZGWUxZU42QyZSsP4AyZZMbJBCrWr1
+89TxfrUmqJJcb1V124WsUzA78Xa3UYHt7Bg8RGMhXVeZYPN8cE5CZEk58Y1m23ZMLHN7wYeJ9da5n5MXharEjrm41hSnWHL
 - Password (mostly empty or x):
 
 - Does this pool port support TLS/SSL? Use no if unknown. (y/N)