Merge branch 'evo' into beta

CHANGELOG.md

@@ -1,3 +1,7 @@
+# v2.16.1-beta
+- Added RandomXL algorithm for [Loki](https://loki.network/).
+  - Algorithm name used by proxy is `randomx/loki` or `rx/loki`.
+  
 # v2.16.0-beta
 - [#1036](https://github.com/xmrig/xmrig/pull/1036) Added RandomWOW (RandomX with different preferences) algorithm support for [Wownero](http://wownero.org/).
   - Algorithm name used by proxy is `randomx/wow` or `rx/wow`.

src/base/net/stratum/Client.cpp

@@ -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();
         }
 

src/base/net/stratum/Pool.cpp

@@ -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
 }

src/common/xmrig.h

@@ -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
 };
 

src/crypto/common/Algorithm.cpp

@@ -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;
         }
     }

src/version.h

@@ -28,7 +28,7 @@
 #define APP_ID        "xmrig-proxy"
 #define APP_NAME      "xmrig-proxy"
 #define APP_DESC      "XMRig Stratum proxy"
-#define APP_VERSION   "2.16.0-beta"
+#define APP_VERSION   "2.16.1-evo"
 #define APP_DOMAIN    "xmrig.com"
 #define APP_SITE      "www.xmrig.com"
 #define APP_COPYRIGHT "Copyright (C) 2016-2019 xmrig.com"
@@ -36,7 +36,7 @@
 
 #define APP_VER_MAJOR  2
 #define APP_VER_MINOR  16
-#define APP_VER_PATCH  0
+#define APP_VER_PATCH  1
 
 #ifdef _MSC_VER
 #   if (_MSC_VER >= 1920)