diff --git a/CHANGELOG.md b/CHANGELOG.md index e4a899cd3..d1f4b4612 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,9 @@ +# v6.13.1 +- [#2468](https://github.com/xmrig/xmrig/pull/2468) Fixed regression in previous version: don't send miner signature during regular mining. + +# v6.13.0 +- [#2445](https://github.com/xmrig/xmrig/pull/2445) Added support for solo mining with miner signatures for the upcoming Wownero fork. + # v6.12.2 - [#2280](https://github.com/xmrig/xmrig/issues/2280) GPU backends are now disabled in benchmark mode. - [#2322](https://github.com/xmrig/xmrig/pull/2322) Improved MSR compatibility with recent Linux kernels and updated `randomx_boost.sh`. diff --git a/scripts/randomx_boost.sh b/scripts/randomx_boost.sh index f74b34b23..3b60959d9 100755 --- a/scripts/randomx_boost.sh +++ b/scripts/randomx_boost.sh @@ -1,4 +1,4 @@ -#!/bin/bash +#!/bin/sh -e MSR_FILE=/sys/module/msr/parameters/allow_writes @@ -8,9 +8,9 @@ else modprobe msr allow_writes=on fi -if cat /proc/cpuinfo | grep -E 'AMD Ryzen|AMD EPYC' > /dev/null; +if grep -E 'AMD Ryzen|AMD EPYC' /proc/cpuinfo > /dev/null; then - if cat /proc/cpuinfo | grep "cpu family[[:space:]]:[[:space:]]25" > /dev/null; + if grep "cpu family[[:space:]]:[[:space:]]25" /proc/cpuinfo > /dev/null; then echo "Detected Zen3 CPU" wrmsr -a 0xc0011020 0x4480000000000 @@ -26,7 +26,7 @@ if cat /proc/cpuinfo | grep -E 'AMD Ryzen|AMD EPYC' > /dev/null; wrmsr -a 0xc001102b 0x2000cc16 echo "MSR register values for Zen1/Zen2 applied" fi -elif cat /proc/cpuinfo | grep "Intel" > /dev/null; +elif grep "Intel" /proc/cpuinfo > /dev/null; then echo "Detected Intel CPU" wrmsr -a 0x1a4 0xf diff --git a/src/backend/cpu/CpuWorker.cpp b/src/backend/cpu/CpuWorker.cpp index fc7d8bf3b..085bccb6c 100644 --- a/src/backend/cpu/CpuWorker.cpp +++ b/src/backend/cpu/CpuWorker.cpp @@ -329,7 +329,7 @@ void xmrig::CpuWorker::start() else # endif if (value < job.target()) { - JobResults::submit(job, current_job_nonces[i], m_hash + (i * 32), miner_signature_saved); + JobResults::submit(job, current_job_nonces[i], m_hash + (i * 32), job.hasMinerSignature() ? miner_signature_saved : nullptr); } } m_count += N; diff --git a/src/version.h b/src/version.h index 744b538e0..5dfc7b2b7 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 "6.13.0-dev" +#define APP_VERSION "6.13.2-dev" #define APP_DOMAIN "xmrig.com" #define APP_SITE "www.xmrig.com" #define APP_COPYRIGHT "Copyright (C) 2016-2021 xmrig.com" @@ -36,7 +36,7 @@ #define APP_VER_MAJOR 6 #define APP_VER_MINOR 13 -#define APP_VER_PATCH 0 +#define APP_VER_PATCH 2 #ifdef _MSC_VER # if (_MSC_VER >= 1920)