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

Merge xmrig v6.16.2 into master

Browse source
This commit is contained in:
MoneroOcean 2021-12-02 15:29:31 +00:00
commit 615715e215
30 changed files with 1506 additions and 339 deletions
Download patch file Download diff file Expand all files Collapse all files

6
src/base/net/stratum/EthStratumClient.cpp
View file

@ -73,7 +73,7 @@ int64_t xmrig::EthStratumClient::submit(const JobResult& result)
auto& allocator = doc.GetAllocator();
Value params(kArrayType);
params.PushBack(m_pool.user().toJSON(), allocator);
params.PushBack(m_user.toJSON(), allocator);
params.PushBack(result.jobId.toJSON(), allocator);
# ifdef XMRIG_ALGO_GHOSTRIDER
@ -471,8 +471,8 @@ void xmrig::EthStratumClient::authorize()
auto &allocator = doc.GetAllocator();
Value params(kArrayType);
params.PushBack(m_pool.user().toJSON(), allocator);
params.PushBack(m_pool.password().toJSON(), allocator);
params.PushBack(m_user.toJSON(), allocator);
params.PushBack(m_password.toJSON(), allocator);
JsonRequest::create(doc, m_sequence, "mining.authorize", params);

5
src/base/net/stratum/benchmark/BenchClient.cpp
View file

@ -50,6 +50,7 @@ xmrig::BenchClient::BenchClient(const std::shared_ptr<BenchConfig> &benchmark, I
# ifdef XMRIG_ALGO_GHOSTRIDER
if (m_benchmark->algorithm() == Algorithm::GHOSTRIDER_RTM) {
const uint32_t q = (benchmark->rotation() / 20) & 1;
const uint32_t r = benchmark->rotation() % 20;
static constexpr uint32_t indices[20][3] = {
@ -75,9 +76,9 @@ xmrig::BenchClient::BenchClient(const std::shared_ptr<BenchConfig> &benchmark, I
{ 3, 4, 5 },
};
blob[ 8] = '0' + indices[r][1];
blob[ 8] = '0' + indices[r][q ? 2 : 1];
blob[ 9] = '0' + indices[r][0];
blob[11] = '0' + indices[r][2];
blob[11] = '0' + indices[r][q ? 1 : 2];
}
# endif