Merge pull request #2069 from nicehash/miners-refresh

Miners refresh
nicehash · May 13, 2020 · 28bd4cd · 28bd4cd
2 parents db7f8d8 + 7249952
commit 28bd4cd
Show file tree

Hide file tree

Showing 283 changed files with 2,755 additions and 8,052 deletions.
diff --git a/NiceHashMiner.sln b/NiceHashMiner.sln
diff --git a/installer/createInstaller_production.bat b/installer/createInstaller_production.bat
diff --git a/installer/createInstaller_testdev.bat b/installer/createInstaller_testdev.bat
diff --git a/installer/createInstaller_testnet.bat b/installer/createInstaller_testnet.bat
diff --git a/installer/createInstallers.bat b/installer/createInstallers.bat
diff --git a/src/Miners/CCMinerTpruvot/CCMinerTpruvot.cs b/src/Miners/CCMinerTpruvot/CCMinerTpruvot.cs
@@ -1,9 +1,5 @@
-using MinerPlugin;
-using MinerPluginToolkitV1.CCMinerCommon;
-using NHM.Common.Enums;
-using System;
-using System.Threading;
-using System.Threading.Tasks;
+using NHM.Common.Enums;
+using NHM.MinerPluginToolkitV1.CCMinerCommon;
 
 namespace CCMinerTpruvot
 {
@@ -13,24 +9,5 @@ public CCMinerTpruvot(string uuid) : base(uuid)
         { }
 
         protected override string AlgorithmName(AlgorithmType algorithmType) => PluginSupportedAlgorithms.AlgorithmName(algorithmType);
-
-        public override async Task<BenchmarkResult> StartBenchmark(CancellationToken stop, BenchmarkPerformanceType benchmarkType = BenchmarkPerformanceType.Standard)
-        {
-            var ret = await base.StartBenchmark(stop, benchmarkType);
-            if (_algorithmType == AlgorithmType.X16R)
-            {
-                try
-                {
-                    foreach (var infoPair in ret.AlgorithmTypeSpeeds)
-                    {
-                        infoPair.Speed = infoPair.Speed * 0.4563831001472754;
-                    }
-                }
-                catch (Exception)
-                {
-                }
-            }
-            return ret;
-        }
     }
 }
diff --git a/src/Miners/CCMinerTpruvot/CCMinerTpruvotPlugin.PluginSupportedAlgorithms.cs b/src/Miners/CCMinerTpruvot/CCMinerTpruvotPlugin.PluginSupportedAlgorithms.cs
@@ -1,8 +1,8 @@
-using MinerPluginToolkitV1.Configs;
+using NHM.MinerPluginToolkitV1.Configs;
 using NHM.Common.Enums;
 using System.Collections.Generic;
 
-using SAS = MinerPluginToolkitV1.Configs.PluginSupportedAlgorithmsSettings.SupportedAlgorithmSettings;
+using SAS = NHM.MinerPluginToolkitV1.Configs.PluginSupportedAlgorithmsSettings.SupportedAlgorithmSettings;
 
 namespace CCMinerTpruvot
 {
@@ -17,8 +17,8 @@ public partial class CCMinerTpruvotPlugin
                     DeviceType.NVIDIA,
                     new List<SAS>
                     {
-                        new SAS(AlgorithmType.X16R), // benchmark performance variations
-                        new SAS(AlgorithmType.Lyra2REv3),
+                        new SAS(AlgorithmType.X16R) { Enabled=false },
+                        new SAS(AlgorithmType.Lyra2REv3)
                     }
                 }
             },

diff --git a/src/Miners/CCMinerTpruvot/CCMinerTpruvotPlugin.cs b/src/Miners/CCMinerTpruvot/CCMinerTpruvotPlugin.cs
@@ -1,5 +1,5 @@
-using MinerPluginToolkitV1;
-using MinerPluginToolkitV1.Configs;
+using NHM.MinerPluginToolkitV1;
+using NHM.MinerPluginToolkitV1.Configs;
 using NHM.Common.Algorithm;
 using NHM.Common.Device;
 using NHM.Common.Enums;
@@ -34,9 +34,9 @@ public CCMinerTpruvotPlugin()
             };
         }
 
-        public override string PluginUUID => "2257f160-7236-11e9-b20c-f9f12eb6d835";
+        public override string PluginUUID => "95b390a0-94eb-11ea-a64d-17be303ea466";
 
-        public override Version Version => new Version(10, 0);
+        public override Version Version => new Version(11, 0);
         public override string Name => "CCMinerTpruvot";
 
         public override string Author => "info@nicehash.com";
@@ -75,15 +75,9 @@ public override IEnumerable<string> CheckBinaryPackageMissingFiles()
         public override bool ShouldReBenchmarkAlgorithmOnDevice(BaseDevice device, Version benchmarkedPluginVersion, params AlgorithmType[] ids)
         {
             try
-            {
-                // X16 R is overestimated in version v1.0
-                var isX16R = ids.Contains(AlgorithmType.X16R);
-                var isOverestimatedVersion = benchmarkedPluginVersion.Major == 1 && benchmarkedPluginVersion.Minor == 0;
-                return isX16R && isOverestimatedVersion;
-            }
+            {}
             catch (Exception)
-            {
-            }
+            {}
             return false;
         }
     }

diff --git a/src/Miners/BrokenMiner/BrokenMiner.csproj → ...s/CCMinerTpruvot/MP.CCMinerTpruvot.csproj b/src/Miners/BrokenMiner/BrokenMiner.csproj → ...s/CCMinerTpruvot/MP.CCMinerTpruvot.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <ItemGroup>
-    <ProjectReference Include="..\MinerPluginToolkitV1\MinerPluginToolkitV1.csproj" />
+    <ProjectReference Include="..\..\NHM.MinerPluginToolkitV1\NHM.MinerPluginToolkitV1.csproj" />
   </ItemGroup>
 
   <PropertyGroup>

diff --git a/src/Miners/CCMinerTpruvot/PluginInternalSettings.cs b/src/Miners/CCMinerTpruvot/PluginInternalSettings.cs
@@ -1,5 +1,5 @@
-using MinerPluginToolkitV1.CCMinerCommon;
-using MinerPluginToolkitV1.ExtraLaunchParameters;
+using NHM.MinerPluginToolkitV1.CCMinerCommon;
+using NHM.MinerPluginToolkitV1.ExtraLaunchParameters;
 
 namespace CCMinerTpruvot
 {