From cdd9ea24969e36369f6e0dbb9b0b6e8a90d22ed1 Mon Sep 17 00:00:00 2001 From: XMRig Date: Sun, 1 Mar 2020 10:21:29 +0700 Subject: [PATCH] Make "astrobwt" as primary user visible algorithm name. --- src/crypto/cn/CryptoNight_test.h | 8 ++++---- src/crypto/common/Algorithm.cpp | 7 +++---- src/crypto/common/Algorithm.h | 6 +++--- 3 files changed, 10 insertions(+), 11 deletions(-) diff --git a/src/crypto/cn/CryptoNight_test.h b/src/crypto/cn/CryptoNight_test.h index 3e055b981..c51e644ee 100644 --- a/src/crypto/cn/CryptoNight_test.h +++ b/src/crypto/cn/CryptoNight_test.h @@ -6,8 +6,8 @@ * Copyright 2016 Jay D Dee * Copyright 2017-2018 XMR-Stak , * Copyright 2018 Lee Clagett - * Copyright 2018-2019 SChernykh - * Copyright 2016-2019 XMRig , + * Copyright 2018-2020 SChernykh + * Copyright 2016-2020 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 @@ -27,7 +27,7 @@ #define XMRIG_CRYPTONIGHT_TEST_H -#include +#include namespace xmrig { @@ -405,7 +405,7 @@ const static uint8_t argon2_wrkz_test_out[160] = { #ifdef XMRIG_ALGO_ASTROBWT -// "astrobwt/dero" +// "astrobwt" const static uint8_t astrobwt_dero_test_out[160] = { 0x7E, 0x88, 0x44, 0xF2, 0xD6, 0xB7, 0xA4, 0x34, 0x98, 0xFE, 0x6D, 0x22, 0x65, 0x27, 0x68, 0x90, 0x23, 0xDA, 0x8A, 0x52, 0xF9, 0xFC, 0x4E, 0xC6, 0x9E, 0x5A, 0xAA, 0xA6, 0x3E, 0xDC, 0xE1, 0xC1, diff --git a/src/crypto/common/Algorithm.cpp b/src/crypto/common/Algorithm.cpp index 5eaf7905e..0b3904f5d 100644 --- a/src/crypto/common/Algorithm.cpp +++ b/src/crypto/common/Algorithm.cpp @@ -6,8 +6,8 @@ * Copyright 2016 Jay D Dee * Copyright 2017-2018 XMR-Stak , * Copyright 2018 Lee Clagett - * Copyright 2018-2019 SChernykh - * Copyright 2016-2019 XMRig , + * Copyright 2018-2020 SChernykh + * Copyright 2016-2020 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 @@ -25,8 +25,6 @@ #include "crypto/common/Algorithm.h" - - #include "crypto/cn/CnAlgo.h" #include "rapidjson/document.h" @@ -125,6 +123,7 @@ static AlgoName const algorithm_names[] = { { "argon2/wrkz", nullptr, Algorithm::AR2_WRKZ }, # endif # ifdef XMRIG_ALGO_ASTROBWT + { "astrobwt", nullptr, Algorithm::ASTROBWT_DERO }, { "astrobwt/dero", nullptr, Algorithm::ASTROBWT_DERO }, # endif }; diff --git a/src/crypto/common/Algorithm.h b/src/crypto/common/Algorithm.h index 5973a343f..fa821f23c 100644 --- a/src/crypto/common/Algorithm.h +++ b/src/crypto/common/Algorithm.h @@ -6,8 +6,8 @@ * Copyright 2016 Jay D Dee * Copyright 2017-2018 XMR-Stak , * Copyright 2018 Lee Clagett - * Copyright 2018-2019 SChernykh - * Copyright 2016-2019 XMRig , + * Copyright 2018-2020 SChernykh + * Copyright 2016-2020 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 @@ -71,7 +71,7 @@ public: RX_SFX, // "rx/sfx" RandomSFX (Safex Cash). AR2_CHUKWA, // "argon2/chukwa" Argon2id (Chukwa). AR2_WRKZ, // "argon2/wrkz" Argon2id (WRKZ) - ASTROBWT_DERO, // "astrobwt/dero" AstroBWT (Dero) + ASTROBWT_DERO, // "astrobwt" AstroBWT (Dero) MAX };