From 8b2424b97aec29f29f5e269ffb7632fe5cdfd245 Mon Sep 17 00:00:00 2001 From: BenDroid Date: Fri, 16 Mar 2018 22:07:04 +0100 Subject: [PATCH] Cleanup --- CHANGELOG.md | 4 ++-- src/Options.cpp | 4 +++- src/config.json | 1 + src/default_config.json | 1 + 4 files changed, 7 insertions(+), 3 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 671f5464..3f6be39e 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,6 +1,6 @@ # 1.5.1 -- Applied changes for Monero v7 PoW starting 03/28/18 (No changes in config needed) -- Applied changes for upcoming AEON PoW changes. (No changes in config needed) +- Applied changes for upcoming Monero v7 PoW changes starting 03/28/18 (No changes in config needed) +- Applied changes for upcoming AEON PoW changes starting 04/07/18 (No changes in config needed) - Added option to force PoW version - Added new design / icons # 1.5.0 diff --git a/src/Options.cpp b/src/Options.cpp index f8d173d8..2ef55f7a 100644 --- a/src/Options.cpp +++ b/src/Options.cpp @@ -71,9 +71,11 @@ Options:\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_V1, 2 POW_V2)\n\ --multihash-thread-mask for av=2/4 only, 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\ @@ -304,9 +306,9 @@ Options::Options(int argc, char **argv) : m_ccKeyFile(nullptr), m_ccCertFile(nullptr), m_algo(ALGO_CRYPTONIGHT), - m_forcePowVersion(POW_AUTODETECT), m_algoVariant(AV0_AUTO), m_aesni(AESNI_AUTO), + m_forcePowVersion(POW_AUTODETECT), m_hashFactor(0), m_apiPort(0), m_donateLevel(kDonateLevel), diff --git a/src/config.json b/src/config.json index 02e53f37..2e995227 100644 --- a/src/config.json +++ b/src/config.json @@ -9,6 +9,7 @@ "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) "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 diff --git a/src/default_config.json b/src/default_config.json index 1964e364..d647ba0a 100644 --- a/src/default_config.json +++ b/src/default_config.json @@ -9,6 +9,7 @@ "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) "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