From 69c8f8e0f5bd498d23d880d0b5a53b3c1061906f Mon Sep 17 00:00:00 2001 From: afiniel <44875524+afiniel@users.noreply.github.com> Date: Mon, 21 Nov 2022 23:16:06 +0100 Subject: [PATCH 1/4] Add Randomx/xdag (xDagger Coin) --- package.json | 2 +- src/backend/opencl/cl/cn/algorithm.cl | 1 + src/base/crypto/Algorithm.cpp | 6 +++++- src/base/crypto/Algorithm.h | 2 ++ src/base/crypto/Coin.cpp | 5 +++-- src/base/crypto/Coin.h | 1 + src/crypto/rx/RxAlgo.h | 2 +- 7 files changed, 14 insertions(+), 5 deletions(-) diff --git a/package.json b/package.json index 80cad8a1..91cf8a37 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "xmrig", "version": "3.0.0", - "description": "RandomX, CryptoNight and Argon2 miner", + "description": "RandomX, CryptoNight , kawpow and Argon2 miner", "main": "index.js", "directories": { "doc": "doc" 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 - * Copyright (c) 2016-2021 XMRig , + * Copyright (c) 2018-2022 SChernykh + * Copyright (c) 2016-2022 XMRig , * * 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 @@ -53,6 +53,7 @@ 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_XDAG, "XDAG", "Xdagger", 0, 0, BLUE_BG_BOLD( WHITE_BOLD_S " xdagger ") }, }; diff --git a/src/base/crypto/Coin.h b/src/base/crypto/Coin.h index fbd36371..82371860 100644 --- a/src/base/crypto/Coin.h +++ b/src/base/crypto/Coin.h @@ -39,6 +39,7 @@ public: KEVA, RAVEN, WOWNERO, + XDAG, MAX }; diff --git a/src/crypto/rx/RxAlgo.h b/src/crypto/rx/RxAlgo.h index 0793cb17..0e6544d8 100644 --- a/src/crypto/rx/RxAlgo.h +++ b/src/crypto/rx/RxAlgo.h @@ -47,7 +47,7 @@ public: static inline Algorithm::Id id(Algorithm::Id algorithm) { - if (algorithm == Algorithm::RX_SFX) { + if (algorithm == Algorithm::RX_SFX || algorithm == Algorithm::RX_XDAG) { return Algorithm::RX_0; } From 96e9588b1b2fed4d9277257c4b148f65e4a2a832 Mon Sep 17 00:00:00 2001 From: afiniel <44875524+afiniel@users.noreply.github.com> Date: Sun, 27 Nov 2022 12:45:46 +0100 Subject: [PATCH 2/4] Update algorithm.cl --- src/backend/opencl/cl/cn/algorithm.cl | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/backend/opencl/cl/cn/algorithm.cl b/src/backend/opencl/cl/cn/algorithm.cl index 542bcd3d..985d2e1b 100644 --- a/src/backend/opencl/cl/cn/algorithm.cl +++ b/src/backend/opencl/cl/cn/algorithm.cl @@ -24,7 +24,8 @@ #define ALGO_RX_SFX 0x72151273 #define ALGO_RX_KEVA 0x7214116b #define ALGO_RX_GRAFT 0x72151267 -#define ALGO_RX_XDAG 0x72151208 +#define ALGO_RX_XDAG 0x72151278 + #define ALGO_AR2_CHUKWA 0x61130000 #define ALGO_AR2_CHUKWA_V2 0x61140000 #define ALGO_AR2_WRKZ 0x61120000 From 60121cdfb9dec7c5fad0e10640447d6c356ef52a Mon Sep 17 00:00:00 2001 From: afiniel <44875524+afiniel@users.noreply.github.com> Date: Sun, 27 Nov 2022 12:50:03 +0100 Subject: [PATCH 3/4] Update Algorithm.h --- src/base/crypto/Algorithm.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/base/crypto/Algorithm.h b/src/base/crypto/Algorithm.h index 8323f7f4..73d28302 100644 --- a/src/base/crypto/Algorithm.h +++ b/src/base/crypto/Algorithm.h @@ -78,7 +78,7 @@ public: RX_GRAFT = 0x72151267, // "rx/graft" RandomGRAFT (Graft). RX_SFX = 0x72151273, // "rx/sfx" RandomSFX (Safex Cash). RX_KEVA = 0x7214116b, // "rx/keva" RandomKEVA (Keva). - RX_XDAG = 0x72151208, // "rx/xdag" RandomXDAG (xDagger Coin). + RX_XDAG = 0x72151278, // "rx/xdag" RandomXDAG (xDagger Coin). AR2_CHUKWA = 0x61130000, // "argon2/chukwa" Argon2id (Chukwa). AR2_CHUKWA_V2 = 0x61140000, // "argon2/chukwav2" Argon2id (Chukwa v2). AR2_WRKZ = 0x61120000, // "argon2/wrkz" Argon2id (WRKZ) From fdf9b73d18aef7009eb8d2e90f94f928ffa46b49 Mon Sep 17 00:00:00 2001 From: afiniel <44875524+afiniel@users.noreply.github.com> Date: Sun, 27 Nov 2022 17:28:55 +0100 Subject: [PATCH 4/4] Update package.json --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 91cf8a37..98375c8e 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "xmrig", "version": "3.0.0", - "description": "RandomX, CryptoNight , kawpow and Argon2 miner", + "description": "RandomX, CryptoNight , Kawpow and Argon2 miner", "main": "index.js", "directories": { "doc": "doc"