v2.15.0-beta

Unified ASM functions signature

CHANGELOG.md

@@ -1,11 +1,124 @@
+# v2.15.0-beta
+- [#314](https://github.com/xmrig/xmrig-proxy/issues/314) Added donate over proxy feature.
+  - Added new option `donate-over-proxy`.
+  - Added real graceful exit.
+  
+# v2.14.1
+* [#975](https://github.com/xmrig/xmrig/issues/975) Fixed crash on Linux if double thread mode used.
+
+# v2.14.0
+- **[#969](https://github.com/xmrig/xmrig/pull/969) Added new algorithm `cryptonight/rwz`, short alias `cn/rwz` (also known as CryptoNight ReverseWaltz), for upcoming [Graft](https://www.graft.network/) fork.**
+- **[#931](https://github.com/xmrig/xmrig/issues/931) Added new algorithm `cryptonight/zls`, short alias `cn/zls` for [Zelerius Network](https://zelerius.org) fork.**
+- **[#940](https://github.com/xmrig/xmrig/issues/940) Added new algorithm `cryptonight/double`, short alias `cn/double` (also known as CryptoNight HeavyX), for [X-CASH](https://x-cash.org/).**
+- [#951](https://github.com/xmrig/xmrig/issues/951#issuecomment-469581529) Fixed crash if AVX was disabled on OS level.
+- [#952](https://github.com/xmrig/xmrig/issues/952) Fixed compile error on some Linux.
+- [#957](https://github.com/xmrig/xmrig/issues/957#issuecomment-468890667) Added support for embedded config.
+- [#958](https://github.com/xmrig/xmrig/pull/958) Fixed incorrect user agent on ARM platforms.
+- [#968](https://github.com/xmrig/xmrig/pull/968) Optimized `cn/r` algorithm performance.
+
+# v2.13.1
+- [#946](https://github.com/xmrig/xmrig/pull/946) Optimized software AES implementations for CPUs without hardware AES support. `cn/r`, `cn/wow` up to 2.6 times faster, 4-9% improvements for other algorithms.
+
+# v2.13.0
+- **[#938](https://github.com/xmrig/xmrig/issues/938) Added support for new algorithm `cryptonight/r`, short alias `cn/r` (also known as CryptoNightR or CryptoNight variant 4), for upcoming [Monero](https://www.getmonero.org/) fork on March 9, thanks [@SChernykh](https://github.com/SChernykh).**
+- [#939](https://github.com/xmrig/xmrig/issues/939) Added support for dynamic (runtime) pools reload.
+- [#932](https://github.com/xmrig/xmrig/issues/932) Fixed `cn-pico` hashrate drop, regression since v2.11.0.
+
+# v2.12.0
+- [#929](https://github.com/xmrig/xmrig/pull/929) Added support for new algorithm `cryptonight/wow`, short alias `cn/wow` (also known as CryptonightR), for upcoming [Wownero](http://wownero.org) fork on February 14.
+
+# v2.11.0
+- [#928](https://github.com/xmrig/xmrig/issues/928) Added support for new algorithm `cryptonight/gpu`, short alias `cn/gpu` (original name `cryptonight-gpu`), for upcoming [Ryo currency](https://ryo-currency.com) fork on February 14.
+- [#749](https://github.com/xmrig/xmrig/issues/749) Added support for detect hardware AES in runtime on ARMv8 platforms.
+- [#292](https://github.com/xmrig/xmrig/issues/292) Fixed build on ARMv8 platforms if compiler not support hardware AES.
+
+# v2.10.0
+- [#904](https://github.com/xmrig/xmrig/issues/904) Added new algorithm `cn-pico/trtl` (aliases `cryptonight-turtle`, `cn-trtl`) for upcoming TurtleCoin (TRTL) fork.
+- Default value for option `max-cpu-usage` changed to `100` also this option now deprecated.
+
+# v2.9.4
+- [#913](https://github.com/xmrig/xmrig/issues/913) Fixed Masari (MSR) support (this update required for upcoming fork).
+- [#915](https://github.com/xmrig/xmrig/pull/915) Improved security, JIT memory now read-only after patching.
+
+# v2.9.3
+- [#909](https://github.com/xmrig/xmrig/issues/909) Fixed compile errors on FreeBSD.
+- [#912](https://github.com/xmrig/xmrig/pull/912) Fixed, C++ implementation of `cn/half` was produce up to 13% of invalid hashes.
+
+# v2.9.2
+- [#907](https://github.com/xmrig/xmrig/pull/907) Fixed crash on Linux.
+
+# v2.9.1
+- Restored compatibility with https://stellite.hashvault.pro.
+
+# v2.9.0
+- [#899](https://github.com/xmrig/xmrig/issues/899) Added support for new algorithm `cn/half` for Masari and Stellite forks.
+- [#834](https://github.com/xmrig/xmrig/pull/834) Added ASM optimized code for AMD Bulldozer.
+- [#839](https://github.com/xmrig/xmrig/issues/839) Fixed FreeBSD compile.
+- [#857](https://github.com/xmrig/xmrig/pull/857) Fixed impossible to build for macOS without clang.
+
+# v2.8.3
+- [#813](https://github.com/xmrig/xmrig/issues/813) Fixed critical bug with Minergate pool and variant 2.
+
+# v2.8.1
+- [#768](https://github.com/xmrig/xmrig/issues/768) Fixed build with Visual Studio 2015.
+- [#769](https://github.com/xmrig/xmrig/issues/769) Fixed regression, some ANSI escape sequences was in log with disabled colors.
+- [#777](https://github.com/xmrig/xmrig/issues/777) Better report about pool connection issues. 
+- Simplified checks for ASM auto detection, only AES support necessary.
+- Added missing options to `--help` output.
+
+# v2.8.0
+- **[#753](https://github.com/xmrig/xmrig/issues/753) Added new algorithm [CryptoNight variant 2](https://github.com/xmrig/xmrig/issues/753) for Monero fork, thanks [@SChernykh](https://github.com/SChernykh).**
+  - Added global and per thread option `"asm"` and and command line equivalent.
+- **[#758](https://github.com/xmrig/xmrig/issues/758) Added SSL/TLS support for secure connections to pools.**
+  - Added per pool options `"tls"` and `"tls-fingerprint"` and command line equivalents.
+- [#767](https://github.com/xmrig/xmrig/issues/767) Added config autosave feature, same with GPU miners.  
+- [#245](https://github.com/xmrig/xmrig-proxy/issues/245) Fixed API ID collision when run multiple miners on same machine.
+- [#757](https://github.com/xmrig/xmrig/issues/757) Fixed send buffer overflow.
+
+# v2.6.4
+- [#700](https://github.com/xmrig/xmrig/issues/700) `cryptonight-lite/ipbc` replaced to `cryptonight-heavy/tube` for **Bittube (TUBE)**.
+- Added `cryptonight/rto` (cryptonight variant 1 with IPBC/TUBE mod) variant for **Arto (RTO)** coin.
+- Added `cryptonight/xao` (original cryptonight with bigger iteration count) variant for **Alloy (XAO)** coin.
+- Better variant detection for **nicehash.com** and **minergate.com**.
+- [#692](https://github.com/xmrig/xmrig/issues/692) Added support for specify both algorithm and variant via single `algo` option.
+
+# v2.6.3
+- **Added support for new cryptonight-heavy variant xhv** (`cn-heavy/xhv`) for upcoming Haven Protocol fork.
+- **Added support for new cryptonight variant msr** (`cn/msr`) also known as `cryptonight-fast` for upcoming Masari fork.
+- Added new detailed hashrate report.
+- [#446](https://github.com/xmrig/xmrig/issues/446) Likely fixed SIGBUS error on 32 bit ARM CPUs.
+- [#551](https://github.com/xmrig/xmrig/issues/551) Fixed `cn-heavy` algorithm on ARMv8.
+- [#614](https://github.com/xmrig/xmrig/issues/614) Fixed display issue with huge pages percentage when colors disabled.
+- [#615](https://github.com/xmrig/xmrig/issues/615) Fixed build without libcpuid.
+- [#629](https://github.com/xmrig/xmrig/pull/629) Fixed file logging with non-seekable files.
+- [#672](https://github.com/xmrig/xmrig/pull/672) Reverted back `cryptonight-light` and exit if no valid algorithm specified.
+
+# v2.6.2
+ - [#607](https://github.com/xmrig/xmrig/issues/607) Fixed donation bug.
+ - [#610](https://github.com/xmrig/xmrig/issues/610) Fixed ARM build.
+
+# v2.6.1
+ - [#168](https://github.com/xmrig/xmrig-proxy/issues/168) Added support for [mining algorithm negotiation](https://github.com/xmrig/xmrig-proxy/blob/dev/doc/STRATUM_EXT.md#1-mining-algorithm-negotiation).
+ - Added IPBC coin support, base algorithm `cn-lite` variant `ipbc`.
+ - [#581](https://github.com/xmrig/xmrig/issues/581) Added support for upcoming Stellite (XTL) fork, base algorithm `cn` variant `xtl`, variant can set now, no need do it after fork.
+ - Added support for **rig-id** stratum protocol extensions, compatible with xmr-stak.
+ - Changed behavior for option `variant=-1` for `cryptonight`, now variant is `1` by default, if you mine old coins need change `variant` to `0`.
+ - A lot of small fixes and better unification with proxy code.
+
+# v2.6.0-beta3
+- [#563](https://github.com/xmrig/xmrig/issues/563) **Added [advanced threads mode](https://github.com/xmrig/xmrig/issues/563), now possible configure each thread individually.**
+- [#255](https://github.com/xmrig/xmrig/issues/563) Low power mode extended to **triple**, **quard** and **penta** modes.
+- [#519](https://github.com/xmrig/xmrig/issues/519) Fixed high donation levels, improved donation start time randomization.
+- [#554](https://github.com/xmrig/xmrig/issues/554) Fixed regression with `print-time` option.
+
 # v2.6.0-beta2
 - Improved performance for `cryptonight v7` especially in double hash mode.
-- [#499](https://github.com/xmrig/xmrig/issues/499) IPv6 disabled for internal HTTP API by default, was cause issues on some systems.
+- [#499](https://github.com/xmrig/xmrig/issues/499) IPv6 disabled for internal HTTP API by default, was causing issues on some systems.
 - Added short aliases for algorithm names: `cn`, `cn-lite` and `cn-heavy`.
 - Fixed regressions (v2.6.0-beta1 affected)
   - [#494](https://github.com/xmrig/xmrig/issues/494) Command line option `--donate-level` was broken.
   - [#502](https://github.com/xmrig/xmrig/issues/502) Build without libmicrohttpd was broken.
-  - Fixed nonce calculation for `--av 4` (software AES, double hash) was cause reduction of effective hashrate and rejected shares on nicehash.
+  - Fixed nonce calculation for `--av 4` (software AES, double hash) was causing reduction of effective hashrate and rejected shares on nicehash.
 
 # v2.6.0-beta1
  - [#476](https://github.com/xmrig/xmrig/issues/476) **Added Cryptonight-Heavy support for Sumokoin ASIC resistance fork.**
@@ -18,6 +131,11 @@
  - Added `--api-no-ipv6` and similar config option to disable IPv6 support for HTTP API.
  - Added `--api-no-restricted` to enable full access to api, this option has no effect if `--api-access-token` not specified.
 
+# v2.5.3
+- Fixed critical bug, in some cases miner was can't recovery connection and switch to failover pool, version 2.5.2 affected. If you use v2.6.0-beta3 this issue doesn't concern you.
+- [#499](https://github.com/xmrig/xmrig/issues/499) IPv6 support disabled for internal HTTP API.
+- Added workaround for nicehash.com if you use `cryptonightv7.<region>.nicehash.com` option `variant=1` will be set automatically.
+
 # v2.5.2
 - [#448](https://github.com/xmrig/xmrig/issues/478) Fixed broken reconnect.
 

CMakeLists.txt

@@ -4,70 +4,67 @@ project(xmrig)
 option(WITH_LIBCPUID        "Use Libcpuid" ON)
 option(WITH_AEON            "CryptoNight-Lite support" ON)
 option(WITH_SUMO            "CryptoNight-Heavy support" ON)
+option(WITH_CN_PICO         "CryptoNight-Pico support" ON)
+option(WITH_CN_GPU          "CryptoNight-GPU support" ON)
 option(WITH_HTTPD           "HTTP REST API" 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(BUILD_STATIC         "Build static binary" OFF)
+option(ARM_TARGET           "Force use specific ARM target 8 or 7" 0)
+option(WITH_EMBEDDED_CONFIG "Enable internal embedded JSON config" OFF)
 
 include (CheckIncludeFile)
 include (cmake/cpu.cmake)
+include (src/base/base.cmake)
 
 
 set(HEADERS
+    "${HEADERS_BASE}"
     src/api/NetworkState.h
     src/App.h
-    src/Console.h
-    src/core/CommonConfig.h
-    src/core/Config.cpp
-    src/core/ConfigLoader.cpp
-    src/core/ConfigLoader.h
+    src/common/config/CommonConfig.h
+    src/common/config/ConfigLoader.h
+    src/common/config/ConfigWatcher.h
+    src/common/cpu/Cpu.h
+    src/common/crypto/Algorithm.h
+    src/common/crypto/keccak.h
+    src/common/interfaces/IConfig.h
+    src/common/interfaces/IConfigCreator.h
+    src/common/interfaces/IControllerListener.h
+    src/common/interfaces/ICpuInfo.h
+    src/common/interfaces/ILogBackend.h
+    src/common/log/BasicLog.h
+    src/common/log/ConsoleLog.h
+    src/common/log/FileLog.h
+    src/common/log/Log.h
+    src/common/Platform.h
+    src/common/utils/mm_malloc.h
+    src/common/xmrig.h
+    src/core/ConfigLoader_default.h
     src/core/ConfigLoader_platform.h
-    src/core/ConfigWatcher.cpp
     src/core/Controller.h
-    src/Cpu.h
-    src/interfaces/IClientListener.h
-    src/interfaces/IConfig.h
-    src/interfaces/IConfigCreator.h
-    src/interfaces/IConsoleListener.h
-    src/interfaces/IControllerListener.h
     src/interfaces/IJobResultListener.h
-    src/interfaces/ILogBackend.h
-    src/interfaces/IStrategy.h
-    src/interfaces/IStrategyListener.h
     src/interfaces/IThread.h
-    src/interfaces/IWatcherListener.h
     src/interfaces/IWorker.h
-    src/log/ConsoleLog.h
-    src/log/FileLog.h
-    src/log/Log.h
     src/Mem.h
-    src/net/Client.h
-    src/net/Id.h
-    src/net/Job.h
     src/net/JobResult.h
     src/net/Network.h
-    src/net/Storage.h
     src/net/strategies/DonateStrategy.h
-    src/net/strategies/FailoverStrategy.h
-    src/net/strategies/SinglePoolStrategy.h
-    src/net/SubmitResult.h
-    src/net/Url.h
-    src/Platform.h
     src/Summary.h
     src/version.h
     src/workers/CpuThread.h
-    src/workers/DoubleWorker.h
-    src/workers/Handle.h
+    src/workers/ThreadHandle.h
     src/workers/Hashrate.h
-    src/workers/SingleWorker.h
+    src/workers/MultiWorker.h
     src/workers/Worker.h
     src/workers/Workers.h
-    src/xmrig.h
    )
 
 set(HEADERS_CRYPTO
     src/crypto/c_blake256.h
     src/crypto/c_groestl.h
     src/crypto/c_jh.h
-    src/crypto/c_keccak.h
     src/crypto/c_skein.h
     src/crypto/CryptoNight.h
     src/crypto/CryptoNight_constants.h
@@ -77,6 +74,7 @@ set(HEADERS_CRYPTO
     src/crypto/hash.h
     src/crypto/skein_port.h
     src/crypto/soft_aes.h
+    src/crypto/asm/CryptonightR_template.h
    )
 
 if (XMRIG_ARM)
@@ -86,40 +84,35 @@ else()
 endif()
 
 set(SOURCES
+    "${SOURCES_BASE}"
     src/api/NetworkState.cpp
     src/App.cpp
-    src/Console.cpp
-    src/core/CommonConfig.cpp
+    src/common/config/CommonConfig.cpp
+    src/common/config/ConfigLoader.cpp
+    src/common/config/ConfigWatcher.cpp
+    src/common/crypto/Algorithm.cpp
+    src/common/crypto/keccak.cpp
+    src/common/log/BasicLog.cpp
+    src/common/log/ConsoleLog.cpp
+    src/common/log/FileLog.cpp
+    src/common/log/Log.cpp
+    src/common/Platform.cpp
     src/core/Config.cpp
-    src/core/ConfigLoader.cpp
-    src/core/ConfigWatcher.cpp
     src/core/Controller.cpp
-    src/log/ConsoleLog.cpp
-    src/log/FileLog.cpp
-    src/log/Log.cpp
     src/Mem.cpp
-    src/net/Client.cpp
-    src/net/Job.cpp
     src/net/Network.cpp
     src/net/strategies/DonateStrategy.cpp
-    src/net/strategies/FailoverStrategy.cpp
-    src/net/strategies/SinglePoolStrategy.cpp
-    src/net/SubmitResult.cpp
-    src/net/Url.cpp
-    src/Platform.cpp
     src/Summary.cpp
     src/workers/CpuThread.cpp
-    src/workers/DoubleWorker.cpp
-    src/workers/Handle.cpp
+    src/workers/ThreadHandle.cpp
     src/workers/Hashrate.cpp
-    src/workers/SingleWorker.cpp
+    src/workers/MultiWorker.cpp
     src/workers/Worker.cpp
     src/workers/Workers.cpp
     src/xmrig.cpp
    )
 
 set(SOURCES_CRYPTO
-    src/crypto/c_keccak.c
     src/crypto/c_groestl.c
     src/crypto/c_blake256.c
     src/crypto/c_jh.c
@@ -128,35 +121,35 @@ set(SOURCES_CRYPTO
 
 if (WIN32)
     set(SOURCES_OS
+        "${SOURCES_OS}"
         res/app.rc
         src/App_win.cpp
-        src/Cpu_win.cpp
+        src/common/Platform_win.cpp
         src/Mem_win.cpp
-        src/Platform_win.cpp
         )
 
     add_definitions(/DWIN32)
     set(EXTRA_LIBS ws2_32 psapi iphlpapi userenv)
 elseif (APPLE)
     set(SOURCES_OS
+        "${SOURCES_OS}"
         src/App_unix.cpp
-        src/Cpu_mac.cpp
+        src/common/Platform_mac.cpp
         src/Mem_unix.cpp
-        src/Platform_mac.cpp
         )
 else()
     set(SOURCES_OS
+        "${SOURCES_OS}"
         src/App_unix.cpp
-        src/Cpu_unix.cpp
+        src/common/Platform_unix.cpp
         src/Mem_unix.cpp
-        src/Platform_unix.cpp
         )
 
-    set(EXTRA_LIBS pthread rt)
-endif()
-
     if (CMAKE_SYSTEM_NAME STREQUAL FreeBSD)
-    set(EXTRA_LIBS ${EXTRA_LIBS} kvm)
+        set(EXTRA_LIBS kvm pthread)
+    else()
+        set(EXTRA_LIBS pthread rt dl)
+    endif()
 endif()
 
 if (CMAKE_SYSTEM_NAME MATCHES "Linux")
@@ -168,7 +161,6 @@ endif()
 
 add_definitions(/D__STDC_FORMAT_MACROS)
 add_definitions(/DUNICODE)
-#add_definitions(/DAPP_DEBUG)
 
 set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${CMAKE_SOURCE_DIR}/cmake")
 
@@ -181,21 +173,26 @@ if (WITH_LIBCPUID)
 
     include_directories(src/3rdparty/libcpuid)
     set(CPUID_LIB cpuid)
-    set(SOURCES_CPUID src/Cpu.cpp)
+    set(SOURCES_CPUID src/core/cpu/AdvancedCpuInfo.h src/core/cpu/AdvancedCpuInfo.cpp src/core/cpu/Cpu.cpp)
 else()
     add_definitions(/DXMRIG_NO_LIBCPUID)
+    set(SOURCES_CPUID src/common/cpu/BasicCpuInfo.h src/common/cpu/Cpu.cpp)
 
     if (XMRIG_ARM)
-        set(SOURCES_CPUID src/Cpu_arm.cpp)
+        set(SOURCES_CPUID ${SOURCES_CPUID} src/common/cpu/BasicCpuInfo_arm.cpp)
     else()
-        set(SOURCES_CPUID src/Cpu_stub.cpp)
+        set(SOURCES_CPUID ${SOURCES_CPUID} src/common/cpu/BasicCpuInfo.cpp)
     endif()
 endif()
 
+include(cmake/OpenSSL.cmake)
+include(cmake/asm.cmake)
+include(cmake/cn-gpu.cmake)
+
 CHECK_INCLUDE_FILE (syslog.h HAVE_SYSLOG_H)
 if (HAVE_SYSLOG_H)
     add_definitions(/DHAVE_SYSLOG_H)
-    set(SOURCES_SYSLOG src/log/SysLog.h src/log/SysLog.cpp)
+    set(SOURCES_SYSLOG src/common/log/SysLog.h src/common/log/SysLog.cpp)
 endif()
 
 if (NOT WITH_AEON)
@@ -206,6 +203,18 @@ if (NOT WITH_SUMO)
     add_definitions(/DXMRIG_NO_SUMO)
 endif()
 
+if (NOT WITH_IPBC)
+    add_definitions(/DXMRIG_NO_IPBC)
+endif()
+
+if (NOT WITH_CN_PICO)
+    add_definitions(/DXMRIG_NO_CN_PICO)
+endif()
+
+if (WITH_EMBEDDED_CONFIG)
+    add_definitions(/DXMRIG_FEATURE_EMBEDDED_CONFIG)
+endif()
+
 if (WITH_HTTPD)
     find_package(MHD)
 
@@ -214,19 +223,20 @@ if (WITH_HTTPD)
         set(HTTPD_SOURCES
             src/api/Api.h
             src/api/ApiRouter.h
-            src/api/HttpBody.h
-            src/api/Httpd.h
-            src/api/HttpReply.h
-            src/api/HttpRequest.h
+            src/common/api/HttpBody.h
+            src/common/api/Httpd.h
+            src/common/api/HttpReply.h
+            src/common/api/HttpRequest.h
             src/api/Api.cpp
             src/api/ApiRouter.cpp
-            src/api/Httpd.cpp
-            src/api/HttpRequest.cpp
+            src/common/api/Httpd.cpp
+            src/common/api/HttpRequest.cpp
             )
     else()
         message(FATAL_ERROR "microhttpd NOT found: use `-DWITH_HTTPD=OFF` to build without http deamon support")
     endif()
 else()
+    set(HTTPD_SOURCES "")
     set(MHD_LIBRARY "")
     add_definitions(/DXMRIG_NO_HTTPD)
     add_definitions(/DXMRIG_NO_API)
@@ -240,5 +250,9 @@ if (BUILD_STATIC)
     set(CMAKE_EXE_LINKER_FLAGS " -static")
 endif()
 
-add_executable(xmrig ${HEADERS} ${SOURCES} ${SOURCES_OS} ${SOURCES_CPUID} ${HEADERS_CRYPTO} ${SOURCES_CRYPTO} ${SOURCES_SYSLOG} ${HTTPD_SOURCES})
-target_link_libraries(xmrig ${UV_LIBRARIES} ${MHD_LIBRARY} ${EXTRA_LIBS} ${CPUID_LIB})
+if (WITH_DEBUG_LOG)
+    add_definitions(/DAPP_DEBUG)
+endif()
+
+add_executable(${CMAKE_PROJECT_NAME} ${HEADERS} ${SOURCES} ${SOURCES_OS} ${SOURCES_CPUID} ${HEADERS_CRYPTO} ${SOURCES_CRYPTO} ${SOURCES_SYSLOG} ${HTTPD_SOURCES} ${TLS_SOURCES} ${XMRIG_ASM_SOURCES} ${CN_GPU_SOURCES})
+target_link_libraries(${CMAKE_PROJECT_NAME} ${XMRIG_ASM_LIBRARY} ${OPENSSL_LIBRARIES} ${UV_LIBRARIES} ${MHD_LIBRARY} ${EXTRA_LIBS} ${CPUID_LIB})

README.md

@@ -1,7 +1,5 @@
 # XMRig
 
-:warning: **You must update miners to version 2.5 before April 6 due [Monero PoW change](https://getmonero.org/2018/02/11/PoW-change-and-key-reuse.html).**
-
 [![Github All Releases](https://img.shields.io/github/downloads/xmrig/xmrig/total.svg)](https://github.com/xmrig/xmrig/releases)
 [![GitHub release](https://img.shields.io/github/release/xmrig/xmrig/all.svg)](https://github.com/xmrig/xmrig/releases)
 [![GitHub Release Date](https://img.shields.io/github/release-date-pre/xmrig/xmrig.svg)](https://github.com/xmrig/xmrig/releases)
@@ -52,14 +50,21 @@ Use [config.xmrig.com](https://config.xmrig.com/xmrig) to generate, edit or shar
 
 ### Options
 ```
-  -a, --algo=ALGO          cryptonight (default) or cryptonight-lite
+  -a, --algo=ALGO          specify the algorithm to use
+                             cryptonight
+                             cryptonight-lite
+                             cryptonight-heavy
   -o, --url=URL            URL of mining server
   -O, --userpass=U:P       username:password pair for mining server
   -u, --user=USERNAME      username for mining server
   -p, --pass=PASSWORD      password for mining server
+      --rig-id=ID          rig identifier for pool-side statistics (needs pool support)
   -t, --threads=N          number of miner threads
   -v, --av=N               algorithm variation, 0 auto select
-  -k, --keepalive          send keepalived for prevent timeout (need pool support)
+  -k, --keepalive          send keepalived packet for prevent timeout (needs pool support)
+      --nicehash           enable nicehash.com support
+      --tls                enable SSL/TLS support (needs pool support)
+      --tls-fingerprint=F  pool TLS certificate fingerprint, if set enable strict certificate pinning
   -r, --retries=N          number of times to retry before switch to backup server (default: 5)
   -R, --retry-pause=N      time to pause between retries (default: 5)
       --cpu-affinity       set process affinity to CPU core(s), mask 0x3 for cores 0 and 1
@@ -75,23 +80,38 @@ Use [config.xmrig.com](https://config.xmrig.com/xmrig) to generate, edit or shar
   -S, --syslog             use system log for output messages
       --max-cpu-usage=N    maximum CPU usage for automatic threads mode (default 75)
       --safe               safe adjust threads and av settings for current CPU
-      --nicehash           enable nicehash/xmrig-proxy support
+      --asm=ASM            ASM code for cn/2, possible values: auto, none, intel, ryzen.
       --print-time=N       print hashrate report every N seconds
       --api-port=N         port for the miner API
       --api-access-token=T access token for API
       --api-worker-id=ID   custom worker-id for API
+      --api-id=ID          custom instance ID for API
+      --api-ipv6           enable IPv6 support for API
+      --api-no-restricted  enable full remote access (only if API token set)
+      --dry-run            test configuration and exit
   -h, --help               display this help and exit
   -V, --version            output version information and exit
 ```
 
-Also you can use configuration via config file, default **config.json**. You can load multiple config files and combine it with command line options.
+Also you can use configuration via config file, default name **config.json**. Some options available only via config file: [`autosave`](https://github.com/xmrig/xmrig/issues/767), [`hw-aes`](https://github.com/xmrig/xmrig/issues/563). `watch` option currently not implemented in miners only in proxy.
 
 ## Algorithm variations
-Since version 0.8.0.
-* `--av=1` For CPUs with hardware AES.
-* `--av=2` Lower power mode (double hash) of `1`.
-* `--av=3` Software AES implementation.
-* `--av=4` Lower power mode (double hash) of `3`.
+
+- `av` option used for automatic and simple threads mode (when you specify only threads count).
+- For [advanced threads mode](https://github.com/xmrig/xmrig/issues/563) each thread configured individually and `av` option not used.
+
+| av | Hashes per round | Hardware AES |
+|----|------------------|--------------|
+| 1  | 1 (Single)       | yes          |
+| 2  | 2 (Double)       | yes          |
+| 3  | 1 (Single)       | no           |
+| 4  | 2 (Double)       | no           |
+| 5  | 3 (Triple)       | yes          |
+| 6  | 4 (Quard)        | yes          |
+| 7  | 5 (Penta)        | yes          |
+| 8  | 3 (Triple)       | no           |
+| 9  | 4 (Quard)        | no           |
+| 10 | 5 (Penta)        | no           |
 
 ## Common Issues
 ### HUGE PAGES unavailable
@@ -100,8 +120,7 @@ Since version 0.8.0.
 
 ## Other information
 * No HTTP support, only stratum protocol support.
-* No TLS support.
-* Default donation 5% (5 minutes in 100 minutes) can be reduced to 1% via command line option `--donate-level`.
+* Default donation 5% (5 minutes in 100 minutes) can be reduced to 1% via option `donate-level`.
 
 
 ### CPU mining performance
@@ -121,15 +140,7 @@ Please note performance is highly dependent on system load. The numbers above ar
 * XMR: `48edfHu7V9Z84YzzMa6fUueoELZ9ZRXq9VetWzYGzKt52XU5xvqgzYnDK9URnRoJMk1j8nLwEVsaSWJ4fhdUyZijBGUicoD`
 * BTC: `1P7ujsXeX7GxQwHNnJsRMgAdNkFZmNVqJT`
 
-## Release checksums
-### SHA-256
-```
-232af0c5f3b1cdbc2d90b514873a764b434d5621d2790da67954b35c17e44fe3 xmrig-2.6.0-beta2-xenial-amd64.tar.gz/xmrig-2.6.0-beta2/xmrig
-2366a06729d4de538ef511862bf11d0c7ad40fd245e7aeab3c1957307d63471a xmrig-2.6.0-beta2-gcc-win32.zip/xmrig.exe
-2f6538c765e001d13ca380cbc1558d51efcb97d4bccdfa40993cb872be4e9efd xmrig-2.6.0-beta2-gcc-win64.zip/xmrig.exe
-3c0479acb78a3cee8fe416ee438dbff09c786acf50fbaf28a820127fcd0c6e62 xmrig-2.6.0-beta2-msvc-win64.zip/xmrig.exe
-```
-
 ## Contacts
 * support@xmrig.com
 * [reddit](https://www.reddit.com/user/XMRig/)
+* [twitter](https://twitter.com/xmrig_dev)

cmake/OpenSSL.cmake

@@ -0,0 +1,29 @@
+if (WITH_TLS)
+    set(OPENSSL_ROOT_DIR ${XMRIG_DEPS})
+
+    if (WIN32)
+        set(OPENSSL_USE_STATIC_LIBS TRUE)
+        set(OPENSSL_MSVC_STATIC_RT TRUE)
+
+        set(EXTRA_LIBS ${EXTRA_LIBS} Crypt32)
+    endif()
+
+    find_package(OpenSSL)
+
+    if (OPENSSL_FOUND)
+        set(TLS_SOURCES src/base/net/stratum/Tls.h src/base/net/stratum/Tls.cpp)
+        include_directories(${OPENSSL_INCLUDE_DIR})
+    else()
+        message(FATAL_ERROR "OpenSSL NOT found: use `-DWITH_TLS=OFF` to build without TLS support")
+    endif()
+
+    add_definitions(/DXMRIG_FEATURE_TLS)
+    remove_definitions(/DXMRIG_NO_TLS)
+else()
+    set(TLS_SOURCES "")
+    set(OPENSSL_LIBRARIES "")
+    remove_definitions(/DXMRIG_FEATURE_TLS)
+    add_definitions(/DXMRIG_NO_TLS)
+
+    set(CMAKE_PROJECT_NAME "${CMAKE_PROJECT_NAME}-notls")
+endif()

cmake/asm.cmake

@@ -0,0 +1,45 @@
+if (WITH_ASM AND NOT XMRIG_ARM AND CMAKE_SIZEOF_VOID_P EQUAL 8)
+    set(XMRIG_ASM_LIBRARY "xmrig-asm")
+
+    if (CMAKE_C_COMPILER_ID MATCHES MSVC)
+        enable_language(ASM_MASM)
+
+        if (MSVC_TOOLSET_VERSION GREATER_EQUAL 141)
+            set(XMRIG_ASM_FILES
+                "src/crypto/asm/cn_main_loop.asm"
+                "src/crypto/asm/CryptonightR_template.asm"
+            )
+        else()
+            set(XMRIG_ASM_FILES
+                "src/crypto/asm/win64/cn_main_loop.asm"
+                "src/crypto/asm/win64/CryptonightR_template.asm"
+            )
+        endif()
+
+        set_property(SOURCE ${XMRIG_ASM_FILES} PROPERTY ASM_MASM)
+    else()
+        enable_language(ASM)
+
+        if (WIN32 AND CMAKE_C_COMPILER_ID MATCHES GNU)
+            set(XMRIG_ASM_FILES
+                "src/crypto/asm/win64/cn_main_loop.S"
+                "src/crypto/asm/CryptonightR_template.S"
+            )
+        else()
+            set(XMRIG_ASM_FILES
+                "src/crypto/asm/cn_main_loop.S"
+                "src/crypto/asm/CryptonightR_template.S"
+            )
+        endif()
+
+        set_property(SOURCE ${XMRIG_ASM_FILES} PROPERTY C)
+    endif()
+
+    add_library(${XMRIG_ASM_LIBRARY} STATIC ${XMRIG_ASM_FILES})
+    set(XMRIG_ASM_SOURCES src/crypto/Asm.h src/crypto/Asm.cpp src/crypto/CryptonightR_gen.cpp)
+    set_property(TARGET ${XMRIG_ASM_LIBRARY} PROPERTY LINKER_LANGUAGE C)
+else()
+    set(XMRIG_ASM_SOURCES "")
+    set(XMRIG_ASM_LIBRARY "")
+    add_definitions(/DXMRIG_NO_ASM)
+endif()

cmake/cn-gpu.cmake

@@ -0,0 +1,23 @@
+if (WITH_CN_GPU AND CMAKE_SIZEOF_VOID_P EQUAL 8)
+
+    if (XMRIG_ARM)
+        set(CN_GPU_SOURCES src/crypto/cn_gpu_arm.cpp)
+
+        if (CMAKE_CXX_COMPILER_ID MATCHES GNU OR CMAKE_CXX_COMPILER_ID MATCHES Clang)
+            set_source_files_properties(src/crypto/cn_gpu_arm.cpp PROPERTIES COMPILE_FLAGS "-O3")
+        endif()
+    else()
+        set(CN_GPU_SOURCES src/crypto/cn_gpu_avx.cpp src/crypto/cn_gpu_ssse3.cpp)
+
+        if (CMAKE_CXX_COMPILER_ID MATCHES GNU OR CMAKE_CXX_COMPILER_ID MATCHES Clang)
+            set_source_files_properties(src/crypto/cn_gpu_avx.cpp PROPERTIES COMPILE_FLAGS "-O3 -mavx2")
+            set_source_files_properties(src/crypto/cn_gpu_ssse3.cpp PROPERTIES COMPILE_FLAGS "-O3")
+        elseif (CMAKE_CXX_COMPILER_ID MATCHES MSVC)
+            set_source_files_properties(src/crypto/cn_gpu_avx.cpp PROPERTIES COMPILE_FLAGS "/arch:AVX")
+        endif()
+    endif()
+else()
+    set(CN_GPU_SOURCES "")
+
+    add_definitions(/DXMRIG_NO_CN_GPU)
+endif()

cmake/cpu.cmake

@@ -7,19 +7,37 @@ if (CMAKE_SYSTEM_PROCESSOR MATCHES "^(x86_64|AMD64)$")
     add_definitions(/DRAPIDJSON_SSE2)
 endif()
 
-
-if (CMAKE_SYSTEM_PROCESSOR MATCHES "^(aarch64)$")
-    set(XMRIG_ARM     ON)
-    set(XMRIG_ARMv8   ON)
-    set(WITH_LIBCPUID OFF)
-
-    add_definitions(/DXMRIG_ARM)
-    add_definitions(/DXMRIG_ARMv8)
+if (NOT ARM_TARGET)
+    if (CMAKE_SYSTEM_PROCESSOR MATCHES "^(aarch64|arm64|armv8-a)$")
+        set(ARM_TARGET 8)
     elseif (CMAKE_SYSTEM_PROCESSOR MATCHES "^(armv7|armv7f|armv7s|armv7k|armv7-a|armv7l)$")
-    set(XMRIG_ARM     ON)
-    set(XMRIG_ARMv7   ON)
-    set(WITH_LIBCPUID OFF)
+        set(ARM_TARGET 7)
+    endif()
+endif()
 
+if (ARM_TARGET AND ARM_TARGET GREATER 6)
+    set(XMRIG_ARM     ON)
+    set(WITH_LIBCPUID OFF)
     add_definitions(/DXMRIG_ARM)
+
+    message(STATUS "Use ARM_TARGET=${ARM_TARGET} (${CMAKE_SYSTEM_PROCESSOR})")
+
+    include(CheckCXXCompilerFlag)
+
+    if (ARM_TARGET EQUAL 8)
+        set(XMRIG_ARMv8 ON)
+        add_definitions(/DXMRIG_ARMv8)
+
+        CHECK_CXX_COMPILER_FLAG(-march=armv8-a+crypto XMRIG_ARM_CRYPTO)
+
+        if (XMRIG_ARM_CRYPTO)
+            add_definitions(/DXMRIG_ARM_CRYPTO)
+            set(ARM8_CXX_FLAGS "-march=armv8-a+crypto")
+        else()
+            set(ARM8_CXX_FLAGS "-march=armv8-a")
+        endif()
+    elseif (ARM_TARGET EQUAL 7)
+        set(XMRIG_ARMv7 ON)
         add_definitions(/DXMRIG_ARMv7)
     endif()
+endif()

cmake/flags.cmake

@@ -13,14 +13,14 @@ endif()
 if (CMAKE_CXX_COMPILER_ID MATCHES GNU)
 
     set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wall -Wno-strict-aliasing")
-    set(CMAKE_C_FLAGS_RELEASE "${CMAKE_C_FLAGS_RELEASE} -Ofast -funroll-loops -fvariable-expansion-in-unroller -ftree-loop-if-convert-stores -fmerge-all-constants -fbranch-target-load-optimize2")
+    set(CMAKE_C_FLAGS_RELEASE "${CMAKE_C_FLAGS_RELEASE} -Ofast")
 
-    set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall -fno-exceptions -fno-rtti")
-    set(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} -Ofast -s -funroll-loops -fvariable-expansion-in-unroller -ftree-loop-if-convert-stores -fmerge-all-constants -fbranch-target-load-optimize2")
+    set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall -fno-exceptions -fno-rtti -Wno-class-memaccess")
+    set(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} -Ofast -s")
 
     if (XMRIG_ARMv8)
-        set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -march=armv8-a+crypto")
-        set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -march=armv8-a+crypto -flax-vector-conversions")
+        set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${ARM8_CXX_FLAGS}")
+        set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${ARM8_CXX_FLAGS} -flax-vector-conversions")
     elseif (XMRIG_ARMv7)
         set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -mfpu=neon")
         set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -mfpu=neon -flax-vector-conversions")
@@ -60,8 +60,8 @@ elseif (CMAKE_CXX_COMPILER_ID MATCHES Clang)
     set(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} -Ofast -funroll-loops -fmerge-all-constants")
 
     if (XMRIG_ARMv8)
-        set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -march=armv8-a+crypto")
-        set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -march=armv8-a+crypto")
+        set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${ARM8_CXX_FLAGS}")
+        set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${ARM8_CXX_FLAGS}")
     elseif (XMRIG_ARMv7)
         set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -mfpu=neon -march=${CMAKE_SYSTEM_PROCESSOR}")
         set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -mfpu=neon -march=${CMAKE_SYSTEM_PROCESSOR}")

doc/ALGORITHMS.md

@@ -0,0 +1,31 @@
+# Algorithms
+
+XMRig uses a different way to specify algorithms, compared to other miners.
+
+Algorithm selection splitted to 2 parts:
+
+ * Global base algorithm per miner or proxy instance, `algo` option. Possible values: `cryptonight`, `cryptonight-lite`, `cryptonight-heavy`.
+ * Algorithm variant specified separately for each pool, `variant` option.
+ * [Full table for supported algorithm and variants.](https://github.com/xmrig/xmrig-proxy/blob/master/doc/STRATUM_EXT.md#14-algorithm-names-and-variants)
+ 
+#### Example
+```json
+{
+  "algo": "cryptonight",
+  ...
+  "pools": [
+    {
+      "url": "...",
+      "variant": 1,
+      ...
+    }
+ ],
+ ...
+}
+```
+
+## Mining algorithm negotiation
+If your pool support [mining algorithm negotiation](https://github.com/xmrig/xmrig-proxy/issues/168) miner will choice proper variant automaticaly and if you choice wrong base algorithm you will see error message.
+
+Pools with mining algorithm negotiation support.
+ * [www.hashvault.pro](https://www.hashvault.pro/)

doc/API.md

@@ -0,0 +1,53 @@
+# HTTP API
+
+If you want use API you need choice a port where is internal HTTP server will listen for incoming connections. API will not available if miner built without `libmicrohttpd`.
+
+Example configuration:
+
+```json
+"api": {
+    "port": 44444,
+    "access-token": "TOKEN",
+    "worker-id": null,
+    "ipv6": false,
+    "restricted": false
+},
+```
+
+* **port** Port for incoming connections `http://<miner ip>:<port>`.
+* **access-token** [Bearer](https://gist.github.com/xmrig/c75fdd1f8e0f3bac05500be2ab718f8e#file-api-html-L54) access token to secure access to API.
+* **worker-id** Optional worker name, if not set will be detected automatically.
+* **ipv6** Enable (`true`) or disable (`false`) IPv6 for API.
+* **restricted** Use `false` to allow remote configuration.
+
+If you prefer use command line options instead of config file, you can use options: `--api-port`, `--api-access-token`, `--api-worker-id`, `--api-ipv6` and `api-no-restricted`.
+
+## Endpoints
+
+### GET /1/summary
+
+Get miner summary information. [Example](api/1/summary.json).
+
+### GET /1/threads
+
+Get detailed information about miner threads. [Example](api/1/threads.json).
+
+
+## Restricted endpoints
+
+All API endpoints below allow access to sensitive information and remote configure miner. You should set `access-token` and allow unrestricted access (`"restricted": false`).
+
+### GET /1/config
+
+Get current miner configuration. [Example](api/1/config.json).
+
+
+### PUT /1/config
+
+Update current miner configuration. Common use case, get current configuration, make changes, and upload it to miner.
+
+Curl example:
+
+```
+curl -v --data-binary @config.json -X PUT -H "Content-Type: application/json" -H "Authorization: Bearer SECRET" http://127.0.0.1:44444/1/config
+```

doc/api/1/config.json

@@ -0,0 +1,63 @@
+{
+    "algo": "cryptonight",
+    "api": {
+        "port": 44444,
+        "access-token": "TOKEN",
+        "worker-id": null,
+        "ipv6": false,
+        "restricted": false
+    },
+    "av": 1,
+    "background": false,
+    "colors": true,
+    "cpu-affinity": null,
+    "cpu-priority": null,
+    "donate-level": 5,
+    "huge-pages": true,
+    "hw-aes": null,
+    "log-file": null,
+    "max-cpu-usage": 75,
+    "pools": [
+        {
+            "url": "pool.monero.hashvault.pro:3333",
+            "user": "48edfHu7V9Z84YzzMa6fUueoELZ9ZRXq9VetWzYGzKt52XU5xvqgzYnDK9URnRoJMk1j8nLwEVsaSWJ4fhdUyZijBGUicoD",
+            "pass": "x",
+            "keepalive": false,
+            "nicehash": false,
+            "variant": -1
+        },
+        {
+            "url": "pool.supportxmr.com:3333",
+            "user": "48edfHu7V9Z84YzzMa6fUueoELZ9ZRXq9VetWzYGzKt52XU5xvqgzYnDK9URnRoJMk1j8nLwEVsaSWJ4fhdUyZijBGUicoD",
+            "pass": "x",
+            "keepalive": false,
+            "nicehash": false,
+            "variant": -1
+        }
+    ],
+    "print-time": 60,
+    "retries": 5,
+    "retry-pause": 5,
+    "safe": false,
+    "threads": [
+        {
+            "low_power_mode": 1,
+            "affine_to_cpu": 0
+        },
+        {
+            "low_power_mode": 1,
+            "affine_to_cpu": 1
+        },
+        {
+            "low_power_mode": 1,
+            "affine_to_cpu": 2
+        },
+        {
+            "low_power_mode": 1,
+            "affine_to_cpu": 3
+        }
+    ],
+    "user-agent": null,
+    "syslog": false,
+    "watch": false
+}

doc/api/1/summary.json

@@ -0,0 +1,73 @@
+{
+    "id": "92f3104f9a2ee78c",
+    "worker_id": "Ubuntu-1604-xenial-64-minimal",
+    "version": "2.6.0-beta3",
+    "kind": "cpu",
+    "ua": "XMRig/2.6.0-beta3 (Linux x86_64) libuv/1.8.0 gcc/5.4.0",
+    "cpu": {
+        "brand": "Intel(R) Core(TM) i7-4770 CPU @ 3.40GHz",
+        "aes": true,
+        "x64": true,
+        "sockets": 1
+    },
+    "algo": "cryptonight",
+    "hugepages": true,
+    "donate_level": 5,
+    "hashrate": {
+        "total": [
+            296.24,
+            296.23,
+            295.97
+        ],
+        "highest": 296.5,
+        "threads": [
+            [
+                73.39,
+                73.39,
+                73.28
+            ],
+            [
+                74.72,
+                74.72,
+                74.71
+            ],
+            [
+                74.72,
+                74.72,
+                74.71
+            ],
+            [
+                73.39,
+                73.39,
+                73.27
+            ]
+        ]
+    },
+    "results": {
+        "diff_current": 9990,
+        "shares_good": 30,
+        "shares_total": 30,
+        "avg_time": 31,
+        "hashes_total": 311833,
+        "best": [
+            278199,
+            181923,
+            103717,
+            96632,
+            56154,
+            51580,
+            45667,
+            33159,
+            29581,
+            29514
+        ],
+        "error_log": []
+    },
+    "connection": {
+        "pool": "pool.monero.hashvault.pro:3333",
+        "uptime": 953,
+        "ping": 35,
+        "failures": 0,
+        "error_log": []
+    }
+}

doc/api/1/threads.json

@@ -0,0 +1,65 @@
+{
+    "hugepages": [
+        4,
+        4
+    ],
+    "memory": 8388608,
+    "threads": [
+        {
+            "type": "cpu",
+            "algo": "cryptonight",
+            "av": 1,
+            "low_power_mode": 1,
+            "affine_to_cpu": 0,
+            "priority": -1,
+            "soft_aes": false,
+            "hashrate": [
+                73.39,
+                73.4,
+                73.28
+            ]
+        },
+        {
+            "type": "cpu",
+            "algo": "cryptonight",
+            "av": 1,
+            "low_power_mode": 1,
+            "affine_to_cpu": 1,
+            "priority": -1,
+            "soft_aes": false,
+            "hashrate": [
+                74.72,
+                74.72,
+                74.7
+            ]
+        },
+        {
+            "type": "cpu",
+            "algo": "cryptonight",
+            "av": 1,
+            "low_power_mode": 1,
+            "affine_to_cpu": 2,
+            "priority": -1,
+            "soft_aes": false,
+            "hashrate": [
+                74.71,
+                74.72,
+                74.7
+            ]
+        },
+        {
+            "type": "cpu",
+            "algo": "cryptonight",
+            "av": 1,
+            "low_power_mode": 1,
+            "affine_to_cpu": 3,
+            "priority": -1,
+            "soft_aes": false,
+            "hashrate": [
+                73.39,
+                73.4,
+                73.28
+            ]
+        }
+    ]
+}

res/app.rc

@@ -4,8 +4,8 @@
 IDI_ICON1    ICON    DISCARDABLE    "app.ico"
 
 VS_VERSION_INFO VERSIONINFO
-  FILEVERSION APP_VER_MAJOR,APP_VER_MINOR,APP_VER_BUILD,APP_VER_REV
-  PRODUCTVERSION APP_VER_MAJOR,APP_VER_MINOR,APP_VER_BUILD,APP_VER_REV
+  FILEVERSION APP_VER_MAJOR,APP_VER_MINOR,APP_VER_PATCH,0
+  PRODUCTVERSION APP_VER_MAJOR,APP_VER_MINOR,APP_VER_PATCH,0
   FILEFLAGSMASK 0x3fL
 #ifdef _DEBUG
   FILEFLAGS VS_FF_DEBUG

src/3rdparty/libcpuid/asm-bits.c

@@ -32,7 +32,7 @@ int cpuid_exists_by_eflags(void)
 #if defined(PLATFORM_X64)
 	return 1; /* CPUID is always present on the x86_64 */
 #elif defined(PLATFORM_X86)
-#  if defined(COMPILER_GCC)
+#  if defined(COMPILER_GCC) || defined(COMPILER_CLANG)
 	int result;
 	__asm __volatile(
 		"	pushfl\n"
@@ -70,6 +70,8 @@ int cpuid_exists_by_eflags(void)
 #  else
 	return 0;
 #  endif /* COMPILER_MICROSOFT */
+#elif defined(PLATFORM_ARM)
+  return 0;
 #else
 	return 0;
 #endif /* PLATFORM_X86 */
@@ -82,7 +84,7 @@ int cpuid_exists_by_eflags(void)
  */
 void exec_cpuid(uint32_t *regs)
 {
-#ifdef COMPILER_GCC
+#  if defined(COMPILER_GCC) || defined(COMPILER_CLANG)
 #	ifdef PLATFORM_X64
 	__asm __volatile(
 		"	mov	%0,	%%rdi\n"
@@ -109,7 +111,7 @@ void exec_cpuid(uint32_t *regs)
 		:"m"(regs)
 		:"memory", "eax", "rdi"
 	);
-#	else
+#	elif defined(PLATFORM_X86)
 	__asm __volatile(
 		"	mov	%0,	%%edi\n"
 
@@ -135,6 +137,7 @@ void exec_cpuid(uint32_t *regs)
 		:"m"(regs)
 		:"memory", "eax", "edi"
 	);
+#	elif defined(PLATFORM_ARM)
 #	endif /* COMPILER_GCC */
 #else
 #  ifdef COMPILER_MICROSOFT
@@ -173,13 +176,18 @@ void exec_cpuid(uint32_t *regs)
 void cpu_rdtsc(uint64_t* result)
 {
 	uint32_t low_part, hi_part;
-#ifdef COMPILER_GCC
+#if defined(COMPILER_GCC) || defined(COMPILER_CLANG)
+#ifdef PLATFORM_ARM
+  low_part = 0;
+  hi_part = 0;
+#else
 	__asm __volatile (
 		"	rdtsc\n"
 		"	mov	%%eax,	%0\n"
 		"	mov	%%edx,	%1\n"
 		:"=m"(low_part), "=m"(hi_part)::"memory", "eax", "edx"
 	);
+#endif
 #else
 #  ifdef COMPILER_MICROSOFT
 	__asm {
@@ -198,12 +206,14 @@ void cpu_rdtsc(uint64_t* result)
 #ifdef INLINE_ASM_SUPPORTED
 void busy_sse_loop(int cycles)
 {
-#ifdef COMPILER_GCC
+#  if defined(COMPILER_GCC) || defined(COMPILER_CLANG)
 #ifndef __APPLE__
 #	define XALIGN ".balign 16\n"
 #else
 #	define XALIGN ".align 4\n"
 #endif
+#ifdef PLATFORM_ARM
+#else
 	__asm __volatile (
 		"	xorps	%%xmm0,	%%xmm0\n"
 		"	xorps	%%xmm1,	%%xmm1\n"
@@ -510,6 +520,7 @@ void busy_sse_loop(int cycles)
 		"	jnz	1b\n"
 		::"a"(cycles)
 	);
+#endif
 #else
 #  ifdef COMPILER_MICROSOFT
 	__asm {

src/3rdparty/libcpuid/asm-bits.h

@@ -29,20 +29,38 @@
 
 /* Determine Compiler: */
 #if defined(_MSC_VER)
+#if !defined(COMPILER_MICROSOFT)
 #	define COMPILER_MICROSOFT
+#endif
 #elif defined(__GNUC__)
+#if !defined(COMPILER_GCC)
 #	define COMPILER_GCC
 #endif
+#elif defined(__clang__)
+#if !defined(COMPILER_CLANG)
+#	define COMPILER_CLANG
+#endif
+#endif
 
 /* Determine Platform */
 #if defined(__x86_64__) || defined(_M_AMD64)
+#if !defined(PLATFORM_X64)
 #	define PLATFORM_X64
+#endif
 #elif defined(__i386__) || defined(_M_IX86)
+#if !defined(PLATFORM_X86)
 #	define PLATFORM_X86
 #endif
+#elif defined(__ARMEL__)
+#if !defined(PLATFORM_ARM)
+#	define PLATFORM_ARM
+#endif
+#endif
 
 /* Under Windows/AMD64 with MSVC, inline assembly isn't supported */
-#if (defined(COMPILER_GCC) && defined(PLATFORM_X64)) || defined(PLATFORM_X86)
+#if (((defined(COMPILER_GCC) || defined(COMPILER_CLANG))) &&  \
+     (defined(PLATFORM_X64) || defined(PLATFORM_X86) || defined(PLATFORM_ARM))) || \
+	 (defined(COMPILER_MICROSOFT) && defined(PLATFORM_X86))
 #	define INLINE_ASM_SUPPORTED
 #endif
 

src/3rdparty/libcpuid/libcpuid.h

@@ -82,6 +82,7 @@
  */
 
 /** @defgroup libcpuid LibCPUID
+ * @brief LibCPUID provides CPU identification
  @{ */
 
 /* Include some integer type specifications: */
@@ -535,23 +536,23 @@ typedef enum {
  * @brief Describes common library error codes
  */
 typedef enum {
-	ERR_OK       =  0,	/*!< "No error" */
-	ERR_NO_CPUID = -1,	/*!< "CPUID instruction is not supported" */
-	ERR_NO_RDTSC = -2,	/*!< "RDTSC instruction is not supported" */
-	ERR_NO_MEM   = -3,	/*!< "Memory allocation failed" */
-	ERR_OPEN     = -4,	/*!< "File open operation failed" */
-	ERR_BADFMT   = -5,	/*!< "Bad file format" */
-	ERR_NOT_IMP  = -6,	/*!< "Not implemented" */
-	ERR_CPU_UNKN = -7,	/*!< "Unsupported processor" */
-	ERR_NO_RDMSR = -8,	/*!< "RDMSR instruction is not supported" */
-	ERR_NO_DRIVER= -9,	/*!< "RDMSR driver error (generic)" */
-	ERR_NO_PERMS = -10,	/*!< "No permissions to install RDMSR driver" */
-	ERR_EXTRACT  = -11,	/*!< "Cannot extract RDMSR driver (read only media?)" */
-	ERR_HANDLE   = -12,	/*!< "Bad handle" */
-	ERR_INVMSR   = -13,	/*!< "Invalid MSR" */
-	ERR_INVCNB   = -14,	/*!< "Invalid core number" */
-	ERR_HANDLE_R = -15,	/*!< "Error on handle read" */
-	ERR_INVRANGE = -16,	/*!< "Invalid given range" */
+	ERR_OK       =  0,	/*!< No error */
+	ERR_NO_CPUID = -1,	/*!< CPUID instruction is not supported */
+	ERR_NO_RDTSC = -2,	/*!< RDTSC instruction is not supported */
+	ERR_NO_MEM   = -3,	/*!< Memory allocation failed */
+	ERR_OPEN     = -4,	/*!< File open operation failed */
+	ERR_BADFMT   = -5,	/*!< Bad file format */
+	ERR_NOT_IMP  = -6,	/*!< Not implemented */
+	ERR_CPU_UNKN = -7,	/*!< Unsupported processor */
+	ERR_NO_RDMSR = -8,	/*!< RDMSR instruction is not supported */
+	ERR_NO_DRIVER= -9,	/*!< RDMSR driver error (generic) */
+	ERR_NO_PERMS = -10,	/*!< No permissions to install RDMSR driver */
+	ERR_EXTRACT  = -11,	/*!< Cannot extract RDMSR driver (read only media?) */
+	ERR_HANDLE   = -12,	/*!< Bad handle */
+	ERR_INVMSR   = -13,	/*!< Invalid MSR */
+	ERR_INVCNB   = -14,	/*!< Invalid core number */
+	ERR_HANDLE_R = -15,	/*!< Error on handle read */
+	ERR_INVRANGE = -16,	/*!< Invalid given range */
 } cpu_error_t;
 
 /**
@@ -668,7 +669,7 @@ struct cpu_epc_t cpuid_get_epc(int index, const struct cpu_raw_data_t* raw);
 const char* cpuid_lib_version(void);
 
 #ifdef __cplusplus
-}; /* extern "C" */
+} /* extern "C" */
 #endif
 
 

src/3rdparty/libcpuid/libcpuid_internal.h

@@ -75,8 +75,9 @@ enum _intel_bits_t {
 	_3                      = LBIT( 14 ),
 	_5                      = LBIT( 15 ),
 	_7                      = LBIT( 16 ),
-	XEON_                   = LBIT( 17 ),
-	ATOM_                   = LBIT( 18 ),
+	_9                      = LBIT( 17 ),
+	XEON_                   = LBIT( 18 ),
+	ATOM_                   = LBIT( 19 ),
 };
 typedef enum _intel_bits_t intel_bits_t;
 

src/3rdparty/libcpuid/libcpuid_types.h

@@ -32,6 +32,32 @@
 #ifndef __LIBCPUID_TYPES_H__
 #define __LIBCPUID_TYPES_H__
 
+#if !defined(_MSC_VER) || _MSC_VER >= 1600
 #  include <stdint.h>
+#else
+/* we have to provide our own: */
+#  if !defined(__int32_t_defined)
+typedef int int32_t;
+#  endif
+
+#  if !defined(__uint32_t_defined)
+typedef unsigned uint32_t;
+#  endif
+
+typedef signed char		int8_t;
+typedef unsigned char		uint8_t;
+typedef signed short		int16_t;
+typedef unsigned short		uint16_t;
+#if (defined _MSC_VER) && (_MSC_VER <= 1300)
+	/* MSVC 6.0: no long longs ... */
+	typedef signed __int64		int64_t;
+	typedef unsigned __int64	uint64_t;
+#else
+	/* all other sane compilers: */
+	typedef signed long long   int64_t;
+	typedef unsigned long long uint64_t;
+#endif
+
+#endif
 
 #endif /* __LIBCPUID_TYPES_H__ */

src/3rdparty/libcpuid/recog_amd.c

@@ -49,6 +49,10 @@ enum _amd_model_codes_t {
 	_1400,
 	_1500,
 	_1600,
+	_1900,
+	_2400,
+	_2500,
+	_2700,
 };
 
 static void load_amd_features(struct cpu_raw_data_t* raw, struct cpu_id_t* data)

src/3rdparty/libcpuid/recog_intel.c

@@ -376,7 +376,7 @@ static intel_code_and_bits_t get_brand_code_and_bits(struct cpu_id_t* data)
 			bits |= bit_matchtable[i].bit;
 	}
 	
-	if ((i = match_pattern(bs, "Core(TM) [im][357]")) != 0) {
+	if ((i = match_pattern(bs, "Core(TM) [im][3579]")) != 0) {
 		bits |= CORE_;
 		i--;
 		switch (bs[i + 9]) {
@@ -387,6 +387,7 @@ static intel_code_and_bits_t get_brand_code_and_bits(struct cpu_id_t* data)
 			case '3': bits |= _3; break;
 			case '5': bits |= _5; break;
 			case '7': bits |= _7; break;
+			case '9': bits |= _9; break;
 		}
 	}
 	for (i = 0; i < COUNT_OF(matchtable); i++)

src/App.cpp

@@ -5,7 +5,9 @@
  * 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 2016-2018 XMRig       <https://github.com/xmrig>, <support@xmrig.com>
+ * Copyright 2018      Lee Clagett <https://github.com/vtnerd>
+ * Copyright 2018      SChernykh   <https://github.com/SChernykh>
+ * Copyright 2016-2019 XMRig       <https://github.com/xmrig>, <support@xmrig.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,58 +30,45 @@
 
 #include "api/Api.h"
 #include "App.h"
-#include "Console.h"
+#include "base/io/Console.h"
+#include "base/kernel/Signals.h"
+#include "common/cpu/Cpu.h"
+#include "common/log/Log.h"
+#include "common/Platform.h"
 #include "core/Config.h"
 #include "core/Controller.h"
-#include "Cpu.h"
 #include "crypto/CryptoNight.h"
-#include "log/ConsoleLog.h"
-#include "log/FileLog.h"
-#include "log/Log.h"
 #include "Mem.h"
 #include "net/Network.h"
-#include "Platform.h"
 #include "Summary.h"
 #include "version.h"
 #include "workers/Workers.h"
 
 
 #ifndef XMRIG_NO_HTTPD
-#   include "api/Httpd.h"
+#   include "common/api/Httpd.h"
 #endif
 
 
-App *App::m_self = nullptr;
-
-
-
-App::App(int argc, char **argv) :
+xmrig::App::App(Process *process) :
     m_console(nullptr),
-    m_httpd(nullptr)
+    m_httpd(nullptr),
+    m_signals(nullptr)
 {
-    m_self = this;
-
-    m_controller = new xmrig::Controller();
-    if (m_controller->init(argc, argv) != 0) {
+    m_controller = new Controller(process);
+    if (m_controller->init() != 0) {
         return;
     }
 
     if (!m_controller->config()->isBackground()) {
         m_console = new Console(this);
     }
-
-    uv_signal_init(uv_default_loop(), &m_sigHUP);
-    uv_signal_init(uv_default_loop(), &m_sigINT);
-    uv_signal_init(uv_default_loop(), &m_sigTERM);
 }
 
 
-App::~App()
+xmrig::App::~App()
 {
-    Mem::release();
-
-    uv_tty_reset_mode();
-
+    delete m_signals;
     delete m_console;
     delete m_controller;
 
@@ -89,29 +78,22 @@ App::~App()
 }
 
 
-int App::exec()
+int xmrig::App::exec()
 {
     if (!m_controller->isReady()) {
         return 2;
     }
 
-    uv_signal_start(&m_sigHUP,  App::onSignal, SIGHUP);
-    uv_signal_start(&m_sigINT,  App::onSignal, SIGINT);
-    uv_signal_start(&m_sigTERM, App::onSignal, SIGTERM);
+    m_signals = new Signals(this);
 
     background();
 
-    Mem::allocate(m_controller->config()->algorithm(),
-                  m_controller->config()->threadsCount(),
-                  m_controller->config()->isDoubleHash(),
-                  m_controller->config()->isHugePages()
-                  );
+    Mem::init(m_controller->config()->isHugePages());
 
     Summary::print(m_controller);
 
     if (m_controller->config()->isDryRun()) {
         LOG_NOTICE("OK");
-        release();
 
         return 0;
     }
@@ -138,12 +120,11 @@ int App::exec()
     const int r = uv_run(uv_default_loop(), UV_RUN_DEFAULT);
     uv_loop_close(uv_default_loop());
 
-    release();
     return r;
 }
 
 
-void App::onConsoleCommand(char command)
+void xmrig::App::onConsoleCommand(char command)
 {
     switch (command) {
     case 'h':
@@ -178,21 +159,7 @@ void App::onConsoleCommand(char command)
 }
 
 
-void App::close()
-{
-    m_controller->network()->stop();
-    Workers::stop();
-
-    uv_stop(uv_default_loop());
-}
-
-
-void App::release()
-{
-}
-
-
-void App::onSignal(uv_signal_t *handle, int signum)
+void xmrig::App::onSignal(int signum)
 {
     switch (signum)
     {
@@ -209,9 +176,23 @@ void App::onSignal(uv_signal_t *handle, int signum)
         break;
 
     default:
-        break;
+        return;
     }
 
-    uv_signal_stop(handle);
-    m_self->close();
+    close();
+}
+
+
+void xmrig::App::close()
+{
+#   ifndef XMRIG_NO_HTTPD
+    m_httpd->stop();
+#   endif
+
+    m_signals->stop();
+    m_console->stop();
+    m_controller->stop();
+
+    Workers::stop();
+    Log::release();
 }

src/App.h

@@ -5,7 +5,9 @@
  * 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 2016-2018 XMRig       <https://github.com/xmrig>, <support@xmrig.com>
+ * Copyright 2018      Lee Clagett <https://github.com/vtnerd>
+ * Copyright 2018-2019 SChernykh   <https://github.com/SChernykh>
+ * Copyright 2016-2019 XMRig       <https://github.com/xmrig>, <support@xmrig.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
@@ -21,54 +23,49 @@
  *   along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef __APP_H__
-#define __APP_H__
+#ifndef XMRIG_APP_H
+#define XMRIG_APP_H
 
 
-#include <uv.h>
-
-
-#include "interfaces/IConsoleListener.h"
-
-
-class Console;
-class Httpd;
-class Network;
-class Options;
+#include "base/kernel/interfaces/IConsoleListener.h"
+#include "base/kernel/interfaces/ISignalListener.h"
 
 
 namespace xmrig {
+
+
+class Console;
 class Controller;
-}
+class Httpd;
+class Network;
+class Process;
+class Signals;
 
 
-class App : public IConsoleListener
+class App : public IConsoleListener, public ISignalListener
 {
 public:
-  App(int argc, char **argv);
-  ~App();
+    App(Process *process);
+    ~App() override;
 
     int exec();
 
 protected:
     void onConsoleCommand(char command) override;
+    void onSignal(int signum) override;
 
 private:
     void background();
     void close();
-  void release();
-
-  static void onSignal(uv_signal_t *handle, int signum);
-
-  static App *m_self;
 
     Console *m_console;
+    Controller *m_controller;
     Httpd *m_httpd;
-  uv_signal_t m_sigHUP;
-  uv_signal_t m_sigINT;
-  uv_signal_t m_sigTERM;
-  xmrig::Controller *m_controller;
+    Signals *m_signals;
 };
 
 
-#endif /* __APP_H__ */
+} /* namespace xmrig */
+
+
+#endif /* XMRIG_APP_H */

src/App_unix.cpp

@@ -5,7 +5,8 @@
  * 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 2016-2018 XMRig       <https://github.com/xmrig>, <support@xmrig.com>
+ * Copyright 2018-2019 SChernykh   <https://github.com/SChernykh>
+ * Copyright 2016-2019 XMRig       <https://github.com/xmrig>, <support@xmrig.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
@@ -29,21 +30,15 @@
 
 
 #include "App.h"
+#include "common/log/Log.h"
 #include "core/Config.h"
 #include "core/Controller.h"
-#include "Cpu.h"
-#include "log/Log.h"
 
 
-void App::background()
+void xmrig::App::background()
 {
     signal(SIGPIPE, SIG_IGN);
 
-    const int64_t affinity = m_controller->config()->affinity();
-    if (affinity != -1L) {
-        Cpu::setAffinity(-1, affinity);
-    }
-
     if (!m_controller->config()->isBackground()) {
         return;
     }

src/App_win.cpp

@@ -5,7 +5,8 @@
  * 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 2016-2018 XMRig       <https://github.com/xmrig>, <support@xmrig.com>
+ * Copyright 2018-2019 SChernykh   <https://github.com/SChernykh>
+ * Copyright 2016-2019 XMRig       <https://github.com/xmrig>, <support@xmrig.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
@@ -27,18 +28,12 @@
 
 
 #include "App.h"
-#include "Cpu.h"
 #include "core/Controller.h"
 #include "core/Config.h"
 
 
-void App::background()
+void xmrig::App::background()
 {
-    const int64_t affinity = m_controller->config()->affinity();
-    if (affinity != -1L) {
-        Cpu::setAffinity(-1, affinity);
-    }
-
     if (!m_controller->config()->isBackground()) {
         return;
     }

src/Cpu.cpp

@@ -1,135 +0,0 @@
-/* XMRig
- * 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 2016-2018 XMRig       <https://github.com/xmrig>, <support@xmrig.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
- *   the Free Software Foundation, either version 3 of the License, or
- *   (at your option) any later version.
- *
- *   This program is distributed in the hope that it will be useful,
- *   but WITHOUT ANY WARRANTY; without even the implied warranty of
- *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- *   GNU General Public License for more details.
- *
- *   You should have received a copy of the GNU General Public License
- *   along with this program. If not, see <http://www.gnu.org/licenses/>.
- */
-
-
-#include <libcpuid.h>
-#include <math.h>
-#include <string.h>
-
-#include "Cpu.h"
-
-
-bool Cpu::m_l2_exclusive = false;
-char Cpu::m_brand[64]    = { 0 };
-int Cpu::m_flags         = 0;
-int Cpu::m_l2_cache      = 0;
-int Cpu::m_l3_cache      = 0;
-int Cpu::m_sockets       = 1;
-int Cpu::m_totalCores    = 0;
-int Cpu::m_totalThreads  = 0;
-
-
-int Cpu::optimalThreadsCount(xmrig::Algo algo, bool doubleHash, int maxCpuUsage)
-{
-    if (m_totalThreads == 1) {
-        return 1;
-    }
-
-    int cache = 0;
-    if (m_l3_cache) {
-        cache = m_l2_exclusive ? (m_l2_cache + m_l3_cache) : m_l3_cache;
-    }
-    else {
-        cache = m_l2_cache;
-    }
-
-    int count = 0;
-    int size  = 2048;
-
-    if (algo == xmrig::CRYPTONIGHT_LITE) {
-        size = 1024;
-    }
-    else if (algo == xmrig::CRYPTONIGHT_HEAVY) {
-        size = 4096;
-    }
-
-    if (doubleHash) {
-        size *= 2;
-    }
-
-    if (cache) {
-        count = cache / size;
-    }
-    else {
-        count = m_totalThreads / 2;
-    }
-
-    if (count > m_totalThreads) {
-        count = m_totalThreads;
-    }
-
-    if (((float) count / m_totalThreads * 100) > maxCpuUsage) {
-        count = (int) ceil((float) m_totalThreads * (maxCpuUsage / 100.0));
-    }
-
-    return count < 1 ? 1 : count;
-}
-
-
-void Cpu::initCommon()
-{
-    struct cpu_raw_data_t raw = { 0 };
-    struct cpu_id_t data = { 0 };
-
-    cpuid_get_raw_data(&raw);
-    cpu_identify(&raw, &data);
-
-    strncpy(m_brand, data.brand_str, sizeof(m_brand) - 1);
-
-    m_totalThreads = data.total_logical_cpus;
-    m_sockets      = m_totalThreads / data.num_logical_cpus;
-
-    if (m_sockets == 0) {
-        m_sockets = 1;
-    }
-
-    m_totalCores = data.num_cores * m_sockets;
-    m_l3_cache = data.l3_cache > 0 ? data.l3_cache * m_sockets : 0;
-
-    // Workaround for AMD CPUs https://github.com/anrieff/libcpuid/issues/97
-    if (data.vendor == VENDOR_AMD && data.ext_family >= 0x15 && data.ext_family < 0x17) {
-        m_l2_cache = data.l2_cache * (m_totalCores / 2) * m_sockets;
-        m_l2_exclusive = true;
-    }
-    // Workaround for Intel Pentium Dual-Core, Core Duo, Core 2 Duo, Core 2 Quad and their Xeon homologue
-    // These processors have L2 cache shared by 2 cores.
-    else if (data.vendor == VENDOR_INTEL && data.ext_family == 0x06 && (data.ext_model == 0x0E || data.ext_model == 0x0F || data.ext_model == 0x17)) {
-        int l2_count_per_socket = m_totalCores > 1 ? m_totalCores / 2 : 1;
-        m_l2_cache = data.l2_cache > 0 ? data.l2_cache * l2_count_per_socket * m_sockets : 0;
-    }
-    else{
-        m_l2_cache = data.l2_cache > 0 ? data.l2_cache * m_totalCores * m_sockets : 0;
-    }
-
-#   if defined(__x86_64__) || defined(_M_AMD64)
-    m_flags |= X86_64;
-#   endif
-
-    if (data.flags[CPU_FEATURE_AES]) {
-        m_flags |= AES;
-    }
-
-    if (data.flags[CPU_FEATURE_BMI2]) {
-        m_flags |= BMI2;
-    }
-}

src/Cpu.h

@@ -1,70 +0,0 @@
-/* XMRig
- * 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 2016-2018 XMRig       <https://github.com/xmrig>, <support@xmrig.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
- *   the Free Software Foundation, either version 3 of the License, or
- *   (at your option) any later version.
- *
- *   This program is distributed in the hope that it will be useful,
- *   but WITHOUT ANY WARRANTY; without even the implied warranty of
- *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- *   GNU General Public License for more details.
- *
- *   You should have received a copy of the GNU General Public License
- *   along with this program. If not, see <http://www.gnu.org/licenses/>.
- */
-
-#ifndef __CPU_H__
-#define __CPU_H__
-
-
-#include <stdint.h>
-
-
-#include "xmrig.h"
-
-
-class Cpu
-{
-public:
-    enum Flags {
-        X86_64 = 1,
-        AES    = 2,
-        BMI2   = 4
-    };
-
-    static int optimalThreadsCount(xmrig::Algo algo, bool doubleHash, int maxCpuUsage);
-    static void init();
-    static void setAffinity(int id, uint64_t mask);
-
-    static inline bool hasAES()       { return (m_flags & AES) != 0; }
-    static inline bool isX64()        { return (m_flags & X86_64) != 0; }
-    static inline const char *brand() { return m_brand; }
-    static inline int cores()         { return m_totalCores; }
-    static inline int l2()            { return m_l2_cache; }
-    static inline int l3()            { return m_l3_cache; }
-    static inline int sockets()       { return m_sockets; }
-    static inline int threads()       { return m_totalThreads; }
-
-private:
-    static void initCommon();
-
-    static bool m_l2_exclusive;
-    static char m_brand[64];
-    static int m_flags;
-    static int m_l2_cache;
-    static int m_l3_cache;
-    static int m_sockets;
-    static int m_totalCores;
-    static int m_totalThreads;
-};
-
-
-#endif /* __CPU_H__ */

src/Cpu_arm.cpp

@@ -1,54 +0,0 @@
-/* XMRig
- * 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 2016-2017 XMRig       <support@xmrig.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
- *   the Free Software Foundation, either version 3 of the License, or
- *   (at your option) any later version.
- *
- *   This program is distributed in the hope that it will be useful,
- *   but WITHOUT ANY WARRANTY; without even the implied warranty of
- *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- *   GNU General Public License for more details.
- *
- *   You should have received a copy of the GNU General Public License
- *   along with this program. If not, see <http://www.gnu.org/licenses/>.
- */
-
-
-#include <string.h>
-
-
-#include "Cpu.h"
-
-
-char Cpu::m_brand[64]   = { 0 };
-int Cpu::m_flags        = 0;
-int Cpu::m_l2_cache     = 0;
-int Cpu::m_l3_cache     = 0;
-int Cpu::m_sockets      = 1;
-int Cpu::m_totalCores   = 0;
-int Cpu::m_totalThreads = 0;
-
-
-int Cpu::optimalThreadsCount(xmrig::Algo algo, bool doubleHash, int maxCpuUsage)
-{
-    return m_totalThreads;
-}
-
-
-void Cpu::initCommon()
-{
-    memcpy(m_brand, "Unknown", 7);
-
-#   if defined(XMRIG_ARMv8)
-    m_flags |= X86_64;
-    m_flags |= AES;
-#   endif
-}

src/Cpu_mac.cpp

@@ -1,45 +0,0 @@
-/* XMRig
- * 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 2016-2017 XMRig       <support@xmrig.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
- *   the Free Software Foundation, either version 3 of the License, or
- *   (at your option) any later version.
- *
- *   This program is distributed in the hope that it will be useful,
- *   but WITHOUT ANY WARRANTY; without even the implied warranty of
- *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- *   GNU General Public License for more details.
- *
- *   You should have received a copy of the GNU General Public License
- *   along with this program. If not, see <http://www.gnu.org/licenses/>.
- */
-
-
-#include <pthread.h>
-#include <sched.h>
-#include <unistd.h>
-
-
-#include "Cpu.h"
-
-
-void Cpu::init()
-{
-#   ifdef XMRIG_NO_LIBCPUID
-    m_totalThreads = sysconf(_SC_NPROCESSORS_CONF);
-#   endif
-
-    initCommon();
-}
-
-
-void Cpu::setAffinity(int id, uint64_t mask)
-{
-}

src/Cpu_unix.cpp

@@ -1,79 +0,0 @@
-/* XMRig
- * 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 2016-2017 XMRig       <support@xmrig.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
- *   the Free Software Foundation, either version 3 of the License, or
- *   (at your option) any later version.
- *
- *   This program is distributed in the hope that it will be useful,
- *   but WITHOUT ANY WARRANTY; without even the implied warranty of
- *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- *   GNU General Public License for more details.
- *
- *   You should have received a copy of the GNU General Public License
- *   along with this program. If not, see <http://www.gnu.org/licenses/>.
- */
-
-
-#ifdef __FreeBSD__
-#   include <sys/types.h>
-#   include <sys/param.h>
-#   include <sys/cpuset.h>
-#   include <pthread_np.h>
-#endif
-
-
-#include <pthread.h>
-#include <sched.h>
-#include <unistd.h>
-#include <string.h>
-
-
-#include "Cpu.h"
-
-
-#ifdef __FreeBSD__
-typedef cpuset_t cpu_set_t;
-#endif
-
-
-void Cpu::init()
-{
-#   ifdef XMRIG_NO_LIBCPUID
-    m_totalThreads = sysconf(_SC_NPROCESSORS_CONF);
-#   endif
-
-    initCommon();
-}
-
-
-void Cpu::setAffinity(int id, uint64_t mask)
-{
-    cpu_set_t set;
-    CPU_ZERO(&set);
-
-    for (int i = 0; i < m_totalThreads; i++) {
-        if (mask & (1UL << i)) {
-            CPU_SET(i, &set);
-        }
-    }
-
-    if (id == -1) {
-#       ifndef __FreeBSD__
-        sched_setaffinity(0, sizeof(&set), &set);
-#       endif
-    } else {
-#       ifndef __ANDROID__
-        pthread_setaffinity_np(pthread_self(), sizeof(&set), &set);
-#       else
-        sched_setaffinity(gettid(), sizeof(&set), &set);
-#       endif
-    }
-}

src/Mem.cpp

@@ -6,7 +6,8 @@
  * Copyright 2016      Jay D Dee   <jayddee246@gmail.com>
  * Copyright 2017-2018 XMR-Stak    <https://github.com/fireice-uk>, <https://github.com/psychocrypt>
  * Copyright 2018      Lee Clagett <https://github.com/vtnerd>
- * Copyright 2016-2018 XMRig       <https://github.com/xmrig>, <support@xmrig.com>
+ * Copyright 2018-2019 SChernykh   <https://github.com/SChernykh>
+ * Copyright 2016-2019 XMRig       <https://github.com/xmrig>, <support@xmrig.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
@@ -23,70 +24,54 @@
  */
 
 
-#include <memory.h>
-
-
+#include "common/utils/mm_malloc.h"
 #include "crypto/CryptoNight.h"
 #include "crypto/CryptoNight_constants.h"
 #include "Mem.h"
 
 
-bool Mem::m_doubleHash             = false;
-int Mem::m_algo                    = 0;
+bool Mem::m_enabled = true;
 int Mem::m_flags    = 0;
-int Mem::m_threads                 = 0;
-size_t Mem::m_offset               = 0;
-size_t Mem::m_size                 = 0;
-alignas(16) uint8_t *Mem::m_memory = nullptr;
 
 
-cryptonight_ctx *Mem::create(int threadId)
+MemInfo Mem::create(cryptonight_ctx **ctx, xmrig::Algo algorithm, size_t count)
 {
-#   ifndef XMRIG_NO_AEON
-    if (m_algo == xmrig::CRYPTONIGHT_LITE) {
-        return createLite(threadId);
+    using namespace xmrig;
+
+    MemInfo info;
+    info.size = cn_select_memory(algorithm) * count;
+
+    constexpr const size_t align_size = 2 * 1024 * 1024;
+    info.size  = ((info.size + align_size - 1) / align_size) * align_size;
+    info.pages = info.size / align_size;
+
+    allocate(info, m_enabled);
+
+    for (size_t i = 0; i < count; ++i) {
+        cryptonight_ctx *c = static_cast<cryptonight_ctx *>(_mm_malloc(sizeof(cryptonight_ctx), 4096));
+        c->memory          = info.memory + (i * cn_select_memory(algorithm));
+
+        uint8_t* p = reinterpret_cast<uint8_t*>(allocateExecutableMemory(0x4000));
+        c->generated_code  = reinterpret_cast<cn_mainloop_fun_ms_abi>(p);
+        c->generated_code_double = reinterpret_cast<cn_mainloop_fun_ms_abi>(p + 0x2000);
+
+        c->generated_code_data.variant = xmrig::VARIANT_MAX;
+        c->generated_code_data.height = (uint64_t)(-1);
+        c->generated_code_double_data = c->generated_code_data;
+
+        ctx[i] = c;
     }
-#   endif
 
-    const size_t size = m_algo == xmrig::CRYPTONIGHT_HEAVY ? xmrig::cn_select_memory<xmrig::CRYPTONIGHT_HEAVY>()
-                                                           : xmrig::cn_select_memory<xmrig::CRYPTONIGHT>();
-
-    cryptonight_ctx *ctx = reinterpret_cast<cryptonight_ctx *>(&m_memory[size - sizeof(cryptonight_ctx) * (threadId + 1)]);
-
-    const int ratio = m_doubleHash ? 2 : 1;
-    ctx->memory = &m_memory[size * (threadId * ratio + 1)];
-
-    return ctx;
+    return info;
 }
 
 
-
-void *Mem::calloc(size_t num, size_t size)
+void Mem::release(cryptonight_ctx **ctx, size_t count, MemInfo &info)
 {
-    void *mem = &m_memory[m_offset];
-    m_offset += (num * size);
+    release(info);
 
-    memset(mem, 0, num * size);
-
-    return mem;
+    for (size_t i = 0; i < count; ++i) {
+        _mm_free(ctx[i]);
+    }
 }
 
-
-#ifndef XMRIG_NO_AEON
-cryptonight_ctx *Mem::createLite(int threadId) {
-    cryptonight_ctx *ctx;
-
-    if (!m_doubleHash) {
-        const size_t offset = MONERO_MEMORY * (threadId + 1);
-
-        ctx = reinterpret_cast<cryptonight_ctx *>(&m_memory[offset + AEON_MEMORY]);
-        ctx->memory = &m_memory[offset];
-        return ctx;
-    }
-
-    ctx = reinterpret_cast<cryptonight_ctx *>(&m_memory[MONERO_MEMORY - sizeof(cryptonight_ctx) * (threadId + 1)]);
-    ctx->memory = &m_memory[MONERO_MEMORY * (threadId + 1)];
-
-    return ctx;
-}
-#endif

src/Mem.h

@@ -6,7 +6,8 @@
  * Copyright 2016      Jay D Dee   <jayddee246@gmail.com>
  * Copyright 2017-2018 XMR-Stak    <https://github.com/fireice-uk>, <https://github.com/psychocrypt>
  * Copyright 2018      Lee Clagett <https://github.com/vtnerd>
- * Copyright 2016-2018 XMRig       <https://github.com/xmrig>, <support@xmrig.com>
+ * Copyright 2018-2019 SChernykh   <https://github.com/SChernykh>
+ * Copyright 2016-2019 XMRig       <https://github.com/xmrig>, <support@xmrig.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
@@ -22,20 +23,30 @@
  *   along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef __MEM_H__
-#define __MEM_H__
+#ifndef XMRIG_MEM_H
+#define XMRIG_MEM_H
 
 
 #include <stddef.h>
 #include <stdint.h>
 
 
-#include "xmrig.h"
+#include "common/xmrig.h"
 
 
 struct cryptonight_ctx;
 
 
+struct MemInfo
+{
+    alignas(16) uint8_t *memory;
+
+    size_t hugePages;
+    size_t pages;
+    size_t size;
+};
+
+
 class Mem
 {
 public:
@@ -45,30 +56,23 @@ public:
         Lock               = 4
     };
 
-    static bool allocate(xmrig::Algo algo, int threads, bool doubleHash, bool enabled);
-    static cryptonight_ctx *create(int threadId);
-    static void *calloc(size_t num, size_t size);
-    static void release();
+    static MemInfo create(cryptonight_ctx **ctx, xmrig::Algo algorithm, size_t count);
+    static void init(bool enabled);
+    static void release(cryptonight_ctx **ctx, size_t count, MemInfo &info);
+
+    static void *allocateExecutableMemory(size_t size);
+    static void protectExecutableMemory(void *p, size_t size);
+    static void flushInstructionCache(void *p, size_t size);
 
-    static inline bool isDoubleHash()         { return m_doubleHash; }
     static inline bool isHugepagesAvailable() { return (m_flags & HugepagesAvailable) != 0; }
-    static inline bool isHugepagesEnabled()   { return (m_flags & HugepagesEnabled) != 0; }
-    static inline int flags()                 { return m_flags; }
-    static inline int threads()               { return m_threads; }
 
 private:
-    static bool m_doubleHash;
-    static int m_algo;
-    static int m_flags;
-    static int m_threads;
-    static size_t m_offset;
-    static size_t m_size;
-    alignas(16) static uint8_t *m_memory;
+    static void allocate(MemInfo &info, bool enabled);
+    static void release(MemInfo &info);
 
-#   ifndef XMRIG_NO_AEON
-    static cryptonight_ctx *createLite(int threadId);
-#   endif
+    static int m_flags;
+    static bool m_enabled;
 };
 
 
-#endif /* __MEM_H__ */
+#endif /* XMRIG_MEM_H */

src/Mem_unix.cpp

@@ -6,7 +6,8 @@
  * Copyright 2016      Jay D Dee   <jayddee246@gmail.com>
  * Copyright 2017-2018 XMR-Stak    <https://github.com/fireice-uk>, <https://github.com/psychocrypt>
  * Copyright 2018      Lee Clagett <https://github.com/vtnerd>
- * Copyright 2016-2018 XMRig       <https://github.com/xmrig>, <support@xmrig.com>
+ * Copyright 2018-2019 SChernykh   <https://github.com/SChernykh>
+ * Copyright 2016-2019 XMRig       <https://github.com/xmrig>, <support@xmrig.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
@@ -27,75 +28,87 @@
 #include <sys/mman.h>
 
 
-#if defined(XMRIG_ARM) && !defined(__clang__)
-#   include "aligned_malloc.h"
-#else
-#   include <mm_malloc.h>
-#endif
-
-
+#include "common/log/Log.h"
+#include "common/utils/mm_malloc.h"
+#include "common/xmrig.h"
 #include "crypto/CryptoNight.h"
-#include "log/Log.h"
 #include "Mem.h"
-#include "xmrig.h"
 
 
-bool Mem::allocate(xmrig::Algo algo, int threads, bool doubleHash, bool enabled)
+void Mem::init(bool enabled)
 {
-    m_algo       = algo;
-    m_threads    = threads;
-    m_doubleHash = doubleHash;
-
-    const int ratio = (doubleHash && algo != xmrig::CRYPTONIGHT_LITE) ? 2 : 1;
-    m_size          = MONERO_MEMORY * (threads * ratio + 1);
-
-    if (algo == xmrig::CRYPTONIGHT_HEAVY) {
-        m_size *= 2;
+    m_enabled = enabled;
 }
 
+
+void Mem::allocate(MemInfo &info, bool enabled)
+{
+    info.hugePages = 0;
+
     if (!enabled) {
-        m_memory = static_cast<uint8_t*>(_mm_malloc(m_size, 16));
-        return true;
-    }
+        info.memory = static_cast<uint8_t*>(_mm_malloc(info.size, 4096));
 
-    m_flags |= HugepagesAvailable;
+        return;
+    }
 
 #   if defined(__APPLE__)
-    m_memory = static_cast<uint8_t*>(mmap(0, m_size, PROT_READ | PROT_WRITE, MAP_PRIVATE | MAP_ANON, VM_FLAGS_SUPERPAGE_SIZE_2MB, 0));
+    info.memory = static_cast<uint8_t*>(mmap(0, info.size, PROT_READ | PROT_WRITE, MAP_PRIVATE | MAP_ANON, VM_FLAGS_SUPERPAGE_SIZE_2MB, 0));
 #   elif defined(__FreeBSD__)
-    m_memory = static_cast<uint8_t*>(mmap(0, m_size, PROT_READ | PROT_WRITE, MAP_PRIVATE | MAP_ANONYMOUS | MAP_ALIGNED_SUPER | MAP_PREFAULT_READ, -1, 0));
+    info.memory = static_cast<uint8_t*>(mmap(0, info.size, PROT_READ | PROT_WRITE, MAP_PRIVATE | MAP_ANONYMOUS | MAP_ALIGNED_SUPER | MAP_PREFAULT_READ, -1, 0));
 #   else
-    m_memory = static_cast<uint8_t*>(mmap(0, m_size, PROT_READ | PROT_WRITE, MAP_PRIVATE | MAP_ANONYMOUS | MAP_HUGETLB | MAP_POPULATE, 0, 0));
+    info.memory = static_cast<uint8_t*>(mmap(0, info.size, PROT_READ | PROT_WRITE, MAP_PRIVATE | MAP_ANONYMOUS | MAP_HUGETLB | MAP_POPULATE, 0, 0));
 #   endif
-    if (m_memory == MAP_FAILED) {
-        m_memory = static_cast<uint8_t*>(_mm_malloc(m_size, 16));
-        return true;
+
+    if (info.memory == MAP_FAILED) {
+        return allocate(info, false);;
     }
 
-    m_flags |= HugepagesEnabled;
+    info.hugePages = info.pages;
 
-    if (madvise(m_memory, m_size, MADV_RANDOM | MADV_WILLNEED) != 0) {
+    if (madvise(info.memory, info.size, MADV_RANDOM | MADV_WILLNEED) != 0) {
         LOG_ERR("madvise failed");
     }
 
-    if (mlock(m_memory, m_size) == 0) {
+    if (mlock(info.memory, info.size) == 0) {
         m_flags |= Lock;
     }
-
-    return true;
 }
 
 
-void Mem::release()
+void Mem::release(MemInfo &info)
 {
-    if (m_flags & HugepagesEnabled) {
+    if (info.hugePages) {
         if (m_flags & Lock) {
-            munlock(m_memory, m_size);
+            munlock(info.memory, info.size);
         }
 
-        munmap(m_memory, m_size);
+        munmap(info.memory, info.size);
     }
     else {
-        _mm_free(m_memory);
+        _mm_free(info.memory);
     }
 }
+
+
+void *Mem::allocateExecutableMemory(size_t size)
+{
+#   if defined(__APPLE__)
+    return mmap(0, size, PROT_READ | PROT_WRITE | PROT_EXEC, MAP_PRIVATE | MAP_ANON, -1, 0);
+#   else
+    return mmap(0, size, PROT_READ | PROT_WRITE | PROT_EXEC, MAP_PRIVATE | MAP_ANONYMOUS, -1, 0);
+#   endif
+}
+
+
+void Mem::protectExecutableMemory(void *p, size_t size)
+{
+    mprotect(p, size, PROT_READ | PROT_EXEC);
+}
+
+
+void Mem::flushInstructionCache(void *p, size_t size)
+{
+#   ifndef __FreeBSD__
+    __builtin___clear_cache(reinterpret_cast<char*>(p), reinterpret_cast<char*>(p) + size);
+#   endif
+}

src/Mem_win.cpp

@@ -6,7 +6,8 @@
  * Copyright 2016      Jay D Dee   <jayddee246@gmail.com>
  * Copyright 2017-2018 XMR-Stak    <https://github.com/fireice-uk>, <https://github.com/psychocrypt>
  * Copyright 2018      Lee Clagett <https://github.com/vtnerd>
- * Copyright 2016-2018 XMRig       <https://github.com/xmrig>, <support@xmrig.com>
+ * Copyright 2018-2019 SChernykh   <https://github.com/SChernykh>
+ * Copyright 2016-2019 XMRig       <https://github.com/xmrig>, <support@xmrig.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,16 +29,13 @@
 #include <ntsecapi.h>
 #include <tchar.h>
 
-#ifdef __GNUC__
-#   include <mm_malloc.h>
-#else
-#   include <malloc.h>
-#endif
 
-#include "log/Log.h"
+#include "common/log/Log.h"
+#include "common/utils/mm_malloc.h"
+#include "common/xmrig.h"
 #include "crypto/CryptoNight.h"
+#include "crypto/CryptoNight_constants.h"
 #include "Mem.h"
-#include "xmrig.h"
 
 
 /*****************************************************************
@@ -145,46 +143,62 @@ static BOOL TrySetLockPagesPrivilege() {
 }
 
 
-bool Mem::allocate(xmrig::Algo algo, int threads, bool doubleHash, bool enabled)
+void Mem::init(bool enabled)
 {
-    m_algo       = algo;
-    m_threads    = threads;
-    m_doubleHash = doubleHash;
+    m_enabled = enabled;
 
-    const int ratio = (doubleHash && algo != xmrig::CRYPTONIGHT_LITE) ? 2 : 1;
-    m_size          = MONERO_MEMORY * (threads * ratio + 1);
-
-    if (algo == xmrig::CRYPTONIGHT_HEAVY) {
-        m_size *= 2;
-    }
-
-    if (!enabled) {
-        m_memory = static_cast<uint8_t*>(_mm_malloc(m_size, 16));
-        return true;
-    }
-
-    if (TrySetLockPagesPrivilege()) {
+    if (enabled && TrySetLockPagesPrivilege()) {
         m_flags |= HugepagesAvailable;
     }
-
-    m_memory = static_cast<uint8_t*>(VirtualAlloc(NULL, m_size, MEM_COMMIT | MEM_RESERVE | MEM_LARGE_PAGES, PAGE_READWRITE));
-    if (!m_memory) {
-        m_memory = static_cast<uint8_t*>(_mm_malloc(m_size, 16));
-    }
-    else {
-        m_flags |= HugepagesEnabled;
-    }
-
-    return true;
 }
 
 
-void Mem::release()
+void Mem::allocate(MemInfo &info, bool enabled)
 {
-    if (m_flags & HugepagesEnabled) {
-        VirtualFree(m_memory, 0, MEM_RELEASE);
+    info.hugePages = 0;
+
+    if (!enabled) {
+        info.memory = static_cast<uint8_t*>(_mm_malloc(info.size, 4096));
+
+        return;
+    }
+
+    info.memory = static_cast<uint8_t*>(VirtualAlloc(nullptr, info.size, MEM_COMMIT | MEM_RESERVE | MEM_LARGE_PAGES, PAGE_READWRITE));
+    if (info.memory) {
+        info.hugePages = info.pages;
+
+        return;
+    }
+
+    allocate(info, false);
+}
+
+
+void Mem::release(MemInfo &info)
+{
+    if (info.hugePages) {
+        VirtualFree(info.memory, 0, MEM_RELEASE);
     }
     else {
-        _mm_free(m_memory);
+        _mm_free(info.memory);
     }
 }
+
+
+void *Mem::allocateExecutableMemory(size_t size)
+{
+    return VirtualAlloc(0, size, MEM_COMMIT | MEM_RESERVE, PAGE_EXECUTE_READWRITE);
+}
+
+
+void Mem::protectExecutableMemory(void *p, size_t size)
+{
+    DWORD oldProtect;
+    VirtualProtect(p, size, PAGE_EXECUTE_READ, &oldProtect);
+}
+
+
+void Mem::flushInstructionCache(void *p, size_t size)
+{
+    ::FlushInstructionCache(GetCurrentProcess(), p, size);
+}

src/Platform.cpp

@@ -1,62 +0,0 @@
-/* XMRig
- * 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 2016-2017 XMRig       <support@xmrig.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
- *   the Free Software Foundation, either version 3 of the License, or
- *   (at your option) any later version.
- *
- *   This program is distributed in the hope that it will be useful,
- *   but WITHOUT ANY WARRANTY; without even the implied warranty of
- *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- *   GNU General Public License for more details.
- *
- *   You should have received a copy of the GNU General Public License
- *   along with this program. If not, see <http://www.gnu.org/licenses/>.
- */
-
-
-#include <string.h>
-#include <uv.h>
-
-
-#include "Platform.h"
-
-
-char *Platform::m_defaultConfigName = nullptr;
-char *Platform::m_userAgent         = nullptr;
-
-
-const char *Platform::defaultConfigName()
-{
-    size_t size = 520;
-
-    if (m_defaultConfigName == nullptr) {
-        m_defaultConfigName = new char[size];
-    }
-
-    if (uv_exepath(m_defaultConfigName, &size) < 0) {
-        return nullptr;
-    }
-
-    if (size < 500) {
-#       ifdef WIN32
-        char *p = strrchr(m_defaultConfigName, '\\');
-#       else
-        char *p = strrchr(m_defaultConfigName, '/');
-#       endif
-
-        if (p) {
-            strcpy(p + 1, "config.json");
-            return m_defaultConfigName;
-        }
-    }
-
-    return nullptr;
-}

src/Platform_mac.cpp

@@ -1,109 +0,0 @@
-/* XMRig
- * 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 2016-2017 XMRig       <support@xmrig.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
- *   the Free Software Foundation, either version 3 of the License, or
- *   (at your option) any later version.
- *
- *   This program is distributed in the hope that it will be useful,
- *   but WITHOUT ANY WARRANTY; without even the implied warranty of
- *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- *   GNU General Public License for more details.
- *
- *   You should have received a copy of the GNU General Public License
- *   along with this program. If not, see <http://www.gnu.org/licenses/>.
- */
-
-
-#include <stdio.h>
-#include <stdlib.h>
-#include <sys/resource.h>
-#include <uv.h>
-
-
-#include "Platform.h"
-#include "version.h"
-
-#ifdef XMRIG_NVIDIA_PROJECT
-#   include "nvidia/cryptonight.h"
-#endif
-
-
-static inline char *createUserAgent()
-{
-    const size_t max = 160;
-
-    char *buf = new char[max];
-
-#   ifdef XMRIG_NVIDIA_PROJECT
-    const int cudaVersion = cuda_get_runtime_version();
-    snprintf(buf, max, "%s/%s (Macintosh; Intel Mac OS X) libuv/%s CUDA/%d.%d clang/%d.%d.%d", APP_NAME, APP_VERSION, uv_version_string(), cudaVersion / 1000, cudaVersion % 100, __clang_major__, __clang_minor__, __clang_patchlevel__);
-#   else
-    snprintf(buf, max, "%s/%s (Macintosh; Intel Mac OS X) libuv/%s clang/%d.%d.%d", APP_NAME, APP_VERSION, uv_version_string(), __clang_major__, __clang_minor__, __clang_patchlevel__);
-#   endif
-
-    return buf;
-}
-
-
-void Platform::init(const char *userAgent)
-{
-    m_userAgent = userAgent ? strdup(userAgent) : createUserAgent();
-}
-
-
-void Platform::release()
-{
-    delete [] m_userAgent;
-}
-
-
-void Platform::setProcessPriority(int priority)
-{
-
-}
-
-
-void Platform::setThreadPriority(int priority)
-{
-    if (priority == -1) {
-        return;
-    }
-
-    int prio = 19;
-    switch (priority)
-    {
-    case 1:
-        prio = 5;
-        break;
-
-    case 2:
-        prio = 0;
-        break;
-
-    case 3:
-        prio = -5;
-        break;
-
-    case 4:
-        prio = -10;
-        break;
-
-    case 5:
-        prio = -15;
-        break;
-
-    default:
-        break;
-    }
-
-    setpriority(PRIO_PROCESS, 0, prio);
-}
-

src/Summary.cpp

@@ -4,8 +4,9 @@
  * 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 2016-2018 XMRig       <https://github.com/xmrig>, <support@xmrig.com>
+ * Copyright 2017-2019 XMR-Stak    <https://github.com/fireice-uk>, <https://github.com/psychocrypt>
+ * Copyright 2018-2019 SChernykh   <https://github.com/SChernykh>
+ * Copyright 2016-2019 XMRig       <support@xmrig.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
@@ -27,64 +28,73 @@
 #include <uv.h>
 
 
+#include "base/net/stratum/Pool.h"
+#include "common/cpu/Cpu.h"
+#include "common/log/Log.h"
 #include "core/Config.h"
 #include "core/Controller.h"
-#include "Cpu.h"
-#include "log/Log.h"
+#include "crypto/Asm.h"
 #include "Mem.h"
-#include "net/Url.h"
 #include "Summary.h"
 #include "version.h"
 
 
-static void print_versions(xmrig::Config *config)
-{
-    char buf[16];
+#ifndef XMRIG_NO_ASM
+static const char *coloredAsmNames[] = {
+    "\x1B[1;31mnone\x1B[0m",
+    "auto",
+    "\x1B[1;32mintel\x1B[0m",
+    "\x1B[1;32mryzen\x1B[0m",
+    "\x1B[1;32mbulldozer\x1B[0m"
+};
 
-#   if defined(__clang__)
-    snprintf(buf, 16, " clang/%d.%d.%d", __clang_major__, __clang_minor__, __clang_patchlevel__);
-#   elif defined(__GNUC__)
-    snprintf(buf, 16, " gcc/%d.%d.%d", __GNUC__, __GNUC_MINOR__, __GNUC_PATCHLEVEL__);
-#   elif defined(_MSC_VER)
-    snprintf(buf, 16, " MSVC/%d", MSVC_VERSION);
-#   else
-    buf[0] = '\0';
+
+inline static const char *asmName(xmrig::Assembly assembly, bool colors)
+{
+    return colors ? coloredAsmNames[assembly] : xmrig::Asm::toString(assembly);
+}
 #endif
 
 
-    Log::i()->text(config->isColors() ? "\x1B[01;32m * \x1B[01;37mVERSIONS:     \x1B[01;36mXMRig/%s\x1B[01;37m libuv/%s%s" : " * VERSIONS:     XMRig/%s libuv/%s%s",
-                   APP_VERSION, uv_version_string(), buf);
-}
-
-
 static void print_memory(xmrig::Config *config) {
+#   ifdef _WIN32
     if (config->isColors()) {
-        Log::i()->text("\x1B[01;32m * \x1B[01;37mHUGE PAGES:   %s, %s",
-                       Mem::isHugepagesAvailable() ? "\x1B[01;32mavailable" : "\x1B[01;31munavailable",
-                       Mem::isHugepagesEnabled() ? "\x1B[01;32menabled" : "\x1B[01;31mdisabled");
+        xmrig::Log::i()->text(GREEN_BOLD(" * ") WHITE_BOLD("%-13s") "%s",
+                       "HUGE PAGES", Mem::isHugepagesAvailable() ? "\x1B[1;32mavailable" : "\x1B[01;31munavailable");
     }
     else {
-        Log::i()->text(" * HUGE PAGES:   %s, %s", Mem::isHugepagesAvailable() ? "available" : "unavailable", Mem::isHugepagesEnabled() ? "enabled" : "disabled");
+        xmrig::Log::i()->text(" * %-13s%s", "HUGE PAGES", Mem::isHugepagesAvailable() ? "available" : "unavailable");
     }
+#   endif
 }
 
 
 static void print_cpu(xmrig::Config *config)
 {
+    using namespace xmrig;
+
     if (config->isColors()) {
-        Log::i()->text("\x1B[01;32m * \x1B[01;37mCPU:          %s (%d) %sx64 %sAES-NI",
-                       Cpu::brand(),
-                       Cpu::sockets(),
-                       Cpu::isX64() ? "\x1B[01;32m" : "\x1B[01;31m-",
-                       Cpu::hasAES() ? "\x1B[01;32m" : "\x1B[01;31m-");
+        Log::i()->text(GREEN_BOLD(" * ") WHITE_BOLD("%-13s%s (%d)") " %sx64 %sAES %sAVX2",
+                       "CPU",
+                       Cpu::info()->brand(),
+                       Cpu::info()->sockets(),
+                       Cpu::info()->isX64()   ? "\x1B[1;32m" : "\x1B[1;31m-",
+                       Cpu::info()->hasAES()  ? "\x1B[1;32m" : "\x1B[1;31m-",
+                       Cpu::info()->hasAVX2() ? "\x1B[1;32m" : "\x1B[1;31m-");
 #       ifndef XMRIG_NO_LIBCPUID
-        Log::i()->text("\x1B[01;32m * \x1B[01;37mCPU L2/L3:    %.1f MB/%.1f MB", Cpu::l2() / 1024.0, Cpu::l3() / 1024.0);
+        Log::i()->text(GREEN_BOLD(" * ") WHITE_BOLD("%-13s%.1f MB/%.1f MB"), "CPU L2/L3", Cpu::info()->L2() / 1024.0, Cpu::info()->L3() / 1024.0);
 #       endif
     }
     else {
-        Log::i()->text(" * CPU:          %s (%d) %sx64 %sAES-NI", Cpu::brand(), Cpu::sockets(), Cpu::isX64() ? "" : "-", Cpu::hasAES() ? "" : "-");
+        Log::i()->text(" * %-13s%s (%d) %sx64 %sAES %sAVX2",
+                       "CPU",
+                       Cpu::info()->brand(),
+                       Cpu::info()->sockets(),
+                       Cpu::info()->isX64()   ? "" : "-",
+                       Cpu::info()->hasAES()  ? "" : "-",
+                       Cpu::info()->hasAVX2() ? "" : "-");
 #       ifndef XMRIG_NO_LIBCPUID
-        Log::i()->text(" * CPU L2/L3:    %.1f MB/%.1f MB", Cpu::l2() / 1024.0, Cpu::l3() / 1024.0);
+        Log::i()->text(" * %-13s%.1f MB/%.1f MB", "CPU L2/L3", Cpu::info()->L2() / 1024.0, Cpu::info()->L3() / 1024.0);
 #       endif
     }
 }
@@ -92,79 +102,67 @@ static void print_cpu(xmrig::Config *config)
 
 static void print_threads(xmrig::Config *config)
 {
-    char buf[32];
+    if (config->threadsMode() != xmrig::Config::Advanced) {
+        char buf[32] = { 0 };
         if (config->affinity() != -1L) {
-        snprintf(buf, 32, ", affinity=0x%" PRIX64, config->affinity());
-    }
-    else {
-        buf[0] = '\0';
+            snprintf(buf, sizeof buf, ", affinity=0x%" PRIX64, config->affinity());
         }
 
-    Log::i()->text(config->isColors() ? "\x1B[01;32m * \x1B[01;37mTHREADS:      \x1B[01;36m%d\x1B[01;37m, %s, av=%d, %sdonate=%d%%%s" : " * THREADS:      %d, %s, av=%d, %sdonate=%d%%%s",
+        xmrig::Log::i()->text(config->isColors() ? GREEN_BOLD(" * ") WHITE_BOLD("%-13s") CYAN_BOLD("%d") WHITE_BOLD(", %s, av=%d, %sdonate=%d%%") WHITE_BOLD("%s")
+                                          : " * %-13s%d, %s, av=%d, %sdonate=%d%%%s",
+                       "THREADS",
                        config->threadsCount(),
-                   config->algoName(),
+                       config->algorithm().name(),
                        config->algoVariant(),
-                   config->isColors() && config->donateLevel() == 0 ? "\x1B[01;31m" : "",
-                   config->donateLevel(),
+                       config->isColors() && config->pools().donateLevel() == 0 ? "\x1B[1;31m" : "",
+                       config->pools().donateLevel(),
                        buf);
     }
-
-
-static void print_pools(xmrig::Config *config)
-{
-    const std::vector<Url*> &pools = config->pools();
-
-    for (size_t i = 0; i < pools.size(); ++i) {
-        Log::i()->text(config->isColors() ? "\x1B[01;32m * \x1B[01;37mPOOL #%d:      \x1B[01;36m%s:%d" : " * POOL #%d:      %s:%d",
-                       i + 1,
-                       pools[i]->host(),
-                       pools[i]->port());
+    else {
+        xmrig::Log::i()->text(config->isColors() ? GREEN_BOLD(" * ") WHITE_BOLD("%-13s") CYAN_BOLD("%d") WHITE_BOLD(", %s, %sdonate=%d%%")
+                                          : " * %-13s%d, %s, %sdonate=%d%%",
+                       "THREADS",
+                       config->threadsCount(),
+                       config->algorithm().name(),
+                       config->isColors() && config->pools().donateLevel() == 0 ? "\x1B[1;31m" : "",
+                       config->pools().donateLevel());
     }
 
-#   ifdef APP_DEBUG
-    for (size_t i = 0; i < pools.size(); ++i) {
-        Log::i()->text("%s:%d, user: %s, pass: %s, ka: %d, nicehash: %d", pools[i]->host(), pools[i]->port(), pools[i]->user(), pools[i]->password(), pools[i]->keepAlive(), pools[i]->isNicehash());
+#   ifndef XMRIG_NO_ASM
+    if (config->assembly() == xmrig::ASM_AUTO) {
+        const xmrig::Assembly assembly = xmrig::Cpu::info()->assembly();
+
+        xmrig::Log::i()->text(config->isColors() ? GREEN_BOLD(" * ") WHITE_BOLD("%-13sauto:%s")
+                                          : " * %-13sauto:%s", "ASSEMBLY", asmName(assembly, config->isColors()));
+    }
+    else {
+        xmrig::Log::i()->text(config->isColors() ? GREEN_BOLD(" * ") WHITE_BOLD("%-13s%s") : " * %-13s%s", "ASSEMBLY", asmName(config->assembly(), config->isColors()));
     }
 #   endif
 }
 
 
-#ifndef XMRIG_NO_API
-static void print_api(xmrig::Config *config)
-{
-    const int port = config->apiPort();
-    if (port == 0) {
-        return;
-    }
-
-    Log::i()->text(config->isColors() ? "\x1B[01;32m * \x1B[01;37mAPI BIND:     \x1B[01;36m%s:%d" : " * API BIND:     %s:%d",
-                   config->isApiIPv6() ? "[::]" : "0.0.0.0", port);
-}
-#endif
-
-
 static void print_commands(xmrig::Config *config)
 {
     if (config->isColors()) {
-        Log::i()->text("\x1B[01;32m * \x1B[01;37mCOMMANDS:     \x1B[01;35mh\x1B[01;37mashrate, \x1B[01;35mp\x1B[01;37mause, \x1B[01;35mr\x1B[01;37mesume");
+        xmrig::Log::i()->text(GREEN_BOLD(" * ") WHITE_BOLD("COMMANDS     ") MAGENTA_BOLD("h") WHITE_BOLD("ashrate, ")
+                                                                     MAGENTA_BOLD("p") WHITE_BOLD("ause, ")
+                                                                     MAGENTA_BOLD("r") WHITE_BOLD("esume"));
     }
     else {
-        Log::i()->text(" * COMMANDS:     'h' hashrate, 'p' pause, 'r' resume");
+        xmrig::Log::i()->text(" * COMMANDS     'h' hashrate, 'p' pause, 'r' resume");
     }
 }
 
 
 void Summary::print(xmrig::Controller *controller)
 {
-    print_versions(controller->config());
+    controller->config()->printVersions();
     print_memory(controller->config());
     print_cpu(controller->config());
     print_threads(controller->config());
-    print_pools(controller->config());
-
-#   ifndef XMRIG_NO_API
-    print_api(controller->config());
-#   endif
+    controller->config()->printPools();
+    controller->config()->printAPI();
 
     print_commands(controller->config());
 }

src/api/Api.cpp

@@ -5,7 +5,8 @@
  * 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 2016-2018 XMRig       <https://github.com/xmrig>, <support@xmrig.com>
+ * Copyright 2018-2019 SChernykh   <https://github.com/SChernykh>
+ * Copyright 2016-2019 XMRig       <https://github.com/xmrig>, <support@xmrig.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
@@ -26,8 +27,8 @@
 
 #include "api/Api.h"
 #include "api/ApiRouter.h"
-#include "api/HttpReply.h"
-#include "api/HttpRequest.h"
+#include "common/api/HttpReply.h"
+#include "common/api/HttpRequest.h"
 
 
 ApiRouter *Api::m_router = nullptr;
@@ -62,17 +63,7 @@ void Api::exec(const xmrig::HttpRequest &req, xmrig::HttpReply &reply)
 }
 
 
-void Api::tick(const Hashrate *hashrate)
-{
-    if (!m_router) {
-        return;
-    }
-
-    m_router->tick(hashrate);
-}
-
-
-void Api::tick(const NetworkState &network)
+void Api::tick(const xmrig::NetworkState &network)
 {
     if (!m_router) {
         return;

src/api/Api.h

@@ -5,7 +5,8 @@
  * 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 2016-2018 XMRig       <https://github.com/xmrig>, <support@xmrig.com>
+ * Copyright 2018-2019 SChernykh   <https://github.com/SChernykh>
+ * Copyright 2016-2019 XMRig       <https://github.com/xmrig>, <support@xmrig.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
@@ -21,8 +22,8 @@
  *   along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef __API_H__
-#define __API_H__
+#ifndef XMRIG_API_H
+#define XMRIG_API_H
 
 
 #include <uv.h>
@@ -30,13 +31,13 @@
 
 class ApiRouter;
 class Hashrate;
-class NetworkState;
 
 
 namespace xmrig {
     class Controller;
     class HttpReply;
     class HttpRequest;
+    class NetworkState;
 }
 
 
@@ -47,11 +48,10 @@ public:
     static void release();
 
     static void exec(const xmrig::HttpRequest &req, xmrig::HttpReply &reply);
-    static void tick(const Hashrate *hashrate);
-    static void tick(const NetworkState &results);
+    static void tick(const xmrig::NetworkState &results);
 
 private:
     static ApiRouter *m_router;
 };
 
-#endif /* __API_H__ */
+#endif /* XMRIG_API_H */

src/api/ApiRouter.cpp

@@ -5,7 +5,8 @@
  * 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 2016-2018 XMRig       <https://github.com/xmrig>, <support@xmrig.com>
+ * Copyright 2018-2019 SChernykh   <https://github.com/SChernykh>
+ * Copyright 2016-2019 XMRig       <https://github.com/xmrig>, <support@xmrig.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
@@ -33,26 +34,21 @@
 
 
 #include "api/ApiRouter.h"
-#include "api/HttpReply.h"
-#include "api/HttpRequest.h"
+#include "base/tools/Buffer.h"
+#include "common/api/HttpReply.h"
+#include "common/api/HttpRequest.h"
+#include "common/cpu/Cpu.h"
+#include "common/crypto/keccak.h"
+#include "common/Platform.h"
 #include "core/Config.h"
 #include "core/Controller.h"
-#include "Cpu.h"
 #include "interfaces/IThread.h"
-#include "Mem.h"
-#include "net/Job.h"
-#include "Platform.h"
 #include "rapidjson/document.h"
 #include "rapidjson/prettywriter.h"
 #include "rapidjson/stringbuffer.h"
 #include "version.h"
 #include "workers/Hashrate.h"
-
-
-extern "C"
-{
-#include "crypto/c_keccak.h"
-}
+#include "workers/Workers.h"
 
 
 static inline double normalize(double d)
@@ -68,20 +64,15 @@ static inline double normalize(double d)
 ApiRouter::ApiRouter(xmrig::Controller *controller) :
     m_controller(controller)
 {
-    m_threads  = controller->config()->threadsCount();
-    m_hashrate = new double[m_threads * 3]();
-
-    memset(m_totalHashrate, 0, sizeof(m_totalHashrate));
     memset(m_workerId, 0, sizeof(m_workerId));
 
     setWorkerId(controller->config()->apiWorkerId());
-    genId();
+    genId(controller->config()->apiId());
 }
 
 
 ApiRouter::~ApiRouter()
 {
-    delete [] m_hashrate;
 }
 
 
@@ -129,22 +120,7 @@ void ApiRouter::exec(const xmrig::HttpRequest &req, xmrig::HttpReply &reply)
 }
 
 
-void ApiRouter::tick(const Hashrate *hashrate)
-{
-    for (int i = 0; i < m_threads; ++i) {
-        m_hashrate[i * 3]     = hashrate->calc((size_t) i, Hashrate::ShortInterval);
-        m_hashrate[i * 3 + 1] = hashrate->calc((size_t) i, Hashrate::MediumInterval);
-        m_hashrate[i * 3 + 2] = hashrate->calc((size_t) i, Hashrate::LargeInterval);
-    }
-
-    m_totalHashrate[0] = hashrate->calc(Hashrate::ShortInterval);
-    m_totalHashrate[1] = hashrate->calc(Hashrate::MediumInterval);
-    m_totalHashrate[2] = hashrate->calc(Hashrate::LargeInterval);
-    m_highestHashrate  = hashrate->highest();
-}
-
-
-void ApiRouter::tick(const NetworkState &network)
+void ApiRouter::tick(const xmrig::NetworkState &network)
 {
     m_network = network;
 }
@@ -158,7 +134,7 @@ void ApiRouter::onConfigChanged(xmrig::Config *config, xmrig::Config *previousCo
 
 void ApiRouter::finalize(xmrig::HttpReply &reply, rapidjson::Document &doc) const
 {
-    rapidjson::StringBuffer buffer(0, 4096);
+    rapidjson::StringBuffer buffer(nullptr, 4096);
     rapidjson::PrettyWriter<rapidjson::StringBuffer> writer(buffer);
     writer.SetMaxDecimalPlaces(10);
     doc.Accept(writer);
@@ -169,10 +145,15 @@ void ApiRouter::finalize(xmrig::HttpReply &reply, rapidjson::Document &doc) cons
 }
 
 
-void ApiRouter::genId()
+void ApiRouter::genId(const char *id)
 {
     memset(m_id, 0, sizeof(m_id));
 
+    if (id && strlen(id) > 0) {
+        strncpy(m_id, id, sizeof(m_id) - 1);
+        return;
+    }
+
     uv_interface_address_t *interfaces;
     int count = 0;
 
@@ -184,14 +165,16 @@ void ApiRouter::genId()
         if (!interfaces[i].is_internal && interfaces[i].address.address4.sin_family == AF_INET) {
             uint8_t hash[200];
             const size_t addrSize = sizeof(interfaces[i].phys_addr);
-            const size_t inSize   = strlen(APP_KIND) + addrSize;
+            const size_t inSize   = strlen(APP_KIND) + addrSize + sizeof(uint16_t);
+            const uint16_t port   = static_cast<uint16_t>(m_controller->config()->apiPort());
 
             uint8_t *input = new uint8_t[inSize]();
-            memcpy(input, interfaces[i].phys_addr, addrSize);
-            memcpy(input + addrSize, APP_KIND, strlen(APP_KIND));
+            memcpy(input, &port, sizeof(uint16_t));
+            memcpy(input + sizeof(uint16_t), interfaces[i].phys_addr, addrSize);
+            memcpy(input + sizeof(uint16_t) + addrSize, APP_KIND, strlen(APP_KIND));
 
-            keccak(input, static_cast<int>(inSize), hash, sizeof(hash));
-            Job::toHex(hash, 8, m_id);
+            xmrig::keccak(input, inSize, hash);
+            xmrig::Buffer::toHex(hash, 8, m_id);
 
             delete [] input;
             break;
@@ -225,21 +208,23 @@ void ApiRouter::getHashrate(rapidjson::Document &doc) const
     rapidjson::Value total(rapidjson::kArrayType);
     rapidjson::Value threads(rapidjson::kArrayType);
 
-    for (int i = 0; i < 3; ++i) {
-        total.PushBack(normalize(m_totalHashrate[i]), allocator);
-    }
+    const Hashrate *hr = Workers::hashrate();
 
-    for (int i = 0; i < m_threads * 3; i += 3) {
+    total.PushBack(normalize(hr->calc(Hashrate::ShortInterval)),  allocator);
+    total.PushBack(normalize(hr->calc(Hashrate::MediumInterval)), allocator);
+    total.PushBack(normalize(hr->calc(Hashrate::LargeInterval)),  allocator);
+
+    for (size_t i = 0; i < Workers::threads(); i++) {
         rapidjson::Value thread(rapidjson::kArrayType);
-        thread.PushBack(normalize(m_hashrate[i]),     allocator);
-        thread.PushBack(normalize(m_hashrate[i + 1]), allocator);
-        thread.PushBack(normalize(m_hashrate[i + 2]), allocator);
+        thread.PushBack(normalize(hr->calc(i, Hashrate::ShortInterval)),  allocator);
+        thread.PushBack(normalize(hr->calc(i, Hashrate::MediumInterval)), allocator);
+        thread.PushBack(normalize(hr->calc(i, Hashrate::LargeInterval)),  allocator);
 
         threads.PushBack(thread, allocator);
     }
 
     hashrate.AddMember("total",   total, allocator);
-    hashrate.AddMember("highest", normalize(m_highestHashrate), allocator);
+    hashrate.AddMember("highest", normalize(hr->highest()), allocator);
     hashrate.AddMember("threads", threads, allocator);
     doc.AddMember("hashrate", hashrate, allocator);
 }
@@ -254,21 +239,22 @@ void ApiRouter::getIdentify(rapidjson::Document &doc) const
 
 void ApiRouter::getMiner(rapidjson::Document &doc) const
 {
+    using namespace xmrig;
     auto &allocator = doc.GetAllocator();
 
     rapidjson::Value cpu(rapidjson::kObjectType);
-    cpu.AddMember("brand",   rapidjson::StringRef(Cpu::brand()), allocator);
-    cpu.AddMember("aes",     Cpu::hasAES(), allocator);
-    cpu.AddMember("x64",     Cpu::isX64(), allocator);
-    cpu.AddMember("sockets", Cpu::sockets(), allocator);
+    cpu.AddMember("brand",   rapidjson::StringRef(Cpu::info()->brand()), allocator);
+    cpu.AddMember("aes",     Cpu::info()->hasAES(), allocator);
+    cpu.AddMember("x64",     Cpu::info()->isX64(), allocator);
+    cpu.AddMember("sockets", Cpu::info()->sockets(), allocator);
 
     doc.AddMember("version",      APP_VERSION, allocator);
     doc.AddMember("kind",         APP_KIND, allocator);
     doc.AddMember("ua",           rapidjson::StringRef(Platform::userAgent()), allocator);
     doc.AddMember("cpu",          cpu, allocator);
-    doc.AddMember("algo",         rapidjson::StringRef(m_controller->config()->algoName()), allocator);
-    doc.AddMember("hugepages",    Mem::isHugepagesEnabled(), allocator);
-    doc.AddMember("donate_level", m_controller->config()->donateLevel(), allocator);
+    doc.AddMember("algo",         rapidjson::StringRef(m_controller->config()->algorithm().name()), allocator);
+    doc.AddMember("hugepages",    Workers::hugePages() > 0, allocator);
+    doc.AddMember("donate_level", m_controller->config()->pools().donateLevel(), allocator);
 }
 
 
@@ -298,13 +284,31 @@ void ApiRouter::getResults(rapidjson::Document &doc) const
 
 void ApiRouter::getThreads(rapidjson::Document &doc) const
 {
-    doc.SetArray();
+    doc.SetObject();
+    auto &allocator = doc.GetAllocator();
+    const Hashrate *hr = Workers::hashrate();
+
+    Workers::threadsSummary(doc);
 
     const std::vector<xmrig::IThread *> &threads = m_controller->config()->threads();
+    rapidjson::Value list(rapidjson::kArrayType);
 
+    size_t i = 0;
     for (const xmrig::IThread *thread : threads) {
-       doc.PushBack(thread->toAPI(doc), doc.GetAllocator());
+        rapidjson::Value value = thread->toAPI(doc);
+
+        rapidjson::Value hashrate(rapidjson::kArrayType);
+        hashrate.PushBack(normalize(hr->calc(i, Hashrate::ShortInterval)),  allocator);
+        hashrate.PushBack(normalize(hr->calc(i, Hashrate::MediumInterval)), allocator);
+        hashrate.PushBack(normalize(hr->calc(i, Hashrate::LargeInterval)),  allocator);
+
+        i++;
+
+        value.AddMember("hashrate", hashrate, allocator);
+        list.PushBack(value, allocator);
     }
+
+    doc.AddMember("threads", list, allocator);
 }
 
 

src/api/ApiRouter.h

@@ -5,7 +5,8 @@
  * 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 2016-2018 XMRig       <https://github.com/xmrig>, <support@xmrig.com>
+ * Copyright 2018-2019 SChernykh   <https://github.com/SChernykh>
+ * Copyright 2016-2019 XMRig       <https://github.com/xmrig>, <support@xmrig.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
@@ -21,12 +22,12 @@
  *   along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef __APIROUTER_H__
-#define __APIROUTER_H__
+#ifndef XMRIG_APIROUTER_H
+#define XMRIG_APIROUTER_H
 
 
 #include "api/NetworkState.h"
-#include "interfaces/IControllerListener.h"
+#include "common/interfaces/IControllerListener.h"
 #include "rapidjson/fwd.h"
 
 
@@ -44,20 +45,19 @@ class ApiRouter : public xmrig::IControllerListener
 {
 public:
     ApiRouter(xmrig::Controller *controller);
-    ~ApiRouter();
+    ~ApiRouter() override;
 
     void get(const xmrig::HttpRequest &req, xmrig::HttpReply &reply) const;
     void exec(const xmrig::HttpRequest &req, xmrig::HttpReply &reply);
 
-    void tick(const Hashrate *hashrate);
-    void tick(const NetworkState &results);
+    void tick(const xmrig::NetworkState &results);
 
 protected:
     void onConfigChanged(xmrig::Config *config, xmrig::Config *previousConfig) override;
 
 private:
     void finalize(xmrig::HttpReply &reply, rapidjson::Document &doc) const;
-    void genId();
+    void genId(const char *id);
     void getConnection(rapidjson::Document &doc) const;
     void getHashrate(rapidjson::Document &doc) const;
     void getIdentify(rapidjson::Document &doc) const;
@@ -67,14 +67,10 @@ private:
     void setWorkerId(const char *id);
     void updateWorkerId(const char *id, const char *previousId);
 
-    char m_id[17];
+    char m_id[32];
     char m_workerId[128];
-    double *m_hashrate;
-    double m_highestHashrate;
-    double m_totalHashrate[3];
-    int m_threads;
-    NetworkState m_network;
+    xmrig::NetworkState m_network;
     xmrig::Controller *m_controller;
 };
 
-#endif /* __APIROUTER_H__ */
+#endif /* XMRIG_APIROUTER_H */

src/api/NetworkState.cpp

@@ -4,8 +4,9 @@
  * 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 2016-2017 XMRig       <support@xmrig.com>
- *
+ * Copyright 2017-2018 XMR-Stak    <https://github.com/fireice-uk>, <https://github.com/psychocrypt>
+ * Copyright 2018-2019 SChernykh   <https://github.com/SChernykh>
+ * Copyright 2016-2019 XMRig       <https://github.com/xmrig>, <support@xmrig.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
@@ -29,10 +30,11 @@
 
 
 #include "api/NetworkState.h"
-#include "net/SubmitResult.h"
+#include "base/net/stratum/SubmitResult.h"
+#include "base/tools/Chrono.h"
 
 
-NetworkState::NetworkState() :
+xmrig::NetworkState::NetworkState() :
     diff(0),
     accepted(0),
     failures(0),
@@ -44,13 +46,7 @@ NetworkState::NetworkState() :
 }
 
 
-int NetworkState::connectionTime() const
-{
-    return m_active ? (int)((uv_now(uv_default_loop()) - m_connectionTime) / 1000) : 0;
-}
-
-
-uint32_t NetworkState::avgTime() const
+uint32_t xmrig::NetworkState::avgTime() const
 {
     if (m_latency.empty()) {
         return 0;
@@ -60,7 +56,7 @@ uint32_t NetworkState::avgTime() const
 }
 
 
-uint32_t NetworkState::latency() const
+uint32_t xmrig::NetworkState::latency() const
 {
     const size_t calls = m_latency.size();
     if (calls == 0) {
@@ -74,7 +70,13 @@ uint32_t NetworkState::latency() const
 }
 
 
-void NetworkState::add(const SubmitResult &result, const char *error)
+uint64_t xmrig::NetworkState::connectionTime() const
+{
+    return m_active ? ((Chrono::steadyMSecs() - m_connectionTime) / 1000) : 0;
+}
+
+
+void xmrig::NetworkState::add(const SubmitResult &result, const char *error)
 {
     if (error) {
         rejected++;
@@ -94,16 +96,16 @@ void NetworkState::add(const SubmitResult &result, const char *error)
 }
 
 
-void NetworkState::setPool(const char *host, int port, const char *ip)
+void xmrig::NetworkState::setPool(const char *host, int port, const char *ip)
 {
     snprintf(pool, sizeof(pool) - 1, "%s:%d", host, port);
 
     m_active = true;
-    m_connectionTime = uv_now(uv_default_loop());
+    m_connectionTime = Chrono::steadyMSecs();
 }
 
 
-void NetworkState::stop()
+void xmrig::NetworkState::stop()
 {
     m_active = false;
     diff     = 0;

src/api/NetworkState.h

@@ -4,8 +4,9 @@
  * 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 2016-2017 XMRig       <support@xmrig.com>
- *
+ * Copyright 2017-2018 XMR-Stak    <https://github.com/fireice-uk>, <https://github.com/psychocrypt>
+ * Copyright 2018-2019 SChernykh   <https://github.com/SChernykh>
+ * Copyright 2016-2019 XMRig       <https://github.com/xmrig>, <support@xmrig.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
@@ -21,14 +22,17 @@
  *   along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef __NETWORKSTATE_H__
-#define __NETWORKSTATE_H__
+#ifndef XMRIG_NETWORKSTATE_H
+#define XMRIG_NETWORKSTATE_H
 
 
 #include <array>
 #include <vector>
 
 
+namespace xmrig {
+
+
 class SubmitResult;
 
 
@@ -37,9 +41,9 @@ class NetworkState
 public:
     NetworkState();
 
-    int connectionTime() const;
     uint32_t avgTime() const;
     uint32_t latency() const;
+    uint64_t connectionTime() const;
     void add(const SubmitResult &result, const char *error);
     void setPool(const char *host, int port, const char *ip);
     void stop();
@@ -58,4 +62,8 @@ private:
     uint64_t m_connectionTime;
 };
 
-#endif /* __NETWORKSTATE_H__ */
+
+} /* namespace xmrig */
+
+
+#endif /* XMRIG_NETWORKSTATE_H */

src/base/base.cmake

@@ -0,0 +1,63 @@
+set(HEADERS_BASE
+    src/base/io/Console.h
+    src/base/io/Json.h
+    src/base/io/Watcher.h
+    src/base/kernel/Entry.h
+    src/base/kernel/interfaces/IClientListener.h
+    src/base/kernel/interfaces/IConfigListener.h
+    src/base/kernel/interfaces/IConsoleListener.h
+    src/base/kernel/interfaces/IDnsListener.h
+    src/base/kernel/interfaces/ILineListener.h
+    src/base/kernel/interfaces/ISignalListener.h
+    src/base/kernel/interfaces/IStrategy.h
+    src/base/kernel/interfaces/IStrategyListener.h
+    src/base/kernel/interfaces/ITimerListener.h
+    src/base/kernel/interfaces/IWatcherListener.h
+    src/base/kernel/Process.h
+    src/base/kernel/Signals.h
+    src/base/net/dns/Dns.h
+    src/base/net/dns/DnsRecord.h
+    src/base/net/stratum/Client.h
+    src/base/net/stratum/Job.h
+    src/base/net/stratum/Pool.h
+    src/base/net/stratum/Pools.h
+    src/base/net/stratum/strategies/FailoverStrategy.h
+    src/base/net/stratum/strategies/SinglePoolStrategy.h
+    src/base/net/stratum/SubmitResult.h
+    src/base/net/tools/RecvBuf.h
+    src/base/net/tools/Storage.h
+    src/base/tools/Arguments.h
+    src/base/tools/Buffer.h
+    src/base/tools/Chrono.h
+    src/base/tools/Handle.h
+    src/base/tools/String.h
+    src/base/tools/Timer.h
+   )
+
+set(SOURCES_BASE
+    src/base/io/Console.cpp
+    src/base/io/Json.cpp
+    src/base/io/Watcher.cpp
+    src/base/kernel/Entry.cpp
+    src/base/kernel/Process.cpp
+    src/base/kernel/Signals.cpp
+    src/base/net/dns/Dns.cpp
+    src/base/net/dns/DnsRecord.cpp
+    src/base/net/stratum/Client.cpp
+    src/base/net/stratum/Job.cpp
+    src/base/net/stratum/Pool.cpp
+    src/base/net/stratum/Pools.cpp
+    src/base/net/stratum/strategies/FailoverStrategy.cpp
+    src/base/net/stratum/strategies/SinglePoolStrategy.cpp
+    src/base/tools/Arguments.cpp
+    src/base/tools/Buffer.cpp
+    src/base/tools/String.cpp
+    src/base/tools/Timer.cpp
+   )
+
+
+if (WIN32)
+    set(SOURCES_OS src/base/io/Json_win.cpp)
+else()
+    set(SOURCES_OS src/base/io/Json_unix.cpp)
+endif()

src/base/io/Console.cpp

@@ -4,8 +4,9 @@
  * 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 2016-2017 XMRig       <support@xmrig.com>
- *
+ * Copyright 2017-2018 XMR-Stak    <https://github.com/fireice-uk>, <https://github.com/psychocrypt>
+ * Copyright 2018-2019 SChernykh   <https://github.com/SChernykh>
+ * Copyright 2016-2019 XMRig       <https://github.com/xmrig>, <support@xmrig.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
@@ -22,26 +23,44 @@
  */
 
 
-#include "Console.h"
-#include "interfaces/IConsoleListener.h"
+#include "base/io/Console.h"
+#include "base/kernel/interfaces/IConsoleListener.h"
+#include "base/tools/Handle.h"
 
 
-Console::Console(IConsoleListener *listener)
+xmrig::Console::Console(IConsoleListener *listener)
     : m_listener(listener)
 {
-    m_tty.data = this;
-    uv_tty_init(uv_default_loop(), &m_tty, 0, 1);
+    m_tty = new uv_tty_t;
 
-    if (!uv_is_readable(reinterpret_cast<uv_stream_t*>(&m_tty))) {
+    m_tty->data = this;
+    uv_tty_init(uv_default_loop(), m_tty, 0, 1);
+
+    if (!uv_is_readable(reinterpret_cast<uv_stream_t*>(m_tty))) {
         return;
     }
 
-    uv_tty_set_mode(&m_tty, UV_TTY_MODE_RAW);
-    uv_read_start(reinterpret_cast<uv_stream_t*>(&m_tty), Console::onAllocBuffer, Console::onRead);
+    uv_tty_set_mode(m_tty, UV_TTY_MODE_RAW);
+    uv_read_start(reinterpret_cast<uv_stream_t*>(m_tty), Console::onAllocBuffer, Console::onRead);
 }
 
 
-void Console::onAllocBuffer(uv_handle_t *handle, size_t suggested_size, uv_buf_t *buf)
+xmrig::Console::~Console()
+{
+    stop();
+}
+
+
+void xmrig::Console::stop()
+{
+    uv_tty_reset_mode();
+
+    Handle::close(m_tty);
+    m_tty = nullptr;
+}
+
+
+void xmrig::Console::onAllocBuffer(uv_handle_t *handle, size_t, uv_buf_t *buf)
 {
     auto console = static_cast<Console*>(handle->data);
     buf->len  = 1;
@@ -49,7 +68,7 @@ void Console::onAllocBuffer(uv_handle_t *handle, size_t suggested_size, uv_buf_t
 }
 
 
-void Console::onRead(uv_stream_t *stream, ssize_t nread, const uv_buf_t *buf)
+void xmrig::Console::onRead(uv_stream_t *stream, ssize_t nread, const uv_buf_t *buf)
 {
     if (nread < 0) {
         return uv_close(reinterpret_cast<uv_handle_t*>(stream), nullptr);

src/base/io/Console.h

@@ -4,8 +4,9 @@
  * 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 2016-2017 XMRig       <support@xmrig.com>
- *
+ * Copyright 2017-2018 XMR-Stak    <https://github.com/fireice-uk>, <https://github.com/psychocrypt>
+ * Copyright 2018-2019 SChernykh   <https://github.com/SChernykh>
+ * Copyright 2016-2019 XMRig       <https://github.com/xmrig>, <support@xmrig.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
@@ -21,13 +22,17 @@
  *   along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef __CONSOLE_H__
-#define __CONSOLE_H__
+#ifndef XMRIG_CONSOLE_H
+#define XMRIG_CONSOLE_H
 
 
 #include <uv.h>
 
 
+
+namespace xmrig {
+
+
 class IConsoleListener;
 
 
@@ -35,6 +40,9 @@ class Console
 {
 public:
     Console(IConsoleListener *listener);
+    ~Console();
+
+    void stop();
 
 private:
     static void onAllocBuffer(uv_handle_t *handle, size_t suggested_size, uv_buf_t *buf);
@@ -42,8 +50,11 @@ private:
 
     char m_buf[1];
     IConsoleListener *m_listener;
-    uv_tty_t m_tty;
+    uv_tty_t *m_tty;
 };
 
 
-#endif /* __CONSOLE_H__ */
+} /* namespace xmrig */
+
+
+#endif /* XMRIG_CONSOLE_H */

src/base/io/Json.cpp

@@ -0,0 +1,93 @@
+/* XMRig
+ * 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-2019 SChernykh   <https://github.com/SChernykh>
+ * Copyright 2016-2019 XMRig       <https://github.com/xmrig>, <support@xmrig.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
+ *   the Free Software Foundation, either version 3 of the License, or
+ *   (at your option) any later version.
+ *
+ *   This program is distributed in the hope that it will be useful,
+ *   but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ *   GNU General Public License for more details.
+ *
+ *   You should have received a copy of the GNU General Public License
+ *   along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+
+#include "base/io/Json.h"
+#include "rapidjson/document.h"
+
+
+bool xmrig::Json::getBool(const rapidjson::Value &obj, const char *key, bool defaultValue)
+{
+    auto i = obj.FindMember(key);
+    if (i != obj.MemberEnd() && i->value.IsBool()) {
+        return i->value.GetBool();
+    }
+
+    return defaultValue;
+}
+
+
+const char *xmrig::Json::getString(const rapidjson::Value &obj, const char *key,  const char *defaultValue)
+{
+    auto i = obj.FindMember(key);
+    if (i != obj.MemberEnd() && i->value.IsString()) {
+        return i->value.GetString();
+    }
+
+    return defaultValue;
+}
+
+
+int xmrig::Json::getInt(const rapidjson::Value &obj, const char *key, int defaultValue)
+{
+    auto i = obj.FindMember(key);
+    if (i != obj.MemberEnd() && i->value.IsInt()) {
+        return i->value.GetInt();
+    }
+
+    return defaultValue;
+}
+
+
+int64_t xmrig::Json::getInt64(const rapidjson::Value &obj, const char *key, int64_t defaultValue)
+{
+    auto i = obj.FindMember(key);
+    if (i != obj.MemberEnd() && i->value.IsInt64()) {
+        return i->value.GetInt64();
+    }
+
+    return defaultValue;
+}
+
+
+uint64_t xmrig::Json::getUint64(const rapidjson::Value &obj, const char *key, uint64_t defaultValue)
+{
+    auto i = obj.FindMember(key);
+    if (i != obj.MemberEnd() && i->value.IsUint64()) {
+        return i->value.GetUint64();
+    }
+
+    return defaultValue;
+}
+
+
+unsigned xmrig::Json::getUint(const rapidjson::Value &obj, const char *key, unsigned defaultValue)
+{
+    auto i = obj.FindMember(key);
+    if (i != obj.MemberEnd() && i->value.IsUint()) {
+        return i->value.GetUint();
+    }
+
+    return defaultValue;
+}

src/base/io/Json.h

@@ -0,0 +1,53 @@
+/* XMRig
+ * 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-2019 SChernykh   <https://github.com/SChernykh>
+ * Copyright 2016-2019 XMRig       <https://github.com/xmrig>, <support@xmrig.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
+ *   the Free Software Foundation, either version 3 of the License, or
+ *   (at your option) any later version.
+ *
+ *   This program is distributed in the hope that it will be useful,
+ *   but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ *   GNU General Public License for more details.
+ *
+ *   You should have received a copy of the GNU General Public License
+ *   along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#ifndef XMRIG_JSON_H
+#define XMRIG_JSON_H
+
+
+#include "rapidjson/fwd.h"
+
+
+namespace xmrig {
+
+
+class Json
+{
+public:
+    static bool getBool(const rapidjson::Value &obj, const char *key, bool defaultValue = false);
+    static const char *getString(const rapidjson::Value &obj, const char *key, const char *defaultValue = nullptr);
+    static int getInt(const rapidjson::Value &obj, const char *key, int defaultValue = 0);
+    static int64_t getInt64(const rapidjson::Value &obj, const char *key, int64_t defaultValue = 0);
+    static uint64_t getUint64(const rapidjson::Value &obj, const char *key, uint64_t defaultValue = 0);
+    static unsigned getUint(const rapidjson::Value &obj, const char *key, unsigned defaultValue = 0);
+
+    static bool get(const char *fileName, rapidjson::Document &doc);
+    static bool save(const char *fileName, const rapidjson::Document &doc);
+};
+
+
+} /* namespace xmrig */
+
+
+#endif /* XMRIG_JSON_H */

src/base/io/Json_unix.cpp

@@ -0,0 +1,62 @@
+/* XMRig
+ * 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-2019 SChernykh   <https://github.com/SChernykh>
+ * Copyright 2016-2019 XMRig       <https://github.com/xmrig>, <support@xmrig.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
+ *   the Free Software Foundation, either version 3 of the License, or
+ *   (at your option) any later version.
+ *
+ *   This program is distributed in the hope that it will be useful,
+ *   but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ *   GNU General Public License for more details.
+ *
+ *   You should have received a copy of the GNU General Public License
+ *   along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+
+#include <fstream>
+
+
+#include "base/io/Json.h"
+#include "rapidjson/document.h"
+#include "rapidjson/istreamwrapper.h"
+#include "rapidjson/ostreamwrapper.h"
+#include "rapidjson/prettywriter.h"
+
+
+bool xmrig::Json::get(const char *fileName, rapidjson::Document &doc)
+{
+    std::ifstream ifs(fileName, std::ios_base::in | std::ios_base::binary);
+    if (!ifs.is_open()) {
+        return false;
+    }
+
+    rapidjson::IStreamWrapper isw(ifs);
+    doc.ParseStream<rapidjson::kParseCommentsFlag | rapidjson::kParseTrailingCommasFlag>(isw);
+
+    return !doc.HasParseError() && doc.IsObject();
+}
+
+
+bool xmrig::Json::save(const char *fileName, const rapidjson::Document &doc)
+{
+    std::ofstream ofs(fileName, std::ios_base::out | std::ios_base::binary | std::ios_base::trunc);
+    if (!ofs.is_open()) {
+        return false;
+    }
+
+    rapidjson::OStreamWrapper osw(ofs);
+    rapidjson::PrettyWriter<rapidjson::OStreamWrapper> writer(osw);
+    doc.Accept(writer);
+
+    return true;
+}

src/base/io/Json_win.cpp

@@ -0,0 +1,124 @@
+/* XMRig
+ * 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-2019 SChernykh   <https://github.com/SChernykh>
+ * Copyright 2016-2019 XMRig       <https://github.com/xmrig>, <support@xmrig.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
+ *   the Free Software Foundation, either version 3 of the License, or
+ *   (at your option) any later version.
+ *
+ *   This program is distributed in the hope that it will be useful,
+ *   but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ *   GNU General Public License for more details.
+ *
+ *   You should have received a copy of the GNU General Public License
+ *   along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+
+#include <windows.h>
+
+
+#ifdef __GNUC__
+#   include <fcntl.h>
+#   include <ext/stdio_filebuf.h>
+#endif
+
+
+#include <fstream>
+
+
+#include "base/io/Json.h"
+#include "rapidjson/document.h"
+#include "rapidjson/istreamwrapper.h"
+#include "rapidjson/ostreamwrapper.h"
+#include "rapidjson/prettywriter.h"
+
+
+#if defined(_MSC_VER) || defined (__GNUC__)
+static std::wstring toUtf16(const char *str)
+{
+    const int size = static_cast<int>(strlen(str));
+    std::wstring ret;
+
+    int len = MultiByteToWideChar(CP_UTF8, 0, str, size, nullptr, 0);
+    if (len > 0) {
+        ret.resize(static_cast<size_t>(len));
+        MultiByteToWideChar(CP_UTF8, 0, str, size, &ret[0], len);
+    }
+
+    return ret;
+}
+#endif
+
+
+bool xmrig::Json::get(const char *fileName, rapidjson::Document &doc)
+{
+    using namespace rapidjson;
+    constexpr const std::ios_base::openmode mode = std::ios_base::in | std::ios_base::binary;
+
+#   if defined(_MSC_VER)
+    std::ifstream ifs(toUtf16(fileName), mode);
+    if (!ifs.is_open()) {
+        return false;
+    }
+#   elif defined(__GNUC__)
+    const int fd = _wopen(toUtf16(fileName).c_str(), _O_RDONLY | _O_BINARY);
+    if (fd == -1) {
+        return false;
+    }
+
+    __gnu_cxx::stdio_filebuf<char> buf(fd, mode);
+    std::istream ifs(&buf);
+#   else
+    std::ifstream ifs(fileName, mode);
+    if (!ifs.is_open()) {
+        return false;
+    }
+#   endif
+
+    IStreamWrapper isw(ifs);
+    doc.ParseStream<kParseCommentsFlag | kParseTrailingCommasFlag>(isw);
+
+    return !doc.HasParseError() && doc.IsObject();
+}
+
+
+bool xmrig::Json::save(const char *fileName, const rapidjson::Document &doc)
+{
+    using namespace rapidjson;
+    constexpr const std::ios_base::openmode mode = std::ios_base::out | std::ios_base::binary | std::ios_base::trunc;
+
+#   if defined(_MSC_VER)
+    std::ofstream ofs(toUtf16(fileName), mode);
+    if (!ofs.is_open()) {
+        return false;
+    }
+#   elif defined(__GNUC__)
+    const int fd = _wopen(toUtf16(fileName).c_str(), _O_WRONLY | _O_BINARY | _O_TRUNC);
+    if (fd == -1) {
+        return false;
+    }
+
+    __gnu_cxx::stdio_filebuf<char> buf(fd, mode);
+    std::ostream ofs(&buf);
+#   else
+    std::ofstream ofs(fileName, mode);
+    if (!ofs.is_open()) {
+        return false;
+    }
+#   endif
+
+    OStreamWrapper osw(ofs);
+    PrettyWriter<OStreamWrapper> writer(osw);
+    doc.Accept(writer);
+
+    return true;
+}

src/base/io/Watcher.cpp

@@ -0,0 +1,88 @@
+/* XMRig
+ * 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-2019 SChernykh   <https://github.com/SChernykh>
+ * Copyright 2016-2019 XMRig       <https://github.com/xmrig>, <support@xmrig.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
+ *   the Free Software Foundation, either version 3 of the License, or
+ *   (at your option) any later version.
+ *
+ *   This program is distributed in the hope that it will be useful,
+ *   but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ *   GNU General Public License for more details.
+ *
+ *   You should have received a copy of the GNU General Public License
+ *   along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+
+#include <uv.h>
+
+
+#include "base/kernel/interfaces/IWatcherListener.h"
+#include "base/io/Watcher.h"
+#include "base/tools/Handle.h"
+#include "base/tools/Timer.h"
+
+
+xmrig::Watcher::Watcher(const String &path, IWatcherListener *listener) :
+    m_listener(listener),
+    m_path(path)
+{
+    m_timer = new Timer(this);
+
+    m_fsEvent = new uv_fs_event_t;
+    m_fsEvent->data = this;
+    uv_fs_event_init(uv_default_loop(), m_fsEvent);
+
+    start();
+}
+
+
+xmrig::Watcher::~Watcher()
+{
+    delete m_timer;
+
+    Handle::close(m_fsEvent);
+}
+
+
+void xmrig::Watcher::onFsEvent(uv_fs_event_t *handle, const char *filename, int, int)
+{
+    if (!filename) {
+        return;
+    }
+
+    static_cast<Watcher *>(handle->data)->queueUpdate();
+}
+
+
+void xmrig::Watcher::queueUpdate()
+{
+    m_timer->stop();
+    m_timer->start(kDelay, 0);
+}
+
+
+void xmrig::Watcher::reload()
+{
+    m_listener->onFileChanged(m_path);
+
+#   ifndef _WIN32
+    uv_fs_event_stop(m_fsEvent);
+    start();
+#   endif
+}
+
+
+void xmrig::Watcher::start()
+{
+    uv_fs_event_start(m_fsEvent, xmrig::Watcher::onFsEvent, m_path, 0);
+}

src/base/io/Watcher.h

@@ -5,7 +5,8 @@
  * 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 2016-2018 XMRig       <https://github.com/xmrig>, <support@xmrig.com>
+ * Copyright 2018-2019 SChernykh   <https://github.com/SChernykh>
+ * Copyright 2016-2019 XMRig       <https://github.com/xmrig>, <support@xmrig.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
@@ -21,49 +22,50 @@
  *   along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef __CONFIGWATCHER_H__
-#define __CONFIGWATCHER_H__
+#ifndef XMRIG_WATCHER_H
+#define XMRIG_WATCHER_H
 
 
-#include <stdint.h>
-#include <uv.h>
-
-#include "rapidjson/fwd.h"
+#include "base/kernel/interfaces/ITimerListener.h"
+#include "base/tools/String.h"
 
 
-struct option;
+typedef struct uv_fs_event_s uv_fs_event_t;
 
 
 namespace xmrig {
 
 
-class IConfigCreator;
 class IWatcherListener;
+class Timer;
 
 
-class ConfigWatcher
+class Watcher : public ITimerListener
 {
 public:
-    ConfigWatcher(const char *path, IConfigCreator *creator, IWatcherListener *listener);
-    ~ConfigWatcher();
+    Watcher(const String &path, IWatcherListener *listener);
+    ~Watcher() override;
+
+protected:
+    inline void onTimer(const Timer *) override { reload(); }
 
 private:
     constexpr static int kDelay = 500;
 
     static void onFsEvent(uv_fs_event_t *handle, const char *filename, int events, int status);
-    static void onTimer(uv_timer_t* handle);
+
     void queueUpdate();
     void reload();
     void start();
 
-    char *m_path;
-    IConfigCreator *m_creator;
     IWatcherListener *m_listener;
-    uv_fs_event_t m_fsEvent;
-    uv_timer_t m_timer;
+    String m_path;
+    Timer *m_timer;
+    uv_fs_event_t *m_fsEvent;
 };
 
 
 } /* namespace xmrig */
 
-#endif /* __CONFIGWATCHER_H__ */
+
+#endif /* XMRIG_WATCHER_H */

src/base/kernel/Entry.cpp

@@ -0,0 +1,121 @@
+/* XMRig
+ * 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-2019 SChernykh   <https://github.com/SChernykh>
+ * Copyright 2016-2019 XMRig       <https://github.com/xmrig>, <support@xmrig.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
+ *   the Free Software Foundation, either version 3 of the License, or
+ *   (at your option) any later version.
+ *
+ *   This program is distributed in the hope that it will be useful,
+ *   but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ *   GNU General Public License for more details.
+ *
+ *   You should have received a copy of the GNU General Public License
+ *   along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+
+#include <stdio.h>
+#include <uv.h>
+
+
+#ifndef XMRIG_NO_HTTPD
+#   include <microhttpd.h>
+#endif
+
+
+#ifndef XMRIG_NO_TLS
+#   include <openssl/opensslv.h>
+#endif
+
+
+#include "base/kernel/Entry.h"
+#include "base/kernel/Process.h"
+#include "core/usage.h"
+#include "version.h"
+
+
+static int showVersion()
+{
+    printf(APP_NAME " " APP_VERSION "\n built on " __DATE__
+
+#   if defined(__clang__)
+    " with clang " __clang_version__);
+#   elif defined(__GNUC__)
+    " with GCC");
+    printf(" %d.%d.%d", __GNUC__, __GNUC_MINOR__, __GNUC_PATCHLEVEL__);
+#   elif defined(_MSC_VER)
+    " with MSVC");
+    printf(" %d", MSVC_VERSION);
+#   else
+    );
+#   endif
+
+    printf("\n features:"
+#   if defined(__i386__) || defined(_M_IX86)
+    " 32-bit"
+#   elif defined(__x86_64__) || defined(_M_AMD64)
+    " 64-bit"
+#   endif
+
+#   if defined(__AES__) || defined(_MSC_VER)
+    " AES"
+#   endif
+    "\n");
+
+    printf("\nlibuv/%s\n", uv_version_string());
+
+#   ifndef XMRIG_NO_HTTPD
+    printf("microhttpd/%s\n", MHD_get_version());
+#   endif
+
+#   if !defined(XMRIG_NO_TLS) && defined(OPENSSL_VERSION_TEXT)
+    {
+        constexpr const char *v = OPENSSL_VERSION_TEXT + 8;
+        printf("OpenSSL/%.*s\n", static_cast<int>(strchr(v, ' ') - v), v);
+    }
+#   endif
+
+    return 0;
+}
+
+
+xmrig::Entry::Id xmrig::Entry::get(const Process &process)
+{
+    const Arguments &args = process.arguments();
+    if (args.hasArg("-h") || args.hasArg("--help")) {
+         return Usage;
+    }
+
+    if (args.hasArg("-V") || args.hasArg("--version")) {
+         return Version;
+    }
+
+    return Default;
+}
+
+
+int xmrig::Entry::exec(const Process &, Id id)
+{
+    switch (id) {
+    case Usage:
+        printf(usage);
+        return 0;
+
+    case Version:
+        return showVersion();
+
+    default:
+        break;
+    }
+
+    return 1;
+}

src/base/kernel/Entry.h

@@ -0,0 +1,52 @@
+/* XMRig
+ * 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-2019 SChernykh   <https://github.com/SChernykh>
+ * Copyright 2016-2019 XMRig       <https://github.com/xmrig>, <support@xmrig.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
+ *   the Free Software Foundation, either version 3 of the License, or
+ *   (at your option) any later version.
+ *
+ *   This program is distributed in the hope that it will be useful,
+ *   but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ *   GNU General Public License for more details.
+ *
+ *   You should have received a copy of the GNU General Public License
+ *   along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#ifndef XMRIG_ENTRY_H
+#define XMRIG_ENTRY_H
+
+
+namespace xmrig {
+
+
+class Process;
+
+
+class Entry
+{
+public:
+    enum Id {
+        Default,
+        Usage,
+        Version
+    };
+
+    static Id get(const Process &process);
+    static int exec(const Process &process, Id id);
+};
+
+
+} /* namespace xmrig */
+
+
+#endif /* XMRIG_ENTRY_H */

src/base/kernel/Process.cpp

@@ -0,0 +1,102 @@
+/* XMRig
+ * 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-2019 SChernykh   <https://github.com/SChernykh>
+ * Copyright 2016-2019 XMRig       <https://github.com/xmrig>, <support@xmrig.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
+ *   the Free Software Foundation, either version 3 of the License, or
+ *   (at your option) any later version.
+ *
+ *   This program is distributed in the hope that it will be useful,
+ *   but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ *   GNU General Public License for more details.
+ *
+ *   You should have received a copy of the GNU General Public License
+ *   along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+
+#include <uv.h>
+#include <time.h>
+
+
+#include "base/kernel/Process.h"
+#include "base/tools/Chrono.h"
+
+
+static size_t location(xmrig::Process::Location location, char *buf, size_t max)
+{
+    using namespace xmrig;
+
+    size_t size = max;
+    if (location == Process::ExeLocation) {
+        return uv_exepath(buf, &size) < 0 ? 0 : size;
+    }
+
+    if (location == Process::CwdLocation) {
+        return uv_cwd(buf, &size) < 0 ? 0 : size;
+    }
+
+    return 0;
+}
+
+
+xmrig::Process::Process(int argc, char **argv) :
+    m_arguments(argc, argv)
+{
+    srand(static_cast<unsigned int>(Chrono::currentMSecsSinceEpoch() ^ reinterpret_cast<uintptr_t>(this)));
+}
+
+
+xmrig::Process::~Process()
+{
+}
+
+
+xmrig::String xmrig::Process::location(Location location, const char *fileName) const
+{
+    constexpr const size_t max = 520;
+
+    char *buf   = new char[max]();
+    size_t size = ::location(location, buf, max);
+
+    if (size == 0) {
+        delete [] buf;
+
+        return String();
+    }
+
+    if (fileName == nullptr) {
+        return buf;
+    }
+
+    if (location == ExeLocation) {
+        char *p = strrchr(buf, kDirSeparator);
+
+        if (p == nullptr) {
+            delete [] buf;
+
+            return String();
+        }
+
+        size = static_cast<size_t>(p - buf);
+    }
+
+    if ((size + strlen(fileName) + 2) >= max) {
+        delete [] buf;
+
+        return String();
+    }
+
+    buf[size] = kDirSeparator;
+    strcpy(buf + size + 1, fileName);
+
+    return buf;
+}

src/base/kernel/Process.h

@@ -0,0 +1,64 @@
+/* XMRig
+ * 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-2019 SChernykh   <https://github.com/SChernykh>
+ * Copyright 2016-2019 XMRig       <https://github.com/xmrig>, <support@xmrig.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
+ *   the Free Software Foundation, either version 3 of the License, or
+ *   (at your option) any later version.
+ *
+ *   This program is distributed in the hope that it will be useful,
+ *   but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ *   GNU General Public License for more details.
+ *
+ *   You should have received a copy of the GNU General Public License
+ *   along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#ifndef XMRIG_PROCESS_H
+#define XMRIG_PROCESS_H
+
+
+#include "base/tools/Arguments.h"
+
+
+namespace xmrig {
+
+
+class Process
+{
+public:
+    enum Location {
+        ExeLocation,
+        CwdLocation
+    };
+
+#   ifdef WIN32
+    constexpr const static char kDirSeparator = '\\';
+#   else
+    constexpr const static char kDirSeparator = '/';
+#   endif
+
+    Process(int argc, char **argv);
+    ~Process();
+
+    String location(Location location, const char *fileName = nullptr) const;
+
+    inline const Arguments &arguments() const { return m_arguments; }
+
+private:
+    Arguments m_arguments;
+};
+
+
+} /* namespace xmrig */
+
+
+#endif /* XMRIG_PROCESS_H */

src/base/kernel/Signals.cpp

@@ -0,0 +1,74 @@
+/* XMRig
+ * 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-2019 SChernykh   <https://github.com/SChernykh>
+ * Copyright 2016-2019 XMRig       <https://github.com/xmrig>, <support@xmrig.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
+ *   the Free Software Foundation, either version 3 of the License, or
+ *   (at your option) any later version.
+ *
+ *   This program is distributed in the hope that it will be useful,
+ *   but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ *   GNU General Public License for more details.
+ *
+ *   You should have received a copy of the GNU General Public License
+ *   along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+
+#include <uv.h>
+
+
+#include "base/kernel/interfaces/ISignalListener.h"
+#include "base/kernel/Signals.h"
+#include "base/tools/Handle.h"
+
+
+static const int signums[xmrig::Signals::kSignalsCount] = { SIGHUP, SIGINT, SIGTERM };
+
+
+xmrig::Signals::Signals(ISignalListener *listener)
+    : m_listener(listener)
+{
+    for (size_t i = 0; i < kSignalsCount; ++i) {
+        uv_signal_t *signal = new uv_signal_t;
+        signal->data        = this;
+
+        m_signals[i] = signal;
+
+        uv_signal_init(uv_default_loop(), signal);
+        uv_signal_start(signal, Signals::onSignal, signums[i]);
+    }
+}
+
+
+xmrig::Signals::~Signals()
+{
+    stop();
+}
+
+
+void xmrig::Signals::stop()
+{
+    if (!m_signals[0]) {
+        return;
+    }
+
+    for (size_t i = 0; i < kSignalsCount; ++i) {
+        Handle::close(m_signals[i]);
+        m_signals[i] = nullptr;
+    }
+}
+
+
+void xmrig::Signals::onSignal(uv_signal_t *handle, int signum)
+{
+    static_cast<Signals *>(handle->data)->m_listener->onSignal(signum);
+}

src/base/kernel/Signals.h

@@ -0,0 +1,64 @@
+/* XMRig
+ * 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-2019 SChernykh   <https://github.com/SChernykh>
+ * Copyright 2016-2019 XMRig       <https://github.com/xmrig>, <support@xmrig.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
+ *   the Free Software Foundation, either version 3 of the License, or
+ *   (at your option) any later version.
+ *
+ *   This program is distributed in the hope that it will be useful,
+ *   but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ *   GNU General Public License for more details.
+ *
+ *   You should have received a copy of the GNU General Public License
+ *   along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#ifndef XMRIG_SIGNALS_H
+#define XMRIG_SIGNALS_H
+
+
+#include <stddef.h>
+
+
+typedef struct uv_signal_s uv_signal_t;
+
+
+namespace xmrig {
+
+
+class ISignalListener;
+
+
+class Signals
+{
+public:
+    constexpr static const size_t kSignalsCount = 3;
+
+    Signals(ISignalListener *listener);
+    ~Signals();
+
+    void stop();
+
+private:
+    void close(int signum);
+
+    static void onSignal(uv_signal_t *handle, int signum);
+
+    ISignalListener *m_listener;
+    uv_signal_t *m_signals[kSignalsCount];
+};
+
+
+} /* namespace xmrig */
+
+
+#endif /* XMRIG_SIGNALS_H */

src/base/kernel/interfaces/IClientListener.h

@@ -4,8 +4,9 @@
  * 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 2016-2017 XMRig       <support@xmrig.com>
- *
+ * Copyright 2017-2018 XMR-Stak    <https://github.com/fireice-uk>, <https://github.com/psychocrypt>
+ * Copyright 2018-2019 SChernykh   <https://github.com/SChernykh>
+ * Copyright 2016-2019 XMRig       <https://github.com/xmrig>, <support@xmrig.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
@@ -21,13 +22,19 @@
  *   along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef __ICLIENTLISTENER_H__
-#define __ICLIENTLISTENER_H__
+#ifndef XMRIG_ICLIENTLISTENER_H
+#define XMRIG_ICLIENTLISTENER_H
 
 
 #include <stdint.h>
 
 
+#include "rapidjson/fwd.h"
+
+
+namespace xmrig {
+
+
 class Client;
 class Job;
 class SubmitResult;
@@ -36,13 +43,17 @@ class SubmitResult;
 class IClientListener
 {
 public:
-    virtual ~IClientListener() {}
+    virtual ~IClientListener() = default;
 
     virtual void onClose(Client *client, int failures)                                           = 0;
-    virtual void onJobReceived(Client *client, const Job &job)                                   = 0;
+    virtual void onJobReceived(Client *client, const Job &job, const rapidjson::Value &params)   = 0;
+    virtual void onLogin(Client *client, rapidjson::Document &doc, rapidjson::Value &params)     = 0;
     virtual void onLoginSuccess(Client *client)                                                  = 0;
     virtual void onResultAccepted(Client *client, const SubmitResult &result, const char *error) = 0;
 };
 
 
-#endif // __ICLIENTLISTENER_H__
+} /* namespace xmrig */
+
+
+#endif // XMRIG_ICLIENTLISTENER_H

src/base/kernel/interfaces/IConfigListener.h

@@ -0,0 +1,47 @@
+/* XMRig
+ * 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-2019 SChernykh   <https://github.com/SChernykh>
+ * Copyright 2016-2019 XMRig       <https://github.com/xmrig>, <support@xmrig.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
+ *   the Free Software Foundation, either version 3 of the License, or
+ *   (at your option) any later version.
+ *
+ *   This program is distributed in the hope that it will be useful,
+ *   but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ *   GNU General Public License for more details.
+ *
+ *   You should have received a copy of the GNU General Public License
+ *   along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#ifndef XMRIG_ICONFIGLISTENER_H
+#define XMRIG_ICONFIGLISTENER_H
+
+
+namespace xmrig {
+
+
+class IConfig;
+
+
+class IConfigListener
+{
+public:
+    virtual ~IConfigListener() = default;
+
+    virtual void onNewConfig(IConfig *config) = 0;
+};
+
+
+} /* namespace xmrig */
+
+
+#endif // XMRIG_ICONFIGLISTENER_H

src/base/kernel/interfaces/IConsoleListener.h

@@ -4,8 +4,9 @@
  * 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 2016-2017 XMRig       <support@xmrig.com>
- *
+ * Copyright 2017-2018 XMR-Stak    <https://github.com/fireice-uk>, <https://github.com/psychocrypt>
+ * Copyright 2018-2019 SChernykh   <https://github.com/SChernykh>
+ * Copyright 2016-2019 XMRig       <https://github.com/xmrig>, <support@xmrig.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
@@ -21,17 +22,23 @@
  *   along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef __ICONSOLELISTENER_H__
-#define __ICONSOLELISTENER_H__
+#ifndef XMRIG_ICONSOLELISTENER_H
+#define XMRIG_ICONSOLELISTENER_H
+
+
+namespace xmrig {
 
 
 class IConsoleListener
 {
 public:
-    virtual ~IConsoleListener() {}
+    virtual ~IConsoleListener() = default;
 
     virtual void onConsoleCommand(char command) = 0;
 };
 
 
-#endif // __ICONSOLELISTENER_H__
+} /* namespace xmrig */
+
+
+#endif // XMRIG_ICONSOLELISTENER_H

src/base/kernel/interfaces/IDnsListener.h

@@ -0,0 +1,47 @@
+/* XMRig
+ * 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-2019 SChernykh   <https://github.com/SChernykh>
+ * Copyright 2016-2019 XMRig       <https://github.com/xmrig>, <support@xmrig.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
+ *   the Free Software Foundation, either version 3 of the License, or
+ *   (at your option) any later version.
+ *
+ *   This program is distributed in the hope that it will be useful,
+ *   but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ *   GNU General Public License for more details.
+ *
+ *   You should have received a copy of the GNU General Public License
+ *   along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#ifndef XMRIG_IDNSLISTENER_H
+#define XMRIG_IDNSLISTENER_H
+
+
+namespace xmrig {
+
+
+class Dns;
+
+
+class IDnsListener
+{
+public:
+    virtual ~IDnsListener() = default;
+
+    virtual void onResolved(const Dns &dns, int status) = 0;
+};
+
+
+} /* namespace xmrig */
+
+
+#endif // XMRIG_IDNSLISTENER_H

src/base/kernel/interfaces/ILineListener.h

@@ -0,0 +1,50 @@
+/* XMRig
+ * 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-2019 SChernykh   <https://github.com/SChernykh>
+ * Copyright 2016-2019 XMRig       <https://github.com/xmrig>, <support@xmrig.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
+ *   the Free Software Foundation, either version 3 of the License, or
+ *   (at your option) any later version.
+ *
+ *   This program is distributed in the hope that it will be useful,
+ *   but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ *   GNU General Public License for more details.
+ *
+ *   You should have received a copy of the GNU General Public License
+ *   along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#ifndef XMRIG_ILINELISTENER_H
+#define XMRIG_ILINELISTENER_H
+
+
+#include <stdint.h>
+
+
+namespace xmrig {
+
+
+class String;
+
+
+class ILineListener
+{
+public:
+    virtual ~ILineListener() = default;
+
+    virtual void onLine(char *line, size_t size) = 0;
+};
+
+
+} /* namespace xmrig */
+
+
+#endif // XMRIG_ILINELISTENER_H

src/base/kernel/interfaces/ISignalListener.h

@@ -0,0 +1,47 @@
+/* XMRig
+ * 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-2019 SChernykh   <https://github.com/SChernykh>
+ * Copyright 2016-2019 XMRig       <https://github.com/xmrig>, <support@xmrig.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
+ *   the Free Software Foundation, either version 3 of the License, or
+ *   (at your option) any later version.
+ *
+ *   This program is distributed in the hope that it will be useful,
+ *   but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ *   GNU General Public License for more details.
+ *
+ *   You should have received a copy of the GNU General Public License
+ *   along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#ifndef XMRIG_ISIGNALLISTENER_H
+#define XMRIG_ISIGNALLISTENER_H
+
+
+namespace xmrig {
+
+
+class String;
+
+
+class ISignalListener
+{
+public:
+    virtual ~ISignalListener() = default;
+
+    virtual void onSignal(int signum) = 0;
+};
+
+
+} /* namespace xmrig */
+
+
+#endif // XMRIG_ISIGNALLISTENER_H

src/base/kernel/interfaces/IStrategy.h

@@ -0,0 +1,59 @@
+/* XMRig
+ * 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-2019 SChernykh   <https://github.com/SChernykh>
+ * Copyright 2016-2019 XMRig       <https://github.com/xmrig>, <support@xmrig.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
+ *   the Free Software Foundation, either version 3 of the License, or
+ *   (at your option) any later version.
+ *
+ *   This program is distributed in the hope that it will be useful,
+ *   but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ *   GNU General Public License for more details.
+ *
+ *   You should have received a copy of the GNU General Public License
+ *   along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#ifndef XMRIG_ISTRATEGY_H
+#define XMRIG_ISTRATEGY_H
+
+
+#include <stdint.h>
+
+
+namespace xmrig {
+
+
+class Algorithm;
+class Client;
+class JobResult;
+
+
+class IStrategy
+{
+public:
+    virtual ~IStrategy() = default;
+
+    virtual bool isActive() const                      = 0;
+    virtual Client *client() const                     = 0;
+    virtual int64_t submit(const JobResult &result)    = 0;
+    virtual void connect()                             = 0;
+    virtual void resume()                              = 0;
+    virtual void setAlgo(const Algorithm &algo)        = 0;
+    virtual void stop()                                = 0;
+    virtual void tick(uint64_t now)                    = 0;
+};
+
+
+} /* namespace xmrig */
+
+
+#endif // XMRIG_ISTRATEGY_H

src/base/kernel/interfaces/IStrategyListener.h

@@ -5,7 +5,8 @@
  * 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 2016-2018 XMRig       <https://github.com/xmrig>, <support@xmrig.com>
+ * Copyright 2018-2019 SChernykh   <https://github.com/SChernykh>
+ * Copyright 2016-2019 XMRig       <https://github.com/xmrig>, <support@xmrig.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
@@ -21,13 +22,16 @@
  *   along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef __ISTRATEGYLISTENER_H__
-#define __ISTRATEGYLISTENER_H__
+#ifndef XMRIG_ISTRATEGYLISTENER_H
+#define XMRIG_ISTRATEGYLISTENER_H
 
 
 #include <stdint.h>
 
 
+namespace xmrig {
+
+
 class Client;
 class IStrategy;
 class Job;
@@ -37,7 +41,7 @@ class SubmitResult;
 class IStrategyListener
 {
 public:
-    virtual ~IStrategyListener() {}
+    virtual ~IStrategyListener() = default;
 
     virtual void onActive(IStrategy *strategy, Client *client)                                                        = 0;
     virtual void onJob(IStrategy *strategy, Client *client, const Job &job)                                           = 0;
@@ -46,4 +50,7 @@ public:
 };
 
 
-#endif // __ISTRATEGYLISTENER_H__
+} /* namespace xmrig */
+
+
+#endif // XMRIG_ISTRATEGYLISTENER_H

src/base/kernel/interfaces/ITimerListener.h

@@ -0,0 +1,47 @@
+/* XMRig
+ * 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-2019 SChernykh   <https://github.com/SChernykh>
+ * Copyright 2016-2019 XMRig       <https://github.com/xmrig>, <support@xmrig.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
+ *   the Free Software Foundation, either version 3 of the License, or
+ *   (at your option) any later version.
+ *
+ *   This program is distributed in the hope that it will be useful,
+ *   but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ *   GNU General Public License for more details.
+ *
+ *   You should have received a copy of the GNU General Public License
+ *   along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#ifndef XMRIG_ITIMERLISTENER_H
+#define XMRIG_ITIMERLISTENER_H
+
+
+namespace xmrig {
+
+
+class Timer;
+
+
+class ITimerListener
+{
+public:
+    virtual ~ITimerListener() = default;
+
+    virtual void onTimer(const Timer *timer) = 0;
+};
+
+
+} /* namespace xmrig */
+
+
+#endif // XMRIG_ITIMERLISTENER_H

src/base/kernel/interfaces/IWatcherListener.h

@@ -5,7 +5,8 @@
  * 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 2016-2018 XMRig       <https://github.com/xmrig>, <support@xmrig.com>
+ * Copyright 2018-2019 SChernykh   <https://github.com/SChernykh>
+ * Copyright 2016-2019 XMRig       <https://github.com/xmrig>, <support@xmrig.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
@@ -21,26 +22,26 @@
  *   along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef __IWATCHERLISTENER_H__
-#define __IWATCHERLISTENER_H__
+#ifndef XMRIG_IWATCHERLISTENER_H
+#define XMRIG_IWATCHERLISTENER_H
 
 
 namespace xmrig {
 
 
-class IConfig;
+class String;
 
 
 class IWatcherListener
 {
 public:
-    virtual ~IWatcherListener() {}
+    virtual ~IWatcherListener() = default;
 
-    virtual void onNewConfig(IConfig *config) = 0;
+    virtual void onFileChanged(const String &fileName) = 0;
 };
 
 
 } /* namespace xmrig */
 
 
-#endif // __IWATCHERLISTENER_H__
+#endif // XMRIG_IWATCHERLISTENER_H

src/base/net/dns/Dns.cpp

@@ -0,0 +1,158 @@
+/* XMRig
+ * 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-2019 SChernykh   <https://github.com/SChernykh>
+ * Copyright 2016-2019 XMRig       <https://github.com/xmrig>, <support@xmrig.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
+ *   the Free Software Foundation, either version 3 of the License, or
+ *   (at your option) any later version.
+ *
+ *   This program is distributed in the hope that it will be useful,
+ *   but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ *   GNU General Public License for more details.
+ *
+ *   You should have received a copy of the GNU General Public License
+ *   along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+
+#include "base/kernel/interfaces/IDnsListener.h"
+#include "base/net/dns/Dns.h"
+#include "base/tools/Handle.h"
+
+
+namespace xmrig {
+    Storage<Dns> Dns::m_storage;
+    static const DnsRecord defaultRecord;
+}
+
+
+xmrig::Dns::Dns(IDnsListener *listener) :
+    m_hints(),
+    m_listener(listener),
+    m_status(0)
+{
+    m_key = m_storage.add(this);
+
+    m_resolver = new uv_getaddrinfo_t;
+    m_resolver->data = m_storage.ptr(m_key);
+
+    m_hints.ai_family   = AF_UNSPEC;
+    m_hints.ai_socktype = SOCK_STREAM;
+    m_hints.ai_protocol = IPPROTO_TCP;
+}
+
+
+xmrig::Dns::~Dns()
+{
+    m_storage.release(m_key);
+
+    Handle::close(m_resolver);
+}
+
+
+bool xmrig::Dns::resolve(const String &host)
+{
+    if (m_host != host) {
+        m_host = host;
+
+        clear();
+    }
+
+    m_status = uv_getaddrinfo(uv_default_loop(), m_resolver, Dns::onResolved, m_host.data(), nullptr, &m_hints);
+
+    return m_status == 0;
+}
+
+
+const char *xmrig::Dns::error() const
+{
+    return uv_strerror(m_status);
+}
+
+
+const xmrig::DnsRecord &xmrig::Dns::get(DnsRecord::Type prefered) const
+{
+    if (count() == 0) {
+        return defaultRecord;
+    }
+
+    const size_t ipv4 = m_ipv4.size();
+    const size_t ipv6 = m_ipv6.size();
+
+    if (ipv6 && (prefered == DnsRecord::AAAA || !ipv4)) {
+        return m_ipv6[ipv6 == 1 ? 0 : static_cast<size_t>(rand()) % ipv6];
+    }
+
+    if (ipv4) {
+        return m_ipv4[ipv4 == 1 ? 0 : static_cast<size_t>(rand()) % ipv4];
+    }
+
+    return defaultRecord;
+}
+
+
+size_t xmrig::Dns::count(DnsRecord::Type type) const
+{
+    if (type == DnsRecord::A) {
+        return m_ipv4.size();
+    }
+
+    if (type == DnsRecord::AAAA) {
+        return m_ipv6.size();
+    }
+
+    return m_ipv4.size() + m_ipv6.size();
+}
+
+
+void xmrig::Dns::clear()
+{
+    m_ipv4.clear();
+    m_ipv6.clear();
+}
+
+
+void xmrig::Dns::onResolved(int status, addrinfo *res)
+{
+    m_status = status;
+
+    if (m_status < 0) {
+        return m_listener->onResolved(*this, status);
+    }
+
+    clear();
+
+    addrinfo *ptr = res;
+    while (ptr != nullptr) {
+        if (ptr->ai_family == AF_INET) {
+            m_ipv4.push_back(ptr);
+        }
+
+        if (ptr->ai_family == AF_INET6) {
+            m_ipv6.push_back(ptr);
+        }
+
+        ptr = ptr->ai_next;
+    }
+
+    m_listener->onResolved(*this, status);
+}
+
+
+void xmrig::Dns::onResolved(uv_getaddrinfo_t *req, int status, addrinfo *res)
+{
+    Dns *dns = m_storage.get(req->data);
+    if (dns) {
+        dns->onResolved(status, res);
+    }
+
+    uv_freeaddrinfo(res);
+}

src/base/net/dns/Dns.h

@@ -0,0 +1,80 @@
+/* XMRig
+ * 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-2019 SChernykh   <https://github.com/SChernykh>
+ * Copyright 2016-2019 XMRig       <https://github.com/xmrig>, <support@xmrig.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
+ *   the Free Software Foundation, either version 3 of the License, or
+ *   (at your option) any later version.
+ *
+ *   This program is distributed in the hope that it will be useful,
+ *   but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ *   GNU General Public License for more details.
+ *
+ *   You should have received a copy of the GNU General Public License
+ *   along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#ifndef XMRIG_DNS_H
+#define XMRIG_DNS_H
+
+
+#include <vector>
+#include <uv.h>
+
+
+#include "base/net/dns/DnsRecord.h"
+#include "base/net/tools/Storage.h"
+#include "base/tools/String.h"
+
+
+namespace xmrig {
+
+
+class IDnsListener;
+
+
+class Dns
+{
+public:
+    Dns(IDnsListener *listener);
+    ~Dns();
+
+    inline bool isEmpty() const { return m_ipv4.empty() && m_ipv6.empty(); }
+    inline int status() const   { return m_status; }
+
+    bool resolve(const String &host);
+    const char *error() const;
+    const DnsRecord &get(DnsRecord::Type prefered = DnsRecord::A) const;
+    size_t count(DnsRecord::Type type = DnsRecord::Unknown) const;
+
+private:
+    void clear();
+    void onResolved(int status, addrinfo *res);
+
+    static void onResolved(uv_getaddrinfo_t *req, int status, addrinfo *res);
+
+    addrinfo m_hints;
+    IDnsListener *m_listener;
+    int m_status;
+    std::vector<DnsRecord> m_ipv4;
+    std::vector<DnsRecord> m_ipv6;
+    String m_host;
+    uintptr_t m_key;
+    uv_getaddrinfo_t *m_resolver;
+
+    static Storage<Dns> m_storage;
+};
+
+
+} /* namespace xmrig */
+
+
+#endif /* XMRIG_DNS_H */

src/base/net/dns/DnsRecord.cpp

@@ -0,0 +1,66 @@
+/* XMRig
+ * 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-2019 SChernykh   <https://github.com/SChernykh>
+ * Copyright 2016-2019 XMRig       <https://github.com/xmrig>, <support@xmrig.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
+ *   the Free Software Foundation, either version 3 of the License, or
+ *   (at your option) any later version.
+ *
+ *   This program is distributed in the hope that it will be useful,
+ *   but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ *   GNU General Public License for more details.
+ *
+ *   You should have received a copy of the GNU General Public License
+ *   along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+
+#include <uv.h>
+
+
+#include "base/net/dns/DnsRecord.h"
+
+
+xmrig::DnsRecord::DnsRecord(const addrinfo *addr) :
+    m_type(addr->ai_family == AF_INET6 ? AAAA : A)
+{
+    char *buf = nullptr;
+
+    if (m_type == AAAA) {
+        buf = new char[45]();
+        uv_ip6_name(reinterpret_cast<sockaddr_in6*>(addr->ai_addr), buf, 45);
+    }
+    else {
+        buf = new char[16]();
+        uv_ip4_name(reinterpret_cast<sockaddr_in*>(addr->ai_addr), buf, 16);
+    }
+
+    m_ip = buf;
+}
+
+
+sockaddr *xmrig::DnsRecord::addr(uint16_t port) const
+{
+    if (m_type == A) {
+        sockaddr_in *addr = new sockaddr_in();
+        uv_ip4_addr(m_ip.data(), port, addr);
+
+        return reinterpret_cast<sockaddr *>(addr);
+    }
+    else if (m_type == AAAA) {
+        sockaddr_in6 *addr = new sockaddr_in6();
+        uv_ip6_addr(m_ip.data(), port, addr);
+
+        return reinterpret_cast<sockaddr *>(addr);
+    }
+
+    return nullptr;
+}

src/base/net/dns/DnsRecord.h

@@ -0,0 +1,66 @@
+/* XMRig
+ * 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-2019 SChernykh   <https://github.com/SChernykh>
+ * Copyright 2016-2019 XMRig       <https://github.com/xmrig>, <support@xmrig.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
+ *   the Free Software Foundation, either version 3 of the License, or
+ *   (at your option) any later version.
+ *
+ *   This program is distributed in the hope that it will be useful,
+ *   but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ *   GNU General Public License for more details.
+ *
+ *   You should have received a copy of the GNU General Public License
+ *   along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#ifndef XMRIG_DNSRECORD_H
+#define XMRIG_DNSRECORD_H
+
+
+struct addrinfo;
+struct sockaddr;
+
+
+#include "base/tools/String.h"
+
+
+namespace xmrig {
+
+
+class DnsRecord
+{
+public:
+    enum Type {
+        Unknown,
+        A,
+        AAAA
+    };
+
+    inline DnsRecord() : m_type(Unknown) {}
+    DnsRecord(const addrinfo *addr);
+
+    sockaddr *addr(uint16_t port = 0) const;
+
+    inline bool isValid() const     { return m_type != Unknown; }
+    inline const String &ip() const { return m_ip; }
+    inline Type type() const        { return m_type; }
+
+private:
+    Type m_type;
+    String m_ip;
+};
+
+
+} /* namespace xmrig */
+
+
+#endif /* XMRIG_DNSRECORD_H */

src/base/net/stratum/Client.cpp

@@ -0,0 +1,986 @@
+/* XMRig
+ * 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-2019 SChernykh   <https://github.com/SChernykh>
+ * Copyright 2016-2019 XMRig       <https://github.com/xmrig>, <support@xmrig.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
+ *   the Free Software Foundation, either version 3 of the License, or
+ *   (at your option) any later version.
+ *
+ *   This program is distributed in the hope that it will be useful,
+ *   but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ *   GNU General Public License for more details.
+ *
+ *   You should have received a copy of the GNU General Public License
+ *   along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#include <assert.h>
+#include <inttypes.h>
+#include <iterator>
+#include <stdio.h>
+#include <string.h>
+#include <utility>
+
+
+#ifndef XMRIG_NO_TLS
+#   include <openssl/ssl.h>
+#   include <openssl/err.h>
+#   include "base/net/stratum/Tls.h"
+#endif
+
+
+#include "base/kernel/interfaces/IClientListener.h"
+#include "base/net/dns/Dns.h"
+#include "base/net/stratum/Client.h"
+#include "base/tools/Buffer.h"
+#include "base/tools/Chrono.h"
+#include "common/log/Log.h"
+#include "net/JobResult.h"
+#include "rapidjson/document.h"
+#include "rapidjson/error/en.h"
+#include "rapidjson/stringbuffer.h"
+#include "rapidjson/writer.h"
+
+
+#ifdef _MSC_VER
+#   define strncasecmp(x,y,z) _strnicmp(x,y,z)
+#endif
+
+
+namespace xmrig {
+
+int64_t Client::m_sequence = 1;
+Storage<Client> Client::m_storage;
+
+} /* namespace xmrig */
+
+
+#ifdef APP_DEBUG
+static const char *states[] = {
+    "unconnected",
+    "host-lookup",
+    "connecting",
+    "connected",
+    "closing"
+};
+#endif
+
+
+xmrig::Client::Client(int id, const char *agent, IClientListener *listener) :
+    m_enabled(true),
+    m_ipv6(false),
+    m_quiet(false),
+    m_agent(agent),
+    m_listener(listener),
+    m_id(id),
+    m_retries(5),
+    m_retryPause(5000),
+    m_failures(0),
+    m_state(UnconnectedState),
+    m_tls(nullptr),
+    m_expire(0),
+    m_jobs(0),
+    m_keepAlive(0),
+    m_key(0),
+    m_stream(nullptr),
+    m_socket(nullptr)
+{
+    m_key = m_storage.add(this);
+    m_dns = new Dns(this);
+}
+
+
+xmrig::Client::~Client()
+{
+    delete m_dns;
+    delete m_socket;
+}
+
+
+void xmrig::Client::connect()
+{
+#   ifndef XMRIG_NO_TLS
+    if (m_pool.isTLS()) {
+        m_tls = new Tls(this);
+    }
+#   endif
+
+    resolve(m_pool.host());
+}
+
+
+/**
+ * @brief Connect to server.
+ *
+ * @param url
+ */
+void xmrig::Client::connect(const Pool &url)
+{
+    setPool(url);
+    connect();
+}
+
+
+void xmrig::Client::deleteLater()
+{
+    if (!m_listener) {
+        return;
+    }
+
+    m_listener = nullptr;
+
+    if (!disconnect()) {
+        m_storage.remove(m_key);
+    }
+}
+
+
+
+void xmrig::Client::setPool(const Pool &pool)
+{
+    if (!pool.isValid()) {
+        return;
+    }
+
+    m_pool = pool;
+}
+
+
+void xmrig::Client::tick(uint64_t now)
+{
+    if (m_state == ConnectedState) {
+        if (m_expire && now > m_expire) {
+            LOG_DEBUG_ERR("[%s] timeout", url());
+            close();
+        }
+        else if (m_keepAlive && now > m_keepAlive) {
+            ping();
+        }
+    }
+
+    if (m_expire && now > m_expire && m_state == ConnectingState) {
+        connect();
+    }
+}
+
+
+bool xmrig::Client::disconnect()
+{
+    m_keepAlive = 0;
+    m_expire    = 0;
+    m_failures  = -1;
+
+    return close();
+}
+
+
+bool xmrig::Client::isTLS() const
+{
+#   ifndef XMRIG_NO_TLS
+    return m_pool.isTLS() && m_tls;
+#   else
+    return false;
+#   endif
+}
+
+
+const char *xmrig::Client::tlsFingerprint() const
+{
+#   ifndef XMRIG_NO_TLS
+    if (isTLS() && m_pool.fingerprint() == nullptr) {
+        return m_tls->fingerprint();
+    }
+#   endif
+
+    return nullptr;
+}
+
+
+const char *xmrig::Client::tlsVersion() const
+{
+#   ifndef XMRIG_NO_TLS
+    if (isTLS()) {
+        return m_tls->version();
+    }
+#   endif
+
+    return nullptr;
+}
+
+
+int64_t xmrig::Client::submit(const JobResult &result)
+{
+#   ifndef XMRIG_PROXY_PROJECT
+    if (result.clientId != m_rpcId) {
+        return -1;
+    }
+#   endif
+
+    using namespace rapidjson;
+
+#   ifdef XMRIG_PROXY_PROJECT
+    const char *nonce = result.nonce;
+    const char *data  = result.result;
+#   else
+    char *nonce = m_sendBuf;
+    char *data  = m_sendBuf + 16;
+
+    Buffer::toHex(reinterpret_cast<const char*>(&result.nonce), 4, nonce);
+    nonce[8] = '\0';
+
+    Buffer::toHex(result.result, 32, data);
+    data[64] = '\0';
+#   endif
+
+    Document doc(kObjectType);
+    auto &allocator = doc.GetAllocator();
+
+    doc.AddMember("id",      m_sequence, allocator);
+    doc.AddMember("jsonrpc", "2.0", allocator);
+    doc.AddMember("method",  "submit", allocator);
+
+    Value params(kObjectType);
+    params.AddMember("id",     StringRef(m_rpcId.data()), allocator);
+    params.AddMember("job_id", StringRef(result.jobId.data()), allocator);
+    params.AddMember("nonce",  StringRef(nonce), allocator);
+    params.AddMember("result", StringRef(data), allocator);
+
+    if (has<EXT_ALGO>() && result.algorithm.isValid()) {
+        params.AddMember("algo", StringRef(result.algorithm.shortName()), allocator);
+    }
+
+    doc.AddMember("params", params, allocator);
+
+#   ifdef XMRIG_PROXY_PROJECT
+    m_results[m_sequence] = SubmitResult(m_sequence, result.diff, result.actualDiff(), result.id);
+#   else
+    m_results[m_sequence] = SubmitResult(m_sequence, result.diff, result.actualDiff());
+#   endif
+
+    return send(doc);
+}
+
+
+void xmrig::Client::onResolved(const Dns &dns, int status)
+{
+    assert(m_listener != nullptr);
+    if (!m_listener) {
+        return reconnect();
+    }
+
+    if (status < 0 && dns.isEmpty()) {
+        if (!isQuiet()) {
+            LOG_ERR("[%s] DNS error: \"%s\"", url(), uv_strerror(status));
+        }
+
+        return reconnect();
+    }
+
+    if (dns.isEmpty()) {
+        if (!isQuiet()) {
+            LOG_ERR("[%s] DNS error: \"No IPv4 (A) or IPv6 (AAAA) records found\"", url());
+        }
+
+        return reconnect();
+    }
+
+    const DnsRecord &record = dns.get();
+    m_ip = record.ip();
+
+    connect(record.addr(m_pool.port()));
+}
+
+
+bool xmrig::Client::close()
+{
+    if (m_state == ClosingState) {
+        return m_socket != nullptr;
+    }
+
+    if (m_state == UnconnectedState || m_socket == nullptr) {
+        return false;
+    }
+
+    setState(ClosingState);
+
+    if (uv_is_closing(reinterpret_cast<uv_handle_t*>(m_socket)) == 0) {
+        uv_close(reinterpret_cast<uv_handle_t*>(m_socket), Client::onClose);
+    }
+
+    return true;
+}
+
+
+bool xmrig::Client::isCriticalError(const char *message)
+{
+    if (!message) {
+        return false;
+    }
+
+    if (strncasecmp(message, "Unauthenticated", 15) == 0) {
+        return true;
+    }
+
+    if (strncasecmp(message, "your IP is banned", 17) == 0) {
+        return true;
+    }
+
+    if (strncasecmp(message, "IP Address currently banned", 27) == 0) {
+        return true;
+    }
+
+    return false;
+}
+
+
+bool xmrig::Client::parseJob(const rapidjson::Value &params, int *code)
+{
+    if (!params.IsObject()) {
+        *code = 2;
+        return false;
+    }
+
+    Job job(m_id, has<EXT_NICEHASH>(), m_pool.algorithm(), m_rpcId);
+
+    if (!job.setId(params["job_id"].GetString())) {
+        *code = 3;
+        return false;
+    }
+
+    if (!job.setBlob(params["blob"].GetString())) {
+        *code = 4;
+        return false;
+    }
+
+    if (!job.setTarget(params["target"].GetString())) {
+        *code = 5;
+        return false;
+    }
+
+    if (params.HasMember("algo")) {
+        job.setAlgorithm(params["algo"].GetString());
+    }
+
+    if (params.HasMember("variant")) {
+        const rapidjson::Value &variant = params["variant"];
+
+        if (variant.IsInt()) {
+            job.setVariant(variant.GetInt());
+        }
+        else if (variant.IsString()){
+            job.setVariant(variant.GetString());
+        }
+    }
+
+    if (params.HasMember("height")) {
+        const rapidjson::Value &variant = params["height"];
+
+        if (variant.IsUint64()) {
+            job.setHeight(variant.GetUint64());
+        }
+    }
+
+    if (!verifyAlgorithm(job.algorithm())) {
+        *code = 6;
+
+        close();
+        return false;
+    }
+
+    m_job.setClientId(m_rpcId);
+
+    if (m_job != job) {
+        m_jobs++;
+        m_job = std::move(job);
+        return true;
+    }
+
+    if (m_jobs == 0) { // https://github.com/xmrig/xmrig/issues/459
+        return false;
+    }
+
+    if (!isQuiet()) {
+        LOG_WARN("[%s] duplicate job received, reconnect", url());
+    }
+
+    close();
+    return false;
+}
+
+
+bool xmrig::Client::parseLogin(const rapidjson::Value &result, int *code)
+{
+    m_rpcId = result["id"].GetString();
+    if (m_rpcId.isNull()) {
+        *code = 1;
+        return false;
+    }
+
+    parseExtensions(result);
+
+    const bool rc = parseJob(result["job"], code);
+    m_jobs = 0;
+
+    return rc;
+}
+
+
+bool xmrig::Client::send(BIO *bio)
+{
+#   ifndef XMRIG_NO_TLS
+    uv_buf_t buf;
+    buf.len = BIO_get_mem_data(bio, &buf.base);
+
+    if (buf.len == 0) {
+        return true;
+    }
+
+    LOG_DEBUG("[%s] TLS send     (%d bytes)", url(), static_cast<int>(buf.len));
+
+    bool result = false;
+    if (state() == ConnectedState && uv_is_writable(m_stream)) {
+        result = uv_try_write(m_stream, &buf, 1) > 0;
+
+        if (!result) {
+            close();
+        }
+    }
+    else {
+        LOG_DEBUG_ERR("[%s] send failed, invalid state: %d", url(), m_state);
+    }
+
+    (void) BIO_reset(bio);
+
+    return result;
+#   else
+    return false;
+#   endif
+}
+
+
+bool xmrig::Client::verifyAlgorithm(const Algorithm &algorithm) const
+{
+#   ifdef XMRIG_PROXY_PROJECT
+    if (m_pool.algorithm().variant() == VARIANT_AUTO || m_id == -1) {
+        return true;
+    }
+#   endif
+
+    if (m_pool.isCompatible(algorithm)) {
+        return true;
+    }
+
+    if (isQuiet()) {
+        return false;
+    }
+
+    if (algorithm.isValid()) {
+        LOG_ERR("Incompatible algorithm \"%s\" detected, reconnect", algorithm.name());
+    }
+    else {
+        LOG_ERR("Unknown/unsupported algorithm detected, reconnect");
+    }
+
+    return false;
+}
+
+
+int xmrig::Client::resolve(const String &host)
+{
+    setState(HostLookupState);
+
+    m_expire = 0;
+    m_recvBuf.reset();
+
+    if (m_failures == -1) {
+        m_failures = 0;
+    }
+
+    if (!m_dns->resolve(host)) {
+        if (!isQuiet()) {
+            LOG_ERR("[%s:%u] getaddrinfo error: \"%s\"", host.data(), m_pool.port(), uv_strerror(m_dns->status()));
+        }
+
+        return 1;
+    }
+
+    return 0;
+}
+
+
+int64_t xmrig::Client::send(const rapidjson::Document &doc)
+{
+    using namespace rapidjson;
+
+    StringBuffer buffer(nullptr, 512);
+    Writer<StringBuffer> writer(buffer);
+    doc.Accept(writer);
+
+    const size_t size = buffer.GetSize();
+    if (size > (sizeof(m_sendBuf) - 2)) {
+        LOG_ERR("[%s] send failed: \"send buffer overflow: %zu > %zu\"", url(), size, (sizeof(m_sendBuf) - 2));
+        close();
+        return -1;
+    }
+
+    memcpy(m_sendBuf, buffer.GetString(), size);
+    m_sendBuf[size]     = '\n';
+    m_sendBuf[size + 1] = '\0';
+
+    return send(size + 1);
+}
+
+
+int64_t xmrig::Client::send(size_t size)
+{
+    LOG_DEBUG("[%s] send (%d bytes): \"%s\"", url(), size, m_sendBuf);
+
+#   ifndef XMRIG_NO_TLS
+    if (isTLS()) {
+        if (!m_tls->send(m_sendBuf, size)) {
+            return -1;
+        }
+    }
+    else
+#   endif
+    {
+        if (state() != ConnectedState || !uv_is_writable(m_stream)) {
+            LOG_DEBUG_ERR("[%s] send failed, invalid state: %d", url(), m_state);
+            return -1;
+        }
+
+        uv_buf_t buf = uv_buf_init(m_sendBuf, (unsigned int) size);
+
+        if (uv_try_write(m_stream, &buf, 1) < 0) {
+            close();
+            return -1;
+        }
+    }
+
+    m_expire = Chrono::steadyMSecs() + kResponseTimeout;
+    return m_sequence++;
+}
+
+
+void xmrig::Client::connect(sockaddr *addr)
+{
+    setState(ConnectingState);
+
+    reinterpret_cast<sockaddr_in*>(addr)->sin_port = htons(m_pool.port());
+
+    uv_connect_t *req = new uv_connect_t;
+    req->data = m_storage.ptr(m_key);
+
+    m_socket = new uv_tcp_t;
+    m_socket->data = m_storage.ptr(m_key);
+
+    uv_tcp_init(uv_default_loop(), m_socket);
+    uv_tcp_nodelay(m_socket, 1);
+
+#   ifndef WIN32
+    uv_tcp_keepalive(m_socket, 1, 60);
+#   endif
+
+    uv_tcp_connect(req, m_socket, reinterpret_cast<const sockaddr*>(addr), Client::onConnect);
+
+    delete addr;
+}
+
+
+void xmrig::Client::handshake()
+{
+#   ifndef XMRIG_NO_TLS
+    if (isTLS()) {
+        m_expire = Chrono::steadyMSecs() + kResponseTimeout;
+
+        m_tls->handshake();
+    }
+    else
+#   endif
+    {
+        login();
+    }
+}
+
+
+void xmrig::Client::login()
+{
+    using namespace rapidjson;
+    m_results.clear();
+
+    Document doc(kObjectType);
+    auto &allocator = doc.GetAllocator();
+
+    doc.AddMember("id",      1,       allocator);
+    doc.AddMember("jsonrpc", "2.0",   allocator);
+    doc.AddMember("method",  "login", allocator);
+
+    Value params(kObjectType);
+    params.AddMember("login", m_pool.user().toJSON(),     allocator);
+    params.AddMember("pass",  m_pool.password().toJSON(), allocator);
+    params.AddMember("agent", StringRef(m_agent),           allocator);
+
+    if (!m_pool.rigId().isNull()) {
+        params.AddMember("rigid", m_pool.rigId().toJSON(), allocator);
+    }
+
+#   ifdef XMRIG_PROXY_PROJECT
+    if (m_pool.algorithm().variant() != xmrig::VARIANT_AUTO)
+#   endif
+    {
+        Value algo(kArrayType);
+
+        for (const auto &a : m_pool.algorithms()) {
+            algo.PushBack(StringRef(a.shortName()), allocator);
+        }
+
+        params.AddMember("algo", algo, allocator);
+    }
+
+    m_listener->onLogin(this, doc, params);
+
+    doc.AddMember("params", params, allocator);
+
+    send(doc);
+}
+
+
+void xmrig::Client::onClose()
+{
+    delete m_socket;
+
+    m_stream = nullptr;
+    m_socket = nullptr;
+    setState(UnconnectedState);
+
+#   ifndef XMRIG_NO_TLS
+    if (m_tls) {
+        delete m_tls;
+        m_tls = nullptr;
+    }
+#   endif
+
+    reconnect();
+}
+
+
+void xmrig::Client::parse(char *line, size_t len)
+{
+    startTimeout();
+
+    LOG_DEBUG("[%s] received (%d bytes): \"%s\"", url(), len, line);
+
+    if (len < 32 || line[0] != '{') {
+        if (!isQuiet()) {
+            LOG_ERR("[%s] JSON decode failed", url());
+        }
+
+        return;
+    }
+
+    rapidjson::Document doc;
+    if (doc.ParseInsitu(line).HasParseError()) {
+        if (!isQuiet()) {
+            LOG_ERR("[%s] JSON decode failed: \"%s\"", url(), rapidjson::GetParseError_En(doc.GetParseError()));
+        }
+
+        return;
+    }
+
+    if (!doc.IsObject()) {
+        return;
+    }
+
+    const rapidjson::Value &id = doc["id"];
+    if (id.IsInt64()) {
+        parseResponse(id.GetInt64(), doc["result"], doc["error"]);
+    }
+    else {
+        parseNotification(doc["method"].GetString(), doc["params"], doc["error"]);
+    }
+}
+
+
+void xmrig::Client::parseExtensions(const rapidjson::Value &result)
+{
+    m_extensions.reset();
+
+    if (!result.HasMember("extensions")) {
+        return;
+    }
+
+    const rapidjson::Value &extensions = result["extensions"];
+    if (!extensions.IsArray()) {
+        return;
+    }
+
+    for (const rapidjson::Value &ext : extensions.GetArray()) {
+        if (!ext.IsString()) {
+            continue;
+        }
+
+        const char *name = ext.GetString();
+
+        if (strcmp(name, "algo") == 0) {
+            setExtension(EXT_ALGO, true);
+        }
+        else if (strcmp(name, "nicehash") == 0) {
+            setExtension(EXT_NICEHASH, true);
+        }
+        else if (strcmp(name, "connect") == 0) {
+            setExtension(EXT_CONNECT, true);
+        }
+        else if (strcmp(name, "keepalive") == 0) {
+            setExtension(EXT_KEEPALIVE, true);
+        }
+#       ifdef XMRIG_FEATURE_TLS
+        else if (strcmp(name, "tls") == 0) {
+            setExtension(EXT_TLS, true);
+        }
+#       endif
+    }
+}
+
+
+void xmrig::Client::parseNotification(const char *method, const rapidjson::Value &params, const rapidjson::Value &error)
+{
+    if (error.IsObject()) {
+        if (!isQuiet()) {
+            LOG_ERR("[%s] error: \"%s\", code: %d", url(), error["message"].GetString(), error["code"].GetInt());
+        }
+        return;
+    }
+
+    if (!method) {
+        return;
+    }
+
+    if (strcmp(method, "job") == 0) {
+        int code = -1;
+        if (parseJob(params, &code)) {
+            m_listener->onJobReceived(this, m_job, params);
+        }
+
+        return;
+    }
+
+    LOG_WARN("[%s] unsupported method: \"%s\"", url(), method);
+}
+
+
+void xmrig::Client::parseResponse(int64_t id, const rapidjson::Value &result, const rapidjson::Value &error)
+{
+    if (error.IsObject()) {
+        const char *message = error["message"].GetString();
+
+        auto it = m_results.find(id);
+        if (it != m_results.end()) {
+            it->second.done();
+            m_listener->onResultAccepted(this, it->second, message);
+            m_results.erase(it);
+        }
+        else if (!isQuiet()) {
+            LOG_ERR("[%s] error: \"%s\", code: %d", url(), message, error["code"].GetInt());
+        }
+
+        if (isCriticalError(message)) {
+            close();
+        }
+
+        return;
+    }
+
+    if (!result.IsObject()) {
+        return;
+    }
+
+    if (id == 1) {
+        int code = -1;
+        if (!parseLogin(result, &code)) {
+            if (!isQuiet()) {
+                LOG_ERR("[%s] login error code: %d", url(), code);
+            }
+
+            close();
+            return;
+        }
+
+        m_failures = 0;
+        m_listener->onLoginSuccess(this);
+        m_listener->onJobReceived(this, m_job, result["job"]);
+        return;
+    }
+
+    auto it = m_results.find(id);
+    if (it != m_results.end()) {
+        it->second.done();
+        m_listener->onResultAccepted(this, it->second, nullptr);
+        m_results.erase(it);
+    }
+}
+
+
+void xmrig::Client::ping()
+{
+    send(snprintf(m_sendBuf, sizeof(m_sendBuf), "{\"id\":%" PRId64 ",\"jsonrpc\":\"2.0\",\"method\":\"keepalived\",\"params\":{\"id\":\"%s\"}}\n", m_sequence, m_rpcId.data()));
+}
+
+
+void xmrig::Client::read(ssize_t nread)
+{
+    const size_t size = static_cast<size_t>(nread);
+
+    if (nread > 0 && size > m_recvBuf.available()) {
+        nread = UV_ENOBUFS;
+    }
+
+    if (nread < 0) {
+        if (!isQuiet()) {
+            LOG_ERR("[%s] read error: \"%s\"", url(), uv_strerror(static_cast<int>(nread)));
+        }
+
+        close();
+        return;
+    }
+
+    assert(m_listener != nullptr);
+    if (!m_listener) {
+        return reconnect();
+    }
+
+    m_recvBuf.nread(size);
+
+#   ifndef XMRIG_NO_TLS
+    if (isTLS()) {
+        LOG_DEBUG("[%s] TLS received (%d bytes)", url(), static_cast<int>(nread));
+
+        m_tls->read(m_recvBuf.base(), m_recvBuf.pos());
+        m_recvBuf.reset();
+    }
+    else
+#   endif
+    {
+        m_recvBuf.getline(this);
+    }
+}
+
+
+void xmrig::Client::reconnect()
+{
+    if (!m_listener) {
+        m_storage.remove(m_key);
+
+        return;
+    }
+
+    m_keepAlive = 0;
+
+    if (m_failures == -1) {
+        return m_listener->onClose(this, -1);
+    }
+
+    setState(ConnectingState);
+
+    m_failures++;
+    m_listener->onClose(this, static_cast<int>(m_failures));
+
+    m_expire = Chrono::steadyMSecs() + m_retryPause;
+}
+
+
+void xmrig::Client::setState(SocketState state)
+{
+    LOG_DEBUG("[%s] state: \"%s\"", url(), states[state]);
+
+    if (m_state == state) {
+        return;
+    }
+
+    m_state = state;
+}
+
+
+void xmrig::Client::startTimeout()
+{
+    m_expire = 0;
+
+    if (has<EXT_KEEPALIVE>()) {
+        const uint64_t ms = static_cast<uint64_t>(m_pool.keepAlive() > 0 ? m_pool.keepAlive() : Pool::kKeepAliveTimeout) * 1000;
+
+        m_keepAlive = Chrono::steadyMSecs() + ms;
+    }
+}
+
+
+void xmrig::Client::onAllocBuffer(uv_handle_t *handle, size_t, uv_buf_t *buf)
+{
+    auto client = getClient(handle->data);
+    if (!client) {
+        return;
+    }
+
+    buf->base = client->m_recvBuf.current();
+
+#   ifdef _WIN32
+    buf->len = static_cast<ULONG>(client->m_recvBuf.available());
+#   else
+    buf->len = client->m_recvBuf.available();
+#   endif
+}
+
+
+void xmrig::Client::onClose(uv_handle_t *handle)
+{
+    auto client = getClient(handle->data);
+    if (!client) {
+        return;
+    }
+
+    client->onClose();
+}
+
+
+void xmrig::Client::onConnect(uv_connect_t *req, int status)
+{
+    auto client = getClient(req->data);
+    if (!client) {
+        delete req;
+        return;
+    }
+
+    if (status < 0) {
+        if (!client->isQuiet()) {
+            LOG_ERR("[%s] connect error: \"%s\"", client->url(), uv_strerror(status));
+        }
+
+        delete req;
+        client->close();
+        return;
+    }
+
+    client->m_stream = static_cast<uv_stream_t*>(req->handle);
+    client->m_stream->data = req->data;
+    client->setState(ConnectedState);
+
+    uv_read_start(client->m_stream, Client::onAllocBuffer, Client::onRead);
+    delete req;
+
+    client->handshake();
+}
+
+
+void xmrig::Client::onRead(uv_stream_t *stream, ssize_t nread, const uv_buf_t *)
+{
+    auto client = getClient(stream->data);
+    if (client) {
+        client->read(nread);
+    }
+}

src/base/net/stratum/Client.h

@@ -0,0 +1,196 @@
+/* XMRig
+ * 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-2019 SChernykh   <https://github.com/SChernykh>
+ * Copyright 2016-2019 XMRig       <https://github.com/xmrig>, <support@xmrig.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
+ *   the Free Software Foundation, either version 3 of the License, or
+ *   (at your option) any later version.
+ *
+ *   This program is distributed in the hope that it will be useful,
+ *   but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ *   GNU General Public License for more details.
+ *
+ *   You should have received a copy of the GNU General Public License
+ *   along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#ifndef XMRIG_CLIENT_H
+#define XMRIG_CLIENT_H
+
+
+#include <bitset>
+#include <map>
+#include <uv.h>
+#include <vector>
+
+
+#include "base/kernel/interfaces/IDnsListener.h"
+#include "base/kernel/interfaces/ILineListener.h"
+#include "base/net/stratum/Job.h"
+#include "base/net/stratum/Pool.h"
+#include "base/net/stratum/SubmitResult.h"
+#include "base/net/tools/RecvBuf.h"
+#include "base/net/tools/Storage.h"
+#include "common/crypto/Algorithm.h"
+
+
+
+typedef struct bio_st BIO;
+
+
+namespace xmrig {
+
+
+class IClientListener;
+class JobResult;
+
+
+class Client : public IDnsListener, public ILineListener
+{
+public:
+    enum SocketState {
+        UnconnectedState,
+        HostLookupState,
+        ConnectingState,
+        ConnectedState,
+        ClosingState
+    };
+
+    enum Extension {
+        EXT_ALGO,
+        EXT_NICEHASH,
+        EXT_CONNECT,
+        EXT_TLS,
+        EXT_KEEPALIVE,
+        EXT_MAX
+    };
+
+    constexpr static int kResponseTimeout = 20 * 1000;
+
+#   ifndef XMRIG_NO_TLS
+    constexpr static int kInputBufferSize = 1024 * 16;
+#   else
+    constexpr static int kInputBufferSize = 1024 * 2;
+#   endif
+
+    Client(int id, const char *agent, IClientListener *listener);
+    ~Client() override;
+
+    bool disconnect();
+    bool isTLS() const;
+    const char *tlsFingerprint() const;
+    const char *tlsVersion() const;
+    int64_t submit(const JobResult &result);
+    void connect();
+    void connect(const Pool &pool);
+    void deleteLater();
+    void setPool(const Pool &pool);
+    void tick(uint64_t now);
+
+    inline bool isEnabled() const                     { return m_enabled; }
+    inline bool isReady() const                       { return m_state == ConnectedState && m_failures == 0; }
+    inline const char *host() const                   { return m_pool.host(); }
+    inline const char *ip() const                     { return m_ip; }
+    inline const Job &job() const                     { return m_job; }
+    inline const Pool &pool() const                   { return m_pool; }
+    inline int id() const                             { return m_id; }
+    inline SocketState state() const                  { return m_state; }
+    inline uint16_t port() const                      { return m_pool.port(); }
+    inline void setAlgo(const Algorithm &algo)        { m_pool.setAlgo(algo); }
+    inline void setEnabled(bool enabled)              { m_enabled = enabled; }
+    inline void setQuiet(bool quiet)                  { m_quiet = quiet; }
+    inline void setRetries(int retries)               { m_retries = retries; }
+    inline void setRetryPause(int ms)                 { m_retryPause = ms; }
+
+    template<Extension ext> inline bool has() const noexcept { return m_extensions.test(ext); }
+
+protected:
+    inline void onLine(char *line, size_t size) override { parse(line, size); }
+
+    void onResolved(const Dns &dns, int status) override;
+
+private:
+    class Tls;
+
+    bool close();
+    bool isCriticalError(const char *message);
+    bool parseJob(const rapidjson::Value &params, int *code);
+    bool parseLogin(const rapidjson::Value &result, int *code);
+    bool send(BIO *bio);
+    bool verifyAlgorithm(const Algorithm &algorithm) const;
+    int resolve(const String &host);
+    int64_t send(const rapidjson::Document &doc);
+    int64_t send(size_t size);
+    void connect(sockaddr *addr);
+    void handshake();
+    void login();
+    void onClose();
+    void parse(char *line, size_t len);
+    void parseExtensions(const rapidjson::Value &result);
+    void parseNotification(const char *method, const rapidjson::Value &params, const rapidjson::Value &error);
+    void parseResponse(int64_t id, const rapidjson::Value &result, const rapidjson::Value &error);
+    void ping();
+    void read(ssize_t nread);
+    void reconnect();
+    void setState(SocketState state);
+    void startTimeout();
+
+    inline bool isQuiet() const                                   { return m_quiet || m_failures >= m_retries; }
+    inline const char *url() const                                { return m_pool.url(); }
+    inline void setExtension(Extension ext, bool enable) noexcept { m_extensions.set(ext, enable); }
+
+    static void onAllocBuffer(uv_handle_t *handle, size_t suggested_size, uv_buf_t *buf);
+    static void onClose(uv_handle_t *handle);
+    static void onConnect(uv_connect_t *req, int status);
+    static void onRead(uv_stream_t *stream, ssize_t nread, const uv_buf_t *buf);
+
+    static inline Client *getClient(void *data) { return m_storage.get(data); }
+
+    bool m_enabled;
+    bool m_ipv6;
+    bool m_quiet;
+    char m_sendBuf[2048];
+    const char *m_agent;
+    Dns *m_dns;
+    IClientListener *m_listener;
+    int m_id;
+    int m_retries;
+    int m_retryPause;
+    int64_t m_failures;
+    Job m_job;
+    Pool m_pool;
+    RecvBuf<kInputBufferSize> m_recvBuf;
+    SocketState m_state;
+    std::bitset<EXT_MAX> m_extensions;
+    std::map<int64_t, SubmitResult> m_results;
+    String m_ip;
+    String m_rpcId;
+    Tls *m_tls;
+    uint64_t m_expire;
+    uint64_t m_jobs;
+    uint64_t m_keepAlive;
+    uintptr_t m_key;
+    uv_stream_t *m_stream;
+    uv_tcp_t *m_socket;
+
+    static int64_t m_sequence;
+    static Storage<Client> m_storage;
+};
+
+
+template<> inline bool Client::has<Client::EXT_NICEHASH>() const noexcept  { return m_extensions.test(EXT_NICEHASH) || m_pool.isNicehash(); }
+template<> inline bool Client::has<Client::EXT_KEEPALIVE>() const noexcept { return m_extensions.test(EXT_KEEPALIVE) || m_pool.keepAlive() > 0; }
+
+
+} /* namespace xmrig */
+
+
+#endif /* XMRIG_CLIENT_H */

src/base/net/stratum/Job.cpp

@@ -0,0 +1,206 @@
+/* XMRig
+ * 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      Lee Clagett <https://github.com/vtnerd>
+ * Copyright 2018      SChernykh   <https://github.com/SChernykh>
+ * Copyright 2016-2019 XMRig       <https://github.com/xmrig>, <support@xmrig.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
+ *   the Free Software Foundation, either version 3 of the License, or
+ *   (at your option) any later version.
+ *
+ *   This program is distributed in the hope that it will be useful,
+ *   but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ *   GNU General Public License for more details.
+ *
+ *   You should have received a copy of the GNU General Public License
+ *   along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+
+#include <assert.h>
+#include <string.h>
+
+
+#include "base/net/stratum/Job.h"
+#include "base/tools/Buffer.h"
+
+
+xmrig::Job::Job() :
+    m_autoVariant(false),
+    m_nicehash(false),
+    m_poolId(-2),
+    m_threadId(-1),
+    m_size(0),
+    m_diff(0),
+    m_height(0),
+    m_target(0),
+    m_blob()
+{
+}
+
+
+xmrig::Job::Job(int poolId, bool nicehash, const Algorithm &algorithm, const String &clientId) :
+    m_algorithm(algorithm),
+    m_autoVariant(algorithm.variant() == VARIANT_AUTO),
+    m_nicehash(nicehash),
+    m_poolId(poolId),
+    m_threadId(-1),
+    m_size(0),
+    m_clientId(clientId),
+    m_diff(0),
+    m_height(0),
+    m_target(0),
+    m_blob()
+{
+}
+
+
+xmrig::Job::~Job()
+{
+}
+
+
+bool xmrig::Job::isEqual(const Job &other) const
+{
+    return m_id == other.m_id && m_clientId == other.m_clientId && memcmp(m_blob, other.m_blob, sizeof(m_blob)) == 0;
+}
+
+
+bool xmrig::Job::setBlob(const char *blob)
+{
+    if (!blob) {
+        return false;
+    }
+
+    m_size = strlen(blob);
+    if (m_size % 2 != 0) {
+        return false;
+    }
+
+    m_size /= 2;
+    if (m_size < 76 || m_size >= sizeof(m_blob)) {
+        return false;
+    }
+
+    if (!Buffer::fromHex(blob, m_size * 2, m_blob)) {
+        return false;
+    }
+
+    if (*nonce() != 0 && !m_nicehash) {
+        m_nicehash = true;
+    }
+
+    if (m_autoVariant) {
+        m_algorithm.setVariant(variant());
+    }
+
+    if (!m_algorithm.isForced()) {
+        if (m_algorithm.variant() == VARIANT_XTL && m_blob[0] >= 9) {
+            m_algorithm.setVariant(VARIANT_HALF);
+        }
+        else if (m_algorithm.variant() == VARIANT_MSR && m_blob[0] >= 8) {
+            m_algorithm.setVariant(VARIANT_HALF);
+        }
+        else if (m_algorithm.variant() == VARIANT_WOW && m_blob[0] < 11) {
+            m_algorithm.setVariant(VARIANT_2);
+        }
+        else if (m_algorithm.variant() == VARIANT_RWZ && m_blob[0] < 12) {
+            m_algorithm.setVariant(VARIANT_2);
+        }
+        else if (m_algorithm.variant() == VARIANT_ZLS && m_blob[0] < 8) {
+            m_algorithm.setVariant(VARIANT_2);
+        }
+    }
+
+#   ifdef XMRIG_PROXY_PROJECT
+    memset(m_rawBlob, 0, sizeof(m_rawBlob));
+    memcpy(m_rawBlob, blob, m_size * 2);
+#   endif
+
+    return true;
+}
+
+
+bool xmrig::Job::setTarget(const char *target)
+{
+    if (!target) {
+        return false;
+    }
+
+    const size_t len = strlen(target);
+
+    if (len <= 8) {
+        uint32_t tmp = 0;
+        char str[8];
+        memcpy(str, target, len);
+
+        if (!Buffer::fromHex(str, 8, reinterpret_cast<uint8_t *>(&tmp)) || tmp == 0) {
+            return false;
+        }
+
+        m_target = 0xFFFFFFFFFFFFFFFFULL / (0xFFFFFFFFULL / static_cast<uint64_t>(tmp));
+    }
+    else if (len <= 16) {
+        m_target = 0;
+        char str[16];
+        memcpy(str, target, len);
+
+        if (!Buffer::fromHex(str, 16, reinterpret_cast<uint8_t *>(&m_target)) || m_target == 0) {
+            return false;
+        }
+    }
+    else {
+        return false;
+    }
+
+#   ifdef XMRIG_PROXY_PROJECT
+    memset(m_rawTarget, 0, sizeof(m_rawTarget));
+    memcpy(m_rawTarget, target, len);
+#   endif
+
+    m_diff = toDiff(m_target);
+    return true;
+}
+
+
+void xmrig::Job::setAlgorithm(const char *algo)
+{
+    m_algorithm.parseAlgorithm(algo);
+
+    if (m_algorithm.variant() == xmrig::VARIANT_AUTO) {
+        m_algorithm.setVariant(variant());
+    }
+}
+
+
+void xmrig::Job::setHeight(uint64_t height)
+{
+    m_height = height;
+}
+
+
+xmrig::Variant xmrig::Job::variant() const
+{
+    switch (m_algorithm.algo()) {
+    case CRYPTONIGHT:
+        return (m_blob[0] >= 10) ? VARIANT_4 : ((m_blob[0] >= 8) ? VARIANT_2 : VARIANT_1);
+
+    case CRYPTONIGHT_LITE:
+        return VARIANT_1;
+
+    case CRYPTONIGHT_HEAVY:
+        return VARIANT_0;
+
+    default:
+        break;
+    }
+
+    return m_algorithm.variant();
+}

src/base/net/stratum/Job.h

@@ -0,0 +1,119 @@
+/* XMRig
+ * 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      Lee Clagett <https://github.com/vtnerd>
+ * Copyright 2018-2019 SChernykh   <https://github.com/SChernykh>
+ * Copyright 2016-2019 XMRig       <https://github.com/xmrig>, <support@xmrig.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
+ *   the Free Software Foundation, either version 3 of the License, or
+ *   (at your option) any later version.
+ *
+ *   This program is distributed in the hope that it will be useful,
+ *   but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ *   GNU General Public License for more details.
+ *
+ *   You should have received a copy of the GNU General Public License
+ *   along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#ifndef XMRIG_JOB_H
+#define XMRIG_JOB_H
+
+
+#include <stddef.h>
+#include <stdint.h>
+
+
+#include "base/tools/String.h"
+#include "common/crypto/Algorithm.h"
+
+
+namespace xmrig {
+
+
+class Job
+{
+public:
+    // Max blob size is 84 (75 fixed + 9 variable), aligned to 96. https://github.com/xmrig/xmrig/issues/1 Thanks fireice-uk.
+    // SECOR increase requirements for blob size: https://github.com/xmrig/xmrig/issues/913
+    static constexpr const size_t kMaxBlobSize = 128;
+
+    Job();
+    Job(int poolId, bool nicehash, const Algorithm &algorithm, const String &clientId);
+    ~Job();
+
+    bool isEqual(const Job &other) const;
+    bool setBlob(const char *blob);
+    bool setTarget(const char *target);
+    void setAlgorithm(const char *algo);
+    void setHeight(uint64_t height);
+
+    inline bool isNicehash() const                    { return m_nicehash; }
+    inline bool isValid() const                       { return m_size > 0 && m_diff > 0; }
+    inline bool setId(const char *id)                 { return m_id = id; }
+    inline const Algorithm &algorithm() const         { return m_algorithm; }
+    inline const String &clientId() const             { return m_clientId; }
+    inline const String &id() const                   { return m_id; }
+    inline const uint32_t *nonce() const              { return reinterpret_cast<const uint32_t*>(m_blob + 39); }
+    inline const uint8_t *blob() const                { return m_blob; }
+    inline int poolId() const                         { return m_poolId; }
+    inline int threadId() const                       { return m_threadId; }
+    inline size_t size() const                        { return m_size; }
+    inline uint32_t *nonce()                          { return reinterpret_cast<uint32_t*>(m_blob + 39); }
+    inline uint32_t diff() const                      { return static_cast<uint32_t>(m_diff); }
+    inline uint64_t height() const                    { return m_height; }
+    inline uint64_t target() const                    { return m_target; }
+    inline uint8_t fixedByte() const                  { return *(m_blob + 42); }
+    inline void reset()                               { m_size = 0; m_diff = 0; }
+    inline void setClientId(const String &id)         { m_clientId = id; }
+    inline void setPoolId(int poolId)                 { m_poolId = poolId; }
+    inline void setThreadId(int threadId)             { m_threadId = threadId; }
+    inline void setVariant(const char *variant)       { m_algorithm.parseVariant(variant); }
+    inline void setVariant(int variant)               { m_algorithm.parseVariant(variant); }
+
+#   ifdef XMRIG_PROXY_PROJECT
+    inline char *rawBlob()                 { return m_rawBlob; }
+    inline const char *rawBlob() const     { return m_rawBlob; }
+    inline const char *rawTarget() const   { return m_rawTarget; }
+#   endif
+
+    static inline uint32_t *nonce(uint8_t *blob)   { return reinterpret_cast<uint32_t*>(blob + 39); }
+    static inline uint64_t toDiff(uint64_t target) { return 0xFFFFFFFFFFFFFFFFULL / target; }
+
+    inline bool operator==(const Job &other) const { return isEqual(other); }
+    inline bool operator!=(const Job &other) const { return !isEqual(other); }
+
+private:
+    Variant variant() const;
+
+    Algorithm m_algorithm;
+    bool m_autoVariant;
+    bool m_nicehash;
+    int m_poolId;
+    int m_threadId;
+    size_t m_size;
+    String m_clientId;
+    String m_id;
+    uint64_t m_diff;
+    uint64_t m_height;
+    uint64_t m_target;
+    uint8_t m_blob[kMaxBlobSize];
+
+#   ifdef XMRIG_PROXY_PROJECT
+    char m_rawBlob[kMaxBlobSize * 2 + 8];
+    char m_rawTarget[24];
+#   endif
+};
+
+
+} /* namespace xmrig */
+
+
+#endif /* XMRIG_JOB_H */

src/base/net/stratum/Pool.cpp

@@ -0,0 +1,508 @@
+/* XMRig
+ * 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 2018-2019 SChernykh   <https://github.com/SChernykh>
+ * Copyright 2016-2019 XMRig       <https://github.com/xmrig>, <support@xmrig.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
+ *   the Free Software Foundation, either version 3 of the License, or
+ *   (at your option) any later version.
+ *
+ *   This program is distributed in the hope that it will be useful,
+ *   but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ *   GNU General Public License for more details.
+ *
+ *   You should have received a copy of the GNU General Public License
+ *   along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+
+#include <assert.h>
+#include <string.h>
+#include <stdlib.h>
+#include <stdio.h>
+
+
+#include "base/io/Json.h"
+#include "base/net/stratum/Pool.h"
+#include "rapidjson/document.h"
+
+
+#ifdef APP_DEBUG
+#   include "common/log/Log.h"
+#endif
+
+
+#ifdef _MSC_VER
+#   define strncasecmp _strnicmp
+#   define strcasecmp  _stricmp
+#endif
+
+
+namespace xmrig {
+
+static const char *kEnabled         = "enabled";
+static const char *kFingerprint     = "tls-fingerprint";
+static const char *kKeepalive       = "keepalive";
+static const char *kNicehash        = "nicehash";
+static const char *kPass            = "pass";
+static const char *kRigId           = "rig-id";
+static const char *kTls             = "tls";
+static const char *kUrl             = "url";
+static const char *kUser            = "user";
+static const char *kVariant         = "variant";
+
+const String Pool::kDefaultPassword = "x";
+const String Pool::kDefaultUser     = "x";
+
+}
+
+
+xmrig::Pool::Pool() :
+    m_enabled(true),
+    m_nicehash(false),
+    m_tls(false),
+    m_keepAlive(0),
+    m_port(kDefaultPort)
+{
+}
+
+
+/**
+ * @brief Parse url.
+ *
+ * Valid urls:
+ * example.com
+ * example.com:3333
+ * stratum+tcp://example.com
+ * stratum+tcp://example.com:3333
+ *
+ * @param url
+ */
+xmrig::Pool::Pool(const char *url) :
+    m_enabled(true),
+    m_nicehash(false),
+    m_tls(false),
+    m_keepAlive(0),
+    m_port(kDefaultPort)
+{
+    parse(url);
+}
+
+
+xmrig::Pool::Pool(const rapidjson::Value &object) :
+    m_enabled(true),
+    m_nicehash(false),
+    m_tls(false),
+    m_keepAlive(0),
+    m_port(kDefaultPort)
+{
+    if (!parse(Json::getString(object, kUrl))) {
+        return;
+    }
+
+    setUser(Json::getString(object, kUser));
+    setPassword(Json::getString(object, kPass));
+    setRigId(Json::getString(object, kRigId));
+    setNicehash(Json::getBool(object, kNicehash));
+
+    const rapidjson::Value &keepalive = object[kKeepalive];
+    if (keepalive.IsInt()) {
+        setKeepAlive(keepalive.GetInt());
+    }
+    else if (keepalive.IsBool()) {
+        setKeepAlive(keepalive.GetBool());
+    }
+
+    const rapidjson::Value &variant = object[kVariant];
+    if (variant.IsString()) {
+        algorithm().parseVariant(variant.GetString());
+    }
+    else if (variant.IsInt()) {
+        algorithm().parseVariant(variant.GetInt());
+    }
+
+    m_enabled     = Json::getBool(object, kEnabled, true);
+    m_tls         = Json::getBool(object, kTls);
+    m_fingerprint = Json::getString(object, kFingerprint);
+}
+
+
+xmrig::Pool::Pool(const char *host, uint16_t port, const char *user, const char *password, int keepAlive, bool nicehash, bool tls) :
+    m_enabled(true),
+    m_nicehash(nicehash),
+    m_tls(tls),
+    m_keepAlive(keepAlive),
+    m_host(host),
+    m_password(password),
+    m_user(user),
+    m_port(port)
+{
+    const size_t size = m_host.size() + 8;
+    assert(size > 8);
+
+    char *url = new char[size]();
+    snprintf(url, size - 1, "%s:%d", m_host.data(), m_port);
+
+    m_url = url;
+}
+
+
+bool xmrig::Pool::isCompatible(const Algorithm &algorithm) const
+{
+    if (m_algorithms.empty()) {
+        return true;
+    }
+
+    for (const auto &a : m_algorithms) {
+        if (algorithm == a) {
+            return true;
+        }
+    }
+
+#   ifdef XMRIG_PROXY_PROJECT
+    if (m_algorithm.algo() == xmrig::CRYPTONIGHT && algorithm.algo() == xmrig::CRYPTONIGHT) {
+        return m_algorithm.variant() == xmrig::VARIANT_RWZ || m_algorithm.variant() == xmrig::VARIANT_ZLS;
+    }
+#   endif
+
+    return false;
+}
+
+
+bool xmrig::Pool::isEnabled() const
+{
+#   ifdef XMRIG_NO_TLS
+    if (isTLS()) {
+        return false;
+    }
+#   endif
+
+    return m_enabled && isValid() && algorithm().isValid();
+}
+
+
+bool xmrig::Pool::isEqual(const Pool &other) const
+{
+    return (m_nicehash       == other.m_nicehash
+            && m_enabled     == other.m_enabled
+            && m_tls         == other.m_tls
+            && m_keepAlive   == other.m_keepAlive
+            && m_port        == other.m_port
+            && m_algorithm   == other.m_algorithm
+            && m_fingerprint == other.m_fingerprint
+            && m_host        == other.m_host
+            && m_password    == other.m_password
+            && m_rigId       == other.m_rigId
+            && m_url         == other.m_url
+            && m_user        == other.m_user);
+}
+
+
+bool xmrig::Pool::parse(const char *url)
+{
+    assert(url != nullptr);
+
+    const char *p = strstr(url, "://");
+    const char *base = url;
+
+    if (p) {
+        if (strncasecmp(url, "stratum+tcp://", 14) == 0) {
+            m_tls = false;
+        }
+        else if (strncasecmp(url, "stratum+ssl://", 14) == 0) {
+            m_tls = true;
+        }
+        else {
+            return false;
+        }
+
+        base = url + 14;
+    }
+
+    if (!strlen(base) || *base == '/') {
+        return false;
+    }
+
+    m_url = url;
+    if (base[0] == '[') {
+        return parseIPv6(base);
+    }
+
+    const char *port = strchr(base, ':');
+    if (!port) {
+        m_host = base;
+        return true;
+    }
+
+    const size_t size = static_cast<size_t>(port++ - base + 1);
+    char *host        = new char[size]();
+    memcpy(host, base, size - 1);
+
+    m_host = host;
+    m_port = static_cast<uint16_t>(strtol(port, nullptr, 10));
+
+    return true;
+}
+
+
+bool xmrig::Pool::setUserpass(const char *userpass)
+{
+    const char *p = strchr(userpass, ':');
+    if (!p) {
+        return false;
+    }
+
+    char *user = new char[p - userpass + 1]();
+    strncpy(user, userpass, static_cast<size_t>(p - userpass));
+
+    m_user     = user;
+    m_password = p + 1;
+
+    return true;
+}
+
+
+rapidjson::Value xmrig::Pool::toJSON(rapidjson::Document &doc) const
+{
+    using namespace rapidjson;
+
+    auto &allocator = doc.GetAllocator();
+
+    Value obj(kObjectType);
+
+    obj.AddMember(StringRef(kUrl),   m_url.toJSON(), allocator);
+    obj.AddMember(StringRef(kUser),  m_user.toJSON(), allocator);
+    obj.AddMember(StringRef(kPass),  m_password.toJSON(), allocator);
+    obj.AddMember(StringRef(kRigId), m_rigId.toJSON(), allocator);
+
+#   ifndef XMRIG_PROXY_PROJECT
+    obj.AddMember(StringRef(kNicehash), isNicehash(), allocator);
+#   endif
+
+    if (m_keepAlive == 0 || m_keepAlive == kKeepAliveTimeout) {
+        obj.AddMember(StringRef(kKeepalive), m_keepAlive > 0, allocator);
+    }
+    else {
+        obj.AddMember(StringRef(kKeepalive), m_keepAlive, allocator);
+    }
+
+    switch (m_algorithm.variant()) {
+    case VARIANT_AUTO:
+    case VARIANT_0:
+    case VARIANT_1:
+        obj.AddMember(StringRef(kVariant), m_algorithm.variant(), allocator);
+        break;
+
+    case VARIANT_2:
+        obj.AddMember(StringRef(kVariant), 2, allocator);
+        break;
+
+    default:
+        obj.AddMember(StringRef(kVariant), StringRef(m_algorithm.variantName()), allocator);
+        break;
+    }
+
+    obj.AddMember(StringRef(kEnabled),     m_enabled, allocator);
+    obj.AddMember(StringRef(kTls),         isTLS(), allocator);
+    obj.AddMember(StringRef(kFingerprint), m_fingerprint.toJSON(), allocator);
+
+    return obj;
+}
+
+
+void xmrig::Pool::adjust(const Algorithm &algorithm)
+{
+    if (!isValid()) {
+        return;
+    }
+
+    if (!m_algorithm.isValid()) {
+        m_algorithm.setAlgo(algorithm.algo());
+        adjustVariant(algorithm.variant());
+    }
+
+    rebuild();
+}
+
+
+void xmrig::Pool::setAlgo(const xmrig::Algorithm &algorithm)
+{
+    m_algorithm = algorithm;
+
+    rebuild();
+}
+
+
+#ifdef APP_DEBUG
+void xmrig::Pool::print() const
+{
+    LOG_NOTICE("url:       %s", m_url.data());
+    LOG_DEBUG ("host:      %s", m_host.data());
+    LOG_DEBUG ("port:      %d", static_cast<int>(m_port));
+    LOG_DEBUG ("user:      %s", m_user.data());
+    LOG_DEBUG ("pass:      %s", m_password.data());
+    LOG_DEBUG ("rig-id     %s", m_rigId.data());
+    LOG_DEBUG ("algo:      %s", m_algorithm.name());
+    LOG_DEBUG ("nicehash:  %d", static_cast<int>(m_nicehash));
+    LOG_DEBUG ("keepAlive: %d", m_keepAlive);
+}
+#endif
+
+
+bool xmrig::Pool::parseIPv6(const char *addr)
+{
+    const char *end = strchr(addr, ']');
+    if (!end) {
+        return false;
+    }
+
+    const char *port = strchr(end, ':');
+    if (!port) {
+        return false;
+    }
+
+    const size_t size = static_cast<size_t>(end - addr);
+    char *host        = new char[size]();
+    memcpy(host, addr + 1, size - 1);
+
+    m_host = host;
+    m_port = static_cast<uint16_t>(strtol(port + 1, nullptr, 10));
+
+    return true;
+}
+
+
+void xmrig::Pool::addVariant(xmrig::Variant variant)
+{
+    const xmrig::Algorithm algorithm(m_algorithm.algo(), variant);
+    if (!algorithm.isValid() || m_algorithm == algorithm) {
+        return;
+    }
+
+    m_algorithms.push_back(algorithm);
+}
+
+
+void xmrig::Pool::adjustVariant(const xmrig::Variant variantHint)
+{
+#   ifndef XMRIG_PROXY_PROJECT
+    using namespace xmrig;
+
+    if (m_host.contains(".nicehash.com")) {
+        m_keepAlive = false;
+        m_nicehash  = true;
+        bool valid  = true;
+
+        switch (m_port) {
+        case 3355:
+        case 33355:
+            valid = m_algorithm.algo() == CRYPTONIGHT && m_host.contains("cryptonight.");
+            m_algorithm.setVariant(VARIANT_0);
+            break;
+
+        case 3363:
+        case 33363:
+            valid = m_algorithm.algo() == CRYPTONIGHT && m_host.contains("cryptonightv7.");
+            m_algorithm.setVariant(VARIANT_1);
+            break;
+
+        case 3364:
+            valid = m_algorithm.algo() == CRYPTONIGHT_HEAVY && m_host.contains("cryptonightheavy.");
+            m_algorithm.setVariant(VARIANT_0);
+            break;
+
+        case 3367:
+        case 33367:
+            valid = m_algorithm.algo() == CRYPTONIGHT && m_host.contains("cryptonightv8.");
+            m_algorithm.setVariant(VARIANT_2);
+            break;
+
+        default:
+            break;
+        }
+
+        if (!valid) {
+            m_algorithm.setAlgo(INVALID_ALGO);
+        }
+
+        m_tls = m_port > 33000;
+        return;
+    }
+
+    if (m_host.contains(".minergate.com")) {
+        m_keepAlive = false;
+        bool valid  = true;
+        m_algorithm.setVariant(VARIANT_1);
+
+        if (m_host.contains("xmr.pool.")) {
+            valid = m_algorithm.algo() == CRYPTONIGHT;
+            m_algorithm.setVariant(m_port == 45700 ? VARIANT_AUTO : VARIANT_0);
+        }
+        else if (m_host.contains("aeon.pool.") && m_port == 45690) {
+            valid = m_algorithm.algo() == CRYPTONIGHT_LITE;
+            m_algorithm.setVariant(VARIANT_1);
+        }
+
+        if (!valid) {
+            m_algorithm.setAlgo(INVALID_ALGO);
+        }
+
+        return;
+    }
+
+    if (variantHint != VARIANT_AUTO) {
+        m_algorithm.setVariant(variantHint);
+        return;
+    }
+
+    if (m_algorithm.variant() != VARIANT_AUTO) {
+        return;
+    }
+
+    if (m_algorithm.algo() == CRYPTONIGHT_HEAVY)  {
+        m_algorithm.setVariant(VARIANT_0);
+    }
+    else if (m_algorithm.algo() == CRYPTONIGHT_LITE) {
+        m_algorithm.setVariant(VARIANT_1);
+    }
+#   endif
+}
+
+
+void xmrig::Pool::rebuild()
+{
+    m_algorithms.clear();
+
+    if (!m_algorithm.isValid()) {
+        return;
+    }
+
+    m_algorithms.push_back(m_algorithm);
+
+#   ifndef XMRIG_PROXY_PROJECT
+    addVariant(VARIANT_4);
+    addVariant(VARIANT_WOW);
+    addVariant(VARIANT_2);
+    addVariant(VARIANT_1);
+    addVariant(VARIANT_0);
+    addVariant(VARIANT_HALF);
+    addVariant(VARIANT_XTL);
+    addVariant(VARIANT_TUBE);
+    addVariant(VARIANT_MSR);
+    addVariant(VARIANT_XHV);
+    addVariant(VARIANT_XAO);
+    addVariant(VARIANT_RTO);
+    addVariant(VARIANT_GPU);
+    addVariant(VARIANT_RWZ);
+    addVariant(VARIANT_ZLS);
+    addVariant(VARIANT_DOUBLE);
+    addVariant(VARIANT_AUTO);
+#   endif
+}

src/base/net/stratum/Pool.h

@@ -0,0 +1,125 @@
+/* XMRig
+ * 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-2019 SChernykh   <https://github.com/SChernykh>
+ * Copyright 2016-2019 XMRig       <https://github.com/xmrig>, <support@xmrig.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
+ *   the Free Software Foundation, either version 3 of the License, or
+ *   (at your option) any later version.
+ *
+ *   This program is distributed in the hope that it will be useful,
+ *   but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ *   GNU General Public License for more details.
+ *
+ *   You should have received a copy of the GNU General Public License
+ *   along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#ifndef XMRIG_POOL_H
+#define XMRIG_POOL_H
+
+
+#include <vector>
+
+
+#include "base/tools/String.h"
+#include "common/crypto/Algorithm.h"
+#include "rapidjson/fwd.h"
+
+
+namespace xmrig {
+
+
+class Pool
+{
+public:
+    static const String kDefaultPassword;
+    static const String kDefaultUser;
+
+    constexpr static uint16_t kDefaultPort        = 3333;
+    constexpr static int kKeepAliveTimeout        = 60;
+
+    Pool();
+    Pool(const char *url);
+    Pool(const rapidjson::Value &object);
+    Pool(const char *host,
+         uint16_t port,
+         const char *user       = nullptr,
+         const char *password   = nullptr,
+         int keepAlive          = 0,
+         bool nicehash          = false,
+         bool tls               = false
+       );
+
+    inline Algorithm &algorithm()                       { return m_algorithm; }
+    inline bool isNicehash() const                      { return m_nicehash; }
+    inline bool isTLS() const                           { return m_tls; }
+    inline bool isValid() const                         { return !m_host.isNull() && m_port > 0; }
+    inline const Algorithm &algorithm() const           { return m_algorithm; }
+    inline const Algorithms &algorithms() const         { return m_algorithms; }
+    inline const String &fingerprint() const            { return m_fingerprint; }
+    inline const String &host() const                   { return m_host; }
+    inline const String &password() const               { return !m_password.isNull() ? m_password : kDefaultPassword; }
+    inline const String &rigId() const                  { return m_rigId; }
+    inline const String &url() const                    { return m_url; }
+    inline const String &user() const                   { return !m_user.isNull() ? m_user : kDefaultUser; }
+    inline int keepAlive() const                        { return m_keepAlive; }
+    inline uint16_t port() const                        { return m_port; }
+    inline void setFingerprint(const char *fingerprint) { m_fingerprint = fingerprint; }
+    inline void setKeepAlive(bool enable)               { setKeepAlive(enable ? kKeepAliveTimeout : 0); }
+    inline void setKeepAlive(int keepAlive)             { m_keepAlive = keepAlive >= 0 ? keepAlive : 0; }
+    inline void setNicehash(bool nicehash)              { m_nicehash = nicehash; }
+    inline void setPassword(const char *password)       { m_password = password; }
+    inline void setRigId(const char *rigId)             { m_rigId = rigId; }
+    inline void setTLS(bool tls)                        { m_tls = tls; }
+    inline void setUser(const char *user)               { m_user = user; }
+
+    inline bool operator!=(const Pool &other) const  { return !isEqual(other); }
+    inline bool operator==(const Pool &other) const  { return isEqual(other); }
+
+    bool isCompatible(const Algorithm &algorithm) const;
+    bool isEnabled() const;
+    bool isEqual(const Pool &other) const;
+    bool parse(const char *url);
+    bool setUserpass(const char *userpass);
+    rapidjson::Value toJSON(rapidjson::Document &doc) const;
+    void adjust(const Algorithm &algorithm);
+    void setAlgo(const Algorithm &algorithm);
+
+#   ifdef APP_DEBUG
+    void print() const;
+#   endif
+
+private:
+    bool parseIPv6(const char *addr);
+    void addVariant(Variant variant);
+    void adjustVariant(const Variant variantHint);
+    void rebuild();
+
+    Algorithm m_algorithm;
+    Algorithms m_algorithms;
+    bool m_enabled;
+    bool m_nicehash;
+    bool m_tls;
+    int m_keepAlive;
+    String m_fingerprint;
+    String m_host;
+    String m_password;
+    String m_rigId;
+    String m_url;
+    String m_user;
+    uint16_t m_port;
+};
+
+
+} /* namespace xmrig */
+
+
+#endif /* XMRIG_POOL_H */

src/base/net/stratum/Pools.cpp

@@ -0,0 +1,229 @@
+/* XMRig
+ * 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-2019 SChernykh   <https://github.com/SChernykh>
+ * Copyright 2016-2019 XMRig       <https://github.com/xmrig>, <support@xmrig.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
+ *   the Free Software Foundation, either version 3 of the License, or
+ *   (at your option) any later version.
+ *
+ *   This program is distributed in the hope that it will be useful,
+ *   but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ *   GNU General Public License for more details.
+ *
+ *   You should have received a copy of the GNU General Public License
+ *   along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+
+#include "base/net/stratum/Pools.h"
+#include "base/net/stratum/strategies/FailoverStrategy.h"
+#include "base/net/stratum/strategies/SinglePoolStrategy.h"
+#include "common/log/Log.h"
+#include "donate.h"
+#include "rapidjson/document.h"
+
+
+xmrig::Pools::Pools() :
+    m_donateLevel(kDefaultDonateLevel),
+    m_retries(5),
+    m_retryPause(5),
+    m_proxyDonate(PROXY_DONATE_AUTO)
+{
+#   ifdef XMRIG_PROXY_PROJECT
+    m_retries    = 2;
+    m_retryPause = 1;
+#   endif
+}
+
+
+xmrig::Pool &xmrig::Pools::current()
+{
+    if (m_data.empty()) {
+        m_data.push_back(Pool());
+    }
+
+    return m_data.back();
+}
+
+
+bool xmrig::Pools::isEqual(const Pools &other) const
+{
+    if (m_data.size() != other.m_data.size() || m_retries != other.m_retries || m_retryPause != other.m_retryPause) {
+        return false;
+    }
+
+    return std::equal(m_data.begin(), m_data.end(), other.m_data.begin());
+}
+
+
+bool xmrig::Pools::setUrl(const char *url)
+{
+    if (m_data.empty() || m_data.back().isValid()) {
+        Pool pool(url);
+
+        if (pool.isValid()) {
+            m_data.push_back(std::move(pool));
+            return true;
+        }
+
+        return false;
+    }
+
+    current().parse(url);
+
+    return m_data.back().isValid();
+}
+
+
+xmrig::IStrategy *xmrig::Pools::createStrategy(IStrategyListener *listener) const
+{
+    if (active() == 1) {
+        for (const Pool &pool : m_data) {
+            if (pool.isEnabled()) {
+                return new SinglePoolStrategy(pool, retryPause(), retries(), listener);
+            }
+        }
+    }
+
+    FailoverStrategy *strategy = new FailoverStrategy(retryPause(), retries(), listener);
+    for (const Pool &pool : m_data) {
+        if (pool.isEnabled()) {
+            strategy->add(pool);
+        }
+    }
+
+    return strategy;
+}
+
+
+rapidjson::Value xmrig::Pools::toJSON(rapidjson::Document &doc) const
+{
+    using namespace rapidjson;
+    auto &allocator = doc.GetAllocator();
+
+    Value pools(kArrayType);
+
+    for (const Pool &pool : m_data) {
+        pools.PushBack(pool.toJSON(doc), allocator);
+    }
+
+    return pools;
+}
+
+
+size_t xmrig::Pools::active() const
+{
+    size_t count = 0;
+    for (const Pool &pool : m_data) {
+        if (pool.isEnabled()) {
+            count++;
+        }
+    }
+
+    return count;
+}
+
+
+void xmrig::Pools::adjust(const Algorithm &algorithm)
+{
+    for (Pool &pool : m_data) {
+        pool.adjust(algorithm);
+    }
+}
+
+
+void xmrig::Pools::load(const rapidjson::Value &pools)
+{
+    m_data.clear();
+
+    for (const rapidjson::Value &value : pools.GetArray()) {
+        if (!value.IsObject()) {
+            continue;
+        }
+
+        Pool pool(value);
+        if (pool.isValid()) {
+            m_data.push_back(std::move(pool));
+        }
+    }
+}
+
+
+void xmrig::Pools::print() const
+{
+    size_t i = 1;
+    for (const Pool &pool : m_data) {
+        if (Log::colors) {
+            const int color = pool.isEnabled() ? (pool.isTLS() ? 32 : 36) : 31;
+
+            Log::i()->text(GREEN_BOLD(" * ") WHITE_BOLD("POOL #%-7zu") "\x1B[1;%dm%s\x1B[0m variant " WHITE_BOLD("%s"),
+                           i,
+                           color,
+                           pool.url().data(),
+                           pool.algorithm().variantName()
+                           );
+        }
+        else {
+            Log::i()->text(" * POOL #%-7zu%s%s variant=%s %s",
+                           i,
+                           pool.isEnabled() ? "" : "-",
+                           pool.url().data(),
+                           pool.algorithm().variantName(),
+                           pool.isTLS() ? "TLS" : ""
+                           );
+        }
+
+        i++;
+    }
+
+#   ifdef APP_DEBUG
+    LOG_NOTICE("POOLS --------------------------------------------------------------------");
+    for (const Pool &pool : m_data) {
+        pool.print();
+    }
+    LOG_NOTICE("--------------------------------------------------------------------------");
+#   endif
+}
+
+
+void xmrig::Pools::setDonateLevel(int level)
+{
+    if (level >= kMinimumDonateLevel && level <= 99) {
+        m_donateLevel = level;
+    }
+}
+
+
+void xmrig::Pools::setProxyDonate(int value)
+{
+    switch (value) {
+    case PROXY_DONATE_NONE:
+    case PROXY_DONATE_AUTO:
+    case PROXY_DONATE_ALWAYS:
+        m_proxyDonate = static_cast<ProxyDonate>(value);
+    }
+}
+
+
+void xmrig::Pools::setRetries(int retries)
+{
+    if (retries > 0 && retries <= 1000) {
+        m_retries = retries;
+    }
+}
+
+
+void xmrig::Pools::setRetryPause(int retryPause)
+{
+    if (retryPause > 0 && retryPause <= 3600) {
+        m_retryPause = retryPause;
+    }
+}

src/base/net/stratum/Pools.h

@@ -0,0 +1,100 @@
+/* XMRig
+ * 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-2019 SChernykh   <https://github.com/SChernykh>
+ * Copyright 2016-2019 XMRig       <https://github.com/xmrig>, <support@xmrig.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
+ *   the Free Software Foundation, either version 3 of the License, or
+ *   (at your option) any later version.
+ *
+ *   This program is distributed in the hope that it will be useful,
+ *   but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ *   GNU General Public License for more details.
+ *
+ *   You should have received a copy of the GNU General Public License
+ *   along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#ifndef XMRIG_POOLS_H
+#define XMRIG_POOLS_H
+
+
+#include <vector>
+
+
+#include "base/net/stratum/Pool.h"
+
+
+namespace xmrig {
+
+
+class IStrategy;
+class IStrategyListener;
+
+
+class Pools
+{
+public:
+    enum ProxyDonate {
+        PROXY_DONATE_NONE,
+        PROXY_DONATE_AUTO,
+        PROXY_DONATE_ALWAYS
+    };
+
+    Pools();
+
+    inline bool setUserpass(const char *userpass)       { return current().setUserpass(userpass); }
+    inline const std::vector<Pool> &data() const        { return m_data; }
+    inline int donateLevel() const                      { return m_donateLevel; }
+    inline int retries() const                          { return m_retries; }
+    inline int retryPause() const                       { return m_retryPause; }
+    inline ProxyDonate proxyDonate() const              { return m_proxyDonate; }
+    inline void setFingerprint(const char *fingerprint) { current().setFingerprint(fingerprint); }
+    inline void setKeepAlive(bool enable)               { current().setKeepAlive(enable); }
+    inline void setKeepAlive(int keepAlive)             { current().setKeepAlive(keepAlive); }
+    inline void setNicehash(bool enable)                { current().setNicehash(enable); }
+    inline void setPassword(const char *password)       { current().setPassword(password); }
+    inline void setRigId(const char *rigId)             { current().setRigId(rigId); }
+    inline void setTLS(bool enable)                     { current().setTLS(enable); }
+    inline void setUser(const char *user)               { current().setUser(user); }
+    inline void setVariant(const char *variant)         { current().algorithm().parseVariant(variant); }
+    inline void setVariant(int variant)                 { current().algorithm().parseVariant(variant); }
+
+    inline bool operator!=(const Pools &other) const    { return !isEqual(other); }
+    inline bool operator==(const Pools &other) const    { return isEqual(other); }
+
+    bool isEqual(const Pools &other) const;
+    bool setUrl(const char *url);
+    IStrategy *createStrategy(IStrategyListener *listener) const;
+    rapidjson::Value toJSON(rapidjson::Document &doc) const;
+    size_t active() const;
+    void adjust(const Algorithm &algorithm);
+    void load(const rapidjson::Value &pools);
+    void print() const;
+    void setDonateLevel(int level);
+    void setProxyDonate(int value);
+    void setRetries(int retries);
+    void setRetryPause(int retryPause);
+
+private:
+    Pool &current();
+
+    int m_donateLevel;
+    int m_retries;
+    int m_retryPause;
+    ProxyDonate m_proxyDonate;
+    std::vector<Pool> m_data;
+};
+
+
+} /* namespace xmrig */
+
+
+#endif /* XMRIG_POOLS_H */

src/base/net/stratum/SubmitResult.h

@@ -0,0 +1,72 @@
+/* XMRig
+ * 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-2019 SChernykh   <https://github.com/SChernykh>
+ * Copyright 2016-2019 XMRig       <https://github.com/xmrig>, <support@xmrig.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
+ *   the Free Software Foundation, either version 3 of the License, or
+ *   (at your option) any later version.
+ *
+ *   This program is distributed in the hope that it will be useful,
+ *   but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ *   GNU General Public License for more details.
+ *
+ *   You should have received a copy of the GNU General Public License
+ *   along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#ifndef XMRIG_SUBMITRESULT_H
+#define XMRIG_SUBMITRESULT_H
+
+
+#include "base/tools/Chrono.h"
+
+
+namespace xmrig {
+
+
+class SubmitResult
+{
+public:
+    inline SubmitResult() :
+        reqId(0),
+        seq(0),
+        diff(0),
+        actualDiff(0),
+        elapsed(0),
+        m_start(0)
+    {}
+
+    inline SubmitResult(int64_t seq, uint32_t diff, uint64_t actualDiff, int64_t reqId = 0) :
+        reqId(reqId),
+        seq(seq),
+        diff(diff),
+        actualDiff(actualDiff),
+        elapsed(0),
+        m_start(Chrono::steadyMSecs())
+    {}
+
+    inline void done() { elapsed = Chrono::steadyMSecs() - m_start; }
+
+    int64_t reqId;
+    int64_t seq;
+    uint32_t diff;
+    uint64_t actualDiff;
+    uint64_t elapsed;
+
+private:
+    uint64_t m_start;
+};
+
+
+} /* namespace xmrig */
+
+
+#endif /* XMRIG_SUBMITRESULT_H */

src/base/net/stratum/Tls.cpp

@@ -0,0 +1,192 @@
+/* XMRig
+ * 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      Lee Clagett <https://github.com/vtnerd>
+ * Copyright 2018-2019 SChernykh   <https://github.com/SChernykh>
+ * Copyright 2016-2019 XMRig       <https://github.com/xmrig>, <support@xmrig.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
+ *   the Free Software Foundation, either version 3 of the License, or
+ *   (at your option) any later version.
+ *
+ *   This program is distributed in the hope that it will be useful,
+ *   but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ *   GNU General Public License for more details.
+ *
+ *   You should have received a copy of the GNU General Public License
+ *   along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+
+#include <assert.h>
+
+
+#include "base/net/stratum/Client.h"
+#include "base/net/stratum/Tls.h"
+#include "base/tools/Buffer.h"
+#include "common/log/Log.h"
+
+
+#ifdef _MSC_VER
+#   define strncasecmp(x,y,z) _strnicmp(x,y,z)
+#endif
+
+
+xmrig::Client::Tls::Tls(Client *client) :
+    m_ready(false),
+    m_buf(),
+    m_fingerprint(),
+    m_client(client),
+    m_ssl(nullptr)
+{
+    m_ctx = SSL_CTX_new(SSLv23_method());
+    assert(m_ctx != nullptr);
+
+    if (!m_ctx) {
+        return;
+    }
+
+    m_writeBio = BIO_new(BIO_s_mem());
+    m_readBio  = BIO_new(BIO_s_mem());
+    SSL_CTX_set_options(m_ctx, SSL_OP_NO_SSLv2 | SSL_OP_NO_SSLv3);
+}
+
+
+xmrig::Client::Tls::~Tls()
+{
+    if (m_ctx) {
+        SSL_CTX_free(m_ctx);
+    }
+
+    if (m_ssl) {
+        SSL_free(m_ssl);
+    }
+}
+
+
+bool xmrig::Client::Tls::handshake()
+{
+    m_ssl = SSL_new(m_ctx);
+    assert(m_ssl != nullptr);
+
+    if (!m_ssl) {
+        return false;
+    }
+
+    SSL_set_connect_state(m_ssl);
+    SSL_set_bio(m_ssl, m_readBio, m_writeBio);
+    SSL_do_handshake(m_ssl);
+
+    return send();
+}
+
+
+bool xmrig::Client::Tls::send(const char *data, size_t size)
+{
+    SSL_write(m_ssl, data, size);
+
+    return send();
+}
+
+
+const char *xmrig::Client::Tls::fingerprint() const
+{
+    return m_ready ? m_fingerprint : nullptr;
+}
+
+
+const char *xmrig::Client::Tls::version() const
+{
+    return m_ready ? SSL_get_version(m_ssl) : nullptr;
+}
+
+
+void xmrig::Client::Tls::read(const char *data, size_t size)
+{
+    BIO_write(m_readBio, data, size);
+
+    if (!SSL_is_init_finished(m_ssl)) {
+        const int rc = SSL_connect(m_ssl);
+
+        if (rc < 0 && SSL_get_error(m_ssl, rc) == SSL_ERROR_WANT_READ) {
+            send();
+        } else if (rc == 1) {
+            X509 *cert = SSL_get_peer_certificate(m_ssl);
+            if (!verify(cert)) {
+                X509_free(cert);
+                m_client->close();
+
+                return;
+            }
+
+            X509_free(cert);
+            m_ready = true;
+            m_client->login();
+      }
+
+      return;
+    }
+
+    int bytes_read = 0;
+    while ((bytes_read = SSL_read(m_ssl, m_buf, sizeof(m_buf))) > 0) {
+        m_buf[bytes_read - 1] = '\0';
+        m_client->parse(m_buf, static_cast<size_t>(bytes_read));
+    }
+}
+
+
+bool xmrig::Client::Tls::send()
+{
+    return m_client->send(m_writeBio);
+}
+
+
+bool xmrig::Client::Tls::verify(X509 *cert)
+{
+    if (cert == nullptr) {
+        LOG_ERR("[%s] Failed to get server certificate", m_client->url());
+
+        return false;
+    }
+
+    if (!verifyFingerprint(cert)) {
+        LOG_ERR("[%s] Failed to verify server certificate fingerprint", m_client->url());
+
+        const char *fingerprint = m_client->m_pool.fingerprint();
+        if (strlen(m_fingerprint) == 64 && fingerprint != nullptr) {
+            LOG_ERR("\"%s\" was given", m_fingerprint);
+            LOG_ERR("\"%s\" was configured", fingerprint);
+        }
+
+        return false;
+    }
+
+    return true;
+}
+
+
+bool xmrig::Client::Tls::verifyFingerprint(X509 *cert)
+{
+    const EVP_MD *digest = EVP_get_digestbyname("sha256");
+    if (digest == nullptr) {
+        return false;
+    }
+
+    unsigned char md[EVP_MAX_MD_SIZE];
+    unsigned int dlen;
+
+    if (X509_digest(cert, digest, md, &dlen) != 1) {
+        return false;
+    }
+
+    Buffer::toHex(md, 32, m_fingerprint);
+    const char *fingerprint = m_client->m_pool.fingerprint();
+
+    return fingerprint == nullptr || strncasecmp(m_fingerprint, fingerprint, 64) == 0;
+}

src/base/net/stratum/Tls.h

@@ -0,0 +1,69 @@
+/* XMRig
+ * 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-2019 SChernykh   <https://github.com/SChernykh>
+ * Copyright 2016-2019 XMRig       <https://github.com/xmrig>, <support@xmrig.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
+ *   the Free Software Foundation, either version 3 of the License, or
+ *   (at your option) any later version.
+ *
+ *   This program is distributed in the hope that it will be useful,
+ *   but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ *   GNU General Public License for more details.
+ *
+ *   You should have received a copy of the GNU General Public License
+ *   along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#ifndef XMRIG_CLIENT_TLS_H
+#define XMRIG_CLIENT_TLS_H
+
+
+#include <openssl/ssl.h>
+
+
+#include "base/net/stratum/Client.h"
+
+
+namespace xmrig {
+
+
+class Client::Tls
+{
+public:
+    Tls(Client *client);
+    ~Tls();
+
+    bool handshake();
+    bool send(const char *data, size_t size);
+    const char *fingerprint() const;
+    const char *version() const;
+    void read(const char *data, size_t size);
+
+private:
+    bool send();
+    bool verify(X509 *cert);
+    bool verifyFingerprint(X509 *cert);
+
+    BIO *m_readBio;
+    BIO *m_writeBio;
+    bool m_ready;
+    char m_buf[1024 * 2];
+    char m_fingerprint[32 * 2 + 8];
+    Client *m_client;
+    SSL *m_ssl;
+    SSL_CTX *m_ctx;
+};
+
+
+} /* namespace xmrig */
+
+
+#endif /* XMRIG_CLIENT_TLS_H */

src/base/net/stratum/strategies/FailoverStrategy.cpp

@@ -5,7 +5,8 @@
  * 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 2016-2018 XMRig       <https://github.com/xmrig>, <support@xmrig.com>
+ * Copyright 2018-2019 SChernykh   <https://github.com/SChernykh>
+ * Copyright 2016-2019 XMRig       <https://github.com/xmrig>, <support@xmrig.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
@@ -22,27 +23,38 @@
  */
 
 
-#include "interfaces/IStrategyListener.h"
-#include "net/Client.h"
-#include "net/strategies/FailoverStrategy.h"
-#include "Platform.h"
+#include "base/kernel/interfaces/IStrategyListener.h"
+#include "base/net/stratum/Client.h"
+#include "base/net/stratum/strategies/FailoverStrategy.h"
+#include "common/Platform.h"
 
 
-FailoverStrategy::FailoverStrategy(const std::vector<Url*> &urls, int retryPause, int retries, IStrategyListener *listener, bool quiet) :
+xmrig::FailoverStrategy::FailoverStrategy(const std::vector<Pool> &pools, int retryPause, int retries, IStrategyListener *listener, bool quiet) :
     m_quiet(quiet),
     m_retries(retries),
     m_retryPause(retryPause),
     m_active(-1),
-    m_index(0),
-    m_listener(listener)
+    m_listener(listener),
+    m_index(0)
 {
-    for (const Url *url : urls) {
-        add(url);
+    for (const Pool &pool : pools) {
+        add(pool);
     }
 }
 
 
-FailoverStrategy::~FailoverStrategy()
+xmrig::FailoverStrategy::FailoverStrategy(int retryPause, int retries, IStrategyListener *listener, bool quiet) :
+    m_quiet(quiet),
+    m_retries(retries),
+    m_retryPause(retryPause),
+    m_active(-1),
+    m_listener(listener),
+    m_index(0)
+{
+}
+
+
+xmrig::FailoverStrategy::~FailoverStrategy()
 {
     for (Client *client : m_pools) {
         client->deleteLater();
@@ -50,33 +62,53 @@ FailoverStrategy::~FailoverStrategy()
 }
 
 
-int64_t FailoverStrategy::submit(const JobResult &result)
+void xmrig::FailoverStrategy::add(const Pool &pool)
+{
+    Client *client = new Client(static_cast<int>(m_pools.size()), Platform::userAgent(), this);
+    client->setPool(pool);
+    client->setRetries(m_retries);
+    client->setRetryPause(m_retryPause * 1000);
+    client->setQuiet(m_quiet);
+
+    m_pools.push_back(client);
+}
+
+
+int64_t xmrig::FailoverStrategy::submit(const JobResult &result)
 {
     if (m_active == -1) {
         return -1;
     }
 
-    return m_pools[m_active]->submit(result);
+    return active()->submit(result);
 }
 
 
-void FailoverStrategy::connect()
+void xmrig::FailoverStrategy::connect()
 {
     m_pools[m_index]->connect();
 }
 
 
-void FailoverStrategy::resume()
+void xmrig::FailoverStrategy::resume()
 {
     if (!isActive()) {
         return;
     }
 
-    m_listener->onJob(this, m_pools[m_active],  m_pools[m_active]->job());
+    m_listener->onJob(this, active(), active()->job());
 }
 
 
-void FailoverStrategy::stop()
+void xmrig::FailoverStrategy::setAlgo(const xmrig::Algorithm &algo)
+{
+    for (Client *client : m_pools) {
+        client->setAlgo(algo);
+    }
+}
+
+
+void xmrig::FailoverStrategy::stop()
 {
     for (size_t i = 0; i < m_pools.size(); ++i) {
         m_pools[i]->disconnect();
@@ -89,7 +121,7 @@ void FailoverStrategy::stop()
 }
 
 
-void FailoverStrategy::tick(uint64_t now)
+void xmrig::FailoverStrategy::tick(uint64_t now)
 {
     for (Client *client : m_pools) {
         client->tick(now);
@@ -97,7 +129,7 @@ void FailoverStrategy::tick(uint64_t now)
 }
 
 
-void FailoverStrategy::onClose(Client *client, int failures)
+void xmrig::FailoverStrategy::onClose(Client *client, int failures)
 {
     if (failures == -1) {
         return;
@@ -112,13 +144,13 @@ void FailoverStrategy::onClose(Client *client, int failures)
         return;
     }
 
-    if (m_index == client->id() && (m_pools.size() - m_index) > 1) {
+    if (m_index == static_cast<size_t>(client->id()) && (m_pools.size() - m_index) > 1) {
         m_pools[++m_index]->connect();
     }
 }
 
 
-void FailoverStrategy::onJobReceived(Client *client, const Job &job)
+void xmrig::FailoverStrategy::onJobReceived(Client *client, const Job &job, const rapidjson::Value &)
 {
     if (m_active == client->id()) {
         m_listener->onJob(this, client, job);
@@ -126,7 +158,7 @@ void FailoverStrategy::onJobReceived(Client *client, const Job &job)
 }
 
 
-void FailoverStrategy::onLoginSuccess(Client *client)
+void xmrig::FailoverStrategy::onLoginSuccess(Client *client)
 {
     int active = m_active;
 
@@ -147,18 +179,7 @@ void FailoverStrategy::onLoginSuccess(Client *client)
 }
 
 
-void FailoverStrategy::onResultAccepted(Client *client, const SubmitResult &result, const char *error)
+void xmrig::FailoverStrategy::onResultAccepted(Client *client, const SubmitResult &result, const char *error)
 {
     m_listener->onResultAccepted(this, client, result, error);
 }
-
-
-void FailoverStrategy::add(const Url *url)
-{
-    Client *client = new Client((int) m_pools.size(), Platform::userAgent(), this);
-    client->setUrl(url);
-    client->setRetryPause(m_retryPause * 1000);
-    client->setQuiet(m_quiet);
-
-    m_pools.push_back(client);
-}

src/base/net/stratum/strategies/FailoverStrategy.h

@@ -5,7 +5,8 @@
  * 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 2016-2018 XMRig       <https://github.com/xmrig>, <support@xmrig.com>
+ * Copyright 2018-2019 SChernykh   <https://github.com/SChernykh>
+ * Copyright 2016-2019 XMRig       <https://github.com/xmrig>, <support@xmrig.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
@@ -21,53 +22,64 @@
  *   along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef __FAILOVERSTRATEGY_H__
-#define __FAILOVERSTRATEGY_H__
+#ifndef XMRIG_FAILOVERSTRATEGY_H
+#define XMRIG_FAILOVERSTRATEGY_H
 
 
 #include <vector>
 
 
-#include "interfaces/IClientListener.h"
-#include "interfaces/IStrategy.h"
+#include "base/kernel/interfaces/IClientListener.h"
+#include "base/kernel/interfaces/IStrategy.h"
+#include "base/net/stratum/Pool.h"
+
+
+namespace xmrig {
 
 
 class Client;
 class IStrategyListener;
-class Url;
 
 
 class FailoverStrategy : public IStrategy, public IClientListener
 {
 public:
-    FailoverStrategy(const std::vector<Url*> &urls, int retryPause, int retries, IStrategyListener *listener, bool quiet = false);
-    ~FailoverStrategy();
+    FailoverStrategy(const std::vector<Pool> &pool, int retryPause, int retries, IStrategyListener *listener, bool quiet = false);
+    FailoverStrategy(int retryPause, int retries, IStrategyListener *listener, bool quiet = false);
+    ~FailoverStrategy() override;
 
-public:
+    void add(const Pool &pool);
+
+protected:
     inline bool isActive() const override                                             { return m_active >= 0; }
+    inline Client *client() const override                                            { return active(); }
+    inline void onLogin(Client *, rapidjson::Document &, rapidjson::Value &) override {}
 
     int64_t submit(const JobResult &result) override;
     void connect() override;
     void resume() override;
+    void setAlgo(const Algorithm &algo) override;
     void stop() override;
     void tick(uint64_t now) override;
 
-protected:
     void onClose(Client *client, int failures) override;
-    void onJobReceived(Client *client, const Job &job) override;
+    void onJobReceived(Client *client, const Job &job, const rapidjson::Value &params) override;
     void onLoginSuccess(Client *client) override;
     void onResultAccepted(Client *client, const SubmitResult &result, const char *error) override;
 
 private:
-    void add(const Url *url);
+    inline Client *active() const { return m_pools[static_cast<size_t>(m_active)]; }
 
     const bool m_quiet;
     const int m_retries;
     const int m_retryPause;
     int m_active;
-    int m_index;
     IStrategyListener *m_listener;
+    size_t m_index;
     std::vector<Client*> m_pools;
 };
 
-#endif /* __FAILOVERSTRATEGY_H__ */
+
+} /* namespace xmrig */
+
+#endif /* XMRIG_FAILOVERSTRATEGY_H */

src/base/net/stratum/strategies/SinglePoolStrategy.cpp

@@ -5,7 +5,8 @@
  * 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 2016-2018 XMRig       <https://github.com/xmrig>, <support@xmrig.com>
+ * Copyright 2018-2019 SChernykh   <https://github.com/SChernykh>
+ * Copyright 2016-2019 XMRig       <https://github.com/xmrig>, <support@xmrig.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
@@ -22,42 +23,43 @@
  */
 
 
-#include "interfaces/IStrategyListener.h"
-#include "net/Client.h"
-#include "net/strategies/SinglePoolStrategy.h"
-#include "Platform.h"
+#include "base/kernel/interfaces/IStrategyListener.h"
+#include "base/net/stratum/Client.h"
+#include "base/net/stratum/strategies/SinglePoolStrategy.h"
+#include "common/Platform.h"
 
 
-SinglePoolStrategy::SinglePoolStrategy(const Url *url, int retryPause, IStrategyListener *listener, bool quiet) :
+xmrig::SinglePoolStrategy::SinglePoolStrategy(const Pool &pool, int retryPause, int retries, IStrategyListener *listener, bool quiet) :
     m_active(false),
     m_listener(listener)
 {
     m_client = new Client(0, Platform::userAgent(), this);
-    m_client->setUrl(url);
+    m_client->setPool(pool);
+    m_client->setRetries(retries);
     m_client->setRetryPause(retryPause * 1000);
     m_client->setQuiet(quiet);
 }
 
 
-SinglePoolStrategy::~SinglePoolStrategy()
+xmrig::SinglePoolStrategy::~SinglePoolStrategy()
 {
     m_client->deleteLater();
 }
 
 
-int64_t SinglePoolStrategy::submit(const JobResult &result)
+int64_t xmrig::SinglePoolStrategy::submit(const JobResult &result)
 {
     return m_client->submit(result);
 }
 
 
-void SinglePoolStrategy::connect()
+void xmrig::SinglePoolStrategy::connect()
 {
     m_client->connect();
 }
 
 
-void SinglePoolStrategy::resume()
+void xmrig::SinglePoolStrategy::resume()
 {
     if (!isActive()) {
         return;
@@ -67,19 +69,25 @@ void SinglePoolStrategy::resume()
 }
 
 
-void SinglePoolStrategy::stop()
+void xmrig::SinglePoolStrategy::setAlgo(const xmrig::Algorithm &algo)
+{
+    m_client->setAlgo(algo);
+}
+
+
+void xmrig::SinglePoolStrategy::stop()
 {
     m_client->disconnect();
 }
 
 
-void SinglePoolStrategy::tick(uint64_t now)
+void xmrig::SinglePoolStrategy::tick(uint64_t now)
 {
     m_client->tick(now);
 }
 
 
-void SinglePoolStrategy::onClose(Client *client, int failures)
+void xmrig::SinglePoolStrategy::onClose(Client *, int)
 {
     if (!isActive()) {
         return;
@@ -90,20 +98,20 @@ void SinglePoolStrategy::onClose(Client *client, int failures)
 }
 
 
-void SinglePoolStrategy::onJobReceived(Client *client, const Job &job)
+void xmrig::SinglePoolStrategy::onJobReceived(Client *client, const Job &job, const rapidjson::Value &)
 {
     m_listener->onJob(this, client, job);
 }
 
 
-void SinglePoolStrategy::onLoginSuccess(Client *client)
+void xmrig::SinglePoolStrategy::onLoginSuccess(Client *client)
 {
     m_active = true;
     m_listener->onActive(this, client);
 }
 
 
-void SinglePoolStrategy::onResultAccepted(Client *client, const SubmitResult &result, const char *error)
+void xmrig::SinglePoolStrategy::onResultAccepted(Client *client, const SubmitResult &result, const char *error)
 {
     m_listener->onResultAccepted(this, client, result, error);
 }

src/base/net/stratum/strategies/SinglePoolStrategy.h

@@ -5,7 +5,8 @@
  * 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 2016-2018 XMRig       <https://github.com/xmrig>, <support@xmrig.com>
+ * Copyright 2018-2019 SChernykh   <https://github.com/SChernykh>
+ * Copyright 2016-2019 XMRig       <https://github.com/xmrig>, <support@xmrig.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
@@ -21,37 +22,42 @@
  *   along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef __SINGLEPOOLSTRATEGY_H__
-#define __SINGLEPOOLSTRATEGY_H__
+#ifndef XMRIG_SINGLEPOOLSTRATEGY_H
+#define XMRIG_SINGLEPOOLSTRATEGY_H
 
 
-#include "interfaces/IClientListener.h"
-#include "interfaces/IStrategy.h"
+#include "base/kernel/interfaces/IClientListener.h"
+#include "base/kernel/interfaces/IStrategy.h"
+
+
+namespace xmrig {
 
 
 class Client;
 class IStrategyListener;
-class Url;
+class Pool;
 
 
 class SinglePoolStrategy : public IStrategy, public IClientListener
 {
 public:
-    SinglePoolStrategy(const Url *url, int retryPause, IStrategyListener *listener, bool quiet = false);
-    ~SinglePoolStrategy();
+    SinglePoolStrategy(const Pool &pool, int retryPause, int retries, IStrategyListener *listener, bool quiet = false);
+    ~SinglePoolStrategy() override;
 
-public:
+protected:
     inline bool isActive() const override  { return m_active; }
+    inline Client *client() const override                                            { return m_client; }
+    inline void onLogin(Client *, rapidjson::Document &, rapidjson::Value &) override {}
 
     int64_t submit(const JobResult &result) override;
     void connect() override;
     void resume() override;
+    void setAlgo(const Algorithm &algo) override;
     void stop() override;
     void tick(uint64_t now) override;
 
-protected:
     void onClose(Client *client, int failures) override;
-    void onJobReceived(Client *client, const Job &job) override;
+    void onJobReceived(Client *client, const Job &job, const rapidjson::Value &params) override;
     void onLoginSuccess(Client *client) override;
     void onResultAccepted(Client *client, const SubmitResult &result, const char *error) override;
 
@@ -61,4 +67,8 @@ private:
     IStrategyListener *m_listener;
 };
 
-#endif /* __SINGLEPOOLSTRATEGY_H__ */
+
+} /* namespace xmrig */
+
+
+#endif /* XMRIG_SINGLEPOOLSTRATEGY_H */

src/base/net/tools/RecvBuf.h

@@ -0,0 +1,99 @@
+/* XMRig
+ * 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-2019 SChernykh   <https://github.com/SChernykh>
+ * Copyright 2016-2019 XMRig       <https://github.com/xmrig>, <support@xmrig.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
+ *   the Free Software Foundation, either version 3 of the License, or
+ *   (at your option) any later version.
+ *
+ *   This program is distributed in the hope that it will be useful,
+ *   but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ *   GNU General Public License for more details.
+ *
+ *   You should have received a copy of the GNU General Public License
+ *   along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#ifndef XMRIG_RECVBUF_H
+#define XMRIG_RECVBUF_H
+
+
+#include <string.h>
+
+
+#include "base/kernel/interfaces/ILineListener.h"
+
+
+namespace xmrig {
+
+
+template<size_t N>
+class RecvBuf
+{
+public:
+    inline RecvBuf() :
+        m_buf(),
+        m_pos(0)
+    {
+    }
+
+    inline char *base()                { return m_buf; }
+    inline char *current()             { return m_buf + m_pos; }
+    inline const char *base() const    { return m_buf; }
+    inline const char *current() const { return m_buf + m_pos; }
+    inline size_t available() const    { return N - m_pos; }
+    inline size_t pos() const          { return m_pos; }
+    inline void nread(size_t size)     { m_pos += size; }
+    inline void reset()                { m_pos = 0; }
+
+    constexpr inline size_t size() const { return N; }
+
+    inline void getline(ILineListener *listener)
+    {
+        char *end;
+        char *start = m_buf;
+        size_t remaining = m_pos;
+
+        while ((end = static_cast<char*>(memchr(start, '\n', remaining))) != nullptr) {
+            *end = '\0';
+
+            end++;
+            const size_t len = static_cast<size_t>(end - start);
+
+            listener->onLine(start, len - 1);
+
+            remaining -= len;
+            start = end;
+        }
+
+        if (remaining == 0) {
+            m_pos = 0;
+            return;
+        }
+
+        if (start == m_buf) {
+            return;
+        }
+
+        memcpy(m_buf, start, remaining);
+        m_pos = remaining;
+    }
+
+private:
+    char m_buf[N];
+    size_t m_pos;
+};
+
+
+} /* namespace xmrig */
+
+
+#endif /* XMRIG_RECVBUF_H */

src/base/net/tools/Storage.h

@@ -5,7 +5,8 @@
  * 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 2016-2018 XMRig       <https://github.com/xmrig>, <support@xmrig.com>
+ * Copyright 2018-2019 SChernykh   <https://github.com/SChernykh>
+ * Copyright 2016-2019 XMRig       <https://github.com/xmrig>, <support@xmrig.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
@@ -21,15 +22,13 @@
  *   along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef __STORAGE_H__
-#define __STORAGE_H__
+#ifndef XMRIG_STORAGE_H
+#define XMRIG_STORAGE_H
 
 
 #include <assert.h>
 #include <map>
 
-#include "log/Log.h"
-
 
 namespace xmrig {
 
@@ -55,11 +54,10 @@ public:
     inline static void *ptr(uintptr_t id) { return reinterpret_cast<void *>(id); }
 
 
-    inline TYPE *get(void *id) const { return get(reinterpret_cast<uintptr_t>(id)); }
+    inline TYPE *get(const void *id) const { return get(reinterpret_cast<uintptr_t>(id)); }
     inline TYPE *get(uintptr_t id) const
     {
         assert(m_data.count(id) > 0);
-
         if (m_data.count(id) == 0) {
             return nullptr;
         }
@@ -68,20 +66,22 @@ public:
     }
 
 
-    inline void remove(void *id) { remove(reinterpret_cast<uintptr_t>(id)); }
-    inline void remove(uintptr_t id)
+    inline void remove(const void *id) { delete release(reinterpret_cast<uintptr_t>(id)); }
+    inline void remove(uintptr_t id)   { delete release(id); }
+
+
+    inline TYPE *release(const void *id) { release(reinterpret_cast<uintptr_t>(id)); }
+    inline TYPE *release(uintptr_t id)
     {
         TYPE *obj = get(id);
-        if (obj == nullptr) {
-            return;
-        }
-
+        if (obj != nullptr) {
             auto it = m_data.find(id);
             if (it != m_data.end()) {
                 m_data.erase(it);
             }
+        }
 
-        delete obj;
+        return obj;
     }
 
 
@@ -94,4 +94,4 @@ private:
 } /* namespace xmrig */
 
 
-#endif /* __STORAGE_H__ */
+#endif /* XMRIG_STORAGE_H */

src/base/tools/Arguments.cpp

@@ -0,0 +1,76 @@
+/* XMRig
+ * 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-2019 SChernykh   <https://github.com/SChernykh>
+ * Copyright 2016-2019 XMRig       <https://github.com/xmrig>, <support@xmrig.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
+ *   the Free Software Foundation, either version 3 of the License, or
+ *   (at your option) any later version.
+ *
+ *   This program is distributed in the hope that it will be useful,
+ *   but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ *   GNU General Public License for more details.
+ *
+ *   You should have received a copy of the GNU General Public License
+ *   along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+
+#include <algorithm>
+#include <uv.h>
+
+
+#include "base/tools/Arguments.h"
+
+
+xmrig::Arguments::Arguments(int argc, char **argv) :
+    m_argv(argv),
+    m_argc(argc)
+{
+    uv_setup_args(argc, argv);
+
+    for (size_t i = 0; i < static_cast<size_t>(argc); ++i) {
+        add(argv[i]);
+    }
+}
+
+
+bool xmrig::Arguments::hasArg(const char *name) const
+{
+    if (m_argc == 1) {
+        return false;
+    }
+
+    return std::find(m_data.begin() + 1, m_data.end(), name) != m_data.end();
+}
+
+
+void xmrig::Arguments::add(const char *arg)
+{
+    if (arg == nullptr) {
+        return;
+    }
+
+    const size_t size = strlen(arg);
+    if (size > 4 && arg[0] == '-' && arg[1] == '-') {
+        const char *p = strstr(arg, "=");
+
+        if (p) {
+            const size_t keySize = static_cast<size_t>(p - arg);
+
+            m_data.push_back(String(arg, keySize));
+            m_data.push_back(arg + keySize + 1);
+
+            return;
+        }
+    }
+
+    m_data.push_back(arg);
+}

src/base/tools/Arguments.h

@@ -0,0 +1,61 @@
+/* XMRig
+ * 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-2019 SChernykh   <https://github.com/SChernykh>
+ * Copyright 2016-2019 XMRig       <https://github.com/xmrig>, <support@xmrig.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
+ *   the Free Software Foundation, either version 3 of the License, or
+ *   (at your option) any later version.
+ *
+ *   This program is distributed in the hope that it will be useful,
+ *   but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ *   GNU General Public License for more details.
+ *
+ *   You should have received a copy of the GNU General Public License
+ *   along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#ifndef XMRIG_ARGUMENTS_H
+#define XMRIG_ARGUMENTS_H
+
+
+#include <vector>
+
+
+#include "base/tools/String.h"
+
+
+namespace xmrig {
+
+
+class Arguments
+{
+public:
+    Arguments(int argc, char **argv);
+
+    bool hasArg(const char *name) const;
+
+    inline char **argv() const                     { return m_argv; }
+    inline const std::vector<String> &data() const { return m_data; }
+    inline int argc() const                        { return m_argc; }
+
+private:
+    void add(const char *arg);
+
+    char **m_argv;
+    int m_argc;
+    std::vector<String> m_data;
+};
+
+
+} /* namespace xmrig */
+
+
+#endif /* XMRIG_ARGUMENTS_H */

src/base/tools/Buffer.cpp

@@ -0,0 +1,201 @@
+/* XMRig
+ * 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-2019 SChernykh   <https://github.com/SChernykh>
+ * Copyright 2016-2019 XMRig       <https://github.com/xmrig>, <support@xmrig.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
+ *   the Free Software Foundation, either version 3 of the License, or
+ *   (at your option) any later version.
+ *
+ *   This program is distributed in the hope that it will be useful,
+ *   but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ *   GNU General Public License for more details.
+ *
+ *   You should have received a copy of the GNU General Public License
+ *   along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+
+#include "base/tools/Buffer.h"
+
+
+static inline uint8_t hf_hex2bin(uint8_t c, bool &err)
+{
+    if (c >= '0' && c <= '9') {
+        return c - '0';
+    }
+    else if (c >= 'a' && c <= 'f') {
+        return c - 'a' + 0xA;
+    }
+    else if (c >= 'A' && c <= 'F') {
+        return c - 'A' + 0xA;
+    }
+
+    err = true;
+    return 0;
+}
+
+
+static inline uint8_t hf_bin2hex(uint8_t c)
+{
+    if (c <= 0x9) {
+        return '0' + c;
+    }
+
+    return 'a' - 0xA + c;
+}
+
+
+xmrig::Buffer::Buffer() :
+    m_data(nullptr),
+    m_size(0)
+{
+}
+
+
+xmrig::Buffer::Buffer(Buffer &&other) :
+    m_data(other.m_data),
+    m_size(other.m_size)
+{
+    other.m_data = nullptr;
+    other.m_size = 0;
+}
+
+
+xmrig::Buffer::Buffer(const Buffer &other)
+{
+    copy(other.data(), other.size());
+}
+
+
+xmrig::Buffer::Buffer(const char *data, size_t size)
+{
+    copy(data, size);
+}
+
+
+xmrig::Buffer::Buffer(size_t size) :
+    m_size(size)
+{
+    m_data = new char[size]();
+}
+
+
+xmrig::Buffer::~Buffer()
+{
+    delete [] m_data;
+}
+
+
+void xmrig::Buffer::from(const char *data, size_t size)
+{
+    if (m_size > 0) {
+        if (m_size == size) {
+            memcpy(m_data, data, m_size);
+
+            return;
+        }
+
+        delete [] m_data;
+    }
+
+    copy(data, size);
+}
+
+
+xmrig::Buffer xmrig::Buffer::allocUnsafe(size_t size)
+{
+    Buffer buf;
+    buf.m_size = size;
+    buf.m_data = new char[size];
+
+    return buf;
+}
+
+
+bool xmrig::Buffer::fromHex(const uint8_t *in, size_t size, uint8_t *out)
+{
+    bool error = false;
+    for (size_t i = 0; i < size; i += 2) {
+        out[i / 2] = static_cast<uint8_t>((hf_hex2bin(in[i], error) << 4) | hf_hex2bin(in[i + 1], error));
+
+        if (error) {
+            return false;
+        }
+    }
+
+    return true;
+}
+
+
+xmrig::Buffer xmrig::Buffer::fromHex(const char *data, size_t size)
+{
+    if (data == nullptr || size % 2 != 0) {
+        return Buffer();
+    }
+
+    Buffer buf(size / 2);
+    fromHex(data, size, buf.data());
+
+    return buf;
+}
+
+
+void xmrig::Buffer::toHex(const uint8_t *in, size_t size, uint8_t *out)
+{
+    for (size_t i = 0; i < size; i++) {
+        out[i * 2]     = hf_bin2hex((in[i] & 0xF0) >> 4);
+        out[i * 2 + 1] = hf_bin2hex(in[i] & 0x0F);
+    }
+}
+
+
+xmrig::String xmrig::Buffer::toHex(const uint8_t *in, size_t size)
+{
+    return Buffer(reinterpret_cast<const char *>(in), size).toHex();
+}
+
+
+xmrig::String xmrig::Buffer::toHex() const
+{
+    if (m_size == 0) {
+        return String();
+    }
+
+    char *buf       = new char[m_size * 2 + 1];
+    buf[m_size * 2] = '\0';
+
+    toHex(m_data, m_size, buf);
+
+    return String(buf);
+}
+
+
+void xmrig::Buffer::copy(const char *data, size_t size)
+{
+    m_data = new char[size];
+    m_size = size;
+
+    memcpy(m_data, data, m_size);
+}
+
+
+void xmrig::Buffer::move(Buffer &&other)
+{
+    if (m_size > 0) {
+        delete [] m_data;
+    }
+
+    m_data = other.m_data;
+    m_size = other.m_size;
+
+    other.m_data = nullptr;
+    other.m_size = 0;
+}

src/base/tools/Buffer.h

@@ -0,0 +1,88 @@
+/* XMRig
+ * 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-2019 SChernykh   <https://github.com/SChernykh>
+ * Copyright 2016-2019 XMRig       <https://github.com/xmrig>, <support@xmrig.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
+ *   the Free Software Foundation, either version 3 of the License, or
+ *   (at your option) any later version.
+ *
+ *   This program is distributed in the hope that it will be useful,
+ *   but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ *   GNU General Public License for more details.
+ *
+ *   You should have received a copy of the GNU General Public License
+ *   along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#ifndef XMRIG_BUFFER_H
+#define XMRIG_BUFFER_H
+
+
+#include "base/tools/String.h"
+
+
+namespace xmrig {
+
+
+class Buffer
+{
+public:
+    Buffer();
+    Buffer(Buffer &&other);
+    Buffer(const Buffer &other);
+    Buffer(const char *data, size_t size);
+    Buffer(size_t size);
+    ~Buffer();
+
+
+    inline char *data()                   { return m_data; }
+    inline const char *data() const       { return m_data; }
+    inline size_t size() const            { return m_size; }
+    inline void from(const Buffer &other) { from(other.data(), other.size()); }
+
+
+    void from(const char *data, size_t size);
+
+
+    inline Buffer &operator=(const Buffer &other) { from(other); return *this; }
+    inline Buffer &operator=(Buffer &&other)      { move(std::move(other)); return *this; }
+
+
+    static Buffer allocUnsafe(size_t size);
+    static inline Buffer alloc(size_t size) { return Buffer(size); }
+
+
+    inline static bool fromHex(const char *in, size_t size, char *out)    { return fromHex(reinterpret_cast<const uint8_t *>(in), size, reinterpret_cast<uint8_t *>(out)); }
+    inline static bool fromHex(const char *in, size_t size, uint8_t *out) { return fromHex(reinterpret_cast<const uint8_t *>(in), size, out); }
+    inline static Buffer fromHex(const char *data)                        { return fromHex(data, strlen(data)); }
+    inline static Buffer fromHex(const String &str)                       { return fromHex(str.data(), str.size()); }
+    inline static void toHex(const char *in, size_t size, char *out)      { return toHex(reinterpret_cast<const uint8_t *>(in), size, reinterpret_cast<uint8_t *>(out)); }
+    inline static void toHex(const uint8_t *in, size_t size, char *out)   { return toHex(in, size, reinterpret_cast<uint8_t *>(out)); }
+
+    static bool fromHex(const uint8_t *in, size_t size, uint8_t *out);
+    static Buffer fromHex(const char *data, size_t size);
+    static String toHex(const uint8_t *in, size_t size);
+    static void toHex(const uint8_t *in, size_t size, uint8_t *out);
+    String toHex() const;
+
+private:
+    void copy(const char *data, size_t size);
+    void move(Buffer &&other);
+
+    char *m_data;
+    size_t m_size;
+};
+
+
+} /* namespace xmrig */
+
+
+#endif /* XMRIG_BUFFER_H */

src/base/tools/Chrono.h

@@ -0,0 +1,60 @@
+/* XMRig
+ * 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-2019 SChernykh   <https://github.com/SChernykh>
+ * Copyright 2016-2019 XMRig       <https://github.com/xmrig>, <support@xmrig.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
+ *   the Free Software Foundation, either version 3 of the License, or
+ *   (at your option) any later version.
+ *
+ *   This program is distributed in the hope that it will be useful,
+ *   but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ *   GNU General Public License for more details.
+ *
+ *   You should have received a copy of the GNU General Public License
+ *   along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#ifndef XMRIG_CHRONO_H
+#define XMRIG_CHRONO_H
+
+
+#include <chrono>
+
+
+namespace xmrig {
+
+
+class Chrono
+{
+public:
+    static inline uint64_t steadyMSecs()
+    {
+        using namespace std::chrono;
+        if (high_resolution_clock::is_steady) {
+            return static_cast<uint64_t>(time_point_cast<milliseconds>(high_resolution_clock::now()).time_since_epoch().count());
+        }
+
+        return static_cast<uint64_t>(time_point_cast<milliseconds>(steady_clock::now()).time_since_epoch().count());
+    }
+
+
+    static inline uint64_t currentMSecsSinceEpoch()
+    {
+        using namespace std::chrono;
+
+        return static_cast<uint64_t>(time_point_cast<milliseconds>(system_clock::now()).time_since_epoch().count());
+    }
+};
+
+
+} /* namespace xmrig */
+
+#endif /* XMRIG_CHRONO_H */

src/base/tools/Handle.h

@@ -5,7 +5,8 @@
  * 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 2016-2018 XMRig       <https://github.com/xmrig>, <support@xmrig.com>
+ * Copyright 2018-2019 SChernykh   <https://github.com/SChernykh>
+ * Copyright 2016-2019 XMRig       <https://github.com/xmrig>, <support@xmrig.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
@@ -21,78 +22,82 @@
  *   along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef __ID_H__
-#define __ID_H__
+#ifndef XMRIG_HANDLE_H
+#define XMRIG_HANDLE_H
 
 
-#include <string.h>
+#include <uv.h>
 
 
 namespace xmrig {
 
 
-class Id
+class Handle
 {
 public:
-    inline Id() :
-        m_data()
+    template<typename T>
+    static inline void close(T handle)
     {
+        if (handle) {
+            deleteLater(handle);
+        }
     }
 
 
-    inline Id(const char *id, size_t sizeFix = 0)
+    template<typename T>
+    static inline void deleteLater(T handle)
     {
-        setId(id, sizeFix);
+        if (uv_is_closing(reinterpret_cast<uv_handle_t *>(handle))) {
+            return;
         }
 
-
-    inline bool operator==(const Id &other) const
-    {
-        return memcmp(m_data, other.m_data, sizeof(m_data)) == 0;
+        uv_close(reinterpret_cast<uv_handle_t *>(handle), [](uv_handle_t *handle) { delete handle; });
     }
-
-
-    inline bool operator!=(const Id &other) const
-    {
-        return memcmp(m_data, other.m_data, sizeof(m_data)) != 0;
-    }
-
-
-    Id &operator=(const Id &other)
-    {
-        memcpy(m_data, other.m_data, sizeof(m_data));
-
-        return *this;
-    }
-
-
-    inline bool setId(const char *id, size_t sizeFix = 0)
-    {
-        memset(m_data, 0, sizeof(m_data));
-        if (!id) {
-            return false;
-        }
-
-        const size_t size = strlen(id);
-        if (size >= sizeof(m_data)) {
-            return false;
-        }
-
-        memcpy(m_data, id, size - sizeFix);
-        return true;
-    }
-
-
-    inline const char *data() const { return m_data; }
-    inline bool isValid() const     { return *m_data != '\0'; }
-
-
-private:
-    char m_data[64];
 };
 
 
+template<>
+inline void Handle::close(uv_timer_t *handle)
+{
+    if (handle) {
+        uv_timer_stop(handle);
+        deleteLater(handle);
+    }
+}
+
+
+template<>
+inline void Handle::close(uv_signal_t *handle)
+{
+    if (handle) {
+        uv_signal_stop(handle);
+        deleteLater(handle);
+    }
+}
+
+
+template<>
+inline void Handle::close(uv_getaddrinfo_t *handle)
+{
+    if (handle) {
+        uv_cancel(reinterpret_cast<uv_req_t *>(handle));
+
+        delete handle;
+    }
+}
+
+
+template<>
+inline void Handle::close(uv_fs_event_t *handle)
+{
+    if (handle) {
+        uv_fs_event_stop(handle);
+        deleteLater(handle);
+    }
+}
+
+
 } /* namespace xmrig */
 
 
-#endif /* __ID_H__ */
+#endif /* XMRIG_HANDLE_H */

src/base/tools/String.cpp

@@ -0,0 +1,222 @@
+/* XMRig
+ * 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-2019 SChernykh   <https://github.com/SChernykh>
+ * Copyright 2016-2019 XMRig       <https://github.com/xmrig>, <support@xmrig.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
+ *   the Free Software Foundation, either version 3 of the License, or
+ *   (at your option) any later version.
+ *
+ *   This program is distributed in the hope that it will be useful,
+ *   but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ *   GNU General Public License for more details.
+ *
+ *   You should have received a copy of the GNU General Public License
+ *   along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+
+#include "base/tools/String.h"
+#include "rapidjson/document.h"
+
+
+xmrig::String::String(const char *str) :
+    m_data(nullptr),
+    m_size(str == nullptr ? 0 : strlen(str))
+{
+    if (m_size == 0) {
+        return;
+    }
+
+    m_data = new char[m_size + 1];
+    memcpy(m_data, str, m_size + 1);
+}
+
+
+xmrig::String::String(const char *str, size_t size) :
+    m_data(nullptr),
+    m_size(size)
+{
+    if (str == nullptr) {
+        m_size = 0;
+
+        return;
+    }
+
+    m_data = new char[m_size + 1];
+    memcpy(m_data, str, m_size);
+    m_data[m_size] = '\0';
+}
+
+
+xmrig::String::String(const String &other) :
+    m_data(nullptr),
+    m_size(other.m_size)
+{
+    if (other.m_data == nullptr) {
+        return;
+    }
+
+    m_data = new char[m_size + 1];
+    memcpy(m_data, other.m_data, m_size + 1);
+}
+
+
+bool xmrig::String::isEqual(const char *str) const
+{
+    return (m_data != nullptr && str != nullptr && strcmp(m_data, str) == 0) || (m_data == nullptr && str == nullptr);
+}
+
+
+bool xmrig::String::isEqual(const String &other) const
+{
+    if (m_size != other.m_size) {
+        return false;
+    }
+
+    return (m_data != nullptr && other.m_data != nullptr && memcmp(m_data, other.m_data, m_size) == 0) || (m_data == nullptr && other.m_data == nullptr);
+}
+
+
+rapidjson::Value xmrig::String::toJSON() const
+{
+    using namespace rapidjson;
+
+    return isNull() ? Value(kNullType) : Value(StringRef(m_data));
+}
+
+
+rapidjson::Value xmrig::String::toJSON(rapidjson::Document &doc) const
+{
+    using namespace rapidjson;
+
+    return isNull() ? Value(kNullType) : Value(m_data, doc.GetAllocator());
+}
+
+
+std::vector<xmrig::String> xmrig::String::split(char sep) const
+{
+    std::vector<xmrig::String> out;
+    if (m_size == 0) {
+        return out;
+    }
+
+    size_t start = 0;
+    size_t pos   = 0;
+
+    for (pos = 0; pos < m_size; ++pos) {
+        if (m_data[pos] == sep) {
+            if ((pos - start) > 0) {
+                out.push_back(String(m_data + start, pos - start));
+            }
+
+            start = pos + 1;
+        }
+    }
+
+    if ((pos - start) > 0) {
+        out.push_back(String(m_data + start, pos - start));
+    }
+
+    return out;
+}
+
+
+xmrig::String xmrig::String::join(const std::vector<xmrig::String> &vec, char sep)
+{
+    if (vec.empty()) {
+        return String();
+    }
+
+    size_t size = vec.size();
+    for (const String &str : vec) {
+        size += str.size();
+    }
+
+    size_t offset = 0;
+    char *buf     = new char[size];
+
+    for (const String &str : vec) {
+        memcpy(buf + offset, str.data(), str.size());
+
+        offset += str.size() + 1;
+
+        if (offset < size) {
+            buf[offset - 1] = sep;
+        }
+    }
+
+    buf[size - 1] = '\0';
+
+    return String(buf);
+}
+
+
+void xmrig::String::copy(const char *str)
+{
+    delete [] m_data;
+
+    if (str == nullptr) {
+        m_size = 0;
+        m_data = nullptr;
+
+        return;
+    }
+
+    m_size = strlen(str);
+    m_data = new char[m_size + 1];
+
+    memcpy(m_data, str, m_size + 1);
+}
+
+
+void xmrig::String::copy(const String &other)
+{
+    if (m_size > 0 && m_size == other.m_size) {
+        memcpy(m_data, other.m_data, m_size + 1);
+
+        return;
+    }
+
+    delete [] m_data;
+
+    if (other.m_data == nullptr) {
+        m_size = 0;
+        m_data = nullptr;
+
+        return;
+    }
+
+    m_size = other.m_size;
+    m_data = new char[m_size + 1];
+
+    memcpy(m_data, other.m_data, m_size + 1);
+}
+
+
+void xmrig::String::move(char *str)
+{
+    delete [] m_data;
+
+    m_size = str == nullptr ? 0 : strlen(str);
+    m_data = str;
+}
+
+
+void xmrig::String::move(String &&other)
+{
+    delete [] m_data;
+
+    m_data = other.m_data;
+    m_size = other.m_size;
+
+    other.m_data = nullptr;
+    other.m_size = 0;
+}

src/base/tools/String.h

@@ -0,0 +1,105 @@
+/* XMRig
+ * 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-2019 SChernykh   <https://github.com/SChernykh>
+ * Copyright 2016-2019 XMRig       <https://github.com/xmrig>, <support@xmrig.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
+ *   the Free Software Foundation, either version 3 of the License, or
+ *   (at your option) any later version.
+ *
+ *   This program is distributed in the hope that it will be useful,
+ *   but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ *   GNU General Public License for more details.
+ *
+ *   You should have received a copy of the GNU General Public License
+ *   along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#ifndef XMRIG_STRING_H
+#define XMRIG_STRING_H
+
+
+#include <utility>
+#include <vector>
+
+
+#include "rapidjson/fwd.h"
+
+
+namespace xmrig {
+
+
+/**
+ * @brief Simple C string wrapper.
+ *
+ * 1. I know about std:string.
+ * 2. For some reason I prefer don't use std:string in miner, eg because of file size of MSYS2 builds.
+ * 3. nullptr and JSON conversion supported.
+ */
+class String
+{
+public:
+    inline String() : m_data(nullptr), m_size(0)                                     {}
+    inline String(char *str) : m_data(str), m_size(str == nullptr ? 0 : strlen(str)) {}
+    inline String(String &&other) : m_data(other.m_data), m_size(other.m_size)       { other.m_data = nullptr; other.m_size = 0; }
+
+    String(const char *str);
+    String(const char *str, size_t size);
+    String(const String &other);
+
+    inline ~String() { delete [] m_data; }
+
+
+    bool isEqual(const char *str) const;
+    bool isEqual(const String &other) const;
+
+
+    inline bool contains(const char *str) const { return isNull() ? false : strstr(m_data, str) != nullptr; }
+
+
+    inline bool isEmpty() const          { return size() == 0; }
+    inline bool isNull() const           { return m_data == nullptr; }
+    inline char *data()                  { return m_data; }
+    inline const char *data() const      { return m_data; }
+    inline size_t size() const           { return m_size; }
+
+
+    inline bool operator!=(const char *str) const      { return !isEqual(str); }
+    inline bool operator!=(const String &other) const  { return !isEqual(other); }
+    inline bool operator<(const String &str) const     { return strcmp(data(), str.data()) < 0; }
+    inline bool operator==(const char *str) const      { return isEqual(str); }
+    inline bool operator==(const String &other) const  { return isEqual(other); }
+    inline operator const char*() const                { return m_data; }
+    inline String &operator=(char *str)                { move(str); return *this; }
+    inline String &operator=(const char *str)          { copy(str); return *this; }
+    inline String &operator=(const String &str)        { copy(str); return *this; }
+    inline String &operator=(String &&other)           { move(std::move(other)); return *this; }
+
+    rapidjson::Value toJSON() const;
+    rapidjson::Value toJSON(rapidjson::Document &doc) const;
+    std::vector<xmrig::String> split(char sep) const;
+
+    static String join(const std::vector<xmrig::String> &vec, char sep);
+
+private:
+    void copy(const char *str);
+    void copy(const String &other);
+    void move(char *str);
+    void move(String &&other);
+
+    char *m_data;
+    size_t m_size;
+};
+
+
+} /* namespace xmrig */
+
+
+#endif /* XMRIG_STRING_H */

src/base/tools/Timer.cpp

@@ -0,0 +1,91 @@
+/* XMRig
+ * 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-2019 SChernykh   <https://github.com/SChernykh>
+ * Copyright 2016-2019 XMRig       <https://github.com/xmrig>, <support@xmrig.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
+ *   the Free Software Foundation, either version 3 of the License, or
+ *   (at your option) any later version.
+ *
+ *   This program is distributed in the hope that it will be useful,
+ *   but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ *   GNU General Public License for more details.
+ *
+ *   You should have received a copy of the GNU General Public License
+ *   along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+
+#include "base/kernel/interfaces/ITimerListener.h"
+#include "base/tools/Handle.h"
+#include "base/tools/Timer.h"
+
+
+xmrig::Timer::Timer(ITimerListener *listener) :
+    m_listener(listener),
+    m_timer(nullptr)
+{
+    init();
+}
+
+
+xmrig::Timer::Timer(ITimerListener *listener, uint64_t timeout, uint64_t repeat) :
+    m_listener(listener),
+    m_timer(nullptr)
+{
+    init();
+    start(timeout, repeat);
+}
+
+
+xmrig::Timer::~Timer()
+{
+    Handle::close(m_timer);
+}
+
+
+uint64_t xmrig::Timer::repeat() const
+{
+    return uv_timer_get_repeat(m_timer);
+}
+
+
+void xmrig::Timer::setRepeat(uint64_t repeat)
+{
+    uv_timer_set_repeat(m_timer, repeat);
+}
+
+
+void xmrig::Timer::start(uint64_t timeout, uint64_t repeat)
+{
+    uv_timer_start(m_timer, onTimer, timeout, repeat);
+}
+
+
+void xmrig::Timer::stop()
+{
+    uv_timer_stop(m_timer);
+}
+
+
+void xmrig::Timer::init()
+{
+    m_timer = new uv_timer_t;
+    m_timer->data = this;
+    uv_timer_init(uv_default_loop(), m_timer);
+}
+
+
+void xmrig::Timer::onTimer(uv_timer_t *handle)
+{
+    const Timer *timer = static_cast<Timer *>(handle->data);
+
+    timer->m_listener->onTimer(timer);
+}

src/base/tools/Timer.h

@@ -0,0 +1,66 @@
+/* XMRig
+ * 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-2019 SChernykh   <https://github.com/SChernykh>
+ * Copyright 2016-2019 XMRig       <https://github.com/xmrig>, <support@xmrig.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
+ *   the Free Software Foundation, either version 3 of the License, or
+ *   (at your option) any later version.
+ *
+ *   This program is distributed in the hope that it will be useful,
+ *   but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ *   GNU General Public License for more details.
+ *
+ *   You should have received a copy of the GNU General Public License
+ *   along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#ifndef XMRIG_TIMER_H
+#define XMRIG_TIMER_H
+
+
+#include <stdint.h>
+
+
+typedef struct uv_timer_s uv_timer_t;
+
+
+namespace xmrig {
+
+
+class ITimerListener;
+
+
+class Timer
+{
+public:
+    Timer(ITimerListener *listener);
+    Timer(ITimerListener *listener, uint64_t timeout, uint64_t repeat);
+    ~Timer();
+
+    uint64_t repeat() const;
+    void setRepeat(uint64_t repeat);
+    void start(uint64_t timeout, uint64_t repeat);
+    void stop();
+
+private:
+    void init();
+
+    static void onTimer(uv_timer_t *handle);
+
+    ITimerListener *m_listener;
+    uv_timer_t *m_timer;
+};
+
+
+} /* namespace xmrig */
+
+
+#endif /* XMRIG_TIMER_H */

src/common/Platform.cpp

@@ -0,0 +1,59 @@
+/* XMRig
+ * 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-2019 SChernykh   <https://github.com/SChernykh>
+ * Copyright 2016-2019 XMRig       <https://github.com/xmrig>, <support@xmrig.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
+ *   the Free Software Foundation, either version 3 of the License, or
+ *   (at your option) any later version.
+ *
+ *   This program is distributed in the hope that it will be useful,
+ *   but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ *   GNU General Public License for more details.
+ *
+ *   You should have received a copy of the GNU General Public License
+ *   along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+
+#include <string.h>
+#include <uv.h>
+
+
+#ifndef XMRIG_NO_TLS
+#   include <openssl/ssl.h>
+#   include <openssl/err.h>
+#endif
+
+
+#include "Platform.h"
+
+
+xmrig::String Platform::m_userAgent;
+
+
+void Platform::init(const char *userAgent)
+{
+#   ifndef XMRIG_NO_TLS
+    SSL_library_init();
+    SSL_load_error_strings();
+    ERR_load_BIO_strings();
+    ERR_load_crypto_strings();
+    SSL_load_error_strings();
+    OpenSSL_add_all_digests();
+#   endif
+
+    if (userAgent) {
+        m_userAgent = userAgent;
+    }
+    else {
+        m_userAgent = createUserAgent();
+    }
+}