new version and bminer 5.4.0

Quake4 · Mar 1, 2018 · 577eca9 · 577eca9
1 parent 63247b7
commit 577eca9
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 17 deletions.
diff --git a/Code/Config.ps1 b/Code/Config.ps1
@@ -46,7 +46,7 @@ class Config : BaseConfig {
 	static [int] $Processors = 0
 	static [int] $Cores = 0
 	static [int] $Threads = 0
-	static [string] $Version = "v1.09"
+	static [string] $Version = "v1.10"
 	static [string] $BinLocation = "Bin"
 	static [eMinerType[]] $ActiveTypes
 	static [string[]] $CPUFeatures

diff --git a/Miners/bminer-530.ps1 → Miners/bminer-540.ps1 b/Miners/bminer-530.ps1 → Miners/bminer-540.ps1
@@ -15,6 +15,7 @@ $Cfg = [BaseConfig]::ReadOrCreate([IO.Path]::Combine($PSScriptRoot, $Name + [Bas
 	BenchmarkSeconds = 90
 	Algorithms = @(
 	[AlgoInfoEx]@{ Enabled = $true; Algorithm = "equihash" }
+	[AlgoInfoEx]@{ Enabled = $true; Algorithm = "equihash"; ExtraArgs="-nofee" }
 )})
 
 if (!$Cfg.Enabled) { return }
@@ -37,27 +38,13 @@ $Cfg.Algorithms | ForEach-Object {
 					Algorithm = $Algo
 					Type = [eMinerType]::nVidia
 					API = "bminer"
-					URI = "https://github.com/Quake4/MindMinerPrerequisites/raw/master/nVidia/bminer/bminer-v5.3.0-amd64.zip"
+					URI = "https://www.bminercontent.com/releases/bminer-v5.4.0-ae18e12-amd64.zip"
 					Path = "$Name\bminer.exe"
 					ExtraArgs = $_.ExtraArgs
 					Arguments = "-uri $proto`://$($Pool.User):$($Pool.Password)@$($Pool.Host):$($Pool.Port) -api 127.0.0.1:1880 $($_.ExtraArgs)"
 					Port = 1880
 					BenchmarkSeconds = if ($_.BenchmarkSeconds) { $_.BenchmarkSeconds } else { $Cfg.BenchmarkSeconds }
-					Fee = 2
-				}
-				[MinerInfo]@{
-					Pool = $Pool.PoolName()
-					PoolKey = $Pool.PoolKey()
-					Name = $Name
-					Algorithm = $Algo
-					Type = [eMinerType]::nVidia
-					API = "bminer"
-					URI = "https://github.com/Quake4/MindMinerPrerequisites/raw/master/nVidia/bminer/bminer-v5.3.0-amd64.zip"
-					Path = "$Name\bminer.exe"
-					ExtraArgs = "-nofee $($_.ExtraArgs)".Trim()
-					Arguments = "-uri $proto`://$($Pool.User):$($Pool.Password)@$($Pool.Host):$($Pool.Port) -api 127.0.0.1:1880 -nofee $($_.ExtraArgs)"
-					Port = 1880
-					BenchmarkSeconds = if ($_.BenchmarkSeconds) { $_.BenchmarkSeconds } else { $Cfg.BenchmarkSeconds }
+					Fee = if ($_.ExtraArgs -and $_.ExtraArgs -contains "nofee") { 0 } else { 2 }
 				}
 			}
 		}