Skip to content

Commit

Permalink
Synched changes to support XMRigCC 2.8.0
Browse files Browse the repository at this point in the history
* Integrated Randomx variant "Panthera" used by Scala[XLA] algo (panthera or rx/panthera)
* Removed obsolete PengolinCoin chukwa variant
  • Loading branch information
Bendr0id committed Aug 17, 2020
1 parent 3898017 commit b1d72e1
Show file tree
Hide file tree
Showing 8 changed files with 39 additions and 65 deletions.
2 changes: 2 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,2 +1,4 @@
.idea/
/build
CMakeFiles/
/CMakeLists.txt.user
73 changes: 22 additions & 51 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,51 +1,22 @@
# v5.0.1c
- Support for RandomV (MoneroV)
# v5.0.1b
- Support for RandomSFX (Safex)
# v5.0.1
- Support for UPX2
- Support for CONCEAL
- Official xmrig-proxy changes 5.0.1:
- **Fixed memory leak.**
- Fixed crash if no valid configuration found.
- Other minor fixes.

# v5.0.0
- Proxy rebased to latest miner codebase.
- [#1068](https://github.com/xmrig/xmrig/pull/1068) Added support for `self-select` stratum protocol extension.
- [#1227](https://github.com/xmrig/xmrig/pull/1227) Added new algorithm `rx/arq`, RandomX variant for upcoming ArQmA fork.

# v3.2.1
- [#349](https://github.com/xmrig/xmrig-proxy/issues/349) Fixed command line option `--coin`.

# v3.2.0
- Added per pool option `coin` with single possible value `monero` for pools without algorithm negotiation, for upcoming Monero fork.
- [#1183](https://github.com/xmrig/xmrig/issues/1183) Fixed compatibility with systemd.

# v3.1.1
- [#1133](https://github.com/xmrig/xmrig/issues/1133) Fixed syslog regression.
- [#1138](https://github.com/xmrig/xmrig/issues/1138) Fixed multiple network bugs.
- [#1141](https://github.com/xmrig/xmrig/issues/1141) Fixed log in background mode.
- Fixed command line options for single pool, free order allowed again.

# v3.1.0
- [#1107](https://github.com/xmrig/xmrig/issues/1107#issuecomment-522235892) Added Argon2 algorithm family: `argon2/chukwa` and `argon2/wrkz`.

# v3.0.0
- **[#1111](https://github.com/xmrig/xmrig/pull/1111) Added RandomX (`rx/test`) algorithm for testing and benchmarking.**
- **[#1036](https://github.com/xmrig/xmrig/pull/1036) Added RandomWOW (`rx/wow`) algorithm for [Wownero](http://wownero.org/).**
- **[#1050](https://github.com/xmrig/xmrig/pull/1050) Added RandomXL (`rx/loki`) algorithm for [Loki](https://loki.network/).**
- **[#335](https://github.com/xmrig/xmrig-proxy/issues/335) Added support for unlimited algorithm switching.**
- [#257](https://github.com/xmrig/xmrig-nvidia/pull/257) New logging subsystem, file and syslog now always without colors.
- [#314](https://github.com/xmrig/xmrig-proxy/issues/314) Added donate over proxy feature and changed donation model.
- [#1007](https://github.com/xmrig/xmrig/issues/1007) Old HTTP API backend based on libmicrohttpd, replaced to custom HTTP server (libuv + http_parser).
- [#1010](https://github.com/xmrig/xmrig/pull/1010#issuecomment-482632107) Added daemon support (solo mining).
- [#1066](https://github.com/xmrig/xmrig/issues/1066#issuecomment-518080529) Added error message if pool not ready for RandomX.
- Added new options `algo-ext` and `access-password`.
- Config files from previous versions NOT compatible, `variant` option replaced to `algo`, global option `algo` removed.
- Command line options also not compatible, `--variant` option replaced to `--algo`.
- Algorithm `cn/msr` renamed to `cn/fast`.
- Algorithm `cn/xtl` removed.

# Previous versions
[doc/CHANGELOG_OLD.md](doc/CHANGELOG_OLD.md)
# v2.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)
* cryptonight-pico (0/tlo)
* cryptonight-extremelite (upx2)
* randomx (0/wow/loki/arq/sfx/keva/panthera)
* argon2/chukwa
* argon2/chukwa-lite (ninja)
* astrobwt
# v2.7.0
* Synched changes to support XMRigCC 2.7.0
* 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/loki/arq/sfx/keva)
* argon2/chukwa
* argon2/chukwa-lite (ninja/pengo)
* astrobwt
2 changes: 1 addition & 1 deletion src/base/kernel/Entry.h
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ class Entry
Version,
Topo,
Platforms,
Algorithms
Algorithms
};

static Id get(const Process &process);
Expand Down
5 changes: 5 additions & 0 deletions src/crypto/common/Algorithm.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -129,6 +129,8 @@ static AlgoName const algorithm_names[] = {
{ "RandomSFX", nullptr, Algorithm::RX_SFX },
{ "randomx/keva", "rx/keva", Algorithm::RX_KEVA },
{ "RandomKEVA", nullptr, Algorithm::RX_KEVA },
{ "Panthera", "panthera", Algorithm::RX_XLA },
{ "randomx/xla", "rx/xla", Algorithm::RX_XLA },
# endif
# ifdef XMRIG_ALGO_ARGON2
{ "argon2/chukwa", nullptr, Algorithm::AR2_CHUKWA },
Expand Down Expand Up @@ -172,6 +174,7 @@ size_t xmrig::Algorithm::l2() const

case RX_WOW:
case RX_KEVA:
case RX_XLA:
return 0x20000;

case RX_ARQ:
Expand Down Expand Up @@ -212,6 +215,7 @@ size_t xmrig::Algorithm::l3() const
return oneMiB;

case RX_ARQ:
case RX_XLA:
return oneMiB / 4;

default:
Expand Down Expand Up @@ -335,6 +339,7 @@ xmrig::Algorithm::Family xmrig::Algorithm::family(Id id)
case RX_ARQ:
case RX_SFX:
case RX_KEVA:
case RX_XLA:
return RANDOM_X;
# endif

Expand Down
1 change: 1 addition & 0 deletions src/crypto/common/Algorithm.h
Original file line number Diff line number Diff line change
Expand Up @@ -72,6 +72,7 @@ class Algorithm
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_LITE,// "argon2/chukwa-lite" Argon2id (Chukwa-Lite).
ASTROBWT_DERO, // "astrobwt/dero" AstroBWT (Dero)
Expand Down
6 changes: 1 addition & 5 deletions src/crypto/common/Coin.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -52,8 +52,7 @@ static CoinName const coin_names[] = {
{ "arqma", Coin::ARQMA },
{ "arq", Coin::ARQMA },
{ "dero", Coin::DERO },
{ "keva", Coin::KEVA },
{ "pengo", Coin::PENGO }
{ "keva", Coin::KEVA }
};


Expand All @@ -76,9 +75,6 @@ xmrig::Algorithm::Id xmrig::Coin::algorithm(uint8_t blobVersion) const
case KEVA:
return (blobVersion >= 11) ? Algorithm::RX_KEVA : Algorithm::CN_R;

case PENGO:
return (blobVersion >= 5) ? Algorithm::AR2_CHUKWA_LITE : Algorithm::CN_PICO_0;

case INVALID:
break;
}
Expand Down
3 changes: 1 addition & 2 deletions src/crypto/common/Coin.h
Original file line number Diff line number Diff line change
Expand Up @@ -42,8 +42,7 @@ class Coin
MONERO,
ARQMA,
DERO,
KEVA,
PENGO
KEVA
};


Expand Down
12 changes: 6 additions & 6 deletions src/version.h
Original file line number Diff line number Diff line change
Expand Up @@ -25,17 +25,17 @@
#ifndef XMRIG_VERSION_H
#define XMRIG_VERSION_H

#define APP_ID "xmrigcc-donation-proxy"
#define APP_NAME "xmrigcc-donation-proxy"
#define APP_DESC "XMRigCC Stratum donation proxy"
#define APP_VERSION "2.7.0 compatible with ALL XMRigCC 2.7.0 supported algos"
#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_DOMAIN ""
#define APP_SITE ""
#define APP_COPYRIGHT "Copyright (C) 2016-2019 xmrig.com"
#define APP_COPYRIGHT ""
#define APP_KIND "proxy"

#define APP_VER_MAJOR 2
#define APP_VER_MINOR 7
#define APP_VER_MINOR 8
#define APP_VER_PATCH 0

#ifdef _MSC_VER
Expand Down

0 comments on commit b1d72e1

Please sign in to comment.