Merge branch 'main' into main

JKorf · Mar 5, 2024 · 0ab955a · 0ab955a
2 parents 2728c53 + fa9ed58
commit 0ab955a
Show file tree

Hide file tree

Showing 304 changed files with 1,462 additions and 21,178 deletions.
diff --git a/ByBit.Net/Bybit.Net.csproj b/ByBit.Net/Bybit.Net.csproj
@@ -2,17 +2,17 @@
   <PropertyGroup>
     <TargetFrameworks>netstandard2.0;netstandard2.1</TargetFrameworks>
     <Nullable>enable</Nullable>
-    <LangVersion>9.0</LangVersion>
+    <LangVersion>10.0</LangVersion>
   </PropertyGroup>
   <PropertyGroup>
     <PackageId>Bybit.Net</PackageId>
     <Authors>JKorf</Authors>
-    <PackageVersion>3.3.0</PackageVersion>
-    <AssemblyVersion>3.3.0</AssemblyVersion>
-    <FileVersion>3.3.0</FileVersion>
-    <Description>Bybit.Net is a .Net wrapper for the Bybit API. It includes all features the API provides, REST API and Websocket, using clear and readable objects including but not limited to Reading market info, Placing and managing orders and Reading balances and funds</Description>
+    <PackageVersion>3.5.2</PackageVersion>
+    <AssemblyVersion>3.5.2</AssemblyVersion>
+    <FileVersion>3.5.2</FileVersion>
+    <Description>Bybit.Net is a client library for accessing the Bybit REST and Websocket API. All data is mapped to readable models and enum values. Additional features include an implementation for maintaining a client side order book, easy integration with other exchange client libraries and more.</Description>
     <PackageRequireLicenseAcceptance>false</PackageRequireLicenseAcceptance>
-    <PackageTags>Bybit Bybit.Net C# .Net CryptoCurrency Exchange API wrapper</PackageTags>
+    <PackageTags>Bybit;Bybit.Net;Bybit Client;Bybit API;CryptoCurrency;CryptoCurrency Exchange</PackageTags>
     <RepositoryType>git</RepositoryType>
     <RepositoryUrl>https://github.com/JKorf/Bybit.Net.git</RepositoryUrl>
     <PackageProjectUrl>https://github.com/JKorf/Bybit.Net</PackageProjectUrl>
@@ -21,7 +21,7 @@
     <PackageReadmeFile>README.md</PackageReadmeFile>
     <NeutralLanguage>en</NeutralLanguage>
     <GeneratePackageOnBuild>true</GeneratePackageOnBuild>
-    <PackageReleaseNotes>3.3.0 - Added V5Api.Account.GetBrokerEarningsAsync endpoint, Added V5Api.Account.GetBrokerAccountInfoAsync endpoint, Added V5Api.Account.GetInternalDepositsAsync endpoint, Added V5Api.Account.SetMultipleCollateralAssetsAsync endpoint, Added PricePercentageFilter to V5Api.ExchangeData.GetSpotSymbolsAsync model, Updated various endpoint parameters and models</PackageReleaseNotes>
+    <PackageReleaseNotes>https://github.com/JKorf/Bybit.Net?tab=readme-ov-file#release-notes</PackageReleaseNotes>
   </PropertyGroup>
   <PropertyGroup>
     <DocumentationFile>Bybit.Net.xml</DocumentationFile>
@@ -48,12 +48,10 @@
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>
-    <PackageReference Include="Microsoft.CodeAnalysis.NetAnalyzers" Version="6.0.0">
+    <PackageReference Include="CryptoExchange.Net" Version="7.0.0" />
+    <PackageReference Include="Microsoft.CodeAnalysis.NetAnalyzers" Version="8.0.0">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>
   </ItemGroup>
-  <ItemGroup>
-    <PackageReference Include="CryptoExchange.Net" Version="6.2.5" />
-  </ItemGroup>
 </Project>
diff --git a/ByBit.Net/Clients/BybitRestClient.cs b/ByBit.Net/Clients/BybitRestClient.cs
@@ -1,17 +1,7 @@
 using Bybit.Net.Clients.CopyTradingApi;
-using Bybit.Net.Clients.GeneralApi;
-using Bybit.Net.Clients.InverseFuturesApi;
-using Bybit.Net.Clients.InversePerpetualApi;
-using Bybit.Net.Clients.UsdPerpetualApi;
 using Bybit.Net.Interfaces.Clients;
 using Bybit.Net.Interfaces.Clients.CopyTradingApi;
-using Bybit.Net.Interfaces.Clients.GeneralApi;
-using Bybit.Net.Interfaces.Clients.InverseFuturesApi;
-using Bybit.Net.Interfaces.Clients.InversePerpetualApi;
-using Bybit.Net.Interfaces.Clients.SpotApi.v1;
-using Bybit.Net.Interfaces.Clients.UsdPerpetualApi;
 using CryptoExchange.Net;
-using Bybit.Net.Clients.SpotApi.v1;
 using Bybit.Net.Clients.SpotApi.v3;
 using Bybit.Net.Interfaces.Clients.SpotApi.v3;
 using Bybit.Net.Interfaces.Clients.DerivativesApi;
@@ -27,19 +17,9 @@ namespace Bybit.Net.Clients
     /// <inheritdoc cref="IBybitRestClient" />
     public class BybitRestClient : BaseRestClient, IBybitRestClient
     {
-        /// <inheritdoc />
-        public IBybitRestClientGeneralApi GeneralApi { get; }
-        /// <inheritdoc />
-        public IBybitRestClientSpotApiV1 SpotApiV1 { get; }
         /// <inheritdoc />
         public IBybitRestClientSpotApiV3 SpotApiV3 { get; }
         /// <inheritdoc />
-        public IBybitRestClientInversePerpetualApi InversePerpetualApi { get; }
-        /// <inheritdoc />
-        public IBybitRestClientInverseFuturesApi InverseFuturesApi { get; }
-        /// <inheritdoc />
-        public IBybitRestClientUsdPerpetualApi UsdPerpetualApi { get; }
-        /// <inheritdoc />
         public IBybitRestClientCopyTradingApi CopyTradingApi { get; }
         /// <inheritdoc />
         public IBybitRestClientDerivativesApi DerivativesApi { get; }
@@ -51,14 +31,7 @@ public class BybitRestClient : BaseRestClient, IBybitRestClient
         /// Create a new instance of the BybitRestClient using provided options
         /// </summary>
         /// <param name="optionsDelegate">Option configuration delegate</param>
-        public BybitRestClient(Action<BybitRestOptions> optionsDelegate) : this(null, null, optionsDelegate)
-        {
-        }
-
-        /// <summary>
-        /// Create a new instance of the BybitRestClient using default options
-        /// </summary>
-        public BybitRestClient(ILoggerFactory? loggerFactory = null, HttpClient? httpClient = null) : this(httpClient, loggerFactory, null)
+        public BybitRestClient(Action<BybitRestOptions>? optionsDelegate = null) : this(null, null, optionsDelegate)
         {
         }
 
@@ -76,12 +49,7 @@ public BybitRestClient(HttpClient? httpClient, ILoggerFactory? loggerFactory, Ac
                 optionsDelegate(options);
             Initialize(options);
 
-            InversePerpetualApi = AddApiClient(new BybitRestClientInversePerpetualApi(_logger, httpClient, options));
-            InverseFuturesApi = AddApiClient(new BybitRestClientInverseFuturesApi(_logger, httpClient, options));
-            UsdPerpetualApi = AddApiClient(new BybitRestClientUsdPerpetualApi(_logger, httpClient, options));
-            SpotApiV1 = AddApiClient(new BybitRestClientSpotApiV1(_logger, httpClient, options));
             SpotApiV3 = AddApiClient(new BybitRestClientSpotApiV3(_logger, httpClient, options));
-            GeneralApi = AddApiClient(new BybitRestClientGeneralApi(_logger, this, httpClient, options));
             CopyTradingApi = AddApiClient(new BybitRestClientCopyTradingApi(_logger, httpClient, options));
             DerivativesApi = AddApiClient(new BybitRestClientDerivativesApi(_logger, httpClient, options));
             V5Api = AddApiClient(new V5.BybitRestClientApi(_logger, httpClient, options));
@@ -103,12 +71,7 @@ public static void SetDefaultOptions(Action<BybitRestOptions> optionsDelegate)
         /// <inheritdoc />
         public void SetApiCredentials(ApiCredentials credentials)
         {
-            InversePerpetualApi.SetApiCredentials(credentials);
-            InverseFuturesApi.SetApiCredentials(credentials);
-            UsdPerpetualApi.SetApiCredentials(credentials);
-            SpotApiV1.SetApiCredentials(credentials);
             SpotApiV3.SetApiCredentials(credentials);
-            GeneralApi.SetApiCredentials(credentials);
             CopyTradingApi.SetApiCredentials(credentials);
             DerivativesApi.SetApiCredentials(credentials);
             V5Api.SetApiCredentials(credentials);

diff --git a/ByBit.Net/Clients/BybitSocketClient.cs b/ByBit.Net/Clients/BybitSocketClient.cs
@@ -1,48 +1,27 @@
-using Bybit.Net.Objects;
-using CryptoExchange.Net;
+using CryptoExchange.Net;
 using System;
 using Bybit.Net.Interfaces.Clients;
-using Bybit.Net.Interfaces.Clients.UsdPerpetualApi;
-using Bybit.Net.Interfaces.Clients.InversePerpetualApi;
-using Bybit.Net.Clients.InversePerpetualApi;
-using Bybit.Net.Clients.UsdPerpetualApi;
-using Bybit.Net.Clients.SpotApi.v1;
-using Bybit.Net.Clients.SpotApi.v2;
-using Bybit.Net.Clients.SpotApi.v3;
-using Bybit.Net.Interfaces.Clients.SpotApi.v1;
-using Bybit.Net.Interfaces.Clients.SpotApi.v2;
 using Bybit.Net.Interfaces.Clients.SpotApi.v3;
 using Bybit.Net.Interfaces.Clients.DerivativesApi.UnifiedMarginApi;
 using Bybit.Net.Interfaces.Clients.DerivativesApi.ContractApi;
-using Bybit.Net.Clients.DerivativesApi.UnifiedMarginApi;
-using Bybit.Net.Clients.DerivativesApi.ContractApi;
-using Bybit.Net.Clients.DerivativesApi;
 using Bybit.Net.Interfaces.Clients.DerivativesApi;
 using CryptoExchange.Net.Authentication;
 using Bybit.Net.Clients.V5;
 using Bybit.Net.Interfaces.Clients.V5;
 using Microsoft.Extensions.Logging;
 using Bybit.Net.Objects.Options;
+using Bybit.Net.Clients.DerivativesApi;
+using Bybit.Net.Clients.DerivativesApi.ContractApi;
+using Bybit.Net.Clients.DerivativesApi.UnifiedMarginApi;
+using Bybit.Net.Clients.SpotApi.v3;
 
 namespace Bybit.Net.Clients
 {
     /// <inheritdoc cref="IBybitSocketClient" />
     public class BybitSocketClient : BaseSocketClient, IBybitSocketClient
     {
-        /// <inheritdoc />
-        public IBybitSocketClientUsdPerpetualApi UsdPerpetualApi { get; }
-        /// <inheritdoc />
-        public IBybitSocketClientInversePerpetualApi InversePerpetualApi { get; }
-        /// <inheritdoc />
-        public IBybitSocketClientSpotApiV1 SpotV1Api { get; }
-        /// <inheritdoc />
-        public IBybitSocketClientSpotApiV2 SpotV2Api { get; }
         /// <inheritdoc />
         public IBybitSocketClientSpotApiV3 SpotV3Api { get; }
-
-        /// <inheritdoc />
-        public IBybitSocketClientCopyTradingApi CopyTradingApi { get; }
-
         /// <inheritdoc />
         public IBybitSocketClientDerivativesPublicApi DerivativesApi { get; }
         /// <inheritdoc />
@@ -87,14 +66,8 @@ public BybitSocketClient(Action<BybitSocketOptions> optionsDelegate, ILoggerFact
             optionsDelegate(options);
             Initialize(options);
 
-            UsdPerpetualApi = AddApiClient(new BybitSocketClientUsdPerpetualApi(_logger, options));
-            InversePerpetualApi = AddApiClient(new BybitSocketClientInversePerpetualApi(_logger, options));
-            SpotV1Api = AddApiClient(new BybitSocketClientSpotApiV1(_logger, options));
-            SpotV2Api = AddApiClient(new BybitSocketClientSpotApiV2(_logger, options));
             SpotV3Api = AddApiClient(new BybitSocketClientSpotApiV3(_logger, options));
 
-            CopyTradingApi = AddApiClient(new BybitSocketClientCopyTradingApi(_logger, options));
-
             DerivativesApi = AddApiClient(new BybitSocketClientDerivativesPublicApi(_logger, options));
             UnifiedMarginApi = AddApiClient(new BybitSocketClientUnifiedMarginApi(_logger, options));
             ContractApi = AddApiClient(new BybitSocketClientContractApi(_logger, options));
@@ -120,12 +93,7 @@ public static void SetDefaultOptions(Action<BybitSocketOptions> optionsDelegate)
         /// <inheritdoc />
         public void SetApiCredentials(ApiCredentials credentials)
         {
-            UsdPerpetualApi.SetApiCredentials(credentials);
-            InversePerpetualApi.SetApiCredentials(credentials);
-            SpotV1Api.SetApiCredentials(credentials);
-            SpotV2Api.SetApiCredentials(credentials);
             SpotV3Api.SetApiCredentials(credentials);
-            CopyTradingApi.SetApiCredentials(credentials);
             DerivativesApi.SetApiCredentials(credentials);
             UnifiedMarginApi.SetApiCredentials(credentials);
             ContractApi.SetApiCredentials(credentials);