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

Merge branch 'beta' of https://github.com/xmrig/xmrig

Browse source
This commit is contained in:
MoneroOcean 2019-10-29 14:19:29 -07:00
commit 245838ffae
57 changed files with 1167 additions and 443 deletions
Download patch file Download diff file Expand all files Collapse all files

1
src/core/Miner.cpp
View file

@ -152,6 +152,7 @@ public:
reply.AddMember("ua", StringRef(Platform::userAgent()), allocator);
reply.AddMember("cpu", Cpu::toJSON(doc), allocator);
reply.AddMember("donate_level", controller->config()->pools().donateLevel(), allocator);
reply.AddMember("paused", !enabled, allocator);
Value algo(kArrayType);

3
src/core/config/Config_default.h
View file

@ -88,7 +88,8 @@ R"===(
"enabled": true,
"tls": false,
"tls-fingerprint": null,
"daemon": false
"daemon": false,
"self-select": null
}
],
"print-time": 60,

1
src/core/config/Config_platform.h
View file

@ -56,6 +56,7 @@ static const option options[] = {
{ "http-no-restricted", 0, nullptr, IConfig::HttpRestrictedKey },
{ "daemon", 0, nullptr, IConfig::DaemonKey },
{ "daemon-poll-interval", 1, nullptr, IConfig::DaemonPollKey },
{ "self-select", 1, nullptr, IConfig::SelfSelectKey },
# endif
{ "av", 1, nullptr, IConfig::AVKey },
{ "background", 0, nullptr, IConfig::BackgroundKey },

1
src/core/config/usage.h
View file

@ -62,6 +62,7 @@ static inline const std::string &usage()
# ifdef XMRIG_FEATURE_HTTP
u += " --daemon use daemon RPC instead of pool for solo mining\n";
u += " --daemon-poll-interval=N daemon poll interval in milliseconds (default: 1000)\n";
u += " --self-select=URL self-select block templates from URL\n";
# endif
u += " -r, --retries=N number of times to retry before switch to backup server (default: 5)\n";