diff --git a/CMakeLists.txt b/CMakeLists.txt index d37734ac..b4b83b8b 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1,15 +1,15 @@ cmake_minimum_required(VERSION 3.1) -project(xmrig) +project(xmrig-4-xdag) option(WITH_HWLOC "Enable hwloc support" ON) -option(WITH_CN_LITE "Enable CryptoNight-Lite algorithms family" ON) -option(WITH_CN_HEAVY "Enable CryptoNight-Heavy algorithms family" ON) -option(WITH_CN_PICO "Enable CryptoNight-Pico algorithm" ON) -option(WITH_CN_FEMTO "Enable CryptoNight-UPX2 algorithm" ON) +option(WITH_CN_LITE "Enable CryptoNight-Lite algorithms family" OFF) +option(WITH_CN_HEAVY "Enable CryptoNight-Heavy algorithms family" OFF) +option(WITH_CN_PICO "Enable CryptoNight-Pico algorithm" OFF) +option(WITH_CN_FEMTO "Enable CryptoNight-UPX2 algorithm" OFF) option(WITH_RANDOMX "Enable RandomX algorithms family" ON) -option(WITH_ARGON2 "Enable Argon2 algorithms family" ON) -option(WITH_KAWPOW "Enable KawPow algorithms family" ON) -option(WITH_GHOSTRIDER "Enable GhostRider algorithm" ON) +option(WITH_ARGON2 "Enable Argon2 algorithms family" OFF) +option(WITH_KAWPOW "Enable KawPow algorithms family" OFF) +option(WITH_GHOSTRIDER "Enable GhostRider algorithm" OFF) option(WITH_HTTP "Enable HTTP protocol support (client/server)" ON) option(WITH_DEBUG_LOG "Enable debug log output" OFF) option(WITH_TLS "Enable OpenSSL support" ON) @@ -17,10 +17,10 @@ option(WITH_ASM "Enable ASM PoW implementations" ON) option(WITH_MSR "Enable MSR mod & 1st-gen Ryzen fix" ON) option(WITH_ENV_VARS "Enable environment variables support in config file" ON) option(WITH_EMBEDDED_CONFIG "Enable internal embedded JSON config" OFF) -option(WITH_OPENCL "Enable OpenCL backend" ON) +option(WITH_OPENCL "Enable OpenCL backend" OFF) set(WITH_OPENCL_VERSION 200 CACHE STRING "Target OpenCL version") set_property(CACHE WITH_OPENCL_VERSION PROPERTY STRINGS 120 200 210 220) -option(WITH_CUDA "Enable CUDA backend" ON) +option(WITH_CUDA "Enable CUDA backend" OFF) option(WITH_NVML "Enable NVML (NVIDIA Management Library) support (only if CUDA backend enabled)" ON) option(WITH_ADL "Enable ADL (AMD Display Library) or sysfs support (only if OpenCL backend enabled)" ON) option(WITH_STRICT_CACHE "Enable strict checks for OpenCL cache" ON) diff --git a/res/app.ico b/res/app.ico index 8c3d628f..16e6e88e 100644 Binary files a/res/app.ico and b/res/app.ico differ diff --git a/res/app.rc b/res/app.rc index fb41b8b1..ec3cdd14 100644 --- a/res/app.rc +++ b/res/app.rc @@ -24,7 +24,7 @@ VS_VERSION_INFO VERSIONINFO VALUE "FileDescription", APP_DESC VALUE "FileVersion", APP_VERSION VALUE "LegalCopyright", APP_COPYRIGHT - VALUE "OriginalFilename", "xmrig.exe" + VALUE "OriginalFilename", "xmrig-4-xdag.exe" VALUE "ProductName", APP_NAME VALUE "ProductVersion", APP_VERSION END diff --git a/src/backend/opencl/cl/cn/algorithm.cl b/src/backend/opencl/cl/cn/algorithm.cl index 36607184..542bcd3d 100644 --- a/src/backend/opencl/cl/cn/algorithm.cl +++ b/src/backend/opencl/cl/cn/algorithm.cl @@ -24,6 +24,7 @@ #define ALGO_RX_SFX 0x72151273 #define ALGO_RX_KEVA 0x7214116b #define ALGO_RX_GRAFT 0x72151267 +#define ALGO_RX_XDAG 0x72151208 #define ALGO_AR2_CHUKWA 0x61130000 #define ALGO_AR2_CHUKWA_V2 0x61140000 #define ALGO_AR2_WRKZ 0x61120000 diff --git a/src/base/crypto/Algorithm.cpp b/src/base/crypto/Algorithm.cpp index 6e76fd26..27c70b73 100644 --- a/src/base/crypto/Algorithm.cpp +++ b/src/base/crypto/Algorithm.cpp @@ -82,6 +82,7 @@ const char *Algorithm::kRX_ARQ = "rx/arq"; const char *Algorithm::kRX_GRAFT = "rx/graft"; const char *Algorithm::kRX_SFX = "rx/sfx"; const char *Algorithm::kRX_KEVA = "rx/keva"; +const char *Algorithm::kRX_XDAG = "rx/xdag"; #endif #ifdef XMRIG_ALGO_ARGON2 @@ -148,6 +149,7 @@ static const std::map kAlgorithmNames = { ALGO_NAME(RX_GRAFT), ALGO_NAME(RX_SFX), ALGO_NAME(RX_KEVA), + ALGO_NAME(RX_XDAG), # endif # ifdef XMRIG_ALGO_ARGON2 @@ -263,6 +265,8 @@ static const std::map kAlgorithmAlias ALGO_ALIAS(RX_SFX, "randomsfx"), ALGO_ALIAS_AUTO(RX_KEVA), ALGO_ALIAS(RX_KEVA, "randomx/keva"), ALGO_ALIAS(RX_KEVA, "randomkeva"), + ALGO_ALIAS_AUTO(RX_XDAG), ALGO_ALIAS(RX_XDAG, "randomx/xdag"), + ALGO_ALIAS(RX_XDAG, "randomxdag"), # endif # ifdef XMRIG_ALGO_ARGON2 @@ -350,7 +354,7 @@ std::vector xmrig::Algorithm::all(const std::function