Merged features for # 1.6.3 (#114)

- Added shift+click function for multi row selection to Dashboard
- Added -DBUILD_STATIC=ON/OFF option to CMake configuration to create fully static builds
- Added current algo and list of supported_varaints to login message for future usage on proxy
- Added support for latest Stellite (XTL) and Alloy (XAO) variants
- Simplification of configuration, "force-pow-variant" and "cryptonight-lite-ipbc" parameters are now deprecated see [Coin Configuration](https://github.com/Bendr0id/xmrigCC/wiki/Coin-configurations) for guidance
- Fixed leaks in transport shutdown
This commit is contained in:
Ben Gräf 2018-05-23 23:23:49 +02:00 committed by GitHub
parent dc6bcacaed
commit f54ce3c95c
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
25 changed files with 654 additions and 431 deletions

View file

@ -62,7 +62,7 @@ Job::Job(int poolId, bool nicehash) :
m_size(0),
m_diff(0),
m_target(0),
m_powVersion(Options::POW_AUTODETECT)
m_powVariant(PowVariant::POW_AUTODETECT)
{
}
@ -136,6 +136,21 @@ bool Job::setTarget(const char *target)
return true;
}
PowVariant Job::powVariant() const
{
if (m_powVariant == PowVariant::POW_AUTODETECT)
{
return (m_blob[0] > 6 ? PowVariant::POW_V1 : PowVariant::POW_V0);
}
else if (m_powVariant == PowVariant::POW_XTL && m_blob[0] < 4)
{
return POW_V1;
}
else
{
return m_powVariant;
}
}
bool Job::fromHex(const char* in, unsigned int len, unsigned char* out)
{
@ -150,7 +165,6 @@ bool Job::fromHex(const char* in, unsigned int len, unsigned char* out)
return true;
}
void Job::toHex(const unsigned char* in, unsigned int len, char* out)
{
for (unsigned int i = 0; i < len; i++) {
@ -159,7 +173,6 @@ void Job::toHex(const unsigned char* in, unsigned int len, char* out)
}
}
bool Job::operator==(const Job &other) const
{
return m_id == other.m_id && memcmp(m_blob, other.m_blob, sizeof(m_blob)) == 0;