source/xmrig-proxy
1
0
Fork 0
mirror of https://github.com/xmrig/xmrig-proxy.git synced 2026-02-09 02:59:17 +08:00
Code Issues Packages Projects Releases Wiki Activity

Add height field support.

Browse Source
This commit is contained in:
XMRig
2019-02-12 04:34:09 +07:00
parent 40816883a7
commit 9e4a0b96bd
3 changed files with 30 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/proxy/Miner.cpp
View File

@@ -5,7 +5,8 @@
* Copyright 2014-2016 Wolf9466 <https://github.com/OhGodAPet>
* Copyright 2016 Jay D Dee <jayddee246@gmail.com>
* Copyright 2017-2018 XMR-Stak <https://github.com/fireice-uk>, <https://github.com/psychocrypt>
* Copyright 2016-2018 XMRig <https://github.com/xmrig>, <support@xmrig.com>
* Copyright 2018-2019 SChernykh <https://github.com/SChernykh>
* Copyright 2016-2019 XMRig <https://github.com/xmrig>, <support@xmrig.com>
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
@@ -174,6 +175,10 @@ void Miner::setJob(Job &job)
params.AddMember("target", StringRef(customDiff ? m_sendBuf : job.rawTarget()), allocator);
params.AddMember("algo", StringRef(job.algorithm().shortName()), allocator);
if (job.height()) {
params.AddMember("height", job.height(), allocator);
}
if (job.algorithm().variant() == xmrig::VARIANT_0 || job.algorithm().variant() == xmrig::VARIANT_1) {
params.AddMember("variant", job.algorithm().variant(), allocator);
}

16
src/proxy/splitters/nicehash/NonceMapper.cpp
View File

@@ -5,7 +5,8 @@
* Copyright 2014-2016 Wolf9466 <https://github.com/OhGodAPet>
* Copyright 2016 Jay D Dee <jayddee246@gmail.com>
* Copyright 2017-2018 XMR-Stak <https://github.com/fireice-uk>, <https://github.com/psychocrypt>
* Copyright 2016-2018 XMRig <https://github.com/xmrig>, <support@xmrig.com>
* Copyright 2018-2019 SChernykh <https://github.com/SChernykh>
* Copyright 2016-2019 XMRig <https://github.com/xmrig>, <support@xmrig.com>
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
@@ -302,9 +303,16 @@ void NonceMapper::connect()
void NonceMapper::setJob(const char *host, int port, const Job &job)
{
if (m_controller->config()->isVerbose()) {
LOG_INFO(isColors() ? "#%03u " MAGENTA_BOLD("new job") " from " WHITE_BOLD("%s:%d") " diff " WHITE_BOLD("%d") " algo " WHITE_BOLD("%s")
: "#%03u new job from %s:%d diff %d algo %s",
m_id, host, port, job.diff(), job.algorithm().shortName());
if (job.height()) {
LOG_INFO(isColors() ? "#%03u " MAGENTA_BOLD("new job") " from " WHITE_BOLD("%s:%d") " diff " WHITE_BOLD("%d") " algo " WHITE_BOLD("%s") " height " WHITE_BOLD("%" PRIu64)
: "#%03u new job from %s:%d diff %d algo %s height %" PRIu64,
m_id, host, port, job.diff(), job.algorithm().shortName(), job.height());
}
else {
LOG_INFO(isColors() ? "#%03u " MAGENTA_BOLD("new job") " from " WHITE_BOLD("%s:%d") " diff " WHITE_BOLD("%d") " algo " WHITE_BOLD("%s")
: "#%03u new job from %s:%d diff %d algo %s",
m_id, host, port, job.diff(), job.algorithm().shortName());
}
}
m_storage->setJob(job);

16
src/proxy/splitters/simple/SimpleMapper.cpp
View File

@@ -5,7 +5,8 @@
* Copyright 2014-2016 Wolf9466 <https://github.com/OhGodAPet>
* Copyright 2016 Jay D Dee <jayddee246@gmail.com>
* Copyright 2017-2018 XMR-Stak <https://github.com/fireice-uk>, <https://github.com/psychocrypt>
* Copyright 2016-2018 XMRig <https://github.com/xmrig>, <support@xmrig.com>
* Copyright 2018-2019 SChernykh <https://github.com/SChernykh>
* Copyright 2016-2019 XMRig <https://github.com/xmrig>, <support@xmrig.com>
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
@@ -188,9 +189,16 @@ void SimpleMapper::onActive(IStrategy *strategy, Client *client)
void SimpleMapper::onJob(IStrategy *strategy, Client *client, const Job &job)
{
if (m_controller->config()->isVerbose()) {
LOG_INFO(isColors() ? "#%03u " MAGENTA_BOLD("new job") " from " WHITE_BOLD("%s:%d") " diff " WHITE_BOLD("%d") " algo " WHITE_BOLD("%s")
: "#%03u new job from %s:%d diff %d algo %s",
m_id, client->host(), client->port(), job.diff(), job.algorithm().shortName());
if (job.height()) {
LOG_INFO(isColors() ? "#%03u " MAGENTA_BOLD("new job") " from " WHITE_BOLD("%s:%d") " diff " WHITE_BOLD("%d") " algo " WHITE_BOLD("%s") " height " WHITE_BOLD("%" PRIu64)
: "#%03u new job from %s:%d diff %d algo %s height %" PRIu64,
m_id, client->host(), client->port(), job.diff(), job.algorithm().shortName(), job.height());
}
else {
LOG_INFO(isColors() ? "#%03u " MAGENTA_BOLD("new job") " from " WHITE_BOLD("%s:%d") " diff " WHITE_BOLD("%d") " algo " WHITE_BOLD("%s")
: "#%03u new job from %s:%d diff %d algo %s",
m_id, client->host(), client->port(), job.diff(), job.algorithm().shortName());
}
}
if (m_donate && m_donate->isActive() && client->id() != -1 && !m_donate->reschedule()) {