Merge branch 'dev'

CHANGELOG.md

@@ -1,3 +1,6 @@
+# v5.8.1
+- [#1575](https://github.com/xmrig/xmrig/pull/1575) Fixed new block detection for DERO solo mining.
+
 # v5.8.0
 - [#1573](https://github.com/xmrig/xmrig/pull/1573) Added new AstroBWT algorithm for upcoming DERO fork, as `"algo": "astrobwt"` or `"coin": "dero"`.
 

src/base/net/stratum/DaemonClient.cpp

@@ -269,6 +269,13 @@ bool xmrig::DaemonClient::parseJob(const rapidjson::Value &params, int *code)
     m_blocktemplate = std::move(blocktemplate);
     m_prevHash      = Json::getString(params, "prev_hash");
 
+    if (m_apiVersion == API_DERO) {
+        // Truncate to 32 bytes to have the same data as in get_info RPC
+        if (m_prevHash.size() > 64) {
+            m_prevHash.data()[64] = '\0';
+        }
+    }
+
     if (m_state == ConnectingState) {
         setState(ConnectedState);
     }

src/version.h

@@ -28,7 +28,7 @@
 #define APP_ID        "xmrig"
 #define APP_NAME      "XMRig"
 #define APP_DESC      "XMRig miner"
-#define APP_VERSION   "5.8.0"
+#define APP_VERSION   "5.8.1-dev"
 #define APP_DOMAIN    "xmrig.com"
 #define APP_SITE      "www.xmrig.com"
 #define APP_COPYRIGHT "Copyright (C) 2016-2020 xmrig.com"
@@ -36,7 +36,7 @@
 
 #define APP_VER_MAJOR  5
 #define APP_VER_MINOR  8
-#define APP_VER_PATCH  0
+#define APP_VER_PATCH  1
 
 #ifdef _MSC_VER
 #   if (_MSC_VER >= 1920)