From 8df35de37df260b206cde3d64f528db3963c1aa9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ben=20Gr=C3=A4f?= Date: Tue, 28 May 2024 17:45:34 +0200 Subject: [PATCH] # 3.4.2 --- CHANGELOG.md | 3 + doc/CHANGELOG_OLD.md | 190 ------------------------------ doc/gpg_keys/xmrig.asc | 30 ----- doc/releases/5_0_0/SHA256SUMS | 3 - doc/releases/5_0_0/SHA256SUMS.sig | 11 -- src/base/crypto/Algorithm.cpp | 6 +- src/base/crypto/Algorithm.h | 4 +- src/base/crypto/Coin.cpp | 1 + src/base/crypto/Coin.h | 1 + src/version.h | 4 +- 10 files changed, 15 insertions(+), 238 deletions(-) delete mode 100644 doc/CHANGELOG_OLD.md delete mode 100644 doc/gpg_keys/xmrig.asc delete mode 100644 doc/releases/5_0_0/SHA256SUMS delete mode 100644 doc/releases/5_0_0/SHA256SUMS.sig diff --git a/CHANGELOG.md b/CHANGELOG.md index afadaa2b2..acc30cf12 100644 --- 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 deleted file mode 100644 index b89db9911..000000000 --- a/doc/CHANGELOG_OLD.md +++ /dev/null @@ -1,190 +0,0 @@ -# v2.99.1-beta -- [#1066](https://github.com/xmrig/xmrig/issues/1066#issuecomment-518080529) Added error message if pool not ready for RandomX. -- Name for reference RandomX configuration changed to `rx/text` to avoid potential conflicts in future. - -# v2.99.0-beta -* [#335](https://github.com/xmrig/xmrig-proxy/issues/335) Added support for unlimited algorithm switching. -* 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. - -# v2.16.1-beta -- Added RandomXL algorithm for [Loki](https://loki.network/). - - Algorithm name used by proxy is `randomx/loki` or `rx/loki`. - -# v2.16.0-beta -- [#1036](https://github.com/xmrig/xmrig/pull/1036) Added RandomWOW (RandomX with different preferences) algorithm support for [Wownero](http://wownero.org/). - - Algorithm name used by proxy is `randomx/wow` or `rx/wow`. - - Currently runtime algorithm switching NOT supported with other algorithms. - -# v2.15.3-beta -- [#1014](https://github.com/xmrig/xmrig/issues/1014) Fixed regression, default value for `algo` option was not applied. - -# v2.15.2-beta -- [#1010](https://github.com/xmrig/xmrig/pull/1010#issuecomment-482632107) Added daemon support (solo mining). -- Config subsystem was rewritten, internally JSON is primary format now. -- Fixed regression, big HTTP responses was truncated. - -# v2.15.1-beta -- [#1007](https://github.com/xmrig/xmrig/issues/1007) Old HTTP API backend based on libmicrohttpd, replaced to custom HTTP server (libuv + http_parser). -- [#257](https://github.com/xmrig/xmrig-nvidia/pull/257) New logging subsystem, file and syslog now always without colors. - -# v2.15.0-beta -- [#314](https://github.com/xmrig/xmrig-proxy/issues/314) Added donate over proxy feature and changed donation model. - - Added new options `algo-ext` and `access-password`. - - Added real graceful exit. - -# v2.14.4 -- Fixed MSVC 2019 version detection. -- Removed obsolete automatic variants. - -# v2.14.1 -- [#306](https://github.com/xmrig/xmrig-proxy/issues/306) [#310](https://github.com/xmrig/xmrig-proxy/issues/310) Fixed compile issues and random crashing if verbose mode or access log was enabled. - -# v2.14.0 -- **[#969](https://github.com/xmrig/xmrig/pull/969) Added new algorithm `cryptonight/rwz`, short alias `cn/rwz` (also known as CryptoNight ReverseWaltz), for upcoming [Graft](https://www.graft.network/) fork.** -- **[#931](https://github.com/xmrig/xmrig/issues/931) Added new algorithm `cryptonight/zls`, short alias `cn/zls` for [Zelerius Network](https://zelerius.org) fork.** -- **[#940](https://github.com/xmrig/xmrig/issues/940) Added new algorithm `cryptonight/double`, short alias `cn/double` (also known as CryptoNight HeavyX), for [X-CASH](https://x-cash.org/).** - -# v2.13.0 -- **[#938](https://github.com/xmrig/xmrig/issues/938) Added support for new algorithm `cryptonight/r`, short alias `cn/r` (also known as CryptoNightR or CryptoNight variant 4), for upcoming [Monero](https://www.getmonero.org/) fork on March 9, thanks [@SChernykh](https://github.com/SChernykh).** - -# v2.12.0 -- [#929](https://github.com/xmrig/xmrig/pull/929) Added support for new algorithm `cryptonight/wow`, short alias `cn/wow` (also known as CryptonightR), for upcoming [Wownero](http://wownero.org) fork on February 14. - -# v2.11.0 -- [#928](https://github.com/xmrig/xmrig/issues/928) Added support for new algorithm `cryptonight/gpu`, short alias `cn/gpu` (original name `cryptonight-gpu`), for upcoming [Ryo currency](https://ryo-currency.com) fork on February 14. - -# v2.10.0 -- [#904](https://github.com/xmrig/xmrig/issues/904) Added new algorithm `cn-pico/trtl` (aliases `cryptonight-turtle`, `cn-trtl`) for upcoming TurtleCoin (TRTL) fork. - -# v2.9.4 -- [#913](https://github.com/xmrig/xmrig/issues/913) Fixed Masari (MSR) support (this update required for upcoming fork). - -# v2.9.1 -- Restored compatibility with https://stellite.hashvault.pro. - -# v2.9.0 -- [#275](https://github.com/xmrig/xmrig-proxy/issues/275) Added SSL/TLS support for incoming connections. -- [#899](https://github.com/xmrig/xmrig/issues/899) Added support for new algorithm `cn/half` for Masari and Stellite forks. -- [#271](https://github.com/xmrig/xmrig-proxy/issues/271) Fixed broken pool options cascading (mixed configuration). -- Added memory and load_average information to API. - -# v2.8.1 -- [#258](https://github.com/xmrig/xmrig-proxy/issues/258) Force NDEBUG for release builds. -- [#108](https://github.com/xmrig/xmrig-proxy/issues/108) Fixed possible crash in simple mode when heavy load. -- [#777](https://github.com/xmrig/xmrig/issues/777) Better report about pool connection issues. -- Fixed error when handle malformed result from miner (divide to zero). -- Fixed malformed login reply. - -# v2.8.0 -- **[#753](https://github.com/xmrig/xmrig/issues/753) Added new algorithm [CryptoNight variant 2](https://github.com/xmrig/xmrig/issues/753) for Monero fork, thanks [@SChernykh](https://github.com/SChernykh).** -- **[#251](https://github.com/xmrig/xmrig-proxy/issues/251) Added extended workers support.** -- **[#758](https://github.com/xmrig/xmrig/issues/758) Added SSL/TLS support for secure outgoing connections to pools.** - - Added per pool options `"tls"` and `"tls-fingerprint"` and command line equivalents. -- [#757](https://github.com/xmrig/xmrig/issues/757) Fixed send buffer overflow. - -# v2.6.5 -- [#245](https://github.com/xmrig/xmrig-proxy/issues/245) Fixed API ID collision when run multiple proxies on same machine. - - Added command line option `--api-id` and equivalent option for config file. -- Added `algo` field to API `GET /1/summary` endpoint. - -# v2.6.4 -- [#238](https://github.com/xmrig/xmrig-proxy/issues/238) `cryptonight-lite/ipbc` replaced to `cryptonight-heavy/tube`. -- Added `cryptonight/xao` and `cryptonight/rto` for future use. - -# v2.6.3 -- **Added support for new cryptonight-heavy variant xhv** (`cn-heavy/xhv`) for upcoming Haven Protocol fork. -- **Added support for new cryptonight variant msr** (`cn/msr`) also known as `cryptonight-fast` for upcoming Masari fork. -- Changed behavior for automatic variant to allow pool override algorithm. -- Fixed `--api-ipv6` option. -- [#629](https://github.com/xmrig/xmrig/pull/629) Fixed file logging with non-seekable files. -- [#672](https://github.com/xmrig/xmrig/pull/672) Reverted back `cryptonight-light` and exit if no valid algorithm specified. - -# v2.6.2 - - [#197](https://github.com/xmrig/xmrig-proxy/issues/197) Fixed compatibility with xmr-stak `rig_id` option, xmr-stak sent empty rig id if user not specify it. - - [#199](https://github.com/xmrig/xmrig-proxy/issues/199) Fixed various bugs in donation subsystem. - -# v2.6.0 - - [#168](https://github.com/xmrig/xmrig-proxy/issues/168) Added support for [mining algorithm negotiation](https://github.com/xmrig/xmrig-proxy/blob/dev/doc/STRATUM_EXT.md#1-mining-algorithm-negotiation). - - Added support for **rig-id** stratum protocol extensions, compatible with xmr-stak. - - A lot of small fixes and better unification with miner code. - -# v2.5.3 -- Fixed critical bug, in some cases proxy was can't recovery connection and switch to failover pool, version 2.5.2 affected. -- Added configurable keepalive support, now possible override default timeout (60 seconds) via config file (only). -- Fixed wrong miners count in 32 bit builds. - -# v2.5.2 -- [#448](https://github.com/xmrig/xmrig/issues/478) Fixed broken reconnect. - -# v2.5.0 -- [#119](https://github.com/xmrig/xmrig-proxy/issues/119) Added graceful reload support, pools and some other settings now can changed without proxy restart. -- [#123](https://github.com/xmrig/xmrig-proxy/issues/123) Fixed regression (all versions since 2.4 affected) fragmented responses from pool/miner was parsed incorrectly. -- [#40](https://github.com/xmrig/xmrig-proxy/issues/40#issuecomment-370202169) Added API endpoint `PUT /1/config` to update current config. -- [#118](https://github.com/xmrig/xmrig-proxy/issues/118#issuecomment-375172833) Added alternative working mode, in that mode proxy support chaining and nicehash.com but lose ability to reduce connection count. -- Added API endpoint `GET /1/config` to get current active config. -- Messages `use pool` now shown only in verbose mode. -- Added IPv6 support: - - IPv6 now fully supported for connections to upstream pools. - - `bind` now accept IPv6 addresses, for example, use `[::]:3333` to bind on all IPv6 interfaces and port 3333. - - Internal HTTP server now support IPv6 for incoming connections. -- New command line options (with equivalent config file options): - - Added `--mode` to switch working mode. - - Added `--reuse-timeout` to set timeout in seconds for reuse pool connections in simple mode. - - Added `--no-watch` and config option `watch` to disable config file watching. - - Added `--variant` to override PoW settings on xmrig miners. - - Added `--api-no-ipv6` and similar config option to disable IPv6 support for HTTP API. - - Added `--algo` to specify algorithm cryptonight or cryptonight-lite. - - Added `--api-no-restricted` to enable full access to api, this option has no effect if `--api-access-token` not specified. -- Deprecations: - - Option `coin` now deprecated, use `algo` instead. - - API endpoint `GET /` now deprecated, use `GET /1/summary` instead. - - API endpoint `GET /workers.json`, use `GET /1/workers` instead. - -# v2.4.5 -- [#109](https://github.com/xmrig/xmrig-proxy/issues/109) Hashrate reports now more detailed for low speed workers. -- [#200](https://github.com/xmrig/xmrig/issues/200) In some cases proxy was doesn't write log to stdout. - -# v2.4.4 - - Added libmicrohttpd version to --version output. - - Fixed bug in singal handler, in some cases proxy wasn't shutdown properly. - - Fixed recent MSVC 2017 version detection. - - Fixed in default `config.json` was missing option `colors`. - - [#37](https://github.com/xmrig/xmrig-proxy/issues/37) Fixed ARM build. - - [#70](https://github.com/xmrig/xmrig-proxy/issues/70) Now used kH/s instead of KH/s. - -# v2.4.2 - - [#153](https://github.com/xmrig/xmrig/issues/153) Fixed issues with dwarfpool.com. - -# v2.4.1 - - [#25](https://github.com/xmrig/xmrig-proxy/issues/25) Use 2 decimal places in API hashrate. - - [#147](https://github.com/xmrig/xmrig/issues/147) Fixed comparability with monero-stratum. - - Fixed OS X build. - -# v2.4.0 - - New internal event based architecture to easily extend proxy features. - - Added [HTTP API](https://github.com/xmrig/xmrig-proxy/wiki/API). - - Added per worker statistics, available in [HTTP API](https://github.com/xmrig/xmrig-proxy/wiki/API) and terminal. - - Added command line option `--no-workers` and config option `workers`. - - Added option `access-log-file`, to write to file log information about connection/disconnection of miners. - - Added limited support to override pool diff, global via option `custom-diff` or per worker `WORKER_ID+DIFF`. - - Added option `coin`, set it to `aeon` if use proxy for AEON (cryptonight-lite). - - Added donation, default 2% configurable down to 1% as promised before, no fee if you use only one pool connection (up to 256 workers). - - [#19](https://github.com/xmrig/xmrig-proxy/issues/19) Use ratio instead of efficiency in connections report. - - Optimized performance, stability and memory usage. - - libjansson replaced to rapidjson. - -# v2.3.0 -- Added config file support. -- Added support for 32bit version. -- Added `--user-agent` option, to set custom user-agent string for pool. For example `cpuminer-multi/0.1`. -- Force reconnect if pool block miner IP address. helps switch to backup pool. -- Better error message when detected incompatible miner, copy original nicehash behavior. -- Fixed [terminal issues](https://github.com/xmrig/xmrig-proxy/issues/2#issuecomment-319914085) after exit on Linux and OS X. -- [#5](https://github.com/xmrig/xmrig-proxy/issues/5) Fixed OX X support. -- [#6](https://github.com/xmrig/xmrig-proxy/issues/6) Fixed `--no-color` option. - -# v2.2.0 -- First public release. diff --git a/doc/gpg_keys/xmrig.asc b/doc/gpg_keys/xmrig.asc deleted file mode 100644 index ea5b2c9bd..000000000 --- a/doc/gpg_keys/xmrig.asc +++ /dev/null @@ -1,30 +0,0 @@ ------BEGIN PGP PUBLIC KEY BLOCK----- - -mQENBF3VSRIBCADfFjDUbq0WLGulFeSou0A+jTvweNllPyLNOn3SNCC0XLEYyEcu -JiEBK80DlvR06TVr8Aw1rT5S2iH0i5Tl8DqShH2mmcN1rBp1M0Y95D89KVj3BIhE -nxmgmD4N3Wgm+5FmEH4W/RpG1xdYWJx3eJhtWPdFJqpg083E2D5P30wIQem+EnTR -5YrtTZPh5cPj2KRY+UmsDE3ahmxCgP7LYgnnpZQlWBBiMV932s7MvYBPJQc1wecS -0wi1zxyS81xHc3839EkA7wueCeNo+5jha+KH66tMKsfrI2WvfPHTCPjK9v7WJc/O -/eRp9d+wacn09D1L6CoRO0ers5p10GO84VhTABEBAAG0GVhNUmlnIDxzdXBwb3J0 -QHhtcmlnLmNvbT6JAU4EEwEIADgWIQSaxM6o5m41pcfN3BtEalNji+lECQUCXdVJ -EgIbAwULCQgHAgYVCgkICwIEFgIDAQIeAQIXgAAKCRBEalNji+lECbkQB/9nRou0 -tOlBwYn8xVgBu7IiDWNVETRWfrjrtdTvSahgbbo6lWgjA/vBLkjN9fISdBQ/n/Mt -hNDJbEtxHHt2baJhvT8du1eWcIHHXCV/rmv+iY/hTXa1gKqHiHDJrtYSVBG3BMme -1rdsUHTiKf3t5yRHOXAfY2C+XNblKAV7mhlxQBiKxdFDIkFEQKNrHNUvnzkOqoCT -2kTZZ2tPUMQdOn1eek6zG/+C7SwcBpJnakJ8jce4yA/xZbOVKetNWO3Ufu3TE34k -OdA+H4PU9+fV77XfOY8DtXeS3boUI97ei+4s/mwX/NFC0i8CPXyefxl3WRUBGDOI -w//kPNQVh4HobOCeuQENBF3VSRIBCADl29WorEi+vRA/3kg9VUXtxSU6caibFS3N -VXANiFRjrOmICdfrIgOSGNrYCQFsXu0Xe0udDYVX8yX6WJk+CT02Pdg0gkXiKoze -KrnK15mo3xXbb2tr1o9ROPgwY/o2AwQHj0o1JhdS2cybfuRiUQRoGgBX7a9X0cTY -r4ZJvOjzgAajl3ciwB3yWUmDiRlzZpO7YWESXbOhGVzyCnP5MlMEJ/fPRw9h38vK -HNKLhzcRfsLpXk34ghY3SxIv4NWUfuZXFWqpSdC9JgNc5zA72lJEQcF4DHJCKl7B -ddmrfsr9mdiIpo+/ZZFPPngdeZ2kvkJ2YKaZNVu2XooJARPQ8B8tABEBAAGJATYE -GAEIACAWIQSaxM6o5m41pcfN3BtEalNji+lECQUCXdVJEgIbDAAKCRBEalNji+lE -CdPUB/4nH1IdhHGmfko2kxdaHqQgCGLqh3pcrQXD9mBv/LYVnoHZpVRHsIDgg2Z4 -lQYrIRRqe69FjVxo7sA2eMIlV0GRDlUrw+HeURFpEhKPEdwFy6i/cti2MY0YxOrB -TvQoRutUoMnyjM4TBJWaaqccbTsavMdLmG3JHdAkiHtUis/fUwVctmEQwN+d/J2b -wJAtliqw3nXchUfdIfwHF/7hg8seUuYUaifzkazBZhVWvRkTVLVanzZ51HRfuzwD -ntaa7kfYGdE+4TKOylAPh+8E6WnR19RRTpsaW0dVBgOiBTE0uc7rUv2HWS/u6RUR -t7ldSBzkuDTlM2V59Iq2hXoSC6dT -=cIG9 ------END PGP PUBLIC KEY BLOCK----- diff --git a/doc/releases/5_0_0/SHA256SUMS b/doc/releases/5_0_0/SHA256SUMS deleted file mode 100644 index f8aa6fc6b..000000000 --- a/doc/releases/5_0_0/SHA256SUMS +++ /dev/null @@ -1,3 +0,0 @@ -e12d814f584cecbb6cec9c394e49989f53ae61d4079c51c7682d938a03963b96 xmrig-proxy-5.0.0-gcc-win32.zip -0a5e143c979ef163247439da3049492ecfad49355e34ae371b14a8e08529230e xmrig-proxy-5.0.0-msvc-win64.zip -af7564afbb7e69aea52e6a2a945cb04caa09a993a468d5c1fdd73c3d337da05e xmrig-proxy-5.0.0-xenial-x64.tar.gz diff --git a/doc/releases/5_0_0/SHA256SUMS.sig b/doc/releases/5_0_0/SHA256SUMS.sig deleted file mode 100644 index 2138901c5..000000000 --- a/doc/releases/5_0_0/SHA256SUMS.sig +++ /dev/null @@ -1,11 +0,0 @@ ------BEGIN PGP SIGNATURE----- - -iQEzBAABCgAdFiEEmsTOqOZuNaXHzdwbRGpTY4vpRAkFAl3Vl4YACgkQRGpTY4vp -RAlj+Qf/TeSwcQ7HoDeCk7kAVTu25gZDf/gqTyYVNPt8x4pSjc0ofxXNo/q0Yrla -Dy5Ovjy0ZHJVYAC3vYdaDEaTWkZ0DVCytYDHEtsOgaA4jQm5baHGyIjREq1II8sl -QU27VhiOsX39jxrV4bGJvSkgLRpljFSIlbwn8+yP+sCwPMJ4MMEoJCC60agIsZBu -PsJQGVxAJ/n3nk2zvUuz/5DGqFyeOJ2MjqnLcaP6IoJ/PHxUngVi7k9qIggi6EFg -Ou/M0VMNpSo9uengCKoOsidtTkoek3MXGw+eS/JVB0qNCGHaNHqj3bTRD8yk7Klv -qq5hC4F84jAPPO8QHago9n4UcoYSkQ== -=M0Ty ------END PGP SIGNATURE----- diff --git a/src/base/crypto/Algorithm.cpp b/src/base/crypto/Algorithm.cpp index 080bd5cb1..1e4c16ee6 100644 --- 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 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 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::all(const std::function= 1930)