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

Merge branch 'evo' into feature-per-pool-algo

Browse source
This commit is contained in:
XMRig 2019-07-06 10:49:31 +07:00
commit 9b14caa9f9
79 changed files with 9889 additions and 40 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -107,8 +107,12 @@ static AlgoName const algorithm_names[] = {
{ "cryptonight_turtle", "cn_turtle", Algorithm::CN_PICO_0 },
# endif
# ifdef XMRIG_ALGO_RANDOMX
{ "randomx/0", "rx/0", Algorithm::RX_0 },
{ "RandomX", "rx", Algorithm::RX_0 },
{ "randomx/wow", "rx/wow", Algorithm::RX_WOW },
{ "randomx", "rx", Algorithm::RX_WOW },
{ "RandomWOW", nullptr, Algorithm::RX_WOW },
{ "randomx/loki", "rx/loki", Algorithm::RX_LOKI },
{ "RandomXL", nullptr, Algorithm::RX_LOKI },
# endif
};

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

@ -69,7 +69,9 @@ public:
CN_PICO_0, // "cn-pico" CryptoNight Turtle (TRTL)
# endif
# ifdef XMRIG_ALGO_RANDOMX
RX_0, // "rx/0" RandomX (reference configuration)
RX_WOW, // "rx/wow" RandomWOW (Wownero)
RX_LOKI, // "rx/loki" RandomXL (Loki)
# endif
MAX
};