From d24babb96eaa32d9cb346e23aa891ae802e41f99 Mon Sep 17 00:00:00 2001 From: xmrig Date: Thu, 29 Mar 2018 17:15:41 +0700 Subject: [PATCH 1/9] Update README.md --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 962408e9c..08d589668 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,6 @@ # XMRig -:warning: **You must update miners to version 2.5 before April 6 due [Monero PoW change](https://getmonero.org/2018/02/11/PoW-change-and-key-reuse.html).** +:warning: **You must update miners to version 2.5 before April 6 due [Monero PoW change](https://getmonero.org/2018/02/11/PoW-change-and-key-reuse.html), also check issue [#482](https://github.com/xmrig/xmrig/issues/482)** [![Github All Releases](https://img.shields.io/github/downloads/xmrig/xmrig/total.svg)](https://github.com/xmrig/xmrig/releases) [![GitHub release](https://img.shields.io/github/release/xmrig/xmrig/all.svg)](https://github.com/xmrig/xmrig/releases) From 1c2b5acb2c6fd848ea5472595cb6f5b74c1c8725 Mon Sep 17 00:00:00 2001 From: xmrig Date: Sun, 8 Apr 2018 02:31:04 +0700 Subject: [PATCH 2/9] Update README.md --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 08d589668..e2801fa68 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,6 @@ # XMRig -:warning: **You must update miners to version 2.5 before April 6 due [Monero PoW change](https://getmonero.org/2018/02/11/PoW-change-and-key-reuse.html), also check issue [#482](https://github.com/xmrig/xmrig/issues/482)** +:warning: **If you mine Monero, Aeon, Sumokoin, Turtlecoin, Stellite, GRAFT, Haven Protocol, IPBC, [PLEASE READ](https://github.com/xmrig/xmrig/issues/482)!** :warning: [![Github All Releases](https://img.shields.io/github/downloads/xmrig/xmrig/total.svg)](https://github.com/xmrig/xmrig/releases) [![GitHub release](https://img.shields.io/github/release/xmrig/xmrig/all.svg)](https://github.com/xmrig/xmrig/releases) From 0814c28998624bd86aeacfadaf9fbb4ccbd74240 Mon Sep 17 00:00:00 2001 From: chinarulezzz Date: Tue, 17 Apr 2018 23:12:19 +0300 Subject: [PATCH 3/9] log/Log.cpp: va_list 'args' was opened but not closed by va_end() --- src/log/Log.cpp | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/log/Log.cpp b/src/log/Log.cpp index 3e5d5671a..c6030f667 100644 --- a/src/log/Log.cpp +++ b/src/log/Log.cpp @@ -47,6 +47,8 @@ void Log::message(Log::Level level, const char* fmt, ...) backend->message(level, fmt, copy); va_end(copy); } + + va_end(args); } From f9dbd7bc78a93a659b3b4b749bff597c4ee0b015 Mon Sep 17 00:00:00 2001 From: Ange Date: Sat, 21 Apr 2018 00:36:58 +0200 Subject: [PATCH 4/9] valgrind showed some conditional jumps when printing the hashrate --- src/workers/Hashrate.cpp | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/workers/Hashrate.cpp b/src/workers/Hashrate.cpp index 7d2e6a4c5..71aa9cc66 100644 --- a/src/workers/Hashrate.cpp +++ b/src/workers/Hashrate.cpp @@ -151,10 +151,10 @@ void Hashrate::add(size_t threadId, uint64_t count, uint64_t timestamp) void Hashrate::print() { - char num1[8]; - char num2[8]; - char num3[8]; - char num4[8]; + char num1[8] = { 0 }; + char num2[8] = { 0 }; + char num3[8] = { 0 }; + char num4[8] = { 0 }; LOG_INFO(m_controller->config()->isColors() ? "\x1B[01;37mspeed\x1B[0m 2.5s/60s/15m \x1B[01;36m%s \x1B[22;36m%s %s \x1B[01;36mH/s\x1B[0m max: \x1B[01;36m%s H/s" : "speed 2.5s/60s/15m %s %s %s H/s max: %s H/s", format(calc(ShortInterval), num1, sizeof(num1)), From 593056113c10a1861e3ddc78d825526f82c7e2a5 Mon Sep 17 00:00:00 2001 From: XMRig Date: Sat, 21 Apr 2018 22:23:12 +0700 Subject: [PATCH 5/9] #541 Revert all changes in Client::close(). --- src/net/Client.cpp | 23 +---------------------- src/version.h | 4 ++-- 2 files changed, 3 insertions(+), 24 deletions(-) diff --git a/src/net/Client.cpp b/src/net/Client.cpp index c8a93f24c..9e6758e38 100644 --- a/src/net/Client.cpp +++ b/src/net/Client.cpp @@ -205,28 +205,7 @@ bool Client::close() setState(ClosingState); - uv_stream_t *stream = reinterpret_cast(m_socket); - - if (uv_is_readable(stream) == 1) { - uv_read_stop(stream); - } - - if (uv_is_writable(stream) == 1) { - const int rc = uv_shutdown(new uv_shutdown_t, stream, [](uv_shutdown_t* req, int status) { - if (uv_is_closing(reinterpret_cast(req->handle)) == 0) { - uv_close(reinterpret_cast(req->handle), Client::onClose); - } - - delete req; - }); - - assert(rc == 0); - - if (rc != 0) { - onClose(); - } - } - else { + if (uv_is_closing(reinterpret_cast(m_socket)) == 0) { uv_close(reinterpret_cast(m_socket), Client::onClose); } diff --git a/src/version.h b/src/version.h index 060edcb72..4b44f2e80 100644 --- a/src/version.h +++ b/src/version.h @@ -27,7 +27,7 @@ #define APP_ID "xmrig" #define APP_NAME "XMRig" #define APP_DESC "XMRig CPU miner" -#define APP_VERSION "2.5.2" +#define APP_VERSION "2.5.3" #define APP_DOMAIN "xmrig.com" #define APP_SITE "www.xmrig.com" #define APP_COPYRIGHT "Copyright (C) 2016-2018 xmrig.com" @@ -35,7 +35,7 @@ #define APP_VER_MAJOR 2 #define APP_VER_MINOR 5 -#define APP_VER_BUILD 2 +#define APP_VER_BUILD 3 #define APP_VER_REV 0 #ifdef _MSC_VER From 7365e0486bf1e991bf77ab3e0085004d61cb0a86 Mon Sep 17 00:00:00 2001 From: XMRig Date: Sat, 21 Apr 2018 22:35:26 +0700 Subject: [PATCH 6/9] Disable IPv6 for API. --- src/api/Httpd.cpp | 4 ---- 1 file changed, 4 deletions(-) diff --git a/src/api/Httpd.cpp b/src/api/Httpd.cpp index 861086ed9..a0c591c4b 100644 --- a/src/api/Httpd.cpp +++ b/src/api/Httpd.cpp @@ -51,10 +51,6 @@ bool Httpd::start() if (MHD_is_feature_supported(MHD_FEATURE_EPOLL)) { flags = MHD_USE_EPOLL_LINUX_ONLY | MHD_USE_EPOLL_INTERNALLY_LINUX_ONLY; } - - if (MHD_is_feature_supported(MHD_FEATURE_IPv6)) { - flags |= MHD_USE_DUAL_STACK; - } # endif m_daemon = MHD_start_daemon(flags, m_port, nullptr, nullptr, &Httpd::handler, this, MHD_OPTION_END); From 90a09f20b3095903884d0a092b67f78d1f4c9685 Mon Sep 17 00:00:00 2001 From: xmrig Date: Sat, 21 Apr 2018 22:52:06 +0700 Subject: [PATCH 7/9] Update CHANGELOG.md --- CHANGELOG.md | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index ab31e6988..e5a74cf6c 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,7 @@ +# v2.5.3 +- Fixed critical bug, in some cases miner was can't recovery connection and switch to failover pool, version 2.5.2 affected. If you use v2.6.0-beta3 this issue doesn't concern you. +- [#499](https://github.com/xmrig/xmrig/issues/499) IPv6 support disabled for internal HTTP API. + # v2.5.2 - [#448](https://github.com/xmrig/xmrig/issues/478) Fixed broken reconnect. From 38874fbb0a175d3348acc54781dc71a5034c5c7b Mon Sep 17 00:00:00 2001 From: XMRig Date: Sun, 22 Apr 2018 12:57:37 +0700 Subject: [PATCH 8/9] Added workaround for nicehash.com if you use cryptonightv7..nicehash.com option variant=1 will be set automatically. --- CHANGELOG.md | 1 + src/net/Url.cpp | 4 ++++ 2 files changed, 5 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index e5a74cf6c..082ee0c18 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,6 +1,7 @@ # v2.5.3 - Fixed critical bug, in some cases miner was can't recovery connection and switch to failover pool, version 2.5.2 affected. If you use v2.6.0-beta3 this issue doesn't concern you. - [#499](https://github.com/xmrig/xmrig/issues/499) IPv6 support disabled for internal HTTP API. +- Added workaround for nicehash.com if you use `cryptonightv7..nicehash.com` option `variant=1` will be set automatically. # v2.5.2 - [#448](https://github.com/xmrig/xmrig/issues/478) Fixed broken reconnect. diff --git a/src/net/Url.cpp b/src/net/Url.cpp index c17ef690a..99fe9dc2b 100644 --- a/src/net/Url.cpp +++ b/src/net/Url.cpp @@ -180,6 +180,10 @@ void Url::adjust(int algo) if (strstr(m_host, ".nicehash.com")) { m_keepAlive = false; m_nicehash = true; + + if (strstr(m_host, "cryptonightv7.")) { + m_variant = xmrig::VARIANT_V1; + } } if (strstr(m_host, ".minergate.com")) { From 8d9025f2caf31fc97a14a5571b5ff85d34474db3 Mon Sep 17 00:00:00 2001 From: xmrig Date: Sun, 22 Apr 2018 22:47:05 +0700 Subject: [PATCH 9/9] Update README.md --- README.md | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/README.md b/README.md index e2801fa68..f69aa3465 100644 --- a/README.md +++ b/README.md @@ -124,10 +124,10 @@ Please note performance is highly dependent on system load. The numbers above ar ## Release checksums ### SHA-256 ``` -b070d06a3615f3db67ad3beab43d6d21f3c88026aa2b4726a93df47145cd30ec xmrig-2.5.2-xenial-amd64.tar.gz/xmrig-2.5.2/xmrig -4852135d3f04fd450ba39abce51ca40ff9131d222220c8b30804be05f6679295 xmrig-2.5.2-gcc-win32.zip/xmrig.exe -284309d07f08261af19c937ece6d2031910d9124a7359c207ded65890b2d7c5f xmrig-2.5.2-gcc-win64.zip/xmrig.exe -e1dc46158a578fb030538fb06e5663a6acc5763545fb447a00ce0a6b388c5226 xmrig-2.5.2-msvc-win64.zip/xmrig.exe +5ae25d05b7735dd6e2482e8dba0cf0f5d10f9738855c4ad4eaf449b8ccd2e5be xmrig-2.5.3-xenial-amd64.tar.gz/xmrig-2.5.3/xmrig +f11f3b381425ca4181c425d5b693407431f964759bb903f66b7cd2345fcdd786 xmrig-2.5.3-gcc-win32.zip/xmrig.exe +67df8b89714e2921931092861361dbae4716c4ab872c767c92adae24dca01514 xmrig-2.5.3-gcc-win64.zip/xmrig.exe +52bf6e0ef72c84282f4df411125384444c521ed9143e5d8c7e7e445d7d55e143 xmrig-2.5.3-msvc-win64.zip/xmrig.exe ``` ## Contacts