diff --git a/src/Options.cpp b/src/Options.cpp index 93b9980e..3c370213 100644 --- a/src/Options.cpp +++ b/src/Options.cpp @@ -69,14 +69,14 @@ Options:\n" -u, --user=USERNAME username for mining server\n\ -p, --pass=PASSWORD password for mining server\n\ -t, --threads=N number of miner threads\n\ - -v, --av=N algorithm variation, 0 auto select\n\ -A, --aesni=N selection of AES-NI mode (0 auto, 1 on, 2 off)\n\ -k, --keepalive send keepalived for prevent timeout (need pool support)\n\ -r, --retries=N number of times to retry before switch to backup server (default: 5)\n\ -R, --retry-pause=N time to pause between retries (default: 5)\n\ - --force-pow-version=N force to use specific PoW variation (default: 0 POW_AUTODETECT, 1 POW_V0, 2 POW_MONERO_V7)\n\ - --multihash-factor=N number of hash blocks to process at a time (not set or 0 enables automatic selection of optimal number of hash blocks)\n\ - --multihash-thread-mask for av=2/4 only, limits multihash to given threads (mask), (default: all threads)\n\ + --pow-variant=V specificy the PoW variat to use: -> auto (default), 0 (v0), 1 (v1, aka monerov7, aeonv7), ipbc (tube), alloy, xtl (including autodetect for v5)\n\ + for further help see: https://github.com/Bendr0id/xmrigCC/wiki/Coin-configurations\n\ + --multihash-factor=N number of hash blocks to process at a time (don't set or 0 enables automatic selection of optimal number of hash blocks)\n\ + --multihash-thread-mask=MASK limits multihash to given threads (mask), (default: all threads)\n\ --cpu-affinity set process affinity to CPU core(s), mask 0x3 for cores 0 and 1\n\ --cpu-priority set process priority (0 idle, 2 normal to 5 highest)\n\ --no-huge-pages disable huge pages support\n\ @@ -981,7 +981,7 @@ bool Options::parsePowVariant(const char *powVariant) break; } - if (i == ARRAY_SIZE(pow_variant_names) - 1 && !strcmp(powVariant, "auto")) { + if (i == ARRAY_SIZE(pow_variant_names) - 1 && (!strcmp(powVariant, "auto") || !strcmp(powVariant, "-1"))) { m_powVariant = POW_AUTODETECT; break; } @@ -996,6 +996,12 @@ bool Options::parsePowVariant(const char *powVariant) break; } + + if (i == ARRAY_SIZE(pow_variant_names) - 1 && !strcmp(powVariant, "tube")) { + m_powVariant = POW_IPBC; + break; + } + if (i == ARRAY_SIZE(pow_variant_names) - 1) { showUsage(1); return false; diff --git a/src/config.json b/src/config.json index 9c73e15c..f1c86923 100644 --- a/src/config.json +++ b/src/config.json @@ -1,22 +1,18 @@ { - "algo": "cryptonight", // cryptonight (default), cryptonight-lite, cryptonight-lite-ipbc or cryptopnight-heavy - "av": null, // DEPRECATED: algorithm variation, (0 auto, - // 1 -> (aesni=1, multihash-factor=1), - // 2 -> (aesni=1, multihash-factor=2), - // 3 -> (aesni=2, multihash-factor=1), - // 4 -> (aesni=2, multihash-factor=2)) + "algo": "cryptonight", // cryptonight (default), cryptonight-lite or cryptopnight-heavy "aesni": 0, // selection of AES-NI mode (0 auto, 1 on, 2 off) "threads": 0, // number of miner threads (not set or 0 enables automatic selection of optimal thread count) "multihash-factor": 0, // number of hash blocks to process at a time (not set or 0 enables automatic selection of optimal number of hash blocks) "multihash-thread-mask" : null, // for multihash-factors>0 only, limits multihash to given threads (mask), mask "0x3" means run multihash on thread 0 and 1 only (default: all threads) - "force-pow-version" : 0, // force to use specific PoW variation (default: 0 POW_AUTODETECT, 1 POW_V1, 2 POW_V2) + "pow-variant" : "auto", // specificy the PoW variat to use: -> auto (default), 0 (v0), 1 (v1, aka monerov7, aeonv7), ipbc (tube), alloy, xtl (including autodetect for v5) + // for further help see: https://github.com/Bendr0id/xmrigCC/wiki/Coin-configurations "background": false, // true to run the miner in the background (Windows only, for *nix plase use screen/tmux or systemd service instead) "colors": true, // false to disable colored output "cpu-affinity": null, // set process affinity to CPU core(s), mask "0x3" for cores 0 and 1 "cpu-priority": null, // set process priority (0 idle, 2 normal to 5 highest) "donate-level": 5, // donate level, mininum 1% "log-file": null, // log all output to a file, example: "c:/some/path/xmrig.log" - "max-cpu-usage": 75, // maximum CPU usage for automatic mode, usually limiting factor is CPU cache not this option. + "max-cpu-usage": 100, // maximum CPU usage for automatic mode, usually limiting factor is CPU cache not this option. "print-time": 60, // print hashrate report every N seconds "retries": 5, // number of times to retry before switch to backup server "retry-pause": 5, // time to pause between retries @@ -32,11 +28,6 @@ "nicehash": false // enable nicehash/xmrig-proxy support } ], - "api": { - "port": 0, // port for the miner API https://github.com/xmrig/xmrig/wiki/API - "access-token": null, // access token for API - "worker-id": null // custom worker-id for API - }, "cc-client": { "url": "localhost:3344", // url of the CC Server (ip:port) "use-tls" : false, // enable tls for CC communication (needs to be enabled on CC Server too) diff --git a/src/default_config.json b/src/default_config.json index 3dc4ae32..f1c86923 100644 --- a/src/default_config.json +++ b/src/default_config.json @@ -1,22 +1,18 @@ { - "algo": "cryptonight", // cryptonight (default), cryptonight-lite, cryptonight-lite-ipbc or cryptopnight-heavy - "av": null, // DEPRECATED: algorithm variation, (0 auto, - // 1 -> (aesni=1, multihash-factor=1), - // 2 -> (aesni=1, multihash-factor=2), - // 3 -> (aesni=2, multihash-factor=1), - // 4 -> (aesni=2, multihash-factor=2)) + "algo": "cryptonight", // cryptonight (default), cryptonight-lite or cryptopnight-heavy "aesni": 0, // selection of AES-NI mode (0 auto, 1 on, 2 off) "threads": 0, // number of miner threads (not set or 0 enables automatic selection of optimal thread count) "multihash-factor": 0, // number of hash blocks to process at a time (not set or 0 enables automatic selection of optimal number of hash blocks) "multihash-thread-mask" : null, // for multihash-factors>0 only, limits multihash to given threads (mask), mask "0x3" means run multihash on thread 0 and 1 only (default: all threads) - "force-pow-version" : 0, // force to use specific PoW variation (default: 0 POW_AUTODETECT, 1 POW_V1, 2 POW_V2) + "pow-variant" : "auto", // specificy the PoW variat to use: -> auto (default), 0 (v0), 1 (v1, aka monerov7, aeonv7), ipbc (tube), alloy, xtl (including autodetect for v5) + // for further help see: https://github.com/Bendr0id/xmrigCC/wiki/Coin-configurations "background": false, // true to run the miner in the background (Windows only, for *nix plase use screen/tmux or systemd service instead) "colors": true, // false to disable colored output "cpu-affinity": null, // set process affinity to CPU core(s), mask "0x3" for cores 0 and 1 "cpu-priority": null, // set process priority (0 idle, 2 normal to 5 highest) "donate-level": 5, // donate level, mininum 1% "log-file": null, // log all output to a file, example: "c:/some/path/xmrig.log" - "max-cpu-usage": 75, // maximum CPU usage for automatic mode, usually limiting factor is CPU cache not this option. + "max-cpu-usage": 100, // maximum CPU usage for automatic mode, usually limiting factor is CPU cache not this option. "print-time": 60, // print hashrate report every N seconds "retries": 5, // number of times to retry before switch to backup server "retry-pause": 5, // time to pause between retries @@ -32,11 +28,6 @@ "nicehash": false // enable nicehash/xmrig-proxy support } ], - "api": { - "port": 0, // port for the miner API https://github.com/xmrig/xmrig/wiki/API - "access-token": null, // access token for API - "worker-id": null // custom worker-id for API - }, "cc-client": { "url": "localhost:3344", // url of the CC Server (ip:port) "use-tls" : false, // enable tls for CC communication (needs to be enabled on CC Server too)