From 297d884482286af236f27d24308a12c37ff89ab2 Mon Sep 17 00:00:00 2001
From: XMRig <support@xmrig.com>
Date: Tue, 3 Mar 2020 23:12:13 +0700
Subject: [PATCH 1/4] v5.8.1-dev

---
 src/version.h | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/version.h b/src/version.h
index 8d4dfd7d0..447b2a8d8 100644
--- a/src/version.h
+++ b/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)

From 874cff3d517ba52ddb5cc02a6581aa15d935a924 Mon Sep 17 00:00:00 2001
From: SChernykh <sergey.v.chernykh@gmail.com>
Date: Tue, 3 Mar 2020 17:53:19 +0100
Subject: [PATCH 2/4] Fixed new block detection for Dero solo mining

---
 src/base/net/stratum/DaemonClient.cpp | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/src/base/net/stratum/DaemonClient.cpp b/src/base/net/stratum/DaemonClient.cpp
index edae8beb6..a27f9d826 100644
--- a/src/base/net/stratum/DaemonClient.cpp
+++ b/src/base/net/stratum/DaemonClient.cpp
@@ -269,6 +269,12 @@ 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);
     }

From 5fa6a034d533dbf06fba2084018f7a0a7aa18108 Mon Sep 17 00:00:00 2001
From: XMRig <support@xmrig.com>
Date: Wed, 4 Mar 2020 00:06:20 +0700
Subject: [PATCH 3/4] Formatting.

---
 src/base/net/stratum/DaemonClient.cpp | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/base/net/stratum/DaemonClient.cpp b/src/base/net/stratum/DaemonClient.cpp
index a27f9d826..c54596826 100644
--- a/src/base/net/stratum/DaemonClient.cpp
+++ b/src/base/net/stratum/DaemonClient.cpp
@@ -271,8 +271,9 @@ bool xmrig::DaemonClient::parseJob(const rapidjson::Value &params, int *code)
 
     if (m_apiVersion == API_DERO) {
         // Truncate to 32 bytes to have the same data as in get_info RPC
-        if (m_prevHash.size() > 64)
+        if (m_prevHash.size() > 64) {
             m_prevHash.data()[64] = '\0';
+        }
     }
 
     if (m_state == ConnectingState) {

From ec17bc4d402cff9000a90cb671b1d05a178ea49f Mon Sep 17 00:00:00 2001
From: xmrig <support@xmrig.com>
Date: Wed, 4 Mar 2020 00:08:38 +0700
Subject: [PATCH 4/4] Update CHANGELOG.md

---
 CHANGELOG.md | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index ba4da402a..1b0d0f6ce 100644
--- a/CHANGELOG.md
+++ b/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"`.