Skip to content

Commit

Permalink
3.0.2.2
Browse files Browse the repository at this point in the history
  • Loading branch information
@Cryptominer937
Cryptominer937 committed Apr 3, 2024
1 parent cc551bd commit 91593ae
Show file tree
Hide file tree
Showing 17 changed files with 853 additions and 80 deletions.
6 changes: 4 additions & 2 deletions zPoolMiner/Configs/jsconfig1.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,8 @@
"karlsenhash": "ZAlgorithm.karlsenhash",
"pyrinhash": "ZAlgorithm.pyrinhash",
"ethash": "ZAlgorithm.ethash",
"ethash": "ZAlgorithm.ethashb3",
"ethashb3": "ZAlgorithm.ethashb3",
"kawpow": "ZAlgorithm.kawpow"
},
"AlgoID": {
//"bitcore": "0",
Expand Down Expand Up @@ -119,7 +120,8 @@
"karlsenhash": "55",
"pyrinhash": "56",
"ethash": "57",
"ethashb3": "58"
"ethashb3": "58",
"kawpow": "59"
},
"MagnitudeFactor": {
"decred": "1",
Expand Down
4 changes: 4 additions & 0 deletions zPoolMiner/CryptoStats.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -887,6 +887,7 @@ private ZAlgorithm ToAlgorithm(string s)
//case "cryptonight_fast": return ZAlgorithm.cryptonight_fast;
case "cryptonight_haven": return ZAlgorithm.cryptonight_haven;
case "cryptonight_upx": return ZAlgorithm.cryptonight_upx;
case "kawpow": return ZAlgorithm.kawpow;
case "yespower": return ZAlgorithm.yespower;
case "cpupower": return ZAlgorithm.cpupower;
case "power2b": return ZAlgorithm.power2b;
Expand Down Expand Up @@ -1007,6 +1008,7 @@ public int NiceHashAlgoId()
case "pyrinhash": return 79;
case "ethash": return 80;
case "ethashb3": return 81;
case "kawpow": return 82;

default: return -1;
}
Expand Down Expand Up @@ -1071,6 +1073,7 @@ private decimal MagnitudeFactor(string s)
case "pyrinhash":
case "ethash":
case "ethashb3":
case "kawpow":
return 1; //end GH
//MH Below
//case "hmq1725":
Expand Down Expand Up @@ -1376,6 +1379,7 @@ public enum ZAlgorithm
pyrinhash,
ethash,
ethashb3,
kawpow,

}
}
84 changes: 29 additions & 55 deletions zPoolMiner/Devices/GroupAlgorithms.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -432,16 +432,16 @@ public static Dictionary<MinerBaseType, List<Algorithm>> CreateDefaultsForGroup(
new List<Algorithm>() {
new Algorithm(MinerBaseType.GatelessGate, AlgorithmType.NeoScrypt, "neoscrypt") { ExtraLaunchParameters = DefaultParam + "--intensity 13 --worksize 256 --gpu-threads 1" },
new Algorithm(MinerBaseType.GatelessGate, AlgorithmType.Lyra2REv2, "Lyra2REv2") { ExtraLaunchParameters = DefaultParam + "--gpu-threads 6 --worksize 128 --intensity d" },
//new Algorithm(MinerBaseType.GatelessGate, AlgorithmType.equihash, "equihash"){ ExtraLaunchParameters = RemDis + "--xintensity 512 --worksize 256 --gpu-threads 2" },
//new Algorithm(MinerBaseType.GatelessGate, AlgorithmType.DaggerHashimoto, "ethash") { ExtraLaunchParameters = DefaultParam + "--xintensity 512 -w 192 -g 1" },
// new Algorithm(MinerBaseType.GatelessGate, AlgorithmType.Decred, "decred") { ExtraLaunchParameters = RemDis + "--gpu-threads 1 --xintensity 256 --lookup-gap 2 --worksize 64" },
// new Algorithm(MinerBaseType.GatelessGate, AlgorithmType.Lbry, "lbry") { ExtraLaunchParameters = DefaultParam + "--xintensity 512 --worksize 128 --gpu-threads 2" },
//new Algorithm(MinerBaseType.GatelessGate, AlgorithmType.cryptonight, "cryptonight") { ExtraLaunchParameters = DefaultParam + "--rawintensity 512 -w 8 -g 2" },
// new Algorithm(MinerBaseType.GatelessGate, AlgorithmType.Pascal, "pascal") { ExtraLaunchParameters = DefaultParam + "--intensity 21 -w 64 -g 2" },
//new Algorithm(MinerBaseType.GatelessGate, AlgorithmType.X11Gost, "sibcoin-mod") { ExtraLaunchParameters = DefaultParam + "--intensity 16 -w 64 -g 2" },
//new Algorithm(MinerBaseType.GatelessGate, AlgorithmType.Skein, "skein") { ExtraLaunchParameters = DefaultParam + "--intensity d --gpu-threads 2" },
//new Algorithm(MinerBaseType.GatelessGate, AlgorithmType.Myriad_groestl, "myriadcoin-groestl") { ExtraLaunchParameters = DefaultParam + "--gpu-threads 2 --worksize 64 --intensity d" },
//new Algorithm(MinerBaseType.GatelessGate, AlgorithmType.Keccak, "keccak") { ExtraLaunchParameters = DefaultParam + "--intensity d --gpu-threads 2" }
new Algorithm(MinerBaseType.GatelessGate, AlgorithmType.equihash, "equihash"){ ExtraLaunchParameters = RemDis + "--xintensity 512 --worksize 256 --gpu-threads 2" },
new Algorithm(MinerBaseType.GatelessGate, AlgorithmType.DaggerHashimoto, "ethash") { ExtraLaunchParameters = DefaultParam + "--xintensity 512 -w 192 -g 1" },
new Algorithm(MinerBaseType.GatelessGate, AlgorithmType.Decred, "decred") { ExtraLaunchParameters = RemDis + "--gpu-threads 1 --xintensity 256 --lookup-gap 2 --worksize 64" },
new Algorithm(MinerBaseType.GatelessGate, AlgorithmType.Lbry, "lbry") { ExtraLaunchParameters = DefaultParam + "--xintensity 512 --worksize 128 --gpu-threads 2" },
new Algorithm(MinerBaseType.GatelessGate, AlgorithmType.cryptonight, "cryptonight") { ExtraLaunchParameters = DefaultParam + "--rawintensity 512 -w 8 -g 2" },
new Algorithm(MinerBaseType.GatelessGate, AlgorithmType.Pascal, "pascal") { ExtraLaunchParameters = DefaultParam + "--intensity 21 -w 64 -g 2" },
new Algorithm(MinerBaseType.GatelessGate, AlgorithmType.X11Gost, "sibcoin-mod") { ExtraLaunchParameters = DefaultParam + "--intensity 16 -w 64 -g 2" },
new Algorithm(MinerBaseType.GatelessGate, AlgorithmType.Skein, "skein") { ExtraLaunchParameters = DefaultParam + "--intensity d --gpu-threads 2" },
new Algorithm(MinerBaseType.GatelessGate, AlgorithmType.Myriad_groestl, "myriadcoin-groestl") { ExtraLaunchParameters = DefaultParam + "--gpu-threads 2 --worksize 64 --intensity d" },
new Algorithm(MinerBaseType.GatelessGate, AlgorithmType.Keccak, "keccak") { ExtraLaunchParameters = DefaultParam + "--intensity d --gpu-threads 2" }
}
},
{ MinerBaseType.mkxminer,
Expand Down Expand Up @@ -503,7 +503,7 @@ public static Dictionary<MinerBaseType, List<Algorithm>> CreateDefaultsForGroup(
},
{ MinerBaseType.ccminer_tpruvot2,
new List<Algorithm>() {
new Algorithm(MinerBaseType.ccminer_tpruvot2, AlgorithmType.NeoScrypt, "neoscrypt"),
//new Algorithm(MinerBaseType.ccminer_tpruvot2, AlgorithmType.NeoScrypt, "neoscrypt"),
}
},
{ MinerBaseType.Claymore,
Expand All @@ -518,58 +518,31 @@ public static Dictionary<MinerBaseType, List<Algorithm>> CreateDefaultsForGroup(
},
{ MinerBaseType.trex,
new List<Algorithm>() {
//new Algorithm(MinerBaseType.trex, AlgorithmType.lyra2z, "Lyra2z"),
//new Algorithm(MinerBaseType.trex, AlgorithmType.Tribus, "tribus"),
//new Algorithm(MinerBaseType.trex, AlgorithmType.phi2, "phi2"),
//new Algorithm(MinerBaseType.trex, AlgorithmType.Phi, "phi"),
//new Algorithm(MinerBaseType.trex, AlgorithmType.C11, "c11"),
//new Algorithm(MinerBaseType.trex, AlgorithmType.X17, "x17"),
//new Algorithm(MinerBaseType.trex, AlgorithmType.Hsr, "hsr"),
new Algorithm(MinerBaseType.trex, AlgorithmType.lyra2z, "Lyra2z"),
new Algorithm(MinerBaseType.trex, AlgorithmType.x16r, "x16r"),
//new Algorithm(MinerBaseType.trex, AlgorithmType.x16s, "x16s"),
//new Algorithm(MinerBaseType.trex, AlgorithmType.sonoa, "sonoa"),
//new Algorithm(MinerBaseType.trex, AlgorithmType.hmq1725, "hmq1725"),
//new Algorithm(MinerBaseType.trex, AlgorithmType.Bitcore, "bitcore"),
//new Algorithm(MinerBaseType.trex, AlgorithmType.Polytimos, "polytimos"),
//new Algorithm(MinerBaseType.trex, AlgorithmType.Skunk, "skunk"),
//new Algorithm(MinerBaseType.trex, AlgorithmType.bcd, "bcd"),
}
},
{ MinerBaseType.ZEnemy,
new List<Algorithm>() {
//new Algorithm(MinerBaseType.ZEnemy, AlgorithmType.Bitcore, "bitcore"),//
//new Algorithm(MinerBaseType.ZEnemy, AlgorithmType.Xevan, "xevan"),//
//new Algorithm(MinerBaseType.ZEnemy, AlgorithmType.X17, "x17"),//
new Algorithm(MinerBaseType.ZEnemy, AlgorithmType.x16r, "x16r"),//
//new Algorithm(MinerBaseType.ZEnemy, AlgorithmType.x16s, "x16s"),
//new Algorithm(MinerBaseType.ZEnemy, AlgorithmType.Tribus, "tribus"),//
//new Algorithm(MinerBaseType.ZEnemy, AlgorithmType.C11, "c11"),//
//new Algorithm(MinerBaseType.ZEnemy, AlgorithmType.Skunk, "skunk"),//
//new Algorithm(MinerBaseType.ZEnemy, AlgorithmType.Phi, "phi"),//
//new Algorithm(MinerBaseType.ZEnemy, AlgorithmType.phi2, "phi2"),
//new Algorithm(MinerBaseType.ZEnemy, AlgorithmType.hex, "hex"),
//new Algorithm(MinerBaseType.ZEnemy, AlgorithmType.Timetravel, "timetravel"),//
//new Algorithm(MinerBaseType.ZEnemy, AlgorithmType.sonoa, "sonoa"),
//new Algorithm(MinerBaseType.ZEnemy, AlgorithmType.bcd, "bcd"),
new Algorithm(MinerBaseType.ZEnemy, AlgorithmType.x16r, "x16r"),
}
},
{ MinerBaseType.CryptoDredge,
{ MinerBaseType.CryptoDredge16,
new List<Algorithm>() {
//new Algorithm(MinerBaseType.CryptoDredge, AlgorithmType.allium, "allium"),
//new Algorithm(MinerBaseType.CryptoDredge, AlgorithmType.argon2d250, "argon2d250"),
//new Algorithm(MinerBaseType.CryptoDredge, AlgorithmType.argon2d4096, "argon2d4096"),
//new Algorithm(MinerBaseType.CryptoDredge, AlgorithmType.hmq1725, "hmq1725"),
//new Algorithm(MinerBaseType.CryptoDredge, AlgorithmType.lyra2v3, "lyra2v3"),
//new Algorithm(MinerBaseType.CryptoDredge, AlgorithmType.NeoScrypt, "neoscrypt"),
//new Algorithm(MinerBaseType.CryptoDredge, AlgorithmType.Skunk, "skunk"),
//new Algorithm(MinerBaseType.CryptoDredge, AlgorithmType.phi2, "phi2"),
//new Algorithm(MinerBaseType.CryptoDredge, AlgorithmType.cryptonight_heavy, "cryptonightheavy"),
//new Algorithm(MinerBaseType.CryptoDredge, AlgorithmType.cryptonight_gpu, "cngpu"),
// new Algorithm(MinerBaseType.CryptoDredge, AlgorithmType.cryptonight_xeq, "cngpu"),
//new Algorithm(MinerBaseType.CryptoDredge, AlgorithmType.cryptonight_saber, "cnsaber"),
//new Algorithm(MinerBaseType.CryptoDredge, AlgorithmType.cryptonight_conceal, "cnconceal"),
//new Algorithm(MinerBaseType.CryptoDredge, AlgorithmType.cryptonight_upx, "cnupx2"),
//new Algorithm(MinerBaseType.CryptoDredge, AlgorithmType.chukwa, "chukwa"),
new Algorithm(MinerBaseType.CryptoDredge16, AlgorithmType.allium, "allium"),
new Algorithm(MinerBaseType.CryptoDredge16, AlgorithmType.NeoScrypt, "neoscrypt"),
}
},{ MinerBaseType.CryptoDredge25,
new List<Algorithm>() {
new Algorithm(MinerBaseType.CryptoDredge25, AlgorithmType.allium, "allium"),
new Algorithm(MinerBaseType.CryptoDredge25, AlgorithmType.NeoScrypt, "neoscrypt"),
new Algorithm(MinerBaseType.CryptoDredge25, AlgorithmType.cryptonight_upx, "cryptonight_upx"),
new Algorithm(MinerBaseType.CryptoDredge25, AlgorithmType.cryptonight_gpu, "cryptonight_gpu"),
}
},{ MinerBaseType.CryptoDredge26,
new List<Algorithm>() {
//new Algorithm(MinerBaseType.CryptoDredge26, AlgorithmType.kawpow, "kawpow"),
//new Algorithm(MinerBaseType.CryptoDredge26, AlgorithmType.cryptonight_upx, "cryptonight_upx"),
}
},
{ MinerBaseType.MiniZ,
Expand All @@ -593,6 +566,7 @@ public static Dictionary<MinerBaseType, List<Algorithm>> CreateDefaultsForGroup(
if (DeviceGroupType.NVIDIA_5_x == deviceGroupType)
{
ToRemoveMinerTypes.AddRange(new MinerBaseType[] {
MinerBaseType.lolMinerNvidia

});
}
Expand Down
1 change: 1 addition & 0 deletions zPoolMiner/Enums/AlgorithmType.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -302,5 +302,6 @@ public enum AlgorithmType : int
pyrinhash = 79,
ethash = 80,
ethashb3 = 81,
kawpow = 82,
}
}
4 changes: 3 additions & 1 deletion zPoolMiner/Enums/MinerBaseType.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -196,7 +196,9 @@ public enum MinerBaseType
CPU_XMRigUPX,
trex,
ZEnemy,
CryptoDredge,
CryptoDredge16,
CryptoDredge25,
CryptoDredge26,
MiniZ,
CPU_verium,
/// <summary>
Expand Down
4 changes: 3 additions & 1 deletion zPoolMiner/Enums/MinerType.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -139,7 +139,9 @@ public enum MinerType
CPU_XMRigUPX,
trex,
ZEnemy,
CryptoDredge,
CryptoDredge16,
CryptoDredge25,
CryptoDredge26,
MiniZ,
CPU_verium,
/// <summary>
Expand Down
48 changes: 42 additions & 6 deletions zPoolMiner/Miners/Grouping/MinerPaths.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -324,7 +324,9 @@ public static class Data
public const string CPU_XMRigUPX = _bin + @"\CPU\CPU-XMRigUPX\xmrig.exe";
public const string trex = _bin + @"\NVIDIA\NVIDIA-trex\t-rex.exe";
public const string MiniZ = _bin + @"\NVIDIA\NVIDIA-miniZ\miniZ.exe";
public const string CryptoDredge = _bin + @"\NVIDIA\NVIDIA-CryptoDredge\CryptoDredge.exe";
public const string CryptoDredge16 = _bin + @"\NVIDIA\NVIDIA-CryptoDredge16\CryptoDredge.exe";
public const string CryptoDredge25 = _bin + @"\NVIDIA\NVIDIA-CryptoDredge25\CryptoDredge.exe";
public const string CryptoDredge26 = _bin + @"\NVIDIA\NVIDIA-CryptoDredge26\CryptoDredge.exe";
public const string ZEnemy = _bin + @"\NVIDIA\NVIDIA-zealotenemy\z-enemy.exe";
//public const string ClaymoreZcashMiner = _bin + @"\AMD-NVIDIA\claymore_zcash\ZecMiner64.exe";

Expand Down Expand Up @@ -450,8 +452,12 @@ public static string GetPathFor(MinerBaseType minerBaseType, AlgorithmType algoT
case MinerBaseType.ZEnemy:
return NVIDIA_GROUPS.ZEnemy(algoType, devGroupType);

case MinerBaseType.CryptoDredge:
return NVIDIA_GROUPS.CryptoDredge(algoType, devGroupType);
case MinerBaseType.CryptoDredge16:
return NVIDIA_GROUPS.CryptoDredge16(algoType, devGroupType);
case MinerBaseType.CryptoDredge25:
return NVIDIA_GROUPS.CryptoDredge25(algoType, devGroupType);
case MinerBaseType.CryptoDredge26:
return NVIDIA_GROUPS.CryptoDredge26(algoType, devGroupType);
case MinerBaseType.CPU_verium:
return Data.CPU_verium;
case MinerBaseType.lolMinerAmd:
Expand Down Expand Up @@ -620,17 +626,47 @@ public static string ZEnemy(AlgorithmType algorithmType, DeviceGroupType nvidiaG
return Data.NONE; // should not happen
}

public static string CryptoDredge(AlgorithmType algorithmType, DeviceGroupType nvidiaGroup)
public static string CryptoDredge16(AlgorithmType algorithmType, DeviceGroupType nvidiaGroup)
{
// sm21 and sm3x have same settings
if (nvidiaGroup == DeviceGroupType.NVIDIA_2_1 || nvidiaGroup == DeviceGroupType.NVIDIA_3_x)
{
return Data.CryptoDredge;
return Data.CryptoDredge16;
}
// sm5x and sm6x have same settings otherwise
if (nvidiaGroup == DeviceGroupType.NVIDIA_5_x || nvidiaGroup == DeviceGroupType.NVIDIA_6_x)
{
return Data.CryptoDredge; ;
return Data.CryptoDredge16;
}
// TODO wrong case?
return Data.NONE; // should not happen
}
public static string CryptoDredge25(AlgorithmType algorithmType, DeviceGroupType nvidiaGroup)
{
// sm21 and sm3x have same settings
if (nvidiaGroup == DeviceGroupType.NVIDIA_2_1 || nvidiaGroup == DeviceGroupType.NVIDIA_3_x)
{
return Data.CryptoDredge25;
}
// sm5x and sm6x have same settings otherwise
if (nvidiaGroup == DeviceGroupType.NVIDIA_5_x || nvidiaGroup == DeviceGroupType.NVIDIA_6_x)
{
return Data.CryptoDredge25;
}
// TODO wrong case?
return Data.NONE; // should not happen
}
public static string CryptoDredge26(AlgorithmType algorithmType, DeviceGroupType nvidiaGroup)
{
// sm21 and sm3x have same settings
if (nvidiaGroup == DeviceGroupType.NVIDIA_2_1 || nvidiaGroup == DeviceGroupType.NVIDIA_3_x)
{
return Data.CryptoDredge26;
}
// sm5x and sm6x have same settings otherwise
if (nvidiaGroup == DeviceGroupType.NVIDIA_5_x || nvidiaGroup == DeviceGroupType.NVIDIA_6_x)
{
return Data.CryptoDredge26;
}
// TODO wrong case?
return Data.NONE; // should not happen
Expand Down
8 changes: 6 additions & 2 deletions zPoolMiner/Miners/MinerFactory.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -128,8 +128,12 @@ public static Miner CreateMiner(DeviceType deviceType, AlgorithmType algorithmTy
return new CPU_nosuch();
case MinerBaseType.trex:
return new trex();
case MinerBaseType.CryptoDredge:
return new CryptoDredge();
case MinerBaseType.CryptoDredge16:
return new CryptoDredge16();
case MinerBaseType.CryptoDredge25:
return new CryptoDredge25();
case MinerBaseType.CryptoDredge26:
return new CryptoDredge26();
case MinerBaseType.ZEnemy:
return new ZEnemy();
case MinerBaseType.MiniZ:
Expand Down
Loading

0 comments on commit 91593ae

Please sign in to comment.