From 5cb3ef90680e95fe96108d6a4d5e964b5ee87301 Mon Sep 17 00:00:00 2001 From: XMRig Date: Fri, 9 Aug 2019 14:26:00 +0700 Subject: [PATCH] Name for reference RandomX configuration changed to rx/text to avoid potential conflicts in future. --- CHANGELOG.md | 1 + doc/ALGORITHMS.md | 1 + src/base/net/stratum/Job.cpp | 9 ++++++++- src/crypto/common/Algorithm.cpp | 2 ++ 4 files changed, 12 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index f2ad4ed1..b67934bb 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -6,6 +6,7 @@ - [#1106](https://github.com/xmrig/xmrig/issues/1106) Fixed `hugepages` field in summary API. - Added alternative short format for CPU threads. - Changed format for CPU threads with intensity above 1. +- Name for reference RandomX configuration changed to `rx/text` to avoid potential conflicts in future. # v2.99.4-beta - [#1062](https://github.com/xmrig/xmrig/issues/1062) Fixed 32 bit support. **32 bit is slow and deprecated**. diff --git a/doc/ALGORITHMS.md b/doc/ALGORITHMS.md index 07f92271..076eb2ff 100644 --- a/doc/ALGORITHMS.md +++ b/doc/ALGORITHMS.md @@ -44,6 +44,7 @@ Since version 3 mining [algorithm](#algorithm-names) should specified for each p | `cn-heavy/xhv` | 4 MB | CryptoNight-Heavy (modified, TUBE only). | | `cn-heavy/tube` | 4 MB | CryptoNight-Heavy (modified, Haven Protocol only). | | `cn-pico` | 256 KB | TurtleCoin (TRTL) | +| `rx/test` | 2 MB | RandomX (reference configuration). | | `rx/0` | 2 MB | RandomX (reference configuration), reserved for future use. | | `rx/wow` | 1 MB | RandomWOW (Wownero). | | `rx/loki` | 2 MB | RandomXL (Loki). | diff --git a/src/base/net/stratum/Job.cpp b/src/base/net/stratum/Job.cpp index 512b686e..04bd82d8 100644 --- a/src/base/net/stratum/Job.cpp +++ b/src/base/net/stratum/Job.cpp @@ -174,6 +174,13 @@ void xmrig::Job::copy(const Job &other) m_target = other.m_target; m_index = other.m_index; - memcpy(m_blob, other.m_blob, sizeof (m_blob)); + memcpy(m_blob, other.m_blob, sizeof(m_blob)); memcpy(m_seedHash, other.m_seedHash, sizeof(m_seedHash)); + +# ifdef XMRIG_PROXY_PROJECT + m_rawSeedHash = other.m_rawSeedHash; + + memcpy(m_rawBlob, other.m_rawBlob, sizeof(m_rawBlob)); + memcpy(m_rawTarget, other.m_rawTarget, sizeof(m_rawTarget)); +# endif } diff --git a/src/crypto/common/Algorithm.cpp b/src/crypto/common/Algorithm.cpp index 30a7ad9c..db6cb234 100644 --- a/src/crypto/common/Algorithm.cpp +++ b/src/crypto/common/Algorithm.cpp @@ -107,6 +107,8 @@ static AlgoName const algorithm_names[] = { { "cryptonight_turtle", "cn_turtle", Algorithm::CN_PICO_0 }, # endif # ifdef XMRIG_ALGO_RANDOMX + { "randomx/test", "rx/test", Algorithm::RX_0 }, + { "randomx/0", "rx/0", Algorithm::RX_0 }, { "randomx/0", "rx/0", Algorithm::RX_0 }, { "RandomX", "rx", Algorithm::RX_0 }, { "randomx/wow", "rx/wow", Algorithm::RX_WOW },