From 487ab2f271b56ed963b03e1783a74de34625b070 Mon Sep 17 00:00:00 2001
From: psychocrypt <psychocryptHPC@gmail.com>
Date: Sun, 25 Mar 2018 22:03:20 +0200
Subject: [PATCH] rename `monero2` to `monero7`
fix #1202
---
doc/FAQ.md | 11 ++++++-----
xmrstak/jconf.cpp | 6 +++---
xmrstak/pools.tpl | 2 +-
3 files changed, 10 insertions(+), 9 deletions(-)
diff --git a/doc/FAQ.md b/doc/FAQ.md
index f22bb53..8739fc4 100644
--- a/doc/FAQ.md
+++ b/doc/FAQ.md
@@ -9,7 +9,7 @@
* [Virus Protection Alert](#virus-protection-alert)
* [Change Currency to Mine](#change-currency-to-mine)
* [How can I mine Monero](#how-can-i-mine-monero)
-* [Why is Monero named monero2](why-is-monero-named-monero2)
+* [Why is Monero named monero7](why-is-monero-named-monero7)
* [Which currency must be chosen if my fork coin is not listed](#which-currency-must-be-chosen-if-my-fork-coin-is-not-listed)
## "Obtaining SeLockMemoryPrivilege failed."
@@ -72,15 +72,16 @@ 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 monero` or `--currency aeon`
+ - start the miner with the [command line option](usage.md) `--currency monero7` or `--currency aeon`
+ - run `xmr-stak --help` to see all supported currencies and algorithms
## How can I mine Monero
-Set the value `currency` in `pools.txt` to `monero2`.
+Set the value `currency` in `pools.txt` to `monero7`.
-## Why is Monero named monero2
+## Why is Monero named monero7
-To avoid configuration conflicts after the hard fork of Monero to the new POW with our old naming schema where all cryptonight currencies was selected by choosing `monero` as currency we decided to switch to the name `monero2`.
+To avoid configuration conflicts after the hard fork of Monero to the new POW with our old naming schema where all cryptonight currencies was selected by choosing `monero` as currency we decided to switch to the name `monero7`.
## Which currency must be chosen if my fork coin is not listed
diff --git a/xmrstak/jconf.cpp b/xmrstak/jconf.cpp
index 225fbe0..713beb4 100644
--- a/xmrstak/jconf.cpp
+++ b/xmrstak/jconf.cpp
@@ -102,7 +102,7 @@ xmrstak_coin_algo coin_algos[] = {
{ "graft", cryptonight, nullptr },
{ "intense", cryptonight, nullptr },
{ "karbo", cryptonight, nullptr },
- { "monero2", cryptonight_monero, "pool.usxmrpool.com:3333" },
+ { "monero7", cryptonight_monero, "pool.usxmrpool.com:3333" },
{ "sumokoin", cryptonight_heavy, nullptr }
};
@@ -322,7 +322,7 @@ bool jconf::IsOnAlgoList(std::string& needle)
if(needle == "monero")
{
printer::inst()->print_msg(L0, "You entered Monero as coin name. Monero will hard-fork the PoW.\nThis means it will stop being compatible with other cryptonight coins.\n"
- "Please use monero2 if you want to mine Monero, or name the coin that you want to mine.");
+ "Please use 'monero7' (support auto switch to new POW) if you want to mine Monero, \nor name the coin that you want to mine.");
return false;
}
@@ -623,7 +623,7 @@ bool jconf::parse_config(const char* sFilename, const char* sFilenamePools)
if(ctmp == "monero")
{
printer::inst()->print_msg(L0, "You entered Monero as coin name. Monero will hard-fork the PoW.\nThis means it will stop being compatible with other cryptonight coins.\n"
- "Please use monero2 if you want to mine Monero, or name the coin that you want to mine.");
+ "Please use monero7 (support auto switch to new POW) if you want to mine Monero, or name the coin that you want to mine.");
return false;
}
diff --git a/xmrstak/pools.tpl b/xmrstak/pools.tpl
index 0b7084f..d3a8a5a 100644
--- a/xmrstak/pools.tpl
+++ b/xmrstak/pools.tpl
@@ -28,7 +28,7 @@ POOLCONF],
* graft
* intense
* karbo
- * monero2 (use this for Monero's new PoW)
+ * monero7 (use this for Monero's new PoW)
* sumokoin
*
*/
--
GitLab