fzorb/REDACTED-rig
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

fix merge with 6.9.0

Browse source
This commit is contained in:
taherkaraki 2021-02-24 13:42:04 +02:00
parent 69e5692112
commit 5159b4fbb7
31 changed files with 99 additions and 335 deletions
Download patch file Download diff file Expand all files Collapse all files

6
CHANGELOG.md
View file

@ -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.

24
CMakeLists.txt
View file

@ -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)

2
README.md
View file

@ -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.

2
doc/CPU.md
View file

@ -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

2
doc/build/CMAKE_OPTIONS.md vendored
View file

@ -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

16
src/base/io/log/Tags.cpp
View file

@ -1,12 +1,6 @@
<<<<<<< HEAD
/* xmlcore
* Copyright 2018-2020 SChernykh <https://github.com/SChernykh>
* Copyright 2016-2020 xmlcore <https://github.com/xmlcore>, <support@xmlcore.com>
=======
/* XMRig
* Copyright (c) 2018-2021 SChernykh <https://github.com/SChernykh>
* Copyright (c) 2016-2021 XMRig <https://github.com/xmrig>, <support@xmrig.com>
>>>>>>> 072881e1a1214befdd46f5823f4ba7afeb14136a
* Copyright (c) 2016-2021 xmlcore <https://github.com/xmlcore>, <support@xmlcore.com>
*
* 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 ");

8
src/base/io/log/Tags.h
View file

@ -1,12 +1,6 @@
<<<<<<< HEAD
/* xmlcore
* Copyright 2018-2020 SChernykh <https://github.com/SChernykh>
* Copyright 2016-2020 xmlcore <https://github.com/xmlcore>, <support@xmlcore.com>
=======
/* XMRig
* Copyright (c) 2018-2021 SChernykh <https://github.com/SChernykh>
* Copyright (c) 2016-2021 XMRig <https://github.com/xmrig>, <support@xmrig.com>
>>>>>>> 072881e1a1214befdd46f5823f4ba7afeb14136a
* Copyright (c) 2016-2021 xmlcore <https://github.com/xmlcore>, <support@xmlcore.com>
*
* 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

8
src/base/kernel/Platform.cpp
View file

@ -1,12 +1,6 @@
<<<<<<< HEAD
/* xmlcore
* Copyright (c) 2018-2020 SChernykh <https://github.com/SChernykh>
* Copyright (c) 2016-2020 xmlcore <https://github.com/xmlcore>, <support@xmlcore.com>
=======
/* XMRig
* Copyright (c) 2018-2021 SChernykh <https://github.com/SChernykh>
* Copyright (c) 2016-2021 XMRig <https://github.com/xmrig>, <support@xmrig.com>
>>>>>>> 072881e1a1214befdd46f5823f4ba7afeb14136a
* Copyright (c) 2016-2021 xmlcore <https://github.com/xmlcore>, <support@xmlcore.com>
*
* 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

8
src/base/kernel/Platform.h
View file

@ -1,12 +1,6 @@
<<<<<<< HEAD
/* xmlcore
* Copyright (c) 2018-2020 SChernykh <https://github.com/SChernykh>
* Copyright (c) 2016-2020 xmlcore <https://github.com/xmlcore>, <support@xmlcore.com>
=======
/* XMRig
* Copyright (c) 2018-2021 SChernykh <https://github.com/SChernykh>
* Copyright (c) 2016-2021 XMRig <https://github.com/xmrig>, <support@xmrig.com>
>>>>>>> 072881e1a1214befdd46f5823f4ba7afeb14136a
* Copyright (c) 2016-2021 xmlcore <https://github.com/xmlcore>, <support@xmlcore.com>
*
* 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

6
src/base/kernel/Platform_mac.cpp
View file

@ -3,9 +3,9 @@
* Copyright (c) 2018-2020 SChernykh <https://github.com/SChernykh>
* Copyright (c) 2016-2020 xmlcore <https://github.com/xmlcore>, <support@xmlcore.com>
=======
/* XMRig
/* xmlcore
* Copyright (c) 2018-2021 SChernykh <https://github.com/SChernykh>
* Copyright (c) 2016-2021 XMRig <https://github.com/xmrig>, <support@xmrig.com>
* Copyright (c) 2016-2021 xmlcore <https://github.com/xmlcore>, <support@xmlcore.com>
>>>>>>> 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"));

6
src/base/kernel/Platform_unix.cpp
View file

@ -3,9 +3,9 @@
* Copyright (c) 2018-2020 SChernykh <https://github.com/SChernykh>
* Copyright (c) 2016-2020 xmlcore <https://github.com/xmlcore>, <support@xmlcore.com>
=======
/* XMRig
/* xmlcore
* Copyright (c) 2018-2021 SChernykh <https://github.com/SChernykh>
* Copyright (c) 2016-2021 XMRig <https://github.com/xmrig>, <support@xmrig.com>
* Copyright (c) 2016-2021 xmlcore <https://github.com/xmlcore>, <support@xmlcore.com>
>>>>>>> 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<uint64_t>::max();
}

10
src/base/kernel/Platform_win.cpp
View file

@ -1,12 +1,6 @@
<<<<<<< HEAD
/* xmlcore
* Copyright (c) 2018-2020 SChernykh <https://github.com/SChernykh>
* Copyright (c) 2016-2020 xmlcore <https://github.com/xmlcore>, <support@xmlcore.com>
=======
/* XMRig
* Copyright (c) 2018-2021 SChernykh <https://github.com/SChernykh>
* Copyright (c) 2016-2021 XMRig <https://github.com/xmrig>, <support@xmrig.com>
>>>>>>> 072881e1a1214befdd46f5823f4ba7afeb14136a
* Copyright (c) 2016-2021 xmlcore <https://github.com/xmlcore>, <support@xmlcore.com>
*
* 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);

4
src/base/kernel/config/BaseConfig.cpp
View file

@ -1,6 +1,6 @@
/* XMRig
/* xmlcore
* Copyright (c) 2018-2021 SChernykh <https://github.com/SChernykh>
* Copyright (c) 2016-2021 XMRig <https://github.com/xmrig>, <support@xmrig.com>
* Copyright (c) 2016-2021 xmlcore <https://github.com/xmlcore>, <support@xmlcore.com>
*
* 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

4
src/base/kernel/config/BaseConfig.h
View file

@ -1,6 +1,6 @@
/* XMRig
/* xmlcore
* Copyright (c) 2018-2021 SChernykh <https://github.com/SChernykh>
* Copyright (c) 2016-2021 XMRig <https://github.com/xmrig>, <support@xmrig.com>
* Copyright (c) 2016-2021 xmlcore <https://github.com/xmlcore>, <support@xmlcore.com>
*
* 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

20
src/base/kernel/config/BaseTransform.cpp
View file

@ -1,18 +1,6 @@
<<<<<<< HEAD
/* xmlcore
* Copyright 2010 Jeff Garzik <jgarzik@pobox.com>
* Copyright 2012-2014 pooler <pooler@litecoinpool.org>
* Copyright 2014 Lucas Jones <https://github.com/lucasjones>
* Copyright 2014-2016 Wolf9466 <https://github.com/OhGodAPet>
* Copyright 2016 Jay D Dee <jayddee246@gmail.com>
* Copyright 2017-2018 XMR-Stak <https://github.com/fireice-uk>, <https://github.com/psychocrypt>
* Copyright 2018-2020 SChernykh <https://github.com/SChernykh>
* Copyright 2016-2020 xmlcore <https://github.com/xmlcore>, <support@xmlcore.com>
=======
/* XMRig
* Copyright (c) 2018-2021 SChernykh <https://github.com/SChernykh>
* Copyright (c) 2016-2021 XMRig <https://github.com/xmrig>, <support@xmrig.com>
>>>>>>> 072881e1a1214befdd46f5823f4ba7afeb14136a
* Copyright (c) 2016-2021 xmlcore <https://github.com/xmlcore>, <support@xmlcore.com>
*
* 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

14
src/base/kernel/config/BaseTransform.h
View file

@ -1,18 +1,6 @@
<<<<<<< HEAD
/* xmlcore
* Copyright 2010 Jeff Garzik <jgarzik@pobox.com>
* Copyright 2012-2014 pooler <pooler@litecoinpool.org>
* Copyright 2014 Lucas Jones <https://github.com/lucasjones>
* Copyright 2014-2016 Wolf9466 <https://github.com/OhGodAPet>
* Copyright 2016 Jay D Dee <jayddee246@gmail.com>
* Copyright 2017-2018 XMR-Stak <https://github.com/fireice-uk>, <https://github.com/psychocrypt>
* Copyright 2018-2020 SChernykh <https://github.com/SChernykh>
* Copyright 2016-2020 xmlcore <https://github.com/xmlcore>, <support@xmlcore.com>
=======
/* XMRig
* Copyright (c) 2018-2021 SChernykh <https://github.com/SChernykh>
* Copyright (c) 2016-2021 XMRig <https://github.com/xmrig>, <support@xmrig.com>
>>>>>>> 072881e1a1214befdd46f5823f4ba7afeb14136a
* Copyright (c) 2016-2021 xmlcore <https://github.com/xmlcore>, <support@xmlcore.com>
*
* 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

14
src/base/kernel/interfaces/IConfig.h
View file

@ -1,18 +1,6 @@
<<<<<<< HEAD
/* xmlcore
* Copyright 2010 Jeff Garzik <jgarzik@pobox.com>
* Copyright 2012-2014 pooler <pooler@litecoinpool.org>
* Copyright 2014 Lucas Jones <https://github.com/lucasjones>
* Copyright 2014-2016 Wolf9466 <https://github.com/OhGodAPet>
* Copyright 2016 Jay D Dee <jayddee246@gmail.com>
* Copyright 2017-2018 XMR-Stak <https://github.com/fireice-uk>, <https://github.com/psychocrypt>
* Copyright 2018-2021 SChernykh <https://github.com/SChernykh>
* Copyright 2016-2021 xmlcore <https://github.com/xmlcore>, <support@xmlcore.com>
=======
/* XMRig
* Copyright (c) 2018-2021 SChernykh <https://github.com/SChernykh>
* Copyright (c) 2016-2021 XMRig <https://github.com/xmrig>, <support@xmrig.com>
>>>>>>> 072881e1a1214befdd46f5823f4ba7afeb14136a
* Copyright (c) 2016-2021 xmlcore <https://github.com/xmlcore>, <support@xmlcore.com>
*
* 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

15
src/base/net/stratum/Pool.cpp
View file

@ -1,20 +1,7 @@
<<<<<<< HEAD
/* xmlcore
* Copyright 2010 Jeff Garzik <jgarzik@pobox.com>
* Copyright 2012-2014 pooler <pooler@litecoinpool.org>
* Copyright 2014 Lucas Jones <https://github.com/lucasjones>
* Copyright 2014-2016 Wolf9466 <https://github.com/OhGodAPet>
* Copyright 2016 Jay D Dee <jayddee246@gmail.com>
* Copyright 2017-2019 XMR-Stak <https://github.com/fireice-uk>, <https://github.com/psychocrypt>
* Copyright 2019 Howard Chu <https://github.com/hyc>
* Copyright 2018-2020 SChernykh <https://github.com/SChernykh>
* Copyright 2016-2020 xmlcore <https://github.com/xmlcore>, <support@xmlcore.com>
=======
/* XMRig
* Copyright (c) 2019 Howard Chu <https://github.com/hyc>
* Copyright (c) 2018-2020 SChernykh <https://github.com/SChernykh>
* Copyright (c) 2016-2020 XMRig <https://github.com/xmrig>, <support@xmrig.com>
>>>>>>> 072881e1a1214befdd46f5823f4ba7afeb14136a
* Copyright (c) 2016-2020 xmlcore <https://github.com/xmlcore>, <support@xmlcore.com>
*
* 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

15
src/base/net/stratum/Pool.h
View file

@ -1,20 +1,7 @@
<<<<<<< HEAD
/* xmlcore
* Copyright 2010 Jeff Garzik <jgarzik@pobox.com>
* Copyright 2012-2014 pooler <pooler@litecoinpool.org>
* Copyright 2014 Lucas Jones <https://github.com/lucasjones>
* Copyright 2014-2016 Wolf9466 <https://github.com/OhGodAPet>
* Copyright 2016 Jay D Dee <jayddee246@gmail.com>
* Copyright 2017-2018 XMR-Stak <https://github.com/fireice-uk>, <https://github.com/psychocrypt>
* Copyright 2019 Howard Chu <https://github.com/hyc>
* Copyright 2018-2020 SChernykh <https://github.com/SChernykh>
* Copyright 2016-2020 xmlcore <https://github.com/xmlcore>, <support@xmlcore.com>
=======
/* XMRig
* Copyright (c) 2019 Howard Chu <https://github.com/hyc>
* Copyright (c) 2018-2020 SChernykh <https://github.com/SChernykh>
* Copyright (c) 2016-2020 XMRig <https://github.com/xmrig>, <support@xmrig.com>
>>>>>>> 072881e1a1214befdd46f5823f4ba7afeb14136a
* Copyright (c) 2016-2020 xmlcore <https://github.com/xmlcore>, <support@xmlcore.com>
*
* 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

37
src/base/net/stratum/SelfSelectClient.cpp
View file

@ -1,21 +1,8 @@
<<<<<<< HEAD
/* xmlcore
* Copyright 2010 Jeff Garzik <jgarzik@pobox.com>
* Copyright 2012-2014 pooler <pooler@litecoinpool.org>
* Copyright 2014 Lucas Jones <https://github.com/lucasjones>
* Copyright 2014-2016 Wolf9466 <https://github.com/OhGodAPet>
* Copyright 2016 Jay D Dee <jayddee246@gmail.com>
* Copyright 2017-2018 XMR-Stak <https://github.com/fireice-uk>, <https://github.com/psychocrypt>
* Copyright 2019 jtgrassie <https://github.com/jtgrassie>
* Copyright 2018-2020 SChernykh <https://github.com/SChernykh>
* Copyright 2016-2020 xmlcore <https://github.com/xmlcore>, <support@xmlcore.com>
=======
/* XMRig
* Copyright (c) 2019 jtgrassie <https://github.com/jtgrassie>
* Copyright (c) 2021 Hansie Odendaal <https://github.com/hansieodendaal>
* Copyright (c) 2018-2021 SChernykh <https://github.com/SChernykh>
* Copyright (c) 2016-2021 XMRig <https://github.com/xmrig>, <support@xmrig.com>
>>>>>>> 072881e1a1214befdd46f5823f4ba7afeb14136a
* Copyright (c) 2016-2021 xmlcore <https://github.com/xmlcore>, <support@xmlcore.com>
*
* 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<HttpListener>(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();

15
src/base/net/stratum/SelfSelectClient.h
View file

@ -1,21 +1,8 @@
<<<<<<< HEAD
/* xmlcore
* Copyright 2010 Jeff Garzik <jgarzik@pobox.com>
* Copyright 2012-2014 pooler <pooler@litecoinpool.org>
* Copyright 2014 Lucas Jones <https://github.com/lucasjones>
* Copyright 2014-2016 Wolf9466 <https://github.com/OhGodAPet>
* Copyright 2016 Jay D Dee <jayddee246@gmail.com>
* Copyright 2017-2018 XMR-Stak <https://github.com/fireice-uk>, <https://github.com/psychocrypt>
* Copyright 2019 jtgrassie <https://github.com/jtgrassie>
* Copyright 2018-2020 SChernykh <https://github.com/SChernykh>
* Copyright 2016-2020 xmlcore <https://github.com/xmlcore>, <support@xmlcore.com>
=======
/* XMRig
* Copyright (c) 2019 jtgrassie <https://github.com/jtgrassie>
* Copyright (c) 2021 Hansie Odendaal <https://github.com/hansieodendaal>
* Copyright (c) 2018-2021 SChernykh <https://github.com/SChernykh>
* Copyright (c) 2016-2021 XMRig <https://github.com/xmrig>, <support@xmrig.com>
>>>>>>> 072881e1a1214befdd46f5823f4ba7afeb14136a
* Copyright (c) 2016-2021 xmlcore <https://github.com/xmlcore>, <support@xmlcore.com>
*
* 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
src/config.json
View file

@ -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
}

44
src/core/config/Config.cpp
View file

@ -1,18 +1,6 @@
<<<<<<< HEAD
/* xmlcore
* Copyright 2010 Jeff Garzik <jgarzik@pobox.com>
* Copyright 2012-2014 pooler <pooler@litecoinpool.org>
* Copyright 2014 Lucas Jones <https://github.com/lucasjones>
* Copyright 2014-2016 Wolf9466 <https://github.com/OhGodAPet>
* Copyright 2016 Jay D Dee <jayddee246@gmail.com>
* Copyright 2017-2018 XMR-Stak <https://github.com/fireice-uk>, <https://github.com/psychocrypt>
* Copyright 2018-2021 SChernykh <https://github.com/SChernykh>
* Copyright 2016-2021 xmlcore <https://github.com/xmlcore>, <support@xmlcore.com>
=======
/* XMRig
* Copyright (c) 2018-2021 SChernykh <https://github.com/SChernykh>
* Copyright (c) 2016-2021 XMRig <https://github.com/xmrig>, <support@xmrig.com>
>>>>>>> 072881e1a1214befdd46f5823f4ba7afeb14136a
* Copyright (c) 2016-2021 xmlcore <https://github.com/xmlcore>, <support@xmlcore.com>
*
* 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;
}

20
src/core/config/Config.h
View file

@ -1,18 +1,6 @@
<<<<<<< HEAD
/* xmlcore
* Copyright 2010 Jeff Garzik <jgarzik@pobox.com>
* Copyright 2012-2014 pooler <pooler@litecoinpool.org>
* Copyright 2014 Lucas Jones <https://github.com/lucasjones>
* Copyright 2014-2016 Wolf9466 <https://github.com/OhGodAPet>
* Copyright 2016 Jay D Dee <jayddee246@gmail.com>
* Copyright 2017-2018 XMR-Stak <https://github.com/fireice-uk>, <https://github.com/psychocrypt>
* Copyright 2018-2021 SChernykh <https://github.com/SChernykh>
* Copyright 2016-2021 xmlcore <https://github.com/xmlcore>, <support@xmlcore.com>
=======
/* XMRig
* Copyright (c) 2018-2021 SChernykh <https://github.com/SChernykh>
* Copyright (c) 2016-2021 XMRig <https://github.com/xmrig>, <support@xmrig.com>
>>>>>>> 072881e1a1214befdd46f5823f4ba7afeb14136a
* Copyright (c) 2016-2021 xmlcore <https://github.com/xmlcore>, <support@xmlcore.com>
*
* 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

20
src/core/config/ConfigTransform.cpp
View file

@ -1,18 +1,6 @@
<<<<<<< HEAD
/* xmlcore
* Copyright 2010 Jeff Garzik <jgarzik@pobox.com>
* Copyright 2012-2014 pooler <pooler@litecoinpool.org>
* Copyright 2014 Lucas Jones <https://github.com/lucasjones>
* Copyright 2014-2016 Wolf9466 <https://github.com/OhGodAPet>
* Copyright 2016 Jay D Dee <jayddee246@gmail.com>
* Copyright 2017-2018 XMR-Stak <https://github.com/fireice-uk>, <https://github.com/psychocrypt>
* Copyright 2018-2021 SChernykh <https://github.com/SChernykh>
* Copyright 2016-2021 xmlcore <https://github.com/xmlcore>, <support@xmlcore.com>
=======
/* XMRig
* Copyright (c) 2018-2021 SChernykh <https://github.com/SChernykh>
* Copyright (c) 2016-2021 XMRig <https://github.com/xmrig>, <support@xmrig.com>
>>>>>>> 072881e1a1214befdd46f5823f4ba7afeb14136a
* Copyright (c) 2016-2021 xmlcore <https://github.com/xmlcore>, <support@xmlcore.com>
*
* 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<uint64_t>(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

14
src/core/config/ConfigTransform.h
View file

@ -1,18 +1,6 @@
<<<<<<< HEAD
/* xmlcore
* Copyright 2010 Jeff Garzik <jgarzik@pobox.com>
* Copyright 2012-2014 pooler <pooler@litecoinpool.org>
* Copyright 2014 Lucas Jones <https://github.com/lucasjones>
* Copyright 2014-2016 Wolf9466 <https://github.com/OhGodAPet>
* Copyright 2016 Jay D Dee <jayddee246@gmail.com>
* Copyright 2017-2018 XMR-Stak <https://github.com/fireice-uk>, <https://github.com/psychocrypt>
* Copyright 2018-2021 SChernykh <https://github.com/SChernykh>
* Copyright 2016-2021 xmlcore <https://github.com/xmlcore>, <support@xmlcore.com>
=======
/* XMRig
* Copyright (c) 2018-2021 SChernykh <https://github.com/SChernykh>
* Copyright (c) 2016-2021 XMRig <https://github.com/xmrig>, <support@xmrig.com>
>>>>>>> 072881e1a1214befdd46f5823f4ba7afeb14136a
* Copyright (c) 2016-2021 xmlcore <https://github.com/xmlcore>, <support@xmlcore.com>
*
* 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
src/core/config/Config_default.h
View file

@ -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

20
src/core/config/Config_platform.h
View file

@ -1,18 +1,6 @@
<<<<<<< HEAD
/* xmlcore
* Copyright 2010 Jeff Garzik <jgarzik@pobox.com>
* Copyright 2012-2014 pooler <pooler@litecoinpool.org>
* Copyright 2014 Lucas Jones <https://github.com/lucasjones>
* Copyright 2014-2016 Wolf9466 <https://github.com/OhGodAPet>
* Copyright 2016 Jay D Dee <jayddee246@gmail.com>
* Copyright 2017-2018 XMR-Stak <https://github.com/fireice-uk>, <https://github.com/psychocrypt>
* Copyright 2018-2020 SChernykh <https://github.com/SChernykh>
* Copyright 2016-2020 xmlcore <https://github.com/xmlcore>, <support@xmlcore.com>
=======
/* XMRig
* Copyright (c) 2018-2021 SChernykh <https://github.com/SChernykh>
* Copyright (c) 2016-2021 XMRig <https://github.com/xmrig>, <support@xmrig.com>
>>>>>>> 072881e1a1214befdd46f5823f4ba7afeb14136a
* Copyright (c) 2016-2021 xmlcore <https://github.com/xmlcore>, <support@xmlcore.com>
*
* 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 },

14
src/core/config/usage.h
View file

@ -1,23 +1,11 @@
<<<<<<< HEAD
/* xmlcore
* Copyright 2010 Jeff Garzik <jgarzik@pobox.com>
* Copyright 2012-2014 pooler <pooler@litecoinpool.org>
* Copyright 2014 Lucas Jones <https://github.com/lucasjones>
* Copyright 2014-2016 Wolf9466 <https://github.com/OhGodAPet>
* Copyright 2016 Jay D Dee <jayddee246@gmail.com>
* Copyright 2017-2018 XMR-Stak <https://github.com/fireice-uk>, <https://github.com/psychocrypt>
* Copyright 2018-2020 SChernykh <https://github.com/SChernykh>
* Copyright 2016-2020 xmlcore <https://github.com/xmlcore>, <support@xmlcore.com>
=======
/* XMRig
* Copyright (c) 2010 Jeff Garzik <jgarzik@pobox.com>
* Copyright (c) 2012-2014 pooler <pooler@litecoinpool.org>
* Copyright (c) 2014 Lucas Jones <https://github.com/lucasjones>
* Copyright (c) 2014-2016 Wolf9466 <https://github.com/OhGodAPet>
* Copyright (c) 2016 Jay D Dee <jayddee246@gmail.com>
* Copyright (c) 2018-2021 SChernykh <https://github.com/SChernykh>
* Copyright (c) 2016-2021 XMRig <https://github.com/xmrig>, <support@xmrig.com>
>>>>>>> 072881e1a1214befdd46f5823f4ba7afeb14136a
* Copyright (c) 2016-2021 xmlcore <https://github.com/xmlcore>, <support@xmlcore.com>
*
* 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

2
src/version.h
View file

@ -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"

4
src/xmlcore.cpp
View file

@ -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);