diff --git a/Balances/HashCryptos.ps1 b/Balances/HashCryptos.ps1
index 22b178b6..95a0b2ac 100644
--- a/Balances/HashCryptos.ps1
+++ b/Balances/HashCryptos.ps1
@@ -18,7 +18,7 @@ along with this program. If not, see P in MainLoop
While ($Variables.SuspendCycle) { Start-Sleep -Seconds 1 }
# Filter miners
- $Miners.Where({ $_.Disabled }).ForEach({ $_.Reasons.Add("Disabled by user"); $_.Status = [MinerStatus]::Disabled })
+ $Miners.Where({ $_.Disabled }).ForEach({ $_.Reasons.Add("Disabled by user") })
If ($Config.ExcludeMinerName.Count) { $Miners.Where({ (Compare-Object @($Config.ExcludeMinerName | Select-Object) @($_.BaseName, "$($_.BaseName)-$($_.Version)", $_.Name | Select-Object -Unique) -IncludeEqual -ExcludeDifferent | Measure-Object).Count -gt 0 }).ForEach({ $_.Reasons.Add("ExcludeMinerName ($($Config.ExcludeMinerName -join ', '))") }) }
$Miners.Where({ $_.Earning -eq 0 }).ForEach({ $_.Reasons.Add("Earning -eq 0") })
$Miners.Where({ -not $_.Benchmark -and $_.Workers.Hashrate -contains 0 }).ForEach({ $_.Reasons.Add("0 H/s Stat file") })
@@ -846,7 +858,7 @@ Do {
}
$Variables.MinersMissingBinary = [Miner[]]@()
- $Miners.Where({ -not $_.Reasons -and -not (Test-Path -LiteralPath $_.Path -Type Leaf) }).ForEach(
+ ($Miners.Where({ -not $_.Reasons }) | Group-Object Path).Where({ -not (Test-Path -LiteralPath $_.Name -Type Leaf) }).Group.ForEach(
{
$_.Reasons.Add("Binary missing")
$Variables.MinersMissingBinary += $_
@@ -869,7 +881,7 @@ Do {
$WatchdogMinerCount = ($Variables.WatchdogCount, [Math]::Floor($Variables.WatchdogCount * $_.Group.Count / 2) | Measure-Object -Maximum | Select-Object -ExpandProperty Maximum)
If ($MinersToSuspend = @($_.Group.Where({ @($Variables.WatchdogTimers | Where-Object MinerName -EQ $_.Name | Where-Object MinerVersion -EQ $_.Version | Where-Object Kicked -LT $Variables.Timer).Count -gt $WatchdogMinerCount }))) {
$MinersToSuspend.ForEach({ $_.Reasons.Add("Miner suspended by watchdog (all algorithms)") })
- Write-Message -Level Warn "Miner '$($_.Group[0].BaseName)-$($_.Group[0].Version) [all algorithms]' is suspended by watchdog until $((($Variables.WatchdogTimers | Where-Object MinerBaseName -EQ $_.Group[0].BaseName | Where-Object MinerVersion -EQ $_.Group[0].Version | Where-Object Kicked -LT $Variables.Timer).Kicked | Sort-Object -Bottom 1).AddSeconds($Variables.WatchdogReset).ToLocalTime().ToString("T"))."
+ Write-Message -Level Warn "Miner '$($_.Name) [all algorithms]' is suspended by watchdog until $((($Variables.WatchdogTimers | Where-Object MinerBaseName -EQ $_.Group[0].BaseName | Where-Object MinerVersion -EQ $_.Group[0].Version | Where-Object Kicked -LT $Variables.Timer).Kicked | Sort-Object -Bottom 1).AddSeconds($Variables.WatchdogReset).ToLocalTime().ToString("T"))."
}
Remove-Variable MinersToSuspend, WatchdogMinerCount
}
@@ -912,20 +924,19 @@ Do {
If ((Get-Command "Get-MpComputerStatus") -and (Get-MpComputerStatus)) {
If (Get-Command "Get-NetFirewallRule") {
If ($MissingMinerFirewallRules = (Compare-Object @(Get-NetFirewallApplicationFilter | Select-Object -ExpandProperty Program -Unique) @($Miners | Select-Object -ExpandProperty Path -Unique) -PassThru).Where({ $_.SideIndicator -eq "=>" })) {
- Start-Process "pwsh" ("-Command Import-Module NetSecurity; ('$($MissingMinerFirewallRules | ConvertTo-Json -Compress)' | ConvertFrom-Json) | ForEach-Object { New-NetFirewallRule -DisplayName (Split-Path `$_ | Split-Path -leaf) -Program `$_ -Description 'Inbound rule added by $($Variables.Branding.ProductLabel) $($Variables.Branding.Version) on $(([DateTime]::Now).ToString())' -Group '$($Variables.Branding.ProductLabel)' }" -replace '"', '\"') -Verb runAs
+ Start-Process "pwsh" ("-Command Import-Module NetSecurity; ('$($MissingMinerFirewallRules | ConvertTo-Json -Compress)' | ConvertFrom-Json) | ForEach-Object { New-NetFirewallRule -DisplayName (Split-Path `$_ | Split-Path -leaf) -Program `$_ -Description 'Inbound rule added by $($Variables.Branding.ProductLabel) $($Variables.Branding.Version) on $([DateTime]::Now.ToString())' -Group '$($Variables.Branding.ProductLabel)' }" -replace '"', '\"') -Verb runAs
}
Remove-Variable MissingMinerFirewallRules
}
}
}
}
- $Variables.MinersOptimal = $Variables.MinersBestPerDevice = $Variables.Miners_Device_Combos = $Variables.MinersBestPerDevice_Combos = $Variables.MinersBestPerDevice_Combo = [Miner[]]@()
If ($Miners.Where({ $_.Available })) {
Write-Message -Level Info "Selecting best miner$(If (@($Variables.EnabledDevices.Model | Select-Object -Unique).Count -gt 1) { "s" }) based on$(If ($Variables.CalculatePowerCost) { " profit (power cost $($Config.MainCurrency) $($Variables.PowerPricekWh)/kWâ‹…h)" } Else { " earning" })..."
If ($Miners.Where({ $_.Available }).Count -eq 1) {
- $Variables.MinersBestPerDevice_Combo = $Variables.MinersBestPerDevice = $Variables.MinersOptimal = $Miners.Where({ $_.Available })
+ $MinersBestPerDeviceCombo = $Variables.MinersBestPerDevice = $Variables.MinersOptimal = $Miners.Where({ $_.Available })
}
Else {
# Add running miner bonus
@@ -933,45 +944,46 @@ Do {
$Miners.Where({ $_.Status -eq [MinerStatus]::Running }).ForEach({ $_.$Bias *= $RunningMinerBonusFactor })
# Get the optimal miners per algorithm and device
- $Variables.MinersOptimal = @(($Miners.Where({ $_.Available }) | Group-Object { [String]$_.DeviceNames }, { [String]$_.Algorithms }).ForEach({ ($_.Group | Sort-Object -Descending -Property Benchmark, MeasurePowerConsumption, KeepRunning, Prioritize, $Bias, Activated, @{ Expression = { $_.WarmupTimes[1] + $_.MinDataSample }; Descending = $true }, @{ Expression = { [String]$_.Algorithms }; Descending = $false } -Top 1).ForEach({ $_.Optimal = $true; $_ }) }))
+ $Variables.MinersOptimal = @(($Miners.Where({ $_.Available -and $_.SideIndicator -ne "<=" -and -not $_.Benchmark -and -not $_.MeasurePowerConsumption }) | Group-Object { [String]$_.DeviceNames }, { [String]$_.Algorithms }).ForEach({ ($_.Group | Sort-Object -Descending -Property KeepRunning, Prioritize, $Bias, Activated, @{ Expression = { $_.WarmupTimes[1] + $_.MinDataSample }; Descending = $true }, @{ Expression = { [String]$_.Algorithms }; Descending = $false } -Top 1).ForEach({ $_.Optimal = $true; $_ }) }))
# Get the best miners per device
- $Variables.MinersBestPerDevice = @(($Miners.Where({ $_.Available }) | Group-Object { [String]$_.DeviceNames }).ForEach({ $_.Group | Sort-Object -Descending -Property Benchmark, MeasurePowerConsumption, KeepRunning, Prioritize, $Bias, Activated, @{ Expression = { $_.WarmupTimes[1] + $_.MinDataSample }; Descending = $true } -Top 1 }))
- $Variables.Miners_Device_Combos = @((Get-Combination @($Variables.MinersBestPerDevice | Select-Object DeviceNames -Unique)).Where({ (Compare-Object ($_.Combination | Select-Object -ExpandProperty DeviceNames -Unique) ($_.Combination | Select-Object -ExpandProperty DeviceNames) | Measure-Object).Count -eq 0 }))
+ $Variables.MinersBestPerDevice = @(($Miners.Where({ $_.Available -and $_.SideIndicator -ne "<=" }) | Group-Object { [String]$_.DeviceNames }).ForEach({ $_.Group | Sort-Object -Descending -Property Benchmark, MeasurePowerConsumption, KeepRunning, Prioritize, $Bias, Activated, @{ Expression = { $_.WarmupTimes[1] + $_.MinDataSample }; Descending = $true } -Top 1 }))
+ $Variables.MinersDeviceCombos = @((Get-Combination @($Variables.MinersBestPerDevice | Select-Object DeviceNames -Unique)).Where({ (Compare-Object ($_.Combination | Select-Object -ExpandProperty DeviceNames -Unique) ($_.Combination | Select-Object -ExpandProperty DeviceNames) | Measure-Object).Count -eq 0 }))
# Get most best miner combination i.e. AMD+NVIDIA+CPU
- $Variables.MinersBestPerDevice_Combos = @(
- $Variables.Miners_Device_Combos.ForEach(
+ $MinersBestPerDeviceCombos = @(
+ $Variables.MinersDeviceCombos.ForEach(
{
- $Miner_Device_Combo = $_.Combination
+ $MinerDeviceCombo = $_.Combination
[PSCustomObject]@{
- Combination = $Miner_Device_Combo.ForEach(
+ Combination = $MinerDeviceCombo.ForEach(
{
- $Miner_Device_Count = $_.DeviceNames.Count
- [Regex]$Miner_Device_Regex = "^(" + (($_.DeviceNames.ForEach({ [Regex]::Escape($_) })) -join '|') + ")$"
- $Variables.MinersBestPerDevice.Where({ ([Array]$_.DeviceNames -notmatch $Miner_Device_Regex).Count -eq 0 -and ([Array]$_.DeviceNames -match $Miner_Device_Regex).Count -eq $Miner_Device_Count })
+ $MinerDeviceCount = $_.DeviceNames.Count
+ [Regex]$MinerDeviceRegex = "^(" + (($_.DeviceNames.ForEach({ [Regex]::Escape($_) })) -join '|') + ")$"
+ $Variables.MinersBestPerDevice.Where({ ([Array]$_.DeviceNames -notmatch $MinerDeviceRegex).Count -eq 0 -and ([Array]$_.DeviceNames -match $MinerDeviceRegex).Count -eq $MinerDeviceCount })
}
)
}
}
)
)
- $Variables.MinersBestPerDevice_Combo = @(($Variables.MinersBestPerDevice_Combos | Sort-Object -Descending { @($_.Combination.Where({ [Double]::IsNaN($_.$Bias) })).Count }, { ($_.Combination | Measure-Object $Bias -Sum | Select-Object -ExpandProperty Sum) }, { ($_.Combination.Where({ $_.$Bias -ne 0 }) | Measure-Object).Count } -Top 1).Combination)
+ $MinersBestPerDeviceCombo = @(($MinersBestPerDeviceCombos | Sort-Object -Descending { @($_.Combination.Where({ [Double]::IsNaN($_.$Bias) })).Count }, { $_.Combination | Measure-Object $Bias -Sum | Select-Object -ExpandProperty Sum }, { ($_.Combination.Where({ $_.$Bias -ne 0 }) | Measure-Object).Count } -Top 1).Combination)
# Revert running miner bonus
$Miners.Where({ $_.Status -eq [MinerStatus]::Running }).ForEach({ $_.$Bias /= $RunningMinerBonusFactor })
- Remove-Variable Bias, Miner_Device_Combo, Miner_Device_Count, Miner_Device_Regex, RunningMinerBonusFactor -ErrorAction Ignore
+ Remove-Variable Bias, MinerDeviceCombo, MinerDeviceCount, MinerDeviceRegex, RunningMinerBonusFactor -ErrorAction Ignore
}
- $Variables.PowerConsumptionIdleSystemW = (($Config.PowerConsumptionIdleSystemW - ($Variables.MinersBestPerDevice_Combo.Where({ $_.Type -eq "CPU" }) | Measure-Object PowerConsumption -Sum | Select-Object -ExpandProperty Sum)), 0 | Measure-Object -Maximum | Select-Object -ExpandProperty Maximum)
+ $Variables.PowerConsumptionIdleSystemW = (($Config.PowerConsumptionIdleSystemW - ($MinersBestPerDeviceCombo.Where({ $_.Type -eq "CPU" }) | Measure-Object PowerConsumption -Sum | Select-Object -ExpandProperty Sum)), 0 | Measure-Object -Maximum | Select-Object -ExpandProperty Maximum)
$Variables.BasePowerCost = [Double]($Variables.PowerConsumptionIdleSystemW / 1000 * 24 * $Variables.PowerPricekWh / $Variables.Rates.($Config.PayoutCurrency).($Config.MainCurrency))
- $Variables.MiningEarning = [Double]($Variables.MinersBestPerDevice_Combo | Measure-Object Earning_Bias -Sum | Select-Object -ExpandProperty Sum)
- $Variables.MiningPowerCost = [Double]($Variables.MinersBestPerDevice_Combo | Measure-Object PowerCost -Sum | Select-Object -ExpandProperty Sum)
- $Variables.MiningPowerConsumption = [Double]($Variables.MinersBestPerDevice_Combo | Measure-Object PowerConsumption -Sum | Select-Object -ExpandProperty Sum)
- $Variables.MiningProfit = [Double](($Variables.MinersBestPerDevice_Combo | Measure-Object Profit_Bias -Sum | Select-Object -ExpandProperty Sum) - $Variables.BasePowerCost)
+ $Variables.MiningEarning = [Double]($MinersBestPerDeviceCombo | Measure-Object Earning_Bias -Sum | Select-Object -ExpandProperty Sum)
+ $Variables.MiningPowerCost = [Double]($MinersBestPerDeviceCombo | Measure-Object PowerCost -Sum | Select-Object -ExpandProperty Sum)
+ $Variables.MiningPowerConsumption = [Double]($MinersBestPerDeviceCombo | Measure-Object PowerConsumption -Sum | Select-Object -ExpandProperty Sum)
+ $Variables.MiningProfit = [Double](($MinersBestPerDeviceCombo | Measure-Object Profit_Bias -Sum | Select-Object -ExpandProperty Sum) - $Variables.BasePowerCost)
}
Else {
+ $Variables.MinersOptimal = $Variables.MinersBestPerDevice = $Variables.MinersDeviceCombos = $MinersBestPerDeviceCombos = $MinersBestPerDeviceCombo = [Miner[]]@()
$Variables.MiningEarning = $Variables.MiningProfit = $Variables.MiningPowerCost = $Variables.MiningPowerConsumption = [Double]0
}
}
@@ -981,7 +993,7 @@ Do {
# ProfitabilityThreshold check - OK to run miners?
If ($Variables.DonationRunning -or (-not $Config.CalculatePowerCost -and $Variables.MiningEarning -ge ($Config.ProfitabilityThreshold / $Variables.Rates.BTC.($Config.MainCurrency))) -or ($Config.CalculatePowerCost -and $Variables.MiningProfit -ge ($Config.ProfitabilityThreshold / $Variables.Rates.BTC.($Config.MainCurrency))) -or $Variables.MinersNeedingBenchmark -or $Variables.MinersNeedingPowerConsumptionMeasurement) {
- $Variables.MinersBestPerDevice_Combo.ForEach({ $_.Best = $true })
+ $MinersBestPerDeviceCombo.ForEach({ $_.Best = $true })
If ($Variables.Rates.($Config.PayoutCurrency)) {
If ($Variables.MinersNeedingBenchmark.Count) {
$Variables.Summary = "Earning / day: n/a (Benchmarking: $($Variables.MinersNeedingBenchmark.Count) $(If ($Variables.MinersNeedingBenchmark.Count -eq 1) { "miner" } Else { "miners" }) left$(If ($Variables.EnabledDevices.Count -gt 1) { " [$((($Variables.MinersNeedingBenchmark | Group-Object -Property { $_.DeviceNames } | Sort-Object -Property Name).ForEach({ "$($_.Name): $($_.Count)" })) -join ', ')]" }))"
@@ -1013,10 +1025,10 @@ Do {
If ($Variables.Summary -ne "") { $Variables.Summary += " " }
If ([Double]::IsNaN($Variables.MiningEarning) -or [Double]::IsNaN($Variables.MiningPowerCost)) {
- $Variables.Summary += "Power Cost / day: n/a [Miner$(If ($Variables.MinersBestPerDevice_Combo.Count -ne 1) { "s" }): n/a; Base: {1:n} {0} ({2:n2} W)]" -f $Config.MainCurrency, ($Variables.BasePowerCost * $Variables.Rates.($Config.PayoutCurrency).($Config.MainCurrency)), $Variables.PowerConsumptionIdleSystemW
+ $Variables.Summary += "Power Cost / day: n/a [Miner$(If ($MinersBestPerDeviceCombo.Count -ne 1) { "s" }): n/a; Base: {1:n} {0} ({2:n2} W)]" -f $Config.MainCurrency, ($Variables.BasePowerCost * $Variables.Rates.($Config.PayoutCurrency).($Config.MainCurrency)), $Variables.PowerConsumptionIdleSystemW
}
ElseIf ($Variables.MiningPowerConsumption -gt 0) {
- $Variables.Summary += "Power Cost / day: {1:n} {0} [Miner$(If ($Variables.MinersBestPerDevice_Combo.Count -ne 1) { "s" }): {2:n} {0} ({3:n2} W); Base: {4:n} {0} ({5:n2} W)]" -f $Config.MainCurrency, (($Variables.MiningPowerCost + $Variables.BasePowerCost) * $Variables.Rates.($Config.PayoutCurrency).($Config.MainCurrency)), ($Variables.MiningPowerCost * $Variables.Rates.($Config.PayoutCurrency).($Config.MainCurrency)), $Variables.MiningPowerConsumption, ($Variables.BasePowerCost * $Variables.Rates.($Config.PayoutCurrency).($Config.MainCurrency)), $Variables.PowerConsumptionIdleSystemW
+ $Variables.Summary += "Power Cost / day: {1:n} {0} [Miner$(If ($MinersBestPerDeviceCombo.Count -ne 1) { "s" }): {2:n} {0} ({3:n2} W); Base: {4:n} {0} ({5:n2} W)]" -f $Config.MainCurrency, (($Variables.MiningPowerCost + $Variables.BasePowerCost) * $Variables.Rates.($Config.PayoutCurrency).($Config.MainCurrency)), ($Variables.MiningPowerCost * $Variables.Rates.($Config.PayoutCurrency).($Config.MainCurrency)), $Variables.MiningPowerConsumption, ($Variables.BasePowerCost * $Variables.Rates.($Config.PayoutCurrency).($Config.MainCurrency)), $Variables.PowerConsumptionIdleSystemW
}
Else {
$Variables.Summary += "Power Cost / day: n/a [Miner: n/a; Base: {1:n} {0} ({2:n2} W)]" -f $Config.MainCurrency, ($Variables.BasePowerCost * $Variables.Rates.BTC.($Config.MainCurrency)), $Variables.PowerConsumptionIdleSystemW
@@ -1038,7 +1050,7 @@ Do {
}
Else {
# Mining earning/profit is below threshold
- $Variables.MinersBestPerDevice_Combo = [Miner[]]@()
+ $MinersBestPerDeviceCombo = [Miner[]]@()
If ($Config.CalculatePowerCost) {
$Variables.Summary = "Mining profit {0} {1:n$($Config.DecimalsMax)} / day is below the configured threshold of {0} {2:n$($Config.DecimalsMax)} / day. Mining is suspended until threshold is reached." -f $Config.MainCurrency, (($Variables.MiningEarning - $Variables.MiningPowerCost - $Variables.BasePowerCost) * $Variables.Rates.($Config.PayoutCurrency).($Config.MainCurrency)), $Config.ProfitabilityThreshold
}
@@ -1057,21 +1069,21 @@ Do {
}
}
- If (-not $Variables.MinersBestPerDevice_Combo -and $Miners) { $Miners.ForEach({ $_.Best = $false }) }
+ If (-not $MinersBestPerDeviceCombo -and $Miners) { $Miners.ForEach({ $_.Best = $false }) }
# Stop running miners
- ForEach ($Miner in @($Miners.Where({ $_.Status -notin @([MinerStatus]::Idle, [MinerStatus]::Unavailable) }) | Sort-Object -Property { $_.DeviceNames })) {
+ ForEach ($Miner in @($Miners.Where({ $_.Status -in @([MinerStatus]::DryRun, [MinerStatus]::Running) }) | Sort-Object -Property { $_.DeviceNames })) {
If ($Miner.Status -eq [MinerStatus]::Running -and $Miner.GetStatus() -ne [MinerStatus]::Running) {
$Miner.StatusInfo = "Error: '$($Miner.Info)' exited unexpectedly"
$Miner.SetStatus([MinerStatus]::Failed)
}
Else {
If ($Miner.Benchmark -or $Miner.MeasurePowerConsumption) {
- If ($Miner.Activated -le 0) { $Miner.Restart = $true }
+ If ($Miner.Activated -lt 1) { $Miner.Restart = $true } # Re-benchmark sets Activated to 0
}
- ElseIf ($Config.DryRun -and $Miner.GetStatus() -eq [MinerStatus]::Running) { $Miner.Restart = $true }
+ ElseIf ($Config.DryRun -and $Miner.Status -ne [MinerStatus]::DryRun) { $Miner.Restart = $true }
ElseIf (-not $Config.DryRun -and $Miner.Status -eq [MinerStatus]::DryRun) { $Miner.Restart = $true }
- If (-not $Miner.Best -or $Miner.Restart -or $Miner.SideIndicator -eq "<=" -or $Variables.NewMiningStatus -ne "Running") {
+ If ($Miner.Restart -or $Miner.SideIndicator -eq "<=" -or $Variables.NewMiningStatus -ne "Running" -or -not $Miner.Best) {
ForEach ($Worker in $Miner.WorkersRunning) {
If ($WatchdogTimers = @($Variables.WatchdogTimers.Where({ $_.MinerName -eq $Miner.Name -and $_.PoolName -eq $Worker.Pool.Name -and $_.PoolRegion -eq $Worker.Pool.Region -and $_.Algorithm -eq $Worker.Pool.Algorithm -and $_.DeviceNames -eq $Miner.DeviceNames }))) {
# Remove Watchdog timers
@@ -1089,7 +1101,7 @@ Do {
# Kill stuck miners on subsequent cycles when not in dry run mode
If (-not $Config.DryRun -or $Variables.CycleStarts.Count -eq 1 -or $Variables.MinersNeedingBenchmark -or $Variables.MinersNeedingPowerConsumptionMeasurement) {
$Loops = 0
- # Some miners, e.g. BzMiner spawn a second executable. These instances do not have a command line beginning with a drive letter
+ # Some miners, e.g. BzMiner spawn a second executable
While ($StuckMinerProcessIDs = @((Get-CimInstance CIM_Process).Where({ $_.ExecutablePath -and ($Miners.Path | Sort-Object -Unique) -contains $_.ExecutablePath -and (Get-CimInstance win32_process -Filter "ParentProcessId = $($_.ProcessId)") -and $Miners.ProcessID -notcontains $_.ProcessID }) | Select-Object -ExpandProperty ProcessID)) {
$StuckMinerProcessIDs.ForEach(
{
@@ -1101,15 +1113,14 @@ Do {
Start-Sleep -Milliseconds 500
$Loops ++
If ($Loops -gt 50) {
- $Message = "Cannot stop all miners graciously."
If ($Config.AutoReboot) {
- Write-Message -Level Error "$Message Restarting computer in 30 seconds..."
+ Write-Message -Level Error "$(If ($StuckMinerProcessIDs.Count -eq 1) { "A miner " } Else { "Some miners are" }) stuck and cannot get stopped graciously. Restarting computer in 30 seconds..."
shutdown.exe /r /t 30 /c "$($Variables.Branding.ProductLabel) detected stuck miner$(If ($StuckMinerProcessIDs.Count -ne 1) { "s" }) and will reboot the computer in 30 seconds."
Start-Sleep -Seconds 60
}
Else {
- Write-Message -Level Error $Message
- Start-Sleep -Seconds 30
+ Write-Message -Level Error "$(If ($StuckMinerProcessIDs.Count -eq 1) { "A miner " } Else { "Some miners are" }) stuck and cannot get stopped graciously. It is recommended to restart the computer."
+ Start-Sleep -Seconds 30
}
}
}
@@ -1118,28 +1129,28 @@ Do {
$Miners.ForEach(
{
- If ($_.Reasons -and $_.Status -ne [MinerStatus]::Disabled) {
- $_.Status = "Unavailable"
+ If ($_.Disabled) {
+ $_.Status = [MinerStatus]::Disabled
+ $_.SubStatus = "Disabled"
+ }
+ ElseIf (-not $_.Available) {
+ $_.Status = [MinerStatus]::Unavailable
$_.SubStatus = "Unavailable"
}
ElseIf ($_.Status -eq [MinerStatus]::Idle) {
$_.SubStatus = "Idle"
}
- ElseIf ($_.Status -eq [MinerStatus]::Unavailable) {
- $_.Status = "Idle"
- $_.SubStatus = "Idle"
- }
}
)
# Update data in API
$Variables.Miners = [Miner[]]@($Miners.Where({ $_.SideIndicator -ne "<=" }))
+ $Variables.MinersBestPerDeviceCombo = $MinersBestPerDeviceCombo
+ Remove-Variable Miners, MinersBestPerDeviceCombo -ErrorAction Ignore
+
$Variables.Miners.ForEach({ $_.PSObject.Properties.Remove("SideIndicator") })
- Remove-Variable Miners
- If (-not ($Variables.EnabledDevices -and $Variables.Miners.Where({ $_.Available }))) {
- $Variables.Miners.ForEach({ $_.Status = [MinerStatus]::Idle; $_.StatusInfo = "Idle" })
- $Variables.Devices.Where({ $_.State -eq [DeviceState]::Enabled }).ForEach({ $_.Status = [MinerStatus]::Idle; $_.StatusInfo = "Idle" })
+ If (-not ($Variables.EnabledDevices -and $Variables.Miners.Where({ $_.Available }))) {
$Variables.Miners = [Miner[]]@()
$Variables.RefreshNeeded = $true
If (-not $Variables.EnabledDevices) {
@@ -1165,7 +1176,7 @@ Do {
Continue
}
- If (-not $Variables.MinersBestPerDevice_Combo) {
+ If (-not $Variables.MinersBestPerDeviceCombo) {
$Variables.Miners.ForEach({ $_.Status = [MinerStatus]::Idle; $_.StatusInfo = "Idle" })
$Variables.Devices.Where({ $_.State -eq [DeviceState]::Enabled }).ForEach({ $_.Status = [MinerStatus]::Idle; $_.StatusInfo = "Idle" })
$Variables.RefreshNeeded = $true
@@ -1181,8 +1192,7 @@ Do {
# Optional delay to avoid blue screens
Start-Sleep -Seconds $Config.Delay
- ForEach ($Miner in $Variables.MinersBestPerDevice_Combo | Sort-Object -Property { $_.DeviceNames }) {
-
+ ForEach ($Miner in $Variables.MinersBestPerDeviceCombo | Sort-Object -Property { $_.DeviceNames }) {
If ($Miner.Status -ne [MinerStatus]::DryRun -and $Miner.GetStatus() -ne [MinerStatus]::Running) {
If ($Miner.Status -ne [MinerStatus]::DryRun) {
# Launch prerun if exists
@@ -1220,7 +1230,7 @@ Do {
}
# Add extra time when CPU mining and miner requires DAG creation
- If ($Miner.Workers.Pool.DAGSizeGiB -and $Variables.MinersBestPerDevice_Combo.Type -contains "CPU" -and -not $Config.DryRun) { $Miner.WarmupTimes[0] += 15 <# seconds #>}
+ If ($Miner.Workers.Pool.DAGSizeGiB -and $Variables.MinersBestPerDeviceCombo.Type -contains "CPU" -and -not $Config.DryRun) { $Miner.WarmupTimes[0] += 15 <# seconds #>}
# Add extra time when notebook runs on battery
If ($Miner.Workers.Pool.DAGSizeGiB -and (Get-CimInstance Win32_Battery).BatteryStatus -eq 1) { $Miner.WarmupTimes[0] += 90 <# seconds #>}
@@ -1262,7 +1272,7 @@ Do {
}
}
- ForEach ($Miner in $Variables.MinersBestPerDevice_Combo | Sort-Object -Property { $_.DeviceNames }) {
+ ForEach ($Miner in $Variables.MinersBestPerDeviceCombo | Sort-Object -Property { $_.DeviceNames }) {
If ($Message = "$(If ($Miner.Benchmark) { "Benchmark" })$(If ($Miner.Benchmark -and $Miner.MeasurePowerConsumption) { " and " })$(If($Miner.MeasurePowerConsumption) { "Power consumption measurement" })") {
$Message = $Message.Substring(0, 1).toUpper() + $Message.Substring(1).toLower()
Write-Message -Level Verbose "$Message for miner '$($Miner.Info)' in progress [Attempt $($Miner.Activated) of $($Variables.WatchdogCount + 1); min. $($Miner.MinDataSample) samples]..."
@@ -1295,7 +1305,7 @@ Do {
$Variables.EndCycleTime = [DateTime]::Now.ToUniversalTime().AddSeconds($Config.Interval)
}
- $Variables.RunningMiners = @($Variables.MinersBestPerDevice_Combo | Sort-Object -Descending -Property Benchmark, MeasurePowerConsumption)
+ $Variables.RunningMiners = @($Variables.MinersBestPerDeviceCombo | Sort-Object -Descending -Property Benchmark, MeasurePowerConsumption)
$Variables.BenchmarkingOrMeasuringMiners = [Miner[]]@()
$Variables.FailedMiners = [Miner[]]@()
@@ -1347,7 +1357,7 @@ Do {
}
}
Else {
- Write-Message -Level Verbose "$($Miner.Name) data sample discarded [$(($Sample.Hashrate.PSObject.Properties.Name.ForEach({ "$($_): $(($Sample.Hashrate.$_ | ConvertTo-Hash) -replace ' ')$(If ($Config.ShowShares) { " / Shares Total: $($Sample.Shares.$_[3]), Rejected: $($Sample.Shares.$_[1]), Ignored: $($Sample.Shares.$_[2])" })" })) -join ' & ')$(If ($Sample.PowerConsumption) { " / Power consumption: $($Sample.PowerConsumption.ToString("N2"))W" })] (Miner is warming up [$((([DateTime]::Now).ToUniversalTime() - $Miner.ValidDataSampleTimestamp).TotalSeconds.ToString("0")) sec])"
+ Write-Message -Level Verbose "$($Miner.Name) data sample discarded [$(($Sample.Hashrate.PSObject.Properties.Name.ForEach({ "$($_): $(($Sample.Hashrate.$_ | ConvertTo-Hash) -replace ' ')$(If ($Config.ShowShares) { " / Shares Total: $($Sample.Shares.$_[3]), Rejected: $($Sample.Shares.$_[1]), Ignored: $($Sample.Shares.$_[2])" })" })) -join ' & ')$(If ($Sample.PowerConsumption) { " / Power consumption: $($Sample.PowerConsumption.ToString("N2"))W" })] (Miner is warming up [$(([DateTime]::Now.ToUniversalTime() - $Miner.ValidDataSampleTimestamp).TotalSeconds.ToString("0")) sec])"
$Miner.SubStatus = "WarmingUp"
$Miner.StatusInfo = "Warming up '$($Miner.Info)'"
}
@@ -1403,10 +1413,10 @@ Do {
# Exit loop when
# - a miner crashed and no other miners are benchmarking or measuring power consumption
- # - all benchmarking miners have collected enough samples
+ # - a benchmarking miner haa collected enough samples
# - WarmupTimes[0] is reached and no readout from miner
# - Interval time is over
- } While ($variables.NewMiningStatus -eq "Running" -and -not $Variables.EndCycleMessage -and (([DateTime]::Now).ToUniversalTime() -le $Variables.EndCycleTime -or $Variables.BenchmarkingOrMeasuringMiners))
+ } While ($variables.NewMiningStatus -eq "Running" -and -not $Variables.EndCycleMessage -and ([DateTime]::Now.ToUniversalTime() -le $Variables.EndCycleTime -or $Variables.BenchmarkingOrMeasuringMiners))
Get-Job -State "Completed" | Receive-Job | Out-Null
Get-Job -State "Completed" | Remove-Job -Force -ErrorAction Ignore | Out-Null
diff --git a/Includes/Dev/DevAPI.ps1 b/Includes/Dev/DevAPI.ps1
index 12a301c7..01439ba3 100644
--- a/Includes/Dev/DevAPI.ps1
+++ b/Includes/Dev/DevAPI.ps1
@@ -616,7 +616,7 @@ Switch ($Path) {
Break
}
"/displayworkers" {
- If ($Config.ShowWorkerStatus -and $Config.MonitoringUser -and $Config.MonitoringServer -and $Variables.WorkersLastUpdated -lt ([DateTime]::Now).AddSeconds(-30)) {
+ If ($Config.ShowWorkerStatus -and $Config.MonitoringUser -and $Config.MonitoringServer -and $Variables.WorkersLastUpdated -lt [DateTime]::Now.AddSeconds(-30)) {
Read-MonitoringData
}
$Workers = [System.Collections.ArrayList]@(
@@ -706,8 +706,8 @@ Switch ($Path) {
$Data = ConvertTo-Json -Depth 4 @($Variables.Miners | Where-Object Available -NE $true | Select-Object -Property * -ExcludeProperty Data, DataReaderJob, Devices, Process, SideIndicator | Sort-Object DeviceName, Name, Algorithm)
Break
}
- "/miners_device_combos" {
- $Data = ConvertTo-Json -Depth 4 @($Variables.Miners_Device_Combos | Select-Object -Property * -ExcludeProperty Data, DataReaderJob, Devices, Process, SideIndicator)
+ "/MinersDeviceCombos" {
+ $Data = ConvertTo-Json -Depth 4 @($Variables.MinersDeviceCombos | Select-Object -Property * -ExcludeProperty Data, DataReaderJob, Devices, Process, SideIndicator)
Break
}
"/miningpowercost" {
diff --git a/Includes/Dev/GetMinerData2.ps1 b/Includes/Dev/GetMinerData2.ps1
index 33d488d7..0e5e2fac 100644
--- a/Includes/Dev/GetMinerData2.ps1
+++ b/Includes/Dev/GetMinerData2.ps1
@@ -38,14 +38,14 @@ Try {
$Miner.
While ($true) {
"$($Miner.name) '$($Miner.DataCollectInterval)'" >> "$($Miner.Name)_Debug.txt"
- $NextLoop = ([DateTime]::Now).AddSeconds($Miner.DataCollectInterval)
+ $NextLoop = [DateTime]::Now.AddSeconds($Miner.DataCollectInterval)
If ($Data = $Miner.GetMinerData()) {
$Miner.LastSample = $Data
$Miner.Data.Add($Data)
$Data | ConvertTo-Json >> "$($Miner.name)_Data.txt"
}
- While (([DateTime]::Now) -lt $NextLoop) { Start-Sleep -Milliseconds 200 }
+ While ([DateTime]::Now -lt $NextLoop) { Start-Sleep -Milliseconds 200 }
}
}
Catch {
diff --git a/Includes/Dev/GetMinerDataRunspace.ps1 b/Includes/Dev/GetMinerDataRunspace.ps1
index 5030d779..6ec550d6 100644
--- a/Includes/Dev/GetMinerDataRunspace.ps1
+++ b/Includes/Dev/GetMinerDataRunspace.ps1
@@ -19,7 +19,7 @@ $PowerShell.AddScript(
$Data = [PSCustomObject]@{ }
While ($true) {
- $NextLoop = ([DateTime]::Now).AddSeconds($Miner.DataCollectInterval)
+ $NextLoop = [DateTime]::Now.AddSeconds($Miner.DataCollectInterval)
Try {
"$($Miner.name) '$($Miner.DataCollectInterval)' 1" >> "$($Miner.Name)_Debug.txt"
If ($Data = $Miner.GetMinerData()) {
@@ -33,7 +33,7 @@ $PowerShell.AddScript(
"$($Miner.name) '$($Miner.DataCollectInterval)' 3" >> "$($Miner.Name)_Debug.txt"
$Error[0] >> "$($Miner.Name)_Debug.txt"
}
- While (([DateTime]::Now) -lt $NextLoop) { Start-Sleep -Milliseconds 200 }
+ While (([DateTime]::Now -lt $NextLoop) { Start-Sleep -Milliseconds 200 }
}
}
)
diff --git a/Includes/Downloader.ps1 b/Includes/Downloader.ps1
index ef76f89e..da568f03 100644
--- a/Includes/Downloader.ps1
+++ b/Includes/Downloader.ps1
@@ -18,7 +18,7 @@ along with this program. If not, see P' pressed. Core cycle is running again." -ForegroundColor Cyan
- If (([DateTime]::Now).ToUniversalTime() -gt $Variables.EndCycleTime) { $Variables.EndCycleTime = [DateTime]::Now.ToUniversalTime() }
+ If ([DateTime]::Now.ToUniversalTime() -gt $Variables.EndCycleTime) { $Variables.EndCycleTime = [DateTime]::Now.ToUniversalTime() }
}
}
Else {
@@ -831,7 +831,7 @@ Function MainLoop {
If ($Variables.RefreshNeeded) {
$Variables.RefreshNeeded = $false
- $host.UI.RawUI.WindowTitle = "$($Variables.Branding.ProductLabel) $($Variables.Branding.Version) - Runtime: {0:dd} days {0:hh} hrs {0:mm} mins - Path: $($Variables.Mainpath)" -f [TimeSpan](([DateTime]::Now).ToUniversalTime() - $Variables.ScriptStartTime)
+ $host.UI.RawUI.WindowTitle = "$($Variables.Branding.ProductLabel) $($Variables.Branding.Version) - Runtime: {0:dd} days {0:hh} hrs {0:mm} mins - Path: $($Variables.Mainpath)" -f [TimeSpan]([DateTime]::Now.ToUniversalTime() - $Variables.ScriptStartTime)
If ($LegacyGUIForm) {
$LegacyGUIForm.Text = $host.UI.RawUI.WindowTitle
@@ -926,19 +926,19 @@ Function MainLoop {
Remove-Variable Bias, Miner_Table, MinersDeviceGroup, MinersDeviceGroupNeedingBenchmark, MinersDeviceGroupNeedingPowerConsumptionMeasurement -ErrorAction Ignore
}
- If ($Variables.MinersBestPerDevice_Combo) {
- Write-Host "`nRunning $(If ($Variables.MinersBestPerDevice_Combo.Count -eq 1) { "miner:" } Else { "miners: $($Variables.MinersBestPerDevice_Combo.Count)" })"
+ If ($Variables.MinersBestPerDeviceCombo) {
+ Write-Host "`nRunning $(If ($Variables.MinersBestPerDeviceCombo.Count -eq 1) { "miner:" } Else { "miners: $($Variables.MinersBestPerDeviceCombo.Count)" })"
[System.Collections.ArrayList]$Miner_Table = @(
@{ Label = "Name"; Expression = { $_.Name } }
If ($Config.CalculatePowerCost -and $Variables.ShowPowerConsumption) { @{ Label = "Power Consumption"; Expression = { If ([Double]::IsNaN($_.PowerConsumption_Live)) { "n/a" } Else { "$($_.PowerConsumption_Live.ToString("N2")) W" } }; Align = "right" } }
@{ Label = "Hashrate"; Expression = { $_.Hashrates_Live.ForEach({ If ([Double]::IsNaN($_)) { "n/a" } Else { $_ | ConvertTo-Hash } }) -join ' & ' }; Align = "right" }
- @{ Label = "Active (this run)"; Expression = { "{0:dd}d {0:hh}h {0:mm}m {0:ss}s" -f (([DateTime]::Now).ToUniversalTime() - $_.BeginTime) } }
+ @{ Label = "Active (this run)"; Expression = { "{0:dd}d {0:hh}h {0:mm}m {0:ss}s" -f ([DateTime]::Now.ToUniversalTime() - $_.BeginTime) } }
@{ Label = "Active (total)"; Expression = { "{0:dd}d {0:hh}h {0:mm}m {0:ss}s" -f ($_.TotalMiningDuration) } }
@{ Label = "Cnt"; Expression = { Switch ($_.Activated) { 0 { "Never" } 1 { "Once" } Default { "$_" } } } }
@{ Label = "Device(s)"; Expression = { $_.DeviceNames -join ',' } }
@{ Label = "Command"; Expression = { $_.CommandLine } }
)
- $Variables.MinersBestPerDevice_Combo | Sort-Object -Property { $_.DeviceNames } | Format-Table $Miner_Table -Wrap | Out-Host
+ $Variables.MinersBestPerDeviceCombo | Sort-Object -Property { $_.DeviceNames } | Format-Table $Miner_Table -Wrap | Out-Host
Remove-Variable Miner_Table
}
@@ -990,7 +990,7 @@ Function MainLoop {
@{Label = "Pool"; Expression = { $_.PoolName } },
@{Label = "Algorithm"; Expression = { $_.Algorithm } },
@{Label = "Device(s)"; Expression = { $_.DeviceNames -join ',' } },
- @{Label = "Last Updated"; Expression = { "{0:mm} min {0:ss} sec ago" -f (([DateTime]::Now).ToUniversalTime() - $_.Kicked) }; Align = "right" }
+ @{Label = "Last Updated"; Expression = { "{0:mm} min {0:ss} sec ago" -f ([DateTime]::Now.ToUniversalTime() - $_.Kicked) }; Align = "right" }
) | Out-Host
}
}
diff --git a/Version.txt b/Version.txt
index fad3a6a5..48177a8d 100644
--- a/Version.txt
+++ b/Version.txt
@@ -1,6 +1,6 @@
{
"Product": "UG-Miner",
- "Version": "6.2.2",
+ "Version": "6.2.3",
"AutoUpdate": true,
"RequireRestart": true,
"Uri": "https://github.com/UselessGuru/UG-Miner/archive/refs/heads/master.zip",
diff --git a/Web/APIdocs.html b/Web/APIdocs.html
index 9b851ce7..821ba271 100644
--- a/Web/APIdocs.html
+++ b/Web/APIdocs.html
@@ -16,7 +16,7 @@
Product: UG-Miner
File: API.psm1
-Version: 6.2.2
+Version: 6.2.3
version date: 2024/03/28
-->
@@ -24,7 +24,7 @@
- UG-Miner API (version 0.5.4.1)
+ UG-Miner API (version 0.5.4.2)
API data is available at http://localhost:[API port]/<resource>.Functions
/functions/stat/set
/functions/pool/enable
Balance data
data-show-refresh="true"
data-show-search-clear-button="true"
data-show-toggle="false"
+ data-sort-select-options="true"
data-toggle="table"
data-toolbar="#toolbar"
data-url="/balancedata"
diff --git a/Web/configedit.html b/Web/configedit.html
index 834ca11e..355183f9 100644
--- a/Web/configedit.html
+++ b/Web/configedit.html
@@ -1190,7 +1190,7 @@ Edit configuration
required: false,
minlength: 3,
maxlength: 1024,
- pattern: '^[+|-]([A-Za-z0-9]{2,}?)+(?:,[+|-]([A-Za-z0-9]{2,})+)*$'
+ pattern: '^[+|-]([A-Za-z0-9\(\))]{2,}?)+(?:,[+|-]([A-Za-z0-9\(\)]{2,})+)*$'
},
PowerConsumptionIdleSystemW: {
digits: true,
diff --git a/Web/css/main.css b/Web/css/main.css
index 6b67c79c..f402e8f0 100644
--- a/Web/css/main.css
+++ b/Web/css/main.css
@@ -111,7 +111,7 @@ footer {
color: white;
font-size: 1.2rem;
line-height: 1.5;
- height: 5.4rem;
+ height: 4.8rem;
display: flex;
align-items: center;
justify-content: center;
diff --git a/Web/devices.html b/Web/devices.html
index ba323e48..4ddea492 100644
--- a/Web/devices.html
+++ b/Web/devices.html
@@ -27,6 +27,7 @@ Enabled devices
data-show-refresh="true"
data-show-search-clear-button="true"
data-show-toggle="true"
+ data-sort-select-options="true"
data-toggle="table"
data-toolbar="#toolbarenableddevices"
data-url="/devices/enabled"
@@ -101,6 +102,7 @@ Disabled devices
data-show-refresh="true"
data-show-search-clear-button="true"
data-show-toggle="true"
+ data-sort-select-options="true"
data-toggle="table"
data-toolbar="#toolbardisableddevices"
data-url="/devices/disabled"
@@ -173,6 +175,7 @@ Unsupported devices
data-show-refresh="true"
data-show-search-clear-button="true"
data-show-toggle="true"
+ data-sort-select-options="true"
data-toggle="table"
data-url="/devices/unsupported"
>
diff --git a/Web/index.html b/Web/index.html
index dfa13c64..0c18ae5e 100644
--- a/Web/index.html
+++ b/Web/index.html
@@ -31,6 +31,7 @@ Active miners
data-show-refresh="true"
data-show-search-clear-button="true"
data-show-toggle="true"
+ data-sort-select-options="true"
data-toggle="table"
data-toolbar="#toolbar"
data-undefined-text=""
@@ -40,13 +41,13 @@ Active miners
Devices
- Name
- Miner
- Version
+ Devices
+ Name
+ Miner
+ Version
Type
- Status
- Status Info
+ Status
+ Status Info
Earning
Earning (biased)
Power cost
@@ -56,30 +57,30 @@ Active miners
Power
BeginTime
Continous cycles
- Running time
- Primary algorithm
- Primary algorithm (variant)
- Primary currency
- Primary coin name
- Primary pool
- Primary pool (variant)
- Primary user
- Live
- Benchmarked
- Primary pool fee
- Primary miner fee
- Secondary algorithm
- Secondary algorithm (variant)
- Secondary currency
- Secondary coin name
- Secondary pool
- Secondary pool (variant)
- Secondary user
- Live
- Benchmarked
- Secondary pool fee
- Secondary miner fee
- Total mining duration
+ Running time
+ Primary algorithm
+ Primary algorithm (variant)
+ Primary currency
+ Primary coin name
+ Primary pool
+ Primary pool (variant)
+ Primary user
+ Live
+ Benchmarked
+ Primary pool fee
+ Primary miner fee
+ Secondary algorithm
+ Secondary algorithm (variant)
+ Secondary currency
+ Secondary coin name
+ Secondary pool
+ Secondary pool (variant)
+ Secondary user
+ Live
+ Benchmarked
+ Secondary pool fee
+ Secondary miner fee
+ Total mining duration
WarmupTimes
Environment variables
API Port
@@ -123,17 +124,17 @@ System log
$table.bootstrapTable('hideColumn', 'PowerCost');
}
if (config.DisableDualAlgoMining == true) {
- $table.bootstrapTable('hideColumn', 'tSecondaryPool');
- $table.bootstrapTable('hideColumn', 'tSecondaryAlgorithm');
- $table.bootstrapTable('hideColumn', 'tSecondaryHashrate');
- $table.bootstrapTable('hideColumn', 'tSecondaryHashrateLive');
- $table.bootstrapTable('hideColumn', 'tSecondaryPoolUser');
+ $table.bootstrapTable('hideColumn', 'SecondaryPool');
+ $table.bootstrapTable('hideColumn', 'SecondaryAlgorithm');
+ $table.bootstrapTable('hideColumn', 'SecondaryHashrate');
+ $table.bootstrapTable('hideColumn', 'SecondaryHashrateLive');
+ $table.bootstrapTable('hideColumn', 'SecondaryPoolUser');
} else {
- $table.bootstrapTable('showColumn', 'tSecondaryPool');
- $table.bootstrapTable('showColumn', 'tSecondaryAlgorithm');
- $table.bootstrapTable('showColumn', 'tSecondaryHashrate');
- $table.bootstrapTable('showColumn', 'tSecondaryHashrateLive');
- $table.bootstrapTable('showColumn', 'tSecondaryPoolUser');
+ $table.bootstrapTable('showColumn', 'SecondaryPool');
+ $table.bootstrapTable('showColumn', 'SecondaryAlgorithm');
+ $table.bootstrapTable('showColumn', 'SecondaryHashrate');
+ $table.bootstrapTable('showColumn', 'SecondaryHashrateLive');
+ $table.bootstrapTable('showColumn', 'SecondaryPoolUser');
}
},
diff --git a/Web/js/utilities.js b/Web/js/utilities.js
index 362e8362..e6b04a12 100644
--- a/Web/js/utilities.js
+++ b/Web/js/utilities.js
@@ -8,64 +8,60 @@ function formatMiners(data) {
try {
// Format miner link
if (item.MinerUri && item.Best && item.Status == 4) {
- item.tBaseName = '' + item.BaseName + ' ';
- item.tName = '' + item.Name + ' ';
- item.tStatusInfo = '' + item.StatusInfo + ' ';
- } else {
- item.tBaseName = item.BaseName;
- item.tName = item.Name;
- item.tStatusInfo = item.StatusInfo;
+ item.BaseName = '' + item.BaseName + ' ';
+ item.Name = '' + item.Name + ' ';
+ item.StatusInfo = '' + item.StatusInfo + ' ';
}
// Format the device(s)
- item.tDevices = formatArrayAsSortedString(item.DeviceNames);
+ item.Devices = formatArrayAsSortedString(item.DeviceNames);
// Format the pool and algorithm data
- item.tPrimaryMinerFee = item.Workers[0].Fee;
- item.tPrimaryHashrate = item.Workers[0].Hashrate;
- item.tPrimaryAlgorithm = item.Workers[0].Pool.Algorithm;
- item.tPrimaryAlgorithmVariant = item.Workers[0].Pool.AlgorithmVariant;
- item.tPrimaryCurrency = item.Workers[0].Pool.Currency;
- item.tPrimaryCoinName = item.Workers[0].Pool.CoinName;
- item.tPrimaryPool = item.Workers[0].Pool.Name;
- item.tPrimaryPoolVariant = item.Workers[0].Pool.Variant;
- item.tPrimaryPoolFee = item.Workers[0].Pool.Fee;
- item.tPrimaryPoolUser = item.Workers[0].Pool.User;
+ item.PrimaryMinerFee = item.Workers[0].Fee;
+ item.PrimaryHashrate = item.Workers[0].Hashrate;
+ item.PrimaryAlgorithm = item.Workers[0].Pool.Algorithm;
+ item.PrimaryAlgorithmVariant = item.Workers[0].Pool.AlgorithmVariant;
+ item.PrimaryCurrency = item.Workers[0].Pool.Currency;
+ item.PrimaryCoinName = item.Workers[0].Pool.CoinName;
+ item.PrimaryPool = item.Workers[0].Pool.Name;
+ item.PrimaryPoolVariant = item.Workers[0].Pool.Variant;
+ item.PrimaryPoolFee = item.Workers[0].Pool.Fee;
+ item.PrimaryPoolUser = item.Workers[0].Pool.User;
if (item.Workers.length > 1) {
- item.tSecondaryMinerFee = item.Workers[1].Fee;
- item.tSecondaryHashrate = item.Workers[1].Hashrate;
- item.tSecondaryAlgorithm = item.Workers[1].Pool.Algorithm;
- item.tSecondaryAlgorithmVariant = item.Workers[1].Pool.AlgorithmVariant;
- item.tSecondaryCurrency = item.Workers[1].Pool.Currency;
- item.tSecondaryCoinName = item.Workers[1].Pool.CoinName;
- item.tSecondaryPool = item.Workers[1].Pool.Name;
- item.tSecondaryPoolVariant = item.Workers[1].Pool.Variant;
- item.tSecondaryPoolFee = item.Workers[1].Pool.Fee;
- item.tSecondaryPoolUser = item.Workers[1].Pool.User;
+ item.SecondaryMinerFee = item.Workers[1].Fee;
+ item.SecondaryHashrate = item.Workers[1].Hashrate;
+ item.SecondaryAlgorithm = item.Workers[1].Pool.Algorithm;
+ item.SecondaryAlgorithmVariant = item.Workers[1].Pool.AlgorithmVariant;
+ item.SecondaryCurrency = item.Workers[1].Pool.Currency;
+ item.SecondaryCoinName = item.Workers[1].Pool.CoinName;
+ item.SecondaryPool = item.Workers[1].Pool.Name;
+ item.SecondaryPoolVariant = item.Workers[1].Pool.Variant;
+ item.SecondaryPoolFee = item.Workers[1].Pool.Fee;
+ item.SecondaryPoolUser = item.Workers[1].Pool.User;
}
// Format margin of error
- if (isNaN(item.Earning_Accuracy)) item.tEarningAccuracy = 'n/a';
- else item.tEarningAccuracy = formatPercent(item.Earning_Accuracy);
+ if (isNaN(item.Earning_Accuracy)) item.EarningAccuracy = 'n/a';
+ else item.EarningAccuracy = formatPercent(item.Earning_Accuracy);
// Format the live speed(s)
- item.tPrimaryHashrateLive = item.Hashrates_Live[0];
- item.tSecondaryHashrateLive = item.Hashrates_Live[1];
+ item.PrimaryHashrateLive = item.Hashrates_Live[0];
+ item.SecondaryHashrateLive = item.Hashrates_Live[1];
// Format Total Mining Duration (TimeSpan)
- if (item.TotalMiningDuration.Ticks > 0) item.tTotalMiningDuration = formatTimeSpan(item.TotalMiningDuration);
- else item.tTotalMiningDuration = "n/a";
+ if (item.TotalMiningDuration.Ticks > 0) item.TotalMiningDuration = formatTimeSpan(item.TotalMiningDuration);
+ else item.TotalMiningDuration = "n/a";
// Format Mining Duration (DateTime)
- if (item.BeginTime == "0001-01-01T00:00:00") item.tMiningDuration = "n/a";
- else item.tMiningDuration = formatTimeSince(item.BeginTime).replace(' ago' ,'').replace('just now', 'just started');
+ if (item.BeginTime == "0001-01-01T00:00:00") item.MiningDuration = "n/a";
+ else item.MiningDuration = formatTimeSince(item.BeginTime).replace(' ago' ,'').replace('just now', 'just started');
// Format status
- item.tStatus = enumminerstatus[item.Status];
+ item.Status = enumminerstatus[item.Status];
// Format warmup times
- item.tWarmupTimes0 = item.WarmupTimes[0];
- item.tWarmupTimes1 = item.WarmupTimes[1];
+ item.WarmupTimes0 = item.WarmupTimes[0];
+ item.WarmupTimes1 = item.WarmupTimes[1];
}
catch (error) {
console.error(item);
@@ -80,9 +76,9 @@ function formatPools(data) {
$.each(data, function(index, item) {
if (config.UsemBTC) factor = 1000;
else factor = 1;
- item.tPrice = item.Price * factor;
- item.tPrice_Bias = item.Price_Bias * factor;
- item.tStablePrice = item.StablePrice * factor;
+ item.Price = item.Price * factor;
+ item.Price_Bias = item.Price_Bias * factor;
+ item.StablePrice = item.StablePrice * factor;
});
return data;
}
diff --git a/Web/minersall.html b/Web/minersall.html
index d8329d39..10483d4c 100644
--- a/Web/minersall.html
+++ b/Web/minersall.html
@@ -39,6 +39,7 @@ All miners
data-show-refresh="true"
data-show-search-clear-button="true"
data-show-toggle="true"
+ data-sort-select-options="true"
data-toggle="table"
data-toolbar="#toolbar"
data-undefined-text=""
@@ -48,13 +49,14 @@ All miners
Name
- Miner
+ Name
+ Miner
Version
CommandLine
- Devices
+ Devices
Type
- Status
+ Status
+ Status Info
Reasons
Earning (biased)
Earning
@@ -62,33 +64,33 @@ All miners
Profit (biased)
Profit
Power
- Total mining duration
- Accuracy
- Primary algorithm
- Primary algorithm (variant)
- Primary currency
- Primary coin name
- Primary pool
- Primary pool (variant)
- Primary user
- Primary
- Primary pool fee
- Primary miner fee
- Secondary algorithm
- Secondary algorithm (variant)
- Secondary currency
- Secondary coin name
- Secondary pool
- Secondary pool (variant)
- Secondary user
- Secondary
- Secondary pool fee
- Secondary miner fee
+ Total mining duration
+ Accuracy
+ Primary algorithm
+ Primary algorithm (variant)
+ Primary currency
+ Primary coin name
+ Primary pool
+ Primary pool (variant)
+ Primary user
+ Primary
+ Primary pool fee
+ Primary miner fee
+ Secondary algorithm
+ Secondary algorithm (variant)
+ Secondary currency
+ Secondary coin name
+ Secondary pool
+ Secondary pool (variant)
+ Secondary user
+ Secondary
+ Secondary pool fee
+ Secondary miner fee
Miner API
API port
Min. data samples
- WarmupTime [0]
- WarmupTime [1]
+ WarmupTime [0]
+ WarmupTime [1]
Updated
Environment variables
Activated
diff --git a/Web/minersoptimal.html b/Web/minersoptimal.html
index 3d54849b..e91518dc 100644
--- a/Web/minersoptimal.html
+++ b/Web/minersoptimal.html
@@ -34,6 +34,7 @@ Optimal miners
data-show-refresh="true"
data-show-search-clear-button="true"
data-show-toggle="true"
+ data-sort-select-options="true"
data-toggle="table"
data-toolbar="#toolbar"
data-undefined-text=""
@@ -43,13 +44,14 @@ Optimal miners
Name
- Miner
+ Name
+ Miner
Version
CommandLine
- Devices
+ Devices
Type
- Status
+ Status
+ Status Info
Reasons
Earning (biased)
Earning
@@ -57,33 +59,33 @@ Optimal miners
Profit (biased)
Profit
Power
- Total mining duration
- Accuracy
- Primary algorithm
- Primary algorithm (variant)
- Primary currency
- Primary coin name
- Primary pool
- Primary pool (variant)
- Primary user
- Primary
- Primary pool fee
- Primary miner fee
- Secondary algorithm
- Secondary algorithm (variant)
- Secondary currency
- Secondary coin name
- Secondary pool
- Secondary pool (variant)
- Secondary user
- Secondary
- Secondary pool fee
- Secondary miner fee
+ Total mining duration
+ Accuracy
+ Primary algorithm
+ Primary algorithm (variant)
+ Primary currency
+ Primary coin name
+ Primary pool
+ Primary pool (variant)
+ Primary user
+ Primary
+ Primary pool fee
+ Primary miner fee
+ Secondary algorithm
+ Secondary algorithm (variant)
+ Secondary currency
+ Secondary coin name
+ Secondary pool
+ Secondary pool (variant)
+ Secondary user
+ Secondary
+ Secondary pool fee
+ Secondary miner fee
Miner API
API port
Min. data samples
- WarmupTime [0]
- WarmupTime [1]
+ WarmupTime [0]
+ WarmupTime [1]
Updated
Environment variables
Activated
diff --git a/Web/minersunavailable.html b/Web/minersunavailable.html
index 7bfdeeff..e7fc2487 100644
--- a/Web/minersunavailable.html
+++ b/Web/minersunavailable.html
@@ -39,6 +39,7 @@ Unavailable miners
data-show-refresh="true"
data-show-search-clear-button="true"
data-show-toggle="true"
+ data-sort-select-options="true"
data-toggle="table"
data-toolbar="#toolbar"
data-undefined-text=""
@@ -48,13 +49,14 @@ Unavailable miners
Name
- Miner
+ Name
+ Miner
Version
CommandLine
- Devices
+ Devices
Type
- Status
+ Status
+ Status Info
Reasons
Earning (biased)
Earning
@@ -62,33 +64,33 @@ Unavailable miners
Profit (biased)
Profit
Power
- Total mining duration
- Accuracy
- Primary algorithm
- Primary algorithm (variant)
- Primary currency
- Primary coin name
- Primary pool
- Primary pool (variant)
- Primary user
- Primary
- Primary pool fee
- Primary miner fee
- Secondary algorithm
- Secondary algorithm (variant)
- Secondary currency
- Secondary coin name
- Secondary pool
- Secondary pool (variant)
- Secondary user
- Secondary
- Secondary pool fee
- Secondary miner fee
+ Total mining duration
+ Accuracy
+ Primary algorithm
+ Primary algorithm (variant)
+ Primary currency
+ Primary coin name
+ Primary pool
+ Primary pool (variant)
+ Primary user
+ Primary
+ Primary pool fee
+ Primary miner fee
+ Secondary algorithm
+ Secondary algorithm (variant)
+ Secondary currency
+ Secondary coin name
+ Secondary pool
+ Secondary pool (variant)
+ Secondary user
+ Secondary
+ Secondary pool fee
+ Secondary miner fee
Miner API
API port
Min. data samples
- WarmupTime [0]
- WarmupTime [1]
+ WarmupTime [0]
+ WarmupTime [1]
Updated
Environment variables
Activated
diff --git a/Web/parts/head.html b/Web/parts/head.html
index cb57da4b..488ec211 100644
--- a/Web/parts/head.html
+++ b/Web/parts/head.html
@@ -17,7 +17,6 @@
All pools
data-show-refresh="true"
data-show-search-clear-button="true"
data-show-toggle="true"
+ data-sort-select-options="true"
data-toggle="table"
data-toolbar="#toolbar"
data-undefined-text=""
@@ -44,16 +45,16 @@ All pools
Pool Uri
Algorithm
Algorithm (variant)
- Currency
+ Currency
Coin name
Reasons
- BTC/GH/24hr
- BTC/GH/24hr
- BTC/GH/24hr
+ BTC/GH/24hr
+ BTC/GH/24hr
+ BTC/GH/24hr
Accuracy
Pool name (variant)
- Pool name
- Region
+ Pool name
+ Region
Username or wallet
Worker name
Password
diff --git a/Web/poolsbest.html b/Web/poolsbest.html
index 1bb5b08f..d8ac2b52 100644
--- a/Web/poolsbest.html
+++ b/Web/poolsbest.html
@@ -32,6 +32,7 @@ Best pools
data-show-refresh="true"
data-show-search-clear-button="true"
data-show-toggle="true"
+ data-sort-select-options="true"
data-toggle="table"
data-toolbar="#toolbar"
data-undefined-text=""
@@ -46,13 +47,13 @@ Best pools
Currency
Coin name
Reasons
- BTC/GH/24hr
- BTC/GH/24hr
- BTC/GH/24hr
+ BTC/GH/24hr
+ BTC/GH/24hr
+ BTC/GH/24hr
Accuracy
Pool name (variant)
- Pool name
- Region
+ Pool name
+ Region
Username or wallet
Worker name
Password
diff --git a/Web/poolsunavailable.html b/Web/poolsunavailable.html
index 9705477a..8269f2ff 100644
--- a/Web/poolsunavailable.html
+++ b/Web/poolsunavailable.html
@@ -33,6 +33,7 @@ Unavailable pools
data-show-refresh="true"
data-show-search-clear-button="true"
data-show-toggle="true"
+ data-sort-select-options="true"
data-toggle="table"
data-toolbar="#toolbar"
data-undefined-text=""
@@ -47,13 +48,13 @@ Unavailable pools
Currency
Coin name
Reasons
- BTC/GH/24hr
- BTC/GH/24hr
- BTC/GH/24hr
+ BTC/GH/24hr
+ BTC/GH/24hr
+ BTC/GH/24hr
Accuracy
Pool name (variant)
- Pool name
- Region
+ Pool name
+ Region
Username or wallet
Worker name
Password
diff --git a/Web/scripts/demo.ps1 b/Web/scripts/demo.ps1
index 588cd7f4..126a7d10 100644
--- a/Web/scripts/demo.ps1
+++ b/Web/scripts/demo.ps1
@@ -18,7 +18,7 @@ along with this program. If not, see Switching log
data-show-refresh="true"
data-show-search-clear-button="true"
data-show-toggle="true"
+ data-sort-select-options="true"
data-toggle="table"
data-toolbar="#toolbar"
data-url="/switchinglog"
diff --git a/Web/watchdogtimers.html b/Web/watchdogtimers.html
index a52224f7..13eed83a 100644
--- a/Web/watchdogtimers.html
+++ b/Web/watchdogtimers.html
@@ -30,6 +30,7 @@ Watchdog timers
data-show-toggle="true"
data-sort-name="DeviceNames"
data-sort-order="asc"
+ data-sort-select-options="true"
data-toggle="table"
data-toolbar="#toolbar"
data-url="/watchdogtimers"