diff --git a/MultiMiner.Engine/Data/AlgorithmParameter.cs b/MultiMiner.Engine/Data/AlgorithmParameter.cs index 15fe489f7..5ef1db5e3 100644 --- a/MultiMiner.Engine/Data/AlgorithmParameter.cs +++ b/MultiMiner.Engine/Data/AlgorithmParameter.cs @@ -12,5 +12,7 @@ class AlgorithmParameter public const string AlgorithmX13 = "--algorithm x13"; public const string AlgorithmX14 = "--algorithm x14"; public const string AlgorithmX15 = "--algorithm x15"; + public const string AlgorithmNeoScrypt = "--algorithm neoscrypt"; + public const string AlgorithmLyra2RE = "--algorithm lyra2re"; } } diff --git a/MultiMiner.Engine/MiningEngine.cs b/MultiMiner.Engine/MiningEngine.cs index 01a4154f1..1ba55898c 100644 --- a/MultiMiner.Engine/MiningEngine.cs +++ b/MultiMiner.Engine/MiningEngine.cs @@ -126,6 +126,14 @@ private static void RegisterBuiltInAgorithms() algorithm = factory.RegisterAlgorithm(AlgorithmNames.X15, AlgorithmFullNames.X15, CoinAlgorithm.AlgorithmFamily.Unknown); algorithm.DefaultMiner = MinerNames.SGMiner5; algorithm.MinerArguments[MinerNames.SGMiner5] = AlgorithmParameter.AlgorithmX15; + + algorithm = factory.RegisterAlgorithm(AlgorithmNames.NeoScrypt, AlgorithmFullNames.NeoScrypt, CoinAlgorithm.AlgorithmFamily.Scrypt); + algorithm.DefaultMiner = MinerNames.SGMiner5; + algorithm.MinerArguments[MinerNames.SGMiner5] = AlgorithmParameter.AlgorithmNeoScrypt; + + algorithm = factory.RegisterAlgorithm(AlgorithmNames.Lyra2RE, AlgorithmFullNames.Lyra2RE, CoinAlgorithm.AlgorithmFamily.Unknown); + algorithm.DefaultMiner = MinerNames.SGMiner5; + algorithm.MinerArguments[MinerNames.SGMiner5] = AlgorithmParameter.AlgorithmLyra2RE; } private static void RegisterMiners() diff --git a/MultiMiner.NiceHash/Extensions/MultipoolInformationExtensions.cs b/MultiMiner.NiceHash/Extensions/MultipoolInformationExtensions.cs index f5fc9ad7f..6a9495c1b 100644 --- a/MultiMiner.NiceHash/Extensions/MultipoolInformationExtensions.cs +++ b/MultiMiner.NiceHash/Extensions/MultipoolInformationExtensions.cs @@ -39,6 +39,12 @@ public static bool PopulateFromJson(this MultipoolInformation multipoolInformati case 7: multipoolInformation.Algorithm = AlgorithmNames.Nist5; break; + case 8: + multipoolInformation.Algorithm = AlgorithmNames.NeoScrypt; + break; + case 9: + multipoolInformation.Algorithm = AlgorithmNames.Lyra2RE; + break; default: //unknown algo return false; diff --git a/MultiMiner.Xgminer/Data/AlgorithmNames.cs b/MultiMiner.Xgminer/Data/AlgorithmNames.cs index d926e50a8..d2b9fe796 100644 --- a/MultiMiner.Xgminer/Data/AlgorithmNames.cs +++ b/MultiMiner.Xgminer/Data/AlgorithmNames.cs @@ -14,6 +14,8 @@ public static class AlgorithmNames public const string ScryptJane = "ScryptJane"; public const string Keccak = "Keccak"; public const string Nist5 = "Nist5"; + public const string NeoScrypt = "NeoScrypt"; + public const string Lyra2RE = "Lyra2RE"; } public static class AlgorithmFullNames @@ -30,8 +32,12 @@ public static class AlgorithmFullNames public const string ScryptJane = "Scrypt-Jane"; public const string Keccak = "Keccak"; public const string Nist5 = "Nist5"; + public const string NeoScrypt = "NeoScrypt"; + public const string Lyra2RE = "Lyra2RE"; } + //used for determining profitability with Multipools + //reference at https://www.nicehash.com/index.jsp?p=multialgo public static class AlgorithmMultipliers { public const double SHA256 = 1.0; @@ -46,5 +52,7 @@ public static class AlgorithmMultipliers public const double ScryptJane = 0.0005; public const double Keccak = 0.5; public const double Nist5 = 0.015; + public const double NeoScrypt = 0.0003; + public const double Lyra2RE = 0.00125; } } diff --git a/MultiMiner.Xgminer/Data/CoinAlgorithm.cs b/MultiMiner.Xgminer/Data/CoinAlgorithm.cs index 4350ab163..b782cf7a7 100644 --- a/MultiMiner.Xgminer/Data/CoinAlgorithm.cs +++ b/MultiMiner.Xgminer/Data/CoinAlgorithm.cs @@ -4,6 +4,7 @@ namespace MultiMiner.Xgminer.Data { public class CoinAlgorithm { + //used for determining work utility / effective hashrate public enum AlgorithmFamily { Unknown, diff --git a/MultiMiner.Xgminer/Data/KnownAlgorithms.cs b/MultiMiner.Xgminer/Data/KnownAlgorithms.cs index ea16304b4..53952e9ba 100644 --- a/MultiMiner.Xgminer/Data/KnownAlgorithms.cs +++ b/MultiMiner.Xgminer/Data/KnownAlgorithms.cs @@ -75,6 +75,18 @@ public static class KnownAlgorithms Name = AlgorithmNames.Nist5, FullName = AlgorithmFullNames.Nist5, Multiplier = AlgorithmMultipliers.Nist5 + }, + new KnownAlgorithm + { + Name = AlgorithmNames.NeoScrypt, + FullName = AlgorithmFullNames.NeoScrypt, + Multiplier = AlgorithmMultipliers.NeoScrypt + }, + new KnownAlgorithm + { + Name = AlgorithmNames.Lyra2RE, + FullName = AlgorithmFullNames.Lyra2RE, + Multiplier = AlgorithmMultipliers.Lyra2RE } }; }