Feature/shared

ByBit.Net/Bybit.Net.csproj

@@ -34,7 +34,7 @@
     <ContinuousIntegrationBuild>true</ContinuousIntegrationBuild>
   </PropertyGroup>
   <ItemGroup Label="Deterministic Build" Condition="'$(Configuration)' == 'Release'">
-    <PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.0.0">
+    <PackageReference Include="Microsoft.SourceLink.GitHub" Version="8.0.0">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>
@@ -52,6 +52,6 @@
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>
-    <PackageReference Include="CryptoExchange.Net" Version="7.11.0" />
+    <PackageReference Include="CryptoExchange.Net" Version="8.0.0" />
   </ItemGroup>
 </Project>

ByBit.Net/Clients/CopyTradingApi/BybitRestClientCopyTradingApi.cs

@@ -5,6 +5,7 @@
 using CryptoExchange.Net.Authentication;
 using CryptoExchange.Net.Clients;
 using CryptoExchange.Net.Objects;
+using CryptoExchange.Net.SharedApis;
 using Microsoft.Extensions.Logging;
 using Newtonsoft.Json;
 using System;
@@ -58,7 +59,7 @@ internal BybitRestClientCopyTradingApi(ILogger logger, HttpClient? httpClient, B
         #endregion
 
         /// <inheritdoc />
-        public override string FormatSymbol(string baseAsset, string quoteAsset) => baseAsset.ToUpperInvariant() + quoteAsset.ToUpperInvariant();
+        public override string FormatSymbol(string baseAsset, string quoteAsset, TradingMode tradingMode, DateTime? deliverTime = null) => baseAsset.ToUpperInvariant() + quoteAsset.ToUpperInvariant();
 
         /// <inheritdoc />
         protected override AuthenticationProvider CreateAuthenticationProvider(ApiCredentials credentials)

ByBit.Net/Clients/DerivativesApi/BybitRestClientDerivativesApi.cs

@@ -9,6 +9,7 @@
 using CryptoExchange.Net.Authentication;
 using CryptoExchange.Net.Clients;
 using CryptoExchange.Net.Objects;
+using CryptoExchange.Net.SharedApis;
 using Microsoft.Extensions.Logging;
 using Newtonsoft.Json;
 using System;
@@ -69,7 +70,7 @@ protected override AuthenticationProvider CreateAuthenticationProvider(ApiCreden
             => new BybitAuthenticationProvider(credentials);
 
         /// <inheritdoc />
-        public override string FormatSymbol(string baseAsset, string quoteAsset) => baseAsset.ToUpperInvariant() + quoteAsset.ToUpperInvariant();
+        public override string FormatSymbol(string baseAsset, string quoteAsset, TradingMode tradingMode, DateTime? deliverTime = null) => baseAsset.ToUpperInvariant() + quoteAsset.ToUpperInvariant();
 
         /// <summary>
         /// Get url for an endpoint

ByBit.Net/Clients/DerivativesApi/BybitSocketClientDerivativesPublicApi.cs

@@ -14,6 +14,7 @@
 using CryptoExchange.Net.Interfaces;
 using CryptoExchange.Net.Objects;
 using CryptoExchange.Net.Objects.Sockets;
+using CryptoExchange.Net.SharedApis;
 using CryptoExchange.Net.Sockets;
 using Microsoft.Extensions.Logging;
 using Newtonsoft.Json;
@@ -43,7 +44,7 @@ internal BybitSocketClientDerivativesPublicApi(ILogger log, BybitSocketOptions o
         }
 
         /// <inheritdoc />
-        public override string FormatSymbol(string baseAsset, string quoteAsset) => baseAsset.ToUpperInvariant() + quoteAsset.ToUpperInvariant();
+        public override string FormatSymbol(string baseAsset, string quoteAsset, TradingMode tradingMode, DateTime? deliverTime = null) => baseAsset.ToUpperInvariant() + quoteAsset.ToUpperInvariant();
 
         /// <inheritdoc />
         public override string? GetListenerIdentifier(IMessageAccessor message)

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

@@ -278,7 +278,7 @@ public async Task<WebCallResult> SetRiskLimitAsync(string symbol, long riskId, P
         #region SetTradeModeAsync
 
         /// <inheritdoc />
-        public async Task<WebCallResult> SetTradeModeAsync(string symbol, TradeMode tradeMode, decimal buyLeverage, decimal sellLeverage, long? receiveWindow = null, CancellationToken ct = default)
+        public async Task<WebCallResult> SetTradeModeAsync(string symbol, Bybit.Net.Enums.TradeMode tradeMode, decimal buyLeverage, decimal sellLeverage, long? receiveWindow = null, CancellationToken ct = default)
         {
             var parameters = new Dictionary<string, object>()
             {

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

@@ -12,6 +12,7 @@
 using CryptoExchange.Net.Interfaces;
 using CryptoExchange.Net.Objects;
 using CryptoExchange.Net.Objects.Sockets;
+using CryptoExchange.Net.SharedApis;
 using CryptoExchange.Net.Sockets;
 using Microsoft.Extensions.Logging;
 using Newtonsoft.Json.Linq;
@@ -39,7 +40,7 @@ internal BybitSocketClientContractApi(ILogger log, BybitSocketOptions options)
         }
 
         /// <inheritdoc />
-        public override string FormatSymbol(string baseAsset, string quoteAsset) => baseAsset.ToUpperInvariant() + quoteAsset.ToUpperInvariant();
+        public override string FormatSymbol(string baseAsset, string quoteAsset, TradingMode tradingMode, DateTime? deliverTime = null) => baseAsset.ToUpperInvariant() + quoteAsset.ToUpperInvariant();
 
         /// <inheritdoc />
         protected override AuthenticationProvider CreateAuthenticationProvider(ApiCredentials credentials)

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

@@ -15,6 +15,7 @@
 using CryptoExchange.Net.Interfaces;
 using CryptoExchange.Net.Objects;
 using CryptoExchange.Net.Objects.Sockets;
+using CryptoExchange.Net.SharedApis;
 using CryptoExchange.Net.Sockets;
 using Microsoft.Extensions.Logging;
 using Newtonsoft.Json.Linq;
@@ -41,7 +42,7 @@ internal BybitSocketClientUnifiedMarginApi(ILogger log, BybitSocketOptions optio
         }
 
         /// <inheritdoc />
-        public override string FormatSymbol(string baseAsset, string quoteAsset) => baseAsset.ToUpperInvariant() + quoteAsset.ToUpperInvariant();
+        public override string FormatSymbol(string baseAsset, string quoteAsset, TradingMode tradingMode, DateTime? deliverTime = null) => baseAsset.ToUpperInvariant() + quoteAsset.ToUpperInvariant();
 
         /// <inheritdoc />
         protected override AuthenticationProvider CreateAuthenticationProvider(ApiCredentials credentials)

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

@@ -11,6 +11,7 @@
 using CryptoExchange.Net.CommonObjects;
 using CryptoExchange.Net.Interfaces.CommonClients;
 using CryptoExchange.Net.Objects;
+using CryptoExchange.Net.SharedApis;
 using Microsoft.Extensions.Logging;
 
 namespace Bybit.Net.Clients.SpotApi.v3
@@ -44,7 +45,7 @@ internal BybitRestClientSpotApiV3(ILogger logger, HttpClient? httpClient, BybitR
         #endregion
 
         /// <inheritdoc />
-        public override string FormatSymbol(string baseAsset, string quoteAsset) => baseAsset.ToUpperInvariant() + quoteAsset.ToUpperInvariant();
+        public override string FormatSymbol(string baseAsset, string quoteAsset, TradingMode tradingMode, DateTime? deliverTime = null) => baseAsset.ToUpperInvariant() + quoteAsset.ToUpperInvariant();
 
         #region Common interface
 

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

@@ -19,6 +19,7 @@
 using CryptoExchange.Net.Interfaces;
 using CryptoExchange.Net.Converters.MessageParsing;
 using CryptoExchange.Net.Clients;
+using CryptoExchange.Net.SharedApis;
 
 namespace Bybit.Net.Clients.SpotApi.v3
 {
@@ -41,7 +42,7 @@ protected override AuthenticationProvider CreateAuthenticationProvider(ApiCreden
             => new BybitAuthenticationProvider(credentials);
 
         /// <inheritdoc />
-        public override string FormatSymbol(string baseAsset, string quoteAsset) => baseAsset.ToUpperInvariant() + quoteAsset.ToUpperInvariant();
+        public override string FormatSymbol(string baseAsset, string quoteAsset, TradingMode tradingMode, DateTime? deliverTime = null) => baseAsset.ToUpperInvariant() + quoteAsset.ToUpperInvariant();
 
         /// <inheritdoc />
         public override string? GetListenerIdentifier(IMessageAccessor message)

ByBit.Net/Clients/V5/BybitRestClientApi.cs

@@ -2,7 +2,6 @@
 using CryptoExchange.Net;
 using CryptoExchange.Net.Authentication;
 using CryptoExchange.Net.Objects;
-using Newtonsoft.Json;
 using System;
 using System.Collections.Generic;
 using System.Net.Http;
@@ -17,11 +16,13 @@
 using CryptoExchange.Net.Clients;
 using CryptoExchange.Net.Converters.MessageParsing;
 using CryptoExchange.Net.Interfaces;
+using Bybit.Net.Interfaces.Clients;
+using CryptoExchange.Net.SharedApis;
 
 namespace Bybit.Net.Clients.V5
 {
     /// <inheritdoc cref="IBybitRestClientApi"/>
-    internal class BybitRestClientApi : RestApiClient, IBybitRestClientApi, ISpotClient
+    internal partial class BybitRestClientApi : RestApiClient, IBybitRestClientApi, ISpotClient
     {
         internal TimeSyncState _timeSyncState = new TimeSyncState("Bybit V5 API");
 
@@ -32,6 +33,7 @@ internal class BybitRestClientApi : RestApiClient, IBybitRestClientApi, ISpotCli
 
         /// <inheritdoc />
         public ISpotClient CommonSpotClient => this;
+        public IBybitRestClientApiShared SharedClient => this;
 
         /// <summary>
         /// Options
@@ -77,7 +79,25 @@ protected override AuthenticationProvider CreateAuthenticationProvider(ApiCreden
             => new BybitAuthenticationProvider(credentials);
 
         /// <inheritdoc />
-        public override string FormatSymbol(string baseAsset, string quoteAsset) => baseAsset.ToUpperInvariant() + quoteAsset.ToUpperInvariant();
+        public override string FormatSymbol(string baseAsset, string quoteAsset, TradingMode tradingMode, DateTime? deliverTime = null)
+        {
+            if (tradingMode == TradingMode.Spot)
+                return baseAsset.ToUpperInvariant() + quoteAsset.ToUpperInvariant();
+
+            if (tradingMode.IsLinear()) {
+                if (tradingMode.IsPerpetual())
+                {
+                    if (quoteAsset == "USDC")
+                        return baseAsset + "PERP";
+
+                    return baseAsset.ToUpperInvariant() + quoteAsset.ToUpperInvariant();
+                }
+
+                return baseAsset.ToUpperInvariant() + "-" + deliverTime!.Value.ToString("ddMMMyy").ToUpperInvariant();
+            }
+
+            return baseAsset.ToUpperInvariant() + quoteAsset.ToUpperInvariant() + (deliverTime == null ? string.Empty : (ExchangeHelpers.GetDeliveryMonthSymbol(deliverTime.Value) + deliverTime.Value.ToString("yy")));
+        }
 
         /// <summary>
         /// Get url for an endpoint

ByBit.Net/Clients/V5/BybitRestClientApiAccount.cs

@@ -93,7 +93,7 @@ public async Task<WebCallResult> SetMultipleCollateralAssetsAsync(
         public async Task<WebCallResult> SwitchCrossIsolatedMarginAsync(
             Category category,
             string symbol,
-            TradeMode tradeMode,
+            Enums.TradeMode tradeMode,
             decimal buyLeverage,
             decimal sellLeverage,
             CancellationToken ct = default)