diff --git a/Examples/BlazorClient/BlazorClient.csproj b/Examples/BlazorClient/BlazorClient.csproj index 102db8a..a5ee220 100644 --- a/Examples/BlazorClient/BlazorClient.csproj +++ b/Examples/BlazorClient/BlazorClient.csproj @@ -5,15 +5,15 @@ - - - - - - - - - + + + + + + + + + diff --git a/Examples/BlazorClient/Pages/Index.razor b/Examples/BlazorClient/Pages/Index.razor index 3971b1c..6e19cba 100644 --- a/Examples/BlazorClient/Pages/Index.razor +++ b/Examples/BlazorClient/Pages/Index.razor @@ -10,7 +10,7 @@ @inject IKucoinClient kucoinClient

BTC-USD prices:

-@foreach(var price in _prices) +@foreach(var price in _prices.OrderBy(p => p.Key)) {
@price.Key: @price.Value
} diff --git a/Examples/BlazorClient/Pages/LiveData.razor b/Examples/BlazorClient/Pages/LiveData.razor index e11fdab..8fdd989 100644 --- a/Examples/BlazorClient/Pages/LiveData.razor +++ b/Examples/BlazorClient/Pages/LiveData.razor @@ -22,7 +22,7 @@ @implements IDisposable

ETH-BTC prices, live updates:

-@foreach(var price in _prices) +@foreach(var price in _prices.OrderBy(p => p.Key)) {
@price.Key: @price.Value
} diff --git a/Examples/BlazorClient/Pages/OrderBooks.razor b/Examples/BlazorClient/Pages/OrderBooks.razor index fe70f5f..8058d65 100644 --- a/Examples/BlazorClient/Pages/OrderBooks.razor +++ b/Examples/BlazorClient/Pages/OrderBooks.razor @@ -11,13 +11,13 @@ @using Huobi.Net.SymbolOrderBooks @using Kraken.Net.SymbolOrderBooks @using Kucoin.Net.Clients -@using Kucoin.Net.SymbolOrderBook +@using Kucoin.Net.SymbolOrderBooks @using System.Collections.Concurrent @using System.Timers @implements IDisposable

ETH-BTC books, live updates:

-@foreach(var book in _books) +@foreach(var book in _books.OrderBy(p => p.Key)) {

@book.Key

@@ -25,7 +25,7 @@ { for (var i = 0; i < 3; i++) { -
@book.Value.Asks.ElementAt(i).Price - @book.Value.Bids.ElementAt(i).Price
+
@book.Value.Bids.ElementAt(i).Price - @book.Value.Asks.ElementAt(i).Price
} }
diff --git a/Examples/BlazorClient/Pages/ExchangeClient.razor b/Examples/BlazorClient/Pages/SpotClient.razor similarity index 56% rename from Examples/BlazorClient/Pages/ExchangeClient.razor rename to Examples/BlazorClient/Pages/SpotClient.razor index a8ecde6..2b658a3 100644 --- a/Examples/BlazorClient/Pages/ExchangeClient.razor +++ b/Examples/BlazorClient/Pages/SpotClient.razor @@ -1,4 +1,4 @@ -@page "/ExchangeClient" +@page "/SpotClient" @inject IBinanceClient binanceClient @inject IBitfinexClient bitfinexClient @inject IBittrexClient bittrexClient @@ -13,34 +13,34 @@ @using Bittrex.Net.Clients.SpotApi @using Bybit.Net.Clients.SpotApi @using CoinEx.Net.Clients.SpotApi -@using CryptoExchange.Net.ExchangeInterfaces +@using CryptoExchange.Net.Interfaces @using FTX.Net.Clients.TradeApi @using Huobi.Net.Clients.SpotApi @using Kraken.Net.Clients.SpotApi @using Kucoin.Net.Clients.SpotApi

ETH-BTC prices:

-@foreach(var price in _prices) +@foreach(var price in _prices.OrderBy(p => p.Key)) {
@price.Key: @price.Value
} @code{ - private Dictionary _prices = new Dictionary(); + private Dictionary _prices = new Dictionary(); protected override async Task OnInitializedAsync() { - var clients = new IExchangeClient[] + var clients = new ISpotClient[] { - binanceClient.SpotApi.AsExchangeClient(), - bitfinexClient.SpotApi.AsExchangeClient(), - bittrexClient.SpotApi.AsExchangeClient(), - bybitClient.SpotApi.AsExchangeClient(), - coinexClient.SpotApi.AsExchangeClient(), - ftxClient.TradeApi.AsExchangeClient(), - huobiClient.SpotApi.AsExchangeClient(), - krakenClient.SpotApi.AsExchangeClient(), - kucoinClient.SpotApi.AsExchangeClient() + binanceClient.SpotApi.ComonSpotClient, + bitfinexClient.SpotApi.ComonSpotClient, + bittrexClient.SpotApi.ComonSpotClient, + bybitClient.SpotApi.ComonSpotClient, + coinexClient.SpotApi.ComonSpotClient, + ftxClient.TradeApi.ComonSpotClient, + huobiClient.SpotApi.ComonSpotClient, + krakenClient.SpotApi.ComonSpotClient, + kucoinClient.SpotApi.ComonSpotClient }; var tasks = clients.Select(c => (c.ExchangeName, c.GetTickerAsync(c.GetSymbolName("ETH", "BTC")))); @@ -49,7 +49,7 @@ { if(task.Item2.Result.Success) // TODO new version - _prices.Add(task.Item1, task.Item2.Result.Data.CommonHighPrice); + _prices.Add(task.Item1, task.Item2.Result.Data.HighPrice); } } diff --git a/Examples/BlazorClient/Program.cs b/Examples/BlazorClient/Program.cs index 985c8c2..19bee04 100644 --- a/Examples/BlazorClient/Program.cs +++ b/Examples/BlazorClient/Program.cs @@ -1,11 +1,5 @@ using Microsoft.AspNetCore.Hosting; -using Microsoft.Extensions.Configuration; using Microsoft.Extensions.Hosting; -using Microsoft.Extensions.Logging; -using System; -using System.Collections.Generic; -using System.Linq; -using System.Threading.Tasks; namespace BlazorClient { diff --git a/Examples/BlazorClient/Shared/NavMenu.razor b/Examples/BlazorClient/Shared/NavMenu.razor index 962c016..63bcaaf 100644 --- a/Examples/BlazorClient/Shared/NavMenu.razor +++ b/Examples/BlazorClient/Shared/NavMenu.razor @@ -13,8 +13,8 @@
  • - - Get data IExchangeClient + + Get data ISpotClient
  • diff --git a/Examples/BlazorClient/Startup.cs b/Examples/BlazorClient/Startup.cs index 2fa03bf..56a1818 100644 --- a/Examples/BlazorClient/Startup.cs +++ b/Examples/BlazorClient/Startup.cs @@ -1,21 +1,29 @@ +using Binance.Net; using Binance.Net.Clients; using Binance.Net.Interfaces.Clients; using Binance.Net.Objects; +using Bitfinex.Net; using Bitfinex.Net.Clients; using Bitfinex.Net.Interfaces.Clients; +using Bittrex.Net; using Bittrex.Net.Clients; using Bittrex.Net.Interfaces.Clients; +using Bybit.Net; using Bybit.Net.Clients; using Bybit.Net.Interfaces.Clients; using CoinEx.Net.Clients; using CoinEx.Net.Interfaces.Clients; using CryptoExchange.Net.Authentication; +using FTX.Net; using FTX.Net.Clients; using FTX.Net.Interfaces.Clients; +using Huobi.Net; using Huobi.Net.Clients; using Huobi.Net.Interfaces.Clients; +using Kraken.Net; using Kraken.Net.Clients; using Kraken.Net.Interfaces.Clients; +using Kucoin.Net; using Kucoin.Net.Clients; using Kucoin.Net.Interfaces.Clients; using Microsoft.AspNetCore.Builder; @@ -23,6 +31,7 @@ using Microsoft.AspNetCore.Hosting; using Microsoft.Extensions.Configuration; using Microsoft.Extensions.DependencyInjection; using Microsoft.Extensions.Hosting; +using Microsoft.Extensions.Logging; namespace BlazorClient { @@ -42,33 +51,25 @@ namespace BlazorClient services.AddRazorPages(); services.AddServerSideBlazor(); - // Register the rest clients as transient, will create a new one when needed - services.AddTransient(); - services.AddTransient(); - services.AddTransient(); - services.AddTransient(); - services.AddTransient(); - services.AddTransient(); - services.AddTransient(); - services.AddTransient(); - services.AddTransient(); + // Register the clients, options can be provided in the callback parameter + services.AddBinance((restClientOptions, socketClientOptions) => { + restClientOptions.ApiCredentials = new ApiCredentials("KEY", "SECRET"); + restClientOptions.LogLevel = LogLevel.Debug; - // Register the socket clients as scoped so the same instance will be reused per client - services.AddScoped(); - services.AddScoped(); - services.AddScoped(); - services.AddScoped(); - services.AddScoped(); - services.AddScoped(); - services.AddScoped(); - services.AddScoped(); - services.AddScoped(); - - // Can set default client options here, for instance: - BinanceClient.SetDefaultOptions(new BinanceClientOptions - { - ApiCredentials = new ApiCredentials("KEY", "SECRET") + socketClientOptions.ApiCredentials = new ApiCredentials("KEY", "SECRET"); }); + services.AddBitfinex(); + services.AddBittrex(); + services.AddBybit(); + //services.AddCoinEx(); + services.AddFTX(); + services.AddHuobi(); + services.AddKraken(); + services.AddKucoin(); + + // TODO remove when AddCoinEx fixed + services.AddScoped(); + services.AddScoped(); } // This method gets called by the runtime. Use this method to configure the HTTP request pipeline. diff --git a/Examples/global.json b/Examples/global.json deleted file mode 100644 index 14f07fd..0000000 --- a/Examples/global.json +++ /dev/null @@ -1,5 +0,0 @@ -{ - "sdk": { - "version": "5.0.103" - } -} \ No newline at end of file diff --git a/global.json b/global.json deleted file mode 100644 index bbbb71d..0000000 --- a/global.json +++ /dev/null @@ -1,5 +0,0 @@ -{ - "sdk": { - "version": "6.0.101" - } -} \ No newline at end of file