fzorb/REDACTED-rig
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge branch 'master' into develop

Browse source
This commit is contained in:
Ben Gräf 2018-11-04 22:51:55 +01:00
commit f94d00f1d0
5 changed files with 11 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

6
CHANGELOG.md
View file

@ -1,3 +1,9 @@
# 1.8.2
- Fix for mining conceal or other coins with cn-msr
- Fixed avg.time on Dashboard
# 1.8.1
- Fix connection stuck in Failover case when DNS resolve fails #197
- Fix supported-variants announcement in login
# 1.8.0 # 1.8.0
- Integration of cnv2 aka moneroV8 - Integration of cnv2 aka moneroV8
- Hashrate improve -> all cnv1, cn-litev1, cnv2, xtl by adding ASM code for Intel/AMD and softaes [thx @SChernykh] - Hashrate improve -> all cnv1, cn-litev1, cnv2, xtl by adding ASM code for Intel/AMD and softaes [thx @SChernykh]

2
README.md
View file

@ -1,6 +1,6 @@
# XMRigCC # XMRigCC
:warning: **Monero is forking to cnv2 on block 1685555 (2018-10-18) make sure you upgrade to at least XMRigCC 1.8.0** :warning: **Monero forked to cnv2 on block 1685555 (2018-10-18) make sure you upgrade to at least XMRigCC 1.8.0 to mine XMR**
:bulb: **This is the CPU variant of XMRigCC, if you're looking for the AMD GPU (OpenCL) variant [click here](https://github.com/Bendr0id/xmrigCC-amd/).** :bulb: **This is the CPU variant of XMRigCC, if you're looking for the AMD GPU (OpenCL) variant [click here](https://github.com/Bendr0id/xmrigCC-amd/).**

4
index.html
View file

@ -279,8 +279,8 @@
.column(10, {page: 'current'}) .column(10, {page: 'current'})
.data() .data()
.reduce(function (a, b) { .reduce(function (a, b) {
return (a + b) / 2; return (a + b);
}, 0); }, 0) / api.column(10, {page: 'current'}).data().length;
sumSharesGood = api sumSharesGood = api
.column(11, {page: 'current'}) .column(11, {page: 'current'})

9
src/net/Job.cpp
View file

@ -146,15 +146,6 @@ PowVariant Job::powVariant() const
} else { } else {
return PowVariant::POW_V0; return PowVariant::POW_V0;
} }
}
else if (m_powVariant == PowVariant::POW_XTL && m_blob[0] < 4) {
return POW_V1;
}
else if (m_powVariant == PowVariant::POW_MSR && m_blob[0] < 7) {
return POW_V1;
}
else if (m_powVariant == PowVariant::POW_XHV && m_blob[0] < 3) {
return POW_V0;
} else { } else {
return m_powVariant; return m_powVariant;
} }

4
src/version.h
View file

@ -36,14 +36,14 @@
#define APP_DESC "XMRigCC CPU miner" #define APP_DESC "XMRigCC CPU miner"
#define APP_COPYRIGHT "Copyright (C) 2017- BenDr0id" #define APP_COPYRIGHT "Copyright (C) 2017- BenDr0id"
#endif #endif
#define APP_VERSION "1.8.0 (based on XMRig)" #define APP_VERSION "1.8.2 (based on XMRig)"
#define APP_DOMAIN "" #define APP_DOMAIN ""
#define APP_SITE "https://github.com/Bendr0id/xmrigCC" #define APP_SITE "https://github.com/Bendr0id/xmrigCC"
#define APP_KIND "cpu" #define APP_KIND "cpu"
#define APP_VER_MAJOR 1 #define APP_VER_MAJOR 1
#define APP_VER_MINOR 8 #define APP_VER_MINOR 8
#define APP_VER_BUILD 0 #define APP_VER_BUILD 2
#define APP_VER_REV 0 #define APP_VER_REV 0
#ifndef NDEBUG #ifndef NDEBUG