Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Cryptonight rework #1577

Merged
merged 18 commits into from Apr 28, 2018
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
11 changes: 10 additions & 1 deletion Algorithms.txt
Expand Up @@ -5,7 +5,15 @@
"blakecoin": "Blakecoin",
"blakevanilla": "BlakeVanilla",
"c11": "C11",
"cryptolight": "CryptoNightLite",
"cryptonight": "CryptoNight",
"cryptonight_heavy": "CryptoNightHeavy",
"cryptonight_lite": "CryptoNightLite",
"cryptonight-heavy": "CryptoNightHeavy",
"cryptonight-lite": "CryptoNightLite",
"cryptonight-monero": "CryptoNightV7",
"cryptonightmonero": "CryptoNightV7",
"cryptonightv7": "CryptoNightV7",
"daggerhashimoto": "Ethash",
"darkcoinmod": "X11",
"decred": "Decred",
Expand Down Expand Up @@ -54,11 +62,12 @@
"x11": "X11",
"x11gost": "Sib",
"x11evo": "X11evo",
"x12": "X12",
"x16r": "X16R",
"x16s": "X16S",
"x17": "X17",
"xevan": "Xevan",
"xmr": "CryptoNight",
"xmr": "CryptoNightV7",
"yescrypt": "Yescrypt",
"zec": "Equihash",
"zuikkis": "Scrypt"
Expand Down
46 changes: 35 additions & 11 deletions Miners/Cast.txt
@@ -1,11 +1,35 @@
{
"Type": "AMD",
"Path": ".\\Bin\\CryptoNight-Cast\\cast_xmr-vega.exe",
"Arguments": "\"--remoteaccess -S $($Pools.CryptoNight.Host):$($Pools.CryptoNight.Port) -u $($Pools.CryptoNight.User) -p $($Pools.CryptoNight.Pass) --forcecompute --fastjobswitch$($DeviceID = 0; $DeviceIDs = @();([OpenCl.Platform]::GetPlatformIDs() | ForEach-Object {[OpenCl.Device]::GetDeviceIDs($_, [OpenCl.DeviceType]::All)} | Where {$_.Type -eq 'GPU' -and $_.Vendor -match 'Advanced Micro Devices, Inc.'} | ForEach-Object {$DeviceIDs += $DeviceID; $DeviceID++});if($DeviceIDs){' -G';$($DeviceIDs -join ',')})\"",
"HashRates": {
"CryptoNight": "\"$(if ($Pools.CryptoNight.SSL) {0}else {$Stats.Cast_CryptoNight_HashRate.Week})\""
},
"API": "Cast",
"Port": "7777",
"URI": "http://www.gandalph3000.com/download/cast_xmr-vega-win64_092.zip"
}
[
{
"Type": "AMD",
"Path": ".\\Bin\\CryptoNight-Cast\\cast_xmr-vega.exe",
"Arguments": "\"--remoteaccess -S $($Pools.CryptoNightV7.Host):$($Pools.CryptoNightV7.Port) -u $($Pools.CryptoNightV7.User) -p $($Pools.CryptoNightV7.Pass) --forcecompute --fastjobswitch$($DeviceID = 0; $DeviceIDs = @();([OpenCl.Platform]::GetPlatformIDs() | ForEach-Object {[OpenCl.Device]::GetDeviceIDs($_, [OpenCl.DeviceType]::All)} | Where {$_.Type -eq 'GPU' -and $_.Vendor -match 'Advanced Micro Devices, Inc.'} | ForEach-Object {$DeviceIDs += $DeviceID; $DeviceID++});if($DeviceIDs){' -G';$($DeviceIDs -join ',')})\"",
"HashRates": {
"CryptoNightV7": "\"$(if ($Pools.CryptoNightV7.SSL) {0}else {$Stats.Cast_CryptoNightV7_HashRate.Week})\""
},
"API": "Cast",
"Port": "7777",
"URI": "http://www.gandalph3000.com/download/cast_xmr-vega-win64_092.zip"
},
{
"Type": "AMD",
"Path": ".\\Bin\\CryptoNight-Cast\\cast_xmr-vega.exe",
"Arguments": "\"--remoteaccess -S $($Pools.CryptoNightLite.Host):$($Pools.CryptoNightLite.Port) -u $($Pools.CryptoNightLite.User) -p $($Pools.CryptoNightLite.Pass) --forcecompute --fastjobswitch$($DeviceID = 0; $DeviceIDs = @();([OpenCl.Platform]::GetPlatformIDs() | ForEach-Object {[OpenCl.Device]::GetDeviceIDs($_, [OpenCl.DeviceType]::All)} | Where {$_.Type -eq 'GPU' -and $_.Vendor -match 'Advanced Micro Devices, Inc.'} | ForEach-Object {$DeviceIDs += $DeviceID; $DeviceID++});if($DeviceIDs){' -G';$($DeviceIDs -join ',')})\"",
"HashRates": {
"CryptoNightLite": "\"$(if ($Pools.CryptoNightLite.SSL) {0}else {$Stats.Cast_CryptoNightLite_HashRate.Week})\""
},
"API": "Cast",
"Port": "7777",
"URI": "http://www.gandalph3000.com/download/cast_xmr-vega-win64_092.zip"
},
{
"Type": "AMD",
"Path": ".\\Bin\\CryptoNight-Cast\\cast_xmr-vega.exe",
"Arguments": "\"--remoteaccess -S $($Pools.CryptoNightHeavy.Host):$($Pools.CryptoNightHeavy.Port) -u $($Pools.CryptoNightHeavy.User) -p $($Pools.CryptoNightHeavy.Pass) --forcecompute --fastjobswitch$($DeviceID = 0; $DeviceIDs = @();([OpenCl.Platform]::GetPlatformIDs() | ForEach-Object {[OpenCl.Device]::GetDeviceIDs($_, [OpenCl.DeviceType]::All)} | Where {$_.Type -eq 'GPU' -and $_.Vendor -match 'Advanced Micro Devices, Inc.'} | ForEach-Object {$DeviceIDs += $DeviceID; $DeviceID++});if($DeviceIDs){' -G';$($DeviceIDs -join ',')})\"",
"HashRates": {
"CryptoNightHeavy": "\"$(if ($Pools.CryptoNightHeavy.SSL) {0}else {$Stats.Cast_CryptoNightHeavy_HashRate.Week})\""
},
"API": "Cast",
"Port": "7777",
"URI": "http://www.gandalph3000.com/download/cast_xmr-vega-win64_092.zip"
}
]
13 changes: 11 additions & 2 deletions Miners/ClaymoreAmd.txt
Expand Up @@ -2,14 +2,23 @@
{
"Type": "AMD",
"Path": ".\\Bin\\CryptoNight-Claymore\\NsGpuCNMiner.exe",
"Arguments": "\"-r -1 -mport -13333 -xpool $($Pools.CryptoNight.Protocol)://$($Pools.CryptoNight.Host):$($Pools.CryptoNight.Port) -xwal $($Pools.CryptoNight.User) -xpsw $($Pools.CryptoNight.Pass)\"",
"Arguments": "\"-r -1 -mport -13333 -pow7 1 -xpool $($Pools.CryptoNightV7.Protocol)://$($Pools.CryptoNightV7.Host):$($Pools.CryptoNightV7.Port) -xwal $($Pools.CryptoNightV7.User) -xpsw $($Pools.CryptoNightV7.Pass)\"",
"HashRates": {
"CryptoNight": "\"$($Stats.ClaymoreAmd_CryptoNight_HashRate.Week)\""
"CryptoNightV7": "\"$($Stats.ClaymoreAmd_CryptoNightV7_HashRate.Week)\""
},
"API": "Claymore",
"Port": "13333"
},
{
"Type": "AMD",
"Path": ".\\Bin\\CryptoNight-Claymore\\NsGpuCNMiner.exe",
"Arguments": "\"-r -1 -mport -13333 -pow7 0 -xpool $($Pools.CryptoNight.Protocol)://$($Pools.CryptoNight.Host):$($Pools.CryptoNight.Port) -xwal $($Pools.CryptoNight.User) -xpsw $($Pools.CryptoNight.Pass)\"",
"HashRates": {
"CryptoNight": "\"$($Stats.ClaymoreAmd_CryptoNight_HashRate.Week)\""
},
"API": "Claymore",
"Port": "13333"
}, {
"Type": "AMD",
"Path": ".\\Bin\\Equihash-Claymore\\ZecMiner64.exe",
"Arguments": "\"-r -1 -mport -13333 -zpool $($Pools.Equihash.Protocol)://$($Pools.Equihash.Host):$($Pools.Equihash.Port) -zwal $($Pools.Equihash.User) -zpsw $($Pools.Equihash.Pass) -allpools 1\"",
Expand Down
35 changes: 24 additions & 11 deletions Miners/ClaymoreCpu.txt
@@ -1,11 +1,24 @@
{
"Type": "CPU",
"Path": ".\\Bin\\CryptoNight-Claymore-Cpu\\NsCpuCNMiner64.exe",
"Arguments": "\"-r -1 -mport 3333 -pow7 1 -o $($Pools.CryptoNight.Protocol)://$($Pools.CryptoNight.Host):$($Pools.CryptoNight.Port) -u $($Pools.CryptoNight.User) -p $($Pools.CryptoNight.Pass)\"",
"HashRates": {
"CryptoNight": "\"$($Stats.ClaymoreCPU_CryptoNight_HashRate.Week)\""
},
"API": "Claymore",
"Port": "3333",
"Wrap": false
}
[
{
"Type": "CPU",
"Path": ".\\Bin\\CryptoNight-Claymore-Cpu\\NsCpuCNMiner64.exe",
"Arguments": "\"-r -1 -mport 3333 -pow7 1 -o $($Pools.CryptoNightV7.Protocol)://$($Pools.CryptoNightV7.Host):$($Pools.CryptoNightV7.Port) -u $($Pools.CryptoNightV7.User) -p $($Pools.CryptoNightV7.Pass)\"",
"HashRates": {
"CryptoNightV7": "\"$($Stats.ClaymoreCPU_CryptoNightV7_HashRate.Week)\""
},
"API": "Claymore",
"Port": "3333",
"Wrap": false
},
{
"Type": "CPU",
"Path": ".\\Bin\\CryptoNight-Claymore-Cpu\\NsCpuCNMiner64.exe",
"Arguments": "\"-r -1 -mport 3333 -pow7 0 -o $($Pools.CryptoNight.Protocol)://$($Pools.CryptoNight.Host):$($Pools.CryptoNight.Port) -u $($Pools.CryptoNight.User) -p $($Pools.CryptoNight.Pass)\"",
"HashRates": {
"CryptoNight": "\"$($Stats.ClaymoreCPU_CryptoNight_HashRate.Week)\""
},
"API": "Claymore",
"Port": "3333",
"Wrap": false
}
]
91 changes: 51 additions & 40 deletions Miners/FireiceAmd.ps1
Expand Up @@ -6,44 +6,55 @@ $Uri = "https://github.com/fireice-uk/xmr-stak/releases/download/2.4.2/xmr-stak-
$Name = Get-Item $MyInvocation.MyCommand.Path | Select-Object -ExpandProperty BaseName
$Port = 3336

([PSCustomObject]@{
pool_list = @([PSCustomObject]@{
pool_address = "$($Pools.CryptoNight.Host):$($Pools.CryptoNight.Port)"
wallet_address = "$($Pools.CryptoNight.User)"
pool_password = "$($Pools.CryptoNight.Pass)"
use_nicehash = $true
use_tls = $Pools.CryptoNight.SSL
tls_fingerprint = ""
pool_weight = 1
rig_id = ""
}
)
currency = "monero7"
call_timeout = 10
retry_time = 10
giveup_limit = 0
verbose_level = 3
print_motd = $true
h_print_time = 60
aes_override = $null
use_slow_memory = "warn"
tls_secure_algo = $true
daemon_mode = $false
flush_stdout = $false
output_file = ""
httpd_port = $Port
http_login = ""
http_pass = ""
prefer_ipv4 = $true
} | ConvertTo-Json -Depth 10
) -replace "^{" -replace "}$" | Set-Content "$(Split-Path $Path)\$($Pools.CryptoNight.Name)_CryptoNight_$($Pools.CryptoNight.User)_Amd.txt" -Force -ErrorAction SilentlyContinue

[PSCustomObject]@{
Type = "AMD"
Path = $Path
Arguments = "-C $($Pools.CryptoNight.Name)_CryptoNight_$($Pools.CryptoNight.User)_Amd.txt --noUAC --noCPU --noNVIDIA -i $($Port)"
HashRates = [PSCustomObject]@{CryptoNight = $Stats."$($Name)_CryptoNight_HashRate".Week}
API = "XMRig"
Port = $Port
URI = $Uri
$Commands = [PSCustomObject]@{
"cryptonight" = "" #CryptoNight
"cryptonight_lite" = "" # CryptoNight-Lite
"cryptonightV7" = "" #CryptoNightV7
}

$Commands | Get-Member -MemberType NoteProperty | Select-Object -ExpandProperty Name | Where-Object {$Pools.$(Get-Algorithm $_)} | ForEach-Object {

$Algorithm_Norm = Get-Algorithm $_

([PSCustomObject]@{
pool_list = @([PSCustomObject]@{
pool_address = "$($Pools.$Algorithm_Norm.Host):$($Pools.$Algorithm_Norm.Port)"
wallet_address = "$($Pools.$Algorithm_Norm.User)"
pool_password = "$($Pools.$Algorithm_Norm.Pass)"
use_nicehash = $true
use_tls = $Pools.$Algorithm_Norm.SSL
tls_fingerprint = ""
pool_weight = 1
rig_id = ""
}
)
currency = if ($Pools.$Algorithm_Norm.Info) {"$($Pools.$Algorithm_Norm.Info -replace '^monero$', 'monero7' -replace '^aeon$', 'aeon7')"} else {"$_"}
call_timeout = 10
retry_time = 10
giveup_limit = 0
verbose_level = 3
print_motd = $true
h_print_time = 60
aes_override = $null
use_slow_memory = "warn"
tls_secure_algo = $true
daemon_mode = $false
flush_stdout = $false
output_file = ""
httpd_port = $Port
http_login = ""
http_pass = ""
prefer_ipv4 = $true
} | ConvertTo-Json -Depth 10
) -replace "^{" -replace "}$" | Set-Content "$(Split-Path $Path)\$($Pools.$Algorithm_Norm.Name)_$($Algorithm_Norm)_$($Pools.$Algorithm_Norm.User)_Amd.txt" -Force -ErrorAction SilentlyContinue

[PSCustomObject]@{
Type = "AMD"
Path = $Path
Arguments = "-C $($Pools.$Algorithm_Norm.Name)_$($Algorithm_Norm)_$($Pools.$Algorithm_Norm.User)_Amd.txt --noUAC --noCPU --noNVIDIA -i $($Port)"
HashRates = [PSCustomObject]@{$Algorithm_Norm = $Stats."$($Name)_$($Algorithm_Norm)_HashRate".Week}
API = "XMRig"
Port = $Port
URI = $Uri
}
}
89 changes: 50 additions & 39 deletions Miners/FireiceCpu.ps1
Expand Up @@ -6,44 +6,55 @@ $Uri = "https://github.com/fireice-uk/xmr-stak/releases/download/2.4.2/xmr-stak-
$Name = Get-Item $MyInvocation.MyCommand.Path | Select-Object -ExpandProperty BaseName
$Port = 3334

([PSCustomObject]@{
pool_list = @([PSCustomObject]@{
pool_address = "$($Pools.CryptoNight.Host):$($Pools.CryptoNight.Port)"
wallet_address = "$($Pools.CryptoNight.User)"
pool_password = "$($Pools.CryptoNight.Pass)"
use_nicehash = $true
use_tls = $Pools.CryptoNight.SSL
tls_fingerprint = ""
pool_weight = 1
rig_id = ""
}
)
currency = "monero7"
call_timeout = 10
retry_time = 10
giveup_limit = 0
verbose_level = 3
print_motd = $true
h_print_time = 60
aes_override = $null
use_slow_memory = "warn"
tls_secure_algo = $true
daemon_mode = $false
flush_stdout = $false
output_file = ""
httpd_port = $Port
http_login = ""
http_pass = ""
prefer_ipv4 = $true
} | ConvertTo-Json -Depth 10
) -replace "^{" -replace "}$" | Set-Content "$(Split-Path $Path)\$($Pools.CryptoNight.Name)_CryptoNight_$($Pools.CryptoNight.User)_Cpu.txt" -Force -ErrorAction SilentlyContinue
$Commands = [PSCustomObject]@{
"cryptonight" = "" #CryptoNight
"cryptonight_lite" = "" # CryptoNight-Lite
"cryptonightV7" = "" #CryptoNightV7
}

[PSCustomObject]@{
Type = "CPU"
Path = $Path
Arguments = "-C $($Pools.CryptoNight.Name)_CryptoNight_$($Pools.CryptoNight.User)_Cpu.txt --noUAC --noAMD --noNVIDIA -i $($Port)"
HashRates = [PSCustomObject]@{CryptoNight = $Stats."$($Name)_CryptoNight_HashRate".Week}
API = "XMRig"
Port = $Port
URI = $Uri
$Commands | Get-Member -MemberType NoteProperty | Select-Object -ExpandProperty Name | Where-Object {$Pools.$(Get-Algorithm $_)} | ForEach-Object {

$Algorithm_Norm = Get-Algorithm $_

([PSCustomObject]@{
pool_list = @([PSCustomObject]@{
pool_address = "$($Pools.$Algorithm_Norm.Host):$($Pools.$Algorithm_Norm.Port)"
wallet_address = "$($Pools.$Algorithm_Norm.User)"
pool_password = "$($Pools.$Algorithm_Norm.Pass)"
use_nicehash = $true
use_tls = $Pools.$Algorithm_Norm.SSL
tls_fingerprint = ""
pool_weight = 1
rig_id = ""
}
)
currency = if ($Pools.$Algorithm_Norm.Info) {"$($Pools.$Algorithm_Norm.Info -replace '^monero$', 'monero7' -replace '^aeon$', 'aeon7')"} else {"$_"}
call_timeout = 10
retry_time = 10
giveup_limit = 0
verbose_level = 3
print_motd = $true
h_print_time = 60
aes_override = $null
use_slow_memory = "warn"
tls_secure_algo = $true
daemon_mode = $false
flush_stdout = $false
output_file = ""
httpd_port = $Port
http_login = ""
http_pass = ""
prefer_ipv4 = $true
} | ConvertTo-Json -Depth 10
) -replace "^{" -replace "}$" | Set-Content "$(Split-Path $Path)\$($Pools.$Algorithm_Norm.Name)_$($Algorithm_Norm)_$($Pools.$Algorithm_Norm.User)_Cpu.txt" -Force -ErrorAction SilentlyContinue

[PSCustomObject]@{
Type = "CPU"
Path = $Path
Arguments = "-C $($Pools.$Algorithm_Norm.Name)_$($Algorithm_Norm)_$($Pools.$Algorithm_Norm.User)_Cpu.txt --noUAC --noAMD --noNVIDIA -i $($Port)"
HashRates = [PSCustomObject]@{$Algorithm_Norm = $Stats."$($Name)_$($Algorithm_Norm)_HashRate".Week}
API = "XMRig"
Port = $Port
URI = $Uri
}
}