diff --git a/help/Change.log b/help/Change.log index d006f3812..bcf43b1c6 100755 --- a/help/Change.log +++ b/help/Change.log @@ -1138,9 +1138,29 @@ OR NEWER- UPDATE IMMEDIATELY. application lost of focus. * Added custom launchcode.dll in apps folder. * Removed extra console launch in Windows version. + * cmd.exe isn't used anymore in SWARM. + * everything works directly from pwsh.exe +* Add more console info. + * notifies user test batch files are made + to test miners, and location + * notifies user that SWARM attempt to + record difficulty and intensity for + them. + * veil warning. +* Fixed cc-rfv2 link. + * moved to optional folder- + Cuda error: invalid params. +* SWARM now not only generates batch/bash + files for testing, but one for each algorithm. + * It uses same environment params as SWARM itself. ## Fixes * Fixed AMD errors for autofan in Windows if only using NVIDIA. * removed cuckaroo from nbminer. - * cuckaroo29d still present. \ No newline at end of file + * cuckaroo29d still present. +* rare error that arguments aren't saved + after first time connection to HiveOS + when user used guided help. +* missed port for x16rv2 on nicehash- fixed. +* t-rex x16rv instead of x16rv2 - fixed. diff --git a/miners/cpu/bubasik.ps1 b/miners/cpu/bubasik.ps1 index b8df4f97d..47960392a 100755 --- a/miners/cpu/bubasik.ps1 +++ b/miners/cpu/bubasik.ps1 @@ -63,9 +63,9 @@ $(vars).CPUTypes | ForEach-Object { 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_4 + HashRates = $Stat.Hour Worker = $(arg).Rigname1 - Quote = if ($Stat.Hour_4) { $Stat.Hour_4 * ($_.Price) }else { 0 } + 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 diff --git a/miners/cpu/cpupower.ps1 b/miners/cpu/cpupower.ps1 index 09bdb1211..f6bbdd3f8 100755 --- a/miners/cpu/cpupower.ps1 +++ b/miners/cpu/cpupower.ps1 @@ -62,9 +62,9 @@ $(vars).CPUTypes | ForEach-Object { 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_4 + HashRates = $Stat.Hour Worker = $(arg).Rigname1 - Quote = if ($Stat.Hour_4) { $Stat.Hour_4 * ($_.Price) }else { 0 } + 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 diff --git a/miners/cpu/jayddee.ps1 b/miners/cpu/jayddee.ps1 index a58194484..670e0b8c3 100644 --- a/miners/cpu/jayddee.ps1 +++ b/miners/cpu/jayddee.ps1 @@ -62,9 +62,9 @@ $(vars).CPUTypes | ForEach-Object { 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_4 + HashRates = $Stat.Hour Worker = $(arg).Rigname1 - Quote = if ($Stat.Hour_4) { $Stat.Hour_4 * ($_.Price) }else { 0 } + 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 diff --git a/miners/cpu/sugarchain.ps1 b/miners/cpu/sugarchain.ps1 index 9a23810ab..0a2774d9f 100755 --- a/miners/cpu/sugarchain.ps1 +++ b/miners/cpu/sugarchain.ps1 @@ -62,9 +62,9 @@ $(vars).CPUTypes | ForEach-Object { Version = "$($(vars).cpu.sugarchain.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_4 + HashRates = $Stat.Hour Worker = $(arg).Rigname1 - Quote = if ($Stat.Hour_4) { $Stat.Hour_4 * ($_.Price) }else { 0 } + 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 diff --git a/miners/cpu/xmrig-cpu.ps1 b/miners/cpu/xmrig-cpu.ps1 index c2408d35d..388ad9fe6 100755 --- a/miners/cpu/xmrig-cpu.ps1 +++ b/miners/cpu/xmrig-cpu.ps1 @@ -64,9 +64,9 @@ $(vars).CPUTypes | ForEach-Object { Version = "$($(vars).cpu.$CName.version)" DeviceCall = "xmrig-opt" Arguments = "-a $($MinerConfig.$ConfigType.naming.$($_.Algorithm)) --http-enabled --http-port=10002 -o stratum+tcp://$($_.Pool_Host):$($_.Port) -u $($_.User1) -p $($_.Pass1)$($Diff) --donate-level=1 --nicehash $($MinerConfig.$ConfigType.commands.$($_.Algorithm))" - HashRates = $Stat.Hour_4 + HashRates = $Stat.Hour Worker = $(arg).Rigname1 - Quote = if ($Stat.Hour_4) { $Stat.Hour_4 * ($_.Price) }else { 0 } + 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 = 10002 diff --git a/miners/gpu/amd/claymore-amd.ps1 b/miners/gpu/amd/claymore-amd.ps1 index 49f5cd8f5..48592e209 100755 --- a/miners/gpu/amd/claymore-amd.ps1 +++ b/miners/gpu/amd/claymore-amd.ps1 @@ -82,8 +82,8 @@ $(vars).AMDTypes | ForEach-Object { Version = "$($(vars).amd.$CName.version)" DeviceCall = "claymore" Arguments = "-platform 1 -mport $Port $AddArgs-mode 1 -allcoins 1 $AddArgs-allpools 1 -epool $($_.Protocol)://$($_.Pool_Host):$($_.Port) -logfile `'$Log`' -ewal $($_.$User) $MinerWorker-wd 0 -gser 2 -dbg -1 -eres 1 $($MinerConfig.$ConfigType.commands.$($_.Algorithm))" - HashRates = $Stat.Hour_4 - Quote = if ($Stat.Hour_4) { $Stat.Hour_4 * ($_.Price) }else { 0 } + HashRates = $Stat.Hour + 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 } API = "claymore" Port = $Port diff --git a/miners/gpu/amd/fancyix.ps1 b/miners/gpu/amd/fancyix.ps1 index ad9bde883..152d4b7df 100755 --- a/miners/gpu/amd/fancyix.ps1 +++ b/miners/gpu/amd/fancyix.ps1 @@ -68,8 +68,8 @@ $(vars).AMDTypes | ForEach-Object { Version = "$($(vars).amd.fancyix.version)" DeviceCall = "sgminer-gm" Arguments = "--gpu-platform $($(vars).AMDPlatform) --api-listen --api-port $Port -k $($MinerConfig.$ConfigType.naming.$($_.Algorithm)) -o stratum+tcp://$($_.Pool_Host):$($_.Port) -u $($_.$User) -p $($_.$Pass)$($Diff) -T $($MinerConfig.$ConfigType.commands.$($_.Algorithm))" - HashRates = $Stat.Hour_4 - Quote = if ($Stat.Hour_4) { $Stat.Hour_4 * ($_.Price) }else { 0 } + HashRates = $Stat.Hour + 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 = $Port diff --git a/miners/gpu/amd/gminer-amd.ps1 b/miners/gpu/amd/gminer-amd.ps1 index 011675832..96ea95103 100755 --- a/miners/gpu/amd/gminer-amd.ps1 +++ b/miners/gpu/amd/gminer-amd.ps1 @@ -99,8 +99,8 @@ $(vars).AMDTypes | ForEach-Object { ArgDevices = $ArgDevices DeviceCall = "gminer" Arguments = "--api $Port --server $($_.Pool_Host) --port $($_.Port) $AddArgs--user $($_.$User) --logfile `'$Log`' --pass $($_.$Pass)$Diff $($MinerConfig.$ConfigType.commands.$($_.Algorithm))" - HashRates = $Stat.Hour_4 - Quote = if ($Stat.Hour_4) { $Stat.Hour_4 * ($_.Price) }else { 0 } + HashRates = $Stat.Hour + 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)" API = "gminer" diff --git a/miners/gpu/amd/lolminer.ps1 b/miners/gpu/amd/lolminer.ps1 index e9f0f1866..3c1a50993 100755 --- a/miners/gpu/amd/lolminer.ps1 +++ b/miners/gpu/amd/lolminer.ps1 @@ -77,8 +77,8 @@ $(vars).AMDTypes | ForEach-Object { Version = "$($(vars).amd.lolminer.version)" DeviceCall = "lolminer" Arguments = "--pool $($_.Pool_Host) --port $($_.Port) --user $($_.$User) $AddArgs--pass $($_.$Pass)$($Diff) --apiport $Port --logs 0 $($MinerConfig.$ConfigType.commands.$($_.Algorithm))" - HashRates = $Stat.Hour_4 - Quote = if ($Stat.Hour_4) { $Stat.Hour_4 * ($_.Price) }else { 0 } + HashRates = $Stat.Hour + 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 = $Port diff --git a/miners/gpu/amd/nanominer.ps1 b/miners/gpu/amd/nanominer.ps1 index 9d015bdd4..c3c820c3e 100755 --- a/miners/gpu/amd/nanominer.ps1 +++ b/miners/gpu/amd/nanominer.ps1 @@ -82,8 +82,8 @@ $(vars).AMDTypes | ForEach-Object { devices = $ArgDevices } Arguments = "`[$($($MinerConfig.$ConfigType.naming.$($_.Algorithm)))`] wallet=$($_.$User) rigPassword=$($_.$Pass)$($Diff) pool1=$($_.Pool_Host):$($_.Port) webport=$Port logPath=$Log" - HashRates = $Stat.Hour_4 - Quote = if ($Stat.Hour_4) { $Stat.Hour_4 * ($_.Price) }else { 0 } + HashRates = $Stat.Hour + 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 = $Port diff --git a/miners/gpu/amd/phoenix-amd.ps1 b/miners/gpu/amd/phoenix-amd.ps1 index 3716a97b4..61ae84047 100755 --- a/miners/gpu/amd/phoenix-amd.ps1 +++ b/miners/gpu/amd/phoenix-amd.ps1 @@ -96,8 +96,8 @@ $(vars).AMDTypes | ForEach-Object { Version = "$($(vars).amd.$CName.version)" DeviceCall = "claymore" Arguments = "-amd -acm -mport $Port -mode 1 -allcoins 1 -allpools 1 $AddArgs-epool $($_.Protocol)://$($_.Pool_Host):$($_.Port) -ewal $($_.$User) $MinerWorker-wd 0 -logfile `'$(Split-Path $Log -Leaf)`' -logdir `'$(Split-Path $Log)`' -gser 2 -dbg -1 -eres 2 $($MinerConfig.$ConfigType.commands.$($_.Algorithm))" - HashRates = $Stat.Hour_4 - Quote = if ($Stat.Hour_4) { $Stat.Hour_4 * ($_.Price) }else { 0 } + HashRates = $Stat.Hour + 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 } API = "claymore" Port = $Port diff --git a/miners/gpu/amd/progminer-amd.ps1 b/miners/gpu/amd/progminer-amd.ps1 index 2adf614dd..a64ffdb55 100755 --- a/miners/gpu/amd/progminer-amd.ps1 +++ b/miners/gpu/amd/progminer-amd.ps1 @@ -72,8 +72,8 @@ $(vars).AMDTypes | ForEach-Object { Version = "$($(vars).amd.$CName.version)" DeviceCall = "progminer_amd" Arguments = "-G -P stratum+tcp://$($_.$User)@$($_.Pool_Host):$($_.Port) --api-port -$Port --opencl-platform $($(vars).AMDPlatform) $($MinerConfig.$ConfigType.commands.$($_.Algorithm))" - HashRates = $Stat.Hour_4 - Quote = if ($Stat.Hour_4) { $Stat.Hour_4 * ($_.Price) }else { 0 } + HashRates = $Stat.Hour + 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 } API = "claymore" Port = $Port diff --git a/miners/gpu/amd/teamredminer.ps1 b/miners/gpu/amd/teamredminer.ps1 index dae3d6e08..ff0d54c2d 100755 --- a/miners/gpu/amd/teamredminer.ps1 +++ b/miners/gpu/amd/teamredminer.ps1 @@ -66,8 +66,8 @@ $(vars).AMDTypes | ForEach-Object { Version = "$($(vars).amd.teamredminer.version)" DeviceCall = "tdxminer" Arguments = "--platform $($(vars).AMDPlatform) -a $($MinerConfig.$ConfigType.naming.$($_.Algorithm)) --api_listen=0.0.0.0:$Port -o stratum+tcp://$($_.Pool_Host):$($_.Port) -u $($_.$User) --log_file `'$Log`' --bus_reorder -p $($_.$Pass)$($DIff) $($MinerConfig.$ConfigType.commands.$($_.Algorithm))" - HashRates = $Stat.Hour_4 - Quote = if ($Stat.Hour_4) { $Stat.Hour_4 * ($_.Price) }else { 0 } + HashRates = $Stat.Hour + 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 = $Port diff --git a/miners/gpu/amd/wildrig.ps1 b/miners/gpu/amd/wildrig.ps1 index fc0d24503..ad06d9a3b 100755 --- a/miners/gpu/amd/wildrig.ps1 +++ b/miners/gpu/amd/wildrig.ps1 @@ -66,8 +66,8 @@ $(vars).AMDTypes | ForEach-Object { Version = "$($(vars).amd.wildrig.version)" DeviceCall = "wildrig" Arguments = "--opencl-platform=$($(vars).AMDPlatform) --api-port $Port --algo $($MinerConfig.$ConfigType.naming.$($_.Algorithm)) --url stratum+tcp://$($_.Pool_Host):$($_.Port) --donate-level 1 --user $($_.$User) --pass $($_.$Pass)$($Diff) $($MinerConfig.$ConfigType.commands.$($MinerConfig.$ConfigType.naming.$($_.Algorithm)))" - HashRates = $Stat.Hour_4 - Quote = if ($Stat.Hour_4) { $Stat.Hour_4 * ($_.Price) }else { 0 } + HashRates = $Stat.Hour + 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 = $Port diff --git a/miners/gpu/amd/xmr-stak.ps1 b/miners/gpu/amd/xmr-stak.ps1 index 5067a32a3..b7811b0a1 100755 --- a/miners/gpu/amd/xmr-stak.ps1 +++ b/miners/gpu/amd/xmr-stak.ps1 @@ -65,8 +65,8 @@ $(vars).AMDTypes | ForEach-Object { Version = "$($(vars).amd.$CName.version)" DeviceCall = "xmrstak" Arguments = "--currency $($MinerConfig.$ConfigType.naming.$($_.Algorithm)) -i $Port --url stratum+tcp://$($_.Pool_Host):$($_.Port) --user $($_.$User) --pass $($_.$Pass)$($Diff) --rigid SWARM --noCPU --noNVIDIA --use-nicehash $($MinerConfig.$ConfigType.commands.$($_.Algorithm))" - HashRates = $Stat.Hour_4 - Quote = if ($Stat.Hour_4) { $Stat.Hour_4 * ($_.Price) }else { 0 } + HashRates = $Stat.Hour + 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 = $Port diff --git a/miners/gpu/amd/xmrig.ps1 b/miners/gpu/amd/xmrig.ps1 index 3c8597b20..5a7aa95b5 100755 --- a/miners/gpu/amd/xmrig.ps1 +++ b/miners/gpu/amd/xmrig.ps1 @@ -64,8 +64,8 @@ $(vars).AMDTypes | ForEach-Object { Version = "$($(vars).amd.xmrig.version)" DeviceCall = "xmrstak" Arguments = "-a $($MinerConfig.$ConfigType.naming.$($_.Algorithm)) --api-port=$Port -o stratum+tcp://$($_.Pool_Host):$($_.Port) -u $($_.$User) -p $($_.$Pass)$($Diff) --donate-level=1 --nicehash --opencl-platform=$($(vars).AMDPlatform) $($MinerConfig.$ConfigType.commands.$($_.Algorithm))" - HashRates = $Stat.Hour_4 - Quote = if ($Stat.Hour_4) { $Stat.Hour_4 * ($_.Price) }else { 0 } + HashRates = $Stat.Hour + 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 = $Port diff --git a/miners/gpu/nvidia/bminer.ps1 b/miners/gpu/nvidia/bminer.ps1 index 034c7fbb8..28e0caff4 100755 --- a/miners/gpu/nvidia/bminer.ps1 +++ b/miners/gpu/nvidia/bminer.ps1 @@ -91,9 +91,8 @@ $(vars).NVIDIATypes | ForEach-Object { Version = "$($(vars).nvidia.bminer.version)" DeviceCall = "bminer" Arguments = "-uri $($Naming)://$($_.$User)$Pass$Diff@$($_.Pool_Host):$($_.Port) $AddArgs-logfile `'$Log`' -api 127.0.0.1:$Port $($MinerConfig.$ConfigType.commands.$($_.Algorithm))" - HashRates = $Stat.Hour_4 - - Quote = if ($Stat.Hour_4) { $Stat.Hour_4 * ($_.Price) }else { 0 } + HashRates = $Stat.Hour + 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 = $Port diff --git a/miners/gpu/nvidia/cc-verus.ps1 b/miners/gpu/nvidia/cc-verus.ps1 index 83d0e4500..4876f006b 100755 --- a/miners/gpu/nvidia/cc-verus.ps1 +++ b/miners/gpu/nvidia/cc-verus.ps1 @@ -69,8 +69,8 @@ $(vars).NVIDIATypes | ForEach-Object { Version = "$($(vars).nvidia.$CName.version)" DeviceCall = "ccminer" Arguments = "-a $($MinerConfig.$ConfigType.naming.$($_.Algorithm)) -o stratum+tcp://$($_.Pool_Host):$($_.Port) -b 0.0.0.0:$Port -u $($_.$User) -p $($_.$Pass)$($Diff) $($MinerConfig.$ConfigType.commands.$($_.Algorithm))" - HashRates = $Stat.Hour_4 - Quote = if ($Stat.Hour_4) { $Stat.Hour_4 * ($_.Price) }else { 0 } + HashRates = $Stat.Hour + 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 = $Port diff --git a/miners/gpu/nvidia/claymore.ps1 b/miners/gpu/nvidia/claymore.ps1 index 3d92f32a3..e4bc20c60 100755 --- a/miners/gpu/nvidia/claymore.ps1 +++ b/miners/gpu/nvidia/claymore.ps1 @@ -80,8 +80,8 @@ $(vars).NVIDIATypes | ForEach-Object { Version = "$($(vars).nvidia.claymore.version)" DeviceCall = "claymore" Arguments = "-platform 2 -mport $Port -mode 1 -allcoins 1 $AddArgs-allpools 1 -epool $($_.Protocol)://$($_.Pool_Host):$($_.Port) -logfile `'$Log`' -ewal $($_.$User) $MinerWorker-wd 0 -gser 2 -dbg -1 -eres 1 $($MinerConfig.$ConfigType.commands.$($_.Algorithm))" - HashRates = $Stat.Hour_4 - Quote = if ($Stat.Hour_4) { $Stat.Hour_4 * ($_.Price) }else { 0 } + HashRates = $Stat.Hour + 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 } API = "claymore" Port = $Port diff --git a/miners/gpu/nvidia/cryptodredge.ps1 b/miners/gpu/nvidia/cryptodredge.ps1 index 85836542e..22d00bd94 100755 --- a/miners/gpu/nvidia/cryptodredge.ps1 +++ b/miners/gpu/nvidia/cryptodredge.ps1 @@ -69,8 +69,8 @@ $(vars).NVIDIATypes | ForEach-Object { Version = "$($(vars).nvidia.cryptodredge.version)" DeviceCall = "ccminer" Arguments = "-a $($MinerConfig.$ConfigType.naming.$($_.Algorithm)) -o stratum+tcp://$($_.Pool_Host):$($_.Port) -b 0.0.0.0:$Port --log `'$Log`' -u $($_.$User) -p $($_.$Pass)$($Diff) --no-nvml $($MinerConfig.$ConfigType.commands.$($_.Algorithm))" - HashRates = $Stat.Hour_4 - Quote = if ($Stat.Hour_4) { $Stat.Hour_4 * ($_.Price) }else { 0 } + HashRates = $Stat.Hour + 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 = $Port diff --git a/miners/gpu/nvidia/gminer.ps1 b/miners/gpu/nvidia/gminer.ps1 index 36cfdf17d..f5476bd9c 100755 --- a/miners/gpu/nvidia/gminer.ps1 +++ b/miners/gpu/nvidia/gminer.ps1 @@ -102,8 +102,8 @@ $(vars).NVIDIATypes | ForEach-Object { Version = "$($(vars).nvidia.gminer.version)" DeviceCall = "gminer" Arguments = "--api $Port --server $($_.Pool_Host) --nvml 0 --port $($_.Port) $AddArgs--user $($_.$User) --logfile `'$Log`' --pass $($_.$Pass)$Diff $($MinerConfig.$ConfigType.commands.$($_.Algorithm))" - HashRates = $Stat.Hour_4 - Quote = if ($Stat.Hour_4) { $Stat.Hour_4 * ($_.Price) }else { 0 } + HashRates = $Stat.Hour + 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)" API = "gminer" diff --git a/miners/gpu/nvidia/miniz.ps1 b/miners/gpu/nvidia/miniz.ps1 index 40e950aef..4bd8140ff 100755 --- a/miners/gpu/nvidia/miniz.ps1 +++ b/miners/gpu/nvidia/miniz.ps1 @@ -83,8 +83,8 @@ $(vars).NVIDIATypes | ForEach-Object { Version = "$($(vars).nvidia.miniz.version)" DeviceCall = "miniz" Arguments = "--telemetry 0.0.0.0:$Port --server $($_.Pool_Host) --port $($_.Port) $AddArgs--user $($_.$User) --pass $($_.$Pass)$($Diff) --logfile=`'$log`' $($MinerConfig.$ConfigType.commands.$($_.Algorithm))" - HashRates = $Stat.Hour_4 - Quote = if ($Stat.Hour_4) { $Stat.Hour_4 * ($_.Price) }else { 0 } + HashRates = $Stat.Hour + 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)" API = "miniz" diff --git a/miners/gpu/nvidia/nbminer.ps1 b/miners/gpu/nvidia/nbminer.ps1 index a955df651..2d8ddc8a4 100755 --- a/miners/gpu/nvidia/nbminer.ps1 +++ b/miners/gpu/nvidia/nbminer.ps1 @@ -80,8 +80,8 @@ $(vars).NVIDIATypes | ForEach-Object { Version = "$($(vars).nvidia.nbminer.version)" DeviceCall = "ccminer" Arguments = "-a $A --api 0.0.0.0:$Port --no-nvml --log-file `'$log`' --url $Stratum$($_.Pool_Host):$($_.Port) --user $($_.$User) $($MinerConfig.$ConfigType.commands.$($_.Algorithm))" - HashRates = $Stat.Hour_4 - Quote = if ($Stat.Hour_4) { $Stat.Hour_4 * ($_.Price) }else { 0 } + HashRates = $Stat.Hour + 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)" API = "nebutech" diff --git a/miners/gpu/nvidia/phoenix.ps1 b/miners/gpu/nvidia/phoenix.ps1 index ce6588be7..dff7e67e9 100755 --- a/miners/gpu/nvidia/phoenix.ps1 +++ b/miners/gpu/nvidia/phoenix.ps1 @@ -97,8 +97,8 @@ $(vars).NVIDIATypes | ForEach-Object { Version = "$($(vars).nvidia.phoenix.version)" DeviceCall = "claymore" Arguments = "-nvidia -mport $Port -mode 1 -allcoins 1 -allpools 1 $AddArgs-pool $($_.Protocol)://$($_.Pool_Host):$($_.Port) -wal $($_.$User) $MinerWorker-wd 0 -logfile `'$(Split-Path $Log -Leaf)`' -logdir `'$(Split-Path $Log)`' -gser 2 -dbg -1 -eres 1 $($MinerConfig.$ConfigType.commands.$($_.Algorithm))" - HashRates = $Stat.Hour_4 - Quote = if ($Stat.Hour_4) { $Stat.Hour_4 * ($_.Price) }else { 0 } + HashRates = $Stat.Hour + 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 } API = "claymore" Port = $Port diff --git a/miners/gpu/nvidia/swarm-miner.ps1 b/miners/gpu/nvidia/swarm-miner.ps1 index 344c8b411..f642c5101 100755 --- a/miners/gpu/nvidia/swarm-miner.ps1 +++ b/miners/gpu/nvidia/swarm-miner.ps1 @@ -72,8 +72,8 @@ $(vars).NVIDIATypes | ForEach-Object { Version = "$($(vars).nvidia.$CName.version)" DeviceCall = "ccminer" Arguments = "-a $($MinerConfig.$ConfigType.naming.$($_.Algorithm)) -o stratum+tcp://$($_.Pool_Host):$($_.Port) -b 0.0.0.0:$Port -u $($_.$User) -p $($_.$Pass)$($Diff) $($MinerConfig.$ConfigType.commands.$($_.Algorithm))" - HashRates = $Stat.Hour_4 - Quote = if ($Stat.Hour_4) { $Stat.Hour_4 * ($_.Price) }else { 0 } + HashRates = $Stat.Hour + 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 = $Port diff --git a/miners/gpu/nvidia/t-rex.ps1 b/miners/gpu/nvidia/t-rex.ps1 index b456a1ab1..941acfb27 100755 --- a/miners/gpu/nvidia/t-rex.ps1 +++ b/miners/gpu/nvidia/t-rex.ps1 @@ -70,8 +70,8 @@ $(vars).NVIDIATypes | ForEach-Object { Version = "$($(vars).nvidia.$CName.version)" DeviceCall = "trex" Arguments = "-a $($MinerConfig.$ConfigType.naming.$($_.Algorithm)) --no-watchdog --no-nvml -o stratum+tcp://$($_.Pool_Host):$($_.Port) --api-bind-telnet 0.0.0.0:$Port2 -l `'$Log`' --api-bind-http 0.0.0.0:$Port -u $($_.$User) -p $($_.$Pass)$($Diff) $($MinerConfig.$ConfigType.commands.$($_.Algorithm))" - HashRates = $Stat.Hour_4 - Quote = if ($Stat.Hour_4) { $Stat.Hour_4 * ($_.Price) }else { 0 } + HashRates = $Stat.Hour + 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 = $Port diff --git a/miners/gpu/nvidia/tt-miner.ps1 b/miners/gpu/nvidia/tt-miner.ps1 index 96dc03117..b6dce66fd 100755 --- a/miners/gpu/nvidia/tt-miner.ps1 +++ b/miners/gpu/nvidia/tt-miner.ps1 @@ -81,8 +81,8 @@ $(vars).NVIDIATypes | ForEach-Object { Version = "$($(vars).nvidia.$CName.version)" DeviceCall = "ttminer" Arguments = "-a $($MinerConfig.$ConfigType.naming.$($_.Algorithm)) --nvidia -o $($_.Protocol)://$($_.Pool_Host):$($_.Port) $Worker-b localhost:$Port -u $($_.$User) -p $($_.$Pass) $($MinerConfig.$ConfigType.commands.$($_.Algorithm))" - HashRates = $Stat.Hour_4 - Quote = if ($Stat.Hour_4) { $Stat.Hour_4 * ($_.Price) }else { 0 } + HashRates = $Stat.Hour + 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 = $Port diff --git a/miners/gpu/nvidia/z-enemy.ps1 b/miners/gpu/nvidia/z-enemy.ps1 index cd6e03fdc..b47e91224 100755 --- a/miners/gpu/nvidia/z-enemy.ps1 +++ b/miners/gpu/nvidia/z-enemy.ps1 @@ -71,8 +71,8 @@ $(vars).NVIDIATypes | ForEach-Object { Version = "$($(vars).nvidia.$CName.version)" DeviceCall = "ccminer" Arguments = "-a $($MinerConfig.$ConfigType.naming.$($_.Algorithm)) --log=`'$Log`' -o stratum+tcp://$($_.Pool_Host):$($_.Port) -b 0.0.0.0:$Port -u $($_.$User) -p $($_.$Pass)$($Diff) $($MinerConfig.$ConfigType.commands.$($_.Algorithm))" - HashRates = $Stat.Hour_4 - Quote = if ($Stat.Hour_4) { $Stat.Hour_4 * ($_.Price) }else { 0 } + HashRates = $Stat.Hour + 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 = $Port diff --git a/miners/optional_and_old/avermore.ps1 b/miners/optional_and_old/avermore.ps1 index f75a9da7a..12e200a26 100755 --- a/miners/optional_and_old/avermore.ps1 +++ b/miners/optional_and_old/avermore.ps1 @@ -68,8 +68,8 @@ $(vars).AMDTypes | ForEach-Object { Version = "$($(vars).amd.avermore.version)" DeviceCall = "sgminer-gm" Arguments = "--gpu-platform $($(vars).AMDPlatform) --api-listen --api-port $Port -k $($MinerConfig.$ConfigType.naming.$($_.Algorithm)) -o stratum+tcp://$($_.Pool_Host):$($_.Port) -u $($_.$User) -p $($_.$Pass)$($Diff) -T $($MinerConfig.$ConfigType.commands.$($_.Algorithm))" - HashRates = $Stat.Hour_4 - Quote = if ($Stat.Hour_4) { $Stat.Hour_4 * ($_.Price) }else { 0 } + HashRates = $Stat.Hour + 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 = $Port diff --git a/miners/optional_and_old/cc-mtp.ps1 b/miners/optional_and_old/cc-mtp.ps1 index 08143d2ae..49b75f3e0 100755 --- a/miners/optional_and_old/cc-mtp.ps1 +++ b/miners/optional_and_old/cc-mtp.ps1 @@ -70,8 +70,8 @@ $(vars).NVIDIATypes | ForEach-Object { Version = "$($(vars).nvidia.'cc-mtp'.version)" DeviceCall = "ccminer" Arguments = "-a $($MinerConfig.$ConfigType.naming.$($_.Algorithm)) -o stratum+tcp://$($_.Pool_Host):$($_.Port) -b 0.0.0.0:$Port -u $($_.$User) -p $($_.$Pass)$($Diff) $($MinerConfig.$ConfigType.commands.$($_.Algorithm))" - HashRates = $Stat.Hour_4 - Quote = if ($Stat.Hour_4) { $Stat.Hour_4 * ($_.Price) }else { 0 } + HashRates = $Stat.Hour + 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 = $Port diff --git a/miners/optional_and_old/cc-rfv2.ps1 b/miners/optional_and_old/cc-rfv2.ps1 index ceb209379..302621cb8 100644 --- a/miners/optional_and_old/cc-rfv2.ps1 +++ b/miners/optional_and_old/cc-rfv2.ps1 @@ -72,8 +72,8 @@ $(vars).NVIDIATypes | ForEach-Object { Version = "$($(vars).nvidia.$CName.version)" DeviceCall = "ccminer" Arguments = "-a $($MinerConfig.$ConfigType.naming.$($_.Algorithm)) -i 11 -o stratum+tcp://$($_.Pool_Host):$($_.Port) -b 0.0.0.0:$Port -u $($_.$User) -p $($_.$Pass)$($Diff) $($MinerConfig.$ConfigType.commands.$($_.Algorithm))" - HashRates = $Stat.Hour_4 - Quote = if ($Stat.Hour_4) { $Stat.Hour_4 * ($_.Price) }else { 0 } + HashRates = $Stat.Hour + 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 = $Port diff --git a/miners/optional_and_old/cc-yescrypt.ps1 b/miners/optional_and_old/cc-yescrypt.ps1 index 6c5984d6e..410e5df8d 100755 --- a/miners/optional_and_old/cc-yescrypt.ps1 +++ b/miners/optional_and_old/cc-yescrypt.ps1 @@ -70,8 +70,8 @@ $(vars).NVIDIATypes | ForEach-Object { Version = "$($(vars).nvidia.'cc-yescrypt'.version)" DeviceCall = "ccminer" Arguments = "-a $($MinerConfig.$ConfigType.naming.$($_.Algorithm)) -o stratum+tcp://$($_.Pool_Host):$($_.Port) -b 0.0.0.0:$Port -u $($_.$User) -p $($_.$Pass)$($Diff) $($MinerConfig.$ConfigType.commands.$($_.Algorithm))" - HashRates = $Stat.Hour_4 - Quote = if ($Stat.Hour_4) { $Stat.Hour_4 * ($_.Price) }else { 0 } + HashRates = $Stat.Hour + 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 = $Port diff --git a/miners/optional_and_old/dstm.ps1 b/miners/optional_and_old/dstm.ps1 index 86b6e4f80..33b7094d0 100755 --- a/miners/optional_and_old/dstm.ps1 +++ b/miners/optional_and_old/dstm.ps1 @@ -74,8 +74,8 @@ $(vars).NVIDIATypes | ForEach-Object { Version = "$($(vars).nvidia.dstm.version)" DeviceCall = "dstm" Arguments = "--server $($_.Pool_Host) --port $($_.Port) --user $($_.$User) --pass $($_.$Pass)$($Diff) --telemetry=0.0.0.0:$Port $($MinerConfig.$ConfigType.commands.$($_.Algorithm))" - HashRates = $Stat.Hour_4 - Quote = if ($Stat.Hour_4) { $Stat.Hour_4 * ($_.Price) }else { 0 } + HashRates = $Stat.Hour + 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 } API = "dstm" Port = $Port diff --git a/miners/optional_and_old/ehssand-amd-1.ps1 b/miners/optional_and_old/ehssand-amd-1.ps1 index 007f0ae78..de1c59c17 100755 --- a/miners/optional_and_old/ehssand-amd-1.ps1 +++ b/miners/optional_and_old/ehssand-amd-1.ps1 @@ -67,8 +67,8 @@ $(vars).AMDTypes | ForEach-Object { Version = "$($(vars).amd.$CName.version)" DeviceCall = "sgminer-gm" Arguments = "--gpu-platform $() --api-listen --api-port $Port -k $($MinerConfig.$ConfigType.naming.$($_.Algorithm)) -o stratum+tcp://$($_.Pool_Host):$($_.Port) -u $($_.$User) -p $($_.$Pass)$($Diff) -T $($MinerConfig.$ConfigType.commands.$($_.Algorithm))" - HashRates = $Stat.Hour_4 - Quote = if ($Stat.Hour_4) { $Stat.Hour_4 * ($_.Price) }else { 0 } + HashRates = $Stat.Hour + 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 = $Port diff --git a/miners/optional_and_old/ehssand.ps1 b/miners/optional_and_old/ehssand.ps1 index 4221270dc..fc88e44da 100755 --- a/miners/optional_and_old/ehssand.ps1 +++ b/miners/optional_and_old/ehssand.ps1 @@ -70,8 +70,8 @@ $(vars).NVIDIATypes | ForEach-Object { Version = "$($(vars).nvidia.ehssand.version)" DeviceCall = "ccminer" Arguments = "-a $($MinerConfig.$ConfigType.naming.$($_.Algorithm)) -o stratum+tcp://$($_.Pool_Host):$($_.Port) -b 0.0.0.0:$Port -u $($_.$User) -p $($_.$Pass)$($Diff) $($MinerConfig.$ConfigType.commands.$($_.Algorithm))" - HashRates = $Stat.Hour_4 - Quote = if ($Stat.Hour_4) { $Stat.Hour_4 * ($_.Price) }else { 0 } + HashRates = $Stat.Hour + 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 = $Port diff --git a/miners/optional_and_old/energi-amd.ps1 b/miners/optional_and_old/energi-amd.ps1 index 6d28aea02..77f943292 100755 --- a/miners/optional_and_old/energi-amd.ps1 +++ b/miners/optional_and_old/energi-amd.ps1 @@ -74,8 +74,8 @@ $(vars).AMDTypes | ForEach-Object { Version = "$($(vars).amd.$CName.version)" DeviceCall = "energiminer" Arguments = "--opencl-platform $($(vars).AMDPlatform) -G stratum://$($_.$User).$($_.$Pass)@$($_.Algorithm).mine.zergpool.com:$($_.Port)" - HashRates = $Stat.Hour_4 - Quote = if ($Stat.Hour_4) { $Stat.Hour_4 * ($_.Price) }else { 0 } + HashRates = $Stat.Hour + 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 = 0 diff --git a/miners/optional_and_old/energiminer.ps1 b/miners/optional_and_old/energiminer.ps1 index f981f4126..45c641dd1 100755 --- a/miners/optional_and_old/energiminer.ps1 +++ b/miners/optional_and_old/energiminer.ps1 @@ -75,8 +75,8 @@ $(vars).NVIDIATypes | ForEach-Object { Version = "$($(vars).nvidia.energiminer.version)" DeviceCall = "energiminer" Arguments = "-U stratum://$($_.$User).$($_.$Pass)@$($_.Algorithm).mine.zergpool.com:$($_.Port)" - HashRates = $Stat.Hour_4 - Quote = if ($Stat.Hour_4) { $Stat.Hour_4 * ($_.Price) }else { 0 } + HashRates = $Stat.Hour + 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 = 0 diff --git a/miners/optional_and_old/ethminer-amd.ps1 b/miners/optional_and_old/ethminer-amd.ps1 index 9c5fe4662..8b90408c5 100755 --- a/miners/optional_and_old/ethminer-amd.ps1 +++ b/miners/optional_and_old/ethminer-amd.ps1 @@ -70,8 +70,8 @@ $(vars).AMDTypes | ForEach-Object { Version = "$($(vars).amd.$CName.version)" DeviceCall = "progminer_amd" Arguments = "-P stratum2+tcp://$($_.$User).$($_.$Pass):x@$($_.Pool_Host):$($_.Port) --opencl --api-bind 127.0.0.1:$Port --noeval --dag-load-mode 1 $($MinerConfig.$ConfigType.commands.$($_.Algorithm))" - HashRates = $Stat.Hour_4 - Quote = if ($Stat.Hour_4) { $Stat.Hour_4 * ($_.Price) }else { 0 } + HashRates = $Stat.Hour + 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 } API = "claymore" Port = $Port diff --git a/miners/optional_and_old/ethminer.ps1 b/miners/optional_and_old/ethminer.ps1 index d3b1eb9e9..7cec43c51 100644 --- a/miners/optional_and_old/ethminer.ps1 +++ b/miners/optional_and_old/ethminer.ps1 @@ -75,8 +75,8 @@ $(vars).NVIDIATypes | ForEach-Object { Version = "$($(vars).nvidia.ethminer.version)" DeviceCall = "progminer" Arguments = "-P $($tcp)://$($_.$User).$($work)@$($_.Pool_Host):$($_.Port) --cuda --api-bind 127.0.0.1:$Port --noeval --dag-load-mode 1 $($MinerConfig.$ConfigType.commands.$($_.Algorithm))" - HashRates = $Stat.Hour_4 - Quote = if ($Stat.Hour_4) { $Stat.Hour_4 * ($_.Price) }else { 0 } + HashRates = $Stat.Hour + 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 = $Port diff --git a/miners/optional_and_old/ewbf.ps1 b/miners/optional_and_old/ewbf.ps1 index 5c4896240..e540badd9 100755 --- a/miners/optional_and_old/ewbf.ps1 +++ b/miners/optional_and_old/ewbf.ps1 @@ -82,8 +82,8 @@ $(vars).NVIDIATypes | ForEach-Object { Version = "$($(vars).nvidia.ewbf.version)" DeviceCall = "ewbf" Arguments = "--api 0.0.0.0:$Port --server $($_.Pool_Host) $AddArgs--port $($_.Port) --user $($_.$User) --pass $($_.$Pass)$($Diff) $($MinerConfig.$ConfigType.commands.$($_.Algorithm))" - HashRates = $Stat.Hour_4 - Quote = if ($Stat.Hour_4) { $Stat.Hour_4 * ($_.Price) }else { 0 } + HashRates = $Stat.Hour + 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)" API = "EWBF" diff --git a/miners/optional_and_old/grin-amd.ps1 b/miners/optional_and_old/grin-amd.ps1 index 6d0f6346e..588bff072 100755 --- a/miners/optional_and_old/grin-amd.ps1 +++ b/miners/optional_and_old/grin-amd.ps1 @@ -69,8 +69,8 @@ $(vars).AMDTypes | ForEach-Object { Host = "$($_.Pool_Host):$($_.Port)" User = "$($_.$User)" Arguments = "$($_.Pool_Host):$($_.Port) $($_.$User) $($_.Algorithm)" - HashRates = $Stat.Hour_4 - Quote = if ($Stat.Hour_4) { $Stat.Hour_4 * ($_.Price) }else { 0 } + HashRates = $Stat.Hour + 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 = 0 diff --git a/miners/optional_and_old/kbminer-amd.ps1 b/miners/optional_and_old/kbminer-amd.ps1 index 72e6de913..b9b093011 100755 --- a/miners/optional_and_old/kbminer-amd.ps1 +++ b/miners/optional_and_old/kbminer-amd.ps1 @@ -68,8 +68,8 @@ $(vars).AMDTypes | ForEach-Object { Version = "$($(vars).amd.$CName.version)" DeviceCall = "kbminer" Arguments = "--algorithm $($MinerConfig.$ConfigType.naming.$($_.Algorithm)) --enableapi --apiaddr $Port --pool $($_.Pool_Host):$($_.Port) --user $($_.$User) --pass $($_.$Pass)$($Diff) $($MinerConfig.$ConfigType.commands.$($_.Algorithm))" - HashRates = $Stat.Hour_4 - Quote = if ($Stat.Hour_4) { $Stat.Hour_4 * ($_.Price) }else { 0 } + HashRates = $Stat.Hour + 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 = $Port diff --git a/miners/optional_and_old/klaust.ps1 b/miners/optional_and_old/klaust.ps1 index 85cdcf36a..c6610beaf 100755 --- a/miners/optional_and_old/klaust.ps1 +++ b/miners/optional_and_old/klaust.ps1 @@ -70,8 +70,8 @@ $(vars).NVIDIATypes | ForEach-Object { Version = "$($(vars).nvidia.klaust.version)" DeviceCall = "ccminer" Arguments = "-a $($MinerConfig.$ConfigType.naming.$($_.Algorithm)) -o stratum+tcp://$($_.Pool_Host):$($_.Port) -b 0.0.0.0:$Port -u $($_.$User) -p $($_.$Pass)$($Diff) $($MinerConfig.$ConfigType.commands.$($_.Algorithm))" - HashRates = $Stat.Hour_4 - Quote = if ($Stat.Hour_4) { $Stat.Hour_4 * ($_.Price) }else { 0 } + HashRates = $Stat.Hour + 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 = $Port diff --git a/miners/optional_and_old/multiminer-amd.ps1 b/miners/optional_and_old/multiminer-amd.ps1 index 761dc71f3..971ee6214 100755 --- a/miners/optional_and_old/multiminer-amd.ps1 +++ b/miners/optional_and_old/multiminer-amd.ps1 @@ -75,8 +75,8 @@ $(vars).AMDTypes | ForEach-Object { Version = "$($(vars).amd.$CName.version)" DeviceCall = "multiminer" Arguments = "-a $($MinerConfig.$ConfigType.naming.$($_.Algorithm)) -o stratum+tcp://$($_.Pool_Host):$($_.Port) -b 0.0.0.0:$Port --use-gpu=OPENCL $ArgDevices-u $($_.$User) -p $($_.$Pass)$($Diff) $($MinerConfig.$ConfigType.commands.$($_.Algorithm))" - HashRates = $Stat.Hour_4 - Quote = if ($Stat.Hour_4) { $Stat.Hour_4 * ($_.Price) }else { 0 } + HashRates = $Stat.Hour + 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 = $Port diff --git a/miners/optional_and_old/multiminer.ps1 b/miners/optional_and_old/multiminer.ps1 index 41e19747c..21eb6218f 100755 --- a/miners/optional_and_old/multiminer.ps1 +++ b/miners/optional_and_old/multiminer.ps1 @@ -76,8 +76,8 @@ $(vars).NVIDIATypes | ForEach-Object { Version = "$($(vars).nvidia.multiminer.version)" DeviceCall = "multiminer" Arguments = "-a $($MinerConfig.$ConfigType.naming.$($_.Algorithm)) -o stratum+tcp://$($_.Pool_Host):$($_.Port) -b 0.0.0.0:$Port --use-gpu=CUDA $ArgDevices-u $($_.$User) -p $($_.$Pass)$($Diff) $($MinerConfig.$ConfigType.commands.$($_.Algorithm))" - HashRates = $Stat.Hour_4 - Quote = if ($Stat.Hour_4) { $Stat.Hour_4 * ($_.Price) }else { 0 } + HashRates = $Stat.Hour + 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 = $Port diff --git a/miners/optional_and_old/nv-lolminer.ps1 b/miners/optional_and_old/nv-lolminer.ps1 index 655efd650..bae9ac3a8 100755 --- a/miners/optional_and_old/nv-lolminer.ps1 +++ b/miners/optional_and_old/nv-lolminer.ps1 @@ -81,8 +81,8 @@ $(vars).NVIDIATypes | ForEach-Object { Version = "$($(vars).nvidia.$CName.version)" DeviceCall = "lolminer" Arguments = "--pool $($_.Pool_Host) --port $($_.Port) --user $($_.$User) $AddArgs--pass $($_.$Pass)$($Diff) --apiport $Port --logs 0 $($MinerConfig.$ConfigType.commands.$($_.Algorithm))" - HashRates = $Stat.Hour_4 - Quote = if ($Stat.Hour_4) { $Stat.Hour_4 * ($_.Price) }else { 0 } + HashRates = $Stat.Hour + 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 = $Port diff --git a/miners/optional_and_old/progminer.ps1 b/miners/optional_and_old/progminer.ps1 index ba82e26b8..b6d4e200d 100755 --- a/miners/optional_and_old/progminer.ps1 +++ b/miners/optional_and_old/progminer.ps1 @@ -73,8 +73,8 @@ $(vars).NVIDIATypes | ForEach-Object { Version = "$($(vars).nvidia.progminer.version)" DeviceCall = "progminer" Arguments = "-U -P stratum+tcp://$($_.$User)@$($_.Pool_Host):$($_.Port) --api-port -$Port $($MinerConfig.$ConfigType.commands.$($_.Algorithm))" - HashRates = $Stat.Hour_4 - Quote = if ($Stat.Hour_4) { $Stat.Hour_4 * ($_.Price) }else { 0 } + HashRates = $Stat.Hour + 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 } API = "claymore" Port = $Port diff --git a/miners/optional_and_old/srbminer.ps1 b/miners/optional_and_old/srbminer.ps1 index c9c7b6acd..5717c57f2 100755 --- a/miners/optional_and_old/srbminer.ps1 +++ b/miners/optional_and_old/srbminer.ps1 @@ -68,8 +68,8 @@ $(vars).AMDTypes | ForEach-Object { Version = "$($(vars).amd.srbminer.version)" DeviceCall = "srbminer" Arguments = "--adldisable --ccryptonighttype $($MinerConfig.$ConfigType.naming.$($_.Algorithm)) -cgpuid $Devices --cnicehash true --cpool $($_.Pool_Host):$($_.Port) --cwallet $($_.$User) --cpassword $($_.$Pass) --apienable --logfile `'$Log`' --apiport $Port $($MinerConfig.$ConfigType.commands.$($_.Algorithm))" - HashRates = $Stat.Hour_4 - Quote = if ($Stat.Hour_4) { $Stat.Hour_4 * ($_.Price) }else { 0 } + HashRates = $Stat.Hour + 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 = $Port diff --git a/miners/optional_and_old/tpruvot.ps1 b/miners/optional_and_old/tpruvot.ps1 index d83d1fb62..a309d78eb 100755 --- a/miners/optional_and_old/tpruvot.ps1 +++ b/miners/optional_and_old/tpruvot.ps1 @@ -70,8 +70,8 @@ $(vars).NVIDIATypes | ForEach-Object { Version = "$($(vars).nvidia.tpruvot.version)" DeviceCall = "ccminer" Arguments = "-a $($MinerConfig.$ConfigType.naming.$($_.Algorithm)) -o stratum+tcp://$($_.Pool_Host):$($_.Port) -b 0.0.0.0:$Port -u $($_.$User) -p $($_.$Pass)$($Diff) $($MinerConfig.$ConfigType.commands.$($_.Algorithm))" - HashRates = $Stat.Hour_4 - Quote = if ($Stat.Hour_4) { $Stat.Hour_4 * ($_.Price) }else { 0 } + HashRates = $Stat.Hour + 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 = $Port diff --git a/miners/optional_and_old/xmrig-nv.ps1 b/miners/optional_and_old/xmrig-nv.ps1 index 510618005..c438a35e6 100755 --- a/miners/optional_and_old/xmrig-nv.ps1 +++ b/miners/optional_and_old/xmrig-nv.ps1 @@ -71,8 +71,8 @@ $(vars).NVIDIATypes | ForEach-Object { Version = "$($(vars).nvidia.$CName.version)" DeviceCall = "xmrstak" Arguments = "-a $($MinerConfig.$ConfigType.naming.$($_.Algorithm)) --api-port=$Port -o stratum+tcp://$($_.Pool_Host):$($_.Port) -u $($_.$User) -p $($_.$Pass)$($Diff) --donate-level 1 --nicehash $($MinerConfig.$ConfigType.commands.$($_.Algorithm))" - HashRates = $Stat.Hour_4 - Quote = if ($Stat.Hour_4) { $Stat.Hour_4 * ($_.Price) }else { 0 } + HashRates = $Stat.Hour + 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 = $Port diff --git a/miners/optional_and_old/zjazz.ps1 b/miners/optional_and_old/zjazz.ps1 index 1bd63a64d..3be658f2f 100755 --- a/miners/optional_and_old/zjazz.ps1 +++ b/miners/optional_and_old/zjazz.ps1 @@ -69,8 +69,8 @@ $(vars).NVIDIATypes | ForEach-Object { Version = "$($(vars).nvidia.zjazz.version)" DeviceCall = "zjazz" Arguments = "-a $($MinerConfig.$ConfigType.naming.$($_.Algorithm)) -o stratum+tcp://$($_.Pool_Host):$($_.Port) -b 0.0.0.0:$Port --hashrate-per-gpu -u $($_.$User) -p $($_.$Pass)$($Diff) $($MinerConfig.$ConfigType.commands.$($_.Algorithm))" - HashRates = $Stat.Hour_4 - Quote = if ($Stat.Hour_4) { $Stat.Hour_4 * ($_.Price) }else { 0 } + HashRates = $Stat.Hour + 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 = $Port