Update README.md

CHANGELOG.md

@@ -1,3 +1,12 @@
+# v2.6.0-beta2
+- Improved performance for `cryptonight v7` especially in double hash mode.
+- [#499](https://github.com/xmrig/xmrig/issues/499) IPv6 disabled for internal HTTP API by default, was cause issues on some systems.
+- Added short aliases for algorithm names: `cn`, `cn-lite` and `cn-heavy`.
+- Fixed regressions (v2.6.0-beta1 affected)
+  - [#494](https://github.com/xmrig/xmrig/issues/494) Command line option `--donate-level` was broken.
+  - [#502](https://github.com/xmrig/xmrig/issues/502) Build without libmicrohttpd was broken.
+  - Fixed nonce calculation for `--av 4` (software AES, double hash) was cause reduction of effective hashrate and rejected shares on nicehash.
+
 # 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.

CMakeLists.txt

@@ -12,7 +12,6 @@ include (cmake/cpu.cmake)
 
 
 set(HEADERS
-    src/api/Api.h
     src/api/NetworkState.h
     src/App.h
     src/Console.h
@@ -87,7 +86,6 @@ else()
 endif()
 
 set(SOURCES
-    src/api/Api.cpp
     src/api/NetworkState.cpp
     src/App.cpp
     src/Console.cpp
@@ -214,11 +212,13 @@ if (WITH_HTTPD)
     if (MHD_FOUND)
         include_directories(${MHD_INCLUDE_DIRS})
         set(HTTPD_SOURCES
+            src/api/Api.h
             src/api/ApiRouter.h
             src/api/HttpBody.h
             src/api/Httpd.h
             src/api/HttpReply.h
             src/api/HttpRequest.h
+            src/api/Api.cpp
             src/api/ApiRouter.cpp
             src/api/Httpd.cpp
             src/api/HttpRequest.cpp

README.md

@@ -124,10 +124,10 @@ Please note performance is highly dependent on system load. The numbers above ar
 ## Release checksums
 ### SHA-256
 ```
-bd14bc3cfd9528e4a7583ab39aecc876250333e1e0faab83781584bb7f65e3eb xmrig-2.6.0-beta1-xenial-amd64.tar.gz/xmrig-2.6.0-beta1/xmrig
-32eebf71e5631029202ae5cbf6f03caad912f1722aa86a1be01a26d491801aba xmrig-2.6.0-beta1-gcc-win32.zip/xmrig.exe
-1cc08844ff019408e2e2c9560fee0c4e0b2dbc2a72bcc1c1da4a847a1787eca3 xmrig-2.6.0-beta1-gcc-win64.zip/xmrig.exe
-fdf99aa8e7792a34b1be0cc6c77e4e83ff9a4b21abb27989f7927dcfed82f6e2 xmrig-2.6.0-beta1-msvc-win64.zip/xmrig.exe
+232af0c5f3b1cdbc2d90b514873a764b434d5621d2790da67954b35c17e44fe3 xmrig-2.6.0-beta2-xenial-amd64.tar.gz/xmrig-2.6.0-beta2/xmrig
+2366a06729d4de538ef511862bf11d0c7ad40fd245e7aeab3c1957307d63471a xmrig-2.6.0-beta2-gcc-win32.zip/xmrig.exe
+2f6538c765e001d13ca380cbc1558d51efcb97d4bccdfa40993cb872be4e9efd xmrig-2.6.0-beta2-gcc-win64.zip/xmrig.exe
+3c0479acb78a3cee8fe416ee438dbff09c786acf50fbaf28a820127fcd0c6e62 xmrig-2.6.0-beta2-msvc-win64.zip/xmrig.exe
 ```
 
 ## Contacts

src/Summary.cpp

@@ -123,7 +123,7 @@ static void print_pools(xmrig::Config *config)
 
 #   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
 }

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

src/core/CommonConfig.cpp

@@ -22,6 +22,7 @@
  */
 
 
+#include <assert.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
@@ -45,6 +46,13 @@ static const char *algoNames[] = {
 };
 
 
+static const char *algoNamesShort[] = {
+    "cn",
+    "cn-lite",
+    "cn-heavy"
+};
+
+
 #if defined(_WIN32) && !defined(strcasecmp)
 #   define strcasecmp _stricmp
 #endif
@@ -53,12 +61,18 @@ static const char *algoNames[] = {
 xmrig::CommonConfig::CommonConfig() :
     m_algorithm(CRYPTONIGHT),
     m_adjusted(false),
-    m_apiIPv6(true),
+    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_apiToken(nullptr),
     m_apiWorkerId(nullptr),
     m_fileName(nullptr),
@@ -247,16 +261,14 @@ bool xmrig::CommonConfig::parseString(int key, const char *arg)
     case ApiIPv6Key:       /* --api-no-ipv6 */
         return parseBoolean(key, false);
 
-#   ifdef XMRIG_PROXY_PROJECT
-    case 1003: /* --donate-level */
+    case DonateLevelKey: /* --donate-level */
+#       ifdef XMRIG_PROXY_PROJECT
         if (strncmp(arg, "minemonero.pro", 14) == 0) {
             m_donateLevel = 0;
+            return true;
         }
-        else {
-            parseUint64(key, strtol(arg, nullptr, 10));
-        }
-        break;
-#   endif
+#       endif
+        return parseUint64(key, strtol(arg, nullptr, 10));
 
     default:
         break;
@@ -337,7 +349,7 @@ bool xmrig::CommonConfig::parseInt(int key, int arg)
         break;
 
     case DonateLevelKey: /* --donate-level */
-        if (arg >= kMinDonateLevel && arg <= 99) {
+        if (arg >= kMinimumDonateLevel && arg <= 99) {
             m_donateLevel = arg;
         }
         break;
@@ -371,10 +383,12 @@ void xmrig::CommonConfig::setAlgo(const char *algo)
         return;
     }
 
-    const size_t size = sizeof(algoNames) / sizeof((algoNames)[0]);
+    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) {
+        if (strcasecmp(algo, algoNames[i]) == 0 || strcasecmp(algo, algoNamesShort[i]) == 0) {
             m_algorithm = static_cast<Algo>(i);
             break;
         }

src/crypto/CryptoNight_constants.h

@@ -66,6 +66,8 @@ inline size_t cn_select_memory(Algo algorithm)
     case CRYPTONIGHT_HEAVY:
         return CRYPTONIGHT_HEAVY_MEMORY;
     }
+
+    return 0;
 }
 
 
@@ -87,6 +89,8 @@ inline uint32_t cn_select_mask(Algo algorithm)
     case CRYPTONIGHT_HEAVY:
         return CRYPTONIGHT_HEAVY_MASK;
     }
+
+    return 0;
 }
 
 
@@ -108,6 +112,8 @@ inline uint32_t cn_select_iter(Algo algorithm)
     case CRYPTONIGHT_HEAVY:
         return CRYPTONIGHT_HEAVY_ITER;
     }
+
+    return 0;
 }
 
 

src/crypto/CryptoNight_x86.h

@@ -386,6 +386,22 @@ static inline void cn_implode_scratchpad(const __m128i *input, __m128i *output)
 }
 
 
+static inline void cryptonight_monero_tweak(uint64_t* mem_out, __m128i tmp)
+{
+    mem_out[0] = EXTRACT64(tmp);
+
+    tmp = _mm_castps_si128(_mm_movehl_ps(_mm_castsi128_ps(tmp), _mm_castsi128_ps(tmp)));
+    uint64_t vh = EXTRACT64(tmp);
+
+    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)
 {
@@ -400,7 +416,7 @@ inline void cryptonight_single_hash(const uint8_t *__restrict__ input, size_t si
 
     keccak(input, (int) size, ctx->state0, 200);
 
-    VARIANT1_INIT(0);
+    VARIANT1_INIT(0)
 
     cn_explode_scratchpad<ALGO, MEM, SOFT_AES>((__m128i*) ctx->state0, (__m128i*) ctx->memory);
 
@@ -423,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;
 
@@ -513,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);

src/donate.h

@@ -29,9 +29,14 @@
  * 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:
@@ -39,7 +44,7 @@
  * BTC: 1P7ujsXeX7GxQwHNnJsRMgAdNkFZmNVqJT
  */
 constexpr const int kDefaultDonateLevel = 5;
-constexpr const int kMinDonateLevel     = 1;
+constexpr const int kMinimumDonateLevel = 1;
 
 
 #endif /* __DONATE_H__ */

src/net/strategies/DonateStrategy.cpp

@@ -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;
 }
 
 
@@ -78,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));
 }
 
 

src/version.h

@@ -27,7 +27,7 @@
 #define APP_ID        "xmrig"
 #define APP_NAME      "XMRig"
 #define APP_DESC      "XMRig CPU miner"
-#define APP_VERSION   "2.6.0-beta1"
+#define APP_VERSION   "2.6.0-beta2"
 #define APP_DOMAIN    "xmrig.com"
 #define APP_SITE      "www.xmrig.com"
 #define APP_COPYRIGHT "Copyright (C) 2016-2018 xmrig.com"
@@ -36,7 +36,7 @@
 #define APP_VER_MAJOR  2
 #define APP_VER_MINOR  6
 #define APP_VER_BUILD  0
-#define APP_VER_REV    1
+#define APP_VER_REV    2
 
 #ifdef _MSC_VER
 #   if (_MSC_VER >= 1910)

src/workers/CpuThread.cpp

@@ -146,28 +146,28 @@ xmrig::CpuThread *xmrig::CpuThread::createFromAV(size_t index, Algo algorithm, A
         softAES  = true;
         break;
 
-    case AV_DOUBLE:
-        multiway = DoubleWay;
     case AV_DOUBLE_SOFT:
         softAES  = true;
+    case AV_DOUBLE:
+        multiway = DoubleWay;
         break;
 
-    case AV_TRIPLE:
-        multiway = TripleWay;
     case AV_TRIPLE_SOFT:
         softAES  = true;
+    case AV_TRIPLE:
+        multiway = TripleWay;
         break;
 
-    case AV_QUAD:
-        multiway = QuadWay;
     case AV_QUAD_SOFT:
         softAES  = true;
+    case AV_QUAD:
+        multiway = QuadWay;
         break;
 
-    case AV_PENTA:
-        multiway = PentaWay;
     case AV_PENTA_SOFT:
         softAES  = true;
+    case AV_PENTA:
+        multiway = PentaWay;
         break;
 
     default:

src/workers/SingleWorker.cpp

@@ -116,7 +116,7 @@ bool SingleWorker::selfTest()
     }
 #   endif
 
-    return memcmp(m_result.result, test_output_heavy, 32) == 0;
+    return m_thread->algorithm() == xmrig::CRYPTONIGHT_HEAVY && memcmp(m_result.result, test_output_heavy, 32) == 0;
 }