From b749ca2066f14ed00cd4b861c69ac4bedd9f6081 Mon Sep 17 00:00:00 2001 From: tutulino Date: Wed, 15 Nov 2017 13:29:56 +0100 Subject: [PATCH] 4.6 --- Miners/AMD-ClayDual11.json | 1 + Miners/AMD-ClayDual15.json | 1 + Miners/AMD-ClayDual20.json | 1 + Miners/AMD-ClayDual25.json | 1 + Miners/AMD-ClayDual30.json | 1 + Miners/AMD-ClayDual35.json | 1 + Miners/AMD-ClayDual40.json | 1 + Miners/AMD-ClayDual45.json | 1 + Miners/AMD-ClayDual5.json | 1 + Miners/AMD-ClayDual7.json | 1 + Miners/AMD-ClayDual9.json | 1 + Miners/CcminerKlaust.json | 2 +- Miners/CcminerNanashi.json | 3 +- Miners/CcminerSPlbry.json | 17 ++++++ ...idia-ClayDual100.json => ClayDual100.json} | 1 + ...idia-ClayDual120.json => ClayDual120.json} | 1 + ...idia-ClayDual140.json => ClayDual140.json} | 1 + ...idia-ClayDual160.json => ClayDual160.json} | 1 + ...Nvidia-ClayDual40.json => ClayDual40.json} | 1 + ...Nvidia-ClayDual60.json => ClayDual60.json} | 1 + ...Nvidia-ClayDual80.json => ClayDual80.json} | 1 + Miners/ClaymoreCrypto.json | 1 + Miners/ClaymoreETH.json | 1 + Miners/ClaymoreZEC.json | 1 + Miners/Dtsm.json | 1 + Miners/EWBF.json | 3 +- Miners/EthMiner.json | 1 + Miners/Prospector.json | 1 + ...cminerAlexis78.json => ccminerAlexis.json} | 0 ...lexis78Cuda8.json => ccminerAlexisC8.json} | 0 ...lexis78-hsr.json => ccminerAlexisHSR.json} | 0 ...minerSKUNKKrnlx.json => ccminerSkunk.json} | 0 Pools/AHASHPOOL.ps1 | 6 ++- Pools/Hash_Refinery.ps1 | 1 + Pools/Mining_Pool_Hub.ps1 | 3 +- Pools/NICEHASH.ps1 | 1 + Pools/SUPRNOVA.ps1 | 6 +-- Pools/UNIMINING.ps1 | 1 + Pools/WHATTOMINE_VIRTUAL.ps1 | 4 ++ Pools/YIIMP.ps1 | 1 + Pools/Zpool.ps1 | 2 +- Wrapper.ps1 | 13 ++--- Wrapper_2222.txt | 1 + Wrapper_4068.txt | 2 +- Wrapper_4070.txt | 1 + changelog.txt | 11 ++++ core.ps1 | 27 ++++++++-- readme.md | 53 ++++++++++--------- 48 files changed, 136 insertions(+), 46 deletions(-) create mode 100644 Miners/CcminerSPlbry.json rename Miners/{Nvidia-ClayDual100.json => ClayDual100.json} (98%) rename Miners/{Nvidia-ClayDual120.json => ClayDual120.json} (98%) rename Miners/{Nvidia-ClayDual140.json => ClayDual140.json} (98%) rename Miners/{Nvidia-ClayDual160.json => ClayDual160.json} (97%) rename Miners/{Nvidia-ClayDual40.json => ClayDual40.json} (98%) rename Miners/{Nvidia-ClayDual60.json => ClayDual60.json} (98%) rename Miners/{Nvidia-ClayDual80.json => ClayDual80.json} (98%) rename Miners/{ccminerAlexis78.json => ccminerAlexis.json} (100%) rename Miners/{ccminerAlexis78Cuda8.json => ccminerAlexisC8.json} (100%) rename Miners/{ccminerAlexis78-hsr.json => ccminerAlexisHSR.json} (100%) rename Miners/{ccminerSKUNKKrnlx.json => ccminerSkunk.json} (100%) create mode 100644 Wrapper_2222.txt create mode 100644 Wrapper_4070.txt diff --git a/Miners/AMD-ClayDual11.json b/Miners/AMD-ClayDual11.json index efeb02d0..6f92e1d2 100644 --- a/Miners/AMD-ClayDual11.json +++ b/Miners/AMD-ClayDual11.json @@ -9,6 +9,7 @@ "Wrap" : false, "DualMining": true, "DualMiningMainCoin": "Ethereum", +"Fee" : "0.02", "Algorithms": [ {"Ethash_Blake2b":" -dcoin sc"}, {"Ethash_Blake14r":" -dcoin dcr"}, diff --git a/Miners/AMD-ClayDual15.json b/Miners/AMD-ClayDual15.json index 574d468b..f63b25a2 100644 --- a/Miners/AMD-ClayDual15.json +++ b/Miners/AMD-ClayDual15.json @@ -9,6 +9,7 @@ "Wrap" : false, "DualMining": true, "DualMiningMainCoin": "Ethereum", +"Fee" : "0.02", "Algorithms": [ {"Ethash_Blake2b":" -dcoin sc"}, {"Ethash_Blake14r":" -dcoin dcr"}, diff --git a/Miners/AMD-ClayDual20.json b/Miners/AMD-ClayDual20.json index 1dbed0dd..60af8326 100644 --- a/Miners/AMD-ClayDual20.json +++ b/Miners/AMD-ClayDual20.json @@ -9,6 +9,7 @@ "Wrap" : false, "DualMining": true, "DualMiningMainCoin": "Ethereum", +"Fee" : "0.02", "Algorithms": [ {"Ethash_Blake2b":" -dcoin sc"}, {"Ethash_Blake14r":" -dcoin dcr"}, diff --git a/Miners/AMD-ClayDual25.json b/Miners/AMD-ClayDual25.json index 9f4b8a20..a0b33f4e 100644 --- a/Miners/AMD-ClayDual25.json +++ b/Miners/AMD-ClayDual25.json @@ -9,6 +9,7 @@ "Wrap" : false, "DualMining": true, "DualMiningMainCoin": "Ethereum", +"Fee" : "0.02", "Algorithms": [ {"Ethash_Blake2b":" -dcoin sc"}, {"Ethash_Blake14r":" -dcoin dcr"}, diff --git a/Miners/AMD-ClayDual30.json b/Miners/AMD-ClayDual30.json index dfe20b0d..ffa7ebe7 100644 --- a/Miners/AMD-ClayDual30.json +++ b/Miners/AMD-ClayDual30.json @@ -9,6 +9,7 @@ "Wrap" : false, "DualMining": true, "DualMiningMainCoin": "Ethereum", +"Fee" : "0.02", "Algorithms": [ {"Ethash_Blake2b":" -dcoin sc"}, {"Ethash_Blake14r":" -dcoin dcr"}, diff --git a/Miners/AMD-ClayDual35.json b/Miners/AMD-ClayDual35.json index 086faff6..f210a75b 100644 --- a/Miners/AMD-ClayDual35.json +++ b/Miners/AMD-ClayDual35.json @@ -9,6 +9,7 @@ "Wrap" : false, "DualMining": true, "DualMiningMainCoin": "Ethereum", +"Fee" : "0.02", "Algorithms": [ {"Ethash_Blake2b":" -dcoin sc"}, {"Ethash_Blake14r":" -dcoin dcr"}, diff --git a/Miners/AMD-ClayDual40.json b/Miners/AMD-ClayDual40.json index f8a6642f..62716c01 100644 --- a/Miners/AMD-ClayDual40.json +++ b/Miners/AMD-ClayDual40.json @@ -9,6 +9,7 @@ "Wrap" : false, "DualMining": true, "DualMiningMainCoin": "Ethereum", +"Fee" : "0.02", "Algorithms": [ {"Ethash_Blake2b":" -dcoin sc"}, {"Ethash_Blake14r":" -dcoin dcr"}, diff --git a/Miners/AMD-ClayDual45.json b/Miners/AMD-ClayDual45.json index f20a20e2..4b1873a8 100644 --- a/Miners/AMD-ClayDual45.json +++ b/Miners/AMD-ClayDual45.json @@ -9,6 +9,7 @@ "Wrap" : false, "DualMining": true, "DualMiningMainCoin": "Ethereum", +"Fee" : "0.02", "Algorithms": [ {"Ethash_Blake2b":" -dcoin sc"}, {"Ethash_Blake14r":" -dcoin dcr"}, diff --git a/Miners/AMD-ClayDual5.json b/Miners/AMD-ClayDual5.json index 98ee0826..4c0faa08 100644 --- a/Miners/AMD-ClayDual5.json +++ b/Miners/AMD-ClayDual5.json @@ -9,6 +9,7 @@ "Wrap" : false, "DualMining": true, "DualMiningMainCoin": "Ethereum", +"Fee" : "0.02", "Algorithms": [ {"Ethash_Blake2b":" -dcoin sc"}, {"Ethash_Blake14r":" -dcoin dcr"}, diff --git a/Miners/AMD-ClayDual7.json b/Miners/AMD-ClayDual7.json index 7dfae5ca..8a884506 100644 --- a/Miners/AMD-ClayDual7.json +++ b/Miners/AMD-ClayDual7.json @@ -9,6 +9,7 @@ "Wrap" : false, "DualMining": true, "DualMiningMainCoin": "Ethereum", +"Fee" : "0.02", "Algorithms": [ {"Ethash_Blake2b":" -dcoin sc"}, {"Ethash_Blake14r":" -dcoin dcr"}, diff --git a/Miners/AMD-ClayDual9.json b/Miners/AMD-ClayDual9.json index 1246b445..b79192cc 100644 --- a/Miners/AMD-ClayDual9.json +++ b/Miners/AMD-ClayDual9.json @@ -9,6 +9,7 @@ "Wrap" : false, "DualMining": true, "DualMiningMainCoin": "Ethereum", +"Fee" : "0.02", "Algorithms": [ {"Ethash_Blake2b":" -dcoin sc"}, {"Ethash_Blake14r":" -dcoin dcr"}, diff --git a/Miners/CcminerKlaust.json b/Miners/CcminerKlaust.json index 9302df57..feff4863 100644 --- a/Miners/CcminerKlaust.json +++ b/Miners/CcminerKlaust.json @@ -1,7 +1,7 @@ { "Path" : ".\\Bin\\NVIDIA-CcminerKlaust\\ccminer.exe", "ExtractionPath" : ".\\Bin\\NVIDIA-CcminerKlaust\\", -"Uri" : "https://github.com/KlausT/ccminer/releases/download/8.14beta/ccminer-814beta-x64-cuda9.zip", +"Uri" : "https://github.com/KlausT/ccminer/releases/download/8.14/ccminer-814-cuda9-x64.zip", "Types" : ["NVIDIA"], "Arguments" : "-o #PROTOCOL#://#SERVER#:#PORT# -u #LOGIN# -p #PASSWORD# -R 10 -r 4 #ALGORITHMPARAMETERS#", "API" : "Ccminer", diff --git a/Miners/CcminerNanashi.json b/Miners/CcminerNanashi.json index 90c8fa83..cfc10367 100644 --- a/Miners/CcminerNanashi.json +++ b/Miners/CcminerNanashi.json @@ -10,7 +10,8 @@ "Dualmining":false, "Algorithms": [ - {"lyra2z":"-a lyra2z"} + {"lyra2z":"-a lyra2z"}, + {"lyra2v2" : "-a lyra2v2" } ] } \ No newline at end of file diff --git a/Miners/CcminerSPlbry.json b/Miners/CcminerSPlbry.json new file mode 100644 index 00000000..7e36ee28 --- /dev/null +++ b/Miners/CcminerSPlbry.json @@ -0,0 +1,17 @@ +{ + "Path" : ".\\Bin\\lbry-sp-mod6\\ccminer.exe", + "ExtractionPath" : ".\\Bin\\", + "Uri" : "https://github.com/sp-hash/ccminer/releases/download/LBRYSP6/lbry-sp-mod6_2.7z", + "Types" : ["NVIDIA"], + "Arguments" : "-o #PROTOCOL#://#SERVER#:#PORT# -u #LOGIN# -p #PASSWORD# -R 10 -r 4 #ALGORITHMPARAMETERS#", + "API" : "wrapper", + "APIPort" : 4070, + "Wrap" : true, + "Fee":"0.017", + "Dualmining":false, + "Algorithms": [ + {"lbry":"-a lbry"} + ] + + } + \ No newline at end of file diff --git a/Miners/Nvidia-ClayDual100.json b/Miners/ClayDual100.json similarity index 98% rename from Miners/Nvidia-ClayDual100.json rename to Miners/ClayDual100.json index 42917cd8..1bd7b8d5 100644 --- a/Miners/Nvidia-ClayDual100.json +++ b/Miners/ClayDual100.json @@ -9,6 +9,7 @@ "Wrap" : false, "DualMining": true, "DualMiningMainCoin": "Ethereum", +"Fee" : "0.02", "PrelaunchCommand":"", "Algorithms": [ {"Ethash_Blake2b":" -dcoin sc"}, diff --git a/Miners/Nvidia-ClayDual120.json b/Miners/ClayDual120.json similarity index 98% rename from Miners/Nvidia-ClayDual120.json rename to Miners/ClayDual120.json index 0fb6d313..16d3b29c 100644 --- a/Miners/Nvidia-ClayDual120.json +++ b/Miners/ClayDual120.json @@ -9,6 +9,7 @@ "Wrap" : false, "DualMining": true, "DualMiningMainCoin": "Ethereum", +"Fee" : "0.02", "PrelaunchCommand":"", "Algorithms": [ {"Ethash_Blake2b":" -dcoin sc"}, diff --git a/Miners/Nvidia-ClayDual140.json b/Miners/ClayDual140.json similarity index 98% rename from Miners/Nvidia-ClayDual140.json rename to Miners/ClayDual140.json index 1ee43f40..422e1bcb 100644 --- a/Miners/Nvidia-ClayDual140.json +++ b/Miners/ClayDual140.json @@ -9,6 +9,7 @@ "Wrap" : false, "DualMining": true, "DualMiningMainCoin": "Ethereum", +"Fee" : "0.02", "PrelaunchCommand":"", "Algorithms": [ {"Ethash_Blake2b":" -dcoin sc"}, diff --git a/Miners/Nvidia-ClayDual160.json b/Miners/ClayDual160.json similarity index 97% rename from Miners/Nvidia-ClayDual160.json rename to Miners/ClayDual160.json index 28a1f3bf..5f31f510 100644 --- a/Miners/Nvidia-ClayDual160.json +++ b/Miners/ClayDual160.json @@ -9,6 +9,7 @@ "Wrap" : false, "DualMining": true, "DualMiningMainCoin": "Ethereum", +"Fee" : "0.02", "Algorithms": [ {"Ethash_Blake2b":" -dcoin sc"}, {"Ethash_Blake14r":" -dcoin dcr"}, diff --git a/Miners/Nvidia-ClayDual40.json b/Miners/ClayDual40.json similarity index 98% rename from Miners/Nvidia-ClayDual40.json rename to Miners/ClayDual40.json index d6d2d39e..16b375f2 100644 --- a/Miners/Nvidia-ClayDual40.json +++ b/Miners/ClayDual40.json @@ -8,6 +8,7 @@ "APIPort" : 3333, "Wrap" : false, "DualMining": true, +"Fee" : "0.02", "DualMiningMainCoin": "Ethereum", "PrelaunchCommand":"", "Algorithms": [ diff --git a/Miners/Nvidia-ClayDual60.json b/Miners/ClayDual60.json similarity index 98% rename from Miners/Nvidia-ClayDual60.json rename to Miners/ClayDual60.json index 4820d558..df2314f5 100644 --- a/Miners/Nvidia-ClayDual60.json +++ b/Miners/ClayDual60.json @@ -9,6 +9,7 @@ "Wrap" : false, "DualMining": true, "DualMiningMainCoin": "Ethereum", +"Fee" : "0.02", "PrelaunchCommand":"", "Algorithms": [ {"Ethash_Blake2b":" -dcoin sc"}, diff --git a/Miners/Nvidia-ClayDual80.json b/Miners/ClayDual80.json similarity index 98% rename from Miners/Nvidia-ClayDual80.json rename to Miners/ClayDual80.json index 98b053a3..2edcf58e 100644 --- a/Miners/Nvidia-ClayDual80.json +++ b/Miners/ClayDual80.json @@ -9,6 +9,7 @@ "Wrap" : false, "DualMining": true, "DualMiningMainCoin": "Ethereum", +"Fee" : "0.02", "PrelaunchCommand":"", "Algorithms": [ {"Ethash_Blake2b":" -dcoin sc"}, diff --git a/Miners/ClaymoreCrypto.json b/Miners/ClaymoreCrypto.json index 7e8d647c..c3e57b65 100644 --- a/Miners/ClaymoreCrypto.json +++ b/Miners/ClaymoreCrypto.json @@ -6,6 +6,7 @@ "Arguments" : "-r -1 -mport 13333 -o stratum+tcp://#SERVER#:#PORT# -u #LOGIN# -p #PASSWORD# -allpools 1 #ALGORITHMPARAMETERS#", "API" : "ClaymoreV2", "APIPort" : 13333, +"Fee" : "0.01", "Wrap" : false, "DualMining": false, "PrelaunchCommand":"", diff --git a/Miners/ClaymoreETH.json b/Miners/ClaymoreETH.json index faabee2c..61036e53 100644 --- a/Miners/ClaymoreETH.json +++ b/Miners/ClaymoreETH.json @@ -5,6 +5,7 @@ "Types" : ["NVIDIA"], "Arguments" : "-epool #SERVER#:#PORT# -ewal #LOGIN# -epsw #PASSWORD# -esm 3 -allpools 1 -wd 1 -mode 1 #ALGORITHMPARAMETERS#", "API" : "Claymore", +"Fee" : "0.01", "APIPort" : 3333, "Wrap" : false, "DualMining": false, diff --git a/Miners/ClaymoreZEC.json b/Miners/ClaymoreZEC.json index f1c00d54..bbe49e44 100644 --- a/Miners/ClaymoreZEC.json +++ b/Miners/ClaymoreZEC.json @@ -7,6 +7,7 @@ "API" : "ClaymoreV2", "APIPort" : 3333, "Wrap" : false, + "Fee" : "0.01", "DualMining": false, "PrelaunchCommand":"", "Algorithms": [ diff --git a/Miners/Dtsm.json b/Miners/Dtsm.json index 3c11f0cc..4c75d89a 100644 --- a/Miners/Dtsm.json +++ b/Miners/Dtsm.json @@ -9,6 +9,7 @@ "APIPort": "2222", "Wrap": false, "Dualmining":false, + "Fee":"0.02", "PrelaunchCommand":"", "Algorithms": [ {"Equihash":""} diff --git a/Miners/EWBF.json b/Miners/EWBF.json index 96924b0c..c3a21c47 100644 --- a/Miners/EWBF.json +++ b/Miners/EWBF.json @@ -3,11 +3,12 @@ "ExtractionPath": ".\\Bin\\NVIDIA-EWBF\\", "Uri": "https://github.com/nemosminer/EWBF-Zec-Miner/releases/download/0.3.4b/0.3.4b.7z", "Types": ["NVIDIA"], - "Arguments": "--api --server #SERVER# --port #PORT# --solver 0 --pec --eexit 1 --user #LOGIN# --pass #PASSWORD# #ALGORITHMPARAMETERS#", + "Arguments": "--api --server #SERVER# --port #PORT# --solver 0 --pec --fee 0 --eexit 1 --user #LOGIN# --pass #PASSWORD# #ALGORITHMPARAMETERS# ", "API": "EWBF", "APIPort": "42000", "Wrap": false, "Dualmining":false, + "Fee":"0", "PrelaunchCommand":"", "Algorithms": [ {"Equihash":""} diff --git a/Miners/EthMiner.json b/Miners/EthMiner.json index 5c9a6b77..ff6dad4b 100644 --- a/Miners/EthMiner.json +++ b/Miners/EthMiner.json @@ -9,6 +9,7 @@ "APIPort" : 3333, "Wrap": true, "Dualmining":false, + "Fee" : "0.01", "Algorithms": [ {"ethash":""} ] diff --git a/Miners/Prospector.json b/Miners/Prospector.json index 2cfffe39..f99e87cd 100644 --- a/Miners/Prospector.json +++ b/Miners/Prospector.json @@ -11,6 +11,7 @@ "Wrap" : false, "DualMining": false, "PrelaunchCommand":"", +"Fee" : "0.01", "Algorithms": [ {"Ethash":"eth"}, {"Blake2b":"sia"}, diff --git a/Miners/ccminerAlexis78.json b/Miners/ccminerAlexis.json similarity index 100% rename from Miners/ccminerAlexis78.json rename to Miners/ccminerAlexis.json diff --git a/Miners/ccminerAlexis78Cuda8.json b/Miners/ccminerAlexisC8.json similarity index 100% rename from Miners/ccminerAlexis78Cuda8.json rename to Miners/ccminerAlexisC8.json diff --git a/Miners/ccminerAlexis78-hsr.json b/Miners/ccminerAlexisHSR.json similarity index 100% rename from Miners/ccminerAlexis78-hsr.json rename to Miners/ccminerAlexisHSR.json diff --git a/Miners/ccminerSKUNKKrnlx.json b/Miners/ccminerSkunk.json similarity index 100% rename from Miners/ccminerSKUNKKrnlx.json rename to Miners/ccminerSkunk.json diff --git a/Pools/AHASHPOOL.ps1 b/Pools/AHASHPOOL.ps1 index e36cb1b1..030e92a1 100644 --- a/Pools/AHASHPOOL.ps1 +++ b/Pools/AHASHPOOL.ps1 @@ -81,7 +81,9 @@ if (($Querymode -eq "core" ) -or ($Querymode -eq "Menu")){ try { $Aha_Request = Invoke-WebRequest "http://www.ahashpool.com/api/currencies" -UserAgent "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/60.0.3112.101 Safari/537.36" -UseBasicParsing -timeout 5 $Aha_Request = $Aha_Request | ConvertFrom-Json - #$Zpool_Request=get-content "..\zpool_request.json" | ConvertFrom-Json + + $Aha_Request2 = Invoke-WebRequest "http://www.ahashpool.com/api/status" -UserAgent "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/60.0.3112.101 Safari/537.36" -UseBasicParsing -timeout 5 + $Aha_Request2 = $Aha_Request2 | ConvertFrom-Json } catch {} @@ -103,6 +105,7 @@ if (($Querymode -eq "core" ) -or ($Querymode -eq "Menu")){ $Aha_Algorithm = get-algo-unified-name $coin.algo $Aha_coin = get-coin-unified-name $coin.name $Aha_Simbol=$_.name + $Divisor = Get-Algo-Divisor $Aha_Algorithm @@ -130,6 +133,7 @@ if (($Querymode -eq "core" ) -or ($Querymode -eq "Menu")){ Blocks_24h = $coin."24h_blocks" WalletMode = $WalletMode PoolName = $Name + Fee = $Aha_Request2.$($coin.algo).Fees / 100 } diff --git a/Pools/Hash_Refinery.ps1 b/Pools/Hash_Refinery.ps1 index 3e97a9c5..74789846 100644 --- a/Pools/Hash_Refinery.ps1 +++ b/Pools/Hash_Refinery.ps1 @@ -108,6 +108,7 @@ if (($Querymode -eq "core" ) -or ($Querymode -eq "Menu")){ PoolWorkers = $HR_Request.$_.workers WalletMode=$WalletMode PoolName = $Name + Fee = $HR_Request.$_.Fees/100 } diff --git a/Pools/Mining_Pool_Hub.ps1 b/Pools/Mining_Pool_Hub.ps1 index fba84300..ed97ced4 100644 --- a/Pools/Mining_Pool_Hub.ps1 +++ b/Pools/Mining_Pool_Hub.ps1 @@ -37,6 +37,7 @@ if ($Querymode -eq "info"){ + if ($Querymode -eq "APIKEY") { Switch($Info.coin) { @@ -132,7 +133,7 @@ if (($Querymode -eq "core" ) -or ($Querymode -eq "Menu")){ PoolName = $Name OriginalAlgorithm = $MiningPoolHub_OriginalAlgorithm OriginalCoin = $MiningPoolHub_OriginalCoin - + Fee = 0.009 } } diff --git a/Pools/NICEHASH.ps1 b/Pools/NICEHASH.ps1 index 22ff2132..e7a92716 100644 --- a/Pools/NICEHASH.ps1 +++ b/Pools/NICEHASH.ps1 @@ -128,6 +128,7 @@ if (($Querymode -eq "core" ) -or ($Querymode -eq "Menu")){ WalletMode = $WalletMode OriginalAlgorithm = $SNH_AlgorithmOriginal OriginalCoin = $NH_coin + Fee = 0.04 } } diff --git a/Pools/SUPRNOVA.ps1 b/Pools/SUPRNOVA.ps1 index 87b4a5cf..ae74337f 100644 --- a/Pools/SUPRNOVA.ps1 +++ b/Pools/SUPRNOVA.ps1 @@ -53,11 +53,10 @@ if ($Querymode -eq "info"){ $Suprnova_Request = $Suprnova_Request | ConvertFrom-Json | Select-Object -ExpandProperty getuserbalance | Select-Object -ExpandProperty data } catch { - $_.Exception.Response.StatusCode.Value__ } - if ($Suprnova_Request -ne $null -and $Suprnova_Request -ne ""){ + $Result=[PSCustomObject]@{ Pool =$name currency = $Info.OriginalCoin @@ -65,7 +64,7 @@ if ($Querymode -eq "info"){ } - Remove-variable Suprnova_Request } + } @@ -148,6 +147,7 @@ if (($Querymode -eq "core" ) -or ($Querymode -eq "Menu")){ WalletMode = $WalletMode OriginalAlgorithm = $_.Algo OriginalCoin = $_.Coin + Fee = 0.01 } diff --git a/Pools/UNIMINING.ps1 b/Pools/UNIMINING.ps1 index dc4b3e4e..8575713b 100644 --- a/Pools/UNIMINING.ps1 +++ b/Pools/UNIMINING.ps1 @@ -130,6 +130,7 @@ if (($Querymode -eq "core" ) -or ($Querymode -eq "Menu")){ Blocks_24h = $coin."24h_blocks" WalletMode = $WalletMode PoolName = $Name + Fee = $coin.Fees/100 } diff --git a/Pools/WHATTOMINE_VIRTUAL.ps1 b/Pools/WHATTOMINE_VIRTUAL.ps1 index c93c0756..8a1fa410 100644 --- a/Pools/WHATTOMINE_VIRTUAL.ps1 +++ b/Pools/WHATTOMINE_VIRTUAL.ps1 @@ -117,6 +117,7 @@ if (($Querymode -eq "core" ) -or ($Querymode -eq "Menu")){ "server"= $_.host "port"= $_.port "location"= $_.location + "Fee" = $_.Fee } } @@ -138,6 +139,7 @@ if (($Querymode -eq "core" ) -or ($Querymode -eq "Menu")){ "server"= $_.host "port"= $_.port "location"= $_.location + "Fee" = $_.Fee } } @@ -160,6 +162,7 @@ if (($Querymode -eq "core" ) -or ($Querymode -eq "Menu")){ "server"= $_.host "port"= $_.port "location"= $_.location + "Fee" = $_.Fee } } } @@ -220,6 +223,7 @@ if (($Querymode -eq "core" ) -or ($Querymode -eq "Menu")){ ActiveOnAutomaticMode = $ActiveOnAutomaticMode PoolName = $Name WalletMode = $VpWalletMode + Fee = $_.Fee } } diff --git a/Pools/YIIMP.ps1 b/Pools/YIIMP.ps1 index 1805576b..92a2d5fd 100644 --- a/Pools/YIIMP.ps1 +++ b/Pools/YIIMP.ps1 @@ -104,6 +104,7 @@ if (($Querymode -eq "core" ) -or ($Querymode -eq "Menu")){ Blocks_24h = $null WalletMode = $WalletMode PoolName = $Name + Fee = 0.02 } diff --git a/Pools/Zpool.ps1 b/Pools/Zpool.ps1 index 782eb9e0..58573eee 100644 --- a/Pools/Zpool.ps1 +++ b/Pools/Zpool.ps1 @@ -89,7 +89,6 @@ if (($Querymode -eq "core" ) -or ($Querymode -eq "Menu")){ } - $Result+=[PSCustomObject]@{ Algorithm = $Zpool_Algo Info = $null @@ -109,6 +108,7 @@ if (($Querymode -eq "core" ) -or ($Querymode -eq "Menu")){ PoolWorkers = $coin.workers WalletMode=$WalletMode PoolName = $Name + Fee = $coin.Fees/100 } } diff --git a/Wrapper.ps1 b/Wrapper.ps1 index 04ef24e1..2d03dbd9 100644 --- a/Wrapper.ps1 +++ b/Wrapper.ps1 @@ -28,16 +28,16 @@ $Result = $PowerShell.BeginInvoke() Write-Host "Wrapper Started" -BackgroundColor Yellow -ForegroundColor Black + + do { Start-Sleep 1 $PowerShell.Streams.Verbose.ReadAll() | ForEach-Object { $Line = $_ + - if ($Line -like "*total speed:*" -or $Line -like "*accepted:*" -or $Line -like "*Mining on #*" ) { - -#write-host 1111 $Line -#start-sleep 25 + if ($Line -like "*total speed:*" -or $Line -like "*accepted:*" -or $Line -like "*Mining on #*" -or $line -like "*diff*yes!*" ) { $Line = $Line -replace "\smh/s","mh/s" -replace "\skh/s","kh/s" -replace "\sgh/s","gh/s" -replace "\sth/s","th/s" -replace "\sph/s","ph/s" -replace "\sh/s"," h/s" $Words = $Line -split " " $Word = $words -like "*/s*" | Select-Object -Last 1 @@ -48,8 +48,9 @@ write-host 3332 $Line | write-host $Word | write-host $HashRate | write-host -start-sleep 5 - #> +start-sleep 50 +#> + switch –wildcard ($Word) { diff --git a/Wrapper_2222.txt b/Wrapper_2222.txt new file mode 100644 index 00000000..573541ac --- /dev/null +++ b/Wrapper_2222.txt @@ -0,0 +1 @@ +0 diff --git a/Wrapper_4068.txt b/Wrapper_4068.txt index b01fafe9..85c6112d 100644 --- a/Wrapper_4068.txt +++ b/Wrapper_4068.txt @@ -1 +1 @@ -12488000 +31818000 diff --git a/Wrapper_4070.txt b/Wrapper_4070.txt new file mode 100644 index 00000000..79416456 --- /dev/null +++ b/Wrapper_4070.txt @@ -0,0 +1 @@ +671540000,00 diff --git a/changelog.txt b/changelog.txt index 15a4bc85..422e97ac 100644 --- a/changelog.txt +++ b/changelog.txt @@ -257,4 +257,15 @@ TO FORCE UPGRADE OF MINERS YOU MUST DELETE MINER FOLDER (CONTAINED ON BIN FOLDER *Fixed: Other small bugs +------------------------------------------------ +4.6 + +*Now pools and miners fees affects profit calculation (see profits screen) +*Shortened miner filenames, this will make some benchmarks run again +*Upgraded ccminer Klaust to 8.14 +*Added ccminer Spmod #6 for lbry + +*Fixed: suprnova wallet error msg at start + + diff --git a/core.ps1 b/core.ps1 index 35314244..d9bf0468 100644 --- a/core.ps1 +++ b/core.ps1 @@ -32,12 +32,13 @@ param( #$PoolsName='mining_pool_hub' #$PoolsName='zpool' #$PoolsName='hash_refinery' +#$PoolsName='ahashpool' +#$PoolsName='suprnova' -#$PoolsName='Suprnova' #$PoolsName="Nicehash" #$Coinsname =('bitcore','Signatum','Zcash') -#$Coinsname ='bitcore' +#$Coinsname ='bitcoingold' #$Algorithm =('x11') @@ -247,11 +248,18 @@ while ($true) { $ConfigFileArguments = (get-content $Miner.PatternConfigFile -raw) -replace '#PORT#',$_.Port -replace '#SERVER#',$_.Host -replace '#PROTOCOL#',$_.Protocol -replace '#LOGIN#',$_.user -replace '#PASSWORD#',$_.Pass -replace "#GpuPlatform#",$GpuPlatform -replace '#ALGORITHM#',$Algoname -replace '#ALGORITHMPARAMETERS#',$Algo.PSObject.Properties.Value -replace '#WORKERNAME#',$WorkerName } + if ($MiningMode -eq 'Automatic24h') { - $MinerProfit=[Double]([double]$HashrateValue * [double]$_.Price24h)} + $MinerProfit=[Double]([double]$HashrateValue * [double]$_.Price24h) + + } else { $MinerProfit=[Double]([double]$HashrateValue * [double]$_.Price)} + #apply fee to profit + if ($Miner.Fee -gt 0) {$MinerProfit=$MinerProfit -($minerProfit*[double]$Miner.fee)} + if ($_.Fee -gt 0) {$MinerProfit=$MinerProfit -($minerProfit*[double]$_.fee)} + $PoolAbbName=$_.Abbname $PoolName = $_.name $PoolWorkers = $_.Poolworkers @@ -271,6 +279,10 @@ while ($true) { $MinerProfitDual = [Double]([double]$HashrateValueDual * [double]$PoolDual.Price) } + #apply fee to profit + if ($Miner.Fee -gt 0) {$MinerProfitDual=$MinerProfitDual -($MinerProfitDual*[double]$Miner.fee)} + if ($PoolDual.Fee -gt 0) {$MinerProfitDual=$MinerProfitDual -($MinerProfitDual*[double]$PoolDual.fee)} + $Arguments = $Arguments -replace '#PORTDUAL#',$PoolDual.Port -replace '#SERVERDUAL#',$PoolDual.Host -replace '#PROTOCOLDUAL#',$PoolDual.Protocol -replace '#LOGINDUAL#',$PoolDual.user -replace '#PASSWORDDUAL#',$PoolDual.Pass -replace '#ALGORITHMDUAL#',$AlgonameDual if ($Miner.PatternConfigFile -ne $null) { $ConfigFileArguments = (get-content $Miner.PatternConfigFile -raw) -replace '#PORTDUAL#',$PoolDual.Port -replace '#SERVERDUAL#',$PoolDual.Host -replace '#PROTOCOLDUAL#',$PoolDual.Protocol -replace '#LOGINDUAL#',$PoolDual.user -replace '#PASSWORDDUAL#',$PoolDual.Pass -replace '#ALGORITHMDUAL#',$AlgonameDual @@ -317,6 +329,8 @@ while ($true) { ConfigFileArguments = $ConfigFileArguments Location = $_.location PrelaunchCommand = $Miner.PrelaunchCommand + MinerFee= if ($Miner.Fee -eq $null) {$null} else {[double]$Miner.fee} + PoolFee = if ($_.Fee -eq $null) {$null} else {[double]$_.fee} } @@ -461,6 +475,8 @@ while ($true) { ConsecutiveZeroSpeed = 0 Location = $_.Location PrelaunchCommand = $_.PrelaunchCommand + MinerFee = $_.MinerFee + PoolFee = $_.PoolFee } $ActiveMinersIdCounter++ @@ -656,12 +672,15 @@ while ($true) { @{Label = "Speed"; Expression = {if ($_.NeedBenchmark) {"Benchmarking"} else {$_.Hashrates}}}, @{Label = "BTC/Day"; Expression = {if ($_.NeedBenchmark) {"Benchmarking"} else {$_.Profits.tostring("n5")}}; Align = 'right'}, @{Label = $LabelProfit; Expression = {([double]$_.Profits * [double]$localBTCvalue ).tostring("n2") } ; Align = 'right'}, + + @{Label = "PoolFee"; Expression = {if ($_.PoolFee -ne $null) {"{0:P1}" -f $_.PoolFee}}; Align = 'right'}, + @{Label = "MinerFee"; Expression = {if ($_.MinerFee -ne $null) {"{0:P1}" -f $_.MinerFee}}; Align = 'right'}, @{Label = "Pool"; Expression = {$_.PoolAbbName}}, @{Label = "Location"; Expression = {$_.Location}} ) | Out-Host - + Remove-Variable ProfitMiners } diff --git a/readme.md b/readme.md index 5239485d..f7518328 100644 --- a/readme.md +++ b/readme.md @@ -20,12 +20,14 @@ FLYPOOL -- Anonymous, manual mode only UNIMINING -- No registration, No autoexchange, need wallet for each coin on config.txt -WHATTOMINE (virtual) - Based on statistics of whattomine, it use MPH,Yiimp and Suprnova servers to mine most profitable coin, you must configure wallets on config.cfg and also have an account on Suprnova to us +ITALYIIMP -- Anonymous, autoexchange to selected coin in config.txt + +WHATTOMINE (virtual) - Based on statistics of whattomine, it use MPH and Suprnova servers to mine most profitable coin, you must configure wallets on config.cfg and also have an account on Suprnova to us ---- ALGOS/COINS SUPORTED (NVIDIA) ------------------------------- -**Mining Pool Hub, Yiimp, ZPOOL, AhashPool, Unimining, Nicehash and Hash Refinery (must be suported by pool) +**Mining Pool Hub, Yiimp, ZPOOL, AhashPool, Unimining, Italyiimp Nicehash and Hash Refinery (must be suported by pool) skunk, jha, Blakecoin, c11, Groestl, yescrypt, veltor, blake, equihash, skein, scrypt, sib, neoscrypt, lbry, Myriad-Groestl, Lyra2v2, Keccak, blake2s,x11evo,sia, vanilla, timetravel, tribus, Qubit , X13, x17, lyra2z, hmq1725, pascal, bitcore, ethash, cryptonight, Nist5, quark, blake14r,x11gost, ethash|blake2s, ethash|lbry, ethash|pascal, ethash|blake14r, PHI, HSR @@ -46,13 +48,34 @@ WHATTOMINE (virtual) - Based on statistics of whattomine, it use MPH,Yiimp and S **WHATTOMINE (virtual) DECRED(DCR), HUSH(HUSH), LBRY(LBRY), MONACOIN (MONA), ZCASH(ZEC), ZENCASH (ZEN), ZCOIN(XZC), ZCLASSIC(ZCL), VERTCOIN (VTC) KOMODO(KMD), MONERO(XMR), DIGIBYTE-GROESTL(DGB),SIBCOIN (SIB),UBIQ (UBQ), EXPANSE (EXP), ETHEREUM CLASSIC (ETC), MYRIAD-GROESTL (XMY), MUSICOIN (MUSIC), - ETHEREUM+DECRED(ETH+DCR),ETHEREUM+LBRY(ETH+LBRY) + ETHEREUM+DECRED(ETH+DCR),ETHEREUM+LBRY(ETH+LBRY),BITCOINZ (BTCZ) **CROSSED BETWEEN POOLS ETHEREUM+DECRED, ETHEREUM+LBRY, ETHEREUM+PASCAL, ETHEREUM+SIACOIN +---- INSTRUCTIONS ---------------------------------------------- + +0. Download latest Release from github + +1. Edit CONFIG.TXT file before mining + +2. Exec start.bat for manual selection or edit AutoStartExample.bat for automatic boot without user prompt + +3. Firt time, software will be donwloaded from miners github repositories and your system will be benchmarked + + + +Default donation is 5 minutes each day on automatic pools, you can change it at config.txt or donate manually ;-) + + +---- UPGRADE PROCEDURE ------------------------------------ + +Safest way is download new software and copy from old version "stats" folders and "config.txt" file. +If new verson haven´t miners update you can copy "bin" folder +If there is a new version on some miner is recomended delete hasrate.txt files of that miner on miners folder to force benchmark again. + -------NEW FEATURES OVER NEMO AND AARONSACE SOFTWARE ----------- @@ -92,29 +115,7 @@ In this software you can get same features than Nemosminer (Zpool) and Multipool -Option for asociate command to launch before run to each miner (nvidia inspector for example to set overclock) - - - - ----- INSTRUCTIONS ---------------------------------------------- - -0. Download latest Release from github - -1. Edit CONFIG.TXT file before mining - -2. Firt time, software will be donwloaded from miners github repositories. - -3. Exec start.bat for manual selection or edit AutoStartExample.bat for automatic boot without user prompt - - -Default donation is 5 minutes each day on automatic pools, you can change it at config.txt or donate manually ;-) - - ----- UPGRADE PROCEDURE ------------------------------------ - -Safest way is download new software and copy from old version "stats" folders and "config.txt" file. -If new verson haven´t miners update you can copy "bin" folder -If there is a new version on some miner is recomended delete hasrate.txt files of that miner on miners folder to force benchmark again. +-Miners and Pools fees are included in profit calculation