Skip to content

Commit

Permalink
Merge pull request #2224 from nicehash/master-plugins-changes
Browse files Browse the repository at this point in the history 
Master plugins changes
  • Loading branch information
@S74nk0
S74nk0 authored Nov 27, 2020
2 parents d3351f0 + e144d29 commit fe13426
Show file tree
Hide file tree
Showing 79 changed files with 16,450 additions and 1,519 deletions.
2 changes: 1 addition & 1 deletion installer/nhm_windows_x.y.z.r-template/EULA.html
View file

Large diffs are not rendered by default.

8,047 changes: 7,679 additions & 368 deletions installer/nhm_windows_x.y.z.r-template/EULA.rtf
View file

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion pre_compiled_libs/README.md
View file
Original file line number Diff line number Diff line change
@@ -1 +1 @@
device_detection_x64 from https://github.com/nicehash/DeviceDetection/releases/tag/v2.1
device_detection_x64 extracted from https://github.com/nicehash/DeviceDetection/releases/download/v2.1/device_detection_x64_signed.zip
Binary file modified pre_compiled_libs/device_detection_x64/device_detection.exe
View file
Binary file not shown.
Binary file modified pre_compiled_libs/device_detection_x64/device_detection_cpu.dll
View file
Binary file not shown.
Binary file modified pre_compiled_libs/device_detection_x64/device_detection_cuda_nvml.dll
View file
Binary file not shown.
Binary file modified pre_compiled_libs/device_detection_x64/device_detection_opencl.dll
View file
Binary file not shown.
Binary file added pre_compiled_libs/device_detection_x64_sha1sums.txt
View file
Binary file not shown.
Binary file added pre_compiled_libs/device_detection_x64_sha256sums.txt
View file
Binary file not shown.
Binary file modified pre_compiled_libs/device_monitoring_x64/device_monitoring_amd.dll
View file
Binary file not shown.
Binary file added pre_compiled_libs/device_monitoring_x64/device_monitoring_amd_nosig.dll
View file
Binary file not shown.
Binary file added pre_compiled_libs/device_monitoring_x64/sha1sums.txt
View file
Binary file not shown.
Binary file added pre_compiled_libs/device_monitoring_x64/sha256sums.txt
View file
Binary file not shown.
7 changes: 3 additions & 4 deletions src/Miners/CryptoDredge/CryptoDredgePlugin.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ public CryptoDredgePlugin()
};
}

public override Version Version => new Version(14, 0);
public override Version Version => new Version(15, 0);
public override string Name => "CryptoDredge";

public override string Author => "[email protected]";
Expand All @@ -44,9 +44,8 @@ public CryptoDredgePlugin()
public override Dictionary<BaseDevice, IReadOnlyList<Algorithm>> GetSupportedAlgorithms(IEnumerable<BaseDevice> devices)
{
var supported = new Dictionary<BaseDevice, IReadOnlyList<Algorithm>>();
#warning TEMP disable NVIDIA driver check
//var isDriverCompatible = Checkers.IsCudaCompatibleDriver(Checkers.CudaVersion.CUDA_10_1_105, CUDADevice.INSTALLED_NVIDIA_DRIVERS);
//if (!isDriverCompatible) return supported;
var isDriverCompatible = Checkers.IsCudaCompatibleDriver(Checkers.CudaVersion.CUDA_10_1_105, CUDADevice.INSTALLED_NVIDIA_DRIVERS);
if (!isDriverCompatible) return supported;

var cudaGpus = devices.Where(dev => dev is CUDADevice cuda && cuda.SM_major >= 5).Cast<CUDADevice>();

Expand Down
14 changes: 6 additions & 8 deletions src/Miners/GMiner/GMinerPlugin.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -26,11 +26,11 @@ public GMinerPlugin()
// https://bitcointalk.org/index.php?topic=5034735.0 | https://github.com/develsoftware/GMinerRelease/releases
MinersBinsUrlsSettings = new MinersBinsUrlsSettings
{
BinVersion = "2.30",
BinVersion = "2.32",
ExePath = new List<string> { "miner.exe" },
Urls = new List<string>
{
"https://github.com/develsoftware/GMinerRelease/releases/download/2.30/gminer_2_30_windows64.zip", // original
"https://github.com/develsoftware/GMinerRelease/releases/download/2.32/gminer_2_32_windows64.zip", // original
}
};
PluginMetaInfo = new PluginMetaInfo
Expand All @@ -42,7 +42,7 @@ public GMinerPlugin()

public override string PluginUUID => "e7a58030-94eb-11ea-a64d-17be303ea466";

public override Version Version => new Version(14, 13);
public override Version Version => new Version(15, 0);

public override string Name => "GMinerCuda9.0+";

Expand Down Expand Up @@ -115,11 +115,9 @@ private static bool IsSupportedAMDDevice(BaseDevice dev)

private static bool IsSupportedNVIDIADevice(BaseDevice dev)
{
#warning TEMP disable NVIDIA driver check
////CUDA 9.0+: minimum drivers 384.xx
//var minDrivers = new Version(384, 0);
//var isDriverSupported = CUDADevice.INSTALLED_NVIDIA_DRIVERS >= minDrivers;
var isDriverSupported = true;
//CUDA 9.0+: minimum drivers 384.xx
var minDrivers = new Version(384, 0);
var isDriverSupported = CUDADevice.INSTALLED_NVIDIA_DRIVERS >= minDrivers;
var isSupported = dev is CUDADevice gpu && gpu.SM_major >= 5;
return isSupported && isDriverSupported;
}
Expand Down
10 changes: 3 additions & 7 deletions src/Miners/LolMiner/LolMinerPlugin.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ public LolMinerPlugin()
};
}

public override Version Version => new Version(13, 14);
public override Version Version => new Version(15, 0);

public override string Name => "lolMiner";

Expand All @@ -51,12 +51,8 @@ public override Dictionary<BaseDevice, IReadOnlyList<Algorithm>> GetSupportedAlg
{
var supported = new Dictionary<BaseDevice, IReadOnlyList<Algorithm>>();

#warning TEMP disable NVIDIA driver check
// NVIDIA backend is NOT CUDA but OpenCL!!!!
//CUDA 9.0+: minimum drivers 384.xx
//var minDrivers = new Version(384, 0);
//var isDriverSupported = CUDADevice.INSTALLED_NVIDIA_DRIVERS >= minDrivers;
var isDriverSupported = true;
var minDrivers = new Version(384, 0);
var isDriverSupported = CUDADevice.INSTALLED_NVIDIA_DRIVERS >= minDrivers;

var gpus = devices
.Where(dev => IsSupportedAMDDevice(dev) || IsSupportedNVIDIADevice(dev, isDriverSupported))
Expand Down
11 changes: 5 additions & 6 deletions src/Miners/MiniZ/MiniZPlugin.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -27,9 +27,9 @@ public MiniZPlugin()
ExePath = new List<string> { "miniZ.exe" },
Urls = new List<string>
{
"https://github.com/nicehash/MinerDownloads/releases/download/3.0.0.2/miniZ_v1.6v6_cuda10_win-x64.zip",
"https://miniz.ch/?smd_process_download=1&download_id=3839", // original (pwd protected)
}
},
BinsPackagePassword = "miniZ"
};
PluginMetaInfo = new PluginMetaInfo
{
Expand All @@ -39,7 +39,7 @@ public MiniZPlugin()
}
public override string PluginUUID => "eda6abd0-94eb-11ea-a64d-17be303ea466";

public override Version Version => new Version(14, 0);
public override Version Version => new Version(15, 0);

public override string Name => "MiniZ";

Expand All @@ -56,10 +56,9 @@ public override Dictionary<BaseDevice, IReadOnlyList<Algorithm>> GetSupportedAlg
{
var supported = new Dictionary<BaseDevice, IReadOnlyList<Algorithm>>();

#warning TEMP disable NVIDIA driver check
// Require 411.31 - CUDA 10.0
//var minDrivers = new Version(411, 31);
//if (CUDADevice.INSTALLED_NVIDIA_DRIVERS < minDrivers) return supported;
var minDrivers = new Version(411, 31);
if (CUDADevice.INSTALLED_NVIDIA_DRIVERS < minDrivers) return supported;

var cudaGpus = devices
.Where(dev => dev is CUDADevice)
Expand Down
10 changes: 7 additions & 3 deletions src/Miners/NBMiner/NBMinerPlugin.PluginSupportedAlgorithms.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@ public partial class NBMinerPlugin
{
{ AlgorithmType.DaggerHashimoto, 1.0 },
{ AlgorithmType.Cuckaroo29BFC, 3.0 },
{ AlgorithmType.Octopus, 3.0 },
},
Algorithms = new Dictionary<DeviceType, List<SAS>>
{
Expand All @@ -29,15 +30,17 @@ public partial class NBMinerPlugin
new SAS(AlgorithmType.DaggerHashimoto) {NonDefaultRAMLimit = 5UL << 30},
new SAS(AlgorithmType.KAWPOW){NonDefaultRAMLimit = 4UL << 30 },
new SAS(AlgorithmType.GrinCuckatoo32),
new SAS(AlgorithmType.BeamV3)
new SAS(AlgorithmType.BeamV3),
new SAS(AlgorithmType.Octopus) {NonDefaultRAMLimit = 5UL << 30},
}
},
{
DeviceType.AMD,
new List<SAS>
{
new SAS(AlgorithmType.KAWPOW){NonDefaultRAMLimit = 4UL << 30 },
new SAS(AlgorithmType.DaggerHashimoto) {NonDefaultRAMLimit = 5UL << 30}
new SAS(AlgorithmType.DaggerHashimoto) {NonDefaultRAMLimit = 5UL << 30},
new SAS(AlgorithmType.Octopus) {NonDefaultRAMLimit = 5UL << 30},
}
}
},
Expand All @@ -50,7 +53,8 @@ public partial class NBMinerPlugin
{ AlgorithmType.KAWPOW, "kawpow" },
{ AlgorithmType.Cuckaroo29BFC, "bfc" },
{ AlgorithmType.GrinCuckatoo32, "cuckatoo32" },
{ AlgorithmType.BeamV3, "beamv3" }
{ AlgorithmType.BeamV3, "beamv3" },
{ AlgorithmType.Octopus, "octopus" }
}
};
}
Expand Down
27 changes: 10 additions & 17 deletions src/Miners/NBMiner/NBMinerPlugin.cs
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
//#define DISABLE_IDevicesCrossReference
using NHM.MinerPluginToolkitV1;
using NHM.MinerPluginToolkitV1;
using NHM.MinerPluginToolkitV1.Configs;
using NHM.MinerPluginToolkitV1.Interfaces;
using NHM.Common;
Expand Down Expand Up @@ -27,11 +26,11 @@ public NBMinerPlugin()
// https://github.com/NebuTech/NBMiner/releases/
MinersBinsUrlsSettings = new MinersBinsUrlsSettings
{
BinVersion = "v33.7",
BinVersion = "v33.8",
ExePath = new List<string> { "NBMiner_Win", "nbminer.exe" },
Urls = new List<string>
{
"https://github.com/NebuTech/NBMiner/releases/download/v33.7/NBMiner_33.7_Win.zip", // original
"https://github.com/NebuTech/NBMiner/releases/download/v33.8/NBMiner_33.8_Win.zip", // original
}
};
PluginMetaInfo = new PluginMetaInfo
Expand All @@ -43,7 +42,7 @@ public NBMinerPlugin()

public override string PluginUUID => "f683f550-94eb-11ea-a64d-17be303ea466";

public override Version Version => new Version(14, 6);
public override Version Version => new Version(15, 0);
public override string Name => "NBMiner";

public override string Author => "[email protected]";
Expand All @@ -58,6 +57,8 @@ private static bool isSupportedVersion(int major, int minor)
new Version(6,1),
new Version(7,0),
new Version(7,5),
new Version(8,0),
new Version(8,6),
};
var cudaDevSMver = new Version(major, minor);
foreach (var supportedVer in nbMinerSMSupportedVersions)
Expand Down Expand Up @@ -99,10 +100,8 @@ public override Dictionary<BaseDevice, IReadOnlyList<Algorithm>> GetSupportedAlg

private static bool IsSupportedNvidiaDevice(BaseDevice dev)
{
#warning TEMP disable NVIDIA driver check
//var minDrivers = new Version(377, 0);
//var isDriverSupported = CUDADevice.INSTALLED_NVIDIA_DRIVERS >= minDrivers;
var isDriverSupported = true;
var minDrivers = new Version(377, 0);
var isDriverSupported = CUDADevice.INSTALLED_NVIDIA_DRIVERS >= minDrivers;
var device = dev as CUDADevice;
var isSupported = isSupportedVersion(device.SM_major, device.SM_minor);
return isDriverSupported && isSupported;
Expand All @@ -122,11 +121,6 @@ protected override MinerBase CreateMinerBase()

public async Task DevicesCrossReference(IEnumerable<BaseDevice> devices)
{
#if DISABLE_IDevicesCrossReference
await Task.CompletedTask;
#else
#warning Blocks exit. Check if this is fixed with newer versions
//return;
try
{
if (_mappedIDs.Count == 0) return;
Expand All @@ -141,12 +135,11 @@ public async Task DevicesCrossReference(IEnumerable<BaseDevice> devices)
var indexID = kvp.Value;
_mappedIDs[uuid] = indexID;
}
} catch(Exception ex)
}
catch(Exception ex)
{
Logger.Error("NBMiner", $"Error during DevicesCrossReference: {ex.Message}");
}

#endif
}

public override IEnumerable<string> CheckBinaryPackageMissingFiles()
Expand Down
6 changes: 2 additions & 4 deletions src/Miners/NanoMiner/NanoMinerPlugin.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ public NanoMinerPlugin()

public override string PluginUUID => "f25fee20-94eb-11ea-a64d-17be303ea466";

public override Version Version => new Version(14, 1);
public override Version Version => new Version(15, 0);

public override string Name => "NanoMiner";

Expand All @@ -63,9 +63,7 @@ public override Dictionary<BaseDevice, IReadOnlyList<Algorithm>> GetSupportedAlg
}

var supported = new Dictionary<BaseDevice, IReadOnlyList<Algorithm>>();
#warning TEMP disable NVIDIA driver check
//var isDriverSupported = CUDADevice.INSTALLED_NVIDIA_DRIVERS >= new Version(411, 31);
var isDriverSupported = true;
var isDriverSupported = CUDADevice.INSTALLED_NVIDIA_DRIVERS >= new Version(411, 31);
var supportedGpus = gpus.Where(dev => IsSupportedAMDDevice(dev) || IsSupportedNVIDIADevice(dev, isDriverSupported));

foreach (var gpu in supportedGpus)
Expand Down
9 changes: 3 additions & 6 deletions src/Miners/Phoenix/PhoenixPlugin.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -29,8 +29,7 @@ public PhoenixPlugin()
ExePath = new List<string> { "PhoenixMiner_5.2e_Windows", "PhoenixMiner.exe" },
Urls = new List<string>
{
"https://github.com/nicehash/MinerDownloads/releases/download/3.0.0.2/PhoenixMiner_5.2e_Windows.zip",
"https://mega.nz/folder/3d11FaCb#l4PhGSvL8fiQ6oxzO57szg/file/mYt3FaAa" // original
"https://mega.nz/folder/3d11FaCb#l4PhGSvL8fiQ6oxzO57szg/file/mYt3FaAa" // original
}
};
PluginMetaInfo = new PluginMetaInfo
Expand All @@ -42,7 +41,7 @@ public PhoenixPlugin()

public override string PluginUUID => "fa369d10-94eb-11ea-a64d-17be303ea466";

public override Version Version => new Version(14, 6);
public override Version Version => new Version(15, 0);
public override string Name => "Phoenix";

public override string Author => "[email protected]";
Expand Down Expand Up @@ -70,9 +69,7 @@ public override Dictionary<BaseDevice, IReadOnlyList<Algorithm>> GetSupportedAlg
}

var supported = new Dictionary<BaseDevice, IReadOnlyList<Algorithm>>();
#warning TEMP disable NVIDIA driver check
//var isDriverSupported = CUDADevice.INSTALLED_NVIDIA_DRIVERS >= new Version(377, 0);
var isDriverSupported = true;
var isDriverSupported = CUDADevice.INSTALLED_NVIDIA_DRIVERS >= new Version(377, 0);
var supportedGpus = gpus.Where(dev => IsSupportedAMDDevice(dev) || IsSupportedNVIDIADevice(dev, isDriverSupported));

foreach (var gpu in supportedGpus)
Expand Down
2 changes: 1 addition & 1 deletion src/Miners/SRBMiner/SRBMinerPlugin.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ public SRBMinerPlugin()
};
}

public override Version Version => new Version(11, 3);
public override Version Version => new Version(15, 0);

public override string Name => "SRBMiner";

Expand Down
9 changes: 3 additions & 6 deletions src/Miners/TRex/TRexPlugin.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -39,19 +39,16 @@ public TRexPlugin()

public override string PluginUUID => "03f80500-94ec-11ea-a64d-17be303ea466";

public override Version Version => new Version(14, 8);
public override Version Version => new Version(15, 0);

public override string Name => "TRex";

public override string Author => "[email protected]";

public override Dictionary<BaseDevice, IReadOnlyList<Algorithm>> GetSupportedAlgorithms(IEnumerable<BaseDevice> devices)
{
#warning TEMP disable NVIDIA driver check
////var isDriverSupported = Checkers.IsCudaCompatibleDriver(Checkers.CudaVersion.CUDA_11_0_3_Update1, CUDADevice.INSTALLED_NVIDIA_DRIVERS); // TODO restore after major version 15
//var CUDA11 = new Version(451, 82);
//var isDriverSupported = CUDADevice.INSTALLED_NVIDIA_DRIVERS >= CUDA11; // TODO <= CUDA 11 is not inside the toolkit before miner plugins major version 15
var isDriverSupported = true; // always enable workaround
var CUDA11 = new Version(451, 82);
var isDriverSupported = CUDADevice.INSTALLED_NVIDIA_DRIVERS >= CUDA11; // TODO <= CUDA 11 is not inside the toolkit before miner plugins major version 15
var cudaGpus = devices.Where(dev => dev is CUDADevice cuda && cuda.SM_major >= 3 && isDriverSupported).Cast<CUDADevice>();
var supported = new Dictionary<BaseDevice, IReadOnlyList<Algorithm>>();

Expand Down
10 changes: 4 additions & 6 deletions src/Miners/TTMiner/TTMinerPlugin.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,6 @@ public TTMinerPlugin()
ExePath = new List<string> { "TT-Miner.exe" },
Urls = new List<string>
{
"https://github.com/nicehash/MinerDownloads/releases/download/3.0.0.2/TT-Miner-4.0.0.3.zip",
"https://tradeproject.de/download/Miner/TT-Miner-4.0.3.zip" // original
}
};
Expand All @@ -42,7 +41,7 @@ public TTMinerPlugin()

public override string PluginUUID => "074d4a80-94ec-11ea-a64d-17be303ea466";

public override Version Version => new Version(14, 0);
public override Version Version => new Version(15, 0);
public override string Name => "TTMiner";
public override string Author => "[email protected]";

Expand All @@ -57,10 +56,9 @@ public override Dictionary<BaseDevice, IReadOnlyList<Algorithm>> GetSupportedAlg
{
var supported = new Dictionary<BaseDevice, IReadOnlyList<Algorithm>>();

#warning TEMP disable NVIDIA driver check
//// Require 398.26
//var minDrivers = new Version(398, 26);
//if (CUDADevice.INSTALLED_NVIDIA_DRIVERS < minDrivers) return supported;
// Require 398.26
var minDrivers = new Version(398, 26);
if (CUDADevice.INSTALLED_NVIDIA_DRIVERS < minDrivers) return supported;


var cudaGpus = devices
Expand Down
2 changes: 1 addition & 1 deletion src/Miners/TeamRedMiner/TeamRedMinerPlugin.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ public TeamRedMinerPlugin()

public override string PluginUUID => "01177a50-94ec-11ea-a64d-17be303ea466";

public override Version Version => new Version(11, 12);
public override Version Version => new Version(15, 0);

public override string Name => "TeamRedMiner";

Expand Down
4 changes: 2 additions & 2 deletions src/Miners/WildRig/WildRigPlugin.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ public WildRigPlugin()

public override string PluginUUID => "0a07d6a0-94ec-11ea-a64d-17be303ea466";

public override Version Version => new Version(11, 2);
public override Version Version => new Version(15, 0);

public override string Name => "WildRig";

Expand Down Expand Up @@ -97,7 +97,7 @@ public override bool ShouldReBenchmarkAlgorithmOnDevice(BaseDevice device, Versi
{
try
{ }
catch (Exception ex)
catch
{ }
// nothing new
return false;
Expand Down
2 changes: 1 addition & 1 deletion src/Miners/XMRig/XMRigPlugin.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ public XMRigPlugin()

public override string PluginUUID => "0e0a7320-94ec-11ea-a64d-17be303ea466";

public override Version Version => new Version(11, 6);
public override Version Version => new Version(15, 0);

public override string Name => "XMRig";

Expand Down
Loading

0 comments on commit fe13426

Please sign in to comment.