Skip to content
This repository has been archived by the owner on Apr 12, 2022. It is now read-only.

Commit

Permalink
Core issues fix and update to v1.0.5
Browse files Browse the repository at this point in the history
  • Loading branch information
@matsakiv
matsakiv committed Oct 12, 2019
1 parent 3b2019b commit 2f90726
Show file tree
Hide file tree
Showing 11 changed files with 112 additions and 84 deletions.
2 changes: 1 addition & 1 deletion .gitlab-ci.yml
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
variables:
NUGET_PATH: 'C:\Tools\Nuget\nuget.exe'
NUGET_PACKAGES: 'C:\Tools\Nuget\packages'
MSBUILD_PATH: 'C:\Program Files (x86)\Microsoft Visual Studio\2017\BuildTools\MSBuild\15.0\Bin\msbuild.exe'
MSBUILD_PATH: 'C:\Program Files (x86)\Microsoft Visual Studio\2019\BuildTools\MSBuild\Current\Bin\msbuild.exe'
XUNIT_PATH: packages\xunit.runner.console.2.4.1\tools\net461
UNITTEST_FOLDER: '.\Atomex.Client.Wpf.Tests\bin\Release\'
GIT_SUBMODULE_STRATEGY: normal
Expand Down
2 changes: 1 addition & 1 deletion Atomex.Client.Core
Submodule Atomex.Client.Core updated 94 files
+1 −2 Atomex.Client.Core.Tests/AesTests.cs
+2 −2 Atomex.Client.Core.Tests/Atomex.Client.Core.Tests.csproj
+198 −0 Atomex.Client.Core.Tests/BitCoreApiTests.cs
+228 −0 Atomex.Client.Core.Tests/BitcoinBasedCurrencyAccountSendTests.cs
+7 −24 Atomex.Client.Core.Tests/BitcoinBasedSwapTransactionFactoryTests.cs
+6 −2 Atomex.Client.Core.Tests/BlockchainInfoApiTests.cs
+8 −8 Atomex.Client.Core.Tests/Common.cs
+32 −19 Atomex.Client.Core.Tests/EtherScanApiTests.cs
+73 −56 Atomex.Client.Core.Tests/InsightApiTests.cs
+9 −4 Atomex.Client.Core.Tests/LiteDbAccountDataRepositoryTests.cs
+2 −2 Atomex.Client.Core.Tests/ProtoTests.cs
+18 −8 Atomex.Client.Core.Tests/TzScanApiTests.cs
+5 −5 Atomex.Client.Core/Atomex.Client.Core.csproj
+1 −1 Atomex.Client.Core/Blockchain/Abstract/IAddressBasedTransaction.cs
+10 −9 Atomex.Client.Core/Blockchain/Abstract/IBlockchainApi.cs
+9 −8 Atomex.Client.Core/Blockchain/Abstract/IInOutBlockchainApi.cs
+1 −1 Atomex.Client.Core/Blockchain/Abstract/IInOutTransaction.cs
+383 −0 Atomex.Client.Core/Blockchain/BitCore/BitCoreApi.cs
+11 −8 Atomex.Client.Core/Blockchain/BitcoinBased/BitcoinBasedTransaction.cs
+9 −0 Atomex.Client.Core/Blockchain/BitcoinBased/DustUsagePolicy.cs
+1 −0 Atomex.Client.Core/Blockchain/BitcoinBased/IBitcoinBasedTransaction.cs
+123 −88 Atomex.Client.Core/Blockchain/BlockchainInfo/BlockchainInfoApi.cs
+12 −4 Atomex.Client.Core/Blockchain/BlockchainTxOutputSource.cs
+25 −22 Atomex.Client.Core/Blockchain/Ethereum/CompositeEthereumBlockchainApi.cs
+81 −73 Atomex.Client.Core/Blockchain/Ethereum/EtherScanApi.cs
+22 −28 Atomex.Client.Core/Blockchain/Ethereum/EthereumNonceManager.cs
+1 −1 Atomex.Client.Core/Blockchain/Ethereum/EthereumTransaction.cs
+5 −4 Atomex.Client.Core/Blockchain/Ethereum/IEthereumBlockchainApi.cs
+88 −75 Atomex.Client.Core/Blockchain/Ethereum/Web3BlockchainApi.cs
+147 −113 Atomex.Client.Core/Blockchain/Insight/InsightApi.cs
+132 −99 Atomex.Client.Core/Blockchain/SoChain/SoChainApi.cs
+7 −6 Atomex.Client.Core/Blockchain/Tezos/ITezosBlockchainApi.cs
+2 −2 Atomex.Client.Core/Blockchain/Tezos/TezosCounter.cs
+0 −8 Atomex.Client.Core/Blockchain/Tezos/TezosNetwork.cs
+2 −2 Atomex.Client.Core/Blockchain/Tezos/TezosTransaction.cs
+85 −80 Atomex.Client.Core/Blockchain/Tezos/TzScanApi.cs
+17 −1 Atomex.Client.Core/Blockchain/TransactionConfirmationCheckTask.cs
+154 −0 Atomex.Client.Core/Common/AsyncHelpers.cs
+1 −1 Atomex.Client.Core/Common/BackgroundTaskPerformer.cs
+1 −1 Atomex.Client.Core/Common/Bson/BitcoinBasedTxOutputToBsonSerializer.cs
+70 −75 Atomex.Client.Core/Common/HttpHelper.cs
+1 −1 Atomex.Client.Core/Common/OrderExtensions.cs
+4 −4 Atomex.Client.Core/Common/RequestLimitControl.cs
+14 −0 Atomex.Client.Core/Common/Result.cs
+1 −1 Atomex.Client.Core/Core/Entities/Currency.cs
+1 −1 Atomex.Client.Core/Core/Entities/WalletAddress.cs
+4 −0 Atomex.Client.Core/Core/Error.cs
+6 −1 Atomex.Client.Core/Currencies/Bitcoin.cs
+13 −0 Atomex.Client.Core/Currencies/BitcoinBasedCurrency.cs
+5 −1 Atomex.Client.Core/Currencies/Ethereum.cs
+2 −1 Atomex.Client.Core/Currencies/Litecoin.cs
+5 −19 Atomex.Client.Core/Currencies/Tezos.cs
+6 −7 Atomex.Client.Core/LiteDb/LiteDbAccountDataRepository.cs
+37 −31 Atomex.Client.Core/LiteDb/LiteDbMigrationManager.cs
+93 −0 Atomex.Client.Core/LiteDb/LiteDbMigrations.cs
+1 −1 Atomex.Client.Core/MarketData/Abstract/QuotesProvider.cs
+10 −3 Atomex.Client.Core/MarketData/Bitfinex/BitfinexQuotesProvider.cs
+12 −10 Atomex.Client.Core/MarketData/Bitfinex/BitfinexQuotesProviderV1.cs
+12 −11 Atomex.Client.Core/MarketData/Poloniex/PoloniexQuotesProvider.cs
+12 −1 Atomex.Client.Core/Subsystems/CurrenciesUpdater.cs
+1 −1 Atomex.Client.Core/Swaps/Abstract/ICurrencySwap.cs
+50 −7 Atomex.Client.Core/Swaps/BitcoinBased/BitcoinBasedSwap.cs
+25 −28 Atomex.Client.Core/Swaps/BitcoinBased/BitcoinBasedSwapTransactionFactory.cs
+0 −1 Atomex.Client.Core/Swaps/BitcoinBased/IBitcoinBasedSwapTransactionFactory.cs
+11 −1 Atomex.Client.Core/Swaps/BitcoinBased/Tasks/BitcoinBasedForceRefundTask.cs
+22 −5 Atomex.Client.Core/Swaps/BitcoinBased/Tasks/BitcoinBasedOutputSpentTask.cs
+5 −5 Atomex.Client.Core/Swaps/ClientSwapManager.cs
+64 −23 Atomex.Client.Core/Swaps/Ethereum/EthereumSwap.cs
+17 −9 Atomex.Client.Core/Swaps/Ethereum/Tasks/EthereumSwapInitiatedControlTask.cs
+15 −12 Atomex.Client.Core/Swaps/Ethereum/Tasks/EthereumSwapRedeemControlTask.cs
+14 −11 Atomex.Client.Core/Swaps/Ethereum/Tasks/EthereumSwapRefundControlTask.cs
+14 −5 Atomex.Client.Core/Swaps/Tezos/Tasks/TezosSwapInitiatedControlTask.cs
+14 −5 Atomex.Client.Core/Swaps/Tezos/Tasks/TezosSwapRedeemControlTask.cs
+14 −5 Atomex.Client.Core/Swaps/Tezos/Tasks/TezosSwapRefundControlTask.cs
+11 −6 Atomex.Client.Core/Swaps/Tezos/TezosSwap.cs
+2 −5 Atomex.Client.Core/Symbols/Symbols.cs
+19 −20 Atomex.Client.Core/Wallet/Abstract/CurrencyAccount.cs
+15 −15 Atomex.Client.Core/Wallet/Abstract/IAccount.cs
+1 −5 Atomex.Client.Core/Wallet/Abstract/IAccountDataRepository.cs
+1 −1 Atomex.Client.Core/Wallet/Abstract/IAddressResolver.cs
+17 −17 Atomex.Client.Core/Wallet/Abstract/ICurrencyAccount.cs
+2 −2 Atomex.Client.Core/Wallet/Abstract/ICurrencyHdWalletScanner.cs
+5 −5 Atomex.Client.Core/Wallet/Abstract/IHdWallet.cs
+4 −4 Atomex.Client.Core/Wallet/Abstract/IHdWalletScanner.cs
+18 −17 Atomex.Client.Core/Wallet/Account.cs
+77 −41 Atomex.Client.Core/Wallet/BitcoinBased/BitcoinBasedCurrencyAccount.cs
+53 −21 Atomex.Client.Core/Wallet/BitcoinBased/BitcoinBasedWalletScanner.cs
+28 −14 Atomex.Client.Core/Wallet/Ethereum/EthereumCurrencyAccount.cs
+34 −10 Atomex.Client.Core/Wallet/Ethereum/EthereumWalletScanner.cs
+26 −12 Atomex.Client.Core/Wallet/HdWallet.cs
+4 −4 Atomex.Client.Core/Wallet/HdWalletScanner.cs
+58 −22 Atomex.Client.Core/Wallet/Tezos/TezosCurrencyAccount.cs
+35 −12 Atomex.Client.Core/Wallet/Tezos/TezosWalletScanner.cs
+23 −17 Atomex.Client.Core/currencies.json
2 changes: 1 addition & 1 deletion Atomex.Client.Wpf.Installer/Product.wxs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
<?define Name = "Atomex Client" ?>
<?define Manufacturer = "Atomex.me" ?>
<?define Description = "Multicurrency HD wallet with built-in hybrid exchange based on atomic swap." ?>
<?define Version = "1.0.4" ?>
<?define Version = "1.0.5" ?>
<?define UpgradeCode = "DB7FCF8D-E0C6-4C99-A6B1-3FB6D703F97E" ?>
<?define ExeName = "Atomex.Client.Wpf.exe" ?>

Expand Down
16 changes: 10 additions & 6 deletions Atomex.Client.Wpf.Tests/app.config
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,27 +12,27 @@
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="System.Runtime.CompilerServices.Unsafe" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-4.0.4.1" newVersion="4.0.4.1" />
<bindingRedirect oldVersion="0.0.0.0-4.0.5.0" newVersion="4.0.5.0" />
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="Microsoft.Extensions.Logging.Abstractions" publicKeyToken="adb9793829ddae60" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-2.2.0.0" newVersion="2.2.0.0" />
<bindingRedirect oldVersion="0.0.0.0-3.0.0.0" newVersion="3.0.0.0" />
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="Microsoft.Extensions.Configuration.Abstractions" publicKeyToken="adb9793829ddae60" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-2.2.0.0" newVersion="2.2.0.0" />
<bindingRedirect oldVersion="0.0.0.0-3.0.0.0" newVersion="3.0.0.0" />
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="Microsoft.Extensions.DependencyModel" publicKeyToken="adb9793829ddae60" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-2.1.0.0" newVersion="2.1.0.0" />
<bindingRedirect oldVersion="0.0.0.0-3.0.0.0" newVersion="3.0.0.0" />
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="Microsoft.Extensions.Primitives" publicKeyToken="adb9793829ddae60" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-2.2.0.0" newVersion="2.2.0.0" />
<bindingRedirect oldVersion="0.0.0.0-3.0.0.0" newVersion="3.0.0.0" />
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="Microsoft.Extensions.Configuration.Binder" publicKeyToken="adb9793829ddae60" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-2.2.0.0" newVersion="2.2.0.0" />
<bindingRedirect oldVersion="0.0.0.0-3.0.0.0" newVersion="3.0.0.0" />
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="System.Numerics.Vectors" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
Expand All @@ -50,6 +50,10 @@
<assemblyIdentity name="System.Memory" publicKeyToken="cc7b13ffcd2ddd51" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-4.0.1.1" newVersion="4.0.1.1" />
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="System.ValueTuple" publicKeyToken="cc7b13ffcd2ddd51" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-4.0.3.0" newVersion="4.0.3.0" />
</dependentAssembly>
</assemblyBinding>
</runtime>
</configuration>
16 changes: 10 additions & 6 deletions Atomex.Client.Wpf/App.config
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,23 +15,23 @@
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="System.Runtime.CompilerServices.Unsafe" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-4.0.4.1" newVersion="4.0.4.1" />
<bindingRedirect oldVersion="0.0.0.0-4.0.5.0" newVersion="4.0.5.0" />
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="Microsoft.Extensions.Configuration.Abstractions" publicKeyToken="adb9793829ddae60" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-2.2.0.0" newVersion="2.2.0.0" />
<bindingRedirect oldVersion="0.0.0.0-3.0.0.0" newVersion="3.0.0.0" />
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="Microsoft.Extensions.DependencyModel" publicKeyToken="adb9793829ddae60" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-2.1.0.0" newVersion="2.1.0.0" />
<bindingRedirect oldVersion="0.0.0.0-3.0.0.0" newVersion="3.0.0.0" />
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="Microsoft.Extensions.Primitives" publicKeyToken="adb9793829ddae60" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-2.2.0.0" newVersion="2.2.0.0" />
<bindingRedirect oldVersion="0.0.0.0-3.0.0.0" newVersion="3.0.0.0" />
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="Microsoft.Extensions.Configuration.Binder" publicKeyToken="adb9793829ddae60" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-2.2.0.0" newVersion="2.2.0.0" />
<bindingRedirect oldVersion="0.0.0.0-3.0.0.0" newVersion="3.0.0.0" />
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="System.Numerics.Vectors" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
Expand All @@ -43,7 +43,7 @@
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="Microsoft.Extensions.Logging.Abstractions" publicKeyToken="adb9793829ddae60" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-2.2.0.0" newVersion="2.2.0.0" />
<bindingRedirect oldVersion="0.0.0.0-3.0.0.0" newVersion="3.0.0.0" />
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="Microsoft.DotNet.PlatformAbstractions" publicKeyToken="adb9793829ddae60" culture="neutral" />
Expand All @@ -57,6 +57,10 @@
<assemblyIdentity name="System.Memory" publicKeyToken="cc7b13ffcd2ddd51" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-4.0.1.1" newVersion="4.0.1.1" />
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="System.ValueTuple" publicKeyToken="cc7b13ffcd2ddd51" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-4.0.3.0" newVersion="4.0.3.0" />
</dependentAssembly>
</assemblyBinding>
</runtime>
</configuration>
Loading

0 comments on commit 2f90726

Please sign in to comment.