mirrors/xmrig
1
0
Fork 1
mirror of https://github.com/xmrig/xmrig.git synced 2026-01-19 13:33:00 -05:00
Code Issues Projects Releases Wiki Activity

Merge xmrig v6.10.0 into master

Browse Source
This commit is contained in:
MoneroOcean
2021-03-08 03:34:30 +00:00
parent 4108d2d823 69590f9777
commit 5d35f324fc
64 changed files with 20043 additions and 3984 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
src/base/net/stratum/DaemonClient.cpp
View File

@@ -25,7 +25,6 @@
#include "base/net/stratum/DaemonClient.h"
#include "3rdparty/http-parser/http_parser.h"
#include "3rdparty/rapidjson/document.h"
#include "3rdparty/rapidjson/error/en.h"
#include "base/io/json/Json.h"
@@ -151,7 +150,7 @@ void xmrig::DaemonClient::connect(const Pool &pool)
void xmrig::DaemonClient::onHttpData(const HttpData &data)
{
if (data.status != HTTP_STATUS_OK) {
if (data.status != 200) {
return retry();
}
@@ -179,12 +178,30 @@ void xmrig::DaemonClient::onHttpData(const HttpData &data)
return send(kGetInfo);
}
if (isOutdated(Json::getUint64(doc, kHeight), Json::getString(doc, kHash))) {
getBlockTemplate();
const uint64_t height = Json::getUint64(doc, kHeight);
const String hash = Json::getString(doc, kHash);
if (isOutdated(height, hash)) {
// Multiple /getheight responses can come at once resulting in multiple getBlockTemplate() calls
if ((height != m_blocktemplateRequestHeight) || (hash != m_blocktemplateRequestHash)) {
m_blocktemplateRequestHeight = height;
m_blocktemplateRequestHash = hash;
getBlockTemplate();
}
}
}
else if (data.url == kGetInfo && isOutdated(Json::getUint64(doc, kHeight), Json::getString(doc, "top_block_hash"))) {
getBlockTemplate();
else if (data.url == kGetInfo) {
const uint64_t height = Json::getUint64(doc, kHeight);
const String hash = Json::getString(doc, "top_block_hash");
if (isOutdated(height, hash)) {
// Multiple /getinfo responses can come at once resulting in multiple getBlockTemplate() calls
if ((height != m_blocktemplateRequestHeight) || (hash != m_blocktemplateRequestHash)) {
m_blocktemplateRequestHeight = height;
m_blocktemplateRequestHash = hash;
getBlockTemplate();
}
}
}
return;

2
src/base/net/stratum/DaemonClient.h
View File

@@ -89,6 +89,8 @@ private:
String m_tlsFingerprint;
String m_tlsVersion;
Timer *m_timer;
uint64_t m_blocktemplateRequestHeight = 0;
String m_blocktemplateRequestHash;
};

7
src/base/net/stratum/Job.cpp
View File

@@ -119,8 +119,10 @@ bool xmrig::Job::setTarget(const char *target)
}
# ifdef XMRIG_PROXY_PROJECT
assert(sizeof(m_rawTarget) > (size * 2));
memset(m_rawTarget, 0, sizeof(m_rawTarget));
memcpy(m_rawTarget, target, len);
memcpy(m_rawTarget, target, std::min(size * 2, sizeof(m_rawTarget)));
# endif
m_diff = toDiff(m_target);
@@ -134,8 +136,7 @@ void xmrig::Job::setDiff(uint64_t diff)
m_target = toDiff(diff);
# ifdef XMRIG_PROXY_PROJECT
Buffer::toHex(reinterpret_cast<uint8_t *>(&m_target), 8, m_rawTarget);
m_rawTarget[16] = '\0';
Cvt::toHex(m_rawTarget, sizeof(m_rawTarget), reinterpret_cast<uint8_t *>(&m_target), sizeof(m_target));
# endif
}

2
src/base/net/stratum/NetworkState.cpp
View File

@@ -206,7 +206,7 @@ void xmrig::NetworkState::printConnection() const
void xmrig::NetworkState::printResults() const
{
if (!m_hashes) {
LOG_NOTICE(YELLOW_BOLD_S "no any results yet");
LOG_NOTICE(YELLOW_BOLD_S "no results yet");
return;
}

3
src/base/net/stratum/SelfSelectClient.cpp
View File

@@ -20,7 +20,6 @@
#include "base/net/stratum/SelfSelectClient.h"
#include "3rdparty/http-parser/http_parser.h"
#include "3rdparty/rapidjson/document.h"
#include "3rdparty/rapidjson/error/en.h"
#include "base/io/json/Json.h"
@@ -288,7 +287,7 @@ void xmrig::SelfSelectClient::submitOriginDaemon(const JobResult& result)
void xmrig::SelfSelectClient::onHttpData(const HttpData &data)
{
if (data.status != HTTP_STATUS_OK) {
if (data.status != 200) {
return retry();
}