Skip to content

Commit

Permalink
# 3.4.1
Browse files Browse the repository at this point in the history
* Added Tuske support
* Removed Lozzax
  • Loading branch information
Bendr0id committed May 23, 2024
1 parent 03d57fe commit bf63afb
Show file tree
Hide file tree
Showing 9 changed files with 23 additions and 16 deletions.
2 changes: 2 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -2,3 +2,5 @@
/build
CMakeFiles/
/CMakeLists.txt.user
cmake-build-debug
.cmake/api/v1/query
12 changes: 8 additions & 4 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,10 +1,14 @@
# 3.4.1
* Synched changes to XMRigCC 3.4.1
* Support for RandomTuske
* Removed Lozzax
# 3.4.0
* Synched changed to XMRigCC 3.4.0
* Synched changes to XMRigCC 3.4.0
* Support for Zephyr
# 3.3.3
* Synched changed to XMRigCC 3.3.3
* Synched changes to XMRigCC 3.3.3
# 3.3.2
* Synched changed to XMRigCC 3.3.2 / xmrig-proxy 6.19.2-dev (wownero fix)
* Synched changes to XMRigCC 3.3.2 / xmrig-proxy 6.19.2-dev (wownero fix)
* cryptonight (0/1/2/r/fast/half/xao/rto/gpu/rwz/zls/double/conceal)
* cryptonight-lite (0/1)
* cryptonight-heavy (0/tube/xhv)
Expand All @@ -15,7 +19,7 @@
* argon2/chukwav2
* argon2/chukwa-lite (ninja)
# 3.3.1
* Synched changed to XMRigCC 3.3.1 / xmrig-proxy 6.18.1-dev
* Synched changes to XMRigCC 3.3.1 / xmrig-proxy 6.18.1-dev
* cryptonight (0/1/2/r/fast/half/xao/rto/gpu/rwz/zls/double/conceal)
* cryptonight-lite (0/1)
* cryptonight-heavy (0/tube/xhv)
Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -73,7 +73,7 @@ Use [config.xmrig.com](https://config.xmrig.com/proxy) to generate, edit or shar
--tls-ciphersuites=S set list of available TLSv1.3 ciphersuites
-h, --help display this help and exit
-V, --version output version information and exit
--algoritms prints out a list of supported algos
--algorithms prints out a list of supported algos
```

## Contact
Expand Down
10 changes: 5 additions & 5 deletions src/base/crypto/Algorithm.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -86,8 +86,8 @@ const char *Algorithm::kRX_ARQ = "rx/arq";
const char *Algorithm::kRX_GRAFT = "rx/graft";
const char *Algorithm::kRX_SFX = "rx/sfx";
const char *Algorithm::kRX_KEVA = "rx/keva";
const char *Algorithm::kRX_LOZZ = "rx/lozz";
const char *Algorithm::kRX_XDAG = "rx/xdag";
const char *Algorithm::kRX_TUSKE = "rx/tuske";
#endif

#ifdef XMRIG_ALGO_ARGON2
Expand Down Expand Up @@ -158,8 +158,8 @@ static const std::map<uint32_t, const char *> kAlgorithmNames = {
ALGO_NAME(RX_GRAFT),
ALGO_NAME(RX_SFX),
ALGO_NAME(RX_KEVA),
ALGO_NAME(RX_LOZZ),
ALGO_NAME(RX_XDAG),
ALGO_NAME(RX_TUSKE),
# endif

# ifdef XMRIG_ALGO_ARGON2
Expand Down Expand Up @@ -280,10 +280,10 @@ static const std::map<const char *, Algorithm::Id, aliasCompare> kAlgorithmAlias
ALGO_ALIAS(RX_SFX, "randomsfx"),
ALGO_ALIAS_AUTO(RX_KEVA), ALGO_ALIAS(RX_KEVA, "randomx/keva"),
ALGO_ALIAS(RX_KEVA, "randomkeva"),
ALGO_ALIAS_AUTO(RX_LOZZ), ALGO_ALIAS(RX_LOZZ, "randomx/lozz"),
ALGO_ALIAS(RX_LOZZ, "randomL"),
ALGO_ALIAS_AUTO(RX_XDAG), ALGO_ALIAS(RX_XDAG, "randomx/xdag"),
ALGO_ALIAS(RX_XDAG, "randomxdag"),
ALGO_ALIAS_AUTO(RX_TUSKE), ALGO_ALIAS(RX_TUSKE, "randomx/tuske"),
ALGO_ALIAS(RX_TUSKE, "randomtuske"),
# endif

# ifdef XMRIG_ALGO_ARGON2
Expand Down Expand Up @@ -372,7 +372,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_LOZZ, RX_XDAG,
RX_0, RX_WOW, RX_ARQ, RX_GRAFT, RX_SFX, RX_KEVA, RX_XDAG, RX_TUSKE,
AR2_CHUKWA, AR2_CHUKWA_V2, AR2_WRKZ,
KAWPOW_RVN,
GHOSTRIDER_RTM
Expand Down
4 changes: 2 additions & 2 deletions src/base/crypto/Algorithm.h
Original file line number Diff line number Diff line change
Expand Up @@ -79,8 +79,8 @@ class Algorithm
RX_GRAFT = 0x72151267, // "rx/graft" RandomGRAFT (Graft).
RX_SFX = 0x72151273, // "rx/sfx" RandomSFX (Safex Cash).
RX_KEVA = 0x7214116b, // "rx/keva" RandomKEVA (Keva).
RX_LOZZ = 0x7215126c, // "rx/lozz" RandomL (Lozzax).
RX_XDAG = 0x72151278, // "rx/xdag" RandomXDAG (xdagger).
RX_TUSKE = 0x72151274, // "rx/tuske" RandomTuske (TUSKE).
AR2_CHUKWA = 0x61130000, // "argon2/chukwa" Argon2id (Chukwa).
AR2_CHUKWA_V2 = 0x61140000, // "argon2/chukwav2" Argon2id (Chukwa v2).
AR2_WRKZ = 0x61120000, // "argon2/wrkz" Argon2id (WRKZ)
Expand Down Expand Up @@ -151,8 +151,8 @@ class Algorithm
static const char *kRX_GRAFT;
static const char *kRX_SFX;
static const char *kRX_KEVA;
static const char *kRX_LOZZ;
static const char *kRX_XDAG;
static const char *kRX_TUSKE;
# endif

# ifdef XMRIG_ALGO_ARGON2
Expand Down
2 changes: 1 addition & 1 deletion src/base/crypto/Coin.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -53,10 +53,10 @@ static const CoinInfo coinInfo[] = {
{ Algorithm::RX_KEVA, "KVA", "Kevacoin", 0, 0, MAGENTA_BG_BOLD(WHITE_BOLD_S " keva ") },
{ Algorithm::KAWPOW_RVN, "RVN", "Ravencoin", 0, 0, BLUE_BG_BOLD( WHITE_BOLD_S " raven ") },
{ Algorithm::RX_WOW, "WOW", "Wownero", 300, 100000000000, MAGENTA_BG_BOLD(WHITE_BOLD_S " wownero ") },
{ Algorithm::RX_LOZZ, "LOZZ", "Lozzax", 120, 1000000000, MAGENTA_BG_BOLD(WHITE_BOLD_S " lozzax ") },
{ Algorithm::RX_XDAG, "XDAG", "Xdagger", 0, 0, BLUE_BG_BOLD( WHITE_BOLD_S " xdagger ") },
{ 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 ") },
};


Expand Down
2 changes: 1 addition & 1 deletion src/base/crypto/Coin.h
Original file line number Diff line number Diff line change
Expand Up @@ -39,10 +39,10 @@ class Coin
KEVA,
RAVEN,
WOWNERO,
LOZZAX,
XDAG,
ZEPHYR,
TOWNFORGE,
TUSKE,
MAX
};

Expand Down
1 change: 1 addition & 0 deletions src/core/config/usage.h
Original file line number Diff line number Diff line change
Expand Up @@ -124,6 +124,7 @@ static inline const std::string &usage()
u += " -V, --version output version information and exit\n";
u += " -h, --help display this help and exit\n";
u += " --dry-run test configuration and exit\n";
u += " --algorithms prints out a list of supported algos\n";

return u;
}
Expand Down
4 changes: 2 additions & 2 deletions src/version.h
Original file line number Diff line number Diff line change
Expand Up @@ -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.0 aligned with XMRigCC 3.4.0"
#define APP_VERSION "3.4.1 aligned with XMRigCC 3.4.1"
#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 0
#define APP_VER_PATCH 1

#ifdef _MSC_VER
# if (_MSC_VER >= 1930)
Expand Down

0 comments on commit bf63afb

Please sign in to comment.