diff --git a/src/common/crypto/Algorithm.cpp b/src/common/crypto/Algorithm.cpp index 9d424c57..7bd01364 100644 --- a/src/common/crypto/Algorithm.cpp +++ b/src/common/crypto/Algorithm.cpp @@ -109,6 +109,8 @@ static AlgoData const xmrStakAlgorithms[] = { { "cryptonight_masari", nullptr, xmrig::CRYPTONIGHT, xmrig::VARIANT_MSR }, { "cryptonight-bittube2", nullptr, xmrig::CRYPTONIGHT_HEAVY, xmrig::VARIANT_TUBE }, // bittube-miner { "cryptonight_alloy", nullptr, xmrig::CRYPTONIGHT, xmrig::VARIANT_XAO }, // xmr-stak-alloy + { "cryptonight_turtle", nullptr, xmrig::CRYPTONIGHT_PICO, xmrig::VARIANT_TRTL }, + { "cryptonight_gpu", nullptr, xmrig::CRYPTONIGHT, xmrig::VARIANT_GPU }, }; #endif diff --git a/src/common/log/Log.h b/src/common/log/Log.h index 788ad263..aa03a743 100644 --- a/src/common/log/Log.h +++ b/src/common/log/Log.h @@ -77,6 +77,7 @@ private: #define CYAN(x) "\x1B[0;36m" x "\x1B[0m" #define WHITE_BOLD(x) "\x1B[1;37m" x "\x1B[0m" #define WHITE(x) "\x1B[0;37m" x "\x1B[0m" +#define GRAY(x) "\x1B[1;30m" x "\x1B[0m" #define LOG_ERR(x, ...) Log::i()->message(ILogBackend::ERR, x, ##__VA_ARGS__) diff --git a/src/common/xmrig.h b/src/common/xmrig.h index d738028f..09bba08b 100644 --- a/src/common/xmrig.h +++ b/src/common/xmrig.h @@ -36,7 +36,7 @@ enum Algo { CRYPTONIGHT_LITE, /* CryptoNight (1 MB) */ CRYPTONIGHT_HEAVY, /* CryptoNight (4 MB) */ CRYPTONIGHT_PICO, /* CryptoNight (256 KB) */ - CRYPTONIGHT_MAX + ALGO_MAX }; diff --git a/src/crypto/CryptoNight_test.h b/src/crypto/CryptoNight_test.h index aadddc2e..31a52dc5 100644 --- a/src/crypto/CryptoNight_test.h +++ b/src/crypto/CryptoNight_test.h @@ -27,6 +27,9 @@ #define XMRIG_CRYPTONIGHT_TEST_H +#include + + const static uint8_t test_input[380] = { 0x03, 0x05, 0xA0, 0xDB, 0xD6, 0xBF, 0x05, 0xCF, 0x16, 0xE5, 0x03, 0xF3, 0xA6, 0x6F, 0x78, 0x00, 0x7C, 0xBF, 0x34, 0x14, 0x43, 0x32, 0xEC, 0xBF, 0xC2, 0x2E, 0xD9, 0x5C, 0x87, 0x00, 0x38, 0x3B, diff --git a/src/workers/CpuThread.cpp b/src/workers/CpuThread.cpp index d709fc6e..e6026722 100644 --- a/src/workers/CpuThread.cpp +++ b/src/workers/CpuThread.cpp @@ -150,9 +150,9 @@ xmrig::CpuThread::cn_hash_fun xmrig::CpuThread::fn(Algo algorithm, AlgoVariant a assert(variant >= VARIANT_0 && variant < VARIANT_MAX); # ifndef XMRIG_NO_ASM - constexpr const size_t count = VARIANT_MAX * 10 * CRYPTONIGHT_MAX + 12; + constexpr const size_t count = VARIANT_MAX * 10 * ALGO_MAX + 12; # else - constexpr const size_t count = VARIANT_MAX * 10 * CRYPTONIGHT_MAX; + constexpr const size_t count = VARIANT_MAX * 10 * ALGO_MAX; # endif static const cn_hash_fun func_table[] = { @@ -617,7 +617,7 @@ size_t xmrig::CpuThread::fnIndex(Algo algorithm, AlgoVariant av, Variant variant return index; } - constexpr const size_t offset = VARIANT_MAX * 10 * CRYPTONIGHT_MAX; + constexpr const size_t offset = VARIANT_MAX * 10 * ALGO_MAX; size_t extra_offset = 0; if (algorithm == CRYPTONIGHT && (variant == VARIANT_2 || variant == VARIANT_HALF)) {