From 9580f5395f8e5b108f726e04583d7dd8f8d36ec4 Mon Sep 17 00:00:00 2001 From: XMRig Date: Wed, 11 Aug 2021 22:26:34 +0700 Subject: [PATCH] Removed shortName. --- src/backend/common/Threads.cpp | 6 +++--- src/backend/common/Threads.h | 2 +- src/backend/cpu/platform/HwlocCpuInfo.cpp | 2 +- src/backend/cuda/wrappers/CudaLib.cpp | 15 ++++----------- src/backend/cuda/wrappers/CudaLib.h | 10 ++-------- src/base/crypto/Algorithm.h | 1 - src/base/net/stratum/Client.cpp | 16 +++++----------- src/base/net/stratum/Client.h | 12 +++--------- src/base/net/stratum/EthStratumClient.cpp | 6 +++--- src/base/net/stratum/EthStratumClient.h | 4 ++-- src/base/net/stratum/NetworkState.cpp | 13 +++---------- src/base/net/stratum/NetworkState.h | 10 ++-------- src/base/net/stratum/Pool.cpp | 7 +++---- src/base/net/stratum/Pool.h | 4 ++-- src/base/net/stratum/benchmark/BenchClient.cpp | 2 +- src/core/Miner.cpp | 2 +- src/crypto/rx/RxQueue.cpp | 17 +++++------------ src/crypto/rx/RxQueue.h | 14 ++++---------- src/donate.h | 11 ++--------- src/net/Network.cpp | 16 +++++----------- src/net/Network.h | 12 +++--------- src/net/strategies/DonateStrategy.cpp | 13 +++---------- src/net/strategies/DonateStrategy.h | 10 ++-------- 23 files changed, 60 insertions(+), 145 deletions(-) diff --git a/src/backend/common/Threads.cpp b/src/backend/common/Threads.cpp index e898978a3..00af22451 100644 --- a/src/backend/common/Threads.cpp +++ b/src/backend/common/Threads.cpp @@ -104,7 +104,7 @@ xmrig::String xmrig::Threads::profileName(const Algorithm &algorithm, bool st return String(); } - const String name = algorithm.shortName(); + const String name = algorithm.name(); if (has(name)) { return name; } @@ -147,11 +147,11 @@ void xmrig::Threads::toJSON(rapidjson::Value &out, rapidjson::Document &doc) } for (const Algorithm &algo : m_disabled) { - out.AddMember(StringRef(algo.shortName()), false, allocator); + out.AddMember(StringRef(algo.name()), false, allocator); } for (const auto &kv : m_aliases) { - out.AddMember(StringRef(kv.first.shortName()), kv.second.toJSON(), allocator); + out.AddMember(StringRef(kv.first.name()), kv.second.toJSON(), allocator); } } diff --git a/src/backend/common/Threads.h b/src/backend/common/Threads.h index 9ae830394..1d129b190 100644 --- a/src/backend/common/Threads.h +++ b/src/backend/common/Threads.h @@ -40,7 +40,7 @@ public: inline bool has(const char *profile) const { return m_profiles.count(profile) > 0; } inline bool isDisabled(const Algorithm &algo) const { return m_disabled.count(algo) > 0; } inline bool isEmpty() const { return m_profiles.empty(); } - inline bool isExist(const Algorithm &algo) const { return isDisabled(algo) || m_aliases.count(algo) > 0 || has(algo.shortName()); } + inline bool isExist(const Algorithm &algo) const { return isDisabled(algo) || m_aliases.count(algo) > 0 || has(algo.name()); } inline const T &get(const Algorithm &algo, bool strict = false) const { return get(profileName(algo, strict)); } inline void disable(const Algorithm &algo) { m_disabled.insert(algo); } inline void setAlias(const Algorithm &algo, const char *profile) { m_aliases[algo] = profile; } diff --git a/src/backend/cpu/platform/HwlocCpuInfo.cpp b/src/backend/cpu/platform/HwlocCpuInfo.cpp index cb35349d9..004f182f1 100644 --- a/src/backend/cpu/platform/HwlocCpuInfo.cpp +++ b/src/backend/cpu/platform/HwlocCpuInfo.cpp @@ -258,7 +258,7 @@ xmrig::CpuThreads xmrig::HwlocCpuInfo::threads(const Algorithm &algorithm, uint3 } if (threads.isEmpty()) { - LOG_WARN("hwloc auto configuration for algorithm \"%s\" failed.", algorithm.shortName()); + LOG_WARN("hwloc auto configuration for algorithm \"%s\" failed.", algorithm.name()); return BasicCpuInfo::threads(algorithm, limit); } diff --git a/src/backend/cuda/wrappers/CudaLib.cpp b/src/backend/cuda/wrappers/CudaLib.cpp index cf628c29e..6e947bce5 100644 --- a/src/backend/cuda/wrappers/CudaLib.cpp +++ b/src/backend/cuda/wrappers/CudaLib.cpp @@ -1,12 +1,6 @@ /* XMRig - * Copyright 2010 Jeff Garzik - * Copyright 2012-2014 pooler - * Copyright 2014 Lucas Jones - * Copyright 2014-2016 Wolf9466 - * Copyright 2016 Jay D Dee - * Copyright 2017-2018 XMR-Stak , - * Copyright 2018-2020 SChernykh - * Copyright 2016-2020 XMRig , + * Copyright (c) 2018-2021 SChernykh + * Copyright (c) 2016-2021 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 @@ -22,7 +16,6 @@ * along with this program. If not, see . */ - #include #include @@ -199,7 +192,7 @@ bool xmrig::CudaLib::deviceInfo(nvid_ctx *ctx, int32_t blocks, int32_t threads, { const Algorithm algo = RxAlgo::id(algorithm); - return pDeviceInfo_v2(ctx, blocks, threads, algo.isValid() ? algo.shortName() : nullptr, dataset_host); + return pDeviceInfo_v2(ctx, blocks, threads, algo.isValid() ? algo.name() : nullptr, dataset_host); } @@ -243,7 +236,7 @@ bool xmrig::CudaLib::setJob(nvid_ctx *ctx, const void *data, size_t size, const { const Algorithm algo = RxAlgo::id(algorithm); - return pSetJob_v2(ctx, data, size, algo.shortName()); + return pSetJob_v2(ctx, data, size, algo.name()); } diff --git a/src/backend/cuda/wrappers/CudaLib.h b/src/backend/cuda/wrappers/CudaLib.h index d7b776d23..70b90dbfd 100644 --- a/src/backend/cuda/wrappers/CudaLib.h +++ b/src/backend/cuda/wrappers/CudaLib.h @@ -1,12 +1,6 @@ /* XMRig - * Copyright 2010 Jeff Garzik - * Copyright 2012-2014 pooler - * Copyright 2014 Lucas Jones - * Copyright 2014-2016 Wolf9466 - * Copyright 2016 Jay D Dee - * Copyright 2017-2018 XMR-Stak , - * Copyright 2018-2020 SChernykh - * Copyright 2016-2020 XMRig , + * Copyright (c) 2018-2021 SChernykh + * Copyright (c) 2016-2021 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/base/crypto/Algorithm.h b/src/base/crypto/Algorithm.h index 64e311ab6..8b03e0701 100644 --- a/src/base/crypto/Algorithm.h +++ b/src/base/crypto/Algorithm.h @@ -169,7 +169,6 @@ public: inline bool isCN() const { return isCN(m_id); } inline bool isEqual(const Algorithm &other) const { return m_id == other.m_id; } inline bool isValid() const { return m_id != INVALID && family() > UNKNOWN; } - inline const char *shortName() const { return name(); } inline Id base() const { return base(m_id); } inline Id id() const { return m_id; } inline size_t l2() const { return l2(m_id); } diff --git a/src/base/net/stratum/Client.cpp b/src/base/net/stratum/Client.cpp index 95e1d8d05..46c9ac2ff 100644 --- a/src/base/net/stratum/Client.cpp +++ b/src/base/net/stratum/Client.cpp @@ -1,13 +1,7 @@ /* XMRig - * Copyright 2010 Jeff Garzik - * Copyright 2012-2014 pooler - * Copyright 2014 Lucas Jones - * Copyright 2014-2016 Wolf9466 - * Copyright 2016 Jay D Dee - * Copyright 2017-2018 XMR-Stak , - * Copyright 2019 jtgrassie - * Copyright 2018-2021 SChernykh - * Copyright 2016-2021 XMRig , + * Copyright (c) 2019 jtgrassie + * Copyright (c) 2018-2021 SChernykh + * Copyright (c) 2016-2021 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 @@ -232,7 +226,7 @@ int64_t xmrig::Client::submit(const JobResult &result) # endif if (has() && result.algorithm.isValid()) { - params.AddMember("algo", StringRef(result.algorithm.shortName()), allocator); + params.AddMember("algo", StringRef(result.algorithm.name()), allocator); } JsonRequest::create(doc, m_sequence, "submit", params); @@ -515,7 +509,7 @@ bool xmrig::Client::verifyAlgorithm(const Algorithm &algorithm, const char *algo m_listener->onVerifyAlgorithm(this, algorithm, &ok); if (!ok && !isQuiet()) { - LOG_ERR("%s " RED("incompatible/disabled algorithm ") RED_BOLD("\"%s\" ") RED("detected, reconnect"), tag(), algorithm.shortName()); + LOG_ERR("%s " RED("incompatible/disabled algorithm ") RED_BOLD("\"%s\" ") RED("detected, reconnect"), tag(), algorithm.name()); } return ok; diff --git a/src/base/net/stratum/Client.h b/src/base/net/stratum/Client.h index d9164b8a3..a74be296d 100644 --- a/src/base/net/stratum/Client.h +++ b/src/base/net/stratum/Client.h @@ -1,13 +1,7 @@ /* XMRig - * Copyright 2010 Jeff Garzik - * Copyright 2012-2014 pooler - * Copyright 2014 Lucas Jones - * Copyright 2014-2016 Wolf9466 - * Copyright 2016 Jay D Dee - * Copyright 2017-2018 XMR-Stak , - * Copyright 2019 jtgrassie - * Copyright 2018-2021 SChernykh - * Copyright 2016-2021 XMRig , + * Copyright (c) 2019 jtgrassie + * Copyright (c) 2018-2021 SChernykh + * Copyright (c) 2016-2021 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/base/net/stratum/EthStratumClient.cpp b/src/base/net/stratum/EthStratumClient.cpp index 5e7edfd4d..40c57f299 100644 --- a/src/base/net/stratum/EthStratumClient.cpp +++ b/src/base/net/stratum/EthStratumClient.cpp @@ -1,6 +1,6 @@ /* XMRig - * Copyright 2018-2020 SChernykh - * Copyright 2016-2020 XMRig , + * Copyright (c) 2018-2021 SChernykh + * Copyright (c) 2016-2021 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 @@ -213,7 +213,7 @@ void xmrig::EthStratumClient::parseNotification(const char *method, const rapidj if (!ok) { if (!isQuiet()) { - LOG_ERR("[%s] incompatible/disabled algorithm \"%s\" detected, reconnect", url(), algo.shortName()); + LOG_ERR("[%s] incompatible/disabled algorithm \"%s\" detected, reconnect", url(), algo.name()); } close(); return; diff --git a/src/base/net/stratum/EthStratumClient.h b/src/base/net/stratum/EthStratumClient.h index c09f3ae83..d6b34fb84 100644 --- a/src/base/net/stratum/EthStratumClient.h +++ b/src/base/net/stratum/EthStratumClient.h @@ -1,6 +1,6 @@ /* XMRig - * Copyright 2018-2020 SChernykh - * Copyright 2016-2020 XMRig , + * Copyright (c) 2018-2021 SChernykh + * Copyright (c) 2016-2021 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/base/net/stratum/NetworkState.cpp b/src/base/net/stratum/NetworkState.cpp index 8d80fffaa..40516a7f3 100644 --- a/src/base/net/stratum/NetworkState.cpp +++ b/src/base/net/stratum/NetworkState.cpp @@ -1,12 +1,6 @@ /* XMRig - * Copyright 2010 Jeff Garzik - * Copyright 2012-2014 pooler - * Copyright 2014 Lucas Jones - * Copyright 2014-2016 Wolf9466 - * Copyright 2016 Jay D Dee - * Copyright 2017-2018 XMR-Stak , - * Copyright 2018-2020 SChernykh - * Copyright 2016-2020 XMRig , + * Copyright (c) 2018-2021 SChernykh + * Copyright (c) 2016-2021 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 @@ -22,7 +16,6 @@ * along with this program. If not, see . */ - #include "base/net/stratum/NetworkState.h" #include "3rdparty/rapidjson/document.h" #include "base/io/log/Log.h" @@ -196,7 +189,7 @@ void xmrig::NetworkState::printConnection() const Log::print(GREEN_BOLD(" * ") WHITE_BOLD("%-17s") CYAN_BOLD("%s ") BLACK_BOLD("(%s) ") GREEN_BOLD("%s"), "pool address", m_pool, m_ip.data(), m_tls.isNull() ? "" : m_tls.data()); - Log::print(GREEN_BOLD(" * ") WHITE_BOLD("%-17s") WHITE_BOLD("%s"), "algorithm", m_algorithm.shortName()); + Log::print(GREEN_BOLD(" * ") WHITE_BOLD("%-17s") WHITE_BOLD("%s"), "algorithm", m_algorithm.name()); printDiff(m_diff); printLatency(latency()); Log::print(GREEN_BOLD(" * ") WHITE_BOLD("%-17s") CYAN_BOLD("%" PRIu64 "s"), "connection time", connectionTime() / 1000); diff --git a/src/base/net/stratum/NetworkState.h b/src/base/net/stratum/NetworkState.h index 8fa1fede5..d47a3511f 100644 --- a/src/base/net/stratum/NetworkState.h +++ b/src/base/net/stratum/NetworkState.h @@ -1,12 +1,6 @@ /* XMRig - * Copyright 2010 Jeff Garzik - * Copyright 2012-2014 pooler - * Copyright 2014 Lucas Jones - * Copyright 2014-2016 Wolf9466 - * Copyright 2016 Jay D Dee - * Copyright 2017-2018 XMR-Stak , - * Copyright 2018-2020 SChernykh - * Copyright 2016-2020 XMRig , + * Copyright (c) 2018-2021 SChernykh + * Copyright (c) 2016-2021 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/base/net/stratum/Pool.cpp b/src/base/net/stratum/Pool.cpp index 427a7e8fc..f11c5e2d3 100644 --- a/src/base/net/stratum/Pool.cpp +++ b/src/base/net/stratum/Pool.cpp @@ -1,7 +1,7 @@ /* XMRig * Copyright (c) 2019 Howard Chu - * Copyright (c) 2018-2020 SChernykh - * Copyright (c) 2016-2020 XMRig , + * Copyright (c) 2018-2021 SChernykh + * Copyright (c) 2016-2021 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 @@ -17,7 +17,6 @@ * along with this program. If not, see . */ - #include #include #include @@ -322,7 +321,7 @@ std::string xmrig::Pool::printableName() const out += std::string(" coin ") + WHITE_BOLD_S + m_coin.name() + CLEAR; } else { - out += std::string(" algo ") + WHITE_BOLD_S + (m_algorithm.isValid() ? m_algorithm.shortName() : "auto") + CLEAR; + out += std::string(" algo ") + WHITE_BOLD_S + (m_algorithm.isValid() ? m_algorithm.name() : "auto") + CLEAR; } if (m_mode == MODE_SELF_SELECT) { diff --git a/src/base/net/stratum/Pool.h b/src/base/net/stratum/Pool.h index 4eb00ec01..865d3db56 100644 --- a/src/base/net/stratum/Pool.h +++ b/src/base/net/stratum/Pool.h @@ -1,7 +1,7 @@ /* XMRig * Copyright (c) 2019 Howard Chu - * Copyright (c) 2018-2020 SChernykh - * Copyright (c) 2016-2020 XMRig , + * Copyright (c) 2018-2021 SChernykh + * Copyright (c) 2016-2021 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/base/net/stratum/benchmark/BenchClient.cpp b/src/base/net/stratum/benchmark/BenchClient.cpp index c66058505..05a2c8551 100644 --- a/src/base/net/stratum/benchmark/BenchClient.cpp +++ b/src/base/net/stratum/benchmark/BenchClient.cpp @@ -263,7 +263,7 @@ void xmrig::BenchClient::start() tag(), size < 1000000 ? size / 1000 : size / 1000000, size < 1000000 ? "K" : "M", - m_job.algorithm().shortName()); + m_job.algorithm().name()); m_listener->onLoginSuccess(this); m_listener->onJobReceived(this, m_job, rapidjson::Value()); diff --git a/src/core/Miner.cpp b/src/core/Miner.cpp index de9f49e0a..81b426eb4 100644 --- a/src/core/Miner.cpp +++ b/src/core/Miner.cpp @@ -156,7 +156,7 @@ public: Value algo(kArrayType); for (const Algorithm &a : algorithms) { - algo.PushBack(StringRef(a.shortName()), allocator); + algo.PushBack(StringRef(a.name()), allocator); } reply.AddMember("algorithms", algo, allocator); diff --git a/src/crypto/rx/RxQueue.cpp b/src/crypto/rx/RxQueue.cpp index 0c55434d9..86b633275 100644 --- a/src/crypto/rx/RxQueue.cpp +++ b/src/crypto/rx/RxQueue.cpp @@ -1,14 +1,8 @@ /* XMRig - * Copyright 2010 Jeff Garzik - * Copyright 2012-2014 pooler - * Copyright 2014 Lucas Jones - * Copyright 2014-2016 Wolf9466 - * Copyright 2016 Jay D Dee - * Copyright 2017-2019 XMR-Stak , - * Copyright 2018 Lee Clagett - * Copyright 2018-2019 tevador - * Copyright 2018-2020 SChernykh - * Copyright 2016-2020 XMRig , + * Copyright (c) 2018 Lee Clagett + * Copyright (c) 2018-2019 tevador + * Copyright (c) 2018-2021 SChernykh + * Copyright (c) 2016-2021 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 @@ -24,7 +18,6 @@ * along with this program. If not, see . */ - #include "crypto/rx/RxQueue.h" #include "backend/common/interfaces/IRxListener.h" #include "base/io/Async.h" @@ -148,7 +141,7 @@ void xmrig::RxQueue::backgroundInit() LOG_INFO("%s" MAGENTA_BOLD("init dataset%s") " algo " WHITE_BOLD("%s (") CYAN_BOLD("%u") WHITE_BOLD(" threads)") BLACK_BOLD(" seed %s..."), Tags::randomx(), item.nodeset.size() > 1 ? "s" : "", - item.seed.algorithm().shortName(), + item.seed.algorithm().name(), item.threads, Cvt::toHex(item.seed.data().data(), 8).data() ); diff --git a/src/crypto/rx/RxQueue.h b/src/crypto/rx/RxQueue.h index 7b462cf4e..7583ce7b9 100644 --- a/src/crypto/rx/RxQueue.h +++ b/src/crypto/rx/RxQueue.h @@ -1,14 +1,8 @@ /* XMRig - * Copyright 2010 Jeff Garzik - * Copyright 2012-2014 pooler - * Copyright 2014 Lucas Jones - * Copyright 2014-2016 Wolf9466 - * Copyright 2016 Jay D Dee - * Copyright 2017-2019 XMR-Stak , - * Copyright 2018 Lee Clagett - * Copyright 2018-2019 tevador - * Copyright 2018-2020 SChernykh - * Copyright 2016-2020 XMRig , + * Copyright (c) 2018 Lee Clagett + * Copyright (c) 2018-2019 tevador + * Copyright (c) 2018-2021 SChernykh + * Copyright (c) 2016-2021 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/donate.h b/src/donate.h index 1d29161c5..5db3badc6 100644 --- a/src/donate.h +++ b/src/donate.h @@ -1,12 +1,6 @@ /* XMRig - * Copyright 2010 Jeff Garzik - * Copyright 2012-2014 pooler - * Copyright 2014 Lucas Jones - * Copyright 2014-2016 Wolf9466 - * Copyright 2016 Jay D Dee - * Copyright 2017-2018 XMR-Stak , - * Copyright 2018-2020 SChernykh - * Copyright 2016-2020 XMRig , + * Copyright (c) 2018-2021 SChernykh + * Copyright (c) 2016-2021 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 @@ -42,7 +36,6 @@ * * If you plan on changing this setting to 0 please consider making a one off donation to my wallet: * XMR: 48edfHu7V9Z84YzzMa6fUueoELZ9ZRXq9VetWzYGzKt52XU5xvqgzYnDK9URnRoJMk1j8nLwEVsaSWJ4fhdUyZijBGUicoD - * BTC: 1P7ujsXeX7GxQwHNnJsRMgAdNkFZmNVqJT */ constexpr const int kDefaultDonateLevel = 1; constexpr const int kMinimumDonateLevel = 1; diff --git a/src/net/Network.cpp b/src/net/Network.cpp index d1acb4ce4..3bf5d76b9 100644 --- a/src/net/Network.cpp +++ b/src/net/Network.cpp @@ -1,13 +1,7 @@ /* XMRig - * Copyright 2010 Jeff Garzik - * Copyright 2012-2014 pooler - * Copyright 2014 Lucas Jones - * Copyright 2014-2016 Wolf9466 - * Copyright 2016 Jay D Dee - * Copyright 2017-2018 XMR-Stak , - * Copyright 2019 Howard Chu - * Copyright 2018-2020 SChernykh - * Copyright 2016-2020 XMRig , + * Copyright (c) 2019 Howard Chu + * Copyright (c) 2018-2021 SChernykh + * Copyright (c) 2016-2021 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 @@ -207,7 +201,7 @@ void xmrig::Network::onLogin(IStrategy *, IClient *client, rapidjson::Document & Value algo(kArrayType); for (const auto &a : algorithms) { - algo.PushBack(StringRef(a.shortName()), allocator); + algo.PushBack(StringRef(a.name()), allocator); } params.AddMember("algo", algo, allocator); @@ -289,7 +283,7 @@ void xmrig::Network::setJob(IClient *client, const Job &job, bool donate) } LOG_INFO("%s " MAGENTA_BOLD("new job") " from " WHITE_BOLD("%s:%d%s") " diff " WHITE_BOLD("%" PRIu64 "%s") " algo " WHITE_BOLD("%s") " height " WHITE_BOLD("%" PRIu64) "%s", - Tags::network(), client->pool().host().data(), client->pool().port(), zmq_buf, diff, scale, job.algorithm().shortName(), job.height(), tx_buf); + Tags::network(), client->pool().host().data(), client->pool().port(), zmq_buf, diff, scale, job.algorithm().name(), job.height(), tx_buf); } if (!donate && m_donate) { diff --git a/src/net/Network.h b/src/net/Network.h index 94d546572..907e61103 100644 --- a/src/net/Network.h +++ b/src/net/Network.h @@ -1,13 +1,7 @@ /* XMRig - * Copyright 2010 Jeff Garzik - * Copyright 2012-2014 pooler - * Copyright 2014 Lucas Jones - * Copyright 2014-2016 Wolf9466 - * Copyright 2016 Jay D Dee - * Copyright 2017-2018 XMR-Stak , - * Copyright 2019 Howard Chu - * Copyright 2018-2020 SChernykh - * Copyright 2016-2020 XMRig , + * Copyright (c) 2019 Howard Chu + * Copyright (c) 2018-2021 SChernykh + * Copyright (c) 2016-2021 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/strategies/DonateStrategy.cpp b/src/net/strategies/DonateStrategy.cpp index b288046e4..be9aad6a8 100644 --- a/src/net/strategies/DonateStrategy.cpp +++ b/src/net/strategies/DonateStrategy.cpp @@ -1,12 +1,6 @@ /* XMRig - * Copyright 2010 Jeff Garzik - * Copyright 2012-2014 pooler - * Copyright 2014 Lucas Jones - * Copyright 2014-2016 Wolf9466 - * Copyright 2016 Jay D Dee - * Copyright 2017-2018 XMR-Stak , - * Copyright 2018-2020 SChernykh - * Copyright 2016-2020 XMRig , + * Copyright (c) 2018-2021 SChernykh + * Copyright (c) 2016-2021 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 @@ -22,7 +16,6 @@ * along with this program. If not, see . */ - #include #include #include @@ -291,7 +284,7 @@ void xmrig::DonateStrategy::setAlgorithms(rapidjson::Document &doc, rapidjson::V Value algo(kArrayType); for (const auto &a : algorithms) { - algo.PushBack(StringRef(a.shortName()), allocator); + algo.PushBack(StringRef(a.name()), allocator); } params.AddMember("algo", algo, allocator); diff --git a/src/net/strategies/DonateStrategy.h b/src/net/strategies/DonateStrategy.h index c5f901641..fd3038bad 100644 --- a/src/net/strategies/DonateStrategy.h +++ b/src/net/strategies/DonateStrategy.h @@ -1,12 +1,6 @@ /* XMRig - * Copyright 2010 Jeff Garzik - * Copyright 2012-2014 pooler - * Copyright 2014 Lucas Jones - * Copyright 2014-2016 Wolf9466 - * Copyright 2016 Jay D Dee - * Copyright 2017-2018 XMR-Stak , - * Copyright 2018-2020 SChernykh - * Copyright 2016-2020 XMRig , + * Copyright (c) 2018-2021 SChernykh + * Copyright (c) 2016-2021 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