Sync changes with miner.

src/common/config/CommonConfig.cpp

@@ -123,7 +123,7 @@ bool xmrig::CommonConfig::finalize()
     }
 
     for (Pool &pool : m_pools) {
-        pool.adjust(m_algorithm.algo());
+        pool.adjust(m_algorithm);
 
         if (pool.isValid() && pool.algorithm().isValid()) {
             m_activePools.push_back(std::move(pool));

src/common/net/Pool.cpp

@@ -223,39 +223,15 @@ rapidjson::Value Pool::toJSON(rapidjson::Document &doc) const
 }
 
 
-void Pool::adjust(xmrig::Algo algorithm)
+void Pool::adjust(const xmrig::Algorithm &algorithm)
 {
     if (!isValid()) {
         return;
     }
 
     if (!m_algorithm.isValid()) {
-        m_algorithm.setAlgo(algorithm);
-
-#       ifndef XMRIG_PROXY_PROJECT
-        if (m_algorithm.variant() == xmrig::VARIANT_AUTO) {
-            if (algorithm == xmrig::CRYPTONIGHT_HEAVY)  {
-                m_algorithm.setVariant(xmrig::VARIANT_0);
-            }
-            else {
-                m_algorithm.setVariant(xmrig::VARIANT_1);
-            }
-        }
-#       endif
-    }
-
-    if (strstr(m_host.data(), ".nicehash.com")) {
-        m_keepAlive = false;
-        m_nicehash  = true;
-
-        if (strstr(m_host.data(), "cryptonightv7.")) {
-            m_algorithm.setVariant(xmrig::VARIANT_1);
-        }
-    }
-
-    if (strstr(m_host.data(), ".minergate.com")) {
-        m_keepAlive = false;
-        m_algorithm.setVariant(xmrig::VARIANT_1);
+        m_algorithm.setAlgo(algorithm.algo());
+        adjustVariant(algorithm.variant());
     }
 
     rebuild();
@@ -320,9 +296,80 @@ void Pool::addVariant(xmrig::Variant variant)
 }
 
 
+void Pool::adjustVariant(const xmrig::Variant variantHint)
+{
+#   ifndef XMRIG_PROXY_PROJECT
+    using namespace xmrig;
+
+    if (m_host.contains(".nicehash.com")) {
+        m_keepAlive = false;
+        m_nicehash  = true;
+        bool valid  = true;
+
+        if (m_host.contains("cryptonight.") && m_port == 3355) {
+            valid = m_algorithm.algo() == CRYPTONIGHT;
+            m_algorithm.setVariant(VARIANT_0);
+        }
+        else if (m_host.contains("cryptonightv7.") && m_port == 3363) {
+            valid = m_algorithm.algo() == CRYPTONIGHT;
+            m_algorithm.setVariant(VARIANT_1);
+        }
+        else if (m_host.contains("cryptonightheavy.") && m_port == 3364) {
+            valid = m_algorithm.algo() == CRYPTONIGHT_HEAVY;
+            m_algorithm.setVariant(VARIANT_0);
+        }
+
+        if (!valid) {
+            m_algorithm.setAlgo(INVALID_ALGO);
+        }
+
+        return;
+    }
+
+    if (m_host.contains(".minergate.com")) {
+        m_keepAlive = false;
+        bool valid  = true;
+        m_algorithm.setVariant(VARIANT_1);
+
+        if (m_host.contains("xmr.pool.")) {
+            valid = m_algorithm.algo() == CRYPTONIGHT;
+            m_algorithm.setVariant(m_port == 45700 ? VARIANT_1 : VARIANT_0);
+        }
+        else if (m_host.contains("aeon.pool.") && m_port == 45690) {
+            valid = m_algorithm.algo() == CRYPTONIGHT_LITE;
+            m_algorithm.setVariant(VARIANT_1);
+        }
+
+        if (!valid) {
+            m_algorithm.setAlgo(INVALID_ALGO);
+        }
+
+        return;
+    }
+
+    if (variantHint != VARIANT_AUTO) {
+        m_algorithm.setVariant(variantHint);
+        return;
+    }
+
+    if (m_algorithm.algo() == CRYPTONIGHT_HEAVY)  {
+        m_algorithm.setVariant(VARIANT_0);
+    }
+    else {
+        m_algorithm.setVariant(VARIANT_1);
+    }
+#   endif
+}
+
+
 void Pool::rebuild()
 {
     m_algorithms.clear();
+
+    if (!m_algorithm.isValid()) {
+        return;
+    }
+
     m_algorithms.push_back(m_algorithm);
 
 #   ifndef XMRIG_PROXY_PROJECT

src/common/net/Pool.h

@@ -77,7 +77,7 @@ public:
     bool parse(const char *url);
     bool setUserpass(const char *userpass);
     rapidjson::Value toJSON(rapidjson::Document &doc) const;
-    void adjust(xmrig::Algo algorithm);
+    void adjust(const xmrig::Algorithm &algorithm);
     void setAlgo(const xmrig::Algorithm &algorithm);
 
 #   ifdef APP_DEBUG
@@ -87,6 +87,7 @@ public:
 private:
     bool parseIPv6(const char *addr);
     void addVariant(xmrig::Variant variant);
+    void adjustVariant(const xmrig::Variant variantHint);
     void rebuild();
 
     bool m_nicehash;

src/common/utils/c_str.h

@@ -72,6 +72,12 @@ public:
     }
 
 
+    inline bool contains(const char *str) const
+    {
+        return strstr(m_data, str) != nullptr;
+    }
+
+
     inline bool isNull() const           { return m_data == nullptr; }
     inline const char *data() const      { return m_data; }
     inline size_t size() const           { return m_data == nullptr ? 0 : strlen(m_data); }