Skip to content

Commit ae3e505

Browse files
saltyminersaltyminer
authored
Merge pull request #20 from BitPoolMining/Dev
AMD Support for Claymore and EXP
2 parents bd46856 + f10e5cc commit ae3e505

File tree

123 files changed

+3132
-303
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

123 files changed

+3132
-303
lines changed

‎BitPoolMiner/App.xaml.cs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,6 @@ public partial class App : Application
1010
{
1111
private static NLog.Logger logger = NLog.LogManager.GetCurrentClassLogger();
1212

13-
1413
protected override void OnStartup(StartupEventArgs e)
1514
{
1615
SetupLogging();

‎BitPoolMiner/BitPoolMiner.csproj

Lines changed: 185 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@
3434
<ProductName>BitPoolMiner</ProductName>
3535
<PublisherName>BitPoolMining</PublisherName>
3636
<SuiteName>BitPoolMining</SuiteName>
37-
<ApplicationRevision>15</ApplicationRevision>
37+
<ApplicationRevision>16</ApplicationRevision>
3838
<ApplicationVersion>1.0.0.%2a</ApplicationVersion>
3939
<UseApplicationTrust>false</UseApplicationTrust>
4040
<CreateDesktopShortcut>true</CreateDesktopShortcut>
@@ -157,6 +157,7 @@
157157
<Compile Include="Formatter\WhatToMineDataFormatter.cs" />
158158
<Compile Include="Formatter\MinerMonitorStatsFormatter.cs" />
159159
<Compile Include="Miners\Ccminer.cs" />
160+
<Compile Include="Miners\Claymore.cs" />
160161
<Compile Include="Miners\DSTM.cs" />
161162
<Compile Include="Miners\EWBF.cs" />
162163
<Compile Include="Miners\Miner.cs" />
@@ -177,6 +178,7 @@
177178
<Compile Include="Models\MinerPayments\MinerPaymentsGroupedByDay.cs" />
178179
<Compile Include="Models\MinerPayments\MinerPaymentSummary.cs" />
179180
<Compile Include="Models\Profitability\ProfitabilityData.cs" />
181+
<Compile Include="Models\RPCResponse\ClaymoreTemplate.cs" />
180182
<Compile Include="Models\RPCResponse\DSTMTemplate.cs" />
181183
<Compile Include="Models\RPCResponse\EWBFTemplate.cs" />
182184
<Compile Include="Models\WhatToMine\WhatToMineResponse.cs" />
@@ -198,6 +200,7 @@
198200
<Compile Include="Utils\ChartUtils\PaymentChartDataBackFill.cs" />
199201
<Compile Include="Utils\ChartUtils\WorkerChartDataBackFill.cs" />
200202
<Compile Include="Utils\CoinMarketCap\CoinMarketCapAPI.cs" />
203+
<Compile Include="Utils\CommandConverter\Converter.cs" />
201204
<Compile Include="Utils\Core.cs" />
202205
<Compile Include="Utils\CryptoCompare\CryptoCompareAPI.cs" />
203206
<Compile Include="Utils\HashrateFormatter.cs" />
@@ -290,6 +293,94 @@
290293
<SubType>Designer</SubType>
291294
</EmbeddedResource>
292295
<None Include="BitPoolMiner_TemporaryKey.pfx" />
296+
<None Include="MinerApps\Claymore\Data.bin">
297+
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
298+
</None>
299+
<None Include="MinerApps\Claymore\Data1a1.bin">
300+
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
301+
</None>
302+
<None Include="MinerApps\Claymore\Data1a1.bin2">
303+
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
304+
</None>
305+
<None Include="MinerApps\Claymore\Data1b1.bin">
306+
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
307+
</None>
308+
<None Include="MinerApps\Claymore\Data1b1.bin2">
309+
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
310+
</None>
311+
<None Include="MinerApps\Claymore\Data1c1.bin">
312+
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
313+
</None>
314+
<None Include="MinerApps\Claymore\Data1c1.bin2">
315+
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
316+
</None>
317+
<None Include="MinerApps\Claymore\Data1c2.bin">
318+
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
319+
</None>
320+
<None Include="MinerApps\Claymore\Data1c2.bin2">
321+
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
322+
</None>
323+
<None Include="MinerApps\Claymore\Data1d1.bin">
324+
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
325+
</None>
326+
<None Include="MinerApps\Claymore\Data1d1.bin2">
327+
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
328+
</None>
329+
<None Include="MinerApps\Claymore\Data1e1.bin">
330+
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
331+
</None>
332+
<None Include="MinerApps\Claymore\Data1e1.bin2">
333+
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
334+
</None>
335+
<None Include="MinerApps\Claymore\Data1e2.bin">
336+
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
337+
</None>
338+
<None Include="MinerApps\Claymore\Data1e2.bin2">
339+
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
340+
</None>
341+
<None Include="MinerApps\Claymore\Data1g1.bin">
342+
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
343+
</None>
344+
<None Include="MinerApps\Claymore\Data1g1.bin2">
345+
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
346+
</None>
347+
<None Include="MinerApps\Claymore\Data1g2.bin">
348+
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
349+
</None>
350+
<None Include="MinerApps\Claymore\Data1g2.bin2">
351+
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
352+
</None>
353+
<None Include="MinerApps\Claymore\Data1h1.bin">
354+
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
355+
</None>
356+
<None Include="MinerApps\Claymore\Data1h1.bin2">
357+
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
358+
</None>
359+
<None Include="MinerApps\Claymore\Data1h2.bin">
360+
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
361+
</None>
362+
<None Include="MinerApps\Claymore\Data1h2.bin2">
363+
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
364+
</None>
365+
<None Include="MinerApps\Claymore\Data1i1.bin">
366+
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
367+
</None>
368+
<None Include="MinerApps\Claymore\Data1i1.bin2">
369+
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
370+
</None>
371+
<None Include="MinerApps\Claymore\Data1j1.bin">
372+
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
373+
</None>
374+
<None Include="MinerApps\Claymore\Data1j1.bin2">
375+
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
376+
</None>
377+
<None Include="MinerApps\Claymore\Remote manager\sample.bat" />
378+
<None Include="MinerApps\Claymore\start_eth+pasc.bat">
379+
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
380+
</None>
381+
<None Include="MinerApps\Claymore\start_only_eth.bat">
382+
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
383+
</None>
293384
<None Include="MinerApps\EWBF\miner.cfg">
294385
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
295386
</None>
@@ -302,6 +393,53 @@
302393
<Resource Include="MinerApps\DSTM\LICENSE.txt">
303394
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
304395
</Resource>
396+
<Resource Include="MinerApps\Claymore\config.txt">
397+
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
398+
</Resource>
399+
<Content Include="MinerApps\Claymore\cuda6.5\cudart64_65.dll">
400+
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
401+
</Content>
402+
<Content Include="MinerApps\Claymore\cuda7.5\cudart64_75.dll">
403+
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
404+
</Content>
405+
<Content Include="MinerApps\Claymore\cuda7.5\EthDcrMiner64.exe">
406+
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
407+
</Content>
408+
<Content Include="MinerApps\Claymore\cuda9.1\cudart64_91.dll">
409+
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
410+
</Content>
411+
<Content Include="MinerApps\Claymore\cudart64_80.dll">
412+
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
413+
</Content>
414+
<Resource Include="MinerApps\Claymore\dpools.txt">
415+
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
416+
</Resource>
417+
<Resource Include="MinerApps\Claymore\epools.txt">
418+
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
419+
</Resource>
420+
<Content Include="MinerApps\Claymore\EthDcrMiner64.exe">
421+
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
422+
</Content>
423+
<Resource Include="MinerApps\Claymore\History.txt">
424+
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
425+
</Resource>
426+
<Content Include="MinerApps\Claymore\libcurl.dll">
427+
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
428+
</Content>
429+
<Resource Include="MinerApps\Claymore\License.txt">
430+
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
431+
</Resource>
432+
<Content Include="MinerApps\Claymore\msvcr110.dll">
433+
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
434+
</Content>
435+
<Resource Include="MinerApps\Claymore\Readme!!!.txt">
436+
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
437+
</Resource>
438+
<Resource Include="MinerApps\Claymore\Remote manager\API.txt" />
439+
<Content Include="MinerApps\Claymore\Remote manager\EthMan.exe" />
440+
<Content Include="MinerApps\Claymore\Remote manager\libeay32.dll" />
441+
<Resource Include="MinerApps\Claymore\Remote manager\readme.txt" />
442+
<Content Include="MinerApps\Claymore\Remote manager\ssleay32.dll" />
305443
<Content Include="MinerApps\DSTM\pthreadVC2.dll">
306444
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
307445
</Content>
@@ -520,6 +658,52 @@
520658
<None Include="publish\Application Files\BitPoolMiner_1_0_0_14\ThinkSharp.FeatureTour.dll.deploy" />
521659
<None Include="publish\Application Files\BitPoolMiner_1_0_0_14\ToastNotifications.dll.deploy" />
522660
<None Include="publish\Application Files\BitPoolMiner_1_0_0_14\ToastNotifications.Messages.dll.deploy" />
661+
<None Include="publish\Application Files\BitPoolMiner_1_0_0_15\bitpool.ico.deploy" />
662+
<None Include="publish\Application Files\BitPoolMiner_1_0_0_15\BitPoolMiner.application" />
663+
<None Include="publish\Application Files\BitPoolMiner_1_0_0_15\BitPoolMiner.exe.config.deploy" />
664+
<None Include="publish\Application Files\BitPoolMiner_1_0_0_15\BitPoolMiner.exe.deploy" />
665+
<None Include="publish\Application Files\BitPoolMiner_1_0_0_15\BitPoolMiner.exe.manifest" />
666+
<None Include="publish\Application Files\BitPoolMiner_1_0_0_15\LiveCharts.dll.deploy" />
667+
<None Include="publish\Application Files\BitPoolMiner_1_0_0_15\LiveCharts.Wpf.dll.deploy" />
668+
<None Include="publish\Application Files\BitPoolMiner_1_0_0_15\Microsoft.Expression.Interactions.dll.deploy" />
669+
<None Include="publish\Application Files\BitPoolMiner_1_0_0_15\MinerApps\ccminer-x64-2.2.4-cuda9\ccminer-x64.exe.deploy" />
670+
<None Include="publish\Application Files\BitPoolMiner_1_0_0_15\MinerApps\ccminer-x64-2.2.4-cuda9\msvcr120.dll.deploy" />
671+
<None Include="publish\Application Files\BitPoolMiner_1_0_0_15\MinerApps\ccminer-x86-2.2.4-cuda9\ccminer.exe.deploy" />
672+
<None Include="publish\Application Files\BitPoolMiner_1_0_0_15\MinerApps\ccminer-x86-2.2.4-cuda9\msvcr120.dll.deploy" />
673+
<None Include="publish\Application Files\BitPoolMiner_1_0_0_15\MinerApps\Claymore\cuda6.5\cudart64_65.dll.deploy" />
674+
<None Include="publish\Application Files\BitPoolMiner_1_0_0_15\MinerApps\Claymore\cuda7.5\cudart64_75.dll.deploy" />
675+
<None Include="publish\Application Files\BitPoolMiner_1_0_0_15\MinerApps\Claymore\cuda7.5\EthDcrMiner64.exe.deploy" />
676+
<None Include="publish\Application Files\BitPoolMiner_1_0_0_15\MinerApps\Claymore\cuda9.1\cudart64_91.dll.deploy" />
677+
<None Include="publish\Application Files\BitPoolMiner_1_0_0_15\MinerApps\Claymore\cudart64_80.dll.deploy" />
678+
<None Include="publish\Application Files\BitPoolMiner_1_0_0_15\MinerApps\Claymore\EthDcrMiner64.exe.deploy" />
679+
<None Include="publish\Application Files\BitPoolMiner_1_0_0_15\MinerApps\Claymore\libcurl.dll.deploy" />
680+
<None Include="publish\Application Files\BitPoolMiner_1_0_0_15\MinerApps\Claymore\msvcr110.dll.deploy" />
681+
<None Include="publish\Application Files\BitPoolMiner_1_0_0_15\MinerApps\Claymore\Remote manager\EthMan.exe.deploy" />
682+
<None Include="publish\Application Files\BitPoolMiner_1_0_0_15\MinerApps\Claymore\Remote manager\libeay32.dll.deploy" />
683+
<None Include="publish\Application Files\BitPoolMiner_1_0_0_15\MinerApps\Claymore\Remote manager\ssleay32.dll.deploy" />
684+
<None Include="publish\Application Files\BitPoolMiner_1_0_0_15\MinerApps\DSTM\pthreadVC2.dll.deploy" />
685+
<None Include="publish\Application Files\BitPoolMiner_1_0_0_15\MinerApps\DSTM\vcruntime140.dll.deploy" />
686+
<None Include="publish\Application Files\BitPoolMiner_1_0_0_15\MinerApps\DSTM\zm.exe.deploy" />
687+
<None Include="publish\Application Files\BitPoolMiner_1_0_0_15\MinerApps\EWBF\cudart32_80.dll.deploy" />
688+
<None Include="publish\Application Files\BitPoolMiner_1_0_0_15\MinerApps\EWBF\cudart64_80.dll.deploy" />
689+
<None Include="publish\Application Files\BitPoolMiner_1_0_0_15\MinerApps\EWBF\miner.exe.deploy" />
690+
<None Include="publish\Application Files\BitPoolMiner_1_0_0_15\MinerApps\EWBF\msvcp120.dll.deploy" />
691+
<None Include="publish\Application Files\BitPoolMiner_1_0_0_15\MinerApps\EWBF\msvcr120.dll.deploy" />
692+
<None Include="publish\Application Files\BitPoolMiner_1_0_0_15\Newtonsoft.Json.dll.deploy" />
693+
<None Include="publish\Application Files\BitPoolMiner_1_0_0_15\NLog.config.deploy" />
694+
<None Include="publish\Application Files\BitPoolMiner_1_0_0_15\NLog.dll.deploy" />
695+
<None Include="publish\Application Files\BitPoolMiner_1_0_0_15\OpenHardwareMonitorLib.dll.deploy" />
696+
<None Include="publish\Application Files\BitPoolMiner_1_0_0_15\publish\setup.exe.deploy" />
697+
<None Include="publish\Application Files\BitPoolMiner_1_0_0_15\Resources\Images\bitpool.png.deploy" />
698+
<None Include="publish\Application Files\BitPoolMiner_1_0_0_15\Resources\Images\exp.png.deploy" />
699+
<None Include="publish\Application Files\BitPoolMiner_1_0_0_15\Resources\Images\hush.png.deploy" />
700+
<None Include="publish\Application Files\BitPoolMiner_1_0_0_15\Resources\Images\kmd.png.deploy" />
701+
<None Include="publish\Application Files\BitPoolMiner_1_0_0_15\Resources\Images\mona.png.deploy" />
702+
<None Include="publish\Application Files\BitPoolMiner_1_0_0_15\Resources\Images\vtc.png.deploy" />
703+
<None Include="publish\Application Files\BitPoolMiner_1_0_0_15\System.Windows.Interactivity.dll.deploy" />
704+
<None Include="publish\Application Files\BitPoolMiner_1_0_0_15\ThinkSharp.FeatureTour.dll.deploy" />
705+
<None Include="publish\Application Files\BitPoolMiner_1_0_0_15\ToastNotifications.dll.deploy" />
706+
<None Include="publish\Application Files\BitPoolMiner_1_0_0_15\ToastNotifications.Messages.dll.deploy" />
523707
<None Include="publish\Application Files\BitPoolMiner_1_0_0_1\bin\Debug\miners\ccminer-x64-2.2.4-cuda9\ccminer-x64.exe.deploy" />
524708
<None Include="publish\Application Files\BitPoolMiner_1_0_0_1\bin\Debug\miners\ccminer-x64-2.2.4-cuda9\msvcr120.dll.deploy" />
525709
<None Include="publish\Application Files\BitPoolMiner_1_0_0_1\bin\Debug\miners\ccminer-x86-2.2.4-cuda9\ccminer.exe.deploy" />

‎BitPoolMiner/Enums/CoinType.cs

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
using System.Collections.Generic;
2+
using System.ComponentModel;
23

34
namespace BitPoolMiner.Enums
45
{
@@ -7,11 +8,17 @@ namespace BitPoolMiner.Enums
78
/// </summary>
89
public enum CoinType
910
{
11+
[Description("test")]
1012
UNDEFINED,
13+
[Description("VTC")]
1114
VTC,
15+
[Description("MONA")]
1216
MONA,
17+
[Description("HUSH")]
1318
HUSH,
19+
[Description("KMD")]
1420
KMD,
21+
[Description("EXP")]
1522
EXP
1623
}
1724

‎BitPoolMiner/Enums/MinerBaseType.cs

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@ public enum MinerBaseType
55
UNDEFINED,
66
CCMiner,
77
EWBF,
8-
DSTM
8+
DSTM,
9+
Claymore
910
}
1011
}

0 commit comments

Comments
 (0)