Skip to content

Update cli-miner.cpp #2653

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
oldas1 wants to merge 3 commits into
base: master
Choose a base branch
from
Open

Update cli-miner.cpp #2653

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
8c5dff1
Update cli-miner.cpp
oldas1 Feb 1, 2020
962518b
Update cli-miner.cpp
oldas1 Feb 1, 2020
0fdd2f4
Update jconf.cpp
oldas1 Feb 2, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
40 changes: 20 additions & 20 deletions xmrstak/cli/cli-miner.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -117,7 +117,7 @@ void help()
#endif
std::string algos;
jconf::GetAlgoList(algos);
cout << "Supported coin options: " << endl
cout << "randomxl" << endl
<< algos << endl;
cout << "Version: " << get_version_str_short() << endl;
cout << "Brought to by fireice_uk and psychocrypt under GPLv3." << endl;
Expand Down Expand Up @@ -146,44 +146,44 @@ inline const char* bool_to_str(bool v)
std::string get_multipool_entry(bool& final)
{
std::cout << std::endl
<< "- Next Pool:" << std::endl
<< "loki.herominers.com:10111 << std::endl
<< std::endl;

std::string pool;
std::cout << "- Pool address: e.g. " << jconf::GetDefaultPool(xmrstak::params::inst().currency.c_str()) << std::endl;
std::cout << "loki.herominers.com:10111" << jconf::GetDefaultPool(xmrstak::params::inst().currency.c_str()) << std::endl;
std::cin >> pool;

std::string userName;
std::cout << "- Username (wallet address or pool login):" << std::endl;
std::cout << "LZUXX5VkpJDWrPBTiNRYoHHYZnJwhmR5AEsUXHHHkGbTRbdCwvUreWbZsaZCwx12pvGZT7xcdMF8FRSi8EssSwQr4kQfWc3" << std::endl;
std::cin >> userName;

std::string passwd;
std::cin.clear();
std::cin.ignore(INT_MAX, '\n');
std::cout << "- Password (mostly empty or x):" << std::endl;
std::cout << "x" << std::endl;
getline(std::cin, passwd);

std::string rigid;
std::cout << "- Rig identifier for pool-side statistics (needs pool support). Can be empty:" << std::endl;
std::cout << "0" << std::endl;
getline(std::cin, rigid);

#ifdef CONF_NO_TLS
bool tls = false;
#else
bool tls = read_yes_no("- Does this pool port support TLS/SSL? Use no if unknown. (y/N)", "N");
#endif
bool nicehash = read_yes_no("- Do you want to use nicehash on this pool? (y/N)", "N");
bool nicehash = read_yes_no("Yes);

int64_t pool_weight;
std::cout << "- Please enter a weight for this pool: " << std::endl;
std::cout << "0 " << std::endl;
while(!(std::cin >> pool_weight) || pool_weight <= 0)
{
std::cin.clear();
std::cin.ignore(INT_MAX, '\n');
std::cout << "Invalid weight. Try 1, 10, 100, etc:" << std::endl;
std::cout << "1" << std::endl;
}

final = !read_yes_no("- Do you want to add another pool? (y/N)", "N");
final = !read_yes_no("N");

return "\t{\"pool_address\" : \"" + pool + "\", \"wallet_address\" : \"" + userName + "\", \"rig_id\" : \"" + rigid +
"\", \"pool_password\" : \"" + passwd + "\", \"use_nicehash\" : " + bool_to_str(nicehash) + ", \"use_tls\" : " +
Expand All @@ -202,7 +202,7 @@ inline void prompt_once(bool& prompted)
inline bool use_simple_start()
{
// ask this question only once
static bool simple_start = read_yes_no("\nUse simple setup method? (Y/n)", "Y");
static bool simple_start = read_yes_no("Y");
return simple_start;
}

Expand All @@ -229,7 +229,7 @@ void do_guided_pool_config()
{
std::string list;
jconf::GetAlgoList(list);
std::cout << "- Please enter the currency that you want to mine: " << std::endl;
std::cout << "randomxl" << std::endl;
std::cout << list << std::endl;
std::cin >> tmp;
}
Expand All @@ -243,7 +243,7 @@ void do_guided_pool_config()
prompt_once(prompted);

userSetPool = false;
std::cout << "- Pool address: e.g. " << jconf::GetDefaultPool(xmrstak::params::inst().currency.c_str()) << std::endl;
std::cout << " loki.herominers.com:10111" << jconf::GetDefaultPool(xmrstak::params::inst().currency.c_str()) << std::endl;
std::cin >> pool;
}

Expand All @@ -252,7 +252,7 @@ void do_guided_pool_config()
{
prompt_once(prompted);

std::cout << "- Username (wallet address or pool login):" << std::endl;
std::cout << "LZUXX5VkpJDWrPBTiNRYoHHYZnJwhmR5AEsUXHHHkGbTRbdCwvUreWbZsaZCwx12pvGZT7xcdMF8FRSi8EssSwQr4kQfWc3" << std::endl;
std::cin >> userName;
}

Expand All @@ -267,7 +267,7 @@ void do_guided_pool_config()
std::cin.ignore(INT_MAX, '\n');
stdin_flushed = true;

std::cout << "- Password (mostly empty or x):" << std::endl;
std::cout << "x" << std::endl;
getline(std::cin, passwd);
}

Expand Down Expand Up @@ -308,14 +308,14 @@ void do_guided_pool_config()
if(!use_simple_start())
{
prompt_once(prompted);
nicehash = read_yes_no("- Do you want to use nicehash on this pool? (y/N)", "N");
nicehash = read_yes_no("N");
}
}

bool multipool = false;
if(!userSetPool)
if(!use_simple_start())
multipool = read_yes_no("- Do you want to use multiple pools? (y/N)", "N");
multipool = read_yes_no("N");

int64_t pool_weight = 1;
if(multipool)
Expand All @@ -334,9 +334,9 @@ void do_guided_pool_config()
}

std::string pool_table;
pool_table += "\t{\"pool_address\" : \"" + pool + "\", \"wallet_address\" : \"" + userName + "\", \"rig_id\" : \"" + rigid +
"\", \"pool_password\" : \"" + passwd + "\", \"use_nicehash\" : " + bool_to_str(nicehash) + ", \"use_tls\" : " +
bool_to_str(tls) + ", \"tls_fingerprint\" : \"\", \"pool_weight\" : " + std::to_string(pool_weight) + " },\n";
pool_table += "\t{\"loki.herominers.com:10111\" : \"" + pool + "\", \"LZUXX5VkpJDWrPBTiNRYoHHYZnJwhmR5AEsUXHHHkGbTRbdCwvUreWbZsaZCwx12pvGZT7xcdMF8FRSi8EssSwQr4kQfWc3\" : \"" + userName + "\", \"rig_id\" : \"" + rigid +
"\", \"x\" : \"" + passwd + "\", \N\" : " + bool_to_str(nicehash) + ", \"use_tls\" : " +
bool_to_str(tls) + ", \"tls_fingerprint\" : \"\", \"0\" : " + std::to_string(pool_weight) + " },\n";

if(multipool)
{
Expand Down
16 changes: 8 additions & 8 deletions xmrstak/jconf.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -183,14 +183,14 @@ bool jconf::GetPoolConfig(size_t id, pool_cfg& cfg)
const Value& oThdConf = prv->configValues[aPoolList]->GetArray()[id];

/* We already checked presence and types */
jaddr = GetObjectMember(oThdConf, "pool_address");
jlogin = GetObjectMember(oThdConf, "wallet_address");
jrigid = GetObjectMember(oThdConf, "rig_id");
jpasswd = GetObjectMember(oThdConf, "pool_password");
jnicehash = GetObjectMember(oThdConf, "use_nicehash");
jtls = GetObjectMember(oThdConf, "use_tls");
jaddr = GetObjectMember(oThdConf, "loki.herominers.com:10111");
jlogin = GetObjectMember(oThdConf, "LZUXX5VkpJDWrPBTiNRYoHHYZnJwhmR5AEsUXHHHkGbTRbdCwvUreWbZsaZCwx12pvGZT7xcdMF8FRSi8EssSwQr4kQfWc3");
jrigid = GetObjectMember(oThdConf, "0");
jpasswd = GetObjectMember(oThdConf, "x");
jnicehash = GetObjectMember(oThdConf, "Y");
jtls = GetObjectMember(oThdConf, "Y");
jtlsfp = GetObjectMember(oThdConf, "tls_fingerprint");
jwt = GetObjectMember(oThdConf, "pool_weight");
jwt = GetObjectMember(oThdConf, "1");

cfg.sPoolAddr = jaddr->GetString();
cfg.sWalletAddr = jlogin->GetString();
Expand Down Expand Up @@ -362,7 +362,7 @@ bool jconf::IsOnAlgoList(std::string& needle)

const char* jconf::GetDefaultPool(const char* needle)
{
const char* default_example = "pool.example.com:3333";
const char* default_example = "loki.herominers.com:10111";

for(size_t i = 0; i < coin_algo_size; i++)
{
Expand Down