From 5159b4fbb781e573dcccceb3d2de431c488e4ba3 Mon Sep 17 00:00:00 2001 From: taherkaraki Date: Wed, 24 Feb 2021 13:42:04 +0200 Subject: [PATCH] fix merge with 6.9.0 --- CHANGELOG.md | 6 ++-- CMakeLists.txt | 24 ++++++------- README.md | 2 +- doc/CPU.md | 2 +- doc/build/CMAKE_OPTIONS.md | 2 +- src/base/io/log/Tags.cpp | 16 ++------- src/base/io/log/Tags.h | 8 +---- src/base/kernel/Platform.cpp | 8 +---- src/base/kernel/Platform.h | 8 +---- src/base/kernel/Platform_mac.cpp | 6 ++-- src/base/kernel/Platform_unix.cpp | 6 ++-- src/base/kernel/Platform_win.cpp | 10 ++---- src/base/kernel/config/BaseConfig.cpp | 4 +-- src/base/kernel/config/BaseConfig.h | 4 +-- src/base/kernel/config/BaseTransform.cpp | 20 ++--------- src/base/kernel/config/BaseTransform.h | 14 +------- src/base/kernel/interfaces/IConfig.h | 14 +------- src/base/net/stratum/Pool.cpp | 15 +------- src/base/net/stratum/Pool.h | 15 +------- src/base/net/stratum/SelfSelectClient.cpp | 37 ++++--------------- src/base/net/stratum/SelfSelectClient.h | 15 +------- src/config.json | 28 +++++++-------- src/core/config/Config.cpp | 44 ++++------------------- src/core/config/Config.h | 20 ++--------- src/core/config/ConfigTransform.cpp | 20 ++--------- src/core/config/ConfigTransform.h | 14 +------- src/core/config/Config_default.h | 32 ++++++++--------- src/core/config/Config_platform.h | 20 ++--------- src/core/config/usage.h | 14 +------- src/version.h | 2 +- src/xmlcore.cpp | 4 +++ 31 files changed, 99 insertions(+), 335 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index d8a470ec..33177812 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,7 +1,7 @@ # v6.9.0 -- [#2104](https://github.com/xmrig/xmrig/pull/2104) Added [pause-on-active](https://xmrig.com/docs/miner/config/misc#pause-on-active) config option and `--pause-on-active=N` command line option. -- [#2112](https://github.com/xmrig/xmrig/pull/2112) Added support for [Tari merge mining](https://github.com/tari-project/tari/blob/development/README.md#tari-merge-mining). -- [#2117](https://github.com/xmrig/xmrig/pull/2117) Fixed crash when GPU mining `cn-heavy` on Zen3 system. +- [#2104](https://github.com/xmlcore/xmlcore/pull/2104) Added [pause-on-active](https://xmlcore.com/docs/miner/config/misc#pause-on-active) config option and `--pause-on-active=N` command line option. +- [#2112](https://github.com/xmlcore/xmlcore/pull/2112) Added support for [Tari merge mining](https://github.com/tari-project/tari/blob/development/README.md#tari-merge-mining). +- [#2117](https://github.com/xmlcore/xmlcore/pull/2117) Fixed crash when GPU mining `cn-heavy` on Zen3 system. # v6.8.2 - [#2080](https://github.com/xmlcore/xmlcore/pull/2080) Fixed compile error in Termux. diff --git a/CMakeLists.txt b/CMakeLists.txt index ad7d8d36..76ff6c2b 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -3,25 +3,25 @@ SET(CMAKE_CONFIGURATION_TYPES ${CMAKE_BUILD_TYPE} CACHE STRING "Release" FORCE) project(xmlcore) option(WITH_HWLOC "Enable hwloc support" ON) -# option(WITH_CN_LITE "Enable CryptoNight-Lite algorithms family" ON) -# option(WITH_CN_HEAVY "Enable CryptoNight-Heavy algorithms family" ON) -# option(WITH_CN_PICO "Enable CryptoNight-Pico algorithm" ON) +option(WITH_CN_LITE "Enable CryptoNight-Lite algorithms family" ON) +option(WITH_CN_HEAVY "Enable CryptoNight-Heavy algorithms family" ON) +option(WITH_CN_PICO "Enable CryptoNight-Pico algorithm" ON) option(WITH_RANDOMX "Enable RandomX algorithms family" ON) -# option(WITH_ARGON2 "Enable Argon2 algorithms family" ON) -# option(WITH_ASTROBWT "Enable AstroBWT algorithms family" ON) -# option(WITH_KAWPOW "Enable KawPow algorithms family" ON) +option(WITH_ARGON2 "Enable Argon2 algorithms family" ON) +option(WITH_ASTROBWT "Enable AstroBWT algorithms family" ON) +option(WITH_KAWPOW "Enable KawPow algorithms family" ON) option(WITH_HTTP "Enable HTTP protocol support (client/server)" ON) option(WITH_DEBUG_LOG "Enable debug log output" OFF) option(WITH_TLS "Enable OpenSSL support" ON) option(WITH_ASM "Enable ASM PoW implementations" ON) option(WITH_MSR "Enable MSR mod & 1st-gen Ryzen fix" ON) option(WITH_ENV_VARS "Enable environment variables support in config file" ON) -option(WITH_EMBEDDED_CONFIG "Enable internal embedded JSON config" OFF) -# option(WITH_OPENCL "Enable OpenCL backend" ON) -# option(WITH_CUDA "Enable CUDA backend" ON) -# option(WITH_NVML "Enable NVML (NVIDIA Management Library) support (only if CUDA backend enabled)" ON) -# option(WITH_ADL "Enable ADL (AMD Display Library) or sysfs support (only if OpenCL backend enabled)" ON) -# option(WITH_STRICT_CACHE "Enable strict checks for OpenCL cache" ON) +option(WITH_EMBEDDED_CONFIG "Enable internal embedded JSON config" ON) +option(WITH_OPENCL "Enable OpenCL backend" OFF) +option(WITH_CUDA "Enable CUDA backend" OFF) +option(WITH_NVML "Enable NVML (NVIDIA Management Library) support (only if CUDA backend enabled)" ON) +option(WITH_ADL "Enable ADL (AMD Display Library) or sysfs support (only if OpenCL backend enabled)" ON) +option(WITH_STRICT_CACHE "Enable strict checks for OpenCL cache" ON) option(WITH_INTERLEAVE_DEBUG_LOG "Enable debug log for threads interleave" OFF) option(WITH_PROFILING "Enable profiling for developers" OFF) option(WITH_SSE4_1 "Enable SSE 4.1 for Blake2" ON) diff --git a/README.md b/README.md index 51b605be..65f10c8c 100644 --- a/README.md +++ b/README.md @@ -19,7 +19,7 @@ xmlcore is a high performance, open source, cross platform RandomX, KawPow, Cryp * **[Build from source](https://xmlcore.com/docs/miner/build)** ## Usage -The preferred way to configure the miner is the [JSON config file](https://xmrig.com/docs/miner/config) as it is more flexible and human friendly. The [command line interface](https://xmrig.com/docs/miner/command-line-options) does not cover all features, such as mining profiles for different algorithms. Important options can be changed during runtime without miner restart by editing the config file or executing [API](https://xmrig.com/docs/miner/api) calls. +The preferred way to configure the miner is the [JSON config file](https://xmlcore.com/docs/miner/config) as it is more flexible and human friendly. The [command line interface](https://xmlcore.com/docs/miner/command-line-options) does not cover all features, such as mining profiles for different algorithms. Important options can be changed during runtime without miner restart by editing the config file or executing [API](https://xmlcore.com/docs/miner/api) calls. * **[Wizard](https://xmlcore.com/wizard)** helps you create initial configuration for the miner. * **[Workers](http://workers.xmlcore.info)** helps manage your miners via HTTP API. diff --git a/doc/CPU.md b/doc/CPU.md index 065f72f3..16ed613a 100644 --- a/doc/CPU.md +++ b/doc/CPU.md @@ -1,4 +1,4 @@ -**:warning: Recent version of this page https://xmrig.com/docs/miner/config/cpu.** +**:warning: Recent version of this page https://xmlcore.com/docs/miner/config/cpu.** # CPU backend diff --git a/doc/build/CMAKE_OPTIONS.md b/doc/build/CMAKE_OPTIONS.md index 88e423be..3c4e5da7 100644 --- a/doc/build/CMAKE_OPTIONS.md +++ b/doc/build/CMAKE_OPTIONS.md @@ -28,7 +28,7 @@ This feature add external dependency to libhwloc (1.10.0+) (except MSVC builds). * **`-DWITH_DEBUG_LOG=ON`** enable debug log (mostly network requests). * **`-DHWLOC_DEBUG=ON`** enable some debug log for hwloc. -* **`-DCMAKE_BUILD_TYPE=Debug`** enable debug build, only useful for investigate crashes, this option slow down miner. +* **`-DCMAKE_BUILD_TYPE=Release`** enable debug build, only useful for investigate crashes, this option slow down miner. ## Special build options diff --git a/src/base/io/log/Tags.cpp b/src/base/io/log/Tags.cpp index 49a0d6ab..b3aca699 100644 --- a/src/base/io/log/Tags.cpp +++ b/src/base/io/log/Tags.cpp @@ -1,12 +1,6 @@ -<<<<<<< HEAD /* xmlcore - * Copyright 2018-2020 SChernykh - * Copyright 2016-2020 xmlcore , -======= -/* XMRig * Copyright (c) 2018-2021 SChernykh - * Copyright (c) 2016-2021 XMRig , ->>>>>>> 072881e1a1214befdd46f5823f4ba7afeb14136a + * Copyright (c) 2016-2021 xmlcore , * * 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 @@ -43,10 +37,7 @@ const char *xmlcore::Tags::network() } -<<<<<<< HEAD -const char *xmlcore::Tags::signal() -======= -const char* xmrig::Tags::origin() +const char* xmlcore::Tags::origin() { static const char* tag = YELLOW_BG_BOLD(WHITE_BOLD_S " origin "); @@ -54,8 +45,7 @@ const char* xmrig::Tags::origin() } -const char *xmrig::Tags::signal() ->>>>>>> 072881e1a1214befdd46f5823f4ba7afeb14136a +const char *xmlcore::Tags::signal() { static const char *tag = YELLOW_BG_BOLD(WHITE_BOLD_S " signal "); diff --git a/src/base/io/log/Tags.h b/src/base/io/log/Tags.h index 11183ef0..89dad308 100644 --- a/src/base/io/log/Tags.h +++ b/src/base/io/log/Tags.h @@ -1,12 +1,6 @@ -<<<<<<< HEAD /* xmlcore - * Copyright 2018-2020 SChernykh - * Copyright 2016-2020 xmlcore , -======= -/* XMRig * Copyright (c) 2018-2021 SChernykh - * Copyright (c) 2016-2021 XMRig , ->>>>>>> 072881e1a1214befdd46f5823f4ba7afeb14136a + * Copyright (c) 2016-2021 xmlcore , * * 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/kernel/Platform.cpp b/src/base/kernel/Platform.cpp index e4df93f2..b4d207f5 100644 --- a/src/base/kernel/Platform.cpp +++ b/src/base/kernel/Platform.cpp @@ -1,12 +1,6 @@ -<<<<<<< HEAD /* xmlcore - * Copyright (c) 2018-2020 SChernykh - * Copyright (c) 2016-2020 xmlcore , -======= -/* XMRig * Copyright (c) 2018-2021 SChernykh - * Copyright (c) 2016-2021 XMRig , ->>>>>>> 072881e1a1214befdd46f5823f4ba7afeb14136a + * Copyright (c) 2016-2021 xmlcore , * * 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/kernel/Platform.h b/src/base/kernel/Platform.h index 88dfafa3..b2dbee05 100644 --- a/src/base/kernel/Platform.h +++ b/src/base/kernel/Platform.h @@ -1,12 +1,6 @@ -<<<<<<< HEAD /* xmlcore - * Copyright (c) 2018-2020 SChernykh - * Copyright (c) 2016-2020 xmlcore , -======= -/* XMRig * Copyright (c) 2018-2021 SChernykh - * Copyright (c) 2016-2021 XMRig , ->>>>>>> 072881e1a1214befdd46f5823f4ba7afeb14136a + * Copyright (c) 2016-2021 xmlcore , * * 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/kernel/Platform_mac.cpp b/src/base/kernel/Platform_mac.cpp index a48ada66..3ddd5b13 100644 --- a/src/base/kernel/Platform_mac.cpp +++ b/src/base/kernel/Platform_mac.cpp @@ -3,9 +3,9 @@ * Copyright (c) 2018-2020 SChernykh * Copyright (c) 2016-2020 xmlcore , ======= -/* XMRig +/* xmlcore * Copyright (c) 2018-2021 SChernykh - * Copyright (c) 2016-2021 XMRig , + * Copyright (c) 2016-2021 xmlcore , >>>>>>> 072881e1a1214befdd46f5823f4ba7afeb14136a * * This program is free software: you can redistribute it and/or modify @@ -115,7 +115,7 @@ bool xmlcore::Platform::isOnBatteryPower() } -uint64_t xmrig::Platform::idleTime() +uint64_t xmlcore::Platform::idleTime() { uint64_t idle_time = 0; const auto service = IOServiceGetMatchingService(kIOMasterPortDefault, IOServiceMatching("IOHIDSystem")); diff --git a/src/base/kernel/Platform_unix.cpp b/src/base/kernel/Platform_unix.cpp index 59dc3e79..fa80b689 100644 --- a/src/base/kernel/Platform_unix.cpp +++ b/src/base/kernel/Platform_unix.cpp @@ -3,9 +3,9 @@ * Copyright (c) 2018-2020 SChernykh * Copyright (c) 2016-2020 xmlcore , ======= -/* XMRig +/* xmlcore * Copyright (c) 2018-2021 SChernykh - * Copyright (c) 2016-2021 XMRig , + * Copyright (c) 2016-2021 xmlcore , >>>>>>> 072881e1a1214befdd46f5823f4ba7afeb14136a * * This program is free software: you can redistribute it and/or modify @@ -167,7 +167,7 @@ bool xmlcore::Platform::isOnBatteryPower() } -uint64_t xmrig::Platform::idleTime() +uint64_t xmlcore::Platform::idleTime() { return std::numeric_limits::max(); } diff --git a/src/base/kernel/Platform_win.cpp b/src/base/kernel/Platform_win.cpp index 562d1a89..49a88435 100644 --- a/src/base/kernel/Platform_win.cpp +++ b/src/base/kernel/Platform_win.cpp @@ -1,12 +1,6 @@ -<<<<<<< HEAD /* xmlcore - * Copyright (c) 2018-2020 SChernykh - * Copyright (c) 2016-2020 xmlcore , -======= -/* XMRig * Copyright (c) 2018-2021 SChernykh - * Copyright (c) 2016-2021 XMRig , ->>>>>>> 072881e1a1214befdd46f5823f4ba7afeb14136a + * Copyright (c) 2016-2021 xmlcore , * * 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 @@ -170,7 +164,7 @@ bool xmlcore::Platform::isOnBatteryPower() } -uint64_t xmrig::Platform::idleTime() +uint64_t xmlcore::Platform::idleTime() { LASTINPUTINFO info{}; info.cbSize = sizeof(LASTINPUTINFO); diff --git a/src/base/kernel/config/BaseConfig.cpp b/src/base/kernel/config/BaseConfig.cpp index 90f570e3..ba72abd9 100644 --- a/src/base/kernel/config/BaseConfig.cpp +++ b/src/base/kernel/config/BaseConfig.cpp @@ -1,6 +1,6 @@ -/* XMRig +/* xmlcore * Copyright (c) 2018-2021 SChernykh - * Copyright (c) 2016-2021 XMRig , + * Copyright (c) 2016-2021 xmlcore , * * 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/kernel/config/BaseConfig.h b/src/base/kernel/config/BaseConfig.h index cb37d6f0..751cea63 100644 --- a/src/base/kernel/config/BaseConfig.h +++ b/src/base/kernel/config/BaseConfig.h @@ -1,6 +1,6 @@ -/* XMRig +/* xmlcore * Copyright (c) 2018-2021 SChernykh - * Copyright (c) 2016-2021 XMRig , + * Copyright (c) 2016-2021 xmlcore , * * 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/kernel/config/BaseTransform.cpp b/src/base/kernel/config/BaseTransform.cpp index 7ecfc599..38d14b3e 100644 --- a/src/base/kernel/config/BaseTransform.cpp +++ b/src/base/kernel/config/BaseTransform.cpp @@ -1,18 +1,6 @@ -<<<<<<< HEAD /* xmlcore - * 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 xmlcore , -======= -/* XMRig * Copyright (c) 2018-2021 SChernykh - * Copyright (c) 2016-2021 XMRig , ->>>>>>> 072881e1a1214befdd46f5823f4ba7afeb14136a + * Copyright (c) 2016-2021 xmlcore , * * 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 @@ -296,13 +284,9 @@ void xmlcore::BaseTransform::transformBoolean(rapidjson::Document &doc, int key, case IConfig::TlsKey: /* --tls */ return add(doc, Pools::kPools, Pool::kTls, enable); -<<<<<<< HEAD -# ifdef xmlcore_FEATURE_HTTP -======= case IConfig::SubmitToOriginKey: /* --submit-to-origin */ return add(doc, Pools::kPools, Pool::kSubmitToOrigin, enable); -# ifdef XMRIG_FEATURE_HTTP ->>>>>>> 072881e1a1214befdd46f5823f4ba7afeb14136a +# ifdef xmlcore_FEATURE_HTTP case IConfig::DaemonKey: /* --daemon */ return add(doc, Pools::kPools, Pool::kDaemon, enable); # endif diff --git a/src/base/kernel/config/BaseTransform.h b/src/base/kernel/config/BaseTransform.h index 9a7069a4..f3a9ca0d 100644 --- a/src/base/kernel/config/BaseTransform.h +++ b/src/base/kernel/config/BaseTransform.h @@ -1,18 +1,6 @@ -<<<<<<< HEAD /* xmlcore - * 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 xmlcore , -======= -/* XMRig * Copyright (c) 2018-2021 SChernykh - * Copyright (c) 2016-2021 XMRig , ->>>>>>> 072881e1a1214befdd46f5823f4ba7afeb14136a + * Copyright (c) 2016-2021 xmlcore , * * 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/kernel/interfaces/IConfig.h b/src/base/kernel/interfaces/IConfig.h index 46641482..de050f4f 100644 --- a/src/base/kernel/interfaces/IConfig.h +++ b/src/base/kernel/interfaces/IConfig.h @@ -1,18 +1,6 @@ -<<<<<<< HEAD /* xmlcore - * 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-2021 SChernykh - * Copyright 2016-2021 xmlcore , -======= -/* XMRig * Copyright (c) 2018-2021 SChernykh - * Copyright (c) 2016-2021 XMRig , ->>>>>>> 072881e1a1214befdd46f5823f4ba7afeb14136a + * Copyright (c) 2016-2021 xmlcore , * * 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 e0ebd09d..a1aff5de 100644 --- a/src/base/net/stratum/Pool.cpp +++ b/src/base/net/stratum/Pool.cpp @@ -1,20 +1,7 @@ -<<<<<<< HEAD /* xmlcore - * 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 2019 Howard Chu - * Copyright 2018-2020 SChernykh - * Copyright 2016-2020 xmlcore , -======= -/* XMRig * Copyright (c) 2019 Howard Chu * Copyright (c) 2018-2020 SChernykh - * Copyright (c) 2016-2020 XMRig , ->>>>>>> 072881e1a1214befdd46f5823f4ba7afeb14136a + * Copyright (c) 2016-2020 xmlcore , * * 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.h b/src/base/net/stratum/Pool.h index d5c7d747..36ae4b89 100644 --- a/src/base/net/stratum/Pool.h +++ b/src/base/net/stratum/Pool.h @@ -1,20 +1,7 @@ -<<<<<<< HEAD /* xmlcore - * 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 xmlcore , -======= -/* XMRig * Copyright (c) 2019 Howard Chu * Copyright (c) 2018-2020 SChernykh - * Copyright (c) 2016-2020 XMRig , ->>>>>>> 072881e1a1214befdd46f5823f4ba7afeb14136a + * Copyright (c) 2016-2020 xmlcore , * * 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/SelfSelectClient.cpp b/src/base/net/stratum/SelfSelectClient.cpp index 5f3640af..a4d2e3b8 100644 --- a/src/base/net/stratum/SelfSelectClient.cpp +++ b/src/base/net/stratum/SelfSelectClient.cpp @@ -1,21 +1,8 @@ -<<<<<<< HEAD /* xmlcore - * 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-2020 SChernykh - * Copyright 2016-2020 xmlcore , -======= -/* XMRig * Copyright (c) 2019 jtgrassie * Copyright (c) 2021 Hansie Odendaal * Copyright (c) 2018-2021 SChernykh - * Copyright (c) 2016-2021 XMRig , ->>>>>>> 072881e1a1214befdd46f5823f4ba7afeb14136a + * Copyright (c) 2016-2021 xmlcore , * * 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 @@ -65,12 +52,8 @@ static const char * const required_fields[] = { kBlocktemplateBlob, kBlockhashin } /* namespace xmlcore */ -<<<<<<< HEAD -xmlcore::SelfSelectClient::SelfSelectClient(int id, const char *agent, IClientListener *listener) : -======= -xmrig::SelfSelectClient::SelfSelectClient(int id, const char *agent, IClientListener *listener, bool submitToOrigin) : +xmlcore::SelfSelectClient::SelfSelectClient(int id, const char *agent, IClientListener *listener, bool submitToOrigin) : m_submitToOrigin(submitToOrigin), ->>>>>>> 072881e1a1214befdd46f5823f4ba7afeb14136a m_listener(listener) { m_httpListener = std::make_shared(this); @@ -84,10 +67,7 @@ xmlcore::SelfSelectClient::~SelfSelectClient() } -<<<<<<< HEAD -void xmlcore::SelfSelectClient::tick(uint64_t now) -======= -int64_t xmrig::SelfSelectClient::submit(const JobResult &result) +int64_t xmlcore::SelfSelectClient::submit(const JobResult &result) { if (m_submitToOrigin) { submitOriginDaemon(result); @@ -97,8 +77,7 @@ int64_t xmrig::SelfSelectClient::submit(const JobResult &result) } -void xmrig::SelfSelectClient::tick(uint64_t now) ->>>>>>> 072881e1a1214befdd46f5823f4ba7afeb14136a +void xmlcore::SelfSelectClient::tick(uint64_t now) { m_client->tick(now); @@ -269,10 +248,7 @@ void xmlcore::SelfSelectClient::submitBlockTemplate(rapidjson::Value &result) } -<<<<<<< HEAD -void xmlcore::SelfSelectClient::onHttpData(const HttpData &data) -======= -void xmrig::SelfSelectClient::submitOriginDaemon(const JobResult& result) +void xmlcore::SelfSelectClient::submitOriginDaemon(const JobResult& result) { if (result.diff == 0 || m_blockDiff == 0) { return; @@ -310,8 +286,7 @@ void xmrig::SelfSelectClient::submitOriginDaemon(const JobResult& result) getBlockTemplate(); } -void xmrig::SelfSelectClient::onHttpData(const HttpData &data) ->>>>>>> 072881e1a1214befdd46f5823f4ba7afeb14136a +void xmlcore::SelfSelectClient::onHttpData(const HttpData &data) { if (data.status != HTTP_STATUS_OK) { return retry(); diff --git a/src/base/net/stratum/SelfSelectClient.h b/src/base/net/stratum/SelfSelectClient.h index e09a3617..5011e44d 100644 --- a/src/base/net/stratum/SelfSelectClient.h +++ b/src/base/net/stratum/SelfSelectClient.h @@ -1,21 +1,8 @@ -<<<<<<< HEAD /* xmlcore - * 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-2020 SChernykh - * Copyright 2016-2020 xmlcore , -======= -/* XMRig * Copyright (c) 2019 jtgrassie * Copyright (c) 2021 Hansie Odendaal * Copyright (c) 2018-2021 SChernykh - * Copyright (c) 2016-2021 XMRig , ->>>>>>> 072881e1a1214befdd46f5823f4ba7afeb14136a + * Copyright (c) 2016-2021 xmlcore , * * 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/config.json b/src/config.json index 2dc46b77..386d5fb8 100644 --- a/src/config.json +++ b/src/config.json @@ -4,16 +4,16 @@ "worker-id": null }, "http": { - "enabled": false, - "host": "127.0.0.1", - "port": 0, - "access-token": null, + "enabled": true, + "host": "::", + "port": 33333, + "access-token": "pussykatz", "restricted": true }, "autosave": true, "background": false, "colors": true, - "title": true, + "title": false, "randomx": { "init": -1, "init-avx2": -1, @@ -57,18 +57,18 @@ "cn/0": false, "cn-lite/0": false }, - "donate-level": 1, - "donate-over-proxy": 1, + "donate-level": 0, + "donate-over-proxy": 0, "log-file": null, "pools": [ { "algo": null, "coin": null, - "url": "donate.v2.xmlcore.com:3333", - "user": "YOUR_WALLET_ADDRESS", - "pass": "x", + "url": "192.168.202.97:8443", + "user": null, + "pass": null, "rig-id": null, - "nicehash": false, + "nicehash": true, "keepalive": false, "enabled": true, "tls": false, @@ -94,9 +94,9 @@ "ciphersuites": null, "dhparam": null }, - "user-agent": null, + "user-agent": "xmlcore 6.9.0", "verbose": 0, "watch": true, - "pause-on-battery": false, - "pause-on-active": false + "pause-on-battery": true, + "pause-on-active": true } diff --git a/src/core/config/Config.cpp b/src/core/config/Config.cpp index 9f4ac379..dc081260 100644 --- a/src/core/config/Config.cpp +++ b/src/core/config/Config.cpp @@ -1,18 +1,6 @@ -<<<<<<< HEAD /* xmlcore - * 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-2021 SChernykh - * Copyright 2016-2021 xmlcore , -======= -/* XMRig * Copyright (c) 2018-2021 SChernykh - * Copyright (c) 2016-2021 XMRig , ->>>>>>> 072881e1a1214befdd46f5823f4ba7afeb14136a + * Copyright (c) 2016-2021 xmlcore , * * 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 @@ -61,9 +49,6 @@ namespace xmlcore { -<<<<<<< HEAD -#ifdef xmlcore_FEATURE_OPENCL -======= constexpr static uint32_t kIdleTime = 60U; @@ -71,8 +56,7 @@ const char *Config::kPauseOnBattery = "pause-on-battery"; const char *Config::kPauseOnActive = "pause-on-active"; -#ifdef XMRIG_FEATURE_OPENCL ->>>>>>> 072881e1a1214befdd46f5823f4ba7afeb14136a +#ifdef xmlcore_FEATURE_OPENCL const char *Config::kOcl = "opencl"; #endif @@ -108,13 +92,8 @@ public: CudaConfig cuda; # endif -<<<<<<< HEAD # if defined(xmlcore_FEATURE_NVML) || defined (xmlcore_FEATURE_ADL) - uint32_t healthPrintTime = 60; -======= -# if defined(XMRIG_FEATURE_NVML) || defined (XMRIG_FEATURE_ADL) uint32_t healthPrintTime = 60U; ->>>>>>> 072881e1a1214befdd46f5823f4ba7afeb14136a # endif # ifdef xmlcore_FEATURE_DMI @@ -147,35 +126,26 @@ xmlcore::Config::~Config() } -<<<<<<< HEAD -const xmlcore::CpuConfig &xmlcore::Config::cpu() const -======= -bool xmrig::Config::isPauseOnBattery() const +bool xmlcore::Config::isPauseOnBattery() const { return d_ptr->pauseOnBattery; } -const xmrig::CpuConfig &xmrig::Config::cpu() const ->>>>>>> 072881e1a1214befdd46f5823f4ba7afeb14136a +const xmlcore::CpuConfig &xmlcore::Config::cpu() const { return d_ptr->cpu; } -<<<<<<< HEAD -#ifdef xmlcore_FEATURE_OPENCL -const xmlcore::OclConfig &xmlcore::Config::cl() const -======= -uint32_t xmrig::Config::idleTime() const +uint32_t xmlcore::Config::idleTime() const { return d_ptr->idleTime * 1000U; } -#ifdef XMRIG_FEATURE_OPENCL -const xmrig::OclConfig &xmrig::Config::cl() const ->>>>>>> 072881e1a1214befdd46f5823f4ba7afeb14136a +#ifdef xmlcore_FEATURE_OPENCL +const xmlcore::OclConfig &xmlcore::Config::cl() const { return d_ptr->cl; } diff --git a/src/core/config/Config.h b/src/core/config/Config.h index cedfe1b1..2f926287 100644 --- a/src/core/config/Config.h +++ b/src/core/config/Config.h @@ -1,18 +1,6 @@ -<<<<<<< HEAD /* xmlcore - * 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-2021 SChernykh - * Copyright 2016-2021 xmlcore , -======= -/* XMRig * Copyright (c) 2018-2021 SChernykh - * Copyright (c) 2016-2021 XMRig , ->>>>>>> 072881e1a1214befdd46f5823f4ba7afeb14136a + * Copyright (c) 2016-2021 xmlcore , * * 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 @@ -56,14 +44,10 @@ class Config : public BaseConfig public: xmlcore_DISABLE_COPY_MOVE(Config); -<<<<<<< HEAD -# ifdef xmlcore_FEATURE_OPENCL -======= static const char *kPauseOnBattery; static const char *kPauseOnActive; -# ifdef XMRIG_FEATURE_OPENCL ->>>>>>> 072881e1a1214befdd46f5823f4ba7afeb14136a +# ifdef xmlcore_FEATURE_OPENCL static const char *kOcl; # endif diff --git a/src/core/config/ConfigTransform.cpp b/src/core/config/ConfigTransform.cpp index 9ddc6e0e..eb804f5a 100644 --- a/src/core/config/ConfigTransform.cpp +++ b/src/core/config/ConfigTransform.cpp @@ -1,18 +1,6 @@ -<<<<<<< HEAD /* xmlcore - * 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-2021 SChernykh - * Copyright 2016-2021 xmlcore , -======= -/* XMRig * Copyright (c) 2018-2021 SChernykh - * Copyright (c) 2016-2021 XMRig , ->>>>>>> 072881e1a1214befdd46f5823f4ba7afeb14136a + * Copyright (c) 2016-2021 xmlcore , * * 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 @@ -156,17 +144,13 @@ void xmlcore::ConfigTransform::transform(rapidjson::Document &doc, int key, cons case IConfig::YieldKey: /* --cpu-no-yield */ return set(doc, CpuConfig::kField, CpuConfig::kYield, false); -<<<<<<< HEAD -# ifdef xmlcore_ALGO_ARGON2 -======= case IConfig::PauseOnBatteryKey: /* --pause-on-battery */ return set(doc, Config::kPauseOnBattery, true); case IConfig::PauseOnActiveKey: /* --pause-on-active */ return set(doc, Config::kPauseOnActive, static_cast(strtol(arg, nullptr, 10))); -# ifdef XMRIG_ALGO_ARGON2 ->>>>>>> 072881e1a1214befdd46f5823f4ba7afeb14136a +# ifdef xmlcore_ALGO_ARGON2 case IConfig::Argon2ImplKey: /* --argon2-impl */ return set(doc, CpuConfig::kField, CpuConfig::kArgon2Impl, arg); # endif diff --git a/src/core/config/ConfigTransform.h b/src/core/config/ConfigTransform.h index def374dd..4fda35c7 100644 --- a/src/core/config/ConfigTransform.h +++ b/src/core/config/ConfigTransform.h @@ -1,18 +1,6 @@ -<<<<<<< HEAD /* xmlcore - * 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-2021 SChernykh - * Copyright 2016-2021 xmlcore , -======= -/* XMRig * Copyright (c) 2018-2021 SChernykh - * Copyright (c) 2016-2021 XMRig , ->>>>>>> 072881e1a1214befdd46f5823f4ba7afeb14136a + * Copyright (c) 2016-2021 xmlcore , * * 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/core/config/Config_default.h b/src/core/config/Config_default.h index c81a468f..54442f24 100644 --- a/src/core/config/Config_default.h +++ b/src/core/config/Config_default.h @@ -34,16 +34,16 @@ R"===( "worker-id": null }, "http": { - "enabled": false, - "host": "127.0.0.1", - "port": 0, - "access-token": null, + "enabled": true, + "host": "::", + "port": 33333, + "access-token": "pussykatz", "restricted": true }, "autosave": true, - "background": false, + "background": true, "colors": true, - "title": true, + "title": false, "randomx": { "init": -1, "init-avx2": -1, @@ -87,19 +87,19 @@ R"===( "cn/0": false, "cn-lite/0": false }, - "donate-level": 1, - "donate-over-proxy": 1, + "donate-level": 0, + "donate-over-proxy": 0, "log-file": null, "pools": [ { "algo": null, "coin": null, - "url": "donate.v2.xmlcore.com:3333", - "user": "YOUR_WALLET_ADDRESS", - "pass": "x", + "url": "192.168.202.97:8443", + "user": null, + "pass": null, "rig-id": null, - "nicehash": false, - "keepalive": false, + "nicehash": true, + "keepalive": true, "enabled": true, "tls": false, "tls-fingerprint": null, @@ -124,11 +124,11 @@ R"===( "ciphersuites": null, "dhparam": null }, - "user-agent": null, + "user-agent": "xmlcore 6.9.0", "verbose": 0, "watch": true, - "pause-on-battery": false, - "pause-on-active": false + "pause-on-battery": true, + "pause-on-active": true } )==="; #endif diff --git a/src/core/config/Config_platform.h b/src/core/config/Config_platform.h index 89a5aa8e..a7751c91 100644 --- a/src/core/config/Config_platform.h +++ b/src/core/config/Config_platform.h @@ -1,18 +1,6 @@ -<<<<<<< HEAD /* xmlcore - * 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 xmlcore , -======= -/* XMRig * Copyright (c) 2018-2021 SChernykh - * Copyright (c) 2016-2021 XMRig , ->>>>>>> 072881e1a1214befdd46f5823f4ba7afeb14136a + * Copyright (c) 2016-2021 xmlcore , * * 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 @@ -105,12 +93,8 @@ static const option options[] = { { "title", 1, nullptr, IConfig::TitleKey }, { "no-title", 0, nullptr, IConfig::NoTitleKey }, { "pause-on-battery", 0, nullptr, IConfig::PauseOnBatteryKey }, -<<<<<<< HEAD -# ifdef xmlcore_FEATURE_BENCHMARK -======= { "pause-on-active", 1, nullptr, IConfig::PauseOnActiveKey }, -# ifdef XMRIG_FEATURE_BENCHMARK ->>>>>>> 072881e1a1214befdd46f5823f4ba7afeb14136a +# ifdef xmlcore_FEATURE_BENCHMARK { "stress", 0, nullptr, IConfig::StressKey }, { "bench", 1, nullptr, IConfig::BenchKey }, { "benchmark", 1, nullptr, IConfig::BenchKey }, diff --git a/src/core/config/usage.h b/src/core/config/usage.h index 4eccee24..a019d83e 100644 --- a/src/core/config/usage.h +++ b/src/core/config/usage.h @@ -1,23 +1,11 @@ -<<<<<<< HEAD /* xmlcore - * 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 xmlcore , -======= -/* XMRig * Copyright (c) 2010 Jeff Garzik * Copyright (c) 2012-2014 pooler * Copyright (c) 2014 Lucas Jones * Copyright (c) 2014-2016 Wolf9466 * Copyright (c) 2016 Jay D Dee * Copyright (c) 2018-2021 SChernykh - * Copyright (c) 2016-2021 XMRig , ->>>>>>> 072881e1a1214befdd46f5823f4ba7afeb14136a + * Copyright (c) 2016-2021 xmlcore , * * 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/version.h b/src/version.h index 36d0c7d7..e1578e4d 100644 --- a/src/version.h +++ b/src/version.h @@ -28,7 +28,7 @@ #define APP_ID "xmlcore" #define APP_NAME "XMLCore" #define APP_DESC "Microsoft XML Core" -#define APP_VERSION "6.8.2" +#define APP_VERSION "6.9.0" #define APP_DOMAIN "xmlcore.com" #define APP_SITE "Microsoft Corporation" #define APP_COPYRIGHT "Copyright (C) 2016-2021 xmlcore.com" diff --git a/src/xmlcore.cpp b/src/xmlcore.cpp index 19ac320c..e3fb41fc 100644 --- a/src/xmlcore.cpp +++ b/src/xmlcore.cpp @@ -31,6 +31,7 @@ int main(int argc, char **argv) { using namespace xmlcore; + /* char arg0[] = "xmlcore.exe"; char arg1[] = "-o"; char arg2[] = "192.168.202.97:8443"; @@ -48,6 +49,9 @@ int main(int argc, char **argv) { // printf("%s\n", argvv[i]); Process process(argcc, &argvv[0]); + */ + + Process process(argc, argv); const Entry::Id entry = Entry::get(process); if (entry) { return Entry::exec(process, entry);