From 25ef6368124f624f540e9a3d0c9a30fb3ebee3bf Mon Sep 17 00:00:00 2001 From: Michele Date: Mon, 17 Oct 2016 12:12:36 +0200 Subject: [PATCH] Changed default pools due to Ghash.io close down --- application/config/app.php | 4 ++-- application/models/util_model.php | 3 ++- install_minera.sh | 4 ++-- minera-bin/src/bfgminer | 2 +- minera-bin/src/cpuminer-gc3355 | 2 +- 5 files changed, 8 insertions(+), 7 deletions(-) diff --git a/application/config/app.php b/application/config/app.php index 55c9ea7..17821b8 100644 --- a/application/config/app.php +++ b/application/config/app.php @@ -26,8 +26,8 @@ $config['mobileminer_url_remotecommands'] = 'https://api.mobileminerapp.com/RemoteCommands'; $config['mobileminera_apikey'] = 'Y8gl9PF6QR22Vv'; $config['mobileminera_url_stats'] = 'https://getminera.com/api/miners'; -$config['minera_pool_url'] = 'stratum+tcp://ltc.ghash.io:3333'; -$config['minera_pool_url_sha256'] = 'stratum+tcp://us1.ghash.io:3333'; +$config['minera_pool_url'] = 'stratum+tcp://us.multipool.us:3334'; +$config['minera_pool_url_sha256'] = 'stratum+tcp://us.multipool.us:3332'; $config['minera_pool_username'] = 'michelem.minera'; $config['minera_pool_password'] = 'x'; $config['minera_api_url'] = 'https://getminera.com/api'; diff --git a/application/models/util_model.php b/application/models/util_model.php index 11d9abc..dce4cfb 100644 --- a/application/models/util_model.php +++ b/application/models/util_model.php @@ -812,7 +812,8 @@ function getMineraPoolUser() { $mineraSystemId = $this->generateMineraId(); - return $this->config->item('minera_pool_username').$this->redis->get("minera_system_id"); + //return $this->config->item('minera_pool_username').$this->redis->get("minera_system_id"); + return $this->config->item('minera_pool_username'); } function autoAddMineraPool() diff --git a/install_minera.sh b/install_minera.sh index 19c3b87..dc229cb 100755 --- a/install_minera.sh +++ b/install_minera.sh @@ -17,7 +17,7 @@ usermod -a -G dialout,plugdev,tty,www-data minera echo -e "Adding sudoers configuration for www-data and minera users\n-----\n" echo -e "\n#Minera settings\nminera ALL = (ALL) NOPASSWD: ALL\nwww-data ALL = (ALL) NOPASSWD: ALL" >> /etc/sudoers -MINER_OPT="--gc3355-detect --gc3355-autotune --freq=850 -o stratum+tcp://ltc.ghash.io:3333 -u michelem.minera -p x --retries=1" +MINER_OPT="--gc3355-detect --gc3355-autotune --freq=850 -o stratum+tcp://us.multipool.us:3334 -u michelem.minera -p x --retries=1" MINER_BIN=`pwd`"/minera-bin/" MINERA_LOGS="/var/log/minera" MINERA_CONF=`pwd`"/conf" @@ -59,7 +59,7 @@ echo -n "1" | redis-cli -x set minerd_autodetect echo -n "1" | redis-cli -x set anonymous_stats echo -n "cpuminer" | redis-cli -x set minerd_software echo -n '["132","155","3"]' | redis-cli -x set dashboard_coin_rates -echo -e '[{"url":"stratum+tcp://ltc.ghash.io:3333","username":"michelem.minera","password":"x"}]' | redis-cli -x set minerd_pools +echo -e '[{"url":"stratum+tcp://us.multipool.us:3334","username":"michelem.minera","password":"x"}]' | redis-cli -x set minerd_pools echo -e "Adding minera startup command to rc.local\n-----\n" chmod 777 /etc/rc.local diff --git a/minera-bin/src/bfgminer b/minera-bin/src/bfgminer index 008572d..9c71295 160000 --- a/minera-bin/src/bfgminer +++ b/minera-bin/src/bfgminer @@ -1 +1 @@ -Subproject commit 008572dfdfe4898a9975dbdb25d05ecbb0a854cd +Subproject commit 9c71295c91a8f35bc1a2a1a37fca811463b6ff28 diff --git a/minera-bin/src/cpuminer-gc3355 b/minera-bin/src/cpuminer-gc3355 index 61df8a3..11ae30f 160000 --- a/minera-bin/src/cpuminer-gc3355 +++ b/minera-bin/src/cpuminer-gc3355 @@ -1 +1 @@ -Subproject commit 61df8a3354edfd2426506d6662ff11d20242c597 +Subproject commit 11ae30ff0418c6f54333671800140244457061c6