From 96b2560f79763aef8f8242da13ac3a446e4b9857 Mon Sep 17 00:00:00 2001 From: XMRig Date: Wed, 2 Oct 2019 10:33:12 +0700 Subject: [PATCH 1/6] v4.2.1-beta --- src/version.h | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/version.h b/src/version.h index 7d7c996da..652908269 100644 --- a/src/version.h +++ b/src/version.h @@ -28,15 +28,15 @@ #define APP_ID "xmrig" #define APP_NAME "XMRig" #define APP_DESC "XMRig miner" -#define APP_VERSION "4.3.0-evo" +#define APP_VERSION "4.2.1-beta" #define APP_DOMAIN "xmrig.com" #define APP_SITE "www.xmrig.com" #define APP_COPYRIGHT "Copyright (C) 2016-2019 xmrig.com" #define APP_KIND "miner" #define APP_VER_MAJOR 4 -#define APP_VER_MINOR 3 -#define APP_VER_PATCH 0 +#define APP_VER_MINOR 2 +#define APP_VER_PATCH 1 #ifdef _MSC_VER # if (_MSC_VER >= 1920) From 72b7d934f615de1e17cf14453a8776e8ce0ad937 Mon Sep 17 00:00:00 2001 From: XMRig Date: Thu, 10 Oct 2019 13:58:43 +0700 Subject: [PATCH 2/6] v4.3.0-beta --- src/version.h | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/version.h b/src/version.h index 652908269..f9c1fdbc1 100644 --- a/src/version.h +++ b/src/version.h @@ -28,15 +28,15 @@ #define APP_ID "xmrig" #define APP_NAME "XMRig" #define APP_DESC "XMRig miner" -#define APP_VERSION "4.2.1-beta" +#define APP_VERSION "4.3.0-beta" #define APP_DOMAIN "xmrig.com" #define APP_SITE "www.xmrig.com" #define APP_COPYRIGHT "Copyright (C) 2016-2019 xmrig.com" #define APP_KIND "miner" #define APP_VER_MAJOR 4 -#define APP_VER_MINOR 2 -#define APP_VER_PATCH 1 +#define APP_VER_MINOR 3 +#define APP_VER_PATCH 0 #ifdef _MSC_VER # if (_MSC_VER >= 1920) From 6009fffa7b698cec68db293b20721a1e57264f38 Mon Sep 17 00:00:00 2001 From: XMRig Date: Fri, 11 Oct 2019 23:23:44 +0700 Subject: [PATCH 3/6] v4.3.1-beta --- src/version.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/version.h b/src/version.h index f9c1fdbc1..a4e716d4f 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 "4.3.0-beta" +#define APP_VERSION "4.3.1-beta" #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 4 #define APP_VER_MINOR 3 -#define APP_VER_PATCH 0 +#define APP_VER_PATCH 1 #ifdef _MSC_VER # if (_MSC_VER >= 1920) From e3f37bc2f9647fbac37722c5f6e1e1c7e66529f5 Mon Sep 17 00:00:00 2001 From: XMRig Date: Tue, 22 Oct 2019 14:15:40 +0700 Subject: [PATCH 4/6] v4.4.0-beta --- src/version.h | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/version.h b/src/version.h index a4e716d4f..dab33f9d1 100644 --- a/src/version.h +++ b/src/version.h @@ -28,15 +28,15 @@ #define APP_ID "xmrig" #define APP_NAME "XMRig" #define APP_DESC "XMRig miner" -#define APP_VERSION "4.3.1-beta" +#define APP_VERSION "4.4.0-beta" #define APP_DOMAIN "xmrig.com" #define APP_SITE "www.xmrig.com" #define APP_COPYRIGHT "Copyright (C) 2016-2019 xmrig.com" #define APP_KIND "miner" #define APP_VER_MAJOR 4 -#define APP_VER_MINOR 3 -#define APP_VER_PATCH 1 +#define APP_VER_MINOR 4 +#define APP_VER_PATCH 0 #ifdef _MSC_VER # if (_MSC_VER >= 1920) From 6e9fd5a430836e36549191cb13466c579e8a3435 Mon Sep 17 00:00:00 2001 From: xmrig Date: Tue, 22 Oct 2019 15:28:15 +0700 Subject: [PATCH 5/6] Update CHANGELOG.md --- CHANGELOG.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 9ada869bd..b380d75ba 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,6 +1,6 @@ # v4.4.0-beta - [#1068](https://github.com/xmrig/xmrig/pull/1068) Added support for `self-select` stratum protocol extension. -- [#1240](https://github.com/xmrig/xmrig/pull/1240) Sync with latest RandomX code. +- [#1240](https://github.com/xmrig/xmrig/pull/1240) Sync with the latest RandomX code. - [#1241](https://github.com/xmrig/xmrig/issues/1241) Fixed regression with colors on old Windows systems. - [#1243](https://github.com/xmrig/xmrig/pull/1243) Fixed incorrect OpenCL memory size detection in some cases. - [#1247](https://github.com/xmrig/xmrig/pull/1247) Fixed ARM64 RandomX code alignment. From dc705d88ab19f30f6c1bd56d0724820ae87bf020 Mon Sep 17 00:00:00 2001 From: XMRig Date: Tue, 22 Oct 2019 16:54:36 +0700 Subject: [PATCH 6/6] Fixed "coin" option for self select mode. --- src/base/net/stratum/SelfSelectClient.cpp | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/base/net/stratum/SelfSelectClient.cpp b/src/base/net/stratum/SelfSelectClient.cpp index ae82dfafb..4de49f6ef 100644 --- a/src/base/net/stratum/SelfSelectClient.cpp +++ b/src/base/net/stratum/SelfSelectClient.cpp @@ -131,6 +131,10 @@ bool xmrig::SelfSelectClient::parseResponse(int64_t id, rapidjson::Value &result return false; } + if (pool().coin().isValid()) { + m_job.setAlgorithm(pool().coin().algorithm(m_job.blob()[0])); + } + m_job.setHeight(Json::getUint64(result, kHeight)); m_job.setSeedHash(Json::getString(result, kSeedHash));