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

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

Browse Source
This commit is contained in:
XMRig
2019-06-26 15:44:52 +07:00
parent b38e432647 0aaf2d38d4
commit 188338c493
19 changed files with 283 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -106,6 +106,10 @@ static AlgoName const algorithm_names[] = {
{ "cryptonight-ultralite", "cn-ultralite", Algorithm::CN_PICO_0 },
{ "cryptonight_turtle", "cn_turtle", Algorithm::CN_PICO_0 },
# endif
# ifdef XMRIG_ALGO_RANDOMX
{ "randomx/wow", "rx/wow", Algorithm::RX_WOW },
{ "randomx", "rx", Algorithm::RX_WOW },
# endif
};
@@ -133,6 +137,7 @@ xmrig::Algorithm::Family xmrig::Algorithm::family(Id id)
case CN_XAO:
case CN_RTO:
case CN_RWZ:
case CN_ZLS:
case CN_DOUBLE:
# ifdef XMRIG_ALGO_CN_GPU
case CN_GPU:
@@ -153,10 +158,15 @@ xmrig::Algorithm::Family xmrig::Algorithm::family(Id id)
# endif
# ifdef XMRIG_ALGO_CN_PICO
case Algorithm::CN_PICO_0:
case CN_PICO_0:
return CN_PICO;
# endif
# ifdef XMRIG_ALGO_RANDOMX
case RX_WOW:
return RANDOM_X;
# endif
default:
break;
}