Skip to content

Commit

Permalink
#287
Browse files Browse the repository at this point in the history 
 add eaglesong
  -gminer
  -nbminer
  -bminer
  -add to pool-algos
  -update various miner.ps1 files
  -add to updater to add to miner.json
  • Loading branch information
@MaynardMiner
MaynardMiner committed Jan 11, 2020
1 parent bc4692d commit 9a7dba2
Show file tree
Hide file tree
Showing 12 changed files with 171 additions and 81 deletions.
3 changes: 2 additions & 1 deletion algopools/nicehash.ps1
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,8 @@ $Nicehash_Ports =
"lyra2z":"3365", "x16r":"3366", "cryptonightv8":"3367", "sha256asicboost":"3368",
"zhash":"3369", "beam":"3370", "grincuckaroo29":"3371", "grincuckatoo31":"3372",
"lyra2rev3":"3373", "mtp":"3374", "cryptonightr":"3375", "cuckoocycle":"3376",
"grincuckarood29":"3377", "beamv2":3378, "x16rv2":3379, "randomxmonero":3380
"grincuckarood29":"3377", "beamv2":"3378", "x16rv2":"3379", "randomxmonero":"3380",
"eaglesong":"3381"
}'

$Nicehash_Ports = $Nicehash_Ports | ConvertFrom-Json
Expand Down
17 changes: 17 additions & 0 deletions build/powershell/startup/remoteagent.psm1
View file
Original file line number Diff line number Diff line change
Expand Up @@ -405,6 +405,11 @@ function Global:start-update {
$Data.$_.difficulty | Add-Member "cuckaroo29d" "" -ErrorAction SilentlyContinue
$Data.$_.naming | Add-Member "cuckaroo29d" "cuckaroo29d" -ErrorAction SilentlyContinue
$Data.$_.fee | Add-Member "cuckaroo29d" 2 -ErrorAction SilentlyContinue

$Data.$_.commands | Add-Member "eaglesong" "" -ErrorAction SilentlyContinue
$Data.$_.difficulty | Add-Member "eaglesong" "" -ErrorAction SilentlyContinue
$Data.$_.naming | Add-Member "eaglesong" "eaglesong" -ErrorAction SilentlyContinue
$Data.$_.fee | Add-Member "eaglesong" 2 -ErrorAction SilentlyContinue
}
}
}
Expand Down Expand Up @@ -464,6 +469,11 @@ function Global:start-update {
$Data.$_.difficulty | Add-Member "beamv2" "" -ErrorAction SilentlyContinue
$Data.$_.naming | Add-Member "beamv2" "beamv2" -ErrorAction SilentlyContinue
$Data.$_.fee | Add-Member "beamv2" 2 -ErrorAction SilentlyContinue

$Data.$_.commands | Add-Member "eaglesong" "" -ErrorAction SilentlyContinue
$Data.$_.difficulty | Add-Member "eaglesong" "" -ErrorAction SilentlyContinue
$Data.$_.naming | Add-Member "eaglesong" "eaglesong" -ErrorAction SilentlyContinue
$Data.$_.fee | Add-Member "eaglesong" 2 -ErrorAction SilentlyContinue
}
}
}
Expand Down Expand Up @@ -631,6 +641,11 @@ function Global:start-update {
$Data.$_.naming = $Data.$_.naming | Select-Object -ExcludeProperty "equihash_150/5"
$Data.$_.fee = $Data.$_.fee | Select-Object -ExcludeProperty "equihash_150/5"

$Data.$_.commands | Add-Member "eaglesong" "" -ErrorAction SilentlyContinue
$Data.$_.difficulty | Add-Member "eaglesong" "" -ErrorAction SilentlyContinue
$Data.$_.naming | Add-Member "eaglesong" "eaglesong" -ErrorAction SilentlyContinue
$Data.$_.fee | Add-Member "eaglesong" 2 -ErrorAction SilentlyContinue

$Data.$_.commands | Add-Member "ethash" "" -ErrorAction SilentlyContinue
$Data.$_.difficulty | Add-Member "ethash" "" -ErrorAction SilentlyContinue
$Data.$_.naming | Add-Member "ethash" "ethash" -ErrorAction SilentlyContinue
Expand Down Expand Up @@ -800,13 +815,15 @@ function Global:start-update {
$Data | add-Member "cryptonight-fast" @{alt_names = @("cryptonight-fast","cryptonightfast","cryptonight_fast"); exclusions = @("add pool or miner here", "comma seperated") } -ErrorAction SilentlyContinue -Force
$Data | add-Member "cryptonight-xeq" @{alt_names = @("cryptonight-xeq","cryptonightxeq","cryptonight_xeq"); exclusions = @("add pool or miner here", "comma seperated") } -ErrorAction SilentlyContinue -Force
$Data | add-Member "cryptonight-conceal" @{alt_names = @("cryptonight-conceal","cryptonightconceal","cryptonight_conceal"); exclusions = @("add pool or miner here", "comma seperated") } -ErrorAction SilentlyContinue -Force
$Data | add-Member "cryptonight-upx2" @{alt_names = @("cryptonight-upx2","cryptonightupx2","cryptonight_upx2","cryptonight-upx","cryptonightupx","cryptonight_upx"); exclusions = @("add pool or miner here", "comma seperated") } -ErrorAction SilentlyContinue -Force
$Data | add-Member "randomsfx" @{alt_names = @("random-sfx","randomsfx","random_sfx"); exclusions = @("add pool or miner here", "comma seperated") } -ErrorAction SilentlyContinue -Force
$Data | add-Member "randomv" @{alt_names = @("random-v","randomv","random_v"); exclusions = @("add pool or miner here", "comma seperated") } -ErrorAction SilentlyContinue -Force
$Data | add-Member "randomx" @{alt_names = @("random-x","randomx","random_x"); exclusions = @("add pool or miner here", "comma seperated") } -ErrorAction SilentlyContinue -Force
$Data | add-Member "yespoweritc" @{alt_names = @("yespoweritc"); exclusions = @("add pool or miner here", "comma seperated") } -ErrorAction SilentlyContinue -Force
$Data | add-Member "yespoweriots" @{alt_names = @("yespoweriots"); exclusions = @("add pool or miner here", "comma seperated") } -ErrorAction SilentlyContinue -Force
$Data | add-Member "yespoweric" @{alt_names = @("yespoweric"); exclusions = @("add pool or miner here", "comma seperated") } -ErrorAction SilentlyContinue -Force
$Data | add-Member "sha256csm" @{alt_names = @("sha256csm"); exclusions = @("add pool or miner here", "comma seperated") } -ErrorAction SilentlyContinue -Force
$Data | add-Member "eaglesong" @{alt_names = @("eaglesong"); exclusions = @("add pool or miner here", "comma seperated") } -ErrorAction SilentlyContinue -Force
}


Expand Down
2 changes: 1 addition & 1 deletion build/powershell/startup/winconfig.psm1
View file
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@ Function Global:Get-Bus {
if ($OldCount) {
Write-Log "Previously Detected GPU List Is:" -ForegroundColor Yellow
$OldCount | Out-Host
Write-Log "Run `Hive_Windows_Reset.bat' if this count is in error count again." -ForegroundColor Yellow
Write-Log "Run 'Hive_Windows_Reset.bat' if this count is in error count again." -ForegroundColor Yellow
Start-Sleep -S .5
}

Expand Down
12 changes: 12 additions & 0 deletions config/miners/bminer.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@
"cuckaroo29": "",
"cuckaroo29d": "",
"cuckatoo31": "",
"eaglesong": "",
"beamv2":""
},
"difficulty": {
Expand All @@ -20,6 +21,7 @@
"cuckaroo29": "",
"cuckaroo29d": "",
"cuckatoo31": "",
"eaglesong": "",
"beamv2":""
},
"naming": {
Expand All @@ -29,6 +31,7 @@
"cuckaroo29": "cuckaroo29",
"cuckaroo29d": "cuckaroo29d",
"cuckatoo31": "cuckatoo31",
"eaglesong": "eaglesong",
"beamv2":"beamv2"
},
"fee": {
Expand All @@ -38,6 +41,7 @@
"cuckaroo29": 1,
"cuckaroo29d": 2,
"cuckatoo31": 1,
"eaglesong": 2,
"beamv2":2
}
},
Expand All @@ -52,6 +56,7 @@
"cuckaroo29": "",
"cuckaroo29d": "",
"cuckatoo31": "",
"eaglesong": "",
"beamv2":""
},
"difficulty": {
Expand All @@ -61,6 +66,7 @@
"cuckaroo29": "",
"cuckaroo29d": "",
"cuckatoo31": "",
"eaglesong": "",
"beamv2":""
},
"naming": {
Expand All @@ -70,6 +76,7 @@
"cuckaroo29": "cuckaroo29",
"cuckaroo29d": "cuckaroo29d",
"cuckatoo31": "cuckatoo31",
"eaglesong": "eaglesong",
"beamv2":"beamv2"
},
"fee": {
Expand All @@ -79,6 +86,7 @@
"cuckaroo29": 1,
"cuckaroo29d": 2,
"cuckatoo31": 1,
"eaglesong": 2,
"beamv2":2
}
},
Expand All @@ -93,6 +101,7 @@
"cuckaroo29": "",
"cuckaroo29d": "",
"cuckatoo31": "",
"eaglesong": "",
"beamv2":""
},
"difficulty": {
Expand All @@ -102,6 +111,7 @@
"cuckaroo29": "",
"cuckaroo29d": "",
"cuckatoo31": "",
"eaglesong": "",
"beamv2":""
},
"naming": {
Expand All @@ -111,6 +121,7 @@
"cuckaroo29": "cuckaroo29",
"cuckaroo29d": "cuckaroo29d",
"cuckatoo31": "cuckatoo31",
"eaglesong": "eaglesong",
"beamv2":"beamv2"
},
"fee": {
Expand All @@ -120,6 +131,7 @@
"cuckaroo29": 1,
"cuckaroo29d": 2,
"cuckatoo31": 1,
"eaglesong": 2,
"beamv2":2
}
}
Expand Down
4 changes: 4 additions & 0 deletions config/miners/gminer-amd.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@
"commands": {
"cuckoo_cycle": "",
"beamv2": "",
"eaglesong": "",
"equihash_125/4": "",
"equihash_192/7": "",
"equihash_144/5": "",
Expand All @@ -21,6 +22,7 @@
"difficulty": {
"cuckoo_cycle": "",
"beamv2": "",
"eaglesong": "",
"equihash_125/4": "",
"equihash_192/7": "",
"equihash_144/5": "",
Expand All @@ -30,6 +32,7 @@
"naming": {
"cuckoo_cycle": "cuckoo_cycle",
"beamv2": "beamv2",
"eaglesong": "eaglesong",
"equihash_125/4": "equihash_125/4",
"equihash_192/7": "equihash_192/7",
"equihash_144/5": "equihash_144/5",
Expand All @@ -39,6 +42,7 @@
"fee": {
"cuckoo_cycle": 2,
"beamv2": 2,
"eaglesong": 2,
"equihash_125/4": 2,
"equihash_192/7": 2,
"equihash_144/5": 2,
Expand Down
12 changes: 12 additions & 0 deletions config/miners/gminer.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@
"cuckaroo29d": "",
"cuckatoo31": "",
"beamv2": "",
"eaglesong": "",
"ethash": "",
"equihash_96/5": "",
"equihash_192/7": "",
Expand All @@ -24,6 +25,7 @@
"cuckaroo29d": "",
"cuckatoo31": "",
"beamv2": "",
"eaglesong": "",
"ethash": "",
"equihash_96/5": "",
"equihash_192/7": "",
Expand All @@ -39,6 +41,7 @@
"cuckatoo31": "cuckatoo31",
"beamv2": "beamv2",
"ethash": "ethash",
"eaglesong": "eaglesong",
"equihash_96/5": "equihash_96/5",
"equihash_192/7": "equihash_192/7",
"equihash_144/5": "equihash_144/5",
Expand All @@ -53,6 +56,7 @@
"cuckatoo31": 2,
"beamv2": 2,
"ethash": 0.65,
"eaglesong": 2,
"equihash_96/5": 2,
"equihash_192/7": 2,
"equihash_144/5": 2,
Expand All @@ -71,6 +75,7 @@
"cuckaroo29d": "",
"cuckatoo31": "",
"beamv2": "",
"eaglesong": "",
"ethash": "",
"equihash_96/5": "",
"equihash_192/7": "",
Expand All @@ -85,6 +90,7 @@
"cuckaroo29d": "",
"cuckatoo31": "",
"beamv2": "",
"eaglesong": "",
"ethash": "",
"equihash_96/5": "",
"equihash_192/7": "",
Expand All @@ -100,6 +106,7 @@
"cuckatoo31": "cuckatoo31",
"beamv2": "beamv2",
"ethash": "ethash",
"eaglesong": "eaglesong",
"equihash_96/5": "equihash_96/5",
"equihash_192/7": "equihash_192/7",
"equihash_144/5": "equihash_144/5",
Expand All @@ -114,6 +121,7 @@
"cuckatoo31": 2,
"beamv2": 2,
"ethash": 0.65,
"eaglesong": 2,
"equihash_96/5": 2,
"equihash_192/7": 2,
"equihash_144/5": 2,
Expand All @@ -132,6 +140,7 @@
"cuckaroo29d": "",
"cuckatoo31": "",
"beamv2": "",
"eaglesong": "",
"ethash": "",
"equihash_96/5": "",
"equihash_192/7": "",
Expand All @@ -146,6 +155,7 @@
"cuckaroo29d": "",
"cuckatoo31": "",
"beamv2": "",
"eaglesong": "",
"ethash": "",
"equihash_96/5": "",
"equihash_192/7": "",
Expand All @@ -161,6 +171,7 @@
"cuckatoo31": "cuckatoo31",
"beamv2": "beamv2",
"ethash": "ethash",
"eaglesong": "eaglesong",
"equihash_96/5": "equihash_96/5",
"equihash_192/7": "equihash_192/7",
"equihash_144/5": "equihash_144/5",
Expand All @@ -175,6 +186,7 @@
"cuckatoo31": 2,
"beamv2": 2,
"ethash": 0.65,
"eaglesong": 2,
"equihash_96/5": 2,
"equihash_192/7": 2,
"equihash_144/5": 2,
Expand Down
36 changes: 24 additions & 12 deletions config/miners/nbminer.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,22 +7,26 @@
"commands": {
"ethash": "",
"cuckaroo29d": "",
"cuckatoo31": ""
"cuckatoo31": "",
"eaglesong": ""
},
"difficulty": {
"ethash": "",
"cuckaroo29d": "",
"cuckatoo31": ""
"cuckatoo31": "",
"eaglesong": ""
},
"naming": {
"ethash": "ethash",
"cuckaroo29d": "cuckaroo29d",
"cuckatoo31": "cuckatoo31"
"cuckatoo31": "cuckatoo31",
"eaglesong": "eaglesong"
},
"fee": {
"ethash": 0.65,
"cuckaroo29d": 2,
"cuckatoo31": 2
"cuckatoo31": 2,
"eaglesong": 2
}
},
"NVIDIA2": {
Expand All @@ -32,22 +36,26 @@
"commands": {
"ethash": "",
"cuckaroo29d": "",
"cuckatoo31": ""
"cuckatoo31": "",
"eaglesong": ""
},
"difficulty": {
"ethash": "",
"cuckaroo29d": "",
"cuckatoo31": ""
"cuckatoo31": "",
"eaglesong": ""
},
"naming": {
"ethash": "ethash",
"cuckaroo29d": "cuckaroo29d",
"cuckatoo31": "cuckatoo31"
"cuckatoo31": "cuckatoo31",
"eaglesong": "eaglesong"
},
"fee": {
"ethash": 0.65,
"cuckaroo29d": 2,
"cuckatoo31": 2
"cuckatoo31": 2,
"eaglesong": 2
}
},
"NVIDIA3": {
Expand All @@ -57,22 +65,26 @@
"commands": {
"ethash": "",
"cuckaroo29d": "",
"cuckatoo31": ""
"cuckatoo31": "",
"eaglesong": ""
},
"difficulty": {
"ethash": "",
"cuckaroo29d": "",
"cuckatoo31": ""
"cuckatoo31": "",
"eaglesong": ""
},
"naming": {
"ethash": "ethash",
"cuckaroo29d": "cuckaroo29d",
"cuckatoo31": "cuckatoo31"
"cuckatoo31": "cuckatoo31",
"eaglesong": "eaglesong"
},
"fee": {
"ethash": 0.65,
"cuckaroo29d": 2,
"cuckatoo31": 2
"cuckatoo31": 2,
"eaglesong": 2
}
}
}
Loading

0 comments on commit 9a7dba2

Please sign in to comment.