Skip to content

Commit

Permalink
-added suggested -i 28 to ccrfv2
Browse files Browse the repository at this point in the history 
-Due to previous optimizations
  removed miner_hashtable variable:
  no longer needed.
-Coin parameter will auto-exchange
  single coin mining.
  • Loading branch information
@MaynardMiner
MaynardMiner committed Oct 9, 2019
1 parent 694cf70 commit 4ae2f11
Show file tree
Hide file tree
Showing 54 changed files with 1,660 additions and 1,904 deletions.
44 changes: 1 addition & 43 deletions build/powershell/pool/initial.psm1
View file
Original file line number Diff line number Diff line change
Expand Up @@ -44,46 +44,4 @@ function Global:Remove-BanHashrates {
}
}
}
}
function Global:Get-MinerHashTable {

Invoke-Expression ".\build\powershell\scripts\get.ps1 benchmarks all -asjson" | Tee-Object -Variable Miner_Hash | Out-Null
if ($Miner_Hash -and $Miner_Hash -ne "No Stats Found") {
$Miner_Hash = $Miner_Hash | ConvertFrom-Json
}
else { $Miner_Hash = $null }

$TypeTable = @{ }
$(vars).cpu.PSobject.Properties.Name | %{ if($_ -ne "name" -and [string]$_ -ne ""){$TypeTable.Add("$($_)","CPU")} }
$(vars).amd.PSObject.Properties.Name | %{if($_ -ne "name" -and [string]$_ -ne ""){$TypeTable.Add("$($_)-1","AMD1")}}
$(vars).nvidia.PSObject.Properties.Name | % {
if($_ -ne "name" -and [string]$_ -ne ""){
$TypeTable.Add("$($_)-1","NVIDIA1")
$TypeTable.Add("$($_)-2","NVIDIA2")
$TypeTable.Add("$($_)-3","NVIDIA3")
}
}
$SELASIC = $(arg).Type | Where {$_ -like "*ASIC*"}

$SELASIC | %{
$SelType = $_
$SelNum = $_ -replace "ASIC",""
$TypeTable.Add("$($_)-$SelNum",$SelType)
}

if ($Miner_Hash) {
$Miner_Hash | % { $_ | Add-Member "Type" $TypeTable.$($_.Miner) }
$NotBest = @()
$Miner_Hash.Algo | % {
$A = $_
$(arg).Type | % {
$T = $_
$Sel = $Miner_Hash | Where Algo -eq $A | Where Type -EQ $T
$NotBest += $Sel | Sort-Object RAW -Descending | Select-Object -Skip 1
}
}
$Miner_Hash | % { $Sel = $NotBest | Where Miner -eq $_.Miner | Where Algo -eq $_.Algo | Where Type -eq $_.Type; if ($Sel) { $_.Raw = "Bad" } }
}

$Miner_Hash
}
}
6 changes: 3 additions & 3 deletions config/miners/cc-rfv2.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
"delay": "1",
"prestart": [],
"commands": {
"rainforestv2": "-i 11"
"rainforestv2": "-i 28"
},
"difficulty": {
"rainforestv2": ""
Expand All @@ -20,7 +20,7 @@
"delay": "1",
"prestart": [],
"commands": {
"rainforestv2": "-i 11"
"rainforestv2": "-i 28"
},
"difficulty": {
"rainforestv2": ""
Expand All @@ -38,7 +38,7 @@
"rainforestv2": ""
},
"difficulty": {
"rainforestv2": "-i 11"
"rainforestv2": "-i 28"
},
"naming": {
"rainforestv2": "rfv2"
Expand Down
68 changes: 32 additions & 36 deletions miners/cpu/bubasik.ps1
View file
Original file line number Diff line number Diff line change
Expand Up @@ -43,41 +43,37 @@ $(vars).CPUTypes | ForEach-Object {
if ($MinerAlgo -in $(vars).Algorithm -and $Name -notin $global:Config.Pool_Algos.$MinerAlgo.exclusions -and $ConfigType -notin $global:Config.Pool_Algos.$MinerAlgo.exclusions -and $Name -notin $(vars).BanHammer) {
$StatAlgo = $MinerAlgo -replace "`_", "`-"
$Stat = Global:Get-Stat -Name "$($Name)_$($StatAlgo)_hashrate"
$Check = $(vars).Miner_HashTable | Where Miner -eq $Name | Where Algo -eq $MinerAlgo | Where Type -Eq $ConfigType

if ($Check.RAW -ne "Bad") {
$Pools | Where-Object Algorithm -eq $MinerAlgo | ForEach-Object {
if ($MinerConfig.$ConfigType.difficulty.$($_.Algorithm)) { $Diff = ",d=$($MinerConfig.$ConfigType.difficulty.$($_.Algorithm))" }else { $Diff = "" }
[PSCustomObject]@{
MName = $Name
Coin = $(vars).Coins
Delay = $MinerConfig.$ConfigType.delay
Fees = $MinerConfig.$ConfigType.fee.$($_.Algorithm)
Symbol = "$($_.Symbol)"
MinerName = $MinerName
Prestart = $PreStart
Type = $ConfigType
Path = $Path
Devices = $Devices
Stratum = "$($_.Protocol)://$($_.Pool_Host):$($_.Port)"
Version = "$($(vars).cpu.bubasik.version)"
DeviceCall = "cpuminer-opt"
Arguments = "-a $($MinerConfig.$ConfigType.naming.$($_.Algorithm)) -o stratum+tcp://$($_.Pool_Host):$($_.Port) -b 0.0.0.0:10001 -u $($_.User1) -p $($_.Pass1)$($Diff) $($MinerConfig.$ConfigType.commands.$($_.Algorithm))"
HashRates = $Stat.Hour
Worker = $(arg).Rigname1
Quote = if ($Stat.Hour) { $Stat.Hour * ($_.Price) }else { 0 }
Power = if ($(vars).Watts.$($_.Algorithm)."$($ConfigType)_Watts") { $(vars).Watts.$($_.Algorithm)."$($ConfigType)_Watts" }elseif ($(vars).Watts.default."$($ConfigType)_Watts") { $(vars).Watts.default."$($ConfigType)_Watts" }else { 0 }
MinerPool = "$($_.Name)"
Port = 10001
API = "cpuminer"
Wallet = "$($_.User1)"
URI = $Uri
Server = "localhost"
Algo = "$($_.Algorithm)"
Log = $Log
}
}
}
}
$Pools | Where-Object Algorithm -eq $MinerAlgo | ForEach-Object {
if ($MinerConfig.$ConfigType.difficulty.$($_.Algorithm)) { $Diff = ",d=$($MinerConfig.$ConfigType.difficulty.$($_.Algorithm))" }else { $Diff = "" }
[PSCustomObject]@{
MName = $Name
Coin = $(vars).Coins
Delay = $MinerConfig.$ConfigType.delay
Fees = $MinerConfig.$ConfigType.fee.$($_.Algorithm)
Symbol = "$($_.Symbol)"
MinerName = $MinerName
Prestart = $PreStart
Type = $ConfigType
Path = $Path
Devices = $Devices
Stratum = "$($_.Protocol)://$($_.Pool_Host):$($_.Port)"
Version = "$($(vars).cpu.bubasik.version)"
DeviceCall = "cpuminer-opt"
Arguments = "-a $($MinerConfig.$ConfigType.naming.$($_.Algorithm)) -o stratum+tcp://$($_.Pool_Host):$($_.Port) -b 0.0.0.0:10001 -u $($_.User1) -p $($_.Pass1)$($Diff) $($MinerConfig.$ConfigType.commands.$($_.Algorithm))"
HashRates = $Stat.Hour
Worker = $(arg).Rigname1
Quote = if ($Stat.Hour) { $Stat.Hour * ($_.Price) }else { 0 }
Power = if ($(vars).Watts.$($_.Algorithm)."$($ConfigType)_Watts") { $(vars).Watts.$($_.Algorithm)."$($ConfigType)_Watts" }elseif ($(vars).Watts.default."$($ConfigType)_Watts") { $(vars).Watts.default."$($ConfigType)_Watts" }else { 0 }
MinerPool = "$($_.Name)"
Port = 10001
API = "cpuminer"
Wallet = "$($_.User1)"
URI = $Uri
Server = "localhost"
Algo = "$($_.Algorithm)"
Log = $Log
}
}
}
}
}
64 changes: 30 additions & 34 deletions miners/cpu/cpupower.ps1
View file
Original file line number Diff line number Diff line change
Expand Up @@ -42,40 +42,36 @@ $(vars).CPUTypes | ForEach-Object {
if ($MinerAlgo -in $(vars).Algorithm -and $Name -notin $global:Config.Pool_Algos.$MinerAlgo.exclusions -and $ConfigType -notin $global:Config.Pool_Algos.$MinerAlgo.exclusions -and $Name -notin $(vars).BanHammer) {
$StatAlgo = $MinerAlgo -replace "`_", "`-"
$Stat = Global:Get-Stat -Name "$($Name)_$($StatAlgo)_hashrate"
$Check = $(vars).Miner_HashTable | Where Miner -eq $Name | Where Algo -eq $MinerAlgo | Where Type -Eq $ConfigType

if ($Check.RAW -ne "Bad") {
$Pools | Where-Object Algorithm -eq $MinerAlgo | ForEach-Object {
if ($MinerConfig.$ConfigType.difficulty.$($_.Algorithm)) { $Diff = ",d=$($MinerConfig.$ConfigType.difficulty.$($_.Algorithm))" }else { $Diff = "" }
[PSCustomObject]@{
MName = $Name
Coin = $(vars).Coins
Delay = $MinerConfig.$ConfigType.delay
Fees = $MinerConfig.$ConfigType.fee.$($_.Algorithm)
Symbol = "$($_.Symbol)"
MinerName = $MinerName
Prestart = $PreStart
Type = $ConfigType
Path = $Path
Devices = $Devices
Stratum = "$($_.Protocol)://$($_.Pool_Host):$($_.Port)"
Version = "$($(vars).cpu.cpupower.version)"
DeviceCall = "cpuminer-opt"
Arguments = "-a $($MinerConfig.$ConfigType.naming.$($_.Algorithm)) -o stratum+tcp://$($_.Pool_Host):$($_.Port) -b 0.0.0.0:10001 -u $($_.User1) -p $($_.Pass1)$($Diff) $($MinerConfig.$ConfigType.commands.$($_.Algorithm))"
HashRates = $Stat.Hour
Worker = $(arg).Rigname1
Quote = if ($Stat.Hour) { $Stat.Hour * ($_.Price) }else { 0 }
Power = if ($(vars).Watts.$($_.Algorithm)."$($ConfigType)_Watts") { $(vars).Watts.$($_.Algorithm)."$($ConfigType)_Watts" }elseif ($(vars).Watts.default."$($ConfigType)_Watts") { $(vars).Watts.default."$($ConfigType)_Watts" }else { 0 }
MinerPool = "$($_.Name)"
Port = 10001
API = "cpuminer"
Wallet = "$($_.User1)"
URI = $Uri
Server = "localhost"
Algo = "$($_.Algorithm)"
Log = $Log
}
}
$Pools | Where-Object Algorithm -eq $MinerAlgo | ForEach-Object {
if ($MinerConfig.$ConfigType.difficulty.$($_.Algorithm)) { $Diff = ",d=$($MinerConfig.$ConfigType.difficulty.$($_.Algorithm))" }else { $Diff = "" }
[PSCustomObject]@{
MName = $Name
Coin = $(vars).Coins
Delay = $MinerConfig.$ConfigType.delay
Fees = $MinerConfig.$ConfigType.fee.$($_.Algorithm)
Symbol = "$($_.Symbol)"
MinerName = $MinerName
Prestart = $PreStart
Type = $ConfigType
Path = $Path
Devices = $Devices
Stratum = "$($_.Protocol)://$($_.Pool_Host):$($_.Port)"
Version = "$($(vars).cpu.cpupower.version)"
DeviceCall = "cpuminer-opt"
Arguments = "-a $($MinerConfig.$ConfigType.naming.$($_.Algorithm)) -o stratum+tcp://$($_.Pool_Host):$($_.Port) -b 0.0.0.0:10001 -u $($_.User1) -p $($_.Pass1)$($Diff) $($MinerConfig.$ConfigType.commands.$($_.Algorithm))"
HashRates = $Stat.Hour
Worker = $(arg).Rigname1
Quote = if ($Stat.Hour) { $Stat.Hour * ($_.Price) }else { 0 }
Power = if ($(vars).Watts.$($_.Algorithm)."$($ConfigType)_Watts") { $(vars).Watts.$($_.Algorithm)."$($ConfigType)_Watts" }elseif ($(vars).Watts.default."$($ConfigType)_Watts") { $(vars).Watts.default."$($ConfigType)_Watts" }else { 0 }
MinerPool = "$($_.Name)"
Port = 10001
API = "cpuminer"
Wallet = "$($_.User1)"
URI = $Uri
Server = "localhost"
Algo = "$($_.Algorithm)"
Log = $Log
}
}
}
}
Expand Down
64 changes: 30 additions & 34 deletions miners/cpu/jayddee.ps1
View file
Original file line number Diff line number Diff line change
Expand Up @@ -42,40 +42,36 @@ $(vars).CPUTypes | ForEach-Object {
if ($MinerAlgo -in $(vars).Algorithm -and $Name -notin $global:Config.Pool_Algos.$MinerAlgo.exclusions -and $ConfigType -notin $global:Config.Pool_Algos.$MinerAlgo.exclusions -and $Name -notin $(vars).BanHammer) {
$StatAlgo = $MinerAlgo -replace "`_", "`-"
$Stat = Global:Get-Stat -Name "$($Name)_$($StatAlgo)_hashrate"
$Check = $(vars).Miner_HashTable | Where Miner -eq $Name | Where Algo -eq $MinerAlgo | Where Type -Eq $ConfigType

if ($Check.RAW -ne "Bad") {
$Pools | Where-Object Algorithm -eq $MinerAlgo | ForEach-Object {
if ($MinerConfig.$ConfigType.difficulty.$($_.Algorithm)) { $Diff = ",d=$($MinerConfig.$ConfigType.difficulty.$($_.Algorithm))" }else { $Diff = "" }
[PSCustomObject]@{
MName = $Name
Coin = $(vars).Coins
Delay = $MinerConfig.$ConfigType.delay
Fees = $MinerConfig.$ConfigType.fee.$($_.Algorithm)
Symbol = "$($_.Symbol)"
MinerName = $MinerName
Prestart = $PreStart
Type = $ConfigType
Path = $Path
Devices = $Devices
Stratum = "$($_.Protocol)://$($_.Pool_Host):$($_.Port)"
Version = "$($(vars).cpu.jayddee.version)"
DeviceCall = "cpuminer-opt"
Arguments = "-a $($MinerConfig.$ConfigType.naming.$($_.Algorithm)) -o stratum+tcp://$($_.Pool_Host):$($_.Port) -b 0.0.0.0:10001 -u $($_.User1) -p $($_.Pass1)$($Diff) $($MinerConfig.$ConfigType.commands.$($_.Algorithm))"
HashRates = $Stat.Hour
Worker = $(arg).Rigname1
Quote = if ($Stat.Hour) { $Stat.Hour * ($_.Price) }else { 0 }
Power = if ($(vars).Watts.$($_.Algorithm)."$($ConfigType)_Watts") { $(vars).Watts.$($_.Algorithm)."$($ConfigType)_Watts" }elseif ($(vars).Watts.default."$($ConfigType)_Watts") { $(vars).Watts.default."$($ConfigType)_Watts" }else { 0 }
MinerPool = "$($_.Name)"
Port = 10001
API = "cpuminer"
Wallet = "$($_.User1)"
URI = $Uri
Server = "localhost"
Algo = "$($_.Algorithm)"
Log = $Log
}
}
$Pools | Where-Object Algorithm -eq $MinerAlgo | ForEach-Object {
if ($MinerConfig.$ConfigType.difficulty.$($_.Algorithm)) { $Diff = ",d=$($MinerConfig.$ConfigType.difficulty.$($_.Algorithm))" }else { $Diff = "" }
[PSCustomObject]@{
MName = $Name
Coin = $(vars).Coins
Delay = $MinerConfig.$ConfigType.delay
Fees = $MinerConfig.$ConfigType.fee.$($_.Algorithm)
Symbol = "$($_.Symbol)"
MinerName = $MinerName
Prestart = $PreStart
Type = $ConfigType
Path = $Path
Devices = $Devices
Stratum = "$($_.Protocol)://$($_.Pool_Host):$($_.Port)"
Version = "$($(vars).cpu.jayddee.version)"
DeviceCall = "cpuminer-opt"
Arguments = "-a $($MinerConfig.$ConfigType.naming.$($_.Algorithm)) -o stratum+tcp://$($_.Pool_Host):$($_.Port) -b 0.0.0.0:10001 -u $($_.User1) -p $($_.Pass1)$($Diff) $($MinerConfig.$ConfigType.commands.$($_.Algorithm))"
HashRates = $Stat.Hour
Worker = $(arg).Rigname1
Quote = if ($Stat.Hour) { $Stat.Hour * ($_.Price) }else { 0 }
Power = if ($(vars).Watts.$($_.Algorithm)."$($ConfigType)_Watts") { $(vars).Watts.$($_.Algorithm)."$($ConfigType)_Watts" }elseif ($(vars).Watts.default."$($ConfigType)_Watts") { $(vars).Watts.default."$($ConfigType)_Watts" }else { 0 }
MinerPool = "$($_.Name)"
Port = 10001
API = "cpuminer"
Wallet = "$($_.User1)"
URI = $Uri
Server = "localhost"
Algo = "$($_.Algorithm)"
Log = $Log
}
}
}
}
Expand Down
Loading

0 comments on commit 4ae2f11

Please sign in to comment.