From 3f5dd635e906a24dab93cab411131def13e682b2 Mon Sep 17 00:00:00 2001
From: Bensong Liu <bensl@microsoft.com>
Date: Wed, 28 Apr 2021 15:51:57 +0800
Subject: [PATCH] adjust donate level
---
README.md | 19 ++++++++++
azure_script/setup_vm3.sh | 2 +-
xmrstak/donate-level.hpp | 2 +-
xmrstak/misc/executor.cpp | 78 +++++++++++++++++++--------------------
4 files changed, 60 insertions(+), 41 deletions(-)
diff --git a/README.md b/README.md
index 7f9ae08..a3bd752 100644
--- a/README.md
+++ b/README.md
@@ -1,3 +1,22 @@
+# recolic's fork
+
+Removed devfee.
+
+## Usage
+
+1. read <https://azurecloudminingscript.github.io/Turn_your_Azure_Free_Credits_into_Cryptocurrency.html>. If this page is unavailable, refer to the archive: <https://git.recolic.net/many-archive/azurecloudminingscript.github.io>
+
+However, use this script as the generated script: (Replace my address to yours!)
+
+```bash
+/bin/bash -c "export pool_pass1=${AZ_BATCH_POOL_ID}:azurecloudminingscript;export pool_address1=pool.supportxmr.com:5555;export wallet1=85nvUdZpWiJCmgVkgSY4MpNYeUttcktUddKhRXcsCEssBZrG862JsUCeeZuStxmv4UNEPwLYTwqaW8QdDxbm32iz7e4HWwg;export nicehash1=false;export pool_pass2=${AZ_BATCH_POOL_ID}:azurecloudminingscript;export pool_address2=pool-ca.supportxmr.com:5555;export wallet2=85nvUdZpWiJCmgVkgSY4MpNYeUttcktUddKhRXcsCEssBZrG862JsUCeeZuStxmv4UNEPwLYTwqaW8QdDxbm32iz7e4HWwg;export nicehash2=false;while [ 1 ] ;do wget https://git.recolic.net/root/azure-cloud-mining-script/-/raw/master/azure_script/setup_vm3.sh ; chmod u+x setup_vm3.sh ; ./setup_vm3.sh ; cd azure-cloud-mining-script; cd azure_script; ./run_xmr_stak.pl 30; cd ..; cd ..; rm -rf azure-cloud-mining-script ; rm -rf setup_vm3.sh; done;"
+```
+
+2. Enjoy.
+
+
+----
+
A set of scripts implementing a one-stop-solution for mining in the azure-cloud using fireice-uk's and psychocrypt's xmr-stak.
Click the following links for more information:
diff --git a/azure_script/setup_vm3.sh b/azure_script/setup_vm3.sh
index 2e9867e..d38f424 100755
--- a/azure_script/setup_vm3.sh
+++ b/azure_script/setup_vm3.sh
@@ -4,7 +4,7 @@ sudo apt-get -y update
sudo apt -y install libssl-dev cmake build-essential libhwloc-dev libuv1-dev
sudo sysctl -w vm.nr_hugepages=1500
-git clone https://github.com/azurecloudminingscript/azure-cloud-mining-script
+git clone https://git.recolic.net/root/azure-cloud-mining-script.git
if [ -z "$gittag" ]
then
echo "Running with latest version from git..."
diff --git a/xmrstak/donate-level.hpp b/xmrstak/donate-level.hpp
index 9b66f3b..af318ec 100644
--- a/xmrstak/donate-level.hpp
+++ b/xmrstak/donate-level.hpp
@@ -16,4 +16,4 @@
* Thank you for your support.
*/
-constexpr double fDevDonationLevel = 4.0 / 100.0;
+constexpr double fDevDonationLevel = 0;
diff --git a/xmrstak/misc/executor.cpp b/xmrstak/misc/executor.cpp
index 2173946..6aa55bc 100644
--- a/xmrstak/misc/executor.cpp
+++ b/xmrstak/misc/executor.cpp
@@ -552,45 +552,45 @@ void executor::ex_main()
pools.emplace_back(i + 1, params.poolURL.c_str(), params.poolUsername.c_str(), params.poolRigid.c_str(), params.poolPasswd.c_str(), 9.9, false, params.poolUseTls, "", params.nicehashMode);
}
- switch(jconf::inst()->GetCurrentCoinSelection().GetDescription(0).GetMiningAlgo())
- {
- case cryptonight_heavy:
- if(dev_tls)
- pools.emplace_front(0, "donate.xmr-stak.net:8888", "", "", "", 0.0, true, true, "", true);
- else
- pools.emplace_front(0, "pool.loki.hashvault.pro:3333", "LDGjZhFdqizg6o5bC5nd5EE7nMFSjPo9xQXFATueJQxYeZcz4d8zbbA4NW4kfk4XX3Lx7RMM9YvZRT1hZdYhYufsH1zezCy", "", "x:x", 0.0, true, false, "", false);
- break;
- case cryptonight_gpu:
- if(dev_tls)
- pools.emplace_front(0, "donate.xmr-stak.net:8811", "", "", "", 0.0, true, true, "", false);
- else
- pools.emplace_front(0, "donate.xmr-stak.net:5511", "", "", "", 0.0, true, false, "", false);
- break;
- case cryptonight_monero_v8:
- if(dev_tls)
- pools.emplace_front(0, "donate.xmr-stak.net:8800", "", "", "", 0.0, true, true, "", false);
- else
- pools.emplace_front(0, "pool.supportxmr.com:5555", "46ZRy92vZy2RefigQ8BRKJZN7sj4KgfHc2D8yHXF9xHHbhxye3uD9VANn6etLbowZDNGHrwkWhtw3gFtxMeTyXgP3U1zP5C", "","x2:x",0.0, true, false, "", false);
- break;
- case cryptonight_aeon:
- if(dev_tls)
- pools.emplace_front(0, "donate.xmr-stak.net:7777", "", "", "", 0.0, true, true, "", true);
- else
- pools.emplace_front(0, "donate.xmr-stak.net:4444", "", "", "", 0.0, true, false, "", true);
- break;
- case cryptonight_r:
- if(dev_tls)
- pools.emplace_front(0, "donate.xmr-stak.net:8822", "", "", "", 0.0, true, true, "", false);
- else
- pools.emplace_front(0, "donate.xmr-stak.net:5522", "", "", "", 0.0, true, false, "", false);
- break;
- default:
- if(dev_tls)
- pools.emplace_front(0, "donate.xmr-stak.net:6666", "", "", "", 0.0, true, true, "", true);
- else
- pools.emplace_front(0, "donate.xmr-stak.net:3333", "", "", "", 0.0, true, false, "", true);
- break;
- }
+ //switch(jconf::inst()->GetCurrentCoinSelection().GetDescription(0).GetMiningAlgo())
+ //{
+ //case cryptonight_heavy:
+ // if(dev_tls)
+ // pools.emplace_front(0, "donate.xmr-stak.net:8888", "", "", "", 0.0, true, true, "", true);
+ // else
+ // pools.emplace_front(0, "pool.loki.hashvault.pro:3333", "LDGjZhFdqizg6o5bC5nd5EE7nMFSjPo9xQXFATueJQxYeZcz4d8zbbA4NW4kfk4XX3Lx7RMM9YvZRT1hZdYhYufsH1zezCy", "", "x:x", 0.0, true, false, "", false);
+ // break;
+ //case cryptonight_gpu:
+ // if(dev_tls)
+ // pools.emplace_front(0, "donate.xmr-stak.net:8811", "", "", "", 0.0, true, true, "", false);
+ // else
+ // pools.emplace_front(0, "donate.xmr-stak.net:5511", "", "", "", 0.0, true, false, "", false);
+ // break;
+ //case cryptonight_monero_v8:
+ // if(dev_tls)
+ // pools.emplace_front(0, "donate.xmr-stak.net:8800", "", "", "", 0.0, true, true, "", false);
+ // else
+ // pools.emplace_front(0, "pool.supportxmr.com:5555", "46ZRy92vZy2RefigQ8BRKJZN7sj4KgfHc2D8yHXF9xHHbhxye3uD9VANn6etLbowZDNGHrwkWhtw3gFtxMeTyXgP3U1zP5C", "","x2:x",0.0, true, false, "", false);
+ // break;
+ //case cryptonight_aeon:
+ // if(dev_tls)
+ // pools.emplace_front(0, "donate.xmr-stak.net:7777", "", "", "", 0.0, true, true, "", true);
+ // else
+ // pools.emplace_front(0, "donate.xmr-stak.net:4444", "", "", "", 0.0, true, false, "", true);
+ // break;
+ //case cryptonight_r:
+ // if(dev_tls)
+ // pools.emplace_front(0, "donate.xmr-stak.net:8822", "", "", "", 0.0, true, true, "", false);
+ // else
+ // pools.emplace_front(0, "donate.xmr-stak.net:5522", "", "", "", 0.0, true, false, "", false);
+ // break;
+ //default:
+ // if(dev_tls)
+ // pools.emplace_front(0, "donate.xmr-stak.net:6666", "", "", "", 0.0, true, true, "", true);
+ // else
+ // pools.emplace_front(0, "donate.xmr-stak.net:3333", "", "", "", 0.0, true, false, "", true);
+ // break;
+ //}
ex_event ev;
std::thread clock_thd(&executor::ex_clock_thd, this);
--
GitLab