Feature/cryptoclients update (#208)

ByBit.Net/Bybit.Net.csproj

@@ -52,6 +52,6 @@
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>
-    <PackageReference Include="CryptoExchange.Net" Version="7.3.3" />
+    <PackageReference Include="CryptoExchange.Net" Version="7.4.0" />
   </ItemGroup>
 </Project>

ByBit.Net/BybitExchange.cs

@@ -0,0 +1,26 @@
+namespace Bybit.Net
+{
+    /// <summary>
+    /// Bybit exchange information and configuration
+    /// </summary>
+    public static class BybitExchange
+    {
+        /// <summary>
+        /// Exchange name
+        /// </summary>
+        public static string ExchangeName => "Bybit";
+
+        /// <summary>
+        /// Url to the main website
+        /// </summary>
+        public static string Url { get; } = "https://www.bybit.com";
+
+        /// <summary>
+        /// Urls to the API documentation
+        /// </summary>
+        public static string[] ApiDocsUrl { get; } = new[] {
+            "https://bybit-exchange.github.io/docs/v3/intro",
+            "https://bybit-exchange.github.io/docs/v5/intro"
+            };
+    }
+}

ByBit.Net/Clients/CopyTradingApi/BybitRestClientCopyTradingApi.cs

@@ -57,6 +57,9 @@ internal BybitRestClientCopyTradingApi(ILogger logger, HttpClient? httpClient, B
         }
         #endregion
 
+        /// <inheritdoc />
+        public override string FormatSymbol(string baseAsset, string quoteAsset) => baseAsset.ToUpperInvariant() + quoteAsset.ToUpperInvariant();
+
         /// <inheritdoc />
         protected override AuthenticationProvider CreateAuthenticationProvider(ApiCredentials credentials)
             => new BybitAuthenticationProvider(credentials);

ByBit.Net/Clients/DerivativesApi/BybitRestClientDerivativesApi.cs

@@ -68,6 +68,9 @@ internal BybitRestClientDerivativesApi(ILogger logger, HttpClient? httpClient, B
         protected override AuthenticationProvider CreateAuthenticationProvider(ApiCredentials credentials)
             => new BybitAuthenticationProvider(credentials);
 
+        /// <inheritdoc />
+        public override string FormatSymbol(string baseAsset, string quoteAsset) => baseAsset.ToUpperInvariant() + quoteAsset.ToUpperInvariant();
+
         /// <summary>
         /// Get url for an endpoint
         /// </summary>

ByBit.Net/Clients/DerivativesApi/BybitSocketClientDerivativesPublicApi.cs

@@ -43,6 +43,9 @@ internal BybitSocketClientDerivativesPublicApi(ILogger log, BybitSocketOptions o
             RegisterPeriodicQuery("Heartbeat", TimeSpan.FromSeconds(20), x => new BybitQuery("ping", null), x => { });
         }
 
+        /// <inheritdoc />
+        public override string FormatSymbol(string baseAsset, string quoteAsset) => baseAsset.ToUpperInvariant() + quoteAsset.ToUpperInvariant();
+
         /// <inheritdoc />
         public override string? GetListenerIdentifier(IMessageAccessor message)
         {

ByBit.Net/Clients/DerivativesApi/ContractApi/BybitSocketClientContractApi.cs

@@ -38,6 +38,9 @@ internal BybitSocketClientContractApi(ILogger log, BybitSocketOptions options)
             RegisterPeriodicQuery("Heartbeat", TimeSpan.FromSeconds(20), x => new BybitQuery("ping", null), x => { });
         }
 
+        /// <inheritdoc />
+        public override string FormatSymbol(string baseAsset, string quoteAsset) => baseAsset.ToUpperInvariant() + quoteAsset.ToUpperInvariant();
+
         /// <inheritdoc />
         protected override AuthenticationProvider CreateAuthenticationProvider(ApiCredentials credentials)
             => new BybitAuthenticationProvider(credentials);

ByBit.Net/Clients/DerivativesApi/UnifiedMarginApi/BybitSocketClientUnifiedMarginApi.cs

@@ -40,6 +40,9 @@ internal BybitSocketClientUnifiedMarginApi(ILogger log, BybitSocketOptions optio
             RegisterPeriodicQuery("Heartbeat", TimeSpan.FromSeconds(20), x => new BybitPingQuery(), x => { });
         }
 
+        /// <inheritdoc />
+        public override string FormatSymbol(string baseAsset, string quoteAsset) => baseAsset.ToUpperInvariant() + quoteAsset.ToUpperInvariant();
+
         /// <inheritdoc />
         protected override AuthenticationProvider CreateAuthenticationProvider(ApiCredentials credentials)
             => new BybitAuthenticationProvider(credentials);

ByBit.Net/Clients/SpotApi/v3/BybitRestClientSpotApiV3.cs

@@ -43,6 +43,9 @@ internal BybitRestClientSpotApiV3(ILogger logger, HttpClient? httpClient, BybitR
         }
         #endregion
 
+        /// <inheritdoc />
+        public override string FormatSymbol(string baseAsset, string quoteAsset) => baseAsset.ToUpperInvariant() + quoteAsset.ToUpperInvariant();
+
         #region Common interface
 
         /// <inheritdoc />

ByBit.Net/Clients/SpotApi/v3/BybitSocketClientSpotApiV3.cs

@@ -40,6 +40,9 @@ internal BybitSocketClientSpotApiV3(ILogger logger, BybitSocketOptions options)
         protected override AuthenticationProvider CreateAuthenticationProvider(ApiCredentials credentials)
             => new BybitAuthenticationProvider(credentials);
 
+        /// <inheritdoc />
+        public override string FormatSymbol(string baseAsset, string quoteAsset) => baseAsset.ToUpperInvariant() + quoteAsset.ToUpperInvariant();
+
         /// <inheritdoc />
         public override string? GetListenerIdentifier(IMessageAccessor message)
         {

ByBit.Net/Clients/V5/BybitRestClientApi.cs

@@ -75,6 +75,9 @@ internal BybitRestClientApi(ILogger logger, HttpClient? httpClient, BybitRestOpt
         protected override AuthenticationProvider CreateAuthenticationProvider(ApiCredentials credentials)
             => new BybitAuthenticationProvider(credentials);
 
+        /// <inheritdoc />
+        public override string FormatSymbol(string baseAsset, string quoteAsset) => baseAsset.ToUpperInvariant() + quoteAsset.ToUpperInvariant();
+
         /// <summary>
         /// Get url for an endpoint
         /// </summary>
@@ -103,6 +106,18 @@ protected override async Task<WebCallResult<DateTime>> GetServerTimestampAsync()
         public override TimeSpan? GetTimeOffset()
             => _timeSyncState.TimeOffset;
 
+        internal async Task<WebCallResult> SendAsync(RequestDefinition definition, ParameterCollection? parameters, CancellationToken cancellationToken, int? weight = null)
+        {
+            var result = await base.SendAsync<BybitResult<object>>(BaseAddress, definition, parameters, cancellationToken, null, weight).ConfigureAwait(false);
+            if (!result)
+                return result.AsDataless();
+
+            if (result.Data.ReturnCode != 0)
+                return result.AsDatalessError(new ServerError(result.Data.ReturnCode, result.Data.ReturnMessage));
+
+            return result.AsDataless();
+        }
+
         internal async Task<WebCallResult<BybitExtResult<T, U>>> SendRequestFullResponseAsync<T,U>(
              Uri uri,
              HttpMethod method,

ByBit.Net/Clients/V5/BybitRestClientApiAccount.cs

@@ -12,12 +12,15 @@
 using System.Globalization;
 using Bybit.Net.Interfaces.Clients.V5;
 using Bybit.Net.Objects.Internal;
+using System.Linq;
 
 namespace Bybit.Net.Clients.V5
 {
     /// <inheritdoc />
     public class BybitRestClientApiAccount : IBybitRestClientApiAccount
     {
+        private static readonly RequestDefinitionCache _definitions = new RequestDefinitionCache();
+
         private BybitRestClientApi _baseClient;
 
         internal BybitRestClientApiAccount(BybitRestClientApi baseClient)
@@ -1005,5 +1008,19 @@ public async Task<WebCallResult<IEnumerable<BybitLiabilityRepayment>>> RepayLiab
         }
 
         #endregion
+
+        #region Request Demo Funds
+
+        /// <inheritdoc />
+        public async Task<WebCallResult> RequestDemoFundsAsync(Dictionary<string, decimal> funds, CancellationToken ct = default)
+        {
+            var parameters = new ParameterCollection();
+            parameters.AddOptionalParameter("utaDemoApplyMoney", funds.Select(f => new { coin = f.Key, amountStr = f.Value.ToString(CultureInfo.InvariantCulture) }));
+
+            var request = _definitions.GetOrCreate(HttpMethod.Post, "v5/account/demo-apply-money", true);
+            return await _baseClient.SendAsync(request, parameters, ct).ConfigureAwait(false);
+        }
+
+        #endregion
     }
 }

ByBit.Net/Clients/V5/BybitSocketClientBaseApi.cs

@@ -37,6 +37,9 @@ internal BybitSocketClientBaseApi(ILogger log, BybitSocketOptions options, strin
             HandleMessageBeforeConfirmation = true;
         }
 
+        /// <inheritdoc />
+        public override string FormatSymbol(string baseAsset, string quoteAsset) => baseAsset.ToUpperInvariant() + quoteAsset.ToUpperInvariant();
+
         /// <inheritdoc />
         public virtual Task<CallResult<UpdateSubscription>> SubscribeToOrderbookUpdatesAsync(string symbol, int depth, Action<DataEvent<BybitOrderbook>> updateHandler, CancellationToken ct = default)
             => SubscribeToOrderbookUpdatesAsync(new string[] { symbol }, depth, updateHandler, ct);

ByBit.Net/Clients/V5/BybitSocketClientPrivateApi.cs

@@ -38,6 +38,9 @@ internal BybitSocketClientPrivateApi(ILogger logger, BybitSocketOptions options)
         /// <inheritdoc />
         protected override AuthenticationProvider CreateAuthenticationProvider(ApiCredentials credentials) => new BybitAuthenticationProvider(credentials);
 
+        /// <inheritdoc />
+        public override string FormatSymbol(string baseAsset, string quoteAsset) => baseAsset.ToUpperInvariant() + quoteAsset.ToUpperInvariant();
+
         /// <inheritdoc />
         protected override Query? GetAuthenticationRequest()
         {

ByBit.Net/Enums/TransactionLogType.cs

@@ -38,6 +38,11 @@ public enum TransactionLogType
         [Map("LIQUIDATION")]
         Liquidation,
         /// <summary>
+        /// Auto deleveraging
+        /// </summary>
+        [Map("ADL")]
+        Adl,
+        /// <summary>
         /// Airdrop
         /// </summary>
         [Map("AIRDROP")]
@@ -168,5 +173,33 @@ public enum TransactionLogType
         /// </summary>
         [Map("PREMARKET_ROLLBACK_PLEDGE_PENALTY_TO_BUYER")]
         PreMarketRollbackPledgePenaltyToBuyer,
+        /// <summary>
+        /// </summary>
+        [Map("CUSTODY_NETWORK_FEE")]
+        CustodyNetworkFee,
+        /// <summary>
+        /// </summary>
+        [Map("CUSTODY_SETTLE_FEE")]
+        CustodySettleFee,
+        /// <summary>
+        /// </summary>
+        [Map("CUSTODY_LOCK")]
+        CustodyLock,
+        /// <summary>
+        /// </summary>
+        [Map("CUSTODY_UNLOCK")]
+        CustodyUnlock,
+        /// <summary>
+        /// </summary>
+        [Map("CUSTODY_UNLOCK_REFUND")]
+        CustodyUnlockRefund,
+        /// <summary>
+        /// </summary>
+        [Map("LOANS_BORROW_FUNDS")]
+        LoansBorrowFunds,
+        /// <summary>
+        /// </summary>
+        [Map("LOANS_ASSET_REDEMPTION")]
+        LoansAssetRedemption,
     }
 }

ByBit.Net/ExtensionMethods/ServiceCollectionExtensions.cs

@@ -59,7 +59,7 @@ public static IServiceCollection AddBybit(
 
             services.AddTransient<ICryptoRestClient, CryptoRestClient>();
             services.AddTransient<ICryptoSocketClient, CryptoSocketClient>();
-            services.AddSingleton<IBybitOrderBookFactory, BybitOrderBookFactory>();
+            services.AddTransient<IBybitOrderBookFactory, BybitOrderBookFactory>();
             services.AddTransient(x => x.GetRequiredService<IBybitRestClient>().V5Api.CommonSpotClient);
             if (socketClientLifeTime == null)
                 services.AddSingleton<IBybitSocketClient, BybitSocketClient>();

ByBit.Net/Interfaces/Clients/V5/IBybitRestClientApiAccount.cs

@@ -575,5 +575,14 @@ Task<WebCallResult<BybitPosition>> AddOrReduceMarginAsync(
         /// <param name="ct">Cancellation token</param>
         /// <returns></returns>
         Task<WebCallResult<IEnumerable<BybitLiabilityRepayment>>> RepayLiabilitiesAsync(string? asset = null, CancellationToken ct = default);
+
+        /// <summary>
+        /// Request funds for demo trading
+        /// <para><a href="https://bybit-exchange.github.io/docs/v5/demo#request-demo-trading-funds" /></para>
+        /// </summary>
+        /// <param name="funds">Dictionary of the asset and amount you want to receive. Only BTC, ETH, USDT or USDC supported</param>
+        /// <param name="ct">Cancellation token</param>
+        /// <returns></returns>
+        Task<WebCallResult> RequestDemoFundsAsync(Dictionary<string, decimal> funds, CancellationToken ct = default);
     }
 }

ByBit.Net/Interfaces/IBybitOrderBookFactory.cs

@@ -10,6 +10,21 @@ namespace Bybit.Net.Interfaces
     /// </summary>
     public interface IBybitOrderBookFactory
     {
+        /// <summary>
+        /// Spot order book factory methods
+        /// </summary>
+        public IOrderBookFactory<BybitOrderBookOptions> Spot { get; }
+
+        /// <summary>
+        /// Options order book factory methods
+        /// </summary>
+        public IOrderBookFactory<BybitOrderBookOptions> Options { get; }
+
+        /// <summary>
+        /// Linear/Inverse order book factory methods
+        /// </summary>
+        public IOrderBookFactory<BybitOrderBookOptions> LinearInverse { get; }
+
         /// <summary>
         /// Create a SymbolOrderBook specifying the category
         /// </summary>

ByBit.Net/Objects/Models/V5/BybitInsurance.cs

@@ -13,6 +13,11 @@ public class BybitInsurance
         [JsonProperty("coin")]
         public string Asset { get; set; } = string.Empty;
         /// <summary>
+        /// Symbols
+        /// </summary>
+        [JsonProperty("symbols")]
+        public string Symbols { get; set; } = string.Empty;
+        /// <summary>
         /// Balance
         /// </summary>
         public decimal Balance { get; set; }

ByBit.Net/SymbolOrderBooks/BybitOrderBookFactory.cs

@@ -3,6 +3,7 @@
 using Bybit.Net.Interfaces.Clients;
 using Bybit.Net.Objects.Options;
 using CryptoExchange.Net.Interfaces;
+using CryptoExchange.Net.OrderBook;
 using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.Logging;
 using System;
@@ -14,13 +15,26 @@ public class BybitOrderBookFactory : IBybitOrderBookFactory
     {
         private readonly IServiceProvider _serviceProvider;
 
+        /// <inheritdoc />
+        public IOrderBookFactory<BybitOrderBookOptions> Spot { get; }
+
+        /// <inheritdoc />
+        public IOrderBookFactory<BybitOrderBookOptions> Options { get; }
+
+        /// <inheritdoc />
+        public IOrderBookFactory<BybitOrderBookOptions> LinearInverse { get; }
+
         /// <summary>
         /// ctor
         /// </summary>
         /// <param name="serviceProvider">Service provider for resolving logging and clients</param>
         public BybitOrderBookFactory(IServiceProvider serviceProvider)
         {
             _serviceProvider = serviceProvider;
+
+            Spot = new OrderBookFactory<BybitOrderBookOptions>((symbol, options) => CreateSpot(symbol, options), (baseAsset, quoteAsset, options) => CreateSpot(baseAsset + quoteAsset, options));
+            Options = new OrderBookFactory<BybitOrderBookOptions>((symbol, options) => CreateOption(symbol, options), (baseAsset, quoteAsset, options) => CreateOption(baseAsset + quoteAsset, options));
+            LinearInverse = new OrderBookFactory<BybitOrderBookOptions>((symbol, options) => CreateLinearInverse(symbol, options), (baseAsset, quoteAsset, options) => CreateLinearInverse(baseAsset + quoteAsset, options));
         }
 
         /// <inheritdoc />