From 2e30f5f5940126b535be81d97dc273eeaa849df3 Mon Sep 17 00:00:00 2001 From: Haifa Bogdan Adnan Date: Wed, 28 Aug 2019 11:50:58 +0300 Subject: [PATCH 1/2] Changes to embedded config file. --- doc/ALGORITHMS.md | 31 ------------------------ src/core/ConfigLoader_default.h | 43 ++++++++++++++++++++++++--------- 2 files changed, 32 insertions(+), 42 deletions(-) delete mode 100644 doc/ALGORITHMS.md diff --git a/doc/ALGORITHMS.md b/doc/ALGORITHMS.md deleted file mode 100644 index 9b42ead1..00000000 --- a/doc/ALGORITHMS.md +++ /dev/null @@ -1,31 +0,0 @@ -# Algorithms - -NinjaRig uses a different way to specify algorithms, compared to other miners. - -Algorithm selection splitted to 2 parts: - - * Global base algorithm per miner or proxy instance, `algo` option. Possible values: `argon2id`. - * Algorithm variant specified separately for each pool, `variant` option. - * [Full table for supported algorithm and variants.](https://github.com/xmrig/xmrig-proxy/blob/master/doc/STRATUM_EXT.md#14-algorithm-names-and-variants) - -#### Example -```json -{ - "algo": "argon2id", - ... - "pools": [ - { - "url": "...", - "variant": 1, - ... - } - ], - ... -} -``` - -## Mining algorithm negotiation -If your pool support [mining algorithm negotiation](https://github.com/xmrig/xmrig-proxy/issues/168) miner will choice proper variant automaticaly and if you choice wrong base algorithm you will see error message. - -Pools with mining algorithm negotiation support. - * [www.hashvault.pro](https://www.hashvault.pro/) diff --git a/src/core/ConfigLoader_default.h b/src/core/ConfigLoader_default.h index a0f098fc..d1ffbcc9 100644 --- a/src/core/ConfigLoader_default.h +++ b/src/core/ConfigLoader_default.h @@ -33,9 +33,9 @@ namespace xmrig { const static char *default_config = R"===( { - "algo": "argon2", + "algo": "chukwa", "api": { - "port": 0, + "port": 10000, "access-token": null, "id": null, "worker-id": null, @@ -45,21 +45,22 @@ R"===( "autosave": true, "background": false, "colors": true, + "cpu-threads": "all", + "cpu-optimization": null, "cpu-affinity": null, - "cpu-priority": null, + "priority": null, "donate-level": 5, - "huge-pages": true, "log-file": null, - "max-cpu-usage": 100, "pools": [ { - "url": "donate.v2.xmrig.com:3333", - "user": "YOUR_WALLET_ADDRESS", + "url": "stratum+tcp://trtl.muxdux.com:5555", + "user": "TRTLuxUdNNphJcrVfH27HMZumtFuJrmHG8B5ky3tzuAcZk7UcEdis2dAQbaQ2aVVGnGEqPtvDhMgWjZdfq8HenxKPEkrR43K618", "pass": "x", "rig-id": null, "nicehash": false, "keepalive": false, - "variant": -1, + "variant": "chukwa", + "enabled": true, "tls": false, "tls-fingerprint": null } @@ -67,10 +68,30 @@ R"===( "print-time": 60, "retries": 5, "retry-pause": 5, - "safe": false, - "threads": null, "user-agent": null, - "watch": false + "syslog": false, + "watch": true, + "use-gpu": [ + "OPENCL", + "CUDA" + ], + "gpu-intensity": [ + 50.0 + ], + "gpu-filter": [ + { + "engine": "OPENCL", + "filter": "AMD" + }, + { + "engine": "OPENCL", + "filter": "Radeon" + }, + { + "engine": "OPENCL", + "filter": "Advanced Micro Devices" + } + ] } )==="; #endif From ae629388811d40e64d0d4a862e781f45f714e41a Mon Sep 17 00:00:00 2001 From: Haifa Bogdan Adnan Date: Wed, 28 Aug 2019 11:52:19 +0300 Subject: [PATCH 2/2] Changes to embedded config file. --- src/config.json | 50 ++++++++++++++++++++++++++++++++++--------------- 1 file changed, 35 insertions(+), 15 deletions(-) diff --git a/src/config.json b/src/config.json index f36136ed..d432bef1 100644 --- a/src/config.json +++ b/src/config.json @@ -1,7 +1,7 @@ { - "algo": "chukwa/wrkz", + "algo": "chukwa", "api": { - "port": 0, + "port": 10000, "access-token": null, "id": null, "worker-id": null, @@ -11,22 +11,21 @@ "autosave": true, "background": false, "colors": true, - "threads": "all", + "cpu-threads": "all", + "cpu-optimization": null, "cpu-affinity": null, - "cpu-priority": null, - "use-gpu": "CUDA", - "gpu-intensity": 50, - "donate-level": 1, - "log-file": "./log.txt", + "priority": null, + "donate-level": 5, + "log-file": null, "pools": [ { - "url": "testnet.wrkz.work:5555", - "user": "WrkzRNDQDwFCBynKPc459v3LDa1gEGzG3j962tMUBko1fw9xgdaS9mNiGMgA9s1q7hS1Z8SGRVWzcGc8Sh8xsvfZ6u2wJEtoZB", + "url": "stratum+tcp://trtl.muxdux.com:5555", + "user": "TRTLuxUdNNphJcrVfH27HMZumtFuJrmHG8B5ky3tzuAcZk7UcEdis2dAQbaQ2aVVGnGEqPtvDhMgWjZdfq8HenxKPEkrR43K618", "pass": "x", "rig-id": null, "nicehash": false, - "keepalive": true, - "variant": "wrkz", + "keepalive": false, + "variant": "chukwa", "enabled": true, "tls": false, "tls-fingerprint": null @@ -35,7 +34,28 @@ "print-time": 60, "retries": 5, "retry-pause": 5, - "safe": false, "user-agent": null, - "watch": true -} \ No newline at end of file + "syslog": false, + "watch": true, + "use-gpu": [ + "OPENCL", + "CUDA" + ], + "gpu-intensity": [ + 50.0 + ], + "gpu-filter": [ + { + "engine": "OPENCL", + "filter": "AMD" + }, + { + "engine": "OPENCL", + "filter": "Radeon" + }, + { + "engine": "OPENCL", + "filter": "Advanced Micro Devices" + } + ] +}