Synched changes to support XMRigCC 2.8.2

* Added turtlecoin Chukwa v2 algo (`chukwav2`) or coin (`turtle` for autoswitch) for upcoming hard fork at block 3,000,000 * Removed obsolete rx/loki randomx variant (switched to PoS)
Bendr0id · Oct 18, 2020 · 71ee8eb · 71ee8eb
1 parent b1d72e1
commit 71ee8eb
Show file tree

Hide file tree

Showing 7 changed files with 30 additions and 12 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,17 @@
+# 2.8.2
+* Synched changes to support XMRigCC 2.8.2
+    * cryptonight (0/1/2/r/fast/half/xao/rto/rwz/zls/double/conceal)
+    * 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
 # v2.8.0
-* Synched changes to support XMRigCC 2.8.0   
+* Synched changes to support XMRigCC 2.8.0
     * cryptonight (0/1/2/r/fast/half/xao/rto/rwz/zls/double/conceal)
     * cryptonight-lite (0/1)
     * cryptonight-heavy (0/tube/xhv)

diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -1,5 +1,5 @@
 cmake_minimum_required(VERSION 2.8)
-project(xmrig-proxy)
+project(xmrigcc-proxy)
 
 
 option(WITH_GOOGLE_BREAKPAD "Use Google Breakpad"     OFF)

diff --git a/src/crypto/common/Algorithm.cpp b/src/crypto/common/Algorithm.cpp
@@ -121,8 +121,6 @@ static AlgoName const algorithm_names[] = {
     { "RandomX",                   "rx",               Algorithm::RX_0            },
     { "randomx/wow",               "rx/wow",           Algorithm::RX_WOW          },
     { "RandomWOW",                 nullptr,            Algorithm::RX_WOW          },
-    { "randomx/loki",              "rx/loki",          Algorithm::RX_LOKI         },
-    { "RandomXL",                  nullptr,            Algorithm::RX_LOKI         },
     { "randomx/arq",               "rx/arq",           Algorithm::RX_ARQ          },
     { "RandomARQ",                 nullptr,            Algorithm::RX_ARQ          },
     { "randomx/sfx",               "rx/sfx",           Algorithm::RX_SFX          },
@@ -137,6 +135,8 @@ static AlgoName const algorithm_names[] = {
     { "chukwa",                    nullptr,            Algorithm::AR2_CHUKWA      },
     { "ar2/512",                   nullptr,            Algorithm::AR2_CHUKWA      },
     { "ar2-512",                   nullptr,            Algorithm::AR2_CHUKWA      },
+    { "argon2/chukwav2",           nullptr,            Algorithm::AR2_CHUKWA_V2   },
+    { "chukwav2",                  nullptr,            Algorithm::AR2_CHUKWA_V2   },
     { "argon2/chukwa-lite",        nullptr,            Algorithm::AR2_CHUKWA_LITE },
     { "ar2/256",                   nullptr,            Algorithm::AR2_CHUKWA_LITE },
     { "ar2-256",                   nullptr,            Algorithm::AR2_CHUKWA_LITE },
@@ -168,7 +168,6 @@ size_t xmrig::Algorithm::l2() const
 #   ifdef XMRIG_ALGO_RANDOMX
     switch (m_id) {
     case RX_0:
-    case RX_LOKI:
     case RX_SFX:
         return 0x40000;
 
@@ -206,7 +205,6 @@ size_t xmrig::Algorithm::l3() const
     if (f == RANDOM_X) {
         switch (m_id) {
         case RX_0:
-        case RX_LOKI:
         case RX_SFX:
             return oneMiB * 2;
 
@@ -231,6 +229,9 @@ size_t xmrig::Algorithm::l3() const
         case AR2_CHUKWA:
             return oneMiB / 2;
 
+        case AR2_CHUKWA_V2:
+            return oneMiB;
+
         case AR2_CHUKWA_LITE:
             return oneMiB / 4;
 
@@ -335,7 +336,6 @@ xmrig::Algorithm::Family xmrig::Algorithm::family(Id id)
 #   ifdef XMRIG_ALGO_RANDOMX
     case RX_0:
     case RX_WOW:
-    case RX_LOKI:
     case RX_ARQ:
     case RX_SFX:
     case RX_KEVA:
@@ -345,6 +345,7 @@ xmrig::Algorithm::Family xmrig::Algorithm::family(Id id)
 
 #   ifdef XMRIG_ALGO_ARGON2
     case AR2_CHUKWA:
+    case AR2_CHUKWA_V2:
     case AR2_CHUKWA_LITE:
         return ARGON2;
 #   endif

diff --git a/src/crypto/common/Algorithm.h b/src/crypto/common/Algorithm.h
@@ -68,12 +68,12 @@ class Algorithm
         CN_EXTREMELITE_0,// "cn-extremelite" CryptoNight-Extremelite (UPX)
         RX_0,          // "rx/0"             RandomX (reference configuration).
         RX_WOW,        // "rx/wow"           RandomWOW (Wownero).
-        RX_LOKI,       // "rx/loki"          RandomXL (Loki).
         RX_ARQ,        // "rx/arq"           RandomARQ (Arqma).
         RX_SFX,        // "rx/sfx"           RandomSFX (Safex Cash).
         RX_KEVA,       // "rx/keva"          RandomKV (Keva).
         RX_XLA,        // "rx/xla"           RandomX-Panthera (Scala).
         AR2_CHUKWA,    // "argon2/chukwa"    Argon2id (Chukwa).
+        AR2_CHUKWA_V2, // "argon2/chukwav2"  Argon2id (Chukwa v2).
         AR2_CHUKWA_LITE,// "argon2/chukwa-lite" Argon2id (Chukwa-Lite).
         ASTROBWT_DERO, // "astrobwt/dero"    AstroBWT (Dero)
         MAX

diff --git a/src/crypto/common/Coin.cpp b/src/crypto/common/Coin.cpp
@@ -52,7 +52,8 @@ static CoinName const coin_names[] = {
     { "arqma",      Coin::ARQMA  },
     { "arq",        Coin::ARQMA  },
     { "dero",       Coin::DERO   },
-    { "keva",       Coin::KEVA   }
+    { "keva",       Coin::KEVA   },
+    { "turtle",     Coin::TURTLE }
 };
 
 
@@ -75,6 +76,9 @@ xmrig::Algorithm::Id xmrig::Coin::algorithm(uint8_t blobVersion) const
     case KEVA:
         return (blobVersion >= 11) ? Algorithm::RX_KEVA : Algorithm::CN_R;
 
+    case TURTLE:
+        return (blobVersion >= 7) ? Algorithm::AR2_CHUKWA_V2 : Algorithm::AR2_CHUKWA;
+
     case INVALID:
         break;
     }

diff --git a/src/crypto/common/Coin.h b/src/crypto/common/Coin.h
@@ -42,7 +42,8 @@ class Coin
         MONERO,
         ARQMA,
         DERO,
-        KEVA
+        KEVA,
+        TURTLE
     };
 
 

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.0 compatible with ALL XMRigCC 2.8.0 supported algos"
+#define APP_VERSION   "2.8.2 compatible with ALL XMRigCC 2.8.2 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  0
+#define APP_VER_PATCH  2
 
 #ifdef _MSC_VER
 #   if (_MSC_VER >= 1920)
-Original file line number
+Diff line change
@@ Expand Up / @@ -42,7 +42,8 @@ class Coin @@
             MONERO,
             ARQMA,
             DERO,
-            KEVA
+            KEVA,
+            TURTLE
         };
@@ Expand Down @@