Merge branch 'dev'

CHANGELOG.md

@@ -1,3 +1,7 @@
+# v3.1.3
+- [#1180](https://github.com/xmrig/xmrig/issues/1180) Fixed possible duplicated shares after algorithm switching.
+- Fixed wrong config file permissions after write (only gcc builds on recent Windows 10 affected).
+
 # v3.1.2
 - Many RandomX optimizations and fixes.
   - [#1132](https://github.com/xmrig/xmrig/issues/1132) Fixed build on CentOS 7.

src/base/io/json/Json_win.cpp

@@ -28,6 +28,7 @@
 
 #ifdef __GNUC__
 #   include <fcntl.h>
+#   include <sys/stat.h>
 #   include <ext/stdio_filebuf.h>
 #endif
 
@@ -102,7 +103,7 @@ bool xmrig::Json::save(const char *fileName, const rapidjson::Document &doc)
         return false;
     }
 #   elif defined(__GNUC__)
-    const int fd = _wopen(toUtf16(fileName).c_str(), _O_WRONLY | _O_BINARY | _O_CREAT | _O_TRUNC);
+    const int fd = _wopen(toUtf16(fileName).c_str(), _O_WRONLY | _O_BINARY | _O_CREAT | _O_TRUNC, _S_IWRITE);
     if (fd == -1) {
         return false;
     }

src/core/Miner.cpp

@@ -112,16 +112,15 @@ public:
     {
         active = true;
 
+        if (reset) {
+            Nonce::reset(job.index());
+        }
+
         for (IBackend *backend : backends) {
             backend->setJob(job);
         }
 
-        if (reset) {
-            Nonce::reset(job.index());
-        }
-        else {
-            Nonce::touch();
-        }
+        Nonce::touch();
 
         if (enabled) {
             Nonce::pause(false);;

src/crypto/common/Nonce.cpp

@@ -78,7 +78,6 @@ void xmrig::Nonce::reset(uint8_t index)
     std::lock_guard<std::mutex> lock(mutex);
 
     m_nonces[index] = 0;
-    touch();
 }
 
 

src/version.h

@@ -28,7 +28,7 @@
 #define APP_ID        "xmrig"
 #define APP_NAME      "XMRig"
 #define APP_DESC      "XMRig CPU miner"
-#define APP_VERSION   "3.1.2"
+#define APP_VERSION   "3.1.3-dev"
 #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  3
 #define APP_VER_MINOR  1
-#define APP_VER_PATCH  2
+#define APP_VER_PATCH  3
 
 #ifdef _MSC_VER
 #   if (_MSC_VER >= 1920)