mirrors/xmrig
1
0
Fork 1
mirror of https://github.com/xmrig/xmrig.git synced 2025-12-21 21:02:52 -05:00
Code Issues Projects Releases Wiki Activity

Merge xmrig v6.11.1 into master

Browse Source
This commit is contained in:
MoneroOcean
2021-04-07 04:15:47 +00:00
parent fd8ed2c6a6 0f83b5e06c
commit 6c75526d3e
5 changed files with 24 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/base/net/stratum/Client.cpp
View File

@@ -381,11 +381,16 @@ bool xmrig::Client::parseJob(const rapidjson::Value &params, int *code)
}
const char *algo = Json::getString(params, "algo");
const char *blobData = Json::getString(params, "blob");
if (algo) {
job.setAlgorithm(algo);
}
else if (m_pool.coin().isValid()) {
job.setAlgorithm(m_pool.coin().algorithm(job.blob()[0]));
uint8_t blobVersion = 0;
if (blobData) {
Cvt::fromHex(&blobVersion, 1, blobData, 2);
}
job.setAlgorithm(m_pool.coin().algorithm(blobVersion));
}
# ifdef XMRIG_FEATURE_HTTP
@@ -401,7 +406,7 @@ bool xmrig::Client::parseJob(const rapidjson::Value &params, int *code)
else
# endif
{
if (!job.setBlob(params["blob"].GetString())) {
if (!job.setBlob(blobData)) {
*code = 4;
return false;
}