Skip to content

Commit

Permalink
v1.7.0
Browse files Browse the repository at this point in the history
  • Loading branch information
MaynardMiner committed Nov 5, 2018
1 parent def8306 commit 1453210
Show file tree
Hide file tree
Showing 72 changed files with 1,416 additions and 1,059 deletions.
Empty file removed SWARM.1.6.8.conf
Empty file.
1 change: 1 addition & 0 deletions SWARM.1.7.0.conf
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
-Timeout 24 -Benchmark 120 -WattOMeter Yes -Delay 1 -RigName1 MKVITO2 -StatsInterval 1 -Currency USD -CoinExchange RVN -Interval 300 -Location US -Auto_Coin Yes -PoolName nicehash,blazepool,zpool,fairpool,blockmasters,nlpool,ahashpool -Type AMD1,CPU,NVIDIA2 -Wallet1 1DRxiWx6yuZfN9hrEJa3BDXWVJ9yyJU36i -Nicehash_Wallet1 3JfBiUZZV17DTjAFCnZb97UpBgtLPLLDop -PasswordCurrency1 BTC -Nicehash_Fee 2 -Wallet2 1DRxiWx6yuZfN9hrEJa3BDXWVJ9yyJU36i -ZergpoolPassword2 RVN -Nicehash_Wallet2 3JfBiUZZV17DTjAFCnZb97UpBgtLPLLDop -PasswordCurrency2 BTC -Donate 0 -CPUWallet 1DRxiWx6yuZfN9hrEJa3BDXWVJ9yyJU36i -CPUCurrency BTC -CPUThreads 3 -Update Yes
2 changes: 1 addition & 1 deletion algopools/ahashpool.ps1
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ $ahashpool_Request | Get-Member -MemberType NoteProperty -ErrorAction Ignore | S

$ahashpool_Host = "$_.mine.ahashpool.com"
$ahashpool_Port = $ahashpool_Request.$_.port
$ahashpool_Algorithm = $ahashpool_Request.$_.name
$ahashpool_Algorithm = Get-Algorithm $ahashpool_Request.$_.name
$ahashpool_Fees = $ahashpool_Request.$_.fees
$Divisor = (1000000*$ahashpool_Request.$_.mbtc_mh_factor)

Expand Down
2 changes: 1 addition & 1 deletion algopools/blazepool.ps1
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ $blazepool_Request = [PSCustomObject]@{}

$blazepool_Request | Get-Member -MemberType NoteProperty -ErrorAction Ignore | Select-Object -ExpandProperty Name | Where-Object {$blazepool_Request.$_.hashrate -gt 0} | Where-Object {$Naming.$($blazepool_Request.$_.name)} | ForEach-Object {

$blazepool_Algorithm = $blazepool_Request.$_.name
$blazepool_Algorithm = Get-Algorithm $blazepool_Request.$_.name
$blazepool_Host = "$_.mine.blazepool.com"
$blazepool_Port = $blazepool_Request.$_.port
$Divisor = (1000000*$blazepool_Request.$_.mbtc_mh_factor)
Expand Down
2 changes: 1 addition & 1 deletion algopools/blockmasters.ps1
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ $blockpool_Request | Get-Member -MemberType NoteProperty -ErrorAction Ignore | S
"US"{$blockpool_Host = "blockmasters.co"}
default{$blockpool_Host = "eu.blockmasters.co"}
}
$blockpool_Algorithm = $blockpool_Request.$_.name
$blockpool_Algorithm = Get-Algorithm $blockpool_Request.$_.name
$blockpool_Port = $blockpool_Request.$_.port
$Divisor = (1000000*$blockpool_Request.$_.mbtc_mh_factor)

Expand Down
2 changes: 1 addition & 1 deletion algopools/fairpool.ps1
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ $fairpool_Request | Get-Member -MemberType NoteProperty -ErrorAction Ignore | Se
default {$fairpool_Host = "eu1.fairpool.pro"}
}
$fairpool_Port = $fairpool_Request.$_.port
$fairpool_Algorithm = $fairpool_Request.$_.name
$fairpool_Algorithm = Get-Algorithm $fairpool_Request.$_.name
$fairpool_Fees = $fairpool_Request.$_.fees
$Divisor = (1000000*$fairpool_Request.$_.mbtc_mh_factor)

Expand Down
2 changes: 1 addition & 1 deletion algopools/hashrefinery.ps1
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@

$Hashrefinery_Host = "$_.us.hashrefinery.com"
$Hashrefinery_Port = $Hashrefinery_Request.$_.port
$Hashrefinery_Algorithm = $Hashrefinery_Request.$_.name
$Hashrefinery_Algorithm = Get-Algorithm $Hashrefinery_Request.$_.name
$Divisor = (1000000*$Hashrefinery_Request.$_.mbtc_mh_factor)

if($Algorithm -eq $hashrefinery_Algorithm)
Expand Down
2 changes: 1 addition & 1 deletion algopools/nicehash.ps1
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ $nicehash_Request.result | Select-Object -ExpandProperty simplemultialgo | Where

$nicehash_Host = "$($_.name).$Region.nicehash.com"
$nicehash_Port = $_.port
$nicehash_Algorithm = $_.name
$nicehash_Algorithm = Get-Algorithm $_.name
$nicehash_Fees = $Nicehash_Fee
$Divisor = 1000000000

Expand Down
2 changes: 1 addition & 1 deletion algopools/nlpool.ps1
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ $nlpoolAlgo_Request = [PSCustomObject]@{}
$nlpoolAlgo_Request | Get-Member -MemberType NoteProperty -ErrorAction Ignore | Select-Object -ExpandProperty Name | Where-Object {$Naming.$($nlpoolAlgo_Request.$_.name)} | Where-Object {$($nlpoolAlgo_Request.$_.estimate_current) -ne "0.00000000"} | ForEach-Object {


$nlpoolAlgo_Algorithm = $nlpoolAlgo_Request.$_.name
$nlpoolAlgo_Algorithm = Get-Algorithm $nlpoolAlgo_Request.$_.name
$nlpoolAlgo_Host = "mine.nlpool.nl"
$nlpoolAlgo_Port = $nlpoolAlgo_Request.$_.port
$Divisor = (1000000*$nlpoolAlgo_Request.$_.mbtc_mh_factor)
Expand Down
2 changes: 1 addition & 1 deletion algopools/phiphipool(notworking).ps1
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ $phiphipool_Request | Get-Member -MemberType NoteProperty -ErrorAction Ignore |

#$phiphipool_Request | Get-Member -MemberType NoteProperty -ErrorAction Ignore | Select-Object -ExpandProperty Name | Where-Object {$phiphipool_Request.$_.hashrate -gt 0} | foreach {
$phiphipool_Port = $phiphipool_Request.$_.port
$phiphipool_Algorithm = $phiphipool_Request.$_.name
$phiphipool_Algorithm = Get-Algorithm $phiphipool_Request.$_.name
$phiphipool_Host = "pool1.phi-phi-pool.com"
$Divisor = (1000000*$phiphipool_Request.$_.mbtc_mh_factor)

Expand Down
2 changes: 1 addition & 1 deletion algopools/starpool.ps1
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ $Name = Get-Item $MyInvocation.MyCommand.Path | Select-Object -ExpandProperty Ba

$starpool_Request | Get-Member -MemberType NoteProperty -ErrorAction Ignore | Select-Object -ExpandProperty Name | Where-Object {$Naming.$($starpool_Request.$_.name)} | ForEach-Object {

$starpool_Algorithm = $starpool_Request.$_.name
$starpool_Algorithm = Get-Algorithm $starpool_Request.$_.name
$starpool_Host = "$_.starpool.biz"
$starpool_Port = $starpool_Request.$_.port
$Divisor = (1000000*$starpool_Request.$_.mbtc_mh_factor)
Expand Down
2 changes: 1 addition & 1 deletion algopools/zpool.ps1
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ $Zpool_Request | Get-Member -MemberType NoteProperty -ErrorAction Ignore | Selec
}
$Zpool_Host = "$_.mine.zpool.ca"
$Zpool_Port = $Zpool_Request.$_.port
$Zpool_Algorithm = $Zpool_Request.$_.name
$Zpool_Algorithm = Get-Algorithm $Zpool_Request.$_.name
$Divisor = (1000000*$Zpool_Request.$_.mbtc_mh_factor)

if($Algorithm -eq $Zpool_Algorithm)
Expand Down
37 changes: 37 additions & 0 deletions build/powershell/background.ps1
Original file line number Diff line number Diff line change
Expand Up @@ -254,6 +254,43 @@ if($Platforms -eq "windows" -and $HiveId -ne $null)
}
else{Write-Host "$MinerAPI API Failed- Coult Not Get Stats" -Foreground Red; $RAW = 0; $RAW | Set-Content ".\build\txt\$MinerType-hash.txt"}
}
'ethminer'
{
$HS = "hs"
Write-Host "Miner $MinerType is ethminer api"
Write-Host "Miner Port is $Port"
Write-Host "Miner Devices is $Devices"
$Message = @{id = 1; jsonrpc = "2.0"; method = "miner_getstat1"} | ConvertTo-Json -Compress
$Client = Get-TCP -Server $Server -Port $port -Message $Message
if($Client)
{
$Data = $Client | ConvertFrom-Json
$RAW = 0
$RAW += $Data.result[2] -split ";" | Select -First 1 | foreach {[Double]$_*1000}
$RAW | Set-Content ".\build\txt\$MinerType-hash.txt"
Write-Host "Miner $Name was clocked at $([Double]$RAW/1000)" -foreground Yellow
$Process = Get-Process | Where Name -clike "*$($MinerType)*"
Write-Host "Current Running instances: $($Process.Name)"
$KHS += $Data.result[2] -split ";" | Select -First 1 | foreach {[Double]$_}
$Hash = $Data.result[3] -split ";"
for($i=0;$i -lt $Devices.Count; $i++){$GPU = $Devices[$i]; $GPUHashrates.$($GCount.$TypeS.$GPU) = $(if($Hash.Count -eq 1){$Hash}else{$Hash[$i]})}
$Hash = $Hash | % {iex $_}
$MinerACC = $Data.result[2] -split ";" | Select -skip 1 -first 1
$MinerREJ = $Data.result[2] -split ";" | Select -skip 2 -first 1
$ACC += $Data.result[2] -split ";" | Select -skip 1 -first 1
$REJ += $Data.result[2] -split ";" | Select -skip 2 -first 1
$UPTIME = $Data.result[1] | Select -first 1 | foreach {[Double]$_*60}
$A = $Data.result[6] -split ";"
$temp = $true
for($i=0; $i -lt $A.count; $i++){if($temp -eq $true){$A[$i] = "$($A[$i])T"; $temp=$false; continue}if($temp -eq $false){$A[$i] = "$($A[$i])F"; $temp=$true; continue}}
$FanSelect = $A | Select-String "F" | foreach {$_ -replace "F"}
$TempSelect = $A | Select-String "T"| foreach {$_ -replace "T"}
for($i=0;$i -lt $Devices.Count; $i++){$GPU = $Devices[$i]; $GPUFans.$($GCount.$TypeS.$GPU) = $(if($FanSelect.Count -eq 1){$FanSelect}else{$FanSelect[$i]})}
for($i=0;$i -lt $Devices.Count; $i++){$GPU = $Devices[$i]; $GPUTemps.$($GCount.$TypeS.$GPU) = $(if($TempSelect.Count -eq 1){$TempSelect}else{$TempSelect[$i]})}
$ALGO = $MinerAlgo
}
else{Write-Host "$MinerAPI API Failed- Coult Not Get Stats" -Foreground Red; $RAW = 0; $RAW | Set-Content ".\build\txt\$MinerType-hash.txt"}
}
'ewbf'
{
$HS = "hs"
Expand Down
2 changes: 1 addition & 1 deletion build/powershell/sorting.ps1
Original file line number Diff line number Diff line change
Expand Up @@ -71,7 +71,7 @@ function start-minersorting {
if($Command -eq "Algo")
{
$Miner.HashRates | Get-Member -MemberType NoteProperty | Select -ExpandProperty Name | ForEach {
if(-not [String]$Miner.HashRates.$_ -or -not [String]$miner.PowerX.$_)
if((-not [String]$Miner.HashRates.$_) -or (-not [String]$Miner.PowerX.$_))
{
$Miner_HashRates.$_ = $null
$Miner_PowerX.$_ = $null
Expand Down
1 change: 0 additions & 1 deletion build/powershell/version.ps1
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,6 @@ else{$CommandQuery = $Command -replace("!","")
Write-Host "Executing Command: $CommandQuery"
Write-Host " " }
$CudaVersion = Get-Content ".\build\txt\cuda.txt"
if($CudaVersion -eq "9.1"){$updatecheck = ".\config\update\nvidia9.1-linux.json"; $miner_update_nvidia = Get-Content ".\config\update\nvidia9.1-linux.json" | ConvertFrom-Json}
if($CudaVersion -eq "9.2"){$updatecheck = ".\config\update\nvidia9.2-linux.json"; $miner_update_nvidia = Get-Content ".\config\update\nvidia9.2-linux.json" | ConvertFrom-Json}
if($CudaVersion -eq "10"){$updatecheck = ".\config\update\nvidia10-linux.json"; $miner_update_nvidia = Get-Content ".\config\update\nvidia10-linux.json" | ConvertFrom-Json}
$miner_update_amd = Get-Content ".\config\update\amd-linux.json" | ConvertFrom-Json
Expand Down
74 changes: 73 additions & 1 deletion config/miners/cryptodredge.json
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,9 @@
"lyra2rev2": "",
"lyra2z": "",
"lyra2re": "",
"exosis": "",
"x17": "",
"bitcore": "",
"allium": "",
"neoscrypt": "",
"blake2s": "",
Expand All @@ -29,6 +32,9 @@
"lyra2rev2": "",
"lyra2z": "",
"lyra2re": "",
"exosis": "",
"x17": "",
"bitcore": "",
"allium": "",
"neoscrypt": "",
"blake2s": "",
Expand All @@ -51,6 +57,9 @@
"lyra2rev2": "lyra2v2",
"lyra2z": "lyra2z",
"lyra2re": "lyra2z",
"exosis": "exosis",
"x17": "x17",
"bitcore": "bitcore",
"allium": "allium",
"neoscrypt": "neoscrypt",
"blake2s": "blake2s",
Expand Down Expand Up @@ -89,6 +98,21 @@
"Core": "",
"Memory": ""
},
"exosis": {
"Power": "",
"Core": "",
"Memory": ""
},
"bitcore": {
"Power": "",
"Core": "",
"Memory": ""
},
"x17": {
"Power": "",
"Core": "",
"Memory": ""
},
"allium": {
"Power": "",
"Core": "",
Expand Down Expand Up @@ -179,6 +203,9 @@
"lyra2rev2": "",
"lyra2z": "",
"lyra2re": "",
"exosis": "",
"x17": "",
"bitcore": "",
"allium": "",
"neoscrypt": "",
"blake2s": "",
Expand All @@ -201,6 +228,9 @@
"lyra2rev2": "",
"lyra2z": "",
"lyra2re": "",
"exosis": "",
"x17": "",
"bitcore": "",
"allium": "",
"neoscrypt": "",
"blake2s": "",
Expand All @@ -223,6 +253,9 @@
"lyra2rev2": "lyra2v2",
"lyra2z": "lyra2z",
"lyra2re": "lyra2z",
"exosis": "exosis",
"x17": "x17",
"bitcore": "bitcore",
"allium": "allium",
"neoscrypt": "neoscrypt",
"blake2s": "blake2s",
Expand Down Expand Up @@ -261,6 +294,21 @@
"Core": "",
"Memory": ""
},
"exosis": {
"Power": "",
"Core": "",
"Memory": ""
},
"bitcore": {
"Power": "",
"Core": "",
"Memory": ""
},
"x17": {
"Power": "",
"Core": "",
"Memory": ""
},
"allium": {
"Power": "",
"Core": "",
Expand Down Expand Up @@ -351,11 +399,14 @@
"lyra2rev2": "",
"lyra2z": "",
"lyra2re": "",
"exosis": "",
"x17": "",
"bitcore": "",
"allium": "",
"neoscrypt": "",
"blake2s": "",
"skein": "",
"cryptonightv7": "",
"cryptonightv7": "",
"cryptonightv8": "",
"cryptonightheavy": "",
"aeon": "",
Expand All @@ -373,6 +424,9 @@
"lyra2rev2": "",
"lyra2z": "",
"lyra2re": "",
"exosis": "",
"x17": "",
"bitcore": "",
"allium": "",
"neoscrypt": "",
"blake2s": "",
Expand All @@ -395,6 +449,9 @@
"lyra2rev2": "lyra2v2",
"lyra2z": "lyra2z",
"lyra2re": "lyra2z",
"exosis": "exosis",
"x17": "x17",
"bitcore": "",
"allium": "allium",
"neoscrypt": "neoscrypt",
"blake2s": "blake2s",
Expand Down Expand Up @@ -433,6 +490,21 @@
"Core": "",
"Memory": ""
},
"exosis": {
"Power": "",
"Core": "",
"Memory": ""
},
"bitcore": {
"Power": "",
"Core": "",
"Memory": ""
},
"x17": {
"Power": "",
"Core": "",
"Memory": ""
},
"allium": {
"Power": "",
"Core": "",
Expand Down
Loading

0 comments on commit 1453210

Please sign in to comment.