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

Fix nicehash support, please note --nicehash option now specified per pool.

Browse source
This commit is contained in:
XMRig 2017-07-01 22:37:27 +03:00
parent 263634f585
commit 8ec58a8394
12 changed files with 23 additions and 26 deletions
Download patch file Download diff file Expand all files Collapse all files

3
src/net/Client.cpp
View file

@ -165,7 +165,7 @@ bool Client::parseJob(const json_t *params, int *code)
return false;
}
Job job;
Job job(m_id, m_url.isNicehash());
if (!job.setId(json_string_value(json_object_get(params, "job_id")))) {
*code = 3;
return false;
@ -181,7 +181,6 @@ bool Client::parseJob(const json_t *params, int *code)
return false;
}
job.setPoolId(m_id);
m_job = std::move(job);
LOG_DEBUG("[%s:%u] job: \"%s\", diff: %lld", m_url.host(), m_url.port(), job.id(), job.diff());

3
src/net/Job.cpp
View file

@ -56,7 +56,8 @@ static inline char hf_bin2hex(unsigned char c)
}
Job::Job(int poolId) :
Job::Job(int poolId, bool nicehash) :
m_nicehash(nicehash),
m_poolId(poolId),
m_size(0),
m_diff(0),

22
src/net/Job.h
View file

@ -34,20 +34,21 @@
class Job
{
public:
Job(int poolId = -2);
Job(int poolId = -2, bool nicehash = false);
bool setBlob(const char *blob);
bool setId(const char *id);
bool setTarget(const char *target);
inline bool isValid() const { return m_size > 0 && m_diff > 0; }
inline const char *id() const { return m_id; }
inline const uint8_t *blob() const { return m_blob; }
inline int poolId() const { return m_poolId; }
inline uint32_t *nonce() { return reinterpret_cast<uint32_t*>(m_blob + 39); }
inline uint32_t diff() const { return m_diff; }
inline uint32_t size() const { return m_size; }
inline uint64_t target() const { return m_target; }
inline void setPoolId(int poolId) { m_poolId = poolId; }
inline bool isNicehash() const { return m_nicehash; }
inline bool isValid() const { return m_size > 0 && m_diff > 0; }
inline const char *id() const { return m_id; }
inline const uint8_t *blob() const { return m_blob; }
inline int poolId() const { return m_poolId; }
inline uint32_t *nonce() { return reinterpret_cast<uint32_t*>(m_blob + 39); }
inline uint32_t diff() const { return m_diff; }
inline uint32_t size() const { return m_size; }
inline uint64_t target() const { return m_target; }
inline void setNicehash(bool nicehash) { m_nicehash = nicehash; }
static bool fromHex(const char* in, unsigned int len, unsigned char* out);
static inline uint32_t *nonce(uint8_t *blob) { return reinterpret_cast<uint32_t*>(blob + 39); }
@ -55,6 +56,7 @@ public:
static void toHex(const unsigned char* in, unsigned int len, char* out);
private:
bool m_nicehash;
int m_poolId;
VAR_ALIGN(16, char m_id[64]);
VAR_ALIGN(16, uint8_t m_blob[84]); // Max blob size is 84 (75 fixed + 9 variable), aligned to 96. https://github.com/xmrig/xmrig/issues/1 Thanks fireice-uk.