Merge f0f6d1666c into 50a98a4bb1

add support for townforge (monero fork using randomx)

CMakeLists.txt

@@ -32,6 +32,7 @@ option(WITH_VAES            "Enable VAES instructions for Cryptonight" ON)
 option(WITH_BENCHMARK       "Enable builtin RandomX benchmark and stress test" ON)
 option(WITH_SECURE_JIT      "Enable secure access to JIT memory" OFF)
 option(WITH_DMI             "Enable DMI/SMBIOS reader" ON)
+option(WITH_BUNDLED_FMT     "Force use of bundled fmt library" ON)
 
 option(BUILD_STATIC         "Build static binary" OFF)
 option(ARM_V8               "Force ARMv8 (64 bit) architecture, use with caution if automatic detection fails, but you sure it may work" OFF)
@@ -198,6 +199,7 @@ add_definitions(-D__STDC_FORMAT_MACROS -DUNICODE -D_FILE_OFFSET_BITS=64)
 find_package(UV REQUIRED)
 
 include(cmake/flags.cmake)
+include(cmake/fmt.cmake)
 include(cmake/randomx.cmake)
 include(cmake/argon2.cmake)
 include(cmake/kawpow.cmake)
@@ -229,7 +231,7 @@ include(src/hw/api/api.cmake)
 include(src/hw/dmi/dmi.cmake)
 
 include_directories(src)
-include_directories(src/3rdparty)
+include_directories(src/3rdparty/CL)
 include_directories(${UV_INCLUDE_DIR})
 
 if (WITH_DEBUG_LOG)
@@ -237,7 +239,7 @@ if (WITH_DEBUG_LOG)
 endif()
 
 add_executable(${CMAKE_PROJECT_NAME} ${HEADERS} ${SOURCES} ${SOURCES_OS} ${HEADERS_CRYPTO} ${SOURCES_CRYPTO} ${SOURCES_SYSLOG} ${TLS_SOURCES} ${XMRIG_ASM_SOURCES})
-target_link_libraries(${CMAKE_PROJECT_NAME} ${XMRIG_ASM_LIBRARY} ${OPENSSL_LIBRARIES} ${UV_LIBRARIES} ${EXTRA_LIBS} ${CPUID_LIB} ${ARGON2_LIBRARY} ${ETHASH_LIBRARY} ${GHOSTRIDER_LIBRARY})
+target_link_libraries(${CMAKE_PROJECT_NAME} ${XMRIG_ASM_LIBRARY} ${OPENSSL_LIBRARIES} ${UV_LIBRARIES} ${EXTRA_LIBS} ${CPUID_LIB} ${ARGON2_LIBRARY} ${ETHASH_LIBRARY} ${GHOSTRIDER_LIBRARY} ${FMT_LIBRARY})
 
 if (WIN32)
     add_custom_command(TARGET ${CMAKE_PROJECT_NAME} POST_BUILD COMMAND ${CMAKE_COMMAND} -E copy_if_different "${CMAKE_SOURCE_DIR}/bin/WinRing0/WinRing0x64.sys" $<TARGET_FILE_DIR:${CMAKE_PROJECT_NAME}>)

cmake/fmt.cmake

@@ -0,0 +1,13 @@
+# SPDX-FileCopyrightText: © 2023 Jean-Pierre De Jesus DIAZ <me@jeandudey.tech>
+# SPDX-License-Identifier: GPL-3.0-or-later
+
+
+if(WITH_BUNDLED_FMT)
+    add_library(fmt INTERFACE)
+    target_sources(fmt INTERFACE ${CMAKE_CURRENT_SOURCE_DIR}/src/3rdparty/fmt/format.cc)
+    target_include_directories(fmt INTERFACE ${CMAKE_CURRENT_SOURCE_DIR}/src/3rdparty/fmt)
+else()
+    set(FMT_LIBRARY fmt)
+    find_package(fmt REQUIRED)
+    set(FMT_LIBRARY fmt::fmt)
+endif()

src/3rdparty/cl.h

@@ -29,7 +29,7 @@
 #if defined(__APPLE__)
 #   include <OpenCL/cl.h>
 #else
-#   include "3rdparty/CL/cl.h"
+#   include <CL/cl.h>
 #endif
 
 

src/3rdparty/fmt/fmt/format.cc

@@ -5,7 +5,7 @@
 //
 // For the license information refer to format.h.
 
-#include "3rdparty/fmt/format-inl.h"
+#include "fmt/format-inl.h"
 
 FMT_BEGIN_NAMESPACE
 namespace detail {

src/backend/cpu/platform/lscpu_arm.cpp

@@ -18,11 +18,11 @@
  */
 
 #include "base/tools/String.h"
-#include "3rdparty/fmt/core.h"
 
 
 #include <cstdio>
 #include <cctype>
+#include <fmt/core.h>
 
 
 namespace xmrig {

src/backend/opencl/wrappers/AdlLib_linux.cpp

@@ -20,7 +20,6 @@
 
 
 #include "backend/opencl/wrappers/AdlLib.h"
-#include "3rdparty/fmt/core.h"
 #include "backend/opencl/wrappers/OclDevice.h"
 
 
@@ -31,6 +30,7 @@
 #include <string>
 #include <sys/stat.h>
 #include <sys/types.h>
+#include <fmt/core.h>
 
 
 namespace xmrig {

src/base/base.cmake

@@ -88,7 +88,6 @@ set(HEADERS_BASE
    )
 
 set(SOURCES_BASE
-    src/3rdparty/fmt/format.cc
     src/base/crypto/Algorithm.cpp
     src/base/crypto/Coin.cpp
     src/base/crypto/keccak.cpp

src/base/crypto/Coin.cpp

@@ -54,6 +54,7 @@ static const CoinInfo coinInfo[] = {
     { 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  ") },
+    { Algorithm::RX_0,            "Townforge","Townforge",    30,     100000000,      MAGENTA_BG_BOLD(WHITE_BOLD_S " townforge ") },
 };
 
 

src/base/crypto/Coin.h

@@ -40,6 +40,7 @@ public:
         RAVEN,
         WOWNERO,
         ZEPHYR,
+        TOWNFORGE,
         MAX
     };
 

src/base/kernel/Process.cpp

@@ -22,10 +22,10 @@
 
 
 #include "base/kernel/Process.h"
-#include "3rdparty/fmt/core.h"
 #include "base/tools/Chrono.h"
 #include "version.h"
 
+#include <fmt/core.h>
 
 #ifdef XMRIG_OS_WIN
 #   ifdef _MSC_VER

src/base/net/stratum/BaseClient.cpp

@@ -17,7 +17,6 @@
  */
 
 #include "base/net/stratum/BaseClient.h"
-#include "3rdparty/fmt/core.h"
 #include "3rdparty/rapidjson/document.h"
 #include "base/io/Env.h"
 #include "base/io/log/Log.h"
@@ -25,6 +24,8 @@
 #include "base/kernel/interfaces/IClientListener.h"
 #include "base/net/stratum/SubmitResult.h"
 
+#include <fmt/core.h>
+
 
 namespace xmrig {
 

src/base/net/stratum/benchmark/BenchClient.cpp

@@ -17,7 +17,6 @@
  */
 
 #include "base/net/stratum/benchmark/BenchClient.h"
-#include "3rdparty/fmt/core.h"
 #include "3rdparty/rapidjson/document.h"
 #include "backend/common/benchmark/BenchState.h"
 #include "backend/common/interfaces/IBackend.h"
@@ -39,6 +38,8 @@
 #   include "hw/dmi/DmiReader.h"
 #endif
 
+#include <fmt/core.h>
+
 
 xmrig::BenchClient::BenchClient(const std::shared_ptr<BenchConfig> &benchmark, IClientListener* listener) :
     m_listener(listener),

src/base/net/stratum/benchmark/BenchConfig.cpp

@@ -17,12 +17,12 @@
  */
 
 #include "base/net/stratum/benchmark/BenchConfig.h"
-#include "3rdparty/fmt/core.h"
 #include "3rdparty/rapidjson/document.h"
 #include "base/io/json/Json.h"
 
 
 #include <string>
+#include <fmt/core.h>
 
 
 #ifdef _MSC_VER

src/base/tools/cryptonote/BlockTemplate.cpp

@@ -207,7 +207,8 @@ bool xmrig::BlockTemplate::parse(bool hashes)
     setOffset(MINER_TX_PREFIX_OFFSET, ar.index());
 
     ar(m_txVersion);
-    ar(m_unlockTime);
+    if (m_coin != Coin::TOWNFORGE)
+      ar(m_unlockTime);
     ar(m_numInputs);
 
     // must be 1 input
@@ -280,6 +281,9 @@ bool xmrig::BlockTemplate::parse(bool hashes)
         ar(m_viewTag);
     }
 
+    if (m_coin == Coin::TOWNFORGE)
+      ar(m_unlockTime);
+
     ar(m_extraSize);
 
     setOffset(TX_EXTRA_OFFSET, ar.index());
@@ -335,6 +339,10 @@ bool xmrig::BlockTemplate::parse(bool hashes)
     uint8_t vin_rct_type = 0;
     ar(vin_rct_type);
 
+    // no way I'm parsing a full game update here
+    if (m_coin == Coin::TOWNFORGE && m_height % 720 == 0)
+      return true;
+
     // must be RCTTypeNull (0)
     if (vin_rct_type != 0) {
         return false;

src/base/tools/cryptonote/WalletAddress.cpp

@@ -33,6 +33,26 @@
 
 bool xmrig::WalletAddress::decode(const char *address, size_t size)
 {
+    uint64_t tf_tag = 0;
+    if (size >= 4 && !strncmp(address, "TF", 2))
+    {
+      tf_tag = 0x424200;
+      switch (address[2])
+      {
+        case '1': tf_tag |= 0; break;
+        case '2': tf_tag |= 1; break;
+        default: tf_tag = 0; return false;
+      }
+      switch (address[3]) {
+        case 'M': tf_tag |= 0; break;
+        case 'T': tf_tag |= 0x10; break;
+        case 'S': tf_tag |= 0x20; break;
+        default: tf_tag = 0; return false;
+      }
+      address += 4;
+      size -= 4;
+    }
+
     static constexpr std::array<int, 9> block_sizes{ 0, 2, 3, 5, 6, 7, 9, 10, 11 };
     static constexpr char alphabet[] = "123456789ABCDEFGHJKLMNPQRSTUVWXYZabcdefghijkmnopqrstuvwxyz";
     constexpr size_t alphabet_size = sizeof(alphabet) - 1;
@@ -114,6 +134,9 @@ bool xmrig::WalletAddress::decode(const char *address, size_t size)
         if (memcmp(m_checksum, md, sizeof(m_checksum)) == 0) {
             m_data = { address, size };
 
+            if (tf_tag)
+              m_tag = tf_tag;
+
             return true;
         }
     }
@@ -228,6 +251,16 @@ const xmrig::WalletAddress::TagInfo &xmrig::WalletAddress::tagInfo(uint64_t tag)
         { 0x54,     { Coin::GRAFT,      TESTNET,    PUBLIC,         28881,  28882 } },
         { 0x55,     { Coin::GRAFT,      TESTNET,    INTEGRATED,     28881,  28882 } },
         { 0x70,     { Coin::GRAFT,      TESTNET,    SUBADDRESS,     28881,  28882 } },
+
+        { 0x424200,     { Coin::TOWNFORGE,     MAINNET,    PUBLIC,         18881,  18882 } },
+        { 0x424201,     { Coin::TOWNFORGE,     MAINNET,    SUBADDRESS,     18881,  18882 } },
+
+        { 0x424210,     { Coin::TOWNFORGE,     TESTNET,    PUBLIC,         28881,  28882 } },
+        { 0x424211,     { Coin::TOWNFORGE,     TESTNET,    SUBADDRESS,     28881,  28882 } },
+
+        { 0x424220,     { Coin::TOWNFORGE,     STAGENET,   PUBLIC,         38881,  38882 } },
+        { 0x424221,     { Coin::TOWNFORGE,     STAGENET,   SUBADDRESS,     38881,  38882 } },
+
     };
 
     const auto it = tags.find(tag);

src/crypto/common/LinuxMemory.cpp

@@ -17,12 +17,12 @@
  */
 
 #include "crypto/common/LinuxMemory.h"
-#include "3rdparty/fmt/core.h"
 #include "crypto/common/VirtualMemory.h"
 
 
 #include <algorithm>
 #include <fstream>
+#include <fmt/core.h>
 #include <mutex>
 #include <string>
 

src/hw/dmi/DmiMemory.cpp

@@ -20,7 +20,6 @@
 
 
 #include "hw/dmi/DmiMemory.h"
-#include "3rdparty/fmt/format.h"
 #include "3rdparty/rapidjson/document.h"
 #include "hw/dmi/DmiTools.h"
 
@@ -28,6 +27,7 @@
 #include <algorithm>
 #include <array>
 #include <regex>
+#include <fmt/format.h>
 
 
 namespace xmrig {

src/hw/dmi/DmiReader.cpp

@@ -19,10 +19,11 @@
  */
 
 #include "hw/dmi/DmiReader.h"
-#include "3rdparty/fmt/core.h"
 #include "3rdparty/rapidjson/document.h"
 #include "hw/dmi/DmiTools.h"
 
+#include <fmt/core.h>
+
 
 namespace xmrig {
 

src/hw/msr/Msr_linux.cpp

@@ -18,7 +18,6 @@
 
 
 #include "hw/msr/Msr.h"
-#include "3rdparty/fmt/core.h"
 #include "backend/cpu/Cpu.h"
 #include "base/io/log/Log.h"
 
@@ -29,6 +28,7 @@
 #include <cstdio>
 #include <dirent.h>
 #include <fcntl.h>
+#include <fmt/core.h>
 #include <fstream>
 #include <sys/stat.h>
 #include <sys/types.h>