From 16a83a9f6179177d95aa8800e34c472fa13c283a Mon Sep 17 00:00:00 2001 From: XMRig Date: Mon, 9 Mar 2020 01:22:34 +0700 Subject: [PATCH] Move files. --- CMakeLists.txt | 7 ------- src/backend/common/Threads.cpp | 6 +++--- src/backend/common/Threads.h | 6 +++--- src/backend/cpu/CpuLaunchData.h | 2 +- src/backend/cpu/interfaces/ICpuInfo.h | 2 +- src/backend/cuda/CudaLaunchData.h | 2 +- src/backend/cuda/CudaThread.cpp | 4 ++-- src/backend/cuda/CudaThread.h | 5 ++--- src/backend/cuda/wrappers/CudaDevice.cpp | 6 +++--- src/backend/cuda/wrappers/CudaLib.h | 5 ++--- src/backend/opencl/OclCache.cpp | 8 ++++---- src/backend/opencl/OclCache.h | 4 ++-- src/backend/opencl/OclLaunchData.cpp | 4 ++-- src/backend/opencl/OclLaunchData.h | 6 +++--- src/backend/opencl/OclThread.cpp | 5 ++--- src/backend/opencl/OclThread.h | 5 ++--- src/backend/opencl/cl/OclSource.cpp | 7 +++---- src/backend/opencl/cl/OclSource.h | 4 ++-- .../opencl/generators/ocl_generic_cn_generator.cpp | 8 ++++---- .../opencl/generators/ocl_generic_cn_gpu_generator.cpp | 6 +++--- .../opencl/generators/ocl_generic_rx_generator.cpp | 2 +- src/backend/opencl/generators/ocl_vega_cn_generator.cpp | 4 ++-- src/backend/opencl/kernels/rx/RxRunKernel.cpp | 2 +- src/backend/opencl/runners/OclBaseRunner.cpp | 4 ++-- src/backend/opencl/runners/OclBaseRunner.h | 6 +++--- src/backend/opencl/runners/OclCnRunner.cpp | 7 +++---- src/backend/opencl/runners/OclCnRunner.h | 4 ++-- src/backend/opencl/runners/OclRyoRunner.cpp | 7 +++---- src/backend/opencl/runners/OclRyoRunner.h | 4 ++-- src/backend/opencl/wrappers/OclDevice.cpp | 2 -- src/base/api/Api.cpp | 6 +++--- src/base/base.cmake | 7 +++++++ src/{crypto/common => base/crypto}/Algorithm.cpp | 4 ++-- src/{crypto/common => base/crypto}/Algorithm.h | 0 src/{crypto/cn => base/crypto}/CnAlgo.h | 6 +++--- src/{crypto/common => base/crypto}/Coin.cpp | 2 +- src/{crypto/common => base/crypto}/Coin.h | 2 +- src/{crypto/common => base/crypto}/keccak.cpp | 6 +++--- src/{crypto/common => base/crypto}/keccak.h | 7 ++++--- src/base/kernel/config/BaseTransform.h | 2 +- src/base/kernel/interfaces/IConfig.h | 1 - src/base/kernel/interfaces/IConfigTransform.h | 5 ++--- src/base/net/stratum/Client.h | 1 - src/base/net/stratum/Job.h | 6 +++--- src/base/net/stratum/NetworkState.h | 2 +- src/base/net/stratum/Pool.h | 2 +- src/core/Miner.h | 2 +- src/crypto/argon2/Hash.h | 6 +++--- src/crypto/astrobwt/AstroBWT.h | 3 ++- src/crypto/astrobwt/sha3.cpp | 8 ++++---- src/crypto/cn/CnCtx.cpp | 6 +++--- src/crypto/cn/CnCtx.h | 8 ++++---- src/crypto/cn/CnHash.cpp | 4 ++-- src/crypto/cn/CnHash.h | 6 +++--- src/crypto/cn/CryptoNight_arm.h | 8 ++++---- src/crypto/cn/CryptoNight_x86.h | 8 ++++---- src/crypto/cn/gpu/cn_gpu_avx.cpp | 6 +++--- src/crypto/cn/gpu/cn_gpu_ssse3.cpp | 6 +++--- src/crypto/cn/r/variant4_random_math.h | 4 ++-- src/crypto/rx/RxAlgo.h | 6 +++--- src/crypto/rx/RxDataset.cpp | 4 ++-- src/crypto/rx/RxDataset.h | 6 +++--- src/net/strategies/DonateStrategy.cpp | 4 ++-- 63 files changed, 144 insertions(+), 154 deletions(-) rename src/{crypto/common => base/crypto}/Algorithm.cpp (99%) rename src/{crypto/common => base/crypto}/Algorithm.h (100%) rename src/{crypto/cn => base/crypto}/CnAlgo.h (98%) rename src/{crypto/common => base/crypto}/Coin.cpp (98%) rename src/{crypto/common => base/crypto}/Coin.h (98%) rename src/{crypto/common => base/crypto}/keccak.cpp (97%) rename src/{crypto/common => base/crypto}/keccak.h (91%) diff --git a/CMakeLists.txt b/CMakeLists.txt index 74c546d7..383a8e6e 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -67,7 +67,6 @@ set(HEADERS_CRYPTO src/crypto/cn/c_groestl.h src/crypto/cn/c_jh.h src/crypto/cn/c_skein.h - src/crypto/cn/CnAlgo.h src/crypto/cn/CnCtx.h src/crypto/cn/CnHash.h src/crypto/cn/CryptoNight_monero.h @@ -77,10 +76,7 @@ set(HEADERS_CRYPTO src/crypto/cn/hash.h src/crypto/cn/skein_port.h src/crypto/cn/soft_aes.h - src/crypto/common/Algorithm.h - src/crypto/common/Coin.h src/crypto/common/HugePagesInfo.h - src/crypto/common/keccak.h src/crypto/common/MemoryPool.h src/crypto/common/Nonce.h src/crypto/common/portable/mm_malloc.h @@ -116,10 +112,7 @@ set(SOURCES_CRYPTO src/crypto/cn/c_skein.c src/crypto/cn/CnCtx.cpp src/crypto/cn/CnHash.cpp - src/crypto/common/Algorithm.cpp - src/crypto/common/Coin.cpp src/crypto/common/HugePagesInfo.cpp - src/crypto/common/keccak.cpp src/crypto/common/MemoryPool.cpp src/crypto/common/Nonce.cpp src/crypto/common/VirtualMemory.cpp diff --git a/src/backend/common/Threads.cpp b/src/backend/common/Threads.cpp index f85e18f3..a72f8026 100644 --- a/src/backend/common/Threads.cpp +++ b/src/backend/common/Threads.cpp @@ -5,8 +5,8 @@ * Copyright 2014-2016 Wolf9466 * Copyright 2016 Jay D Dee * Copyright 2017-2018 XMR-Stak , - * 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,7 +25,7 @@ #include "backend/common/Threads.h" #include "backend/cpu/CpuThreads.h" -#include "crypto/cn/CnAlgo.h" +#include "base/crypto/CnAlgo.h" #include "rapidjson/document.h" diff --git a/src/backend/common/Threads.h b/src/backend/common/Threads.h index 59b04fc9..a21fe13b 100644 --- a/src/backend/common/Threads.h +++ b/src/backend/common/Threads.h @@ -5,8 +5,8 @@ * Copyright 2014-2016 Wolf9466 * Copyright 2016 Jay D Dee * Copyright 2017-2018 XMR-Stak , - * 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 @@ -30,8 +30,8 @@ #include +#include "base/crypto/Algorithm.h" #include "base/tools/String.h" -#include "crypto/common/Algorithm.h" #include "rapidjson/fwd.h" diff --git a/src/backend/cpu/CpuLaunchData.h b/src/backend/cpu/CpuLaunchData.h index 0ba8ad7f..1cadc6de 100644 --- a/src/backend/cpu/CpuLaunchData.h +++ b/src/backend/cpu/CpuLaunchData.h @@ -27,8 +27,8 @@ #define XMRIG_CPULAUNCHDATA_H +#include "base/crypto/Algorithm.h" #include "crypto/cn/CnHash.h" -#include "crypto/common/Algorithm.h" #include "crypto/common/Assembly.h" #include "crypto/common/Nonce.h" diff --git a/src/backend/cpu/interfaces/ICpuInfo.h b/src/backend/cpu/interfaces/ICpuInfo.h index 4aad6944..f5a35b2d 100644 --- a/src/backend/cpu/interfaces/ICpuInfo.h +++ b/src/backend/cpu/interfaces/ICpuInfo.h @@ -27,8 +27,8 @@ #include "backend/cpu/CpuThreads.h" +#include "base/crypto/Algorithm.h" #include "crypto/common/Assembly.h" -#include "crypto/common/Algorithm.h" namespace xmrig { diff --git a/src/backend/cuda/CudaLaunchData.h b/src/backend/cuda/CudaLaunchData.h index 33173ffb..8bf2dbeb 100644 --- a/src/backend/cuda/CudaLaunchData.h +++ b/src/backend/cuda/CudaLaunchData.h @@ -28,7 +28,7 @@ #include "backend/cuda/CudaThread.h" -#include "crypto/common/Algorithm.h" +#include "base/crypto/Algorithm.h" #include "crypto/common/Nonce.h" diff --git a/src/backend/cuda/CudaThread.cpp b/src/backend/cuda/CudaThread.cpp index d98989ab..eb65dc2c 100644 --- a/src/backend/cuda/CudaThread.cpp +++ b/src/backend/cuda/CudaThread.cpp @@ -5,8 +5,8 @@ * Copyright 2014-2016 Wolf9466 * Copyright 2016 Jay D Dee * Copyright 2017-2018 XMR-Stak , - * 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 diff --git a/src/backend/cuda/CudaThread.h b/src/backend/cuda/CudaThread.h index 8943ac22..3588e846 100644 --- a/src/backend/cuda/CudaThread.h +++ b/src/backend/cuda/CudaThread.h @@ -5,8 +5,8 @@ * Copyright 2014-2016 Wolf9466 * Copyright 2016 Jay D Dee * Copyright 2017-2018 XMR-Stak , - * 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 @@ -29,7 +29,6 @@ using nvid_ctx = struct nvid_ctx; -#include "crypto/common/Algorithm.h" #include "rapidjson/fwd.h" diff --git a/src/backend/cuda/wrappers/CudaDevice.cpp b/src/backend/cuda/wrappers/CudaDevice.cpp index 93234d53..daa16074 100644 --- a/src/backend/cuda/wrappers/CudaDevice.cpp +++ b/src/backend/cuda/wrappers/CudaDevice.cpp @@ -5,8 +5,8 @@ * Copyright 2014-2016 Wolf9466 * Copyright 2016 Jay D Dee * Copyright 2017-2018 XMR-Stak , - * 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 @@ -26,8 +26,8 @@ #include "backend/cuda/wrappers/CudaDevice.h" #include "backend/cuda/CudaThreads.h" #include "backend/cuda/wrappers/CudaLib.h" +#include "base/crypto/Algorithm.h" #include "base/io/log/Log.h" -#include "crypto/common/Algorithm.h" #include "rapidjson/document.h" #ifdef XMRIG_FEATURE_NVML diff --git a/src/backend/cuda/wrappers/CudaLib.h b/src/backend/cuda/wrappers/CudaLib.h index 99824f80..b48e720c 100644 --- a/src/backend/cuda/wrappers/CudaLib.h +++ b/src/backend/cuda/wrappers/CudaLib.h @@ -5,8 +5,8 @@ * Copyright 2014-2016 Wolf9466 * Copyright 2016 Jay D Dee * Copyright 2017-2018 XMR-Stak , - * 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 @@ -31,7 +31,6 @@ using nvid_ctx = struct nvid_ctx; #include "backend/cuda/wrappers/CudaDevice.h" #include "base/tools/String.h" -#include "crypto/common/Algorithm.h" #include diff --git a/src/backend/opencl/OclCache.cpp b/src/backend/opencl/OclCache.cpp index 7e5504c0..e93019c8 100644 --- a/src/backend/opencl/OclCache.cpp +++ b/src/backend/opencl/OclCache.cpp @@ -5,8 +5,8 @@ * Copyright 2014-2016 Wolf9466 * Copyright 2016 Jay D Dee * Copyright 2017-2018 XMR-Stak , - * 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 @@ -29,15 +29,15 @@ #include +#include "backend/opencl/OclCache.h" #include "3rdparty/base32/base32.h" #include "backend/common/Tags.h" #include "backend/opencl/interfaces/IOclRunner.h" -#include "backend/opencl/OclCache.h" #include "backend/opencl/OclLaunchData.h" #include "backend/opencl/wrappers/OclLib.h" +#include "base/crypto/keccak.h" #include "base/io/log/Log.h" #include "base/tools/Chrono.h" -#include "crypto/common/keccak.h" namespace xmrig { diff --git a/src/backend/opencl/OclCache.h b/src/backend/opencl/OclCache.h index e3eea5c3..5f17bfca 100644 --- a/src/backend/opencl/OclCache.h +++ b/src/backend/opencl/OclCache.h @@ -5,8 +5,8 @@ * Copyright 2014-2016 Wolf9466 * Copyright 2016 Jay D Dee * Copyright 2017-2018 XMR-Stak , - * 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 diff --git a/src/backend/opencl/OclLaunchData.cpp b/src/backend/opencl/OclLaunchData.cpp index 2af6d101..48c380f4 100644 --- a/src/backend/opencl/OclLaunchData.cpp +++ b/src/backend/opencl/OclLaunchData.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 diff --git a/src/backend/opencl/OclLaunchData.h b/src/backend/opencl/OclLaunchData.h index 644023be..73716b84 100644 --- a/src/backend/opencl/OclLaunchData.h +++ b/src/backend/opencl/OclLaunchData.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 @@ -31,7 +31,7 @@ #include "backend/opencl/runners/tools/OclSharedData.h" #include "backend/opencl/wrappers/OclDevice.h" #include "backend/opencl/wrappers/OclPlatform.h" -#include "crypto/common/Algorithm.h" +#include "base/crypto/Algorithm.h" #include "crypto/common/Nonce.h" diff --git a/src/backend/opencl/OclThread.cpp b/src/backend/opencl/OclThread.cpp index 8ca4574f..e94eb876 100644 --- a/src/backend/opencl/OclThread.cpp +++ b/src/backend/opencl/OclThread.cpp @@ -5,8 +5,8 @@ * Copyright 2014-2016 Wolf9466 * Copyright 2016 Jay D Dee * Copyright 2017-2018 XMR-Stak , - * 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 @@ -24,7 +24,6 @@ #include "backend/opencl/OclThread.h" - #include "base/io/json/Json.h" #include "rapidjson/document.h" diff --git a/src/backend/opencl/OclThread.h b/src/backend/opencl/OclThread.h index 1882abf7..4febb7a0 100644 --- a/src/backend/opencl/OclThread.h +++ b/src/backend/opencl/OclThread.h @@ -5,8 +5,8 @@ * Copyright 2014-2016 Wolf9466 * Copyright 2016 Jay D Dee * Copyright 2017-2018 XMR-Stak , - * 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 @@ -26,7 +26,6 @@ #define XMRIG_OCLTHREAD_H -#include "crypto/common/Algorithm.h" #include "rapidjson/fwd.h" diff --git a/src/backend/opencl/cl/OclSource.cpp b/src/backend/opencl/cl/OclSource.cpp index 5f569d49..b30e8a8f 100644 --- a/src/backend/opencl/cl/OclSource.cpp +++ b/src/backend/opencl/cl/OclSource.cpp @@ -5,8 +5,8 @@ * Copyright 2014-2016 Wolf9466 * Copyright 2016 Jay D Dee * Copyright 2017-2018 XMR-Stak , - * 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 @@ -24,9 +24,8 @@ #include "backend/opencl/cl/OclSource.h" - #include "backend/opencl/cl/cn/cryptonight_cl.h" -#include "crypto/common/Algorithm.h" +#include "base/crypto/Algorithm.h" #ifdef XMRIG_ALGO_CN_GPU diff --git a/src/backend/opencl/cl/OclSource.h b/src/backend/opencl/cl/OclSource.h index 40b70810..6f41d1eb 100644 --- a/src/backend/opencl/cl/OclSource.h +++ b/src/backend/opencl/cl/OclSource.h @@ -5,8 +5,8 @@ * Copyright 2014-2016 Wolf9466 * Copyright 2016 Jay D Dee * Copyright 2017-2018 XMR-Stak , - * 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 diff --git a/src/backend/opencl/generators/ocl_generic_cn_generator.cpp b/src/backend/opencl/generators/ocl_generic_cn_generator.cpp index 5fb91ebf..90e80e6f 100644 --- a/src/backend/opencl/generators/ocl_generic_cn_generator.cpp +++ b/src/backend/opencl/generators/ocl_generic_cn_generator.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 @@ -26,8 +26,8 @@ #include "backend/opencl/OclThreads.h" #include "backend/opencl/wrappers/OclDevice.h" -#include "crypto/cn/CnAlgo.h" -#include "crypto/common/Algorithm.h" +#include "base/crypto/Algorithm.h" +#include "base/crypto/CnAlgo.h" #include diff --git a/src/backend/opencl/generators/ocl_generic_cn_gpu_generator.cpp b/src/backend/opencl/generators/ocl_generic_cn_gpu_generator.cpp index 338a7a78..9a6a8952 100644 --- a/src/backend/opencl/generators/ocl_generic_cn_gpu_generator.cpp +++ b/src/backend/opencl/generators/ocl_generic_cn_gpu_generator.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 @@ -26,7 +26,7 @@ #include "backend/opencl/OclThreads.h" #include "backend/opencl/wrappers/OclDevice.h" -#include "crypto/common/Algorithm.h" +#include "base/crypto/Algorithm.h" #include diff --git a/src/backend/opencl/generators/ocl_generic_rx_generator.cpp b/src/backend/opencl/generators/ocl_generic_rx_generator.cpp index 27124ace..49a73f40 100644 --- a/src/backend/opencl/generators/ocl_generic_rx_generator.cpp +++ b/src/backend/opencl/generators/ocl_generic_rx_generator.cpp @@ -26,7 +26,7 @@ #include "backend/opencl/OclThreads.h" #include "backend/opencl/wrappers/OclDevice.h" -#include "crypto/common/Algorithm.h" +#include "base/crypto/Algorithm.h" #include "crypto/randomx/randomx.h" #include "crypto/rx/RxAlgo.h" diff --git a/src/backend/opencl/generators/ocl_vega_cn_generator.cpp b/src/backend/opencl/generators/ocl_vega_cn_generator.cpp index dbaba1c5..0e14dad9 100644 --- a/src/backend/opencl/generators/ocl_vega_cn_generator.cpp +++ b/src/backend/opencl/generators/ocl_vega_cn_generator.cpp @@ -26,8 +26,8 @@ #include "backend/opencl/OclThreads.h" #include "backend/opencl/wrappers/OclDevice.h" -#include "crypto/cn/CnAlgo.h" -#include "crypto/common/Algorithm.h" +#include "base/crypto/Algorithm.h" +#include "base/crypto/CnAlgo.h" #include diff --git a/src/backend/opencl/kernels/rx/RxRunKernel.cpp b/src/backend/opencl/kernels/rx/RxRunKernel.cpp index ff2a3299..a88068d7 100644 --- a/src/backend/opencl/kernels/rx/RxRunKernel.cpp +++ b/src/backend/opencl/kernels/rx/RxRunKernel.cpp @@ -25,7 +25,7 @@ #include "backend/opencl/kernels/rx/RxRunKernel.h" #include "backend/opencl/wrappers/OclLib.h" -#include "crypto/common/Algorithm.h" +#include "base/crypto/Algorithm.h" #include "crypto/randomx/randomx.h" #include "crypto/rx/RxAlgo.h" diff --git a/src/backend/opencl/runners/OclBaseRunner.cpp b/src/backend/opencl/runners/OclBaseRunner.cpp index 5c498dbd..9e2a48a9 100644 --- a/src/backend/opencl/runners/OclBaseRunner.cpp +++ b/src/backend/opencl/runners/OclBaseRunner.cpp @@ -5,8 +5,8 @@ * Copyright 2014-2016 Wolf9466 * Copyright 2016 Jay D Dee * Copyright 2017-2018 XMR-Stak , - * 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 diff --git a/src/backend/opencl/runners/OclBaseRunner.h b/src/backend/opencl/runners/OclBaseRunner.h index 6abbb2b7..68a20f25 100644 --- a/src/backend/opencl/runners/OclBaseRunner.h +++ b/src/backend/opencl/runners/OclBaseRunner.h @@ -5,8 +5,8 @@ * Copyright 2014-2016 Wolf9466 * Copyright 2016 Jay D Dee * Copyright 2017-2018 XMR-Stak , - * 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 @@ -31,7 +31,7 @@ #include "3rdparty/cl.h" #include "backend/opencl/interfaces/IOclRunner.h" -#include "crypto/common/Algorithm.h" +#include "base/crypto/Algorithm.h" namespace xmrig { diff --git a/src/backend/opencl/runners/OclCnRunner.cpp b/src/backend/opencl/runners/OclCnRunner.cpp index a1f4d5cb..67cc4027 100644 --- a/src/backend/opencl/runners/OclCnRunner.cpp +++ b/src/backend/opencl/runners/OclCnRunner.cpp @@ -5,8 +5,8 @@ * Copyright 2014-2016 Wolf9466 * Copyright 2016 Jay D Dee * Copyright 2017-2018 XMR-Stak , - * 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 @@ -24,7 +24,6 @@ #include "backend/opencl/runners/OclCnRunner.h" - #include "backend/opencl/kernels/Cn0Kernel.h" #include "backend/opencl/kernels/Cn1Kernel.h" #include "backend/opencl/kernels/Cn2Kernel.h" @@ -32,9 +31,9 @@ #include "backend/opencl/OclLaunchData.h" #include "backend/opencl/runners/tools/OclCnR.h" #include "backend/opencl/wrappers/OclLib.h" +#include "base/crypto/CnAlgo.h" #include "base/io/log/Log.h" #include "base/net/stratum/Job.h" -#include "crypto/cn/CnAlgo.h" xmrig::OclCnRunner::OclCnRunner(size_t index, const OclLaunchData &data) : OclBaseRunner(index, data) diff --git a/src/backend/opencl/runners/OclCnRunner.h b/src/backend/opencl/runners/OclCnRunner.h index bd20019f..bae581ce 100644 --- a/src/backend/opencl/runners/OclCnRunner.h +++ b/src/backend/opencl/runners/OclCnRunner.h @@ -5,8 +5,8 @@ * Copyright 2014-2016 Wolf9466 * Copyright 2016 Jay D Dee * Copyright 2017-2018 XMR-Stak , - * 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 diff --git a/src/backend/opencl/runners/OclRyoRunner.cpp b/src/backend/opencl/runners/OclRyoRunner.cpp index 0907903e..8d494a26 100644 --- a/src/backend/opencl/runners/OclRyoRunner.cpp +++ b/src/backend/opencl/runners/OclRyoRunner.cpp @@ -5,8 +5,8 @@ * Copyright 2014-2016 Wolf9466 * Copyright 2016 Jay D Dee * Copyright 2017-2018 XMR-Stak , - * 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 @@ -24,7 +24,6 @@ #include "backend/opencl/runners/OclRyoRunner.h" - #include "backend/opencl/kernels/Cn00RyoKernel.h" #include "backend/opencl/kernels/Cn0Kernel.h" #include "backend/opencl/kernels/Cn1RyoKernel.h" @@ -32,9 +31,9 @@ #include "backend/opencl/kernels/CnBranchKernel.h" #include "backend/opencl/OclLaunchData.h" #include "backend/opencl/wrappers/OclLib.h" +#include "base/crypto/CnAlgo.h" #include "base/io/log/Log.h" #include "base/net/stratum/Job.h" -#include "crypto/cn/CnAlgo.h" xmrig::OclRyoRunner::OclRyoRunner(size_t index, const OclLaunchData &data) : OclBaseRunner(index, data) diff --git a/src/backend/opencl/runners/OclRyoRunner.h b/src/backend/opencl/runners/OclRyoRunner.h index fd9f41c3..4cf6245f 100644 --- a/src/backend/opencl/runners/OclRyoRunner.h +++ b/src/backend/opencl/runners/OclRyoRunner.h @@ -5,8 +5,8 @@ * Copyright 2014-2016 Wolf9466 * Copyright 2016 Jay D Dee * Copyright 2017-2018 XMR-Stak , - * 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 diff --git a/src/backend/opencl/wrappers/OclDevice.cpp b/src/backend/opencl/wrappers/OclDevice.cpp index 766e70e5..bd51d0f3 100644 --- a/src/backend/opencl/wrappers/OclDevice.cpp +++ b/src/backend/opencl/wrappers/OclDevice.cpp @@ -28,8 +28,6 @@ #include "backend/opencl/OclThreads.h" #include "backend/opencl/wrappers/OclLib.h" #include "base/io/log/Log.h" -#include "crypto/cn/CnAlgo.h" -#include "crypto/common/Algorithm.h" #include "rapidjson/document.h" #ifdef XMRIG_FEATURE_ADL diff --git a/src/base/api/Api.cpp b/src/base/api/Api.cpp index dfd78565..535875fb 100644 --- a/src/base/api/Api.cpp +++ b/src/base/api/Api.cpp @@ -5,8 +5,8 @@ * Copyright 2014-2016 Wolf9466 * Copyright 2016 Jay D Dee * Copyright 2017-2018 XMR-Stak , - * 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 @@ -30,6 +30,7 @@ #include "3rdparty/http-parser/http_parser.h" #include "base/api/interfaces/IApiListener.h" #include "base/api/requests/HttpApiRequest.h" +#include "base/crypto/keccak.h" #include "base/io/json/Json.h" #include "base/kernel/Base.h" #include "base/kernel/Env.h" @@ -37,7 +38,6 @@ #include "base/tools/Chrono.h" #include "core/config/Config.h" #include "core/Controller.h" -#include "crypto/common/keccak.h" #include "version.h" diff --git a/src/base/base.cmake b/src/base/base.cmake index 871b045d..f2a14381 100644 --- a/src/base/base.cmake +++ b/src/base/base.cmake @@ -1,5 +1,9 @@ set(HEADERS_BASE src/base/api/interfaces/IApiListener.h + src/base/crypto/Algorithm.h + src/base/crypto/CnAlgo.h + src/base/crypto/Coin.h + src/base/crypto/keccak.h src/base/io/Console.h src/base/io/json/Json.h src/base/io/json/JsonChain.h @@ -61,6 +65,9 @@ set(HEADERS_BASE ) set(SOURCES_BASE + src/base/crypto/Algorithm.cpp + src/base/crypto/Coin.cpp + src/base/crypto/keccak.cpp src/base/io/Console.cpp src/base/io/json/Json.cpp src/base/io/json/JsonChain.cpp diff --git a/src/crypto/common/Algorithm.cpp b/src/base/crypto/Algorithm.cpp similarity index 99% rename from src/crypto/common/Algorithm.cpp rename to src/base/crypto/Algorithm.cpp index ef438ab9..52971966 100644 --- a/src/crypto/common/Algorithm.cpp +++ b/src/base/crypto/Algorithm.cpp @@ -24,8 +24,8 @@ */ -#include "crypto/common/Algorithm.h" -#include "crypto/cn/CnAlgo.h" +#include "base/crypto/Algorithm.h" +#include "base/crypto/CnAlgo.h" #include "rapidjson/document.h" diff --git a/src/crypto/common/Algorithm.h b/src/base/crypto/Algorithm.h similarity index 100% rename from src/crypto/common/Algorithm.h rename to src/base/crypto/Algorithm.h diff --git a/src/crypto/cn/CnAlgo.h b/src/base/crypto/CnAlgo.h similarity index 98% rename from src/crypto/cn/CnAlgo.h rename to src/base/crypto/CnAlgo.h index 0b115c34..15561806 100644 --- a/src/crypto/cn/CnAlgo.h +++ b/src/base/crypto/CnAlgo.h @@ -6,8 +6,8 @@ * Copyright 2016 Jay D Dee * Copyright 2017-2019 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 @@ -31,7 +31,7 @@ #include -#include "crypto/common/Algorithm.h" +#include "base/crypto/Algorithm.h" namespace xmrig diff --git a/src/crypto/common/Coin.cpp b/src/base/crypto/Coin.cpp similarity index 98% rename from src/crypto/common/Coin.cpp rename to src/base/crypto/Coin.cpp index b17b340e..8b32e4fc 100644 --- a/src/crypto/common/Coin.cpp +++ b/src/base/crypto/Coin.cpp @@ -24,7 +24,7 @@ */ -#include "crypto/common/Coin.h" +#include "base/crypto/Coin.h" #include "rapidjson/document.h" diff --git a/src/crypto/common/Coin.h b/src/base/crypto/Coin.h similarity index 98% rename from src/crypto/common/Coin.h rename to src/base/crypto/Coin.h index 9e57a8e9..3197c46d 100644 --- a/src/crypto/common/Coin.h +++ b/src/base/crypto/Coin.h @@ -27,7 +27,7 @@ #define XMRIG_COIN_H -#include "crypto/common/Algorithm.h" +#include "base/crypto/Algorithm.h" #include "rapidjson/fwd.h" diff --git a/src/crypto/common/keccak.cpp b/src/base/crypto/keccak.cpp similarity index 97% rename from src/crypto/common/keccak.cpp rename to src/base/crypto/keccak.cpp index 132ae0a8..f7940dfb 100644 --- a/src/crypto/common/keccak.cpp +++ b/src/base/crypto/keccak.cpp @@ -6,7 +6,8 @@ * Copyright 2014-2016 Wolf9466 * Copyright 2016 Jay D Dee * Copyright 2017-2018 XMR-Stak , - * Copyright 2016-2018 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 @@ -23,11 +24,10 @@ */ -#include #include -#include "crypto/common/keccak.h" +#include "base/crypto/keccak.h" #define HASH_DATA_AREA 136 diff --git a/src/crypto/common/keccak.h b/src/base/crypto/keccak.h similarity index 91% rename from src/crypto/common/keccak.h rename to src/base/crypto/keccak.h index 6121044a..2b039c90 100644 --- a/src/crypto/common/keccak.h +++ b/src/base/crypto/keccak.h @@ -6,7 +6,8 @@ * Copyright 2014-2016 Wolf9466 * Copyright 2016 Jay D Dee * Copyright 2017-2018 XMR-Stak , - * Copyright 2016-2018 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 @@ -26,8 +27,8 @@ #ifndef XMRIG_KECCAK_H #define XMRIG_KECCAK_H -#include -#include +#include +#include namespace xmrig { diff --git a/src/base/kernel/config/BaseTransform.h b/src/base/kernel/config/BaseTransform.h index 16ad843f..9550328a 100644 --- a/src/base/kernel/config/BaseTransform.h +++ b/src/base/kernel/config/BaseTransform.h @@ -26,8 +26,8 @@ #define XMRIG_BASETRANSFORM_H +#include "base/crypto/Coin.h" #include "base/kernel/interfaces/IConfigTransform.h" -#include "crypto/common/Coin.h" #include "rapidjson/document.h" diff --git a/src/base/kernel/interfaces/IConfig.h b/src/base/kernel/interfaces/IConfig.h index af1c3d16..93025fc9 100644 --- a/src/base/kernel/interfaces/IConfig.h +++ b/src/base/kernel/interfaces/IConfig.h @@ -26,7 +26,6 @@ #define XMRIG_ICONFIG_H -#include "crypto/common/Algorithm.h" #include "rapidjson/fwd.h" diff --git a/src/base/kernel/interfaces/IConfigTransform.h b/src/base/kernel/interfaces/IConfigTransform.h index 8afe8221..571d3e5a 100644 --- a/src/base/kernel/interfaces/IConfigTransform.h +++ b/src/base/kernel/interfaces/IConfigTransform.h @@ -5,8 +5,8 @@ * Copyright 2014-2016 Wolf9466 * Copyright 2016 Jay D Dee * Copyright 2017-2018 XMR-Stak , - * 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 @@ -26,7 +26,6 @@ #define XMRIG_ICONFIGTRANSFORM_H -#include "crypto/common/Algorithm.h" #include "rapidjson/fwd.h" diff --git a/src/base/net/stratum/Client.h b/src/base/net/stratum/Client.h index e26eaa7b..ead8039c 100644 --- a/src/base/net/stratum/Client.h +++ b/src/base/net/stratum/Client.h @@ -42,7 +42,6 @@ #include "base/net/tools/RecvBuf.h" #include "base/net/tools/Storage.h" #include "base/tools/Object.h" -#include "crypto/common/Algorithm.h" using BIO = struct bio_st; diff --git a/src/base/net/stratum/Job.h b/src/base/net/stratum/Job.h index ed369a16..a4ecd3e1 100644 --- a/src/base/net/stratum/Job.h +++ b/src/base/net/stratum/Job.h @@ -6,9 +6,9 @@ * Copyright 2016 Jay D Dee * Copyright 2017-2018 XMR-Stak , * Copyright 2018 Lee Clagett - * Copyright 2018-2019 SChernykh * Copyright 2019 Howard Chu - * 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 @@ -32,9 +32,9 @@ #include +#include "base/crypto/Algorithm.h" #include "base/tools/Buffer.h" #include "base/tools/String.h" -#include "crypto/common/Algorithm.h" namespace xmrig { diff --git a/src/base/net/stratum/NetworkState.h b/src/base/net/stratum/NetworkState.h index 479b184c..fef3ad44 100644 --- a/src/base/net/stratum/NetworkState.h +++ b/src/base/net/stratum/NetworkState.h @@ -26,9 +26,9 @@ #define XMRIG_NETWORKSTATE_H +#include "base/crypto/Algorithm.h" #include "base/net/stratum/strategies/StrategyProxy.h" #include "base/tools/String.h" -#include "crypto/common/Algorithm.h" #include diff --git a/src/base/net/stratum/Pool.h b/src/base/net/stratum/Pool.h index 35238771..02855200 100644 --- a/src/base/net/stratum/Pool.h +++ b/src/base/net/stratum/Pool.h @@ -31,8 +31,8 @@ #include +#include "base/crypto/Coin.h" #include "base/net/stratum/ProxyUrl.h" -#include "crypto/common/Coin.h" #include "rapidjson/fwd.h" diff --git a/src/core/Miner.h b/src/core/Miner.h index 96ac6a16..b529d969 100644 --- a/src/core/Miner.h +++ b/src/core/Miner.h @@ -31,10 +31,10 @@ #include "backend/common/interfaces/IRxListener.h" #include "base/api/interfaces/IApiListener.h" +#include "base/crypto/Algorithm.h" #include "base/kernel/interfaces/IBaseListener.h" #include "base/kernel/interfaces/ITimerListener.h" #include "base/tools/Object.h" -#include "crypto/common/Algorithm.h" namespace xmrig { diff --git a/src/crypto/argon2/Hash.h b/src/crypto/argon2/Hash.h index b337f193..194bcb58 100644 --- a/src/crypto/argon2/Hash.h +++ b/src/crypto/argon2/Hash.h @@ -5,8 +5,8 @@ * Copyright 2014-2016 Wolf9466 * Copyright 2016 Jay D Dee * Copyright 2017-2018 XMR-Stak , - * 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,8 +27,8 @@ #include "3rdparty/argon2.h" +#include "base/crypto/Algorithm.h" #include "crypto/cn/CryptoNight.h" -#include "crypto/common/Algorithm.h" namespace xmrig { namespace argon2 { diff --git a/src/crypto/astrobwt/AstroBWT.h b/src/crypto/astrobwt/AstroBWT.h index 7a373470..1419641e 100644 --- a/src/crypto/astrobwt/AstroBWT.h +++ b/src/crypto/astrobwt/AstroBWT.h @@ -27,7 +27,8 @@ */ -#include "crypto/common/Algorithm.h" +#include "base/crypto/Algorithm.h" + struct cryptonight_ctx; diff --git a/src/crypto/astrobwt/sha3.cpp b/src/crypto/astrobwt/sha3.cpp index bc7a8ddd..db1b0554 100644 --- a/src/crypto/astrobwt/sha3.cpp +++ b/src/crypto/astrobwt/sha3.cpp @@ -16,12 +16,12 @@ * Aug 2015. Andrey Jivsov. crypto@brainhub.org * ---------------------------------------------------------------------- */ -#include -#include -#include +#include +#include +#include #include "sha3.h" -#include "crypto/common/keccak.h" +#include "base/crypto/keccak.h" #define SHA3_ASSERT( x ) #if defined(_MSC_VER) diff --git a/src/crypto/cn/CnCtx.cpp b/src/crypto/cn/CnCtx.cpp index 5d41bca0..ee151fb3 100644 --- a/src/crypto/cn/CnCtx.cpp +++ b/src/crypto/cn/CnCtx.cpp @@ -6,8 +6,8 @@ * Copyright 2016 Jay D Dee * Copyright 2017-2019 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,8 +27,8 @@ #include "crypto/cn/CnCtx.h" +#include "base/crypto/Algorithm.h" #include "crypto/cn/CryptoNight.h" -#include "crypto/common/Algorithm.h" #include "crypto/common/portable/mm_malloc.h" #include "crypto/common/VirtualMemory.h" diff --git a/src/crypto/cn/CnCtx.h b/src/crypto/cn/CnCtx.h index 7b0adbec..7939bf4e 100644 --- a/src/crypto/cn/CnCtx.h +++ b/src/crypto/cn/CnCtx.h @@ -6,8 +6,8 @@ * Copyright 2016 Jay D Dee * Copyright 2017-2019 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,8 +27,8 @@ #define XMRIG_CN_CTX_H -#include -#include +#include +#include struct cryptonight_ctx; diff --git a/src/crypto/cn/CnHash.cpp b/src/crypto/cn/CnHash.cpp index 309dbe3e..846fb626 100644 --- a/src/crypto/cn/CnHash.cpp +++ b/src/crypto/cn/CnHash.cpp @@ -6,8 +6,8 @@ * Copyright 2016 Jay D Dee * Copyright 2017-2019 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 diff --git a/src/crypto/cn/CnHash.h b/src/crypto/cn/CnHash.h index 92f4df94..f0b5a711 100644 --- a/src/crypto/cn/CnHash.h +++ b/src/crypto/cn/CnHash.h @@ -6,8 +6,8 @@ * Copyright 2016 Jay D Dee * Copyright 2017-2019 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 @@ -31,7 +31,7 @@ #include -#include "crypto/cn/CnAlgo.h" +#include "base/crypto/CnAlgo.h" #include "crypto/common/Assembly.h" diff --git a/src/crypto/cn/CryptoNight_arm.h b/src/crypto/cn/CryptoNight_arm.h index 02266634..f8ddbd54 100644 --- a/src/crypto/cn/CryptoNight_arm.h +++ b/src/crypto/cn/CryptoNight_arm.h @@ -7,8 +7,8 @@ * Copyright 2016 Imran Yusuff * Copyright 2017-2019 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 @@ -28,11 +28,11 @@ #define XMRIG_CRYPTONIGHT_ARM_H -#include "crypto/cn/CnAlgo.h" +#include "base/crypto/CnAlgo.h" +#include "base/crypto/keccak.h" #include "crypto/cn/CryptoNight_monero.h" #include "crypto/cn/CryptoNight.h" #include "crypto/cn/soft_aes.h" -#include "crypto/common/keccak.h" #include "crypto/common/portable/mm_malloc.h" diff --git a/src/crypto/cn/CryptoNight_x86.h b/src/crypto/cn/CryptoNight_x86.h index b63c3292..d71af013 100644 --- a/src/crypto/cn/CryptoNight_x86.h +++ b/src/crypto/cn/CryptoNight_x86.h @@ -6,8 +6,8 @@ * Copyright 2016 Jay D Dee * Copyright 2017-2019 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 @@ -36,11 +36,11 @@ #include "backend/cpu/Cpu.h" -#include "crypto/cn/CnAlgo.h" +#include "base/crypto/CnAlgo.h" +#include "base/crypto/keccak.h" #include "crypto/cn/CryptoNight_monero.h" #include "crypto/cn/CryptoNight.h" #include "crypto/cn/soft_aes.h" -#include "crypto/common/keccak.h" extern "C" diff --git a/src/crypto/cn/gpu/cn_gpu_avx.cpp b/src/crypto/cn/gpu/cn_gpu_avx.cpp index 38da9714..d3dc7b81 100644 --- a/src/crypto/cn/gpu/cn_gpu_avx.cpp +++ b/src/crypto/cn/gpu/cn_gpu_avx.cpp @@ -5,8 +5,8 @@ * Copyright 2014-2016 Wolf9466 * Copyright 2016 Jay D Dee * Copyright 2017-2019 XMR-Stak , - * 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 @@ -23,7 +23,7 @@ */ -#include "crypto/cn/CnAlgo.h" +#include "base/crypto/CnAlgo.h" #ifdef __GNUC__ diff --git a/src/crypto/cn/gpu/cn_gpu_ssse3.cpp b/src/crypto/cn/gpu/cn_gpu_ssse3.cpp index 7cca096e..7e0ef5b7 100644 --- a/src/crypto/cn/gpu/cn_gpu_ssse3.cpp +++ b/src/crypto/cn/gpu/cn_gpu_ssse3.cpp @@ -5,8 +5,8 @@ * Copyright 2014-2016 Wolf9466 * Copyright 2016 Jay D Dee * Copyright 2017-2019 XMR-Stak , - * 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 @@ -23,7 +23,7 @@ */ -#include "crypto/cn/CnAlgo.h" +#include "base/crypto/CnAlgo.h" #ifdef __GNUC__ diff --git a/src/crypto/cn/r/variant4_random_math.h b/src/crypto/cn/r/variant4_random_math.h index 73290061..f8dfb274 100644 --- a/src/crypto/cn/r/variant4_random_math.h +++ b/src/crypto/cn/r/variant4_random_math.h @@ -2,10 +2,10 @@ #define VARIANT4_RANDOM_MATH_H -#include +#include -#include "crypto/common/Algorithm.h" +#include "base/crypto/Algorithm.h" extern "C" diff --git a/src/crypto/rx/RxAlgo.h b/src/crypto/rx/RxAlgo.h index a939c27f..81c4687c 100644 --- a/src/crypto/rx/RxAlgo.h +++ b/src/crypto/rx/RxAlgo.h @@ -7,8 +7,8 @@ * Copyright 2017-2019 XMR-Stak , * Copyright 2018 Lee Clagett * Copyright 2018-2019 tevador - * 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 @@ -32,7 +32,7 @@ #include -#include "crypto/common/Algorithm.h" +#include "base/crypto/Algorithm.h" struct RandomX_ConfigurationBase; diff --git a/src/crypto/rx/RxDataset.cpp b/src/crypto/rx/RxDataset.cpp index ba1721af..e0e9fccf 100644 --- a/src/crypto/rx/RxDataset.cpp +++ b/src/crypto/rx/RxDataset.cpp @@ -7,8 +7,8 @@ * Copyright 2017-2019 XMR-Stak , * Copyright 2018 Lee Clagett * Copyright 2018-2019 tevador - * 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 diff --git a/src/crypto/rx/RxDataset.h b/src/crypto/rx/RxDataset.h index e46a93c6..34840fc4 100644 --- a/src/crypto/rx/RxDataset.h +++ b/src/crypto/rx/RxDataset.h @@ -7,8 +7,8 @@ * Copyright 2017-2019 XMR-Stak , * Copyright 2018 Lee Clagett * Copyright 2018-2019 tevador - * 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 @@ -28,8 +28,8 @@ #define XMRIG_RX_DATASET_H +#include "base/crypto/Algorithm.h" #include "base/tools/Object.h" -#include "crypto/common/Algorithm.h" #include "crypto/common/HugePagesInfo.h" #include "crypto/randomx/configuration.h" #include "crypto/randomx/randomx.h" diff --git a/src/net/strategies/DonateStrategy.cpp b/src/net/strategies/DonateStrategy.cpp index 4559334b..ace9cfa3 100644 --- a/src/net/strategies/DonateStrategy.cpp +++ b/src/net/strategies/DonateStrategy.cpp @@ -28,6 +28,8 @@ #include +#include "net/strategies/DonateStrategy.h" +#include "base/crypto/keccak.h" #include "base/kernel/Platform.h" #include "base/net/stratum/Client.h" #include "base/net/stratum/Job.h" @@ -38,9 +40,7 @@ #include "core/config/Config.h" #include "core/Controller.h" #include "core/Miner.h" -#include "crypto/common/keccak.h" #include "net/Network.h" -#include "net/strategies/DonateStrategy.h" #include "rapidjson/document.h"