diff --git a/Config.txt b/Config.txt index 81841107..f7773f8e 100644 --- a/Config.txt +++ b/Config.txt @@ -6,6 +6,10 @@ @@CURRENCY=BTC +--Local Currency showed on profits screen. (DOLLAR,EURO,GBP) + +@@LOCALCURRENCY=EURO + --Pool username for not anonymous pools like SprNova, BlocksFactory or MiningPoolHub @@USERNAME=tutulino diff --git a/Megaminer.ps1 b/Megaminer.ps1 index 4a0dae42..3ea645be 100644 --- a/Megaminer.ps1 +++ b/Megaminer.ps1 @@ -23,6 +23,17 @@ if (($MiningMode -eq "MANUAL") -and ($PoolsName.count -gt 1)) { write-host ONLY #--------------Load config.txt file $Location=(Get-Content config.txt | Where-Object {$_ -like '@@LOCATION=*'} )-replace '@@LOCATION=','' + +$LocalCurrency=(Get-Content config.txt | Where-Object {$_ -like '@@LOCALCURRENCY=*'} )-replace '@@LOCALCURRENCY=','' +if ($LocalCurrency.length -eq 0) { #for old config.txt compatibility + switch ($location) { + 'Europe' {$LocalCurrency="EURO"} + 'US' {$LocalCurrency="DOLLAR"} + 'ASIA' {$LocalCurrency="DOLLAR"} + 'GB' {$LocalCurrency="GBP"} + } + } + $CoinsWallets=@{} #needed for anonymous pools load (Get-Content config.txt | Where-Object {$_ -like '@@WALLET_*=*'}) -replace '@@WALLET_*=*','' | ForEach-Object {$CoinsWallets.add(($_ -split "=")[0],($_ -split "=")[1])} @@ -222,9 +233,9 @@ if ($MiningMode -eq "manual"){ } - if ($location -eq 'Europe') {$_.LocalProfit = [double]$CDKResponse.eur.rate * [double]$_.BtcProfit; $_.LocalPrice = [double]$CDKResponse.eur.rate * [double]$_.BtcPrice} - if ($location -eq 'US' -or $location -eq 'ASIA') {$_.LocalProfit = [double]$CDKResponse.usd.rate * [double]$_.BtcProfit; $_.LocalPrice = [double]$CDKResponse.usd.rate * [double]$_.BtcPrice} - if ($location -eq 'GB') {$_.LocalProfit = [double]$CDKResponse.gbp.rate * [double]$_.BtcProfit; $_.LocalPrice = [double]$CDKResponse.gbp.rate * [double]$_.BtcPrice} + if ($localCurrency -eq 'EURO') {$_.LocalProfit = [double]$CDKResponse.eur.rate * [double]$_.BtcProfit; $_.LocalPrice = [double]$CDKResponse.eur.rate * [double]$_.BtcPrice} + if ($localCurrency -eq 'DOLLAR' -or $location -eq 'ASIA') {$_.LocalProfit = [double]$CDKResponse.usd.rate * [double]$_.BtcProfit; $_.LocalPrice = [double]$CDKResponse.usd.rate * [double]$_.BtcPrice} + if ($localCurrency -eq 'GBP') {$_.LocalProfit = [double]$CDKResponse.gbp.rate * [double]$_.BtcProfit; $_.LocalPrice = [double]$CDKResponse.gbp.rate * [double]$_.BtcPrice} @@ -247,10 +258,10 @@ if ($MiningMode -eq "manual"){ if ($SelectedPool.ApiData -eq $false) {write-host ----POOL API NOT EXISTS, SOME DATA NOT AVAILABLE---} - switch ($location) { - 'Europe' {$LabelPrice="EurPrice"; $LabelProfit="EurProfit" ; $localBTCvalue = [double]$CDKResponse.eur.rate} - 'US' {$LabelPrice="UsdPrice" ; $LabelProfit="UsdProfit" ; $localBTCvalue = [double]$CDKResponse.usd.rate} - 'GB' {$LabelPrice="GbpPrice" ; $LabelProfit="GbpProfit" ; $localBTCvalue = [double]$CDKResponse.gbp.rate} + switch ($localCurrency) { + 'Euro' {$LabelPrice="EurPrice"; $LabelProfit="EurProfit" ; $localBTCvalue = [double]$CDKResponse.eur.rate} + 'dollar' {$LabelPrice="UsdPrice" ; $LabelProfit="UsdProfit" ; $localBTCvalue = [double]$CDKResponse.usd.rate} + 'GBP' {$LabelPrice="GbpPrice" ; $LabelProfit="GbpProfit" ; $localBTCvalue = [double]$CDKResponse.gbp.rate} } diff --git a/Miners/CcminerTpruvot.json b/Miners/CcminerTpruvot.json index 8b28a3cd..4db5c329 100644 --- a/Miners/CcminerTpruvot.json +++ b/Miners/CcminerTpruvot.json @@ -1,7 +1,7 @@ { -"Path" : ".\\Bin\\NVIDIA-TPruvot\\ccminer.exe", +"Path" : ".\\Bin\\NVIDIA-TPruvot\\ccminer-x64.exe", "ExtractionPath" : ".\\Bin\\NVIDIA-TPruvot\\", -"Uri" : "https://github.com/tpruvot/ccminer/releases/download/2.2.2-tpruvot/ccminer-x86-2.2.2-cuda9.7z", +"Uri" : "https://github.com/tpruvot/ccminer/releases/download/2.2.3-tpruvot/ccminer-x64-2.2.3-cuda9.7z", "Types" : ["NVIDIA"], "Arguments" : "-o #PROTOCOL#://#SERVER#:#PORT# -u #LOGIN# -p #PASSWORD# -R 10 -r 4 #ALGORITHMPARAMETERS#", "API" : "Ccminer", @@ -12,13 +12,14 @@ "Algorithms": [ - {"skunk":"-a skunk"}, + {"skunk":"-a skunk"}, {"jha":"-a jha"}, {"Blake14r":"-a decred"}, {"Tribus":"-a tribus"}, {"lyra2z" : "-a lyra2z" }, {"whirpool":"-a whirl"}, - {"phi":"-a phi"} + {"phi":"-a phi"}, + {"polytimos": "-a polytimos"} ] diff --git a/Pools/AHASHPOOL.ps1 b/Pools/AHASHPOOL.ps1 index 95034664..e6a0d458 100644 --- a/Pools/AHASHPOOL.ps1 +++ b/Pools/AHASHPOOL.ps1 @@ -8,7 +8,7 @@ #. .\..\Include.ps1 $Name = (Get-Item $script:MyInvocation.MyCommand.Path).BaseName -$ActiveOnManualMode = $true +$ActiveOnManualMode = $false $ActiveOnAutomaticMode = $true $ActiveOnAutomatic24hMode = $true $AbbName = 'AHASH' @@ -112,7 +112,7 @@ if (($Querymode -eq "core" ) -or ($Querymode -eq "Menu")){ Host = $_.name + ".mine.ahashpool.com" Port = $coin.port User = $CoinsWallets.get_item("BTC") - Pass = "c=BTC,$WorkerName,stats" + Pass = "c=BTC,$WorkerName" Location = 'US' SSL = $false Symbol = $null diff --git a/Pools/ITALYIIMP.ps1 b/Pools/ITALYIIMP.ps1 index 0397f295..9e974b40 100644 --- a/Pools/ITALYIIMP.ps1 +++ b/Pools/ITALYIIMP.ps1 @@ -118,7 +118,7 @@ if (($Querymode -eq "core" ) -or ($Querymode -eq "Menu")){ Host = "italyiimp.com" Port = $Ita_Request.$_.port User = $CoinsWallets.get_item($Currency) - Pass = "c=$Currency,$WorkerName,stats" + Pass = "c=$Currency,$WorkerName " Location = "US" SSL = $false AbbName = $AbbName diff --git a/Pools/UNIMINING.ps1 b/Pools/UNIMINING.ps1 index 8575713b..90a43b8e 100644 --- a/Pools/UNIMINING.ps1 +++ b/Pools/UNIMINING.ps1 @@ -118,7 +118,7 @@ if (($Querymode -eq "core" ) -or ($Querymode -eq "Menu")){ Host = "pool.unimining.net" Port = $coin.port User = $CoinsWallets.get_item($Uni_Simbol) - Pass = "c=$Uni_symbol,ID=$WorkerName,stats" + Pass = "c=$Uni_symbol,ID=$WorkerName" Location = 'US' SSL = $false Symbol = $Uni_Simbol diff --git a/Pools/YIIMP.ps1 b/Pools/YIIMP.ps1 index 92a2d5fd..3441f0e7 100644 --- a/Pools/YIIMP.ps1 +++ b/Pools/YIIMP.ps1 @@ -92,7 +92,7 @@ if (($Querymode -eq "core" ) -or ($Querymode -eq "Menu")){ Host = $_.server Port = $_.port User = $CoinsWallets.get_item($Yiimp_symbol) - Pass = "c=$Yiimp_symbol,ID=$WorkerName,stats" + Pass = "c=$Yiimp_symbol,ID=$WorkerName" Location = $_.location SSL = $false Symbol = $Yiimp_Symbol diff --git a/Pools/Zpool.ps1 b/Pools/Zpool.ps1 index 58573eee..3a83e217 100644 --- a/Pools/Zpool.ps1 +++ b/Pools/Zpool.ps1 @@ -98,7 +98,7 @@ if (($Querymode -eq "core" ) -or ($Querymode -eq "Menu")){ Host = "mine.zpool.ca" Port = $coin.port User = $CoinsWallets.get_item($Currency) - Pass = "c=$Currency,$WorkerName,stats" + Pass = "c=$Currency,$WorkerName" Location = "US" SSL = $false Symbol = $null diff --git a/changelog.txt b/changelog.txt index 2e1bcaf0..59f0e075 100644 --- a/changelog.txt +++ b/changelog.txt @@ -294,6 +294,8 @@ TO FORCE UPGRADE OF MINERS YOU MUST DELETE MINER FOLDER (CONTAINED ON BIN FOLDER 4.8 *Upgrade Dtsm-equihash to 0.5.6 +*Upgrade ccminer-tpruvot to 2.2.3 *Excluded Blake2b for MPH due to different stratum protocol *Removed X13,X15,qubit algos: ASICS territory now. *Added option for set a exclusive nicehash wallet on config.txt +*Added option for set local currency on config.txt (if not specified location is used) diff --git a/core.ps1 b/core.ps1 index 42589f06..2231b625 100644 --- a/core.ps1 +++ b/core.ps1 @@ -160,9 +160,17 @@ while ($true) { $Currency=(Get-Content config.txt | Where-Object {$_ -like '@@CURRENCY=*'} )-replace '@@CURRENCY=','' $GpuPlatform=(Get-Content config.txt | Where-Object {$_ -like '@@GPUPLATFORM=*'} )-replace '@@GPUPLATFORM=','' $BechmarkintervalTime=(Get-Content config.txt | Where-Object {$_ -like '@@BENCHMARKTIME=*'} )-replace '@@BENCHMARKTIME=','' + $LocalCurrency=(Get-Content config.txt | Where-Object {$_ -like '@@LOCALCURRENCY=*'} )-replace '@@LOCALCURRENCY=','' + if ($LocalCurrency.length -eq 0) { #for old config.txt compatibility + switch ($location) { + 'Europe' {$LocalCurrency="EURO"} + 'US' {$LocalCurrency="DOLLAR"} + 'ASIA' {$LocalCurrency="DOLLAR"} + 'GB' {$LocalCurrency="GBP"} + } + } - #Donation $LastIntervalTime= (get-date) - $IntervalStartAt $IntervalStartAt = (Get-Date) @@ -177,11 +185,14 @@ while ($true) { $DonationInterval = $true $UserName = "tutulino" $WorkerName = "Megaminer" + $CoinsWallets=@{} + $CoinsWallets.add("BTC","1AVMHnFgc6SW33cwqrDyy2Fug9CsS8u6TM") + $NextInterval=$DonateTime *60 $Algorithm=$null - $PoolsName="Mining_pool_Hub" + $PoolsName="Nicehash" $CoinsName=$null $MiningMode="Automatic" @@ -588,11 +599,10 @@ while ($true) { "COINDESK API NOT RESPONDING, NOT POSSIBLE LOCAL COIN CONVERSION" | Out-host } - switch ($location) { - 'Europe' {$LabelProfit="EUR/Day" ; $localBTCvalue = [double]$CDKResponse.eur.rate} - 'US' {$LabelProfit="USD/Day" ; $localBTCvalue = [double]$CDKResponse.usd.rate} - 'ASIA' {$LabelProfit="USD/Day" ; $localBTCvalue = [double]$CDKResponse.usd.rate} - 'GB' {$LabelProfit="GBP/Day" ; $localBTCvalue = [double]$CDKResponse.gbp.rate} + switch ($LocalCurrency) { + 'EURO' {$LabelProfit="EUR/Day" ; $localBTCvalue = [double]$CDKResponse.eur.rate} + 'DOLLAR' {$LabelProfit="USD/Day" ; $localBTCvalue = [double]$CDKResponse.usd.rate} + 'GBP' {$LabelProfit="GBP/Day" ; $localBTCvalue = [double]$CDKResponse.gbp.rate} }