Swaps refactoring, fixes

atomex-me · Nov 24, 2020 · a517086 · a517086
1 parent 5b99877
commit a517086
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 5 deletions.
diff --git a/Atomex.Client.Core b/Atomex.Client.Core
diff --git a/Atomex.Client.Wpf.Installer/Product.wxs b/Atomex.Client.Wpf.Installer/Product.wxs
@@ -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.65" ?>
+<?define Version = "1.0.66" ?>
 <?define UpgradeCode = "DB7FCF8D-E0C6-4C99-A6B1-3FB6D703F97E" ?>
 <?define ExeName = "Atomex.Client.Wpf.exe" ?>
 

diff --git a/Atomex.Client.Wpf/App.xaml.cs b/Atomex.Client.Wpf/App.xaml.cs
@@ -2,16 +2,17 @@
 using System.Linq;
 using System.Reflection;
 using System.Windows;
-using Atomex.MarketData.Bitfinex;
+using Microsoft.Extensions.Configuration;
+using Serilog;
+
 using Atomex.Client.Wpf.Common;
 using Atomex.Client.Wpf.ViewModels;
 using Atomex.Client.Wpf.Views;
 using Atomex.Common.Configuration;
 using Atomex.Core;
+using Atomex.MarketData.Bitfinex;
 using Atomex.Updates;
 using Atomex.Subsystems;
-using Microsoft.Extensions.Configuration;
-using Serilog;
 
 namespace Atomex.Client.Wpf
 {

diff --git a/Atomex.Client.Wpf/Atomex.Client.Wpf.csproj b/Atomex.Client.Wpf/Atomex.Client.Wpf.csproj
@@ -941,6 +941,7 @@
     <Resource Include="Resources\Images\wbtc.png" />
     <Resource Include="Resources\Images\wbtc_mask.png" />
   </ItemGroup>
+  <ItemGroup />
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <Import Project="..\packages\NETStandard.Library.2.0.3\build\netstandard2.0\NETStandard.Library.targets" Condition="Exists('..\packages\NETStandard.Library.2.0.3\build\netstandard2.0\NETStandard.Library.targets')" />
   <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
+4 −4		Atomex.Client.Core.Tests/BitcoinBased/BitcoinBasedSwapTransactionFactoryTests.cs
+0 −75		Atomex.Client.Core.Tests/BitcoinBased/BitcoinBasedSwapTransactionVerifierTests.cs
+0 −332		Atomex.Client.Core.Tests/BitcoinBased/BitcoinBasedTests.cs
+13 −27		Atomex.Client.Core/Api/Proto/ProtoScheme.cs
+0 −2		Atomex.Client.Core/Api/Proto/ProtoSchemes.cs
+2 −1		Atomex.Client.Core/Api/Proto/SwapAcceptScheme.cs
+2 −1		Atomex.Client.Core/Api/Proto/SwapInitiateScheme.cs
+0 −18		Atomex.Client.Core/Api/Proto/SwapPaymentScheme.cs
+4 −8		Atomex.Client.Core/Api/Proto/SwapScheme.cs
+8 −397		Atomex.Client.Core/Blockchain/BitcoinBased/BitcoinBasedSwapTemplate.cs
+0 −125		Atomex.Client.Core/Blockchain/BitcoinBased/BitcoinBasedTransactionVerifier.cs
+0 −140		Atomex.Client.Core/Blockchain/Ethereum/CompositeEthereumBlockchainApi.cs
+42 −3		Atomex.Client.Core/Blockchain/Ethereum/EtherScanApi.cs
+17 −1		Atomex.Client.Core/Blockchain/Ethereum/IEthereumBlockchainApi.cs
+0 −224		Atomex.Client.Core/Blockchain/Ethereum/Web3BlockchainApi.cs
+52 −13		Atomex.Client.Core/Blockchain/SoChain/SoChainApi.cs
+15 −0		Atomex.Client.Core/Blockchain/Tezos/ITezosBlockchainApi.cs
+75 −34		Atomex.Client.Core/Blockchain/Tezos/TzktApi.cs
+49 −36		Atomex.Client.Core/Common/Bson/SwapToBsonSerializer.cs
+24 −38		Atomex.Client.Core/Common/DateTimeExtensions.cs
+0 −62		Atomex.Client.Core/Common/ParallelExtensions.cs
+0 −323		Atomex.Client.Core/Common/RpcLog.cs
+0 −42		Atomex.Client.Core/Common/SwapExtensions.cs
+0 −66		Atomex.Client.Core/Common/VarInteger.cs
+23 −22		Atomex.Client.Core/Core/Swap.cs
+0 −95		Atomex.Client.Core/Currencies/BitcoinBasedCurrency.cs
+2 −7		Atomex.Client.Core/Currencies/Ethereum.cs
+1 −2		Atomex.Client.Core/Currencies/EthereumTokens/ERC20.cs
+19 −61		Atomex.Client.Core/Subsystems/WebSocketAtomexClient.cs
+115 −37		Atomex.Client.Core/Swaps/Abstract/CurrencySwap.cs
+6 −5		Atomex.Client.Core/Swaps/Abstract/ICurrencySwap.cs
+1 −1		Atomex.Client.Core/Swaps/Abstract/ISwapClient.cs
+2 −1		Atomex.Client.Core/Swaps/Abstract/ISwapManager.cs
+161 −221		Atomex.Client.Core/Swaps/BitcoinBased/BitcoinBasedSwap.cs
+4 −4		Atomex.Client.Core/Swaps/BitcoinBased/BitcoinBasedSwapTransactionFactory.cs
+190 −0		Atomex.Client.Core/Swaps/BitcoinBased/Helpers/BitcoinBasedSwapInitiatedHelper.cs
+30 −1		Atomex.Client.Core/Swaps/BitcoinBased/Helpers/BitcoinBasedSwapSpentHelper.cs
+2 −1		Atomex.Client.Core/Swaps/BitcoinBased/IBitcoinBasedSwapTransactionFactory.cs
+2 −9		Atomex.Client.Core/Swaps/CurrencySwapCreator.cs
+33 −104		Atomex.Client.Core/Swaps/Ethereum/ERC20/ERC20Swap.cs
+59 −2		Atomex.Client.Core/Swaps/Ethereum/ERC20/Helpers/ERC20SwapInitiatedHelper.cs
+38 −105		Atomex.Client.Core/Swaps/Ethereum/EthereumSwap.cs
+58 −1		Atomex.Client.Core/Swaps/Ethereum/Helpers/EthereumSwapInitiatedHelper.cs
+266 −152		Atomex.Client.Core/Swaps/SwapManager.cs
+20 −112		Atomex.Client.Core/Swaps/Tezos/FA12/FA12Swap.cs
+42 −1		Atomex.Client.Core/Swaps/Tezos/FA12/Helpers/FA12SwapInitiatedHelper.cs
+26 −113		Atomex.Client.Core/Swaps/Tezos/FA2/FA2Swap.cs
+42 −1		Atomex.Client.Core/Swaps/Tezos/FA2/Helpers/FA2SwapInitiatedHelper.cs
+41 −1		Atomex.Client.Core/Swaps/Tezos/Helpers/TezosSwapInitiatedHelper.cs
+42 −1		Atomex.Client.Core/Swaps/Tezos/NYX/Helpers/NYXSwapInitiatedHelper.cs
+20 −108		Atomex.Client.Core/Swaps/Tezos/NYX/NYXSwap.cs
+28 −103		Atomex.Client.Core/Swaps/Tezos/TezosSwap.cs
+1 −2		Atomex.Client.Core/Wallet/Account.cs
+2 −0		Atomex.Client.Core/Wallet/Tezos/FA12/FA12Account.cs
+2 −0		Atomex.Client.Core/Wallet/Tezos/FA2/FA2Account.cs
+2 −0		Atomex.Client.Core/Wallet/Tezos/NYX/NYXAccount.cs
+18 −0		Atomex.Client.Core/Wallet/Tezos/TezosAccount.cs
+1 −1		Atomex.Client.Core/Wallet/Tezos/TezosExtKey.cs
+4 −7		Atomex.Client.Core/Web/BinaryWebSocketClient.cs
+13 −28		Atomex.Client.Core/Web/ExchangeWebClient.cs
+6 −4		Atomex.Client.Core/currencies.json