From 0c48570ac662662fc9e808c0efe042f843fd6b23 Mon Sep 17 00:00:00 2001
From: psychocrypt <psychocryptHPC@gmail.com>
Date: Thu, 29 Mar 2018 21:02:58 +0200
Subject: [PATCH] github annotations
- documentation: change `aeon` to `aeon7`
- change `case` order in `switch` statements
- update README.txt
---
README.md | 2 ++
doc/FAQ.md | 2 +-
xmrstak/backend/cryptonight.hpp | 20 +++++++-------------
xmrstak/misc/executor.cpp | 9 +--------
xmrstak/pools.tpl | 2 +-
5 files changed, 12 insertions(+), 23 deletions(-)
diff --git a/README.md b/README.md
index 29e1e12..ec6ae01 100644
--- a/README.md
+++ b/README.md
@@ -1,6 +1,8 @@
###### fireice-uk's and psychocrypt's
# XMR-Stak - Monero/Aeon All-in-One Mining Software
+**XMR-Stak is ready for the POW change of Monero-v7, Aeon-v7 and Sumukoin-v3**
+
XMR-Stak is a universal Stratum pool miner. This miner supports CPUs, AMD and NVIDIA gpus and can be used to mine the crypto currency Monero and Aeon.
## HTML reports
diff --git a/doc/FAQ.md b/doc/FAQ.md
index 8739fc4..35dc248 100644
--- a/doc/FAQ.md
+++ b/doc/FAQ.md
@@ -72,7 +72,7 @@ If your antivirus software flags **xmr-stak**, it will likely move it to its qua
If the miner is compiled for Monero and Aeon than you can change
- the value `currency` in the config *or*
- - start the miner with the [command line option](usage.md) `--currency monero7` or `--currency aeon`
+ - start the miner with the [command line option](usage.md) `--currency monero7` or `--currency aeon7`
- run `xmr-stak --help` to see all supported currencies and algorithms
## How can I mine Monero
diff --git a/xmrstak/backend/cryptonight.hpp b/xmrstak/backend/cryptonight.hpp
index 538f1d8..8a8e259 100644
--- a/xmrstak/backend/cryptonight.hpp
+++ b/xmrstak/backend/cryptonight.hpp
@@ -49,16 +49,14 @@ inline size_t cn_select_memory(xmrstak_algo algo)
{
switch(algo)
{
+ case cryptonight_monero:
case cryptonight:
- return CRYPTONIGHT_MEMORY;
+ return CRYPTONIGHT_MEMORY;
+ case cryptonight_aeon:
case cryptonight_lite:
return CRYPTONIGHT_LITE_MEMORY;
- case cryptonight_monero:
- return CRYPTONIGHT_MEMORY;
case cryptonight_heavy:
return CRYPTONIGHT_HEAVY_MEMORY;
- case cryptonight_aeon:
- return CRYPTONIGHT_LITE_MEMORY;
default:
return 0;
}
@@ -86,16 +84,14 @@ inline size_t cn_select_mask(xmrstak_algo algo)
{
switch(algo)
{
+ case cryptonight_monero:
case cryptonight:
return CRYPTONIGHT_MASK;
+ case cryptonight_aeon:
case cryptonight_lite:
return CRYPTONIGHT_LITE_MASK;
- case cryptonight_monero:
- return CRYPTONIGHT_MASK;
case cryptonight_heavy:
return CRYPTONIGHT_HEAVY_MASK;
- case cryptonight_aeon:
- return CRYPTONIGHT_LITE_MASK;
default:
return 0;
}
@@ -123,16 +119,14 @@ inline size_t cn_select_iter(xmrstak_algo algo)
{
switch(algo)
{
+ case cryptonight_monero:
case cryptonight:
return CRYPTONIGHT_ITER;
+ case cryptonight_aeon:
case cryptonight_lite:
return CRYPTONIGHT_LITE_ITER;
- case cryptonight_monero:
- return CRYPTONIGHT_ITER;
case cryptonight_heavy:
return CRYPTONIGHT_HEAVY_ITER;
- case cryptonight_aeon:
- return CRYPTONIGHT_LITE_ITER;
default:
return 0;
}
diff --git a/xmrstak/misc/executor.cpp b/xmrstak/misc/executor.cpp
index 8520237..0e1dd9f 100644
--- a/xmrstak/misc/executor.cpp
+++ b/xmrstak/misc/executor.cpp
@@ -563,15 +563,8 @@ void executor::ex_main()
else
pools.emplace_front(0, "donate.xmr-stak.net:5500", "", "", "", 0.0, true, false, "", false);
break;
-
- case cryptonight_lite:
- if(dev_tls)
- pools.emplace_front(0, "donate.xmr-stak.net:7777", "", "", "", 0.0, true, true, "", true);
- else
- pools.emplace_front(0, "donate.xmr-stak.net:4444", "", "", "", 0.0, true, false, "", true);
- break;
-
case cryptonight_aeon:
+ case cryptonight_lite:
if(dev_tls)
pools.emplace_front(0, "donate.xmr-stak.net:7777", "", "", "", 0.0, true, true, "", true);
else
diff --git a/xmrstak/pools.tpl b/xmrstak/pools.tpl
index d3a8a5a..f5afff6 100644
--- a/xmrstak/pools.tpl
+++ b/xmrstak/pools.tpl
@@ -20,7 +20,7 @@ POOLCONF],
/*
* Currency to mine. Supported values:
*
- * aeon
+ * aeon7 (use this for Aeon's new PoW)
* cryptonight (try this if your coin is not listed)
* cryptonight_lite
* edollar
--
GitLab