CryptoExchange V7.11.0 (#230)

Updated CryptoExchange.Net to V7.11.0
JKorf · Aug 7, 2024 · 080ddc3 · 080ddc3
1 parent eb04e27
commit 080ddc3
Show file tree

Hide file tree

Showing 6 changed files with 23 additions and 14 deletions.
diff --git a/ByBit.Net/Bybit.Net.csproj b/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.10.0" />
+    <PackageReference Include="CryptoExchange.Net" Version="7.11.0" />
   </ItemGroup>
 </Project>
diff --git a/ByBit.Net/BybitAuthenticationProvider.cs b/ByBit.Net/BybitAuthenticationProvider.cs
@@ -16,8 +16,6 @@ namespace Bybit.Net
 {
     internal class BybitAuthenticationProvider : AuthenticationProvider
     {
-        public string GetApiKey() => _credentials.Key!.GetString();
-
         public BybitAuthenticationProvider(ApiCredentials credentials) : base(credentials)
         {
         }
@@ -26,9 +24,9 @@ public override void AuthenticateRequest(
             RestApiClient apiClient,
             Uri uri,
             HttpMethod method,
-            IDictionary<string, object> uriParameters,
-            IDictionary<string, object> bodyParameters,
-            Dictionary<string, string> headers,
+            ref IDictionary<string, object>? uriParameters,
+            ref IDictionary<string, object>? bodyParameters,
+            ref Dictionary<string, string>? headers,
             bool auth,
             ArrayParametersSerialization arraySerialization,
             HttpMethodParameterPosition parameterPosition,
@@ -37,12 +35,22 @@ public override void AuthenticateRequest(
             if (!auth)
                 return;
 
-            var parameters = parameterPosition == HttpMethodParameterPosition.InUri ? uriParameters : bodyParameters;
+            IDictionary<string, object> parameters;
+            if (parameterPosition == HttpMethodParameterPosition.InUri)
+            {
+                uriParameters ??= new Dictionary<string, object>();
+                parameters = uriParameters;
+            }
+            else
+            {
+                bodyParameters ??= new Dictionary<string, object>();
+                parameters = bodyParameters;
+            }
             var timestamp = DateTimeConverter.ConvertToMilliseconds(GetTimestamp(apiClient).AddMilliseconds(-1000)).Value.ToString(CultureInfo.InvariantCulture);
             if (apiClient is BybitRestClientCopyTradingApi || apiClient is BybitRestClientApi)
             {
                 var signPayload = parameterPosition == HttpMethodParameterPosition.InUri ? uri.SetParameters(parameters, arraySerialization).Query.Replace("?", "") : requestBodyFormat == RequestBodyFormat.FormData ? parameters.ToFormData() : JsonConvert.SerializeObject(parameters);
-                var key = _credentials.Key!.GetString();
+                var key = _credentials.Key!;
                 var recvWindow = ((BybitRestOptions)apiClient.ClientOptions).ReceiveWindow.TotalMilliseconds;
                 var payload = timestamp + key + recvWindow + signPayload;
 
@@ -52,6 +60,7 @@ public override void AuthenticateRequest(
                 else
                     sign = SignRSASHA256(Encoding.UTF8.GetBytes(payload), SignOutputType.Base64);
 
+                headers ??= new Dictionary<string, string>();
                 headers.Add("X-BAPI-API-KEY", key);
                 headers.Add("X-BAPI-SIGN", sign);
                 headers.Add("X-BAPI-SIGN-TYPE", "2");
@@ -60,7 +69,7 @@ public override void AuthenticateRequest(
             }
             else
             {
-                parameters.Add("api_key", _credentials.Key!.GetString());
+                parameters.Add("api_key", _credentials.Key);
                 parameters.Add("timestamp", timestamp);
                 var signData = parameterPosition == HttpMethodParameterPosition.InUri ? uri.SetParameters(parameters, arraySerialization).Query.Replace("?", "") : parameters.ToFormData();
 

diff --git a/ByBit.Net/Clients/DerivativesApi/ContractApi/BybitSocketClientContractApi.cs b/ByBit.Net/Clients/DerivativesApi/ContractApi/BybitSocketClientContractApi.cs
@@ -60,7 +60,7 @@ protected override AuthenticationProvider CreateAuthenticationProvider(ApiCreden
         {
             var expireTime = DateTimeConverter.ConvertToMilliseconds(DateTime.UtcNow.AddSeconds(30))!;
             var authProvider = (BybitAuthenticationProvider)AuthenticationProvider!;
-            var key = authProvider.GetApiKey();
+            var key = authProvider.ApiKey;
             var sign = authProvider.Sign($"GET/realtime{expireTime}");
 
             return new BybitQuery("auth", new object[]

diff --git a/ByBit.Net/Clients/DerivativesApi/UnifiedMarginApi/BybitSocketClientUnifiedMarginApi.cs b/ByBit.Net/Clients/DerivativesApi/UnifiedMarginApi/BybitSocketClientUnifiedMarginApi.cs
@@ -65,7 +65,7 @@ protected override AuthenticationProvider CreateAuthenticationProvider(ApiCreden
         {
             var expireTime = DateTimeConverter.ConvertToMilliseconds(DateTime.UtcNow.AddSeconds(30))!;
             var authProvider = (BybitAuthenticationProvider)AuthenticationProvider!;
-            var key = authProvider.GetApiKey();
+            var key = authProvider.ApiKey;
             var sign = authProvider.Sign($"GET/realtime{expireTime}");
 
             return new BybitUnifiedQuery("auth", new object[]

diff --git a/ByBit.Net/Clients/SpotApi/v3/BybitSocketClientSpotApiV3.cs b/ByBit.Net/Clients/SpotApi/v3/BybitSocketClientSpotApiV3.cs
@@ -58,7 +58,7 @@ protected override AuthenticationProvider CreateAuthenticationProvider(ApiCreden
         {
             var expireTime = DateTimeConverter.ConvertToMilliseconds(DateTime.UtcNow.AddSeconds(30))!;
             var authProvider = (BybitAuthenticationProvider)AuthenticationProvider!;
-            var key = authProvider.GetApiKey();
+            var key = authProvider.ApiKey;
             var sign = authProvider.Sign($"GET/realtime{expireTime}");
 
             return new BybitQuery("auth", new object[]

diff --git a/ByBit.Net/Clients/V5/BybitSocketClientPrivateApi.cs b/ByBit.Net/Clients/V5/BybitSocketClientPrivateApi.cs
@@ -71,7 +71,7 @@ private Query GetPingQuery(SocketConnection connection)
                 // Auth subscription
                 var expireTime = DateTimeConverter.ConvertToMilliseconds(DateTime.UtcNow.AddSeconds(30))!;
                 var authProvider = (BybitAuthenticationProvider)AuthenticationProvider!;
-                var key = authProvider.GetApiKey();
+                var key = authProvider.ApiKey;
                 var sign = authProvider.Sign($"GET/realtime{expireTime}");
 
                 return new BybitQuery("auth", new object[]
@@ -86,7 +86,7 @@ private Query GetPingQuery(SocketConnection connection)
                 // Trading
                 var expireTime = DateTimeConverter.ConvertToMilliseconds(DateTime.UtcNow.AddSeconds(30))!;
                 var authProvider = (BybitAuthenticationProvider)AuthenticationProvider!;
-                var key = authProvider.GetApiKey();
+                var key = authProvider.ApiKey;
                 var sign = authProvider.Sign($"GET/realtime{expireTime}");
 
                 return new BybitRequestQuery<object>("auth", null, new object[]