Skip to content

Commit

Permalink
add libcurl, ethminer
Browse files Browse the repository at this point in the history
  • Loading branch information
MaynardMiner committed Jul 25, 2019
1 parent abe9621 commit 7a45178
Show file tree
Hide file tree
Showing 54 changed files with 331 additions and 73 deletions.
1 change: 1 addition & 0 deletions build/export/libcurl.so.3
Binary file added build/export/libcurl.so.3.0.0
Binary file not shown.
7 changes: 7 additions & 0 deletions build/powershell/startup/linuxconfig.psm1
Original file line number Diff line number Diff line change
Expand Up @@ -41,6 +41,13 @@ function Global:Get-Data {
Set-Location $($(vars).dir)
}

if (-not (Test-Path ".\build\export\libcurl.so.3")) {
$Proc = Start-Process ln -ArgumentList "-s $($(vars).dir)/build/export/libcurl.so.3.0.0 $($(vars).dir)/build/export/libcurl.so.3" -PassThru
$Proc | Wait-Process
Set-Location "/"
Set-Location $($(vars).dir)
}

if (-not (Test-Path ".\build\export\libnvrtc-builtins.so.10.1")) {
$Proc = Start-Process ln -ArgumentList "-s $($(vars).dir)/build/export/libnvrtc-builtins.so.10.1.105 $($(vars).dir)/build/export/libnvrtc-builtins.so.10.1" -PassThru
$Proc | Wait-Process
Expand Down
26 changes: 26 additions & 0 deletions config/miners/ethminer-amd.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,26 @@
{
"name": "ethminer-amd",
"AMD1": {
"name": "AMD1",
"delay": "1",
"prestart": [
"export GPU_FORCE_64BIT_PTR 0",
"export GPU_MAX_HEAP_SIZE=100",
"export GPU_USE_SYNC_OBJECTS=1",
"export GPU_SINGLE_ALLOC_PERCENT=100",
"export GPU_MAX_ALLOC_PERCENT=100"
],
"commands": {
"ethash": ""
},
"difficulty": {
"ethash": ""
},
"naming": {
"ethash": "ethash"
},
"fee": {
"ethash": 0
}
}
}
54 changes: 54 additions & 0 deletions config/miners/ethminer.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,54 @@
{
"name": "ethminer",
"NVIDIA1": {
"name": "NVIDIA1",
"delay": "1",
"prestart": [],
"commands": {
"ethash": ""
},
"difficulty": {
"ethash": ""
},
"naming": {
"ethash": "ethash"
},
"fee": {
"ethash": 0
}
},
"NVIDIA2": {
"name": "NVIDIA2",
"delay": "1",
"prestart": [],
"commands": {
"ethash": ""
},
"difficulty": {
"ethash": ""
},
"naming": {
"ethash": "ethash"
},
"fee": {
"ethash": 0
}
},
"NVIDIA3": {
"name": "NVIDIA3",
"delay": "1",
"prestart": [],
"commands": {
"ethash": ""
},
"difficulty": {
"ethash": ""
},
"naming": {
"ethash": "ethash"
},
"fee": {
"ethash": 0
}
}
}
13 changes: 12 additions & 1 deletion config/update/amd-linux.json
Original file line number Diff line number Diff line change
Expand Up @@ -208,5 +208,16 @@
"version": "0.17.0",
"optional": "No",
"uri": "https://github.com/MaynardMiner/MM.Compiled-Miners/releases/download/v5.0/progminer-linux-10.tar.gz"
}
},
"ethminer-amd": {
"name": "ethminer-amd",
"type": "amd",
"AMD1": ".\\bin\\ethminer-amd-1\\ethminer",
"AMD2": ".\\bin\\ethminer-amd-2\\ethminer",
"AMD3": ".\\bin\\ethminer-amd-3\\ethminer",
"minername": "ethminer",
"version": "0.19.0-alpha.0",
"optional": "No",
"uri": "https://github.com/ethereum-mining/ethminer/releases/download/v0.19.0-alpha.0/ethminer-0.19.0-alpha.0-cuda10.0-windows-amd64.zip"
}
}
13 changes: 12 additions & 1 deletion config/update/amd-win.json
Original file line number Diff line number Diff line change
Expand Up @@ -175,5 +175,16 @@
"version": "1.12",
"optional": "No",
"uri": "https://github.com/MaynardMiner/MM.Compiled-Miners/releases/download/v9.0/progminer-windows.zip"
}
},
"ethminer-amd": {
"name": "ethminer-amd",
"type": "amd",
"AMD1": ".\\bin\\ethminer-amd-1\\ethminer.exe",
"AMD2": ".\\bin\\ethminer-amd-2\\ethminer.exe",
"AMD3": ".\\bin\\ethminer-amd-3\\ethminer.exe",
"minername": "ethminer.exe",
"version": "0.19.0-alpha.0",
"optional": "No",
"uri": "https://github.com/ethereum-mining/ethminer/releases/download/v0.19.0-alpha.0/ethminer-0.19.0-alpha.0-cuda10.0-windows-amd64.zip"
}
}
15 changes: 13 additions & 2 deletions config/update/nvidia-linux.json
Original file line number Diff line number Diff line change
Expand Up @@ -296,5 +296,16 @@
"version": "3.0.0",
"optional": "No",
"uri": "https://tradeproject.de/download/Miner/TT-Miner-3.0.0-beta1.tar.xz"
}
}
},
"ethminer": {
"name": "ethminer",
"type": "nvidia",
"NVIDIA1": ".\\bin\\ethminer-1\\ethminer",
"NVIDIA2": ".\\bin\\ethminer-2\\ethminer",
"NVIDIA3": ".\\bin\\ethminer-3\\ethminer",
"minername": "ethminer",
"version": "0.19.0-alpha.0",
"optional": "No",
"uri": "https://github.com/MaynardMiner/MM.Compiled-Miners/releases/download/v4.0/ethminer-linux.tar.gz"
}
}
13 changes: 12 additions & 1 deletion config/update/nvidia-win.json
Original file line number Diff line number Diff line change
Expand Up @@ -263,5 +263,16 @@
"version":"0.8.5",
"optional": "Yes",
"uri":"https://github.com/Lolliedieb/lolMiner-releases/releases/download/0.8.5/lolMiner_v085_Win64.zip"
}
},
"ethminer": {
"name": "ethminer",
"type": "nvidia",
"NVIDIA1": ".\\bin\\ethminer-1\\ethminer.exe",
"NVIDIA2": ".\\bin\\ethminer-2\\ethminer.exe",
"NVIDIA3": ".\\bin\\ethminer-3\\ethminer.exe",
"minername": "ethminer.exe",
"version": "0.19.0-alpha.0",
"optional": "No",
"uri": "https://github.com/ethereum-mining/ethminer/releases/download/v0.19.0-alpha.0/ethminer-0.19.0-alpha.0-cuda10.0-windows-amd64.zip"
}
}
7 changes: 7 additions & 0 deletions install.ps1
Original file line number Diff line number Diff line change
Expand Up @@ -97,6 +97,13 @@ if (Test-Path ".\build\export\libcudart.so.10.0.130") {
Set-Location $Dir
}

if (Test-Path ".\build\export\libcurl.so.3.0.0") {
$Proc = Start-Process ln -ArgumentList "-s $dir/build/export/libcurl.so.3.0.0 $dir/build/export/libcurl.so.3" -PassThru
$Proc | Wait-Process
Set-Location "/"
Set-Location $($(vars).dir)
}

if (Test-Path ".\build\export\libcudart.so.10.1.105") {
$Proc = Start-Process ln -ArgumentList "-s $dir/build/export/libcudart.so.10.1.105 $dir/build/export/libcudart.so.10.1" -PassThru
$Proc | Wait-Process
Expand Down
2 changes: 0 additions & 2 deletions miners/cpu/bubasik.ps1
Original file line number Diff line number Diff line change
Expand Up @@ -26,9 +26,7 @@ $(vars).CPUTypes | ForEach-Object {
$ExportDir = Join-Path $($(vars).dir) "build\export"

##Prestart actions before miner launch
$BE = "/usr/lib/x86_64-linux-gnu/libcurl-compat.so.3.0.0"
$Prestart = @()
if (Test-Path $BE) { $Prestart += "export LD_PRELOAD=libcurl.so.4.5.0" }
$PreStart += "export LD_LIBRARY_PATH=$ExportDir"
$MinerConfig.$ConfigType.prestart | ForEach-Object { $Prestart += "$($_)" }

Expand Down
2 changes: 0 additions & 2 deletions miners/cpu/sugarchain.ps1
Original file line number Diff line number Diff line change
Expand Up @@ -25,9 +25,7 @@ $(vars).CPUTypes | ForEach-Object {
$ExportDir = Join-Path $($(vars).dir) "build\export"

##Prestart actions before miner launch
$BE = "/usr/lib/x86_64-linux-gnu/libcurl-compat.so.3.0.0"
$Prestart = @()
if (Test-Path $BE) { $Prestart += "export LD_PRELOAD=libcurl.so.4.5.0" }
$PreStart += "export LD_LIBRARY_PATH=$ExportDir"
$MinerConfig.$ConfigType.prestart | ForEach-Object { $Prestart += "$($_)" }

Expand Down
1 change: 0 additions & 1 deletion miners/cpu/xmrig-cpu.ps1
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,6 @@ $(vars).CPUTypes | ForEach-Object {
$ExportDir = Join-Path $($(vars).dir) "build\export"

##Prestart actions before miner launch
$BE = "/usr/lib/x86_64-linux-gnu/libcurl-compat.so.3.0.0"
$Prestart = @()
$PreStart += "export LD_LIBRARY_PATH=$ExportDir"
$MinerConfig.$ConfigType.prestart | ForEach-Object { $Prestart += "$($_)" }
Expand Down
1 change: 0 additions & 1 deletion miners/gpu/amd/claymore-amd.ps1
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,6 @@ $(vars).AMDTypes | ForEach-Object {
$ExportDir = Join-Path $($(vars).dir) "build\export"

##Prestart actions before miner launch
$BE = "/usr/lib/x86_64-linux-gnu/libcurl-compat.so.3.0.0"
$Prestart = @()
$PreStart += "export LD_LIBRARY_PATH=$ExportDir"
$MinerConfig.$ConfigType.prestart | ForEach-Object { $Prestart += "$($_)" }
Expand Down
90 changes: 90 additions & 0 deletions miners/gpu/amd/ethminer-amd.ps1
Original file line number Diff line number Diff line change
@@ -0,0 +1,90 @@
$(vars).AMDTypes | ForEach-Object {

$ConfigType = $_; $Num = $ConfigType -replace "AMD", ""
$CName = "progminer-amd"

##Miner Path Information
if ($(vars).amd.$CName.$ConfigType) { $Path = "$($(vars).amd.$CName.$ConfigType)" }
else { $Path = "None" }
if ($(vars).amd.$CName.uri) { $Uri = "$($(vars).amd.$CName.uri)" }
else { $Uri = "None" }
if ($(vars).amd.$CName.minername) { $MinerName = "$($(vars).amd.$CName.minername)" }
else { $MinerName = "None" }

$User = "User$Num"; $Pass = "Pass$Num"; $Name = "$CName-$Num"; $Port = "2700$Num"

Switch ($Num) {
1 { $Get_Devices = $(vars).AMDDevices1; $Rig = $(arg).Rigname1 }
}

##Log Directory
$Log = Join-Path $($(vars).dir) "logs\$ConfigType.log"

##Parse -GPUDevices
if ($Get_Devices -ne "none") {
$GPUDevices1 = $Get_Devices
$GPUDevices1 = $GPUDevices1 -replace ',', ' '
$Devices = $GPUDevices1
}
else { $Devices = $Get_Devices }

##Get Configuration File
$MinerConfig = $Global:config.miners.$CName

##Export would be /path/to/[SWARMVERSION]/build/export##
$ExportDir = Join-Path $($(vars).dir) "build\export"

##Prestart actions before miner launch
$Prestart = @()
$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 }

##Build Miner Settings
$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 {
[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).amd.$CName.version)"
DeviceCall = "progminer_amd"
Arguments = "-P stratum2+tcp://$($_.$User).$($_.$Pass):x@$($_.Host):$($_.Port) --opencl --api-bind 0.0.0.0:$Port --noeval --dag-load-mode 1 $($MinerConfig.$ConfigType.commands.$($_.Algorithm))"
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
Worker = $Rig
MinerPool = "$($_.Name)"
Wallet = "$($_.$User)"
URI = $Uri
Server = "localhost"
Algo = "$($_.Algorithm)"
Log = $Log
}
}
}
}
}
}
2 changes: 0 additions & 2 deletions miners/gpu/amd/fancyix.ps1
Original file line number Diff line number Diff line change
Expand Up @@ -30,9 +30,7 @@ $(vars).AMDTypes | ForEach-Object {
$ExportDir = Join-Path $($(vars).dir) "build\export"

##Prestart actions before miner launch
$BE = "/usr/lib/x86_64-linux-gnu/libcurl-compat.so.3.0.0"
$Prestart = @()
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 += "$($_)" }

Expand Down
1 change: 0 additions & 1 deletion miners/gpu/amd/gminer-amd.ps1
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,6 @@ $(vars).AMDTypes | ForEach-Object {
$ExportDir = Join-Path $($(vars).dir) "build\export"

##Prestart actions before miner launch
$BE = "/usr/lib/x86_64-linux-gnu/libcurl-compat.so.3.0.0"
$Prestart = @()
$PreStart += "export LD_LIBRARY_PATH=$ExportDir"
$MinerConfig.$ConfigType.prestart | ForEach-Object { $Prestart += "$($_)" }
Expand Down
2 changes: 0 additions & 2 deletions miners/gpu/amd/lolminer.ps1
Original file line number Diff line number Diff line change
Expand Up @@ -30,9 +30,7 @@ $(vars).AMDTypes | ForEach-Object {
$ExportDir = Join-Path $($(vars).dir) "build\export"

##Prestart actions before miner launch
$BE = "/usr/lib/x86_64-linux-gnu/libcurl-compat.so.3.0.0"
$Prestart = @()
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 += "$($_)" }

Expand Down
1 change: 0 additions & 1 deletion miners/gpu/amd/progminer-amd.ps1
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,6 @@ $(vars).AMDTypes | ForEach-Object {
$ExportDir = Join-Path $($(vars).dir) "build\export"

##Prestart actions before miner launch
$BE = "/usr/lib/x86_64-linux-gnu/libcurl-compat.so.3.0.0"
$Prestart = @()
$PreStart += "export LD_LIBRARY_PATH=$ExportDir"
$MinerConfig.$ConfigType.prestart | ForEach-Object { $Prestart += "$($_)" }
Expand Down
1 change: 0 additions & 1 deletion miners/gpu/amd/teamredminer.ps1
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,6 @@ $(vars).AMDTypes | ForEach-Object {
$ExportDir = Join-Path $($(vars).dir) "build\export"

##Prestart actions before miner launch
$BE = "/usr/lib/x86_64-linux-gnu/libcurl-compat.so.3.0.0"
$Prestart = @()
$PreStart += "export LD_LIBRARY_PATH=$ExportDir"
$MinerConfig.$ConfigType.prestart | ForEach-Object { $Prestart += "$($_)" }
Expand Down
1 change: 0 additions & 1 deletion miners/gpu/amd/wildrig.ps1
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,6 @@ $(vars).AMDTypes | ForEach-Object {
$ExportDir = Join-Path $($(vars).dir) "build\export"

##Prestart actions before miner launch
$BE = "/usr/lib/x86_64-linux-gnu/libcurl-compat.so.3.0.0"
$Prestart = @()
$PreStart += "export LD_LIBRARY_PATH=$ExportDir"
$MinerConfig.$ConfigType.prestart | ForEach-Object { $Prestart += "$($_)" }
Expand Down
1 change: 0 additions & 1 deletion miners/gpu/amd/xmr-stak.ps1
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,6 @@ $(vars).AMDTypes | ForEach-Object {
$ExportDir = Join-Path $($(vars).dir) "build\export"

##Prestart actions before miner launch
$BE = "/usr/lib/x86_64-linux-gnu/libcurl-compat.so.3.0.0"
$Prestart = @()
$PreStart += "export LD_LIBRARY_PATH=$ExportDir"
$MinerConfig.$ConfigType.prestart | ForEach-Object { $Prestart += "$($_)" }
Expand Down
1 change: 0 additions & 1 deletion miners/gpu/amd/xmrig.ps1
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,6 @@ $(vars).AMDTypes | ForEach-Object {
$ExportDir = Join-Path $($(vars).dir) "build\export"

##Prestart actions before miner launch
$BE = "/usr/lib/x86_64-linux-gnu/libcurl-compat.so.3.0.0"
$Prestart = @()
$PreStart += "export LD_LIBRARY_PATH=$ExportDir"
$MinerConfig.$ConfigType.prestart | ForEach-Object { $Prestart += "$($_)" }
Expand Down
2 changes: 0 additions & 2 deletions miners/gpu/nvidia/cc-rfv2.ps1
Original file line number Diff line number Diff line change
Expand Up @@ -34,9 +34,7 @@ $(vars).NVIDIATypes | ForEach-Object {
$ExportDir = Join-Path $($(vars).dir) "build\export"

##Prestart actions before miner launch
$BE = "/usr/lib/x86_64-linux-gnu/libcurl-compat.so.3.0.0"
$Prestart = @()
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 += "$($_)" }

Expand Down
Loading

0 comments on commit 7a45178

Please sign in to comment.