Skip to content

Commit 2a105d5

Browse files
saltyminersaltyminer
authored
Merge pull request #26 from BitPoolMining/Dev
New release to update Getting Started form
2 parents a455b8b + e1e0496 commit 2a105d5

File tree

94 files changed

+3419
-12
lines changed

Some content is hidden

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

94 files changed

+3419
-12
lines changed

‎BitPoolMiner/App.xaml.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ private void BitPoolMiner_DispatcherUnhandledException(object sender, System.Win
3333
{
3434
// Hotfix to prevent excessive errors
3535
// TODO - fix this shit
36-
if (e.Exception.Message == "Cannot set Owner property to a Window that has not been shown previously.")
36+
if (e.Exception.Message.ToLower() == "Cannot set Owner property to a Window that has not been shown previously.".ToLower())
3737
{
3838
e.Handled = true;
3939
return;

‎BitPoolMiner/BitPoolMiner.csproj

Lines changed: 89 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>19</ApplicationRevision>
37+
<ApplicationRevision>20</ApplicationRevision>
3838
<ApplicationVersion>1.0.0.%2a</ApplicationVersion>
3939
<UseApplicationTrust>false</UseApplicationTrust>
4040
<CreateDesktopShortcut>true</CreateDesktopShortcut>
@@ -981,6 +981,94 @@
981981
<None Include="publish\Application Files\BitPoolMiner_1_0_0_18\ThinkSharp.FeatureTour.dll.deploy" />
982982
<None Include="publish\Application Files\BitPoolMiner_1_0_0_18\ToastNotifications.dll.deploy" />
983983
<None Include="publish\Application Files\BitPoolMiner_1_0_0_18\ToastNotifications.Messages.dll.deploy" />
984+
<None Include="publish\Application Files\BitPoolMiner_1_0_0_19\bitpool.ico.deploy" />
985+
<None Include="publish\Application Files\BitPoolMiner_1_0_0_19\BitPoolMiner.application" />
986+
<None Include="publish\Application Files\BitPoolMiner_1_0_0_19\BitPoolMiner.exe.config.deploy" />
987+
<None Include="publish\Application Files\BitPoolMiner_1_0_0_19\BitPoolMiner.exe.deploy" />
988+
<None Include="publish\Application Files\BitPoolMiner_1_0_0_19\BitPoolMiner.exe.manifest" />
989+
<None Include="publish\Application Files\BitPoolMiner_1_0_0_19\LiveCharts.dll.deploy" />
990+
<None Include="publish\Application Files\BitPoolMiner_1_0_0_19\LiveCharts.Wpf.dll.deploy" />
991+
<None Include="publish\Application Files\BitPoolMiner_1_0_0_19\Microsoft.Expression.Interactions.dll.deploy" />
992+
<None Include="publish\Application Files\BitPoolMiner_1_0_0_19\MinerApps\ccminer-2.2-mod-r2\ccminer.exe.deploy" />
993+
<None Include="publish\Application Files\BitPoolMiner_1_0_0_19\MinerApps\ccminer-2.2-mod-r2\README.txt.deploy" />
994+
<None Include="publish\Application Files\BitPoolMiner_1_0_0_19\MinerApps\ccminer-2.2-mod-r2\vcruntime140.dll.deploy" />
995+
<None Include="publish\Application Files\BitPoolMiner_1_0_0_19\MinerApps\ccminer-x64-2.2.4-cuda9\ccminer-x64.exe.deploy" />
996+
<None Include="publish\Application Files\BitPoolMiner_1_0_0_19\MinerApps\ccminer-x64-2.2.4-cuda9\msvcr120.dll.deploy" />
997+
<None Include="publish\Application Files\BitPoolMiner_1_0_0_19\MinerApps\ccminer-x64-2.2.4-cuda9\README.txt.deploy" />
998+
<None Include="publish\Application Files\BitPoolMiner_1_0_0_19\MinerApps\ccminer-x86-2.2.4-cuda9\ccminer.exe.deploy" />
999+
<None Include="publish\Application Files\BitPoolMiner_1_0_0_19\MinerApps\ccminer-x86-2.2.4-cuda9\msvcr120.dll.deploy" />
1000+
<None Include="publish\Application Files\BitPoolMiner_1_0_0_19\MinerApps\Claymore\config.txt.deploy" />
1001+
<None Include="publish\Application Files\BitPoolMiner_1_0_0_19\MinerApps\Claymore\cuda6.5\cudart64_65.dll.deploy" />
1002+
<None Include="publish\Application Files\BitPoolMiner_1_0_0_19\MinerApps\Claymore\cuda7.5\cudart64_75.dll.deploy" />
1003+
<None Include="publish\Application Files\BitPoolMiner_1_0_0_19\MinerApps\Claymore\cuda7.5\EthDcrMiner64.exe.deploy" />
1004+
<None Include="publish\Application Files\BitPoolMiner_1_0_0_19\MinerApps\Claymore\cuda9.1\cudart64_91.dll.deploy" />
1005+
<None Include="publish\Application Files\BitPoolMiner_1_0_0_19\MinerApps\Claymore\cudart64_80.dll.deploy" />
1006+
<None Include="publish\Application Files\BitPoolMiner_1_0_0_19\MinerApps\Claymore\Data.bin.deploy" />
1007+
<None Include="publish\Application Files\BitPoolMiner_1_0_0_19\MinerApps\Claymore\Data1a1.bin.deploy" />
1008+
<None Include="publish\Application Files\BitPoolMiner_1_0_0_19\MinerApps\Claymore\Data1a1.bin2.deploy" />
1009+
<None Include="publish\Application Files\BitPoolMiner_1_0_0_19\MinerApps\Claymore\Data1b1.bin.deploy" />
1010+
<None Include="publish\Application Files\BitPoolMiner_1_0_0_19\MinerApps\Claymore\Data1b1.bin2.deploy" />
1011+
<None Include="publish\Application Files\BitPoolMiner_1_0_0_19\MinerApps\Claymore\Data1c1.bin.deploy" />
1012+
<None Include="publish\Application Files\BitPoolMiner_1_0_0_19\MinerApps\Claymore\Data1c1.bin2.deploy" />
1013+
<None Include="publish\Application Files\BitPoolMiner_1_0_0_19\MinerApps\Claymore\Data1c2.bin.deploy" />
1014+
<None Include="publish\Application Files\BitPoolMiner_1_0_0_19\MinerApps\Claymore\Data1c2.bin2.deploy" />
1015+
<None Include="publish\Application Files\BitPoolMiner_1_0_0_19\MinerApps\Claymore\Data1d1.bin.deploy" />
1016+
<None Include="publish\Application Files\BitPoolMiner_1_0_0_19\MinerApps\Claymore\Data1d1.bin2.deploy" />
1017+
<None Include="publish\Application Files\BitPoolMiner_1_0_0_19\MinerApps\Claymore\Data1e1.bin.deploy" />
1018+
<None Include="publish\Application Files\BitPoolMiner_1_0_0_19\MinerApps\Claymore\Data1e1.bin2.deploy" />
1019+
<None Include="publish\Application Files\BitPoolMiner_1_0_0_19\MinerApps\Claymore\Data1e2.bin.deploy" />
1020+
<None Include="publish\Application Files\BitPoolMiner_1_0_0_19\MinerApps\Claymore\Data1e2.bin2.deploy" />
1021+
<None Include="publish\Application Files\BitPoolMiner_1_0_0_19\MinerApps\Claymore\Data1g1.bin.deploy" />
1022+
<None Include="publish\Application Files\BitPoolMiner_1_0_0_19\MinerApps\Claymore\Data1g1.bin2.deploy" />
1023+
<None Include="publish\Application Files\BitPoolMiner_1_0_0_19\MinerApps\Claymore\Data1g2.bin.deploy" />
1024+
<None Include="publish\Application Files\BitPoolMiner_1_0_0_19\MinerApps\Claymore\Data1g2.bin2.deploy" />
1025+
<None Include="publish\Application Files\BitPoolMiner_1_0_0_19\MinerApps\Claymore\Data1h1.bin.deploy" />
1026+
<None Include="publish\Application Files\BitPoolMiner_1_0_0_19\MinerApps\Claymore\Data1h1.bin2.deploy" />
1027+
<None Include="publish\Application Files\BitPoolMiner_1_0_0_19\MinerApps\Claymore\Data1h2.bin.deploy" />
1028+
<None Include="publish\Application Files\BitPoolMiner_1_0_0_19\MinerApps\Claymore\Data1h2.bin2.deploy" />
1029+
<None Include="publish\Application Files\BitPoolMiner_1_0_0_19\MinerApps\Claymore\Data1i1.bin.deploy" />
1030+
<None Include="publish\Application Files\BitPoolMiner_1_0_0_19\MinerApps\Claymore\Data1i1.bin2.deploy" />
1031+
<None Include="publish\Application Files\BitPoolMiner_1_0_0_19\MinerApps\Claymore\Data1j1.bin.deploy" />
1032+
<None Include="publish\Application Files\BitPoolMiner_1_0_0_19\MinerApps\Claymore\Data1j1.bin2.deploy" />
1033+
<None Include="publish\Application Files\BitPoolMiner_1_0_0_19\MinerApps\Claymore\dpools.txt.deploy" />
1034+
<None Include="publish\Application Files\BitPoolMiner_1_0_0_19\MinerApps\Claymore\epools.txt.deploy" />
1035+
<None Include="publish\Application Files\BitPoolMiner_1_0_0_19\MinerApps\Claymore\EthDcrMiner64.exe.deploy" />
1036+
<None Include="publish\Application Files\BitPoolMiner_1_0_0_19\MinerApps\Claymore\History.txt.deploy" />
1037+
<None Include="publish\Application Files\BitPoolMiner_1_0_0_19\MinerApps\Claymore\libcurl.dll.deploy" />
1038+
<None Include="publish\Application Files\BitPoolMiner_1_0_0_19\MinerApps\Claymore\License.txt.deploy" />
1039+
<None Include="publish\Application Files\BitPoolMiner_1_0_0_19\MinerApps\Claymore\msvcr110.dll.deploy" />
1040+
<None Include="publish\Application Files\BitPoolMiner_1_0_0_19\MinerApps\Claymore\Readme!!!.txt.deploy" />
1041+
<None Include="publish\Application Files\BitPoolMiner_1_0_0_19\MinerApps\Claymore\Remote manager\API.txt.deploy" />
1042+
<None Include="publish\Application Files\BitPoolMiner_1_0_0_19\MinerApps\Claymore\Remote manager\EthMan.exe.deploy" />
1043+
<None Include="publish\Application Files\BitPoolMiner_1_0_0_19\MinerApps\Claymore\Remote manager\libeay32.dll.deploy" />
1044+
<None Include="publish\Application Files\BitPoolMiner_1_0_0_19\MinerApps\Claymore\Remote manager\readme.txt.deploy" />
1045+
<None Include="publish\Application Files\BitPoolMiner_1_0_0_19\MinerApps\Claymore\Remote manager\sample.bat.deploy" />
1046+
<None Include="publish\Application Files\BitPoolMiner_1_0_0_19\MinerApps\Claymore\Remote manager\ssleay32.dll.deploy" />
1047+
<None Include="publish\Application Files\BitPoolMiner_1_0_0_19\MinerApps\Claymore\start_eth+pasc.bat.deploy" />
1048+
<None Include="publish\Application Files\BitPoolMiner_1_0_0_19\MinerApps\Claymore\start_only_eth.bat.deploy" />
1049+
<None Include="publish\Application Files\BitPoolMiner_1_0_0_19\MinerApps\DSTM\pthreadVC2.dll.deploy" />
1050+
<None Include="publish\Application Files\BitPoolMiner_1_0_0_19\MinerApps\DSTM\vcruntime140.dll.deploy" />
1051+
<None Include="publish\Application Files\BitPoolMiner_1_0_0_19\MinerApps\DSTM\zm.exe.deploy" />
1052+
<None Include="publish\Application Files\BitPoolMiner_1_0_0_19\MinerApps\EWBF\cudart32_80.dll.deploy" />
1053+
<None Include="publish\Application Files\BitPoolMiner_1_0_0_19\MinerApps\EWBF\cudart64_80.dll.deploy" />
1054+
<None Include="publish\Application Files\BitPoolMiner_1_0_0_19\MinerApps\EWBF\miner.exe.deploy" />
1055+
<None Include="publish\Application Files\BitPoolMiner_1_0_0_19\MinerApps\EWBF\msvcp120.dll.deploy" />
1056+
<None Include="publish\Application Files\BitPoolMiner_1_0_0_19\MinerApps\EWBF\msvcr120.dll.deploy" />
1057+
<None Include="publish\Application Files\BitPoolMiner_1_0_0_19\Newtonsoft.Json.dll.deploy" />
1058+
<None Include="publish\Application Files\BitPoolMiner_1_0_0_19\NLog.config.deploy" />
1059+
<None Include="publish\Application Files\BitPoolMiner_1_0_0_19\NLog.dll.deploy" />
1060+
<None Include="publish\Application Files\BitPoolMiner_1_0_0_19\OpenHardwareMonitorLib.dll.deploy" />
1061+
<None Include="publish\Application Files\BitPoolMiner_1_0_0_19\publish\setup.exe.deploy" />
1062+
<None Include="publish\Application Files\BitPoolMiner_1_0_0_19\Resources\Images\bitpool.png.deploy" />
1063+
<None Include="publish\Application Files\BitPoolMiner_1_0_0_19\Resources\Images\exp.png.deploy" />
1064+
<None Include="publish\Application Files\BitPoolMiner_1_0_0_19\Resources\Images\hush.png.deploy" />
1065+
<None Include="publish\Application Files\BitPoolMiner_1_0_0_19\Resources\Images\kmd.png.deploy" />
1066+
<None Include="publish\Application Files\BitPoolMiner_1_0_0_19\Resources\Images\mona.png.deploy" />
1067+
<None Include="publish\Application Files\BitPoolMiner_1_0_0_19\Resources\Images\vtc.png.deploy" />
1068+
<None Include="publish\Application Files\BitPoolMiner_1_0_0_19\System.Windows.Interactivity.dll.deploy" />
1069+
<None Include="publish\Application Files\BitPoolMiner_1_0_0_19\ThinkSharp.FeatureTour.dll.deploy" />
1070+
<None Include="publish\Application Files\BitPoolMiner_1_0_0_19\ToastNotifications.dll.deploy" />
1071+
<None Include="publish\Application Files\BitPoolMiner_1_0_0_19\ToastNotifications.Messages.dll.deploy" />
9841072
<None Include="publish\Application Files\BitPoolMiner_1_0_0_1\bin\Debug\miners\ccminer-x64-2.2.4-cuda9\ccminer-x64.exe.deploy" />
9851073
<None Include="publish\Application Files\BitPoolMiner_1_0_0_1\bin\Debug\miners\ccminer-x64-2.2.4-cuda9\msvcr120.dll.deploy" />
9861074
<None Include="publish\Application Files\BitPoolMiner_1_0_0_1\bin\Debug\miners\ccminer-x86-2.2.4-cuda9\ccminer.exe.deploy" />

‎BitPoolMiner/MainWindow.xaml.cs

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -71,6 +71,10 @@ public MainWindow()
7171
// rerendering of charts from the main window view timer event
7272
MainWindowViewModel.profitabilityViewModel = ProfitabilityViewModel;
7373

74+
// Pass a reference of the Wallet View Model to the Account View model.
75+
// This will allow the account view model to refresh the wallet if needed when linking account id's.
76+
AccountViewModel.WalletViewModel = WalletViewModel;
77+
7478
// Check to see if should start mining on applications tart.
7579
CheckAutoStartMining();
7680

@@ -228,7 +232,7 @@ private void ResizeWindow()
228232
{
229233
_inStateChange = true;
230234
WindowState = WindowState.Normal;
231-
ResizeMode = ResizeMode.CanMinimize;
235+
ResizeMode = ResizeMode.CanResize;
232236
Height = SystemParameters.PrimaryScreenHeight - 100;
233237
Width = SystemParameters.PrimaryScreenWidth - 100;
234238
_inStateChange = false;

‎BitPoolMiner/ViewModels/AccountViewModel.cs

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -84,6 +84,7 @@ public WorkerSettings WorkerSettings
8484
}
8585
}
8686

87+
// List of GPU hardware settings
8788
private ObservableCollection<GPUSettings> gpuSettingsList;
8889
public ObservableCollection<GPUSettings> GPUSettingsList
8990
{
@@ -102,6 +103,9 @@ public ObservableCollection<GPUSettings> GPUSettingsList
102103
}
103104
}
104105

106+
// WalletViewModel reference
107+
public WalletViewModel WalletViewModel { get; set; }
108+
105109
#endregion
106110

107111
#region Commands
@@ -334,6 +338,9 @@ public void UpdateAccountID(object parameter)
334338
// Insert new worker for account
335339
InsertAccountWorkers();
336340

341+
// Reload Wallet Addresses
342+
WalletViewModel.CommandInitAccountWallet.Execute(null);
343+
337344
// Notify success
338345
ShowSuccess("Updated existing Account ID");
339346
}

‎BitPoolMiner/ViewModels/WalletViewModel.cs

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88

99
namespace BitPoolMiner.ViewModels
1010
{
11-
class WalletViewModel : ViewModelBase
11+
public class WalletViewModel : ViewModelBase
1212
{
1313
/// <summary>
1414
/// Constrtuctor
@@ -20,9 +20,10 @@ public WalletViewModel()
2020

2121
// Wire up commands for Account Wallets
2222
CommandSaveAccountWallet = new RelayCommand(PersistAccountWallet);
23+
CommandInitAccountWallet = new RelayCommand(InitAccountWallet);
2324

2425
// Load initial wallet data
25-
InitAccountWallet();
26+
InitAccountWallet(null);
2627
}
2728

2829
#region Wallet Settings
@@ -47,11 +48,12 @@ public List<AccountWallet> AccountWalletList
4748

4849
// Relay commands used for command binding to the view
4950
public RelayCommand CommandSaveAccountWallet { get; set; }
51+
public RelayCommand CommandInitAccountWallet { get; set; }
5052

5153
/// <summary>
5254
/// Load list of wallet addresses account
5355
/// </summary>
54-
private void InitAccountWallet()
56+
private void InitAccountWallet(object param)
5557
{
5658
try
5759
{

0 commit comments

Comments
 (0)