Merge remote-tracking branch 'remotes/origin/dev' into evo

Fix: protectRX flushed CPU cache only on MacOS/iOS

.gitmodules

@@ -0,0 +1,4 @@
+[submodule "src/base"]
+	path = src/base
+	url = https://github.com/xmrig/base.git
+	branch = master

CHANGELOG.md

@@ -1,12 +1,58 @@
+# v6.18.0
+- [#3067](https://github.com/xmrig/xmrig/pull/3067) Monero v15 network upgrade support and more house keeping.
+  - Removed deprecated AstroBWTv1 and v2.
+  - Fixed debug GhostRider build.
+  - Monero v15 network upgrade support.
+  - Fixed ZMQ debug log.
+  - Improved daemon ZMQ mining stability.
+- [#3054](https://github.com/xmrig/xmrig/pull/3054) Fixes for 32-bit ARM.
+- [#3042](https://github.com/xmrig/xmrig/pull/3042) Fixed being unable to resume from `pause-on-battery`.
+- [#3031](https://github.com/xmrig/xmrig/pull/3031) Fixed `--cpu-priority` not working sometimes.
+- [#3020](https://github.com/xmrig/xmrig/pull/3020) Removed old AstroBWT algorithm.
+
+# v6.17.0
+- [#2954](https://github.com/xmrig/xmrig/pull/2954) **Dero HE fork support (`astrobwt/v2` algorithm).**
+  - [#2961](https://github.com/xmrig/xmrig/pull/2961) Dero HE (`astrobwt/v2`) CUDA config generator.
+  - [#2969](https://github.com/xmrig/xmrig/pull/2969) Dero HE (`astrobwt/v2`) OpenCL support.
+- Fixed displayed DMI memory information for empty slots.
+- [#2932](https://github.com/xmrig/xmrig/pull/2932) Fixed GhostRider with hwloc disabled.
+
+# v6.16.4
+- [#2904](https://github.com/xmrig/xmrig/pull/2904) Fixed unaligned memory accesses.
+- [#2908](https://github.com/xmrig/xmrig/pull/2908) Added MSVC/2022 to `version.h`.
+- [#2910](https://github.com/xmrig/xmrig/issues/2910) Fixed donation for GhostRider/RTM.
+
+# v6.16.3
+- [#2778](https://github.com/xmrig/xmrig/pull/2778) Fixed `READY threads X/X` display after algorithm switching.
+- [#2782](https://github.com/xmrig/xmrig/pull/2782) Updated GhostRider documentation.
+- [#2815](https://github.com/xmrig/xmrig/pull/2815) Fixed `cn-heavy` in 32-bit builds.
+- [#2827](https://github.com/xmrig/xmrig/pull/2827) GhostRider: set correct priority for helper threads.
+- [#2837](https://github.com/xmrig/xmrig/pull/2837) RandomX: don't restart mining threads when the seed changes.
+- [#2848](https://github.com/xmrig/xmrig/pull/2848) GhostRider: added support for `client.reconnect` method.
+- [#2856](https://github.com/xmrig/xmrig/pull/2856) Fix for short responses from some Raptoreum pools.
+- [#2873](https://github.com/xmrig/xmrig/pull/2873) Fixed GhostRider benchmark on single-core systems.
+- [#2882](https://github.com/xmrig/xmrig/pull/2882) Fixed ARMv7 compilation.
+- [#2893](https://github.com/xmrig/xmrig/pull/2893) KawPow OpenCL: use separate UV loop for building programs.
+
+# v6.16.2
+- [#2751](https://github.com/xmrig/xmrig/pull/2751) Fixed crash on CPUs supporting VAES and running GCC-compiled xmrig.
+- [#2761](https://github.com/xmrig/xmrig/pull/2761) Fixed broken auto-tuning in GCC Windows build.
+- [#2771](https://github.com/xmrig/xmrig/issues/2771) Fixed environment variables support for GhostRider and KawPow. 
+- [#2769](https://github.com/xmrig/xmrig/pull/2769) Performance fixes:
+  - Fixed several performance bottlenecks introduced in v6.16.1.
+  - Fixed overall GCC-compiled build performance, it's the same speed as MSVC build now.
+  - **Linux builds are up to 10% faster now compared to v6.16.0 GCC build.**
+  - **Windows builds are up to 5% faster now compared to v6.16.0 MSVC build.**
+
 # v6.16.1
 - [#2729](https://github.com/xmrig/xmrig/pull/2729) GhostRider fixes:
-  - Added average hashrate display
-  - Fixed the number of threads shown at startup
-  - Fixed `--threads` or `-t` command line option (but `--cpu-max-threads-hint` is recommended to use)
+  - Added average hashrate display.
+  - Fixed the number of threads shown at startup.
+  - Fixed `--threads` or `-t` command line option (but `--cpu-max-threads-hint` is recommended to use).
 - [#2738](https://github.com/xmrig/xmrig/pull/2738) GhostRider fixes:
-  - Fixed "difficulty is not a number" error when diff is high on some pools
-  - Fixed GhostRider compilation when WITH_KAWPOW=OFF
-- [#2740](https://github.com/xmrig/xmrig/pull/2740) Added VAES support for Cryptonight variants **+4% speedup on Zen3**
+  - Fixed "difficulty is not a number" error when diff is high on some pools.
+  - Fixed GhostRider compilation when `WITH_KAWPOW=OFF`.
+- [#2740](https://github.com/xmrig/xmrig/pull/2740) Added VAES support for Cryptonight variants **+4% speedup on Zen3**.
   - VAES instructions are available on Intel Ice Lake/AMD Zen3 and newer CPUs.
   - +4% speedup on Ryzen 5 5600X.
 

CHANGELOG_NEXT.md

@@ -0,0 +1,6 @@
+# v7.0.0
+- `src/base` is now a git submodule for the [base](https://github.com/xmrig/base) project, build instructions require slight update.
+- Removed config option `background` (only command line available). Switching to background now happens on a very early stage before any I/O.
+
+# Previous versions
+[doc/CHANGELOG_OLD.md](doc/CHANGELOG_OLD.md)

CMakeLists.txt

@@ -1,4 +1,4 @@
-cmake_minimum_required(VERSION 2.8.12)
+cmake_minimum_required(VERSION 3.1)
 project(xmrig)
 
 option(WITH_HWLOC           "Enable hwloc support" ON)
@@ -8,7 +8,6 @@ option(WITH_CN_PICO         "Enable CryptoNight-Pico algorithm" ON)
 option(WITH_CN_FEMTO        "Enable CryptoNight-UPX2 algorithm" ON)
 option(WITH_RANDOMX         "Enable RandomX algorithms family" ON)
 option(WITH_ARGON2          "Enable Argon2 algorithms family" ON)
-option(WITH_ASTROBWT        "Enable AstroBWT algorithms family" ON)
 option(WITH_KAWPOW          "Enable KawPow algorithms family" ON)
 option(WITH_GHOSTRIDER      "Enable GhostRider algorithm" ON)
 option(WITH_HTTP            "Enable HTTP protocol support (client/server)" ON)
@@ -28,6 +27,7 @@ option(WITH_STRICT_CACHE    "Enable strict checks for OpenCL cache" ON)
 option(WITH_INTERLEAVE_DEBUG_LOG "Enable debug log for threads interleave" OFF)
 option(WITH_PROFILING       "Enable profiling for developers" OFF)
 option(WITH_SSE4_1          "Enable SSE 4.1 for Blake2" ON)
+option(WITH_AVX2            "Enable AVX2 for Blake2" ON)
 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)
@@ -37,22 +37,26 @@ option(BUILD_STATIC         "Build static binary" OFF)
 option(ARM_TARGET           "Force use specific ARM target 8 or 7" 0)
 option(HWLOC_DEBUG          "Enable hwloc debug helpers and log" OFF)
 
+add_definitions(-DXMRIG_MINER_PROJECT)
 
-set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${CMAKE_SOURCE_DIR}/cmake")
+set(WITH_SODIUM     OFF)
+set(WITH_CRYPTONOTE ON)
+set(WITH_CRYPTO_OPS ON)
+set(WITH_COM        OFF)
+set(WITH_EVENTS     OFF)
 
+set(CMAKE_MODULE_PATH "${CMAKE_SOURCE_DIR}/src/base/cmake" "${CMAKE_SOURCE_DIR}/cmake")
+set(LIBS base)
 
-include (CheckIncludeFile)
-include (cmake/cpu.cmake)
-include (cmake/os.cmake)
-include (src/base/base.cmake)
-include (src/backend/backend.cmake)
+include(base)
+add_subdirectory(src/base)
+
+include(src/backend/backend.cmake)
 
 
 set(HEADERS
-    "${HEADERS_BASE}"
-    "${HEADERS_BASE_HTTP}"
     "${HEADERS_BACKEND}"
-    src/App.h
+    src/backend/common/interfaces/IMemoryPool.h
     src/core/config/Config_default.h
     src/core/config/Config_platform.h
     src/core/config/Config.h
@@ -61,17 +65,6 @@ set(HEADERS
     src/core/Controller.h
     src/core/Miner.h
     src/core/Taskbar.h
-    src/net/interfaces/IJobResultListener.h
-    src/net/JobResult.h
-    src/net/JobResults.h
-    src/net/Network.h
-    src/net/strategies/DonateStrategy.h
-    src/Summary.h
-    src/version.h
-   )
-
-set(HEADERS_CRYPTO
-    src/backend/common/interfaces/IMemoryPool.h
     src/crypto/cn/asm/CryptonightR_template.h
     src/crypto/cn/c_blake256.h
     src/crypto/cn/c_groestl.h
@@ -92,32 +85,29 @@ set(HEADERS_CRYPTO
     src/crypto/common/Nonce.h
     src/crypto/common/portable/mm_malloc.h
     src/crypto/common/VirtualMemory.h
+    src/MinerApp.h
+    src/net/interfaces/IJobResultListener.h
+    src/net/JobResult.h
+    src/net/JobResults.h
+    src/net/Network.h
+    src/net/strategies/DonateStrategy.h
+    src/Summary.h
+    src/version.h
    )
 
 if (XMRIG_ARM)
-    set(HEADERS_CRYPTO "${HEADERS_CRYPTO}" src/crypto/cn/CryptoNight_arm.h)
+    list(APPEND HEADERS src/crypto/cn/CryptoNight_arm.h)
 else()
-    set(HEADERS_CRYPTO "${HEADERS_CRYPTO}" src/crypto/cn/CryptoNight_x86.h)
+    list(APPEND HEADERS src/crypto/cn/CryptoNight_x86.h)
 endif()
 
 set(SOURCES
-    "${SOURCES_BASE}"
-    "${SOURCES_BASE_HTTP}"
     "${SOURCES_BACKEND}"
-    src/App.cpp
     src/core/config/Config.cpp
     src/core/config/ConfigTransform.cpp
     src/core/Controller.cpp
     src/core/Miner.cpp
     src/core/Taskbar.cpp
-    src/net/JobResults.cpp
-    src/net/Network.cpp
-    src/net/strategies/DonateStrategy.cpp
-    src/Summary.cpp
-    src/xmrig.cpp
-   )
-
-set(SOURCES_CRYPTO
     src/crypto/cn/c_blake256.c
     src/crypto/cn/c_groestl.c
     src/crypto/cn/c_jh.c
@@ -128,6 +118,12 @@ set(SOURCES_CRYPTO
     src/crypto/common/MemoryPool.cpp
     src/crypto/common/Nonce.cpp
     src/crypto/common/VirtualMemory.cpp
+    src/MinerApp.cpp
+    src/net/JobResults.cpp
+    src/net/Network.cpp
+    src/net/strategies/DonateStrategy.cpp
+    src/Summary.cpp
+    src/xmrig.cpp
    )
 
 if (CMAKE_C_COMPILER_ID MATCHES GNU)
@@ -136,108 +132,58 @@ endif()
 
 if (WITH_VAES)
     add_definitions(-DXMRIG_VAES)
-    set(HEADERS_CRYPTO "${HEADERS_CRYPTO}" src/crypto/cn/CryptoNight_x86_vaes.h)
-    set(SOURCES_CRYPTO "${SOURCES_CRYPTO}" src/crypto/cn/CryptoNight_x86_vaes.cpp)
+    list(APPEND HEADERS src/crypto/cn/CryptoNight_x86_vaes.h)
+    list(APPEND SOURCES src/crypto/cn/CryptoNight_x86_vaes.cpp)
     if (CMAKE_C_COMPILER_ID MATCHES GNU OR CMAKE_C_COMPILER_ID MATCHES Clang)
         set_source_files_properties(src/crypto/cn/CryptoNight_x86_vaes.cpp PROPERTIES COMPILE_FLAGS "-Ofast -fno-tree-vectorize -mavx2 -mvaes")
     endif()
 endif()
 
 if (WITH_HWLOC)
-    list(APPEND HEADERS_CRYPTO
+    list(APPEND HEADERS
         src/crypto/common/NUMAMemoryPool.h
         )
 
-    list(APPEND SOURCES_CRYPTO
+    list(APPEND SOURCES
         src/crypto/common/NUMAMemoryPool.cpp
         src/crypto/common/VirtualMemory_hwloc.cpp
         )
 endif()
 
 if (XMRIG_OS_WIN)
-    list(APPEND SOURCES_OS
+    list(APPEND SOURCES
         res/app.rc
-        src/App_win.cpp
         src/crypto/common/VirtualMemory_win.cpp
         )
-
-    set(EXTRA_LIBS ws2_32 psapi iphlpapi userenv)
-elseif (XMRIG_OS_APPLE)
-    list(APPEND SOURCES_OS
-        src/App_unix.cpp
-        src/crypto/common/VirtualMemory_unix.cpp
-        )
-
-    find_library(IOKIT_LIBRARY IOKit)
-    find_library(CORESERVICES_LIBRARY CoreServices)
-    set(EXTRA_LIBS ${IOKIT_LIBRARY} ${CORESERVICES_LIBRARY})
 else()
-    list(APPEND SOURCES_OS
-        src/App_unix.cpp
-        src/crypto/common/VirtualMemory_unix.cpp
-        )
+    list(APPEND SOURCES src/crypto/common/VirtualMemory_unix.cpp)
 
-    if (XMRIG_OS_ANDROID)
-        set(EXTRA_LIBS pthread rt dl log)
-    elseif (XMRIG_OS_LINUX)
-        list(APPEND SOURCES_OS
+    if (XMRIG_OS_LINUX AND NOT XMRIG_OS_ANDROID)
+        list(APPEND SOURCES
             src/crypto/common/LinuxMemory.h
             src/crypto/common/LinuxMemory.cpp
             )
-
-        set(EXTRA_LIBS pthread rt dl)
-    elseif (XMRIG_OS_FREEBSD)
-        set(EXTRA_LIBS kvm pthread)
     endif()
 endif()
 
-add_definitions(-DXMRIG_MINER_PROJECT -DXMRIG_JSON_SINGLE_LINE_ARRAY)
-add_definitions(-D__STDC_FORMAT_MACROS -DUNICODE -D_FILE_OFFSET_BITS=64)
+include_directories(src)
+include_directories(src/3rdparty)
 
-find_package(UV REQUIRED)
-
-include(cmake/flags.cmake)
-include(cmake/randomx.cmake)
-include(cmake/argon2.cmake)
-include(cmake/astrobwt.cmake)
-include(cmake/kawpow.cmake)
-include(cmake/ghostrider.cmake)
-include(cmake/OpenSSL.cmake)
-include(cmake/asm.cmake)
-
-if (WITH_CN_LITE)
-    add_definitions(/DXMRIG_ALGO_CN_LITE)
-endif()
-
-if (WITH_CN_HEAVY)
-    add_definitions(/DXMRIG_ALGO_CN_HEAVY)
-endif()
-
-if (WITH_CN_PICO)
-    add_definitions(/DXMRIG_ALGO_CN_PICO)
-endif()
-
-if (WITH_CN_FEMTO)
-    add_definitions(/DXMRIG_ALGO_CN_FEMTO)
-endif()
+include(randomx)
+include(argon2)
+include(kawpow)
+include(ghostrider)
+include(asm)
 
 if (WITH_EMBEDDED_CONFIG)
-    add_definitions(/DXMRIG_FEATURE_EMBEDDED_CONFIG)
+    add_definitions(-DXMRIG_FEATURE_EMBEDDED_CONFIG)
 endif()
 
 include(src/hw/api/api.cmake)
 include(src/hw/dmi/dmi.cmake)
 
-include_directories(src)
-include_directories(src/3rdparty)
-include_directories(${UV_INCLUDE_DIR})
-
-if (WITH_DEBUG_LOG)
-    add_definitions(/DAPP_DEBUG)
-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})
+add_executable(${CMAKE_PROJECT_NAME} ${HEADERS} ${SOURCES})
+target_link_libraries(${CMAKE_PROJECT_NAME} ${LIBS})
 
 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}>)

README.md

@@ -7,10 +7,10 @@
 [![GitHub stars](https://img.shields.io/github/stars/xmrig/xmrig.svg)](https://github.com/xmrig/xmrig/stargazers)
 [![GitHub forks](https://img.shields.io/github/forks/xmrig/xmrig.svg)](https://github.com/xmrig/xmrig/network)
 
-XMRig is a high performance, open source, cross platform RandomX, KawPow, CryptoNight and AstroBWT unified CPU/GPU miner and [RandomX benchmark](https://xmrig.com/benchmark). Official binaries are available for Windows, Linux, macOS and FreeBSD.
+XMRig is a high performance, open source, cross platform RandomX, KawPow, CryptoNight and [GhostRider](https://github.com/xmrig/xmrig/tree/master/src/crypto/ghostrider#readme) unified CPU/GPU miner and [RandomX benchmark](https://xmrig.com/benchmark). Official binaries are available for Windows, Linux, macOS and FreeBSD.
 
 ## Mining backends
-- **CPU** (x64/ARMv8)
+- **CPU** (x64/ARMv7/ARMv8)
 - **OpenCL** for AMD GPUs.
 - **CUDA** for NVIDIA GPUs via external [CUDA plugin](https://github.com/xmrig/xmrig-cuda).
 

cmake/FindHWLOC.cmake

@@ -1,25 +0,0 @@
-find_path(
-    HWLOC_INCLUDE_DIR
-    NAMES hwloc.h
-    PATHS "${XMRIG_DEPS}" ENV "XMRIG_DEPS"
-    PATH_SUFFIXES "include"
-    NO_DEFAULT_PATH
-)
-
-find_path(HWLOC_INCLUDE_DIR NAMES hwloc.h)
-
-find_library(
-    HWLOC_LIBRARY
-    NAMES hwloc.a hwloc libhwloc
-    PATHS "${XMRIG_DEPS}" ENV "XMRIG_DEPS"
-    PATH_SUFFIXES "lib"
-    NO_DEFAULT_PATH
-)
-
-find_library(HWLOC_LIBRARY NAMES hwloc.a hwloc libhwloc)
-
-set(HWLOC_LIBRARIES ${HWLOC_LIBRARY})
-set(HWLOC_INCLUDE_DIRS ${HWLOC_INCLUDE_DIR})
-
-include(FindPackageHandleStandardArgs)
-find_package_handle_standard_args(HWLOC DEFAULT_MSG HWLOC_LIBRARY HWLOC_INCLUDE_DIR)

cmake/FindUV.cmake

@@ -1,25 +0,0 @@
-find_path(
-    UV_INCLUDE_DIR
-    NAMES uv.h
-    PATHS "${XMRIG_DEPS}" ENV "XMRIG_DEPS"
-    PATH_SUFFIXES "include"
-    NO_DEFAULT_PATH
-)
-
-find_path(UV_INCLUDE_DIR NAMES uv.h)
-
-find_library(
-    UV_LIBRARY
-    NAMES libuv.a uv libuv
-    PATHS "${XMRIG_DEPS}" ENV "XMRIG_DEPS"
-    PATH_SUFFIXES "lib"
-    NO_DEFAULT_PATH
-)
-
-find_library(UV_LIBRARY NAMES libuv.a uv libuv)
-
-set(UV_LIBRARIES ${UV_LIBRARY})
-set(UV_INCLUDE_DIRS ${UV_INCLUDE_DIR})
-
-include(FindPackageHandleStandardArgs)
-find_package_handle_standard_args(UV DEFAULT_MSG UV_LIBRARY UV_INCLUDE_DIR)

cmake/OpenSSL.cmake

@@ -1,64 +0,0 @@
-if (WITH_TLS)
-    set(OPENSSL_ROOT_DIR ${XMRIG_DEPS})
-
-    if (WIN32)
-        set(OPENSSL_USE_STATIC_LIBS TRUE)
-        set(OPENSSL_MSVC_STATIC_RT TRUE)
-
-        set(EXTRA_LIBS ${EXTRA_LIBS} crypt32)
-    elseif (APPLE)
-        set(OPENSSL_USE_STATIC_LIBS TRUE)
-    endif()
-
-    if (BUILD_STATIC)
-        set(OPENSSL_USE_STATIC_LIBS TRUE)
-    endif()
-
-
-    find_package(OpenSSL)
-
-    if (OPENSSL_FOUND)
-        set(TLS_SOURCES
-            src/base/net/stratum/Tls.cpp
-            src/base/net/stratum/Tls.h
-            src/base/net/tls/ServerTls.cpp
-            src/base/net/tls/ServerTls.h
-            src/base/net/tls/TlsConfig.cpp
-            src/base/net/tls/TlsConfig.h
-            src/base/net/tls/TlsContext.cpp
-            src/base/net/tls/TlsContext.h
-            src/base/net/tls/TlsGen.cpp
-            src/base/net/tls/TlsGen.h
-            )
-
-        include_directories(${OPENSSL_INCLUDE_DIR})
-
-        if (WITH_HTTP)
-            set(TLS_SOURCES ${TLS_SOURCES}
-                src/base/net/https/HttpsClient.cpp
-                src/base/net/https/HttpsClient.h
-                src/base/net/https/HttpsContext.cpp
-                src/base/net/https/HttpsContext.h
-                src/base/net/https/HttpsServer.cpp
-                src/base/net/https/HttpsServer.h
-                )
-        endif()
-    else()
-        message(FATAL_ERROR "OpenSSL NOT found: use `-DWITH_TLS=OFF` to build without TLS support")
-    endif()
-
-    add_definitions(/DXMRIG_FEATURE_TLS)
-else()
-    set(TLS_SOURCES "")
-    set(OPENSSL_LIBRARIES "")
-    remove_definitions(/DXMRIG_FEATURE_TLS)
-
-    if (WITH_HTTP)
-        set(TLS_SOURCES ${TLS_SOURCES}
-            src/base/net/http/HttpServer.cpp
-            src/base/net/http/HttpServer.h
-            )
-    endif()
-
-    set(CMAKE_PROJECT_NAME "${CMAKE_PROJECT_NAME}-notls")
-endif()

cmake/argon2.cmake

@@ -1,18 +1,13 @@
 if (WITH_ARGON2)
-    add_definitions(/DXMRIG_ALGO_ARGON2)
-
-    list(APPEND HEADERS_CRYPTO
+    list(APPEND HEADERS
         src/crypto/argon2/Hash.h
         src/crypto/argon2/Impl.h
     )
 
-    list(APPEND SOURCES_CRYPTO
+    list(APPEND SOURCES
         src/crypto/argon2/Impl.cpp
     )
 
     add_subdirectory(src/3rdparty/argon2)
-    set(ARGON2_LIBRARY argon2)
-else()
-    remove_definitions(/DXMRIG_ALGO_ARGON2)
-    set(ARGON2_LIBRARY "")
+    list(APPEND LIBS argon2)
 endif()

cmake/asm.cmake

@@ -36,17 +36,16 @@ if (WITH_ASM AND NOT XMRIG_ARM AND CMAKE_SIZEOF_VOID_P EQUAL 8)
     endif()
 
     add_library(${XMRIG_ASM_LIBRARY} STATIC ${XMRIG_ASM_FILES})
-    set(XMRIG_ASM_SOURCES
-        src/crypto/common/Assembly.h
+    list(APPEND HEADERS src/crypto/common/Assembly.h)
+
+    list(APPEND SOURCES
         src/crypto/common/Assembly.cpp
         src/crypto/cn/r/CryptonightR_gen.cpp
         )
     set_property(TARGET ${XMRIG_ASM_LIBRARY} PROPERTY LINKER_LANGUAGE C)
 
-    add_definitions(/DXMRIG_FEATURE_ASM)
+    list(APPEND LIBS ${XMRIG_ASM_LIBRARY})
+    add_definitions(-DXMRIG_FEATURE_ASM)
 else()
-    set(XMRIG_ASM_SOURCES "")
-    set(XMRIG_ASM_LIBRARY "")
-
-    remove_definitions(/DXMRIG_FEATURE_ASM)
+    set(WITH_ASM OFF)
 endif()

cmake/astrobwt.cmake

@@ -1,51 +0,0 @@
-if (WITH_ASTROBWT)
-    add_definitions(/DXMRIG_ALGO_ASTROBWT)
-
-    list(APPEND HEADERS_CRYPTO
-        src/crypto/astrobwt/AstroBWT.h
-    )
-
-    list(APPEND SOURCES_CRYPTO
-        src/crypto/astrobwt/AstroBWT.cpp
-    )
-
-    if (XMRIG_ARM)
-        list(APPEND HEADERS_CRYPTO
-            src/crypto/astrobwt/salsa20_ref/ecrypt-config.h
-            src/crypto/astrobwt/salsa20_ref/ecrypt-machine.h
-            src/crypto/astrobwt/salsa20_ref/ecrypt-portable.h
-            src/crypto/astrobwt/salsa20_ref/ecrypt-sync.h
-        )
-
-        list(APPEND SOURCES_CRYPTO
-            src/crypto/astrobwt/salsa20_ref/salsa20.c
-        )
-    else()
-        if (CMAKE_SIZEOF_VOID_P EQUAL 8)
-            add_definitions(/DASTROBWT_AVX2)
-            list(APPEND SOURCES_CRYPTO src/crypto/astrobwt/xmm6int/salsa20_xmm6int-avx2.c)
-
-            if (CMAKE_C_COMPILER_ID MATCHES GNU OR CMAKE_C_COMPILER_ID MATCHES Clang)
-                set_source_files_properties(src/crypto/astrobwt/xmm6int/salsa20_xmm6int-avx2.c PROPERTIES COMPILE_FLAGS -mavx2)
-            endif()
-
-            if (CMAKE_C_COMPILER_ID MATCHES MSVC)
-                enable_language(ASM_MASM)
-                list(APPEND SOURCES_CRYPTO src/crypto/astrobwt/sha3_256_avx2.asm)
-            else()
-                enable_language(ASM)
-                list(APPEND SOURCES_CRYPTO src/crypto/astrobwt/sha3_256_avx2.S)
-            endif()
-        endif()
-
-        list(APPEND HEADERS_CRYPTO
-            src/crypto/astrobwt/Salsa20.hpp
-        )
-
-        list(APPEND SOURCES_CRYPTO
-            src/crypto/astrobwt/Salsa20.cpp
-        )
-    endif()
-else()
-    remove_definitions(/DXMRIG_ALGO_ASTROBWT)
-endif()

cmake/cpu.cmake

@@ -1,59 +0,0 @@
-if (CMAKE_SIZEOF_VOID_P EQUAL 8)
-    set(XMRIG_64_BIT ON)
-    add_definitions(-DXMRIG_64_BIT)
-else()
-    set(XMRIG_64_BIT OFF)
-endif()
-
-if (NOT CMAKE_SYSTEM_PROCESSOR)
-    message(WARNING "CMAKE_SYSTEM_PROCESSOR not defined")
-endif()
-
-include(CheckCXXCompilerFlag)
-
-if (CMAKE_CXX_COMPILER_ID MATCHES MSVC)
-    set(VAES_SUPPORTED ON)
-else()
-    CHECK_CXX_COMPILER_FLAG("-mavx2 -mvaes" VAES_SUPPORTED)
-endif()
-
-if (NOT VAES_SUPPORTED)
-    set(WITH_VAES OFF)
-endif()
-
-if (XMRIG_64_BIT AND CMAKE_SYSTEM_PROCESSOR MATCHES "^(x86_64|AMD64)$")
-    add_definitions(-DRAPIDJSON_SSE2)
-else()
-    set(WITH_SSE4_1 OFF)
-    set(WITH_VAES OFF)
-endif()
-
-if (NOT ARM_TARGET)
-    if (CMAKE_SYSTEM_PROCESSOR MATCHES "^(aarch64|arm64|armv8-a)$")
-        set(ARM_TARGET 8)
-    elseif (CMAKE_SYSTEM_PROCESSOR MATCHES "^(armv7|armv7f|armv7s|armv7k|armv7-a|armv7l)$")
-        set(ARM_TARGET 7)
-    endif()
-endif()
-
-if (ARM_TARGET AND ARM_TARGET GREATER 6)
-    set(XMRIG_ARM ON)
-    add_definitions(-DXMRIG_ARM=${ARM_TARGET})
-
-    message(STATUS "Use ARM_TARGET=${ARM_TARGET} (${CMAKE_SYSTEM_PROCESSOR})")
-
-    if (ARM_TARGET EQUAL 8)
-        CHECK_CXX_COMPILER_FLAG(-march=armv8-a+crypto XMRIG_ARM_CRYPTO)
-
-        if (XMRIG_ARM_CRYPTO)
-            add_definitions(-DXMRIG_ARM_CRYPTO)
-            set(ARM8_CXX_FLAGS "-march=armv8-a+crypto")
-        else()
-            set(ARM8_CXX_FLAGS "-march=armv8-a")
-        endif()
-    endif()
-endif()
-
-if (WITH_SSE4_1)
-    add_definitions(-DXMRIG_FEATURE_SSE4_1)
-endif()

cmake/flags.cmake

@@ -1,110 +0,0 @@
-set(CMAKE_CXX_STANDARD_REQUIRED ON)
-set(CMAKE_CXX_EXTENSIONS OFF)
-set(CMAKE_CXX_STANDARD 11)
-
-set(CMAKE_C_STANDARD 99)
-set(CMAKE_C_STANDARD_REQUIRED ON)
-
-if ("${CMAKE_BUILD_TYPE}" STREQUAL "")
-    set(CMAKE_BUILD_TYPE Release)
-endif()
-
-if (CMAKE_BUILD_TYPE STREQUAL "Release")
-    add_definitions(/DNDEBUG)
-endif()
-
-include(CheckSymbolExists)
-
-if (CMAKE_CXX_COMPILER_ID MATCHES GNU)
-    set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wall -Wno-strict-aliasing")
-    set(CMAKE_C_FLAGS_RELEASE "${CMAKE_C_FLAGS_RELEASE} -Ofast")
-
-    set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall -fexceptions -fno-rtti -Wno-strict-aliasing -Wno-class-memaccess")
-    set(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} -Ofast -s")
-
-    if (ARM_TARGET EQUAL 8)
-        set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${ARM8_CXX_FLAGS}")
-        set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${ARM8_CXX_FLAGS} -flax-vector-conversions")
-    elseif (ARM_TARGET EQUAL 7)
-        set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -mfpu=neon")
-        set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -mfpu=neon -flax-vector-conversions")
-    else()
-        set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -maes")
-        set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -maes")
-
-        add_definitions(/DHAVE_ROTR)
-    endif()
-
-    if (WIN32)
-        if (CMAKE_SIZEOF_VOID_P EQUAL 8)
-            set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -static")
-        else()
-            set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -static -Wl,--large-address-aware")
-        endif()
-    else()
-        set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -static-libgcc -static-libstdc++")
-    endif()
-
-    if (BUILD_STATIC)
-        set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -static")
-    endif()
-
-    add_definitions(/D_GNU_SOURCE)
-
-    if (${CMAKE_VERSION} VERSION_LESS "3.1.0")
-        set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -std=c99")
-        set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11")
-    endif()
-
-    #set(CMAKE_C_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} -gdwarf-2")
-
-    add_definitions(/DHAVE_BUILTIN_CLEAR_CACHE)
-
-elseif (CMAKE_CXX_COMPILER_ID MATCHES MSVC)
-    set(CMAKE_C_FLAGS_RELEASE "/MT /O2 /Oi /DNDEBUG /GL")
-    set(CMAKE_CXX_FLAGS_RELEASE "/MT /O2 /Oi /DNDEBUG /GL")
-
-    set(CMAKE_C_FLAGS_RELWITHDEBINFO "/Ob1 /Zi /DRELWITHDEBINFO")
-    set(CMAKE_CXX_FLAGS_RELWITHDEBINFO "/Ob1 /Zi /DRELWITHDEBINFO")
-
-    add_definitions(/D_CRT_SECURE_NO_WARNINGS)
-    add_definitions(/D_CRT_NONSTDC_NO_WARNINGS)
-    add_definitions(/DNOMINMAX)
-    add_definitions(/DHAVE_ROTR)
-
-elseif (CMAKE_CXX_COMPILER_ID MATCHES Clang)
-
-    set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wall")
-    set(CMAKE_C_FLAGS_RELEASE "${CMAKE_C_FLAGS_RELEASE} -Ofast -funroll-loops -fmerge-all-constants")
-
-    set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall -fexceptions -fno-rtti -Wno-missing-braces")
-    set(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} -Ofast -funroll-loops -fmerge-all-constants")
-
-    if (ARM_TARGET EQUAL 8)
-        set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${ARM8_CXX_FLAGS}")
-        set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${ARM8_CXX_FLAGS}")
-    elseif (ARM_TARGET EQUAL 7)
-        set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -mfpu=neon -march=${CMAKE_SYSTEM_PROCESSOR}")
-        set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -mfpu=neon -march=${CMAKE_SYSTEM_PROCESSOR}")
-    else()
-        set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -maes")
-        set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -maes")
-
-        check_symbol_exists("_rotr" "x86intrin.h" HAVE_ROTR)
-        if (HAVE_ROTR)
-            add_definitions(/DHAVE_ROTR)
-        endif()
-    endif()
-
-    if (BUILD_STATIC)
-        set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -static")
-    endif()
-
-endif()
-
-if (NOT WIN32)
-    check_symbol_exists("__builtin___clear_cache" "stdlib.h" HAVE_BUILTIN_CLEAR_CACHE)
-    if (HAVE_BUILTIN_CLEAR_CACHE)
-        add_definitions(/DHAVE_BUILTIN_CLEAR_CACHE)
-    endif()
-endif()

cmake/ghostrider.cmake

@@ -1,8 +1,4 @@
 if (WITH_GHOSTRIDER)
-    add_definitions(/DXMRIG_ALGO_GHOSTRIDER)
     add_subdirectory(src/crypto/ghostrider)
-    set(GHOSTRIDER_LIBRARY ghostrider)
-else()
-    remove_definitions(/DXMRIG_ALGO_GHOSTRIDER)
-    set(GHOSTRIDER_LIBRARY "")
+    list(APPEND LIBS ghostrider)
 endif()

cmake/kawpow.cmake

@@ -1,19 +1,14 @@
 if (WITH_KAWPOW)
-    add_definitions(/DXMRIG_ALGO_KAWPOW)
-
-    list(APPEND HEADERS_CRYPTO
+    list(APPEND HEADERS
         src/crypto/kawpow/KPCache.h
         src/crypto/kawpow/KPHash.h
     )
 
-    list(APPEND SOURCES_CRYPTO
+    list(APPEND SOURCES
         src/crypto/kawpow/KPCache.cpp
         src/crypto/kawpow/KPHash.cpp
     )
 
-    add_subdirectory(src/3rdparty/libethash)
-    set(ETHASH_LIBRARY ethash)
-else()
-    remove_definitions(/DXMRIG_ALGO_KAWPOW)
-    set(ETHASH_LIBRARY "")
+    add_subdirectory(src/base/3rdparty/libethash)
+    list(INSERT LIBS 0 ethash)
 endif()

cmake/os.cmake

@@ -1,52 +0,0 @@
-if (WIN32)
-    set(XMRIG_OS_WIN ON)
-elseif (APPLE)
-    set(XMRIG_OS_APPLE ON)
-
-    if (IOS OR CMAKE_SYSTEM_NAME STREQUAL iOS)
-        set(XMRIG_OS_IOS ON)
-    else()
-        set(XMRIG_OS_MACOS ON)
-    endif()
-else()
-    set(XMRIG_OS_UNIX ON)
-
-    if (ANDROID OR CMAKE_SYSTEM_NAME MATCHES "Android")
-        set(XMRIG_OS_ANDROID ON)
-    elseif(CMAKE_SYSTEM_NAME MATCHES "Linux")
-        set(XMRIG_OS_LINUX ON)
-    elseif(CMAKE_SYSTEM_NAME STREQUAL FreeBSD)
-        set(XMRIG_OS_FREEBSD ON)
-    endif()
-endif()
-
-
-if (XMRIG_OS_WIN)
-    add_definitions(-DWIN32 -DXMRIG_OS_WIN)
-elseif(XMRIG_OS_APPLE)
-    add_definitions(-DXMRIG_OS_APPLE)
-
-    if (XMRIG_OS_IOS)
-        add_definitions(-DXMRIG_OS_IOS)
-    else()
-        add_definitions(-DXMRIG_OS_MACOS)
-    endif()
-
-    if (XMRIG_ARM)
-        set(WITH_SECURE_JIT ON)
-    endif()
-elseif(XMRIG_OS_UNIX)
-    add_definitions(-DXMRIG_OS_UNIX)
-
-    if (XMRIG_OS_ANDROID)
-        add_definitions(-DXMRIG_OS_ANDROID)
-    elseif (XMRIG_OS_LINUX)
-        add_definitions(-DXMRIG_OS_LINUX)
-    elseif (XMRIG_OS_FREEBSD)
-        add_definitions(-DXMRIG_OS_FREEBSD)
-    endif()
-endif()
-
-if (WITH_SECURE_JIT)
-    add_definitions(-DXMRIG_SECURE_JIT)
-endif()

cmake/randomx.cmake

@@ -1,8 +1,5 @@
 if (WITH_RANDOMX)
-    add_definitions(/DXMRIG_ALGO_RANDOMX)
-    set(WITH_ARGON2 ON)
-
-    list(APPEND HEADERS_CRYPTO
+    list(APPEND HEADERS
         src/crypto/rx/Rx.h
         src/crypto/rx/RxAlgo.h
         src/crypto/rx/RxBasicStorage.h
@@ -14,7 +11,7 @@ if (WITH_RANDOMX)
         src/crypto/rx/RxVm.h
     )
 
-    list(APPEND SOURCES_CRYPTO
+    list(APPEND SOURCES
         src/crypto/randomx/aes_hash.cpp
         src/crypto/randomx/allocator.cpp
         src/crypto/randomx/blake2_generator.cpp
@@ -44,19 +41,19 @@ if (WITH_RANDOMX)
 
     if (WITH_ASM AND CMAKE_C_COMPILER_ID MATCHES MSVC)
         enable_language(ASM_MASM)
-        list(APPEND SOURCES_CRYPTO
+        list(APPEND SOURCES
              src/crypto/randomx/jit_compiler_x86_static.asm
              src/crypto/randomx/jit_compiler_x86.cpp
             )
     elseif (WITH_ASM AND NOT XMRIG_ARM AND CMAKE_SIZEOF_VOID_P EQUAL 8)
-        list(APPEND SOURCES_CRYPTO
+        list(APPEND SOURCES
              src/crypto/randomx/jit_compiler_x86_static.S
              src/crypto/randomx/jit_compiler_x86.cpp
             )
         # cheat because cmake and ccache hate each other
         set_property(SOURCE src/crypto/randomx/jit_compiler_x86_static.S PROPERTY LANGUAGE C)
     elseif (XMRIG_ARM AND CMAKE_SIZEOF_VOID_P EQUAL 8)
-        list(APPEND SOURCES_CRYPTO
+        list(APPEND SOURCES
              src/crypto/randomx/jit_compiler_a64_static.S
              src/crypto/randomx/jit_compiler_a64.cpp
             )
@@ -67,16 +64,22 @@ if (WITH_RANDOMX)
             set_property(SOURCE src/crypto/randomx/jit_compiler_a64_static.S PROPERTY LANGUAGE C)
         endif()
     else()
-        list(APPEND SOURCES_CRYPTO
-             src/crypto/randomx/jit_compiler_fallback.cpp
-            )
+        list(APPEND SOURCES src/crypto/randomx/jit_compiler_fallback.cpp)
     endif()
 
     if (WITH_SSE4_1)
-        list(APPEND SOURCES_CRYPTO src/crypto/randomx/blake2/blake2b_sse41.c)
+        list(APPEND SOURCES src/crypto/randomx/blake2/blake2b_sse41.c)
 
         if (CMAKE_C_COMPILER_ID MATCHES GNU OR CMAKE_C_COMPILER_ID MATCHES Clang)
-            set_source_files_properties(src/crypto/randomx/blake2/blake2b_sse41.c PROPERTIES COMPILE_FLAGS -msse4.1)
+            set_source_files_properties(src/crypto/randomx/blake2/blake2b_sse41.c PROPERTIES COMPILE_FLAGS "-Ofast -msse4.1")
+        endif()
+    endif()
+
+    if (WITH_AVX2)
+        list(APPEND SOURCES src/crypto/randomx/blake2/avx2/blake2b_avx2.c)
+
+        if (CMAKE_C_COMPILER_ID MATCHES GNU OR CMAKE_C_COMPILER_ID MATCHES Clang)
+            set_source_files_properties(src/crypto/randomx/blake2/avx2/blake2b_avx2.c PROPERTIES COMPILE_FLAGS "-Ofast -mavx2")
         endif()
     endif()
 
@@ -85,56 +88,49 @@ if (WITH_RANDOMX)
     endif()
 
     if (WITH_HWLOC)
-        list(APPEND HEADERS_CRYPTO
-             src/crypto/rx/RxNUMAStorage.h
-            )
-
-        list(APPEND SOURCES_CRYPTO
-             src/crypto/rx/RxNUMAStorage.cpp
-            )
+        list(APPEND HEADERS src/crypto/rx/RxNUMAStorage.h)
+        list(APPEND SOURCES src/crypto/rx/RxNUMAStorage.cpp)
     endif()
 
     if (WITH_MSR AND NOT XMRIG_ARM AND CMAKE_SIZEOF_VOID_P EQUAL 8 AND (XMRIG_OS_WIN OR XMRIG_OS_LINUX))
-        add_definitions(/DXMRIG_FEATURE_MSR)
-        add_definitions(/DXMRIG_FIX_RYZEN)
-        message("-- WITH_MSR=ON")
+        add_definitions(-DXMRIG_FEATURE_MSR -DXMRIG_FIX_RYZEN)
 
         if (XMRIG_OS_WIN)
-            list(APPEND SOURCES_CRYPTO
+            list(APPEND SOURCES
                 src/crypto/rx/RxFix_win.cpp
                 src/hw/msr/Msr_win.cpp
                 )
         elseif (XMRIG_OS_LINUX)
-            list(APPEND SOURCES_CRYPTO
+            list(APPEND SOURCES
                 src/crypto/rx/RxFix_linux.cpp
                 src/hw/msr/Msr_linux.cpp
                 )
         endif()
 
-        list(APPEND HEADERS_CRYPTO
+        list(APPEND HEADERS
             src/crypto/rx/RxFix.h
             src/crypto/rx/RxMsr.h
             src/hw/msr/Msr.h
             src/hw/msr/MsrItem.h
             )
 
-        list(APPEND SOURCES_CRYPTO
+        list(APPEND SOURCES
             src/crypto/rx/RxMsr.cpp
             src/hw/msr/Msr.cpp
             src/hw/msr/MsrItem.cpp
             )
     else()
-        remove_definitions(/DXMRIG_FEATURE_MSR)
-        remove_definitions(/DXMRIG_FIX_RYZEN)
-        message("-- WITH_MSR=OFF")
+        set(WITH_MSR OFF)
     endif()
 
     if (WITH_PROFILING)
-        add_definitions(/DXMRIG_FEATURE_PROFILING)
+        add_definitions(-DXMRIG_FEATURE_PROFILING)
 
-        list(APPEND HEADERS_CRYPTO src/crypto/rx/Profiler.h)
-        list(APPEND SOURCES_CRYPTO src/crypto/rx/Profiler.cpp)
+        list(APPEND HEADERS src/crypto/rx/Profiler.h)
+        list(APPEND SOURCES src/crypto/rx/Profiler.cpp)
     endif()
-else()
-    remove_definitions(/DXMRIG_ALGO_RANDOMX)
 endif()
+
+
+message(STATUS "WITH_MSR        \t= ${WITH_MSR}")
+message(STATUS "WITH_PROFILING  \t= ${WITH_PROFILING}")

res/app.rc

@@ -20,7 +20,7 @@ VS_VERSION_INFO VERSIONINFO
     BEGIN
       BLOCK "000004b0"
       BEGIN
-        VALUE "CompanyName",      APP_SITE
+        VALUE "CompanyName",      APP_DOMAIN
         VALUE "FileDescription",  APP_DESC
         VALUE "FileVersion",      APP_VERSION
         VALUE "LegalCopyright",   APP_COPYRIGHT

scripts/build.hwloc.sh

@@ -1,6 +1,10 @@
 #!/bin/bash -e
 
-HWLOC_VERSION="2.5.0"
+HWLOC_VERSION_MAJOR="2"
+HWLOC_VERSION_MINOR="7"
+HWLOC_VERSION_PATCH="1"
+
+HWLOC_VERSION="${HWLOC_VERSION_MAJOR}.${HWLOC_VERSION_MINOR}.${HWLOC_VERSION_PATCH}"
 
 mkdir -p deps
 mkdir -p deps/include
@@ -8,7 +12,7 @@ mkdir -p deps/lib
 
 mkdir -p build && cd build
 
-wget https://download.open-mpi.org/release/hwloc/v2.5/hwloc-${HWLOC_VERSION}.tar.gz -O hwloc-${HWLOC_VERSION}.tar.gz
+wget https://download.open-mpi.org/release/hwloc/v${HWLOC_VERSION_MAJOR}.${HWLOC_VERSION_MINOR}/hwloc-${HWLOC_VERSION}.tar.gz -O hwloc-${HWLOC_VERSION}.tar.gz
 tar -xzf hwloc-${HWLOC_VERSION}.tar.gz
 
 cd hwloc-${HWLOC_VERSION}
@@ -16,4 +20,4 @@ cd hwloc-${HWLOC_VERSION}
 make -j$(nproc || sysctl -n hw.ncpu || sysctl -n hw.logicalcpu)
 cp -fr include ../../deps
 cp hwloc/.libs/libhwloc.a ../../deps/lib
-cd ..
+cd ..

scripts/build.libressl.sh

@@ -1,6 +1,6 @@
 #!/bin/bash -e
 
-LIBRESSL_VERSION="3.0.2"
+LIBRESSL_VERSION="3.5.2"
 
 mkdir -p deps
 mkdir -p deps/include
@@ -17,4 +17,4 @@ make -j$(nproc || sysctl -n hw.ncpu || sysctl -n hw.logicalcpu)
 cp -fr include ../../deps
 cp crypto/.libs/libcrypto.a ../../deps/lib
 cp ssl/.libs/libssl.a ../../deps/lib
-cd ..
+cd ..

scripts/build.openssl.sh

@@ -1,6 +1,6 @@
 #!/bin/bash -e
 
-OPENSSL_VERSION="1.1.1l"
+OPENSSL_VERSION="1.1.1o"
 
 mkdir -p deps
 mkdir -p deps/include

scripts/build.openssl3.sh

@@ -0,0 +1,20 @@
+#!/bin/bash -e
+
+OPENSSL_VERSION="3.0.3"
+
+mkdir -p deps
+mkdir -p deps/include
+mkdir -p deps/lib
+
+mkdir -p build && cd build
+
+wget https://www.openssl.org/source/openssl-${OPENSSL_VERSION}.tar.gz -O openssl-${OPENSSL_VERSION}.tar.gz
+tar -xzf openssl-${OPENSSL_VERSION}.tar.gz
+
+cd openssl-${OPENSSL_VERSION}
+./config -no-shared -no-asm -no-zlib -no-comp -no-dgram -no-filenames -no-cms
+make -j$(nproc || sysctl -n hw.ncpu || sysctl -n hw.logicalcpu)
+cp -fr include ../../deps
+cp libcrypto.a ../../deps/lib
+cp libssl.a ../../deps/lib
+cd ..

scripts/build.uv.sh

@@ -1,6 +1,6 @@
 #!/bin/bash -e
 
-UV_VERSION="1.42.0"
+UV_VERSION="1.44.1"
 
 mkdir -p deps
 mkdir -p deps/include
@@ -17,4 +17,4 @@ sh autogen.sh
 make -j$(nproc || sysctl -n hw.ncpu || sysctl -n hw.logicalcpu)
 cp -fr include ../../deps
 cp .libs/libuv.a ../../deps/lib
-cd ..
+cd ..

scripts/generate_cl.js

@@ -67,15 +67,6 @@ function rx()
 }
 
 
-function astrobwt()
-{
-    const astrobwt = opencl_minify(addIncludes('astrobwt.cl', [ 'BWT.cl', 'salsa20.cl', 'sha3.cl' ]));
-
-    // fs.writeFileSync('astrobwt_gen.cl', astrobwt);
-    fs.writeFileSync('astrobwt_cl.h', text2h(astrobwt, 'xmrig', 'astrobwt_cl'));
-}
-
-
 function kawpow()
 {
     const kawpow = opencl_minify(addIncludes('kawpow.cl', [ 'defs.h' ]));
@@ -97,11 +88,6 @@ process.chdir(path.resolve('src/backend/opencl/cl/rx'));
 
 rx();
 
-process.chdir(cwd);
-process.chdir(path.resolve('src/backend/opencl/cl/astrobwt'));
-
-astrobwt();
-
 process.chdir(cwd);
 process.chdir(path.resolve('src/backend/opencl/cl/kawpow'));
 

scripts/rtm_ghostrider_example.cmd

@@ -16,5 +16,8 @@
 :: Smaller pools also often have smaller fees/payout limits.
 
 cd %~dp0
+:: Use this command line to connect to non-SSL port
 xmrig.exe -a gr -o raptoreumemporium.com:3008 -u WALLET_ADDRESS -p x
+:: Or use this command line to connect to an SSL port
+:: xmrig.exe -a gr -o rtm.suprnova.cc:4273 --tls -u WALLET_ADDRESS -p x
 pause

src/3rdparty/epee/LICENSE.txt

@@ -1,25 +0,0 @@
-Copyright (c) 2006-2013, Andrey N. Sabelnikov, www.sabelnikov.net
-All rights reserved.
-
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions are met:
-    * Redistributions of source code must retain the above copyright
-      notice, this list of conditions and the following disclaimer.
-    * Redistributions in binary form must reproduce the above copyright
-      notice, this list of conditions and the following disclaimer in the
-      documentation and/or other materials provided with the distribution.
-    * Neither the name of the Andrey N. Sabelnikov nor the
-      names of its contributors may be used to endorse or promote products
-      derived from this software without specific prior written permission.
-
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
-ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
-WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
-DISCLAIMED. IN NO EVENT SHALL Andrey N. Sabelnikov BE LIABLE FOR ANY
-DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
-(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
-ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
-SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

src/3rdparty/epee/README.md

@@ -1 +0,0 @@
-epee -  is a small library of helpers, wrappers, tools and and so on, used to make my life easier.

src/3rdparty/epee/span.h

@@ -1,176 +0,0 @@
-// Copyright (c) 2017-2020, The Monero Project
-//
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without modification, are
-// permitted provided that the following conditions are met:
-//
-// 1. Redistributions of source code must retain the above copyright notice, this list of
-//    conditions and the following disclaimer.
-//
-// 2. Redistributions in binary form must reproduce the above copyright notice, this list
-//    of conditions and the following disclaimer in the documentation and/or other
-//    materials provided with the distribution.
-//
-// 3. Neither the name of the copyright holder nor the names of its contributors may be
-//    used to endorse or promote products derived from this software without specific
-//    prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY
-// EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
-// MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL
-// THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
-// PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
-// STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF
-// THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-#pragma once
-
-#include <algorithm>
-#include <cstdint>
-#include <memory>
-#include <string>
-#include <type_traits>
-
-namespace epee
-{
-  /*!
-    \brief Non-owning sequence of data. Does not deep copy
-
-    Inspired by `gsl::span` and/or `boost::iterator_range`. This class is
-    intended to be used as a parameter type for functions that need to take a
-    writable or read-only sequence of data. Most common cases are `span<char>`
-    and `span<std::uint8_t>`. Using as a class member is only recommended if
-    clearly documented as not doing a deep-copy. C-arrays are easily convertible
-    to this type.
-
-    \note Conversion from C string literal to `span<const char>` will include
-      the NULL-terminator.
-    \note Never allows derived-to-base pointer conversion; an array of derived
-      types is not an array of base types.
-   */
-  template<typename T>
-  class span
-  {
-    template<typename U>
-    static constexpr bool safe_conversion() noexcept
-    {
-      // Allow exact matches or `T*` -> `const T*`.
-      using with_const = typename std::add_const<U>::type;
-      return std::is_same<T, U>() ||
-        (std::is_const<T>() && std::is_same<T, with_const>());
-    }
-
-  public:
-    using value_type = T;
-    using size_type = std::size_t;
-    using difference_type = std::ptrdiff_t;
-    using pointer = T*;
-    using const_pointer = const T*;
-    using reference = T&;
-    using const_reference = const T&;
-    using iterator = pointer;
-    using const_iterator = const_pointer;
-
-    constexpr span() noexcept : ptr(nullptr), len(0) {}
-    constexpr span(std::nullptr_t) noexcept : span() {}
-
-    //! Prevent derived-to-base conversions; invalid in this context.
-    template<typename U, typename = typename std::enable_if<safe_conversion<U>()>::type>
-    constexpr span(U* const src_ptr, const std::size_t count) noexcept
-      : ptr(src_ptr), len(count) {}
-
-    //! Conversion from C-array. Prevents common bugs with sizeof + arrays.
-    template<std::size_t N>
-    constexpr span(T (&src)[N]) noexcept : span(src, N) {}
-
-    constexpr span(const span&) noexcept = default;
-    span& operator=(const span&) noexcept = default;
-
-    /*! Try to remove `amount` elements from beginning of span.
-    \return Number of elements removed. */
-    std::size_t remove_prefix(std::size_t amount) noexcept
-    {
-        amount = std::min(len, amount);
-        ptr += amount;
-        len -= amount;
-        return amount;
-    }
-
-    constexpr iterator begin() const noexcept { return ptr; }
-    constexpr const_iterator cbegin() const noexcept { return ptr; }
-
-    constexpr iterator end() const noexcept { return begin() + size(); }
-    constexpr const_iterator cend() const noexcept { return cbegin() + size(); }
-
-    constexpr bool empty() const noexcept { return size() == 0; }
-    constexpr pointer data() const noexcept { return ptr; }
-    constexpr std::size_t size() const noexcept { return len; }
-    constexpr std::size_t size_bytes() const noexcept { return size() * sizeof(value_type); }
-
-    T &operator[](size_t idx) noexcept { return ptr[idx]; }
-    const T &operator[](size_t idx) const noexcept { return ptr[idx]; }
-
-  private:
-    T* ptr;
-    std::size_t len;
-  };
-
-  //! \return `span<const T::value_type>` from a STL compatible `src`.
-  template<typename T>
-  constexpr span<const typename T::value_type> to_span(const T& src)
-  {
-    // compiler provides diagnostic if size() is not size_t.
-    return {src.data(), src.size()};
-  }
-
-  //! \return `span<T::value_type>` from a STL compatible `src`.
-  template<typename T>
-  constexpr span<typename T::value_type> to_mut_span(T& src)
-  {
-    // compiler provides diagnostic if size() is not size_t.
-    return {src.data(), src.size()};
-  }
-
-  template<typename T>
-  constexpr bool has_padding() noexcept
-  {
-    return !std::is_standard_layout<T>() || alignof(T) != 1;
-  }
-
-  //! \return Cast data from `src` as `span<const std::uint8_t>`.
-  template<typename T>
-  span<const std::uint8_t> to_byte_span(const span<const T> src) noexcept
-  {
-    static_assert(!has_padding<T>(), "source type may have padding");
-    return {reinterpret_cast<const std::uint8_t*>(src.data()), src.size_bytes()};
-  }
-
-  //! \return `span<const std::uint8_t>` which represents the bytes at `&src`.
-  template<typename T>
-  span<const std::uint8_t> as_byte_span(const T& src) noexcept
-  {
-    static_assert(!std::is_empty<T>(), "empty types will not work -> sizeof == 1");
-    static_assert(!has_padding<T>(), "source type may have padding");
-    return {reinterpret_cast<const std::uint8_t*>(std::addressof(src)), sizeof(T)};
-  }
-
-  //! \return `span<std::uint8_t>` which represents the bytes at `&src`.
-  template<typename T>
-  span<std::uint8_t> as_mut_byte_span(T& src) noexcept
-  {
-    static_assert(!std::is_empty<T>(), "empty types will not work -> sizeof == 1");
-    static_assert(!has_padding<T>(), "source type may have padding");
-    return {reinterpret_cast<std::uint8_t*>(std::addressof(src)), sizeof(T)};
-  }
-
-  //! make a span from a std::string
-  template<typename T>
-  span<const T> strspan(const std::string &s) noexcept
-  {
-    static_assert(std::is_same<T, char>() || std::is_same<T, unsigned char>() || std::is_same<T, int8_t>() || std::is_same<T, uint8_t>(), "Unexpected type");
-    return {reinterpret_cast<const T*>(s.data()), s.size()};
-  }
-}

src/3rdparty/fmt/LICENSE.rst

@@ -1,27 +0,0 @@
-Copyright (c) 2012 - present, Victor Zverovich
-
-Permission is hereby granted, free of charge, to any person obtaining
-a copy of this software and associated documentation files (the
-"Software"), to deal in the Software without restriction, including
-without limitation the rights to use, copy, modify, merge, publish,
-distribute, sublicense, and/or sell copies of the Software, and to
-permit persons to whom the Software is furnished to do so, subject to
-the following conditions:
-
-The above copyright notice and this permission notice shall be
-included in all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-
---- Optional exception to the license ---
-
-As an exception, if, as a result of your compiling your source code, portions
-of this Software are embedded into a machine-executable object form of such
-source code, you may redistribute such embedded portions in such object form
-without including the above copyright and permission notices.