v4.3.4.2

Fixes: - Brains / ZergPool: Change sort order to select best paying currency - Brains / ZergPool: Default pool fee not set (Regression from 4.3.4.1) - Core / Includes.psm1: Add-CoinName not updating data files Miner updates: - GMiner-v3.33 - Rigel-v1.4.1
Minerx117 · Apr 18, 2023 · 8d299bd · 8d299bd
1 parent 8925413
commit 8d299bd
Show file tree

Hide file tree

Showing 60 changed files with 1,126 additions and 220 deletions.
diff --git a/Balances/HashCryptos.ps1 b/Balances/HashCryptos.ps1
@@ -18,8 +18,8 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
 <#
 Product:        NemosMiner
 File:           Zpool.ps1
-Version:        4.3.4.1
-Version date:   16 April 2023
+Version:        4.3.4.2
+Version date:   18 April 2023
 #>
 
 using module ..\Includes\Include.psm1

diff --git a/Balances/HiveON.ps1 b/Balances/HiveON.ps1
@@ -18,8 +18,8 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
 <#
 Product:        NemosMiner
 File:           Hiveon.ps1
-Version:        4.3.4.1
-Version date:   16 April 2023
+Version:        4.3.4.2
+Version date:   18 April 2023
 #>
 
 using module ..\Includes\Include.psm1

diff --git a/Balances/MiningDutch.ps1 b/Balances/MiningDutch.ps1
@@ -18,8 +18,8 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
 <#
 Product:        NemosMiner
 File:           MiningDutch.ps1
-Version:        4.3.4.1
-Version date:   16 April 2023
+Version:        4.3.4.2
+Version date:   18 April 2023
 #>
 
 using module ..\Includes\Include.psm1

diff --git a/Balances/MiningPoolHub.ps1 b/Balances/MiningPoolHub.ps1
@@ -18,8 +18,8 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
 <#
 Product:        NemosMiner
 File:           MiningPoolHub.ps1
-Version:        4.3.4.1
-Version date:   16 April 2023
+Version:        4.3.4.2
+Version date:   18 April 2023
 #>
 using module ..\Includes\Include.psm1
 

diff --git a/Balances/NiceHash External.ps1 b/Balances/NiceHash External.ps1
@@ -18,8 +18,8 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
 <#
 Product:        NemosMiner
 File:           NiceHash Internal.ps1
-Version:        4.3.4.1
-Version date:   16 April 2023
+Version:        4.3.4.2
+Version date:   18 April 2023
 #>
 
 using module ..\Includes\Include.psm1

diff --git a/Balances/NiceHash Internal.ps1 b/Balances/NiceHash Internal.ps1
@@ -18,8 +18,8 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
 <#
 Product:        NemosMiner
 File:           NiceHash Internal.ps1
-Version:        4.3.4.1
-Version date:   16 April 2023
+Version:        4.3.4.2
+Version date:   18 April 2023
 #>
 
 using module ..\Includes\Include.psm1

diff --git a/Balances/ProHashing.ps1 b/Balances/ProHashing.ps1
@@ -18,8 +18,8 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
 <#
 Product:        NemosMiner
 File:           ProHashing.ps1
-Version:        4.3.4.1
-Version date:   16 April 2023
+Version:        4.3.4.2
+Version date:   18 April 2023
 #>
 
 using module ..\Includes\Include.psm1

diff --git a/Balances/ZergPool.ps1 b/Balances/ZergPool.ps1
@@ -18,8 +18,8 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
 <#
 Product:        NemosMiner
 File:           ZergPool.ps1
-Version:        4.3.4.1
-Version date:   16 April 2023
+Version:        4.3.4.2
+Version date:   18 April 2023
 #>
 
 using module ..\Includes\Include.psm1

diff --git a/Balances/Zpool.ps1 b/Balances/Zpool.ps1
@@ -18,8 +18,8 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
 <#
 Product:        NemosMiner
 File:           Zpool.ps1
-Version:        4.3.4.1
-Version date:   16 April 2023
+Version:        4.3.4.2
+Version date:   18 April 2023
 #>
 
 using module ..\Includes\Include.psm1

diff --git a/Brains/HashCryptos.ps1 b/Brains/HashCryptos.ps1
@@ -19,8 +19,8 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
 <#
 Product:        NemosMiner
 File:           MiningDutch.ps1
-Version:        4.3.4.1
-Version date:   16 April 2023
+Version:        4.3.4.2
+Version date:   18 April 2023
 #>
 
 using module ..\Includes\Include.psm1

diff --git a/Brains/MiningDutch.ps1 b/Brains/MiningDutch.ps1
@@ -19,8 +19,8 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
 <#
 Product:        NemosMiner
 File:           MiningDutch.ps1
-Version:        4.3.4.1
-Version date:   16 April 2023
+Version:        4.3.4.2
+Version date:   18 April 2023
 #>
 
 using module ..\Includes\Include.psm1

diff --git a/Brains/ProHashing.ps1 b/Brains/ProHashing.ps1
@@ -19,8 +19,8 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
 <#
 Product:        NemosMiner
 File:           ProHashing.ps1
-Version:        4.3.4.1
-Version date:   16 April 2023
+Version:        4.3.4.2
+Version date:   18 April 2023
 #>
 
 using module ..\Includes\Include.psm1

diff --git a/Brains/ZPool.ps1 b/Brains/ZPool.ps1
@@ -19,8 +19,8 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
 <#
 Product:        NemosMiner
 File:           ZPool.ps1
-Version:        4.3.4.1
-Version date:   16 April 2023
+Version:        4.3.4.2
+Version date:   18 April 2023
 #>
 
 using module ..\Includes\Include.psm1
@@ -66,18 +66,36 @@ While ($BrainConfig = $Config.PoolsConfig.$BrainName.BrainConfig) {
         } While (-not ($AlgoData -and $CurrenciesData))
 
         $CurDate = (Get-Date).ToUniversalTime()
-        $CurrenciesData.PSObject.Properties.Name | Where-Object { -not $CurrenciesData.$_.hashrate } | ForEach-Object { $CurrenciesData.PSObject.Properties.Remove($_) }
+        # $CurrenciesData.PSObject.Properties.Name | Where-Object { -not $CurrenciesData.$_.hashrate } | ForEach-Object { $CurrenciesData.PSObject.Properties.Remove($_) }
+
+        # Add currency and convert to array for easy sorting
+        $CurrenciesArray = [System.Collections.Generic.List[PSCustomObject]]@()
+        $CurrenciesData.PSObject.Properties.Name | ForEach-Object { 
+            $CurrenciesData.$_ | Add-Member @{ Currency = If ($CurrenciesData.$_.symbol) { $CurrenciesData.$_.symbol -replace "-.+$", "" } Else { $_ -replace "-.+$", "" } } -Force
+            $CurrenciesData.$_ | Add-Member @{ CoinName = If ($CurrenciesData.$_.name) { $CurrenciesData.$_.name } Else { $_ } } -Force
+            $CurrenciesData.$_.PSObject.Properties.Remove("symbol")
+            $CurrenciesData.$_.PSObject.Properties.Remove("name")
+            $CurrenciesArray.Add($CurrenciesData.$_)
+        }
+
+        # Get best currency
+        $CurrenciesArray | Group-Object algo | ForEach-Object { 
+            $BestCurrency = ($_.Group | Sort-Object estimate -Descending | Select-Object -First 1)
+            $AlgoData.($_.name) | Add-Member Currency $BestCurrency.currency -Force
+            $AlgoData.($_.name) | Add-Member CoinName $BestCurrency.coinname -Force
+        }
 
         ForEach ($Algo in $AlgoData.PSObject.Properties.Name) { 
-            If ($AlgoData.$Algo.coins -eq 1) { 
-                $Currencies = @($CurrenciesData.PSObject.Properties.Name | Where-Object { $CurrenciesData.$_.algo -eq $Algo })
-                $Currency = If ($Currencies.Count -eq 1) { $($Currencies[0] -replace "-.+").Trim() } Else { "" }
-            }
-            Else { 
-                $Currency = ""
-            }
+            $Currency = $AlgoData.$Algo.Currency
             If ($Currency) { 
-                $AlgoData.$Algo | Add-Member @{ Currency = $Currency } -Force
+                # Add coin name and keep data data up to date
+                If ($AlgoData.$Algo.CoinName) { 
+                    Add-CoinName -Algorithm $Algo -Currency $Currency -CoinName $AlgoData.$Algo.CoinName
+                    If ($Variables.DagData.Algorithm.$Algo -and $AlgoData.$Algo.height -gt ($Variables.DAGData.Currency.$Currency.BlockHeight)) { 
+                        $Variables.DAGData.Currency.$Currency = (Get-DAGData -Blockheight $AlgoData.$Algo.height -Currency $Currency -EpochReserve 2)
+                        $Variables.DAGData.Updated."$BrainName Brain" = (Get-Date).ToUniversalTime()
+                    }
+                }
                 $AlgoData.$Algo | Add-Member @{ conversion_disabled = $CurrenciesData.$Currency.conversion_disabled } -Force
                 If ($CurrenciesData.$Currency.error) { 
                     $AlgoData.$Algo | Add-Member @{ error = "Pool error msg: $($CurrenciesData.$Currency.error)" } -Force
@@ -87,7 +105,6 @@ While ($BrainConfig = $Config.PoolsConfig.$BrainName.BrainConfig) {
                 }
             }
             Else { 
-                $AlgoData.$Algo | Add-Member @{ Currency = "" } -Force
                 $AlgoData.$Algo | Add-Member @{ error = "" } -Force
                 $AlgoData.$Algo | Add-Member @{ conversion_disabled = 0 } -Force
             }

diff --git a/Brains/ZergPool.ps1 b/Brains/ZergPool.ps1
@@ -19,8 +19,8 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
 <#
 Product:        NemosMiner
 File:           ZergPool.ps1
-Version:        4.3.4.1
-Version date:   16 April 2023
+Version:        4.3.4.2
+Version date:   18 April 2023
 #>
 
 using module ..\Includes\Include.psm1
@@ -37,6 +37,7 @@ $AlgoObject = @()
 $APICallFails = 0
 $CurrenciesData = @()
 $Durations = [System.Collections.Generic.List[Double]]@()
+$PayoutCurrency = $Config.PoolsConfig.$BrainName.Wallets.Keys | Select-Object -First 1
 $TransferFile = "$($PWD)\Data\BrainData_$($BrainName).json"
 
 $ProgressPreference = "SilentlyContinue"
@@ -52,10 +53,10 @@ While ($BrainConfig = $Config.PoolsConfig.$BrainName.BrainConfig) {
         Do {
             Try { 
                 $CurrenciesData = Invoke-RestMethod -Uri $BrainConfig.PoolCurrenciesUri -Headers @{ "Cache-Control" = "no-cache" } -SkipCertificateCheck -TimeoutSec $BrainConfig.PoolAPITimeout
-                $AlgoData = [PSCustomObject]@{ }
-                $CurrenciesArray = [System.Collections.Generic.List[PSCustomObject]]@()
+                $CurrenciesData.PSObject.Properties.Name | Where-Object { $CurrenciesData.$_.noautotrade -and $CurrenciesData.$_.symbol -ne $PayoutCurreny } | ForEach-Object { $CurrenciesData.PSObject.Properties.Remove($_) }
+
                 # Add currency and convert to array for easy sorting
-                $CurrenciesData.PSObject.Properties.Name | Where-Object { $_ -like "*-*" } | ForEach-Object { $CurrenciesData.PSObject.Properties.Remove($_) }
+                $CurrenciesArray = [System.Collections.Generic.List[PSCustomObject]]@()
                 $CurrenciesData.PSObject.Properties.Name | ForEach-Object { 
                     $CurrenciesData.$_ | Add-Member @{ Currency = If ($CurrenciesData.$_.symbol) { $CurrenciesData.$_.symbol } Else { $_ } } -Force
                     $CurrenciesData.$_ | Add-Member @{ CoinName = If ($CurrenciesData.$_.name) { $CurrenciesData.$_.name } Else { $_ } } -Force
@@ -64,9 +65,9 @@ While ($BrainConfig = $Config.PoolsConfig.$BrainName.BrainConfig) {
                     $CurrenciesArray.Add($CurrenciesData.$_)
                 }
 
+                $AlgoData = [PSCustomObject]@{ }
                 $CurrenciesArray | Group-Object algo | ForEach-Object { 
-                    $BestCurrency = ($_.Group | Sort-Object estimate_current | Select-Object -First 1)
-                    $BestCurrency | Add-Member Coins $_.Group.Count -Force
+                    $BestCurrency = ($_.Group | Sort-Object estimate_current -Descending | Select-Object -First 1)
                     $AlgoData | Add-Member (Get-Algorithm $BestCurrency.algo) $BestCurrency -Force
                 }
                 $APICallFails = 0
@@ -83,12 +84,12 @@ While ($BrainConfig = $Config.PoolsConfig.$BrainName.BrainConfig) {
         $AlgoData = ($AlgoData | ConvertTo-Json) -replace '"estimate_last24":', '"estimate_last24h":' | ConvertFrom-Json
 
         ForEach ($Algo in $AlgoData.PSObject.Properties.Name) { 
-            If (-not $AlgoData.$Algo.currency) { 
-                $Currencies = @(($CurrenciesData | Get-Member -MemberType NoteProperty).Name | Where-Object { $CurrenciesData.$_.algo -eq $Algo } | ForEach-Object { $CurrenciesData.$_ })
-                $Currency = If ($Currencies.Currency) { (($Currencies | Sort-Object Estimate)[-1].Currency).Trim() } Else { "" }
+            If ($AlgoData.$Algo.currency) { 
+                $Currency = $AlgoData.$Algo.currency
             }
             Else { 
-                $Currency = $AlgoData.$Algo.currency
+                $Currencies = @(($CurrenciesData | Get-Member -MemberType NoteProperty).Name | Where-Object { $CurrenciesData.$_.algo -eq $Algo } | ForEach-Object { $CurrenciesData.$_ })
+                $Currency = If ($Currencies.Currency) { (($Currencies | Sort-Object Estimate)[-1].Currency).Trim() } Else { "" }
             }
 
             # Add coin name and keep data data up to date
@@ -100,14 +101,14 @@ While ($BrainConfig = $Config.PoolsConfig.$BrainName.BrainConfig) {
                 }
             }
             $AlgoData.$Algo | Add-Member @{ Currency = $Currency } -Force
-            $AlgoData.$Algo | Add-Member @{ Fees = $Config.PoolsConfig.$BrainName.Variant.$PoolVariant.DefaultFee } -Force
+            $AlgoData.$Algo | Add-Member @{ Fees = $Config.PoolsConfig.$BrainName.DefaultFee } -Force
 
             $AlgoData.$Algo.actual_last24h_shared = ($AlgoData.$Algo.actual_last24h_shared -as [Double]) / 1000
             $AlgoData.$Algo.estimate_current = $AlgoData.$Algo.estimate_current -as [Double]
             $AlgoData.$Algo.estimate_last24h = $AlgoData.$Algo.estimate_last24h -as [Double]
             $BasePrice = If ($AlgoData.$Algo.actual_last24h_shared) { $AlgoData.$Algo.actual_last24h_shared } Else { $AlgoData.$Algo.estimate_last24h }
 
-            $AlgoObject+= [PSCustomObject]@{
+            $AlgoObject += [PSCustomObject]@{
                 actual_last24h     = $BasePrice
                 Currency           = $Currency
                 Date               = $CurDate

diff --git a/ChangeLog.txt b/ChangeLog.txt
@@ -11,6 +11,20 @@ Known issues:
 - Increasing memory consumption over time (PWSH will eat up memory despite aggressive variable cleaning & garbage collection)
 
 
+
+ChangeLog NemosMiner 4.3.4.2 18.04.2023
+=======================================
+
+Fixes:
+- Brains / ZergPool: Change sort order to select best paying currency
+- Brains / ZergPool: Default pool fee not set (Regression from 4.3.4.1)
+- Core / Includes.psm1: Add-CoinName not updating data files
+
+Miner updates:
+- GMiner-v3.33
+- Rigel-v1.4.1
+
+
 ChangeLog NemosMiner 4.3.4.1 16.04.2023
 =======================================
 
@@ -25,7 +39,7 @@ Fixes:
 - SRBMinerMulti-v2.2.4: Could not generate miner objects for CryptoHashing pool
 
 Pools:
-- MiningPoolHub: Removed Coin variant, renamed MininPoolHubCoins to MiningPoolHub
+- MiningPoolHub: Removed Coin variant, renamed MiningPoolHubCoins to MiningPoolHub
 - MiningPoolHub: Added *Plus variant
 
 Miner updates:

diff --git a/Data/CoinNames.json b/Data/CoinNames.json
@@ -61,6 +61,7 @@
   "BLACK": "Blackchain",
   "BLAS": "Blakestar2",
   "BLAST": "Blast",
+  "BLC": "Blake",
   "BLOC": "Bloc",
   "BMB": "Bamboo",
   "BNB": "Binancesmartchain",
@@ -185,6 +186,7 @@
   "EXO": "Exosis",
   "EXP": "Expanse",
   "FCH": "FreeCash",
+  "FEC": "Ferrite",
   "FIRO": "Firo",
   "FITA": "Theta",
   "FJC": "FujiCoin",
@@ -321,6 +323,7 @@
   "MAZA": "MazaCoin",
   "MBC": "MicrobitCoin",
   "MBGL": "Mobitglobal",
+  "MCL": "Marmara",
   "MDEX": "Moondex",
   "MEC": "MegaCoin",
   "MEG": "MegaCoin",
@@ -484,6 +487,7 @@
   "SWAMP": "SwampCoin",
   "SXC": "SexCoin",
   "SYS": "SysCoin",
+  "TAFT": "Cointaft",
   "TAJ": "TajCoin",
   "TCC": "TaichiCoin",
   "TCR": "TecraCoin",
@@ -516,19 +520,16 @@
   "UBQ": "UBIQ",
   "UFO": "UfoProject",
   "UIS": "Unitus",
-  "UMBRU": "UMBRU",
   "UPX": "Uplexa",
   "URALS": "UralsCoin",
   "URX": "Uranium-x",
-  "UT": "ULORD",
   "V8": "V8 Coin",
   "VBK": "Veriblock",
   "VDL": "Vidulum",
   "VDS": "VDimension",
   "VECO": "Veco",
   "VEGI": "Veggie",
   "VEIL": "Veil",
-  "VGC": "5G-CASH",
   "VHH": "Volkshash",
   "VIA": "ViaCoin",
   "VIC": "Victorim",
@@ -564,7 +565,6 @@
   "XCY": "CyprusCoin",
   "XDAG": "Dagger",
   "XDN": "Digitalnote",
-  "XDNA": "XDNA",
   "XEBEC": "Xebec",
   "XEC": "eCash",
   "XEQ": "Equilibria",
@@ -586,15 +586,14 @@
   "XRC": "Bitcoin Rhodium",
   "XRD": "Raven Dark",
   "XRG": "Ergon",
-  "XSC": "XSC",
   "XSG": "Snowgem",
   "XSH": "Shield",
   "XSHB": "Shield",
   "XSPC": "Spectre",
   "XSR": "SucreCoin",
   "XTA": "Italo",
   "XTNC": "XtendCash",
-  "XVG": "VERGE",
+  "XVG": "Verge",
   "XVP": "VirtaCoinPlus",
   "XWP": "Swap",
   "XZC": "Firo",
@@ -621,6 +620,5 @@
   "ZOC": "01Coin",
   "ZP": "ZenProtocol",
   "ZUR": "ZurCoin",
-  "ZYON": "BitZyon",
-  "BLC": "Blake"
+  "ZYON": "BitZyon"
 }