Skip to content

Commit

Permalink
Change.log update
Browse files Browse the repository at this point in the history 
Revert back hour_4 stats
more changes are neccessary
  • Loading branch information
@MaynardMiner
MaynardMiner committed Oct 3, 2019
1 parent 4f90168 commit 295f6de
Show file tree
Hide file tree
Showing 52 changed files with 123 additions and 104 deletions.
22 changes: 21 additions & 1 deletion help/Change.log
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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.
* 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.
4 changes: 2 additions & 2 deletions miners/cpu/bubasik.ps1
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions miners/cpu/cpupower.ps1
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions miners/cpu/jayddee.ps1
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions miners/cpu/sugarchain.ps1
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions miners/cpu/xmrig-cpu.ps1
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions miners/gpu/amd/claymore-amd.ps1
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions miners/gpu/amd/fancyix.ps1
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions miners/gpu/amd/gminer-amd.ps1
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
4 changes: 2 additions & 2 deletions miners/gpu/amd/lolminer.ps1
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions miners/gpu/amd/nanominer.ps1
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions miners/gpu/amd/phoenix-amd.ps1
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions miners/gpu/amd/progminer-amd.ps1
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions miners/gpu/amd/teamredminer.ps1
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions miners/gpu/amd/wildrig.ps1
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions miners/gpu/amd/xmr-stak.ps1
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions miners/gpu/amd/xmrig.ps1
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
5 changes: 2 additions & 3 deletions miners/gpu/nvidia/bminer.ps1
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
Loading

0 comments on commit 295f6de

Please sign in to comment.