Skip to content

Commit

Permalink
update miners
Browse files Browse the repository at this point in the history
  • Loading branch information
MaynardMiner committed Aug 22, 2019
1 parent 225a1f9 commit d09b61e
Show file tree
Hide file tree
Showing 11 changed files with 210 additions and 34 deletions.
9 changes: 0 additions & 9 deletions build/powershell/background/initial.psm1
Original file line number Diff line number Diff line change
Expand Up @@ -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)
}
}

Expand Down
7 changes: 6 additions & 1 deletion build/powershell/run/commands.psm1
Original file line number Diff line number Diff line change
Expand Up @@ -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

}


Expand Down
60 changes: 60 additions & 0 deletions config/miners/jayddee.json
Original file line number Diff line number Diff line change
@@ -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"
}
4 changes: 2 additions & 2 deletions config/update/amd-linux.json
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down
4 changes: 2 additions & 2 deletions config/update/amd-win.json
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down
17 changes: 13 additions & 4 deletions config/update/cpu-linux.json
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"name": "cpu-linux",
"name": "bubasik",
"bubasik": {
"name": "bubasik",
"type": "cpu",
Expand All @@ -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"
}
Expand Down
15 changes: 12 additions & 3 deletions config/update/cpu-win.json
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"name": "cpu-win",
"name": "bubasik",
"bubasik": {
"name": "bubasik",
"type": "cpu",
Expand All @@ -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"
Expand All @@ -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"
}
}
16 changes: 8 additions & 8 deletions config/update/nvidia-linux.json
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down Expand Up @@ -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",
Expand All @@ -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",
Expand Down Expand Up @@ -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",
Expand Down
10 changes: 5 additions & 5 deletions config/update/nvidia-win.json
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down Expand Up @@ -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",
Expand Down Expand Up @@ -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"
},
Expand Down
20 changes: 20 additions & 0 deletions help/Change.log
Original file line number Diff line number Diff line change
Expand Up @@ -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.
82 changes: 82 additions & 0 deletions miners/cpu/jayddee.ps1
Original file line number Diff line number Diff line change
@@ -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
}
}
}
}
}
}

0 comments on commit d09b61e

Please sign in to comment.