Merge 735e6e9814 into ff53be5f3b

CHANGELOG.md

@@ -1,12 +1,3 @@
-# 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`.
-- [#2830](https://github.com/xmrig/xmrig/pull/2830) Added API rebind polling.
-- [#2927](https://github.com/xmrig/xmrig/pull/2927) Fixed compatibility with hwloc 1.11.x.
-- [#3060](https://github.com/xmrig/xmrig/pull/3060) Added x86 to `README.md`.
-- [#3236](https://github.com/xmrig/xmrig/pull/3236) Fixed: receive CUDA loader error on Linux too.
-- [#3290](https://github.com/xmrig/xmrig/pull/3290) Added [Zephyr](https://www.zephyrprotocol.com/) coin support for solo mining.
-
 # v6.19.3
 - [#3245](https://github.com/xmrig/xmrig/issues/3245) Improved algorithm negotiation for donation rounds by sending extra information about current mining job.
 - [#3254](https://github.com/xmrig/xmrig/pull/3254) Tweaked auto-tuning for Intel CPUs.

src/backend/opencl/runners/tools/OclKawPow.cpp

@@ -399,9 +399,6 @@ private:
     uv_loop_t* m_loop          = nullptr;
     uv_thread_t m_loopThread   = {};
     uv_async_t m_shutdownAsync = {};
-    uv_async_t m_batonAsync    = {};
-
-    std::vector<KawPowBaton> m_batons;
 
     static void loop(void* data)
     {
@@ -422,37 +419,19 @@ void KawPowBuilder::build_async(const IOclRunner& runner, uint64_t period, uint3
     if (!m_loop) {
         m_loop = new uv_loop_t{};
         uv_loop_init(m_loop);
-
+        uv_async_init(m_loop, &m_shutdownAsync, [](uv_async_t* handle) { uv_close(reinterpret_cast<uv_handle_t*>(handle), nullptr); });
-        uv_async_init(m_loop, &m_shutdownAsync, [](uv_async_t* handle)
-            {
-                KawPowBuilder* builder = reinterpret_cast<KawPowBuilder*>(handle->data);
-                uv_close(reinterpret_cast<uv_handle_t*>(&builder->m_shutdownAsync), nullptr);
-                uv_close(reinterpret_cast<uv_handle_t*>(&builder->m_batonAsync), nullptr);
-            });
-
-        uv_async_init(m_loop, &m_batonAsync, [](uv_async_t* handle)
-            {
-                std::vector<KawPowBaton> batons;
-                {
-                    KawPowBuilder* b = reinterpret_cast<KawPowBuilder*>(handle->data);
-
-                    std::lock_guard<std::mutex> lock(b->m_mutex);
-                    batons = std::move(b->m_batons);
-                }
-
-                for (const KawPowBaton& baton : batons) {
-                    builder.build(baton.runner, baton.period, baton.worksize);
-                }
-            });
-
-        m_shutdownAsync.data = this;
-        m_batonAsync.data = this;
-
         uv_thread_create(&m_loopThread, loop, this);
     }
 
-    m_batons.emplace_back(runner, period, worksize);
+    KawPowBaton* baton = new KawPowBaton(runner, period, worksize);
-    uv_async_send(&m_batonAsync);
+
+    uv_queue_work(m_loop, &baton->req,
+        [](uv_work_t* req) {
+            KawPowBaton* baton = static_cast<KawPowBaton*>(req->data);
+            builder.build(baton->runner, baton->period, baton->worksize);
+        },
+        [](uv_work_t* req, int) { delete static_cast<KawPowBaton*>(req->data); }
+    );
 }
 
 

src/base/api/Api.cpp

@@ -1,6 +1,6 @@
 /* XMRig
- * Copyright (c) 2018-2023 SChernykh   <https://github.com/SChernykh>
+ * Copyright (c) 2018-2021 SChernykh   <https://github.com/SChernykh>
- * Copyright (c) 2016-2023 XMRig       <https://github.com/xmrig>, <support@xmrig.com>
+ * Copyright (c) 2016-2021 XMRig       <https://github.com/xmrig>, <support@xmrig.com>
  *
  *   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
@@ -123,21 +123,6 @@ void xmrig::Api::stop()
 }
 
 
-void xmrig::Api::tick()
-{
-#   ifdef XMRIG_FEATURE_HTTP
-    if (m_httpd->isBound() || !m_base->config()->http().isEnabled()) {
-        return;
-    }
-
-    if (++m_ticks % 10 == 0) {
-        m_ticks = 0;
-        m_httpd->start();
-    }
-#   endif
-}
-
-
 void xmrig::Api::onConfigChanged(Config *config, Config *previousConfig)
 {
     if (config->apiId() != previousConfig->apiId()) {

src/base/api/Api.h

@@ -1,6 +1,6 @@
 /* XMRig
- * Copyright (c) 2018-2023 SChernykh   <https://github.com/SChernykh>
+ * Copyright (c) 2018-2021 SChernykh   <https://github.com/SChernykh>
- * Copyright (c) 2016-2023 XMRig       <https://github.com/xmrig>, <support@xmrig.com>
+ * Copyright (c) 2016-2021 XMRig       <https://github.com/xmrig>, <support@xmrig.com>
  *
  *   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
@@ -21,6 +21,7 @@
 
 
 #include <vector>
+#include <cstdint>
 
 
 #include "base/kernel/interfaces/IBaseListener.h"
@@ -43,7 +44,7 @@ class Api : public IBaseListener
 public:
     XMRIG_DISABLE_COPY_MOVE_DEFAULT(Api)
 
-    explicit Api(Base *base);
+    Api(Base *base);
     ~Api() override;
 
     inline const char *id() const                   { return m_id; }
@@ -53,7 +54,6 @@ public:
     void request(const HttpData &req);
     void start();
     void stop();
-    void tick();
 
 protected:
     void onConfigChanged(Config *config, Config *previousConfig) override;
@@ -65,15 +65,14 @@ private:
 
     Base *m_base;
     char m_id[32]{};
-    const uint64_t m_timestamp;
-    Httpd *m_httpd  = nullptr;
-    std::vector<IApiListener *> m_listeners;
     String m_workerId;
-    uint8_t m_ticks = 0;
+    const uint64_t m_timestamp;
+    Httpd *m_httpd = nullptr;
+    std::vector<IApiListener *> m_listeners;
 };
 
 
 } // namespace xmrig
 
 
-#endif // XMRIG_API_H
+#endif /* XMRIG_API_H */

src/base/api/Httpd.h

@@ -1,6 +1,6 @@
 /* XMRig
- * Copyright (c) 2018-2023 SChernykh   <https://github.com/SChernykh>
+ * Copyright (c) 2018-2021 SChernykh   <https://github.com/SChernykh>
- * Copyright (c) 2016-2023 XMRig       <https://github.com/xmrig>, <support@xmrig.com>
+ * Copyright (c) 2016-2021 XMRig       <https://github.com/xmrig>, <support@xmrig.com>
  *
  *   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,6 +22,11 @@
 
 #include "base/kernel/interfaces/IBaseListener.h"
 #include "base/net/http/HttpListener.h"
+#include "base/tools/Object.h"
+
+
+#include <cstdint>
+#include <memory>
 
 
 namespace xmrig {
@@ -38,11 +43,9 @@ class Httpd : public IBaseListener, public IHttpListener
 public:
     XMRIG_DISABLE_COPY_MOVE_DEFAULT(Httpd)
 
-    explicit Httpd(Base *base);
+    Httpd(Base *base);
     ~Httpd() override;
 
-    inline bool isBound() const { return m_server != nullptr; }
-
     bool start();
     void stop();
 
@@ -66,7 +69,7 @@ private:
 };
 
 
-} // namespace xmrig
+} /* namespace xmrig */
 
 
-#endif // XMRIG_HTTPD_H
+#endif /* XMRIG_HTTPD_H */

src/base/crypto/Coin.cpp

@@ -53,7 +53,6 @@ static const CoinInfo coinInfo[] = {
     { Algorithm::RX_KEVA,         "KVA",      "Kevacoin",     0,      0,              MAGENTA_BG_BOLD(WHITE_BOLD_S " keva    ") },
     { Algorithm::KAWPOW_RVN,      "RVN",      "Ravencoin",    0,      0,              BLUE_BG_BOLD(   WHITE_BOLD_S " raven   ") },
     { Algorithm::RX_WOW,          "WOW",      "Wownero",      300,    100000000000,   MAGENTA_BG_BOLD(WHITE_BOLD_S " wownero ") },
-    { Algorithm::RX_0,            "ZEPH",     "Zephyr",       120,    1000000000000,  BLUE_BG_BOLD(   WHITE_BOLD_S " zephyr  ") },
 };
 
 

src/base/crypto/Coin.h

@@ -39,7 +39,6 @@ public:
         KEVA,
         RAVEN,
         WOWNERO,
-        ZEPHYR,
         MAX
     };
 

src/base/tools/cryptonote/BlockTemplate.cpp

@@ -197,11 +197,6 @@ bool xmrig::BlockTemplate::parse(bool hashes)
         ar(m_vote);
     }
 
-    if (m_coin == Coin::ZEPHYR) {
-        uint8_t pricing_record[24];
-        ar(pricing_record);
-    }
-
     // Miner transaction begin
     // Prefix begin
     setOffset(MINER_TX_PREFIX_OFFSET, ar.index());
@@ -225,8 +220,8 @@ bool xmrig::BlockTemplate::parse(bool hashes)
     ar(m_height);
     ar(m_numOutputs);
 
-    const uint64_t expected_outputs = (m_coin == Coin::ZEPHYR) ? 2 : 1;
+    // must be 1 output
-    if (m_numOutputs != expected_outputs) {
+    if (m_numOutputs != 1) {
         return false;
     }
 
@@ -242,35 +237,7 @@ bool xmrig::BlockTemplate::parse(bool hashes)
 
     ar(m_ephPublicKey, kKeySize);
 
-    if (m_coin == Coin::ZEPHYR) {
+    if (m_outputType == 3) {
-        if (m_outputType != 2) {
-            return false;
-        }
-
-        uint64_t asset_type_len;
-        ar(asset_type_len);
-        ar.skip(asset_type_len);
-        ar(m_viewTag);
-
-        uint64_t amount2;
-        ar(amount2);
-
-        uint8_t output_type2;
-        ar(output_type2);
-        if (output_type2 != 2) {
-            return false;
-        }
-
-        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);
     }
 
@@ -281,8 +248,6 @@ bool xmrig::BlockTemplate::parse(bool hashes)
     BlobReader<true> ar_extra(blob(TX_EXTRA_OFFSET), m_extraSize);
     ar.skip(m_extraSize);
 
-    bool pubkey_offset_first = true;
-
     while (ar_extra.index() < m_extraSize) {
         uint64_t extra_tag  = 0;
         uint64_t size       = 0;
@@ -291,10 +256,7 @@ bool xmrig::BlockTemplate::parse(bool hashes)
 
         switch (extra_tag) {
         case 0x01: // TX_EXTRA_TAG_PUBKEY
-            if (pubkey_offset_first) {
+            setOffset(TX_PUBKEY_OFFSET, offset(TX_EXTRA_OFFSET) + ar_extra.index());
-                pubkey_offset_first = false;
-                setOffset(TX_PUBKEY_OFFSET, offset(TX_EXTRA_OFFSET) + ar_extra.index());
-            }
             ar_extra.skip(kKeySize);
             break;
 
@@ -315,13 +277,6 @@ bool xmrig::BlockTemplate::parse(bool hashes)
         }
     }
 
-    if (m_coin == Coin::ZEPHYR) {
-        uint64_t pricing_record_height, amount_burnt, amount_minted;
-        ar(pricing_record_height);
-        ar(amount_burnt);
-        ar(amount_minted);
-    }
-
     setOffset(MINER_TX_PREFIX_END_OFFSET, ar.index());
     // Prefix end
 

src/net/Network.cpp

@@ -308,10 +308,6 @@ void xmrig::Network::tick()
     if (m_donate) {
         m_donate->tick(now);
     }
-
-#   ifdef XMRIG_FEATURE_API
-    m_controller->api()->tick();
-#   endif
 }
 
 

src/version.h

@@ -22,15 +22,15 @@
 #define APP_ID        "xmrig"
 #define APP_NAME      "XMRig"
 #define APP_DESC      "XMRig miner"
-#define APP_VERSION   "6.20.1-dev"
+#define APP_VERSION   "6.19.4-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  20
+#define APP_VER_MINOR  19
-#define APP_VER_PATCH  1
+#define APP_VER_PATCH  4
 
 #ifdef _MSC_VER
 #   if (_MSC_VER >= 1930)