#1.9.0 (#236)
# 1.9.0 - Integrated Monero CN-R variant so called CNv4, aka CN-R, aka CNv5, aka Cryptonight-R #233 (algo: "cryptonight", variant: "r") - Integrated Wownero CN-R variant #233 (algo: "cryptonight", variant: "wow") - Integrated Graft variant (algo: "cryptonight", variant: "rwz" OR variant: "graft") - Integrated X-Cash variant #234 (algo: "cryptonight", variant: "double" OR variant: "heavyx" OR variant: "xcash") - Integrated Zelerius variant (algo: "cryptonight", variant: "zls" OR variant: "zelerius") - Add miner version column to the Dashboard (version turns red when its outdated) - Fixed crash when remote logging is disabled
This commit is contained in:
parent
e48436cc91
commit
862c34b31e
50 changed files with 15657 additions and 2303 deletions
|
@ -260,6 +260,14 @@ bool Client::parseJob(const rapidjson::Value ¶ms, int *code)
|
|||
|
||||
job.setPowVariant(powVariant);
|
||||
|
||||
if (params.HasMember("height")) {
|
||||
const rapidjson::Value &variant = params["height"];
|
||||
|
||||
if (variant.IsUint64()) {
|
||||
job.setHeight(variant.GetUint64());
|
||||
}
|
||||
}
|
||||
|
||||
if (m_job != job) {
|
||||
m_jobs++;
|
||||
m_job = std::move(job);
|
||||
|
|
|
@ -62,6 +62,7 @@ Job::Job(int poolId, bool nicehash) :
|
|||
m_size(0),
|
||||
m_diff(0),
|
||||
m_target(0),
|
||||
m_height(0),
|
||||
m_powVariant(PowVariant::POW_AUTODETECT)
|
||||
{
|
||||
}
|
||||
|
|
|
@ -54,9 +54,11 @@ public:
|
|||
inline uint32_t *nonce() { return reinterpret_cast<uint32_t*>(m_blob + 39); }
|
||||
inline uint32_t diff() const { return (uint32_t) m_diff; }
|
||||
inline uint64_t target() const { return m_target; }
|
||||
inline uint64_t height() const { return m_height; }
|
||||
inline void setNicehash(bool nicehash) { m_nicehash = nicehash; }
|
||||
inline void setThreadId(int threadId) { m_threadId = threadId; }
|
||||
inline void setPowVariant(PowVariant powVariant) { m_powVariant = powVariant; }
|
||||
inline void setHeight(uint64_t height) { m_height = height; }
|
||||
|
||||
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); }
|
||||
|
@ -76,6 +78,7 @@ private:
|
|||
size_t m_size;
|
||||
uint64_t m_diff;
|
||||
uint64_t m_target;
|
||||
uint64_t m_height;
|
||||
PowVariant m_powVariant;
|
||||
};
|
||||
|
||||
|
|
|
@ -170,11 +170,11 @@ void Network::onResultAccepted(Client *client, const SubmitResult &result, const
|
|||
void Network::setJob(Client *client, const Job &job)
|
||||
{
|
||||
if (m_options->colors()) {
|
||||
LOG_INFO("\x1B[01;35mnew job\x1B[0m from \x1B[01;37m%s:%d\x1B[0m with diff \x1B[01;37m%d\x1B[0m and PoW \x1B[01;37m%s",
|
||||
LOG_INFO("\x1B[01;35mnew job\x1B[0m from \x1B[01;37m%s:%d\x1B[0m with diff \x1B[01;37m%d\x1B[0m variant \x1B[01;37m%s",
|
||||
client->host(), client->port(), job.diff(), getPowVariantName(job.powVariant()).c_str());
|
||||
}
|
||||
else {
|
||||
LOG_INFO("new job from %s:%d with diff %d and PoW %s", client->host(), client->port(), job.diff(), getPowVariantName(job.powVariant()).c_str());
|
||||
LOG_INFO("new job from %s:%d with diff %d variant %s", client->host(), client->port(), job.diff(), getPowVariantName(job.powVariant()).c_str());
|
||||
}
|
||||
|
||||
m_state.powVariant = job.powVariant();
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue