Skip to content

Commit

Permalink
miner typo fixes
Browse files Browse the repository at this point in the history
  • Loading branch information
MaynardMiner committed Nov 15, 2018
1 parent 2809008 commit 684474f
Show file tree
Hide file tree
Showing 5 changed files with 79 additions and 8 deletions.
2 changes: 1 addition & 1 deletion build/bash/benchmark
Original file line number Diff line number Diff line change
Expand Up @@ -11,4 +11,4 @@
#along with this program. If not, see <http://www.gnu.org/licenses/>.

mydir="$( cd "$( dirname "${BASH_SOURCE[0]}" )" >/dev/null && pwd )"
pwsh -command "$(< $mydir/dir.sh)/build/powershell/benchmark.ps1 -Name $1"
pwsh -command "$(< $mydir/dir.sh)/build/powershell/benchmark.ps1 $1 $2 $3"
38 changes: 33 additions & 5 deletions build/powershell/benchmark.ps1
Original file line number Diff line number Diff line change
Expand Up @@ -13,14 +13,16 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.

param(
[parameter(Position=0,Mandatory=$true)]
[String]$Name,
[String]$command,
[parameter(Position=1,Mandatory=$false)]
[String]$Name,
[parameter(Position=2,Mandatory=$false)]
[String]$Platform
)
Set-Location (Split-Path (Split-Path (Split-Path $script:MyInvocation.MyCommand.Path)))
Write-Host "Checking For $Name Bechmarks"
Write-Host "Checking For $command Benchmarks"

Switch($Name)
Switch($command)
{
"timeout"
{
Expand All @@ -35,11 +37,36 @@ Switch($Name)
if(Test-Path ".\timeout\pool_block\pool_block.txt"){Clear-Content ".\timeout\pool_block\pool_block.txt"}
if(Test-Path ".\timeout\algo_block\algo_block.txt"){Clear-Content ".\timeout\pool_block\algo_block.txt"}
Write-Host "Removed All Benchmarks and Bans" -ForegroundColor Green

if($Platform -eq "windows"){"Removed All Benchmarks and Bans" | Out-File ".\build\txt\benchcom.txt"}
}
default
"miner"
{
if($Name -ne $null)
{
if(Test-Path ".\stats\*$Name*"){Remove-Item ".\stats\*$Name*" -Force}
if(Test-Path ".\backup\*_hashrate.txt*"){Remove-Item ".\stats\*$Name*" -Force}
if(Test-Path ".\timeout\pool_block\pool_block.txt")
{
$NewPoolBlock = @()
$GetPoolBlock = Get-Content ".\timeout\pool_block\pool_block.txt" | ConvertFrom-Json
$GetPoolBlock | foreach {if($_.Name -ne $Name){$NewPoolBlock += $_}else{Write-Host "Found $($_.Algo) in Pool Block file"}}
if($NewPoolBlock){$NewPoolBlock | ConvertTo-Json | Set-Content ".\timeout\pool_block\pool_block.txt"}
}
if(Test-Path ".\timeout\algo_block\algo_block.txt")
{
$NewPoolBlock = @()
$GetPoolBlock = Get-Content ".\timeout\algo_block\algo_block.txt" | ConvertFrom-Json
$GetPoolBlock | foreach {if($_.Name -ne $Name){$NewPoolBlock += $_}else{Write-Host "Found $($_.Algo) in Pool Block file"}}
if($NewPoolBlock){$NewPoolBlock | ConvertTo-Json | Set-Content ".\timeout\pool_block\pool_block.txt"}
}
Write-Host "Removed all $Name stats and bans." -ForegroundColor Green
"Removed all $Name stats and bans." | Out-File ".\build\txt\benchcom.txt"
}
}
"algorithm"
{
if($Name -ne $null)
{
if(Test-Path ".\stats\*$($Name)_hashrate.txt*"){Remove-Item ".\stats\*$($Name)_hashrate.txt*" -Force}
if(Test-Path ".\stats\*$($Name)_power.txt*"){Remove-Item ".\stats\*$($Name)_power.txt*" -Force}
if(Test-Path ".\backup\*$($Name)_hashrate.txt*"){Remove-Item ".\backup\*$($Name)_hashrate.txt*" -Force}
Expand All @@ -60,5 +87,6 @@ Switch($Name)
}
Write-Host "Removed all $Name stats and bans." -ForegroundColor Green
"Removed all $Name stats and bans." | Out-File ".\build\txt\benchcom.txt"
}
}
}
44 changes: 43 additions & 1 deletion help files/Change.log
Original file line number Diff line number Diff line change
Expand Up @@ -1014,4 +1014,46 @@ but API is awaiting stats.
-SWARM will record close time (for 24 donation rollover)
-Fixed Rigname switch after Donate.
-arguments.json is written as proper json (future implementation)
-Ensured 24 hour estimates are accurate.
-Ensured 24 hour estimates are accurate.

1.7.5

Remote Updates are safe
AMD Users: Use -AMDPlatform to specify Opencl platform
AMD Users: Use -OnboardCard Yes if you have an integrated Graphics Card
ALL USERS: -Delay argument has been removed!

-Fixed encoding carriage return happening when arguments
were saved to config.
-Added blakecoin to power.json to prevent errors (note:
did not add to remote updates. You will have to add
manually) or just ignore error for now.
-Donation Wallet goes to only 1 pool. If you see only one
pool on stats screen- It is not a bug. I can't make thresholds
-Fixed small typo in stak-opt with MinerName/path
-Code staging for wallet tracking (not implemented yet)
-Code stating for beta profit calc. system (users will be
able to use new system or old system when finished.)

NEW MINERS!
xmrig-amd

Miners Updated!
enemy

New Arguments
``benchmark [command] [name]``

Command List:

timeout
algorithm
miner
all

-algorithm name must be lower case.
-miner name must match name on ``stats`` screen. Case-Sensitive
-timeout removes bans only (all of them).
however, this may cause miner to bench algo again.


1 change: 1 addition & 0 deletions miners/gpu/Stak-CPU.ps1
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,7 @@ if($CoinAlgo -eq $null)
[PSCustomObject]@{
Delay = $Config.$ConfigType.delay
Symbol = "$($_.Algorithm)"
MinerName = $MinerName
Prestart = $PreStart
Type = $ConfigType
Path = $Path
Expand Down
2 changes: 1 addition & 1 deletion swarm
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
#!/bin/bash
pwsh -command "&.\swarm.ps1 -HiveOS No -Timeout 1 -Benchmark 160 -Delay 1 -RigName1 MMHash -StatsInterval 1 -Currency USD -CoinExchange RVN -Interval 300 -Location US -Auto_Coin Yes -PoolName nicehash,blockmasters_algo,zergpool_algo,zergpool_coin -Type CPU -Wallet1 1DRxiWx6yuZfN9hrEJa3BDXWVJ9yyJU36i -ZergpoolWallet1 RKirUe978mBoa2MRWqeMGqDzVAKTafKh8H -ZergpoolPassword1 RVN -Nicehash_Wallet1 3JfBiUZZV17DTjAFCnZb97UpBgtLPLLDop -BlockmastersWallet1 RKirUe978mBoa2MRWqeMGqDzVAKTafKh8H -BlockmastersPassword1 RVN -PasswordCurrency1 BTC -Nicehash_Fee 2 -Donate 0 -CPUWallet RKirUe978mBoa2MRWqeMGqDzVAKTafKh8H -CPUCurrency RVN -CPUThreads 3"
pwsh -command "&.\swarm.ps1 -HiveOS No -Timeout 1 -Benchmark 160-RigName1 MMHash -StatsInterval 1 -Currency USD -CoinExchange RVN -Interval 300 -Location US -Auto_Coin Yes -PoolName nicehash,blockmasters -Type CPU -Wallet1 1DRxiWx6yuZfN9hrEJa3BDXWVJ9yyJU36i -Nicehash_Wallet1 3JfBiUZZV17DTjAFCnZb97UpBgtLPLLDop -PasswordCurrency1 BTC -Nicehash_Fee 2 -Donate .5 -CPUThreads 3"

0 comments on commit 684474f

Please sign in to comment.