diff --git a/CHANGELOG.md b/CHANGELOG.md index ba4f8fb9..3f6be39e 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,6 +1,8 @@ # 1.5.1 -- Applied changes for Monero v7 PoW starting 03/28/18 (No changes in config needed) -- Applied new design / icons +- Applied changes for upcoming Monero v7 PoW changes starting 03/28/18 (No changes in config needed) +- Applied changes for upcoming AEON PoW changes starting 04/07/18 (No changes in config needed) +- Added option to force PoW version +- Added new design / icons # 1.5.0 - Full SSL/TLS support for the whole communication: - XMRigCCServer Dashboard <-> Browser diff --git a/README.md b/README.md index a2710cda..ea895b21 100644 --- a/README.md +++ b/README.md @@ -3,6 +3,7 @@ [![Windows Build status](https://ci.appveyor.com/api/projects/status/l8v7cuuy320a4tpd?svg=true)](https://ci.appveyor.com/project/Bendr0id/xmrigcc) [![Docker Build status](https://img.shields.io/docker/build/bendr0id/xmrigcc.svg)](https://hub.docker.com/r/bendr0id/xmrigcc/) [![GitHub release](https://img.shields.io/github/release/bendr0id/xmrigCC/all.svg)](https://github.com/bendr0id/xmrigCC/releases) +[![Github downloads 1.5.1](https://img.shields.io/github/downloads/bendr0id/xmrigCC/1.5.1/total.svg)](https://github.com/bendr0id/xmrigCC/releases) [![Github downloads release](https://img.shields.io/github/downloads/bendr0id/xmrigCC/total.svg)](https://github.com/bendr0id/xmrigCC/releases) [![GitHub stars](https://img.shields.io/github/stars/bendr0id/xmrigCC.svg)](https://github.com/bendr0id/xmrigCC/stargazers) diff --git a/index.html b/index.html index d753b356..277566ea 100644 --- a/index.html +++ b/index.html @@ -89,7 +89,7 @@ $(document).ready(function() { var table = $('#clientStatusList').DataTable({ - dom: "<'row'<'col-sm-9'B><'col-sm-3'f>><'row'<'col-sm-12't>><'row'<'col-sm-10'i><'col-sm-2'<'#serverTime'>>>", + dom: "<'row'<'col-sm-9'B><'col-sm-3'f>><'row'<'col-sm-12't>><'row'<'col-sm-4'i><'col-sm-8'<'#serverTime'>>>", bPaginate: false, ajax: { url: "/admin/getClientStatusList", @@ -329,7 +329,7 @@ currentServerTime = settings.json.current_server_time * 1000; clockDrift = new Date().getTime() - currentServerTime; - $('#serverTime').html("
" + new Date(currentServerTime) + "
"); + $('#serverTime').html("
" + new Date(currentServerTime) + "
"); }); table.on('select', function () { @@ -691,4 +691,4 @@ - \ No newline at end of file + diff --git a/src/Mem.cpp b/src/Mem.cpp index 5d9261d0..a7e0fc8a 100644 --- a/src/Mem.cpp +++ b/src/Mem.cpp @@ -34,7 +34,7 @@ int Mem::m_flags = 0; size_t Mem::m_hashFactor = 1; size_t Mem::m_threads = 0; size_t Mem::m_memorySize = 0; -uint8_t *Mem::m_memory = nullptr; +alignas(16) uint8_t *Mem::m_memory = nullptr; Mem::ThreadBitSet Mem::m_multiHashThreadMask = Mem::ThreadBitSet(-1L); cryptonight_ctx *Mem::create(int threadId) diff --git a/src/Mem.h b/src/Mem.h index 5334f72a..e2048162 100644 --- a/src/Mem.h +++ b/src/Mem.h @@ -27,8 +27,8 @@ #define __MEM_H__ -#include -#include +#include +#include #include #include "Options.h" diff --git a/src/Options.cpp b/src/Options.cpp index f8d173d8..58beed44 100644 --- a/src/Options.cpp +++ b/src/Options.cpp @@ -71,9 +71,11 @@ Options:\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\ + -A, --aesni=N selection of AES-NI mode (0 auto, 1 on, 2 off)\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\ + --force-pow-version=N force to use specific PoW variation (default: 0 POW_AUTODETECT, 1 POW_V1, 2 POW_V2)\n\ --multihash-thread-mask for av=2/4 only, limits multihash to given threads (mask), (default: all threads)\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\ @@ -307,6 +309,7 @@ Options::Options(int argc, char **argv) : m_forcePowVersion(POW_AUTODETECT), m_algoVariant(AV0_AUTO), m_aesni(AESNI_AUTO), + m_forcePowVersion(POW_AUTODETECT), m_hashFactor(0), m_apiPort(0), m_donateLevel(kDonateLevel), diff --git a/src/config.json b/src/config.json index 02e53f37..2e995227 100644 --- a/src/config.json +++ b/src/config.json @@ -9,6 +9,7 @@ "threads": 0, // number of miner threads (not set or 0 enables automatic selection of optimal thread count) "multihash-factor": 0, // number of hash blocks to process at a time (not set or 0 enables automatic selection of optimal number of hash blocks) "multihash-thread-mask" : null, // for multihash-factors>0 only, limits multihash to given threads (mask), mask "0x3" means run multihash on thread 0 and 1 only (default: all threads) + "force-pow-version" : 0, // force to use specific PoW variation (default: 0 POW_AUTODETECT, 1 POW_V1, 2 POW_V2) "background": false, // true to run the miner in the background (Windows only, for *nix plase use screen/tmux or systemd service instead) "colors": true, // false to disable colored output "cpu-affinity": null, // set process affinity to CPU core(s), mask "0x3" for cores 0 and 1 diff --git a/src/crypto/CryptoNight_arm.h b/src/crypto/CryptoNight_arm.h index 4316ab98..dd3699f9 100644 --- a/src/crypto/CryptoNight_arm.h +++ b/src/crypto/CryptoNight_arm.h @@ -36,7 +36,6 @@ #include "crypto/CryptoNight.h" -#include "crypto/CryptoNight_monero.h" #include "crypto/soft_aes.h" diff --git a/src/crypto/CryptoNight_monero.h b/src/crypto/CryptoNight_monero.h deleted file mode 100644 index 504b9b9d..00000000 --- a/src/crypto/CryptoNight_monero.h +++ /dev/null @@ -1,57 +0,0 @@ -/* XMRig - * Copyright 2010 Jeff Garzik - * Copyright 2012-2014 pooler - * Copyright 2014 Lucas Jones - * Copyright 2014-2016 Wolf9466 - * Copyright 2016 Jay D Dee - * Copyright 2017-2018 XMR-Stak , - * Copyright 2018 Lee Clagett - * Copyright 2016-2018 XMRig , - * - * 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 . - */ - -#ifndef __CRYPTONIGHT_MONERO_H__ -#define __CRYPTONIGHT_MONERO_H__ - -// VARIANT ALTERATIONS -#define VARIANT1_INIT(part) \ - const uint8_t version##part = static_cast(input)[part * size]; \ - uint64_t tweak1_2_##part = 0; \ - /*if (MONERO)*/ { \ - if (version##part > 6) { \ - tweak1_2_##part = (*reinterpret_cast(reinterpret_cast(input) + 35 + part * size) ^ \ - *(reinterpret_cast(ctx->state[part]) + 24)); \ - } \ - } - -#define VARIANT1_1(p, part) \ - /*if (MONERO)*/ { \ - if (version##part > 6) { \ - const uint8_t tmp = reinterpret_cast(p)[11]; \ - static const uint32_t table = 0x75310; \ - const uint8_t index = (((tmp >> 3) & 6) | (tmp & 1)) << 1; \ - ((uint8_t*)(p))[11] = tmp ^ ((table >> index) & 0x30); \ - } \ - } - -#define VARIANT1_2(p, part) \ - /*if (MONERO)*/ { \ - if (version##part > 6) { \ - (p) ^= tweak1_2_##part; \ - } \ - } - - -#endif /* __CRYPTONIGHT_MONERO_H__ */ diff --git a/src/crypto/CryptoNight_x86.h b/src/crypto/CryptoNight_x86.h index 1eeb9365..c14c0172 100644 --- a/src/crypto/CryptoNight_x86.h +++ b/src/crypto/CryptoNight_x86.h @@ -36,7 +36,6 @@ #include "crypto/CryptoNight.h" -#include "crypto/CryptoNight_monero.h" #include "crypto/soft_aes.h" diff --git a/src/default_config.json b/src/default_config.json index 1964e364..d647ba0a 100644 --- a/src/default_config.json +++ b/src/default_config.json @@ -9,6 +9,7 @@ "threads": 0, // number of miner threads (not set or 0 enables automatic selection of optimal thread count) "multihash-factor": 0, // number of hash blocks to process at a time (not set or 0 enables automatic selection of optimal number of hash blocks) "multihash-thread-mask" : null, // for multihash-factors>0 only, limits multihash to given threads (mask), mask "0x3" means run multihash on thread 0 and 1 only (default: all threads) + "force-pow-version" : 0, // force to use specific PoW variation (default: 0 POW_AUTODETECT, 1 POW_V1, 2 POW_V2) "background": false, // true to run the miner in the background (Windows only, for *nix plase use screen/tmux or systemd service instead) "colors": true, // false to disable colored output "cpu-affinity": null, // set process affinity to CPU core(s), mask "0x3" for cores 0 and 1