summaryrefslogtreecommitdiffstats
path: root/xmrstak/cli/cli-miner.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'xmrstak/cli/cli-miner.cpp')
-rw-r--r--xmrstak/cli/cli-miner.cpp96
1 files changed, 85 insertions, 11 deletions
diff --git a/xmrstak/cli/cli-miner.cpp b/xmrstak/cli/cli-miner.cpp
index 546d226..6da0855 100644
--- a/xmrstak/cli/cli-miner.cpp
+++ b/xmrstak/cli/cli-miner.cpp
@@ -85,10 +85,13 @@ void help()
cout<<" --nvidia FILE NVIDIA backend miner config file"<<endl;
#endif
cout<<" "<<endl;
- cout<<"The Following options temporary overwrites the config entries of \nthe pool with the highest weight:"<<endl;
+ cout<<"The following options can be used for automatic start without a guided config,"<<endl;
+ cout<<"If config exists then this pool will be top priority."<<endl;
cout<<" -o, --url URL pool url and port, e.g. pool.usxmrpool.com:3333"<<endl;
+ cout<<" -O, --tls-url URL TLS pool url and port, e.g. pool.usxmrpool.com:10443"<<endl;
cout<<" -u, --user USERNAME pool user name or wallet address"<<endl;
cout<<" -p, --pass PASSWD pool password, in the most cases x or empty \"\""<<endl;
+ cout<<" --use-nicehash the pool should run in nicehash mode"<<endl;
cout<<" \n"<<endl;
#ifdef _WIN32
cout<<"Environment variables:\n"<<endl;
@@ -162,7 +165,16 @@ std::string get_multipool_entry(bool& final)
", \"tls_fingerprint\" : \"\", \"pool_weight\" : " + std::to_string(pool_weight) + " },\n";
}
-void do_guided_config(bool userSetPasswd)
+inline void prompt_once(bool& prompted)
+{
+ if(!prompted)
+ {
+ std::cout<<"Please enter:"<<std::endl;
+ prompted = true;
+ }
+}
+
+void do_guided_config()
{
using namespace xmrstak;
@@ -173,10 +185,13 @@ void do_guided_config(bool userSetPasswd)
configEditor configTpl{};
configTpl.set(std::string(tpl));
- std::cout<<"Please enter:"<<std::endl;
+ bool prompted = false;
+
auto& currency = params::inst().currency;
if(currency.empty())
{
+ prompt_once(prompted);
+
std::string tmp;
#if defined(CONF_NO_AEON)
tmp = "monero";
@@ -196,6 +211,8 @@ void do_guided_config(bool userSetPasswd)
bool userSetPool = true;
if(pool.empty())
{
+ prompt_once(prompted);
+
userSetPool = false;
if(currency == "monero")
std::cout<<"- Pool address: e.g. pool.usxmrpool.com:3333"<<std::endl;
@@ -207,25 +224,44 @@ void do_guided_config(bool userSetPasswd)
auto& userName = params::inst().poolUsername;
if(userName.empty())
{
+ prompt_once(prompted);
+
std::cout<<"- Username (wallet address or pool login):"<<std::endl;
std::cin >> userName;
}
auto& passwd = params::inst().poolPasswd;
- if(passwd.empty() && (!userSetPasswd))
+ if(passwd.empty() && !params::inst().userSetPwd)
{
+ prompt_once(prompted);
+
// clear everything from stdin to allow an empty password
std::cin.clear(); std::cin.ignore(INT_MAX,'\n');
std::cout<<"- Password (mostly empty or x):"<<std::endl;
getline(std::cin, passwd);
}
+ bool tls;
#ifdef CONF_NO_TLS
- bool tls = false;
+ tls = false;
#else
- bool tls = read_yes_no("- Does this pool port support TLS/SSL? Use no if unknown. (y/N)");
+ if(!userSetPool)
+ {
+ prompt_once(prompted);
+ tls = read_yes_no("- Does this pool port support TLS/SSL? Use no if unknown. (y/N)");
+ }
+ else
+ tls = params::inst().poolUseTls;
#endif
- bool nicehash = read_yes_no("- Do you want to use nicehash on this pool? (y/n)");
+
+ bool nicehash;
+ if(!userSetPool)
+ {
+ prompt_once(prompted);
+ nicehash = read_yes_no("- Do you want to use nicehash on this pool? (y/n)");
+ }
+ else
+ nicehash = params::inst().nicehashMode;
bool multipool;
if(!userSetPool)
@@ -339,9 +375,16 @@ int main(int argc, char *argv[])
params::inst().executablePrefix += seperator;
}
- bool userSetPasswd = false;
bool uacDialog = true;
- for(int i = 1; i < argc; ++i)
+ bool pool_url_set = false;
+ for(size_t i = 1; i < argc-1; i++)
+ {
+ std::string opName(argv[i]);
+ if(opName == "-o" || opName == "-O" || opName == "--url" || opName == "--tls-url")
+ pool_url_set = true;
+ }
+
+ for(size_t i = 1; i < argc; ++i)
{
std::string opName(argv[i]);
if(opName.compare("-h") == 0 || opName.compare("--help") == 0)
@@ -428,9 +471,29 @@ int main(int argc, char *argv[])
return 1;
}
params::inst().poolURL = argv[i];
+ params::inst().poolUseTls = false;
+ }
+ else if(opName.compare("-O") == 0 || opName.compare("--tls-url") == 0)
+ {
+ ++i;
+ if( i >=argc )
+ {
+ printer::inst()->print_msg(L0, "No argument for parameter '-O/--tls-url' given");
+ win_exit();
+ return 1;
+ }
+ params::inst().poolURL = argv[i];
+ params::inst().poolUseTls = true;
}
else if(opName.compare("-u") == 0 || opName.compare("--user") == 0)
{
+ if(!pool_url_set)
+ {
+ printer::inst()->print_msg(L0, "Pool address has to be set if you want to specify username and password.");
+ win_exit();
+ return 1;
+ }
+
++i;
if( i >=argc )
{
@@ -442,6 +505,13 @@ int main(int argc, char *argv[])
}
else if(opName.compare("-p") == 0 || opName.compare("--pass") == 0)
{
+ if(!pool_url_set)
+ {
+ printer::inst()->print_msg(L0, "Pool address has to be set if you want to specify username and password.");
+ win_exit();
+ return 1;
+ }
+
++i;
if( i >=argc )
{
@@ -449,9 +519,13 @@ int main(int argc, char *argv[])
win_exit();
return 1;
}
- userSetPasswd = true;
+ params::inst().userSetPwd = true;
params::inst().poolPasswd = argv[i];
}
+ else if(opName.compare("--use-nicehash") == 0)
+ {
+ params::inst().nicehashMode = true;
+ }
else if(opName.compare("-c") == 0 || opName.compare("--config") == 0)
{
++i;
@@ -491,7 +565,7 @@ int main(int argc, char *argv[])
// check if we need a guided start
if(!configEditor::file_exist(params::inst().configFile))
- do_guided_config(userSetPasswd);
+ do_guided_config();
if(!jconf::inst()->parse_config(params::inst().configFile.c_str()))
{
OpenPOWER on IntegriCloud