# 3.4.2

Bendr0id · May 28, 2024 · 8df35de · 8df35de
1 parent 1029325
commit 8df35de
Show file tree

Hide file tree

Showing 10 changed files with 15 additions and 238 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,6 @@
+# 3.4.2
+* Synched changes to XMRigCC 3.4.2
+* Support for RandomXEQ (Equilibria)
 # 3.4.1
 * Synched changes to XMRigCC 3.4.1
 * Support for RandomTuske

diff --git a/doc/CHANGELOG_OLD.md b/doc/CHANGELOG_OLD.md
diff --git a/doc/gpg_keys/xmrig.asc b/doc/gpg_keys/xmrig.asc
diff --git a/doc/releases/5_0_0/SHA256SUMS b/doc/releases/5_0_0/SHA256SUMS
diff --git a/doc/releases/5_0_0/SHA256SUMS.sig b/doc/releases/5_0_0/SHA256SUMS.sig
diff --git a/src/base/crypto/Algorithm.cpp b/src/base/crypto/Algorithm.cpp
@@ -88,6 +88,7 @@ const char *Algorithm::kRX_SFX          = "rx/sfx";
 const char *Algorithm::kRX_KEVA         = "rx/keva";
 const char *Algorithm::kRX_XDAG         = "rx/xdag";
 const char *Algorithm::kRX_TUSKE        = "rx/tuske";
+const char *Algorithm::kRX_XEQ          = "rx/xeq";
 #endif
 
 #ifdef XMRIG_ALGO_ARGON2
@@ -160,6 +161,7 @@ static const std::map<uint32_t, const char *> kAlgorithmNames = {
     ALGO_NAME(RX_KEVA),
     ALGO_NAME(RX_XDAG),
     ALGO_NAME(RX_TUSKE),
+    ALGO_NAME(RX_XEQ),
 #   endif
 
 #   ifdef XMRIG_ALGO_ARGON2
@@ -284,6 +286,8 @@ static const std::map<const char *, Algorithm::Id, aliasCompare> kAlgorithmAlias
                                     ALGO_ALIAS(RX_XDAG,         "randomxdag"),
     ALGO_ALIAS_AUTO(RX_TUSKE),      ALGO_ALIAS(RX_TUSKE,        "randomx/tuske"),
                                     ALGO_ALIAS(RX_TUSKE,        "randomtuske"),
+    ALGO_ALIAS_AUTO(RX_XEQ),        ALGO_ALIAS(RX_XEQ,          "randomx/xeq"),
+                                    ALGO_ALIAS(RX_XEQ,          "randomxeq"),
 #   endif
 
 #   ifdef XMRIG_ALGO_ARGON2
@@ -372,7 +376,7 @@ std::vector<xmrig::Algorithm> xmrig::Algorithm::all(const std::function<bool(con
         CN_PICO_0, CN_PICO_TLO,
         CN_UPX2,
         CN_GPU,
-        RX_0, RX_WOW, RX_ARQ, RX_GRAFT, RX_SFX, RX_KEVA, RX_XDAG, RX_TUSKE,
+        RX_0, RX_WOW, RX_ARQ, RX_GRAFT, RX_SFX, RX_KEVA, RX_XDAG, RX_TUSKE, RX_XEQ,
         AR2_CHUKWA, AR2_CHUKWA_V2, AR2_WRKZ,
         KAWPOW_RVN,
         GHOSTRIDER_RTM

diff --git a/src/base/crypto/Algorithm.h b/src/base/crypto/Algorithm.h
@@ -80,7 +80,8 @@ class Algorithm
         RX_SFX          = 0x72151273,   // "rx/sfx"           RandomSFX (Safex Cash).
         RX_KEVA         = 0x7214116b,   // "rx/keva"          RandomKEVA (Keva).
         RX_XDAG         = 0x72151278,   // "rx/xdag"          RandomXDAG (xdagger).
-        RX_TUSKE        = 0x72151274, // "rx/tuske" RandomTuske (TUSKE).
+        RX_TUSKE        = 0x72151274,   // "rx/tuske"         RandomTuske (TUSKE).
+        RX_XEQ          = 0x72121078,   // "rx/xeq"           RandomXEQ (Equilibria).
         AR2_CHUKWA      = 0x61130000,   // "argon2/chukwa"    Argon2id (Chukwa).
         AR2_CHUKWA_V2   = 0x61140000,   // "argon2/chukwav2"  Argon2id (Chukwa v2).
         AR2_WRKZ        = 0x61120000,   // "argon2/wrkz"      Argon2id (WRKZ)
@@ -153,6 +154,7 @@ class Algorithm
     static const char *kRX_KEVA;
     static const char *kRX_XDAG;
     static const char *kRX_TUSKE;
+    static const char *kRX_XEQ;
 #   endif
 
 #   ifdef XMRIG_ALGO_ARGON2

diff --git a/src/base/crypto/Coin.cpp b/src/base/crypto/Coin.cpp
@@ -57,6 +57,7 @@ static const CoinInfo coinInfo[] = {
     { Algorithm::RX_0,            "ZEPH",     "Zephyr",       120,    1000000000000,  BLUE_BG_BOLD(   WHITE_BOLD_S " zephyr  ") },
     { Algorithm::RX_0,            "Townforge","Townforge",    30,     100000000,      MAGENTA_BG_BOLD(WHITE_BOLD_S " townforge ") },
     { Algorithm::RX_TUSKE,        "TSK",      "Tuske",        120,    1000000000000,  MAGENTA_BG_BOLD(WHITE_BOLD_S " tuske ") },
+    { Algorithm::RX_XEQ,          "XEQ",      "Equilibria",   120,    10000,          BLUE_BG_BOLD( WHITE_BOLD_S " equilibria ") },
 };
 
 

diff --git a/src/base/crypto/Coin.h b/src/base/crypto/Coin.h
@@ -43,6 +43,7 @@ class Coin
         ZEPHYR,
         TOWNFORGE,
         TUSKE,
+        XEQ,
         MAX
     };
 

diff --git a/src/version.h b/src/version.h
@@ -22,15 +22,15 @@
 #define APP_ID        "xmrigcc-proxy"
 #define APP_NAME      "xmrigcc-proxy"
 #define APP_DESC      "XMRigCC Stratum proxy"
-#define APP_VERSION   "3.4.1 aligned with XMRigCC 3.4.1"
+#define APP_VERSION   "3.4.2 aligned with XMRigCC 3.4.2"
 #define APP_DOMAIN    ""
 #define APP_SITE      ""
 #define APP_COPYRIGHT ""
 #define APP_KIND      "proxy"
 
 #define APP_VER_MAJOR  3
 #define APP_VER_MINOR  4
-#define APP_VER_PATCH  1
+#define APP_VER_PATCH  2
 
 #ifdef _MSC_VER
 #   if (_MSC_VER >= 1930)
-Original file line number
+Diff line change
@@ Expand Up / @@ -43,6 +43,7 @@ class Coin @@
             ZEPHYR,
             TOWNFORGE,
             TUSKE,
+            XEQ,
             MAX
         };
@@ Expand Down @@