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

src/crypto/cn/CnAlgo.h

@@ -127,6 +127,7 @@ private:
 #       endif
 #       ifdef XMRIG_ALGO_CN_PICO
         CN_MEMORY / 8, // CN_PICO_0
+        0,             // RX_WOW
 #       endif
     };
 
@@ -156,7 +157,8 @@ private:
         CN_ITER / 2, // CN_HEAVY_XHV
 #       endif
 #       ifdef XMRIG_ALGO_CN_PICO
-        CN_ITER / 8, // CN_PICO_0
+        CN_ITER / 8, // CN_PICO_0,
+        0,           // RX_WOW
 #       endif
     };
 
@@ -186,7 +188,8 @@ private:
         Algorithm::CN_0,   // CN_HEAVY_XHV
 #       endif
 #       ifdef XMRIG_ALGO_CN_PICO
-        Algorithm::CN_2,   // CN_PICO_0
+        Algorithm::CN_2,    // CN_PICO_0,
+        Algorithm::INVALID, // RX_WOW
 #       endif
     };
 };

src/crypto/common/Algorithm.cpp

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

src/crypto/common/Algorithm.h

@@ -67,6 +67,9 @@ public:
 #       endif
 #       ifdef XMRIG_ALGO_CN_PICO
         CN_PICO_0,     // "cn-pico"          CryptoNight Turtle (TRTL)
+#       endif
+#       ifdef XMRIG_ALGO_RANDOMX
+        RX_WOW,        // "rx/wow"           RandomWOW
 #       endif
         MAX
     };
@@ -76,7 +79,8 @@ public:
         CN,
         CN_LITE,
         CN_HEAVY,
-        CN_PICO
+        CN_PICO,
+        RANDOM_X
     };
 
     inline Algorithm()                                     {}