Merge pull request #58 from BitPoolMining/Dev

Release 1.0.1.28
BitPoolMining · Jun 7, 2019 · 2a2280c · 2a2280c
2 parents a9d77e5 + f3c2244
commit 2a2280c
Show file tree

Hide file tree

Showing 325 changed files with 845 additions and 9,665 deletions.
diff --git a/BitPoolMiner/BitPoolMiner.csproj b/BitPoolMiner/BitPoolMiner.csproj
diff --git a/BitPoolMiner/Enums/AlgorithmType.cs b/BitPoolMiner/Enums/AlgorithmType.cs
@@ -6,6 +6,7 @@ public enum AlgorithmType
         Equihash,
         Lyra2REv2,
         EthHash,
-        x16R
+        x16R,
+        CryptoNightR
     }
 }
diff --git a/BitPoolMiner/Enums/CoinType.cs b/BitPoolMiner/Enums/CoinType.cs
@@ -9,18 +9,9 @@ public enum CoinType
     {
         UNDEFINED,
         VTC,
-        //MONA,
-        //HUSH,
-        //KMD,
-        //EXP,
-        //ETH,
         ETC,
-        //BTCP,
-        //BTG,
-        //ZEN,
-        //ZCL,
-        RVN
-        //SUQA,        
+        RVN,
+        XMR
     }
 
     public static class CoinLogos
@@ -30,19 +21,10 @@ public static class CoinLogos
         /// </summary>
         public static readonly Dictionary<CoinType, string> CoinLogoDictionary = new Dictionary<CoinType, string>
         {
-            //{ CoinType.HUSH, @"Resources\\Images\\hush.png" },
-            //{ CoinType.KMD, @"Resources\\Images\\kmd.png" },
             { CoinType.VTC, @"Resources\\Images\\vtc.png" },
-            //{ CoinType.MONA, @"Resources\\Images\\mona.png" },
-            //{ CoinType.EXP, @"Resources\\Images\\exp.png" },
-            //{ CoinType.ETH, @"Resources\\Images\\eth.png" },
             { CoinType.ETC, @"Resources\\Images\\etc.png" },
-            //{ CoinType.BTG, @"Resources\\Images\\btg.png" },
-            //{ CoinType.BTCP, @"Resources\\Images\\btcp.png" },
-            //{ CoinType.ZEN, @"Resources\\Images\\zencash.png" },
-            //{ CoinType.ZCL, @"Resources\\Images\\zcl.png" },
             { CoinType.RVN, @"Resources\\Images\\rvn.png" },
-            //{ CoinType.SUQA, @"Resources\\Images\\suqa.png" },
+            { CoinType.XMR, @"Resources\\Images\\xmr.png" },
         };
     }
 
@@ -53,19 +35,10 @@ public static class CoinNames
         /// </summary>
         public static readonly Dictionary<CoinType, string> CoinNameDictionary = new Dictionary<CoinType, string>
         {
-            //{ CoinType.HUSH, "HUSH" },
-            //{ CoinType.KMD, "KOMODO" },
             { CoinType.VTC, "VERTCOIN" },
-            //{ CoinType.MONA, "MONACOIN" },
-            //{ CoinType.EXP, "EXPANSE" },
-            //{ CoinType.ETH, "ETHEREUM" },
             { CoinType.ETC, "ETHEREUM CLASSIC" },
-            //{ CoinType.BTG, "BITCOIN GOLD" },
-            //{ CoinType.BTCP, "BITCOIN PRIVATE" },
-            //{ CoinType.ZEN, "ZENCASH" },
-            //{ CoinType.ZCL, "ZCLASSIC" },
             { CoinType.RVN, "RAVENCOIN" },
-            //{ CoinType.SUQA, "SUQA" },
+            { CoinType.XMR, "MONERO" },
         };
      }
 
@@ -76,19 +49,10 @@ public static class CoinWhatToMineIDDictionary
         /// </summary>
         public static readonly Dictionary<CoinType, int> CoinWhatToMineID = new Dictionary<CoinType, int>
         {
-            //{ CoinType.HUSH, 168 },
-            //{ CoinType.KMD, 174 },
             { CoinType.VTC, 5 },
-            //{ CoinType.MONA, 148 },
-            //{ CoinType.EXP, 154 },
-            //{ CoinType.ETH, 151 },
             { CoinType.ETC, 162 },
-            //{ CoinType.BTG, 214 },
-            //{ CoinType.BTCP, 230 },
-            //{ CoinType.ZEN, 185 },
-            //{ CoinType.ZCL, 167 },
             { CoinType.RVN, 234 },
-            //{ CoinType.SUQA, 277 },
+            { CoinType.XMR, 101 },
         };
     }
 
@@ -111,7 +75,7 @@ public static class CoinPaymentChartColor
             //{ CoinType.ZEN, "#68fee0" },
             //{ CoinType.ZCL, "#a072fc" },
             { CoinType.RVN, "#68fee0" },
-            //{ CoinType.SUQA, "#35bda8" },
+            { CoinType.XMR, "#35bda8" },
         };
     }
 }
diff --git a/BitPoolMiner/Enums/HardwareType.cs b/BitPoolMiner/Enums/HardwareType.cs
@@ -4,6 +4,7 @@ public enum HardwareType
     {
         UNDEFINED,
         AMD,
-        Nvidia
+        Nvidia,
+        CPU
     }
 }
diff --git a/BitPoolMiner/Enums/MinerBaseType.cs b/BitPoolMiner/Enums/MinerBaseType.cs
@@ -8,6 +8,9 @@ public enum MinerBaseType
         LyclMiner,
         TRex,
         WildRig,
-        CryptoDredge
+        CryptoDredge,
+        XMRig,
+        XMRigNvidia,
+        XMRigAMD
     }
 }
diff --git a/BitPoolMiner/MinerApps/xmrig-2.14.4/config.json b/BitPoolMiner/MinerApps/xmrig-2.14.4/config.json
@@ -0,0 +1,43 @@
+{
+    "algo": "cryptonight",
+    "api": {
+        "port": 0,
+        "access-token": null,
+        "id": null,
+        "worker-id": null,
+        "ipv6": false,
+        "restricted": true
+    },
+    "asm": true,
+    "autosave": true,
+    "av": 0,
+    "background": false,
+    "colors": true,
+    "cpu-affinity": null,
+    "cpu-priority": null,
+    "donate-level": 5,
+    "huge-pages": true,
+    "hw-aes": null,
+    "log-file": null,
+    "max-cpu-usage": 100,
+    "pools": [
+        {
+            "url": "donate.v2.xmrig.com:3333",
+            "user": "YOUR_WALLET_ADDRESS",
+            "pass": "x",
+            "rig-id": null,
+            "nicehash": false,
+            "keepalive": false,
+            "variant": -1,
+            "tls": false,
+            "tls-fingerprint": null
+        }
+    ],
+    "print-time": 60,
+    "retries": 5,
+    "retry-pause": 5,
+    "safe": false,
+    "threads": null,
+    "user-agent": null,
+    "watch": true
+}
diff --git a/BitPoolMiner/MinerApps/xmrig-2.14.4/start.cmd b/BitPoolMiner/MinerApps/xmrig-2.14.4/start.cmd
@@ -0,0 +1,3 @@
+@echo off
+xmrig.exe
+pause
diff --git a/BitPoolMiner/MinerApps/xmrig-2.14.4/xmrig-notls.exe b/BitPoolMiner/MinerApps/xmrig-2.14.4/xmrig-notls.exe
diff --git a/BitPoolMiner/MinerApps/xmrig-2.14.4/xmrig.exe b/BitPoolMiner/MinerApps/xmrig-2.14.4/xmrig.exe
diff --git a/BitPoolMiner/MinerApps/xmrig-amd-2.14.4/config.json b/BitPoolMiner/MinerApps/xmrig-amd-2.14.4/config.json
@@ -0,0 +1,39 @@
+{
+    "algo": "cryptonight",
+    "api": {
+        "port": 0,
+        "access-token": null,
+        "id": null,
+        "worker-id": null,
+        "ipv6": false,
+        "restricted": true
+    },
+    "autosave": true,
+    "background": false,
+    "cache": true,
+    "colors": true,
+    "donate-level": 5,
+    "log-file": null,
+    "opencl-platform": "AMD",
+    "pools": [
+        {
+            "url": "donate.v2.xmrig.com:3333",
+            "user": "YOUR_WALLET_ADDRESS",
+            "pass": "x",
+            "rig-id": null,
+            "nicehash": false,
+            "keepalive": false,
+            "variant": -1,
+            "enabled": true,
+            "tls": false,
+            "tls-fingerprint": null
+        }
+    ],
+    "print-time": 60,
+    "retries": 5,
+    "retry-pause": 5,
+    "threads": null,
+    "user-agent": null,
+    "syslog": false,
+    "watch": true
+}
diff --git a/BitPoolMiner/MinerApps/xmrig-amd-2.14.4/start.cmd b/BitPoolMiner/MinerApps/xmrig-amd-2.14.4/start.cmd
@@ -0,0 +1,3 @@
+@echo off
+xmrig-amd.exe
+pause
diff --git a/BitPoolMiner/MinerApps/xmrig-amd-2.14.4/xmrig-amd-notls.exe b/BitPoolMiner/MinerApps/xmrig-amd-2.14.4/xmrig-amd-notls.exe
diff --git a/BitPoolMiner/MinerApps/xmrig-amd-2.14.4/xmrig-amd.exe b/BitPoolMiner/MinerApps/xmrig-amd-2.14.4/xmrig-amd.exe
diff --git a/BitPoolMiner/MinerApps/xmrig-nvidia-2.14.4/config.json b/BitPoolMiner/MinerApps/xmrig-nvidia-2.14.4/config.json
@@ -0,0 +1,39 @@
+{
+    "algo": "cryptonight",
+    "api": {
+        "port": 0,
+        "access-token": null,
+        "id": null,
+        "worker-id": null,
+        "ipv6": false,
+        "restricted": true
+    },
+    "background": false,
+    "colors": true,
+    "cuda-bfactor": null,
+    "cuda-bsleep": null,
+    "cuda-max-threads": 64,
+    "donate-level": 5,
+    "log-file": null,
+    "pools": [
+        {
+            "url": "donate.v2.xmrig.com:3333",
+            "user": "YOUR_WALLET",
+            "pass": "x",
+            "rig-id": null,
+            "nicehash": false,
+            "keepalive": true,
+            "variant": -1,
+            "enabled": true,
+            "tls": false,
+            "tls-fingerprint": null
+        }
+    ],
+    "print-time": 60,
+    "retries": 5,
+    "retry-pause": 5,
+    "threads": null,
+    "user-agent": null,
+    "syslog": false,
+    "watch": true
+}
diff --git a/BitPoolMiner/MinerApps/xmrig-nvidia-2.14.4/nvrtc-builtins64_100.dll b/BitPoolMiner/MinerApps/xmrig-nvidia-2.14.4/nvrtc-builtins64_100.dll
diff --git a/...er-x64-2.2.4-cuda9/ccminer-x64.exe.deploy → ...pps/xmrig-nvidia-2.14.4/nvrtc64_100_0.dll b/...er-x64-2.2.4-cuda9/ccminer-x64.exe.deploy → ...pps/xmrig-nvidia-2.14.4/nvrtc64_100_0.dll
diff --git a/BitPoolMiner/MinerApps/xmrig-nvidia-2.14.4/start.cmd b/BitPoolMiner/MinerApps/xmrig-nvidia-2.14.4/start.cmd
@@ -0,0 +1,3 @@
+@echo off
+xmrig-nvidia.exe
+pause
diff --git a/BitPoolMiner/MinerApps/xmrig-nvidia-2.14.4/xmrig-nvidia.exe b/BitPoolMiner/MinerApps/xmrig-nvidia-2.14.4/xmrig-nvidia.exe
diff --git a/BitPoolMiner/Miners/MinerFactory.cs b/BitPoolMiner/Miners/MinerFactory.cs
@@ -35,6 +35,9 @@ public static Miner CreateMiner(MinerBaseType minerBaseType, HardwareType hardwa
                 case MinerBaseType.LyclMiner:
                     return new LyclMiner(hardwareType, minerBaseType, is64Bit);
 
+                case MinerBaseType.XMRig:
+                    return new XMRig(hardwareType, minerBaseType);
+
                 default:
                     throw new ApplicationException(string.Format("The miner base type {0} is not yet supported.", minerBaseType.ToString()));
             }
-Original file line number
+Diff line change
@@ Expand Up / @@ -4,6 +4,7 @@ public enum HardwareType @@
         {
             UNDEFINED,
             AMD,
-            Nvidia
+            Nvidia,
+            CPU
         }
     }