Merge branch 'dev'

CHANGELOG.md

@@ -1,3 +1,10 @@
+# v6.3.0
+- Sync changes with the miner.
+  - Added support for upcoming Haven fork.
+  - Added tags to log records.
+  - [#1708](https://github.com/xmrig/xmrig/issues/1708) Added `title` option.
+  - [#1728](https://github.com/xmrig/xmrig/issues/1728) Fixed, 32 bit Windows builds was crash on start.
+
 # v5.11.0
 - Added new algorithm `cn/ccx` for Conceal.
 - Removed previously deprecated `cn/gpu` algorithm.

src/App.cpp

@@ -30,10 +30,10 @@
 #include "App.h"
 #include "base/io/Console.h"
 #include "base/io/log/Log.h"
+#include "base/io/log/Tags.h"
 #include "base/io/Signals.h"
 #include "core/config/Config.h"
 #include "core/Controller.h"
-#include "proxy/Proxy.h"
 #include "Summary.h"
 #include "version.h"
 
@@ -79,7 +79,7 @@ int xmrig::App::exec()
     Summary::print(m_controller);
 
     if (m_controller->config()->isDryRun()) {
-        LOG_NOTICE("OK");
+        LOG_NOTICE("%s " WHITE_BOLD("OK"), Tags::config());
 
         return 0;
     }
@@ -95,47 +95,12 @@ int xmrig::App::exec()
 
 void xmrig::App::onConsoleCommand(char command)
 {
-    switch (command) {
-#   ifdef APP_DEVEL
-    case 's':
-    case 'S':
-        m_controller->proxy()->printState();
-        break;
-#   endif
-
-    case 'v':
-    case 'V':
-        m_controller->config()->toggleVerbose();
-        LOG_NOTICE("verbose: %d", m_controller->config()->isVerbose());
-        break;
-
-    case 'h':
-    case 'H':
-        m_controller->proxy()->printHashrate();
-        break;
-
-    case 'c':
-    case 'C':
-        m_controller->proxy()->printConnections();
-        break;
-
-    case 'd':
-    case 'D':
-        m_controller->proxy()->toggleDebug();
-        break;
-
-    case 'w':
-    case 'W':
-        m_controller->proxy()->printWorkers();
-        break;
-
-    case 3:
-        LOG_WARN("Ctrl+C received, exiting");
+    if (command == 3) {
+        LOG_WARN("%s " YELLOW("Ctrl+C received, exiting"), Tags::signal());
         close();
-        break;
-
-    default:
-        break;
+    }
+    else {
+        m_controller->execCommand(command);
     }
 }
 
@@ -145,15 +110,15 @@ void xmrig::App::onSignal(int signum)
     switch (signum)
     {
     case SIGHUP:
-        LOG_WARN("SIGHUP received, exiting");
+        LOG_WARN("%s " YELLOW("SIGHUP received, exiting"), Tags::signal());
         break;
 
     case SIGTERM:
-        LOG_WARN("SIGTERM received, exiting");
+        LOG_WARN("%s " YELLOW("SIGTERM received, exiting"), Tags::signal());
         break;
 
     case SIGINT:
-        LOG_WARN("SIGINT received, exiting");
+        LOG_WARN("%s " YELLOW("SIGINT received, exiting"), Tags::signal());
         break;
 
     default:

src/base/base.cmake

@@ -3,6 +3,7 @@ set(HEADERS_BASE
     src/base/crypto/Algorithm.h
     src/base/crypto/Coin.h
     src/base/crypto/keccak.h
+    src/base/crypto/sha3.h
     src/base/io/Console.h
     src/base/io/Env.h
     src/base/io/json/Json.h
@@ -12,11 +13,13 @@ set(HEADERS_BASE
     src/base/io/log/backends/FileLog.h
     src/base/io/log/FileLogWriter.h
     src/base/io/log/Log.h
+    src/base/io/log/Tags.h
     src/base/io/Signals.h
     src/base/io/Watcher.h
     src/base/kernel/Base.h
     src/base/kernel/config/BaseConfig.h
     src/base/kernel/config/BaseTransform.h
+    src/base/kernel/config/Title.h
     src/base/kernel/Entry.h
     src/base/kernel/interfaces/IBaseListener.h
     src/base/kernel/interfaces/IClient.h
@@ -69,6 +72,7 @@ set(SOURCES_BASE
     src/base/crypto/Algorithm.cpp
     src/base/crypto/Coin.cpp
     src/base/crypto/keccak.cpp
+    src/base/crypto/sha3.cpp
     src/base/io/Console.cpp
     src/base/io/Env.cpp
     src/base/io/json/Json.cpp
@@ -78,11 +82,13 @@ set(SOURCES_BASE
     src/base/io/log/backends/FileLog.cpp
     src/base/io/log/FileLogWriter.cpp
     src/base/io/log/Log.cpp
+    src/base/io/log/Tags.cpp
     src/base/io/Signals.cpp
     src/base/io/Watcher.cpp
     src/base/kernel/Base.cpp
     src/base/kernel/config/BaseConfig.cpp
     src/base/kernel/config/BaseTransform.cpp
+    src/base/kernel/config/Title.cpp
     src/base/kernel/Entry.cpp
     src/base/kernel/Platform.cpp
     src/base/kernel/Process.cpp
@@ -203,3 +209,16 @@ if (WITH_ENV_VARS)
 else()
     remove_definitions(/DXMRIG_FEATURE_ENV)
 endif()
+
+
+if (WITH_KAWPOW)
+    list(APPEND HEADERS_BASE
+        src/base/net/stratum/AutoClient.h
+        src/base/net/stratum/EthStratumClient.h
+        )
+
+    list(APPEND SOURCES_BASE
+        src/base/net/stratum/AutoClient.cpp
+        src/base/net/stratum/EthStratumClient.cpp
+        )
+endif()