Dot net update nhmws4 #2870

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open

object05 wants to merge 295 commits into master from dot_net_update_nhmws4

NiceHashMiner.sln

-Original file line number
+Diff line change
@@ Expand Up @@
     EndProject
     Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Tools", "Tools", "{BB931C9A-EE48-42A6-B5F3-3A193B1A051A}"
     EndProject
-    Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "MP.NBMiner", "src\Miners\NBMiner\MP.NBMiner.csproj", "{A4B0CDCB-D1D7-4563-9888-D58E0B36D0F8}"
-    EndProject
     Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MinerProcessCounter", "src\Tools\MinerProcessCounter\MinerProcessCounter.csproj", "{69B58028-8F30-4D3F-8E51-DEF85C08E4CC}"
     EndProject
     Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "CreateLogReport", "src\Tools\CreateLogReport\CreateLogReport.csproj", "{663285C0-8F68-4638-BEB2-4BB042868445}"
@@ Expand All @@
     EndProject
     Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "NiceHashMiner", "src\NiceHashMiner\NiceHashMiner.csproj", "{56653651-3BF1-4A89-A20C-3178C06A29A3}"
     EndProject
-    Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "MP.XMRig", "src\Miners\XMRig\MP.XMRig.csproj", "{850CBE9E-AB73-4C24-AFBD-2FA4911E07B5}"
-    EndProject
     Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "NHMCore", "src\NHMCore\NHMCore.csproj", "{43DCAF38-D0C4-4335-983D-650F78461EB2}"
     EndProject
     Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "NiceHashMinerLauncher", "src\NiceHashMinerLauncher\NiceHashMinerLauncher.csproj", "{674DECD6-9BC3-4BA7-B0AE-4C2EA7D74C51}"
@@ Expand Down Expand Up @@
     EndProject
     Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "AssemblyInfoVersionManager", "src\Tools\AssemblyInfoVersionManager\AssemblyInfoVersionManager.csproj", "{A1481D50-D481-409C-BF07-C44F9AF1DD51}"
     EndProject
-    Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MP.GMiner", "src\Miners\GMiner\MP.GMiner.csproj", "{72746BBD-6A91-4441-87AA-8EFE4B2DA7BB}"
+    Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "MP.GMiner", "src\Miners\GMiner\MP.GMiner.csproj", "{72746BBD-6A91-4441-87AA-8EFE4B2DA7BB}"
     EndProject
     Global
     	GlobalSection(SolutionConfigurationPlatforms) = preSolution
@@ Expand All / @@ -98,14 +94,6 @@ Global @@
     		{279A5B29-3799-43FA-9734-E462E046BA81}.Release|Any CPU.Build.0 = Release|Any CPU
     		{279A5B29-3799-43FA-9734-E462E046BA81}.Release|x64.ActiveCfg = Release|Any CPU
     		{279A5B29-3799-43FA-9734-E462E046BA81}.Release|x64.Build.0 = Release|Any CPU
-    		{A4B0CDCB-D1D7-4563-9888-D58E0B36D0F8}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-    		{A4B0CDCB-D1D7-4563-9888-D58E0B36D0F8}.Debug|Any CPU.Build.0 = Debug|Any CPU
-    		{A4B0CDCB-D1D7-4563-9888-D58E0B36D0F8}.Debug|x64.ActiveCfg = Debug|Any CPU
-    		{A4B0CDCB-D1D7-4563-9888-D58E0B36D0F8}.Debug|x64.Build.0 = Debug|Any CPU
-    		{A4B0CDCB-D1D7-4563-9888-D58E0B36D0F8}.Release|Any CPU.ActiveCfg = Release|Any CPU
-    		{A4B0CDCB-D1D7-4563-9888-D58E0B36D0F8}.Release|Any CPU.Build.0 = Release|Any CPU
-    		{A4B0CDCB-D1D7-4563-9888-D58E0B36D0F8}.Release|x64.ActiveCfg = Release|Any CPU
-    		{A4B0CDCB-D1D7-4563-9888-D58E0B36D0F8}.Release|x64.Build.0 = Release|Any CPU
     		{69B58028-8F30-4D3F-8E51-DEF85C08E4CC}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
     		{69B58028-8F30-4D3F-8E51-DEF85C08E4CC}.Debug|Any CPU.Build.0 = Debug|Any CPU
     		{69B58028-8F30-4D3F-8E51-DEF85C08E4CC}.Debug|x64.ActiveCfg = Debug|Any CPU
@@ Expand Down Expand Up / @@ -178,14 +166,6 @@ Global @@
     		{56653651-3BF1-4A89-A20C-3178C06A29A3}.Release|Any CPU.Build.0 = Release|Any CPU
     		{56653651-3BF1-4A89-A20C-3178C06A29A3}.Release|x64.ActiveCfg = Release|Any CPU
     		{56653651-3BF1-4A89-A20C-3178C06A29A3}.Release|x64.Build.0 = Release|Any CPU
-    		{850CBE9E-AB73-4C24-AFBD-2FA4911E07B5}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-    		{850CBE9E-AB73-4C24-AFBD-2FA4911E07B5}.Debug|Any CPU.Build.0 = Debug|Any CPU
-    		{850CBE9E-AB73-4C24-AFBD-2FA4911E07B5}.Debug|x64.ActiveCfg = Debug|Any CPU
-    		{850CBE9E-AB73-4C24-AFBD-2FA4911E07B5}.Debug|x64.Build.0 = Debug|Any CPU
-    		{850CBE9E-AB73-4C24-AFBD-2FA4911E07B5}.Release|Any CPU.ActiveCfg = Release|Any CPU
-    		{850CBE9E-AB73-4C24-AFBD-2FA4911E07B5}.Release|Any CPU.Build.0 = Release|Any CPU
-    		{850CBE9E-AB73-4C24-AFBD-2FA4911E07B5}.Release|x64.ActiveCfg = Release|Any CPU
-    		{850CBE9E-AB73-4C24-AFBD-2FA4911E07B5}.Release|x64.Build.0 = Release|Any CPU
     		{43DCAF38-D0C4-4335-983D-650F78461EB2}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
     		{43DCAF38-D0C4-4335-983D-650F78461EB2}.Debug|Any CPU.Build.0 = Debug|Any CPU
     		{43DCAF38-D0C4-4335-983D-650F78461EB2}.Debug|x64.ActiveCfg = Debug|Any CPU
@@ Expand Down Expand Up / @@ -367,12 +347,10 @@ Global @@
     		HideSolutionNode = FALSE
     	EndGlobalSection
     	GlobalSection(NestedProjects) = preSolution
-    		{A4B0CDCB-D1D7-4563-9888-D58E0B36D0F8} = {F40126B4-5B3B-4085-B47D-A5EF4B51570C}
     		{69B58028-8F30-4D3F-8E51-DEF85C08E4CC} = {BB931C9A-EE48-42A6-B5F3-3A193B1A051A}
     		{663285C0-8F68-4638-BEB2-4BB042868445} = {BB931C9A-EE48-42A6-B5F3-3A193B1A051A}
     		{1B657592-641E-42EC-BC44-ABCAE62EF1FD} = {F40126B4-5B3B-4085-B47D-A5EF4B51570C}
     		{3712894A-0836-4CE3-A4A9-C21A32AACBEC} = {BB931C9A-EE48-42A6-B5F3-3A193B1A051A}
-    		{850CBE9E-AB73-4C24-AFBD-2FA4911E07B5} = {F40126B4-5B3B-4085-B47D-A5EF4B51570C}
     		{ED4101C4-C44E-4C6C-8F93-73A950388823} = {BB931C9A-EE48-42A6-B5F3-3A193B1A051A}
     		{FBB69B33-8A14-4087-909C-F33791384D35} = {F40126B4-5B3B-4085-B47D-A5EF4B51570C}
     		{E9A55CE7-37B9-462F-92E8-AE929C5ADCCA} = {F40126B4-5B3B-4085-B47D-A5EF4B51570C}
@@ Expand Down @@

doc/UserPlugins/09.png

Sorry, something went wrong. Reload?

Sorry, we cannot display this file.

Sorry, this file is invalid so it cannot be displayed.

doc/UserPlugins/10.png

Sorry, something went wrong. Reload?

Sorry, we cannot display this file.

Sorry, this file is invalid so it cannot be displayed.

doc/UserPlugins/README.md

            
                      Original file line number
                      Diff line number
                      Diff line change
                  
    @@ -7,42 +7,55 @@ NiceHash Miner from version 3.0.7.0 supports generic plugins for experimental pu
  
    ## #1 Generating generic plugin files

    ### 1 First, navigate to the **NiceHash Miner root directory > internals > UserMinerPlugins.json**<br /><img src="01.png" />

    ### 1. First, navigate to the **NiceHash Miner root directory > internals > UserMinerPlugins.json**<br /><img src="01.png" />

    ### 2 Add a plugin name here, we will use **ExamplePlugin**.<br /><img src="02.png" />

    ### 2. Add a plugin name here, we will use **ExamplePlugin**.<br /><img src="02.png" />

    ### 3 Start NiceHash Miner for the files to be created automatically. Close NiceHash Miner after it initializes.

    ### 3. Start NiceHash Miner for the files to be created automatically. Close NiceHash Miner after it initializes.

    ### 4 New files will be generated in the **..\miner_plugins\ExamplePlugin** directory.<br /><img src="03.png" />

    ### 4. New files will be generated in the **..\miner_plugins\ExamplePlugin** directory.<br /><img src="03.png" />

    ## #2 Moving the miner files to plugin bins directory

    ### 1 Download the preferred miner from the official source.

    ### 1. Download the preferred miner from the official source.

    <br />

    ### 2 Create a new folder named **bins** in the **NiceHash Miner\miner_plugins\ExamplePlugin** directory and move the miner file (all files included in the miner folder, not just the executable) to the **bins** directory.

    ### 2. Create a new folder named **bins** in the **NiceHash Miner\miner_plugins\ExamplePlugin** directory and move the miner file (all files included in the miner folder, not just the executable) to the **bins** directory.

    <img src="04.png" />

    <br />

    ## #3 Editing the plugin settings

    ### 1 Open **NiceHash Miner\miner_plugins\ExamplePlugin\Devices.json** and mark each compatible device as compatible with the plugin by changing **`"compatible": false`** to **`"compatible": true`**.<br /><img src="05.png" /><br />If the miner uses custom device IDs (has different GPU detection technique), make sure to manually change the device ID ("miner_device_id") also.

    ### 1. Open **NiceHash Miner\miner_plugins\ExamplePlugin\Devices.json** and mark each compatible device as compatible with the plugin by changing **`"compatible": false`** to **`"compatible": true`**.<br /><img src="05.png" /><br />If the miner uses custom device IDs (has different GPU detection technique), make sure to manually change the device ID ("miner_device_id") also.

    <br />

    ### 2 Open NiceHash Miner\miner_plugins\ExamplePlugin\MinerSettings.json and change the algorithm_command_line to a compatible command for the selected miner.<br />You can use all the placeholders from the top default_command_line. Example of a algorithm_command_line: `-a {ALGORITHM} -o nicehash+tcp://{POOL_URL}:{POOL_PORT} -u {USERNAME} -api 127.0.0.1:{API_PORT} -log -d {DEVICES} {EXTRA_LAUNCH_PARAMETERS}`<br />Optionally, change the "device_seperator" for the miner.<br /><img src="06.png" />

    ### 2. Open NiceHash Miner\miner_plugins\ExamplePlugin\MinerSettings.json and change the algorithm_command_line to a compatible command for the selected miner.<br />You can use all the placeholders from the top default_command_line. Example of a algorithm_command_line: `-a {ALGORITHM} -o nicehash+tcp://{POOL_URL}:{POOL_PORT} -u {USERNAME} -api 127.0.0.1:{API_PORT} -log -d {DEVICES} {EXTRA_LAUNCH_PARAMETERS}`<br />Optionally, change the "device_seperator" for the miner.<br /><img src="06.png" />

    <br />

    ### 3 Navigate to ExamplePlugin\Internals and open MinersBinsUrlsSettings.json

    ### 3. Navigate to ExamplePlugin\Internals and open MinersBinsUrlsSettings.json

    Change the `"bin_path"` to the miner executable name. Do not use any specific path, NHM will automatically look for the miner in NiceHash Miner\miner_plugins\ExamplePlugin\bins.

    <img src="07.png" />

    <br />

    ### 4. Navigate to NiceHash Miner\configs\AcceptedPlugins.json

    Add the name of the plugin you added in the `"UserMinerPlugins.json"` to the last line.

    <img src="09.png" />

    <br />

    ### 5. Navigate to NiceHash Miner\miner_plugins\ExamplePlugin\PluginSupportedAlgorithmsSettings.json

    Add the target algorithms to target device groups, default is DaggerHashimoto and RandomXmonero (for example we configured to add DaggerHashimoto algo in the MinersSettings.json earlier):

    <img src="10.png" />

    <br />

    # Additional information

    Navigate to `NiceHash Miner\miner_plugins\ExamplePlugin\internals` and check the included files. There are other customizations possible through these files. Including adding extra launch parameters and supported algorithms. All of the settings are self-explanatory to advanced users.

pre_compiled_libs/device_detection_x64/device_detection.exe

Binary file not shown.

pre_compiled_libs/device_detection_x64/device_detection_igcl.dll

Binary file not shown.

pre_compiled_libs/device_detection_x64/device_detection_opencl_adl.dll

Binary file not shown.

pre_compiled_libs/device_monitoring_x64/device_monitoring_amd.dll

Binary file not shown.

pre_compiled_libs/device_monitoring_x64/device_monitoring_intel.dll

Binary file not shown.

pre_compiled_libs/device_monitoring_x64/device_monitoring_nvidia.dll

Binary file not shown.

pre_compiled_libs/device_monitoring_x64/pid_controller.dll

Binary file not shown.

src/Miners/Excavator/CmdConfig.cs

            
                      Original file line number
                      Diff line number
                      Diff line change
                  
    @@ -46,9 +46,10 @@ public static string CreateTemplate(IEnumerable<int> gpuUuids, string algorithmN
  
                return CreateDefaultTemplateAndCreateCMD("__SUBSCRIBE_PARAM_LOCATION__", "__SUBSCRIBE_PARAM_USERNAME__", gpuUuids, algorithmName);

            }

            public static string CommandFileTemplatePath(string pluginUUID)

            public static string CommandFileTemplatePath(string pluginUUID, string binPath, string fileName)

            {

                return Paths.MinerPluginsPath(pluginUUID, "internals", "CommandLineTemplate.json");

                var path = Paths.MinerPluginsPath(pluginUUID, binPath, fileName);

                return path;

            }

            private static List<Command> CreateInitialCommands(string subscribeLocation, string subscribeUsername, IEnumerable<int> excavatorIds, string algorithmName)

    @@ -58,9 +59,24 @@ private static List<Command> CreateInitialCommands(string subscribeLocation, str
  
                        new Command { Id = 1, Method = "subscribe", Params = new List<string>{ subscribeLocation, subscribeUsername } },

                        new Command { Id = 2, Method = "algorithm.add", Params = new List<string>{ algorithmName.ToLower() } },

                    };

                return initialCommands;

            }

            private static List<Command> CreateExtraCommands(IEnumerable<int> excavatorIds, string algorithmName, List<Command> mandatoryCMDS = null)

            {

                var initialCommands = new List<Command>();

                if (algorithmName == "randomx")

                {

                    initialCommands.AddRange(excavatorIds.Select((dev, index) => new Command { Id = index + 3, Method = "worker.add", Params = new List<string> { algorithmName, dev.ToString(), "NTHREADS=0", "HIGHPRIORITY=0", "USELARGEPAGE=1", "USEMSR=1" } }));

                    if (mandatoryCMDS != null)

                    {

                        foreach (var c in initialCommands)

                        {

                            var crossRef = mandatoryCMDS.FirstOrDefault(m => m.Id == c.Id);

                            if (crossRef == null) continue;

                            c.Params = crossRef.Params;

                        }

                    }

                }

                else initialCommands.AddRange(excavatorIds.Select((dev, index) => new Command { Id = index + 3, Method = "worker.add", Params = new List<string> { algorithmName.ToLower(), dev.ToString() } }));

                return initialCommands;

    @@ -78,6 +94,11 @@ private static string CreateDefaultTemplateAndCreateCMD(string subscribeLocation
  
                            Commands = CreateInitialCommands(subscribeLocation, subscribeUsername, excavatorIds, algorithmName),

                        },

                        new CommandList

                        {

                            Time = 1,

                            Commands = CreateExtraCommands(excavatorIds, algorithmName),

                        },

                        new CommandList

                        {

                            Event = "on_quit",

                            Commands = new List<Command>{ },

    @@ -91,9 +112,10 @@ private static string CreateDefaultTemplateAndCreateCMD(string subscribeLocation
  
                    return null;

                }

            }

            private static string[] _invalidTemplateMethods = new string[] { "subscribe", "algorithm.add", "worker.add" };

            private static string[] _invalidTemplateMethods = new string[] { "subscribe", "algorithm.add" };

            private static string ParseTemplateFileAndCreateCMD(string templateFilePath, IEnumerable<int> excavatorIds, string subscribeLocation, string subscribeUsername, string algorithmName)

            {

                if (!File.Exists(templateFilePath)) return null;

                try

                {

    @@ -103,9 +125,26 @@ private static string ParseTemplateFileAndCreateCMD(string templateFilePath, IEn
  
                        .Select(cmd => (cmd, commands: cmd.Commands.ToList()))

                        .Where(p => p.commands.Any())

                        .ToArray();

                    var otherCmds = template

                        .Where(cmd => cmd.Commands.All(c => _invalidTemplateMethods.Contains(c.Method)))

                        .Select(cmd => (cmd, commands: cmd.Commands.ToList()))

                        .Where(p => p.commands.Any())

                        .ToArray();

                    foreach (var (cmd, commands) in validCmds)

                    {

                        cmd.Commands = commands;

                        foreach(var c in cmd.Commands)

                        {

                            if(c.Method == "worker.add")

                            {

                                if (c.Params.Count >= 2 && c.Params[0].ToLower() != "randomx")

                                {

                                    c.Params = new List<string> { algorithmName.ToLower(), c.Params[1] };

                                }

                            }

                        }

                    }

                    var commandListTemplate = new List<CommandList>

                    {

    @@ -115,7 +154,10 @@ private static string ParseTemplateFileAndCreateCMD(string templateFilePath, IEn
  
                            Commands = CreateInitialCommands(subscribeLocation, subscribeUsername, excavatorIds, algorithmName),

                        },

                    };

                    if (validCmds.Any()) commandListTemplate.AddRange(validCmds.Select(p => p.cmd));

                    if (validCmds.Any())

                    {

                        commandListTemplate.AddRange(validCmds.Select(p => p.cmd));

                    }

                    return JsonConvert.SerializeObject(commandListTemplate, Formatting.Indented, _jsonSettings);

                }

                catch (Exception e)

    @@ -136,16 +178,16 @@ private static string CreateCommandWithTemplate(string subscribeLocation, string
  
                return template;

            }

            private static string GetServiceLocation(string miningLocation)

            {

            { 

                if (BuildOptions.BUILD_TAG == BuildTag.TESTNET) return $"nhmp-test.auto.nicehash.com:443";

                if (BuildOptions.BUILD_TAG == BuildTag.TESTNETDEV) return $"nhmp-dev.auto.nicehash.com:443";

                //BuildTag.PRODUCTION

                return $"nhmp.auto.nicehash.com:443";

            }

            public static string CmdJSONString(string pluginUUID, string _miningLocation, string username, string algorithmName, params int[] excavatorIds) { 

            public static string CmdJSONString(string pluginUUID, string _miningLocation, string username, string algorithmName, string fileName, string binPath, params int[] excavatorIds) {

                var miningLocation = GetMiningLocation(_miningLocation);

                var templatePath = CommandFileTemplatePath(pluginUUID);

                var templatePath = CommandFileTemplatePath(pluginUUID, binPath, fileName);

                var miningServiceLocation = GetServiceLocation(miningLocation);

                var command = CreateCommandWithTemplate(miningServiceLocation, username, excavatorIds, templatePath, algorithmName);

                if (command == null) Logger.Error("Excavator.CmdConfig", "command is NULL");

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Dot net update nhmws4 #2870

Uh oh!

Diff view

Diff view

There are no files selected for viewing

Uh oh!

Dot net update nhmws4 #2870

Are you sure you want to change the base?

Uh oh!

Dot net update nhmws4 #2870

Uh oh!

Uh oh!

Diff view

Diff view

There are no files selected for viewing

Uh oh!