up

tutulino · Apr 20, 2018 · ddd70a6 · ddd70a6
1 parent 09826bf
commit ddd70a6
Show file tree

Hide file tree

Showing 13 changed files with 75 additions and 30 deletions.
diff --git a/Config.txt b/Config.txt
@@ -162,9 +162,9 @@
 --Algorithms, define what algorithms can be mined for MM, for an Algo can be mined must exists: 1. A pool, 2. A miner, 3. This config.
 --If used, algorithm parameter from core.ps1 override this config.
 
-@@ALGORITHMS_NVIDIA=bitcore,blakecoin,c11,cryptonight,Equihash,Ethash,,Ethash_Blake2b,Ethash_Blake14r,Ethash_Keccak,Ethash_blake2s,Ethash_pascal,Ethash_Lbry,groestl,hsr,jha,Keccak,keccakc,lbry,lyra2v2,lyra2z,Myriad-Groestl,Neoscrypt,nist5,pascal,phi,polytimos,sib,skein,skunk,timetravel,tribus,veltor,whirpool,x11evo,x11gost,x14,x16r,x17,xevan,yescrypt,X12,x16s
-@@ALGORITHMS_AMD=bitcore,blake,cryptonight,darkcoin-mod,equihash,Ethash,Ethash_Blake2b,Ethash_Blake14r,Ethash_Keccak,Ethash_blake2s,Ethash_pascal,Ethash_Lbry,Groestl,hsr,Keccak,lyra2v2,lyra2z,Myriad-groestl,neoscrypt,Pascal,phi,skein,tribus,vanilla,veltor,x11gost,xevan,yescrypt
-@@ALGORITHMS_CPU=bitcore,blakecoin,cryptonight,hmq1725,jha,keccak,keccakc,lyra2v2,lyra2z,m7m,neoscrypt,nist5,phi,polytimos,timetravel,tribus,veltor
+@@ALGORITHMS_NVIDIA=bitcore,blakecoin,c11,cryptonight,Equihash,Ethash,,Ethash_Blake2b,Ethash_Blake14r,Ethash_Keccak,Ethash_blake2s,Ethash_pascal,Ethash_Lbry,groestl,hsr,jha,Keccak,keccakc,lbry,lyra2v2,lyra2z,Myriad-Groestl,Neoscrypt,nist5,pascal,phi,polytimos,sib,skein,skunk,timetravel,tribus,veltor,whirpool,x11evo,x11gost,x14,x16r,x17,xevan,yescrypt,X12,x16s,cryptonightv7
+@@ALGORITHMS_AMD=bitcore,blake,cryptonight,darkcoin-mod,equihash,Ethash,Ethash_Blake2b,Ethash_Blake14r,Ethash_Keccak,Ethash_blake2s,Ethash_pascal,Ethash_Lbry,Groestl,hsr,Keccak,lyra2v2,lyra2z,Myriad-groestl,neoscrypt,Pascal,phi,skein,tribus,vanilla,veltor,x11gost,xevan,yescrypt,x16r,x16s,cryptonightv7
+@@ALGORITHMS_CPU=bitcore,blakecoin,cryptonight,hmq1725,jha,keccak,keccakc,lyra2v2,lyra2z,m7m,neoscrypt,nist5,phi,polytimos,timetravel,tribus,veltor,cryptonightv7,x16s
 
 
 --[optional]Port for megaminer api (http:\\localhost:port), set zero to disable api.

diff --git a/Include.ps1 b/Include.ps1
@@ -263,9 +263,9 @@ function get_gpu_information ($Types) {
                                             utilization_memory = if ($SMIresultSplit[2] -like "*Supported*") {$null} else {[int]($SMIresultSplit[2] -replace '%','')} 
                                             temperature_gpu    = if ($SMIresultSplit[3] -like "*Supported*") {$null} else {[int]($SMIresultSplit[3] -replace '%','')} 
                                             power_draw         = if ($SMIresultSplit[4] -like "*Supported*") {$null} else {[int]($SMIresultSplit[4] -replace 'W','')} 
-                                            power_limit        = if ($SMIresultSplit[5] -like "*Supported*") {$null} else {[int]($SMIresultSplit[5] -replace 'W','')} 
+                                            power_limit        = if ($SMIresultSplit[5] -like "*Supported*" -or $SMIresultSplit[5] -like  "*error*") {$null} else {[int]($SMIresultSplit[5] -replace 'W','')} 
                                             pstate             = $SMIresultSplit[7]
-                                            FanSpeed           = if ($SMIresultSplit[6] -like "*Supported*") {$null} else {[int]($SMIresultSplit[6] -replace '%','')} 
+                                            FanSpeed           = if ($SMIresultSplit[6] -like "*Supported*" -or $SMIresultSplit[6] -like  "*error*") {$null} else {[int]($SMIresultSplit[6] -replace '%','')} 
                                             ClockGpu           = if ($SMIresultSplit[8] -like "*Supported*") {$null} else {[int]($SMIresultSplit[8] -replace 'Mhz','')}
                                             ClockMem           = if ($SMIresultSplit[9] -like "*Supported*") {$null} else {[int]($SMIresultSplit[9] -replace 'Mhz','')}
                                             Power_MaxLimit     = if ($SMIresultSplit[10] -like "*Supported*") {$null} else { [int]($SMIresultSplit[10] -replace 'W','')}

diff --git a/Miners/A-ClaymoreCrypto.json b/Miners/A-ClaymoreCrypto.json
@@ -1,7 +1,7 @@
 {
-"Path" : ".\\Bin\\Claymore CryptoNote AMD GPU Miner v11.0 - POOL\\NsGpuCNMiner.exe",
+"Path" : ".\\Bin\\Claymore CryptoNote AMD GPU Miner v11.3 - POOL\\NsGpuCNMiner.exe",
 "ExtractionPath" : ".\\Bin\\",
-"Uri" : "https://github.com/tutulino/Software/releases/download/0/Claymore.CryptoNote.AMD.GPU.Miner.v11.0.-.POOL.-.Catalyst.15.12-17.x.zip",
+"Uri" : "https://github.com/tutulino/Software/releases/download/0/Claymore.CryptoNote.AMD.GPU.Miner.v11.3.-.POOL.-.Catalyst.15.12-18.x.zip",
 "Types" : ["AMD"],
 "Arguments" : "-xpool  #PROTOCOL#://#SERVER#:#PORT# -xwal #LOGIN# -xpsw #PASSWORD# -allpools 1 -dmem 1 -di #DEVICESCLAYMODE# -mport #APIPORT# #ALGORITHMPARAMETERS#",
 "API" : "ClaymoreV2",
@@ -10,7 +10,9 @@
 "DualMining": false,
 "PrelaunchCommand":"",
 "Algorithms": [
-                {"Cryptonight":""}
+          {"Cryptonight":""},
+          {"cryptonightv7":"-pow7 1"}
+
               ]
 
 }

diff --git a/Miners/C-JayAvx2.json b/Miners/C-JayAvx2.json
@@ -1,7 +1,7 @@
 {
-"Path" : ".\\Bin\\CPU-Jaydee\\cpuminer-opt-3.8.2.1-windows\\cpuminer-avx2.exe",
+"Path" : ".\\Bin\\CPU-Jaydee\\cpuminer-opt-3.8.7.2-windows\\cpuminer-avx2.exe",
 "ExtractionPath" : ".\\Bin\\CPU-Jaydee\\",
-"Uri" : "https://github.com/JayDDee/cpuminer-opt/files/1734002/cpuminer-opt-3.8.2.1-windows.zip",
+"Uri" : "https://github.com/JayDDee/cpuminer-opt/files/1899884/cpuminer-opt-3.8.7.2-windows.zip",
 "Types" : ["CPU"],
 "Arguments" : "-o #PROTOCOL#://#SERVER#:#PORT# -u #LOGIN# -p #PASSWORD# -R 10 -r 4 -b #APIPORT# #ALGORITHMPARAMETERS#",
 "API" : "ccminer",
@@ -12,7 +12,6 @@
               {"cryptonight":"-a cryptonight"},
               {"lyra2z":"-a lyra2z"},
               {"hmq1725":"-a hmq1725"},
-              {"nist5":"-a nist5"},
               {"jha":"-a jha"},
               {"bitcore":"-a bitcore"},
               {"m7m":"-a m7m"},
@@ -23,7 +22,8 @@
               {"polytimos":"-a polytimos"},    
               {"blakecoin":"-a blakecoin"},  
               {"neoscrypt":"-a neoscrypt"},
-              {"tribus":"-a tribus"}
+              {"tribus":"-a tribus"},
+              {"x16s":"-a x16s"}
               ]
 
 }

diff --git a/Miners/C-JaySse2.json b/Miners/C-JaySse2.json
@@ -1,7 +1,7 @@
 {
-"Path" : ".\\Bin\\CPU-Jaydee\\cpuminer-opt-3.8.2.1-windows\\cpuminer-sse2.exe",
+"Path" : ".\\Bin\\CPU-Jaydee\\cpuminer-opt-3.8.7.2-windows\\cpuminer-sse2.exe",
 "ExtractionPath" : ".\\Bin\\CPU-Jaydee\\",
-"Uri" : "https://github.com/JayDDee/cpuminer-opt/files/1734002/cpuminer-opt-3.8.2.1-windows.zip",
+"Uri" : "https://github.com/JayDDee/cpuminer-opt/files/1899884/cpuminer-opt-3.8.7.2-windows.zip",
 "Types" : ["CPU"],
 "Arguments" : "-o #PROTOCOL#://#SERVER#:#PORT# -u #LOGIN# -p #PASSWORD# -R 10 -r 4 -b #APIPORT# #ALGORITHMPARAMETERS#",
 "API" : "ccminer",
@@ -22,7 +22,8 @@
               {"phi":"-a phi1612"},      
               {"polytimos":"-a polytimos"},    
               {"blakecoin":"-a blakecoin"},  
-              {"neoscrypt":"-a neoscrypt"}
+              {"neoscrypt":"-a neoscrypt"},
+              {"x16s":"-a x16s"}
 
               ]
 

diff --git a/Miners/C-XMrigGCC.json b/Miners/C-XMrigGCC.json
@@ -1,7 +1,7 @@
 {
 "Path" : ".\\Bin\\CPU-XMRIG_GCC\\xmrig.exe",
 "ExtractionPath" : ".\\Bin\\CPU-XMRIG_GCC\\",
-"Uri" : "https://github.com/xmrig/xmrig/releases/download/v2.5.2/xmrig-2.5.2-gcc-win64.zip",
+"Uri" : "https://github.com/xmrig/xmrig/releases/download/v2.6.0-beta2/xmrig-2.6.0-beta2-gcc-win64.zip",
 "Types" : ["CPU"],
 "Arguments" : "-o #PROTOCOL#://#SERVER#:#PORT# -u #LOGIN# -p #PASSWORD# --api-port #APIPORT# --donate-level 1 #ALGORITHMPARAMETERS#",
 "API" : "XMRig",
@@ -10,7 +10,8 @@
 "PrelaunchCommand":"",
 "Fee" : 0.01,
 "Algorithms": [
-                {"CRYPTONIGHT":""}
+                {"CRYPTONIGHT":""},
+                {"CRYPTONIGHTV7":""}
               ]
 
 }

diff --git a/Miners/C-XMrigMSVC.json b/Miners/C-XMrigMSVC.json
@@ -1,7 +1,7 @@
 {
 "Path" : ".\\Bin\\CPU-XMRIG_MSVC\\xmrig.exe",
 "ExtractionPath" : ".\\Bin\\CPU-XMRIG_MSVC\\",
-"Uri" : "https://github.com/xmrig/xmrig/releases/download/v2.5.2/xmrig-2.5.2-msvc-win64.zip",
+"Uri" : "https://github.com/xmrig/xmrig/releases/download/v2.6.0-beta2/xmrig-2.6.0-beta2-msvc-win64.zip",
 "Types" : ["CPU"],
 "Arguments" : "-o #PROTOCOL#://#SERVER#:#PORT# -u #LOGIN# -p #PASSWORD# --api-port #APIPORT# --donate-level 1 #ALGORITHMPARAMETERS#",
 "API" : "XMRig",
@@ -10,8 +10,8 @@
 "PrelaunchCommand":"",
 "Fee" : 0.01,
 "Algorithms": [
-                {"CRYPTONIGHT":""}
+                {"CRYPTONIGHT":""},
+                {"CRYPTONIGHTV7":""}
               ]
 
 }
-
diff --git a/Miners/N-CcminerKlaust.json b/Miners/N-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.19/ccminer-819final-cuda91-x64.zip",
+"Uri" : "https://github.com/KlausT/ccminer/releases/download/8.21/ccminer-821-cuda91-x64.zip",
 "Types" : ["NVIDIA"],
 "Arguments" : "-o #PROTOCOL#://#SERVER#:#PORT# -u #LOGIN# -p #PASSWORD# -R 10 -r 4 -b #APIPORT# -d #DEVICES# #ALGORITHMPARAMETERS# ",
 "API" : "Ccminer",

diff --git a/Miners/N-CcminerX16r.json b/Miners/N-CcminerX16r.json
@@ -1,7 +1,7 @@
 {
-"Path" : ".\\Bin\\NVIDIA-CcminerX16R\\rvnenemy\\ccminer.exe",
+"Path" : ".\\Bin\\NVIDIA-CcminerX16R\\z-enemy.exe",
 "ExtractionPath" : ".\\Bin\\NVIDIA-CcminerX16R\\",
-"Uri" : "https://github.com/tutulino/Software/releases/download/0/rvnenemy.zip",
+"Uri" : "https://github.com/tutulino/Software/releases/download/0/z-enemy-1.05a.zip",
 "Types" : ["NVIDIA"],
 "Arguments" : "-o #PROTOCOL#://#SERVER#:#PORT# -u #LOGIN# -p #PASSWORD# -R 10 -r 4 -b #APIPORT# -d #DEVICES# #ALGORITHMPARAMETERS# ",
 "API" : "Ccminer",
@@ -10,6 +10,7 @@
 "PrelaunchCommand":"",
 "Algorithms": [
                 {"x16r":"-a x16r"},
+                {"x16r":"-a x16s"},
 			    {"x17":"-a x17"}
 
               ]

diff --git a/Miners/N-XMrig.json b/Miners/N-XMrig.json
@@ -0,0 +1,18 @@
+{
+"Path" : ".\\Bin\\NVIDIA-XMRIG\\xmrig-nvidia.exe",
+"ExtractionPath" : ".\\Bin\\NVIDIA-XMRIG\\",
+"Uri" : "https://github.com/xmrig/xmrig-nvidia/releases/download/v2.6.0-beta1/xmrig-nvidia-2.6.0-beta1-cuda9-win64.zip",
+"Types" : ["NVIDIA"],
+"Arguments" : "-o #PROTOCOL#://#SERVER#:#PORT# -u #LOGIN# -p #PASSWORD# --api-port #APIPORT# --cuda-devices #DEVICES# --donate-level 1 #ALGORITHMPARAMETERS#",
+"API" : "XMRig",
+"Apiport": 12337,
+"Dualmining":false,
+"PrelaunchCommand":"",
+"Fee" : 0.01,
+"Algorithms": [
+                {"CRYPTONIGHT":""},
+                {"CRYPTONIGHTV7":""}
+              ]
+
+}
+
diff --git a/Pools/Zergpool.ps1 b/Pools/Zergpool.ps1
@@ -171,7 +171,7 @@ if (($Querymode -eq "core" ) -or ($Querymode -eq "Menu")){
                                 WalletMode    = $WalletMode
                                 Walletsymbol = $Currency
                                 PoolName = $Name
-                                Fee = ($request.($coin.algo).Fees)/100
+                                Fee = $coin.Fees/100
                                 RewardType=$RewardType
                                 }
                             }

diff --git a/changelog.txt b/changelog.txt
@@ -631,7 +631,8 @@ This release add a new section in config.txt for Farm Monitor
 ---FEATURES CHANGES:
 
 * Cancelled miners due to fails will be retried after 6 hours
-* New x16r, x16s ans x12 algos
+* New CryptonightV7, x16r, x16s ans x12 algos
+
 
 
 ---POOLS CHANGES:
@@ -641,17 +642,22 @@ This release add a new section in config.txt for Farm Monitor
 ---MINERS CHANGES:
 
 * Updated ccminer tpruvot to 2.2.5
-* Updated xmrig to 2.5.2
+* Updated cpu xmrig to v2.6.0-beta2
+* Added nvdia xmrig v2.6.0-beta1
 * Updated Claymore ETH to 11.6
 * Updated Phoenixminer to 2.8c
 * Updated bminer to 6.1.0
-* Replaced ccminer x16 for enemy release
+* Replaced ccminer x16 for enemy 1.05 release
+* Updated Claymore-cryptonote to 11.3
+* Updated ccminer klausT to 8.21
+* Updated cpuminer Jayddee to 3.8.7.2
 
 
 ---BUG FIXES:
 
 * Blazepool Wallet not shown
 * Claymore Neoscrypt for AMD not using selected devices
+* Wrong Zergpool fee
 
 
 

diff --git a/core.ps1 b/core.ps1
@@ -74,7 +74,7 @@ $ErrorActionPreference = "Continue"
 
 $config=get_config
 
-$Release="6.1"
+$Release="6.2"
 writelog ("Release $Release") $logfile $false
 
 if ($Groupnames -eq $null) {$Host.UI.RawUI.WindowTitle = "MegaMiner"} else {$Host.UI.RawUI.WindowTitle = "MM-" + ($Groupnames -join "/")}
@@ -585,7 +585,8 @@ while ($Quit -eq $false) {
                                                                         Status                = 'Idle'
                                                                         Stats                 = $Stats
                                                                         StatsHistory          = $StatsHistory
-                                                                        TimeSinceStartInterval= [TimeSpan]0              
+                                                                        TimeSinceStartInterval= [TimeSpan]0    
+                                                                        CancelationTime       = $null          
                                                                 } 
                                                             }
                                                 }   
@@ -808,6 +809,18 @@ while ($Quit -eq $false) {
         Writelog $msg $LogFile $false
         }
 
+
+    #checks if there is any cancelled miner that must reactivate
+     $ActiveMiners.subminers | Where-Object {$_.Status -eq "Cancelled" -and $_.CancellationTime.TotalMinutes -gt 3600} | foreach-object {
+
+        $_.Status = "Iddle"
+        $_.CancellationTime = $null
+
+        Writelog ("Cancelation time elapsed, reactivated"+$ActiveMiners[$_.IdF].name+"/"+$ActiveMiners[$_.IdF].Algorithms+'/'+$ActiveMiners[$_.IdF].Coin+" with Power Limit "+[string]$_.PowerLimit+" (id "+[string]$_.IdF+"-"+[string]$_.Id+")") $LogFile $true 
+
+     }
+
+
     #For each type, select most profitable miner, not benchmarked has priority, only new miner is lauched if new profit is greater than old by percenttoswitch
     #This section changes subminer 
     foreach ($Type in $Types) {
@@ -827,7 +840,10 @@ while ($Quit -eq $false) {
             if ($BestLast.Status -eq 'PendingCancellation') {
 
                 if (($ActiveMiners[$BestLast.IdF].subminers.stats.FailedTimes | Measure-Object -sum).sum -ge 2) {
-                                    $ActiveMiners[$BestLast.IdF].subminers |foreach-object{$_.Status='Cancelled'}
+                                    $ActiveMiners[$BestLast.IdF].subminers |foreach-object{
+                                            $_.Status = 'Cancelled'
+                                            $_.CancelationTime = get-date
+                                        }
                                     Writelog ("Detected more than 3 fails,cancelling combination  for $BestNowLogMsg") $LogFile $true           
                                 }
                 }