fzorb/REDACTED-rig
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge pull request #1 from FSOL-XDAG/ADD_XDAG

Browse source 
Add XDAG 2 XMRIG
This commit is contained in:
FSOL-XDAG 2023-03-23 21:30:49 +01:00 • committed by GitHub
commit b9790b514e
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
7 changed files with 13 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

1
src/backend/opencl/cl/cn/algorithm.cl
View file

@ -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

6
src/base/crypto/Algorithm.cpp
View file

@ -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

2
src/base/crypto/Algorithm.h
View file

@ -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

1
src/base/crypto/Coin.cpp
View file

@ -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 ") },
};

1
src/base/crypto/Coin.h
View file

@ -39,6 +39,7 @@ public:
KEVA,
RAVEN,
WOWNERO,
XDAG,
MAX
};

2
src/base/net/stratum/Job.cpp
View file

@ -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;
}

2
src/crypto/rx/RxAlgo.h
View file

@ -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;
}