mirrors/xmrig
1
0
Fork 1
mirror of https://github.com/xmrig/xmrig.git synced 2026-01-18 21:22:50 -05:00
Code Issues Projects Releases Wiki Activity

Merge branch 'dev' into feature/yadacoin

Browse Source
This commit is contained in:
pdxwebdev
2022-02-04 19:27:02 -08:00
committed by GitHub
parent 0f47bfb1b5 802029e5f5
commit 396f003edc
4 changed files with 19 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/base/net/stratum/AutoClient.cpp
View File

@@ -65,6 +65,12 @@ bool xmrig::AutoClient::parseLogin(const rapidjson::Value &result, int *code)
m_mode = ETH_MODE;
setAlgo(algo);
# ifdef XMRIG_ALGO_GHOSTRIDER
if (algo.family() == Algorithm::GHOSTRIDER) {
setExtraNonce2Size(Json::getUint64(result, "extra_nonce2_size"));
}
# endif
return true;
}

4
src/base/net/stratum/EthStratumClient.h
View File

@@ -47,6 +47,10 @@ protected:
void setExtraNonce(const rapidjson::Value &nonce);
# ifdef XMRIG_ALGO_GHOSTRIDER
inline void setExtraNonce2Size(uint64_t size) { m_extraNonce2Size = size; }
# endif
private:
static const char *errorMessage(const rapidjson::Value &error);

4
src/version.h
View File

@@ -33,7 +33,9 @@
#define APP_VER_PATCH 0
#ifdef _MSC_VER
# if (_MSC_VER >= 1920)
# if (_MSC_VER >= 1930)
# define MSVC_VERSION 2022
# elif (_MSC_VER >= 1920 && _MSC_VER < 1930)
# define MSVC_VERSION 2019
# elif (_MSC_VER >= 1910 && _MSC_VER < 1920)
# define MSVC_VERSION 2017