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

Merged features for # 1.6.3 (#114)

Browse source 
- 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
Download patch file Download diff file Expand all files Collapse all files

23
src/Options.h
View file

@ -33,6 +33,7 @@
#include <vector>
#include "rapidjson/fwd.h"
#include "PowVariant.h"
class Url;
struct option;
@ -42,10 +43,9 @@ class Options
{
public:
enum Algo {
ALGO_CRYPTONIGHT, /* CryptoNight (Monero) */
ALGO_CRYPTONIGHT_LITE, /* CryptoNight-Lite (AEON) */
ALGO_CRYPTONIGHT_LITE_IPBC, /* CryptoNight-Lite-IPBC (IPBC) */
ALGO_CRYPTONIGHT_HEAVY /* CryptoNight-Heavy (SUMO) */
ALGO_CRYPTONIGHT, /* CryptoNight (2MB ScratchPad) */
ALGO_CRYPTONIGHT_LITE, /* CryptoNight-Lite (1MB ScratchPad) */
ALGO_CRYPTONIGHT_HEAVY /* CryptoNight-Heavy (4MB ScratchPad) */
};
enum AlgoVariant {
@ -63,12 +63,6 @@ public:
AESNI_OFF
};
enum PowVersion {
POW_AUTODETECT, /* Default, automatic detect by block version */
POW_V1, /* Force to use PoW algo before 28.03.2018 */
POW_V2, /* Force to use PoW algo used by Monero V7 (after 28.03.2018) and AEON */
};
static inline Options* i() { return m_self; }
static Options *parse(int argc, char **argv);
@ -94,7 +88,7 @@ public:
inline const char *ccCertFile() const { return m_ccCertFile == nullptr ? "server.pem" : m_ccCertFile; }
inline const std::vector<Url*> &pools() const { return m_pools; }
inline Algo algo() const { return m_algo; }
inline PowVersion forcePowVersion() const { return m_forcePowVersion; }
inline PowVariant powVariant() const { return m_powVariant; }
inline bool aesni() const { return m_aesni == AESNI_ON; }
inline size_t hashFactor() const { return m_hashFactor; }
inline int apiPort() const { return m_apiPort; }
@ -110,9 +104,10 @@ public:
inline int64_t multiHashThreadMask() const { return m_multiHashThreadMask; }
inline void setColors(bool colors) { m_colors = colors; }
inline static void release() { delete m_self; }
inline static void release() { delete m_self; }
const char *algoName() const;
const char *algoShortName() const;
private:
constexpr static uint16_t kDefaultCCPort = 3344;
@ -133,9 +128,11 @@ private:
void parseConfig(const char *fileName);
void parseJSON(const struct option *option, const rapidjson::Value &object);
void showUsage(int status) const;
void showDeprecateWarning(const char* deprecated, const char* newParam) const;
void showVersion(void);
bool setAlgo(const char *algo);
bool parsePowVariant(const char *powVariant);
void optimizeAlgorithmConfiguration();
@ -164,7 +161,7 @@ private:
Algo m_algo;
AlgoVariant m_algoVariant;
AesNi m_aesni;
PowVersion m_forcePowVersion;
PowVariant m_powVariant;
size_t m_hashFactor;
int m_apiPort;
int m_donateLevel;