From 5bdfafd7197bdb0a825af439be3cbf83760f461c Mon Sep 17 00:00:00 2001 From: XMRig Date: Mon, 4 Apr 2022 20:17:40 +0700 Subject: [PATCH 1/5] v6.17.0-dev --- src/version.h | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/src/version.h b/src/version.h index 0e87de996..dcb01202c 100644 --- a/src/version.h +++ b/src/version.h @@ -1,6 +1,6 @@ /* XMRig - * Copyright (c) 2018-2021 SChernykh - * Copyright (c) 2016-2021 XMRig , + * Copyright (c) 2018-2022 SChernykh + * Copyright (c) 2016-2022 XMRig , * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -22,15 +22,15 @@ #define APP_ID "xmrig" #define APP_NAME "XMRig" #define APP_DESC "XMRig miner" -#define APP_VERSION "6.16.5-dev" +#define APP_VERSION "6.17.0-dev" #define APP_DOMAIN "xmrig.com" #define APP_SITE "www.xmrig.com" -#define APP_COPYRIGHT "Copyright (C) 2016-2021 xmrig.com" +#define APP_COPYRIGHT "Copyright (C) 2016-2022 xmrig.com" #define APP_KIND "miner" #define APP_VER_MAJOR 6 -#define APP_VER_MINOR 16 -#define APP_VER_PATCH 5 +#define APP_VER_MINOR 17 +#define APP_VER_PATCH 0 #ifdef _MSC_VER # if (_MSC_VER >= 1930) From e55a854314e47a173184f625b6eed0550c1f807d Mon Sep 17 00:00:00 2001 From: xmrig Date: Mon, 4 Apr 2022 20:33:39 +0700 Subject: [PATCH 2/5] Update CHANGELOG.md --- CHANGELOG.md | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 8834cd641..4594313d8 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,10 @@ +# v6.17.0 +- [#2954](https://github.com/xmrig/xmrig/pull/2954) **Dero HE fork support (`astrobwt/v2` algorithm).** + - [#2961](https://github.com/xmrig/xmrig/pull/2961) Dero HE (`astrobwt/v2`) CUDA config generator. + - [#2969](https://github.com/xmrig/xmrig/pull/2969) Dero HE (`astrobwt/v2`) OpenCL support. +- Fixed displayed DMI memory information for empty slots. +- [#2932](https://github.com/xmrig/xmrig/pull/2932) Fixed GhostRider with hwloc disabled. + # v6.16.4 - [#2904](https://github.com/xmrig/xmrig/pull/2904) Fixed unaligned memory accesses. - [#2908](https://github.com/xmrig/xmrig/pull/2908) Added MSVC/2022 to `version.h`. From 4c171bea1ed1769b49ea805e7db07c3aef3bab30 Mon Sep 17 00:00:00 2001 From: XMRig Date: Tue, 5 Apr 2022 15:15:03 +0700 Subject: [PATCH 3/5] Disable donate for astrobwt/v2. --- src/net/strategies/DonateStrategy.cpp | 10 ++++++++-- src/net/strategies/DonateStrategy.h | 4 ++-- 2 files changed, 10 insertions(+), 4 deletions(-) diff --git a/src/net/strategies/DonateStrategy.cpp b/src/net/strategies/DonateStrategy.cpp index 3d4003406..cdaf2258f 100644 --- a/src/net/strategies/DonateStrategy.cpp +++ b/src/net/strategies/DonateStrategy.cpp @@ -1,6 +1,6 @@ /* XMRig - * Copyright (c) 2018-2021 SChernykh - * Copyright (c) 2016-2021 XMRig , + * Copyright (c) 2018-2022 SChernykh + * Copyright (c) 2016-2022 XMRig , * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -106,6 +106,12 @@ int64_t xmrig::DonateStrategy::submit(const JobResult &result) void xmrig::DonateStrategy::connect() { +# ifdef XMRIG_ALGO_ASTROBWT + if (m_algorithm == Algorithm::ASTROBWT_DERO_2) { + return; + } +# endif + m_proxy = createProxy(); if (m_proxy) { m_proxy->connect(); diff --git a/src/net/strategies/DonateStrategy.h b/src/net/strategies/DonateStrategy.h index fd3038bad..56a0580ea 100644 --- a/src/net/strategies/DonateStrategy.h +++ b/src/net/strategies/DonateStrategy.h @@ -1,6 +1,6 @@ /* XMRig - * Copyright (c) 2018-2021 SChernykh - * Copyright (c) 2016-2021 XMRig , + * Copyright (c) 2018-2022 SChernykh + * Copyright (c) 2016-2022 XMRig , * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by From 56c95703a555e8bdf773b51ea475be9ad58c4333 Mon Sep 17 00:00:00 2001 From: XMRig Date: Tue, 5 Apr 2022 21:46:01 +0700 Subject: [PATCH 4/5] v6.17.0 --- src/version.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/version.h b/src/version.h index dcb01202c..381ed8193 100644 --- a/src/version.h +++ b/src/version.h @@ -22,7 +22,7 @@ #define APP_ID "xmrig" #define APP_NAME "XMRig" #define APP_DESC "XMRig miner" -#define APP_VERSION "6.17.0-dev" +#define APP_VERSION "6.17.0" #define APP_DOMAIN "xmrig.com" #define APP_SITE "www.xmrig.com" #define APP_COPYRIGHT "Copyright (C) 2016-2022 xmrig.com" From 56753d7c4a121c865f88995fe089b0216546f012 Mon Sep 17 00:00:00 2001 From: XMRig Date: Wed, 6 Apr 2022 01:58:24 +0700 Subject: [PATCH 5/5] v6.17.1-dev --- src/version.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/version.h b/src/version.h index 381ed8193..50c6fd273 100644 --- a/src/version.h +++ b/src/version.h @@ -22,7 +22,7 @@ #define APP_ID "xmrig" #define APP_NAME "XMRig" #define APP_DESC "XMRig miner" -#define APP_VERSION "6.17.0" +#define APP_VERSION "6.17.1-dev" #define APP_DOMAIN "xmrig.com" #define APP_SITE "www.xmrig.com" #define APP_COPYRIGHT "Copyright (C) 2016-2022 xmrig.com" @@ -30,7 +30,7 @@ #define APP_VER_MAJOR 6 #define APP_VER_MINOR 17 -#define APP_VER_PATCH 0 +#define APP_VER_PATCH 1 #ifdef _MSC_VER # if (_MSC_VER >= 1930)