Merge branch 'master' of https://github.com/Bendr0id/xmrigCC
This commit is contained in:
commit
b394aea8bf
11 changed files with 16 additions and 67 deletions
|
@ -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
|
||||
|
|
|
@ -3,6 +3,7 @@
|
|||
[](https://ci.appveyor.com/project/Bendr0id/xmrigcc)
|
||||
[](https://hub.docker.com/r/bendr0id/xmrigcc/)
|
||||
[](https://github.com/bendr0id/xmrigCC/releases)
|
||||
[](https://github.com/bendr0id/xmrigCC/releases)
|
||||
[](https://github.com/bendr0id/xmrigCC/releases)
|
||||
[](https://github.com/bendr0id/xmrigCC/stargazers)
|
||||
|
||||
|
|
|
@ -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("<div class='dataTables_info'>" + new Date(currentServerTime) + "</div>");
|
||||
$('#serverTime').html("<div class='dataTables_info text-right'>" + new Date(currentServerTime) + "</div>");
|
||||
});
|
||||
|
||||
table.on('select', function () {
|
||||
|
@ -691,4 +691,4 @@
|
|||
</div>
|
||||
</div>
|
||||
</body>
|
||||
</html>
|
||||
</html>
|
||||
|
|
|
@ -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)
|
||||
|
|
|
@ -27,8 +27,8 @@
|
|||
#define __MEM_H__
|
||||
|
||||
|
||||
#include <cstddef>
|
||||
#include <cstdint>
|
||||
#include <stddef.h>
|
||||
#include <stdint.h>
|
||||
#include <bitset>
|
||||
|
||||
#include "Options.h"
|
||||
|
|
|
@ -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),
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -36,7 +36,6 @@
|
|||
|
||||
|
||||
#include "crypto/CryptoNight.h"
|
||||
#include "crypto/CryptoNight_monero.h"
|
||||
#include "crypto/soft_aes.h"
|
||||
|
||||
|
||||
|
|
|
@ -1,57 +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/>.
|
||||
*/
|
||||
|
||||
#ifndef __CRYPTONIGHT_MONERO_H__
|
||||
#define __CRYPTONIGHT_MONERO_H__
|
||||
|
||||
// VARIANT ALTERATIONS
|
||||
#define VARIANT1_INIT(part) \
|
||||
const uint8_t version##part = static_cast<const uint8_t*>(input)[part * size]; \
|
||||
uint64_t tweak1_2_##part = 0; \
|
||||
/*if (MONERO)*/ { \
|
||||
if (version##part > 6) { \
|
||||
tweak1_2_##part = (*reinterpret_cast<const uint64_t*>(reinterpret_cast<const uint8_t*>(input) + 35 + part * size) ^ \
|
||||
*(reinterpret_cast<const uint64_t*>(ctx->state[part]) + 24)); \
|
||||
} \
|
||||
}
|
||||
|
||||
#define VARIANT1_1(p, part) \
|
||||
/*if (MONERO)*/ { \
|
||||
if (version##part > 6) { \
|
||||
const uint8_t tmp = reinterpret_cast<const uint8_t*>(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__ */
|
|
@ -36,7 +36,6 @@
|
|||
|
||||
|
||||
#include "crypto/CryptoNight.h"
|
||||
#include "crypto/CryptoNight_monero.h"
|
||||
#include "crypto/soft_aes.h"
|
||||
|
||||
|
||||
|
|
|
@ -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
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue