fzorb/REDACTED-rig
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge 7ca96a8295 into 09a7219651

Browse source
This commit is contained in:
us77ipis 2022-06-11 12:12:07 -06:00 • committed by GitHub
commit 38cb903c98
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
9 changed files with 82 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

58
src/backend/cpu/CpuWorker.cpp
View file

@ -25,6 +25,7 @@
#include "backend/cpu/CpuWorker.h"
#include "base/tools/Alignment.h"
#include "base/tools/Chrono.h"
#include "base/tools/bswap_64.h"
#include "core/config/Config.h"
#include "core/Miner.h"
#include "crypto/cn/CnCtx.h"
@ -38,6 +39,10 @@
#include "crypto/ghostrider/ghostrider.h"
#include "net/JobResults.h"
extern "C" {
#include "crypto/ghostrider/sph_sha2.h"
}
#ifdef XMRIG_ALGO_RANDOMX
# include "crypto/randomx/randomx.h"
@ -260,6 +265,8 @@ void xmrig::CpuWorker<N>::start()
# ifdef XMRIG_ALGO_RANDOMX
bool first = true;
alignas(16) uint64_t tempHash[8] = {};
sph_sha256_context sha256_ctx_cache, sha256_ctx;
alignas(16) uint64_t dsha256[4] = {};
# endif
while (!Nonce::isOutdated(Nonce::CPU, m_job.sequence())) {
@ -293,7 +300,32 @@ void xmrig::CpuWorker<N>::start()
# ifdef XMRIG_ALGO_RANDOMX
uint8_t* miner_signature_ptr = m_job.blob() + m_job.nonceOffset() + m_job.nonceSize();
if (job.algorithm().family() == Algorithm::RANDOM_X) {
if (job.algorithm().id() == Algorithm::RX_VEIL) {
if (first) {
// Init sha256 context cache until nonceOffset
sph_sha256_init(&sha256_ctx_cache);
sph_sha256(&sha256_ctx_cache, job.blob(), m_job.nonceOffset());
sha256d(dsha256, m_job.blob(), job.size());
}
if (first) {
first = false;
randomx_calculate_hash_first(m_vm, tempHash, dsha256, 32);
}
if (!nextRound()) {
break;
}
// Compute header double-sha256
memcpy(&sha256_ctx, &sha256_ctx_cache, sizeof(sha256_ctx));
sph_sha256(&sha256_ctx, m_job.blob() + m_job.nonceOffset(), job.size() - m_job.nonceOffset());
sph_sha256_close(&sha256_ctx, dsha256);
sph_sha256_full(dsha256, dsha256, 32);
randomx_calculate_hash_next(m_vm, tempHash, dsha256, 32, m_hash);
}
else if (job.algorithm().family() == Algorithm::RANDOM_X) {
if (first) {
first = false;
if (job.hasMinerSignature()) {
@ -354,19 +386,35 @@ void xmrig::CpuWorker<N>::start()
}
if (valid) {
for (size_t i = 0; i < N; ++i) {
const uint64_t value = *reinterpret_cast<uint64_t*>(m_hash + (i * 32) + 24);
if (job.algorithm().id() == Algorithm::RX_VEIL) {
const uint64_t value = bswap_64(*reinterpret_cast<uint64_t*>(m_hash));
# ifdef XMRIG_FEATURE_BENCHMARK
if (m_benchSize) {
if (current_job_nonces[i] < m_benchSize) {
if (current_job_nonces[0] < m_benchSize) {
BenchState::add(value);
}
}
else
# endif
if (value < job.target()) {
JobResults::submit(job, current_job_nonces[i], m_hash + (i * 32), job.hasMinerSignature() ? miner_signature_saved : nullptr);
JobResults::submit(job, current_job_nonces[0], m_hash, nullptr);
}
} else {
for (size_t i = 0; i < N; ++i) {
const uint64_t value = *reinterpret_cast<uint64_t*>(m_hash + (i * 32) + 24);
# ifdef XMRIG_FEATURE_BENCHMARK
if (m_benchSize) {
if (current_job_nonces[i] < m_benchSize) {
BenchState::add(value);
}
}
else
# endif
if (value < job.target()) {
JobResults::submit(job, current_job_nonces[i], m_hash + (i * 32), job.hasMinerSignature() ? miner_signature_saved : nullptr);
}
}
}
m_count += N;

4
src/backend/cuda/CudaWorker.cpp
View file

@ -69,7 +69,9 @@ xmrig::CudaWorker::CudaWorker(size_t id, const CudaLaunchData &data) :
switch (m_algorithm.family()) {
case Algorithm::RANDOM_X:
# ifdef XMRIG_ALGO_RANDOMX
m_runner = new CudaRxRunner(id, data);
if (m_algorithm.id() != Algorithm::RX_VEIL) {
m_runner = new CudaRxRunner(id, data);
}
# endif
break;

12
src/backend/opencl/OclWorker.cpp
View file

@ -76,11 +76,13 @@ xmrig::OclWorker::OclWorker(size_t id, const OclLaunchData &data) :
switch (m_algorithm.family()) {
case Algorithm::RANDOM_X:
# ifdef XMRIG_ALGO_RANDOMX
if (data.thread.isAsm() && data.device.vendorId() == OCL_VENDOR_AMD) {
m_runner = new OclRxJitRunner(id, data);
}
else {
m_runner = new OclRxVmRunner(id, data);
if (m_algorithm.id() != Algorithm::RX_VEIL) {
if (data.thread.isAsm() && data.device.vendorId() == OCL_VENDOR_AMD) {
m_runner = new OclRxJitRunner(id, data);
}
else {
m_runner = new OclRxVmRunner(id, data);
}
}
# endif
break;

6
src/base/crypto/Algorithm.cpp
View file

@ -77,6 +77,7 @@ const char *Algorithm::kCN_UPX2 = "cn/upx2";
#ifdef XMRIG_ALGO_RANDOMX
const char *Algorithm::kRX = "rx";
const char *Algorithm::kRX_0 = "rx/0";
const char *Algorithm::kRX_VEIL = "rx/veil";
const char *Algorithm::kRX_WOW = "rx/wow";
const char *Algorithm::kRX_ARQ = "rx/arq";
const char *Algorithm::kRX_GRAFT = "rx/graft";
@ -149,6 +150,7 @@ static const std::map<uint32_t, const char *> kAlgorithmNames = {
# ifdef XMRIG_ALGO_RANDOMX
ALGO_NAME(RX_0),
ALGO_NAME(RX_VEIL),
ALGO_NAME(RX_WOW),
ALGO_NAME(RX_ARQ),
ALGO_NAME(RX_GRAFT),
@ -264,6 +266,8 @@ static const std::map<const char *, Algorithm::Id, aliasCompare> kAlgorithmAlias
ALGO_ALIAS(RX_0, "rx/test"),
ALGO_ALIAS(RX_0, "randomx"),
ALGO_ALIAS(RX_0, "rx"),
ALGO_ALIAS_AUTO(RX_VEIL), ALGO_ALIAS(RX_VEIL, "randomx/veil"),
ALGO_ALIAS(RX_VEIL, "randomveil"),
ALGO_ALIAS_AUTO(RX_WOW), ALGO_ALIAS(RX_WOW, "randomx/wow"),
ALGO_ALIAS(RX_WOW, "randomwow"),
ALGO_ALIAS_AUTO(RX_ARQ), ALGO_ALIAS(RX_ARQ, "randomx/arq"),
@ -368,7 +372,7 @@ std::vector<xmrig::Algorithm> xmrig::Algorithm::all(const std::function<bool(con
CN_HEAVY_0, CN_HEAVY_TUBE, CN_HEAVY_XHV,
CN_PICO_0, CN_PICO_TLO,
CN_UPX2,
RX_0, RX_WOW, RX_ARQ, RX_GRAFT, RX_SFX, RX_KEVA,
RX_0, RX_VEIL, RX_WOW, RX_ARQ, RX_GRAFT, RX_SFX, RX_KEVA,
AR2_CHUKWA, AR2_CHUKWA_V2, AR2_WRKZ,
ASTROBWT_DERO, ASTROBWT_DERO_2,
KAWPOW_RVN,

2
src/base/crypto/Algorithm.h
View file

@ -73,6 +73,7 @@ public:
CN_GR_5 = 0x63120105, // "cn/turtle-lite" GhostRider
GHOSTRIDER_RTM = 0x6c150000, // "ghostrider" GhostRider
RX_0 = 0x72151200, // "rx/0" RandomX (reference configuration).
RX_VEIL = 0x72151201, // "rx/veil" RandomX (Veil).
RX_WOW = 0x72141177, // "rx/wow" RandomWOW (Wownero).
RX_ARQ = 0x72121061, // "rx/arq" RandomARQ (Arqma).
RX_GRAFT = 0x72151267, // "rx/graft" RandomGRAFT (Graft).
@ -142,6 +143,7 @@ public:
# ifdef XMRIG_ALGO_RANDOMX
static const char *kRX;
static const char *kRX_0;
static const char *kRX_VEIL;
static const char *kRX_WOW;
static const char *kRX_ARQ;
static const char *kRX_GRAFT;

1
src/base/crypto/Coin.cpp
View file

@ -55,6 +55,7 @@ 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_VEIL, "VEIL", "Veil", 120, 1000000000000, BLUE_BG_BOLD( WHITE_BOLD_S " veil ") }
};

1
src/base/crypto/Coin.h
View file

@ -41,6 +41,7 @@ public:
KEVA,
RAVEN,
WOWNERO,
VEIL,
MAX
};

4
src/base/net/stratum/Job.cpp
View file

@ -173,12 +173,14 @@ int32_t xmrig::Job::nonceOffset() const
auto id = algorithm().id();
if (id == Algorithm::ASTROBWT_DERO_2) return 44;
if (id == Algorithm::RX_VEIL) return 140;
return 39;
}
uint32_t xmrig::Job::getNumTransactions() const
{
if (!(m_algorithm.isCN() || m_algorithm.family() == Algorithm::RANDOM_X)) {
if (!(m_algorithm.isCN() || (m_algorithm.family() == Algorithm::RANDOM_X && m_algorithm.id() != Algorithm::RX_VEIL))) {
return 0;
}

8
src/net/JobResult.h
View file

@ -31,6 +31,7 @@
#include <cstdint>
#include "base/tools/bswap_64.h"
#include "base/tools/String.h"
#include "base/net/stratum/Job.h"
@ -80,7 +81,12 @@ public:
}
inline const uint8_t *result() const { return m_result; }
inline uint64_t actualDiff() const { return Job::toDiff(reinterpret_cast<const uint64_t*>(m_result)[3]); }
inline uint64_t actualDiff() const {
if (algorithm.id() == Algorithm::RX_VEIL) {
return Job::toDiff(bswap_64(*reinterpret_cast<const uint64_t*>(m_result)));
}
return Job::toDiff(reinterpret_cast<const uint64_t*>(m_result)[3]);
}
inline uint8_t *result() { return m_result; }
inline const uint8_t *headerHash() const { return m_headerHash; }
inline const uint8_t *mixHash() const { return m_mixHash; }