Added "rx/loki" algorithm.

This commit is contained in:
XMRig
2019-07-20 00:41:01 +07:00
parent be09f9ef3c
commit d51dcd6315
4 changed files with 10 additions and 5 deletions

View File

@@ -739,7 +739,7 @@ void xmrig::Client::parseResponse(int64_t id, const rapidjson::Value &result, co
LOG_ERR("[%s] error: " RED_BOLD("\"%s\"") RED_S ", code: %d", url(), message, error["code"].GetInt());
}
if (isCriticalError(message)) {
if (m_id == 1 || isCriticalError(message)) {
close();
}

View File

@@ -518,6 +518,7 @@ void xmrig::Pool::rebuild()
addVariant(VARIANT_ZLS);
addVariant(VARIANT_DOUBLE);
addVariant(VARIANT_RX_WOW);
addVariant(VARIANT_RX_LOKI);
addVariant(VARIANT_AUTO);
# endif
}

View File

@@ -81,6 +81,7 @@ enum Variant {
VARIANT_ZLS = 15, // CryptoNight variant 2 with 3/4 iterations (Zelerius)
VARIANT_DOUBLE = 16, // CryptoNight variant 2 with double iterations (X-CASH)
VARIANT_RX_WOW = 17, // RandomX (Wownero)
VARIANT_RX_LOKI = 18, // RandomX (Loki)
VARIANT_MAX
};

View File

@@ -72,6 +72,7 @@ static AlgoData const algorithms[] = {
# ifdef XMRIG_ALGO_RANDOMX
{ "randomx/wow", "rx/wow", xmrig::RANDOM_X, xmrig::VARIANT_RX_WOW },
{ "randomx/loki", "rx/loki", xmrig::RANDOM_X, xmrig::VARIANT_RX_LOKI },
{ "randomx", "rx", xmrig::RANDOM_X, xmrig::VARIANT_RX_WOW },
# endif
@@ -145,6 +146,7 @@ static const char *variants[] = {
"zls",
"double",
"rx/wow",
"rx/loki",
};
@@ -200,10 +202,6 @@ void xmrig::Algorithm::parseAlgorithm(const char *algo)
break;
}
}
if (m_algo == INVALID_ALGO) {
assert(false);
}
}
@@ -224,6 +222,11 @@ void xmrig::Algorithm::parseVariant(const char *variant)
for (size_t i = 0; i < ARRAY_SIZE(variants); i++) {
if (strcasecmp(variant, variants[i]) == 0) {
m_variant = static_cast<Variant>(i);
if (m_variant == VARIANT_RX_WOW || m_variant == VARIANT_RX_LOKI) { // FIXME
m_algo = RANDOM_X;
}
return;
}
}