Skip to content

Commit

Permalink
58
Browse files Browse the repository at this point in the history
  • Loading branch information
@angelbbs
angelbbs committed Jul 28, 2023
1 parent 7f28e28 commit 60ec386
Show file tree
Hide file tree
Showing 25 changed files with 935 additions and 263 deletions.
Binary file modified LatestBuild/nhmlffLatest.zip
View file
Binary file not shown.
14 changes: 7 additions & 7 deletions MinerLegacyForkFixMonitor/Program.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -87,9 +87,9 @@ static void Main(string[] argv)
var MonitorProc = new Process
{
StartInfo =
{
FileName = "NiceHashMinerLegacy.exe"
}
{
FileName = "NiceHashMinerLegacy.exe"
}
};

if (MonitorProc.Start())
Expand Down Expand Up @@ -145,17 +145,17 @@ static void Main(string[] argv)
//Helpers.ConsolePrint("Monitor", "stuckCount: " + stuckCount.ToString());
}

if (stuckCount > 20)
if (stuckCount > 720)
{
Helpers.ConsolePrint("Monitor", "Main process stuck. Trying restart");
try
{
var tkHandle = new Process
{
StartInfo =
{
FileName = "taskkill.exe"
}
{
FileName = "taskkill.exe"
}
};
tkHandle.StartInfo.Arguments = "/PID " + p.Id.ToString() + " /F /T";
tkHandle.StartInfo.UseShellExecute = false;
Expand Down
31 changes: 10 additions & 21 deletions NiceHashMiner/Algorithms/DualAlgorithm.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -29,41 +29,26 @@ public override AlgorithmType DualNiceHashID
{
get
{
if (NiceHashID == AlgorithmType.Autolykos)
{
switch (SecondaryNiceHashID)
{
case AlgorithmType.DaggerHashimoto:
return AlgorithmType.AutolykosZil;
}
}
if (NiceHashID == AlgorithmType.DaggerHashimoto)
{
switch (SecondaryNiceHashID)
{
case AlgorithmType.Autolykos:
return AlgorithmType.DaggerAutolykos;
case AlgorithmType.KAWPOW:
return AlgorithmType.DaggerKAWPOW;
case AlgorithmType.Octopus:
return AlgorithmType.DaggerOctopus;
}
}

if (NiceHashID == AlgorithmType.DaggerHashimoto)
{
switch (SecondaryNiceHashID)
{
case AlgorithmType.KHeavyHash:
return AlgorithmType.DaggerKHeavyHash;
case AlgorithmType.IronFish:
return AlgorithmType.DaggerIronFish;
}
}
if (NiceHashID == AlgorithmType.Autolykos)
{
switch (SecondaryNiceHashID)
{
case AlgorithmType.DaggerHashimoto:
return AlgorithmType.AutolykosZil;
case AlgorithmType.KHeavyHash:
return AlgorithmType.AutolykosKHeavyHash;
case AlgorithmType.IronFish:
return AlgorithmType.AutolykosIronFish;
}
}
if (NiceHashID == AlgorithmType.Octopus)
Expand All @@ -72,6 +57,8 @@ public override AlgorithmType DualNiceHashID
{
case AlgorithmType.KHeavyHash:
return AlgorithmType.OctopusKHeavyHash;
case AlgorithmType.IronFish:
return AlgorithmType.OctopusIronFish;
}
}
if (NiceHashID == AlgorithmType.ETCHash)
Expand All @@ -80,6 +67,8 @@ public override AlgorithmType DualNiceHashID
{
case AlgorithmType.KHeavyHash:
return AlgorithmType.ETCHashKHeavyHash;
case AlgorithmType.IronFish:
return AlgorithmType.ETCHashIronFish;
}
}

Expand Down
2 changes: 1 addition & 1 deletion NiceHashMiner/Configs/Data/GeneralConfig.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ public class GeneralConfig
public int DaggerHashimoto3GBMaxEpoch = 235;
public int DaggerHashimoto4GBMaxEpoch = 352;
public int DaggerHashimoto1070MaxEpoch = 371;
public int ZILMaxEpoch = 0;
public int ZILMaxEpoch = 1;
public LanguageType Language = LanguageType.En;
public string DisplayCurrency = "USD";
public bool Show_displayConected = false;
Expand Down
12 changes: 12 additions & 0 deletions NiceHashMiner/Configs/Data/ZILConfig.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,13 +11,16 @@ public class ZILConfigGMiner
{
public bool Autolykos_NVIDIA { get; set; }
public bool AutolykosKHeavyHash_NVIDIA { get; set; }
public bool AutolykosIronFish_NVIDIA { get; set; }
public bool BeamV3_NVIDIA { get; set; }
public bool CuckooCycle_NVIDIA { get; set; }
public bool GrinCuckatoo32_NVIDIA { get; set; }
public bool KAWPOW_NVIDIA { get; set; }
public bool KHeavyHash_NVIDIA { get; set; }
public bool IronFish_NVIDIA { get; set; }
public bool Octopus_NVIDIA { get; set; }
public bool OctopusKHeavyHash_NVIDIA { get; set; }
public bool OctopusIronFish_NVIDIA { get; set; }
public bool ZelHash_NVIDIA { get; set; }
public bool ZHash_NVIDIA { get; set; }
public bool KAWPOW_AMD { get; set; }
Expand All @@ -28,13 +31,16 @@ public ZILConfigGMiner()
{
Autolykos_NVIDIA = true;
AutolykosKHeavyHash_NVIDIA = true;
AutolykosIronFish_NVIDIA = true;
BeamV3_NVIDIA = true;
CuckooCycle_NVIDIA = true;
GrinCuckatoo32_NVIDIA = true;
KAWPOW_NVIDIA = true;
KHeavyHash_NVIDIA = true;
IronFish_NVIDIA = true;
Octopus_NVIDIA = true;
OctopusKHeavyHash_NVIDIA = true;
OctopusIronFish_NVIDIA = true;
ZelHash_NVIDIA = true;
ZHash_NVIDIA = true;
KAWPOW_AMD = true;
Expand Down Expand Up @@ -67,12 +73,18 @@ public ZILConfigNanominer()
[Serializable]
public class ZILConfigRigel
{
public bool Autolykos_NVIDIA { get; set; }
public bool AutolykosKHeavyHash_NVIDIA { get; set; }
public bool KHeavyHash_NVIDIA { get; set; }
public bool Nexapow_NVIDIA { get; set; }
public bool IronFish_NVIDIA { get; set; }
public ZILConfigRigel()
{
Autolykos_NVIDIA = true;
AutolykosKHeavyHash_NVIDIA = true;
KHeavyHash_NVIDIA = true;
Nexapow_NVIDIA = true;
IronFish_NVIDIA = true;
}
}
[Serializable]
Expand Down
68 changes: 65 additions & 3 deletions NiceHashMiner/Devices/Algorithms/DefaultAlgorithms.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -36,10 +36,12 @@ public static class DefaultAlgorithms
MinerBaseType.Nanominer,
new List<Algorithm>()
{
/*
new Algorithm(MinerBaseType.Nanominer, AlgorithmType.DaggerHashimoto, "DaggerHashimoto")
{
ExtraLaunchParameters = "memTweak=1"
}
*/
}
},

Expand Down Expand Up @@ -102,6 +104,9 @@ public static class DefaultAlgorithms
},
new Algorithm(MinerBaseType.SRBMiner, AlgorithmType.KHeavyHash, "KHeavyHash")
{
},
new Algorithm(MinerBaseType.SRBMiner, AlgorithmType.IronFish, "IronFish")
{
}
}
},
Expand Down Expand Up @@ -166,6 +171,14 @@ public static class DefaultAlgorithms
new Algorithm(MinerBaseType.SRBMiner, AlgorithmType.KHeavyHash, "KHeavyHash")
{
},
//разрывает соединение на найсе
//
/*
new Algorithm(MinerBaseType.SRBMiner, AlgorithmType.IronFish, "IronFish")
{
},
*/

/*
new DualAlgorithm(MinerBaseType.SRBMiner, AlgorithmType.Autolykos, AlgorithmType.KHeavyHash, "AutolykosKHeavyHash")
{
Expand Down Expand Up @@ -203,12 +216,18 @@ public static class DefaultAlgorithms
new List<Algorithm>() {
new Algorithm(MinerBaseType.teamredminer, AlgorithmType.DaggerHashimoto, "DaggerHashimoto"),
new Algorithm(MinerBaseType.teamredminer, AlgorithmType.KAWPOW, "KAWPOW"),
new Algorithm(MinerBaseType.teamredminer, AlgorithmType.Autolykos, "Autolykos")
/*
new Algorithm(MinerBaseType.teamredminer, AlgorithmType.Autolykos, "Autolykos"),

new DualAlgorithm(MinerBaseType.teamredminer, AlgorithmType.Autolykos, AlgorithmType.KHeavyHash, "AutolykosKHeavyHash")
{
ExtraLaunchParameters = "--kas_end"
},
/*
//extranonce not supported, worker name not allowed
new DualAlgorithm(MinerBaseType.teamredminer, AlgorithmType.Autolykos, AlgorithmType.IronFish, "AutolykosIronFish")
{
ExtraLaunchParameters = "--iron_end"
}
*/
}
},
Expand Down Expand Up @@ -260,6 +279,10 @@ public static class DefaultAlgorithms
},
new DualAlgorithm(MinerBaseType.lolMiner, AlgorithmType.ETCHash, AlgorithmType.KHeavyHash, "ETCHashKHeavyHash")
{
},
new Algorithm(MinerBaseType.lolMiner, AlgorithmType.IronFish, "IronFish")
{
ExtraLaunchParameters = ""
}
}
},
Expand Down Expand Up @@ -481,18 +504,41 @@ public static class DefaultAlgorithms
{
ExtraLaunchParameters = "--mt 1"
},
new Algorithm(MinerBaseType.GMiner, AlgorithmType.IronFish, "IronFish")
{
ExtraLaunchParameters = "--mt 1"
},
new DualAlgorithm(MinerBaseType.GMiner, AlgorithmType.Autolykos, AlgorithmType.KHeavyHash, AlgorithmType.AutolykosKHeavyHash.ToString())
{
ExtraLaunchParameters = "--mt 1"
},
new DualAlgorithm(MinerBaseType.GMiner, AlgorithmType.Autolykos, AlgorithmType.IronFish, AlgorithmType.AutolykosIronFish.ToString())
{
ExtraLaunchParameters = "--mt 1"
},
new DualAlgorithm(MinerBaseType.GMiner, AlgorithmType.DaggerHashimoto, AlgorithmType.KHeavyHash, AlgorithmType.DaggerKHeavyHash.ToString())
{
ExtraLaunchParameters = "--mt 1"
},
new DualAlgorithm(MinerBaseType.GMiner, AlgorithmType.ETCHash, AlgorithmType.KHeavyHash, AlgorithmType.ETCHashKHeavyHash.ToString())
{
ExtraLaunchParameters = "--mt 1"
},
new DualAlgorithm(MinerBaseType.GMiner, AlgorithmType.Octopus, AlgorithmType.KHeavyHash, AlgorithmType.OctopusKHeavyHash.ToString())
{
ExtraLaunchParameters = "--mt 1"
},
new DualAlgorithm(MinerBaseType.GMiner, AlgorithmType.DaggerHashimoto, AlgorithmType.IronFish, AlgorithmType.DaggerIronFish.ToString())
{
ExtraLaunchParameters = "--mt 1"
},
new DualAlgorithm(MinerBaseType.GMiner, AlgorithmType.ETCHash, AlgorithmType.IronFish, AlgorithmType.ETCHashIronFish.ToString())
{
ExtraLaunchParameters = "--mt 1"
},
new DualAlgorithm(MinerBaseType.GMiner, AlgorithmType.Octopus, AlgorithmType.IronFish, AlgorithmType.OctopusIronFish.ToString())
{
ExtraLaunchParameters = "--mt 1"
}
}
},
Expand All @@ -514,11 +560,15 @@ public static class DefaultAlgorithms
},
new Algorithm(MinerBaseType.lolMiner, AlgorithmType.NexaPow, "NexaPow")
{
ExtraLaunchParameters = ""
ExtraLaunchParameters = "--keepfree 1024"
},
new DualAlgorithm(MinerBaseType.lolMiner, AlgorithmType.DaggerHashimoto, AlgorithmType.KHeavyHash, AlgorithmType.DaggerKHeavyHash.ToString())
{
},
new Algorithm(MinerBaseType.lolMiner, AlgorithmType.IronFish, "IronFish")
{
ExtraLaunchParameters = ""
}
}
},

Expand All @@ -531,6 +581,18 @@ public static class DefaultAlgorithms
ExtraLaunchParameters = "--no-tui"
},
new Algorithm(MinerBaseType.Rigel, AlgorithmType.NexaPow, "NexaPow")
{
ExtraLaunchParameters = "--no-tui"
},
new Algorithm(MinerBaseType.Rigel, AlgorithmType.Autolykos, "Autolykos")
{
ExtraLaunchParameters = "--no-tui"
},
new Algorithm(MinerBaseType.Rigel, AlgorithmType.IronFish, "IronFish")
{
ExtraLaunchParameters = "--no-tui"
},
new DualAlgorithm(MinerBaseType.Rigel, AlgorithmType.Autolykos, AlgorithmType.KHeavyHash, AlgorithmType.AutolykosKHeavyHash.ToString())
{
ExtraLaunchParameters = "--no-tui"
}
Expand Down
1 change: 1 addition & 0 deletions NiceHashMiner/Devices/Algorithms/GroupAlgorithms.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -176,6 +176,7 @@ public static class GroupAlgorithms
AlgorithmType.OctopusKHeavyHash
});
}

if (device.Name.ToLower().Contains("gtx 10") && device.DeviceType == DeviceType.NVIDIA)
{
algoSettings = FilterMinerAlgos(algoSettings, new List<AlgorithmType>
Expand Down

0 comments on commit 60ec386

Please sign in to comment.