Merge pull request #2534 from nicehash/master_NL-1547_nanominer_update

Master nl 1547 nanominer update
nicehash · Oct 21, 2021 · cca0d4b · cca0d4b
2 parents 900c78f + 12fdb79
commit cca0d4b
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 6 deletions.
diff --git a/src/Miners/NanoMiner/NanoMinerPlugin.PluginSupportedAlgorithms.cs b/src/Miners/NanoMiner/NanoMinerPlugin.PluginSupportedAlgorithms.cs
@@ -16,7 +16,8 @@ public partial class NanoMinerPlugin
                     DeviceType.AMD,
                     new List<SAS>
                     {
-                        new SAS(AlgorithmType.KAWPOW){NonDefaultRAMLimit = 4UL << 30 }
+                        new SAS(AlgorithmType.KAWPOW){NonDefaultRAMLimit = 4UL << 30 },
+                        new SAS(AlgorithmType.DaggerHashimoto)
                     }
                 },
                 {
@@ -25,13 +26,15 @@ public partial class NanoMinerPlugin
                     {
                         new SAS(AlgorithmType.KAWPOW){NonDefaultRAMLimit = 4UL << 30 },
                         new SAS(AlgorithmType.Octopus),
+                        new SAS(AlgorithmType.DaggerHashimoto)
                     }
                 }
             },
             AlgorithmNames = new Dictionary<AlgorithmType, string>
             {
                 { AlgorithmType.KAWPOW, "Kawpow" },
                 { AlgorithmType.Octopus, "Octopus" },
+                { AlgorithmType.DaggerHashimoto, "Ethash" }
             }
         };
     }

diff --git a/src/Miners/NanoMiner/NanoMinerPlugin.cs b/src/Miners/NanoMiner/NanoMinerPlugin.cs
@@ -1,4 +1,5 @@
 using NHM.Common.Algorithm;
+using NHM.Common;
 using NHM.Common.Device;
 using NHM.Common.Enums;
 using NHM.MinerPluginToolkitV1;
@@ -23,11 +24,11 @@ public NanoMinerPlugin()
             // https://github.com/nanopool/nanominer/releases
             MinersBinsUrlsSettings = new MinersBinsUrlsSettings
             {
-                BinVersion = "v3.3.4",
-                ExePath = new List<string> { "nanominer-windows-3.3.4-cuda11", "nanominer.exe" },
+                BinVersion = "v3.3.14",
+                ExePath = new List<string> { "nanominer-windows-3.3.14-cuda11", "nanominer.exe" },
                 Urls = new List<string>
                 {
-                    "https://github.com/nanopool/nanominer/releases/download/3.3.4/nanominer-windows-3.3.4-cuda11.zip", // original
+                    "https://github.com/nanopool/nanominer/releases/download/v3.3.14/nanominer-windows-3.3.14-cuda11.zip", // original
                 }
             };
             PluginMetaInfo = new PluginMetaInfo
@@ -39,7 +40,7 @@ public NanoMinerPlugin()
 
         public override string PluginUUID => "f25fee20-94eb-11ea-a64d-17be303ea466";
 
-        public override Version Version => new Version(16, 0);
+        public override Version Version => new Version(16, 1);
 
         public override string Name => "NanoMiner";
 
@@ -60,9 +61,13 @@ public override Dictionary<BaseDevice, IReadOnlyList<Algorithm>> GetSupportedAlg
             {
                 _mappedIDs[gpu.UUID] = ++pcieId;
             }
-
+            var minDrivers = new Version(455, 23);
             var supported = new Dictionary<BaseDevice, IReadOnlyList<Algorithm>>();
             var isDriverSupported = CUDADevice.INSTALLED_NVIDIA_DRIVERS >= new Version(455, 23);
+            if (!isDriverSupported)
+            {
+                Logger.Error("NanoMinerPlugin", $"GetSupportedAlgorithms installed NVIDIA driver is not supported. minimum {minDrivers}, installed {CUDADevice.INSTALLED_NVIDIA_DRIVERS}");
+            }
             var supportedGpus = gpus.Where(dev => IsSupportedAMDDevice(dev) || IsSupportedNVIDIADevice(dev, isDriverSupported));
 
             foreach (var gpu in supportedGpus)