From df6a397e52dc3f08afc9b9e97cccd9ac9a8178f6 Mon Sep 17 00:00:00 2001 From: XMRig Date: Tue, 6 Mar 2018 17:06:07 +0700 Subject: [PATCH] Update copyright and move version into Job class. --- src/crypto/CryptoNight.cpp | 9 +++++---- src/crypto/CryptoNight.h | 7 ++++--- src/crypto/CryptoNight_arm.h | 5 +++-- src/crypto/CryptoNight_x86.h | 5 +++-- src/net/Job.cpp | 5 +++-- src/net/Job.h | 6 ++++-- src/workers/DoubleWorker.cpp | 9 ++++----- src/workers/DoubleWorker.h | 5 +++-- src/workers/SingleWorker.cpp | 9 ++++----- src/workers/SingleWorker.h | 5 +++-- 10 files changed, 36 insertions(+), 29 deletions(-) diff --git a/src/crypto/CryptoNight.cpp b/src/crypto/CryptoNight.cpp index ecc051f2c..8de52c5a2 100644 --- a/src/crypto/CryptoNight.cpp +++ b/src/crypto/CryptoNight.cpp @@ -4,8 +4,9 @@ * Copyright 2014 Lucas Jones * Copyright 2014-2016 Wolf9466 * Copyright 2016 Jay D Dee - * Copyright 2016-2017 XMRig - * + * Copyright 2017-2018 XMR-Stak , + * Copyright 2018 Lee Clagett + * Copyright 2016-2018 XMRig , * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -144,9 +145,9 @@ bool (*cryptonight_variations[4])(const void *input, size_t size, void *output, #endif -bool CryptoNight::hash(const Job &job, JobResult &result, cryptonight_ctx *ctx, uint8_t version) +bool CryptoNight::hash(const Job &job, JobResult &result, cryptonight_ctx *ctx) { - const bool rc = cryptonight_hash_ctx(job.blob(), job.size(), result.result, ctx, version); + const bool rc = cryptonight_hash_ctx(job.blob(), job.size(), result.result, ctx, job.version()); return rc && *reinterpret_cast(result.result + 24) < job.target(); } diff --git a/src/crypto/CryptoNight.h b/src/crypto/CryptoNight.h index 890e6263f..6fa4719c4 100644 --- a/src/crypto/CryptoNight.h +++ b/src/crypto/CryptoNight.h @@ -4,8 +4,9 @@ * Copyright 2014 Lucas Jones * Copyright 2014-2016 Wolf9466 * Copyright 2016 Jay D Dee - * Copyright 2016-2017 XMRig - * + * Copyright 2017-2018 XMR-Stak , + * Copyright 2018 Lee Clagett + * Copyright 2016-2018 XMRig , * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -50,7 +51,7 @@ class JobResult; class CryptoNight { public: - static bool hash(const Job &job, JobResult &result, cryptonight_ctx *ctx, uint8_t version); + static bool hash(const Job &job, JobResult &result, cryptonight_ctx *ctx); static bool init(int algo, int variant); static bool hash(const uint8_t *input, size_t size, uint8_t *output, cryptonight_ctx *ctx, uint8_t version); diff --git a/src/crypto/CryptoNight_arm.h b/src/crypto/CryptoNight_arm.h index 513fa8843..b5dc789d6 100644 --- a/src/crypto/CryptoNight_arm.h +++ b/src/crypto/CryptoNight_arm.h @@ -5,8 +5,9 @@ * Copyright 2014-2016 Wolf9466 * Copyright 2016 Jay D Dee * Copyright 2016 Imran Yusuff - * Copyright 2016-2017 XMRig - * + * Copyright 2017-2018 XMR-Stak , + * Copyright 2018 Lee Clagett + * Copyright 2016-2018 XMRig , * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/crypto/CryptoNight_x86.h b/src/crypto/CryptoNight_x86.h index a9500850d..c2f026452 100644 --- a/src/crypto/CryptoNight_x86.h +++ b/src/crypto/CryptoNight_x86.h @@ -4,8 +4,9 @@ * Copyright 2014 Lucas Jones * Copyright 2014-2016 Wolf9466 * Copyright 2016 Jay D Dee - * Copyright 2016-2017 XMRig - * + * Copyright 2017-2018 XMR-Stak , + * Copyright 2018 Lee Clagett + * Copyright 2016-2018 XMRig , * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/net/Job.cpp b/src/net/Job.cpp index c3d33739a..e0e49b435 100644 --- a/src/net/Job.cpp +++ b/src/net/Job.cpp @@ -4,8 +4,9 @@ * Copyright 2014 Lucas Jones * Copyright 2014-2016 Wolf9466 * Copyright 2016 Jay D Dee - * Copyright 2016-2017 XMRig - * + * Copyright 2017-2018 XMR-Stak , + * Copyright 2018 Lee Clagett + * Copyright 2016-2018 XMRig , * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/net/Job.h b/src/net/Job.h index bf8f88356..d74b64edd 100644 --- a/src/net/Job.h +++ b/src/net/Job.h @@ -4,8 +4,9 @@ * Copyright 2014 Lucas Jones * Copyright 2014-2016 Wolf9466 * Copyright 2016 Jay D Dee - * Copyright 2016-2017 XMRig - * + * Copyright 2017-2018 XMR-Stak , + * Copyright 2018 Lee Clagett + * Copyright 2016-2018 XMRig , * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -54,6 +55,7 @@ public: inline uint32_t *nonce() { return reinterpret_cast(m_blob + 39); } inline uint32_t diff() const { return (uint32_t) m_diff; } inline uint64_t target() const { return m_target; } + inline uint8_t version() const { return m_blob[0]; } inline void setNicehash(bool nicehash) { m_nicehash = nicehash; } inline void setThreadId(int threadId) { m_threadId = threadId; } diff --git a/src/workers/DoubleWorker.cpp b/src/workers/DoubleWorker.cpp index 8c49649ce..aac503f12 100644 --- a/src/workers/DoubleWorker.cpp +++ b/src/workers/DoubleWorker.cpp @@ -4,8 +4,9 @@ * Copyright 2014 Lucas Jones * Copyright 2014-2016 Wolf9466 * Copyright 2016 Jay D Dee - * Copyright 2016-2017 XMRig - * + * Copyright 2017-2018 XMR-Stak , + * Copyright 2018 Lee Clagett + * Copyright 2016-2018 XMRig , * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -76,8 +77,6 @@ void DoubleWorker::start() consumeJob(); } - const uint8_t version = m_state->job.size() ? m_state->job.blob()[0] : 0; - while (!Workers::isOutdated(m_sequence)) { if ((m_count & 0xF) == 0) { storeStats(); @@ -87,7 +86,7 @@ void DoubleWorker::start() *Job::nonce(m_state->blob) = ++m_state->nonce1; *Job::nonce(m_state->blob + m_state->job.size()) = ++m_state->nonce2; - if (CryptoNight::hash(m_state->blob, m_state->job.size(), m_hash, m_ctx, version)) { + if (CryptoNight::hash(m_state->blob, m_state->job.size(), m_hash, m_ctx, m_state->job.version())) { if (*reinterpret_cast(m_hash + 24) < m_state->job.target()) { Workers::submit(JobResult(m_state->job.poolId(), m_state->job.id(), m_state->nonce1, m_hash, m_state->job.diff())); } diff --git a/src/workers/DoubleWorker.h b/src/workers/DoubleWorker.h index 711f4bd1c..9f29fa5b2 100644 --- a/src/workers/DoubleWorker.h +++ b/src/workers/DoubleWorker.h @@ -4,8 +4,9 @@ * Copyright 2014 Lucas Jones * Copyright 2014-2016 Wolf9466 * Copyright 2016 Jay D Dee - * Copyright 2016-2017 XMRig - * + * Copyright 2017-2018 XMR-Stak , + * Copyright 2018 Lee Clagett + * Copyright 2016-2018 XMRig , * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by diff --git a/src/workers/SingleWorker.cpp b/src/workers/SingleWorker.cpp index 3a2cc32c6..9f4a7484c 100644 --- a/src/workers/SingleWorker.cpp +++ b/src/workers/SingleWorker.cpp @@ -4,8 +4,9 @@ * Copyright 2014 Lucas Jones * Copyright 2014-2016 Wolf9466 * Copyright 2016 Jay D Dee - * Copyright 2016-2017 XMRig - * + * Copyright 2017-2018 XMR-Stak , + * Copyright 2018 Lee Clagett + * Copyright 2016-2018 XMRig , * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -52,8 +53,6 @@ void SingleWorker::start() consumeJob(); } - const uint8_t version = m_job.size() ? m_job.blob()[0] : 0; - while (!Workers::isOutdated(m_sequence)) { if ((m_count & 0xF) == 0) { storeStats(); @@ -62,7 +61,7 @@ void SingleWorker::start() m_count++; *m_job.nonce() = ++m_result.nonce; - if (CryptoNight::hash(m_job, m_result, m_ctx, version)) { + if (CryptoNight::hash(m_job, m_result, m_ctx)) { Workers::submit(m_result); } diff --git a/src/workers/SingleWorker.h b/src/workers/SingleWorker.h index 08ab1857e..f7d9cff88 100644 --- a/src/workers/SingleWorker.h +++ b/src/workers/SingleWorker.h @@ -4,8 +4,9 @@ * Copyright 2014 Lucas Jones * Copyright 2014-2016 Wolf9466 * Copyright 2016 Jay D Dee - * Copyright 2016-2017 XMRig - * + * Copyright 2017-2018 XMR-Stak , + * Copyright 2018 Lee Clagett + * Copyright 2016-2018 XMRig , * * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by