diff --git a/zPoolMiner/CryptoStats.cs b/zPoolMiner/CryptoStats.cs index 45c6b7b..0aef5fa 100644 --- a/zPoolMiner/CryptoStats.cs +++ b/zPoolMiner/CryptoStats.cs @@ -914,6 +914,44 @@ private ZAlgorithm ToAlgorithm(string s) case "pyrinhash": return ZAlgorithm.pyrinhash; case "etchash": return ZAlgorithm.ethash; case "etchashb3": return ZAlgorithm.ethashb3; + case "aurum": return ZAlgorithm.aurum; + case "bmw512": return ZAlgorithm.bmw512; + case "curvehash": return ZAlgorithm.curvehash; + case "evrprogpow": return ZAlgorithm.evrprogpow; + case "firopow": return ZAlgorithm.firopow; + case "frkhash": return ZAlgorithm.frkhash; + case "ghostrider": return ZAlgorithm.take2; + case "heavyhash": return ZAlgorithm.heavyhash; + case "karlsenhashnxl": return ZAlgorithm.karlsenhashnxl; + case "kheavyhash": return ZAlgorithm.kheavyhash; + case "megabtx": return ZAlgorithm.megabtx; + case "memehash": return ZAlgorithm.memehash; + case "meowpow": return ZAlgorithm.meowpow; + case "mike": return ZAlgorithm.mike; + case "minotaurx": return ZAlgorithm.minotaurx; + case "neoscrypt-xaya": return ZAlgorithm.neoscryptxaya; + case "nexapow": return ZAlgorithm.nexapow; + case "odocrypt": return ZAlgorithm.odocrypt; + case "panthera": return ZAlgorithm.panthera; + case "randomarq": return ZAlgorithm.randomarq; + case "sha256csm": return ZAlgorithm.sha256csm; + case "sha256dt": return ZAlgorithm.sha256dt; + case "sha3d": return ZAlgorithm.sha3d; + case "sha512256d": return ZAlgorithm.sha512256d; + case "skydoge": return ZAlgorithm.skydoge; + case "verthash": return ZAlgorithm.verthash; + case "verushash": return ZAlgorithm.verushash; + case "x16rt": return ZAlgorithm.x16rt; + case "x16rv2": return ZAlgorithm.x16rv2; + case "x21s": return ZAlgorithm.x21s; + case "x25x": return ZAlgorithm.x25x; + case "yespowerltncg": return ZAlgorithm.yespowerltncg; + case "yespowermgpc": return ZAlgorithm.yespowermgpc; + case "yespowerr16": return ZAlgorithm.yespowerr16; + case "yespowersugar": return ZAlgorithm.yespowersugar; + case "yespowertide": return ZAlgorithm.yespowertide; + case "yespowerurx": return ZAlgorithm.yespowerurx; + } return ZAlgorithm.unknown; @@ -1009,6 +1047,43 @@ public int NiceHashAlgoId() case "ethash": return 80; case "ethashb3": return 81; case "kawpow": return 82; + case "aurum": return 83; + case "bmw512": return 84; + case "curvehash": return 85; + case "evrprogpow": return 86; + case "firopow": return 87; + case "frkhash": return 88; + case "ghostrider": return 89; + case "heavyhash": return 90; + case "karlsenhashnxl": return 91; + case "kheavyhash": return 92; + case "megabtx": return 93; + case "memehash": return 94; + case "meowpow": return 95; + case "mike": return 96; + case "minotaurx": return 97; + case "neoscrypt-xaya": return 98; + case "nexapow": return 99; + case "odocrypt": return 100; + case "panthera": return 101; + case "randomarq": return 102; + case "sha256csm": return 103; + case "sha256dt": return 104; + case "sha3d": return 105; + case "sha512256d": return 106; + case "skydoge": return 107; + case "verthash": return 108; + case "verushash": return 109; + case "x16rt": return 110; + case "x16rv2": return 111; + case "x21s": return 112; + case "x25x": return 113; + case "yespowerltncg": return 114; + case "yespowermgpc": return 115; + case "yespowerr16": return 116; + case "yespowersugar": return 117; + case "yespowertide": return 118; + case "yespowerurx": return 119; default: return -1; } @@ -1043,7 +1118,6 @@ private decimal MagnitudeFactor(string s) case "x11": case "quark": case "qubit": - case "sha256t": case "lyra2z": case "dedal": case "groestl": @@ -1053,9 +1127,7 @@ private decimal MagnitudeFactor(string s) //case "lyra2v3": case "myr-gr": case "nist5": - case "odocrypt": case "phi": - case "sha3d": case "sib": case "skein": //case "tribus": @@ -1071,11 +1143,51 @@ private decimal MagnitudeFactor(string s) case "bcd": case "karlsenhash": case "pyrinhash": + case "allium": + case "bmw512": + case "curvehash": case "ethash": case "ethashb3": + case "evrprogpow": + case "firopow": + case "frkhash": + case "heavyhash": case "kawpow": + case "karlsenhashnxl": + case "kheavyhash": + case "megabtx": + case "memehash": + case "meowpow": + case "nexapow": + case "odocrypt": + case "sha256csm": + case "sha256dt": + case "sha256t": + case "sha3d": + case "sha512256d": + case "skydoge": + case "x16r": + case "x16rt": + case "x16rv2": + case "x21s": + case "x22i": + case "x25x": return 1; //end GH //MH Below + case "aurum": + case "cpupower": + case "cryptonight_gpu": + case "cryptonight_upx": + case "equihash": + case "equihash125": + case "minotaurx": + case "neoscrypt-xaya": + case "randomarq": + case "yescrypt": + case "yescryptR8": + case "yespower": + case "yespowerr16": + case "yespowertide": //case "hmq1725": case "jeonghash": //case "m7m": @@ -1087,18 +1199,10 @@ private decimal MagnitudeFactor(string s) case "progpow": //case "sonoa": case "x12": - case "x16r": - case "x16rt": - case "x16rv2": //case "x16s": - case "x21s": - case "x22i": - case "x25x": //case "xevan": - case "allium": //case "equihash96": - case "cryptonight_upx": - case "yescrypt": + case "verthash": return 1000; // end MH //KH Below case "yescryptr16": @@ -1111,24 +1215,24 @@ private decimal MagnitudeFactor(string s) //case "cryptonight_saber": case "cryptonight_heavyx": //case "cryptonight_heavy": - case "cryptonight_gpu": //case "cryptonight_xeq": - case "yespower": - case "cpupower": case "power2b": case "yespoweriots": //case "yescryptr8g": case "yescryptr32": case "argon2d4096": - case "equihash": - case "equihash125": case "equihash144": case "equihash192": case "lyra2z330": - case "yescryptR8": case "yespowerR16": case "scryptn2": - + case "ghostrider": + case "mike": + case "panthera": + case "yespowerltncg": + case "yespowermgpc": + case "yespowersugar": + case "yespowerurx": return 1000000; //end KH default: return 1000; @@ -1380,6 +1484,43 @@ public enum ZAlgorithm ethash, ethashb3, kawpow, + aurum, + bmw512, + curvehash, + evrprogpow, + firopow, + frkhash, + take2, + heavyhash, + karlsenhashnxl, + kheavyhash, + megabtx, + memehash, + meowpow, + mike, + minotaurx, + neoscryptxaya, + nexapow, + odocrypt, + panthera, + randomarq, + sha256csm, + sha256dt, + sha3d, + sha512256d, + skydoge, + verthash, + verushash, + x16rt, + x16rv2, + x21s, + x25x, + yespowerltncg, + yespowermgpc, + yespowerr16, + yespowersugar, + yespowertide, + yespowerurx, } } diff --git a/zPoolMiner/Devices/GroupAlgorithms.cs b/zPoolMiner/Devices/GroupAlgorithms.cs index 2c90ca9..76b0284 100644 --- a/zPoolMiner/Devices/GroupAlgorithms.cs +++ b/zPoolMiner/Devices/GroupAlgorithms.cs @@ -367,7 +367,7 @@ public static Dictionary> CreateDefaultsForGroup( new Algorithm(MinerBaseType.CPU_RKZ, AlgorithmType.yescrypt, "yescrypt"), new Algorithm(MinerBaseType.CPU_RKZ, AlgorithmType.yespower, "yespower"), new Algorithm(MinerBaseType.CPU_RKZ, AlgorithmType.cpupower, "cpupower"), - new Algorithm(MinerBaseType.CPU_RKZ, AlgorithmType.power2b, "power2b") + //new Algorithm(MinerBaseType.CPU_RKZ, AlgorithmType.power2b, "power2b") } }, @@ -433,11 +433,11 @@ public static Dictionary> CreateDefaultsForGroup( 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.ethash, "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.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" }, @@ -481,7 +481,11 @@ public static Dictionary> CreateDefaultsForGroup( 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") + new Algorithm(MinerBaseType.lolMinerAmd,AlgorithmType.ethashb3,"ethashb3"), + new Algorithm(MinerBaseType.lolMinerAmd,AlgorithmType.nexapow,"nexapow"), + new Algorithm(MinerBaseType.lolMinerAmd,AlgorithmType.sha512256d,"sha512256d"), + new Algorithm(MinerBaseType.lolMinerAmd,AlgorithmType.equihash144,"equihash144"), + new Algorithm(MinerBaseType.lolMinerAmd,AlgorithmType.equihash192,"equihash192") } } }; @@ -498,7 +502,11 @@ public static Dictionary> CreateDefaultsForGroup( new Algorithm(MinerBaseType.lolMinerNvidia,AlgorithmType.karlsenhash,"karlsenhash"), new Algorithm(MinerBaseType.lolMinerNvidia,AlgorithmType.pyrinhash,"pyrinhash"), new Algorithm(MinerBaseType.lolMinerNvidia,AlgorithmType.ethash,"ethash"), - new Algorithm(MinerBaseType.lolMinerNvidia,AlgorithmType.ethashb3,"ethashb3") + new Algorithm(MinerBaseType.lolMinerNvidia,AlgorithmType.ethashb3,"ethashb3"), + new Algorithm(MinerBaseType.lolMinerNvidia,AlgorithmType.nexapow,"nexapow"), + new Algorithm(MinerBaseType.lolMinerNvidia,AlgorithmType.sha512256d,"sha512256d"), + new Algorithm(MinerBaseType.lolMinerNvidia,AlgorithmType.equihash144,"equihash144"), + new Algorithm(MinerBaseType.lolMinerNvidia,AlgorithmType.equihash192,"equihash192") } }, { MinerBaseType.ccminer_tpruvot2, @@ -531,6 +539,10 @@ public static Dictionary> CreateDefaultsForGroup( new List() { new Algorithm(MinerBaseType.CryptoDredge16, AlgorithmType.allium, "allium"), new Algorithm(MinerBaseType.CryptoDredge16, AlgorithmType.NeoScrypt, "neoscrypt"), + new Algorithm(MinerBaseType.CryptoDredge16, AlgorithmType.lyra2z, "lyra2z"), + new Algorithm(MinerBaseType.CryptoDredge16, AlgorithmType.x16r, "x16r"), + //new Algorithm(MinerBaseType.CryptoDredge16, AlgorithmType.x16rt, "x16rt"), + new Algorithm(MinerBaseType.CryptoDredge16, AlgorithmType.x21s, "x21s"), } },{ MinerBaseType.CryptoDredge25, new List() { @@ -538,6 +550,11 @@ public static Dictionary> CreateDefaultsForGroup( 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"), + new Algorithm(MinerBaseType.CryptoDredge25, AlgorithmType.lyra2z, "lyra2z"), + new Algorithm(MinerBaseType.CryptoDredge25, AlgorithmType.x16r, "x16r"), + new Algorithm(MinerBaseType.CryptoDredge25, AlgorithmType.x16rt, "x16rt"), + new Algorithm(MinerBaseType.CryptoDredge25, AlgorithmType.x16rv2, "x16rv2"), + new Algorithm(MinerBaseType.CryptoDredge25, AlgorithmType.x21s, "x21s"), } },{ MinerBaseType.CryptoDredge26, new List() { diff --git a/zPoolMiner/Enums/AlgorithmType.cs b/zPoolMiner/Enums/AlgorithmType.cs index 2216205..1313de0 100644 --- a/zPoolMiner/Enums/AlgorithmType.cs +++ b/zPoolMiner/Enums/AlgorithmType.cs @@ -303,5 +303,42 @@ public enum AlgorithmType : int ethash = 80, ethashb3 = 81, kawpow = 82, + aurum = 83, + bmw512 = 84, + curvehash = 85, + evrprogpow = 86, + firopow = 87, + frkhash = 88, + ghostrider = 89, + heavyhash =90, + karlsenhashnxl = 91, + kheavyhash = 92, + megabtx = 93, + memehash = 94, + meowpow = 95, + mike = 96, + minotaurx = 97, + neoscryptxaya = 98, + nexapow = 99, + odocrypt = 100, + panthera = 101, + randomarq = 102, + sha256csm = 103, + sha256dt = 104, + sha3d = 105, + sha512256d = 106, + skydoge = 107, + verthash = 108, + verushash = 109, + x16rt = 110, + x16rv2 = 111, + x21s = 112, + x25x = 113, + yespowerltncg = 114, + yespowermgpc = 115, + yespowerr16 = 116, + yespowersugar = 117, + yespowertide = 118, + yespowerurx = 119, } } diff --git a/zPoolMiner/Miners/AMD/lolminerAmd.cs b/zPoolMiner/Miners/AMD/lolminerAmd.cs index df339ac..389d79d 100644 --- a/zPoolMiner/Miners/AMD/lolminerAmd.cs +++ b/zPoolMiner/Miners/AMD/lolminerAmd.cs @@ -15,6 +15,7 @@ using zPoolMiner.Enums; using zPoolMiner.Miners; using zPoolMiner.Miners.Grouping; +using zPoolMiner.Miners.Parsing; namespace NiceHashMiner.Miners { @@ -159,13 +160,21 @@ public override void Start(string url, string btcAddress, string worker) } string username = GetUsername(btcAddress, worker); if (MiningSetup.CurrentAlgorithmType == AlgorithmType.karlsenhash) - LastCommandLine = " --algo KARLSEN" + " --pool=" + url + " --user=" + username + " --pass " + worker + " --devices AMD --watchdog exit" + apiBind; + LastCommandLine = " --algo KARLSEN" + " --pool=" + url + " --user=" + username + " --pass " + worker + " --devices AMD --watchdog exit" + apiBind + " " + ExtraLaunchParametersParser.ParseForMiningSetup(MiningSetup, DeviceType.NVIDIA); if (MiningSetup.CurrentAlgorithmType == AlgorithmType.pyrinhash) - LastCommandLine = " --algo PYRIN" + " --pool=" + url + " --user=" + username + " --pass " + worker + " --devices AMD --watchdog exit" + apiBind; + LastCommandLine = " --algo PYRIN" + " --pool=" + url + " --user=" + username + " --pass " + worker + " --devices AMD --watchdog exit" + apiBind + " " + ExtraLaunchParametersParser.ParseForMiningSetup(MiningSetup, DeviceType.NVIDIA); if (MiningSetup.CurrentAlgorithmType == AlgorithmType.ethash) - LastCommandLine = " --algo ETHASH" + " --pool=" + "stratum+tcp://ethash.mine.zergpool.com:9999" + " --user=" + username + " --pass " + worker + " --devices AMD --watchdog exit" + apiBind; + LastCommandLine = " --algo ETHASH" + " --pool=" + "stratum+tcp://ethash.mine.zergpool.com:9999" + " --user=" + username + " --pass " + worker + " --devices AMD --watchdog exit" + apiBind + " " + ExtraLaunchParametersParser.ParseForMiningSetup(MiningSetup, DeviceType.NVIDIA); if (MiningSetup.CurrentAlgorithmType == AlgorithmType.ethashb3) - LastCommandLine = " --algo ETHASHB3" + " --pool=" + "stratum+tcp://ethash.mine.zergpool.com:9996" + " --user=" + username + " --pass " + worker + " --devices AMD --watchdog exit" + apiBind; + LastCommandLine = " --algo ETHASHB3" + " --pool=" + "stratum+tcp://ethashb3.mine.zergpool.com:9996" + " --user=" + username + " --pass " + worker + " --devices AMD --watchdog exit" + apiBind + " " + ExtraLaunchParametersParser.ParseForMiningSetup(MiningSetup, DeviceType.NVIDIA); + if (MiningSetup.CurrentAlgorithmType == AlgorithmType.nexapow) + LastCommandLine = " --algo NEXA" + " --pool=" + "stratum+tcp://nexapow.mine.zergpool.com:3004" + " --user=" + username + " --pass " + worker + " --devices AMD --watchdog exit" + apiBind + " " + ExtraLaunchParametersParser.ParseForMiningSetup(MiningSetup, DeviceType.NVIDIA); + if (MiningSetup.CurrentAlgorithmType == AlgorithmType.sha512256d) + LastCommandLine = " --algo RADIANT" + " --pool=" + "stratum+tcp://sha512256d.mine.zergpool.com:7086" + " --user=" + username + " --pass " + worker + " --devices AMD --watchdog exit" + apiBind + " " + ExtraLaunchParametersParser.ParseForMiningSetup(MiningSetup, DeviceType.NVIDIA); + if (MiningSetup.CurrentAlgorithmType == AlgorithmType.equihash144) + LastCommandLine = " --algo EQUI144_5 --pers auto" + " --pool=" + "stratum+tcp://equihash144.mine.zergpool.com:2146" + " --user=" + username + " --pass " + worker + " --devices AMD --watchdog exit" + apiBind + " " + ExtraLaunchParametersParser.ParseForMiningSetup(MiningSetup, DeviceType.NVIDIA); + if (MiningSetup.CurrentAlgorithmType == AlgorithmType.equihash192) + LastCommandLine = " --algo EQUI192_7 --pers auto" + " --pool=" + "stratum+tcp://equihash192.mine.zergpool.com:2144" + " --user=" + username + " --pass " + worker + " --devices AMD --watchdog exit" + apiBind + " " + ExtraLaunchParametersParser.ParseForMiningSetup(MiningSetup, DeviceType.NVIDIA); LastCommandLine += GetDevicesCommandString(); diff --git a/zPoolMiner/Miners/Nvidia/lolminerNvidia.cs b/zPoolMiner/Miners/Nvidia/lolminerNvidia.cs index 86d245f..715b04a 100644 --- a/zPoolMiner/Miners/Nvidia/lolminerNvidia.cs +++ b/zPoolMiner/Miners/Nvidia/lolminerNvidia.cs @@ -15,6 +15,7 @@ using zPoolMiner.Enums; using zPoolMiner.Miners; using zPoolMiner.Miners.Grouping; +using zPoolMiner.Miners.Parsing; namespace NiceHashMiner.Miners { @@ -159,13 +160,21 @@ public override void Start(string url, string btcAddress, string worker) } string username = GetUsername(btcAddress, worker); if (MiningSetup.CurrentAlgorithmType == AlgorithmType.karlsenhash) - LastCommandLine = " --algo KARLSEN" + " --pool=" + url + " --user=" + username + " --pass " + worker + " --devices NVIDIA --watchdog exit" + apiBind; + LastCommandLine = " --algo KARLSEN" + " --pool=" + url + " --user=" + username + " --pass " + worker + " --devices NVIDIA --watchdog exit" + apiBind + " " + ExtraLaunchParametersParser.ParseForMiningSetup(MiningSetup,DeviceType.NVIDIA); if (MiningSetup.CurrentAlgorithmType == AlgorithmType.pyrinhash) - LastCommandLine = " --algo PYRIN" + " --pool=" + url + " --user=" + username + " --pass " + worker + " --devices NVIDIA --watchdog exit" + apiBind; + LastCommandLine = " --algo PYRIN" + " --pool=" + url + " --user=" + username + " --pass " + worker + " --devices NVIDIA --watchdog exit" + apiBind + " " + ExtraLaunchParametersParser.ParseForMiningSetup(MiningSetup, DeviceType.NVIDIA); if (MiningSetup.CurrentAlgorithmType == AlgorithmType.ethash) - LastCommandLine = " --algo ETHASH" + " --pool=" + "stratum+tcp://ethash.mine.zergpool.com:9999" + " --user=" + username + " --pass " + worker + " --devices NVIDIA --watchdog exit" + apiBind; + LastCommandLine = " --algo ETHASH" + " --pool=" + "stratum+tcp://ethash.mine.zergpool.com:9999" + " --user=" + username + " --pass " + worker + " --devices NVIDIA --watchdog exit" + apiBind + " " + ExtraLaunchParametersParser.ParseForMiningSetup(MiningSetup, DeviceType.NVIDIA); if (MiningSetup.CurrentAlgorithmType == AlgorithmType.ethashb3) - LastCommandLine = " --algo ETHASHB3" + " --pool=" + "stratum+tcp://ethash.mine.zergpool.com:9996" + " --user=" + username + " --pass " + worker + " --devices NVIDIA --watchdog exit" + apiBind; + LastCommandLine = " --algo ETHASHB3" + " --pool=" + "stratum+tcp://ethashb3.mine.zergpool.com:9996" + " --user=" + username + " --pass " + worker + " --devices NVIDIA --watchdog exit" + apiBind + " " + ExtraLaunchParametersParser.ParseForMiningSetup(MiningSetup, DeviceType.NVIDIA); + if (MiningSetup.CurrentAlgorithmType == AlgorithmType.nexapow) + LastCommandLine = " --algo NEXA" + " --pool=" + "stratum+tcp://nexapow.mine.zergpool.com:3004" + " --user=" + username + " --pass " + worker + " --devices NVIDIA --watchdog exit" + apiBind + " " + ExtraLaunchParametersParser.ParseForMiningSetup(MiningSetup, DeviceType.NVIDIA); + if (MiningSetup.CurrentAlgorithmType == AlgorithmType.sha512256d) + LastCommandLine = " --algo RADIANT" + " --pool=" + "stratum+tcp://sha512256d.mine.zergpool.com:7086" + " --user=" + username + " --pass " + worker + " --devices NVIDIA --watchdog exit" + apiBind + " " + ExtraLaunchParametersParser.ParseForMiningSetup(MiningSetup, DeviceType.NVIDIA); + if (MiningSetup.CurrentAlgorithmType == AlgorithmType.equihash144) + LastCommandLine = " --algo EQUI144_5 --pers auto" + " --pool=" + "stratum+tcp://equihash144.mine.zergpool.com:2146" + " --user=" + username + " --pass " + worker + " --devices NVIDIA --watchdog exit" + apiBind + " " + ExtraLaunchParametersParser.ParseForMiningSetup(MiningSetup, DeviceType.NVIDIA); + if (MiningSetup.CurrentAlgorithmType == AlgorithmType.equihash192) + LastCommandLine = " --algo EQUI192_7 --pers auto" + " --pool=" + "stratum+tcp://equihash192.mine.zergpool.com:2144" + " --user=" + username + " --pass " + worker + " --devices NVIDIA --watchdog exit" + apiBind + " " + ExtraLaunchParametersParser.ParseForMiningSetup(MiningSetup, DeviceType.NVIDIA); LastCommandLine += GetDevicesCommandString(); @@ -187,14 +196,14 @@ protected override string BenchmarkCreateCommandLine(Algorithm algorithm, int ti if (ConfigManager.GeneralConfig.WorkerName.Length > 0) username += ":" + ConfigManager.GeneralConfig.WorkerName.Trim(); if (MiningSetup.CurrentAlgorithmType == AlgorithmType.karlsenhash) - CommandLine = "--algo KARLSEN --pool " + url + " --user " + "DE8BDPdYu9LadwV4z4KamDqni43BUhGb66 --pass Benchmark " + "--devices NVIDIA --watchdog exit --apihost 127.0.0.1 --apiport " + ApiPort + " --shortstats 120"; + CommandLine = "--algo KARLSEN --pool " + url + " --user " + "DE8BDPdYu9LadwV4z4KamDqni43BUhGb66 --pass Benchmark " + "--devices NVIDIA --watchdog exit --apihost 127.0.0.1 --apiport " + ApiPort + " --shortstats 120" + " " + ExtraLaunchParametersParser.ParseForMiningSetup(MiningSetup, DeviceType.NVIDIA); if (MiningSetup.CurrentAlgorithmType == AlgorithmType.pyrinhash) - CommandLine = "--algo PYRIN --pool " + url + " --user " + "DE8BDPdYu9LadwV4z4KamDqni43BUhGb66 --pass Benchmark " + "--devices NVIDIA --watchdog exit --apihost 127.0.0.1 --apiport " + ApiPort + " --shortstats 120"; + CommandLine = "--algo PYRIN --pool " + url + " --user " + "DE8BDPdYu9LadwV4z4KamDqni43BUhGb66 --pass Benchmark " + "--devices NVIDIA --watchdog exit --apihost 127.0.0.1 --apiport " + ApiPort + " --shortstats 120" + " " + ExtraLaunchParametersParser.ParseForMiningSetup(MiningSetup, DeviceType.NVIDIA); if (MiningSetup.CurrentAlgorithmType == AlgorithmType.ethash) - CommandLine = "--algo ETHASH --pool " + "stratum+tcp://ethash.mine.zergpool.com:9999" + " --user " + "DE8BDPdYu9LadwV4z4KamDqni43BUhGb66 --pass Benchmark " + "--devices NVIDIA --watchdog exit --apihost 127.0.0.1 --apiport " + ApiPort + " --shortstats 120"; + CommandLine = "--algo ETHASH --pool " + "stratum+tcp://ethash.mine.zergpool.com:9999" + " --user " + "DE8BDPdYu9LadwV4z4KamDqni43BUhGb66 --pass Benchmark " + "--devices NVIDIA --watchdog exit --apihost 127.0.0.1 --apiport " + ApiPort + " --shortstats 120" + " " + ExtraLaunchParametersParser.ParseForMiningSetup(MiningSetup, DeviceType.NVIDIA); if (MiningSetup.CurrentAlgorithmType == AlgorithmType.ethashb3) - CommandLine = "--algo ETHASHB3 --pool " + "stratum+tcp://ethash.mine.zergpool.com:9996" + " --user " + "DE8BDPdYu9LadwV4z4KamDqni43BUhGb66 --pass Benchmark " + "--devices NVIDIA --watchdog exit --apihost 127.0.0.1 --apiport " + ApiPort + " --shortstats 120"; + CommandLine = "--algo ETHASHB3 --pool " + "stratum+tcp://ethash.mine.zergpool.com:9996" + " --user " + "DE8BDPdYu9LadwV4z4KamDqni43BUhGb66 --pass Benchmark " + "--devices NVIDIA --watchdog exit --apihost 127.0.0.1 --apiport " + ApiPort + " --shortstats 120" + " " + ExtraLaunchParametersParser.ParseForMiningSetup(MiningSetup, DeviceType.NVIDIA); CommandLine += GetDevicesCommandString(); //amd карты перечисляются первыми diff --git a/zPoolMiner/Utils/AlgorithmCryptoMiner937Names.cs b/zPoolMiner/Utils/AlgorithmCryptoMiner937Names.cs index 614ed41..2a27b2e 100644 --- a/zPoolMiner/Utils/AlgorithmCryptoMiner937Names.cs +++ b/zPoolMiner/Utils/AlgorithmCryptoMiner937Names.cs @@ -74,8 +74,44 @@ public static string GetName(AlgorithmType type) || (AlgorithmType.ethash <= type && type <= AlgorithmType.ethash) || (AlgorithmType.ethashb3 <= type && type <= AlgorithmType.ethashb3) || (AlgorithmType.kawpow <= type && type <= AlgorithmType.kawpow) - - ) + || (AlgorithmType.aurum <= type && type <= AlgorithmType.aurum) + || (AlgorithmType.bmw512 <= type && type <= AlgorithmType.bmw512) + || (AlgorithmType.curvehash <= type && type <= AlgorithmType.curvehash) + || (AlgorithmType.evrprogpow <= type && type <= AlgorithmType.evrprogpow) + || (AlgorithmType.firopow <= type && type <= AlgorithmType.firopow) + || (AlgorithmType.frkhash <= type && type <= AlgorithmType.frkhash) + || (AlgorithmType.ghostrider <= type && type <= AlgorithmType.ghostrider) + || (AlgorithmType.heavyhash <= type && type <= AlgorithmType.heavyhash) + || (AlgorithmType.karlsenhashnxl <= type && type <= AlgorithmType.karlsenhashnxl) + || (AlgorithmType.kheavyhash <= type && type <= AlgorithmType.kheavyhash) + || (AlgorithmType.megabtx <= type && type <= AlgorithmType.megabtx) + || (AlgorithmType.memehash <= type && type <= AlgorithmType.memehash) + || (AlgorithmType.meowpow <= type && type <= AlgorithmType.meowpow) + || (AlgorithmType.mike <= type && type <= AlgorithmType.mike) + || (AlgorithmType.minotaurx <= type && type <= AlgorithmType.minotaurx) + || (AlgorithmType.neoscryptxaya <= type && type <= AlgorithmType.neoscryptxaya) + || (AlgorithmType.nexapow <= type && type <= AlgorithmType.nexapow) + || (AlgorithmType.odocrypt <= type && type <= AlgorithmType.odocrypt) + || (AlgorithmType.panthera <= type && type <= AlgorithmType.panthera) + || (AlgorithmType.randomarq <= type && type <= AlgorithmType.randomarq) + || (AlgorithmType.sha256csm <= type && type <= AlgorithmType.sha256csm) + || (AlgorithmType.sha256dt <= type && type <= AlgorithmType.sha256dt) + || (AlgorithmType.sha3d <= type && type <= AlgorithmType.sha3d) + || (AlgorithmType.sha512256d <= type && type <= AlgorithmType.sha512256d) + || (AlgorithmType.skydoge <= type && type <= AlgorithmType.skydoge) + || (AlgorithmType.verthash <= type && type <= AlgorithmType.verthash) + || (AlgorithmType.verushash <= type && type <= AlgorithmType.verushash) + || (AlgorithmType.x16rt <= type && type <= AlgorithmType.x16rt) + || (AlgorithmType.x16rv2 <= type && type <= AlgorithmType.x16rv2) + || (AlgorithmType.x21s <= type && type <= AlgorithmType.x21s) + || (AlgorithmType.x25x <= type && type <= AlgorithmType.x25x) + || (AlgorithmType.yespowerltncg <= type && type <= AlgorithmType.yespowerltncg) + || (AlgorithmType.yespowermgpc <= type && type <= AlgorithmType.yespowermgpc) + || (AlgorithmType.yespowerr16 <= type && type <= AlgorithmType.yespowerr16) + || (AlgorithmType.yespowersugar <= type && type <= AlgorithmType.yespowersugar) + || (AlgorithmType.yespowertide <= type && type <= AlgorithmType.yespowertide) + || (AlgorithmType.yespowerurx <= type && type <= AlgorithmType.yespowerurx) + || (AlgorithmType.kawpow <= type && type <= AlgorithmType.kawpow)) { return Enum.GetName(typeof(AlgorithmType), type); }