Added ability to set extra miner arguments

Author: saltyminer

BitPoolMiner/BitPoolMiner.csproj

@@ -5,6 +5,7 @@
 using System;
 using System.Collections.ObjectModel;
 using System.Linq;
+using System.Windows;
 
 // This is the Miner base class.
 
@@ -62,19 +63,33 @@ protected virtual BPMProcess StartProcess()
             var process = new BPMProcess();
 
             IsMining = true;
+            FormatPerMinerCoinCombo();
 
-            // DS - Hotfix for SUQA/TREX algo type
-            // TODO - Fix this shit
+            ObservableCollection<AccountMinerTypeExtraParams> AccountMinerTypeExtraParamsList = (ObservableCollection<AccountMinerTypeExtraParams>)Application.Current.Properties["AccountMinerTypeExtraParamsList"];
+            AccountMinerTypeExtraParams accountMinerTypeExtraParams = AccountMinerTypeExtraParamsList.First(x => x.MinerBaseType == MinerBaseType);
 
-            if (MinerBaseType == MinerBaseType.TRex && CoinType == CoinType.SUQA)
+            if (accountMinerTypeExtraParams != null && accountMinerTypeExtraParams.ExtraParams != String.Empty)
             {
-                MinerArguments = MinerArguments.Replace("x16r", "x22i");
+                // Add Extra Params 
+                MinerArguments = String.Format("{0} {1}", MinerArguments, accountMinerTypeExtraParams.ExtraParams);
             }
 
             process.Start(MinerWorkingDirectory, MinerArguments, MinerFileName, Hardware == HardwareType.AMD, MinerBaseType);
             process.MinerProcess.Exited += MinerExited;
             return process;
         }
+        /// <summary>
+        /// Handle special scenarios
+        /// </summary>
+        private void FormatPerMinerCoinCombo()
+        {
+            // DS - Hotfix for SUQA/TREX algo type
+            // TODO - Fix this shit
+            if (MinerBaseType == MinerBaseType.TRex && CoinType == CoinType.SUQA)
+            {
+                MinerArguments = MinerArguments.Replace("x16r", "x22i");
+            }
+        }
 
         /// <summary>
         /// Stops the miner process

BitPoolMiner/Miners/Miner.cs

@@ -0,0 +1,39 @@
+using BitPoolMiner.Enums;
+using Newtonsoft.Json;
+
+namespace BitPoolMiner.Models
+{
+    public class AccountMinerTypeExtraParams
+    {
+        /// <summary>
+        /// Miner Type to Add Extra Param to
+        /// </summary>
+        public string MinerBaseTypeString { get; set; }
+
+        /// <summary>
+        /// Miner Type to Add Extra Param to
+        /// </summary>
+        [JsonIgnore]
+        public MinerBaseType MinerBaseType
+        {
+            get
+            {
+                MinerBaseType minerBaseType;
+                if(System.Enum.TryParse(MinerBaseTypeString, out minerBaseType))
+                {
+                    return minerBaseType;
+                }
+                else
+                {
+                    return MinerBaseType.UNDEFINED;
+                }
+            }
+
+        }
+
+        /// <summary>
+        /// Extra miner parameters to use
+        /// </summary>
+        public string ExtraParams { get; set; }
+    }
+}

BitPoolMiner/Models/AccountMinerTypeExtraParams.cs

@@ -44,5 +44,10 @@ public static class FileNameConstants
         /// Config file used to store the worker settings
         /// </summary>
         public const string WorkerSettingsFileName = "WorkerSettings.json";
+
+        /// <summary>
+        /// Config file used to store the miner extra params
+        /// </summary>
+        public const string MinerTypeExtraParamsFileName = "MinerTypeExtraParams.json";
     }
 }

BitPoolMiner/Persistence/FileSystem/Base/FileConstants.cs

@@ -0,0 +1,108 @@
+using BitPoolMiner.Models;
+using BitPoolMiner.Persistence.FileSystem.Base;
+using Newtonsoft.Json;
+using System;
+using System.IO;
+using BitPoolMiner.Utils;
+using BitPoolMiner.Enums;
+using System.Collections.Generic;
+using System.Collections.ObjectModel;
+
+namespace BitPoolMiner.Persistence.FileSystem
+{
+    /// <summary>
+    /// Handles configuration file used to store the extra parameters for miner apps to use
+    /// </summary>
+    public class MinerTypeExtraParamsFile
+    {
+        /// <summary>
+        /// Serialize object to JSON and write/overwrite file
+        /// </summary>
+        /// <param name="accountMinerTypeExtraParamsList"></param>
+        public void WriteJsonToFile(ObservableCollection<AccountMinerTypeExtraParams> accountMinerTypeExtraParamsList)
+        {
+            string filePath = Path.Combine(FileConstants.ConfigFilePath(), FileNameConstants.MinerTypeExtraParamsFileName);
+
+            try
+            {
+                // serialize JSON directly to a file
+                using (StreamWriter file = File.CreateText(filePath))
+                {
+                    JsonSerializer serializer = new JsonSerializer();
+                    serializer.Serialize(file, accountMinerTypeExtraParamsList);
+                }
+            }
+            catch (Exception e)
+            {
+                throw new ApplicationException(string.Format("Error writing file {0}", filePath), e);
+            }
+        }
+
+        /// <summary>
+        /// Read object from file and deserialize JSON and map to object
+        /// </summary>
+        /// <returns></returns>
+        public ObservableCollection<AccountMinerTypeExtraParams> ReadJsonFromFile()
+        {
+            string filePath = Path.Combine(FileConstants.ConfigFilePath(), FileNameConstants.MinerTypeExtraParamsFileName);
+
+            // Create new empty list of miner type extra params
+            ObservableCollection<AccountMinerTypeExtraParams> accountMinerTypeExtraParamsList = new ObservableCollection<AccountMinerTypeExtraParams>();
+
+            try
+            {
+                if (File.Exists(filePath))
+                {
+                    // deserialize JSON directly from a file
+                    using (StreamReader file = File.OpenText(filePath))
+                    {
+                        JsonSerializer serializer = new JsonSerializer();
+                        accountMinerTypeExtraParamsList = (ObservableCollection<AccountMinerTypeExtraParams>)serializer.Deserialize(file, typeof(ObservableCollection<AccountMinerTypeExtraParams>));
+                    }
+                }
+                else
+                {
+                    accountMinerTypeExtraParamsList = InitEmptyMinerTypeExtraParams();
+                }
+                return accountMinerTypeExtraParamsList;
+            }
+            catch (Exception e)
+            {
+                accountMinerTypeExtraParamsList = InitEmptyMinerTypeExtraParams();
+
+                NLogProcessing.LogError(e, "Miner type extra parameters could not be loaded. Using default values.");
+
+                // Return defaults
+                return accountMinerTypeExtraParamsList;
+            }
+        }
+
+        /// <summary>
+        /// Initializes a new AccountMinerTypeExtraParams object (only called when one doesn't exist or cannot be read).
+        /// </summary>
+        /// <param name="accountMinerTypeExtraParams"></param>
+        /// <returns></returns>
+        private ObservableCollection<AccountMinerTypeExtraParams> InitEmptyMinerTypeExtraParams()
+        {
+            // Create new empty list of miner type extra params
+            ObservableCollection<AccountMinerTypeExtraParams> accountMinerTypeExtraParamsList = new ObservableCollection<AccountMinerTypeExtraParams>();
+
+            // Set default values
+            foreach (MinerBaseType minerBaseType in Enum.GetValues(typeof(MinerBaseType)))
+            {
+                // Don't add settings for Undefined
+                if (minerBaseType != MinerBaseType.UNDEFINED)
+                {
+                    AccountMinerTypeExtraParams accountMinerTypeExtraParams = new AccountMinerTypeExtraParams();
+                    accountMinerTypeExtraParams.MinerBaseTypeString = minerBaseType.ToString();
+                    accountMinerTypeExtraParams.ExtraParams = "";
+                    accountMinerTypeExtraParamsList.Add(accountMinerTypeExtraParams);
+                }
+            }
+            // Write defaults to disk
+            WriteJsonToFile(accountMinerTypeExtraParamsList);
+
+            return accountMinerTypeExtraParamsList;
+        }
+    }
+}

BitPoolMiner/Persistence/FileSystem/MinerTypeExtraParamsFile.cs

@@ -107,6 +107,20 @@ public ObservableCollection<GPUSettings> GPUSettingsList
         // WalletViewModel reference
         public WalletViewModel WalletViewModel { get; set; }
 
+        // Account Miner Type Extra Params property to bind to UI
+        private ObservableCollection<AccountMinerTypeExtraParams> accountMinerTypeExtraParamsList;
+        public ObservableCollection<AccountMinerTypeExtraParams> AccountMinerTypeExtraParamsList
+        {
+            get
+            {
+                return accountMinerTypeExtraParamsList;
+            }
+            set
+            {
+                accountMinerTypeExtraParamsList = value;
+                OnPropertyChanged();
+            }
+        }
 
         #endregion
 
@@ -120,6 +134,7 @@ public ObservableCollection<GPUSettings> GPUSettingsList
         public RelayCommand CommandScanHardware { get; set; }
         public RelayCommand CommandSaveAccountWorkerHardware { get; set; }
         public RelayCommand CommandUpdateCoinType { get; set; }
+        public RelayCommand CommandSaveAccountMinerTypeExtraParams { get; set; }
 
         #endregion
 
@@ -146,6 +161,7 @@ public AccountViewModel(MainWindowViewModel mainWindowViewModel)
             CommandScanHardware = new RelayCommand(ScanHardware);
             CommandSaveAccountWorkerHardware = new RelayCommand(PersistWorkerHardware);
             CommandUpdateCoinType = new RelayCommand(UpdateCoinType);
+            CommandSaveAccountMinerTypeExtraParams = new RelayCommand(PersistMinerTypeExtraParams);
 
             // Load previous GUID or get a new GUID
             InitAccountID();
@@ -159,10 +175,11 @@ public AccountViewModel(MainWindowViewModel mainWindowViewModel)
             // Load hardware settings from API or scan for hardware
             InitWorkerHardware();
 
+            // Load miner type extra params
+            InitMinerTypeExtraParams();
+
             // Update worker list on main window
             _mainWindowViewModel.GetAccountWorkerList();
-
-
         }
 
         /// <summary>
@@ -268,7 +285,23 @@ private void InitWorkerHardware()
             // Set global variable for Worker Name
             Application.Current.Properties["GPUSettingsList"] = GPUSettingsList;
         }
-               
+
+        private void InitMinerTypeExtraParams()
+        {
+            try
+            {
+                // Attempt to read the miner type extra params from the config file
+                MinerTypeExtraParamsFile minerTypeExtraParamsFile = new MinerTypeExtraParamsFile();
+                AccountMinerTypeExtraParamsList = minerTypeExtraParamsFile.ReadJsonFromFile();
+
+                // Save list for later
+                Application.Current.Properties["AccountMinerTypeExtraParamsList"] = AccountMinerTypeExtraParamsList;
+            }
+            catch (Exception e)
+            {
+                throw new ApplicationException(string.Format("Error getting miner type extra settings", e));
+            }
+        }
 
         #endregion
 
@@ -510,6 +543,54 @@ public void PersistWorkerSettings(object param)
 
         #endregion
 
+        #region MinerTypeExtraParams
+
+        private bool ValidateMinerTypeExtraParams(ObservableCollection<AccountMinerTypeExtraParams> minerTypeExtraParamsValidateList)
+        {
+            bool isValid = true;
+
+            foreach (AccountMinerTypeExtraParams minerTypeExtraParams in minerTypeExtraParamsValidateList)
+            {
+                // Validate that miner type is set
+                if (minerTypeExtraParams.MinerBaseType == MinerBaseType.UNDEFINED)
+                {
+                    ShowError("Please select a miner type");
+                    isValid = false;
+                }
+            }
+
+            return isValid;
+        }
+
+        public void PersistMinerTypeExtraParams(object param)
+        {
+            try
+            {
+                if (ValidateMinerTypeExtraParams(AccountMinerTypeExtraParamsList) == false)
+                {
+                    return;
+                }
+
+                // Write GUID to account identity config file
+                MinerTypeExtraParamsFile minerTypeExtraParamsFile = new MinerTypeExtraParamsFile();
+                minerTypeExtraParamsFile.WriteJsonToFile(AccountMinerTypeExtraParamsList);
+
+                // Notify UI of change
+                OnPropertyChanged("AccountMinerTypeExtraParamsList");
+
+                Application.Current.Properties["AccountMinerTypeExtraParamsList"] = AccountMinerTypeExtraParamsList;
+
+                // Notify success
+                ShowSuccess(string.Format("Miner type extra params saved"));
+            }
+            catch (Exception e)
+            {
+                throw new ApplicationException(string.Format("Error saving miner type extra params"), e);
+            }
+        }
+
+        #endregion
+
         #region WorkerHardware
 
         /// <summary>