Updated CryptoExchange.Net version, added CommonSpotClient to DI, upd…

…ated common ticker function to include last price
JKorf · Oct 9, 2023 · edae854 · edae854
1 parent e684d00
commit edae854
Show file tree

Hide file tree

Showing 3 changed files with 30 additions and 15 deletions.
diff --git a/Bittrex.Net/Bittrex.Net.csproj b/Bittrex.Net/Bittrex.Net.csproj
@@ -39,7 +39,7 @@
     </PackageReference>
   </ItemGroup>
   <ItemGroup>
-    <PackageReference Include="CryptoExchange.Net" Version="6.1.0" />
+    <PackageReference Include="CryptoExchange.Net" Version="6.1.5" />
     <PackageReference Include="Microsoft.AspNet.SignalR.Client" Version="2.4.2" />
     <PackageReference Include="Microsoft.CSharp" Version="4.5.0" />
     <PackageReference Include="ConfigureAwaitChecker.Analyzer" Version="5.0.0">

diff --git a/Bittrex.Net/BittrexHelpers.cs b/Bittrex.Net/BittrexHelpers.cs
@@ -75,6 +75,7 @@ public static IServiceCollection AddBittrex(
 
             services.AddSingleton<IBittrexOrderBookFactory, BittrexOrderBookFactory>();
             services.AddTransient<IBittrexRestClient, BittrexRestClient>();
+            services.AddTransient(x => x.GetRequiredService<IBittrexRestClient>().SpotApi.CommonSpotClient);
             if (socketClientLifeTime == null)
                 services.AddSingleton<IBittrexSocketClient, BittrexSocketClient>();
             else

diff --git a/Bittrex.Net/Clients/SpotApi/BittrexRestClientSpotApi.cs b/Bittrex.Net/Clients/SpotApi/BittrexRestClientSpotApi.cs
@@ -97,33 +97,47 @@ async Task<WebCallResult<Ticker>> IBaseRestClient.GetTickerAsync(string symbol,
             if (string.IsNullOrEmpty(symbol))
                 throw new ArgumentException(nameof(symbol) + " required for Bittrex " + nameof(ISpotClient.GetTickerAsync), nameof(symbol));
 
-            var ticker = await ExchangeData.GetSymbolSummaryAsync(symbol, ct: ct).ConfigureAwait(false);
-            if (!ticker)
-                return ticker.As<Ticker>(null);
+            var tickerTask = ExchangeData.GetTickerAsync(symbol, ct: ct);
+            var summaryTask = ExchangeData.GetSymbolSummaryAsync(symbol, ct: ct);
+            await Task.WhenAll(tickerTask, summaryTask).ConfigureAwait(false);
 
-            return ticker.As(new Ticker
+            if (!tickerTask.Result)
+                return tickerTask.Result.As<Ticker>(null);
+
+            if (!summaryTask.Result)
+                return summaryTask.Result.As<Ticker>(null);
+
+            return tickerTask.Result.As(new Ticker
             {
-                SourceObject = ticker.Data,
-                Symbol = ticker.Data.Symbol,
-                HighPrice = ticker.Data.HighPrice,
-                LowPrice = ticker.Data.LowPrice,
-                Volume = ticker.Data.Volume
+                SourceObject = tickerTask.Result.Data,
+                Symbol = tickerTask.Result.Data.Symbol,
+                HighPrice = summaryTask.Result.Data.HighPrice,
+                LowPrice = summaryTask.Result.Data.LowPrice,
+                Volume = summaryTask.Result.Data.Volume,
+                LastPrice = tickerTask.Result.Data.LastPrice
             });
         }
 
         async Task<WebCallResult<IEnumerable<Ticker>>> IBaseRestClient.GetTickersAsync(CancellationToken ct)
         {
-            var tickers = await ExchangeData.GetSymbolSummariesAsync(ct: ct).ConfigureAwait(false);
-            if (!tickers)
-                return tickers.As<IEnumerable<Ticker>>(null);
+            var tickerTask = ExchangeData.GetTickersAsync(ct: ct);
+            var summaryTask = ExchangeData.GetSymbolSummariesAsync(ct: ct);
+            await Task.WhenAll(tickerTask, summaryTask).ConfigureAwait(false);
+
+            if (!tickerTask.Result)
+                return tickerTask.Result.As<IEnumerable<Ticker>>(null);
+
+            if (!summaryTask.Result)
+                return summaryTask.Result.As<IEnumerable<Ticker>>(null);
 
-            return tickers.As(tickers.Data.Select(t => new Ticker
+            return tickerTask.Result.As(summaryTask.Result.Data.Select(t => new Ticker
             {
                 SourceObject = t,
                 Symbol = t.Symbol,
                 HighPrice = t.HighPrice,
                 LowPrice = t.LowPrice,
-                Volume = t.Volume
+                Volume = t.Volume,
+                LastPrice = tickerTask.Result.Data.SingleOrDefault(ti => ti.Symbol == t.Symbol)?.LastPrice
             }));
         }