From c2945307708a8de2b77bad7efa2dcd76eec97211 Mon Sep 17 00:00:00 2001 From: Interchained Date: Thu, 14 Jan 2021 02:59:06 -0500 Subject: [PATCH 1/4] add support for xmrigAlgo handling --- website_example/pages/getting_started.html | 39 +++++++++++----------- 1 file changed, 19 insertions(+), 20 deletions(-) diff --git a/website_example/pages/getting_started.html b/website_example/pages/getting_started.html index 3c9a04e..ed1a588 100644 --- a/website_example/pages/getting_started.html +++ b/website_example/pages/getting_started.html @@ -182,8 +182,8 @@ "pass": "YOUR_WORKER_NAME", "keepalive": true, "nicehash": false, - "variant": "trtl", - "algo": "cryptonight-pico/trtl" + "variant": "!msr", + "algo": "" } ], @@ -210,8 +210,8 @@ "pass": "YOUR_WORKER_NAME" "keepalive": true, "nicehash": false, - "variant": "trtl", - "algo": "cryptonight-pico/trtl" + "variant": "!msr", + "algo": "" } ], @@ -238,8 +238,8 @@ "pass": "YOUR_WORKER_NAME" "keepalive": true, "nicehash": false - "variant": "trtl", - "algo": "cryptonight-pico/trtl" + "variant": "!msr", + "algo": "" } ], @@ -266,8 +266,8 @@ "pass": "YOUR_WORKER_NAME", "keepalive": true, "nicehash": false, - "algo": "cryptonight-ultralite", - "pow-variant": "2" + "algo": "", + "pow-variant": "!msr" }, ], @@ -276,22 +276,19 @@ - + + + + @@ -347,6 +344,7 @@ currentPage = { algorithm = ''; xmrstakAlgo = ''; + xmrigAlgo = ''; if (cnAlgorithm == "argon2") { if (cnVariant === 1) @@ -397,6 +395,7 @@ currentPage = { } else if (cnVariant === 4) { algorithm = 'CryptoNight Fast'; xmrstakAlgo = 'cryptonight_masari'; + xmrigAlgo = 'cn/fast'; } else if (cnVariant === 6) { algorithm = 'CryptoNight Alloy'; xmrstakAlgo = 'cryptonight_alloy'; @@ -432,6 +431,7 @@ currentPage = { updateText('cnAlgorithm', algorithm); updateText('xmrstakAlgo', xmrstakAlgo); + updateText('xmrigAlgo', xmrigAlgo); } }; @@ -469,4 +469,3 @@ $('#generateConf').click(function() { }); - From 62fdd35fcd61d4198ecd09da826d01157acde400 Mon Sep 17 00:00:00 2001 From: Interchained Date: Thu, 14 Jan 2021 03:07:58 -0500 Subject: [PATCH 2/4] Update getting_started.html --- website_example/pages/getting_started.html | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/website_example/pages/getting_started.html b/website_example/pages/getting_started.html index ed1a588..5b2017f 100644 --- a/website_example/pages/getting_started.html +++ b/website_example/pages/getting_started.html @@ -183,7 +183,7 @@ "keepalive": true, "nicehash": false, "variant": "!msr", - "algo": "" + "algo": "" } ], @@ -211,7 +211,7 @@ "keepalive": true, "nicehash": false, "variant": "!msr", - "algo": "" + "algo": "" } ], @@ -239,7 +239,7 @@ "keepalive": true, "nicehash": false "variant": "!msr", - "algo": "" + "algo": "" } ], @@ -266,7 +266,7 @@ "pass": "YOUR_WORKER_NAME", "keepalive": true, "nicehash": false, - "algo": "", + "algo": "", "pow-variant": "!msr" }, ], @@ -431,7 +431,10 @@ currentPage = { updateText('cnAlgorithm', algorithm); updateText('xmrstakAlgo', xmrstakAlgo); - updateText('xmrigAlgo', xmrigAlgo); + updateText('xmrigAlgoCPU', xmrigAlgo); + updateText('xmrigAlgoAMD', xmrigAlgo); + updateText('xmrigAlgoNVIDIA', xmrigAlgo); + updateText('xmrigAlgoCC', xmrigAlgo); } }; @@ -469,3 +472,4 @@ $('#generateConf').click(function() { }); + From 708eeba5b2db4753f0860ba12510a2e5b831dbdf Mon Sep 17 00:00:00 2001 From: Interchained Date: Thu, 14 Jan 2021 03:15:23 -0500 Subject: [PATCH 3/4] update algos --- website_example/pages/getting_started.html | 16 +++++++++++++++- 1 file changed, 15 insertions(+), 1 deletion(-) diff --git a/website_example/pages/getting_started.html b/website_example/pages/getting_started.html index 5b2017f..9bf998f 100644 --- a/website_example/pages/getting_started.html +++ b/website_example/pages/getting_started.html @@ -356,12 +356,15 @@ currentPage = { algorithm = 'CryptoNight DefyX'; else if (cnVariant === 2) algorithm = 'RandomARQ'; + xmrigAlgo = 'rx/arq'; else if (cnVariant === 17) { algorithm = 'RandomWOW'; xmrstakAlgo = 'randomX_wow'; + xmrigAlgo = 'rx/wow'; } else if (cnVariant === 18) { algorithm = 'RandomXL'; xmrstakAlgo = 'randomX_loki'; + xmrigAlgo = 'rx/loki'; } else { algorithm = 'RandomX'; xmrstakAlgo = 'randomX'; @@ -370,28 +373,35 @@ currentPage = { if (cnVariant === 1) { algorithm = 'CryptoNight Lite v7'; xmrstakAlgo = 'cryptonight_lite_v7'; + xmrigAlgo = 'cn-lite/0'; } else { algorithm = 'CryptoNight Lite'; xmrstakAlgo = 'cryptonight_lite'; + xmrigAlgo = 'cn-lite/1'; } } else if (cnAlgorithm == "cryptonight_pico") { algorithm = 'CryptoNight Turtle'; xmrstakAlgo = 'cryptonight_turtle'; + xmrigAlgo = 'cn-pico'; } else if (cnAlgorithm == "cryptonight_heavy") { if (cnVariant === 1) { algorithm = 'CryptoNight Haven'; xmrstakAlgo = 'cryptonight_haven'; + xmrigAlgo = 'cn-heavy/xhv'; } else if (cnVariant === 2) { algorithm = 'CryptoNight Saber'; xmrstakAlgo = 'cryptonight_bittube2'; + xmrigAlgo = 'cn-heavy/tube'; } else { algorithm = 'CryptoNight Heavy'; xmrstakAlgo = 'cryptonight_heavy'; + xmrigAlgo = 'cn-heavy/0'; } } else { if (cnVariant === 1) { algorithm = 'CryptoNight v7'; xmrstakAlgo = 'cryptonight_v7'; + xmrigAlgo = 'cn/1'; } else if (cnVariant === 4) { algorithm = 'CryptoNight Fast'; xmrstakAlgo = 'cryptonight_masari'; @@ -414,18 +424,22 @@ currentPage = { } else if (cnVariant === 13) { algorithm = 'CryptoNight R'; xmrstakAlgo = 'cryptonight_r'; + xmrigAlgo = 'cn/r'; } else if (cnVariant === 14) { algorithm = 'CryptoNight v8 ReverseWaltz'; xmrstakAlgo = 'cryptonight_v8_reversewaltz'; } else if (cnVariant === 15) { algorithm = 'CryptoNight Zelerius'; xmrstakAlgo = 'cryptonight_v8_zelerius'; + xmrigAlgo = 'cn/zls'; } else if (cnVariant === 16) { algorithm = 'CryptoNight v8 Double'; xmrstakAlgo = 'cryptonight_v8_double'; + xmrigAlgo = 'cn/double'; } else { algorithm = 'CryptoNight'; - xmrstakAlgo = 'cryptonight'; + xmrstakAlgo = 'cryptonight + xmrigAlgo = 'cn/2'; } } From 1508cfe6cab987391331e80f7d73ed2fc492d951 Mon Sep 17 00:00:00 2001 From: Interchained Date: Thu, 14 Jan 2021 03:16:11 -0500 Subject: [PATCH 4/4] Update getting_started.html --- website_example/pages/getting_started.html | 23 +++------------------- 1 file changed, 3 insertions(+), 20 deletions(-) diff --git a/website_example/pages/getting_started.html b/website_example/pages/getting_started.html index 9bf998f..e8f474a 100644 --- a/website_example/pages/getting_started.html +++ b/website_example/pages/getting_started.html @@ -270,26 +270,9 @@ "pow-variant": "!msr" }, ], - - - - - - - - - - - + + +