Merge pull request #67 from psychocrypt/topic-aeon2

add Aeon support

1 files changed, 42 insertions, 1 deletions

diff --git a/xmrstak/jconf.cpp b/xmrstak/jconf.cpp
index c033e66..4b23ed5 100644
--- a/xmrstak/jconf.cpp
+++ b/xmrstak/jconf.cpp
@@ -27,6 +27,7 @@
 #include "xmrstak/misc/console.hpp"
 #include "xmrstak/misc/jext.hpp"
 #include "xmrstak/misc/console.hpp"
+#include "xmrstak/misc/utility.hpp"
 
 #include <stdio.h>
 #include <stdlib.h>
@@ -46,7 +47,7 @@ using namespace rapidjson;
  * This enum needs to match index in oConfigValues, otherwise we will get a runtime error
  */
 enum configEnum {
-	bTlsMode, bTlsSecureAlgo, sTlsFingerprint, sPoolAddr, sWalletAddr, sPoolPwd,
+	bTlsMode, bTlsSecureAlgo, sTlsFingerprint, sPoolAddr, sWalletAddr, sPoolPwd,sCurrency,
 	iCallTimeout, iNetRetry, iGiveUpLimit, iVerboseLevel, iAutohashTime,
 	bDaemonMode, sOutputFile, iHttpdPort, bPreferIpv4, bNiceHashMode, bAesOverride, sUseSlowMem };
 
@@ -65,6 +66,7 @@ configVal oConfigValues[] = {
 	{ sPoolAddr, "pool_address", kStringType },
 	{ sWalletAddr, "wallet_address", kStringType },
 	{ sPoolPwd, "pool_password", kStringType },
+	{ sCurrency, "currency", kStringType },
 	{ iCallTimeout, "call_timeout", kNumberType },
 	{ iNetRetry, "retry_time", kNumberType },
 	{ iGiveUpLimit, "giveup_limit", kNumberType },
@@ -150,6 +152,45 @@ const char* jconf::GetWalletAddress()
 	return poolUsername.c_str();
 }
 
+const std::string jconf::GetCurrency()
+{
+	auto& currency = xmrstak::params::inst().currency;
+	if(currency.empty())
+		currency = prv->configValues[sCurrency]->GetString();
+	if(
+#ifndef CONF_NO_MONERO
+			// if monero is disabled at compile time, enable error message if selected currency is `monero`
+			!xmrstak::strcmp_i(currency, "monero")
+#else
+			true
+#endif
+			&&
+#ifndef CONF_NO_AEON
+			// if aeon is disabled at compile time, enable error message if selected currency is `aeon`
+			!xmrstak::strcmp_i(currency, "aeon")
+#else
+			true
+#endif
+	)
+	{
+		printer::inst()->print_msg(L0, "ERROR: Wrong currency selected - '%s'.", currency.c_str());
+		win_exit();
+	}
+	return currency;
+}
+
+bool jconf::IsCurrencyMonero()
+{
+	if(xmrstak::strcmp_i(::jconf::inst()->GetCurrency(), "monero"))
+	{
+		return true;
+	}
+	else
+	{
+		return false;
+	}
+}
+
 bool jconf::PreferIpv4()
 {
 	return prv->configValues[bPreferIpv4]->GetBool();