Skip to content

Commit

Permalink
4.8
Browse files Browse the repository at this point in the history
  • Loading branch information
@tutulino
tutulino committed Dec 6, 2017
1 parent bb437ee commit 18a3d27
Show file tree
Hide file tree
Showing 10 changed files with 52 additions and 24 deletions.
4 changes: 4 additions & 0 deletions Config.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
25 changes: 18 additions & 7 deletions Megaminer.ps1
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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])}

Expand Down Expand Up @@ -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}



Expand All @@ -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}

}

Expand Down
9 changes: 5 additions & 4 deletions Miners/CcminerTpruvot.json
View file
Original file line number Diff line number Diff line change
@@ -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",
Expand All @@ -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"}

]

Expand Down
4 changes: 2 additions & 2 deletions Pools/AHASHPOOL.ps1
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
#. .\..\Include.ps1

$Name = (Get-Item $script:MyInvocation.MyCommand.Path).BaseName
$ActiveOnManualMode = $true
$ActiveOnManualMode = $false
$ActiveOnAutomaticMode = $true
$ActiveOnAutomatic24hMode = $true
$AbbName = 'AHASH'
Expand Down Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion Pools/ITALYIIMP.ps1
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion Pools/UNIMINING.ps1
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion Pools/YIIMP.ps1
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion Pools/Zpool.ps1
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 2 additions & 0 deletions changelog.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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)
24 changes: 17 additions & 7 deletions core.ps1
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand All @@ -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"

Expand Down Expand Up @@ -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}

}

Expand Down

0 comments on commit 18a3d27

Please sign in to comment.