Update README.md

Fix msvc build.
Fix x86 build.
2025-12-07 07:55:04 -05:00 · 2018-04-20 11:13:00 +07:00 · 2018-04-20 10:36:41 +07:00 · 2018-04-20 10:14:33 +07:00 · 2018-04-19 21:19:00 +07:00 · 2018-04-19 20:57:23 +07:00
109 changed files with 6503 additions and 2970 deletions
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,136 +1,162 @@
-# v2.5.2
- [#448](https://github.com/xmrig/xmrig/issues/478) Fixed broken reconnect.
-
-# v2.5.1
- [#454](https://github.com/xmrig/xmrig/issues/454) Fixed build with libmicrohttpd version below v0.9.35.
- [#456](https://github.com/xmrig/xmrig/issues/459) Verbose errors related to donation pool was not fully silenced.
- [#459](https://github.com/xmrig/xmrig/issues/459) Fixed regression (version 2.5.0 affected) with connection to **xmr.f2pool.com**.
-
-# v2.5.0
- [#434](https://github.com/xmrig/xmrig/issues/434) **Added support for Monero v7 PoW, scheduled on April 6.**
- Added full IPv6 support.
- Added protocol extension, when use the miner with xmrig-proxy 2.5+ no more need manually specify `nicehash` option.
- [#123](https://github.com/xmrig/xmrig-proxy/issues/123) Fixed regression (all versions since 2.4 affected) fragmented responses from pool/proxy was parsed incorrectly.
- [#428](https://github.com/xmrig/xmrig/issues/428) Fixed regression (version 2.4.5 affected) with CPU cache size detection.
-
-# v2.4.5
- [#324](https://github.com/xmrig/xmrig/pull/324) Fixed build without libmicrohttpd (CMake cache issue).
- [#341](https://github.com/xmrig/xmrig/issues/341) Fixed wrong exit code and added command line option `--dry-run`.
- [#385](https://github.com/xmrig/xmrig/pull/385) Up to 20% performance increase for non-AES CPU and fixed Intel Core 2 cache detection.
-
-# v2.4.4
- - Added libmicrohttpd version to --version output.
- - Fixed bug in singal handler, in some cases miner wasn't shutdown properly.
- - Fixed recent MSVC 2017 version detection.
- - [#279](https://github.com/xmrig/xmrig/pull/279) Fixed build on some macOS versions.
-
-# v2.4.3
- - [#94](https://github.com/xmrig/xmrig/issues/94#issuecomment-342019257) [#216](https://github.com/xmrig/xmrig/issues/216) Added **ARMv8** and **ARMv7** support. Hardware AES supported, thanks [Imran Yusuff](https://github.com/imranyusuff).
- - [#157](https://github.com/xmrig/xmrig/issues/157) [#196](https://github.com/xmrig/xmrig/issues/196) Fixed Linux compile issues.
- - [#184](https://github.com/xmrig/xmrig/issues/184) Fixed cache size detection for CPUs with disabled Hyper-Threading.
- - [#200](https://github.com/xmrig/xmrig/issues/200) In some cases miner was doesn't write log to stdout.
-
-# v2.4.2
- - [#60](https://github.com/xmrig/xmrig/issues/60) Added FreeBSD support, thanks [vcambur](https://github.com/vcambur).
- - [#153](https://github.com/xmrig/xmrig/issues/153) Fixed issues with dwarfpool.com.
- 
-# v2.4.1
-  - [#147](https://github.com/xmrig/xmrig/issues/147) Fixed comparability with monero-stratum.
-
-# v2.4.0
- - Added [HTTP API](https://github.com/xmrig/xmrig/wiki/API).
- - Added comments support in config file.
- - libjansson replaced to rapidjson.
- - [#98](https://github.com/xmrig/xmrig/issues/98) Ignore `keepalive` option with minergate.com and nicehash.com.
- - [#101](https://github.com/xmrig/xmrig/issues/101) Fixed MSVC 2017 (15.3) compile time version detection.
- - [#108](https://github.com/xmrig/xmrig/issues/108) Silently ignore invalid values for `donate-level` option.
- - [#111](https://github.com/xmrig/xmrig/issues/111) Fixed build without AEON support.
- 
-# v2.3.1
- [#68](https://github.com/xmrig/xmrig/issues/68) Fixed compatibility with Docker containers, was nothing print on console.
-
-# v2.3.0
- Added `--cpu-priority` option (0 idle, 2 normal to 5 highest).
- Added `--user-agent` option, to set custom user-agent string for pool. For example `cpuminer-multi/0.1`.
- Added `--no-huge-pages` option, to disable huge pages support.
- [#62](https://github.com/xmrig/xmrig/issues/62) Don't send the login to the dev pool.
- Force reconnect if pool block miner IP address. helps switch to backup pool.
- Fixed: failed open default config file if path contains non English characters.
- Fixed: error occurred if try use unavailable stdin or stdout, regression since version 2.2.0.
- Fixed: message about huge pages support successfully enabled on Windows was not shown in release builds.
-
-# v2.2.1
- Fixed [terminal issues](https://github.com/xmrig/xmrig-proxy/issues/2#issuecomment-319914085) after exit on Linux and OS X.
-
-# v2.2.0
- [#46](https://github.com/xmrig/xmrig/issues/46) Restored config file support. Now possible use multiple config files and combine with command line options also added support for default config.
- Improved colors support on Windows, now used uv_tty, legacy code removed.
- QuickEdit Mode now disabled on Windows.
- Added interactive commands in console window:: **h**ashrate, **p**ause, **r**esume.
- Fixed autoconf mode for AMD FX CPUs.
-
-# v2.1.0
- [#40](https://github.com/xmrig/xmrig/issues/40)
-Improved miner shutdown, fixed crash on exit for Linux and OS X.
- Fixed, login request was contain malformed JSON if username or password has some special characters for example `\`. 
- [#220](https://github.com/fireice-uk/xmr-stak-cpu/pull/220) Better support for Round Robin DNS, IP address now always chosen randomly instead of stuck on first one.
- Changed donation address, new [xmrig-proxy](https://github.com/xmrig/xmrig-proxy) is coming soon.
-
-# v2.0.2
- Better deal with possible duplicate jobs from pool, show warning and ignore duplicates.
- For Windows builds libuv updated to version 1.13.1 and gcc to 7.1.0.
-
-# v2.0.1
- - [#27](https://github.com/xmrig/xmrig/issues/27) Fixed possibility crash on 32bit systems.
-
-# v2.0.0
- - Option `--backup-url` removed, instead now possibility specify multiple pools for example: `-o example1.com:3333 -u user1 -p password1 -k -o example2.com:5555 -u user2 -o example3.com:4444 -u user3`
- - [#15](https://github.com/xmrig/xmrig/issues/15) Added option `-l, --log-file=FILE` to write log to file.
- - [#15](https://github.com/xmrig/xmrig/issues/15) Added option `-S, --syslog` to use syslog for logging, Linux only.
- - [#18](https://github.com/xmrig/xmrig/issues/18) Added nice messages for accepted/rejected shares with diff and network latency.
- - [#20](https://github.com/xmrig/xmrig/issues/20) Fixed `--cpu-affinity` for more than 32 threads.
- - Fixed Windows XP support.
- - Fixed regression, option `--no-color` was not fully disable colored output.
- - Show resolved pool IP address in miner output.
- 
-# v1.0.1
- Fix broken software AES implementation, app has crashed if CPU not support AES-NI, only version 1.0.0 affected.
-
-# v1.0.0
- Miner complete rewritten in C++ with libuv.
- This version should be fully compatible (except config file) with previos versions, many new nice features will come in next versions.
- This is still beta. If you found regression, stability or perfomance issues or have an idea for new feature please fell free to open new [issue](https://github.com/xmrig/xmrig/issues/new).
- Added new option `--print-time=N`, print hashrate report every N seconds.
- New hashrate reports, by default every 60 secons.
- Added Microsoft Visual C++ 2015 and 2017 support.
- Removed dependency on libcurl.
- To compile this version from source please switch to [dev](https://github.com/xmrig/xmrig/tree/dev) branch.
-
-# v0.8.2
- Fixed L2 cache size detection for AMD CPUs (Bulldozer/Piledriver/Steamroller/Excavator architecture).
-
-# v0.8.2
- Fixed L2 cache size detection for AMD CPUs (Bulldozer/Piledriver/Steamroller/Excavator architecture).
- Fixed gcc 7.1 support.
-
-# v0.8.1
- Added nicehash support, detects automaticaly by pool URL, for example `cryptonight.eu.nicehash.com:3355` or manually via option `--nicehash`.
-
-# v0.8.0
- Added double hash mode, also known as lower power mode. `--av=2` and `--av=4`.
- Added smart automatic CPU configuration. Default threads count now depends on size of the L3 cache of CPU.
- Added CryptoNight-Lite support for AEON `-a cryptonight-lite`.
- Added `--max-cpu-usage` option for auto CPU configuration mode.
- Added `--safe` option for adjust threads and algorithm variations to current CPU.
- No more manual steps to enable huge pages on Windows. XMRig will do it automatically.
- Removed BMI2 algorithm variation.
- Removed default pool URL.
-
-# v0.6.0
- Added automatic cryptonight self test.
- New software AES algorithm variation. Will be automatically selected if cpu not support AES-NI.
- Added 32 bit builds.
- Documented [algorithm variations](https://github.com/xmrig/xmrig#algorithm-variations).
-
-# v0.5.0
- Initial public release.
+# 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 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 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.**
+ - HTTP server now runs in main loop, it make possible easy extend API without worry about thread synchronization.
+ - Added initial graceful reload support, miner will reload configuration if config file changed, disabled by default until it will be fully implemented and tested.
+ - Added API endpoint `PUT /1/config` to update current config.
+ - Added API endpoint `GET /1/config` to get current active config.
+ - Added API endpoint `GET /1/threads` to get current active threads configuration.
+ - API endpoint `GET /` now deprecated, use `GET /1/summary` instead.
+ - 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.2
+- [#448](https://github.com/xmrig/xmrig/issues/478) Fixed broken reconnect.
+
+# v2.5.1
+- [#454](https://github.com/xmrig/xmrig/issues/454) Fixed build with libmicrohttpd version below v0.9.35.
+- [#456](https://github.com/xmrig/xmrig/issues/459) Verbose errors related to donation pool was not fully silenced.
+- [#459](https://github.com/xmrig/xmrig/issues/459) Fixed regression (version 2.5.0 affected) with connection to **xmr.f2pool.com**.
+
+# v2.5.0
+- [#434](https://github.com/xmrig/xmrig/issues/434) **Added support for Monero v7 PoW, scheduled on April 6.**
+- Added full IPv6 support.
+- Added protocol extension, when use the miner with xmrig-proxy 2.5+ no more need manually specify `nicehash` option.
+- [#123](https://github.com/xmrig/xmrig-proxy/issues/123) Fixed regression (all versions since 2.4 affected) fragmented responses from pool/proxy was parsed incorrectly.
+- [#428](https://github.com/xmrig/xmrig/issues/428) Fixed regression (version 2.4.5 affected) with CPU cache size detection.
+
+# v2.4.5
+- [#324](https://github.com/xmrig/xmrig/pull/324) Fixed build without libmicrohttpd (CMake cache issue).
+- [#341](https://github.com/xmrig/xmrig/issues/341) Fixed wrong exit code and added command line option `--dry-run`.
+- [#385](https://github.com/xmrig/xmrig/pull/385) Up to 20% performance increase for non-AES CPU and fixed Intel Core 2 cache detection.
+
+# v2.4.4
+ - Added libmicrohttpd version to --version output.
+ - Fixed bug in singal handler, in some cases miner wasn't shutdown properly.
+ - Fixed recent MSVC 2017 version detection.
+ - [#279](https://github.com/xmrig/xmrig/pull/279) Fixed build on some macOS versions.
+
+# v2.4.3
+ - [#94](https://github.com/xmrig/xmrig/issues/94#issuecomment-342019257) [#216](https://github.com/xmrig/xmrig/issues/216) Added **ARMv8** and **ARMv7** support. Hardware AES supported, thanks [Imran Yusuff](https://github.com/imranyusuff).
+ - [#157](https://github.com/xmrig/xmrig/issues/157) [#196](https://github.com/xmrig/xmrig/issues/196) Fixed Linux compile issues.
+ - [#184](https://github.com/xmrig/xmrig/issues/184) Fixed cache size detection for CPUs with disabled Hyper-Threading.
+ - [#200](https://github.com/xmrig/xmrig/issues/200) In some cases miner was doesn't write log to stdout.
+
+# v2.4.2
+ - [#60](https://github.com/xmrig/xmrig/issues/60) Added FreeBSD support, thanks [vcambur](https://github.com/vcambur).
+ - [#153](https://github.com/xmrig/xmrig/issues/153) Fixed issues with dwarfpool.com.
+ 
+# v2.4.1
+  - [#147](https://github.com/xmrig/xmrig/issues/147) Fixed comparability with monero-stratum.
+
+# v2.4.0
+ - Added [HTTP API](https://github.com/xmrig/xmrig/wiki/API).
+ - Added comments support in config file.
+ - libjansson replaced to rapidjson.
+ - [#98](https://github.com/xmrig/xmrig/issues/98) Ignore `keepalive` option with minergate.com and nicehash.com.
+ - [#101](https://github.com/xmrig/xmrig/issues/101) Fixed MSVC 2017 (15.3) compile time version detection.
+ - [#108](https://github.com/xmrig/xmrig/issues/108) Silently ignore invalid values for `donate-level` option.
+ - [#111](https://github.com/xmrig/xmrig/issues/111) Fixed build without AEON support.
+ 
+# v2.3.1
+- [#68](https://github.com/xmrig/xmrig/issues/68) Fixed compatibility with Docker containers, was nothing print on console.
+
+# v2.3.0
+- Added `--cpu-priority` option (0 idle, 2 normal to 5 highest).
+- Added `--user-agent` option, to set custom user-agent string for pool. For example `cpuminer-multi/0.1`.
+- Added `--no-huge-pages` option, to disable huge pages support.
+- [#62](https://github.com/xmrig/xmrig/issues/62) Don't send the login to the dev pool.
+- Force reconnect if pool block miner IP address. helps switch to backup pool.
+- Fixed: failed open default config file if path contains non English characters.
+- Fixed: error occurred if try use unavailable stdin or stdout, regression since version 2.2.0.
+- Fixed: message about huge pages support successfully enabled on Windows was not shown in release builds.
+
+# v2.2.1
+- Fixed [terminal issues](https://github.com/xmrig/xmrig-proxy/issues/2#issuecomment-319914085) after exit on Linux and OS X.
+
+# v2.2.0
+- [#46](https://github.com/xmrig/xmrig/issues/46) Restored config file support. Now possible use multiple config files and combine with command line options also added support for default config.
+- Improved colors support on Windows, now used uv_tty, legacy code removed.
+- QuickEdit Mode now disabled on Windows.
+- Added interactive commands in console window:: **h**ashrate, **p**ause, **r**esume.
+- Fixed autoconf mode for AMD FX CPUs.
+
+# v2.1.0
+- [#40](https://github.com/xmrig/xmrig/issues/40)
+Improved miner shutdown, fixed crash on exit for Linux and OS X.
+- Fixed, login request was contain malformed JSON if username or password has some special characters for example `\`. 
+- [#220](https://github.com/fireice-uk/xmr-stak-cpu/pull/220) Better support for Round Robin DNS, IP address now always chosen randomly instead of stuck on first one.
+- Changed donation address, new [xmrig-proxy](https://github.com/xmrig/xmrig-proxy) is coming soon.
+
+# v2.0.2
+- Better deal with possible duplicate jobs from pool, show warning and ignore duplicates.
+- For Windows builds libuv updated to version 1.13.1 and gcc to 7.1.0.
+
+# v2.0.1
+ - [#27](https://github.com/xmrig/xmrig/issues/27) Fixed possibility crash on 32bit systems.
+
+# v2.0.0
+ - Option `--backup-url` removed, instead now possibility specify multiple pools for example: `-o example1.com:3333 -u user1 -p password1 -k -o example2.com:5555 -u user2 -o example3.com:4444 -u user3`
+ - [#15](https://github.com/xmrig/xmrig/issues/15) Added option `-l, --log-file=FILE` to write log to file.
+ - [#15](https://github.com/xmrig/xmrig/issues/15) Added option `-S, --syslog` to use syslog for logging, Linux only.
+ - [#18](https://github.com/xmrig/xmrig/issues/18) Added nice messages for accepted/rejected shares with diff and network latency.
+ - [#20](https://github.com/xmrig/xmrig/issues/20) Fixed `--cpu-affinity` for more than 32 threads.
+ - Fixed Windows XP support.
+ - Fixed regression, option `--no-color` was not fully disable colored output.
+ - Show resolved pool IP address in miner output.
+ 
+# v1.0.1
+- Fix broken software AES implementation, app has crashed if CPU not support AES-NI, only version 1.0.0 affected.
+
+# v1.0.0
+- Miner complete rewritten in C++ with libuv.
+- This version should be fully compatible (except config file) with previos versions, many new nice features will come in next versions.
+- This is still beta. If you found regression, stability or perfomance issues or have an idea for new feature please fell free to open new [issue](https://github.com/xmrig/xmrig/issues/new).
+- Added new option `--print-time=N`, print hashrate report every N seconds.
+- New hashrate reports, by default every 60 secons.
+- Added Microsoft Visual C++ 2015 and 2017 support.
+- Removed dependency on libcurl.
+- To compile this version from source please switch to [dev](https://github.com/xmrig/xmrig/tree/dev) branch.
+
+# v0.8.2
+- Fixed L2 cache size detection for AMD CPUs (Bulldozer/Piledriver/Steamroller/Excavator architecture).
+
+# v0.8.2
+- Fixed L2 cache size detection for AMD CPUs (Bulldozer/Piledriver/Steamroller/Excavator architecture).
+- Fixed gcc 7.1 support.
+
+# v0.8.1
+- Added nicehash support, detects automaticaly by pool URL, for example `cryptonight.eu.nicehash.com:3355` or manually via option `--nicehash`.
+
+# v0.8.0
+- Added double hash mode, also known as lower power mode. `--av=2` and `--av=4`.
+- Added smart automatic CPU configuration. Default threads count now depends on size of the L3 cache of CPU.
+- Added CryptoNight-Lite support for AEON `-a cryptonight-lite`.
+- Added `--max-cpu-usage` option for auto CPU configuration mode.
+- Added `--safe` option for adjust threads and algorithm variations to current CPU.
+- No more manual steps to enable huge pages on Windows. XMRig will do it automatically.
+- Removed BMI2 algorithm variation.
+- Removed default pool URL.
+
+# v0.6.0
+- Added automatic cryptonight self test.
+- New software AES algorithm variation. Will be automatically selected if cpu not support AES-NI.
+- Added 32 bit builds.
+- Documented [algorithm variations](https://github.com/xmrig/xmrig#algorithm-variations).
+
+# v0.5.0
+- Initial public release.
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -3,6 +3,7 @@ project(xmrig)

 option(WITH_LIBCPUID "Use Libcpuid" ON)
 option(WITH_AEON     "CryptoNight-Lite support" ON)
+option(WITH_SUMO     "CryptoNight-Heavy support" ON)
 option(WITH_HTTPD    "HTTP REST API" ON)
 option(BUILD_STATIC  "Build static binary" OFF)

@@ -11,18 +12,31 @@ include (cmake/cpu.cmake)


 set(HEADERS
-    src/api/Api.h
-    src/api/ApiState.h
    src/api/NetworkState.h
    src/App.h
+    src/common/config/CommonConfig.h
+    src/common/config/ConfigLoader.h
+    src/common/config/ConfigWatcher.h
+    src/common/Platform.h
+    src/common/utils/c_str.h
+    src/common/utils/mm_malloc.h
+    src/common/xmrig.h
    src/Console.h
+    src/core/Config.cpp
+    src/core/ConfigLoader_platform.h
+    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
@@ -33,22 +47,20 @@ set(HEADERS
    src/net/Job.h
    src/net/JobResult.h
    src/net/Network.h
+    src/net/Pool.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/Options.h
-    src/Platform.h
    src/Summary.h
    src/version.h
-    src/workers/DoubleWorker.h
+    src/workers/CpuThread.h
    src/workers/Handle.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
@@ -58,6 +70,7 @@ set(HEADERS_CRYPTO
    src/crypto/c_keccak.h
    src/crypto/c_skein.h
    src/crypto/CryptoNight.h
+    src/crypto/CryptoNight_constants.h
    src/crypto/CryptoNight_monero.h
    src/crypto/CryptoNight_test.h
    src/crypto/groestl_tables.h
@@ -73,11 +86,15 @@ else()
 endif()

 set(SOURCES
-    src/api/Api.cpp
-    src/api/ApiState.cpp
    src/api/NetworkState.cpp
    src/App.cpp
+    src/common/config/CommonConfig.cpp
+    src/common/config/ConfigLoader.cpp
+    src/common/config/ConfigWatcher.cpp
+    src/common/Platform.cpp
    src/Console.cpp
+    src/core/Config.cpp
+    src/core/Controller.cpp
    src/log/ConsoleLog.cpp
    src/log/FileLog.cpp
    src/log/Log.cpp
@@ -85,18 +102,16 @@ set(SOURCES
    src/net/Client.cpp
    src/net/Job.cpp
    src/net/Network.cpp
+    src/net/Pool.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/Options.cpp
-    src/Platform.cpp
    src/Summary.cpp
-    src/workers/DoubleWorker.cpp
+    src/workers/CpuThread.cpp
    src/workers/Handle.cpp
    src/workers/Hashrate.cpp
-    src/workers/SingleWorker.cpp
+    src/workers/MultiWorker.cpp
    src/workers/Worker.cpp
    src/workers/Workers.cpp
    src/xmrig.cpp
@@ -108,16 +123,15 @@ set(SOURCES_CRYPTO
    src/crypto/c_blake256.c
    src/crypto/c_jh.c
    src/crypto/c_skein.c
-    src/crypto/CryptoNight.cpp
   )

 if (WIN32)
    set(SOURCES_OS
        res/app.rc
        src/App_win.cpp
+        src/common/Platform_win.cpp
        src/Cpu_win.cpp
        src/Mem_win.cpp
-        src/Platform_win.cpp
        )

    add_definitions(/DWIN32)
@@ -125,16 +139,16 @@ if (WIN32)
 elseif (APPLE)
    set(SOURCES_OS
        src/App_unix.cpp
+        src/common/Platform_mac.cpp
        src/Cpu_mac.cpp
        src/Mem_unix.cpp
-        src/Platform_mac.cpp
        )
 else()
    set(SOURCES_OS
        src/App_unix.cpp
+        src/common/Platform_unix.cpp
        src/Cpu_unix.cpp
        src/Mem_unix.cpp
-        src/Platform_unix.cpp
        )

    set(EXTRA_LIBS pthread rt)
@@ -187,12 +201,27 @@ if (NOT WITH_AEON)
    add_definitions(/DXMRIG_NO_AEON)
 endif()

+if (NOT WITH_SUMO)
+    add_definitions(/DXMRIG_NO_SUMO)
+endif()
+
 if (WITH_HTTPD)
    find_package(MHD)

    if (MHD_FOUND)
        include_directories(${MHD_INCLUDE_DIRS})
-        set(HTTPD_SOURCES src/api/Httpd.h src/api/Httpd.cpp)
+        set(HTTPD_SOURCES
+            src/api/Api.h
+            src/api/ApiRouter.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/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()
--- a/README.md
+++ b/README.md
@@ -124,10 +124,10 @@ Please note performance is highly dependent on system load. The numbers above ar
 ## Release checksums
 ### SHA-256
 ```
-b070d06a3615f3db67ad3beab43d6d21f3c88026aa2b4726a93df47145cd30ec xmrig-2.5.2-xenial-amd64.tar.gz/xmrig-2.5.2/xmrig
-4852135d3f04fd450ba39abce51ca40ff9131d222220c8b30804be05f6679295 xmrig-2.5.2-gcc-win32.zip/xmrig.exe
-284309d07f08261af19c937ece6d2031910d9124a7359c207ded65890b2d7c5f xmrig-2.5.2-gcc-win64.zip/xmrig.exe
-e1dc46158a578fb030538fb06e5663a6acc5763545fb447a00ce0a6b388c5226 xmrig-2.5.2-msvc-win64.zip/xmrig.exe
+6b32fefb356b27caa2180be17755d09639f0654096a1a0c61e8f10f4f2ac1626 xmrig-2.6.0-beta3-xenial-amd64.tar.gz/xmrig-2.6.0-beta3/xmrig
+c8b40f4d7aac9d0cc7c3d02cadeac91b0bdb034aae2fb6b415d503272eabb987 xmrig-2.6.0-beta3-gcc-win32.zip/xmrig.exe
+32cf7958f97a23296186e38a4addb9cf234adcbd9c7914b15e4209a87fe272e7 xmrig-2.6.0-beta3-gcc-win64.zip/xmrig.exe
+4f176ee4c4be52701edc0d573cf9647c4aacbb4ff14975b80b98e6fe63068542 xmrig-2.6.0-beta3-msvc-win64.zip/xmrig.exe
 ```

 ## Contacts
--- a/cmake/flags.cmake
+++ b/cmake/flags.cmake
@@ -13,10 +13,10 @@ 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_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} -Ofast -s")

    if (XMRIG_ARMv8)
        set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -march=armv8-a+crypto")
--- a/doc/API.md
+++ b/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
+```
--- a/doc/api/1/config.json
+++ b/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
+}
--- a/doc/api/1/summary.json
+++ b/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": []
+    }
+}
--- a/doc/api/1/threads.json
+++ b/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
+            ]
+        }
+    ]
+}
--- a/src/App.cpp
+++ b/src/App.cpp
@@ -4,8 +4,8 @@
 * 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 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
@@ -28,7 +28,10 @@

 #include "api/Api.h"
 #include "App.h"
+#include "common/Platform.h"
 #include "Console.h"
+#include "core/Config.h"
+#include "core/Controller.h"
 #include "Cpu.h"
 #include "crypto/CryptoNight.h"
 #include "log/ConsoleLog.h"
@@ -36,19 +39,13 @@
 #include "log/Log.h"
 #include "Mem.h"
 #include "net/Network.h"
-#include "Options.h"
-#include "Platform.h"
 #include "Summary.h"
 #include "version.h"
 #include "workers/Workers.h"


-#ifdef HAVE_SYSLOG_H
-#   include "log/SysLog.h"
-#endif
-
 #ifndef XMRIG_NO_HTTPD
-#   include "api/Httpd.h"
+#   include "common/api/Httpd.h"
 #endif


@@ -58,40 +55,19 @@ App *App::m_self = nullptr;

 App::App(int argc, char **argv) :
    m_console(nullptr),
-    m_httpd(nullptr),
-    m_network(nullptr),
-    m_options(nullptr)
+    m_httpd(nullptr)
 {
    m_self = this;

-    Cpu::init();
-    m_options = Options::parse(argc, argv);
-    if (!m_options) {
+    m_controller = new xmrig::Controller();
+    if (m_controller->init(argc, argv) != 0) {
        return;
    }

-    Log::init();
-
-    if (!m_options->background()) {
-        Log::add(new ConsoleLog(m_options->colors()));
+    if (!m_controller->config()->isBackground()) {
        m_console = new Console(this);
    }

-    if (m_options->logFile()) {
-        Log::add(new FileLog(m_options->logFile()));
-    }
-
-#   ifdef HAVE_SYSLOG_H
-    if (m_options->syslog()) {
-        Log::add(new SysLog());
-    }
-#   endif
-
-    Platform::init(m_options->userAgent());
-    Platform::setProcessPriority(m_options->priority());
-
-    m_network = new Network(m_options);
-
    uv_signal_init(uv_default_loop(), &m_sigHUP);
    uv_signal_init(uv_default_loop(), &m_sigINT);
    uv_signal_init(uv_default_loop(), &m_sigTERM);
@@ -102,17 +78,18 @@ App::~App()
 {
    uv_tty_reset_mode();

+    delete m_console;
+    delete m_controller;
+
 #   ifndef XMRIG_NO_HTTPD
    delete m_httpd;
 #   endif
-
-    delete m_console;
 }


 int App::exec()
 {
-    if (!m_options) {
+    if (!m_controller->isReady()) {
        return 2;
    }

@@ -122,15 +99,11 @@ int App::exec()

    background();

-    if (!CryptoNight::init(m_options->algo(), m_options->algoVariant())) {
-        LOG_ERR("\"%s\" hash self-test failed.", m_options->algoName());
-        return 1;
-    }
+    Mem::init(m_controller->config()->isHugePages());

-    Mem::allocate(m_options->algo(), m_options->threads(), m_options->doubleHash(), m_options->hugePages());
-    Summary::print();
+    Summary::print(m_controller);

-    if (m_options->dryRun()) {
+    if (m_controller->config()->isDryRun()) {
        LOG_NOTICE("OK");
        release();

@@ -138,17 +111,23 @@ int App::exec()
    }

 #   ifndef XMRIG_NO_API
-    Api::start();
+    Api::start(m_controller);
 #   endif

 #   ifndef XMRIG_NO_HTTPD
-    m_httpd = new Httpd(m_options->apiPort(), m_options->apiToken());
+    m_httpd = new Httpd(
+                m_controller->config()->apiPort(),
+                m_controller->config()->apiToken(),
+                m_controller->config()->isApiIPv6(),
+                m_controller->config()->isApiRestricted()
+                );
+
    m_httpd->start();
 #   endif

-    Workers::start(m_options->affinity(), m_options->priority());
+    Workers::start(m_controller);

-    m_network->connect();
+    m_controller->network()->connect();

    const int r = uv_run(uv_default_loop(), UV_RUN_DEFAULT);
    uv_loop_close(uv_default_loop());
@@ -169,7 +148,7 @@ void App::onConsoleCommand(char command)
    case 'p':
    case 'P':
        if (Workers::isEnabled()) {
-            LOG_INFO(m_options->colors() ? "\x1B[01;33mpaused\x1B[0m, press \x1B[01;35mr\x1B[0m to resume" : "paused, press 'r' to resume");
+            LOG_INFO(m_controller->config()->isColors() ? "\x1B[01;33mpaused\x1B[0m, press \x1B[01;35mr\x1B[0m to resume" : "paused, press 'r' to resume");
            Workers::setEnabled(false);
        }
        break;
@@ -177,7 +156,7 @@ void App::onConsoleCommand(char command)
    case 'r':
    case 'R':
        if (!Workers::isEnabled()) {
-            LOG_INFO(m_options->colors() ? "\x1B[01;32mresumed" : "resumed");
+            LOG_INFO(m_controller->config()->isColors() ? "\x1B[01;32mresumed" : "resumed");
            Workers::setEnabled(true);
        }
        break;
@@ -195,7 +174,7 @@ void App::onConsoleCommand(char command)

 void App::close()
 {
-    m_network->stop();
+    m_controller->network()->stop();
    Workers::stop();

    uv_stop(uv_default_loop());
@@ -204,13 +183,6 @@ void App::close()

 void App::release()
 {
-    if (m_network) {
-        delete m_network;
-    }
-
-    Options::release();
-    Mem::release();
-    Platform::release();
 }


--- a/src/App.h
+++ b/src/App.h
@@ -4,8 +4,8 @@
 * 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 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
@@ -37,6 +37,11 @@ class Network;
 class Options;


+namespace xmrig {
+    class Controller;
+}
+
+
 class App : public IConsoleListener
 {
 public:
@@ -59,11 +64,10 @@ private:

  Console *m_console;
  Httpd *m_httpd;
-  Network *m_network;
-  Options *m_options;
  uv_signal_t m_sigHUP;
  uv_signal_t m_sigINT;
  uv_signal_t m_sigTERM;
+  xmrig::Controller *m_controller;
 };


--- a/src/App_unix.cpp
+++ b/src/App_unix.cpp
@@ -29,20 +29,16 @@


 #include "App.h"
-#include "Cpu.h"
+#include "core/Config.h"
+#include "core/Controller.h"
 #include "log/Log.h"
-#include "Options.h"


 void App::background()
 {
    signal(SIGPIPE, SIG_IGN);

-    if (m_options->affinity() != -1L) {
-        Cpu::setAffinity(-1, m_options->affinity());
-    }
-
-    if (!m_options->background()) {
+    if (!m_controller->config()->isBackground()) {
        return;
    }

--- a/src/App_win.cpp
+++ b/src/App_win.cpp
@@ -4,8 +4,8 @@
 * 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 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
@@ -27,17 +27,13 @@


 #include "App.h"
-#include "Options.h"
-#include "Cpu.h"
+#include "core/Controller.h"
+#include "core/Config.h"


 void App::background()
 {
-    if (m_options->affinity() != -1L) {
-        Cpu::setAffinity(-1, m_options->affinity());
-    }
-
-    if (!m_options->background()) {
+    if (!m_controller->config()->isBackground()) {
        return;
    }

--- a/src/Cpu.cpp
+++ b/src/Cpu.cpp
@@ -4,8 +4,8 @@
 * 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 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
@@ -26,26 +26,27 @@
 #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;
+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;
+size_t Cpu::m_totalThreads  = 0;


-int Cpu::optimalThreadsCount(int algo, bool doubleHash, int maxCpuUsage)
+size_t Cpu::optimalThreadsCount(size_t size, int maxCpuUsage)
 {
    if (m_totalThreads == 1) {
        return 1;
    }

-    int cache = 0;
+    size_t cache = 0;
    if (m_l3_cache) {
        cache = m_l2_exclusive ? (m_l2_cache + m_l3_cache) : m_l3_cache;
    }
@@ -53,11 +54,14 @@ int Cpu::optimalThreadsCount(int algo, bool doubleHash, int maxCpuUsage)
        cache = m_l2_cache;
    }

-    int count = 0;
-    const int size = (algo ? 1024 : 2048) * (doubleHash ? 2 : 1);
+    size_t count = 0;

    if (cache) {
        count = cache / size;
+
+        if (cache % size >= size / 2) {
+            count++;
+        }
    }
    else {
        count = m_totalThreads / 2;
--- a/src/Cpu.h
+++ b/src/Cpu.h
@@ -4,8 +4,8 @@
 * 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 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
@@ -37,9 +37,8 @@ public:
        BMI2   = 4
    };

-    static int optimalThreadsCount(int algo, bool doubleHash, int maxCpuUsage);
+    static size_t optimalThreadsCount(size_t size, 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; }
@@ -60,7 +59,7 @@ private:
    static int m_l3_cache;
    static int m_sockets;
    static int m_totalCores;
-    static int m_totalThreads;
+    static size_t m_totalThreads;
 };


--- a/src/Cpu_arm.cpp
+++ b/src/Cpu_arm.cpp
@@ -4,8 +4,8 @@
 * 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 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
@@ -28,16 +28,16 @@
 #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;
+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;
+size_t Cpu::m_totalThreads = 0;


-int Cpu::optimalThreadsCount(int algo, bool doubleHash, int maxCpuUsage)
+size_t Cpu::optimalThreadsCount(size_t size, int maxCpuUsage)
 {
    return m_totalThreads;
 }
--- a/src/Cpu_mac.cpp
+++ b/src/Cpu_mac.cpp
@@ -4,8 +4,8 @@
 * 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 2016      Jay D Dee   <jayddee246@gmail.com>
+ * 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
@@ -38,8 +38,3 @@ void Cpu::init()

    initCommon();
 }
-
-
-void Cpu::setAffinity(int id, uint64_t mask)
-{
-}
--- a/src/Cpu_unix.cpp
+++ b/src/Cpu_unix.cpp
@@ -52,28 +52,3 @@ void Cpu::init()

    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
-    }
-}
--- a/src/Cpu_win.cpp
+++ b/src/Cpu_win.cpp
@@ -39,14 +39,3 @@ void Cpu::init()

    initCommon();
 }
-
-
-void Cpu::setAffinity(int id, uint64_t mask)
-{
-    if (id == -1) {
-        SetProcessAffinityMask(GetCurrentProcess(), mask);
-    }
-    else {
-        SetThreadAffinityMask(GetCurrentThread(), mask);
-    }
-}
--- a/src/Mem.cpp
+++ b/src/Mem.cpp
@@ -23,68 +23,49 @@
 */


-#include <memory.h>
-
-
+#include "common/utils/mm_malloc.h"
 #include "crypto/CryptoNight.h"
+#include "crypto/CryptoNight_constants.h"
 #include "Mem.h"
-#include "Options.h"
-#include "xmrig.h"


-bool Mem::m_doubleHash             = false;
-int Mem::m_algo                    = 0;
-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;
+bool Mem::m_enabled = true;
+int Mem::m_flags    = 0;


-cryptonight_ctx *Mem::create(int threadId)
+
+MemInfo Mem::create(cryptonight_ctx **ctx, xmrig::Algo algorithm, size_t count)
 {
+    using namespace xmrig;
+
+    MemInfo info;
+    info.size = cn_select_memory(algorithm) * count;
+
 #   ifndef XMRIG_NO_AEON
-    if (m_algo == xmrig::ALGO_CRYPTONIGHT_LITE) {
-        return createLite(threadId);
-    }
+    info.size += info.size % cn_select_memory<CRYPTONIGHT>();
 #   endif

-    cryptonight_ctx *ctx = reinterpret_cast<cryptonight_ctx *>(&m_memory[MONERO_MEMORY - sizeof(cryptonight_ctx) * (threadId + 1)]);
+    info.pages = info.size / cn_select_memory<CRYPTONIGHT>();

-    const int ratio = m_doubleHash ? 2 : 1;
-    ctx->memory = &m_memory[MONERO_MEMORY * (threadId * ratio + 1)];
+    allocate(info, m_enabled);

-    return ctx;
-}
+    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));

-
-
-void *Mem::calloc(size_t num, size_t size)
-{
-    void *mem = &m_memory[m_offset];
-    m_offset += (num * size);
-
-    memset(mem, 0, num * size);
-
-    return mem;
-}
-
-
-#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[i] = c;
    }

-    ctx = reinterpret_cast<cryptonight_ctx *>(&m_memory[MONERO_MEMORY - sizeof(cryptonight_ctx) * (threadId + 1)]);
-    ctx->memory = &m_memory[MONERO_MEMORY * (threadId + 1)];
-
-    return ctx;
+    return info;
 }
-#endif
+
+
+void Mem::release(cryptonight_ctx **ctx, size_t count, MemInfo &info)
+{
+    release(info);
+
+    for (size_t i = 0; i < count; ++i) {
+        _mm_free(ctx[i]);
+    }
+}
+
--- a/src/Mem.h
+++ b/src/Mem.h
@@ -30,9 +30,22 @@
 #include <stdint.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:
@@ -42,29 +55,18 @@ public:
        Lock               = 4
    };

-    static bool allocate(int 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 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;
 };


--- a/src/Mem_unix.cpp
+++ b/src/Mem_unix.cpp
@@ -27,72 +27,63 @@
 #include <sys/mman.h>


-#if defined(XMRIG_ARM) && !defined(__clang__)
-#   include "aligned_malloc.h"
-#else
-#   include <mm_malloc.h>
-#endif
-
-
+#include "common/utils/mm_malloc.h"
+#include "common/xmrig.h"
 #include "crypto/CryptoNight.h"
 #include "log/Log.h"
 #include "Mem.h"
-#include "Options.h"
-#include "xmrig.h"


-bool Mem::allocate(int 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::ALGO_CRYPTONIGHT_LITE) ? 2 : 1;
-    m_size          = MONERO_MEMORY * (threads * ratio + 1);
+
+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);
    }
 }
--- a/src/Mem_win.cpp
+++ b/src/Mem_win.cpp
@@ -28,17 +28,13 @@
 #include <ntsecapi.h>
 #include <tchar.h>

-#ifdef __GNUC__
-#   include <mm_malloc.h>
-#else
-#   include <malloc.h>
-#endif

-#include "log/Log.h"
+#include "common/utils/mm_malloc.h"
+#include "common/xmrig.h"
 #include "crypto/CryptoNight.h"
+#include "crypto/CryptoNight_constants.h"
+#include "log/Log.h"
 #include "Mem.h"
-#include "Options.h"
-#include "xmrig.h"


 /*****************************************************************
@@ -146,42 +142,43 @@ static BOOL TrySetLockPagesPrivilege() {
 }


-bool Mem::allocate(int 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::ALGO_CRYPTONIGHT_LITE) ? 2 : 1;
-    m_size          = MONERO_MEMORY * (threads * ratio + 1);
-
-    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);
    }
 }
--- a/src/Options.cpp
+++ b/src/Options.cpp
@@ -1,761 +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 <string.h>
-#include <uv.h>
-
-
-#ifdef _MSC_VER
-#   include "getopt/getopt.h"
-#else
-#   include <getopt.h>
-#endif
-
-
-#ifndef XMRIG_NO_HTTPD
-#   include <microhttpd.h>
-#endif
-
-
-#include "Cpu.h"
-#include "donate.h"
-#include "net/Url.h"
-#include "Options.h"
-#include "Platform.h"
-#include "rapidjson/document.h"
-#include "rapidjson/error/en.h"
-#include "rapidjson/filereadstream.h"
-#include "version.h"
-#include "xmrig.h"
-
-
-#ifndef ARRAY_SIZE
-#   define ARRAY_SIZE(arr) (sizeof(arr) / sizeof((arr)[0]))
-#endif
-
-
-Options *Options::m_self = nullptr;
-
-
-static char const usage[] = "\
-Usage: " APP_ID " [OPTIONS]\n\
-Options:\n\
-  -a, --algo=ALGO          cryptonight (default) or cryptonight-lite\n\
-  -o, --url=URL            URL of mining server\n\
-  -O, --userpass=U:P       username:password pair for mining server\n\
-  -u, --user=USERNAME      username for mining server\n\
-  -p, --pass=PASSWORD      password for mining server\n\
-  -t, --threads=N          number of miner threads\n\
-  -v, --av=N               algorithm variation, 0 auto select\n\
-  -k, --keepalive          send keepalived for prevent timeout (need pool support)\n\
-  -r, --retries=N          number of times to retry before switch to backup server (default: 5)\n\
-  -R, --retry-pause=N      time to pause between retries (default: 5)\n\
-      --cpu-affinity       set process affinity to CPU core(s), mask 0x3 for cores 0 and 1\n\
-      --cpu-priority       set process priority (0 idle, 2 normal to 5 highest)\n\
-      --no-huge-pages      disable huge pages support\n\
-      --no-color           disable colored output\n\
-      --variant            algorithm PoW variant\n\
-      --donate-level=N     donate level, default 5%% (5 minutes in 100 minutes)\n\
-      --user-agent         set custom user-agent string for pool\n\
-  -B, --background         run the miner in the background\n\
-  -c, --config=FILE        load a JSON-format configuration file\n\
-  -l, --log-file=FILE      log all output to a file\n"
-# ifdef HAVE_SYSLOG_H
-"\
-  -S, --syslog             use system log for output messages\n"
-# endif
-"\
-      --max-cpu-usage=N    maximum CPU usage for automatic threads mode (default 75)\n\
-      --safe               safe adjust threads and av settings for current CPU\n\
-      --nicehash           enable nicehash/xmrig-proxy support\n\
-      --print-time=N       print hashrate report every N seconds\n\
-      --api-port=N         port for the miner API\n\
-      --api-access-token=T access token for API\n\
-      --api-worker-id=ID   custom worker-id for API\n\
-  -h, --help               display this help and exit\n\
-  -V, --version            output version information and exit\n\
-";
-
-
-static char const short_options[] = "a:c:khBp:Px:r:R:s:t:T:o:u:O:v:Vl:S";
-
-
-static struct option const options[] = {
-    { "algo",             1, nullptr, 'a'  },
-    { "api-access-token", 1, nullptr, 4001 },
-    { "api-port",         1, nullptr, 4000 },
-    { "api-worker-id",    1, nullptr, 4002 },
-    { "av",               1, nullptr, 'v'  },
-    { "background",       0, nullptr, 'B'  },
-    { "config",           1, nullptr, 'c'  },
-    { "cpu-affinity",     1, nullptr, 1020 },
-    { "cpu-priority",     1, nullptr, 1021 },
-    { "donate-level",     1, nullptr, 1003 },
-    { "dry-run",          0, nullptr, 5000 },
-    { "help",             0, nullptr, 'h'  },
-    { "keepalive",        0, nullptr ,'k'  },
-    { "log-file",         1, nullptr, 'l'  },
-    { "max-cpu-usage",    1, nullptr, 1004 },
-    { "nicehash",         0, nullptr, 1006 },
-    { "no-color",         0, nullptr, 1002 },
-    { "no-huge-pages",    0, nullptr, 1009 },
-    { "variant",          1, nullptr, 1010 },
-    { "pass",             1, nullptr, 'p'  },
-    { "print-time",       1, nullptr, 1007 },
-    { "retries",          1, nullptr, 'r'  },
-    { "retry-pause",      1, nullptr, 'R'  },
-    { "safe",             0, nullptr, 1005 },
-    { "syslog",           0, nullptr, 'S'  },
-    { "threads",          1, nullptr, 't'  },
-    { "url",              1, nullptr, 'o'  },
-    { "user",             1, nullptr, 'u'  },
-    { "user-agent",       1, nullptr, 1008 },
-    { "userpass",         1, nullptr, 'O'  },
-    { "version",          0, nullptr, 'V'  },
-    { 0, 0, 0, 0 }
-};
-
-
-static struct option const config_options[] = {
-    { "algo",          1, nullptr, 'a'  },
-    { "av",            1, nullptr, 'v'  },
-    { "background",    0, nullptr, 'B'  },
-    { "colors",        0, nullptr, 2000 },
-    { "cpu-affinity",  1, nullptr, 1020 },
-    { "cpu-priority",  1, nullptr, 1021 },
-    { "donate-level",  1, nullptr, 1003 },
-    { "dry-run",       0, nullptr, 5000 },
-    { "huge-pages",    0, nullptr, 1009 },
-    { "log-file",      1, nullptr, 'l'  },
-    { "max-cpu-usage", 1, nullptr, 1004 },
-    { "print-time",    1, nullptr, 1007 },
-    { "retries",       1, nullptr, 'r'  },
-    { "retry-pause",   1, nullptr, 'R'  },
-    { "safe",          0, nullptr, 1005 },
-    { "syslog",        0, nullptr, 'S'  },
-    { "threads",       1, nullptr, 't'  },
-    { "user-agent",    1, nullptr, 1008 },
-    { 0, 0, 0, 0 }
-};
-
-
-static struct option const pool_options[] = {
-    { "url",           1, nullptr, 'o'  },
-    { "pass",          1, nullptr, 'p'  },
-    { "user",          1, nullptr, 'u'  },
-    { "userpass",      1, nullptr, 'O'  },
-    { "keepalive",     0, nullptr ,'k'  },
-    { "variant",       1, nullptr, 1010 },
-    { "nicehash",      0, nullptr, 1006 },
-    { 0, 0, 0, 0 }
-};
-
-
-static struct option const api_options[] = {
-    { "port",          1, nullptr, 4000 },
-    { "access-token",  1, nullptr, 4001 },
-    { "worker-id",     1, nullptr, 4002 },
-    { 0, 0, 0, 0 }
-};
-
-
-static const char *algo_names[] = {
-    "cryptonight",
-#   ifndef XMRIG_NO_AEON
-    "cryptonight-lite"
-#   endif
-};
-
-
-Options *Options::parse(int argc, char **argv)
-{
-    Options *options = new Options(argc, argv);
-    if (options->isReady()) {
-        m_self = options;
-        return m_self;
-    }
-
-    delete options;
-    return nullptr;
-}
-
-
-const char *Options::algoName() const
-{
-    return algo_names[m_algo];
-}
-
-
-Options::Options(int argc, char **argv) :
-    m_background(false),
-    m_colors(true),
-    m_doubleHash(false),
-    m_dryRun(false),
-    m_hugePages(true),
-    m_ready(false),
-    m_safe(false),
-    m_syslog(false),
-    m_apiToken(nullptr),
-    m_apiWorkerId(nullptr),
-    m_logFile(nullptr),
-    m_userAgent(nullptr),
-    m_algo(0),
-    m_algoVariant(0),
-    m_apiPort(0),
-    m_donateLevel(kDonateLevel),
-    m_maxCpuUsage(75),
-    m_printTime(60),
-    m_priority(-1),
-    m_retries(5),
-    m_retryPause(5),
-    m_threads(0),
-    m_affinity(-1L)
-{
-    m_pools.push_back(new Url());
-
-    int key;
-
-    while (1) {
-        key = getopt_long(argc, argv, short_options, options, NULL);
-        if (key < 0) {
-            break;
-        }
-
-        if (!parseArg(key, optarg)) {
-            return;
-        }
-    }
-
-    if (optind < argc) {
-        fprintf(stderr, "%s: unsupported non-option argument '%s'\n", argv[0], argv[optind]);
-        return;
-    }
-
-    if (!m_pools[0]->isValid()) {
-        parseConfig(Platform::defaultConfigName());
-    }
-
-    if (!m_pools[0]->isValid()) {
-        fprintf(stderr, "No pool URL supplied. Exiting.\n");
-        return;
-    }
-
-    m_algoVariant = getAlgoVariant();
-    if (m_algoVariant == AV2_AESNI_DOUBLE || m_algoVariant == AV4_SOFT_AES_DOUBLE) {
-        m_doubleHash = true;
-    }
-
-    if (!m_threads) {
-        m_threads = Cpu::optimalThreadsCount(m_algo, m_doubleHash, m_maxCpuUsage);
-    }
-    else if (m_safe) {
-        const int count = Cpu::optimalThreadsCount(m_algo, m_doubleHash, m_maxCpuUsage);
-        if (m_threads > count) {
-            m_threads = count;
-        }
-    }
-
-    adjust();
-
-    m_ready = true;
-}
-
-
-Options::~Options()
-{
-}
-
-
-bool Options::getJSON(const char *fileName, rapidjson::Document &doc)
-{
-    uv_fs_t req;
-    const int fd = uv_fs_open(uv_default_loop(), &req, fileName, O_RDONLY, 0644, nullptr);
-    if (fd < 0) {
-        fprintf(stderr, "unable to open %s: %s\n", fileName, uv_strerror(fd));
-        return false;
-    }
-
-    uv_fs_req_cleanup(&req);
-
-    FILE *fp = fdopen(fd, "rb");
-    char buf[8192];
-    rapidjson::FileReadStream is(fp, buf, sizeof(buf));
-
-    doc.ParseStream(is);
-
-    uv_fs_close(uv_default_loop(), &req, fd, nullptr);
-    uv_fs_req_cleanup(&req);
-
-    if (doc.HasParseError()) {
-        printf("%s:%d: %s\n", fileName, (int) doc.GetErrorOffset(), rapidjson::GetParseError_En(doc.GetParseError()));
-        return false;
-    }
-
-    return doc.IsObject();
-}
-
-
-bool Options::parseArg(int key, const char *arg)
-{
-    switch (key) {
-    case 'a': /* --algo */
-        if (!setAlgo(arg)) {
-            return false;
-        }
-        break;
-
-    case 'o': /* --url */
-        if (m_pools.size() > 1 || m_pools[0]->isValid()) {
-            Url *url = new Url(arg);
-            if (url->isValid()) {
-                m_pools.push_back(url);
-            }
-            else {
-                delete url;
-            }
-        }
-        else {
-            m_pools[0]->parse(arg);
-        }
-
-        if (!m_pools.back()->isValid()) {
-            return false;
-        }
-        break;
-
-    case 'O': /* --userpass */
-        if (!m_pools.back()->setUserpass(arg)) {
-            return false;
-        }
-        break;
-
-    case 'u': /* --user */
-        m_pools.back()->setUser(arg);
-        break;
-
-    case 'p': /* --pass */
-        m_pools.back()->setPassword(arg);
-        break;
-
-    case 'l': /* --log-file */
-        free(m_logFile);
-        m_logFile = strdup(arg);
-        m_colors = false;
-        break;
-
-    case 4001: /* --access-token */
-        free(m_apiToken);
-        m_apiToken = strdup(arg);
-        break;
-
-    case 4002: /* --worker-id */
-        free(m_apiWorkerId);
-        m_apiWorkerId = strdup(arg);
-        break;
-
-    case 'r':  /* --retries */
-    case 'R':  /* --retry-pause */
-    case 'v':  /* --av */
-    case 1003: /* --donate-level */
-    case 1004: /* --max-cpu-usage */
-    case 1007: /* --print-time */
-    case 1021: /* --cpu-priority */
-    case 4000: /* --api-port */
-    case 1010: /* --variant */
-        return parseArg(key, strtol(arg, nullptr, 10));
-
-    case 'B':  /* --background */
-    case 'k':  /* --keepalive */
-    case 'S':  /* --syslog */
-    case 1005: /* --safe */
-    case 1006: /* --nicehash */
-    case 5000: /* --dry-run */
-        return parseBoolean(key, true);
-
-    case 1002: /* --no-color */
-    case 1009: /* --no-huge-pages */
-        return parseBoolean(key, false);
-
-    case 't':  /* --threads */
-        if (strncmp(arg, "all", 3) == 0) {
-            m_threads = Cpu::threads();
-            return true;
-        }
-
-        return parseArg(key, strtol(arg, nullptr, 10));
-
-    case 'V': /* --version */
-        showVersion();
-        return false;
-
-    case 'h': /* --help */
-        showUsage(0);
-        return false;
-
-    case 'c': /* --config */
-        parseConfig(arg);
-        break;
-
-    case 1020: { /* --cpu-affinity */
-            const char *p  = strstr(arg, "0x");
-            return parseArg(key, p ? strtoull(p, nullptr, 16) : strtoull(arg, nullptr, 10));
-        }
-
-    case 1008: /* --user-agent */
-        free(m_userAgent);
-        m_userAgent = strdup(arg);
-        break;
-
-    default:
-        showUsage(1);
-        return false;
-    }
-
-    return true;
-}
-
-
-bool Options::parseArg(int key, uint64_t arg)
-{
-    switch (key) {
-        case 'r': /* --retries */
-        if (arg < 1 || arg > 1000) {
-            showUsage(1);
-            return false;
-        }
-
-        m_retries = (int) arg;
-        break;
-
-    case 'R': /* --retry-pause */
-        if (arg < 1 || arg > 3600) {
-            showUsage(1);
-            return false;
-        }
-
-        m_retryPause = (int) arg;
-        break;
-
-    case 't': /* --threads */
-        if (arg < 1 || arg > 1024) {
-            showUsage(1);
-            return false;
-        }
-
-        m_threads = (int) arg;
-        break;
-
-    case 'v': /* --av */
-        if (arg > 1000) {
-            showUsage(1);
-            return false;
-        }
-
-        m_algoVariant = (int) arg;
-        break;
-
-    case 1003: /* --donate-level */
-        if (arg < 1 || arg > 99) {
-            return true;
-        }
-
-        m_donateLevel = (int) arg;
-        break;
-
-    case 1004: /* --max-cpu-usage */
-        if (arg < 1 || arg > 100) {
-            showUsage(1);
-            return false;
-        }
-
-        m_maxCpuUsage = (int) arg;
-        break;
-
-    case 1007: /* --print-time */
-        if (arg > 1000) {
-            showUsage(1);
-            return false;
-        }
-
-        m_printTime = (int) arg;
-        break;
-
-    case 1010: /* --variant */
-        m_pools.back()->setVariant((int) arg);
-        break;
-
-    case 1020: /* --cpu-affinity */
-        if (arg) {
-            m_affinity = arg;
-        }
-        break;
-
-    case 1021: /* --cpu-priority */
-        if (arg <= 5) {
-            m_priority = (int) arg;
-        }
-        break;
-
-    case 4000: /* --api-port */
-        if (arg <= 65536) {
-            m_apiPort = (int) arg;
-        }
-        break;
-
-    default:
-        break;
-    }
-
-    return true;
-}
-
-
-bool Options::parseBoolean(int key, bool enable)
-{
-    switch (key) {
-    case 'k': /* --keepalive */
-        m_pools.back()->setKeepAlive(enable);
-        break;
-
-    case 'B': /* --background */
-        m_background = enable;
-        m_colors = enable ? false : m_colors;
-        break;
-
-    case 'S': /* --syslog */
-        m_syslog = enable;
-        m_colors = enable ? false : m_colors;
-        break;
-
-    case 1002: /* --no-color */
-        m_colors = enable;
-        break;
-
-    case 1005: /* --safe */
-        m_safe = enable;
-        break;
-
-    case 1006: /* --nicehash */
-        m_pools.back()->setNicehash(enable);
-        break;
-
-    case 1009: /* --no-huge-pages */
-        m_hugePages = enable;
-        break;
-
-    case 2000: /* colors */
-        m_colors = enable;
-        break;
-
-    case 5000: /* --dry-run */
-        m_dryRun = enable;
-        break;
-
-    default:
-        break;
-    }
-
-    return true;
-}
-
-
-Url *Options::parseUrl(const char *arg) const
-{
-    auto url = new Url(arg);
-    if (!url->isValid()) {
-        delete url;
-        return nullptr;
-    }
-
-    return url;
-}
-
-
-void Options::adjust()
-{
-    for (Url *url : m_pools) {
-        url->adjust(m_algo);
-    }
-}
-
-
-void Options::parseConfig(const char *fileName)
-{
-    rapidjson::Document doc;
-    if (!getJSON(fileName, doc)) {
-        return;
-    }
-
-    for (size_t i = 0; i < ARRAY_SIZE(config_options); i++) {
-        parseJSON(&config_options[i], doc);
-    }
-
-    const rapidjson::Value &pools = doc["pools"];
-    if (pools.IsArray()) {
-        for (const rapidjson::Value &value : pools.GetArray()) {
-            if (!value.IsObject()) {
-                continue;
-            }
-
-            for (size_t i = 0; i < ARRAY_SIZE(pool_options); i++) {
-                parseJSON(&pool_options[i], value);
-            }
-        }
-    }
-
-    const rapidjson::Value &api = doc["api"];
-    if (api.IsObject()) {
-        for (size_t i = 0; i < ARRAY_SIZE(api_options); i++) {
-            parseJSON(&api_options[i], api);
-        }
-    }
-}
-
-
-void Options::parseJSON(const struct option *option, const rapidjson::Value &object)
-{
-    if (!option->name || !object.HasMember(option->name)) {
-        return;
-    }
-
-    const rapidjson::Value &value = object[option->name];
-
-    if (option->has_arg && value.IsString()) {
-        parseArg(option->val, value.GetString());
-    }
-    else if (option->has_arg && value.IsInt64()) {
-        parseArg(option->val, value.GetUint64());
-    }
-    else if (!option->has_arg && value.IsBool()) {
-        parseBoolean(option->val, value.IsTrue());
-    }
-}
-
-
-void Options::showUsage(int status) const
-{
-    if (status) {
-        fprintf(stderr, "Try \"" APP_ID "\" --help' for more information.\n");
-    }
-    else {
-        printf(usage);
-    }
-}
-
-
-void Options::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)
-    " i386"
-#   elif defined(__x86_64__) || defined(_M_AMD64)
-    " x86_64"
-#   endif
-
-#   if defined(__AES__) || defined(_MSC_VER)
-    " AES-NI"
-#   endif
-    "\n");
-
-    printf("\nlibuv/%s\n", uv_version_string());
-
-#   ifndef XMRIG_NO_HTTPD
-    printf("libmicrohttpd/%s\n", MHD_get_version());
-#   endif
-}
-
-
-bool Options::setAlgo(const char *algo)
-{
-    for (size_t i = 0; i < ARRAY_SIZE(algo_names); i++) {
-        if (algo_names[i] && !strcmp(algo, algo_names[i])) {
-            m_algo = (int) i;
-            break;
-        }
-
-#       ifndef XMRIG_NO_AEON
-        if (i == ARRAY_SIZE(algo_names) - 1 && !strcmp(algo, "cryptonight-light")) {
-            m_algo = xmrig::ALGO_CRYPTONIGHT_LITE;
-            break;
-        }
-#       endif
-
-        if (i == ARRAY_SIZE(algo_names) - 1) {
-            showUsage(1);
-            return false;
-        }
-    }
-
-    return true;
-}
-
-
-int Options::getAlgoVariant() const
-{
-#   ifndef XMRIG_NO_AEON
-    if (m_algo == xmrig::ALGO_CRYPTONIGHT_LITE) {
-        return getAlgoVariantLite();
-    }
-#   endif
-
-    if (m_algoVariant <= AV0_AUTO || m_algoVariant >= AV_MAX) {
-        return Cpu::hasAES() ? AV1_AESNI : AV3_SOFT_AES;
-    }
-
-    if (m_safe && !Cpu::hasAES() && m_algoVariant <= AV2_AESNI_DOUBLE) {
-        return m_algoVariant + 2;
-    }
-
-    return m_algoVariant;
-}
-
-
-#ifndef XMRIG_NO_AEON
-int Options::getAlgoVariantLite() const
-{
-    if (m_algoVariant <= AV0_AUTO || m_algoVariant >= AV_MAX) {
-        return Cpu::hasAES() ? AV2_AESNI_DOUBLE : AV4_SOFT_AES_DOUBLE;
-    }
-
-    if (m_safe && !Cpu::hasAES() && m_algoVariant <= AV2_AESNI_DOUBLE) {
-        return m_algoVariant + 2;
-    }
-
-    return m_algoVariant;
-}
-#endif
--- a/src/Options.h
+++ b/src/Options.h
@@ -1,133 +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 __OPTIONS_H__
-#define __OPTIONS_H__
-
-
-#include <stdint.h>
-#include <vector>
-
-
-#include "rapidjson/fwd.h"
-
-
-class Url;
-struct option;
-
-
-class Options
-{
-public:
-    enum AlgoVariant {
-        AV0_AUTO,
-        AV1_AESNI,
-        AV2_AESNI_DOUBLE,
-        AV3_SOFT_AES,
-        AV4_SOFT_AES_DOUBLE,
-        AV_MAX
-    };
-
-    static inline Options* i() { return m_self; }
-    static Options *parse(int argc, char **argv);
-
-    inline bool background() const                { return m_background; }
-    inline bool colors() const                    { return m_colors; }
-    inline bool doubleHash() const                { return m_doubleHash; }
-    inline bool dryRun() const                    { return m_dryRun; }
-    inline bool hugePages() const                 { return m_hugePages; }
-    inline bool syslog() const                    { return m_syslog; }
-    inline const char *apiToken() const           { return m_apiToken; }
-    inline const char *apiWorkerId() const        { return m_apiWorkerId; }
-    inline const char *logFile() const            { return m_logFile; }
-    inline const char *userAgent() const          { return m_userAgent; }
-    inline const std::vector<Url*> &pools() const { return m_pools; }
-    inline int algo() const                       { return m_algo; }
-    inline int algoVariant() const                { return m_algoVariant; }
-    inline int apiPort() const                    { return m_apiPort; }
-    inline int donateLevel() const                { return m_donateLevel; }
-    inline int printTime() const                  { return m_printTime; }
-    inline int priority() const                   { return m_priority; }
-    inline int retries() const                    { return m_retries; }
-    inline int retryPause() const                 { return m_retryPause; }
-    inline int threads() const                    { return m_threads; }
-    inline int64_t affinity() const               { return m_affinity; }
-    inline void setColors(bool colors)            { m_colors = colors; }
-
-    inline static void release()                  { delete m_self; }
-
-    const char *algoName() const;
-
-private:
-    Options(int argc, char **argv);
-    ~Options();
-
-    inline bool isReady() const { return m_ready; }
-
-    static Options *m_self;
-
-    bool getJSON(const char *fileName, rapidjson::Document &doc);
-    bool parseArg(int key, const char *arg);
-    bool parseArg(int key, uint64_t arg);
-    bool parseBoolean(int key, bool enable);
-    Url *parseUrl(const char *arg) const;
-    void adjust();
-    void parseConfig(const char *fileName);
-    void parseJSON(const struct option *option, const rapidjson::Value &object);
-    void showUsage(int status) const;
-    void showVersion(void);
-
-    bool setAlgo(const char *algo);
-
-    int getAlgoVariant() const;
-#   ifndef XMRIG_NO_AEON
-    int getAlgoVariantLite() const;
-#   endif
-
-    bool m_background;
-    bool m_colors;
-    bool m_doubleHash;
-    bool m_dryRun;
-    bool m_hugePages;
-    bool m_ready;
-    bool m_safe;
-    bool m_syslog;
-    char *m_apiToken;
-    char *m_apiWorkerId;
-    char *m_logFile;
-    char *m_userAgent;
-    int m_algo;
-    int m_algoVariant;
-    int m_apiPort;
-    int m_donateLevel;
-    int m_maxCpuUsage;
-    int m_printTime;
-    int m_priority;
-    int m_retries;
-    int m_retryPause;
-    int m_threads;
-    int64_t m_affinity;
-    std::vector<Url*> m_pools;
-};
-
-#endif /* __OPTIONS_H__ */
--- a/src/Summary.cpp
+++ b/src/Summary.cpp
@@ -4,8 +4,8 @@
 * 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 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
@@ -27,16 +27,17 @@
 #include <uv.h>


+#include "core/Config.h"
+#include "core/Controller.h"
 #include "Cpu.h"
 #include "log/Log.h"
 #include "Mem.h"
-#include "net/Url.h"
-#include "Options.h"
+#include "net/Pool.h"
 #include "Summary.h"
 #include "version.h"


-static void print_versions()
+static void print_versions(xmrig::Config *config)
 {
    char buf[16];

@@ -51,26 +52,27 @@ static void print_versions()
 #   endif


-    Log::i()->text(Options::i()->colors() ? "\x1B[01;32m * \x1B[01;37mVERSIONS:     \x1B[01;36mXMRig/%s\x1B[01;37m libuv/%s%s" : " * VERSIONS:     XMRig/%s libuv/%s%s",
+    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() {
-    if (Options::i()->colors()) {
-        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");
+static void print_memory(xmrig::Config *config) {
+#   ifdef _WIN32
+    if (config->isColors()) {
+        Log::i()->text("\x1B[01;32m * \x1B[01;37mHUGE PAGES:   %s",
+                       Mem::isHugepagesAvailable() ? "\x1B[01;32mavailable" : "\x1B[01;31munavailable");
    }
    else {
-        Log::i()->text(" * HUGE PAGES:   %s, %s", Mem::isHugepagesAvailable() ? "available" : "unavailable", Mem::isHugepagesEnabled() ? "enabled" : "disabled");
+        Log::i()->text(" * HUGE PAGES:   %s", Mem::isHugepagesAvailable() ? "available" : "unavailable");
    }
+#   endif
 }


-static void print_cpu()
+static void print_cpu(xmrig::Config *config)
 {
-    if (Options::i()->colors()) {
+    if (config->isColors()) {
        Log::i()->text("\x1B[01;32m * \x1B[01;37mCPU:          %s (%d) %sx64 %sAES-NI",
                       Cpu::brand(),
                       Cpu::sockets(),
@@ -89,60 +91,71 @@ static void print_cpu()
 }


-static void print_threads()
+static void print_threads(xmrig::Config *config)
 {
-    char buf[32];
-    if (Options::i()->affinity() != -1L) {
-        snprintf(buf, 32, ", affinity=0x%" PRIX64, Options::i()->affinity());
+    if (config->threadsMode() != xmrig::Config::Advanced) {
+        char buf[32];
+        if (config->affinity() != -1L) {
+            snprintf(buf, 32, ", affinity=0x%" PRIX64, config->affinity());
+        }
+        else {
+            buf[0] = '\0';
+        }
+
+        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",
+                       config->threadsCount(),
+                       config->algoName(),
+                       config->algoVariant(),
+                       config->isColors() && config->donateLevel() == 0 ? "\x1B[01;31m" : "",
+                       config->donateLevel(),
+                       buf);
    }
    else {
-        buf[0] = '\0';
+        Log::i()->text(config->isColors() ? "\x1B[01;32m * \x1B[01;37mTHREADS:      \x1B[01;36m%d\x1B[01;37m, %s, %sdonate=%d%%" : " * THREADS:      %d, %s, %sdonate=%d%%",
+                       config->threadsCount(),
+                       config->algoName(),
+                       config->isColors() && config->donateLevel() == 0 ? "\x1B[01;31m" : "",
+                       config->donateLevel());
    }
-
-    Log::i()->text(Options::i()->colors() ? "\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",
-                   Options::i()->threads(),
-                   Options::i()->algoName(),
-                   Options::i()->algoVariant(),
-                   Options::i()->colors() && Options::i()->donateLevel() == 0 ? "\x1B[01;31m" : "",
-                   Options::i()->donateLevel(),
-                   buf);
 }


-static void print_pools()
+static void print_pools(xmrig::Config *config)
 {
-    const std::vector<Url*> &pools = Options::i()->pools();
+    const std::vector<Pool> &pools = config->pools();

    for (size_t i = 0; i < pools.size(); ++i) {
-        Log::i()->text(Options::i()->colors() ? "\x1B[01;32m * \x1B[01;37mPOOL #%d:      \x1B[01;36m%s:%d" : " * POOL #%d:      %s:%d",
+        Log::i()->text(config->isColors() ? "\x1B[01;32m * \x1B[01;37mPOOL #%d:      \x1B[01;36m%s" : " * POOL #%d:      %s",
                       i + 1,
-                       pools[i]->host(),
-                       pools[i]->port());
+                       pools[i].url()
+                       );
    }

 #   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]->isKeepAlive(), pools[i]->isNicehash());
+        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());
    }
 #   endif
 }


 #ifndef XMRIG_NO_API
-static void print_api()
+static void print_api(xmrig::Config *config)
 {
-    if (Options::i()->apiPort() == 0) {
+    const int port = config->apiPort();
+    if (port == 0) {
        return;
    }

-    Log::i()->text(Options::i()->colors() ? "\x1B[01;32m * \x1B[01;37mAPI PORT:     \x1B[01;36m%d" : " * API PORT:     %d", Options::i()->apiPort());
+    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()
+static void print_commands(xmrig::Config *config)
 {
-    if (Options::i()->colors()) {
+    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");
    }
    else {
@@ -151,19 +164,19 @@ static void print_commands()
 }


-void Summary::print()
+void Summary::print(xmrig::Controller *controller)
 {
-    print_versions();
-    print_memory();
-    print_cpu();
-    print_threads();
-    print_pools();
+    print_versions(controller->config());
+    print_memory(controller->config());
+    print_cpu(controller->config());
+    print_threads(controller->config());
+    print_pools(controller->config());

 #   ifndef XMRIG_NO_API
-    print_api();
+    print_api(controller->config());
 #   endif

-    print_commands();
+    print_commands(controller->config());
 }


--- a/src/Summary.h
+++ b/src/Summary.h
@@ -4,8 +4,8 @@
 * 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 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
@@ -25,10 +25,15 @@
 #define __SUMMARY_H__


+namespace xmrig {
+    class Controller;
+}
+
+
 class Summary
 {
 public:
-    static void print();
+    static void print(xmrig::Controller *controller);
 };


--- a/src/api/Api.cpp
+++ b/src/api/Api.cpp
@@ -4,8 +4,8 @@
 * 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 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
@@ -25,17 +25,17 @@


 #include "api/Api.h"
-#include "api/ApiState.h"
+#include "api/ApiRouter.h"
+#include "common/api/HttpReply.h"
+#include "common/api/HttpRequest.h"


-ApiState *Api::m_state = nullptr;
-uv_mutex_t Api::m_mutex;
+ApiRouter *Api::m_router = nullptr;


-bool Api::start()
+bool Api::start(xmrig::Controller *controller)
 {
-    uv_mutex_init(&m_mutex);
-    m_state = new ApiState();
+    m_router = new ApiRouter(controller);

    return true;
 }
@@ -43,43 +43,30 @@ bool Api::start()

 void Api::release()
 {
-    delete m_state;
+    delete m_router;
 }


-char *Api::get(const char *url, int *status)
+void Api::exec(const xmrig::HttpRequest &req, xmrig::HttpReply &reply)
 {
-    if (!m_state) {
-        return nullptr;
-    }
-
-    uv_mutex_lock(&m_mutex);
-    char *buf = m_state->get(url, status);
-    uv_mutex_unlock(&m_mutex);
-
-    return buf;
-}
-
-
-void Api::tick(const Hashrate *hashrate)
-{
-    if (!m_state) {
+    if (!m_router) {
+        reply.status = 500;
        return;
    }

-    uv_mutex_lock(&m_mutex);
-    m_state->tick(hashrate);
-    uv_mutex_unlock(&m_mutex);
+    if (req.method() == xmrig::HttpRequest::Get) {
+        return m_router->get(req, reply);
+    }
+
+    m_router->exec(req, reply);
 }


 void Api::tick(const NetworkState &network)
 {
-    if (!m_state) {
+    if (!m_router) {
        return;
    }

-    uv_mutex_lock(&m_mutex);
-    m_state->tick(network);
-    uv_mutex_unlock(&m_mutex);
+    m_router->tick(network);
 }
--- a/src/api/Api.h
+++ b/src/api/Api.h
@@ -4,8 +4,8 @@
 * 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 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
@@ -28,24 +28,29 @@
 #include <uv.h>


-class ApiState;
+class ApiRouter;
 class Hashrate;
 class NetworkState;


+namespace xmrig {
+    class Controller;
+    class HttpReply;
+    class HttpRequest;
+}
+
+
 class Api
 {
 public:
-    static bool start();
+    static bool start(xmrig::Controller *controller);
    static void release();

-    static char *get(const char *url, int *status);
-    static void tick(const Hashrate *hashrate);
+    static void exec(const xmrig::HttpRequest &req, xmrig::HttpReply &reply);
    static void tick(const NetworkState &results);

 private:
-    static ApiState *m_state;
-    static uv_mutex_t m_mutex;
+    static ApiRouter *m_router;
 };

 #endif /* __API_H__ */
--- a/src/api/ApiRouter.cpp
+++ b/src/api/ApiRouter.cpp
@@ -4,8 +4,8 @@
 * 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 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
@@ -32,17 +32,22 @@
 #endif


-#include "api/ApiState.h"
+#include "api/ApiRouter.h"
+#include "common/api/HttpReply.h"
+#include "common/api/HttpRequest.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 "Options.h"
-#include "Platform.h"
 #include "rapidjson/document.h"
-#include "rapidjson/stringbuffer.h"
 #include "rapidjson/prettywriter.h"
+#include "rapidjson/stringbuffer.h"
 #include "version.h"
 #include "workers/Hashrate.h"
+#include "workers/Workers.h"


 extern "C"
@@ -61,34 +66,42 @@ static inline double normalize(double d)
 }


-ApiState::ApiState()
+ApiRouter::ApiRouter(xmrig::Controller *controller) :
+    m_controller(controller)
 {
-    m_threads  = Options::i()->threads();
-    m_hashrate = new double[m_threads * 3]();
-
-    memset(m_totalHashrate, 0, sizeof(m_totalHashrate));
    memset(m_workerId, 0, sizeof(m_workerId));

-    if (Options::i()->apiWorkerId()) {
-        strncpy(m_workerId, Options::i()->apiWorkerId(), sizeof(m_workerId) - 1);
-    }
-    else {
-        gethostname(m_workerId, sizeof(m_workerId) - 1);
-    }
-
+    setWorkerId(controller->config()->apiWorkerId());
    genId();
 }


-ApiState::~ApiState()
+ApiRouter::~ApiRouter()
 {
-    delete [] m_hashrate;
 }


-char *ApiState::get(const char *url, int *status) const
+void ApiRouter::ApiRouter::get(const xmrig::HttpRequest &req, xmrig::HttpReply &reply) const
 {
    rapidjson::Document doc;
+
+    if (req.match("/1/config")) {
+        if (req.isRestricted()) {
+            reply.status = 403;
+            return;
+        }
+
+        m_controller->config()->getJSON(doc);
+
+        return finalize(reply, doc);
+    }
+
+    if (req.match("/1/threads")) {
+        getThreads(doc);
+
+        return finalize(reply, doc);
+    }
+
    doc.SetObject();

    getIdentify(doc);
@@ -97,43 +110,47 @@ char *ApiState::get(const char *url, int *status) const
    getResults(doc);
    getConnection(doc);

-    return finalize(doc);
+    return finalize(reply, doc);
 }


-void ApiState::tick(const Hashrate *hashrate)
+void ApiRouter::exec(const xmrig::HttpRequest &req, xmrig::HttpReply &reply)
 {
-    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);
+    if (req.method() == xmrig::HttpRequest::Put && req.match("/1/config")) {
+        m_controller->config()->reload(req.body());
+        return;
    }

-    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();
+    reply.status = 404;
 }


-void ApiState::tick(const NetworkState &network)
+void ApiRouter::tick(const NetworkState &network)
 {
    m_network = network;
 }


-char *ApiState::finalize(rapidjson::Document &doc) const
+void ApiRouter::onConfigChanged(xmrig::Config *config, xmrig::Config *previousConfig)
+{
+    updateWorkerId(config->apiWorkerId(), previousConfig->apiWorkerId());
+}
+
+
+void ApiRouter::finalize(xmrig::HttpReply &reply, rapidjson::Document &doc) const
 {
    rapidjson::StringBuffer buffer(0, 4096);
    rapidjson::PrettyWriter<rapidjson::StringBuffer> writer(buffer);
    writer.SetMaxDecimalPlaces(10);
    doc.Accept(writer);

-    return strdup(buffer.GetString());
+    reply.status = 200;
+    reply.buf    = strdup(buffer.GetString());
+    reply.size   = buffer.GetSize();
 }


-void ApiState::genId()
+void ApiRouter::genId()
 {
    memset(m_id, 0, sizeof(m_id));

@@ -166,7 +183,7 @@ void ApiState::genId()
 }


-void ApiState::getConnection(rapidjson::Document &doc) const
+void ApiRouter::getConnection(rapidjson::Document &doc) const
 {
    auto &allocator = doc.GetAllocator();

@@ -181,7 +198,7 @@ void ApiState::getConnection(rapidjson::Document &doc) const
 }


-void ApiState::getHashrate(rapidjson::Document &doc) const
+void ApiRouter::getHashrate(rapidjson::Document &doc) const
 {
    auto &allocator = doc.GetAllocator();

@@ -189,34 +206,36 @@ void ApiState::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("total",   total, allocator);
+    hashrate.AddMember("highest", normalize(hr->highest()), allocator);
    hashrate.AddMember("threads", threads, allocator);
    doc.AddMember("hashrate", hashrate, allocator);
 }


-void ApiState::getIdentify(rapidjson::Document &doc) const
+void ApiRouter::getIdentify(rapidjson::Document &doc) const
 {
    doc.AddMember("id",        rapidjson::StringRef(m_id),       doc.GetAllocator());
    doc.AddMember("worker_id", rapidjson::StringRef(m_workerId), doc.GetAllocator());
 }


-void ApiState::getMiner(rapidjson::Document &doc) const
+void ApiRouter::getMiner(rapidjson::Document &doc) const
 {
    auto &allocator = doc.GetAllocator();

@@ -230,13 +249,13 @@ void ApiState::getMiner(rapidjson::Document &doc) const
    doc.AddMember("kind",         APP_KIND, allocator);
    doc.AddMember("ua",           rapidjson::StringRef(Platform::userAgent()), allocator);
    doc.AddMember("cpu",          cpu, allocator);
-    doc.AddMember("algo",         rapidjson::StringRef(Options::i()->algoName()), allocator);
-    doc.AddMember("hugepages",    Mem::isHugepagesEnabled(), allocator);
-    doc.AddMember("donate_level", Options::i()->donateLevel(), allocator);
+    doc.AddMember("algo",         rapidjson::StringRef(m_controller->config()->algoName()), allocator);
+    doc.AddMember("hugepages",    Workers::hugePages() > 0, allocator);
+    doc.AddMember("donate_level", m_controller->config()->donateLevel(), allocator);
 }


-void ApiState::getResults(rapidjson::Document &doc) const
+void ApiRouter::getResults(rapidjson::Document &doc) const
 {
    auto &allocator = doc.GetAllocator();

@@ -258,3 +277,57 @@ void ApiState::getResults(rapidjson::Document &doc) const

    doc.AddMember("results", results, allocator);
 }
+
+
+void ApiRouter::getThreads(rapidjson::Document &doc) const
+{
+    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);
+
+    for (const xmrig::IThread *thread : threads) {
+        rapidjson::Value value = thread->toAPI(doc);
+
+        rapidjson::Value hashrate(rapidjson::kArrayType);
+        hashrate.PushBack(normalize(hr->calc(thread->index(), Hashrate::ShortInterval)),  allocator);
+        hashrate.PushBack(normalize(hr->calc(thread->index(), Hashrate::MediumInterval)), allocator);
+        hashrate.PushBack(normalize(hr->calc(thread->index(), Hashrate::LargeInterval)),  allocator);
+
+        value.AddMember("hashrate", hashrate, allocator);
+        list.PushBack(value, allocator);
+    }
+
+    doc.AddMember("threads", list, allocator);
+}
+
+
+void ApiRouter::setWorkerId(const char *id)
+{
+    memset(m_workerId, 0, sizeof(m_workerId));
+
+    if (id && strlen(id) > 0) {
+        strncpy(m_workerId, id, sizeof(m_workerId) - 1);
+    }
+    else {
+        gethostname(m_workerId, sizeof(m_workerId) - 1);
+    }
+}
+
+
+void ApiRouter::updateWorkerId(const char *id, const char *previousId)
+{
+    if (id == previousId) {
+        return;
+    }
+
+    if (id != nullptr && previousId != nullptr && strcmp(id, previousId) == 0) {
+        return;
+    }
+
+    setWorkerId(id);
+}
--- a/src/api/ApiRouter.h
+++ b/src/api/ApiRouter.h
@@ -4,8 +4,8 @@
 * 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 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
@@ -21,43 +21,55 @@
 *   along with this program. If not, see <http://www.gnu.org/licenses/>.
 */

-#ifndef __APISTATE_H__
-#define __APISTATE_H__
+#ifndef __APIROUTER_H__
+#define __APIROUTER_H__


 #include "api/NetworkState.h"
+#include "interfaces/IControllerListener.h"
 #include "rapidjson/fwd.h"


 class Hashrate;


-class ApiState
+namespace xmrig {
+    class Controller;
+    class HttpReply;
+    class HttpRequest;
+}
+
+
+class ApiRouter : public xmrig::IControllerListener
 {
 public:
-    ApiState();
-    ~ApiState();
+    ApiRouter(xmrig::Controller *controller);
+    ~ApiRouter();
+
+    void get(const xmrig::HttpRequest &req, xmrig::HttpReply &reply) const;
+    void exec(const xmrig::HttpRequest &req, xmrig::HttpReply &reply);

-    char *get(const char *url, int *status) const;
-    void tick(const Hashrate *hashrate);
    void tick(const NetworkState &results);

+protected:
+    void onConfigChanged(xmrig::Config *config, xmrig::Config *previousConfig) override;
+
 private:
-    char *finalize(rapidjson::Document &doc) const;
+    void finalize(xmrig::HttpReply &reply, rapidjson::Document &doc) const;
    void genId();
    void getConnection(rapidjson::Document &doc) const;
    void getHashrate(rapidjson::Document &doc) const;
    void getIdentify(rapidjson::Document &doc) const;
    void getMiner(rapidjson::Document &doc) const;
    void getResults(rapidjson::Document &doc) const;
+    void getThreads(rapidjson::Document &doc) const;
+    void setWorkerId(const char *id);
+    void updateWorkerId(const char *id, const char *previousId);

    char m_id[17];
    char m_workerId[128];
-    double *m_hashrate;
-    double m_highestHashrate;
-    double m_totalHashrate[3];
-    int m_threads;
    NetworkState m_network;
+    xmrig::Controller *m_controller;
 };

-#endif /* __APISTATE_H__ */
+#endif /* __APIROUTER_H__ */
--- a/src/api/Httpd.cpp
+++ b/src/api/Httpd.cpp
@@ -1,128 +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 <microhttpd.h>
-#include <string.h>
-
-
-#include "api/Api.h"
-#include "api/Httpd.h"
-#include "log/Log.h"
-
-
-Httpd::Httpd(int port, const char *accessToken) :
-    m_accessToken(accessToken),
-    m_port(port),
-    m_daemon(nullptr)
-{
-}
-
-
-bool Httpd::start()
-{
-    if (!m_port) {
-        return false;
-    }
-
-    unsigned int flags = MHD_USE_SELECT_INTERNALLY;
-
-#   if MHD_VERSION >= 0x00093500
-    if (MHD_is_feature_supported(MHD_FEATURE_EPOLL)) {
-        flags = MHD_USE_EPOLL_LINUX_ONLY | MHD_USE_EPOLL_INTERNALLY_LINUX_ONLY;
-    }
-
-    if (MHD_is_feature_supported(MHD_FEATURE_IPv6)) {
-        flags |= MHD_USE_DUAL_STACK;
-    }
-#   endif
-
-    m_daemon = MHD_start_daemon(flags, m_port, nullptr, nullptr, &Httpd::handler, this, MHD_OPTION_END);
-    if (!m_daemon) {
-        LOG_ERR("HTTP Daemon failed to start.");
-        return false;
-    }
-
-    return true;
-}
-
-
-int Httpd::auth(const char *header)
-{
-    if (!m_accessToken) {
-        return MHD_HTTP_OK;
-    }
-
-    if (m_accessToken && !header) {
-        return MHD_HTTP_UNAUTHORIZED;
-    }
-
-    const size_t size = strlen(header);
-    if (size < 8 || strlen(m_accessToken) != size - 7 || memcmp("Bearer ", header, 7) != 0) {
-        return MHD_HTTP_FORBIDDEN;
-    }
-
-    return strncmp(m_accessToken, header + 7, strlen(m_accessToken)) == 0 ? MHD_HTTP_OK : MHD_HTTP_FORBIDDEN;
-}
-
-
-int Httpd::done(MHD_Connection *connection, int status, MHD_Response *rsp)
-{
-    if (!rsp) {
-        rsp = MHD_create_response_from_buffer(0, nullptr, MHD_RESPMEM_PERSISTENT);
-    }
-
-    MHD_add_response_header(rsp, "Content-Type", "application/json");
-    MHD_add_response_header(rsp, "Access-Control-Allow-Origin", "*");
-    MHD_add_response_header(rsp, "Access-Control-Allow-Methods", "GET");
-    MHD_add_response_header(rsp, "Access-Control-Allow-Headers", "Authorization");
-
-    const int ret = MHD_queue_response(connection, status, rsp);
-    MHD_destroy_response(rsp);
-    return ret;
-}
-
-
-int Httpd::handler(void *cls, struct MHD_Connection *connection, const char *url, const char *method, const char *version, const char *upload_data, size_t *upload_data_size, void **con_cls)
-{
-    if (strcmp(method, "OPTIONS") == 0) {
-        return done(connection, MHD_HTTP_OK, nullptr);
-    }
-
-    if (strcmp(method, "GET") != 0) {
-        return MHD_NO;
-    }
-
-    int status = static_cast<Httpd*>(cls)->auth(MHD_lookup_connection_value(connection, MHD_HEADER_KIND, "Authorization"));
-    if (status != MHD_HTTP_OK) {
-        return done(connection, status, nullptr);
-    }
-
-    char *buf = Api::get(url, &status);
-    if (buf == nullptr) {
-        return MHD_NO;
-    }
-
-    MHD_Response *rsp = MHD_create_response_from_buffer(strlen(buf), (void*) buf, MHD_RESPMEM_MUST_FREE);
-    return done(connection, status, rsp);
-}
--- a/src/common/Platform.cpp
+++ b/src/common/Platform.cpp
@@ -29,16 +29,16 @@
 #include "Platform.h"


-char *Platform::m_defaultConfigName = nullptr;
-char *Platform::m_userAgent         = nullptr;
+char Platform::m_defaultConfigName[520] = { 0 };
+xmrig::c_str Platform::m_userAgent;


 const char *Platform::defaultConfigName()
 {
    size_t size = 520;

-    if (m_defaultConfigName == nullptr) {
-        m_defaultConfigName = new char[size];
+    if (*m_defaultConfigName) {
+        return m_defaultConfigName;
    }

    if (uv_exepath(m_defaultConfigName, &size) < 0) {
@@ -58,5 +58,6 @@ const char *Platform::defaultConfigName()
        }
    }

+    *m_defaultConfigName = '\0';
    return nullptr;
 }
--- a/src/common/Platform.h
+++ b/src/common/Platform.h
@@ -25,20 +25,26 @@
 #define __PLATFORM_H__


+#include <stdint.h>
+
+
+#include "common/utils/c_str.h"
+
+
 class Platform
 {
 public:
+    static bool setThreadAffinity(uint64_t cpu_id);
    static const char *defaultConfigName();
    static void init(const char *userAgent);
-    static void release();
    static void setProcessPriority(int priority);
    static void setThreadPriority(int priority);

-    static inline const char *userAgent() { return m_userAgent; }
+    static inline const char *userAgent() { return m_userAgent.data(); }

 private:
-    static char *m_defaultConfigName;
-    static char *m_userAgent;
+    static char m_defaultConfigName[520];
+    static xmrig::c_str m_userAgent;
 };


--- a/src/common/Platform_mac.cpp
+++ b/src/common/Platform_mac.cpp
@@ -22,6 +22,8 @@
 */


+#include <mach/thread_act.h>
+#include <mach/thread_policy.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <sys/resource.h>
@@ -53,15 +55,24 @@ static inline char *createUserAgent()
 }


-void Platform::init(const char *userAgent)
+bool Platform::setThreadAffinity(uint64_t cpu_id)
 {
-    m_userAgent = userAgent ? strdup(userAgent) : createUserAgent();
+    thread_port_t mach_thread;
+    thread_affinity_policy_data_t policy = { static_cast<integer_t>(cpu_id) };
+    mach_thread = pthread_mach_thread_np(pthread_self());
+
+    return thread_policy_set(mach_thread, THREAD_AFFINITY_POLICY, (thread_policy_t)&policy, 1) == KERN_SUCCESS;
 }


-void Platform::release()
+void Platform::init(const char *userAgent)
 {
-    delete [] m_userAgent;
+    if (userAgent) {
+        m_userAgent = userAgent;
+    }
+    else {
+        m_userAgent = createUserAgent();
+    }
 }


--- a/src/common/Platform_unix.cpp
+++ b/src/common/Platform_unix.cpp
@@ -21,6 +21,14 @@
 *   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 <sched.h>
 #include <stdio.h>
 #include <stdlib.h>
@@ -37,6 +45,11 @@
 #endif


+#ifdef __FreeBSD__
+typedef cpuset_t cpu_set_t;
+#endif
+
+
 static inline char *createUserAgent()
 {
    const size_t max = 160;
@@ -63,15 +76,28 @@ static inline char *createUserAgent()
 }


-void Platform::init(const char *userAgent)
+bool Platform::setThreadAffinity(uint64_t cpu_id)
 {
-    m_userAgent = userAgent ? strdup(userAgent) : createUserAgent();
+    cpu_set_t mn;
+    CPU_ZERO(&mn);
+    CPU_SET(cpu_id, &mn);
+
+#   ifndef __ANDROID__
+    return pthread_setaffinity_np(pthread_self(), sizeof(cpu_set_t), &mn) == 0;
+#   else
+    return sched_setaffinity(gettid(), sizeof(cpu_set_t), &mn) == 0;
+#   endif
 }


-void Platform::release()
+void Platform::init(const char *userAgent)
 {
-    delete [] m_userAgent;
+    if (userAgent) {
+        m_userAgent = userAgent;
+    }
+    else {
+        m_userAgent = createUserAgent();
+    }
 }


--- a/src/common/Platform_win.cpp
+++ b/src/common/Platform_win.cpp
@@ -27,9 +27,11 @@
 #include <uv.h>


+#include "log/Log.h"
 #include "Platform.h"
 #include "version.h"

+
 #ifdef XMRIG_NVIDIA_PROJECT
 #   include "nvidia/cryptonight.h"
 #endif
@@ -82,16 +84,24 @@ static inline char *createUserAgent()
 }


-void Platform::init(const char *userAgent)
+bool Platform::setThreadAffinity(uint64_t cpu_id)
 {
-    m_userAgent = userAgent ? strdup(userAgent) : createUserAgent();
+    if (cpu_id >= 64) {
+        LOG_ERR("Unable to set affinity. Windows supports only affinity up to 63.");
+    }
+
+    return SetThreadAffinityMask(GetCurrentThread(), 1ULL << cpu_id) != 0;
 }


-void Platform::release()
+void Platform::init(const char *userAgent)
 {
-    delete [] m_defaultConfigName;
-    delete [] m_userAgent;
+    if (userAgent) {
+        m_userAgent = userAgent;
+    }
+    else {
+        m_userAgent = createUserAgent();
+    }
 }


@@ -131,7 +141,6 @@ void Platform::setProcessPriority(int priority)
 }


-
 void Platform::setThreadPriority(int priority)
 {
    if (priority == -1) {
--- a/src/common/api/HttpBody.h
+++ b/src/common/api/HttpBody.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 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 __HTTPBODY_H__
+#define __HTTPBODY_H__
+
+
+#include <string.h>
+
+
+namespace xmrig {
+
+
+class HttpBody
+{
+public:
+    inline HttpBody() :
+        m_pos(0)
+    {}
+
+
+    inline bool write(const char *data, size_t size)
+    {
+        if (size > (sizeof(m_data) - m_pos - 1)) {
+            return false;
+        }
+
+        memcpy(m_data + m_pos, data, size);
+
+        m_pos += size;
+        m_data[m_pos] = '\0';
+
+        return true;
+    }
+
+
+    inline const char *data() const { return m_data; }
+
+private:
+    char m_data[32768];
+    size_t m_pos;
+};
+
+
+} /* namespace xmrig */
+
+
+#endif /* __HTTPBODY_H__ */
--- a/src/common/api/HttpReply.h
+++ b/src/common/api/HttpReply.h
@@ -7,6 +7,7 @@
 * 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
@@ -21,27 +22,32 @@
 *   along with this program. If not, see <http://www.gnu.org/licenses/>.
 */

-#ifndef __XMRIG_H__
-#define __XMRIG_H__
+#ifndef __HTTPREPLY_H__
+#define __HTTPREPLY_H__


-namespace xmrig
+#include <stdint.h>
+
+
+namespace xmrig {
+
+
+class HttpReply
 {
+public:
+    HttpReply() :
+        buf(nullptr),
+        status(200),
+        size(0)
+    {}

-
-enum Algo {
-    ALGO_CRYPTONIGHT,      /* CryptoNight (Monero) */
-    ALGO_CRYPTONIGHT_LITE, /* CryptoNight-Lite (AEON) */
+    char *buf;
+    int status;
+    size_t size;
 };


-enum Variant {
-    VARIANT_AUTO = -1,
-    VARIANT_NONE = 0,
-    VARIANT_V1   = 1
-};
-
-} /* xmrig */
+} /* namespace xmrig */


-#endif /* __XMRIG_H__ */
+#endif /* __HTTPREPLY_H__ */
--- a/src/common/api/HttpRequest.cpp
+++ b/src/common/api/HttpRequest.cpp
@@ -0,0 +1,175 @@
+/* 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 <microhttpd.h>
+#include <string.h>
+
+#include "common/api/HttpBody.h"
+#include "common/api/HttpRequest.h"
+#include "common/api/HttpReply.h"
+
+
+#ifndef MHD_HTTP_PAYLOAD_TOO_LARGE
+#   define MHD_HTTP_PAYLOAD_TOO_LARGE 413
+#endif
+
+
+xmrig::HttpRequest::HttpRequest(MHD_Connection *connection, const char *url, const char *method, const char *uploadData, size_t *uploadSize, void **cls) :
+    m_fulfilled(true),
+    m_restricted(true),
+    m_uploadData(uploadData),
+    m_url(url),
+    m_body(static_cast<HttpBody*>(*cls)),
+    m_method(Unsupported),
+    m_connection(connection),
+    m_uploadSize(uploadSize),
+    m_cls(cls)
+{
+    if (strcmp(method, MHD_HTTP_METHOD_OPTIONS) == 0) {
+        m_method = Options;
+    }
+    else if (strcmp(method, MHD_HTTP_METHOD_GET) == 0) {
+        m_method = Get;
+    }
+    else if (strcmp(method, MHD_HTTP_METHOD_PUT) == 0) {
+        m_method = Put;
+    }
+}
+
+
+xmrig::HttpRequest::~HttpRequest()
+{
+    if (m_fulfilled) {
+        delete m_body;
+    }
+}
+
+
+bool xmrig::HttpRequest::match(const char *path) const
+{
+    return strcmp(m_url, path) == 0;
+}
+
+
+bool xmrig::HttpRequest::process(const char *accessToken, bool restricted, xmrig::HttpReply &reply)
+{
+    m_restricted = restricted || !accessToken;
+
+    if (m_body) {
+        if (*m_uploadSize != 0) {
+            if (!m_body->write(m_uploadData, *m_uploadSize)) {
+                *m_cls       = nullptr;
+                m_fulfilled  = true;
+                reply.status = MHD_HTTP_PAYLOAD_TOO_LARGE;
+                return false;
+            }
+
+            *m_uploadSize = 0;
+            m_fulfilled   = false;
+            return true;
+        }
+
+        m_fulfilled = true;
+        return true;
+    }
+
+    reply.status = auth(accessToken);
+    if (reply.status != MHD_HTTP_OK) {
+        return false;
+    }
+
+    if (m_restricted && m_method != Get) {
+        reply.status = MHD_HTTP_FORBIDDEN;
+        return false;
+    }
+
+    if (m_method == Get) {
+        return true;
+    }
+
+    const char *contentType = MHD_lookup_connection_value(m_connection, MHD_HEADER_KIND, "Content-Type");
+    if (!contentType || strcmp(contentType, "application/json") != 0) {
+        reply.status = MHD_HTTP_UNSUPPORTED_MEDIA_TYPE;
+        return false;
+    }
+
+    m_body      = new xmrig::HttpBody();
+    m_fulfilled = false;
+    *m_cls      = m_body;
+
+    return true;
+}
+
+
+const char *xmrig::HttpRequest::body() const
+{
+    return m_body ? m_body->data() : nullptr;
+}
+
+
+int xmrig::HttpRequest::end(const HttpReply &reply)
+{
+    if (reply.buf) {
+        return end(reply.status, MHD_create_response_from_buffer(reply.size ? reply.size : strlen(reply.buf), (void*) reply.buf, MHD_RESPMEM_MUST_FREE));
+    }
+
+    return end(reply.status, nullptr);
+}
+
+
+int xmrig::HttpRequest::end(int status, MHD_Response *rsp)
+{
+    if (!rsp) {
+        rsp = MHD_create_response_from_buffer(0, nullptr, MHD_RESPMEM_PERSISTENT);
+    }
+
+    MHD_add_response_header(rsp, "Content-Type", "application/json");
+    MHD_add_response_header(rsp, "Access-Control-Allow-Origin", "*");
+    MHD_add_response_header(rsp, "Access-Control-Allow-Methods", "GET, PUT");
+    MHD_add_response_header(rsp, "Access-Control-Allow-Headers", "Authorization");
+
+    const int ret = MHD_queue_response(m_connection, status, rsp);
+    MHD_destroy_response(rsp);
+    return ret;
+}
+
+
+int xmrig::HttpRequest::auth(const char *accessToken)
+{
+    if (!accessToken) {
+        return MHD_HTTP_OK;
+    }
+
+    const char *header = MHD_lookup_connection_value(m_connection, MHD_HEADER_KIND, "Authorization");
+    if (accessToken && !header) {
+        return MHD_HTTP_UNAUTHORIZED;
+    }
+
+    const size_t size = strlen(header);
+    if (size < 8 || strlen(accessToken) != size - 7 || memcmp("Bearer ", header, 7) != 0) {
+        return MHD_HTTP_FORBIDDEN;
+    }
+
+    return strncmp(accessToken, header + 7, strlen(accessToken)) == 0 ? MHD_HTTP_OK : MHD_HTTP_FORBIDDEN;
+}
--- a/src/common/api/HttpRequest.h
+++ b/src/common/api/HttpRequest.h
@@ -0,0 +1,84 @@
+/* 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 __HTTPREQUEST_H__
+#define __HTTPREQUEST_H__
+
+
+#include <stdint.h>
+
+
+struct MHD_Connection;
+struct MHD_Response;
+
+
+namespace xmrig {
+
+
+class HttpBody;
+class HttpReply;
+
+
+class HttpRequest
+{
+public:
+    enum Method {
+        Unsupported,
+        Options,
+        Get,
+        Put
+    };
+
+    HttpRequest(MHD_Connection *connection, const char *url, const char *method, const char *uploadData, size_t *uploadSize, void **cls);
+    ~HttpRequest();
+
+    inline bool isFulfilled() const  { return m_fulfilled; }
+    inline bool isRestricted() const { return m_restricted; }
+    inline Method method() const     { return m_method; }
+
+    bool match(const char *path) const;
+    bool process(const char *accessToken, bool restricted, xmrig::HttpReply &reply);
+    const char *body() const;
+    int end(const HttpReply &reply);
+    int end(int status, MHD_Response *rsp);
+
+private:
+    int auth(const char *accessToken);
+
+    bool m_fulfilled;
+    bool m_restricted;
+    const char *m_uploadData;
+    const char *m_url;
+    HttpBody *m_body;
+    Method m_method;
+    MHD_Connection *m_connection;
+    size_t *m_uploadSize;
+    void **m_cls;
+};
+
+
+} /* namespace xmrig */
+
+
+#endif /* __HTTPREQUEST_H__ */
--- a/src/common/api/Httpd.cpp
+++ b/src/common/api/Httpd.cpp
@@ -0,0 +1,141 @@
+/* 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 <microhttpd.h>
+#include <string.h>
+
+
+#include "api/Api.h"
+#include "common/api/Httpd.h"
+#include "common/api/HttpReply.h"
+#include "common/api/HttpRequest.h"
+#include "log/Log.h"
+
+
+Httpd::Httpd(int port, const char *accessToken, bool IPv6, bool restricted) :
+    m_idle(true),
+    m_IPv6(IPv6),
+    m_restricted(restricted),
+    m_accessToken(accessToken ? strdup(accessToken) : nullptr),
+    m_port(port),
+    m_daemon(nullptr)
+{
+    uv_timer_init(uv_default_loop(), &m_timer);
+    m_timer.data = this;
+}
+
+
+Httpd::~Httpd()
+{
+    uv_timer_stop(&m_timer);
+
+    if (m_daemon) {
+        MHD_stop_daemon(m_daemon);
+    }
+
+    delete m_accessToken;
+}
+
+
+bool Httpd::start()
+{
+    if (!m_port) {
+        return false;
+    }
+
+    unsigned int flags = 0;
+#   if MHD_VERSION >= 0x00093500
+    if (m_IPv6 && MHD_is_feature_supported(MHD_FEATURE_IPv6)) {
+        flags |= MHD_USE_DUAL_STACK;
+    }
+
+    if (MHD_is_feature_supported(MHD_FEATURE_EPOLL)) {
+        flags |= MHD_USE_EPOLL_LINUX_ONLY;
+    }
+#   endif
+
+    m_daemon = MHD_start_daemon(flags, m_port, nullptr, nullptr, &Httpd::handler, this, MHD_OPTION_END);
+    if (!m_daemon) {
+        LOG_ERR("HTTP Daemon failed to start.");
+        return false;
+    }
+
+    uv_timer_start(&m_timer, Httpd::onTimer, kIdleInterval, kIdleInterval);
+    return true;
+}
+
+
+int Httpd::process(xmrig::HttpRequest &req)
+{
+    xmrig::HttpReply reply;
+    if (!req.process(m_accessToken, m_restricted, reply)) {
+        return req.end(reply);
+    }
+
+    if (!req.isFulfilled()) {
+        return MHD_YES;
+    }
+
+    Api::exec(req, reply);
+
+    return req.end(reply);
+}
+
+
+void Httpd::run()
+{
+    MHD_run(m_daemon);
+
+    const MHD_DaemonInfo *info = MHD_get_daemon_info(m_daemon, MHD_DAEMON_INFO_CURRENT_CONNECTIONS);
+    if (m_idle && info->num_connections) {
+        uv_timer_set_repeat(&m_timer, kActiveInterval);
+        m_idle = false;
+    }
+    else if (!m_idle && !info->num_connections) {
+        uv_timer_set_repeat(&m_timer, kIdleInterval);
+        m_idle = true;
+    }
+}
+
+
+int Httpd::handler(void *cls, struct MHD_Connection *connection, const char *url, const char *method, const char *version, const char *uploadData, size_t *uploadSize, void **con_cls)
+{
+    xmrig::HttpRequest req(connection, url, method, uploadData, uploadSize, con_cls);
+
+    if (req.method() == xmrig::HttpRequest::Options) {
+        return req.end(MHD_HTTP_OK, nullptr);
+    }
+
+    if (req.method() == xmrig::HttpRequest::Unsupported) {
+        return req.end(MHD_HTTP_METHOD_NOT_ALLOWED, nullptr);
+    }
+
+    return static_cast<Httpd*>(cls)->process(req);
+}
+
+
+void Httpd::onTimer(uv_timer_t *handle)
+{
+    static_cast<Httpd*>(handle->data)->run();
+}
--- a/src/common/api/Httpd.h
+++ b/src/common/api/Httpd.h
@@ -33,21 +33,38 @@ struct MHD_Daemon;
 struct MHD_Response;


+class UploadCtx;
+
+
+namespace xmrig {
+    class HttpRequest;
+}
+
+
 class Httpd
 {
 public:
-    Httpd(int port, const char *accessToken);
+    Httpd(int port, const char *accessToken, bool IPv6, bool restricted);
+    ~Httpd();
    bool start();

 private:
-    int auth(const char *header);
+    constexpr static const int kIdleInterval   = 200;
+    constexpr static const int kActiveInterval = 25;

-    static int done(MHD_Connection *connection, int status, MHD_Response *rsp);
-    static int handler(void *cls, MHD_Connection *connection, const char *url, const char *method, const char *version, const char *upload_data, size_t *upload_data_size, void **con_cls);
+    int process(xmrig::HttpRequest &req);
+    void run();

+    static int handler(void *cls, MHD_Connection *connection, const char *url, const char *method, const char *version, const char *uploadData, size_t *uploadSize, void **con_cls);
+    static void onTimer(uv_timer_t *handle);
+
+    bool m_idle;
+    bool m_IPv6;
+    bool m_restricted;
    const char *m_accessToken;
    const int m_port;
    MHD_Daemon *m_daemon;
+    uv_timer_t m_timer;
 };

 #endif /* __HTTPD_H__ */
--- a/src/common/config/CommonConfig.cpp
+++ b/src/common/config/CommonConfig.cpp
@@ -0,0 +1,331 @@
+/* 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 <assert.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <uv.h>
+
+
+#include "common/config/CommonConfig.h"
+#include "donate.h"
+#include "log/Log.h"
+#include "net/Pool.h"
+#include "rapidjson/document.h"
+#include "rapidjson/filewritestream.h"
+#include "rapidjson/prettywriter.h"
+
+
+xmrig::CommonConfig::CommonConfig() :
+    m_algorithm(CRYPTONIGHT),
+    m_adjusted(false),
+    m_apiIPv6(false),
+    m_apiRestricted(true),
+    m_background(false),
+    m_colors(true),
+    m_syslog(false),
+
+#   ifdef XMRIG_PROXY_PROJECT
+    m_watch(true),
+#   else
+    m_watch(false), // TODO: enable config file watch by default when this feature propertly handled and tested.
+#   endif
+
+    m_apiPort(0),
+    m_donateLevel(kDefaultDonateLevel),
+    m_printTime(60),
+    m_retries(5),
+    m_retryPause(5)
+{
+    m_pools.push_back(Pool());
+
+#   ifdef XMRIG_PROXY_PROJECT
+    m_retries    = 2;
+    m_retryPause = 1;
+#   endif
+}
+
+
+xmrig::CommonConfig::~CommonConfig()
+{
+}
+
+
+bool xmrig::CommonConfig::adjust()
+{
+    if (m_adjusted) {
+        return false;
+    }
+
+    m_adjusted = true;
+
+    for (Pool &pool : m_pools) {
+        pool.adjust(algorithm());
+    }
+
+    return true;
+}
+
+
+bool xmrig::CommonConfig::isValid() const
+{
+    return m_pools[0].isValid() && m_algorithm != INVALID_ALGO;
+}
+
+
+bool xmrig::CommonConfig::parseBoolean(int key, bool enable)
+{
+    switch (key) {
+    case BackgroundKey: /* --background */
+        m_background = enable;
+        break;
+
+    case SyslogKey: /* --syslog */
+        m_syslog = enable;
+        break;
+
+    case KeepAliveKey: /* --keepalive */
+        m_pools.back().setKeepAlive(enable ? Pool::kKeepAliveTimeout : 0);
+        break;
+
+#   ifndef XMRIG_PROXY_PROJECT
+    case NicehashKey: /* --nicehash */
+        m_pools.back().setNicehash(enable);
+        break;
+#   endif
+
+    case ColorKey: /* --no-color */
+        m_colors = enable;
+        break;
+
+    case WatchKey: /* watch */
+        m_watch = enable;
+        break;
+
+    case ApiIPv6Key: /* ipv6 */
+        m_apiIPv6 = enable;
+
+    case ApiRestrictedKey: /* restricted */
+        m_apiRestricted = enable;
+
+    default:
+        break;
+    }
+
+    return true;
+}
+
+
+bool xmrig::CommonConfig::parseString(int key, const char *arg)
+{
+    switch (key) {
+    case AlgorithmKey: /* --algo */
+        setAlgo(arg);
+        break;
+
+    case UserpassKey: /* --userpass */
+        if (!m_pools.back().setUserpass(arg)) {
+            return false;
+        }
+
+        break;
+
+    case UrlKey: /* --url */
+        if (m_pools.size() > 1 || m_pools[0].isValid()) {
+            Pool pool(arg);
+
+            if (pool.isValid()) {
+                m_pools.push_back(std::move(pool));
+            }
+        }
+        else {
+            m_pools[0].parse(arg);
+        }
+
+        if (!m_pools.back().isValid()) {
+            return false;
+        }
+
+        break;
+
+    case UserKey: /* --user */
+        m_pools.back().setUser(arg);
+        break;
+
+    case PasswordKey: /* --pass */
+        m_pools.back().setPassword(arg);
+        break;
+
+    case LogFileKey: /* --log-file */
+        m_logFile = arg;
+        break;
+
+    case ApiAccessTokenKey: /* --api-access-token */
+        m_apiToken = arg;
+        break;
+
+    case ApiWorkerIdKey: /* --api-worker-id */
+        m_apiWorkerId = arg;
+        break;
+
+    case UserAgentKey: /* --user-agent */
+        m_userAgent = arg;
+        break;
+
+    case RetriesKey:     /* --retries */
+    case RetryPauseKey:  /* --retry-pause */
+    case VariantKey:     /* --variant */
+    case ApiPort:        /* --api-port */
+    case PrintTimeKey:   /* --cpu-priority */
+        return parseUint64(key, strtol(arg, nullptr, 10));
+
+    case BackgroundKey: /* --background */
+    case SyslogKey:     /* --syslog */
+    case KeepAliveKey:  /* --keepalive */
+    case NicehashKey:   /* --nicehash */
+    case ApiIPv6Key:       /* --api-ipv6 */
+        return parseBoolean(key, true);
+
+    case ColorKey:         /* --no-color */
+    case WatchKey:         /* --no-watch */
+    case ApiRestrictedKey: /* --api-no-restricted */
+        return parseBoolean(key, false);
+
+    case DonateLevelKey: /* --donate-level */
+#       ifdef XMRIG_PROXY_PROJECT
+        if (strncmp(arg, "minemonero.pro", 14) == 0) {
+            m_donateLevel = 0;
+            return true;
+        }
+#       endif
+        return parseUint64(key, strtol(arg, nullptr, 10));
+
+    default:
+        break;
+    }
+
+    return true;
+}
+
+
+bool xmrig::CommonConfig::parseUint64(int key, uint64_t arg)
+{
+    return parseInt(key, static_cast<int>(arg));
+}
+
+
+bool xmrig::CommonConfig::save()
+{
+    if (m_fileName.isNull()) {
+        return false;
+    }
+
+    uv_fs_t req;
+    const int fd = uv_fs_open(uv_default_loop(), &req, m_fileName.data(), O_WRONLY | O_CREAT | O_TRUNC, 0644, nullptr);
+    if (fd < 0) {
+        return false;
+    }
+
+    uv_fs_req_cleanup(&req);
+
+    rapidjson::Document doc;
+    getJSON(doc);
+
+    FILE *fp = fdopen(fd, "w");
+
+    char buf[4096];
+    rapidjson::FileWriteStream os(fp, buf, sizeof(buf));
+    rapidjson::PrettyWriter<rapidjson::FileWriteStream> writer(os);
+    doc.Accept(writer);
+
+    fclose(fp);
+
+    uv_fs_close(uv_default_loop(), &req, fd, nullptr);
+    uv_fs_req_cleanup(&req);
+
+    LOG_NOTICE("configuration saved to: \"%s\"", m_fileName.data());
+    return true;
+}
+
+
+void xmrig::CommonConfig::setFileName(const char *fileName)
+{
+    m_fileName = fileName;
+}
+
+
+bool xmrig::CommonConfig::parseInt(int key, int arg)
+{
+    switch (key) {
+    case RetriesKey: /* --retries */
+        if (arg > 0 && arg <= 1000) {
+            m_retries = arg;
+        }
+        break;
+
+    case RetryPauseKey: /* --retry-pause */
+        if (arg > 0 && arg <= 3600) {
+            m_retryPause = arg;
+        }
+        break;
+
+    case KeepAliveKey: /* --keepalive */
+        m_pools.back().setKeepAlive(arg);
+        break;
+
+    case VariantKey: /* --variant */
+        m_pools.back().setVariant(arg);
+        break;
+
+    case DonateLevelKey: /* --donate-level */
+        if (arg >= kMinimumDonateLevel && arg <= 99) {
+            m_donateLevel = arg;
+        }
+        break;
+
+    case ApiPort: /* --api-port */
+        if (arg > 0 && arg <= 65536) {
+            m_apiPort = arg;
+        }
+        break;
+
+    case PrintTimeKey: /* --print-time */
+        if (arg >= 0 && arg <= 3600) {
+            m_printTime = arg;
+        }
+        break;
+
+    default:
+        break;
+    }
+
+    return true;
+}
+
+
+void xmrig::CommonConfig::setAlgo(const char *algo)
+{
+    m_algorithm = Pool::algorithm(algo);
+}
--- a/src/common/config/CommonConfig.h
+++ b/src/common/config/CommonConfig.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 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 __COMMONCONFIG_H__
+#define __COMMONCONFIG_H__
+
+
+#include <vector>
+
+
+#include "common/utils/c_str.h"
+#include "common/xmrig.h"
+#include "interfaces/IConfig.h"
+#include "net/Pool.h"
+
+
+namespace xmrig {
+
+
+class CommonConfig : public IConfig
+{
+public:
+    CommonConfig();
+    ~CommonConfig();
+
+    inline Algo algorithm() const                  { return m_algorithm; }
+    inline bool isApiIPv6() const                  { return m_apiIPv6; }
+    inline bool isApiRestricted() const            { return m_apiRestricted; }
+    inline bool isBackground() const               { return m_background; }
+    inline bool isColors() const                   { return m_colors; }
+    inline bool isSyslog() const                   { return m_syslog; }
+    inline const char *algoName() const            { return Pool::algoName(m_algorithm); }
+    inline const char *apiToken() const            { return m_apiToken.data(); }
+    inline const char *apiWorkerId() const         { return m_apiWorkerId.data(); }
+    inline const char *logFile() const             { return m_logFile.data(); }
+    inline const char *userAgent() const           { return m_userAgent.data(); }
+    inline const std::vector<Pool> &pools() const  { return m_pools; }
+    inline int apiPort() const                     { return m_apiPort; }
+    inline int donateLevel() const                 { return m_donateLevel; }
+    inline int printTime() const                   { return m_printTime; }
+    inline int retries() const                     { return m_retries; }
+    inline int retryPause() const                  { return m_retryPause; }
+    inline void setColors(bool colors)             { m_colors = colors; }
+
+    inline bool isWatch() const override           { return m_watch && !m_fileName.isNull(); }
+    inline const char *fileName() const override   { return m_fileName.data(); }
+
+protected:
+    bool adjust() override;
+    bool isValid() const override;
+    bool parseBoolean(int key, bool enable) override;
+    bool parseString(int key, const char *arg) override;
+    bool parseUint64(int key, uint64_t arg) override;
+    bool save() override;
+    void setFileName(const char *fileName) override;
+
+    Algo m_algorithm;
+    bool m_adjusted;
+    bool m_apiIPv6;
+    bool m_apiRestricted;
+    bool m_background;
+    bool m_colors;
+    bool m_syslog;
+    bool m_watch;
+    int m_apiPort;
+    int m_donateLevel;
+    int m_printTime;
+    int m_retries;
+    int m_retryPause;
+    std::vector<Pool> m_pools;
+    xmrig::c_str m_apiToken;
+    xmrig::c_str m_apiWorkerId;
+    xmrig::c_str m_fileName;
+    xmrig::c_str m_logFile;
+    xmrig::c_str m_userAgent;
+
+private:
+    bool parseInt(int key, int arg);
+    void setAlgo(const char *algo);
+};
+
+
+} /* namespace xmrig */
+
+#endif /* __COMMONCONFIG_H__ */
--- a/src/common/config/ConfigLoader.cpp
+++ b/src/common/config/ConfigLoader.cpp
@@ -0,0 +1,311 @@
+/* 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 <limits.h>
+#include <stdio.h>
+#include <uv.h>
+
+
+#ifndef XMRIG_NO_HTTPD
+#   include <microhttpd.h>
+#endif
+
+
+#include "common/config/ConfigLoader.h"
+#include "common/config/ConfigWatcher.h"
+#include "common/Platform.h"
+#include "core/ConfigCreator.h"
+#include "core/ConfigLoader_platform.h"
+#include "interfaces/IConfig.h"
+#include "interfaces/IWatcherListener.h"
+#include "net/Pool.h"
+#include "rapidjson/document.h"
+#include "rapidjson/error/en.h"
+#include "rapidjson/filereadstream.h"
+
+
+xmrig::ConfigWatcher *xmrig::ConfigLoader::m_watcher     = nullptr;
+xmrig::IConfigCreator *xmrig::ConfigLoader::m_creator    = nullptr;
+xmrig::IWatcherListener *xmrig::ConfigLoader::m_listener = nullptr;
+
+
+#ifndef ARRAY_SIZE
+#   define ARRAY_SIZE(arr) (sizeof(arr) / sizeof((arr)[0]))
+#endif
+
+
+bool xmrig::ConfigLoader::loadFromFile(xmrig::IConfig *config, const char *fileName)
+{
+    rapidjson::Document doc;
+    if (!getJSON(fileName, doc)) {
+        return false;
+    }
+
+    config->setFileName(fileName);
+
+    return loadFromJSON(config, doc);
+}
+
+
+bool xmrig::ConfigLoader::loadFromJSON(xmrig::IConfig *config, const char *json)
+{
+    rapidjson::Document doc;
+    doc.Parse(json);
+
+    if (doc.HasParseError() || !doc.IsObject()) {
+        return false;
+    }
+
+    return loadFromJSON(config, doc);
+}
+
+
+bool xmrig::ConfigLoader::loadFromJSON(xmrig::IConfig *config, const rapidjson::Document &doc)
+{
+    for (size_t i = 0; i < ARRAY_SIZE(config_options); i++) {
+        parseJSON(config, &config_options[i], doc);
+    }
+
+    const rapidjson::Value &pools = doc["pools"];
+    if (pools.IsArray()) {
+        for (const rapidjson::Value &value : pools.GetArray()) {
+            if (!value.IsObject()) {
+                continue;
+            }
+
+            for (size_t i = 0; i < ARRAY_SIZE(pool_options); i++) {
+                parseJSON(config, &pool_options[i], value);
+            }
+        }
+    }
+
+    const rapidjson::Value &api = doc["api"];
+    if (api.IsObject()) {
+        for (size_t i = 0; i < ARRAY_SIZE(api_options); i++) {
+            parseJSON(config, &api_options[i], api);
+        }
+    }
+
+    config->parseJSON(doc);
+    config->adjust();
+
+    return config->isValid();
+}
+
+
+bool xmrig::ConfigLoader::reload(xmrig::IConfig *oldConfig, const char *json)
+{
+    xmrig::IConfig *config = m_creator->create();
+    if (!loadFromJSON(config, json)) {
+        delete config;
+
+        return false;
+    }
+
+    config->setFileName(oldConfig->fileName());
+    const bool saved = config->save();
+
+    if (config->isWatch() && m_watcher && saved) {
+        delete config;
+
+        return true;
+    }
+
+    m_listener->onNewConfig(config);
+    return true;
+}
+
+
+xmrig::IConfig *xmrig::ConfigLoader::load(int argc, char **argv, IConfigCreator *creator, IWatcherListener *listener)
+{
+    m_creator  = creator;
+    m_listener = listener;
+
+    xmrig::IConfig *config = m_creator->create();
+    int key;
+
+    while (1) {
+        key = getopt_long(argc, argv, short_options, options, NULL);
+        if (key < 0) {
+            break;
+        }
+
+        if (!parseArg(config, key, optarg)) {
+            delete config;
+            return nullptr;
+        }
+    }
+
+    if (optind < argc) {
+        fprintf(stderr, "%s: unsupported non-option argument '%s'\n", argv[0], argv[optind]);
+        delete config;
+        return nullptr;
+    }
+
+    if (!config->isValid()) {
+        loadFromFile(config, Platform::defaultConfigName());
+    }
+
+    if (!config->isValid()) {
+        fprintf(stderr, "No valid configuration found. Exiting.\n");
+        delete config;
+        return nullptr;
+    }
+
+    if (config->isWatch()) {
+        m_watcher = new xmrig::ConfigWatcher(config->fileName(), creator, listener);
+    }
+
+    config->adjust();
+    return config;
+}
+
+
+void xmrig::ConfigLoader::release()
+{
+    delete m_watcher;
+    delete m_creator;
+
+    m_watcher = nullptr;
+    m_creator = nullptr;
+}
+
+
+bool xmrig::ConfigLoader::getJSON(const char *fileName, rapidjson::Document &doc)
+{
+    uv_fs_t req;
+    const int fd = uv_fs_open(uv_default_loop(), &req, fileName, O_RDONLY, 0644, nullptr);
+    if (fd < 0) {
+        fprintf(stderr, "unable to open %s: %s\n", fileName, uv_strerror(fd));
+        return false;
+    }
+
+    uv_fs_req_cleanup(&req);
+
+    FILE *fp = fdopen(fd, "rb");
+    char buf[8192];
+    rapidjson::FileReadStream is(fp, buf, sizeof(buf));
+
+    doc.ParseStream(is);
+
+    uv_fs_close(uv_default_loop(), &req, fd, nullptr);
+    uv_fs_req_cleanup(&req);
+
+    if (doc.HasParseError()) {
+        printf("%s<%d>: %s\n", fileName, (int) doc.GetErrorOffset(), rapidjson::GetParseError_En(doc.GetParseError()));
+        return false;
+    }
+
+    return doc.IsObject();
+}
+
+
+bool xmrig::ConfigLoader::parseArg(xmrig::IConfig *config, int key, const char *arg)
+{
+    switch (key) {
+    case xmrig::IConfig::VersionKey: /* --version */
+        showVersion();
+        return false;
+
+    case xmrig::IConfig::HelpKey: /* --help */
+        showUsage();
+        return false;
+
+    case xmrig::IConfig::ConfigKey: /* --config */
+        loadFromFile(config, arg);
+        break;
+
+    default:
+        return config->parseString(key, arg);;
+    }
+
+    return true;
+}
+
+
+void xmrig::ConfigLoader::parseJSON(xmrig::IConfig *config, const struct option *option, const rapidjson::Value &object)
+{
+    if (!option->name || !object.HasMember(option->name)) {
+        return;
+    }
+
+    const rapidjson::Value &value = object[option->name];
+
+    if (option->has_arg) {
+        if (value.IsString()) {
+            config->parseString(option->val, value.GetString());
+        }
+        else if (value.IsInt64()) {
+            config->parseUint64(option->val, value.GetUint64());
+        }
+        else if (value.IsBool()) {
+            config->parseBoolean(option->val, value.IsTrue());
+        }
+    }
+    else if (value.IsBool()) {
+        config->parseBoolean(option->val, value.IsTrue());
+    }
+}
+
+
+void xmrig::ConfigLoader::showUsage()
+{
+    printf(usage);
+}
+
+
+void xmrig::ConfigLoader::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("libmicrohttpd/%s\n", MHD_get_version());
+#   endif
+}
--- a/src/common/config/ConfigLoader.h
+++ b/src/common/config/ConfigLoader.h
@@ -0,0 +1,71 @@
+/* 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 __CONFIGLOADER_H__
+#define __CONFIGLOADER_H__
+
+
+#include <stdint.h>
+
+
+#include "rapidjson/fwd.h"
+
+
+struct option;
+
+
+namespace xmrig {
+
+
+class ConfigWatcher;
+class IConfigCreator;
+class IWatcherListener;
+class IConfig;
+
+
+class ConfigLoader
+{
+public:
+    static bool loadFromFile(IConfig *config, const char *fileName);
+    static bool loadFromJSON(IConfig *config, const char *json);
+    static bool loadFromJSON(IConfig *config, const rapidjson::Document &doc);
+    static bool reload(IConfig *oldConfig, const char *json);
+    static IConfig *load(int argc, char **argv, IConfigCreator *creator, IWatcherListener *listener);
+    static void release();
+
+private:
+    static bool getJSON(const char *fileName, rapidjson::Document &doc);
+    static bool parseArg(IConfig *config, int key, const char *arg);
+    static void parseJSON(IConfig *config, const struct option *option, const rapidjson::Value &object);
+    static void showUsage();
+    static void showVersion();
+
+    static ConfigWatcher *m_watcher;
+    static IConfigCreator *m_creator;
+    static IWatcherListener *m_listener;
+};
+
+
+} /* namespace xmrig */
+
+#endif /* __CONFIGLOADER_H__ */
--- a/src/common/config/ConfigWatcher.cpp
+++ b/src/common/config/ConfigWatcher.cpp
@@ -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 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 <stdio.h>
+
+
+#include "common/config/ConfigLoader.h"
+#include "common/config/ConfigWatcher.h"
+#include "core/ConfigCreator.h"
+#include "interfaces/IWatcherListener.h"
+#include "log/Log.h"
+
+
+xmrig::ConfigWatcher::ConfigWatcher(const char *path, IConfigCreator *creator, IWatcherListener *listener) :
+    m_creator(creator),
+    m_listener(listener),
+    m_path(path)
+{
+    uv_fs_event_init(uv_default_loop(), &m_fsEvent);
+    uv_timer_init(uv_default_loop(), &m_timer);
+
+    m_fsEvent.data = m_timer.data = this;
+
+    start();
+}
+
+
+xmrig::ConfigWatcher::~ConfigWatcher()
+{
+    uv_timer_stop(&m_timer);
+    uv_fs_event_stop(&m_fsEvent);
+}
+
+
+void xmrig::ConfigWatcher::onTimer(uv_timer_t* handle)
+{
+    static_cast<xmrig::ConfigWatcher *>(handle->data)->reload();
+}
+
+
+void xmrig::ConfigWatcher::onFsEvent(uv_fs_event_t* handle, const char *filename, int events, int status)
+{
+    if (!filename) {
+        return;
+    }
+
+    static_cast<xmrig::ConfigWatcher *>(handle->data)->queueUpdate();
+}
+
+
+void xmrig::ConfigWatcher::queueUpdate()
+{
+    uv_timer_stop(&m_timer);
+    uv_timer_start(&m_timer, xmrig::ConfigWatcher::onTimer, kDelay, 0);
+}
+
+
+void xmrig::ConfigWatcher::reload()
+{
+    LOG_WARN("\"%s\" was changed, reloading configuration", m_path.data());
+
+    IConfig *config = m_creator->create();
+    ConfigLoader::loadFromFile(config, m_path.data());
+
+    if (!config->isValid()) {
+        LOG_ERR("reloading failed");
+
+        delete config;
+        return;
+    }
+
+    m_listener->onNewConfig(config);
+
+#   ifndef _WIN32
+    uv_fs_event_stop(&m_fsEvent);
+    start();
+#   endif
+}
+
+
+void xmrig::ConfigWatcher::start()
+{
+    uv_fs_event_start(&m_fsEvent, xmrig::ConfigWatcher::onFsEvent, m_path.data(), 0);
+}
--- a/src/common/config/ConfigWatcher.h
+++ b/src/common/config/ConfigWatcher.h
@@ -0,0 +1,71 @@
+/* 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 __CONFIGWATCHER_H__
+#define __CONFIGWATCHER_H__
+
+
+#include <stdint.h>
+#include <uv.h>
+
+
+#include "common/utils/c_str.h"
+#include "rapidjson/fwd.h"
+
+
+struct option;
+
+
+namespace xmrig {
+
+
+class IConfigCreator;
+class IWatcherListener;
+
+
+class ConfigWatcher
+{
+public:
+    ConfigWatcher(const char *path, IConfigCreator *creator, IWatcherListener *listener);
+    ~ConfigWatcher();
+
+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();
+
+    IConfigCreator *m_creator;
+    IWatcherListener *m_listener;
+    uv_fs_event_t m_fsEvent;
+    uv_timer_t m_timer;
+    xmrig::c_str m_path;
+};
+
+
+} /* namespace xmrig */
+
+#endif /* __CONFIGWATCHER_H__ */
--- a/src/common/utils/c_str.h
+++ b/src/common/utils/c_str.h
@@ -0,0 +1,96 @@
+/* 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 __C_STR_H__
+#define __C_STR_H__
+
+
+#include <string.h>
+#include <stdlib.h>
+
+#include <stdio.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.
+ */
+class c_str
+{
+public:
+    inline c_str() : m_data(nullptr)                   {}
+    inline c_str(c_str &&other)                        { m_data = other.m_data; other.m_data = nullptr; }
+    inline c_str(const c_str &other) : m_data(nullptr) { set(other.data()); }
+    inline c_str(const char *str) : m_data(nullptr)    { set(str); }
+    inline ~c_str()                                    { free(m_data); }
+
+
+    inline void set(const char *str)
+    {
+        free(m_data);
+
+        m_data = str != nullptr ? strdup(str) : nullptr;
+    }
+
+
+    inline void set(char *str)
+    {
+        free(m_data);
+
+        m_data = str;
+    }
+
+
+    inline bool isEqual(const char *str) const
+    {
+        return (m_data != nullptr && str != nullptr && strcmp(m_data, str)) || (m_data == nullptr && m_data == nullptr);
+    }
+
+
+    inline bool isNull() const           { return m_data == nullptr; }
+    inline const char *data() const      { return m_data; }
+    inline size_t size() const           { return m_data == nullptr ? 0 : strlen(m_data); }
+
+
+    inline bool operator!=(const c_str &str) const { return !isEqual(str.data()); }
+    inline bool operator!=(const char *str) const  { return !isEqual(str); }
+    inline bool operator==(const c_str &str) const { return isEqual(str.data()); }
+    inline bool operator==(const char *str) const  { return isEqual(str); }
+    inline c_str &operator=(char *str)             { set(str); return *this; }
+    inline c_str &operator=(const c_str &str)      { set(str.data()); return *this; }
+    inline c_str &operator=(const char *str)       { set(str); return *this; }
+
+
+private:
+    char *m_data;
+};
+
+
+} /* namespace xmrig */
+
+#endif /* __C_STR_H__ */
--- a/src/common/utils/mm_malloc.h
+++ b/src/common/utils/mm_malloc.h
@@ -0,0 +1,43 @@
+/* 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 __MM_MALLOC_PORTABLE_H__
+#define __MM_MALLOC_PORTABLE_H__
+
+
+#ifdef _WIN32
+#   ifdef __GNUC__
+#       include <mm_malloc.h>
+#   else
+#       include <malloc.h>
+#   endif
+#else
+#   if defined(XMRIG_ARM) && !defined(__clang__)
+#       include "aligned_malloc.h"
+#   else
+#       include <mm_malloc.h>
+#   endif
+#endif
+
+
+#endif /* __MM_MALLOC_PORTABLE_H__ */
--- a/src/common/xmrig.h
+++ b/src/common/xmrig.h
@@ -0,0 +1,77 @@
+/* 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 __XMRIG_H__
+#define __XMRIG_H__
+
+
+namespace xmrig
+{
+
+
+enum Algo {
+    INVALID_ALGO = -1,
+    CRYPTONIGHT,       /* CryptoNight (Monero) */
+    CRYPTONIGHT_LITE,  /* CryptoNight-Lite (AEON) */
+    CRYPTONIGHT_HEAVY, /* CryptoNight-Heavy (SUMO) */
+};
+
+
+//--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.
+enum AlgoVariant {
+    AV_AUTO,        // --av=0 Automatic mode.
+    AV_SINGLE,      // --av=1  Single hash mode
+    AV_DOUBLE,      // --av=2  Double hash mode
+    AV_SINGLE_SOFT, // --av=3  Single hash mode (Software AES)
+    AV_DOUBLE_SOFT, // --av=4  Double hash mode (Software AES)
+    AV_TRIPLE,      // --av=5  Triple hash mode
+    AV_QUAD,        // --av=6  Quard hash mode
+    AV_PENTA,       // --av=7  Penta hash mode
+    AV_TRIPLE_SOFT, // --av=8  Triple hash mode (Software AES)
+    AV_QUAD_SOFT,   // --av=9  Quard hash mode  (Software AES)
+    AV_PENTA_SOFT,  // --av=10 Penta hash mode  (Software AES)
+    AV_MAX
+};
+
+
+enum Variant {
+    VARIANT_AUTO = -1, // Autodetect
+    VARIANT_NONE = 0,  // Original CryptoNight
+    VARIANT_V1   = 1   // Monero v7 PoW
+};
+
+
+enum AesMode {
+    AES_AUTO,
+    AES_HW,
+    AES_SOFT
+};
+
+
+} /* namespace xmrig */
+
+
+#endif /* __XMRIG_H__ */
--- a/src/config.json
+++ b/src/config.json
@@ -27,6 +27,8 @@
    "api": {
        "port": 0,                             // port for the miner API https://github.com/xmrig/xmrig/wiki/API
        "access-token": null,                  // access token for API
-        "worker-id": null                      // custom worker-id for API
+        "worker-id": null,                     // custom worker-id for API
+        "ipv6": false,
+        "restricted": true
    }
 }
--- a/src/core/Config.cpp
+++ b/src/core/Config.cpp
@@ -0,0 +1,384 @@
+/* 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 <string.h>
+#include <uv.h>
+#include <inttypes.h>
+
+
+#include "common/config/ConfigLoader.h"
+#include "core/Config.h"
+#include "core/ConfigCreator.h"
+#include "Cpu.h"
+#include "crypto/CryptoNight_constants.h"
+#include "net/Pool.h"
+#include "rapidjson/document.h"
+#include "rapidjson/filewritestream.h"
+#include "rapidjson/prettywriter.h"
+#include "workers/CpuThread.h"
+
+
+static char affinity_tmp[20] = { 0 };
+
+
+xmrig::Config::Config() : xmrig::CommonConfig(),
+    m_aesMode(AES_AUTO),
+    m_algoVariant(AV_AUTO),
+    m_dryRun(false),
+    m_hugePages(true),
+    m_safe(false),
+    m_maxCpuUsage(75),
+    m_priority(-1)
+{
+}
+
+
+xmrig::Config::~Config()
+{
+}
+
+
+bool xmrig::Config::reload(const char *json)
+{
+    return xmrig::ConfigLoader::reload(this, json);
+}
+
+
+void xmrig::Config::getJSON(rapidjson::Document &doc) const
+{
+    using namespace rapidjson;
+
+    doc.SetObject();
+
+    auto &allocator = doc.GetAllocator();
+
+    doc.AddMember("algo", StringRef(algoName()), allocator);
+
+    Value api(kObjectType);
+    api.AddMember("port",         apiPort(), allocator);
+    api.AddMember("access-token", apiToken() ? Value(StringRef(apiToken())).Move() : Value(kNullType).Move(), allocator);
+    api.AddMember("worker-id",    apiWorkerId() ? Value(StringRef(apiWorkerId())).Move() : Value(kNullType).Move(), allocator);
+    api.AddMember("ipv6",         isApiIPv6(), allocator);
+    api.AddMember("restricted",   isApiRestricted(), allocator);
+    doc.AddMember("api",          api, allocator);
+
+    doc.AddMember("av",           algoVariant(), allocator);
+    doc.AddMember("background",   isBackground(), allocator);
+    doc.AddMember("colors",       isColors(), allocator);
+
+    if (affinity() != -1L) {
+        snprintf(affinity_tmp, sizeof(affinity_tmp) - 1, "0x%" PRIX64, affinity());
+        doc.AddMember("cpu-affinity", StringRef(affinity_tmp), allocator);
+    }
+    else {
+        doc.AddMember("cpu-affinity", kNullType, allocator);
+    }
+
+    doc.AddMember("cpu-priority",  priority() != -1 ? Value(priority()) : Value(kNullType), allocator);
+    doc.AddMember("donate-level",  donateLevel(), allocator);
+    doc.AddMember("huge-pages",    isHugePages(), allocator);
+    doc.AddMember("hw-aes",        m_aesMode == AES_AUTO ? Value(kNullType) : Value(m_aesMode == AES_HW), allocator);
+    doc.AddMember("log-file",      logFile()             ? Value(StringRef(logFile())).Move() : Value(kNullType).Move(), allocator);
+    doc.AddMember("max-cpu-usage", m_maxCpuUsage, allocator);
+
+    Value pools(kArrayType);
+
+    for (const Pool &pool : m_pools) {
+        Value obj(kObjectType);
+
+        obj.AddMember("url",     StringRef(pool.url()), allocator);
+        obj.AddMember("user",    StringRef(pool.user()), allocator);
+        obj.AddMember("pass",    StringRef(pool.password()), allocator);
+
+        if (pool.keepAlive() == 0 || pool.keepAlive() == Pool::kKeepAliveTimeout) {
+            obj.AddMember("keepalive", pool.keepAlive() > 0, allocator);
+        }
+        else {
+            obj.AddMember("keepalive", pool.keepAlive(), allocator);
+        }
+
+        obj.AddMember("nicehash", pool.isNicehash(), allocator);
+        obj.AddMember("variant",  pool.variant(), allocator);
+
+        pools.PushBack(obj, allocator);
+    }
+
+    doc.AddMember("pools",         pools, allocator);
+    doc.AddMember("print-time",    printTime(), allocator);
+    doc.AddMember("retries",       retries(), allocator);
+    doc.AddMember("retry-pause",   retryPause(), allocator);
+    doc.AddMember("safe",          m_safe, allocator);
+
+    if (threadsMode() == Advanced) {
+        Value threads(kArrayType);
+
+        for (const IThread *thread : m_threads.list) {
+            threads.PushBack(thread->toConfig(doc), doc.GetAllocator());
+        }
+
+        doc.AddMember("threads", threads, allocator);
+    }
+    else {
+        doc.AddMember("threads", threadsMode() == Automatic ? Value(kNullType) : Value(threadsCount()), allocator);
+    }
+
+    doc.AddMember("user-agent", userAgent() ? Value(StringRef(userAgent())).Move() : Value(kNullType).Move(), allocator);
+
+#   ifdef HAVE_SYSLOG_H
+    doc.AddMember("syslog", isSyslog(), allocator);
+#   endif
+
+    doc.AddMember("watch", m_watch, allocator);
+}
+
+
+xmrig::Config *xmrig::Config::load(int argc, char **argv, IWatcherListener *listener)
+{
+    return static_cast<Config*>(ConfigLoader::load(argc, argv, new ConfigCreator(), listener));
+}
+
+
+bool xmrig::Config::adjust()
+{
+    if (!CommonConfig::adjust()) {
+        return false;
+    }
+
+    if (!m_threads.cpu.empty()) {
+        m_threads.mode     = Advanced;
+        const bool softAES = (m_aesMode == AES_AUTO ? (Cpu::hasAES() ? AES_HW : AES_SOFT) : m_aesMode) == AES_SOFT;
+
+        for (size_t i = 0; i < m_threads.cpu.size(); ++i) {
+            m_threads.list.push_back(CpuThread::createFromData(i, m_algorithm, m_threads.cpu[i], m_priority, softAES));
+        }
+
+        return true;
+    }
+
+    m_algoVariant  = getAlgoVariant();
+    m_threads.mode = m_threads.count ? Simple : Automatic;
+
+    const size_t size = CpuThread::multiway(m_algoVariant) * cn_select_memory(m_algorithm) / 1024;
+
+    if (!m_threads.count) {
+        m_threads.count = Cpu::optimalThreadsCount(size, m_maxCpuUsage);
+    }
+    else if (m_safe) {
+        const size_t count = Cpu::optimalThreadsCount(size, m_maxCpuUsage);
+        if (m_threads.count > count) {
+            m_threads.count = count;
+        }
+    }
+
+    for (size_t i = 0; i < m_threads.count; ++i) {
+        m_threads.list.push_back(CpuThread::createFromAV(i, m_algorithm, m_algoVariant, m_threads.mask, m_priority));
+    }
+
+    return true;
+}
+
+
+bool xmrig::Config::parseBoolean(int key, bool enable)
+{
+    if (!CommonConfig::parseBoolean(key, enable)) {
+        return false;
+    }
+
+    switch (key) {
+    case IConfig::SafeKey: /* --safe */
+        m_safe = enable;
+        break;
+
+    case IConfig::HugePagesKey: /* --no-huge-pages */
+        m_hugePages = enable;
+        break;
+
+    case IConfig::DryRunKey: /* --dry-run */
+        m_dryRun = enable;
+        break;
+
+    case IConfig::HardwareAESKey: /* hw-aes config only */
+        m_aesMode = enable ? AES_HW : AES_SOFT;
+        break;
+
+    default:
+        break;
+    }
+
+    return true;
+}
+
+
+bool xmrig::Config::parseString(int key, const char *arg)
+{
+    if (!CommonConfig::parseString(key, arg)) {
+        return false;
+    }
+
+    switch (key) {
+    case xmrig::IConfig::AVKey:          /* --av */
+    case xmrig::IConfig::MaxCPUUsageKey: /* --max-cpu-usage */
+    case xmrig::IConfig::CPUPriorityKey: /* --cpu-priority */
+        return parseUint64(key, strtol(arg, nullptr, 10));
+
+    case xmrig::IConfig::SafeKey:   /* --safe */
+    case xmrig::IConfig::DryRunKey: /* --dry-run */
+        return parseBoolean(key, true);
+
+    case xmrig::IConfig::HugePagesKey: /* --no-huge-pages */
+        return parseBoolean(key, false);
+
+    case xmrig::IConfig::ThreadsKey:  /* --threads */
+        if (strncmp(arg, "all", 3) == 0) {
+            m_threads.count = Cpu::threads();
+            return true;
+        }
+
+        return parseUint64(key, strtol(arg, nullptr, 10));
+
+    case xmrig::IConfig::CPUAffinityKey: /* --cpu-affinity */
+        {
+            const char *p  = strstr(arg, "0x");
+            return parseUint64(key, p ? strtoull(p, nullptr, 16) : strtoull(arg, nullptr, 10));
+        }
+
+    default:
+        break;
+    }
+
+    return true;
+}
+
+
+bool xmrig::Config::parseUint64(int key, uint64_t arg)
+{
+    if (!CommonConfig::parseUint64(key, arg)) {
+        return false;
+    }
+
+    switch (key) {
+    case xmrig::IConfig::CPUAffinityKey: /* --cpu-affinity */
+        if (arg) {
+            m_threads.mask = arg;
+        }
+        break;
+
+    default:
+        return parseInt(key, static_cast<int>(arg));
+    }
+
+    return true;
+}
+
+
+void xmrig::Config::parseJSON(const rapidjson::Document &doc)
+{
+    const rapidjson::Value &threads = doc["threads"];
+
+    if (threads.IsArray()) {
+        for (const rapidjson::Value &value : threads.GetArray()) {
+            if (!value.IsObject()) {
+                continue;
+            }
+
+            if (value.HasMember("low_power_mode")) {
+                auto data = CpuThread::parse(value);
+
+                if (data.valid) {
+                    m_threads.cpu.push_back(std::move(data));
+                }
+            }
+        }
+    }
+}
+
+
+bool xmrig::Config::parseInt(int key, int arg)
+{
+    switch (key) {
+    case xmrig::IConfig::ThreadsKey: /* --threads */
+        if (arg >= 0 && arg < 1024) {
+            m_threads.count = arg;
+        }
+        break;
+
+    case xmrig::IConfig::AVKey: /* --av */
+        if (arg >= AV_AUTO && arg < AV_MAX) {
+            m_algoVariant = static_cast<AlgoVariant>(arg);
+        }
+        break;
+
+    case xmrig::IConfig::MaxCPUUsageKey: /* --max-cpu-usage */
+        if (m_maxCpuUsage > 0 && arg <= 100) {
+            m_maxCpuUsage = arg;
+        }
+        break;
+
+    case xmrig::IConfig::CPUPriorityKey: /* --cpu-priority */
+        if (arg >= 0 && arg <= 5) {
+            m_priority = arg;
+        }
+        break;
+
+    default:
+        break;
+    }
+
+    return true;
+}
+
+
+xmrig::AlgoVariant xmrig::Config::getAlgoVariant() const
+{
+#   ifndef XMRIG_NO_AEON
+    if (m_algorithm == xmrig::CRYPTONIGHT_LITE) {
+        return getAlgoVariantLite();
+    }
+#   endif
+
+    if (m_algoVariant <= AV_AUTO || m_algoVariant >= AV_MAX) {
+        return Cpu::hasAES() ? AV_SINGLE : AV_SINGLE_SOFT;
+    }
+
+    if (m_safe && !Cpu::hasAES() && m_algoVariant <= AV_DOUBLE) {
+        return static_cast<AlgoVariant>(m_algoVariant + 2);
+    }
+
+    return m_algoVariant;
+}
+
+
+#ifndef XMRIG_NO_AEON
+xmrig::AlgoVariant xmrig::Config::getAlgoVariantLite() const
+{
+    if (m_algoVariant <= AV_AUTO || m_algoVariant >= AV_MAX) {
+        return Cpu::hasAES() ? AV_DOUBLE : AV_DOUBLE_SOFT;
+    }
+
+    if (m_safe && !Cpu::hasAES() && m_algoVariant <= AV_DOUBLE) {
+        return static_cast<AlgoVariant>(m_algoVariant + 2);
+    }
+
+    return m_algoVariant;
+}
+#endif
--- a/src/core/Config.h
+++ b/src/core/Config.h
@@ -0,0 +1,131 @@
+/* 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 __CONFIG_H__
+#define __CONFIG_H__
+
+
+#include <stdint.h>
+#include <vector>
+
+
+#include "common/config/CommonConfig.h"
+#include "common/xmrig.h"
+#include "rapidjson/fwd.h"
+#include "workers/CpuThread.h"
+
+
+class Addr;
+class Url;
+
+
+namespace xmrig {
+
+
+class ConfigLoader;
+class IThread;
+class IWatcherListener;
+
+
+/**
+ * @brief The Config class
+ *
+ * Options with dynamic reload:
+ *   colors
+ *   debug
+ *   verbose
+ *   custom-diff (only for new connections)
+ *   api/worker-id
+ *   pools/
+ */
+class Config : public CommonConfig
+{
+public:
+    enum ThreadsMode {
+        Automatic,
+        Simple,
+        Advanced
+    };
+
+
+    Config();
+    ~Config();
+
+    bool reload(const char *json);
+
+    void getJSON(rapidjson::Document &doc) const override;
+
+    inline AesMode aesMode() const                       { return m_aesMode; }
+    inline AlgoVariant algoVariant() const               { return m_algoVariant; }
+    inline bool isDryRun() const                         { return m_dryRun; }
+    inline bool isHugePages() const                      { return m_hugePages; }
+    inline const std::vector<IThread *> &threads() const { return m_threads.list; }
+    inline int priority() const                          { return m_priority; }
+    inline int threadsCount() const                      { return m_threads.list.size(); }
+    inline int64_t affinity() const                      { return m_threads.mask; }
+    inline ThreadsMode threadsMode() const               { return m_threads.mode; }
+
+    static Config *load(int argc, char **argv, IWatcherListener *listener);
+
+protected:
+    bool adjust() override;
+    bool parseBoolean(int key, bool enable) override;
+    bool parseString(int key, const char *arg) override;
+    bool parseUint64(int key, uint64_t arg) override;
+    void parseJSON(const rapidjson::Document &doc) override;
+
+private:
+    bool parseInt(int key, int arg);
+
+    AlgoVariant getAlgoVariant() const;
+#   ifndef XMRIG_NO_AEON
+    AlgoVariant getAlgoVariantLite() const;
+#   endif
+
+
+    struct Threads
+    {
+       inline Threads() : mask(-1L), count(0), mode(Automatic) {}
+
+       int64_t mask;
+       size_t count;
+       std::vector<CpuThread::Data> cpu;
+       std::vector<IThread *> list;
+       ThreadsMode mode;
+    };
+
+
+    AesMode m_aesMode;
+    AlgoVariant m_algoVariant;
+    bool m_dryRun;
+    bool m_hugePages;
+    bool m_safe;
+    int m_maxCpuUsage;
+    int m_priority;
+    Threads m_threads;
+};
+
+
+} /* namespace xmrig */
+
+#endif /* __CONFIG_H__ */
--- a/src/core/ConfigCreator.h
+++ b/src/core/ConfigCreator.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 2016-2018 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 __CONFIGCREATOR_H__
+#define __CONFIGCREATOR_H__
+
+
+#include "core/Config.h"
+#include "interfaces/IConfigCreator.h"
+
+
+namespace xmrig {
+
+
+class IConfig;
+
+
+class ConfigCreator : public IConfigCreator
+{
+public:
+    inline IConfig *create() const override
+    {
+        return new Config();
+    }
+};
+
+
+} /* namespace xmrig */
+
+
+#endif // __CONFIGCREATOR_H__
--- a/src/core/ConfigLoader_platform.h
+++ b/src/core/ConfigLoader_platform.h
@@ -0,0 +1,184 @@
+/* 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 __CONFIGLOADER_PLATFORM_H__
+#define __CONFIGLOADER_PLATFORM_H__
+
+
+#ifdef _MSC_VER
+#   include "getopt/getopt.h"
+#else
+#   include <getopt.h>
+#endif
+
+
+#include "version.h"
+#include "interfaces/IConfig.h"
+
+
+namespace xmrig {
+
+
+static char const usage[] = "\
+Usage: " APP_ID " [OPTIONS]\n\
+Options:\n\
+  -a, --algo=ALGO          specify the algorithm to use\n\
+                             cryptonight\n"
+#ifndef XMRIG_NO_AEON
+"\
+                             cryptonight-lite\n"
+#endif
+#ifndef XMRIG_NO_SUMO
+"\
+                             cryptonight-heavy\n"
+#endif
+"\
+  -o, --url=URL            URL of mining server\n\
+  -O, --userpass=U:P       username:password pair for mining server\n\
+  -u, --user=USERNAME      username for mining server\n\
+  -p, --pass=PASSWORD      password for mining server\n\
+  -t, --threads=N          number of miner threads\n\
+  -v, --av=N               algorithm variation, 0 auto select\n\
+  -k, --keepalive          send keepalived for prevent timeout (need pool support)\n\
+  -r, --retries=N          number of times to retry before switch to backup server (default: 5)\n\
+  -R, --retry-pause=N      time to pause between retries (default: 5)\n\
+      --cpu-affinity       set process affinity to CPU core(s), mask 0x3 for cores 0 and 1\n\
+      --cpu-priority       set process priority (0 idle, 2 normal to 5 highest)\n\
+      --no-huge-pages      disable huge pages support\n\
+      --no-color           disable colored output\n\
+      --variant            algorithm PoW variant\n\
+      --donate-level=N     donate level, default 5%% (5 minutes in 100 minutes)\n\
+      --user-agent         set custom user-agent string for pool\n\
+  -B, --background         run the miner in the background\n\
+  -c, --config=FILE        load a JSON-format configuration file\n\
+  -l, --log-file=FILE      log all output to a file\n"
+# ifdef HAVE_SYSLOG_H
+"\
+  -S, --syslog             use system log for output messages\n"
+# endif
+"\
+      --max-cpu-usage=N    maximum CPU usage for automatic threads mode (default 75)\n\
+      --safe               safe adjust threads and av settings for current CPU\n\
+      --nicehash           enable nicehash/xmrig-proxy support\n\
+      --print-time=N       print hashrate report every N seconds\n\
+      --api-port=N         port for the miner API\n\
+      --api-access-token=T access token for API\n\
+      --api-worker-id=ID   custom worker-id for API\n\
+      --api-ipv6           enable IPv6 support for API\n\
+      --api-no-restricted  enable full remote access (only if API token set)\n\
+  -h, --help               display this help and exit\n\
+  -V, --version            output version information and exit\n\
+";
+
+
+static char const short_options[] = "a:c:khBp:Px:r:R:s:t:T:o:u:O:v:Vl:S";
+
+
+static struct option const options[] = {
+    { "algo",              1, nullptr, xmrig::IConfig::AlgorithmKey      },
+    { "api-access-token",  1, nullptr, xmrig::IConfig::ApiAccessTokenKey },
+    { "api-port",          1, nullptr, xmrig::IConfig::ApiPort           },
+    { "api-worker-id",     1, nullptr, xmrig::IConfig::ApiWorkerIdKey    },
+    { "api-ipv6",          0, nullptr, xmrig::IConfig::ApiIPv6Key        },
+    { "api-no-restricted", 0, nullptr, xmrig::IConfig::ApiRestrictedKey  },
+    { "av",                1, nullptr, xmrig::IConfig::AVKey             },
+    { "background",        0, nullptr, xmrig::IConfig::BackgroundKey     },
+    { "config",            1, nullptr, xmrig::IConfig::ConfigKey         },
+    { "cpu-affinity",      1, nullptr, xmrig::IConfig::CPUAffinityKey    },
+    { "cpu-priority",      1, nullptr, xmrig::IConfig::CPUPriorityKey    },
+    { "donate-level",      1, nullptr, xmrig::IConfig::DonateLevelKey    },
+    { "dry-run",           0, nullptr, xmrig::IConfig::DryRunKey         },
+    { "help",              0, nullptr, xmrig::IConfig::HelpKey           },
+    { "keepalive",         0, nullptr, xmrig::IConfig::KeepAliveKey      },
+    { "log-file",          1, nullptr, xmrig::IConfig::LogFileKey        },
+    { "max-cpu-usage",     1, nullptr, xmrig::IConfig::MaxCPUUsageKey    },
+    { "nicehash",          0, nullptr, xmrig::IConfig::NicehashKey       },
+    { "no-color",          0, nullptr, xmrig::IConfig::ColorKey          },
+    { "no-huge-pages",     0, nullptr, xmrig::IConfig::HugePagesKey      },
+    { "variant",           1, nullptr, xmrig::IConfig::VariantKey        },
+    { "pass",              1, nullptr, xmrig::IConfig::PasswordKey       },
+    { "print-time",        1, nullptr, xmrig::IConfig::PrintTimeKey      },
+    { "retries",           1, nullptr, xmrig::IConfig::RetriesKey        },
+    { "retry-pause",       1, nullptr, xmrig::IConfig::RetryPauseKey     },
+    { "safe",              0, nullptr, xmrig::IConfig::SafeKey           },
+    { "syslog",            0, nullptr, xmrig::IConfig::SyslogKey         },
+    { "threads",           1, nullptr, xmrig::IConfig::ThreadsKey        },
+    { "url",               1, nullptr, xmrig::IConfig::UrlKey            },
+    { "user",              1, nullptr, xmrig::IConfig::UserKey           },
+    { "user-agent",        1, nullptr, xmrig::IConfig::UserAgentKey      },
+    { "userpass",          1, nullptr, xmrig::IConfig::UserpassKey       },
+    { "version",           0, nullptr, xmrig::IConfig::VersionKey        },
+    { 0, 0, 0, 0 }
+};
+
+
+static struct option const config_options[] = {
+    { "algo",          1, nullptr, xmrig::IConfig::AlgorithmKey   },
+    { "av",            1, nullptr, xmrig::IConfig::AVKey          },
+    { "background",    0, nullptr, xmrig::IConfig::BackgroundKey  },
+    { "colors",        0, nullptr, xmrig::IConfig::ColorKey       },
+    { "cpu-affinity",  1, nullptr, xmrig::IConfig::CPUAffinityKey },
+    { "cpu-priority",  1, nullptr, xmrig::IConfig::CPUPriorityKey },
+    { "donate-level",  1, nullptr, xmrig::IConfig::DonateLevelKey },
+    { "dry-run",       0, nullptr, xmrig::IConfig::DryRunKey      },
+    { "huge-pages",    0, nullptr, xmrig::IConfig::HugePagesKey   },
+    { "log-file",      1, nullptr, xmrig::IConfig::LogFileKey     },
+    { "max-cpu-usage", 1, nullptr, xmrig::IConfig::MaxCPUUsageKey },
+    { "print-time",    1, nullptr, xmrig::IConfig::PrintTimeKey   },
+    { "retries",       1, nullptr, xmrig::IConfig::RetriesKey     },
+    { "retry-pause",   1, nullptr, xmrig::IConfig::RetryPauseKey  },
+    { "safe",          0, nullptr, xmrig::IConfig::SafeKey        },
+    { "syslog",        0, nullptr, xmrig::IConfig::SyslogKey      },
+    { "threads",       1, nullptr, xmrig::IConfig::ThreadsKey     },
+    { "user-agent",    1, nullptr, xmrig::IConfig::UserAgentKey   },
+    { "hw-aes",        0, nullptr, xmrig::IConfig::HardwareAESKey },
+    { 0, 0, 0, 0 }
+};
+
+
+static struct option const pool_options[] = {
+    { "url",           1, nullptr, xmrig::IConfig::UrlKey        },
+    { "pass",          1, nullptr, xmrig::IConfig::PasswordKey   },
+    { "user",          1, nullptr, xmrig::IConfig::UserKey       },
+    { "userpass",      1, nullptr, xmrig::IConfig::UserpassKey   },
+    { "nicehash",      0, nullptr, xmrig::IConfig::NicehashKey   },
+    { "keepalive",     2, nullptr, xmrig::IConfig::KeepAliveKey  },
+    { "variant",       1, nullptr, xmrig::IConfig::VariantKey    },
+    { 0, 0, 0, 0 }
+};
+
+
+static struct option const api_options[] = {
+    { "port",          1, nullptr, xmrig::IConfig::ApiPort           },
+    { "access-token",  1, nullptr, xmrig::IConfig::ApiAccessTokenKey },
+    { "worker-id",     1, nullptr, xmrig::IConfig::ApiWorkerIdKey    },
+    { "ipv6",          0, nullptr, xmrig::IConfig::ApiIPv6Key        },
+    { "restricted",    0, nullptr, xmrig::IConfig::ApiRestrictedKey  },
+    { 0, 0, 0, 0 }
+};
+
+
+} /* namespace xmrig */
+
+#endif /* __CONFIGLOADER_PLATFORM_H__ */
--- a/src/core/Controller.cpp
+++ b/src/core/Controller.cpp
@@ -0,0 +1,151 @@
+/* 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 <assert.h>
+
+
+#include "common/config/ConfigLoader.h"
+#include "common/Platform.h"
+#include "core/Config.h"
+#include "core/Controller.h"
+#include "Cpu.h"
+#include "interfaces/IControllerListener.h"
+#include "log/ConsoleLog.h"
+#include "log/FileLog.h"
+#include "log/Log.h"
+#include "net/Network.h"
+
+
+#ifdef HAVE_SYSLOG_H
+#   include "log/SysLog.h"
+#endif
+
+
+class xmrig::ControllerPrivate
+{
+public:
+    inline ControllerPrivate() :
+        network(nullptr),
+        config(nullptr)
+    {}
+
+
+    inline ~ControllerPrivate()
+    {
+        delete network;
+        delete config;
+    }
+
+
+    Network *network;
+    std::vector<xmrig::IControllerListener *> listeners;
+    xmrig::Config *config;
+};
+
+
+xmrig::Controller::Controller()
+    : d_ptr(new ControllerPrivate())
+{
+}
+
+
+xmrig::Controller::~Controller()
+{
+    ConfigLoader::release();
+
+    delete d_ptr;
+}
+
+
+bool xmrig::Controller::isReady() const
+{
+    return d_ptr->config && d_ptr->network;
+}
+
+
+xmrig::Config *xmrig::Controller::config() const
+{
+    assert(d_ptr->config != nullptr);
+
+    return d_ptr->config;
+}
+
+
+int xmrig::Controller::init(int argc, char **argv)
+{
+    Cpu::init();
+
+    d_ptr->config = xmrig::Config::load(argc, argv, this);
+    if (!d_ptr->config) {
+        return 1;
+    }
+
+    Log::init();
+    Platform::init(config()->userAgent());
+    Platform::setProcessPriority(d_ptr->config->priority());
+
+    if (!config()->isBackground()) {
+        Log::add(new ConsoleLog(this));
+    }
+
+    if (config()->logFile()) {
+        Log::add(new FileLog(config()->logFile()));
+    }
+
+#   ifdef HAVE_SYSLOG_H
+    if (config()->isSyslog()) {
+        Log::add(new SysLog());
+    }
+#   endif
+
+    d_ptr->network = new Network(this);
+    return 0;
+}
+
+
+Network *xmrig::Controller::network() const
+{
+    assert(d_ptr->network != nullptr);
+
+    return d_ptr->network;
+}
+
+
+void xmrig::Controller::addListener(IControllerListener *listener)
+{
+    d_ptr->listeners.push_back(listener);
+}
+
+
+void xmrig::Controller::onNewConfig(IConfig *config)
+{
+    Config *previousConfig = d_ptr->config;
+    d_ptr->config = static_cast<Config*>(config);
+
+    for (xmrig::IControllerListener *listener : d_ptr->listeners) {
+        listener->onConfigChanged(d_ptr->config, previousConfig);
+    }
+
+    delete previousConfig;
+}
--- a/src/core/Controller.h
+++ b/src/core/Controller.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 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 __CONTROLLER_H__
+#define __CONTROLLER_H__
+
+
+#include "interfaces/IWatcherListener.h"
+
+
+class Network;
+class StatsData;
+
+
+namespace xmrig {
+
+
+class Config;
+class ControllerPrivate;
+class IControllerListener;
+
+
+class Controller : public IWatcherListener
+{
+public:
+    Controller();
+    ~Controller();
+
+    bool isReady() const;
+    Config *config() const;
+    int init(int argc, char **argv);
+    Network *network() const;
+    void addListener(IControllerListener *listener);
+
+protected:
+    void onNewConfig(IConfig *config) override;
+
+private:
+    ControllerPrivate *d_ptr;
+};
+
+} /* namespace xmrig */
+
+#endif /* __CONTROLLER_H__ */
--- a/src/crypto/CryptoNight.cpp
+++ b/src/crypto/CryptoNight.cpp
@@ -1,192 +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 2018      Lee Clagett <https://github.com/vtnerd>
- * 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 "crypto/CryptoNight.h"
-
-
-#if defined(XMRIG_ARM)
-#   include "crypto/CryptoNight_arm.h"
-#else
-#   include "crypto/CryptoNight_x86.h"
-#endif
-
-#include "crypto/CryptoNight_test.h"
-#include "net/Job.h"
-#include "net/JobResult.h"
-#include "Options.h"
-#include "xmrig.h"
-
-
-void (*cryptonight_hash_ctx)(const uint8_t *input, size_t size, uint8_t *output, cryptonight_ctx *ctx, int variant) = nullptr;
-
-
-#define CRYPTONIGHT_HASH(NAME, ITERATIONS, MEM, MASK, SOFT_AES) \
-    switch (variant) { \
-    case xmrig::VARIANT_V1: \
-        return cryptonight_##NAME##_hash<ITERATIONS, MEM, MASK, SOFT_AES, xmrig::VARIANT_V1>(input, size, output, ctx); \
-    \
-    case xmrig::VARIANT_NONE: \
-        return cryptonight_##NAME##_hash<ITERATIONS, MEM, MASK, SOFT_AES, xmrig::VARIANT_NONE>(input, size, output, ctx); \
-    \
-    default: \
-        break; \
-    }
-
-
-static void cryptonight_av1_aesni(const uint8_t *input, size_t size, uint8_t *output, struct cryptonight_ctx *ctx, int variant) {
-#   if !defined(XMRIG_ARMv7)
-    CRYPTONIGHT_HASH(single, MONERO_ITER, MONERO_MEMORY, MONERO_MASK, false)
-#   endif
-}
-
-
-static void cryptonight_av2_aesni_double(const uint8_t *input, size_t size, uint8_t *output, cryptonight_ctx *ctx, int variant) {
-#   if !defined(XMRIG_ARMv7)
-    CRYPTONIGHT_HASH(double, MONERO_ITER, MONERO_MEMORY, MONERO_MASK, false)
-#   endif
-}
-
-
-static void cryptonight_av3_softaes(const uint8_t *input, size_t size, uint8_t *output, cryptonight_ctx *ctx, int variant) {
-    CRYPTONIGHT_HASH(single, MONERO_ITER, MONERO_MEMORY, MONERO_MASK, true)
-}
-
-
-static void cryptonight_av4_softaes_double(const uint8_t *input, size_t size, uint8_t *output, cryptonight_ctx *ctx, int variant) {
-    CRYPTONIGHT_HASH(double, MONERO_ITER, MONERO_MEMORY, MONERO_MASK, true)
-}
-
-
-#ifndef XMRIG_NO_AEON
-static void cryptonight_lite_av1_aesni(const uint8_t *input, size_t size, uint8_t *output, cryptonight_ctx *ctx, int variant) {
-#   if !defined(XMRIG_ARMv7)
-    CRYPTONIGHT_HASH(single, AEON_ITER, AEON_MEMORY, AEON_MASK, false)
-#   endif
-}
-
-
-static void cryptonight_lite_av2_aesni_double(const uint8_t *input, size_t size, uint8_t *output, cryptonight_ctx *ctx, int variant) {
-#   if !defined(XMRIG_ARMv7)
-    CRYPTONIGHT_HASH(double, AEON_ITER, AEON_MEMORY, AEON_MASK, false)
-#   endif
-}
-
-
-static void cryptonight_lite_av3_softaes(const uint8_t *input, size_t size, uint8_t *output, cryptonight_ctx *ctx, int variant) {
-    CRYPTONIGHT_HASH(single, AEON_ITER, AEON_MEMORY, AEON_MASK, true)
-}
-
-
-static void cryptonight_lite_av4_softaes_double(const uint8_t *input, size_t size, uint8_t *output, cryptonight_ctx *ctx, int variant) {
-    CRYPTONIGHT_HASH(double, AEON_ITER, AEON_MEMORY, AEON_MASK, true)
-}
-
-void (*cryptonight_variations[8])(const uint8_t *input, size_t size, uint8_t *output, cryptonight_ctx *ctx, int variant) = {
-            cryptonight_av1_aesni,
-            cryptonight_av2_aesni_double,
-            cryptonight_av3_softaes,
-            cryptonight_av4_softaes_double,
-            cryptonight_lite_av1_aesni,
-            cryptonight_lite_av2_aesni_double,
-            cryptonight_lite_av3_softaes,
-            cryptonight_lite_av4_softaes_double
-        };
-#else
-void (*cryptonight_variations[4])(const uint8_t *input, size_t size, uint8_t *output, cryptonight_ctx *ctx, int variant) = {
-            cryptonight_av1_aesni,
-            cryptonight_av2_aesni_double,
-            cryptonight_av3_softaes,
-            cryptonight_av4_softaes_double
-        };
-#endif
-
-
-bool CryptoNight::hash(const Job &job, JobResult &result, cryptonight_ctx *ctx)
-{
-    cryptonight_hash_ctx(job.blob(), job.size(), result.result, ctx, job.variant());
-
-    return *reinterpret_cast<uint64_t*>(result.result + 24) < job.target();
-}
-
-
-bool CryptoNight::init(int algo, int variant)
-{
-    if (variant < 1 || variant > 4) {
-        return false;
-    }
-
-#   ifndef XMRIG_NO_AEON
-    const int index = algo == xmrig::ALGO_CRYPTONIGHT_LITE ? (variant + 3) : (variant - 1);
-#   else
-    const int index = variant - 1;
-#   endif
-
-    cryptonight_hash_ctx = cryptonight_variations[index];
-
-    return selfTest(algo);
-}
-
-
-void CryptoNight::hash(const uint8_t *input, size_t size, uint8_t *output, cryptonight_ctx *ctx, int variant)
-{
-    cryptonight_hash_ctx(input, size, output, ctx, variant);
-}
-
-
-bool CryptoNight::selfTest(int algo) {
-    if (cryptonight_hash_ctx == nullptr) {
-        return false;
-    }
-
-    uint8_t output[64];
-
-    struct cryptonight_ctx *ctx = static_cast<cryptonight_ctx *>(_mm_malloc(sizeof(cryptonight_ctx), 16));
-    ctx->memory = static_cast<uint8_t *>(_mm_malloc(MONERO_MEMORY * 2, 16));
-
-    cryptonight_hash_ctx(test_input, 76, output, ctx, 0);
-
-    const bool doubleHash = Options::i()->doubleHash();
-
-#   ifndef XMRIG_NO_AEON
-    bool rc = memcmp(output, algo == xmrig::ALGO_CRYPTONIGHT_LITE ? test_output_v0_lite : test_output_v0, (doubleHash ? 64 : 32)) == 0;
-#   else
-    bool rc = memcmp(output, test_output_v0, (doubleHash ? 64 : 32)) == 0;
-#   endif
-
-    if (rc) {
-        cryptonight_hash_ctx(test_input, 76, output, ctx, 1);
-
-#       ifndef XMRIG_NO_AEON
-        rc = memcmp(output, algo == xmrig::ALGO_CRYPTONIGHT_LITE ? test_output_v1_lite : test_output_v1, (doubleHash ? 64 : 32)) == 0;
-#       else
-        rc = memcmp(output, test_output_v1, (doubleHash ? 64 : 32)) == 0;
-#       endif
-    }
-
-    _mm_free(ctx->memory);
-    _mm_free(ctx);
-
-    return rc;
-}
--- a/src/crypto/CryptoNight.h
+++ b/src/crypto/CryptoNight.h
@@ -30,35 +30,10 @@
 #include <stdint.h>


-#define AEON_MEMORY   1048576
-#define AEON_MASK     0xFFFF0
-#define AEON_ITER     0x40000
-
-#define MONERO_MEMORY 2097152
-#define MONERO_MASK   0x1FFFF0
-#define MONERO_ITER   0x80000
-
-
 struct cryptonight_ctx {
-    alignas(16) uint8_t state0[200];
-    alignas(16) uint8_t state1[200];
+    alignas(16) uint8_t state[200];
    alignas(16) uint8_t* memory;
 };


-class Job;
-class JobResult;
-
-
-class CryptoNight
-{
-public:
-    static bool hash(const Job &job, JobResult &result, cryptonight_ctx *ctx);
-    static bool init(int algo, int variant);
-    static void hash(const uint8_t *input, size_t size, uint8_t *output, cryptonight_ctx *ctx, int variant);
-
-private:
-    static bool selfTest(int algo);
-};
-
 #endif /* __CRYPTONIGHT_H__ */
--- a/src/crypto/CryptoNight_arm.h
+++ b/src/crypto/CryptoNight_arm.h
@@ -27,14 +27,9 @@
 #define __CRYPTONIGHT_ARM_H__


-#if defined(XMRIG_ARM) && !defined(__clang__)
-#   include "aligned_malloc.h"
-#else
-#   include <mm_malloc.h>
-#endif
-
-
+#include "common/utils/mm_malloc.h"
 #include "crypto/CryptoNight.h"
+#include "crypto/CryptoNight_constants.h"
 #include "crypto/CryptoNight_monero.h"
 #include "crypto/soft_aes.h"

@@ -78,6 +73,19 @@ static inline __attribute__((always_inline)) __m128i _mm_set_epi64x(const uint64
 }


+#ifdef XMRIG_ARMv8
+static inline __attribute__((always_inline)) __m128i _mm_aesenc_si128(__m128i v, __m128i rkey)
+{
+    alignas(16) const __m128i zero = { 0 };
+    return veorq_u8(vaesmcq_u8(vaeseq_u8(v, zero)), rkey );
+}
+#else
+static inline __attribute__((always_inline)) __m128i _mm_aesenc_si128(__m128i v, __m128i rkey)
+{
+}
+#endif
+
+
 /* this one was not implemented yet so here it is */
 static inline __attribute__((always_inline)) uint64_t _mm_cvtsi128_si64(__m128i a)
 {
@@ -160,19 +168,19 @@ static inline void aes_genkey(const __m128i* memory, __m128i* k0, __m128i* k1, _
    *k0 = xout0;
    *k1 = xout2;

-    SOFT_AES ? soft_aes_genkey_sub<0x01>(&xout0, &xout2) : soft_aes_genkey_sub<0x01>(&xout0, &xout2);
+    soft_aes_genkey_sub<0x01>(&xout0, &xout2);
    *k2 = xout0;
    *k3 = xout2;

-    SOFT_AES ? soft_aes_genkey_sub<0x02>(&xout0, &xout2) : soft_aes_genkey_sub<0x02>(&xout0, &xout2);
+    soft_aes_genkey_sub<0x02>(&xout0, &xout2);
    *k4 = xout0;
    *k5 = xout2;

-    SOFT_AES ? soft_aes_genkey_sub<0x04>(&xout0, &xout2) : soft_aes_genkey_sub<0x04>(&xout0, &xout2);
+    soft_aes_genkey_sub<0x04>(&xout0, &xout2);
    *k6 = xout0;
    *k7 = xout2;

-    SOFT_AES ? soft_aes_genkey_sub<0x08>(&xout0, &xout2) : soft_aes_genkey_sub<0x08>(&xout0, &xout2);
+    soft_aes_genkey_sub<0x08>(&xout0, &xout2);
    *k8 = xout0;
    *k9 = xout2;
 }
@@ -191,22 +199,34 @@ static inline void aes_round(__m128i key, __m128i* x0, __m128i* x1, __m128i* x2,
        *x6 = soft_aesenc((uint32_t*)x6, key);
        *x7 = soft_aesenc((uint32_t*)x7, key);
    }
-#   ifndef XMRIG_ARMv7
    else {
-        *x0 = vaesmcq_u8(vaeseq_u8(*((uint8x16_t *) x0), key));
-        *x1 = vaesmcq_u8(vaeseq_u8(*((uint8x16_t *) x1), key));
-        *x2 = vaesmcq_u8(vaeseq_u8(*((uint8x16_t *) x2), key));
-        *x3 = vaesmcq_u8(vaeseq_u8(*((uint8x16_t *) x3), key));
-        *x4 = vaesmcq_u8(vaeseq_u8(*((uint8x16_t *) x4), key));
-        *x5 = vaesmcq_u8(vaeseq_u8(*((uint8x16_t *) x5), key));
-        *x6 = vaesmcq_u8(vaeseq_u8(*((uint8x16_t *) x6), key));
-        *x7 = vaesmcq_u8(vaeseq_u8(*((uint8x16_t *) x7), key));
+        *x0 = _mm_aesenc_si128(*x0, key);
+        *x1 = _mm_aesenc_si128(*x1, key);
+        *x2 = _mm_aesenc_si128(*x2, key);
+        *x3 = _mm_aesenc_si128(*x3, key);
+        *x4 = _mm_aesenc_si128(*x4, key);
+        *x5 = _mm_aesenc_si128(*x5, key);
+        *x6 = _mm_aesenc_si128(*x6, key);
+        *x7 = _mm_aesenc_si128(*x7, key);
    }
-#   endif
 }


-template<size_t MEM, bool SOFT_AES>
+inline void mix_and_propagate(__m128i& x0, __m128i& x1, __m128i& x2, __m128i& x3, __m128i& x4, __m128i& x5, __m128i& x6, __m128i& x7)
+{
+    __m128i tmp0 = x0;
+    x0 = _mm_xor_si128(x0, x1);
+    x1 = _mm_xor_si128(x1, x2);
+    x2 = _mm_xor_si128(x2, x3);
+    x3 = _mm_xor_si128(x3, x4);
+    x4 = _mm_xor_si128(x4, x5);
+    x5 = _mm_xor_si128(x5, x6);
+    x6 = _mm_xor_si128(x6, x7);
+    x7 = _mm_xor_si128(x7, tmp0);
+}
+
+
+template<xmrig::Algo ALGO, size_t MEM, bool SOFT_AES>
 static inline void cn_explode_scratchpad(const __m128i *input, __m128i *output)
 {
    __m128i xin0, xin1, xin2, xin3, xin4, xin5, xin6, xin7;
@@ -223,11 +243,24 @@ static inline void cn_explode_scratchpad(const __m128i *input, __m128i *output)
    xin6 = _mm_load_si128(input + 10);
    xin7 = _mm_load_si128(input + 11);

-    for (size_t i = 0; i < MEM / sizeof(__m128i); i += 8) {
-        if (!SOFT_AES) {
-            aes_round<SOFT_AES>(_mm_setzero_si128(), &xin0, &xin1, &xin2, &xin3, &xin4, &xin5, &xin6, &xin7);
-        }
+    if (ALGO == xmrig::CRYPTONIGHT_HEAVY) {
+        for (size_t i = 0; i < 16; i++) {
+            aes_round<SOFT_AES>(k0, &xin0, &xin1, &xin2, &xin3, &xin4, &xin5, &xin6, &xin7);
+            aes_round<SOFT_AES>(k1, &xin0, &xin1, &xin2, &xin3, &xin4, &xin5, &xin6, &xin7);
+            aes_round<SOFT_AES>(k2, &xin0, &xin1, &xin2, &xin3, &xin4, &xin5, &xin6, &xin7);
+            aes_round<SOFT_AES>(k3, &xin0, &xin1, &xin2, &xin3, &xin4, &xin5, &xin6, &xin7);
+            aes_round<SOFT_AES>(k4, &xin0, &xin1, &xin2, &xin3, &xin4, &xin5, &xin6, &xin7);
+            aes_round<SOFT_AES>(k5, &xin0, &xin1, &xin2, &xin3, &xin4, &xin5, &xin6, &xin7);
+            aes_round<SOFT_AES>(k6, &xin0, &xin1, &xin2, &xin3, &xin4, &xin5, &xin6, &xin7);
+            aes_round<SOFT_AES>(k7, &xin0, &xin1, &xin2, &xin3, &xin4, &xin5, &xin6, &xin7);
+            aes_round<SOFT_AES>(k8, &xin0, &xin1, &xin2, &xin3, &xin4, &xin5, &xin6, &xin7);
+            aes_round<SOFT_AES>(k9, &xin0, &xin1, &xin2, &xin3, &xin4, &xin5, &xin6, &xin7);

+            mix_and_propagate(xin0, xin1, xin2, xin3, xin4, xin5, xin6, xin7);
+        }
+    }
+
+    for (size_t i = 0; i < MEM / sizeof(__m128i); i += 8) {
        aes_round<SOFT_AES>(k0, &xin0, &xin1, &xin2, &xin3, &xin4, &xin5, &xin6, &xin7);
        aes_round<SOFT_AES>(k1, &xin0, &xin1, &xin2, &xin3, &xin4, &xin5, &xin6, &xin7);
        aes_round<SOFT_AES>(k2, &xin0, &xin1, &xin2, &xin3, &xin4, &xin5, &xin6, &xin7);
@@ -237,20 +270,7 @@ static inline void cn_explode_scratchpad(const __m128i *input, __m128i *output)
        aes_round<SOFT_AES>(k6, &xin0, &xin1, &xin2, &xin3, &xin4, &xin5, &xin6, &xin7);
        aes_round<SOFT_AES>(k7, &xin0, &xin1, &xin2, &xin3, &xin4, &xin5, &xin6, &xin7);
        aes_round<SOFT_AES>(k8, &xin0, &xin1, &xin2, &xin3, &xin4, &xin5, &xin6, &xin7);
-
-        if (!SOFT_AES) {
-            xin0 ^= k9;
-            xin1 ^= k9;
-            xin2 ^= k9;
-            xin3 ^= k9;
-            xin4 ^= k9;
-            xin5 ^= k9;
-            xin6 ^= k9;
-            xin7 ^= k9;
-        }
-        else {
-            aes_round<SOFT_AES>(k9, &xin0, &xin1, &xin2, &xin3, &xin4, &xin5, &xin6, &xin7);
-        }
+        aes_round<SOFT_AES>(k9, &xin0, &xin1, &xin2, &xin3, &xin4, &xin5, &xin6, &xin7);

        _mm_store_si128(output + i + 0, xin0);
        _mm_store_si128(output + i + 1, xin1);
@@ -264,7 +284,7 @@ static inline void cn_explode_scratchpad(const __m128i *input, __m128i *output)
 }


-template<size_t MEM, bool SOFT_AES>
+template<xmrig::Algo ALGO, size_t MEM, bool SOFT_AES>
 static inline void cn_implode_scratchpad(const __m128i *input, __m128i *output)
 {
    __m128i xout0, xout1, xout2, xout3, xout4, xout5, xout6, xout7;
@@ -292,10 +312,6 @@ static inline void cn_implode_scratchpad(const __m128i *input, __m128i *output)
        xout6 = _mm_xor_si128(_mm_load_si128(input + i + 6), xout6);
        xout7 = _mm_xor_si128(_mm_load_si128(input + i + 7), xout7);

-        if (!SOFT_AES) {
-            aes_round<SOFT_AES>(_mm_setzero_si128(), &xout0, &xout1, &xout2, &xout3, &xout4, &xout5, &xout6, &xout7);
-        }
-
        aes_round<SOFT_AES>(k0, &xout0, &xout1, &xout2, &xout3, &xout4, &xout5, &xout6, &xout7);
        aes_round<SOFT_AES>(k1, &xout0, &xout1, &xout2, &xout3, &xout4, &xout5, &xout6, &xout7);
        aes_round<SOFT_AES>(k2, &xout0, &xout1, &xout2, &xout3, &xout4, &xout5, &xout6, &xout7);
@@ -305,19 +321,51 @@ static inline void cn_implode_scratchpad(const __m128i *input, __m128i *output)
        aes_round<SOFT_AES>(k6, &xout0, &xout1, &xout2, &xout3, &xout4, &xout5, &xout6, &xout7);
        aes_round<SOFT_AES>(k7, &xout0, &xout1, &xout2, &xout3, &xout4, &xout5, &xout6, &xout7);
        aes_round<SOFT_AES>(k8, &xout0, &xout1, &xout2, &xout3, &xout4, &xout5, &xout6, &xout7);
+        aes_round<SOFT_AES>(k9, &xout0, &xout1, &xout2, &xout3, &xout4, &xout5, &xout6, &xout7);

-        if (!SOFT_AES) {
-            xout0 ^= k9;
-            xout1 ^= k9;
-            xout2 ^= k9;
-            xout3 ^= k9;
-            xout4 ^= k9;
-            xout5 ^= k9;
-            xout6 ^= k9;
-            xout7 ^= k9;
+        if (ALGO == xmrig::CRYPTONIGHT_HEAVY) {
+            mix_and_propagate(xout0, xout1, xout2, xout3, xout4, xout5, xout6, xout7);
        }
-        else {
+    }
+
+    if (ALGO == xmrig::CRYPTONIGHT_HEAVY) {
+        for (size_t i = 0; i < MEM / sizeof(__m128i); i += 8) {
+            xout0 = _mm_xor_si128(_mm_load_si128(input + i + 0), xout0);
+            xout1 = _mm_xor_si128(_mm_load_si128(input + i + 1), xout1);
+            xout2 = _mm_xor_si128(_mm_load_si128(input + i + 2), xout2);
+            xout3 = _mm_xor_si128(_mm_load_si128(input + i + 3), xout3);
+            xout4 = _mm_xor_si128(_mm_load_si128(input + i + 4), xout4);
+            xout5 = _mm_xor_si128(_mm_load_si128(input + i + 5), xout5);
+            xout6 = _mm_xor_si128(_mm_load_si128(input + i + 6), xout6);
+            xout7 = _mm_xor_si128(_mm_load_si128(input + i + 7), xout7);
+
+            aes_round<SOFT_AES>(k0, &xout0, &xout1, &xout2, &xout3, &xout4, &xout5, &xout6, &xout7);
+            aes_round<SOFT_AES>(k1, &xout0, &xout1, &xout2, &xout3, &xout4, &xout5, &xout6, &xout7);
+            aes_round<SOFT_AES>(k2, &xout0, &xout1, &xout2, &xout3, &xout4, &xout5, &xout6, &xout7);
+            aes_round<SOFT_AES>(k3, &xout0, &xout1, &xout2, &xout3, &xout4, &xout5, &xout6, &xout7);
+            aes_round<SOFT_AES>(k4, &xout0, &xout1, &xout2, &xout3, &xout4, &xout5, &xout6, &xout7);
+            aes_round<SOFT_AES>(k5, &xout0, &xout1, &xout2, &xout3, &xout4, &xout5, &xout6, &xout7);
+            aes_round<SOFT_AES>(k6, &xout0, &xout1, &xout2, &xout3, &xout4, &xout5, &xout6, &xout7);
+            aes_round<SOFT_AES>(k7, &xout0, &xout1, &xout2, &xout3, &xout4, &xout5, &xout6, &xout7);
+            aes_round<SOFT_AES>(k8, &xout0, &xout1, &xout2, &xout3, &xout4, &xout5, &xout6, &xout7);
            aes_round<SOFT_AES>(k9, &xout0, &xout1, &xout2, &xout3, &xout4, &xout5, &xout6, &xout7);
+
+            mix_and_propagate(xout0, xout1, xout2, xout3, xout4, xout5, xout6, xout7);
+        }
+
+        for (size_t i = 0; i < 16; i++) {
+            aes_round<SOFT_AES>(k0, &xout0, &xout1, &xout2, &xout3, &xout4, &xout5, &xout6, &xout7);
+            aes_round<SOFT_AES>(k1, &xout0, &xout1, &xout2, &xout3, &xout4, &xout5, &xout6, &xout7);
+            aes_round<SOFT_AES>(k2, &xout0, &xout1, &xout2, &xout3, &xout4, &xout5, &xout6, &xout7);
+            aes_round<SOFT_AES>(k3, &xout0, &xout1, &xout2, &xout3, &xout4, &xout5, &xout6, &xout7);
+            aes_round<SOFT_AES>(k4, &xout0, &xout1, &xout2, &xout3, &xout4, &xout5, &xout6, &xout7);
+            aes_round<SOFT_AES>(k5, &xout0, &xout1, &xout2, &xout3, &xout4, &xout5, &xout6, &xout7);
+            aes_round<SOFT_AES>(k6, &xout0, &xout1, &xout2, &xout3, &xout4, &xout5, &xout6, &xout7);
+            aes_round<SOFT_AES>(k7, &xout0, &xout1, &xout2, &xout3, &xout4, &xout5, &xout6, &xout7);
+            aes_round<SOFT_AES>(k8, &xout0, &xout1, &xout2, &xout3, &xout4, &xout5, &xout6, &xout7);
+            aes_round<SOFT_AES>(k9, &xout0, &xout1, &xout2, &xout3, &xout4, &xout5, &xout6, &xout7);
+
+            mix_and_propagate(xout0, xout1, xout2, xout3, xout4, xout5, xout6, xout7);
        }
    }

@@ -332,17 +380,41 @@ static inline void cn_implode_scratchpad(const __m128i *input, __m128i *output)
 }


-template<size_t ITERATIONS, size_t MEM, size_t MASK, bool SOFT_AES, int VARIANT>
-inline void cryptonight_single_hash(const uint8_t *__restrict__ input, size_t size, uint8_t *__restrict__ output, cryptonight_ctx *__restrict__ ctx)
+static inline void cryptonight_monero_tweak(uint64_t* mem_out, __m128i tmp)
 {
-    keccak(input, (int) size, ctx->state0, 200);
+    mem_out[0] = EXTRACT64(tmp);
+
+    uint64_t vh = vgetq_lane_u64(tmp, 1);
+
+    uint8_t x = vh >> 24;
+    static const uint16_t table = 0x7531;
+    const uint8_t index = (((x >> 3) & 6) | (x & 1)) << 1;
+    vh ^= ((table >> index) & 0x3) << 28;
+
+    mem_out[1] = vh;
+}
+
+
+template<xmrig::Algo ALGO, bool SOFT_AES, int VARIANT>
+inline void cryptonight_single_hash(const uint8_t *__restrict__ input, size_t size, uint8_t *__restrict__ output, cryptonight_ctx **__restrict__ ctx)
+{
+    constexpr size_t MASK       = xmrig::cn_select_mask<ALGO>();
+    constexpr size_t ITERATIONS = xmrig::cn_select_iter<ALGO>();
+    constexpr size_t MEM        = xmrig::cn_select_memory<ALGO>();
+
+    if (VARIANT > 0 && size < 43) {
+        memset(output, 0, 32);
+        return;
+    }
+
+    keccak(input, (int) size, ctx[0]->state, 200);

    VARIANT1_INIT(0);

-    cn_explode_scratchpad<MEM, SOFT_AES>((__m128i*) ctx->state0, (__m128i*) ctx->memory);
+    cn_explode_scratchpad<ALGO, MEM, SOFT_AES>((__m128i*) ctx[0]->state, (__m128i*) ctx[0]->memory);

-    const uint8_t* l0 = ctx->memory;
-    uint64_t* h0 = reinterpret_cast<uint64_t*>(ctx->state0);
+    const uint8_t* l0 = ctx[0]->memory;
+    uint64_t* h0 = reinterpret_cast<uint64_t*>(ctx[0]->state);

    uint64_t al0 = h0[0] ^ h0[4];
    uint64_t ah0 = h0[1] ^ h0[5];
@@ -358,13 +430,15 @@ inline void cryptonight_single_hash(const uint8_t *__restrict__ input, size_t si
        }
        else {
            cx = _mm_load_si128((__m128i *) &l0[idx0 & MASK]);
-#           ifndef XMRIG_ARMv7
-            cx = vreinterpretq_m128i_u8(vaesmcq_u8(vaeseq_u8(cx, vdupq_n_u8(0)))) ^ _mm_set_epi64x(ah0, al0);
-#           endif
+            cx = _mm_aesenc_si128(cx, _mm_set_epi64x(ah0, al0));
+        }
+
+        if (VARIANT > 0) {
+            cryptonight_monero_tweak((uint64_t*)&l0[idx0 & MASK], _mm_xor_si128(bx0, cx));
+        } else {
+            _mm_store_si128((__m128i *)&l0[idx0 & MASK], _mm_xor_si128(bx0, cx));
        }

-        _mm_store_si128((__m128i *) &l0[idx0 & MASK], _mm_xor_si128(bx0, cx));
-        VARIANT1_1(&l0[idx0 & MASK]);
        idx0 = EXTRACT64(cx);
        bx0 = cx;

@@ -384,31 +458,49 @@ inline void cryptonight_single_hash(const uint8_t *__restrict__ input, size_t si
        ah0 ^= ch;
        al0 ^= cl;
        idx0 = al0;
+
+        if (ALGO == xmrig::CRYPTONIGHT_HEAVY) {
+            int64_t n  = ((int64_t*)&l0[idx0 & MASK])[0];
+            int32_t d  = ((int32_t*)&l0[idx0 & MASK])[2];
+            int64_t q = n / (d | 0x5);
+
+            ((int64_t*)&l0[idx0 & MASK])[0] = n ^ q;
+            idx0 = d ^ q;
+        }
    }

-    cn_implode_scratchpad<MEM, SOFT_AES>((__m128i*) ctx->memory, (__m128i*) ctx->state0);
+    cn_implode_scratchpad<ALGO, MEM, SOFT_AES>((__m128i*) ctx[0]->memory, (__m128i*) ctx[0]->state);

    keccakf(h0, 24);
-    extra_hashes[ctx->state0[0] & 3](ctx->state0, 200, output);
+    extra_hashes[ctx[0]->state[0] & 3](ctx[0]->state, 200, output);
 }


-template<size_t ITERATIONS, size_t MEM, size_t MASK, bool SOFT_AES, int VARIANT>
-inline void cryptonight_double_hash(const uint8_t *__restrict__ input, size_t size, uint8_t *__restrict__ output, struct cryptonight_ctx *__restrict__ ctx)
+template<xmrig::Algo ALGO, bool SOFT_AES, int VARIANT>
+inline void cryptonight_double_hash(const uint8_t *__restrict__ input, size_t size, uint8_t *__restrict__ output, struct cryptonight_ctx **__restrict__ ctx)
 {
-    keccak(input,        (int) size, ctx->state0, 200);
-    keccak(input + size, (int) size, ctx->state1, 200);
+    constexpr size_t MASK       = xmrig::cn_select_mask<ALGO>();
+    constexpr size_t ITERATIONS = xmrig::cn_select_iter<ALGO>();
+    constexpr size_t MEM        = xmrig::cn_select_memory<ALGO>();
+
+    if (VARIANT > 0 && size < 43) {
+        memset(output, 0, 64);
+        return;
+    }
+
+    keccak(input,        (int) size, ctx[0]->state, 200);
+    keccak(input + size, (int) size, ctx[1]->state, 200);

    VARIANT1_INIT(0);
    VARIANT1_INIT(1);

-    const uint8_t* l0 = ctx->memory;
-    const uint8_t* l1 = ctx->memory + MEM;
-    uint64_t* h0 = reinterpret_cast<uint64_t*>(ctx->state0);
-    uint64_t* h1 = reinterpret_cast<uint64_t*>(ctx->state1);
+    const uint8_t* l0 = ctx[0]->memory;
+    const uint8_t* l1 = ctx[1]->memory;
+    uint64_t* h0 = reinterpret_cast<uint64_t*>(ctx[0]->state);
+    uint64_t* h1 = reinterpret_cast<uint64_t*>(ctx[1]->state);

-    cn_explode_scratchpad<MEM, SOFT_AES>((__m128i*) h0, (__m128i*) l0);
-    cn_explode_scratchpad<MEM, SOFT_AES>((__m128i*) h1, (__m128i*) l1);
+    cn_explode_scratchpad<ALGO, MEM, SOFT_AES>((__m128i*) h0, (__m128i*) l0);
+    cn_explode_scratchpad<ALGO, MEM, SOFT_AES>((__m128i*) h1, (__m128i*) l1);

    uint64_t al0 = h0[0] ^ h0[4];
    uint64_t al1 = h1[0] ^ h1[4];
@@ -431,16 +523,17 @@ inline void cryptonight_double_hash(const uint8_t *__restrict__ input, size_t si
        else {
            cx0 = _mm_load_si128((__m128i *) &l0[idx0 & MASK]);
            cx1 = _mm_load_si128((__m128i *) &l1[idx1 & MASK]);
-#           ifndef XMRIG_ARMv7
-            cx0 = vreinterpretq_m128i_u8(vaesmcq_u8(vaeseq_u8(cx0, vdupq_n_u8(0)))) ^ _mm_set_epi64x(ah0, al0);
-            cx1 = vreinterpretq_m128i_u8(vaesmcq_u8(vaeseq_u8(cx1, vdupq_n_u8(0)))) ^ _mm_set_epi64x(ah1, al1);
-#           endif
+            cx0 = _mm_aesenc_si128(cx0, _mm_set_epi64x(ah0, al0));
+            cx1 = _mm_aesenc_si128(cx1, _mm_set_epi64x(ah1, al1));
        }

-        _mm_store_si128((__m128i *) &l0[idx0 & MASK], _mm_xor_si128(bx0, cx0));
-        _mm_store_si128((__m128i *) &l1[idx1 & MASK], _mm_xor_si128(bx1, cx1));
-        VARIANT1_1(&l0[idx0 & MASK]);
-        VARIANT1_1(&l1[idx1 & MASK]);
+        if (VARIANT > 0) {
+            cryptonight_monero_tweak((uint64_t*)&l0[idx0 & MASK], _mm_xor_si128(bx0, cx0));
+            cryptonight_monero_tweak((uint64_t*)&l1[idx1 & MASK], _mm_xor_si128(bx1, cx1));
+        } else {
+            _mm_store_si128((__m128i *) &l0[idx0 & MASK], _mm_xor_si128(bx0, cx0));
+            _mm_store_si128((__m128i *) &l1[idx1 & MASK], _mm_xor_si128(bx1, cx1));
+        };

        idx0 = EXTRACT64(cx0);
        idx1 = EXTRACT64(cx1);
@@ -465,6 +558,15 @@ inline void cryptonight_double_hash(const uint8_t *__restrict__ input, size_t si
        al0 ^= cl;
        idx0 = al0;

+        if (ALGO == xmrig::CRYPTONIGHT_HEAVY) {
+            int64_t n  = ((int64_t*)&l0[idx0 & MASK])[0];
+            int32_t d  = ((int32_t*)&l0[idx0 & MASK])[2];
+            int64_t q = n / (d | 0x5);
+
+            ((int64_t*)&l0[idx0 & MASK])[0] = n ^ q;
+            idx0 = d ^ q;
+        }
+
        cl = ((uint64_t*) &l1[idx1 & MASK])[0];
        ch = ((uint64_t*) &l1[idx1 & MASK])[1];
        lo = __umul128(idx1, cl, &hi);
@@ -480,16 +582,43 @@ inline void cryptonight_double_hash(const uint8_t *__restrict__ input, size_t si
        ah1 ^= ch;
        al1 ^= cl;
        idx1 = al1;
+
+        if (ALGO == xmrig::CRYPTONIGHT_HEAVY) {
+            int64_t n  = ((int64_t*)&l1[idx1 & MASK])[0];
+            int32_t d  = ((int32_t*)&l1[idx1 & MASK])[2];
+            int64_t q = n / (d | 0x5);
+
+            ((int64_t*)&l1[idx1 & MASK])[0] = n ^ q;
+            idx1 = d ^ q;
+        }
    }

-    cn_implode_scratchpad<MEM, SOFT_AES>((__m128i*) l0, (__m128i*) h0);
-    cn_implode_scratchpad<MEM, SOFT_AES>((__m128i*) l1, (__m128i*) h1);
+    cn_implode_scratchpad<ALGO, MEM, SOFT_AES>((__m128i*) l0, (__m128i*) h0);
+    cn_implode_scratchpad<ALGO, MEM, SOFT_AES>((__m128i*) l1, (__m128i*) h1);

    keccakf(h0, 24);
    keccakf(h1, 24);

-    extra_hashes[ctx->state0[0] & 3](ctx->state0, 200, output);
-    extra_hashes[ctx->state1[0] & 3](ctx->state1, 200, output + 32);
+    extra_hashes[ctx[0]->state[0] & 3](ctx[0]->state, 200, output);
+    extra_hashes[ctx[1]->state[0] & 3](ctx[1]->state, 200, output + 32);
+}
+
+
+template<xmrig::Algo ALGO, bool SOFT_AES, int VARIANT>
+inline void cryptonight_triple_hash(const uint8_t *__restrict__ input, size_t size, uint8_t *__restrict__ output, struct cryptonight_ctx **__restrict__ ctx)
+{
+}
+
+
+template<xmrig::Algo ALGO, bool SOFT_AES, int VARIANT>
+inline void cryptonight_quad_hash(const uint8_t *__restrict__ input, size_t size, uint8_t *__restrict__ output, struct cryptonight_ctx **__restrict__ ctx)
+{
+}
+
+
+template<xmrig::Algo ALGO, bool SOFT_AES, int VARIANT>
+inline void cryptonight_penta_hash(const uint8_t *__restrict__ input, size_t size, uint8_t *__restrict__ output, struct cryptonight_ctx **__restrict__ ctx)
+{
 }

 #endif /* __CRYPTONIGHT_ARM_H__ */
--- a/src/crypto/CryptoNight_constants.h
+++ b/src/crypto/CryptoNight_constants.h
@@ -0,0 +1,132 @@
+/* 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 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 __CRYPTONIGHT_CONSTANTS_H__
+#define __CRYPTONIGHT_CONSTANTS_H__
+
+
+#include <stdint.h>
+
+
+#include "common/xmrig.h"
+
+
+namespace xmrig
+{
+
+constexpr const size_t   CRYPTONIGHT_MEMORY       = 2 * 1024 * 1024;
+constexpr const uint32_t CRYPTONIGHT_MASK         = 0x1FFFF0;
+constexpr const uint32_t CRYPTONIGHT_ITER         = 0x80000;
+
+constexpr const size_t   CRYPTONIGHT_LITE_MEMORY  = 1 * 1024 * 1024;
+constexpr const uint32_t CRYPTONIGHT_LITE_MASK    = 0xFFFF0;
+constexpr const uint32_t CRYPTONIGHT_LITE_ITER    = 0x40000;
+
+constexpr const size_t   CRYPTONIGHT_HEAVY_MEMORY = 4 * 1024 * 1024;
+constexpr const uint32_t CRYPTONIGHT_HEAVY_MASK   = 0x3FFFF0;
+constexpr const uint32_t CRYPTONIGHT_HEAVY_ITER   = 0x40000;
+
+
+template<Algo ALGO> inline constexpr size_t cn_select_memory()           { return 0; }
+template<> inline constexpr size_t cn_select_memory<CRYPTONIGHT>()       { return CRYPTONIGHT_MEMORY; }
+template<> inline constexpr size_t cn_select_memory<CRYPTONIGHT_LITE>()  { return CRYPTONIGHT_LITE_MEMORY; }
+template<> inline constexpr size_t cn_select_memory<CRYPTONIGHT_HEAVY>() { return CRYPTONIGHT_HEAVY_MEMORY; }
+
+inline size_t cn_select_memory(Algo algorithm)
+{
+    switch(algorithm)
+    {
+    case CRYPTONIGHT:
+        return CRYPTONIGHT_MEMORY;
+
+    case CRYPTONIGHT_LITE:
+        return CRYPTONIGHT_LITE_MEMORY;
+
+    case CRYPTONIGHT_HEAVY:
+        return CRYPTONIGHT_HEAVY_MEMORY;
+
+    default:
+        break;
+    }
+
+    return 0;
+}
+
+
+template<Algo ALGO> inline constexpr uint32_t cn_select_mask()           { return 0; }
+template<> inline constexpr uint32_t cn_select_mask<CRYPTONIGHT>()       { return CRYPTONIGHT_MASK; }
+template<> inline constexpr uint32_t cn_select_mask<CRYPTONIGHT_LITE>()  { return CRYPTONIGHT_LITE_MASK; }
+template<> inline constexpr uint32_t cn_select_mask<CRYPTONIGHT_HEAVY>() { return CRYPTONIGHT_HEAVY_MASK; }
+
+inline uint32_t cn_select_mask(Algo algorithm)
+{
+    switch(algorithm)
+    {
+    case CRYPTONIGHT:
+        return CRYPTONIGHT_MASK;
+
+    case CRYPTONIGHT_LITE:
+        return CRYPTONIGHT_LITE_MASK;
+
+    case CRYPTONIGHT_HEAVY:
+        return CRYPTONIGHT_HEAVY_MASK;
+
+    default:
+        break;
+    }
+
+    return 0;
+}
+
+
+template<Algo ALGO> inline constexpr uint32_t cn_select_iter()           { return 0; }
+template<> inline constexpr uint32_t cn_select_iter<CRYPTONIGHT>()       { return CRYPTONIGHT_ITER; }
+template<> inline constexpr uint32_t cn_select_iter<CRYPTONIGHT_LITE>()  { return CRYPTONIGHT_LITE_ITER; }
+template<> inline constexpr uint32_t cn_select_iter<CRYPTONIGHT_HEAVY>() { return CRYPTONIGHT_HEAVY_ITER; }
+
+inline uint32_t cn_select_iter(Algo algorithm)
+{
+    switch(algorithm)
+    {
+    case CRYPTONIGHT:
+        return CRYPTONIGHT_ITER;
+
+    case CRYPTONIGHT_LITE:
+        return CRYPTONIGHT_LITE_ITER;
+
+    case CRYPTONIGHT_HEAVY:
+        return CRYPTONIGHT_HEAVY_ITER;
+
+    default:
+        break;
+    }
+
+    return 0;
+}
+
+
+} /* namespace xmrig */
+
+
+#endif /* __CRYPTONIGHT_CONSTANTS_H__ */
--- a/src/crypto/CryptoNight_monero.h
+++ b/src/crypto/CryptoNight_monero.h
@@ -32,14 +32,14 @@
    uint64_t tweak1_2_##part = 0; \
    if (VARIANT > 0) { \
        tweak1_2_##part = (*reinterpret_cast<const uint64_t*>(input + 35 + part * size) ^ \
-                          *(reinterpret_cast<const uint64_t*>(ctx->state##part) + 24)); \
+                          *(reinterpret_cast<const uint64_t*>(ctx[part]->state) + 24)); \
    }
 #else
 #   define VARIANT1_INIT(part) \
    uint64_t tweak1_2_##part = 0; \
    if (VARIANT > 0) { \
        volatile const uint64_t a = *reinterpret_cast<const uint64_t*>(input + 35 + part * size); \
-        volatile const uint64_t b = *(reinterpret_cast<const uint64_t*>(ctx->state##part) + 24); \
+        volatile const uint64_t b = *(reinterpret_cast<const uint64_t*>(ctx[part]->state) + 24); \
        tweak1_2_##part = a ^ b; \
    }
 #endif
--- a/src/crypto/CryptoNight_test.h
+++ b/src/crypto/CryptoNight_test.h
@@ -26,52 +26,107 @@
 #define __CRYPTONIGHT_TEST_H__


-const static uint8_t test_input[152] = {
+const static uint8_t test_input[380] = {
+    0x03, 0x05, 0xA0, 0xDB, 0xD6, 0xBF, 0x05, 0xCF, 0x16, 0xE5, 0x03, 0xF3, 0xA6, 0x6F, 0x78, 0x00,
+    0x7C, 0xBF, 0x34, 0x14, 0x43, 0x32, 0xEC, 0xBF, 0xC2, 0x2E, 0xD9, 0x5C, 0x87, 0x00, 0x38, 0x3B,
+    0x30, 0x9A, 0xCE, 0x19, 0x23, 0xA0, 0x96, 0x4B, 0x00, 0x00, 0x00, 0x08, 0xBA, 0x93, 0x9A, 0x62,
+    0x72, 0x4C, 0x0D, 0x75, 0x81, 0xFC, 0xE5, 0x76, 0x1E, 0x9D, 0x8A, 0x0E, 0x6A, 0x1C, 0x3F, 0x92,
+    0x4F, 0xDD, 0x84, 0x93, 0xD1, 0x11, 0x56, 0x49, 0xC0, 0x5E, 0xB6, 0x01,
    0x01, 0x00, 0xFB, 0x8E, 0x8A, 0xC8, 0x05, 0x89, 0x93, 0x23, 0x37, 0x1B, 0xB7, 0x90, 0xDB, 0x19,
    0x21, 0x8A, 0xFD, 0x8D, 0xB8, 0xE3, 0x75, 0x5D, 0x8B, 0x90, 0xF3, 0x9B, 0x3D, 0x55, 0x06, 0xA9,
    0xAB, 0xCE, 0x4F, 0xA9, 0x12, 0x24, 0x45, 0x00, 0x00, 0x00, 0x00, 0xEE, 0x81, 0x46, 0xD4, 0x9F,
    0xA9, 0x3E, 0xE7, 0x24, 0xDE, 0xB5, 0x7D, 0x12, 0xCB, 0xC6, 0xC6, 0xF3, 0xB9, 0x24, 0xD9, 0x46,
    0x12, 0x7C, 0x7A, 0x97, 0x41, 0x8F, 0x93, 0x48, 0x82, 0x8F, 0x0F, 0x02,
-    0x03, 0x05, 0xA0, 0xDB, 0xD6, 0xBF, 0x05, 0xCF, 0x16, 0xE5, 0x03, 0xF3, 0xA6, 0x6F, 0x78, 0x00,
-    0x7C, 0xBF, 0x34, 0x14, 0x43, 0x32, 0xEC, 0xBF, 0xC2, 0x2E, 0xD9, 0x5C, 0x87, 0x00, 0x38, 0x3B,
-    0x30, 0x9A, 0xCE, 0x19, 0x23, 0xA0, 0x96, 0x4B, 0x00, 0x00, 0x00, 0x08, 0xBA, 0x93, 0x9A, 0x62,
-    0x72, 0x4C, 0x0D, 0x75, 0x81, 0xFC, 0xE5, 0x76, 0x1E, 0x9D, 0x8A, 0x0E, 0x6A, 0x1C, 0x3F, 0x92,
-    0x4F, 0xDD, 0x84, 0x93, 0xD1, 0x11, 0x56, 0x49, 0xC0, 0x5E, 0xB6, 0x01
+    0x07, 0x07, 0xB4, 0x87, 0xD0, 0xD6, 0x05, 0x26, 0xE0, 0xC6, 0xDD, 0x9B, 0xC7, 0x18, 0xC3, 0xCF,
+    0x52, 0x04, 0xBD, 0x4F, 0x9B, 0x27, 0xF6, 0x73, 0xB9, 0x3F, 0xEF, 0x7B, 0xB2, 0xF7, 0x2B, 0xBB,
+    0x3F, 0x3E, 0x9C, 0x3E, 0x9D, 0x33, 0x1E, 0xDE, 0xAD, 0xBE, 0xEF, 0x4E, 0x00, 0x91, 0x81, 0x29,
+    0x74, 0xB2, 0x70, 0xE7, 0x6D, 0xD2, 0x2A, 0x5F, 0x52, 0x04, 0x93, 0xE6, 0x18, 0x89, 0x40, 0xD8,
+    0xC6, 0xE3, 0x90, 0x6E, 0xAA, 0x6A, 0xB7, 0xE2, 0x08, 0x7E, 0x78, 0x0E,
+    0x01, 0x00, 0xEE, 0xB2, 0xD1, 0xD6, 0x05, 0xFF, 0x27, 0x7F, 0x26, 0xDB, 0xAA, 0xB2, 0xC9, 0x26,
+    0x30, 0xC6, 0xCF, 0x11, 0x64, 0xEA, 0x6C, 0x8A, 0xE0, 0x98, 0x01, 0xF8, 0x75, 0x4B, 0x49, 0xAF,
+    0x79, 0x70, 0xAE, 0xEE, 0xA7, 0x62, 0x2C, 0x00, 0x00, 0x00, 0x00, 0x47, 0x8C, 0x63, 0xE7, 0xD8,
+    0x40, 0x02, 0x3C, 0xDA, 0xEA, 0x92, 0x52, 0x53, 0xAC, 0xFD, 0xC7, 0x8A, 0x4C, 0x31, 0xB2, 0xF2,
+    0xEC, 0x72, 0x7B, 0xFF, 0xCE, 0xC0, 0xE7, 0x12, 0xD4, 0xE9, 0x2A, 0x01,
+    0x07, 0x07, 0xA9, 0xB7, 0xD1, 0xD6, 0x05, 0x3F, 0x0D, 0x5E, 0xFD, 0xC7, 0x03, 0xFC, 0xFC, 0xD2,
+    0xCE, 0xBC, 0x44, 0xD8, 0xAB, 0x44, 0xA6, 0xA0, 0x3A, 0xE4, 0x4D, 0x8F, 0x15, 0xAF, 0x62, 0x17,
+    0xD1, 0xE0, 0x92, 0x85, 0xE4, 0x73, 0xF9, 0x00, 0x00, 0x00, 0xA0, 0xFC, 0x09, 0xDE, 0xAB, 0xF5,
+    0x8B, 0x6F, 0x1D, 0xCA, 0xA8, 0xBA, 0xAC, 0x74, 0xDD, 0x74, 0x19, 0xD5, 0xD6, 0x10, 0xEC, 0x38,
+    0xCF, 0x50, 0x29, 0x6A, 0x07, 0x0B, 0x93, 0x8F, 0x8F, 0xA8, 0x10, 0x04
 };


-const static uint8_t test_output_v0[64] = {
+const static uint8_t test_output_v0[160] = {
+    0x1A, 0x3F, 0xFB, 0xEE, 0x90, 0x9B, 0x42, 0x0D, 0x91, 0xF7, 0xBE, 0x6E, 0x5F, 0xB5, 0x6D, 0xB7,
+    0x1B, 0x31, 0x10, 0xD8, 0x86, 0x01, 0x1E, 0x87, 0x7E, 0xE5, 0x78, 0x6A, 0xFD, 0x08, 0x01, 0x00,
    0x1B, 0x60, 0x6A, 0x3F, 0x4A, 0x07, 0xD6, 0x48, 0x9A, 0x1B, 0xCD, 0x07, 0x69, 0x7B, 0xD1, 0x66,
    0x96, 0xB6, 0x1C, 0x8A, 0xE9, 0x82, 0xF6, 0x1A, 0x90, 0x16, 0x0F, 0x4E, 0x52, 0x82, 0x8A, 0x7F,
-    0x1A, 0x3F, 0xFB, 0xEE, 0x90, 0x9B, 0x42, 0x0D, 0x91, 0xF7, 0xBE, 0x6E, 0x5F, 0xB5, 0x6D, 0xB7,
-    0x1B, 0x31, 0x10, 0xD8, 0x86, 0x01, 0x1E, 0x87, 0x7E, 0xE5, 0x78, 0x6A, 0xFD, 0x08, 0x01, 0x00
+    0xA1, 0xB4, 0xFA, 0xE3, 0xE5, 0x76, 0xCE, 0xCF, 0xB7, 0x9C, 0xAF, 0x3E, 0x29, 0x92, 0xE4, 0xE0,
+    0x31, 0x24, 0x05, 0x48, 0xBF, 0x8D, 0x5F, 0x7B, 0x11, 0x03, 0x60, 0xAA, 0xD7, 0x50, 0x3F, 0x0C,
+    0x2D, 0x30, 0xF3, 0x87, 0x4F, 0x86, 0xA1, 0x4A, 0xB5, 0xA2, 0x1A, 0x08, 0xD0, 0x44, 0x2C, 0x9D,
+    0x16, 0xE9, 0x28, 0x49, 0xA1, 0xFF, 0x85, 0x6F, 0x12, 0xBB, 0x7D, 0xAB, 0x11, 0x1C, 0xE7, 0xF7,
+    0x2D, 0x9D, 0x19, 0xE4, 0xD2, 0x26, 0x44, 0x1E, 0xCD, 0x22, 0x08, 0x24, 0xA8, 0x97, 0x46, 0x62,
+    0x04, 0x84, 0x90, 0x4A, 0xEE, 0x99, 0x14, 0xED, 0xB8, 0xC6, 0x0D, 0x37, 0xA1, 0x66, 0x17, 0xB0
 };


 // Monero v7
-const static uint8_t test_output_v1[64] = {
-    0xC9, 0xFA, 0xE8, 0x42, 0x5D, 0x86, 0x88, 0xDC, 0x23, 0x6B, 0xCD, 0xBC, 0x42, 0xFD, 0xB4, 0x2D,
-    0x37, 0x6C, 0x6E, 0xC1, 0x90, 0x50, 0x1A, 0xA8, 0x4B, 0x04, 0xA4, 0xB4, 0xCF, 0x1E, 0xE1, 0x22,
+const static uint8_t test_output_v1[160] = {
    0xF2, 0x2D, 0x3D, 0x62, 0x03, 0xD2, 0xA0, 0x8B, 0x41, 0xD9, 0x02, 0x72, 0x78, 0xD8, 0xBC, 0xC9,
-    0x83, 0xAC, 0xAD, 0xA9, 0xB6, 0x8E, 0x52, 0xE3, 0xC6, 0x89, 0x69, 0x2A, 0x50, 0xE9, 0x21, 0xD9
+    0x83, 0xAC, 0xAD, 0xA9, 0xB6, 0x8E, 0x52, 0xE3, 0xC6, 0x89, 0x69, 0x2A, 0x50, 0xE9, 0x21, 0xD9,
+    0xC9, 0xFA, 0xE8, 0x42, 0x5D, 0x86, 0x88, 0xDC, 0x23, 0x6B, 0xCD, 0xBC, 0x42, 0xFD, 0xB4, 0x2D,
+    0x37, 0x6C, 0x6E, 0xC1, 0x90, 0x50, 0x1A, 0xA8, 0x4B, 0x04, 0xA4, 0xB4, 0xCF, 0x1E, 0xE1, 0x22,   
+    0xE7, 0x8C, 0x5A, 0x6E, 0x38, 0x30, 0x68, 0x4A, 0x73, 0xFC, 0x1B, 0xC6, 0x6D, 0xFC, 0x8D, 0x98,
+    0xB4, 0xC2, 0x23, 0x39, 0xAD, 0xE0, 0x9D, 0xF6, 0x6D, 0x8C, 0x6A, 0xAA, 0xF9, 0xB2, 0xE3, 0x4C,
+    0xB6, 0x90, 0x6C, 0xE6, 0x15, 0x5E, 0x46, 0x07, 0x9C, 0xB2, 0x6B, 0xAC, 0x3B, 0xAC, 0x1A, 0xDE,
+    0x92, 0x2C, 0xD6, 0x0C, 0x46, 0x9D, 0x9B, 0xC2, 0x84, 0x52, 0x65, 0xF6, 0xBD, 0xFA, 0x0D, 0x74,
+    0x00, 0x66, 0x10, 0x07, 0xF1, 0x19, 0x06, 0x3A, 0x6C, 0xFF, 0xEE, 0xB2, 0x40, 0xE5, 0x88, 0x2B,
+    0x6C, 0xAB, 0x6B, 0x1D, 0x88, 0xB8, 0x44, 0x25, 0xF4, 0xEA, 0xB7, 0xEC, 0xBA, 0x12, 0x8A, 0x24
 };


 #ifndef XMRIG_NO_AEON
-const static uint8_t test_output_v0_lite[64] = {
+const static uint8_t test_output_v0_lite[160] = {
+    0x36, 0x95, 0xB4, 0xB5, 0x3B, 0xB0, 0x03, 0x58, 0xB0, 0xAD, 0x38, 0xDC, 0x16, 0x0F, 0xEB, 0x9E,
+    0x00, 0x4E, 0xEC, 0xE0, 0x9B, 0x83, 0xA7, 0x2E, 0xF6, 0xBA, 0x98, 0x64, 0xD3, 0x51, 0x0C, 0x88,
    0x28, 0xA2, 0x2B, 0xAD, 0x3F, 0x93, 0xD1, 0x40, 0x8F, 0xCA, 0x47, 0x2E, 0xB5, 0xAD, 0x1C, 0xBE,
    0x75, 0xF2, 0x1D, 0x05, 0x3C, 0x8C, 0xE5, 0xB3, 0xAF, 0x10, 0x5A, 0x57, 0x71, 0x3E, 0x21, 0xDD,
-    0x36, 0x95, 0xB4, 0xB5, 0x3B, 0xB0, 0x03, 0x58, 0xB0, 0xAD, 0x38, 0xDC, 0x16, 0x0F, 0xEB, 0x9E,
-    0x00, 0x4E, 0xEC, 0xE0, 0x9B, 0x83, 0xA7, 0x2E, 0xF6, 0xBA, 0x98, 0x64, 0xD3, 0x51, 0x0C, 0x88
+    0x38, 0x08, 0xE1, 0x17, 0x0B, 0x99, 0x8D, 0x1A, 0x3C, 0xCE, 0x35, 0xC5, 0xC7, 0x3A, 0x00, 0x2E,
+    0xCB, 0x54, 0xF0, 0x78, 0x2E, 0x9E, 0xDB, 0xC7, 0xDF, 0x2E, 0x71, 0x9A, 0x16, 0x97, 0xC4, 0x18,
+    0x4B, 0x97, 0x07, 0xFE, 0x5D, 0x98, 0x9A, 0xD6, 0xD8, 0xE5, 0x92, 0x66, 0x87, 0x7F, 0x19, 0x37,
+    0xA2, 0x5E, 0xE6, 0x96, 0xB5, 0x97, 0x33, 0x89, 0xE0, 0xA7, 0xC9, 0xDD, 0x4A, 0x7E, 0x9E, 0x53,
+    0xBE, 0x91, 0x2B, 0xF5, 0xF5, 0xAF, 0xDD, 0x09, 0xA2, 0xF4, 0xA4, 0x56, 0xEB, 0x96, 0x22, 0xC9,
+    0x94, 0xFB, 0x7B, 0x28, 0xC9, 0x97, 0x65, 0x04, 0xAC, 0x4F, 0x84, 0x71, 0xDA, 0x6E, 0xD8, 0xC5
 };


-// AEON v2
-const static uint8_t test_output_v1_lite[64] = {
+// AEON v7
+const static uint8_t test_output_v1_lite[160] = {
+    0x6D, 0x8C, 0xDC, 0x44, 0x4E, 0x9B, 0xBB, 0xFD, 0x68, 0xFC, 0x43, 0xFC, 0xD4, 0x85, 0x5B, 0x22,
+    0x8C, 0x8A, 0x1B, 0xD9, 0x1D, 0x9D, 0x00, 0x28, 0x5B, 0xEC, 0x02, 0xB7, 0xCA, 0x2D, 0x67, 0x41,
    0x87, 0xC4, 0xE5, 0x70, 0x65, 0x3E, 0xB4, 0xC2, 0xB4, 0x2B, 0x7A, 0x0D, 0x54, 0x65, 0x59, 0x45,
    0x2D, 0xFA, 0xB5, 0x73, 0xB8, 0x2E, 0xC5, 0x2F, 0x15, 0x2B, 0x7F, 0xF9, 0x8E, 0x79, 0x44, 0x6F,
-    0x6D, 0x8C, 0xDC, 0x44, 0x4E, 0x9B, 0xBB, 0xFD, 0x68, 0xFC, 0x43, 0xFC, 0xD4, 0x85, 0x5B, 0x22,
-    0x8C, 0x8A, 0x1B, 0xD9, 0x1D, 0x9D, 0x00, 0x28, 0x5B, 0xEC, 0x02, 0xB7, 0xCA, 0x2D, 0x67, 0x41
+    0x16, 0x08, 0x74, 0xC7, 0xA2, 0xD2, 0xA3, 0x97, 0x95, 0x76, 0xCA, 0x4D, 0x06, 0x39, 0x7A, 0xAB,
+    0x6C, 0x87, 0x58, 0x33, 0x4D, 0xC8, 0x5A, 0xAB, 0x04, 0x27, 0xFE, 0x8B, 0x1C, 0x23, 0x2F, 0x32,
+    0xC0, 0x44, 0xFF, 0x0D, 0xB5, 0x3B, 0x27, 0x96, 0x06, 0x89, 0x7B, 0xA3, 0x0B, 0xD0, 0xCE, 0x9E,
+    0x90, 0x22, 0x77, 0x5A, 0xAD, 0xA1, 0xE5, 0xB6, 0xFC, 0xCB, 0x39, 0x7E, 0x2B, 0x10, 0xEE, 0xB4,
+    0x8C, 0x2B, 0xA4, 0x1F, 0x60, 0x76, 0x39, 0xD7, 0xF6, 0x46, 0x77, 0x18, 0x20, 0xAD, 0xD4, 0xC9,
+    0x87, 0xF7, 0x37, 0xDA, 0xFD, 0xBA, 0xBA, 0xD2, 0xF2, 0x68, 0xDC, 0x26, 0x8D, 0x1B, 0x08, 0xC6
+};
+#endif
+
+
+#ifndef XMRIG_NO_SUMO
+const static uint8_t test_output_heavy[160] = {
+    0x99, 0x83, 0xF2, 0x1B, 0xDF, 0x20, 0x10, 0xA8, 0xD7, 0x07, 0xBB, 0x2F, 0x14, 0xD7, 0x86, 0x64,
+    0xBB, 0xE1, 0x18, 0x7F, 0x55, 0x01, 0x4B, 0x39, 0xE5, 0xF3, 0xD6, 0x93, 0x28, 0xE4, 0x8F, 0xC2,
+    0x4D, 0x94, 0x7D, 0xD6, 0xDB, 0x6E, 0x07, 0x48, 0x26, 0x4A, 0x51, 0x2E, 0xAC, 0xF3, 0x25, 0x4A,
+    0x1F, 0x1A, 0xA2, 0x5B, 0xFC, 0x0A, 0xAD, 0x82, 0xDE, 0xA8, 0x99, 0x96, 0x88, 0x52, 0xD2, 0x7D,
+    0x3E, 0xE1, 0x23, 0x03, 0x5A, 0x63, 0x7B, 0x66, 0xF6, 0xD7, 0xC2, 0x2A, 0x34, 0x5E, 0x88, 0xE7,
+    0xFA, 0xC4, 0x25, 0x36, 0x54, 0xCB, 0xD2, 0x5C, 0x2F, 0x80, 0x2A, 0xF9, 0xCC, 0x43, 0xF7, 0xCD,
+    0xE5, 0x18, 0xA8, 0x05, 0x60, 0x18, 0xA5, 0x73, 0x72, 0x9B, 0x32, 0xDC, 0x69, 0x83, 0xC1, 0xE1,
+    0x1F, 0xDB, 0xDA, 0x6B, 0xAC, 0xEC, 0x9F, 0x67, 0xF8, 0x27, 0x1D, 0xC7, 0xE6, 0x46, 0x42, 0xF9,
+    0x53, 0x62, 0x0A, 0x54, 0x7D, 0x43, 0xEA, 0x18, 0x94, 0xED, 0xD8, 0x92, 0x06, 0x6A, 0xA1, 0x51,
+    0xAD, 0xB1, 0xFD, 0x89, 0xFB, 0x5C, 0xB4, 0x25, 0x6A, 0xDD, 0xB0, 0x09, 0xC5, 0x72, 0x87, 0xEB
 };
 #endif

--- a/src/crypto/CryptoNight_x86.h
+++ b/src/crypto/CryptoNight_x86.h
@@ -35,6 +35,7 @@


 #include "crypto/CryptoNight.h"
+#include "crypto/CryptoNight_constants.h"
 #include "crypto/CryptoNight_monero.h"
 #include "crypto/soft_aes.h"

@@ -217,7 +218,21 @@ static inline void aes_round(__m128i key, __m128i* x0, __m128i* x1, __m128i* x2,
 }


-template<size_t MEM, bool SOFT_AES>
+inline void mix_and_propagate(__m128i& x0, __m128i& x1, __m128i& x2, __m128i& x3, __m128i& x4, __m128i& x5, __m128i& x6, __m128i& x7)
+{
+    __m128i tmp0 = x0;
+    x0 = _mm_xor_si128(x0, x1);
+    x1 = _mm_xor_si128(x1, x2);
+    x2 = _mm_xor_si128(x2, x3);
+    x3 = _mm_xor_si128(x3, x4);
+    x4 = _mm_xor_si128(x4, x5);
+    x5 = _mm_xor_si128(x5, x6);
+    x6 = _mm_xor_si128(x6, x7);
+    x7 = _mm_xor_si128(x7, tmp0);
+}
+
+
+template<xmrig::Algo ALGO, size_t MEM, bool SOFT_AES>
 static inline void cn_explode_scratchpad(const __m128i *input, __m128i *output)
 {
    __m128i xin0, xin1, xin2, xin3, xin4, xin5, xin6, xin7;
@@ -234,6 +249,23 @@ static inline void cn_explode_scratchpad(const __m128i *input, __m128i *output)
    xin6 = _mm_load_si128(input + 10);
    xin7 = _mm_load_si128(input + 11);

+    if (ALGO == xmrig::CRYPTONIGHT_HEAVY) {
+        for (size_t i = 0; i < 16; i++) {
+            aes_round<SOFT_AES>(k0, &xin0, &xin1, &xin2, &xin3, &xin4, &xin5, &xin6, &xin7);
+            aes_round<SOFT_AES>(k1, &xin0, &xin1, &xin2, &xin3, &xin4, &xin5, &xin6, &xin7);
+            aes_round<SOFT_AES>(k2, &xin0, &xin1, &xin2, &xin3, &xin4, &xin5, &xin6, &xin7);
+            aes_round<SOFT_AES>(k3, &xin0, &xin1, &xin2, &xin3, &xin4, &xin5, &xin6, &xin7);
+            aes_round<SOFT_AES>(k4, &xin0, &xin1, &xin2, &xin3, &xin4, &xin5, &xin6, &xin7);
+            aes_round<SOFT_AES>(k5, &xin0, &xin1, &xin2, &xin3, &xin4, &xin5, &xin6, &xin7);
+            aes_round<SOFT_AES>(k6, &xin0, &xin1, &xin2, &xin3, &xin4, &xin5, &xin6, &xin7);
+            aes_round<SOFT_AES>(k7, &xin0, &xin1, &xin2, &xin3, &xin4, &xin5, &xin6, &xin7);
+            aes_round<SOFT_AES>(k8, &xin0, &xin1, &xin2, &xin3, &xin4, &xin5, &xin6, &xin7);
+            aes_round<SOFT_AES>(k9, &xin0, &xin1, &xin2, &xin3, &xin4, &xin5, &xin6, &xin7);
+
+            mix_and_propagate(xin0, xin1, xin2, xin3, xin4, xin5, xin6, xin7);
+        }
+    }
+
    for (size_t i = 0; i < MEM / sizeof(__m128i); i += 8) {
        aes_round<SOFT_AES>(k0, &xin0, &xin1, &xin2, &xin3, &xin4, &xin5, &xin6, &xin7);
        aes_round<SOFT_AES>(k1, &xin0, &xin1, &xin2, &xin3, &xin4, &xin5, &xin6, &xin7);
@@ -258,7 +290,7 @@ static inline void cn_explode_scratchpad(const __m128i *input, __m128i *output)
 }


-template<size_t MEM, bool SOFT_AES>
+template<xmrig::Algo ALGO, size_t MEM, bool SOFT_AES>
 static inline void cn_implode_scratchpad(const __m128i *input, __m128i *output)
 {
    __m128i xout0, xout1, xout2, xout3, xout4, xout5, xout6, xout7;
@@ -296,6 +328,51 @@ static inline void cn_implode_scratchpad(const __m128i *input, __m128i *output)
        aes_round<SOFT_AES>(k7, &xout0, &xout1, &xout2, &xout3, &xout4, &xout5, &xout6, &xout7);
        aes_round<SOFT_AES>(k8, &xout0, &xout1, &xout2, &xout3, &xout4, &xout5, &xout6, &xout7);
        aes_round<SOFT_AES>(k9, &xout0, &xout1, &xout2, &xout3, &xout4, &xout5, &xout6, &xout7);
+
+        if (ALGO == xmrig::CRYPTONIGHT_HEAVY) {
+            mix_and_propagate(xout0, xout1, xout2, xout3, xout4, xout5, xout6, xout7);
+        }
+    }
+
+    if (ALGO == xmrig::CRYPTONIGHT_HEAVY) {
+        for (size_t i = 0; i < MEM / sizeof(__m128i); i += 8) {
+            xout0 = _mm_xor_si128(_mm_load_si128(input + i + 0), xout0);
+            xout1 = _mm_xor_si128(_mm_load_si128(input + i + 1), xout1);
+            xout2 = _mm_xor_si128(_mm_load_si128(input + i + 2), xout2);
+            xout3 = _mm_xor_si128(_mm_load_si128(input + i + 3), xout3);
+            xout4 = _mm_xor_si128(_mm_load_si128(input + i + 4), xout4);
+            xout5 = _mm_xor_si128(_mm_load_si128(input + i + 5), xout5);
+            xout6 = _mm_xor_si128(_mm_load_si128(input + i + 6), xout6);
+            xout7 = _mm_xor_si128(_mm_load_si128(input + i + 7), xout7);
+
+            aes_round<SOFT_AES>(k0, &xout0, &xout1, &xout2, &xout3, &xout4, &xout5, &xout6, &xout7);
+            aes_round<SOFT_AES>(k1, &xout0, &xout1, &xout2, &xout3, &xout4, &xout5, &xout6, &xout7);
+            aes_round<SOFT_AES>(k2, &xout0, &xout1, &xout2, &xout3, &xout4, &xout5, &xout6, &xout7);
+            aes_round<SOFT_AES>(k3, &xout0, &xout1, &xout2, &xout3, &xout4, &xout5, &xout6, &xout7);
+            aes_round<SOFT_AES>(k4, &xout0, &xout1, &xout2, &xout3, &xout4, &xout5, &xout6, &xout7);
+            aes_round<SOFT_AES>(k5, &xout0, &xout1, &xout2, &xout3, &xout4, &xout5, &xout6, &xout7);
+            aes_round<SOFT_AES>(k6, &xout0, &xout1, &xout2, &xout3, &xout4, &xout5, &xout6, &xout7);
+            aes_round<SOFT_AES>(k7, &xout0, &xout1, &xout2, &xout3, &xout4, &xout5, &xout6, &xout7);
+            aes_round<SOFT_AES>(k8, &xout0, &xout1, &xout2, &xout3, &xout4, &xout5, &xout6, &xout7);
+            aes_round<SOFT_AES>(k9, &xout0, &xout1, &xout2, &xout3, &xout4, &xout5, &xout6, &xout7);
+
+            mix_and_propagate(xout0, xout1, xout2, xout3, xout4, xout5, xout6, xout7);
+        }
+
+        for (size_t i = 0; i < 16; i++) {
+            aes_round<SOFT_AES>(k0, &xout0, &xout1, &xout2, &xout3, &xout4, &xout5, &xout6, &xout7);
+            aes_round<SOFT_AES>(k1, &xout0, &xout1, &xout2, &xout3, &xout4, &xout5, &xout6, &xout7);
+            aes_round<SOFT_AES>(k2, &xout0, &xout1, &xout2, &xout3, &xout4, &xout5, &xout6, &xout7);
+            aes_round<SOFT_AES>(k3, &xout0, &xout1, &xout2, &xout3, &xout4, &xout5, &xout6, &xout7);
+            aes_round<SOFT_AES>(k4, &xout0, &xout1, &xout2, &xout3, &xout4, &xout5, &xout6, &xout7);
+            aes_round<SOFT_AES>(k5, &xout0, &xout1, &xout2, &xout3, &xout4, &xout5, &xout6, &xout7);
+            aes_round<SOFT_AES>(k6, &xout0, &xout1, &xout2, &xout3, &xout4, &xout5, &xout6, &xout7);
+            aes_round<SOFT_AES>(k7, &xout0, &xout1, &xout2, &xout3, &xout4, &xout5, &xout6, &xout7);
+            aes_round<SOFT_AES>(k8, &xout0, &xout1, &xout2, &xout3, &xout4, &xout5, &xout6, &xout7);
+            aes_round<SOFT_AES>(k9, &xout0, &xout1, &xout2, &xout3, &xout4, &xout5, &xout6, &xout7);
+
+            mix_and_propagate(xout0, xout1, xout2, xout3, xout4, xout5, xout6, xout7);
+        }
    }

    _mm_store_si128(output + 4, xout0);
@@ -309,23 +386,48 @@ static inline void cn_implode_scratchpad(const __m128i *input, __m128i *output)
 }


-template<size_t ITERATIONS, size_t MEM, size_t MASK, bool SOFT_AES, int VARIANT>
-inline void cryptonight_single_hash(const uint8_t *__restrict__ input, size_t size, uint8_t *__restrict__ output, cryptonight_ctx *__restrict__ ctx)
+static inline void cryptonight_monero_tweak(uint64_t* mem_out, __m128i tmp)
 {
-    keccak(input, (int) size, ctx->state0, 200);
+    mem_out[0] = EXTRACT64(tmp);

-    VARIANT1_INIT(0);
+    tmp = _mm_castps_si128(_mm_movehl_ps(_mm_castsi128_ps(tmp), _mm_castsi128_ps(tmp)));
+    uint64_t vh = EXTRACT64(tmp);

-    cn_explode_scratchpad<MEM, SOFT_AES>((__m128i*) ctx->state0, (__m128i*) ctx->memory);
+    uint8_t x = vh >> 24;
+    static const uint16_t table = 0x7531;
+    const uint8_t index = (((x >> 3) & 6) | (x & 1)) << 1;
+    vh ^= ((table >> index) & 0x3) << 28;

-    const uint8_t* l0 = ctx->memory;
-    uint64_t* h0 = reinterpret_cast<uint64_t*>(ctx->state0);
+    mem_out[1] = vh;
+}
+
+
+template<xmrig::Algo ALGO, bool SOFT_AES, int VARIANT>
+inline void cryptonight_single_hash(const uint8_t *__restrict__ input, size_t size, uint8_t *__restrict__ output, cryptonight_ctx **__restrict__ ctx)
+{
+    constexpr size_t MASK       = xmrig::cn_select_mask<ALGO>();
+    constexpr size_t ITERATIONS = xmrig::cn_select_iter<ALGO>();
+    constexpr size_t MEM        = xmrig::cn_select_memory<ALGO>();
+
+    if (VARIANT > 0 && size < 43) {
+        memset(output, 0, 32);
+        return;
+    }
+
+    keccak(input, (int) size, ctx[0]->state, 200);
+
+    VARIANT1_INIT(0)
+
+    cn_explode_scratchpad<ALGO, MEM, SOFT_AES>((__m128i*) ctx[0]->state, (__m128i*) ctx[0]->memory);
+
+    const uint8_t* l0 = ctx[0]->memory;
+    uint64_t* h0 = reinterpret_cast<uint64_t*>(ctx[0]->state);

    uint64_t al0 = h0[0] ^ h0[4];
    uint64_t ah0 = h0[1] ^ h0[5];
    __m128i bx0 = _mm_set_epi64x(h0[3] ^ h0[7], h0[2] ^ h0[6]);

-    uint64_t idx0 = h0[0] ^ h0[4];
+    uint64_t idx0 = al0;

    for (size_t i = 0; i < ITERATIONS; i++) {
        __m128i cx;
@@ -337,8 +439,13 @@ inline void cryptonight_single_hash(const uint8_t *__restrict__ input, size_t si
            cx = _mm_load_si128((__m128i *) &l0[idx0 & MASK]);
            cx = _mm_aesenc_si128(cx, _mm_set_epi64x(ah0, al0));
        }
-        _mm_store_si128((__m128i *) &l0[idx0 & MASK], _mm_xor_si128(bx0, cx));
-        VARIANT1_1(&l0[idx0 & MASK]);
+
+        if (VARIANT > 0) {
+            cryptonight_monero_tweak((uint64_t*)&l0[idx0 & MASK], _mm_xor_si128(bx0, cx));
+        } else {
+            _mm_store_si128((__m128i *)&l0[idx0 & MASK], _mm_xor_si128(bx0, cx));
+        }
+
        idx0 = EXTRACT64(cx);
        bx0 = cx;

@@ -358,31 +465,49 @@ inline void cryptonight_single_hash(const uint8_t *__restrict__ input, size_t si
        ah0 ^= ch;
        al0 ^= cl;
        idx0 = al0;
+
+        if (ALGO == xmrig::CRYPTONIGHT_HEAVY) {
+            int64_t n  = ((int64_t*)&l0[idx0 & MASK])[0];
+            int32_t d  = ((int32_t*)&l0[idx0 & MASK])[2];
+            int64_t q = n / (d | 0x5);
+
+            ((int64_t*)&l0[idx0 & MASK])[0] = n ^ q;
+            idx0 = d ^ q;
+        }
    }

-    cn_implode_scratchpad<MEM, SOFT_AES>((__m128i*) ctx->memory, (__m128i*) ctx->state0);
+    cn_implode_scratchpad<ALGO, MEM, SOFT_AES>((__m128i*) ctx[0]->memory, (__m128i*) ctx[0]->state);

    keccakf(h0, 24);
-    extra_hashes[ctx->state0[0] & 3](ctx->state0, 200, output);
+    extra_hashes[ctx[0]->state[0] & 3](ctx[0]->state, 200, output);
 }


-template<size_t ITERATIONS, size_t MEM, size_t MASK, bool SOFT_AES, int VARIANT>
-inline void cryptonight_double_hash(const uint8_t *__restrict__ input, size_t size, uint8_t *__restrict__ output, struct cryptonight_ctx *__restrict__ ctx)
+template<xmrig::Algo ALGO, bool SOFT_AES, int VARIANT>
+inline void cryptonight_double_hash(const uint8_t *__restrict__ input, size_t size, uint8_t *__restrict__ output, cryptonight_ctx **__restrict__ ctx)
 {
-    keccak(input,        (int) size, ctx->state0, 200);
-    keccak(input + size, (int) size, ctx->state1, 200);
+    constexpr size_t MASK       = xmrig::cn_select_mask<ALGO>();
+    constexpr size_t ITERATIONS = xmrig::cn_select_iter<ALGO>();
+    constexpr size_t MEM        = xmrig::cn_select_memory<ALGO>();
+
+    if (VARIANT > 0 && size < 43) {
+        memset(output, 0, 64);
+        return;
+    }
+
+    keccak(input,        (int) size, ctx[0]->state, 200);
+    keccak(input + size, (int) size, ctx[1]->state, 200);

    VARIANT1_INIT(0);
    VARIANT1_INIT(1);

-    const uint8_t* l0 = ctx->memory;
-    const uint8_t* l1 = ctx->memory + MEM;
-    uint64_t* h0 = reinterpret_cast<uint64_t*>(ctx->state0);
-    uint64_t* h1 = reinterpret_cast<uint64_t*>(ctx->state1);
+    const uint8_t* l0 = ctx[0]->memory;
+    const uint8_t* l1 = ctx[1]->memory;
+    uint64_t* h0 = reinterpret_cast<uint64_t*>(ctx[0]->state);
+    uint64_t* h1 = reinterpret_cast<uint64_t*>(ctx[1]->state);

-    cn_explode_scratchpad<MEM, SOFT_AES>((__m128i*) h0, (__m128i*) l0);
-    cn_explode_scratchpad<MEM, SOFT_AES>((__m128i*) h1, (__m128i*) l1);
+    cn_explode_scratchpad<ALGO, MEM, SOFT_AES>((__m128i*) h0, (__m128i*) l0);
+    cn_explode_scratchpad<ALGO, MEM, SOFT_AES>((__m128i*) h1, (__m128i*) l1);

    uint64_t al0 = h0[0] ^ h0[4];
    uint64_t al1 = h1[0] ^ h1[4];
@@ -392,8 +517,8 @@ inline void cryptonight_double_hash(const uint8_t *__restrict__ input, size_t si
    __m128i bx0 = _mm_set_epi64x(h0[3] ^ h0[7], h0[2] ^ h0[6]);
    __m128i bx1 = _mm_set_epi64x(h1[3] ^ h1[7], h1[2] ^ h1[6]);

-    uint64_t idx0 = h0[0] ^ h0[4];
-    uint64_t idx1 = h1[0] ^ h1[4];
+    uint64_t idx0 = al0;
+    uint64_t idx1 = al1;

    for (size_t i = 0; i < ITERATIONS; i++) {
        __m128i cx0, cx1;
@@ -409,10 +534,13 @@ inline void cryptonight_double_hash(const uint8_t *__restrict__ input, size_t si
            cx1 = _mm_aesenc_si128(cx1, _mm_set_epi64x(ah1, al1));
        }

-        _mm_store_si128((__m128i *) &l0[idx0 & MASK], _mm_xor_si128(bx0, cx0));
-        _mm_store_si128((__m128i *) &l1[idx1 & MASK], _mm_xor_si128(bx1, cx1));
-        VARIANT1_1(&l0[idx0 & MASK]);
-        VARIANT1_1(&l1[idx1 & MASK]);
+        if (VARIANT > 0) {
+            cryptonight_monero_tweak((uint64_t*)&l0[idx0 & MASK], _mm_xor_si128(bx0, cx0));
+            cryptonight_monero_tweak((uint64_t*)&l1[idx1 & MASK], _mm_xor_si128(bx1, cx1));
+        } else {
+            _mm_store_si128((__m128i *) &l0[idx0 & MASK], _mm_xor_si128(bx0, cx0));
+            _mm_store_si128((__m128i *) &l1[idx1 & MASK], _mm_xor_si128(bx1, cx1));
+        }

        idx0 = EXTRACT64(cx0);
        idx1 = EXTRACT64(cx1);
@@ -437,6 +565,15 @@ inline void cryptonight_double_hash(const uint8_t *__restrict__ input, size_t si
        al0 ^= cl;
        idx0 = al0;

+        if (ALGO == xmrig::CRYPTONIGHT_HEAVY) {
+            int64_t n  = ((int64_t*)&l0[idx0 & MASK])[0];
+            int32_t d  = ((int32_t*)&l0[idx0 & MASK])[2];
+            int64_t q = n / (d | 0x5);
+
+            ((int64_t*)&l0[idx0 & MASK])[0] = n ^ q;
+            idx0 = d ^ q;
+        }
+
        cl = ((uint64_t*) &l1[idx1 & MASK])[0];
        ch = ((uint64_t*) &l1[idx1 & MASK])[1];
        lo = __umul128(idx1, cl, &hi);
@@ -452,16 +589,399 @@ inline void cryptonight_double_hash(const uint8_t *__restrict__ input, size_t si
        ah1 ^= ch;
        al1 ^= cl;
        idx1 = al1;
+
+        if (ALGO == xmrig::CRYPTONIGHT_HEAVY) {
+            int64_t n  = ((int64_t*)&l1[idx1 & MASK])[0];
+            int32_t d  = ((int32_t*)&l1[idx1 & MASK])[2];
+            int64_t q = n / (d | 0x5);
+
+            ((int64_t*)&l1[idx1 & MASK])[0] = n ^ q;
+            idx1 = d ^ q;
+        }
    }

-    cn_implode_scratchpad<MEM, SOFT_AES>((__m128i*) l0, (__m128i*) h0);
-    cn_implode_scratchpad<MEM, SOFT_AES>((__m128i*) l1, (__m128i*) h1);
+    cn_implode_scratchpad<ALGO, MEM, SOFT_AES>((__m128i*) l0, (__m128i*) h0);
+    cn_implode_scratchpad<ALGO, MEM, SOFT_AES>((__m128i*) l1, (__m128i*) h1);

    keccakf(h0, 24);
    keccakf(h1, 24);

-    extra_hashes[ctx->state0[0] & 3](ctx->state0, 200, output);
-    extra_hashes[ctx->state1[0] & 3](ctx->state1, 200, output + 32);
+    extra_hashes[ctx[0]->state[0] & 3](ctx[0]->state, 200, output);
+    extra_hashes[ctx[1]->state[0] & 3](ctx[1]->state, 200, output + 32);
+}
+
+
+#define CN_STEP1(a, b, c, l, ptr, idx)                \
+    ptr = reinterpret_cast<__m128i*>(&l[idx & MASK]); \
+    c = _mm_load_si128(ptr);
+
+
+#define CN_STEP2(a, b, c, l, ptr, idx)                                 \
+    if (SOFT_AES) {                                                    \
+        c = soft_aesenc(c, a);                                         \
+    } else {                                                           \
+        c = _mm_aesenc_si128(c, a);                                    \
+    }                                                                  \
+                                                                       \
+    b = _mm_xor_si128(b, c);                                           \
+                                                                       \
+    if (VARIANT > 0) {                                                 \
+        cryptonight_monero_tweak(reinterpret_cast<uint64_t*>(ptr), b); \
+    } else {                                                           \
+        _mm_store_si128(ptr, b);                                       \
+    }
+
+
+#define CN_STEP3(a, b, c, l, ptr, idx)                \
+    idx = EXTRACT64(c);                               \
+    ptr = reinterpret_cast<__m128i*>(&l[idx & MASK]); \
+    b = _mm_load_si128(ptr);
+
+
+#define CN_STEP4(a, b, c, l, mc, ptr, idx)              \
+    lo = __umul128(idx, EXTRACT64(b), &hi);             \
+    a = _mm_add_epi64(a, _mm_set_epi64x(lo, hi));       \
+                                                        \
+    if (VARIANT > 0) {                                  \
+        _mm_store_si128(ptr, _mm_xor_si128(a, mc));     \
+    } else {                                            \
+        _mm_store_si128(ptr, a);                        \
+    }                                                   \
+                                                        \
+    a = _mm_xor_si128(a, b);                            \
+    idx = EXTRACT64(a);                                 \
+                                                        \
+    if (ALGO == xmrig::CRYPTONIGHT_HEAVY) {             \
+        int64_t n = ((int64_t*)&l[idx & MASK])[0];      \
+        int32_t d = ((int32_t*)&l[idx & MASK])[2];      \
+        int64_t q = n / (d | 0x5);                      \
+        ((int64_t*)&l[idx & MASK])[0] = n ^ q;          \
+        idx = d ^ q;                                    \
+    }
+
+
+#define CONST_INIT(ctx, n)                                                                       \
+    __m128i mc##n;                                                                               \
+    if (VARIANT > 0) {                                                                           \
+        mc##n = _mm_set_epi64x(*reinterpret_cast<const uint64_t*>(input + n * size + 35) ^       \
+                               *(reinterpret_cast<const uint64_t*>((ctx)->state) + 24), 0);      \
+    }
+
+
+template<xmrig::Algo ALGO, bool SOFT_AES, int VARIANT>
+inline void cryptonight_triple_hash(const uint8_t *__restrict__ input, size_t size, uint8_t *__restrict__ output, cryptonight_ctx **__restrict__ ctx)
+{
+    constexpr size_t MASK       = xmrig::cn_select_mask<ALGO>();
+    constexpr size_t ITERATIONS = xmrig::cn_select_iter<ALGO>();
+    constexpr size_t MEM        = xmrig::cn_select_memory<ALGO>();
+
+    if (VARIANT > 0 && size < 43) {
+        memset(output, 0, 32 * 3);
+        return;
+    }
+
+    for (size_t i = 0; i < 3; i++) {
+        keccak(input + size * i, static_cast<int>(size), ctx[i]->state, 200);
+        cn_explode_scratchpad<ALGO, MEM, SOFT_AES>(reinterpret_cast<__m128i*>(ctx[i]->state), reinterpret_cast<__m128i*>(ctx[i]->memory));
+    }
+
+    CONST_INIT(ctx[0], 0);
+    CONST_INIT(ctx[1], 1);
+    CONST_INIT(ctx[2], 2);
+
+    uint8_t* l0  = ctx[0]->memory;
+    uint8_t* l1  = ctx[1]->memory;
+    uint8_t* l2  = ctx[2]->memory;
+    uint64_t* h0 = reinterpret_cast<uint64_t*>(ctx[0]->state);
+    uint64_t* h1 = reinterpret_cast<uint64_t*>(ctx[1]->state);
+    uint64_t* h2 = reinterpret_cast<uint64_t*>(ctx[2]->state);
+
+    __m128i ax0 = _mm_set_epi64x(h0[1] ^ h0[5], h0[0] ^ h0[4]);
+    __m128i bx0 = _mm_set_epi64x(h0[3] ^ h0[7], h0[2] ^ h0[6]);
+    __m128i ax1 = _mm_set_epi64x(h1[1] ^ h1[5], h1[0] ^ h1[4]);
+    __m128i bx1 = _mm_set_epi64x(h1[3] ^ h1[7], h1[2] ^ h1[6]);
+    __m128i ax2 = _mm_set_epi64x(h2[1] ^ h2[5], h2[0] ^ h2[4]);
+    __m128i bx2 = _mm_set_epi64x(h2[3] ^ h2[7], h2[2] ^ h2[6]);
+    __m128i cx0 = _mm_set_epi64x(0, 0);
+    __m128i cx1 = _mm_set_epi64x(0, 0);
+    __m128i cx2 = _mm_set_epi64x(0, 0);
+
+    uint64_t idx0, idx1, idx2;
+    idx0 = EXTRACT64(ax0);
+    idx1 = EXTRACT64(ax1);
+    idx2 = EXTRACT64(ax2);
+
+    for (size_t i = 0; i < ITERATIONS / 2; i++) {
+        uint64_t hi, lo;
+        __m128i *ptr0, *ptr1, *ptr2;
+
+        // EVEN ROUND
+        CN_STEP1(ax0, bx0, cx0, l0, ptr0, idx0);
+        CN_STEP1(ax1, bx1, cx1, l1, ptr1, idx1);
+        CN_STEP1(ax2, bx2, cx2, l2, ptr2, idx2);
+
+        CN_STEP2(ax0, bx0, cx0, l0, ptr0, idx0);
+        CN_STEP2(ax1, bx1, cx1, l1, ptr1, idx1);
+        CN_STEP2(ax2, bx2, cx2, l2, ptr2, idx2);
+
+        CN_STEP3(ax0, bx0, cx0, l0, ptr0, idx0);
+        CN_STEP3(ax1, bx1, cx1, l1, ptr1, idx1);
+        CN_STEP3(ax2, bx2, cx2, l2, ptr2, idx2);
+
+        CN_STEP4(ax0, bx0, cx0, l0, mc0, ptr0, idx0);
+        CN_STEP4(ax1, bx1, cx1, l1, mc1, ptr1, idx1);
+        CN_STEP4(ax2, bx2, cx2, l2, mc2, ptr2, idx2);
+
+        // ODD ROUND
+        CN_STEP1(ax0, cx0, bx0, l0, ptr0, idx0);
+        CN_STEP1(ax1, cx1, bx1, l1, ptr1, idx1);
+        CN_STEP1(ax2, cx2, bx2, l2, ptr2, idx2);
+
+        CN_STEP2(ax0, cx0, bx0, l0, ptr0, idx0);
+        CN_STEP2(ax1, cx1, bx1, l1, ptr1, idx1);
+        CN_STEP2(ax2, cx2, bx2, l2, ptr2, idx2);
+
+        CN_STEP3(ax0, cx0, bx0, l0, ptr0, idx0);
+        CN_STEP3(ax1, cx1, bx1, l1, ptr1, idx1);
+        CN_STEP3(ax2, cx2, bx2, l2, ptr2, idx2);
+
+        CN_STEP4(ax0, cx0, bx0, l0, mc0, ptr0, idx0);
+        CN_STEP4(ax1, cx1, bx1, l1, mc1, ptr1, idx1);
+        CN_STEP4(ax2, cx2, bx2, l2, mc2, ptr2, idx2);
+    }
+
+    for (size_t i = 0; i < 3; i++) {
+        cn_implode_scratchpad<ALGO, MEM, SOFT_AES>(reinterpret_cast<__m128i*>(ctx[i]->memory), reinterpret_cast<__m128i*>(ctx[i]->state));
+        keccakf(reinterpret_cast<uint64_t*>(ctx[i]->state), 24);
+        extra_hashes[ctx[i]->state[0] & 3](ctx[i]->state, 200, output + 32 * i);
+    }
+}
+
+
+template<xmrig::Algo ALGO, bool SOFT_AES, int VARIANT>
+inline void cryptonight_quad_hash(const uint8_t *__restrict__ input, size_t size, uint8_t *__restrict__ output, cryptonight_ctx **__restrict__ ctx)
+{
+    constexpr size_t MASK       = xmrig::cn_select_mask<ALGO>();
+    constexpr size_t ITERATIONS = xmrig::cn_select_iter<ALGO>();
+    constexpr size_t MEM        = xmrig::cn_select_memory<ALGO>();
+
+    if (VARIANT > 0 && size < 43) {
+        memset(output, 0, 32 * 4);
+        return;
+    }
+
+    for (size_t i = 0; i < 4; i++) {
+        keccak(input + size * i, static_cast<int>(size), ctx[i]->state, 200);
+        cn_explode_scratchpad<ALGO, MEM, SOFT_AES>(reinterpret_cast<__m128i*>(ctx[i]->state), reinterpret_cast<__m128i*>(ctx[i]->memory));
+    }
+
+    CONST_INIT(ctx[0], 0);
+    CONST_INIT(ctx[1], 1);
+    CONST_INIT(ctx[2], 2);
+    CONST_INIT(ctx[3], 3);
+
+    uint8_t* l0  = ctx[0]->memory;
+    uint8_t* l1  = ctx[1]->memory;
+    uint8_t* l2  = ctx[2]->memory;
+    uint8_t* l3  = ctx[3]->memory;
+    uint64_t* h0 = reinterpret_cast<uint64_t*>(ctx[0]->state);
+    uint64_t* h1 = reinterpret_cast<uint64_t*>(ctx[1]->state);
+    uint64_t* h2 = reinterpret_cast<uint64_t*>(ctx[2]->state);
+    uint64_t* h3 = reinterpret_cast<uint64_t*>(ctx[3]->state);
+
+    __m128i ax0 = _mm_set_epi64x(h0[1] ^ h0[5], h0[0] ^ h0[4]);
+    __m128i bx0 = _mm_set_epi64x(h0[3] ^ h0[7], h0[2] ^ h0[6]);
+    __m128i ax1 = _mm_set_epi64x(h1[1] ^ h1[5], h1[0] ^ h1[4]);
+    __m128i bx1 = _mm_set_epi64x(h1[3] ^ h1[7], h1[2] ^ h1[6]);
+    __m128i ax2 = _mm_set_epi64x(h2[1] ^ h2[5], h2[0] ^ h2[4]);
+    __m128i bx2 = _mm_set_epi64x(h2[3] ^ h2[7], h2[2] ^ h2[6]);
+    __m128i ax3 = _mm_set_epi64x(h3[1] ^ h3[5], h3[0] ^ h3[4]);
+    __m128i bx3 = _mm_set_epi64x(h3[3] ^ h3[7], h3[2] ^ h3[6]);
+    __m128i cx0 = _mm_set_epi64x(0, 0);
+    __m128i cx1 = _mm_set_epi64x(0, 0);
+    __m128i cx2 = _mm_set_epi64x(0, 0);
+    __m128i cx3 = _mm_set_epi64x(0, 0);
+
+    uint64_t idx0, idx1, idx2, idx3;
+    idx0 = EXTRACT64(ax0);
+    idx1 = EXTRACT64(ax1);
+    idx2 = EXTRACT64(ax2);
+    idx3 = EXTRACT64(ax3);
+
+    for (size_t i = 0; i < ITERATIONS / 2; i++)
+    {
+        uint64_t hi, lo;
+        __m128i *ptr0, *ptr1, *ptr2, *ptr3;
+
+        // EVEN ROUND
+        CN_STEP1(ax0, bx0, cx0, l0, ptr0, idx0);
+        CN_STEP1(ax1, bx1, cx1, l1, ptr1, idx1);
+        CN_STEP1(ax2, bx2, cx2, l2, ptr2, idx2);
+        CN_STEP1(ax3, bx3, cx3, l3, ptr3, idx3);
+
+        CN_STEP2(ax0, bx0, cx0, l0, ptr0, idx0);
+        CN_STEP2(ax1, bx1, cx1, l1, ptr1, idx1);
+        CN_STEP2(ax2, bx2, cx2, l2, ptr2, idx2);
+        CN_STEP2(ax3, bx3, cx3, l3, ptr3, idx3);
+
+        CN_STEP3(ax0, bx0, cx0, l0, ptr0, idx0);
+        CN_STEP3(ax1, bx1, cx1, l1, ptr1, idx1);
+        CN_STEP3(ax2, bx2, cx2, l2, ptr2, idx2);
+        CN_STEP3(ax3, bx3, cx3, l3, ptr3, idx3);
+
+        CN_STEP4(ax0, bx0, cx0, l0, mc0, ptr0, idx0);
+        CN_STEP4(ax1, bx1, cx1, l1, mc1, ptr1, idx1);
+        CN_STEP4(ax2, bx2, cx2, l2, mc2, ptr2, idx2);
+        CN_STEP4(ax3, bx3, cx3, l3, mc3, ptr3, idx3);
+
+        // ODD ROUND
+        CN_STEP1(ax0, cx0, bx0, l0, ptr0, idx0);
+        CN_STEP1(ax1, cx1, bx1, l1, ptr1, idx1);
+        CN_STEP1(ax2, cx2, bx2, l2, ptr2, idx2);
+        CN_STEP1(ax3, cx3, bx3, l3, ptr3, idx3);
+
+        CN_STEP2(ax0, cx0, bx0, l0, ptr0, idx0);
+        CN_STEP2(ax1, cx1, bx1, l1, ptr1, idx1);
+        CN_STEP2(ax2, cx2, bx2, l2, ptr2, idx2);
+        CN_STEP2(ax3, cx3, bx3, l3, ptr3, idx3);
+
+        CN_STEP3(ax0, cx0, bx0, l0, ptr0, idx0);
+        CN_STEP3(ax1, cx1, bx1, l1, ptr1, idx1);
+        CN_STEP3(ax2, cx2, bx2, l2, ptr2, idx2);
+        CN_STEP3(ax3, cx3, bx3, l3, ptr3, idx3);
+
+        CN_STEP4(ax0, cx0, bx0, l0, mc0, ptr0, idx0);
+        CN_STEP4(ax1, cx1, bx1, l1, mc1, ptr1, idx1);
+        CN_STEP4(ax2, cx2, bx2, l2, mc2, ptr2, idx2);
+        CN_STEP4(ax3, cx3, bx3, l3, mc3, ptr3, idx3);
+    }
+
+    for (size_t i = 0; i < 4; i++) {
+        cn_implode_scratchpad<ALGO, MEM, SOFT_AES>(reinterpret_cast<__m128i*>(ctx[i]->memory), reinterpret_cast<__m128i*>(ctx[i]->state));
+        keccakf(reinterpret_cast<uint64_t*>(ctx[i]->state), 24);
+        extra_hashes[ctx[i]->state[0] & 3](ctx[i]->state, 200, output + 32 * i);
+    }
+}
+
+
+template<xmrig::Algo ALGO, bool SOFT_AES, int VARIANT>
+inline void cryptonight_penta_hash(const uint8_t *__restrict__ input, size_t size, uint8_t *__restrict__ output, cryptonight_ctx **__restrict__ ctx)
+{
+    constexpr size_t MASK       = xmrig::cn_select_mask<ALGO>();
+    constexpr size_t ITERATIONS = xmrig::cn_select_iter<ALGO>();
+    constexpr size_t MEM        = xmrig::cn_select_memory<ALGO>();
+
+    if (VARIANT > 0 && size < 43) {
+        memset(output, 0, 32 * 5);
+        return;
+    }
+
+    for (size_t i = 0; i < 5; i++) {
+        keccak(input + size * i, static_cast<int>(size), ctx[i]->state, 200);
+        cn_explode_scratchpad<ALGO, MEM, SOFT_AES>(reinterpret_cast<__m128i*>(ctx[i]->state), reinterpret_cast<__m128i*>(ctx[i]->memory));
+    }
+
+    CONST_INIT(ctx[0], 0);
+    CONST_INIT(ctx[1], 1);
+    CONST_INIT(ctx[2], 2);
+    CONST_INIT(ctx[3], 3);
+    CONST_INIT(ctx[4], 4);
+
+    uint8_t* l0  = ctx[0]->memory;
+    uint8_t* l1  = ctx[1]->memory;
+    uint8_t* l2  = ctx[2]->memory;
+    uint8_t* l3  = ctx[3]->memory;
+    uint8_t* l4  = ctx[4]->memory;
+    uint64_t* h0 = reinterpret_cast<uint64_t*>(ctx[0]->state);
+    uint64_t* h1 = reinterpret_cast<uint64_t*>(ctx[1]->state);
+    uint64_t* h2 = reinterpret_cast<uint64_t*>(ctx[2]->state);
+    uint64_t* h3 = reinterpret_cast<uint64_t*>(ctx[3]->state);
+    uint64_t* h4 = reinterpret_cast<uint64_t*>(ctx[4]->state);
+
+    __m128i ax0 = _mm_set_epi64x(h0[1] ^ h0[5], h0[0] ^ h0[4]);
+    __m128i bx0 = _mm_set_epi64x(h0[3] ^ h0[7], h0[2] ^ h0[6]);
+    __m128i ax1 = _mm_set_epi64x(h1[1] ^ h1[5], h1[0] ^ h1[4]);
+    __m128i bx1 = _mm_set_epi64x(h1[3] ^ h1[7], h1[2] ^ h1[6]);
+    __m128i ax2 = _mm_set_epi64x(h2[1] ^ h2[5], h2[0] ^ h2[4]);
+    __m128i bx2 = _mm_set_epi64x(h2[3] ^ h2[7], h2[2] ^ h2[6]);
+    __m128i ax3 = _mm_set_epi64x(h3[1] ^ h3[5], h3[0] ^ h3[4]);
+    __m128i bx3 = _mm_set_epi64x(h3[3] ^ h3[7], h3[2] ^ h3[6]);
+    __m128i ax4 = _mm_set_epi64x(h4[1] ^ h4[5], h4[0] ^ h4[4]);
+    __m128i bx4 = _mm_set_epi64x(h4[3] ^ h4[7], h4[2] ^ h4[6]);
+    __m128i cx0 = _mm_set_epi64x(0, 0);
+    __m128i cx1 = _mm_set_epi64x(0, 0);
+    __m128i cx2 = _mm_set_epi64x(0, 0);
+    __m128i cx3 = _mm_set_epi64x(0, 0);
+    __m128i cx4 = _mm_set_epi64x(0, 0);
+
+    uint64_t idx0, idx1, idx2, idx3, idx4;
+    idx0 = EXTRACT64(ax0);
+    idx1 = EXTRACT64(ax1);
+    idx2 = EXTRACT64(ax2);
+    idx3 = EXTRACT64(ax3);
+    idx4 = EXTRACT64(ax4);
+
+    for (size_t i = 0; i < ITERATIONS / 2; i++)
+    {
+        uint64_t hi, lo;
+        __m128i *ptr0, *ptr1, *ptr2, *ptr3, *ptr4;
+
+        // EVEN ROUND
+        CN_STEP1(ax0, bx0, cx0, l0, ptr0, idx0);
+        CN_STEP1(ax1, bx1, cx1, l1, ptr1, idx1);
+        CN_STEP1(ax2, bx2, cx2, l2, ptr2, idx2);
+        CN_STEP1(ax3, bx3, cx3, l3, ptr3, idx3);
+        CN_STEP1(ax4, bx4, cx4, l4, ptr4, idx4);
+
+        CN_STEP2(ax0, bx0, cx0, l0, ptr0, idx0);
+        CN_STEP2(ax1, bx1, cx1, l1, ptr1, idx1);
+        CN_STEP2(ax2, bx2, cx2, l2, ptr2, idx2);
+        CN_STEP2(ax3, bx3, cx3, l3, ptr3, idx3);
+        CN_STEP2(ax4, bx4, cx4, l4, ptr4, idx4);
+
+        CN_STEP3(ax0, bx0, cx0, l0, ptr0, idx0);
+        CN_STEP3(ax1, bx1, cx1, l1, ptr1, idx1);
+        CN_STEP3(ax2, bx2, cx2, l2, ptr2, idx2);
+        CN_STEP3(ax3, bx3, cx3, l3, ptr3, idx3);
+        CN_STEP3(ax4, bx4, cx4, l4, ptr4, idx4);
+
+        CN_STEP4(ax0, bx0, cx0, l0, mc0, ptr0, idx0);
+        CN_STEP4(ax1, bx1, cx1, l1, mc1, ptr1, idx1);
+        CN_STEP4(ax2, bx2, cx2, l2, mc2, ptr2, idx2);
+        CN_STEP4(ax3, bx3, cx3, l3, mc3, ptr3, idx3);
+        CN_STEP4(ax4, bx4, cx4, l4, mc4, ptr4, idx4);
+
+        // ODD ROUND
+        CN_STEP1(ax0, cx0, bx0, l0, ptr0, idx0);
+        CN_STEP1(ax1, cx1, bx1, l1, ptr1, idx1);
+        CN_STEP1(ax2, cx2, bx2, l2, ptr2, idx2);
+        CN_STEP1(ax3, cx3, bx3, l3, ptr3, idx3);
+        CN_STEP1(ax4, cx4, bx4, l4, ptr4, idx4);
+
+        CN_STEP2(ax0, cx0, bx0, l0, ptr0, idx0);
+        CN_STEP2(ax1, cx1, bx1, l1, ptr1, idx1);
+        CN_STEP2(ax2, cx2, bx2, l2, ptr2, idx2);
+        CN_STEP2(ax3, cx3, bx3, l3, ptr3, idx3);
+        CN_STEP2(ax4, cx4, bx4, l4, ptr4, idx4);
+
+        CN_STEP3(ax0, cx0, bx0, l0, ptr0, idx0);
+        CN_STEP3(ax1, cx1, bx1, l1, ptr1, idx1);
+        CN_STEP3(ax2, cx2, bx2, l2, ptr2, idx2);
+        CN_STEP3(ax3, cx3, bx3, l3, ptr3, idx3);
+        CN_STEP3(ax4, cx4, bx4, l4, ptr4, idx4);
+
+        CN_STEP4(ax0, cx0, bx0, l0, mc0, ptr0, idx0);
+        CN_STEP4(ax1, cx1, bx1, l1, mc1, ptr1, idx1);
+        CN_STEP4(ax2, cx2, bx2, l2, mc2, ptr2, idx2);
+        CN_STEP4(ax3, cx3, bx3, l3, mc3, ptr3, idx3);
+        CN_STEP4(ax4, cx4, bx4, l4, mc4, ptr4, idx4);
+    }
+
+    for (size_t i = 0; i < 5; i++) {
+        cn_implode_scratchpad<ALGO, MEM, SOFT_AES>(reinterpret_cast<__m128i*>(ctx[i]->memory), reinterpret_cast<__m128i*>(ctx[i]->state));
+        keccakf(reinterpret_cast<uint64_t*>(ctx[i]->state), 24);
+        extra_hashes[ctx[i]->state[0] & 3](ctx[i]->state, 200, output + 32 * i);
+    }
 }

 #endif /* __CRYPTONIGHT_X86_H__ */
--- a/src/crypto/soft_aes.h
+++ b/src/crypto/soft_aes.h
@@ -105,6 +105,23 @@ static inline __m128i soft_aesenc(const uint32_t* in, __m128i key)
    return _mm_xor_si128(out, key);
 }

+static inline __m128i soft_aesenc(__m128i in, __m128i key)
+{
+    uint32_t x0, x1, x2, x3;
+    x0 = _mm_cvtsi128_si32(in);
+    x1 = _mm_cvtsi128_si32(_mm_shuffle_epi32(in, 0x55));
+    x2 = _mm_cvtsi128_si32(_mm_shuffle_epi32(in, 0xAA));
+    x3 = _mm_cvtsi128_si32(_mm_shuffle_epi32(in, 0xFF));
+
+    __m128i out = _mm_set_epi32(
+        (saes_table[0][x3 & 0xff] ^ saes_table[1][(x0 >> 8) & 0xff] ^ saes_table[2][(x1 >> 16) & 0xff] ^ saes_table[3][x2 >> 24]),
+        (saes_table[0][x2 & 0xff] ^ saes_table[1][(x3 >> 8) & 0xff] ^ saes_table[2][(x0 >> 16) & 0xff] ^ saes_table[3][x1 >> 24]),
+        (saes_table[0][x1 & 0xff] ^ saes_table[1][(x2 >> 8) & 0xff] ^ saes_table[2][(x3 >> 16) & 0xff] ^ saes_table[3][x0 >> 24]),
+        (saes_table[0][x0 & 0xff] ^ saes_table[1][(x1 >> 8) & 0xff] ^ saes_table[2][(x2 >> 16) & 0xff] ^ saes_table[3][x3 >> 24]));
+
+    return _mm_xor_si128(out, key);
+}
+
 static inline uint32_t sub_word(uint32_t key)
 {
    return (saes_sbox[key >> 24 ] << 24)   | 
--- a/src/donate.h
+++ b/src/donate.h
@@ -29,16 +29,22 @@
 * Dev donation.
 *
 * Percentage of your hashing power that you want to donate to the developer, can be 0 if you don't want to do that.
- * Example of how it works for the default setting of 1:
- * You miner will mine into your usual pool for 99 minutes, then switch to the developer's pool for 1 minute.
- * Since v2.5.1 start time randomized in range from 50 to 150 minutes minus donation time.
+ *
+ * Example of how it works for the setting of 1%:
+ * You miner will mine into your usual pool for random time (in range from 49.5 to 148.5 minutes),
+ * then switch to the developer's pool for 1 minute, then switch again to your pool for 99 minutes
+ * and then switch agaiin to developer's pool for 1 minute, these rounds will continue until miner working.
+ *
+ * Randomised only first round, to prevent waves on the donation pool.
+ *
 * Switching is instant, and only happens after a successful connection, so you never loose any hashes.
 *
 * If you plan on changing this setting to 0 please consider making a one off donation to my wallet:
 * XMR: 48edfHu7V9Z84YzzMa6fUueoELZ9ZRXq9VetWzYGzKt52XU5xvqgzYnDK9URnRoJMk1j8nLwEVsaSWJ4fhdUyZijBGUicoD
 * BTC: 1P7ujsXeX7GxQwHNnJsRMgAdNkFZmNVqJT
 */
-constexpr const int kDonateLevel = 5;
+constexpr const int kDefaultDonateLevel = 5;
+constexpr const int kMinimumDonateLevel = 1;


 #endif /* __DONATE_H__ */
--- a/src/interfaces/IConfig.h
+++ b/src/interfaces/IConfig.h
@@ -0,0 +1,110 @@
+/* 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-2018 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 __ICONFIG_H__
+#define __ICONFIG_H__
+
+
+#include "rapidjson/fwd.h"
+
+
+namespace xmrig {
+
+
+class IConfig
+{
+public:
+    enum Keys {
+        // common
+        AlgorithmKey      = 'a',
+        ApiPort           = 4000,
+        ApiAccessTokenKey = 4001,
+        ApiWorkerIdKey    = 4002,
+        ApiIPv6Key        = 4003,
+        ApiRestrictedKey  = 4004,
+        BackgroundKey     = 'B',
+        ConfigKey         = 'c',
+        DonateLevelKey    = 1003,
+        HelpKey           = 'h',
+        KeepAliveKey      = 'k',
+        LogFileKey        = 'l',
+        ColorKey          = 1002,
+        WatchKey          = 1105,
+        PasswordKey       = 'p',
+        RetriesKey        = 'r',
+        RetryPauseKey     = 'R',
+        SyslogKey         = 'S',
+        UrlKey            = 'o',
+        UserKey           = 'u',
+        UserAgentKey      = 1008,
+        UserpassKey       = 'O',
+        VerboseKey        = 1100,
+        VersionKey        = 'V',
+        VariantKey        = 1010,
+
+        // xmrig common
+        CPUPriorityKey    = 1021,
+        NicehashKey       = 1006,
+        PrintTimeKey      = 1007,
+
+        // xmrig cpu
+        AVKey             = 'v',
+        CPUAffinityKey    = 1020,
+        DryRunKey         = 5000,
+        HugePagesKey      = 1009,
+        MaxCPUUsageKey    = 1004,
+        SafeKey           = 1005,
+        ThreadsKey        = 't',
+        HardwareAESKey    = 1011,
+
+        // xmrig-proxy
+        AccessLogFileKey  = 'A',
+        BindKey           = 'b',
+        CoinKey           = 1104,
+        CustomDiffKey     = 1102,
+        DebugKey          = 1101,
+        ModeKey           = 'm',
+        PoolCoinKey       = 'C',
+        ReuseTimeoutKey   = 1106,
+        WorkersKey        = 1103,
+    };
+
+    virtual ~IConfig() {}
+
+    virtual bool adjust()                                  = 0;
+    virtual bool isValid() const                           = 0;
+    virtual bool isWatch() const                           = 0;
+    virtual bool parseBoolean(int key, bool enable)        = 0;
+    virtual bool parseString(int key, const char *arg)     = 0;
+    virtual bool parseUint64(int key, uint64_t arg)        = 0;
+    virtual bool save()                                    = 0;
+    virtual const char *fileName() const                   = 0;
+    virtual void getJSON(rapidjson::Document &doc) const   = 0;
+    virtual void parseJSON(const rapidjson::Document &doc) = 0;
+    virtual void setFileName(const char *fileName)         = 0;
+};
+
+
+} /* namespace xmrig */
+
+
+#endif // __ICONFIG_H__
--- a/src/interfaces/IConfigCreator.h
+++ b/src/interfaces/IConfigCreator.h
@@ -0,0 +1,45 @@
+/* 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-2018 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 __ICONFIGCREATOR_H__
+#define __ICONFIGCREATOR_H__
+
+
+namespace xmrig {
+
+
+class IConfig;
+
+
+class IConfigCreator
+{
+public:
+    virtual ~IConfigCreator() {}
+
+    virtual IConfig *create() const = 0;
+};
+
+
+} /* namespace xmrig */
+
+
+#endif // __ICONFIGCREATOR_H__
--- a/src/interfaces/IControllerListener.h
+++ b/src/interfaces/IControllerListener.h
@@ -5,7 +5,6 @@
 * 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 2016-2018 XMRig       <https://github.com/xmrig>, <support@xmrig.com>
 *
 *   This program is free software: you can redistribute it and/or modify
@@ -22,34 +21,26 @@
 *   along with this program. If not, see <http://www.gnu.org/licenses/>.
 */

-#ifndef __SINGLEWORKER_H__
-#define __SINGLEWORKER_H__
+#ifndef __ICONTROLLERLISTENER_H__
+#define __ICONTROLLERLISTENER_H__


-#include "net/Job.h"
-#include "net/JobResult.h"
-#include "workers/Worker.h"
+namespace xmrig {


-class Handle;
+class Config;


-class SingleWorker : public Worker
+class IControllerListener
 {
 public:
-    SingleWorker(Handle *handle);
+    virtual ~IControllerListener() {}

-    void start() override;
-
-private:
-    bool resume(const Job &job);
-    void consumeJob();
-    void save(const Job &job);
-
-    Job m_job;
-    Job m_paused;
-    JobResult m_result;
+    virtual void onConfigChanged(Config *config, Config *previousConfig) = 0;
 };


-#endif /* __SINGLEWORKER_H__ */
+} /* namespace xmrig */
+
+
+#endif // __ICONTROLLERLISTENER_H__
--- a/src/interfaces/IThread.h
+++ b/src/interfaces/IThread.h
@@ -0,0 +1,73 @@
+/* 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-2018 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 __ITHREAD_H__
+#define __ITHREAD_H__
+
+
+#include <stdint.h>
+
+
+#include "common/xmrig.h"
+#include "rapidjson/fwd.h"
+
+
+namespace xmrig {
+
+
+class IThread
+{
+public:
+    enum Type {
+        CPU,
+        OpenCL,
+        CUDA
+    };
+
+    enum Multiway {
+        SingleWay = 1,
+        DoubleWay,
+        TripleWay,
+        QuadWay,
+        PentaWay
+    };
+
+    virtual ~IThread() {}
+
+    virtual Algo algorithm() const                                    = 0;
+    virtual int priority() const                                      = 0;
+    virtual int64_t affinity() const                                  = 0;
+    virtual Multiway multiway() const                                 = 0;
+    virtual rapidjson::Value toConfig(rapidjson::Document &doc) const = 0;
+    virtual size_t index() const                                      = 0;
+    virtual Type type() const                                         = 0;
+
+#   ifndef XMRIG_NO_API
+    virtual rapidjson::Value toAPI(rapidjson::Document &doc) const = 0;
+#   endif
+};
+
+
+} /* namespace xmrig */
+
+
+#endif // __ITHREAD_H__
--- a/src/interfaces/IWatcherListener.h
+++ b/src/interfaces/IWatcherListener.h
@@ -0,0 +1,46 @@
+/* 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 __IWATCHERLISTENER_H__
+#define __IWATCHERLISTENER_H__
+
+
+namespace xmrig {
+
+
+class IConfig;
+
+
+class IWatcherListener
+{
+public:
+    virtual ~IWatcherListener() {}
+
+    virtual void onNewConfig(IConfig *config) = 0;
+};
+
+
+} /* namespace xmrig */
+
+
+#endif // __IWATCHERLISTENER_H__
--- a/src/interfaces/IWorker.h
+++ b/src/interfaces/IWorker.h
@@ -4,8 +4,8 @@
 * 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 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
@@ -33,6 +33,8 @@ class IWorker
 public:
    virtual ~IWorker() {}

+    virtual bool selfTest()            = 0;
+    virtual size_t id() const          = 0;
    virtual uint64_t hashCount() const = 0;
    virtual uint64_t timestamp() const = 0;
    virtual void start()               = 0;
--- a/src/log/ConsoleLog.cpp
+++ b/src/log/ConsoleLog.cpp
@@ -4,8 +4,8 @@
 * 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 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
@@ -34,18 +34,18 @@
 #endif


+#include "core/Config.h"
+#include "core/Controller.h"
 #include "log/ConsoleLog.h"
 #include "log/Log.h"
-#include "Options.h"


-ConsoleLog::ConsoleLog(bool colors) :
-    m_colors(colors),
-    m_stream(nullptr)
+ConsoleLog::ConsoleLog(xmrig::Controller *controller) :
+    m_stream(nullptr),
+    m_controller(controller)
 {
    if (uv_tty_init(uv_default_loop(), &m_tty, 1, 0) < 0) {
-        Options::i()->setColors(false);
-        m_colors = false;
+        controller->config()->setColors(false);
        return;
    }

@@ -78,7 +78,9 @@ void ConsoleLog::message(int level, const char* fmt, va_list args)
 #   endif

    const char* color = nullptr;
-    if (m_colors) {
+    const bool colors = m_controller->config()->isColors();
+
+    if (colors) {
        switch (level) {
        case Log::ERR:
            color = Log::kCL_RED;
@@ -109,9 +111,9 @@ void ConsoleLog::message(int level, const char* fmt, va_list args)
             stime.tm_hour,
             stime.tm_min,
             stime.tm_sec,
-             m_colors ? color : "",
+             colors ? color : "",
             fmt,
-             m_colors ? Log::kCL_N : ""
+             colors ? Log::kCL_N : ""
        );

    print(args);
@@ -120,7 +122,7 @@ void ConsoleLog::message(int level, const char* fmt, va_list args)

 void ConsoleLog::text(const char* fmt, va_list args)
 {
-    snprintf(m_fmt, sizeof(m_fmt) - 1, "%s%s\n", fmt, m_colors ? Log::kCL_N : "");
+    snprintf(m_fmt, sizeof(m_fmt) - 1, "%s%s\n", fmt, m_controller->config()->isColors() ? Log::kCL_N : "");

    print(args);
 }
--- a/src/log/ConsoleLog.h
+++ b/src/log/ConsoleLog.h
@@ -4,8 +4,8 @@
 * 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 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
@@ -31,10 +31,15 @@
 #include "interfaces/ILogBackend.h"


+namespace xmrig {
+    class Controller;
+}
+
+
 class ConsoleLog : public ILogBackend
 {
 public:
-    ConsoleLog(bool colors);
+    ConsoleLog(xmrig::Controller *controller);

    void message(int level, const char *fmt, va_list args) override;
    void text(const char *fmt, va_list args) override;
@@ -43,12 +48,12 @@ private:
    bool isWritable() const;
    void print(va_list args);

-    bool m_colors;
    char m_buf[512];
    char m_fmt[256];
    uv_buf_t m_uvBuf;
    uv_stream_t *m_stream;
    uv_tty_t m_tty;
+    xmrig::Controller *m_controller;
 };

 #endif /* __CONSOLELOG_H__ */
--- a/src/log/Log.cpp
+++ b/src/log/Log.cpp
@@ -4,8 +4,8 @@
 * 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 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
@@ -38,6 +38,8 @@ Log *Log::m_self = nullptr;

 void Log::message(Log::Level level, const char* fmt, ...)
 {
+    uv_mutex_lock(&m_mutex);
+
    va_list args;
    va_list copy;
    va_start(args, fmt);
@@ -47,11 +49,15 @@ void Log::message(Log::Level level, const char* fmt, ...)
        backend->message(level, fmt, copy);
        va_end(copy);
    }
+
+    uv_mutex_unlock(&m_mutex);
 }


 void Log::text(const char* fmt, ...)
 {
+    uv_mutex_lock(&m_mutex);
+
    va_list args;
    va_list copy;
    va_start(args, fmt);
@@ -63,6 +69,8 @@ void Log::text(const char* fmt, ...)
    }

    va_end(args);
+
+    uv_mutex_unlock(&m_mutex);
 }


--- a/src/log/Log.h
+++ b/src/log/Log.h
@@ -4,8 +4,8 @@
 * 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 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
@@ -25,6 +25,7 @@
 #define __LOG_H__


+#include <assert.h>
 #include <uv.h>
 #include <vector>

@@ -54,20 +55,28 @@ public:
    constexpr static const char* kCL_GRAY = "\x1B[90m";
 #   endif

-    static inline Log* i()                       { return m_self; }
+    static inline Log* i()                       { assert(m_self != nullptr); return m_self; }
    static inline void add(ILogBackend *backend) { i()->m_backends.push_back(backend); }
-    static inline void init()                    { if (!m_self) { m_self = new Log();} }
-    static inline void release()                 { delete m_self; }
+    static inline void init()                    { if (!m_self) { new Log(); } }
+    static inline void release()                 { assert(m_self != nullptr); delete m_self; }

    void message(Level level, const char* fmt, ...);
    void text(const char* fmt, ...);

 private:
-    inline Log() {}
+    inline Log() {
+        assert(m_self == nullptr);
+
+        uv_mutex_init(&m_mutex);
+
+        m_self = this;
+    }
+
    ~Log();

    static Log *m_self;
    std::vector<ILogBackend*> m_backends;
+    uv_mutex_t m_mutex;
 };


--- a/src/net/Client.cpp
+++ b/src/net/Client.cpp
@@ -32,7 +32,6 @@
 #include "interfaces/IClientListener.h"
 #include "log/Log.h"
 #include "net/Client.h"
-#include "net/Url.h"
 #include "rapidjson/document.h"
 #include "rapidjson/error/en.h"
 #include "rapidjson/stringbuffer.h"
@@ -52,6 +51,7 @@


 int64_t Client::m_sequence = 1;
+xmrig::Storage<Client> Client::m_storage;


 Client::Client(int id, const char *agent, IClientListener *listener) :
@@ -67,13 +67,17 @@ Client::Client(int id, const char *agent, IClientListener *listener) :
    m_state(UnconnectedState),
    m_expire(0),
    m_jobs(0),
+    m_keepAlive(0),
+    m_key(0),
    m_stream(nullptr),
    m_socket(nullptr)
 {
+    m_key = m_storage.add(this);
+
    memset(m_ip, 0, sizeof(m_ip));
    memset(&m_hints, 0, sizeof(m_hints));

-    m_resolver.data = this;
+    m_resolver.data = m_storage.ptr(m_key);

    m_hints.ai_family   = AF_UNSPEC;
    m_hints.ai_socktype = SOCK_STREAM;
@@ -81,11 +85,6 @@ Client::Client(int id, const char *agent, IClientListener *listener) :

    m_recvBuf.base = m_buf;
    m_recvBuf.len  = sizeof(m_buf);
-
-#   ifndef XMRIG_PROXY_PROJECT
-    m_keepAliveTimer.data = this;
-    uv_timer_init(uv_default_loop(), &m_keepAliveTimer);
-#   endif
 }


@@ -97,7 +96,7 @@ Client::~Client()

 void Client::connect()
 {
-    resolve(m_url.host());
+    resolve(m_pool.host());
 }


@@ -106,10 +105,10 @@ void Client::connect()
 *
 * @param url
 */
-void Client::connect(const Url *url)
+void Client::connect(const Pool &url)
 {
-    setUrl(url);
-    resolve(m_url.host());
+    setPool(url);
+    connect();
 }


@@ -122,34 +121,34 @@ void Client::deleteLater()
    m_listener = nullptr;

    if (!disconnect()) {
-        delete this;
+        m_storage.remove(m_key);
    }
 }


-void Client::setUrl(const Url *url)
+void Client::setPool(const Pool &pool)
 {
-    if (!url || !url->isValid()) {
+    if (!pool.isValid()) {
        return;
    }

-    m_url = url;
+    m_pool = pool;
 }


 void Client::tick(uint64_t now)
 {
-    if (m_expire == 0 || now < m_expire) {
-        return;
-    }
-
    if (m_state == ConnectedState) {
-        LOG_DEBUG_ERR("[%s:%u] timeout", m_url.host(), m_url.port());
-        close();
+        if (m_expire && now > m_expire) {
+            LOG_DEBUG_ERR("[%s] timeout", m_pool.url());
+            close();
+        }
+        else if (m_keepAlive && now > m_keepAlive) {
+            ping();
+        }
    }

-
-    if (m_state == ConnectingState) {
+    if (m_expire && now > m_expire && m_state == ConnectingState) {
        connect();
    }
 }
@@ -157,12 +156,9 @@ void Client::tick(uint64_t now)

 bool Client::disconnect()
 {
-#   ifndef XMRIG_PROXY_PROJECT
-    uv_timer_stop(&m_keepAliveTimer);
-#   endif
-
-    m_expire   = 0;
-    m_failures = -1;
+    m_keepAlive = 0;
+    m_expire    = 0;
+    m_failures  = -1;

    return close();
 }
@@ -205,28 +201,7 @@ bool Client::close()

    setState(ClosingState);

-    uv_stream_t *stream = reinterpret_cast<uv_stream_t*>(m_socket);
-
-    if (uv_is_readable(stream) == 1) {
-        uv_read_stop(stream);
-    }
-
-    if (uv_is_writable(stream) == 1) {
-        const int rc = uv_shutdown(new uv_shutdown_t, stream, [](uv_shutdown_t* req, int status) {
-            if (uv_is_closing(reinterpret_cast<uv_handle_t*>(req->handle)) == 0) {
-                uv_close(reinterpret_cast<uv_handle_t*>(req->handle), Client::onClose);
-            }
-
-            delete req;
-        });
-
-        assert(rc == 0);
-
-        if (rc != 0) {
-            onClose();
-        }
-    }
-    else {
+    if (uv_is_closing(reinterpret_cast<uv_handle_t*>(m_socket)) == 0) {
        uv_close(reinterpret_cast<uv_handle_t*>(m_socket), Client::onClose);
    }

@@ -264,11 +239,10 @@ bool Client::parseJob(const rapidjson::Value &params, int *code)
    }

 #   ifdef XMRIG_PROXY_PROJECT
-    Job job(m_id, m_url.variant());
+    Job job(m_id, m_pool.variant());
    job.setClientId(m_rpcId);
-    job.setCoin(m_url.coin());
 #   else
-    Job job(m_id, m_nicehash, m_url.algo(), m_url.variant());
+    Job job(m_id, m_nicehash, m_pool.algo(), m_pool.variant());
 #   endif

    if (!job.setId(params["job_id"].GetString())) {
@@ -305,7 +279,7 @@ bool Client::parseJob(const rapidjson::Value &params, int *code)
    }

    if (!m_quiet) {
-        LOG_WARN("[%s:%u] duplicate job received, reconnect", m_url.host(), m_url.port());
+        LOG_WARN("[%s] duplicate job received, reconnect", m_pool.url());
    }

    close();
@@ -321,7 +295,7 @@ bool Client::parseLogin(const rapidjson::Value &result, int *code)
    }

 #   ifndef XMRIG_PROXY_PROJECT
-    m_nicehash = m_url.isNicehash();
+    m_nicehash = m_pool.isNicehash();
 #   endif

    if (result.HasMember("extensions")) {
@@ -349,7 +323,7 @@ int Client::resolve(const char *host)
    const int r = uv_getaddrinfo(uv_default_loop(), &m_resolver, Client::onResolved, host, nullptr, &m_hints);
    if (r) {
        if (!m_quiet) {
-            LOG_ERR("[%s:%u] getaddrinfo error: \"%s\"", host, m_url.port(), uv_strerror(r));
+            LOG_ERR("[%s:%u] getaddrinfo error: \"%s\"", host, m_pool.port(), uv_strerror(r));
        }
        return 1;
    }
@@ -360,9 +334,9 @@ int Client::resolve(const char *host)

 int64_t Client::send(size_t size)
 {
-    LOG_DEBUG("[%s:%u] send (%d bytes): \"%s\"", m_url.host(), m_url.port(), size, m_sendBuf);
+    LOG_DEBUG("[%s] send (%d bytes): \"%s\"", m_pool.url(), size, m_sendBuf);
    if (state() != ConnectedState || !uv_is_writable(m_stream)) {
-        LOG_DEBUG_ERR("[%s:%u] send failed, invalid state: %d", m_url.host(), m_url.port(), m_state);
+        LOG_DEBUG_ERR("[%s] send failed, invalid state: %d", m_pool.url(), m_state);
        return -1;
    }

@@ -400,14 +374,14 @@ void Client::connect(sockaddr *addr)
 {
    setState(ConnectingState);

-    reinterpret_cast<struct sockaddr_in*>(addr)->sin_port = htons(m_url.port());
+    reinterpret_cast<sockaddr_in*>(addr)->sin_port = htons(m_pool.port());
    delete m_socket;

    uv_connect_t *req = new uv_connect_t;
-    req->data = this;
+    req->data = m_storage.ptr(m_key);

    m_socket = new uv_tcp_t;
-    m_socket->data = this;
+    m_socket->data = m_storage.ptr(m_key);

    uv_tcp_init(uv_default_loop(), m_socket);
    uv_tcp_nodelay(m_socket, 1);
@@ -434,9 +408,9 @@ void Client::login()
    doc.AddMember("method",  "login", allocator);

    rapidjson::Value params(rapidjson::kObjectType);
-    params.AddMember("login", rapidjson::StringRef(m_url.user()),     allocator);
-    params.AddMember("pass",  rapidjson::StringRef(m_url.password()), allocator);
-    params.AddMember("agent", rapidjson::StringRef(m_agent),          allocator);
+    params.AddMember("login", rapidjson::StringRef(m_pool.user()),     allocator);
+    params.AddMember("pass",  rapidjson::StringRef(m_pool.password()), allocator);
+    params.AddMember("agent", rapidjson::StringRef(m_agent),           allocator);

    doc.AddMember("params", params, allocator);

@@ -475,11 +449,11 @@ void Client::parse(char *line, size_t len)

    line[len - 1] = '\0';

-    LOG_DEBUG("[%s:%u] received (%d bytes): \"%s\"", m_url.host(), m_url.port(), len, line);
+    LOG_DEBUG("[%s] received (%d bytes): \"%s\"", m_pool.url(), len, line);

    if (len < 32 || line[0] != '{') {
        if (!m_quiet) {
-            LOG_ERR("[%s:%u] JSON decode failed", m_url.host(), m_url.port());
+            LOG_ERR("[%s] JSON decode failed", m_pool.url());
        }

        return;
@@ -488,7 +462,7 @@ void Client::parse(char *line, size_t len)
    rapidjson::Document doc;
    if (doc.ParseInsitu(line).HasParseError()) {
        if (!m_quiet) {
-            LOG_ERR("[%s:%u] JSON decode failed: \"%s\"", m_url.host(), m_url.port(), rapidjson::GetParseError_En(doc.GetParseError()));
+            LOG_ERR("[%s] JSON decode failed: \"%s\"", m_pool.url(), rapidjson::GetParseError_En(doc.GetParseError()));
        }

        return;
@@ -530,7 +504,7 @@ void Client::parseNotification(const char *method, const rapidjson::Value &param
 {
    if (error.IsObject()) {
        if (!m_quiet) {
-            LOG_ERR("[%s:%u] error: \"%s\", code: %d", m_url.host(), m_url.port(), error["message"].GetString(), error["code"].GetInt());
+            LOG_ERR("[%s] error: \"%s\", code: %d", m_pool.url(), error["message"].GetString(), error["code"].GetInt());
        }
        return;
    }
@@ -548,7 +522,7 @@ void Client::parseNotification(const char *method, const rapidjson::Value &param
        return;
    }

-    LOG_WARN("[%s:%u] unsupported method: \"%s\"", m_url.host(), m_url.port(), method);
+    LOG_WARN("[%s] unsupported method: \"%s\"", m_pool.url(), method);
 }


@@ -564,10 +538,10 @@ void Client::parseResponse(int64_t id, const rapidjson::Value &result, const rap
            m_results.erase(it);
        }
        else if (!m_quiet) {
-            LOG_ERR("[%s:%u] error: \"%s\", code: %d", m_url.host(), m_url.port(), message, error["code"].GetInt());
+            LOG_ERR("[%s] error: \"%s\", code: %d", m_pool.url(), message, error["code"].GetInt());
        }

-        if (id == 1 || isCriticalError(message)) {
+        if (isCriticalError(message)) {
            close();
        }

@@ -582,7 +556,7 @@ void Client::parseResponse(int64_t id, const rapidjson::Value &result, const rap
        int code = -1;
        if (!parseLogin(result, &code)) {
            if (!m_quiet) {
-                LOG_ERR("[%s:%u] login error code: %d", m_url.host(), m_url.port(), code);
+                LOG_ERR("[%s] login error code: %d", m_pool.url(), code);
            }

            close();
@@ -613,18 +587,13 @@ void Client::ping()
 void Client::reconnect()
 {
    if (!m_listener) {
-        delete this;
+        m_storage.remove(m_key);

        return;
    }

    setState(ConnectingState);
-
-#   ifndef XMRIG_PROXY_PROJECT
-    if (m_url.isKeepAlive()) {
-        uv_timer_stop(&m_keepAliveTimer);
-    }
-#   endif
+    m_keepAlive = 0;

    if (m_failures == -1) {
        return m_listener->onClose(this, -1);
@@ -639,7 +608,7 @@ void Client::reconnect()

 void Client::setState(SocketState state)
 {
-    LOG_DEBUG("[%s:%u] state: %d", m_url.host(), m_url.port(), state);
+    LOG_DEBUG("[%s] state: %d", m_pool.url(), state);

    if (m_state == state) {
        return;
@@ -653,13 +622,9 @@ void Client::startTimeout()
 {
    m_expire = 0;

-#   ifndef XMRIG_PROXY_PROJECT
-    if (!m_url.isKeepAlive()) {
-        return;
+    if (m_pool.keepAlive()) {
+        m_keepAlive = uv_now(uv_default_loop()) + (m_pool.keepAlive() * 1000);
    }
-
-    uv_timer_start(&m_keepAliveTimer, [](uv_timer_t *handle) { getClient(handle->data)->ping(); }, kKeepAliveTimeout, 0);
-#   endif
 }


@@ -690,12 +655,13 @@ void Client::onConnect(uv_connect_t *req, int status)
 {
    auto client = getClient(req->data);
    if (!client) {
+        delete req;
        return;
    }

    if (status < 0) {
        if (!client->m_quiet) {
-            LOG_ERR("[%s:%u] connect error: \"%s\"", client->m_url.host(), client->m_url.port(), uv_strerror(status));
+            LOG_ERR("[%s] connect error: \"%s\"", client->m_pool.url(), uv_strerror(status));
        }

        delete req;
@@ -723,7 +689,7 @@ void Client::onRead(uv_stream_t *stream, ssize_t nread, const uv_buf_t *buf)

    if (nread < 0) {
        if (nread != UV_EOF && !client->m_quiet) {
-            LOG_ERR("[%s:%u] read error: \"%s\"", client->m_url.host(), client->m_url.port(), uv_strerror((int) nread));
+            LOG_ERR("[%s] read error: \"%s\"", client->m_pool.url(), uv_strerror((int) nread));
        }

        client->close();
@@ -735,6 +701,11 @@ void Client::onRead(uv_stream_t *stream, ssize_t nread, const uv_buf_t *buf)
        return;
    }

+    assert(client->m_listener != nullptr);
+    if (!client->m_listener) {
+        return client->reconnect();
+    }
+
    client->m_recvBufPos += nread;

    char* end;
@@ -771,9 +742,14 @@ void Client::onResolved(uv_getaddrinfo_t *req, int status, struct addrinfo *res)
        return;
    }

+    assert(client->m_listener != nullptr);
+    if (!client->m_listener) {
+        return client->reconnect();
+    }
+
    if (status < 0) {
        if (!client->m_quiet) {
-            LOG_ERR("[%s:%u] DNS error: \"%s\"", client->m_url.host(), client->m_url.port(), uv_strerror(status));
+            LOG_ERR("[%s] DNS error: \"%s\"", client->m_pool.url(), uv_strerror(status));
        }

        return client->reconnect();
@@ -797,7 +773,7 @@ void Client::onResolved(uv_getaddrinfo_t *req, int status, struct addrinfo *res)

    if (ipv4.empty() && ipv6.empty()) {
        if (!client->m_quiet) {
-            LOG_ERR("[%s:%u] DNS error: \"No IPv4 (A) or IPv6 (AAAA) records found\"", client->m_url.host(), client->m_url.port());
+            LOG_ERR("[%s] DNS error: \"No IPv4 (A) or IPv6 (AAAA) records found\"", client->m_pool.url());
        }

        uv_freeaddrinfo(res);
--- a/src/net/Client.h
+++ b/src/net/Client.h
@@ -32,8 +32,9 @@

 #include "net/Id.h"
 #include "net/Job.h"
+#include "net/Storage.h"
 #include "net/SubmitResult.h"
-#include "net/Url.h"
+#include "net/Pool.h"
 #include "rapidjson/fwd.h"


@@ -53,31 +54,29 @@ public:
    };

    constexpr static int kResponseTimeout  = 20 * 1000;
-    constexpr static int kKeepAliveTimeout = 60 * 1000;

    Client(int id, const char *agent, IClientListener *listener);
+    ~Client();

    bool disconnect();
    int64_t submit(const JobResult &result);
    void connect();
-    void connect(const Url *url);
+    void connect(const Pool &pool);
    void deleteLater();
-    void setUrl(const Url *url);
+    void setPool(const Pool &pool);
    void tick(uint64_t now);

    inline bool isReady() const              { return m_state == ConnectedState && m_failures == 0; }
-    inline const char *host() const          { return m_url.host(); }
+    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 int id() const                    { return m_id; }
    inline SocketState state() const         { return m_state; }
-    inline uint16_t port() const             { return m_url.port(); }
+    inline uint16_t port() const             { return m_pool.port(); }
    inline void setQuiet(bool quiet)         { m_quiet = quiet; }
    inline void setRetryPause(int ms)        { m_retryPause = ms; }

 private:
-    ~Client();
-
    bool close();
    bool isCriticalError(const char *message);
    bool parseJob(const rapidjson::Value &params, int *code);
@@ -103,7 +102,7 @@ private:
    static void onRead(uv_stream_t *stream, ssize_t nread, const uv_buf_t *buf);
    static void onResolved(uv_getaddrinfo_t *req, int status, struct addrinfo *res);

-    static inline Client *getClient(void *data) { return static_cast<Client*>(data); }
+    static inline Client *getClient(void *data) { return m_storage.get(data); }

    addrinfo m_hints;
    bool m_ipv6;
@@ -118,22 +117,22 @@ private:
    int m_retryPause;
    int64_t m_failures;
    Job m_job;
+    Pool m_pool;
    size_t m_recvBufPos;
    SocketState m_state;
-    static int64_t m_sequence;
    std::map<int64_t, SubmitResult> m_results;
    uint64_t m_expire;
    uint64_t m_jobs;
-    Url m_url;
+    uint64_t m_keepAlive;
+    uintptr_t m_key;
    uv_buf_t m_recvBuf;
    uv_getaddrinfo_t m_resolver;
    uv_stream_t *m_stream;
    uv_tcp_t *m_socket;
    xmrig::Id m_rpcId;

-#   ifndef XMRIG_PROXY_PROJECT
-    uv_timer_t m_keepAliveTimer;
-#   endif
+    static int64_t m_sequence;
+    static xmrig::Storage<Client> m_storage;
 };


--- a/src/net/Job.cpp
+++ b/src/net/Job.cpp
@@ -23,6 +23,7 @@
 */


+#include <assert.h>
 #include <string.h>


@@ -59,14 +60,14 @@ static inline char hf_bin2hex(unsigned char c)
 Job::Job() :
    m_nicehash(false),
    m_coin(),
-    m_algo(xmrig::ALGO_CRYPTONIGHT),
+    m_algo(xmrig::CRYPTONIGHT),
    m_poolId(-2),
    m_threadId(-1),
-    m_variant(xmrig::VARIANT_AUTO),
    m_size(0),
    m_diff(0),
    m_target(0),
-    m_blob()
+    m_blob(),
+    m_variant(xmrig::VARIANT_AUTO)
 {
 }

@@ -77,12 +78,12 @@ Job::Job(int poolId, bool nicehash, int algo, int variant) :
    m_algo(algo),
    m_poolId(poolId),
    m_threadId(-1),
-    m_variant(variant),
    m_size(0),
    m_diff(0),
    m_target(0),
    m_blob()
 {
+    setVariant(variant);
 }


@@ -164,7 +165,7 @@ void Job::setCoin(const char *coin)
    }

    strncpy(m_coin, coin, sizeof(m_coin));
-    m_algo = strcmp(m_coin, "AEON") == 0 ? xmrig::ALGO_CRYPTONIGHT_LITE : xmrig::ALGO_CRYPTONIGHT;
+    m_algo = strcmp(m_coin, "AEON") == 0 ? xmrig::CRYPTONIGHT_LITE : xmrig::CRYPTONIGHT;
 }


@@ -174,10 +175,12 @@ void Job::setVariant(int variant)
    case xmrig::VARIANT_AUTO:
    case xmrig::VARIANT_NONE:
    case xmrig::VARIANT_V1:
-        m_variant = variant;
+        m_variant = static_cast<xmrig::Variant>(variant);
        break;

    default:
+        assert(false);
+        m_variant = xmrig::VARIANT_AUTO;
        break;
    }
 }
@@ -206,6 +209,17 @@ void Job::toHex(const unsigned char* in, unsigned int len, char* out)
 }


+#ifdef APP_DEBUG
+char *Job::toHex(const unsigned char* in, unsigned int len)
+{
+    char *out = new char[len * 2 + 1]();
+    toHex(in, len, out);
+
+    return out;
+}
+#endif
+
+
 bool Job::operator==(const Job &other) const
 {
    return m_id == other.m_id && memcmp(m_blob, other.m_blob, sizeof(m_blob)) == 0;
--- a/src/net/Job.h
+++ b/src/net/Job.h
@@ -30,8 +30,8 @@
 #include <stdint.h>


+#include "common/xmrig.h"
 #include "net/Id.h"
-#include "xmrig.h"


 class Job
@@ -55,7 +55,6 @@ public:
    inline const xmrig::Id &id() const     { return m_id; }
    inline int poolId() const              { return m_poolId; }
    inline int threadId() const            { return m_threadId; }
-    inline int variant() const             { return (m_variant == xmrig::VARIANT_AUTO ? (m_blob[0] > 6 ? 1 : 0) : m_variant); }
    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 (uint32_t) m_diff; }
@@ -63,12 +62,17 @@ public:
    inline void setNicehash(bool nicehash) { m_nicehash = nicehash; }
    inline void setPoolId(int poolId)      { m_poolId = poolId; }
    inline void setThreadId(int threadId)  { m_threadId = threadId; }
+    inline xmrig::Variant variant() const  { return (m_variant == xmrig::VARIANT_AUTO ? (m_blob[0] > 6 ? xmrig::VARIANT_V1 : xmrig::VARIANT_NONE) : m_variant); }

    static bool fromHex(const char* in, unsigned int len, unsigned char* out);
    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; }
    static void toHex(const unsigned char* in, unsigned int len, char* out);

+#   ifdef APP_DEBUG
+    static char *toHex(const unsigned char* in, unsigned int len);
+#   endif
+
    bool operator==(const Job &other) const;
    bool operator!=(const Job &other) const;

@@ -78,12 +82,12 @@ private:
    int m_algo;
    int m_poolId;
    int m_threadId;
-    int m_variant;
    size_t m_size;
    uint64_t m_diff;
    uint64_t m_target;
    uint8_t m_blob[96]; // Max blob size is 84 (75 fixed + 9 variable), aligned to 96. https://github.com/xmrig/xmrig/issues/1 Thanks fireice-uk.
    xmrig::Id m_id;
+    xmrig::Variant m_variant;
 };

 #endif /* __JOB_H__ */
--- a/src/net/Network.cpp
+++ b/src/net/Network.cpp
@@ -38,30 +38,30 @@
 #include "net/strategies/FailoverStrategy.h"
 #include "net/strategies/SinglePoolStrategy.h"
 #include "net/SubmitResult.h"
-#include "net/Url.h"
-#include "Options.h"
 #include "workers/Workers.h"
+#include "core/Controller.h"
+#include "core/Config.h"


-Network::Network(const Options *options) :
-    m_options(options),
-    m_donate(nullptr)
+Network::Network(xmrig::Controller *controller) :
+    m_donate(nullptr),
+    m_controller(controller)
 {
    srand(time(0) ^ (uintptr_t) this);

    Workers::setListener(this);

-    const std::vector<Url*> &pools = options->pools();
+    const std::vector<Pool> &pools = controller->config()->pools();

    if (pools.size() > 1) {
-        m_strategy = new FailoverStrategy(pools, options->retryPause(), options->retries(), this);
+        m_strategy = new FailoverStrategy(pools, controller->config()->retryPause(), controller->config()->retries(), this);
    }
    else {
-        m_strategy = new SinglePoolStrategy(pools.front(), options->retryPause(), this);
+        m_strategy = new SinglePoolStrategy(pools.front(), controller->config()->retryPause(), this);
    }

-    if (m_options->donateLevel() > 0) {
-        m_donate = new DonateStrategy(options->donateLevel(), options->pools().front()->user(), options->algo(), this);
+    if (controller->config()->donateLevel() > 0) {
+        m_donate = new DonateStrategy(controller->config()->donateLevel(), controller->config()->pools().front().user(), controller->config()->algorithm(), this);
    }

    m_timer.data = this;
@@ -101,7 +101,7 @@ void Network::onActive(IStrategy *strategy, Client *client)

    m_state.setPool(client->host(), client->port(), client->ip());

-    LOG_INFO(m_options->colors() ? "\x1B[01;37muse pool \x1B[01;36m%s:%d \x1B[01;30m%s" : "use pool %s:%d %s", client->host(), client->port(), client->ip());
+    LOG_INFO(isColors() ? "\x1B[01;37muse pool \x1B[01;36m%s:%d \x1B[01;30m%s" : "use pool %s:%d %s", client->host(), client->port(), client->ip());
 }


@@ -146,21 +146,27 @@ void Network::onResultAccepted(IStrategy *strategy, Client *client, const Submit
    m_state.add(result, error);

    if (error) {
-        LOG_INFO(m_options->colors() ? "\x1B[01;31mrejected\x1B[0m (%" PRId64 "/%" PRId64 ") diff \x1B[01;37m%u\x1B[0m \x1B[31m\"%s\"\x1B[0m \x1B[01;30m(%" PRIu64 " ms)"
-                                     : "rejected (%" PRId64 "/%" PRId64 ") diff %u \"%s\" (%" PRIu64 " ms)",
+        LOG_INFO(isColors() ? "\x1B[01;31mrejected\x1B[0m (%" PRId64 "/%" PRId64 ") diff \x1B[01;37m%u\x1B[0m \x1B[31m\"%s\"\x1B[0m \x1B[01;30m(%" PRIu64 " ms)"
+                            : "rejected (%" PRId64 "/%" PRId64 ") diff %u \"%s\" (%" PRIu64 " ms)",
                 m_state.accepted, m_state.rejected, result.diff, error, result.elapsed);
    }
    else {
-        LOG_INFO(m_options->colors() ? "\x1B[01;32maccepted\x1B[0m (%" PRId64 "/%" PRId64 ") diff \x1B[01;37m%u\x1B[0m \x1B[01;30m(%" PRIu64 " ms)"
-                                     : "accepted (%" PRId64 "/%" PRId64 ") diff %u (%" PRIu64 " ms)",
+        LOG_INFO(isColors() ? "\x1B[01;32maccepted\x1B[0m (%" PRId64 "/%" PRId64 ") diff \x1B[01;37m%u\x1B[0m \x1B[01;30m(%" PRIu64 " ms)"
+                            : "accepted (%" PRId64 "/%" PRId64 ") diff %u (%" PRIu64 " ms)",
                 m_state.accepted, m_state.rejected, result.diff, result.elapsed);
    }
 }


+bool Network::isColors() const
+{
+    return m_controller->config()->isColors();
+}
+
+
 void Network::setJob(Client *client, const Job &job, bool donate)
 {
-    if (m_options->colors()) {
+    if (isColors()) {
        LOG_INFO("\x1B[01;35mnew job\x1B[0m from \x1B[01;37m%s:%d\x1B[0m diff \x1B[01;37m%d", client->host(), client->port(), job.diff());
    }
    else {
--- a/src/net/Network.h
+++ b/src/net/Network.h
@@ -35,14 +35,18 @@


 class IStrategy;
-class Options;
 class Url;


+namespace xmrig {
+    class Controller;
+}
+
+
 class Network : public IJobResultListener, public IStrategyListener
 {
 public:
-  Network(const Options *options);
+  Network(xmrig::Controller *controller);
  ~Network();

  void connect();
@@ -58,16 +62,17 @@ protected:
 private:
  constexpr static int kTickInterval = 1 * 1000;

+  bool isColors() const;
  void setJob(Client *client, const Job &job, bool donate);
  void tick();

  static void onTick(uv_timer_t *handle);

-  const Options *m_options;
  IStrategy *m_donate;
  IStrategy *m_strategy;
  NetworkState m_state;
  uv_timer_t m_timer;
+  xmrig::Controller *m_controller;
 };


--- a/src/net/Pool.cpp
+++ b/src/net/Pool.cpp
@@ -0,0 +1,280 @@
+/* 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 <assert.h>
+#include <string.h>
+#include <stdlib.h>
+#include <stdio.h>
+
+
+#include "net/Pool.h"
+
+
+#ifdef _MSC_VER
+#   define strncasecmp _strnicmp
+#   define strcasecmp  _stricmp
+#endif
+
+
+static const char *algoNames[] = {
+    "cryptonight",
+#   ifndef XMRIG_NO_AEON
+    "cryptonight-lite",
+#   else
+    nullptr,
+#   endif
+#   ifndef XMRIG_NO_SUMO
+    "cryptonight-heavy"
+#   else
+    nullptr
+#   endif
+};
+
+
+static const char *algoNamesShort[] = {
+    "cn",
+#   ifndef XMRIG_NO_AEON
+    "cn-lite",
+#   else
+    nullptr,
+#   endif
+#   ifndef XMRIG_NO_SUMO
+    "cn-heavy"
+#   else
+    nullptr
+#   endif
+};
+
+
+Pool::Pool() :
+    m_nicehash(false),
+    m_keepAlive(0),
+    m_port(kDefaultPort),
+    m_algo(xmrig::CRYPTONIGHT),
+    m_variant(xmrig::VARIANT_AUTO)
+{
+}
+
+
+/**
+ * @brief Parse url.
+ *
+ * Valid urls:
+ * example.com
+ * example.com:3333
+ * stratum+tcp://example.com
+ * stratum+tcp://example.com:3333
+ *
+ * @param url
+ */
+Pool::Pool(const char *url) :
+    m_nicehash(false),
+    m_keepAlive(0),
+    m_port(kDefaultPort),
+    m_algo(xmrig::CRYPTONIGHT),
+    m_variant(xmrig::VARIANT_AUTO)
+{
+    parse(url);
+}
+
+
+Pool::Pool(const char *host, uint16_t port, const char *user, const char *password, int keepAlive, bool nicehash, xmrig::Variant variant) :
+    m_nicehash(nicehash),
+    m_keepAlive(keepAlive),
+    m_port(port),
+    m_algo(xmrig::CRYPTONIGHT),
+    m_host(host),
+    m_password(password),
+    m_user(user),
+        m_variant(variant)
+{
+    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;
+}
+
+
+const char *Pool::algoName(xmrig::Algo algorithm)
+{
+    return algoNames[algorithm];
+}
+
+
+xmrig::Algo Pool::algorithm(const char *algo)
+{
+#   ifndef XMRIG_NO_AEON
+    if (strcasecmp(algo, "cryptonight-light") == 0) {
+        fprintf(stderr, "Algorithm \"cryptonight-light\" is deprecated, use \"cryptonight-lite\" instead\n");
+
+        return xmrig::CRYPTONIGHT_LITE;
+    }
+#   endif
+
+    const size_t size = sizeof(algoNames) / sizeof(algoNames[0]);
+
+    assert(size == (sizeof(algoNamesShort) / sizeof(algoNamesShort[0])));
+
+    for (size_t i = 0; i < size; i++) {
+        if ((algoNames[i] && strcasecmp(algo, algoNames[i]) == 0) || (algoNamesShort[i] && strcasecmp(algo, algoNamesShort[i]) == 0)) {
+            return static_cast<xmrig::Algo>(i);
+        }
+    }
+
+    fprintf(stderr, "Unknown algorithm \"%s\" specified.\n", algo);
+    return xmrig::INVALID_ALGO;
+}
+
+
+bool 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)) {
+            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 = 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 Pool::setUserpass(const char *userpass)
+{
+    const char *p = strchr(userpass, ':');
+    if (!p) {
+        return false;
+    }
+
+    char *user = new char[p - userpass + 1]();
+    strncpy(user, userpass, p - userpass);
+
+    m_user     = user;
+    m_password = p + 1;
+
+    return true;
+}
+
+
+void Pool::adjust(xmrig::Algo algo)
+{
+    if (!isValid()) {
+        return;
+    }
+
+    m_algo = algo;
+
+    if (strstr(m_host.data(), ".nicehash.com")) {
+        m_keepAlive = false;
+        m_nicehash  = true;
+    }
+
+    if (strstr(m_host.data(), ".minergate.com")) {
+        m_keepAlive = false;
+    }
+}
+
+
+void Pool::setVariant(int variant)
+{
+   switch (variant) {
+   case xmrig::VARIANT_AUTO:
+   case xmrig::VARIANT_NONE:
+   case xmrig::VARIANT_V1:
+       m_variant = static_cast<xmrig::Variant>(variant);
+       break;
+
+   default:
+       assert(false);
+       break;
+   }
+}
+
+
+bool Pool::isEqual(const Pool &other) const
+{
+    return (m_nicehash     == other.m_nicehash
+            && m_keepAlive == other.m_keepAlive
+            && m_port      == other.m_port
+            && m_algo      == other.m_algo
+            && m_host      == other.m_host
+            && m_password  == other.m_password
+            && m_url       == other.m_url
+            && m_user      == other.m_user
+            && m_variant   == other.m_variant);
+}
+
+
+bool 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 = 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;
+}
--- a/src/net/Pool.h
+++ b/src/net/Pool.h
@@ -0,0 +1,96 @@
+/* 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 __POOL_H__
+#define __POOL_H__
+
+
+#include <stdint.h>
+
+
+#include "common/utils/c_str.h"
+#include "common/xmrig.h"
+
+
+class Pool
+{
+public:
+    constexpr static const char *kDefaultPassword = "x";
+    constexpr static const char *kDefaultUser     = "x";
+    constexpr static uint16_t kDefaultPort        = 3333;
+    constexpr static int kKeepAliveTimeout        = 60;
+
+    Pool();
+    Pool(const char *url);
+    Pool(const char *host,
+        uint16_t port,
+        const char *user       = nullptr,
+        const char *password   = nullptr,
+        int keepAlive          = 0,
+        bool nicehash          = false,
+        xmrig::Variant variant = xmrig::VARIANT_AUTO
+       );
+
+    static const char *algoName(xmrig::Algo algorithm);
+    static xmrig::Algo algorithm(const char *algo);
+
+    inline bool isNicehash() const                { return m_nicehash; }
+    inline bool isValid() const                   { return !m_host.isNull() && m_port > 0; }
+    inline const char *host() const               { return m_host.data(); }
+    inline const char *password() const           { return !m_password.isNull() ? m_password.data() : kDefaultPassword; }
+    inline const char *url() const                { return m_url.data(); }
+    inline const char *user() const               { return !m_user.isNull() ? m_user.data() : kDefaultUser; }
+    inline int keepAlive() const                  { return m_keepAlive; }
+    inline uint16_t port() const                  { return m_port; }
+    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 setUser(const char *user)         { m_user = user; }
+    inline xmrig::Algo algo() const               { return m_algo; }
+    inline xmrig::Variant variant() const         { return m_variant; }
+
+    inline bool operator!=(const Pool &other) const  { return !isEqual(other); }
+    inline bool operator==(const Pool &other) const  { return isEqual(other); }
+
+    bool parse(const char *url);
+    bool setUserpass(const char *userpass);
+    void adjust(xmrig::Algo algo);
+    void setVariant(int variant);
+
+    bool isEqual(const Pool &other) const;
+
+private:
+    bool parseIPv6(const char *addr);
+
+    bool m_nicehash;
+    int m_keepAlive;
+    uint16_t m_port;
+    xmrig::Algo m_algo;
+    xmrig::c_str m_host;
+    xmrig::c_str m_password;
+    xmrig::c_str m_url;
+    xmrig::c_str m_user;
+    xmrig::Variant m_variant;
+};
+
+#endif /* __POOL_H__ */
--- a/src/net/Storage.h
+++ b/src/net/Storage.h
@@ -0,0 +1,97 @@
+/* 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 __STORAGE_H__
+#define __STORAGE_H__
+
+
+#include <assert.h>
+#include <map>
+
+#include "log/Log.h"
+
+
+namespace xmrig {
+
+
+template <class TYPE>
+class Storage
+{
+public:
+    inline Storage() :
+        m_counter(0)
+    {
+    }
+
+
+    inline uintptr_t add(TYPE *ptr)
+    {
+        m_data[m_counter] = ptr;
+
+        return m_counter++;
+    }
+
+
+    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(uintptr_t id) const
+    {
+        assert(m_data.count(id) > 0);
+
+        if (m_data.count(id) == 0) {
+            return nullptr;
+        }
+
+        return m_data.at(id);
+    }
+
+
+    inline void remove(void *id) { remove(reinterpret_cast<uintptr_t>(id)); }
+    inline void remove(uintptr_t id)
+    {
+        TYPE *obj = get(id);
+        if (obj == nullptr) {
+            return;
+        }
+
+        auto it = m_data.find(id);
+        if (it != m_data.end()) {
+            m_data.erase(it);
+        }
+
+        delete obj;
+    }
+
+
+private:
+    std::map<uintptr_t, TYPE *> m_data;
+    uint64_t m_counter;
+};
+
+
+} /* namespace xmrig */
+
+
+#endif /* __STORAGE_H__ */
--- a/src/net/Url.cpp
+++ b/src/net/Url.cpp
@@ -1,284 +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 <string.h>
-#include <stdlib.h>
-#include <stdio.h>
-
-
-#include "net/Url.h"
-#include "xmrig.h"
-
-
-#ifdef _MSC_VER
-#   define strncasecmp(x,y,z) _strnicmp(x,y,z)
-#endif
-
-
-Url::Url() :
-    m_keepAlive(false),
-    m_nicehash(false),
-    m_host(nullptr),
-    m_password(nullptr),
-    m_user(nullptr),
-    m_algo(xmrig::ALGO_CRYPTONIGHT),
-    m_variant(xmrig::VARIANT_AUTO),
-    m_url(nullptr),
-    m_port(kDefaultPort)
-{
-}
-
-
-/**
- * @brief Parse url.
- *
- * Valid urls:
- * example.com
- * example.com:3333
- * stratum+tcp://example.com
- * stratum+tcp://example.com:3333
- *
- * @param url
- */
-Url::Url(const char *url) :
-    m_keepAlive(false),
-    m_nicehash(false),
-    m_host(nullptr),
-    m_password(nullptr),
-    m_user(nullptr),
-    m_algo(xmrig::ALGO_CRYPTONIGHT),
-    m_variant(xmrig::VARIANT_AUTO),
-    m_url(nullptr),
-    m_port(kDefaultPort)
-{
-    parse(url);
-}
-
-
-Url::Url(const char *host, uint16_t port, const char *user, const char *password, bool keepAlive, bool nicehash, int variant) :
-    m_keepAlive(keepAlive),
-    m_nicehash(nicehash),
-    m_password(password ? strdup(password) : nullptr),
-    m_user(user ? strdup(user) : nullptr),
-    m_algo(xmrig::ALGO_CRYPTONIGHT),
-    m_variant(variant),
-    m_url(nullptr),
-    m_port(port)
-{
-    m_host = strdup(host);
-}
-
-
-Url::~Url()
-{
-    free(m_host);
-    free(m_password);
-    free(m_user);
-
-    if (m_url) {
-        delete [] m_url;
-    }
-}
-
-
-bool Url::parse(const char *url)
-{
-    const char *p = strstr(url, "://");
-    const char *base = url;
-
-    if (p) {
-        if (strncasecmp(url, "stratum+tcp://", 14)) {
-            return false;
-        }
-
-        base = url + 14;
-    }
-
-    if (!strlen(base) || *base == '/') {
-        return false;
-    }
-
-    if (base[0] == '[') {
-        return parseIPv6(base);
-    }
-
-    const char *port = strchr(base, ':');
-    if (!port) {
-        m_host = strdup(base);
-        return false;
-    }
-
-    const size_t size = port++ - base + 1;
-    m_host = new char[size]();
-    memcpy(m_host, base, size - 1);
-
-    m_port = (uint16_t) strtol(port, nullptr, 10);
-    return true;
-}
-
-
-bool Url::setUserpass(const char *userpass)
-{
-    const char *p = strchr(userpass, ':');
-    if (!p) {
-        return false;
-    }
-
-    free(m_user);
-    free(m_password);
-
-    m_user = static_cast<char*>(calloc(p - userpass + 1, 1));
-    strncpy(m_user, userpass, p - userpass);
-    m_password = strdup(p + 1);
-
-    return true;
-}
-
-
-const char *Url::url() const
-{
-    if (!m_url) {
-        const size_t size = strlen(m_host) + 8;
-        m_url = new char[size];
-
-        snprintf(m_url, size - 1, "%s:%d", m_host, m_port);
-    }
-
-    return m_url;
-}
-
-
-void Url::adjust(int algo)
-{
-    if (!isValid()) {
-        return;
-    }
-
-    m_algo = algo;
-
-    if (strstr(m_host, ".nicehash.com")) {
-        m_keepAlive = false;
-        m_nicehash  = true;
-    }
-
-    if (strstr(m_host, ".minergate.com")) {
-        m_keepAlive = false;
-    }
-}
-
-
-void Url::setPassword(const char *password)
-{
-    if (!password) {
-        return;
-    }
-
-    free(m_password);
-    m_password = strdup(password);
-}
-
-
-void Url::setUser(const char *user)
-{
-    if (!user) {
-        return;
-    }
-
-    free(m_user);
-    m_user = strdup(user);
-}
-
-
-void Url::setVariant(int variant)
-{
-   switch (variant) {
-   case xmrig::VARIANT_AUTO:
-   case xmrig::VARIANT_NONE:
-   case xmrig::VARIANT_V1:
-       m_variant = variant;
-       break;
-
-   default:
-       break;
-   }
-}
-
-
-bool Url::operator==(const Url &other) const
-{
-    if (m_port != other.m_port || m_keepAlive != other.m_keepAlive || m_nicehash != other.m_nicehash) {
-        return false;
-    }
-
-    if (strcmp(host(), other.host()) != 0 || strcmp(user(), other.user()) != 0 || strcmp(password(), other.password()) != 0) {
-        return false;
-    }
-
-    return true;
-}
-
-
-Url &Url::operator=(const Url *other)
-{
-    m_keepAlive = other->m_keepAlive;
-    m_algo      = other->m_algo;
-    m_variant   = other->m_variant;
-    m_nicehash  = other->m_nicehash;
-    m_port      = other->m_port;
-
-    free(m_host);
-    m_host = strdup(other->m_host);
-
-    setPassword(other->m_password);
-    setUser(other->m_user);
-
-    if (m_url) {
-        delete [] m_url;
-        m_url = nullptr;
-    }
-
-    return *this;
-}
-
-
-bool Url::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 = end - addr;
-    m_host = new char[size]();
-    memcpy(m_host, addr + 1, size - 1);
-
-    m_port = (uint16_t) strtol(port + 1, nullptr, 10);
-
-    return true;
-}
--- a/src/net/Url.h
+++ b/src/net/Url.h
@@ -1,81 +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 __URL_H__
-#define __URL_H__
-
-
-#include <stdint.h>
-
-
-class Url
-{
-public:
-    constexpr static const char *kDefaultPassword = "x";
-    constexpr static const char *kDefaultUser     = "x";
-    constexpr static uint16_t kDefaultPort        = 3333;
-
-    Url();
-    Url(const char *url);
-    Url(const char *host, uint16_t port, const char *user = nullptr, const char *password = nullptr, bool keepAlive = false, bool nicehash = false, int variant = -1);
-    ~Url();
-
-    inline bool isKeepAlive() const          { return m_keepAlive; }
-    inline bool isNicehash() const           { return m_nicehash; }
-    inline bool isValid() const              { return m_host && m_port > 0; }
-    inline const char *host() const          { return m_host; }
-    inline const char *password() const      { return m_password ? m_password : kDefaultPassword; }
-    inline const char *user() const          { return m_user ? m_user : kDefaultUser; }
-    inline int algo() const                  { return m_algo; }
-    inline int variant() const               { return m_variant; }
-    inline uint16_t port() const             { return m_port; }
-    inline void setKeepAlive(bool keepAlive) { m_keepAlive = keepAlive; }
-    inline void setNicehash(bool nicehash)   { m_nicehash = nicehash; }
-    inline void setVariant(bool monero)      { m_variant = monero; }
-
-    bool parse(const char *url);
-    bool setUserpass(const char *userpass);
-    const char *url() const;
-    void adjust(int algo);
-    void setPassword(const char *password);
-    void setUser(const char *user);
-    void setVariant(int variant);
-
-    bool operator==(const Url &other) const;
-    Url &operator=(const Url *other);
-
-private:
-    bool parseIPv6(const char *addr);
-
-    bool m_keepAlive;
-    bool m_nicehash;
-    char *m_host;
-    char *m_password;
-    char *m_user;
-    int m_algo;
-    int m_variant;
-    mutable char *m_url;
-    uint16_t m_port;
-};
-
-#endif /* __URL_H__ */
--- a/src/net/strategies/DonateStrategy.cpp
+++ b/src/net/strategies/DonateStrategy.cpp
@@ -22,13 +22,13 @@
 */


+#include "common/Platform.h"
+#include "common/xmrig.h"
 #include "interfaces/IStrategyListener.h"
 #include "net/Client.h"
 #include "net/Job.h"
 #include "net/strategies/DonateStrategy.h"
 #include "net/strategies/FailoverStrategy.h"
-#include "Platform.h"
-#include "xmrig.h"


 extern "C"
@@ -41,8 +41,8 @@ const static char *kDonatePool1   = "miner.fee.xmrig.com";
 const static char *kDonatePool2   = "emergency.fee.xmrig.com";


-static inline int random(int min, int max){
-   return min + rand() / (RAND_MAX / (max - min + 1) + 1);
+static inline float randomf(float min, float max) {
+    return (max - min) * ((((float) rand()) / (float) RAND_MAX)) + min;
 }


@@ -59,14 +59,18 @@ DonateStrategy::DonateStrategy(int level, const char *user, int algo, IStrategyL
    keccak(reinterpret_cast<const uint8_t *>(user), static_cast<int>(strlen(user)), hash, sizeof(hash));
    Job::toHex(hash, 32, userId);

-    if (algo == xmrig::ALGO_CRYPTONIGHT) {
-        m_pools.push_back(new Url(kDonatePool1, 6666, userId, nullptr, false, true));
-        m_pools.push_back(new Url(kDonatePool1, 80,   userId, nullptr, false, true));
-        m_pools.push_back(new Url(kDonatePool2, 5555, "48edfHu7V9Z84YzzMa6fUueoELZ9ZRXq9VetWzYGzKt52XU5xvqgzYnDK9URnRoJMk1j8nLwEVsaSWJ4fhdUyZijBGUicoD", "emergency", false, false));
+    if (algo == xmrig::CRYPTONIGHT) {
+        m_pools.push_back(Pool(kDonatePool1, 6666, userId, nullptr, false, true));
+        m_pools.push_back(Pool(kDonatePool1, 80,   userId, nullptr, false, true));
+        m_pools.push_back(Pool(kDonatePool2, 5555, "48edfHu7V9Z84YzzMa6fUueoELZ9ZRXq9VetWzYGzKt52XU5xvqgzYnDK9URnRoJMk1j8nLwEVsaSWJ4fhdUyZijBGUicoD", "emergency", false, false));
+    }
+    else if (algo == xmrig::CRYPTONIGHT_HEAVY) {
+        m_pools.push_back(Pool(kDonatePool1, 8888, userId, nullptr, false, true));
+        m_pools.push_back(Pool(kDonatePool1, 8889, userId, nullptr, false, true));
    }
    else {
-        m_pools.push_back(new Url(kDonatePool1, 5555, userId, nullptr, false, true));
-        m_pools.push_back(new Url(kDonatePool1, 7777, userId, nullptr, false, true));
+        m_pools.push_back(Pool(kDonatePool1, 5555, userId, nullptr, false, true));
+        m_pools.push_back(Pool(kDonatePool1, 7777, userId, nullptr, false, true));
    }

    m_strategy = new FailoverStrategy(m_pools, 1, 1, this, true);
@@ -74,7 +78,7 @@ DonateStrategy::DonateStrategy(int level, const char *user, int algo, IStrategyL
    m_timer.data = this;
    uv_timer_init(uv_default_loop(), &m_timer);

-    idle(random(3000, 9000) * 1000 - m_donateTime);
+    idle(m_idleTime * randomf(0.5, 1.5));
 }


--- a/src/net/strategies/DonateStrategy.h
+++ b/src/net/strategies/DonateStrategy.h
@@ -32,6 +32,7 @@
 #include "interfaces/IClientListener.h"
 #include "interfaces/IStrategy.h"
 #include "interfaces/IStrategyListener.h"
+#include "net/Pool.h"


 class Client;
@@ -71,7 +72,7 @@ private:
    const int m_idleTime;
    IStrategy *m_strategy;
    IStrategyListener *m_listener;
-    std::vector<Url*> m_pools;
+    std::vector<Pool> m_pools;
    uv_timer_t m_timer;
 };

--- a/src/net/strategies/FailoverStrategy.cpp
+++ b/src/net/strategies/FailoverStrategy.cpp
@@ -22,13 +22,13 @@
 */


+#include "common/Platform.h"
 #include "interfaces/IStrategyListener.h"
 #include "net/Client.h"
 #include "net/strategies/FailoverStrategy.h"
-#include "Platform.h"


-FailoverStrategy::FailoverStrategy(const std::vector<Url*> &urls, int retryPause, int retries, IStrategyListener *listener, bool quiet) :
+FailoverStrategy::FailoverStrategy(const std::vector<Pool> &urls, int retryPause, int retries, IStrategyListener *listener, bool quiet) :
    m_quiet(quiet),
    m_retries(retries),
    m_retryPause(retryPause),
@@ -36,7 +36,7 @@ FailoverStrategy::FailoverStrategy(const std::vector<Url*> &urls, int retryPause
    m_index(0),
    m_listener(listener)
 {
-    for (const Url *url : urls) {
+    for (const Pool &url : urls) {
        add(url);
    }
 }
@@ -153,10 +153,10 @@ void FailoverStrategy::onResultAccepted(Client *client, const SubmitResult &resu
 }


-void FailoverStrategy::add(const Url *url)
+void FailoverStrategy::add(const Pool &pool)
 {
    Client *client = new Client((int) m_pools.size(), Platform::userAgent(), this);
-    client->setUrl(url);
+    client->setPool(pool);
    client->setRetryPause(m_retryPause * 1000);
    client->setQuiet(m_quiet);

--- a/src/net/strategies/FailoverStrategy.h
+++ b/src/net/strategies/FailoverStrategy.h
@@ -30,6 +30,7 @@

 #include "interfaces/IClientListener.h"
 #include "interfaces/IStrategy.h"
+#include "net/Pool.h"


 class Client;
@@ -40,7 +41,7 @@ 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(const std::vector<Pool> &urls, int retryPause, int retries, IStrategyListener *listener, bool quiet = false);
    ~FailoverStrategy();

 public:
@@ -59,7 +60,7 @@ protected:
    void onResultAccepted(Client *client, const SubmitResult &result, const char *error) override;

 private:
-    void add(const Url *url);
+    void add(const Pool &pool);

    const bool m_quiet;
    const int m_retries;
--- a/src/net/strategies/SinglePoolStrategy.cpp
+++ b/src/net/strategies/SinglePoolStrategy.cpp
@@ -22,18 +22,18 @@
 */


+#include "common/Platform.h"
 #include "interfaces/IStrategyListener.h"
 #include "net/Client.h"
 #include "net/strategies/SinglePoolStrategy.h"
-#include "Platform.h"


-SinglePoolStrategy::SinglePoolStrategy(const Url *url, int retryPause, IStrategyListener *listener, bool quiet) :
+SinglePoolStrategy::SinglePoolStrategy(const Pool &pool, int retryPause, 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->setRetryPause(retryPause * 1000);
    m_client->setQuiet(quiet);
 }
--- a/src/net/strategies/SinglePoolStrategy.h
+++ b/src/net/strategies/SinglePoolStrategy.h
@@ -37,7 +37,7 @@ class Url;
 class SinglePoolStrategy : public IStrategy, public IClientListener
 {
 public:
-    SinglePoolStrategy(const Url *url, int retryPause, IStrategyListener *listener, bool quiet = false);
+    SinglePoolStrategy(const Pool &pool, int retryPause, IStrategyListener *listener, bool quiet = false);
    ~SinglePoolStrategy();

 public:
--- a/src/version.h
+++ b/src/version.h
@@ -27,16 +27,16 @@
 #define APP_ID        "xmrig"
 #define APP_NAME      "XMRig"
 #define APP_DESC      "XMRig CPU miner"
-#define APP_VERSION   "2.5.2"
+#define APP_VERSION   "2.6.0-beta3"
 #define APP_DOMAIN    "xmrig.com"
 #define APP_SITE      "www.xmrig.com"
 #define APP_COPYRIGHT "Copyright (C) 2016-2018 xmrig.com"
 #define APP_KIND      "cpu"

 #define APP_VER_MAJOR  2
-#define APP_VER_MINOR  5
-#define APP_VER_BUILD  2
-#define APP_VER_REV    0
+#define APP_VER_MINOR  6
+#define APP_VER_BUILD  0
+#define APP_VER_REV    3

 #ifdef _MSC_VER
 #   if (_MSC_VER >= 1910)
--- a/src/workers/CpuThread.cpp
+++ b/src/workers/CpuThread.cpp
@@ -0,0 +1,278 @@
+/* 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 <assert.h>
+
+
+#include "net/Pool.h"
+#include "rapidjson/document.h"
+#include "workers/CpuThread.h"
+
+
+#if defined(XMRIG_ARM)
+#   include "crypto/CryptoNight_arm.h"
+#else
+#   include "crypto/CryptoNight_x86.h"
+#endif
+
+
+xmrig::CpuThread::CpuThread(size_t index, Algo algorithm, AlgoVariant av, Multiway multiway, int64_t affinity, int priority, bool softAES, bool prefetch) :
+    m_algorithm(algorithm),
+    m_av(av),
+    m_prefetch(prefetch),
+    m_softAES(softAES),
+    m_priority(priority),
+    m_affinity(affinity),
+    m_multiway(multiway),
+    m_index(index)
+{
+}
+
+
+xmrig::CpuThread::~CpuThread()
+{
+}
+
+
+bool xmrig::CpuThread::isSoftAES(AlgoVariant av)
+{
+    return av == AV_SINGLE_SOFT || av == AV_DOUBLE_SOFT || av > AV_PENTA;
+}
+
+
+xmrig::CpuThread::cn_hash_fun xmrig::CpuThread::fn(Algo algorithm, AlgoVariant av, Variant variant)
+{
+    assert(variant == VARIANT_NONE || variant == VARIANT_V1);
+
+    static const cn_hash_fun func_table[50] = {
+        cryptonight_single_hash<CRYPTONIGHT, false, VARIANT_NONE>,
+        cryptonight_double_hash<CRYPTONIGHT, false, VARIANT_NONE>,
+        cryptonight_single_hash<CRYPTONIGHT, true,  VARIANT_NONE>,
+        cryptonight_double_hash<CRYPTONIGHT, true,  VARIANT_NONE>,
+        cryptonight_triple_hash<CRYPTONIGHT, false, VARIANT_NONE>,
+        cryptonight_quad_hash<CRYPTONIGHT,   false, VARIANT_NONE>,
+        cryptonight_penta_hash<CRYPTONIGHT,  false, VARIANT_NONE>,
+        cryptonight_triple_hash<CRYPTONIGHT, true,  VARIANT_NONE>,
+        cryptonight_quad_hash<CRYPTONIGHT,   true,  VARIANT_NONE>,
+        cryptonight_penta_hash<CRYPTONIGHT,  true,  VARIANT_NONE>,
+
+        cryptonight_single_hash<CRYPTONIGHT, false, VARIANT_V1>,
+        cryptonight_double_hash<CRYPTONIGHT, false, VARIANT_V1>,
+        cryptonight_single_hash<CRYPTONIGHT, true,  VARIANT_V1>,
+        cryptonight_double_hash<CRYPTONIGHT, true,  VARIANT_V1>,
+        cryptonight_triple_hash<CRYPTONIGHT, false, VARIANT_V1>,
+        cryptonight_quad_hash<CRYPTONIGHT,   false, VARIANT_V1>,
+        cryptonight_penta_hash<CRYPTONIGHT,  false, VARIANT_V1>,
+        cryptonight_triple_hash<CRYPTONIGHT, true,  VARIANT_V1>,
+        cryptonight_quad_hash<CRYPTONIGHT,   true,  VARIANT_V1>,
+        cryptonight_penta_hash<CRYPTONIGHT,  true,  VARIANT_V1>,
+
+#       ifndef XMRIG_NO_AEON
+        cryptonight_single_hash<CRYPTONIGHT_LITE, false, VARIANT_NONE>,
+        cryptonight_double_hash<CRYPTONIGHT_LITE, false, VARIANT_NONE>,
+        cryptonight_single_hash<CRYPTONIGHT_LITE, true,  VARIANT_NONE>,
+        cryptonight_double_hash<CRYPTONIGHT_LITE, true,  VARIANT_NONE>,
+        cryptonight_triple_hash<CRYPTONIGHT_LITE, false, VARIANT_NONE>,
+        cryptonight_quad_hash<CRYPTONIGHT_LITE,   false, VARIANT_NONE>,
+        cryptonight_penta_hash<CRYPTONIGHT_LITE,  false, VARIANT_NONE>,
+        cryptonight_triple_hash<CRYPTONIGHT_LITE, true,  VARIANT_NONE>,
+        cryptonight_quad_hash<CRYPTONIGHT_LITE,   true,  VARIANT_NONE>,
+        cryptonight_penta_hash<CRYPTONIGHT_LITE,  true,  VARIANT_NONE>,
+
+        cryptonight_single_hash<CRYPTONIGHT_LITE, false, VARIANT_V1>,
+        cryptonight_double_hash<CRYPTONIGHT_LITE, false, VARIANT_V1>,
+        cryptonight_single_hash<CRYPTONIGHT_LITE, true,  VARIANT_V1>,
+        cryptonight_double_hash<CRYPTONIGHT_LITE, true,  VARIANT_V1>,
+        cryptonight_triple_hash<CRYPTONIGHT_LITE, false, VARIANT_V1>,
+        cryptonight_quad_hash<CRYPTONIGHT_LITE,   false, VARIANT_V1>,
+        cryptonight_penta_hash<CRYPTONIGHT_LITE,  false, VARIANT_V1>,
+        cryptonight_triple_hash<CRYPTONIGHT_LITE, true,  VARIANT_V1>,
+        cryptonight_quad_hash<CRYPTONIGHT_LITE,   true,  VARIANT_V1>,
+        cryptonight_penta_hash<CRYPTONIGHT_LITE,  true,  VARIANT_V1>,
+#       else
+        nullptr, nullptr, nullptr, nullptr, nullptr, nullptr, nullptr, nullptr, nullptr, nullptr,
+        nullptr, nullptr, nullptr, nullptr, nullptr, nullptr, nullptr, nullptr, nullptr, nullptr,
+#       endif
+
+#       ifndef XMRIG_NO_SUMO
+        cryptonight_single_hash<CRYPTONIGHT_HEAVY, false, VARIANT_NONE>,
+        cryptonight_double_hash<CRYPTONIGHT_HEAVY, false, VARIANT_NONE>,
+        cryptonight_single_hash<CRYPTONIGHT_HEAVY, true,  VARIANT_NONE>,
+        cryptonight_double_hash<CRYPTONIGHT_HEAVY, true,  VARIANT_NONE>,
+        cryptonight_triple_hash<CRYPTONIGHT_HEAVY, false, VARIANT_NONE>,
+        cryptonight_quad_hash<CRYPTONIGHT_HEAVY,   false, VARIANT_NONE>,
+        cryptonight_penta_hash<CRYPTONIGHT_HEAVY,  false, VARIANT_NONE>,
+        cryptonight_triple_hash<CRYPTONIGHT_HEAVY, true,  VARIANT_NONE>,
+        cryptonight_quad_hash<CRYPTONIGHT_HEAVY,   true,  VARIANT_NONE>,
+        cryptonight_penta_hash<CRYPTONIGHT_HEAVY,  true,  VARIANT_NONE>,
+#       else
+        nullptr, nullptr, nullptr, nullptr, nullptr, nullptr, nullptr, nullptr, nullptr, nullptr,
+#       endif
+    };
+
+#   ifndef XMRIG_NO_SUMO
+    if (algorithm == CRYPTONIGHT_HEAVY) {
+        variant = VARIANT_NONE;
+    }
+#   endif
+
+    return func_table[20 * algorithm + 10 * variant + av - 1];
+}
+
+
+xmrig::CpuThread *xmrig::CpuThread::createFromAV(size_t index, Algo algorithm, AlgoVariant av, int64_t affinity, int priority)
+{
+    assert(av > AV_AUTO && av < AV_MAX);
+
+    int64_t cpuId = -1L;
+
+    if (affinity != -1L) {
+        size_t idx = 0;
+
+        for (size_t i = 0; i < 64; i++) {
+            if (!(affinity & (1ULL << i))) {
+                continue;
+            }
+
+            if (idx == index) {
+                cpuId = i;
+                break;
+            }
+
+            idx++;
+        }
+    }
+
+    return new CpuThread(index, algorithm, av, multiway(av), cpuId, priority, isSoftAES(av), false);
+}
+
+
+xmrig::CpuThread *xmrig::CpuThread::createFromData(size_t index, Algo algorithm, const CpuThread::Data &data, int priority, bool softAES)
+{
+    int av                  = AV_AUTO;
+    const Multiway multiway = data.multiway;
+
+    if (multiway <= DoubleWay) {
+        av = softAES ? (multiway + 2) : multiway;
+    }
+    else {
+        av = softAES ? (multiway + 5) : (multiway + 2);
+    }
+
+    assert(av > AV_AUTO && av < AV_MAX);
+
+    return new CpuThread(index, algorithm, static_cast<AlgoVariant>(av), multiway, data.affinity, priority, softAES, false);
+}
+
+
+xmrig::CpuThread::Data xmrig::CpuThread::parse(const rapidjson::Value &object)
+{
+    Data data;
+
+    const auto &multiway = object["low_power_mode"];
+    if (multiway.IsBool()) {
+        data.multiway = multiway.IsTrue() ? DoubleWay : SingleWay;
+        data.valid    = true;
+    }
+    else if (multiway.IsUint()) {
+        data.setMultiway(multiway.GetInt());
+    }
+
+    if (!data.valid) {
+        return data;
+    }
+
+    const auto &affinity = object["affine_to_cpu"];
+
+    if (affinity.IsUint64()) {
+        data.affinity = affinity.GetInt64();
+    }
+
+    return data;
+}
+
+
+xmrig::IThread::Multiway xmrig::CpuThread::multiway(AlgoVariant av)
+{
+    switch (av) {
+    case AV_SINGLE:
+    case AV_SINGLE_SOFT:
+        return SingleWay;
+
+    case AV_DOUBLE_SOFT:
+    case AV_DOUBLE:
+        return DoubleWay;
+
+    case AV_TRIPLE_SOFT:
+    case AV_TRIPLE:
+        return TripleWay;
+
+    case AV_QUAD_SOFT:
+    case AV_QUAD:
+        return QuadWay;
+
+    case AV_PENTA_SOFT:
+    case AV_PENTA:
+        return PentaWay;
+
+    default:
+        break;
+    }
+
+    return SingleWay;
+}
+
+
+#ifndef XMRIG_NO_API
+rapidjson::Value xmrig::CpuThread::toAPI(rapidjson::Document &doc) const
+{
+    using namespace rapidjson;
+
+    Value obj(kObjectType);
+    auto &allocator = doc.GetAllocator();
+
+    obj.AddMember("type",          "cpu", allocator);
+    obj.AddMember("algo",           rapidjson::StringRef(Pool::algoName(algorithm())), allocator);
+    obj.AddMember("av",             m_av, allocator);
+    obj.AddMember("low_power_mode", multiway(), allocator);
+    obj.AddMember("affine_to_cpu",  affinity(), allocator);
+    obj.AddMember("priority",       priority(), allocator);
+    obj.AddMember("soft_aes",       isSoftAES(), allocator);
+
+    return obj;
+}
+#endif
+
+
+rapidjson::Value xmrig::CpuThread::toConfig(rapidjson::Document &doc) const
+{
+    using namespace rapidjson;
+
+    Value obj(kObjectType);
+    auto &allocator = doc.GetAllocator();
+
+    obj.AddMember("low_power_mode", multiway(), allocator);
+    obj.AddMember("affine_to_cpu",  affinity() == -1L ? Value(kFalseType) : Value(affinity()), allocator);
+
+    return obj;
+}
--- a/src/workers/CpuThread.h
+++ b/src/workers/CpuThread.h
@@ -0,0 +1,104 @@
+/* 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 __CPUTHREAD_H__
+#define __CPUTHREAD_H__
+
+
+#include "common/xmrig.h"
+#include "interfaces/IThread.h"
+
+
+struct cryptonight_ctx;
+
+
+namespace xmrig {
+
+
+class CpuThread : public IThread
+{
+public:
+    struct Data
+    {
+        inline Data() : valid(false), affinity(-1L), multiway(SingleWay) {}
+
+        inline void setMultiway(int value)
+        {
+            if (value >= SingleWay && value <= PentaWay) {
+                multiway = static_cast<Multiway>(value);
+                valid    = true;
+            }
+        }
+
+        bool valid;
+        int64_t affinity;
+        Multiway multiway;
+    };
+
+
+    CpuThread(size_t index, Algo algorithm, AlgoVariant av, Multiway multiway, int64_t affinity, int priority, bool softAES, bool prefetch);
+    ~CpuThread();
+
+    typedef void (*cn_hash_fun)(const uint8_t *input, size_t size, uint8_t *output, cryptonight_ctx **ctx);
+
+    static bool isSoftAES(AlgoVariant av);
+    static cn_hash_fun fn(Algo algorithm, AlgoVariant av, Variant variant);
+    static CpuThread *createFromAV(size_t index, Algo algorithm, AlgoVariant av, int64_t affinity, int priority);
+    static CpuThread *createFromData(size_t index, Algo algorithm, const CpuThread::Data &data, int priority, bool softAES);
+    static Data parse(const rapidjson::Value &object);
+    static Multiway multiway(AlgoVariant av);
+
+    inline bool isPrefetch() const               { return m_prefetch; }
+    inline bool isSoftAES() const                { return m_softAES; }
+    inline cn_hash_fun fn(Variant variant) const { return fn(m_algorithm, m_av, variant); }
+
+    inline Algo algorithm() const override       { return m_algorithm; }
+    inline int priority() const override         { return m_priority; }
+    inline int64_t affinity() const override     { return m_affinity; }
+    inline Multiway multiway() const override    { return m_multiway; }
+    inline size_t index() const override         { return m_index; }
+    inline Type type() const override            { return CPU; }
+
+protected:
+#   ifndef XMRIG_NO_API
+    rapidjson::Value toAPI(rapidjson::Document &doc) const override;
+#   endif
+
+    rapidjson::Value toConfig(rapidjson::Document &doc) const override;
+
+private:
+    const Algo m_algorithm;
+    const AlgoVariant m_av;
+    const bool m_prefetch;
+    const bool m_softAES;
+    const int m_priority;
+    const int64_t m_affinity;
+    const Multiway m_multiway;
+    const size_t m_index;
+};
+
+
+} /* namespace xmrig */
+
+
+#endif /* __CPUTHREAD_H__ */
--- a/src/workers/DoubleWorker.cpp
+++ b/src/workers/DoubleWorker.cpp
@@ -1,152 +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 2018      Lee Clagett <https://github.com/vtnerd>
- * 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 <thread>
-
-
-#include "crypto/CryptoNight.h"
-#include "workers/DoubleWorker.h"
-#include "workers/Workers.h"
-
-
-class DoubleWorker::State
-{
-public:
-  inline State() :
-      nonce1(0),
-      nonce2(0)
-  {}
-
-  Job job;
-  uint32_t nonce1;
-  uint32_t nonce2;
-  uint8_t blob[84 * 2];
-};
-
-
-DoubleWorker::DoubleWorker(Handle *handle)
-    : Worker(handle)
-{
-    m_state       = new State();
-    m_pausedState = new State();
-}
-
-
-DoubleWorker::~DoubleWorker()
-{
-    delete m_state;
-    delete m_pausedState;
-}
-
-
-void DoubleWorker::start()
-{
-    while (Workers::sequence() > 0) {
-        if (Workers::isPaused()) {
-            do {
-                std::this_thread::sleep_for(std::chrono::milliseconds(200));
-            }
-            while (Workers::isPaused());
-
-            if (Workers::sequence() == 0) {
-                break;
-            }
-
-            consumeJob();
-        }
-
-        while (!Workers::isOutdated(m_sequence)) {
-            if ((m_count & 0xF) == 0) {
-                storeStats();
-            }
-
-            m_count += 2;
-            *Job::nonce(m_state->blob)                       = ++m_state->nonce1;
-            *Job::nonce(m_state->blob + m_state->job.size()) = ++m_state->nonce2;
-
-            CryptoNight::hash(m_state->blob, m_state->job.size(), m_hash, m_ctx, m_state->job.variant());
-
-            if (*reinterpret_cast<uint64_t*>(m_hash + 24) < m_state->job.target()) {
-                Workers::submit(JobResult(m_state->job.poolId(), m_state->job.id(), m_state->nonce1, m_hash, m_state->job.diff()));
-            }
-
-            if (*reinterpret_cast<uint64_t*>(m_hash + 32 + 24) < m_state->job.target()) {
-                Workers::submit(JobResult(m_state->job.poolId(), m_state->job.id(), m_state->nonce2, m_hash + 32, m_state->job.diff()));
-            }
-
-            std::this_thread::yield();
-        }
-
-        consumeJob();
-    }
-}
-
-
-bool DoubleWorker::resume(const Job &job)
-{
-    if (m_state->job.poolId() == -1 && job.poolId() >= 0 && job.id() == m_pausedState->job.id()) {
-        *m_state = *m_pausedState;
-        return true;
-    }
-
-    return false;
-}
-
-
-void DoubleWorker::consumeJob()
-{
-    Job job = Workers::job();
-    m_sequence = Workers::sequence();
-    if (m_state->job == job) {
-        return;
-    }
-
-    save(job);
-
-    if (resume(job)) {
-        return;
-    }
-
-    m_state->job = std::move(job);
-    memcpy(m_state->blob,                       m_state->job.blob(), m_state->job.size());
-    memcpy(m_state->blob + m_state->job.size(), m_state->job.blob(), m_state->job.size());
-
-    if (m_state->job.isNicehash()) {
-        m_state->nonce1 = (*Job::nonce(m_state->blob)                       & 0xff000000U) + (0xffffffU / (m_threads * 2) * m_id);
-        m_state->nonce2 = (*Job::nonce(m_state->blob + m_state->job.size()) & 0xff000000U) + (0xffffffU / (m_threads * 2) * (m_id + m_threads));
-    }
-    else {
-        m_state->nonce1 = 0xffffffffU / (m_threads * 2) * m_id;
-        m_state->nonce2 = 0xffffffffU / (m_threads * 2) * (m_id + m_threads);
-    }
-}
-
-
-void DoubleWorker::save(const Job &job)
-{
-    if (job.poolId() == -1 && m_state->job.poolId() >= 0) {
-        *m_pausedState = *m_state;
-    }
-}
--- a/src/workers/Handle.cpp
+++ b/src/workers/Handle.cpp
@@ -4,8 +4,8 @@
 * 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 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
@@ -25,12 +25,11 @@
 #include "workers/Handle.h"


-Handle::Handle(int threadId, int threads, int64_t affinity, int priority) :
-    m_priority(priority),
-    m_threadId(threadId),
-    m_threads(threads),
-    m_affinity(affinity),
-    m_worker(nullptr)
+Handle::Handle(xmrig::IThread *config, uint32_t offset, size_t totalWays) :
+    m_worker(nullptr),
+    m_totalWays(totalWays),
+    m_offset(offset),
+    m_config(config)
 {
 }

--- a/src/workers/Handle.h
+++ b/src/workers/Handle.h
@@ -4,8 +4,8 @@
 * 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 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
@@ -25,34 +25,37 @@
 #define __HANDLE_H__


+#include <assert.h>
 #include <stdint.h>
 #include <uv.h>


+#include "interfaces/IThread.h"
+
+
 class IWorker;


 class Handle
 {
 public:
-    Handle(int threadId, int threads, int64_t affinity, int priority);
+    Handle(xmrig::IThread *config, uint32_t offset, size_t totalWays);
    void join();
    void start(void (*callback) (void *));

-    inline int priority() const            { return m_priority; }
-    inline int threadId() const            { return m_threadId; }
-    inline int threads() const             { return m_threads; }
-    inline int64_t affinity() const        { return m_affinity; }
    inline IWorker *worker() const         { return m_worker; }
-    inline void setWorker(IWorker *worker) { m_worker = worker; }
+    inline size_t threadId() const         { return m_config->index(); }
+    inline size_t totalWays() const        { return m_totalWays; }
+    inline uint32_t offset() const         { return m_offset; }
+    inline void setWorker(IWorker *worker) { assert(worker != nullptr); m_worker = worker; }
+    inline xmrig::IThread *config() const  { return m_config; }

 private:
-    int m_priority;
-    int m_threadId;
-    int m_threads;
-    int64_t m_affinity;
    IWorker *m_worker;
+    size_t m_totalWays;
+    uint32_t m_offset;
    uv_thread_t m_thread;
+    xmrig::IThread *m_config;
 };


--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
xmrig	a9178bd468	Update README.md	2018-04-20 11:13:00 +07:00
XMRig	78e2c12202	Fix msvc build.	2018-04-20 10:36:41 +07:00
XMRig	2d2e60a197	Fix x86 build.	2018-04-20 10:14:33 +07:00
xmrig	3f85b11e12	Update CHANGELOG.md	2018-04-19 21:19:00 +07:00
XMRig	91dd5fe68a	v2.6.0-beta3	2018-04-19 20:57:23 +07:00
XMRig	fe1649a2c1	Revert old Client::close.	2018-04-19 20:29:23 +07:00
XMRig	9be897eb6b	Merge remote-tracking branch 'remotes/origin/feature-advanced-threads' into dev	2018-04-19 19:45:29 +07:00
XMRig	14576f599c	Fix ARMv7 build.	2018-04-19 19:44:17 +07:00
XMRig	e119f7f402	Rearrange test vectors, for catch cn-heavy bug.	2018-04-19 13:50:06 +07:00
XMRig	ad94e9a7d2	Simplify ARM implementation.	2018-04-19 11:54:11 +07:00
XMRig	bc67216f7f	Added API docs and bug fixes.	2018-04-18 09:58:06 +07:00
XMRig	d04a1fcb8f	Add extra information to threads API.	2018-04-17 14:36:32 +07:00
XMRig	c0a72edf9a	Added hashrate information to "GET /1/threads" endpoint.	2018-04-17 10:51:29 +07:00
XMRig	c221bf09f6	Use direct access to hashrate in API.	2018-04-17 10:29:37 +07:00
XMRig	b32ec5342e	Fixed automatic threads mode for --av above 4	2018-04-17 09:42:53 +07:00
XMRig	9e3f2ae9f9	Added x3 x4 x5 hashing modes.	2018-04-16 15:40:37 +07:00
XMRig	dba1acd302	Finalize config changes.	2018-04-15 21:41:03 +07:00
XMRig	f8bf48a522	Added config only boolean option "hw-aes".	2018-04-15 19:25:09 +07:00
XMRig	f0158ae505	Fix again.	2018-04-15 15:10:41 +07:00
XMRig	6de83dddd6	Fix wrong memory usage displayed for cn-lite.	2018-04-15 15:01:41 +07:00
XMRig	e2d85d78a7	Added information about started threads.	2018-04-15 14:49:39 +07:00
XMRig	6b4f2d0a91	Fixed ARM build.	2018-04-15 12:58:17 +07:00
XMRig	8716f362f8	Fixed HW AES detection.	2018-04-15 11:36:48 +07:00
XMRig	9125b6c251	Rewrite memory allocation.	2018-04-15 11:08:47 +07:00
XMRig	4b71b7aa29	Added class MultiWorker and remove classes SingleWorker and DoubleWorker.	2018-04-14 22:14:57 +07:00
XMRig	c81401ab2d	Basic advanced config reader, only single hash supported.	2018-04-14 07:01:12 +07:00
XMRig	c44b299750	Added reader for advanced threads.	2018-04-13 17:59:27 +07:00
XMRig	9ce9147dad	Use new method to set affinity.	2018-04-13 09:27:37 +07:00
XMRig	c1800094d0	Move Platform.	2018-04-13 07:23:01 +07:00
XMRig	a6b698d4eb	Move common parts of API.	2018-04-13 07:12:53 +07:00
XMRig	51422f4b1e	Move xmrig.h to common/xmrig.h.	2018-04-13 07:00:51 +07:00
XMRig	f197f6b1eb	Changed directory structure.	2018-04-13 06:38:18 +07:00
XMRig	01c8245846	#548 Fixed macOS build.	2018-04-13 05:05:53 +07:00
XMRig	b13640e4a1	Fixes for build without cn-lite and cn-heavy.	2018-04-12 11:38:43 +07:00
XMRig	a73ad9b089	Fixed build with APP_DEBUG.	2018-04-11 08:29:02 +07:00
XMRig	1ebaf677e0	Move static algo name conversions to Pool class.	2018-04-11 06:39:24 +07:00
XMRig	36ef254c73	Rename class Url to Pool.	2018-04-11 06:09:34 +07:00
XMRig	ad7545d149	Refactoring.	2018-04-11 03:52:23 +07:00
XMRig	3924a16048	Merge branch 'dev' of github.com:xmrig/xmrig into dev	2018-04-10 23:23:11 +07:00
XMRig	0bfd409bdf	Remove unused class UploadCtx.	2018-04-10 23:22:49 +07:00
xmrig	916ff33058	Update CHANGELOG.md	2018-04-10 03:56:19 +07:00
xmrig	30903686bd	Update README.md	2018-04-10 00:30:06 +07:00
XMRig	82e1138158	v2.6.0-beta2	2018-04-09 23:50:01 +07:00
XMRig	ccbb78d4e9	Improved performance for cryptonight v7.	2018-04-09 21:56:15 +07:00
XMRig	5b664f3681	Fix nonce calculation for --av 4.	2018-04-09 21:21:46 +07:00
XMRig	77207eaaae	Fix build with APP_DEBUG.	2018-04-09 20:38:02 +07:00
XMRig	de83cfd53c	#519 Fix donation start time randomization.	2018-04-08 22:19:21 +07:00
XMRig	eb56c2b56e	Better implementation for algorithm aliases.	2018-04-08 03:20:44 +07:00
XMRig	bb2faaddc0	Added short aliases for algorithm names: cn, cn-lite and cn-heavy.	2018-04-08 02:44:31 +07:00
xmrig	89c095f79e	Update CHANGELOG.md	2018-04-07 01:21:56 +07:00
XMRig	dff7636701	Merge branch 'dev' of github.com:xmrig/xmrig into dev	2018-04-07 01:18:22 +07:00
XMRig	3b83fa530c	#499 Disabled IPv6 for internal HTTP API by default, was cause issues on some systems.	2018-04-07 01:17:58 +07:00
xmrig	bca087f111	Update CHANGELOG.md	2018-04-07 00:50:24 +07:00
XMRig	ae647699a4	#502 Fixed build without libmicrohttpd.	2018-04-07 00:44:48 +07:00
XMRig	3a67ee6d11	Small fixes.	2018-04-06 23:32:54 +07:00
XMRig	c227e3c7b4	Fix command line option --donate-level.	2018-04-04 00:10:53 +07:00
xmrig	6a1c52b904	Update README.md	2018-04-03 19:02:12 +07:00
XMRig	7003559c74	Merge branch 'feature-cryptonight-heavy' into dev	2018-04-03 18:23:17 +07:00
xmrig	6b710ff3b3	Update CHANGELOG.md	2018-04-03 18:12:24 +07:00
XMRig	4e8ef7c6ed	Added cryptonight-heavy support for ARM	2018-04-03 17:51:06 +07:00
XMRig	26e1b14020	Added test hashes for self test.	2018-04-03 17:19:01 +07:00
XMRig	d4123b8fa6	Quick fix, temporary use old style affinity.	2018-04-03 17:06:03 +07:00
XMRig	dd6bc339bf	First working cryptonight-heavy.	2018-04-03 16:55:41 +07:00
XMRig	7d5a97137d	Fix autoconfig and memory allocation for heavy algo.	2018-04-03 16:08:15 +07:00
XMRig	5c6ec587ac	Move selfTest to threads, remove legacy CryptoNight.cpp.	2018-04-03 14:51:05 +07:00
XMRig	d7c5630509	Fix nonce allocation in DoubleWorker.	2018-04-03 03:27:44 +07:00
XMRig	c1bc6acd26	Fix DoubleWorker.	2018-04-03 03:01:04 +07:00
XMRig	903b243308	New style function selector.	2018-04-03 02:55:28 +07:00
XMRig	72cd6d168e	Now used IThread to start threads, cpu-affinity broken, nonce allocation in double mode probably broken too.	2018-04-02 15:03:56 +07:00
XMRig	6c970612bf	Transform affinity and av to internal representation.	2018-04-02 14:05:16 +07:00
XMRig	a042cbf885	Added classes IThread, CpuThread and API endpoint "GET /1/threads".	2018-04-01 22:49:21 +07:00
XMRig	44d56393db	Fix Linux build.	2018-03-31 20:26:07 +07:00
XMRig	edd47b12a8	Update CHANGELOG.md and version.	2018-03-31 19:43:16 +07:00
XMRig	6e51b4191e	Merge branch 'feature-controller' into dev	2018-03-31 19:15:22 +07:00
XMRig	8d4d1a3285	Added API endpoint "GET /1/config".	2018-03-31 19:00:31 +07:00
XMRig	341557c34e	Added client storage from proxy.	2018-03-31 18:12:52 +07:00
XMRig	af0a6fdf20	Small fixes.	2018-03-31 17:51:33 +07:00
XMRig	7f5d7cf7dd	Fix Linux build.	2018-03-31 16:52:58 +07:00
XMRig	aac7b0404a	Options class replaced to xmrig::Config.	2018-03-31 16:29:47 +07:00
XMRig	aad19f1a35	Added initial next gen config support from proxy.	2018-03-31 13:48:06 +07:00
XMRig	872148c35c	Merge branch 'feature-http-in-main-loop' into dev	2018-03-29 17:55:10 +07:00
XMRig	9fe863b5d7	Background http changes from proxy.	2018-03-27 14:01:38 +07:00
XMRig	f1bc06473f	Merge branch 'dev' of github.com:xmrig/xmrig into dev	2018-03-27 12:13:44 +07:00
XMRig	bab6a63822	Merge branch 'master' into dev	2018-03-27 12:13:21 +07:00
xmrig	04a95e3aa8	Update CHANGELOG.md	2018-03-22 10:19:29 +07:00