Merge 8f507b7d09 into fee51b20fa

CHANGELOG.md

@@ -1,13 +1,3 @@
-# v6.21.0
-- [#3302](https://github.com/xmrig/xmrig/pull/3302) [#3312](https://github.com/xmrig/xmrig/pull/3312) Enabled keepalive for Windows (>= Vista).
-- [#3320](https://github.com/xmrig/xmrig/pull/3320) Added "built for OS/architecture/bits" to "ABOUT".
-- [#3339](https://github.com/xmrig/xmrig/pull/3339) Added SNI option for TLS connections.
-- [#3342](https://github.com/xmrig/xmrig/pull/3342) Update `cn_main_loop.asm`.
-- [#3346](https://github.com/xmrig/xmrig/pull/3346) ARM64 JIT: don't use `x18` register.
-- [#3348](https://github.com/xmrig/xmrig/pull/3348) Update to latest `sse2neon.h`.
-- [#3356](https://github.com/xmrig/xmrig/pull/3356) Updated pricing record size for **Zephyr** solo mining.
-- [#3358](https://github.com/xmrig/xmrig/pull/3358) **Zephyr** solo mining: handle multiple outputs.
-
 # v6.20.0
 - Added new ARM CPU names.
 - [#2394](https://github.com/xmrig/xmrig/pull/2394) Added new CMake options `ARM_V8` and `ARM_V7`.

src/backend/common/common.cmake

@@ -20,7 +20,7 @@ set(SOURCES_BACKEND_COMMON
     src/backend/common/Workers.cpp
    )
 
-if (WITH_RANDOMX AND WITH_BENCHMARK)
+if (WITH_BENCHMARK AND (WITH_RANDOMX OR WITH_GHOSTRIDER))
     list(APPEND HEADERS_BACKEND_COMMON
         src/backend/common/benchmark/Benchmark.h
         src/backend/common/benchmark/BenchState_test.h

src/base/base.cmake

@@ -259,7 +259,7 @@ if (WITH_KAWPOW OR WITH_GHOSTRIDER)
 endif()
 
 
-if (WITH_RANDOMX AND WITH_BENCHMARK)
+if (WITH_BENCHMARK AND (WITH_RANDOMX OR WITH_GHOSTRIDER))
     add_definitions(/DXMRIG_FEATURE_BENCHMARK)
 
     list(APPEND HEADERS_BASE

src/base/tools/cryptonote/BlockTemplate.cpp

@@ -198,7 +198,7 @@ bool xmrig::BlockTemplate::parse(bool hashes)
     }
 
     if (m_coin == Coin::ZEPHYR) {
-        uint8_t pricing_record[120];
+        uint8_t pricing_record[24];
         ar(pricing_record);
     }
 
@@ -225,12 +225,8 @@ bool xmrig::BlockTemplate::parse(bool hashes)
     ar(m_height);
     ar(m_numOutputs);
 
-    if (m_coin == Coin::ZEPHYR) {
+    const uint64_t expected_outputs = (m_coin == Coin::ZEPHYR) ? 2 : 1;
-        if (m_numOutputs < 2) {
+    if (m_numOutputs != expected_outputs) {
-            return false;
-        }
-    }
-    else if (m_numOutputs != 1) {
         return false;
     }
 
@@ -256,25 +252,23 @@ bool xmrig::BlockTemplate::parse(bool hashes)
         ar.skip(asset_type_len);
         ar(m_viewTag);
 
-        for (uint64_t k = 1; k < m_numOutputs; ++k) {
+        uint64_t amount2;
-            uint64_t amount2;
+        ar(amount2);
-            ar(amount2);
 
-            uint8_t output_type2;
+        uint8_t output_type2;
-            ar(output_type2);
+        ar(output_type2);
-            if (output_type2 != 2) {
+        if (output_type2 != 2) {
-                return false;
+            return false;
-            }
-
-            Span key2;
-            ar(key2, kKeySize);
-
-            ar(asset_type_len);
-            ar.skip(asset_type_len);
-
-            uint8_t view_tag2;
-            ar(view_tag2);
         }
+
+        Span key2;
+        ar(key2, kKeySize);
+
+        ar(asset_type_len);
+        ar.skip(asset_type_len);
+
+        uint8_t view_tag2;
+        ar(view_tag2);
     }
     else if (m_outputType == 3) {
         ar(m_viewTag);

src/crypto/ghostrider/ghostrider.cpp

@@ -333,8 +333,8 @@ void benchmark()
 
         const CnHash::AlgoVariant* av = Cpu::info()->hasAES() ? av_hw_aes : av_soft_aes;
 
-        uint8_t buf[80];
+        uint8_t buf[80] = { 0 };
-        uint8_t hash[32 * 8];
+        uint8_t hash[32 * 8] = { 0 };
 
         LOG_VERBOSE("%24s |  N  | Hashrate", "Algorithm");
         LOG_VERBOSE("-------------------------|-----|-------------");
@@ -540,10 +540,13 @@ HelperThread* create_helper_thread(int64_t cpu_index, int priority, const std::v
             });
 
             if (hwloc_bitmap_weight(helper_cpu_set) > 0) {
+                hwloc_bitmap_free(main_threads_set);
                 return new HelperThread(helper_cpu_set, priority, is8MB);
             }
         }
     }
+    hwloc_bitmap_free(helper_cpu_set);
+    hwloc_bitmap_free(main_threads_set);
 #endif
 
     return nullptr;

src/version.h

@@ -22,15 +22,15 @@
 #define APP_ID        "xmrig"
 #define APP_NAME      "XMRig"
 #define APP_DESC      "XMRig miner"
-#define APP_VERSION   "6.21.0"
+#define APP_VERSION   "6.20.1-dev"
 #define APP_DOMAIN    "xmrig.com"
 #define APP_SITE      "www.xmrig.com"
 #define APP_COPYRIGHT "Copyright (C) 2016-2023 xmrig.com"
 #define APP_KIND      "miner"
 
 #define APP_VER_MAJOR  6
-#define APP_VER_MINOR  21
+#define APP_VER_MINOR  20
-#define APP_VER_PATCH  0
+#define APP_VER_PATCH  1
 
 #ifdef _MSC_VER
 #   if (_MSC_VER >= 1930)