mirrors/xmrig
1
0
Fork 1
mirror of https://github.com/xmrig/xmrig.git synced 2025-12-24 21:32:47 -05:00
Code Issues Projects Releases Wiki Activity

Merge https://github.com/xmvdev/xmrig

Browse Source
This commit is contained in:
MoneroOcean
2019-12-15 15:43:17 -08:00
parent 12aeb03da2 78e047a398
commit c41cc3d494
8 changed files with 116 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/crypto/common/Algorithm.cpp
View File

@@ -113,6 +113,7 @@ static AlgoName const algorithm_names[] = {
{ "DefyX", "defyx", Algorithm::DEFYX },
{ "randomx/arq", "rx/arq", Algorithm::RX_ARQ },
{ "RandomARQ", nullptr, Algorithm::RX_ARQ },
{ "RandomV", "rx/v", Algorithm::RX_V },
# endif
# ifdef XMRIG_ALGO_ARGON2
{ "argon2/chukwa", nullptr, Algorithm::AR2_CHUKWA },
@@ -138,6 +139,7 @@ size_t xmrig::Algorithm::l2() const
# ifdef XMRIG_ALGO_RANDOMX
switch (m_id) {
case RX_0:
case RX_V:
case RX_LOKI:
return 0x40000;
@@ -176,6 +178,7 @@ size_t xmrig::Algorithm::l3() const
if (f == RANDOM_X) {
switch (m_id) {
case RX_0:
case RX_V:
case RX_LOKI:
return oneMiB * 2;
@@ -276,6 +279,7 @@ xmrig::Algorithm::Family xmrig::Algorithm::family(Id id)
# ifdef XMRIG_ALGO_RANDOMX
case RX_0:
case RX_V:
case RX_WOW:
case RX_LOKI:
case DEFYX:

1
src/crypto/common/Algorithm.h
View File

@@ -68,6 +68,7 @@ public:
RX_LOKI, // "rx/loki" RandomXL (Loki).
DEFYX, // "defyx" DefyX (Scala).
RX_ARQ, // "rx/arq" RandomARQ (Arqma).
RX_V, // "rx/v" RandomV (Monerov).
AR2_CHUKWA, // "argon2/chukwa" Argon2id (Chukwa).
AR2_WRKZ, // "argon2/wrkz" Argon2id (WRKZ)
MAX

6
src/crypto/randomx/randomx.cpp
View File

@@ -92,6 +92,11 @@ RandomX_ConfigurationArqma::RandomX_ConfigurationArqma()
ScratchpadL3_Size = 262144;
}
RandomX_ConfigurationV::RandomX_ConfigurationV()
{
ArgonSalt = "RandomV\x03";
}
RandomX_ConfigurationBase::RandomX_ConfigurationBase()
: ArgonMemory(262144)
, ArgonIterations(3)
@@ -264,6 +269,7 @@ void RandomX_ConfigurationBase::Apply()
RandomX_ConfigurationMonero RandomX_MoneroConfig;
RandomX_ConfigurationWownero RandomX_WowneroConfig;
RandomX_ConfigurationV RandomX_VConfig;
RandomX_ConfigurationLoki RandomX_LokiConfig;
RandomX_ConfigurationArqma RandomX_ArqmaConfig;

2
src/crypto/randomx/randomx.h
View File

@@ -179,11 +179,13 @@ struct RandomX_ConfigurationBase
};
struct RandomX_ConfigurationMonero : public RandomX_ConfigurationBase {};
struct RandomX_ConfigurationV : public RandomX_ConfigurationBase { RandomX_ConfigurationV(); };
struct RandomX_ConfigurationWownero : public RandomX_ConfigurationBase { RandomX_ConfigurationWownero(); };
struct RandomX_ConfigurationLoki : public RandomX_ConfigurationBase { RandomX_ConfigurationLoki(); };
struct RandomX_ConfigurationArqma : public RandomX_ConfigurationBase { RandomX_ConfigurationArqma(); };
extern RandomX_ConfigurationMonero RandomX_MoneroConfig;
extern RandomX_ConfigurationV RandomX_VConfig;
extern RandomX_ConfigurationWownero RandomX_WowneroConfig;
extern RandomX_ConfigurationLoki RandomX_LokiConfig;
extern RandomX_ConfigurationArqma RandomX_ArqmaConfig;

5
src/crypto/rx/RxAlgo.cpp
View File

@@ -41,7 +41,10 @@ xmrig::Algorithm::Id xmrig::RxAlgo::apply(Algorithm::Id algorithm)
const RandomX_ConfigurationBase *xmrig::RxAlgo::base(Algorithm::Id algorithm)
{
switch (algorithm) {
case Algorithm::RX_WOW:
case Algorithm::RX_V:
return &RandomX_VConfig;
case Algorithm::RX_WOW:
return &RandomX_WowneroConfig;
case Algorithm::RX_LOKI: