From d09b61e3c143d0d3993f03c7d6ac6507fb31a9b1 Mon Sep 17 00:00:00 2001 From: MaynardMiner <38481606+MaynardMiner@users.noreply.github.com> Date: Wed, 21 Aug 2019 23:14:17 -0400 Subject: [PATCH] update miners --- build/powershell/background/initial.psm1 | 9 --- build/powershell/run/commands.psm1 | 7 +- config/miners/jayddee.json | 60 +++++++++++++++++ config/update/amd-linux.json | 4 +- config/update/amd-win.json | 4 +- config/update/cpu-linux.json | 17 +++-- config/update/cpu-win.json | 15 ++++- config/update/nvidia-linux.json | 16 ++--- config/update/nvidia-win.json | 10 +-- help/Change.log | 20 ++++++ miners/cpu/jayddee.ps1 | 82 ++++++++++++++++++++++++ 11 files changed, 210 insertions(+), 34 deletions(-) create mode 100644 config/miners/jayddee.json create mode 100644 miners/cpu/jayddee.ps1 diff --git a/build/powershell/background/initial.psm1 b/build/powershell/background/initial.psm1 index f8fa29712..f1a1b17fa 100755 --- a/build/powershell/background/initial.psm1 +++ b/build/powershell/background/initial.psm1 @@ -16,15 +16,6 @@ function Global:Invoke-MinerCheck { Write-Host "Miners Have Switched `n" -ForegroundColor Cyan $global:CurrentMiners = $global:GetMiners; $global:StartTime = Get-Date - Write-Host "Waiting for all miners to launch `n" - $Check = $false; - $Time = 0 - do{ - $check = Test-Path ".\build\pid\start.txt"; - start-sleep -S 1 - $Time++ - if($Time -gt 29){$check = $true} - }Until($check -eq $true) } } diff --git a/build/powershell/run/commands.psm1 b/build/powershell/run/commands.psm1 index a6affe509..6cf050b41 100755 --- a/build/powershell/run/commands.psm1 +++ b/build/powershell/run/commands.psm1 @@ -36,12 +36,17 @@ function Global:Get-StatusLite { } function Global:Get-PriceMessage { + $Total = 0; $(vars).BestActiveMIners | % { - if ($_.Profit_Day -ne "bench") { $ScreenProfit = "$(($_.Profit_Day * $(vars).Rates.$($(arg).Currency)).ToString("N2")) $($(arg).Currency)/Day" } else { $ScreenProfit = "Benchmarking" } + if ($_.Profit_Day -ne "bench") { $ScreenProfit = "$($Value = $_.Profit_Day * $(vars).Rates.$($(arg).Currency); $Total += $Value; $Value.ToString("N2")) $($(arg).Currency)/Day" } else { $ScreenProfit = "Benchmarking" } $ProfitMessage = "Current Daily Profit For $($_.Type): $ScreenProfit" $ProfitMessage | Out-File ".\build\txt\minerstats.txt" -Append $ProfitMessage | Out-File ".\build\txt\charts.txt" -Append } + $ProfitMessage = "Current Daily Profit For Rig: $($Total.ToString("N2")) $($(arg).Currency)/Day" + $ProfitMessage | Out-File ".\build\txt\minerstats.txt" -Append + $ProfitMessage | Out-File ".\build\txt\charts.txt" -Append + } diff --git a/config/miners/jayddee.json b/config/miners/jayddee.json new file mode 100644 index 000000000..0f396ff3c --- /dev/null +++ b/config/miners/jayddee.json @@ -0,0 +1,60 @@ +{ + "CPU": { + "name": "CPU", + "delay": "1", + "prestart": [], + "commands": { + "yescryptr8": "", + "yescrypt": "", + "yescryptr16": "", + "yescryptr24": "", + "yescryptr32": "", + "yespower": "", + "yespowerr8": "", + "yespowerr16": "", + "yespowerr24": "", + "yespowerr32": "", + "lyra2z330": "" + }, + "difficulty": { + "yescryptr8": "", + "yescrypt": "", + "yescryptr16": "", + "yescryptr24": "", + "yescryptr32": "", + "yespower": "", + "yespowerr8": "", + "yespowerr16": "", + "yespowerr24": "", + "yespowerr32": "", + "lyra2z330": "" + }, + "naming": { + "yescryptr8": "yescryptr8", + "yescrypt": "yescrypt", + "yescryptr16": "yescryptr16", + "yescryptr24": "yescryptr24", + "yescryptr32": "yescryptr32", + "yespower": "yespower", + "yespowerr8": "yespowerr8", + "yespowerr16": "yespowerr16", + "yespowerr24": "yespowerr24", + "yespowerr32": "yespowerr32", + "lyra2z330": "lyra2z330" + }, + "fee": { + "yescryptr8": 0, + "yescrypt": 0, + "yescryptr16": 0, + "yescryptr24": 0, + "yescryptr32": 0, + "yespower": 0, + "yespowerr8": 0, + "yespowerr16": 0, + "yespowerr24": 0, + "yespowerr32": 0, + "lyra2z330": 0 + } + }, + "name": "jayddee" +} \ No newline at end of file diff --git a/config/update/amd-linux.json b/config/update/amd-linux.json index f4e86adbe..d461498e0 100755 --- a/config/update/amd-linux.json +++ b/config/update/amd-linux.json @@ -18,9 +18,9 @@ "AMD2": ".\\bin\\gminer-amd-2\\miner", "AMD3": ".\\bin\\gminer-amd-3\\miner", "minername": "miner", - "version": "1.55", + "version": "1.59", "optional": "No", - "uri": "https://github.com/develsoftware/GMinerRelease/releases/download/1.55/gminer_1_55_linux64.tar.xz" + "uri": "https://github.com/develsoftware/GMinerRelease/releases/download/1.59/gminer_1_59_linux64.tar.xz" }, "kbminer-amd": { "name": "kbminer-amd", diff --git a/config/update/amd-win.json b/config/update/amd-win.json index cbcb5a141..167ff178d 100755 --- a/config/update/amd-win.json +++ b/config/update/amd-win.json @@ -51,9 +51,9 @@ "AMD2": ".\\bin\\gminer-amd-2\\miner.exe", "AMD3": ".\\bin\\gminer-amd-3\\miner.exe", "minername": "miner.exe", - "version": "1.55", + "version": "1.59", "optional": "No", - "uri": "https://github.com/develsoftware/GMinerRelease/releases/download/1.55/gminer_1_55_windows64.zip" + "uri": "https://github.com/develsoftware/GMinerRelease/releases/download/1.59/gminer_1_59_windows64.zip" }, "phoenix-amd": { "name": "phoenix-amd", diff --git a/config/update/cpu-linux.json b/config/update/cpu-linux.json index b65515070..e91a2b32e 100755 --- a/config/update/cpu-linux.json +++ b/config/update/cpu-linux.json @@ -1,5 +1,5 @@ { - "name": "cpu-linux", + "name": "bubasik", "bubasik": { "name": "bubasik", "type": "cpu", @@ -23,16 +23,25 @@ "type": "cpu", "CPU": ".\\bin\\sugarchain-1\\cpuminer", "minername": "cpuminer", - "version": "3.9.6.2", + "version": "3.8.8.1.7", "optional": "No", - "uri": "https://github.com/MaynardMiner/MM.Compiled-Miners/releases/download/v8.0/cpuminer-jayddee.tar.gz" + "uri": "https://github.com/MaynardMiner/MM.Compiled-Miners/releases/download/v8.0/sugarchain-linux.tar.gz" + }, + "jayddee": { + "name": "jayddee", + "type": "cpu", + "CPU": ".\\bin\\jayddee-1\\cpuminer", + "minername": "cpuminer", + "version": "3.9.7", + "optional": "No", + "uri": "https://github.com/MaynardMiner/MM.Compiled-Miners/releases/download/v8.0/jayddee-linux.tar.gz" }, "cpupower": { "name": "cpupower", "type": "cpu", "CPU": ".\\bin\\cpupower-1\\cpuminer", "minername": "cpuminer", - "version": "3.9.6.2", + "version": "1.0", "optional": "No", "uri": "https://github.com/MaynardMiner/MM.Compiled-Miners/releases/download/v8.0/cpupower-linux.tar.gz" } diff --git a/config/update/cpu-win.json b/config/update/cpu-win.json index f8314723a..4d7264a47 100755 --- a/config/update/cpu-win.json +++ b/config/update/cpu-win.json @@ -1,5 +1,5 @@ { - "name": "cpu-win", + "name": "bubasik", "bubasik": { "name": "bubasik", "type": "cpu", @@ -23,6 +23,15 @@ "type": "cpu", "CPU": ".\\bin\\sugarchain-1\\cpuminer-avx2.exe", "minername": "cpuminer-avx2.exe", + "version": "3.8.8.1.7", + "optional": "No", + "uri": "cpuminer-opt-sugarchain-v3.8.8.1.7-w64.zip" + }, + "jayddee": { + "name": "jayddee", + "type": "cpu", + "CPU": ".\\bin\\jayddee-1\\cpuminer-avx2.exe", + "minername": "cpuminer-avx2.exe", "version": "3.9.7", "optional": "No", "uri": "https://github.com/JayDDee/cpuminer-opt/releases/download/v3.9.7/cpuminer-opt-3.9.7-windows.zip" @@ -32,8 +41,8 @@ "type": "cpu", "CPU": ".\\bin\\cpupower-1\\cpuminer-avx2.exe", "minername": "cpuminer-avx2.exe", - "version": "3.9.6.2", + "version": "1.0", "optional": "No", - "uri": "https://github.com/cpu-pool/cpuminer-opt-cpupower/releases/download/v1.0/Cpuminer-opt-cpupower.zip" + "uri": "https://github.com/cpu-pool/cpuminer-opt-cpupower/releases/download/v1.0/Cpuminer-opt-cpupower-win64.zip" } } \ No newline at end of file diff --git a/config/update/nvidia-linux.json b/config/update/nvidia-linux.json index e8ae9b025..e38f8c826 100755 --- a/config/update/nvidia-linux.json +++ b/config/update/nvidia-linux.json @@ -18,9 +18,9 @@ "NVIDIA2": ".\\bin\\nbminer-2\\nbminer", "NVIDIA3": ".\\bin\\nbminer-3\\nbminer", "minername": "nbminer", - "version": "24.2", + "version": "24.4", "optional": "No", - "uri": "https://github.com/NebuTech/NBMiner/releases/download/v24.2/NBMiner_24.2_Linux.tgz" + "uri": "https://github.com/NebuTech/NBMiner/releases/download/v24.4/NBMiner_24.4_Linux.tgz" }, "multiminer": { "name": "multiminer", @@ -205,9 +205,9 @@ "NVIDIA2": ".\\bin\\gminer-2\\miner", "NVIDIA3": ".\\bin\\gminer-3\\miner", "minername": "miner", - "version": "1.55", + "version": "1.59", "optional": "No", - "uri": "https://github.com/develsoftware/GMinerRelease/releases/download/1.55/gminer_1_55_linux64.tar.xz" + "uri": "https://github.com/develsoftware/GMinerRelease/releases/download/1.59/gminer_1_59_linux64.tar.xz" }, "grin-miner": { "name": "grin-miner", @@ -227,9 +227,9 @@ "NVIDIA2": ".\\bin\\bminer-2\\bminer", "NVIDIA3": ".\\bin\\bminer-3\\bminer", "minername": "bminer", - "version": "15.8.2", + "version": "15.8.3", "optional": "No", - "uri": "https://www.bminercontent.com/releases/bminer-v15.8.2-7f347c7-amd64.tar.xz" + "uri": "https://www.bminercontent.com/releases/bminer-v15.8.3-fc8dae9-amd64.tar.xz" }, "miniz": { "name": "miniz", @@ -293,9 +293,9 @@ "NVIDIA2": ".\\bin\\tt-miner-2\\TT-Miner", "NVIDIA3": ".\\bin\\tt-miner-3\\TT-Miner", "minername": "TT-Miner", - "version": "3.0.0", + "version": "3.0.4", "optional": "No", - "uri": "https://TradeProject.de/download/Miner/TT-Miner.tar.xz" + "uri": "https://tradeproject.de/download/Miner/TT-Miner.tar.xz" }, "ethminer": { "name": "ethminer", diff --git a/config/update/nvidia-win.json b/config/update/nvidia-win.json index 486972d7a..f5b678675 100755 --- a/config/update/nvidia-win.json +++ b/config/update/nvidia-win.json @@ -18,9 +18,9 @@ "NVIDIA2": ".\\bin\\nbminer-2\\nbminer.exe", "NVIDIA3": ".\\bin\\nbminer-3\\nbminer.exe", "minername": "nbminer.exe", - "version": "24.2", + "version": "24.4", "optional": "No", - "uri": "https://github.com/NebuTech/NBMiner/releases/download/v24.2/NBMiner_24.2_Win.zip" + "uri": "https://github.com/NebuTech/NBMiner/releases/download/v24.4/NBMiner_24.4_Win.zip" }, "cc-mtp": { "name": "cc-mtp", @@ -62,9 +62,9 @@ "NVIDIA2": ".\\bin\\bminer-2\\bminer.exe", "NVIDIA3": ".\\bin\\bminer-3\\bminer.exe", "minername": "bminer.exe", - "version": "15.8.2", + "version": "15.8.3", "optional": "No", - "uri": "https://www.bminercontent.com/releases/bminer-lite-v15.8.2-7f347c7-amd64.zip" + "uri": "https://www.bminercontent.com/releases/bminer-lite-v15.8.3-fc8dae9-amd64.zip" }, "ehssand": { "name": "ehssand", @@ -238,7 +238,7 @@ "NVIDIA2": ".\\bin\\tt-miner-2\\TT-Miner.exe", "NVIDIA3": ".\\bin\\tt-miner-3\\TT-Miner.exe", "minername": "TT-Miner.exe", - "version": "3.0.1", + "version": "3.0.4", "optional": "No", "uri": "https://tradeproject.de/download/Miner/TT-Miner.zip" }, diff --git a/help/Change.log b/help/Change.log index a8f9636e4..f9f69efad 100755 --- a/help/Change.log +++ b/help/Change.log @@ -767,8 +767,28 @@ I will work on splitting miners for each algo. * bminer updated * lolminer updated * beamv2 on nicehash added +* nbminer updated +* updated cpuminers ## Fixes * Adjusted -Stat_Algo Day & -Stat_Coin Day to allow full values. * Fixed new ``get stats lite`` table + +############################################ +############################################ + +# SWARM 2.6.1 + +## New features +* ``get stats`` will show daily profit for rig. + +## Updates +* TT-Updated +* Gminer Updated + +## Fixes +* Fixed ``-coin_param`` params value +* Fixed gminer equihash_150/5 +* Removed "Waiting for all miners to launch" + * It can cause issues with hiveos oc settings. \ No newline at end of file diff --git a/miners/cpu/jayddee.ps1 b/miners/cpu/jayddee.ps1 new file mode 100644 index 000000000..665586cc5 --- /dev/null +++ b/miners/cpu/jayddee.ps1 @@ -0,0 +1,82 @@ +$(vars).CPUTypes | ForEach-Object { + + $ConfigType = $_; + + ##Miner Path Information + if ($(vars).cpu.jayddee.$ConfigType) { $Path = "$($(vars).cpu.jayddee.$ConfigType)" } + else { $Path = "None" } + if ($(vars).cpu.jayddee.uri) { $Uri = "$($(vars).cpu.jayddee.uri)" } + else { $Uri = "None" } + if ($(vars).cpu.jayddee.minername) { $MinerName = "$($(vars).cpu.jayddee.minername)" } + else { $MinerName = "None" } + + $Name = "jayddee"; + + ##Log Directory + $Log = Join-Path $($(vars).dir) "logs\$ConfigType.log" + + ##Parse -CPUThreads + if ($(arg).CPUThreads -ne '') { $Devices = $(arg).CPUThreads } + + ##Get Configuration File + $MinerConfig = $Global:config.miners.jayddee + + ##Export would be /path/to/[SWARMVERSION]/build/export## + $ExportDir = Join-Path $($(vars).dir) "build\export" + + ##Prestart actions before miner launch + $Prestart = @() + $BE = "/usr/lib/x86_64-linux-gnu/libcurl-compat.so.3.0.0" + if (Test-Path $BE) { $Prestart += "export LD_PRELOAD=libcurl-compat.so.3.0.0" } + $PreStart += "export LD_LIBRARY_PATH=$ExportDir" + $MinerConfig.$ConfigType.prestart | ForEach-Object { $Prestart += "$($_)" } + + if ($(vars).Coins) { $Pools = $(vars).CoinPools } else { $Pools = $(vars).AlgoPools } + + if ($(vars).Bancount -lt 1) { $(vars).Bancount = 5 } + + $MinerConfig.$ConfigType.commands | Get-Member -MemberType NoteProperty | Select-Object -ExpandProperty Name | ForEach-Object { + + $MinerAlgo = $_ + + if ($MinerAlgo -in $(vars).Algorithm -and $Name -notin $global:Config.Pool_Algos.$MinerAlgo.exclusions -and $ConfigType -notin $global:Config.Pool_Algos.$MinerAlgo.exclusions -and $Name -notin $(vars).BanHammer) { + $StatAlgo = $MinerAlgo -replace "`_", "`-" + $Stat = Global:Get-Stat -Name "$($Name)_$($StatAlgo)_hashrate" + $Check = $(vars).Miner_HashTable | Where Miner -eq $Name | Where Algo -eq $MinerAlgo | Where Type -Eq $ConfigType + + if ($Check.RAW -ne "Bad") { + $Pools | Where-Object Algorithm -eq $MinerAlgo | ForEach-Object { + if ($MinerConfig.$ConfigType.difficulty.$($_.Algorithm)) { $Diff = ",d=$($MinerConfig.$ConfigType.difficulty.$($_.Algorithm))" }else { $Diff = "" } + [PSCustomObject]@{ + MName = $Name + Coin = $(vars).Coins + Delay = $MinerConfig.$ConfigType.delay + Fees = $MinerConfig.$ConfigType.fee.$($_.Algorithm) + Symbol = "$($_.Symbol)" + MinerName = $MinerName + Prestart = $PreStart + Type = $ConfigType + Path = $Path + Devices = $Devices + Stratum = "$($_.Protocol)://$($_.Host):$($_.Port)" + Version = "$($(vars).cpu.jayddee.version)" + DeviceCall = "cpuminer-opt" + Arguments = "-a $($MinerConfig.$ConfigType.naming.$($_.Algorithm)) -o stratum+tcp://$($_.Host):$($_.Port) -b 0.0.0.0:10001 -u $($_.User1) -p $($_.Pass1)$($Diff) $($MinerConfig.$ConfigType.commands.$($_.Algorithm))" + HashRates = $Stat.Hour + Worker = $(arg).Rigname1 + Quote = if ($Stat.Hour) { $Stat.Hour * ($_.Price) }else { 0 } + Power = if ($(vars).Watts.$($_.Algorithm)."$($ConfigType)_Watts") { $(vars).Watts.$($_.Algorithm)."$($ConfigType)_Watts" }elseif ($(vars).Watts.default."$($ConfigType)_Watts") { $(vars).Watts.default."$($ConfigType)_Watts" }else { 0 } + MinerPool = "$($_.Name)" + Port = 10001 + API = "cpuminer" + Wallet = "$($_.User1)" + URI = $Uri + Server = "localhost" + Algo = "$($_.Algorithm)" + Log = $Log + } + } + } + } + } +} \ No newline at end of file