Merge xmrig v6.11.1 into master

CHANGELOG.md

@@ -1,3 +1,6 @@
+# v6.11.1
+- [#2239](https://github.com/xmrig/xmrig/pull/2239) Fixed broken `coin` setting functionality.
+
 # v6.11.0
 - [#2196](https://github.com/xmrig/xmrig/pull/2196) Improved DNS subsystem and added new DNS specific options.
 - [#2172](https://github.com/xmrig/xmrig/pull/2172) Fixed build on Alpine 3.13.

src/base/net/stratum/Client.cpp

@@ -381,11 +381,16 @@ bool xmrig::Client::parseJob(const rapidjson::Value &params, int *code)
     }
 
     const char *algo = Json::getString(params, "algo");
+    const char *blobData = Json::getString(params, "blob");
     if (algo) {
         job.setAlgorithm(algo);
     }
     else if (m_pool.coin().isValid()) {
-        job.setAlgorithm(m_pool.coin().algorithm(job.blob()[0]));
+        uint8_t blobVersion = 0;
+        if (blobData) {
+            Cvt::fromHex(&blobVersion, 1, blobData, 2);
+        }
+        job.setAlgorithm(m_pool.coin().algorithm(blobVersion));
     }
 
 #   ifdef XMRIG_FEATURE_HTTP
@@ -401,7 +406,7 @@ bool xmrig::Client::parseJob(const rapidjson::Value &params, int *code)
     else
 #   endif
     {
-        if (!job.setBlob(params["blob"].GetString())) {
+        if (!job.setBlob(blobData)) {
             *code = 4;
             return false;
         }

src/base/net/stratum/DaemonClient.cpp

@@ -248,7 +248,9 @@ bool xmrig::DaemonClient::parseJob(const rapidjson::Value &params, int *code)
     }
 
     if (m_pool.coin().isValid()) {
-        job.setAlgorithm(m_pool.coin().algorithm(job.blob()[0]));
+        uint8_t blobVersion = 0;
+        Cvt::fromHex(&blobVersion, 1, m_blockhashingblob.data(), 2);
+        job.setAlgorithm(m_pool.coin().algorithm(blobVersion));
     }
 
     if (blocktemplate.isNull() || !job.setBlob(m_blockhashingblob)) {

src/base/net/stratum/SelfSelectClient.cpp

@@ -130,12 +130,17 @@ bool xmrig::SelfSelectClient::parseResponse(int64_t id, rapidjson::Value &result
         }
     }
 
-    if (!m_job.setBlob(result[kBlockhashingBlob].GetString())) {
+    const char *blobData = Json::getString(result, kBlockhashingBlob);
-        return false;
+    if (pool().coin().isValid()) {
+        uint8_t blobVersion = 0;
+        if (blobData) {
+            Cvt::fromHex(&blobVersion, 1, blobData, 2);
+        }
+        m_job.setAlgorithm(pool().coin().algorithm(blobVersion));
     }
 
-    if (pool().coin().isValid()) {
+    if (!m_job.setBlob(blobData)) {
-        m_job.setAlgorithm(pool().coin().algorithm(m_job.blob()[0]));
+        return false;
     }
 
     m_job.setHeight(Json::getUint64(result, kHeight));

src/version.h

@@ -28,7 +28,7 @@
 #define APP_ID        "xmrig"
 #define APP_NAME      "XMRig"
 #define APP_DESC      "XMRig miner"
-#define APP_VERSION   "6.11.0-mo1"
+#define APP_VERSION   "6.11.1-mo1"
 #define APP_DOMAIN    "xmrig.com"
 #define APP_SITE      "www.xmrig.com"
 #define APP_COPYRIGHT "Copyright (C) 2016-2021 xmrig.com"
@@ -36,7 +36,7 @@
 
 #define APP_VER_MAJOR  6
 #define APP_VER_MINOR  11
-#define APP_VER_PATCH  0
+#define APP_VER_PATCH  1
 
 #ifdef _MSC_VER
 #   if (_MSC_VER >= 1920)