Feature/credentials update

BingX.Net.UnitTests/BingXRestClientTests.cs

@@ -9,6 +9,7 @@
 using CryptoExchange.Net.Objects;
 using BingX.Net.Interfaces.Clients;
 using CryptoExchange.Net.Converters.SystemTextJson;
+using BingX.Net.Clients.SpotApi;
 
 namespace BingX.Net.UnitTests
 {
@@ -18,7 +19,7 @@ public class BingXRestClientTests
         [Test]
         public void CheckSignatureExample1()
         {
-            var authProvider = new BingXAuthenticationProvider(new ApiCredentials("hO6oQotzTE0S5FRYze2Jx2wGx7eVnJGMolpA1nZyehsoMgCcgKNWQHd4QgTFZuwl4Zt4xMe2PqGBegWXO4A", "mheO6dR8ovSsxZQCOYEFCtelpuxcWGTfHw7te326y6jOwq5WpvFQ9JNljoTwBXZGv5It07m9RXSPpDQEK2w"));
+            var authProvider = new BingXAuthenticationProvider(new BingXCredentials("hO6oQotzTE0S5FRYze2Jx2wGx7eVnJGMolpA1nZyehsoMgCcgKNWQHd4QgTFZuwl4Zt4xMe2PqGBegWXO4A", "mheO6dR8ovSsxZQCOYEFCtelpuxcWGTfHw7te326y6jOwq5WpvFQ9JNljoTwBXZGv5It07m9RXSPpDQEK2w"));
             var client = (RestApiClient)new BingXRestClient().SpotApi;
 
             CryptoExchange.Net.Testing.TestHelpers.CheckSignature(
@@ -139,8 +140,8 @@ public void TestConstructorConfiguration()
 
             Assert.That(((BaseApiClient)restClient.SpotApi).OutputOriginalData, Is.True);
             Assert.That(((BaseApiClient)socketClient.SpotApi).OutputOriginalData, Is.False);
-            Assert.That(((BaseApiClient)restClient.SpotApi).AuthenticationProvider.ApiKey, Is.EqualTo("123"));
-            Assert.That(((BaseApiClient)socketClient.SpotApi).AuthenticationProvider.ApiKey, Is.EqualTo("456"));
+            Assert.That(((BingXRestClientSpotApi)restClient.SpotApi).AuthenticationProvider.Key, Is.EqualTo("123"));
+            Assert.That(((BingXSocketClientSpotApi)socketClient.SpotApi).AuthenticationProvider.Key, Is.EqualTo("456"));
             Assert.That(((BaseApiClient)restClient.SpotApi).ClientOptions.Proxy.Host, Is.EqualTo("host"));
             Assert.That(((BaseApiClient)restClient.SpotApi).ClientOptions.Proxy.Port, Is.EqualTo(80));
             Assert.That(((BaseApiClient)socketClient.SpotApi).ClientOptions.Proxy.Host, Is.EqualTo("host2"));

BingX.Net.UnitTests/BingXRestIntegrationTests.cs

@@ -1,6 +1,7 @@
 using BingX.Net;
 using BingX.Net.Clients;
 using BingX.Net.SymbolOrderBooks;
+using CryptoExchange.Net.Authentication;
 using CryptoExchange.Net.Objects.Errors;
 using CryptoExchange.Net.Testing;
 using Microsoft.Extensions.Logging;
@@ -31,7 +32,7 @@ public override BingXRestClient GetClient(ILoggerFactory loggerFactory)
             return new BingXRestClient(null, loggerFactory, Options.Create(new Objects.Options.BingXRestOptions
             {
                 OutputOriginalData = true,
-                ApiCredentials = Authenticated ? new CryptoExchange.Net.Authentication.ApiCredentials(key, sec) : null
+                ApiCredentials = Authenticated ? new BingXCredentials(key, sec) : null
             }));
         }
 

BingX.Net.UnitTests/BingXSocketIntegrationTests.cs

@@ -1,6 +1,7 @@
 using BingX.Net.Clients;
 using BingX.Net.Objects.Models;
 using BingX.Net.Objects.Options;
+using CryptoExchange.Net.Authentication;
 using CryptoExchange.Net.Testing;
 using Microsoft.Extensions.Logging;
 using Microsoft.Extensions.Options;
@@ -28,7 +29,7 @@ public override BingXSocketClient GetClient(ILoggerFactory loggerFactory)
             return new BingXSocketClient(Options.Create(new BingXSocketOptions
             {
                 OutputOriginalData = true,
-                ApiCredentials = Authenticated ? new CryptoExchange.Net.Authentication.ApiCredentials(key, sec) : null
+                ApiCredentials = Authenticated ? new BingXCredentials(key, sec) : null
             }), loggerFactory);
         }
 
@@ -40,7 +41,7 @@ private BingXRestClient GetRestClient()
             Authenticated = key != null && sec != null;
             return new BingXRestClient(x =>
             {
-                x.ApiCredentials = Authenticated ? new CryptoExchange.Net.Authentication.ApiCredentials(key, sec) : null;
+                x.ApiCredentials = Authenticated ? new BingXCredentials(key, sec) : null;
             });
         }
 

BingX.Net.UnitTests/RestRequestTests.cs

@@ -21,7 +21,7 @@ public async Task ValidateSpotAccountCalls()
             var client = new BingXRestClient(opts =>
             {
                 opts.AutoTimestamp = false;
-                opts.ApiCredentials = new ApiCredentials("123", "456");
+                opts.ApiCredentials = new BingXCredentials("123", "456");
                 opts.OutputOriginalData = true;
             });
             var tester = new RestRequestValidator<BingXRestClient>(client, "Endpoints/Spot/Account", "https://open-api.bingx.com", IsAuthenticated);
@@ -49,7 +49,7 @@ public async Task ValidateSpotExchangeDataCalls()
             var client = new BingXRestClient(opts =>
             {
                 opts.AutoTimestamp = false;
-                opts.ApiCredentials = new ApiCredentials("123", "456");
+                opts.ApiCredentials = new BingXCredentials("123", "456");
             });
             var tester = new RestRequestValidator<BingXRestClient>(client, "Endpoints/Spot/ExchangeData", "https://open-api.bingx.com", IsAuthenticated, "data");
             await tester.ValidateAsync(client => client.SpotApi.ExchangeData.GetSymbolsAsync(), "GetSymbols", nestedJsonProperty: "data.symbols");
@@ -68,7 +68,7 @@ public async Task ValidateSpotTradingCalls()
             var client = new BingXRestClient(opts =>
             {
                 opts.AutoTimestamp = false;
-                opts.ApiCredentials = new ApiCredentials("123", "456");
+                opts.ApiCredentials = new BingXCredentials("123", "456");
             });
             var tester = new RestRequestValidator<BingXRestClient>(client, "Endpoints/Spot/Trading", "https://open-api.bingx.com", IsAuthenticated, "data");
             await tester.ValidateAsync(client => client.SpotApi.Trading.PlaceOrderAsync("ETHUSDT", Enums.OrderSide.Buy, Enums.OrderType.Market, 1), "PlaceOrder", nestedJsonProperty: "data");
@@ -93,7 +93,7 @@ public async Task ValidatePerpetualFuturesAccountCalls()
             var client = new BingXRestClient(opts =>
             {
                 opts.AutoTimestamp = false;
-                opts.ApiCredentials = new ApiCredentials("123", "456");
+                opts.ApiCredentials = new BingXCredentials("123", "456");
             });
             var tester = new RestRequestValidator<BingXRestClient>(client, "Endpoints/PerpetualFutures/Account", "https://open-api.bingx.com", IsAuthenticated, "data");
             await tester.ValidateAsync(client => client.PerpetualFuturesApi.Account.GetBalancesAsync(), "GetBalances", nestedJsonProperty: "data");
@@ -124,7 +124,7 @@ public async Task ValidatePerpetualFuturesExchangeDataCalls()
             var client = new BingXRestClient(opts =>
             {
                 opts.AutoTimestamp = false;
-                opts.ApiCredentials = new ApiCredentials("123", "456");
+                opts.ApiCredentials = new BingXCredentials("123", "456");
             });
             var tester = new RestRequestValidator<BingXRestClient>(client, "Endpoints/PerpetualFutures/ExchangeData", "https://open-api.bingx.com", IsAuthenticated, "data");
             await tester.ValidateAsync(client => client.PerpetualFuturesApi.ExchangeData.GetContractsAsync(), "GetContracts", nestedJsonProperty: "data", ignoreProperties: new List<string> { "tradeMinLimit" });
@@ -147,7 +147,7 @@ public async Task ValidatePerpetualFuturesTradingCalls()
             var client = new BingXRestClient(opts =>
             {
                 opts.AutoTimestamp = false;
-                opts.ApiCredentials = new ApiCredentials("123", "456");
+                opts.ApiCredentials = new BingXCredentials("123", "456");
             });
             var tester = new RestRequestValidator<BingXRestClient>(client, "Endpoints/PerpetualFutures/Trading", "https://open-api.bingx.com", IsAuthenticated, "data");
             await tester.ValidateAsync(client => client.PerpetualFuturesApi.Trading.GetPositionsAsync(), "GetPositions");

BingX.Net.UnitTests/SocketSubscriptionTests.cs

@@ -1,6 +1,7 @@
 using BingX.Net.Clients;
 using BingX.Net.Objects.Models;
 using BingX.Net.Objects.Options;
+using CryptoExchange.Net.Authentication;
 using CryptoExchange.Net.Objects;
 using CryptoExchange.Net.Testing;
 using Microsoft.Extensions.Logging;
@@ -22,7 +23,7 @@ public async Task ValidateConcurrentSpotSubscriptions()
 
             var client = new BingXSocketClient(Options.Create(new BingXSocketOptions
             {
-                ApiCredentials = new CryptoExchange.Net.Authentication.ApiCredentials("123", "456"),
+                ApiCredentials = new BingXCredentials("123", "456"),
                 OutputOriginalData = true
             }), logger);
 
@@ -41,7 +42,7 @@ public async Task ValidateSpotSubscriptions()
 
             var client = new BingXSocketClient(Options.Create(new BingXSocketOptions
             {
-                ApiCredentials = new CryptoExchange.Net.Authentication.ApiCredentials("123", "456")
+                ApiCredentials = new BingXCredentials("123", "456")
             }), logger);
             var tester = new SocketSubscriptionValidator<BingXSocketClient>(client, "Subscriptions/Spot", "wss://open-api-ws.bingx.com/market");
             await tester.ValidateAsync<BingXTradeUpdate>((client, handler) => client.SpotApi.SubscribeToTradeUpdatesAsync("BTC-USDT", handler), "Trades", nestedJsonProperty: "data");
@@ -63,7 +64,7 @@ public async Task ValidateConcurrentPerpetualFutureSubscriptions()
 
             var client = new BingXSocketClient(Options.Create(new BingXSocketOptions
             {
-                ApiCredentials = new CryptoExchange.Net.Authentication.ApiCredentials("123", "456"),
+                ApiCredentials = new BingXCredentials("123", "456"),
                 OutputOriginalData = true
             }), logger);
 
@@ -82,7 +83,7 @@ public async Task ValidatePerpetualFutureSubscriptions()
 
             var client = new BingXSocketClient(Options.Create(new BingXSocketOptions
             {
-                ApiCredentials = new CryptoExchange.Net.Authentication.ApiCredentials("123", "456")
+                ApiCredentials = new BingXCredentials("123", "456")
             }), logger);
             var tester = new SocketSubscriptionValidator<BingXSocketClient>(client, "Subscriptions/PerpetualFutures", "wss://open-api-ws.bingx.com/market");
             await tester.ValidateAsync<BingXFuturesTradeUpdate[]>((client, handler) => client.PerpetualFuturesApi.SubscribeToTradeUpdatesAsync("ETH-USDT", handler), "Trades", nestedJsonProperty: "data");

BingX.Net/BingX.Net.csproj

@@ -23,6 +23,7 @@
     <GeneratePackageOnBuild>true</GeneratePackageOnBuild>
     <EnableConfigurationBindingGenerator>true</EnableConfigurationBindingGenerator>
     <PackageReleaseNotes>https://github.com/JKorf/BingX.Net?tab=readme-ov-file#release-notes</PackageReleaseNotes>
+    <NoWarn>$(NoWarn);SYSLIB1100;SYSLIB1101</NoWarn>
   </PropertyGroup>
   <PropertyGroup Label="AOT" Condition="$([MSBuild]::IsTargetFrameworkCompatible('$(TargetFramework)', 'net7.0'))">
     <IsAotCompatible>true</IsAotCompatible>
@@ -52,10 +53,12 @@
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>
-    <PackageReference Include="CryptoExchange.Net" Version="10.8.0" />
     <PackageReference Include="Microsoft.CodeAnalysis.NetAnalyzers" Version="10.0.101">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>
   </ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include="..\..\CryptoExchange.Net\CryptoExchange.Net\CryptoExchange.Net.csproj" />
+  </ItemGroup>
 </Project>

BingX.Net/BingXAuthenticationProvider.cs

@@ -2,25 +2,24 @@
 using System.Collections.Generic;
 using BingX.Net.Objects.Options;
 using CryptoExchange.Net;
 using CryptoExchange.Net.Authentication;
 using CryptoExchange.Net.Clients;
 using CryptoExchange.Net.Objects;
 using System.Linq;
 using System.Globalization;
 
 namespace BingX.Net
 {
-    internal class BingXAuthenticationProvider : AuthenticationProvider
+    internal class BingXAuthenticationProvider : AuthenticationProvider<BingXCredentials, BingXCredentials>
     {
-        public override ApiCredentialsType[] SupportedCredentialTypes => [ApiCredentialsType.Hmac];
-        public BingXAuthenticationProvider(ApiCredentials credentials) : base(credentials)
+        public BingXAuthenticationProvider(BingXCredentials credentials) : base(credentials, credentials)
         {
         }
 
         public override void ProcessRequest(RestApiClient apiClient, RestRequestConfiguration request)
         {
             request.Headers ??= new Dictionary<string, string>();
-            request.Headers.Add("X-BX-APIKEY", ApiKey);
+            request.Headers.Add("X-BX-APIKEY", Credential.Key);
 
             if (!request.Authenticated)
                 return;

BingX.Net/BingXCredentials.cs

@@ -0,0 +1,48 @@
+using CryptoExchange.Net.Authentication;
+using System;
+using System.Net;
+
+namespace BingX.Net
+{
+    /// <summary>
+    /// BingX API credentials
+    /// </summary>
+    public class BingXCredentials : HMACCredential
+    {
+        /// <summary>
+        /// Create new credentials
+        /// </summary>
+        public BingXCredentials() { }
+
+        /// <summary>
+        /// Create new credentials providing credentials in HMAC format
+        /// </summary>
+        /// <param name="key">API key</param>
+        /// <param name="secret">API secret</param>
+        public BingXCredentials(string key, string secret) : base(key, secret)
+        {
+        }
+
+        /// <summary>
+        /// Create new credentials providing HMAC credentials
+        /// </summary>
+        /// <param name="credential">Credentials</param>
+        public BingXCredentials(HMACCredential credential) : base(credential.Key, credential.Secret)
+        {
+        }
+
+        /// <summary>
+        /// Specify the HMAC credentials
+        /// </summary>
+        /// <param name="key">API key</param>
+        /// <param name="secret">API secret</param>
+        public BingXCredentials WithHMAC(string key, string secret)
+        {
+            if (!string.IsNullOrEmpty(Key)) throw new InvalidOperationException("Credentials already set");
+
+            Key = key;
+            Secret = secret;
+            return this;
+        }
+    }
+}

BingX.Net/BingXTrackerFactory.cs

@@ -114,7 +114,7 @@ public IUserSpotDataTracker CreateUserSpotDataTracker(SpotUserDataTrackerConfig?
         }
 
         /// <inheritdoc />
-        public IUserSpotDataTracker CreateUserSpotDataTracker(string userIdentifier, ApiCredentials credentials, SpotUserDataTrackerConfig? config = null, BingXEnvironment? environment = null)
+        public IUserSpotDataTracker CreateUserSpotDataTracker(string userIdentifier, BingXCredentials credentials, SpotUserDataTrackerConfig? config = null, BingXEnvironment? environment = null)
         {
             var clientProvider = _serviceProvider?.GetRequiredService<IBingXUserClientProvider>() ?? new BingXUserClientProvider();
             var restClient = clientProvider.GetRestClient(userIdentifier, credentials, environment);
@@ -143,7 +143,7 @@ public IUserFuturesDataTracker BingXUserPerpetualFuturesDataTracker(FuturesUserD
         }
 
         /// <inheritdoc />
-        public IUserFuturesDataTracker BingXUserPerpetualFuturesDataTracker(string userIdentifier, ApiCredentials credentials, FuturesUserDataTrackerConfig? config = null, BingXEnvironment? environment = null)
+        public IUserFuturesDataTracker BingXUserPerpetualFuturesDataTracker(string userIdentifier, BingXCredentials credentials, FuturesUserDataTrackerConfig? config = null, BingXEnvironment? environment = null)
         {
             var clientProvider = _serviceProvider?.GetRequiredService<IBingXUserClientProvider>() ?? new BingXUserClientProvider();
             var restClient = clientProvider.GetRestClient(userIdentifier, credentials, environment);

BingX.Net/Clients/Apis/BingXRestClientSubAccountApi.cs

@@ -15,7 +15,7 @@
 namespace BingX.Net.Clients.Apis
 {
     /// <inheritdoc cref="IBingXRestClientSubAccountApi" />
-    public class BingXRestClientSubAccountApi : BingXRestClientApi, IBingXRestClientSubAccountApi
+    internal class BingXRestClientSubAccountApi : BingXRestClientApi, IBingXRestClientSubAccountApi
     {
         #region fields 
         private static readonly RequestDefinitionCache _definitions = new();

BingX.Net/Clients/BingXRestClient.cs

@@ -17,7 +17,7 @@
 namespace BingX.Net.Clients
 {
     /// <inheritdoc cref="IBingXRestClient" />
-    public class BingXRestClient : BaseRestClient, IBingXRestClient
+    public class BingXRestClient : BaseRestClient<BingXEnvironment, BingXCredentials>, IBingXRestClient
     {
         #region Api clients
 
@@ -58,14 +58,6 @@ public BingXRestClient(HttpClient? httpClient, ILoggerFactory? loggerFactory, IO
 
         #endregion
 
-        /// <inheritdoc />
-        public void SetOptions(UpdateOptions options)
-        {
-            PerpetualFuturesApi.SetOptions(options);
-            SpotApi.SetOptions(options);
-            SubAccountApi.SetOptions(options);
-        }
-
         /// <summary>
         /// Set the default options to be used when creating new clients
         /// </summary>
@@ -75,12 +67,5 @@ public static void SetDefaultOptions(Action<BingXRestOptions> optionsDelegate)
             BingXRestOptions.Default = ApplyOptionsDelegate(optionsDelegate);
         }
 
-        /// <inheritdoc />
-        public void SetApiCredentials(ApiCredentials credentials)
-        {
-            SpotApi.SetApiCredentials(credentials);
-            PerpetualFuturesApi.SetApiCredentials(credentials);
-            SubAccountApi.SetApiCredentials(credentials);
-        }
     }
 }

BingX.Net/Clients/BingXRestClientApi.cs

@@ -23,7 +23,7 @@ namespace BingX.Net.Clients
     /// <summary>
     /// BingX rest client base
     /// </summary>
-    public abstract class BingXRestClientApi : RestApiClient
+    internal abstract class BingXRestClientApi : RestApiClient<BingXEnvironment, BingXAuthenticationProvider, BingXCredentials>
     {
         private IStringMessageSerializer? _serializer;
 
@@ -51,7 +51,7 @@ public override string FormatSymbol(string baseAsset, string quoteAsset, Trading
         protected override IMessageSerializer CreateSerializer() => new SystemTextJsonMessageSerializer(SerializerOptions.WithConverters(BingXExchange._serializerContext));
 
         /// <inheritdoc />
-        protected override AuthenticationProvider CreateAuthenticationProvider(ApiCredentials credentials)
+        protected override BingXAuthenticationProvider CreateAuthenticationProvider(BingXCredentials credentials)
             => new BingXAuthenticationProvider(credentials);
 
         internal Task<WebCallResult> SendAsync(RequestDefinition definition, ParameterCollection? parameters, CancellationToken cancellationToken, int? weight = null)

BingX.Net/Clients/BingXSocketClient.cs

@@ -14,7 +14,7 @@
 namespace BingX.Net.Clients
 {
     /// <inheritdoc cref="IBingXSocketClient" />
-    public class BingXSocketClient : BaseSocketClient, IBingXSocketClient
+    public class BingXSocketClient : BaseSocketClient<BingXEnvironment, BingXCredentials>, IBingXSocketClient
     {
         #region fields
         #endregion
@@ -54,13 +54,6 @@ public BingXSocketClient(IOptions<BingXSocketOptions> options, ILoggerFactory? l
         }
         #endregion
 
-        /// <inheritdoc />
-        public void SetOptions(UpdateOptions options)
-        {
-            PerpetualFuturesApi.SetOptions(options);
-            SpotApi.SetOptions(options);
-        }
-
         /// <summary>
         /// Set the default options to be used when creating new clients
         /// </summary>
@@ -70,11 +63,5 @@ public static void SetDefaultOptions(Action<BingXSocketOptions> optionsDelegate)
             BingXSocketOptions.Default = ApplyOptionsDelegate(optionsDelegate);
         }
 
-        /// <inheritdoc />
-        public void SetApiCredentials(ApiCredentials credentials)
-        {
-            SpotApi.SetApiCredentials(credentials);
-            PerpetualFuturesApi.SetApiCredentials(credentials);
-        }
     }
 }