Skip to content

Commit 80e62d6

Browse files
saltyminersaltyminer
authored
Merge pull request #29 from BitPoolMining/Dev
New stable release for BTG, BTCP, ZEN, ZCL
2 parents e4e5165 + db93501 commit 80e62d6

193 files changed

Lines changed: 6919 additions & 12 deletions

File tree

Some content is hidden

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

‎BitPoolMiner/BitPoolMiner.csproj‎

Lines changed: 190 additions & 2 deletions
Large diffs are not rendered by default.

‎BitPoolMiner/Models/GPUSettings.cs‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -155,7 +155,6 @@ private List<MinerBaseType> SetMinerBaseType()
155155
minerBaseTypeList.Add(MinerBaseType.EWBF);
156156
break;
157157
case CoinType.BTG:
158-
minerBaseTypeList.Add(MinerBaseType.DSTM);
159158
minerBaseTypeList.Add(MinerBaseType.EWBF);
160159
break;
161160
case CoinType.BTCP:

‎BitPoolMiner/Views/AccountView.xaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -336,7 +336,7 @@
336336

337337
<DataGridTemplateColumn Header="Miner" CellStyle="{StaticResource DataGridCellStyle}"> <DataGridTemplateColumn.CellTemplate> <DataTemplate> <ComboBox FontSize= "14"
338338
FontWeight= "Bold" Foreground= "#000000" Height="25"
339-
SelectedItem="{Binding Path=MinerBaseType}"
339+
SelectedItem="{Binding Path=MinerBaseType, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}"
340340
ItemsSource="{Binding Path=MinerBaseTypeList}"> <ComboBox.ItemContainerStyle>
341341
<Style TargetType="ComboBoxItem">
342342
<Setter Property="Background" Value="#646464"/>

‎BitPoolMiner/Views/WalletView.xaml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -50,9 +50,9 @@
5050
<Setter Property = "FontSize" Value = "12" />
5151
<Setter Property = "FontWeight" Value = "Bold" />
5252
<Setter Property = "BorderBrush" Value = "#444444" />
53-
<Setter Property = "Margin" Value = "5" />
53+
<Setter Property = "Margin" Value = "5 0 5 0" />
5454
<Setter Property = "Padding" Value = "5" />
55-
<Setter Property = "VerticalContentAlignment" Value = "Center" />
55+
<Setter Property = "VerticalContentAlignment" Value = "Top" />
5656
</Style>
5757

5858
<!-- Style - Button -->
@@ -220,7 +220,7 @@
220220
<DataGridTextColumn Binding="{Binding CoinName}" Header="Coin Name" IsReadOnly="True" CellStyle="{StaticResource DataGridCellStyle}"/>
221221
<DataGridTextColumn Binding="{Binding CoinSymbol}" Header="Symbol" IsReadOnly="True" CellStyle="{StaticResource DataGridCellStyle}"/>
222222
<DataGridTextColumn Binding="{Binding AlgorithmType}" Header="AlgorithmType" IsReadOnly="True" CellStyle="{StaticResource DataGridCellStyle}"/>
223-
<DataGridTemplateColumn IsReadOnly="True" Header="Enabled For Mining" CellStyle="{StaticResource DataGridCellStyle}"> <DataGridTemplateColumn.CellTemplate> <DataTemplate> <CheckBox IsEnabled="False" Background= "#646464"
223+
<DataGridTemplateColumn IsReadOnly="True" Header="Enabled" CellStyle="{StaticResource DataGridCellStyle}"> <DataGridTemplateColumn.CellTemplate> <DataTemplate> <CheckBox IsEnabled="False" Background= "#646464"
224224
Foreground= "#FFFFFF" IsChecked="{Binding Enabled, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}" > <CheckBox.LayoutTransform>
225225
<ScaleTransform ScaleX="1.5" ScaleY="1.5" />
226226
</CheckBox.LayoutTransform> </CheckBox> </DataTemplate> </DataGridTemplateColumn.CellTemplate> </DataGridTemplateColumn>

‎BitPoolMiner/publish/Application Files/BitPoolMiner_1_0_0_23/BitPoolMiner.application‎

Lines changed: 28 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,28 @@
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<asmv1:assembly xsi:schemaLocation="urn:schemas-microsoft-com:asm.v1 assembly.adaptive.xsd" manifestVersion="1.0" xmlns:asmv1="urn:schemas-microsoft-com:asm.v1" xmlns="urn:schemas-microsoft-com:asm.v2" xmlns:asmv2="urn:schemas-microsoft-com:asm.v2" xmlns:xrml="urn:mpeg:mpeg21:2003:01-REL-R-NS" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:asmv3="urn:schemas-microsoft-com:asm.v3" xmlns:dsig="http://www.w3.org/2000/09/xmldsig#" xmlns:co.v1="urn:schemas-microsoft-com:clickonce.v1" xmlns:co.v2="urn:schemas-microsoft-com:clickonce.v2">
3+
<assemblyIdentity name="BitPoolMiner.application" version="1.0.0.23" publicKeyToken="4eb951c39ace8231" language="neutral" processorArchitecture="msil" xmlns="urn:schemas-microsoft-com:asm.v1" />
4+
<description asmv2:publisher="BitPoolMining" co.v1:suiteName="BitPoolMining" asmv2:product="BitPoolMiner" xmlns="urn:schemas-microsoft-com:asm.v1" />
5+
<deployment install="true" mapFileExtensions="true" co.v1:createDesktopShortcut="true">
6+
<subscription>
7+
<update>
8+
<expiration maximumAge="0" unit="days" />
9+
</update>
10+
</subscription>
11+
<deploymentProvider codebase="https://raw.githubusercontent.com/BitPoolMining/BitPoolMiner/master/BitPoolMiner/publish/BitPoolMiner.application" />
12+
</deployment>
13+
<compatibleFrameworks xmlns="urn:schemas-microsoft-com:clickonce.v2">
14+
<framework targetVersion="4.6.1" profile="Full" supportedRuntime="4.0.30319" />
15+
</compatibleFrameworks>
16+
<dependency>
17+
<dependentAssembly dependencyType="install" codebase="Application Files\BitPoolMiner_1_0_0_23\BitPoolMiner.exe.manifest" size="47253">
18+
<assemblyIdentity name="BitPoolMiner.exe" version="1.0.0.23" publicKeyToken="4eb951c39ace8231" language="neutral" processorArchitecture="msil" type="win32" />
19+
<hash>
20+
<dsig:Transforms>
21+
<dsig:Transform Algorithm="urn:schemas-microsoft-com:HashTransforms.Identity" />
22+
</dsig:Transforms>
23+
<dsig:DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha256" />
24+
<dsig:DigestValue>dU2TqVl/HGdFIoX6HKZGhrKxPsWA/+5lal0IN4P5GwQ=</dsig:DigestValue>
25+
</hash>
26+
</dependentAssembly>
27+
</dependency>
28+
<publisherIdentity name="CN=DSTURT-SURFACE\dstur" issuerKeyHash="e52c1a52fe2c96e0cea6ee90dfad5b3aa9285afb" /><Signature Id="StrongNameSignature" xmlns="http://www.w3.org/2000/09/xmldsig#"><SignedInfo><CanonicalizationMethod Algorithm="http://www.w3.org/2001/10/xml-exc-c14n#" /><SignatureMethod Algorithm="http://www.w3.org/2000/09/xmldsig#rsa-sha256" /><Reference URI=""><Transforms><Transform Algorithm="http://www.w3.org/2000/09/xmldsig#enveloped-signature" /><Transform Algorithm="http://www.w3.org/2001/10/xml-exc-c14n#" /></Transforms><DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha256" /><DigestValue>SczAJZ+U8CJ6sqRUcZrJAh3Vin69+h7Q6VbesN3DlHY=</DigestValue></Reference></SignedInfo><SignatureValue>C4h5B6Fj8wWv2LbtXe7UUbmUctqehV+CorZ2/VQvCkHYMS75vmu4qPZ3xblDFmxHXMHsK+uzJ26BXO3abyB2b28ua9mD6ZCL8rZ5tJVY0Li9lkRpapNmOjmjRsg49X3xoQ4UigkKTiiQfcxPMedaUs1NqO95vdumbQSpAAJlwC0=</SignatureValue><KeyInfo Id="StrongNameKeyInfo"><KeyValue><RSAKeyValue><Modulus>0N2j1jELxr2whZRV1BDtcUDcOARPClY+n8mSKqddyC4INatOTDnSL0lDCDAm1vI1LGLwogYDoKtIVAOtRtFzUPmLsJ2vHFwjOsb1TgXQuvZFJNmchbI9QaO3M4+efATGygi4DWpgtWSwmyarNHPSx2Od+W0Xx/HKCAJfjkijZaU=</Modulus><Exponent>AQAB</Exponent></RSAKeyValue></KeyValue><msrel:RelData xmlns:msrel="http://schemas.microsoft.com/windows/rel/2005/reldata"><r:license xmlns:r="urn:mpeg:mpeg21:2003:01-REL-R-NS" xmlns:as="http://schemas.microsoft.com/windows/pki/2005/Authenticode"><r:grant><as:ManifestInformation Hash="7694c3ddb0de56e9d01efabd7e8ad51d02c99a7154a4b27a22f0949f25c0cc49" Description="" Url=""><as:assemblyIdentity name="BitPoolMiner.application" version="1.0.0.23" publicKeyToken="4eb951c39ace8231" language="neutral" processorArchitecture="msil" xmlns="urn:schemas-microsoft-com:asm.v1" /></as:ManifestInformation><as:SignedBy /><as:AuthenticodePublisher><as:X509SubjectName>CN=DSTURT-SURFACE\dstur</as:X509SubjectName></as:AuthenticodePublisher></r:grant><r:issuer><Signature Id="AuthenticodeSignature" xmlns="http://www.w3.org/2000/09/xmldsig#"><SignedInfo><CanonicalizationMethod Algorithm="http://www.w3.org/2001/10/xml-exc-c14n#" /><SignatureMethod Algorithm="http://www.w3.org/2000/09/xmldsig#rsa-sha256" /><Reference URI=""><Transforms><Transform Algorithm="http://www.w3.org/2000/09/xmldsig#enveloped-signature" /><Transform Algorithm="http://www.w3.org/2001/10/xml-exc-c14n#" /></Transforms><DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha256" /><DigestValue>FUaWRYb2QbE80L0R0gAXzV9EAdo19f45CSH6NVSAbc8=</DigestValue></Reference></SignedInfo><SignatureValue>HVlAogC74mb9C7O3fmC+EuyGkV8tBSN7M3+zwv30vniGIP5ElSz7CYfA5fy4ubgUoY1fKVK52y21CW0GXkVDnJyrkh0rqYXLEy247HC4AZX9h/j91oYbu7IXripmp4cd4leZDJMMtq4ERR2AhSAA9HNPbavKK+gCXuUToyvks4s=</SignatureValue><KeyInfo><KeyValue><RSAKeyValue><Modulus>0N2j1jELxr2whZRV1BDtcUDcOARPClY+n8mSKqddyC4INatOTDnSL0lDCDAm1vI1LGLwogYDoKtIVAOtRtFzUPmLsJ2vHFwjOsb1TgXQuvZFJNmchbI9QaO3M4+efATGygi4DWpgtWSwmyarNHPSx2Od+W0Xx/HKCAJfjkijZaU=</Modulus><Exponent>AQAB</Exponent></RSAKeyValue></KeyValue><X509Data><X509Certificate>MIIB6TCCAVKgAwIBAgIQMSF8bfMsQJFJBvCnjsSRajANBgkqhkiG9w0BAQsFADAzMTEwLwYDVQQDHigARABTAFQAVQBSAFQALQBTAFUAUgBGAEEAQwBFAFwAZABzAHQAdQByMB4XDTE4MDYxNDE5NDgyNloXDTE5MDYxNTAxNDgyNlowMzExMC8GA1UEAx4oAEQAUwBUAFUAUgBUAC0AUwBVAFIARgBBAEMARQBcAGQAcwB0AHUAcjCBnzANBgkqhkiG9w0BAQEFAAOBjQAwgYkCgYEA0N2j1jELxr2whZRV1BDtcUDcOARPClY+n8mSKqddyC4INatOTDnSL0lDCDAm1vI1LGLwogYDoKtIVAOtRtFzUPmLsJ2vHFwjOsb1TgXQuvZFJNmchbI9QaO3M4+efATGygi4DWpgtWSwmyarNHPSx2Od+W0Xx/HKCAJfjkijZaUCAwEAATANBgkqhkiG9w0BAQsFAAOBgQAvVlpdo9XcpudUkYsVFltjDgxy7/PChctSOu63rXfeVIkXEt29ScfaWJxZM9iqREHxD3IafS910dObtPYIejHfqJvWazWey7SnnrJ1byJHMlb3AUan0xeZNMXl7rTn7LFmb76tcSiW4RO1bq2ii4e40sbkW4gjOiebmYIFs0pGrw==</X509Certificate></X509Data></KeyInfo></Signature></r:issuer></r:license></msrel:RelData></KeyInfo></Signature></asmv1:assembly>

‎BitPoolMiner/publish/Application Files/BitPoolMiner_1_0_0_23/BitPoolMiner.exe.config.deploy‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<configuration>
3+
<startup>
4+
<supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.6.1"/>
5+
</startup>
6+
</configuration>

‎BitPoolMiner/publish/Application Files/BitPoolMiner_1_0_0_23/BitPoolMiner.exe.deploy‎

338 KB
Binary file not shown.

0 commit comments

Comments
 (0)