From 98f0347f6fd14495165dea483a57842502549f41 Mon Sep 17 00:00:00 2001
From: FSOL <128682335+FSOL-XDAG@users.noreply.github.com>
Date: Thu, 23 Mar 2023 21:27:43 +0100
Subject: [PATCH] Add XDAG 2 XMRIG

Integrate @Swordlet files
---
 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              | 1 +
 src/base/crypto/Coin.h                | 1 +
 src/base/net/stratum/Job.cpp          | 2 ++
 src/crypto/rx/RxAlgo.h                | 2 +-
 7 files changed, 13 insertions(+), 2 deletions(-)

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<uint32_t, const char *> 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<const char *, Algorithm::Id, aliasCompare> 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> xmrig::Algorithm::all(const std::function<bool(con
         CN_HEAVY_0, CN_HEAVY_TUBE, CN_HEAVY_XHV,
         CN_PICO_0, CN_PICO_TLO,
         CN_UPX2,
-        RX_0, RX_WOW, RX_ARQ, RX_GRAFT, RX_SFX, RX_KEVA,
+        RX_0, RX_WOW, RX_ARQ, RX_GRAFT, RX_SFX, RX_KEVA, RX_XDAG,
         AR2_CHUKWA, AR2_CHUKWA_V2, AR2_WRKZ,
         KAWPOW_RVN,
         GHOSTRIDER_RTM
diff --git a/src/base/crypto/Algorithm.h b/src/base/crypto/Algorithm.h
index f96c3fd3..917b9c32 100644
--- a/src/base/crypto/Algorithm.h
+++ b/src/base/crypto/Algorithm.h
@@ -78,6 +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"          RandomX (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)
@@ -144,6 +145,7 @@ public:
     static const char *kRX_GRAFT;
     static const char *kRX_SFX;
     static const char *kRX_KEVA;
+    static const char *kRX_XDAG;
 #   endif
 
 #   ifdef XMRIG_ALGO_ARGON2
diff --git a/src/base/crypto/Coin.cpp b/src/base/crypto/Coin.cpp
index b63570e1..04b49999 100644
--- a/src/base/crypto/Coin.cpp
+++ b/src/base/crypto/Coin.cpp
@@ -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 " xdag    ") },
 };
 
 
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/base/net/stratum/Job.cpp b/src/base/net/stratum/Job.cpp
index 56f5de80..058e0f79 100644
--- a/src/base/net/stratum/Job.cpp
+++ b/src/base/net/stratum/Job.cpp
@@ -174,8 +174,10 @@ void xmrig::Job::setSigKey(const char *sig_key)
 int32_t xmrig::Job::nonceOffset() const
 {
    auto f = algorithm().family();
+   auto i = algorithm().id();
    if (f == Algorithm::KAWPOW)     return 32;
    if (f == Algorithm::GHOSTRIDER) return 76;
+   if (i == Algorithm::RX_XDAG)    return 60;
    return 39;
 }
 
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;
         }