Merge branch 'master' into alpha3

nicehash · Jan 27, 2020 · 410308b · 410308b
2 parents dc7524b + bc06892
commit 410308b
Show file tree

Hide file tree

Showing 9 changed files with 26 additions and 21 deletions.
diff --git a/src/Miners/GMiner/GMinerPlugin.cs b/src/Miners/GMiner/GMinerPlugin.cs
@@ -25,11 +25,11 @@ public GMinerPlugin()
             // https://bitcointalk.org/index.php?topic=5034735.0 | https://github.com/develsoftware/GMinerRelease/releases
             MinersBinsUrlsSettings = new MinersBinsUrlsSettings
             {
-                BinVersion = "1.95",
+                BinVersion = "1.96",
                 ExePath = new List<string> { "miner.exe" },
                 Urls = new List<string>
                 {
-                    "https://github.com/develsoftware/GMinerRelease/releases/download/1.95/gminer_1_95_windows64.zip", // original
+                    "https://github.com/develsoftware/GMinerRelease/releases/download/1.96/gminer_1_96_windows64.zip", // original
                 }
             };
             PluginMetaInfo = new PluginMetaInfo
@@ -41,7 +41,7 @@ public GMinerPlugin()
 
         public override string PluginUUID => "1b7019d0-7237-11e9-b20c-f9f12eb6d835";
 
-        public override Version Version => new Version(6, 2);
+        public override Version Version => new Version(6, 3);
 
         public override string Name => "GMinerCuda9.0+";
 
@@ -146,7 +146,7 @@ public override bool ShouldReBenchmarkAlgorithmOnDevice(BaseDevice device, Versi
         {
             try
             {
-                if (benchmarkedPluginVersion.Major == 6 && benchmarkedPluginVersion.Minor < 2) {
+                if (benchmarkedPluginVersion.Major == 6 && benchmarkedPluginVersion.Minor < 3) {
                     return ids.FirstOrDefault() == AlgorithmType.Cuckaroom;
                 }
             }

diff --git a/src/Miners/LolMinerBeam/LolMinerBeamPlugin.PluginSupportedAlgorithms.cs b/src/Miners/LolMinerBeam/LolMinerBeamPlugin.PluginSupportedAlgorithms.cs
@@ -8,7 +8,7 @@ namespace LolMinerBeam
 {
     public partial class LolMinerBeamPlugin
     {
-        const ulong AMD_8GBMemory = 8UL << 30; // 4GB
+        const ulong AMD_8GBMemory = 7UL << 30; // 7GB but really 8GB
         internal static List<SAS> SupportedAMDAlgos()
         {
             return new List<SAS>
@@ -17,6 +17,7 @@ internal static List<SAS> SupportedAMDAlgos()
                         new SAS(AlgorithmType.GrinCuckatoo31),
                         new SAS(AlgorithmType.BeamV2),
                         new SAS(AlgorithmType.Cuckaroom) { NonDefaultRAMLimit = AMD_8GBMemory },
+                        new SAS(AlgorithmType.GrinCuckatoo32),
                     };
         }
 
@@ -52,6 +53,7 @@ internal static List<SAS> SupportedNVIDIAOpenCLAlgos(bool enabled = false)
                 { AlgorithmType.GrinCuckatoo31, "GRIN-AT31" },
                 { AlgorithmType.BeamV2, "BEAM-II" },
                 { AlgorithmType.Cuckaroom, "FLOO-C29M" },
+                { AlgorithmType.GrinCuckatoo32, "GRIN-C32" },
             }
         };
     }

diff --git a/src/Miners/LolMinerBeam/LolMinerBeamPlugin.cs b/src/Miners/LolMinerBeam/LolMinerBeamPlugin.cs
@@ -23,11 +23,11 @@ public LolMinerBeamPlugin()
             // https://github.com/Lolliedieb/lolMiner-releases/releases | https://bitcointalk.org/index.php?topic=4724735.0 
             MinersBinsUrlsSettings = new MinersBinsUrlsSettings
             {
-                BinVersion = "0.9.5.1",
-                ExePath = new List<string> { "0.9.5.1", "lolMiner.exe" },
+                BinVersion = "0.9.6.1",
+                ExePath = new List<string> { "0.9.6.1", "lolMiner.exe" },
                 Urls = new List<string>
                 {
-                    "https://github.com/Lolliedieb/lolMiner-releases/releases/download/0.95/lolMiner_v0951_Win64.zip" // original
+                    "https://github.com/Lolliedieb/lolMiner-releases/releases/download/0.96/lolMiner_v0961_Win64.zip" // original
                 }
             };
             PluginMetaInfo = new PluginMetaInfo
@@ -37,7 +37,7 @@ public LolMinerBeamPlugin()
             };
         }
 
-        public override Version Version => new Version(6, 0);
+        public override Version Version => new Version(7, 0);
 
         public override string Name => "lolMiner";
 
@@ -116,9 +116,9 @@ public override IEnumerable<string> CheckBinaryPackageMissingFiles()
         public override bool ShouldReBenchmarkAlgorithmOnDevice(BaseDevice device, Version benchmarkedPluginVersion, params AlgorithmType[] ids)
         {
             if (ids.Count() == 0) return false;
-            if (benchmarkedPluginVersion.Major == 4 && benchmarkedPluginVersion.Minor < 1)
+            if (benchmarkedPluginVersion.Major <= 7)
             {
-                if (device.DeviceType == DeviceType.AMD && ids.FirstOrDefault() == AlgorithmType.GrinCuckatoo31) return true;
+                if (device.DeviceType == DeviceType.AMD && ids.FirstOrDefault() == AlgorithmType.Cuckaroom) return true;
             }
             return false;
         }

diff --git a/src/Miners/MinerPluginToolkitV1/Filters.cs b/src/Miners/MinerPluginToolkitV1/Filters.cs
@@ -24,6 +24,7 @@ public static class Filters
         public const ulong MinMTPMem = 5UL << 30; // 5GB
         public const ulong MinGrinCuckarood29Memory = 6012951136; // 5.6GB
         public const ulong MinGrinCuckaroomMemory = 6012951136; // 5.6GB // TODO check the RAM limits
+        public const ulong MinGrin32Mem = 7UL << 30; // 7.0GB (because system acn reserve GPU memory) really this is 8GB
 
 
         private static readonly Dictionary<AlgorithmType, ulong> _minMemoryPerAlgo = new Dictionary<AlgorithmType, ulong>
@@ -40,6 +41,7 @@ public static class Filters
             { AlgorithmType.MTP, MinMTPMem },
             { AlgorithmType.GrinCuckarood29, MinGrinCuckarood29Memory },
             { AlgorithmType.Cuckaroom, MinGrinCuckaroomMemory },
+            { AlgorithmType.GrinCuckatoo32, MinGrin32Mem },
         };
 
         public static List<AlgorithmType> InsufficientDeviceMemoryAlgorithnms(ulong Ram, IEnumerable<AlgorithmType> algos)

diff --git a/src/Miners/NanoMiner/NanoMinerPlugin.cs b/src/Miners/NanoMiner/NanoMinerPlugin.cs
@@ -23,11 +23,11 @@ public NanoMinerPlugin()
             // https://bitcointalk.org/index.php?topic=5089248.0 | https://github.com/nanopool/nanominer/releases
             MinersBinsUrlsSettings = new MinersBinsUrlsSettings
             {
-                BinVersion = "v1.7.1",
-                ExePath = new List<string> { "nanominer-windows-1.7.1", "nanominer.exe" },
+                BinVersion = "v1.7.3",
+                ExePath = new List<string> { "nanominer-windows-1.7.3", "nanominer.exe" },
                 Urls = new List<string>
                 {
-                    "https://github.com/nanopool/nanominer/releases/download/v1.7.1/nanominer-windows-1.7.1.zip", // original
+                    "https://github.com/nanopool/nanominer/releases/download/v1.7.3/nanominer-windows-1.7.3.zip", // original
                 }
             };
             PluginMetaInfo = new PluginMetaInfo
@@ -39,7 +39,7 @@ public NanoMinerPlugin()
 
         public override string PluginUUID => "a841b4b0-ae17-11e9-8e4e-bb1e2c6e76b4";
 
-        public override Version Version => new Version(5, 1);
+        public override Version Version => new Version(5, 2);
 
         public override string Name => "NanoMiner";
 

diff --git a/src/NHM.Common/Enums/AlgorithmType.cs b/src/NHM.Common/Enums/AlgorithmType.cs
@@ -111,6 +111,7 @@ public enum AlgorithmType
         Eaglesong = 48,
         //[Obsolete("UNUSED Algorithm")]
         Cuckaroom = 49,
+        GrinCuckatoo32 = 50,
         #endregion // NiceHashAPI
     }
 

diff --git a/src/NHMCore/Mining/Plugins/PluginPackageInfoCR.cs b/src/NHMCore/Mining/Plugins/PluginPackageInfoCR.cs
@@ -94,10 +94,10 @@ public bool CompatibleNHPluginVersion
             {
                 var ver = OnlineInfo?.PluginVersion ?? null;
                 var isNHPlugin = "info@nicehash.com" == OnlineInfo?.PluginAuthor;
-                // 5 brings new interfaces + Eaglesong, 6 new algo Cuckaroom
-                // current supported major versions are 5-6 inclusive (older not supported)
+                // 5 brings new interfaces + Eaglesong, 6 new algo Cuckaroom, 7 new algo GrinCuckatoo32
+                // current supported major versions are 5-7 inclusive (older not supported)
                 if (isNHPlugin && ver != null) {
-                    return ver.Major == 5 || ver.Major == 6;
+                    return ver.Major == 5 || ver.Major == 6 || ver.Major == 7;
                 }
                 // here we assume it is compatible so allow install
                 return true;

diff --git a/src/NiceHashMiner/Properties/AssemblyInfo.cs b/src/NiceHashMiner/Properties/AssemblyInfo.cs
@@ -65,5 +65,5 @@
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
 
-[assembly: AssemblyVersion("3.0.0.1")]
-[assembly: AssemblyFileVersion("3.0.0.1")]
+[assembly: AssemblyVersion("3.0.0.2")]
+[assembly: AssemblyFileVersion("3.0.0.2")]
diff --git a/src/Tools/MinerPluginsPacker/Program.cs b/src/Tools/MinerPluginsPacker/Program.cs
@@ -80,7 +80,7 @@ private static void CheckPluginMetaData(IMinerPlugin plugin)
             }
         }
 
-        private static int[] _supportedMajorverLinks = new int[] { 3, 4, 5, 6 };
+        private static int[] _supportedMajorverLinks = new int[] { 3, 4, 5, 6, 7 };
         private static bool IsMajorVersionLinkSupported(int major)
         {
             return _supportedMajorverLinks.Contains(major);