Skip to content

Commit

Permalink
prep for lolminerNvidia
Browse files Browse the repository at this point in the history
  • Loading branch information
@Cryptominer937
Cryptominer937 committed Mar 26, 2024
1 parent d14937e commit 86ee669
Show file tree
Hide file tree
Showing 10 changed files with 384 additions and 38 deletions.
2 changes: 1 addition & 1 deletion zPoolMiner/Algorithm.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -132,7 +132,7 @@ public Algorithm(MinerBaseType minerBaseType, AlgorithmType cryptominer937ID, st
LessThreads = 1;
Enabled = !(CryptoMiner937ID == AlgorithmType.Nist5 || CryptoMiner937ID == AlgorithmType.Skein || CryptoMiner937ID == AlgorithmType.Blake2s || CryptoMiner937ID == AlgorithmType.Phi) && minerBaseType == MinerBaseType.sgminer;
Enabled = !(CryptoMiner937ID == AlgorithmType.cryptonight) || (CryptoMiner937ID == AlgorithmType.Keccak) && minerBaseType == MinerBaseType.GatelessGate;
Enabled = !(CryptoMiner937ID == AlgorithmType.karlsenhash) || (CryptoMiner937ID == AlgorithmType.pyrinhash) || (CryptoMiner937ID == AlgorithmType.ethash) || (CryptoMiner937ID == AlgorithmType.ethashb3) && minerBaseType == MinerBaseType.lolMiner;
Enabled = !(CryptoMiner937ID == AlgorithmType.karlsenhash) || (CryptoMiner937ID == AlgorithmType.pyrinhash) || (CryptoMiner937ID == AlgorithmType.ethash) || (CryptoMiner937ID == AlgorithmType.ethashb3) && minerBaseType == MinerBaseType.lolMinerAmd;
BenchmarkStatus = "";
}

Expand Down
12 changes: 6 additions & 6 deletions zPoolMiner/Devices/GroupAlgorithms.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -238,7 +238,7 @@ private static Dictionary<MinerBaseType, List<Algorithm>> CreateForDevice(Comput
algo.Enabled = false;
}
}
if (algoSettings.ContainsKey(MinerBaseType.lolMiner))
if (algoSettings.ContainsKey(MinerBaseType.lolMinerAmd))
{

}
Expand Down Expand Up @@ -476,12 +476,12 @@ public static Dictionary<MinerBaseType, List<Algorithm>> CreateDefaultsForGroup(
new List<Algorithm> {
new Algorithm(MinerBaseType.XmrStakAMD, AlgorithmType.cryptonight, "")
}
}*/{MinerBaseType.lolMiner,
}*/{MinerBaseType.lolMinerAmd,
new List<Algorithm>() {
new Algorithm(MinerBaseType.lolMiner,AlgorithmType.karlsenhash,"karlsenhash"),
new Algorithm(MinerBaseType.lolMiner,AlgorithmType.pyrinhash,"pyrinhash"),
new Algorithm(MinerBaseType.lolMiner,AlgorithmType.ethash,"ethash"),
new Algorithm(MinerBaseType.lolMiner,AlgorithmType.ethashb3,"ethashb3")
new Algorithm(MinerBaseType.lolMinerAmd,AlgorithmType.karlsenhash,"karlsenhash"),
new Algorithm(MinerBaseType.lolMinerAmd,AlgorithmType.pyrinhash,"pyrinhash"),
new Algorithm(MinerBaseType.lolMinerAmd,AlgorithmType.ethash,"ethash"),
new Algorithm(MinerBaseType.lolMinerAmd,AlgorithmType.ethashb3,"ethashb3")
}
}
};
Expand Down
2 changes: 1 addition & 1 deletion zPoolMiner/Enums/MinerBaseType.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -141,7 +141,7 @@ public enum MinerBaseType
/// </summary>
experimental,

lolMiner,
lolMinerAmd,
/// <summary>
/// Defines the EWBF
/// </summary>
Expand Down
2 changes: 1 addition & 1 deletion zPoolMiner/Enums/MinerType.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -111,7 +111,7 @@ public enum MinerType
/// Defines the Xmrig
/// </summary>
Xmrig,
lolMiner,
lolMinerAmd,
/// <summary>
/// Defines the Palgin_Neoscrypt
/// </summary>
Expand Down
14 changes: 7 additions & 7 deletions zPoolMiner/Miners/AMD/lolminer.cs → zPoolMiner/Miners/AMD/lolminerAmd.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,14 +19,14 @@

namespace NiceHashMiner.Miners
{
class lolMiner : Miner
class lolMinerAmd : Miner
{
private readonly int GPUPlatformNumber;
Stopwatch _benchmarkTimer = new Stopwatch();
int count = 0;
double speed = 0;

public lolMiner()
public lolMinerAmd()
: base("lolMiner_AMD")
{
GPUPlatformNumber = ComputeDeviceManager.Avaliable.AMDOpenCLPlatformNum;
Expand Down Expand Up @@ -260,7 +260,7 @@ public class lolGpuResult
public override async Task<APIData> GetSummaryAsync()
{
var ad = new APIData(MiningSetup.CurrentAlgorithmType);
string ResponseFromlolMiner;
string ResponseFromlolMinerAmd;
try
{
HttpWebRequest WR = (HttpWebRequest)WebRequest.Create("http://127.0.0.1:" + ApiPort.ToString() + "/summary");
Expand All @@ -271,8 +271,8 @@ public override async Task<APIData> GetSummaryAsync()
Stream SS = Response.GetResponseStream();
SS.ReadTimeout = 2 * 1000;
StreamReader Reader = new StreamReader(SS);
ResponseFromlolMiner = await Reader.ReadToEndAsync();
//Helpers.ConsolePrint("API: ", ResponseFromlolMiner);
ResponseFromlolMinerAmd = await Reader.ReadToEndAsync();
//Helpers.ConsolePrint("API: ", ResponseFromlolMinerAmd);
//if (ResponseFromlolMiner.Length == 0 || (ResponseFromlolMiner[0] != '{' && ResponseFromlolMiner[0] != '['))
// throw new Exception("Not JSON!");
Reader.Close();
Expand All @@ -283,14 +283,14 @@ public override async Task<APIData> GetSummaryAsync()
return null;
}

if (ResponseFromlolMiner == null)
if (ResponseFromlolMinerAmd == null)
{
CurrentMinerReadStatus = MinerApiReadStatus.NONE;
return null;
}
try
{
dynamic resp = JsonConvert.DeserializeObject(ResponseFromlolMiner);
dynamic resp = JsonConvert.DeserializeObject(ResponseFromlolMinerAmd);
int mult = 1;
if (resp != null)
{
Expand Down
36 changes: 18 additions & 18 deletions zPoolMiner/Miners/Grouping/MinerPaths.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -223,7 +223,7 @@ public static class Data
/// </summary>
//public const string ccminer_xevan = _bin + @"\ccminer_xevan\ccminer.exe";

public const string lolMiner = _bin + @"\lolMiner\lolMiner.exe";
public const string lolMinerAmd = _bin + @"\lolMiner\lolMiner.exe";
/// <summary>
/// CPUminers
/// </summary>
Expand Down Expand Up @@ -453,8 +453,8 @@ public static string GetPathFor(MinerBaseType minerBaseType, AlgorithmType algoT
return NVIDIA_GROUPS.CryptoDredge(algoType, devGroupType);
case MinerBaseType.CPU_verium:
return Data.CPU_verium;
case MinerBaseType.lolMiner:
return AMD_GROUP.lolMiner(algoType);
case MinerBaseType.lolMinerAmd:
return AMD_GROUP.lolMinerAmd(algoType);
}
return Data.NONE;
}
Expand Down Expand Up @@ -751,19 +751,19 @@ public static string Sgminer_path(AlgorithmType type)
}
if (AlgorithmType.karlsenhash == type)
{
return Data.lolMiner;
return Data.lolMinerAmd;
}
if (AlgorithmType.pyrinhash == type)
{
return Data.lolMiner;
return Data.lolMinerAmd;
}
if (AlgorithmType.ethash == type)
{
return Data.lolMiner;
return Data.lolMinerAmd;
}
if (AlgorithmType.ethashb3 == type)
{
return Data.lolMiner;
return Data.lolMinerAmd;
}
/*if (AlgorithmType.x16r == type)
{
Expand All @@ -772,27 +772,27 @@ public static string Sgminer_path(AlgorithmType type)

return Data.NONE;
}
public static string lolMiner_path(AlgorithmType type)
public static string lolMinerAmd_path(AlgorithmType type)
{

if (AlgorithmType.karlsenhash == type)
{
return Data.lolMiner;
return Data.lolMinerAmd;
}
if (AlgorithmType.pyrinhash == type)
{
return Data.lolMiner;
return Data.lolMinerAmd;
}
if (AlgorithmType.ethash == type)
{
return Data.lolMiner;
return Data.lolMinerAmd;
}
if (AlgorithmType.ethashb3 == type)
{
return Data.lolMiner;
return Data.lolMinerAmd;
}

return Data.lolMiner;
return Data.lolMinerAmd;
}

/// <summary>
Expand All @@ -810,23 +810,23 @@ public static string Glg_path(AlgorithmType type)
return Data.NONE;
}

public static string lolMiner(AlgorithmType type)
public static string lolMinerAmd(AlgorithmType type)
{
if (AlgorithmType.karlsenhash == type)
{
return Data.lolMiner;
return Data.lolMinerAmd;
}
if (AlgorithmType.pyrinhash == type)
{
return Data.lolMiner;
return Data.lolMinerAmd;
}
if (AlgorithmType.ethash == type)
{
return Data.lolMiner;
return Data.lolMinerAmd;
}
if (AlgorithmType.ethashb3 == type)
{
return Data.lolMiner;
return Data.lolMinerAmd;
}
return Data.NONE;
}
Expand Down
4 changes: 2 additions & 2 deletions zPoolMiner/Miners/MinerFactory.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -100,8 +100,8 @@ public static Miner CreateMiner(DeviceType deviceType, AlgorithmType algorithmTy
case MinerBaseType.Claymore:
return CreateClaymore(algorithmType, secondaryAlgorithmType);

case MinerBaseType.lolMiner:
return new lolMiner();
case MinerBaseType.lolMinerAmd:
return new lolMinerAmd();

case MinerBaseType.OptiminerAMD:
return new OptiminerZcashMiner();
Expand Down
Loading

0 comments on commit 86ee669

Please sign in to comment.