Synched changes to support XMRigCC 2.8.4

* Added CN algo variant CXCHE algo: (`cn/cache_hash`)
Bendr0id · Nov 19, 2020 · 6055149 · 6055149
1 parent 71ee8eb
commit 6055149
Show file tree

Hide file tree

Showing 5 changed files with 27 additions and 4 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,15 @@
+# 2.8.4
+* Synched changes to support XMRigCC 2.8.4
+    * cryptonight (0/1/2/r/fast/half/xao/rto/gpu/rwz/zls/double/conceal/cache_hash)
+    * cryptonight-lite (0/1)
+    * cryptonight-heavy (0/tube/xhv)
+    * cryptonight-pico (0/tlo)
+    * cryptonight-extremelite (upx2)
+    * randomx (0/wow/arq/sfx/keva/panthera)
+    * argon2/chukwa
+    * argon2/chukwav2
+    * argon2/chukwa-lite (ninja)
+    * astrobwt
 # 2.8.2
 * Synched changes to support XMRigCC 2.8.2
     * cryptonight (0/1/2/r/fast/half/xao/rto/rwz/zls/double/conceal)

diff --git a/src/crypto/cn/CnAlgo.h b/src/crypto/cn/CnAlgo.h
@@ -100,6 +100,9 @@ class CnAlgo
 #       endif
             return CN_ITER / 2;
 
+        case Algorithm::CN_CACHE_HASH:
+            return 0x50000;
+
         case Algorithm::CN_RWZ:
         case Algorithm::CN_ZLS:
             return 0x60000;
@@ -159,6 +162,7 @@ class CnAlgo
         case Algorithm::CN_0:
         case Algorithm::CN_XAO:
         case Algorithm::CN_CONCEAL:
+        case Algorithm::CN_CACHE_HASH:
 #       ifdef XMRIG_ALGO_CN_LITE
         case Algorithm::CN_LITE_0:
 #       endif
@@ -216,13 +220,14 @@ template<> constexpr inline Algorithm::Id CnAlgo<Algorithm::CN_XAO>::base() cons
 template<> constexpr inline Algorithm::Id CnAlgo<Algorithm::CN_LITE_0>::base() const        { return Algorithm::CN_0; }
 template<> constexpr inline Algorithm::Id CnAlgo<Algorithm::CN_HEAVY_0>::base() const       { return Algorithm::CN_0; }
 template<> constexpr inline Algorithm::Id CnAlgo<Algorithm::CN_HEAVY_XHV>::base() const     { return Algorithm::CN_0; }
+template<> constexpr inline Algorithm::Id CnAlgo<Algorithm::CN_CONCEAL>::base() const       { return Algorithm::CN_0; }
+template<> constexpr inline Algorithm::Id CnAlgo<Algorithm::CN_CACHE_HASH>::base() const    { return Algorithm::CN_0; }
 template<> constexpr inline Algorithm::Id CnAlgo<Algorithm::CN_1>::base() const             { return Algorithm::CN_1; }
 template<> constexpr inline Algorithm::Id CnAlgo<Algorithm::CN_FAST>::base() const          { return Algorithm::CN_1; }
 template<> constexpr inline Algorithm::Id CnAlgo<Algorithm::CN_RTO>::base() const           { return Algorithm::CN_1; }
 template<> constexpr inline Algorithm::Id CnAlgo<Algorithm::CN_LITE_1>::base() const        { return Algorithm::CN_1; }
 template<> constexpr inline Algorithm::Id CnAlgo<Algorithm::CN_HEAVY_TUBE>::base() const    { return Algorithm::CN_1; }
 
-
 template<> constexpr inline uint32_t CnAlgo<Algorithm::CN_FAST>::iterations() const         { return CN_ITER / 2; }
 template<> constexpr inline uint32_t CnAlgo<Algorithm::CN_HALF>::iterations() const         { return CN_ITER / 2; }
 template<> constexpr inline uint32_t CnAlgo<Algorithm::CN_LITE_0>::iterations() const       { return CN_ITER / 2; }
@@ -233,6 +238,7 @@ template<> constexpr inline uint32_t CnAlgo<Algorithm::CN_HEAVY_XHV>::iterations
 template<> constexpr inline uint32_t CnAlgo<Algorithm::CN_XAO>::iterations() const          { return CN_ITER * 2; }
 template<> constexpr inline uint32_t CnAlgo<Algorithm::CN_DOUBLE>::iterations() const       { return CN_ITER * 2; }
 template<> constexpr inline uint32_t CnAlgo<Algorithm::CN_CONCEAL>::iterations() const      { return CN_ITER / 2; }
+template<> constexpr inline uint32_t CnAlgo<Algorithm::CN_CACHE_HASH>::iterations() const   { return 0x50000; }
 template<> constexpr inline uint32_t CnAlgo<Algorithm::CN_RWZ>::iterations() const          { return 0x60000; }
 template<> constexpr inline uint32_t CnAlgo<Algorithm::CN_ZLS>::iterations() const          { return 0x60000; }
 template<> constexpr inline uint32_t CnAlgo<Algorithm::CN_GPU>::iterations() const          { return 0xC000; }
@@ -251,7 +257,8 @@ template<> constexpr inline size_t CnAlgo<Algorithm::CN_EXTREMELITE_0>::memory()
 
 template<> constexpr inline uint32_t CnAlgo<Algorithm::CN_GPU>::mask() const                { return 0x1FFFC0; }
 template<> constexpr inline uint32_t CnAlgo<Algorithm::CN_PICO_0>::mask() const             { return 0x1FFF0; }
-template<> constexpr inline uint32_t CnAlgo<Algorithm::CN_EXTREMELITE_0>::mask() const    { return 0x1FFF0; }
+template<> constexpr inline uint32_t CnAlgo<Algorithm::CN_EXTREMELITE_0>::mask() const      { return 0x1FFF0; }
+template<> constexpr inline uint32_t CnAlgo<Algorithm::CN_CACHE_HASH>::mask() const         { return 0x1FFFA0; }
 
 } /* namespace xmrig */
 

diff --git a/src/crypto/common/Algorithm.cpp b/src/crypto/common/Algorithm.cpp
@@ -75,6 +75,8 @@ static AlgoName const algorithm_names[] = {
     { "cryptonight/double",        "cn/double",        Algorithm::CN_DOUBLE       },
     { "cryptonight/conceal",       "cn/conceal",       Algorithm::CN_CONCEAL      },
     { "cryptonight/ccx",           "cn/ccx",           Algorithm::CN_CONCEAL      },
+    { "cryptonight/cache_hash",    "cn/cache_hash",    Algorithm::CN_CACHE_HASH   },
+    { "cryptonight/cache",         "cn/cache",         Algorithm::CN_CACHE_HASH   },
 #   ifdef XMRIG_ALGO_CN_GPU
     { "cryptonight/gpu",           "cn/gpu",           Algorithm::CN_GPU          },
     { "cryptonight_gpu",           nullptr,            Algorithm::CN_GPU          },
@@ -304,6 +306,7 @@ xmrig::Algorithm::Family xmrig::Algorithm::family(Id id)
     case CN_ZLS:
     case CN_DOUBLE:
     case CN_CONCEAL:
+    case CN_CACHE_HASH:
 #   ifdef XMRIG_ALGO_CN_GPU
     case CN_GPU:
 #   endif

diff --git a/src/crypto/common/Algorithm.h b/src/crypto/common/Algorithm.h
@@ -57,6 +57,7 @@ class Algorithm
         CN_ZLS,        // "cn/zls"           CryptoNight variant 2 with 3/4 iterations (Zelerius).
         CN_DOUBLE,     // "cn/double"        CryptoNight variant 2 with double iterations (X-CASH).
         CN_CONCEAL,    // "cn/conceal"       CryptoNight variant 0 (modified, Conceal only).
+        CN_CACHE_HASH, // "cn/cache_hash"    CryptoNight variant Cache (CXCHE)
         CN_GPU,        // "cn/gpu"           CryptoNight-GPU (Ryo).
         CN_LITE_0,     // "cn-lite/0"        CryptoNight-Lite variant 0.
         CN_LITE_1,     // "cn-lite/1"        CryptoNight-Lite variant 1.

diff --git a/src/version.h b/src/version.h
@@ -28,15 +28,15 @@
 #define APP_ID        "xmrigcc-proxy"
 #define APP_NAME      "xmrigcc-proxy"
 #define APP_DESC      "XMRigCC Stratum proxy"
-#define APP_VERSION   "2.8.2 compatible with ALL XMRigCC 2.8.2 supported algos"
+#define APP_VERSION   "2.8.4 compatible with ALL XMRigCC 2.8.4 supported algos"
 #define APP_DOMAIN    ""
 #define APP_SITE      ""
 #define APP_COPYRIGHT ""
 #define APP_KIND      "proxy"
 
 #define APP_VER_MAJOR  2
 #define APP_VER_MINOR  8
-#define APP_VER_PATCH  2
+#define APP_VER_PATCH  4
 
 #ifdef _MSC_VER
 #   if (_MSC_VER >= 1920)