summaryrefslogtreecommitdiffstats
path: root/xmrstak/misc
diff options
context:
space:
mode:
authorpsychocrypt <psychocrypt@users.noreply.github.com>2017-10-24 21:21:11 +0200
committerpsychocrypt <psychocrypt@users.noreply.github.com>2017-10-27 20:12:01 +0200
commitb0d5f15f9b3a669617efc9897d5ff7b6b1f63376 (patch)
tree63ff9fda8916e67578b90280c3db9c5a7c9b09a7 /xmrstak/misc
parent77666c74f2facb0a46b089aab98e324110d33cdd (diff)
downloadxmr-stak-b0d5f15f9b3a669617efc9897d5ff7b6b1f63376.zip
xmr-stak-b0d5f15f9b3a669617efc9897d5ff7b6b1f63376.tar.gz
general aeon support
- cli-miner.hpp: - add option `--currency` - add guided start section - config.tpl: add value `currency` - params.hpp: add value to store the selected currency - executor.hpp: add dev pool address
Diffstat (limited to 'xmrstak/misc')
-rw-r--r--xmrstak/misc/executor.cpp21
1 files changed, 17 insertions, 4 deletions
diff --git a/xmrstak/misc/executor.cpp b/xmrstak/misc/executor.cpp
index 7fc46e4..885961a 100644
--- a/xmrstak/misc/executor.cpp
+++ b/xmrstak/misc/executor.cpp
@@ -21,6 +21,7 @@
*
*/
+#include "../jconf.hpp"
#include "executor.hpp"
#include "xmrstak/net/jpsock.hpp"
@@ -183,8 +184,16 @@ void executor::on_sock_ready(size_t pool_id)
if(pool_id == dev_pool_id)
{
- if(!pool->cmd_login("", ""))
- pool->disconnect();
+ if(::jconf::inst()->IsCurrencyXMR())
+ {
+ if(!pool->cmd_login("", ""))
+ pool->disconnect();
+ }
+ else
+ {
+ if(!pool->cmd_login("WmsvqXDu7Fw5eAEZr1euJH3ycad55NxFd82PfhLR9Zi1Nq5S74zk63EA8fyMS8BQNR94os9N9aah87inKkumNJ7G2d7qTpRLN", "x"))
+ pool->disconnect();
+ }
current_pool_id = dev_pool_id;
printer::inst()->print_msg(L1, "Dev pool logged in. Switching work.");
@@ -352,8 +361,12 @@ void executor::on_switch_pool(size_t pool_id)
// If it fails, it fails, we carry on on the usr pool
// as we never receive further events
printer::inst()->print_msg(L1, "Connecting to dev pool...");
- const char* dev_pool_addr = jconf::inst()->GetTlsSetting() ? "donate.xmr-stak.net:6666" : "donate.xmr-stak.net:3333";
- if(!pool->connect(dev_pool_addr, error))
+ std::string dev_pool_addr;
+ if(::jconf::inst()->IsCurrencyXMR())
+ dev_pool_addr = jconf::inst()->GetTlsSetting() ? "donate.xmr-stak.net:6666" : "donate.xmr-stak.net:3333";
+ else
+ dev_pool_addr = jconf::inst()->GetTlsSetting() ? "mine.aeon-pool.com:443" : "mine.aeon-pool.com:5555";
+ if(!pool->connect(dev_pool_addr.c_str(), error))
printer::inst()->print_msg(L1, "Error connecting to dev pool. Staying with user pool.");
}
else
OpenPOWER on IntegriCloud