Added specific logging for user cancellation on rest requests instead of generic warning log

* Fix memory leak in AsyncAutoResetEvent

CancellationTokenRegistration MUST be disposed, as the CancellationToken passed is saved for the lifetime of the Client, and registrations build up forever.

CryptoExchange.Net.UnitTests/AsyncResetEventTests.cs

@@ -106,6 +106,7 @@ namespace CryptoExchange.Net.UnitTests
             for(var i = 1; i <= 10; i++)
             {
                 evnt.Set();
+                await Task.Delay(1); // Wait for the continuation.
                 Assert.That(10 - i == waiters.Count(w => w.Status != TaskStatus.RanToCompletion));
             }
 

CryptoExchange.Net.UnitTests/RestClientTests.cs

@@ -176,12 +176,12 @@ namespace CryptoExchange.Net.UnitTests
 
             for (var i = 0; i < requests + 1; i++)
             {
-                var result1 = await rateLimiter.ProcessAsync(new TraceLogger(), 1, RateLimitItemType.Request, requestDefinition, "https://test.com", "123", 1, RateLimitingBehaviour.Wait, default);             
+                var result1 = await rateLimiter.ProcessAsync(new TraceLogger(), 1, RateLimitItemType.Request, requestDefinition, "https://test.com", "123", 1, RateLimitingBehaviour.Wait, null, default);             
                 Assert.That(i == requests? triggered : !triggered);
             }
             triggered = false;
             await Task.Delay((int)Math.Round(perSeconds * 1000) + 10);
-            var result2 = await rateLimiter.ProcessAsync(new TraceLogger(), 1, RateLimitItemType.Request, requestDefinition, "https://test.com", "123", 1,  RateLimitingBehaviour.Wait, default);
+            var result2 = await rateLimiter.ProcessAsync(new TraceLogger(), 1, RateLimitItemType.Request, requestDefinition, "https://test.com", "123", 1,  RateLimitingBehaviour.Wait, null, default);
             Assert.That(!triggered);
         }
 
@@ -201,7 +201,7 @@ namespace CryptoExchange.Net.UnitTests
             rateLimiter.RateLimitTriggered += (x) => { evnt = x; };
             for (var i = 0; i < 2; i++)
             {
-                var result1 = await rateLimiter.ProcessAsync(new TraceLogger(), 1, RateLimitItemType.Request, requestDefinition, "https://test.com", "123", 1, RateLimitingBehaviour.Wait, default);
+                var result1 = await rateLimiter.ProcessAsync(new TraceLogger(), 1, RateLimitItemType.Request, requestDefinition, "https://test.com", "123", 1, RateLimitingBehaviour.Wait, null, default);
                 bool expected = i == 1 ? (expectLimiting ? evnt.DelayTime > TimeSpan.Zero : evnt == null) : evnt == null;
                 Assert.That(expected);
             }
@@ -222,9 +222,9 @@ namespace CryptoExchange.Net.UnitTests
             RateLimitEvent evnt = null;
             rateLimiter.RateLimitTriggered += (x) => { evnt = x; };
 
-            var result1 = await rateLimiter.ProcessAsync(new TraceLogger(), 1, RateLimitItemType.Request, requestDefinition1, "https://test.com", "123", 1, RateLimitingBehaviour.Wait, default);
+            var result1 = await rateLimiter.ProcessAsync(new TraceLogger(), 1, RateLimitItemType.Request, requestDefinition1, "https://test.com", "123", 1, RateLimitingBehaviour.Wait, null, default);
             Assert.That(evnt == null);
-            var result2 = await rateLimiter.ProcessAsync(new TraceLogger(), 1, RateLimitItemType.Request, requestDefinition2, "https://test.com", "123", 1, RateLimitingBehaviour.Wait, default);
+            var result2 = await rateLimiter.ProcessAsync(new TraceLogger(), 1, RateLimitItemType.Request, requestDefinition2, "https://test.com", "123", 1, RateLimitingBehaviour.Wait, null, default);
             Assert.That(expectLimiting ? evnt != null : evnt == null);
         }
 
@@ -243,12 +243,12 @@ namespace CryptoExchange.Net.UnitTests
 
             for (var i = 0; i < requests + 1; i++)
             {
-                var result1 = await rateLimiter.ProcessAsync(new TraceLogger(), 1, RateLimitItemType.Request, requestDefinition, "https://test.com", "123", 1, RateLimitingBehaviour.Wait, default);
+                var result1 = await rateLimiter.ProcessAsync(new TraceLogger(), 1, RateLimitItemType.Request, requestDefinition, "https://test.com", "123", 1, RateLimitingBehaviour.Wait, null, default);
                 Assert.That(i == requests ? triggered : !triggered);
             }
             triggered = false;
             await Task.Delay((int)Math.Round(perSeconds * 1000) + 10);
-            var result2 = await rateLimiter.ProcessAsync(new TraceLogger(), 1, RateLimitItemType.Request, requestDefinition, "https://test.com", "123", 1, RateLimitingBehaviour.Wait, default);
+            var result2 = await rateLimiter.ProcessAsync(new TraceLogger(), 1, RateLimitItemType.Request, requestDefinition, "https://test.com", "123", 1, RateLimitingBehaviour.Wait, null, default);
             Assert.That(!triggered);
         }
 
@@ -266,7 +266,7 @@ namespace CryptoExchange.Net.UnitTests
             rateLimiter.RateLimitTriggered += (x) => { evnt = x; };
             for (var i = 0; i < 2; i++)
             {
-                var result1 = await rateLimiter.ProcessAsync(new TraceLogger(), 1, RateLimitItemType.Request, requestDefinition, "https://test.com", "123", 1, RateLimitingBehaviour.Wait, default);
+                var result1 = await rateLimiter.ProcessAsync(new TraceLogger(), 1, RateLimitItemType.Request, requestDefinition, "https://test.com", "123", 1, RateLimitingBehaviour.Wait, null, default);
                 bool expected = i == 1 ? (expectLimited ? evnt.DelayTime > TimeSpan.Zero : evnt == null) : evnt == null;
                 Assert.That(expected);
             }
@@ -286,7 +286,7 @@ namespace CryptoExchange.Net.UnitTests
             rateLimiter.RateLimitTriggered += (x) => { evnt = x; };
             for (var i = 0; i < 2; i++)
             {
-                var result1 = await rateLimiter.ProcessAsync(new TraceLogger(), 1, RateLimitItemType.Request, requestDefinition, "https://test.com", "123", 1, RateLimitingBehaviour.Wait, default);
+                var result1 = await rateLimiter.ProcessAsync(new TraceLogger(), 1, RateLimitItemType.Request, requestDefinition, "https://test.com", "123", 1, RateLimitingBehaviour.Wait, null, default);
                 bool expected = i == 1 ? (expectLimited ? evnt.DelayTime > TimeSpan.Zero : evnt == null) : evnt == null;
                 Assert.That(expected);
             }
@@ -309,9 +309,9 @@ namespace CryptoExchange.Net.UnitTests
             RateLimitEvent evnt = null;
             rateLimiter.RateLimitTriggered += (x) => { evnt = x; };
 
-            var result1 = await rateLimiter.ProcessAsync(new TraceLogger(), 1, RateLimitItemType.Request, requestDefinition1, "https://test.com", key1, 1, RateLimitingBehaviour.Wait, default);
+            var result1 = await rateLimiter.ProcessAsync(new TraceLogger(), 1, RateLimitItemType.Request, requestDefinition1, "https://test.com", key1, 1, RateLimitingBehaviour.Wait, null, default);
             Assert.That(evnt == null);
-            var result2 = await rateLimiter.ProcessAsync(new TraceLogger(), 1, RateLimitItemType.Request, requestDefinition2, "https://test.com", key2, 1, RateLimitingBehaviour.Wait, default);
+            var result2 = await rateLimiter.ProcessAsync(new TraceLogger(), 1, RateLimitItemType.Request, requestDefinition2, "https://test.com", key2, 1, RateLimitingBehaviour.Wait, null, default);
             Assert.That(expectLimited ? evnt != null : evnt == null);
         }
 
@@ -328,9 +328,9 @@ namespace CryptoExchange.Net.UnitTests
             RateLimitEvent evnt = null;
             rateLimiter.RateLimitTriggered += (x) => { evnt = x; };
 
-            var result1 = await rateLimiter.ProcessAsync(new TraceLogger(), 1, RateLimitItemType.Request, requestDefinition1, "https://test.com", "123", 1, RateLimitingBehaviour.Wait, default);
+            var result1 = await rateLimiter.ProcessAsync(new TraceLogger(), 1, RateLimitItemType.Request, requestDefinition1, "https://test.com", "123", 1, RateLimitingBehaviour.Wait, null, default);
             Assert.That(evnt == null);
-            var result2 = await rateLimiter.ProcessAsync(new TraceLogger(), 1, RateLimitItemType.Request, requestDefinition2, "https://test.com", null, 1, RateLimitingBehaviour.Wait, default);
+            var result2 = await rateLimiter.ProcessAsync(new TraceLogger(), 1, RateLimitItemType.Request, requestDefinition2, "https://test.com", null, 1, RateLimitingBehaviour.Wait, null, default);
             Assert.That(expectLimited ? evnt != null : evnt == null);
         }
 
@@ -348,9 +348,9 @@ namespace CryptoExchange.Net.UnitTests
             RateLimitEvent evnt = null;
             rateLimiter.RateLimitTriggered += (x) => { evnt = x; };
 
-            var result1 = await rateLimiter.ProcessAsync(new TraceLogger(), 1, RateLimitItemType.Request, requestDefinition1, host1, "123", 1, RateLimitingBehaviour.Wait, default);
+            var result1 = await rateLimiter.ProcessAsync(new TraceLogger(), 1, RateLimitItemType.Request, requestDefinition1, host1, "123", 1, RateLimitingBehaviour.Wait, null, default);
             Assert.That(evnt == null);
-            var result2 = await rateLimiter.ProcessAsync(new TraceLogger(), 1, RateLimitItemType.Request, requestDefinition1, host2, "123", 1, RateLimitingBehaviour.Wait, default);
+            var result2 = await rateLimiter.ProcessAsync(new TraceLogger(), 1, RateLimitItemType.Request, requestDefinition1, host2, "123", 1, RateLimitingBehaviour.Wait, null, default);
             Assert.That(expectLimited ? evnt != null : evnt == null);
         }
 
@@ -365,9 +365,9 @@ namespace CryptoExchange.Net.UnitTests
             RateLimitEvent evnt = null;
             rateLimiter.RateLimitTriggered += (x) => { evnt = x; };
 
-            var result1 = await rateLimiter.ProcessAsync(new TraceLogger(), 1, RateLimitItemType.Connection, new RequestDefinition("1", HttpMethod.Get), host1, "123", 1, RateLimitingBehaviour.Wait, default);
+            var result1 = await rateLimiter.ProcessAsync(new TraceLogger(), 1, RateLimitItemType.Connection, new RequestDefinition("1", HttpMethod.Get), host1, "123", 1, RateLimitingBehaviour.Wait, null, default);
             Assert.That(evnt == null);
-            var result2 = await rateLimiter.ProcessAsync(new TraceLogger(), 1, RateLimitItemType.Connection, new RequestDefinition("1", HttpMethod.Get), host2, "123", 1, RateLimitingBehaviour.Wait, default);
+            var result2 = await rateLimiter.ProcessAsync(new TraceLogger(), 1, RateLimitItemType.Connection, new RequestDefinition("1", HttpMethod.Get), host2, "123", 1, RateLimitingBehaviour.Wait, null, default);
             Assert.That(expectLimited ? evnt != null : evnt == null);
         }
 
@@ -381,8 +381,8 @@ namespace CryptoExchange.Net.UnitTests
             rateLimiter.RateLimitTriggered += (x) => { evnt = x; };
             var ct = new CancellationTokenSource(TimeSpan.FromSeconds(0.2));
 
-            var result1 = await rateLimiter.ProcessAsync(new TraceLogger(), 1, RateLimitItemType.Connection, new RequestDefinition("1", HttpMethod.Get), "https://test.com", "123", 1, RateLimitingBehaviour.Wait, ct.Token);
-            var result2 = await rateLimiter.ProcessAsync(new TraceLogger(), 1, RateLimitItemType.Connection, new RequestDefinition("1", HttpMethod.Get), "https://test.com", "123", 1, RateLimitingBehaviour.Wait, ct.Token);
+            var result1 = await rateLimiter.ProcessAsync(new TraceLogger(), 1, RateLimitItemType.Connection, new RequestDefinition("1", HttpMethod.Get), "https://test.com", "123", 1, RateLimitingBehaviour.Wait, null, ct.Token);
+            var result2 = await rateLimiter.ProcessAsync(new TraceLogger(), 1, RateLimitItemType.Connection, new RequestDefinition("1", HttpMethod.Get), "https://test.com", "123", 1, RateLimitingBehaviour.Wait, null, ct.Token);
             Assert.That(result2.Error, Is.TypeOf<CancellationRequestedError>());
         }
     }

CryptoExchange.Net/Attributes/MapAttribute.cs

@@ -5,6 +5,7 @@ namespace CryptoExchange.Net.Attributes
     /// <summary>
     /// Map a enum entry to string values
     /// </summary>
+    [AttributeUsage(AttributeTargets.Field)]
     public class MapAttribute : Attribute
     {
         /// <summary>

CryptoExchange.Net/Authentication/AuthenticationProvider.cs

@@ -459,10 +459,10 @@ namespace CryptoExchange.Net.Authentication
         /// <param name="serializer"></param>
         /// <param name="parameters"></param>
         /// <returns></returns>
-        protected string GetSerializedBody(IMessageSerializer serializer, IDictionary<string, object> parameters)
+        protected static string GetSerializedBody(IMessageSerializer serializer, IDictionary<string, object> parameters)
         {
-            if (parameters.Count == 1 && parameters.ContainsKey(Constants.BodyPlaceHolderKey))
-                return serializer.Serialize(parameters[Constants.BodyPlaceHolderKey]);
+            if (parameters.Count == 1 && parameters.TryGetValue(Constants.BodyPlaceHolderKey, out object? value))
+                return serializer.Serialize(value);
             else
                 return serializer.Serialize(parameters);
         }

CryptoExchange.Net/Clients/BaseApiClient.cs

@@ -55,7 +55,7 @@ namespace CryptoExchange.Net.Clients
         /// ctor
         /// </summary>
         /// <param name="logger">Logger</param>
-        /// <param name="outputOriginalData">Should data from this client include the orginal data in the call result</param>
+        /// <param name="outputOriginalData">Should data from this client include the original data in the call result</param>
         /// <param name="baseAddress">Base address for this API client</param>
         /// <param name="apiCredentials">Api credentials</param>
         /// <param name="clientOptions">Client options</param>

CryptoExchange.Net/Clients/BaseClient.cs

@@ -49,7 +49,7 @@ namespace CryptoExchange.Net.Clients
         /// </summary>
         protected internal ILogger _logger;
 
-        private object _versionLock = new object();
+        private readonly object _versionLock = new object();
         private Version _exchangeVersion;
 
         /// <summary>

CryptoExchange.Net/Clients/BaseSocketClient.cs

@@ -93,6 +93,7 @@ namespace CryptoExchange.Net.Clients
             {
                 tasks.Add(client.ReconnectAsync());
             }
+
             await Task.WhenAll(tasks.ToArray()).ConfigureAwait(false);
         }
 
@@ -106,6 +107,7 @@ namespace CryptoExchange.Net.Clients
             {
                 result.AppendLine(client.GetSubscriptionsState());
             }
+
             return result.ToString();
         }
 
@@ -120,6 +122,7 @@ namespace CryptoExchange.Net.Clients
             {
                 result.Add(client.GetState());
             }
+
             return result;
         }
     }

CryptoExchange.Net/Clients/CryptoBaseClient.cs

@@ -9,7 +9,7 @@ namespace CryptoExchange.Net.Clients
     /// </summary>
     public class CryptoBaseClient : IDisposable
     {
-        private Dictionary<Type, object> _serviceCache = new Dictionary<Type, object>();
+        private readonly Dictionary<Type, object> _serviceCache = new Dictionary<Type, object>();
 
         /// <summary>
         /// Service provider

CryptoExchange.Net/Clients/RestApiClient.cs

@@ -89,7 +89,7 @@ namespace CryptoExchange.Net.Clients
         /// <summary>
         /// Memory cache
         /// </summary>
-        private static MemoryCache _cache = new MemoryCache();
+        private readonly static MemoryCache _cache = new MemoryCache();
 
         /// <summary>
         /// ctor
@@ -155,6 +155,7 @@ namespace CryptoExchange.Net.Clients
         /// <param name="additionalHeaders">Additional headers for this request</param>
         /// <param name="weight">Override the request weight for this request definition, for example when the weight depends on the parameters</param>
         /// <param name="weightSingleLimiter">Specify the weight to apply to the individual rate limit guard for this request</param>
+        /// <param name="rateLimitKeySuffix">An additional optional suffix for the key selector. Can be used to make rate limiting work based on parameters.</param>
         /// <returns></returns>
         protected virtual Task<WebCallResult<T>> SendAsync<T>(
             string baseAddress,
@@ -163,7 +164,8 @@ namespace CryptoExchange.Net.Clients
             CancellationToken cancellationToken,
             Dictionary<string, string>? additionalHeaders = null,
             int? weight = null,
-            int? weightSingleLimiter = null)
+            int? weightSingleLimiter = null,
+            string? rateLimitKeySuffix = null)
         {
             var parameterPosition = definition.ParameterPosition ?? ParameterPositions[definition.Method];
             return SendAsync<T>(
@@ -174,7 +176,8 @@ namespace CryptoExchange.Net.Clients
                 cancellationToken,
                 additionalHeaders,
                 weight,
-                weightSingleLimiter);
+                weightSingleLimiter,
+                rateLimitKeySuffix);
         }
 
         /// <summary>
@@ -189,6 +192,7 @@ namespace CryptoExchange.Net.Clients
         /// <param name="additionalHeaders">Additional headers for this request</param>
         /// <param name="weight">Override the request weight for this request definition, for example when the weight depends on the parameters</param>
         /// <param name="weightSingleLimiter">Specify the weight to apply to the individual rate limit guard for this request</param>
+        /// <param name="rateLimitKeySuffix">An additional optional suffix for the key selector. Can be used to make rate limiting work based on parameters.</param>
         /// <returns></returns>
         protected virtual async Task<WebCallResult<T>> SendAsync<T>(
             string baseAddress,
@@ -198,7 +202,8 @@ namespace CryptoExchange.Net.Clients
             CancellationToken cancellationToken,
             Dictionary<string, string>? additionalHeaders = null,
             int? weight = null,
-            int? weightSingleLimiter = null)
+            int? weightSingleLimiter = null,
+            string? rateLimitKeySuffix = null)
         {
             string? cacheKey = null;
             if (ShouldCache(definition))
@@ -222,7 +227,7 @@ namespace CryptoExchange.Net.Clients
                 currentTry++;
                 var requestId = ExchangeHelpers.NextId();
 
-                var prepareResult = await PrepareAsync(requestId, baseAddress, definition, cancellationToken, additionalHeaders, weight, weightSingleLimiter).ConfigureAwait(false);
+                var prepareResult = await PrepareAsync(requestId, baseAddress, definition, cancellationToken, additionalHeaders, weight, weightSingleLimiter, rateLimitKeySuffix).ConfigureAwait(false);
                 if (!prepareResult)
                     return new WebCallResult<T>(prepareResult.Error!);
 
@@ -236,10 +241,17 @@ namespace CryptoExchange.Net.Clients
                 _logger.RestApiSendRequest(request.RequestId, definition, request.Content, string.IsNullOrEmpty(request.Uri.Query) ? "-" : request.Uri.Query, string.Join(", ", request.GetHeaders().Select(h => h.Key + $"=[{string.Join(",", h.Value)}]")));
                 TotalRequestsMade++;
                 var result = await GetResponseAsync<T>(request, definition.RateLimitGate, cancellationToken).ConfigureAwait(false);
-                if (!result)
-                    _logger.RestApiErrorReceived(result.RequestId, result.ResponseStatusCode, (long)Math.Floor(result.ResponseTime!.Value.TotalMilliseconds), result.Error?.ToString());
+                if (result.Error is not CancellationRequestedError)
+                {
+                    if (!result)
+                        _logger.RestApiErrorReceived(result.RequestId, result.ResponseStatusCode, (long)Math.Floor(result.ResponseTime!.Value.TotalMilliseconds), result.Error?.ToString());
+                    else
+                        _logger.RestApiResponseReceived(result.RequestId, result.ResponseStatusCode, (long)Math.Floor(result.ResponseTime!.Value.TotalMilliseconds), OutputOriginalData ? result.OriginalData : "[Data only available when OutputOriginal = true]");
+                }
                 else
-                    _logger.RestApiResponseReceived(result.RequestId, result.ResponseStatusCode, (long)Math.Floor(result.ResponseTime!.Value.TotalMilliseconds), OutputOriginalData ? result.OriginalData : "[Data only available when OutputOriginal = true]");
+                {
+                    _logger.RestApiCancellationRequested(result.RequestId);
+                }
 
                 if (await ShouldRetryRequestAsync(definition.RateLimitGate, result, currentTry).ConfigureAwait(false))
                     continue;
@@ -264,6 +276,7 @@ namespace CryptoExchange.Net.Clients
         /// <param name="additionalHeaders">Additional headers for this request</param>
         /// <param name="weight">Override the request weight for this request</param>
         /// <param name="weightSingleLimiter">Specify the weight to apply to the individual rate limit guard for this request</param>
+        /// <param name="rateLimitKeySuffix">An additional optional suffix for the key selector</param>
         /// <returns></returns>
         /// <exception cref="Exception"></exception>
         protected virtual async Task<CallResult> PrepareAsync(
@@ -273,7 +286,8 @@ namespace CryptoExchange.Net.Clients
             CancellationToken cancellationToken,
             Dictionary<string, string>? additionalHeaders = null,
             int? weight = null,
-            int? weightSingleLimiter = null)
+            int? weightSingleLimiter = null,
+            string? rateLimitKeySuffix = null)
         {
             // Time sync
             if (definition.Authenticated)
@@ -308,7 +322,7 @@ namespace CryptoExchange.Net.Clients
 
                 if (ClientOptions.RateLimiterEnabled)
                 {
-                    var limitResult = await definition.RateLimitGate.ProcessAsync(_logger, requestId, RateLimitItemType.Request, definition, baseAddress, AuthenticationProvider?._credentials.Key, requestWeight, ClientOptions.RateLimitingBehaviour, cancellationToken).ConfigureAwait(false);
+                    var limitResult = await definition.RateLimitGate.ProcessAsync(_logger, requestId, RateLimitItemType.Request, definition, baseAddress, AuthenticationProvider?._credentials.Key, requestWeight, ClientOptions.RateLimitingBehaviour, rateLimitKeySuffix, cancellationToken).ConfigureAwait(false);
                     if (!limitResult)
                         return new CallResult(limitResult.Error!);
                 }
@@ -323,7 +337,7 @@ namespace CryptoExchange.Net.Clients
                 if (ClientOptions.RateLimiterEnabled)
                 {
                     var singleRequestWeight = weightSingleLimiter ?? 1;
-                    var limitResult = await definition.RateLimitGate.ProcessSingleAsync(_logger, requestId, definition.LimitGuard, RateLimitItemType.Request, definition, baseAddress, AuthenticationProvider?._credentials.Key, singleRequestWeight, ClientOptions.RateLimitingBehaviour, cancellationToken).ConfigureAwait(false);
+                    var limitResult = await definition.RateLimitGate.ProcessSingleAsync(_logger, requestId, definition.LimitGuard, RateLimitItemType.Request, definition, baseAddress, AuthenticationProvider?._credentials.Key, singleRequestWeight, ClientOptions.RateLimitingBehaviour, rateLimitKeySuffix, cancellationToken).ConfigureAwait(false);
                     if (!limitResult)
                         return new CallResult(limitResult.Error!);
                 }
@@ -609,7 +623,7 @@ namespace CryptoExchange.Net.Clients
 
                 if (ClientOptions.RateLimiterEnabled)
                 {
-                    var limitResult = await gate.ProcessAsync(_logger, requestId, RateLimitItemType.Request, new RequestDefinition(uri.AbsolutePath.TrimStart('/'), method) { Authenticated = signed }, uri.Host, AuthenticationProvider?._credentials.Key, requestWeight, ClientOptions.RateLimitingBehaviour, cancellationToken).ConfigureAwait(false);
+                    var limitResult = await gate.ProcessAsync(_logger, requestId, RateLimitItemType.Request, new RequestDefinition(uri.AbsolutePath.TrimStart('/'), method) { Authenticated = signed }, uri.Host, AuthenticationProvider?._credentials.Key, requestWeight, ClientOptions.RateLimitingBehaviour, null, cancellationToken).ConfigureAwait(false);
                     if (!limitResult)
                         return new CallResult<IRequest>(limitResult.Error!);
                 }
@@ -826,7 +840,7 @@ namespace CryptoExchange.Net.Clients
             if (parameterPosition == HttpMethodParameterPosition.InUri)
             {
                 foreach (var parameter in parameters)
-                    uri = uri.AddQueryParmeter(parameter.Key, parameter.Value.ToString()!);
+                    uri = uri.AddQueryParameter(parameter.Key, parameter.Value.ToString()!);
             }
 
             var headers = new Dictionary<string, string>();

CryptoExchange.Net/Clients/SocketApiClient.cs

@@ -82,7 +82,7 @@ namespace CryptoExchange.Net.Clients
         {
             get
             {
-                if (!socketConnections.Any())
+                if (socketConnections.IsEmpty)
                     return 0;
 
                 return socketConnections.Sum(s => s.Value.IncomingKbps);
@@ -97,7 +97,7 @@ namespace CryptoExchange.Net.Clients
         {
             get
             {
-                if (!socketConnections.Any())
+                if (socketConnections.IsEmpty)
                     return 0;
 
                 return socketConnections.Sum(s => s.Value.UserSubscriptionCount);
@@ -510,7 +510,7 @@ namespace CryptoExchange.Net.Clients
 
             if (connection != null)
             {
-                if (connection.UserSubscriptionCount < ClientOptions.SocketSubscriptionsCombineTarget || socketConnections.Count >= (ApiOptions.MaxSocketConnections ?? ClientOptions.MaxSocketConnections) && socketConnections.All(s => s.Value.UserSubscriptionCount >= ClientOptions.SocketSubscriptionsCombineTarget))
+                if (connection.UserSubscriptionCount < ClientOptions.SocketSubscriptionsCombineTarget || (socketConnections.Count >= (ApiOptions.MaxSocketConnections ?? ClientOptions.MaxSocketConnections) && socketConnections.All(s => s.Value.UserSubscriptionCount >= ClientOptions.SocketSubscriptionsCombineTarget)))
                     // Use existing socket if it has less than target connections OR it has the least connections and we can't make new
                     return new CallResult<SocketConnection>(connection);
             }
@@ -598,9 +598,10 @@ namespace CryptoExchange.Net.Clients
                 KeepAliveInterval = KeepAliveInterval,
                 ReconnectInterval = ClientOptions.ReconnectInterval,
                 RateLimiter = ClientOptions.RateLimiterEnabled ? RateLimiter : null,
-                RateLimitingBehaviour = ClientOptions.RateLimitingBehaviour,
+                RateLimitingBehavior = ClientOptions.RateLimitingBehaviour,
                 Proxy = ClientOptions.Proxy,
-                Timeout = ApiOptions.SocketNoDataTimeout ?? ClientOptions.SocketNoDataTimeout
+                Timeout = ApiOptions.SocketNoDataTimeout ?? ClientOptions.SocketNoDataTimeout,
+                ReceiveBufferSize = ClientOptions.ReceiveBufferSize,
             };
 
         /// <summary>
@@ -670,8 +671,11 @@ namespace CryptoExchange.Net.Clients
             var tasks = new List<Task>();
             {
                 var socketList = socketConnections.Values;
-                foreach (var connection in socketList.Where(s => !s.DedicatedRequestConnection.IsDedicatedRequestConnection))
-                    tasks.Add(connection.CloseAsync());
+                foreach (var connection in socketList)
+                {
+                    foreach(var subscription in connection.Subscriptions.Where(x => x.UserSubscription))
+                        tasks.Add(connection.CloseAsync(subscription));
+                }
             }
 
             await Task.WhenAll(tasks.ToArray()).ConfigureAwait(false);
@@ -718,7 +722,7 @@ namespace CryptoExchange.Net.Clients
             base.SetOptions(options);
 
             if ((!previousProxyIsSet && options.Proxy == null)
-                || !socketConnections.Any())
+                || socketConnections.IsEmpty)
             {
                 return;
             }

CryptoExchange.Net/Converters/MessageParsing/MessageNode.cs

@@ -3,7 +3,7 @@
     /// <summary>
     /// Node accessor
     /// </summary>
-    public struct NodeAccessor
+    public readonly struct NodeAccessor
     {
         /// <summary>
         /// Index

CryptoExchange.Net/Converters/MessageParsing/MessagePath.cs

@@ -6,9 +6,9 @@ namespace CryptoExchange.Net.Converters.MessageParsing
     /// <summary>
     /// Message access definition
     /// </summary>
-    public struct MessagePath : IEnumerable<NodeAccessor>
+    public readonly struct MessagePath : IEnumerable<NodeAccessor>
     {
-        private List<NodeAccessor> _path;
+        private readonly List<NodeAccessor> _path;
 
         internal void Add(NodeAccessor node)
         {

CryptoExchange.Net/Converters/SystemTextJson/ArrayConverter.cs

@@ -87,8 +87,12 @@ namespace CryptoExchange.Net.Converters.SystemTextJson
 
                     if (prop.JsonConverterType == null && IsSimple(prop.PropertyInfo.PropertyType))
                     {
-                        if (prop.PropertyInfo.PropertyType == typeof(string))
+                        if (prop.TargetType == typeof(string))
                             writer.WriteStringValue(Convert.ToString(objValue, CultureInfo.InvariantCulture));
+                        else if(prop.TargetType.IsEnum)
+                            writer.WriteStringValue(EnumConverter.GetString(objValue));
+                        else if (prop.TargetType == typeof(bool))
+                            writer.WriteBooleanValue((bool)objValue);
                         else
                             writer.WriteRawValue(Convert.ToString(objValue, CultureInfo.InvariantCulture)!);
                     }
@@ -187,12 +191,12 @@ namespace CryptoExchange.Net.Converters.SystemTextJson
                                 _converterOptionsCache.TryAdd(attribute.JsonConverterType, newOptions);
                             }
 
-                            value = JsonDocument.ParseValue(ref reader).Deserialize(targetType, newOptions);
+                            value = JsonDocument.ParseValue(ref reader).Deserialize(attribute.PropertyInfo.PropertyType, newOptions);
                         }
                         else if (attribute.DefaultDeserialization)
                         {
                             // Use default deserialization
-                            value = JsonDocument.ParseValue(ref reader).Deserialize(targetType, options);
+                            value = JsonDocument.ParseValue(ref reader).Deserialize(attribute.PropertyInfo.PropertyType, SerializerOptions.WithConverters);
                         }
                         else
                         {

CryptoExchange.Net/Converters/SystemTextJson/DateTimeConverter.cs

@@ -47,7 +47,7 @@ namespace CryptoExchange.Net.Converters.SystemTextJson
                 if (reader.TokenType is JsonTokenType.Number)
                 {
                     var longValue = reader.GetDouble();
-                    if (longValue == 0 || longValue == -1)
+                    if (longValue == 0 || longValue < 0)
                         return default;
 
                     return ParseFromDouble(longValue);

CryptoExchange.Net/Converters/SystemTextJson/EnumConverter.cs

@@ -172,6 +172,13 @@ namespace CryptoExchange.Net.Converters.SystemTextJson
                     return true;
                 }
 
+                if (objectType.IsDefined(typeof(FlagsAttribute)))
+                {
+                    var intValue = int.Parse(value);
+                    result = Enum.ToObject(objectType, intValue);
+                    return true;
+                }
+
                 try
                 {
                     // If no explicit mapping is found try to parse string

CryptoExchange.Net/Converters/SystemTextJson/SystemTextJsonMessageAccessor.cs

@@ -20,8 +20,8 @@ namespace CryptoExchange.Net.Converters.SystemTextJson
         /// </summary>
         protected JsonDocument? _document;
 
-        private static JsonSerializerOptions _serializerOptions = SerializerOptions.WithConverters;
-        private JsonSerializerOptions? _customSerializerOptions;
+        private static readonly JsonSerializerOptions _serializerOptions = SerializerOptions.WithConverters;
+        private readonly JsonSerializerOptions? _customSerializerOptions;
 
         /// <inheritdoc />
         public bool IsJson { get; set; }
@@ -148,6 +148,7 @@ namespace CryptoExchange.Net.Converters.SystemTextJson
                     return value.Value.Deserialize<T>(_customSerializerOptions ?? _serializerOptions);
                 }
                 catch { }
+
                 return default;
             }
 
@@ -359,7 +360,7 @@ namespace CryptoExchange.Net.Converters.SystemTextJson
 
         /// <inheritdoc />
         public override string GetOriginalString() =>
-            // Netstandard 2.0 doesn't support GetString from a ReadonlySpan<byte>, so use ToArray there instead
+            // NetStandard 2.0 doesn't support GetString from a ReadonlySpan<byte>, so use ToArray there instead
 #if NETSTANDARD2_0
             Encoding.UTF8.GetString(_bytes.ToArray());
 #else

CryptoExchange.Net/CryptoExchange.Net.csproj

@@ -6,9 +6,9 @@
     <PackageId>CryptoExchange.Net</PackageId>
     <Authors>JKorf</Authors>
     <Description>CryptoExchange.Net is a base library which is used to implement different cryptocurrency (exchange) API's. It provides a standardized way of implementing different API's, which results in a very similar experience for users of the API implementations.</Description>
-    <PackageVersion>8.7.1</PackageVersion>
-    <AssemblyVersion>8.7.1</AssemblyVersion>
-    <FileVersion>8.7.1</FileVersion>
+    <PackageVersion>8.8.0</PackageVersion>
+    <AssemblyVersion>8.8.0</AssemblyVersion>
+    <FileVersion>8.8.0</FileVersion>
     <PackageRequireLicenseAcceptance>false</PackageRequireLicenseAcceptance>
     <PackageTags>OKX;OKX.Net;Mexc;Mexc.Net;Kucoin;Kucoin.Net;Kraken;Kraken.Net;Huobi;Huobi.Net;CoinEx;CoinEx.Net;Bybit;Bybit.Net;Bitget;Bitget.Net;Bitfinex;Bitfinex.Net;Binance;Binance.Net;CryptoCurrency;CryptoCurrency Exchange</PackageTags>
     <RepositoryType>git</RepositoryType>

CryptoExchange.Net/ExchangeHelpers.cs

@@ -160,7 +160,7 @@ namespace CryptoExchange.Net
         }
 
         /// <summary>
-        /// Generate a new unique id. The id is staticly stored so it is guarenteed to be unique
+        /// Generate a new unique id. The id is statically stored so it is guaranteed to be unique
         /// </summary>
         /// <returns></returns>
         public static int NextId() => Interlocked.Increment(ref _lastId);

CryptoExchange.Net/ExtensionMethods.cs

@@ -111,6 +111,7 @@ namespace CryptoExchange.Net
                     formData.Add(kvp.Key, string.Format(CultureInfo.InvariantCulture, "{0}", kvp.Value));
                 }
             }
+
             return formData.ToString()!;
         }
 
@@ -286,6 +287,7 @@ namespace CryptoExchange.Net
                     httpValueCollection.Add(parameter.Key, parameter.Value.ToString());
                 }
             }
+
             uriBuilder.Query = httpValueCollection.ToString();
             return uriBuilder.Uri;
         }
@@ -333,6 +335,7 @@ namespace CryptoExchange.Net
                     httpValueCollection.Add(parameter.Key, parameter.Value.ToString());
                 }
             }
+
             uriBuilder.Query = httpValueCollection.ToString();
             return uriBuilder.Uri;
         }
@@ -344,7 +347,7 @@ namespace CryptoExchange.Net
         /// <param name="name"></param>
         /// <param name="value"></param>
         /// <returns></returns>
-        public static Uri AddQueryParmeter(this Uri uri, string name, string value)
+        public static Uri AddQueryParameter(this Uri uri, string name, string value)
         {
             var httpValueCollection = HttpUtility.ParseQueryString(uri.Query);
 

CryptoExchange.Net/Interfaces/ISocketApiClient.cs

@@ -19,7 +19,7 @@ namespace CryptoExchange.Net.Interfaces
         /// </summary>
         int CurrentSubscriptions { get; }
         /// <summary>
-        /// Incoming data kpbs
+        /// Incoming data Kbps
         /// </summary>
         double IncomingKbps { get; }
         /// <summary>

CryptoExchange.Net/Interfaces/ISymbolOrderBook.cs

@@ -105,7 +105,7 @@ namespace CryptoExchange.Net.Interfaces
         Task StopAsync();
 
         /// <summary>
-        /// Get the average price that a market order would fill at at the current order book state. This is no guarentee that an order of that quantity would actually be filled
+        /// Get the average price that a market order would fill at at the current order book state. This is no guarantee that an order of that quantity would actually be filled
         /// at that price since between this calculation and the order placement the book might have changed.
         /// </summary>
         /// <param name="quantity">The quantity in base asset to fill</param>
@@ -115,7 +115,7 @@ namespace CryptoExchange.Net.Interfaces
 
         /// <summary>
         /// Get the amount of base asset which can be traded with the quote quantity when placing a market order at at the current order book state. 
-        /// This is no guarentee that an order of that quantity would actually be fill the quantity returned by this since between this calculation and the order placement the book might have changed.
+        /// This is no guarantee that an order of that quantity would actually be fill the quantity returned by this since between this calculation and the order placement the book might have changed.
         /// </summary>
         /// <param name="quoteQuantity">The quantity in quote asset looking to trade</param>
         /// <param name="type">The type</param>

CryptoExchange.Net/Interfaces/IWebsocket.cs

@@ -47,7 +47,7 @@ namespace CryptoExchange.Net.Interfaces
         /// </summary>
         event Func<Task> OnReconnected;
         /// <summary>
-        /// Get reconntion url
+        /// Get reconnection url
         /// </summary>
         Func<Task<Uri?>>? GetReconnectionUrl { get; set; }
 

CryptoExchange.Net/LibraryHelpers.cs

@@ -10,9 +10,9 @@ namespace CryptoExchange.Net
     public static class LibraryHelpers
     {
         /// <summary>
-        /// Client order id seperator
+        /// Client order id separator
         /// </summary>
-        public const string ClientOrderIdSeperator = "JK";
+        public const string ClientOrderIdSeparator = "JK";
 
         /// <summary>
         /// Apply broker id to a client order id
@@ -20,25 +20,25 @@ namespace CryptoExchange.Net
         /// <param name="clientOrderId"></param>
         /// <param name="brokerId"></param>
         /// <param name="maxLength"></param>
-        /// <param name="allowValueAdjustement"></param>
+        /// <param name="allowValueAdjustment"></param>
         /// <returns></returns>
-        public static string ApplyBrokerId(string? clientOrderId, string brokerId, int maxLength, bool allowValueAdjustement)
+        public static string ApplyBrokerId(string? clientOrderId, string brokerId, int maxLength, bool allowValueAdjustment)
         {
-            var reservedLength = brokerId.Length + ClientOrderIdSeperator.Length;
+            var reservedLength = brokerId.Length + ClientOrderIdSeparator.Length;
 
             if ((clientOrderId?.Length + reservedLength) > maxLength)
                 return clientOrderId!;
 
             if (!string.IsNullOrEmpty(clientOrderId))
             {
-                if (allowValueAdjustement)
-                    clientOrderId = brokerId + ClientOrderIdSeperator + clientOrderId;
+                if (allowValueAdjustment)
+                    clientOrderId = brokerId + ClientOrderIdSeparator + clientOrderId;
 
                 return clientOrderId!;
             }
             else
             {
-                clientOrderId = ExchangeHelpers.AppendRandomString(brokerId + ClientOrderIdSeperator, maxLength);
+                clientOrderId = ExchangeHelpers.AppendRandomString(brokerId + ClientOrderIdSeparator, maxLength);
             }
 
             return clientOrderId;

CryptoExchange.Net/Logging/Extensions/CryptoExchangeWebSocketClientLoggingExtension.cs

@@ -33,7 +33,7 @@ namespace CryptoExchange.Net.Logging.Extensions
         private static readonly Action<ILogger, int, Exception?> _receiveLoopStoppedWithException;
         private static readonly Action<ILogger, int, Exception?> _receiveLoopFinished;
         private static readonly Action<ILogger, int, TimeSpan?, Exception?> _startingTaskForNoDataReceivedCheck;
-        private static readonly Action<ILogger, int, TimeSpan?, Exception?> _noDataReceiveTimoutReconnect;
+        private static readonly Action<ILogger, int, TimeSpan?, Exception?> _noDataReceiveTimeoutReconnect;
         private static readonly Action<ILogger, int, string, string, Exception?> _socketProcessingStateChanged;
         private static readonly Action<ILogger, int, Exception?> _socketPingTimeout;
 
@@ -169,7 +169,7 @@ namespace CryptoExchange.Net.Logging.Extensions
                 new EventId(1026, "StartingTaskForNoDataReceivedCheck"),
                 "[Sckt {SocketId}] starting task checking for no data received for {Timeout}");
 
-            _noDataReceiveTimoutReconnect = LoggerMessage.Define<int, TimeSpan?>(
+            _noDataReceiveTimeoutReconnect = LoggerMessage.Define<int, TimeSpan?>(
                 LogLevel.Warning,
                 new EventId(1027, "NoDataReceiveTimeoutReconnect"),
                 "[Sckt {SocketId}] no data received for {Timeout}, reconnecting socket");
@@ -356,7 +356,7 @@ namespace CryptoExchange.Net.Logging.Extensions
         public static void SocketNoDataReceiveTimoutReconnect(
             this ILogger logger, int socketId, TimeSpan? timeSpan)
         {
-            _noDataReceiveTimoutReconnect(logger, socketId, timeSpan, null);
+            _noDataReceiveTimeoutReconnect(logger, socketId, timeSpan, null);
         }
 
         public static void SocketProcessingStateChanged(

CryptoExchange.Net/Logging/Extensions/RestApiClientLoggingExtensions.cs

@@ -21,7 +21,7 @@ namespace CryptoExchange.Net.Logging.Extensions
         private static readonly Action<ILogger, string, Exception?> _restApiCheckingCache;
         private static readonly Action<ILogger, string, Exception?> _restApiCacheHit;
         private static readonly Action<ILogger, string, Exception?> _restApiCacheNotHit;
-
+        private static readonly Action<ILogger, int?, Exception?> _restApiCancellationRequested;
 
         static RestApiClientLoggingExtensions()
         {
@@ -37,7 +37,7 @@ namespace CryptoExchange.Net.Logging.Extensions
 
             _restApiFailedToSyncTime = LoggerMessage.Define<int, string>(
                 LogLevel.Debug,
-                new EventId(4002, "RestApifailedToSyncTime"),
+                new EventId(4002, "RestApiFailedToSyncTime"),
                 "[Req {RequestId}] Failed to sync time, aborting request: {ErrorMessage}");
 
             _restApiNoApiCredentials = LoggerMessage.Define<int, string>(
@@ -84,6 +84,12 @@ namespace CryptoExchange.Net.Logging.Extensions
                 LogLevel.Trace,
                 new EventId(4011, "RestApiCacheNotHit"),
                 "Cache not hit for key {Key}");
+
+            _restApiCancellationRequested = LoggerMessage.Define<int?>(
+                LogLevel.Debug,
+                new EventId(4012, "RestApiCancellationRequested"),
+                "[Req {RequestId}] Request cancelled by user");
+
         }
 
         public static void RestApiErrorReceived(this ILogger logger, int? requestId, HttpStatusCode? responseStatusCode, long responseTime, string? error)
@@ -145,5 +151,9 @@ namespace CryptoExchange.Net.Logging.Extensions
         {
             _restApiCacheNotHit(logger, key, null);
         }
+        public static void RestApiCancellationRequested(this ILogger logger, int? requestId)
+        {
+            _restApiCancellationRequested(logger, requestId, null);
+        }
     }
 }

CryptoExchange.Net/Logging/Extensions/SocketConnectionLoggingExtension.cs

@@ -10,7 +10,7 @@ namespace CryptoExchange.Net.Logging.Extensions
         private static readonly Action<ILogger, int, bool, Exception?> _activityPaused;
         private static readonly Action<ILogger, int, Sockets.SocketConnection.SocketStatus, Sockets.SocketConnection.SocketStatus, Exception?> _socketStatusChanged;
         private static readonly Action<ILogger, int, string?, Exception?> _failedReconnectProcessing;
-        private static readonly Action<ILogger, int, Exception?> _unkownExceptionWhileProcessingReconnection;
+        private static readonly Action<ILogger, int, Exception?> _unknownExceptionWhileProcessingReconnection;
         private static readonly Action<ILogger, int, WebSocketError, string?, Exception?> _webSocketErrorCodeAndDetails;
         private static readonly Action<ILogger, int, string?, Exception?> _webSocketError;
         private static readonly Action<ILogger, int, int, Exception?> _messageSentNotPending;
@@ -28,7 +28,7 @@ namespace CryptoExchange.Net.Logging.Extensions
         private static readonly Action<ILogger, int, Exception?> _closingNoMoreSubscriptions;
         private static readonly Action<ILogger, int, int, int, Exception?> _addingNewSubscription;
         private static readonly Action<ILogger, int, Exception?> _nothingToResubscribeCloseConnection;
-        private static readonly Action<ILogger, int, Exception?> _failedAuthenticationDisconnectAndRecoonect;
+        private static readonly Action<ILogger, int, Exception?> _failedAuthenticationDisconnectAndReconnect;
         private static readonly Action<ILogger, int, Exception?> _authenticationSucceeded;
         private static readonly Action<ILogger, int, string?, Exception?> _failedRequestRevitalization;
         private static readonly Action<ILogger, int, Exception?> _allSubscriptionResubscribed;
@@ -55,15 +55,15 @@ namespace CryptoExchange.Net.Logging.Extensions
                 new EventId(2002, "FailedReconnectProcessing"),
                 "[Sckt {SocketId}] failed reconnect processing: {ErrorMessage}, reconnecting again");
 
-            _unkownExceptionWhileProcessingReconnection = LoggerMessage.Define<int>(
+            _unknownExceptionWhileProcessingReconnection = LoggerMessage.Define<int>(
                 LogLevel.Warning,
-                new EventId(2003, "UnkownExceptionWhileProcessingReconnection"),
+                new EventId(2003, "UnknownExceptionWhileProcessingReconnection"),
                 "[Sckt {SocketId}] Unknown exception while processing reconnection, reconnecting again");
 
             _webSocketErrorCodeAndDetails = LoggerMessage.Define<int, WebSocketError, string?>(
                 LogLevel.Warning,
                 new EventId(2004, "WebSocketErrorCode"),
-                "[Sckt {SocketId}] error: Websocket error code {WebSocketErrorCdoe}, details: {Details}");
+                "[Sckt {SocketId}] error: Websocket error code {WebSocketErrorCode}, details: {Details}");
 
             _webSocketError = LoggerMessage.Define<int, string?>(
                 LogLevel.Warning,
@@ -145,7 +145,7 @@ namespace CryptoExchange.Net.Logging.Extensions
                 new EventId(2020, "NothingToResubscribe"),
                 "[Sckt {SocketId}] nothing to resubscribe, closing connection");
 
-            _failedAuthenticationDisconnectAndRecoonect = LoggerMessage.Define<int>(
+            _failedAuthenticationDisconnectAndReconnect = LoggerMessage.Define<int>(
                 LogLevel.Warning,
                 new EventId(2021, "FailedAuthentication"),
                 "[Sckt {SocketId}] authentication failed on reconnected socket. Disconnecting and reconnecting");
@@ -206,9 +206,9 @@ namespace CryptoExchange.Net.Logging.Extensions
             _failedReconnectProcessing(logger, socketId, error, null);
         }
 
-        public static void UnkownExceptionWhileProcessingReconnection(this ILogger logger, int socketId, Exception e)
+        public static void UnknownExceptionWhileProcessingReconnection(this ILogger logger, int socketId, Exception e)
         {
-            _unkownExceptionWhileProcessingReconnection(logger, socketId, e);
+            _unknownExceptionWhileProcessingReconnection(logger, socketId, e);
         }
 
         public static void WebSocketErrorCodeAndDetails(this ILogger logger, int socketId, WebSocketError error, string? details, Exception e)
@@ -285,7 +285,7 @@ namespace CryptoExchange.Net.Logging.Extensions
         }
         public static void FailedAuthenticationDisconnectAndRecoonect(this ILogger logger, int socketId)
         {
-            _failedAuthenticationDisconnectAndRecoonect(logger, socketId, null);
+            _failedAuthenticationDisconnectAndReconnect(logger, socketId, null);
         }
         public static void AuthenticationSucceeded(this ILogger logger, int socketId)
         {

CryptoExchange.Net/Logging/Extensions/SymbolOrderBookLoggingExtensions.cs

@@ -62,7 +62,6 @@ namespace CryptoExchange.Net.Logging.Extensions
                 new EventId(5005, "OrderBookStopping"),
                 "{Api} order book {Symbol} stopping");
 
-
             _orderBookStopped = LoggerMessage.Define<string, string>(
                 LogLevel.Trace,
                 new EventId(5006, "OrderBookStopped"),

CryptoExchange.Net/Logging/Extensions/TrackerLoggingExtensions.cs

@@ -97,7 +97,6 @@ namespace CryptoExchange.Net.Logging.Extensions
                 new EventId(6012, "KlineTrackerConnectionRestored"),
                 "Kline tracker for {Symbol} successfully resynchronized");
 
-
             _tradeTrackerStatusChanged = LoggerMessage.Define<string, SyncStatus, SyncStatus>(
                 LogLevel.Debug,
                 new EventId(6013, "KlineTrackerStatusChanged"),

CryptoExchange.Net/Objects/AsyncAutoResetEvent.cs

@@ -32,44 +32,51 @@ namespace CryptoExchange.Net.Objects
         /// Wait for the AutoResetEvent to be set
         /// </summary>
         /// <returns></returns>
-        public Task<bool> WaitAsync(TimeSpan? timeout = null, CancellationToken ct = default)
+        public async Task<bool> WaitAsync(TimeSpan? timeout = null, CancellationToken ct = default)
         {
-            lock (_waits)
+            CancellationTokenRegistration registration = default;
+            try
             {
-                if (_signaled)
+                Task<bool> waiter = _completed;
+                lock (_waits)
                 {
-                    if(_reset)
-                        _signaled = false;
-                    return _completed;
-                }
-                else
-                {
-                    if (ct.IsCancellationRequested)
-                        return _completed;
-
-                    var tcs = new TaskCompletionSource<bool>(TaskCreationOptions.RunContinuationsAsynchronously);
-                    if (timeout.HasValue)
+                    if (_signaled)
                     {
-                        var timeoutSource = new CancellationTokenSource(timeout.Value);
-                        var cancellationSource = CancellationTokenSource.CreateLinkedTokenSource(timeoutSource.Token, ct);
-                        ct = cancellationSource.Token;
+                        if (_reset)
+                            _signaled = false;
                     }
-
-                    var registration = ct.Register(() =>
+                    else if (!ct.IsCancellationRequested)
                     {
-                        lock (_waits)
+                        var tcs = new TaskCompletionSource<bool>(TaskCreationOptions.RunContinuationsAsynchronously);
+                        if (timeout.HasValue)
                         {
-                            tcs.TrySetResult(false);
-
-                            // Not the cleanest but it works
-                            _waits = new Queue<TaskCompletionSource<bool>>(_waits.Where(i => i != tcs));
+                            var timeoutSource = new CancellationTokenSource(timeout.Value);
+                            var cancellationSource = CancellationTokenSource.CreateLinkedTokenSource(timeoutSource.Token, ct);
+                            ct = cancellationSource.Token;
                         }
-                    }, useSynchronizationContext: false);
-                    
 
-                    _waits.Enqueue(tcs);
-                    return tcs.Task;
+                        registration = ct.Register(() =>
+                        {
+                            lock (_waits)
+                            {
+                                tcs.TrySetResult(false);
+
+                                // Not the cleanest but it works
+                                _waits = new Queue<TaskCompletionSource<bool>>(_waits.Where(i => i != tcs));
+                            }
+                        }, useSynchronizationContext: false);
+
+
+                        _waits.Enqueue(tcs);
+                        waiter = tcs.Task;
+                    }
                 }
+
+                return await waiter.ConfigureAwait(false);
+            }
+            finally
+            {
+                registration.Dispose();
             }
         }
 

CryptoExchange.Net/Objects/CallResult.cs

@@ -89,7 +89,7 @@ namespace CryptoExchange.Net.Objects
         /// <summary>
         /// Create a new error result
         /// </summary>
-        /// <param name="error">The erro rto return</param>
+        /// <param name="error">The error to return</param>
         public CallResult(Error error) : this(default, null, error) { }
 
         /// <summary>

CryptoExchange.Net/Objects/Enums.cs

@@ -1,4 +1,6 @@
-namespace CryptoExchange.Net.Objects
+using CryptoExchange.Net.Attributes;
+
+namespace CryptoExchange.Net.Objects
 {
     /// <summary>
     /// What to do when a request would exceed the rate limit
@@ -92,7 +94,7 @@
         /// <summary>
         /// Disposed
         /// </summary>
-        Diposed
+        Disposed
     }
 
     /// <summary>
@@ -215,7 +217,7 @@
         /// </summary>
         FixedDelay,
         /// <summary>
-        /// Backof policy of 2^`reconnectAttempt`, where `reconnectAttempt` has a max value of 5
+        /// Backoff policy of 2^`reconnectAttempt`, where `reconnectAttempt` has a max value of 5
         /// </summary>
         ExponentialBackoff
     }

CryptoExchange.Net/Objects/Options/RestExchangeOptions.cs

@@ -55,7 +55,7 @@ namespace CryptoExchange.Net.Objects.Options
     {
         /// <summary>
         /// Trade environment. Contains info about URL's to use to connect to the API. To swap environment select another environment for
-        /// the exhange's environment list or create a custom environment using either `[Exchange]Environment.CreateCustom()` or `[Exchange]Environment.[Environment]`, for example `KucoinEnvironment.TestNet` or `BinanceEnvironment.Live`
+        /// the exchange's environment list or create a custom environment using either `[Exchange]Environment.CreateCustom()` or `[Exchange]Environment.[Environment]`, for example `KucoinEnvironment.TestNet` or `BinanceEnvironment.Live`
         /// </summary>
 #pragma warning disable CS8618 // Non-nullable field must contain a non-null value when exiting constructor. Consider declaring as nullable.
         public TEnvironment Environment { get; set; }

CryptoExchange.Net/Objects/Options/SocketExchangeOptions.cs

@@ -52,6 +52,15 @@ namespace CryptoExchange.Net.Objects.Options
         /// </summary>
         public TimeSpan? ConnectDelayAfterRateLimited { get; set; }
 
+        /// <summary>
+        /// The buffer size to use for receiving data. Leave unset to use the default buffer size.
+        /// </summary>
+        /// <remarks>
+        /// Only specify this if you are creating a significant amount of connections and understand the typical message length we receive from the exchange.
+        /// Setting this too low can increase memory consumption and allocations.
+        /// </remarks>
+        public int? ReceiveBufferSize { get; set; }
+
         /// <summary>
         /// Create a copy of this options
         /// </summary>
@@ -72,6 +81,7 @@ namespace CryptoExchange.Net.Objects.Options
             item.RequestTimeout = RequestTimeout;
             item.RateLimitingBehaviour = RateLimitingBehaviour;
             item.RateLimiterEnabled = RateLimiterEnabled;
+            item.ReceiveBufferSize = ReceiveBufferSize;
             return item;
         }
     }

CryptoExchange.Net/Objects/RequestDefinition.cs

@@ -25,8 +25,7 @@ namespace CryptoExchange.Net.Objects
         /// </summary>
         public bool Authenticated { get; set; }
 
-
-        // Formating
+        // Formatting
 
         /// <summary>
         /// The body format for this request

CryptoExchange.Net/Objects/Sockets/DataEvent.cs

@@ -12,7 +12,12 @@ namespace CryptoExchange.Net.Objects.Sockets
         /// <summary>
         /// The timestamp the data was received
         /// </summary>
-        public DateTime Timestamp { get; set; }
+        public DateTime ReceiveTime { get; set; }
+
+        /// <summary>
+        /// The timestamp of the data as specified by the server. Note that the server time and client time might not be 100% in sync so this value might not be fully comparable to local time.
+        /// </summary>
+        public DateTime? DataTime { get; set; }
 
         /// <summary>
         /// The stream producing the update
@@ -42,29 +47,32 @@ namespace CryptoExchange.Net.Objects.Sockets
         /// <summary>
         /// ctor
         /// </summary>
-        public DataEvent(T data, string? streamId, string? symbol, string? originalData, DateTime timestamp, SocketUpdateType? updateType)
+        public DataEvent(T data, string? streamId, string? symbol, string? originalData, DateTime receiveTimestamp, SocketUpdateType? updateType)
         {
             Data = data;
             StreamId = streamId;
             Symbol = symbol;
             OriginalData = originalData;
-            Timestamp = timestamp;
+            ReceiveTime = receiveTimestamp;
             UpdateType = updateType;
         }
 
         /// <summary>
-        /// Create a new DataEvent with data in the from of type K based on the current DataEvent. Topic, OriginalData and Timestamp will be copied over
+        /// Create a new DataEvent with data in the from of type K based on the current DataEvent. Topic, OriginalData and ReceivedTimestamp will be copied over
         /// </summary>
         /// <typeparam name="K">The type of the new data</typeparam>
         /// <param name="data">The new data</param>
         /// <returns></returns>
         public DataEvent<K> As<K>(K data)
         {
-            return new DataEvent<K>(data, StreamId, Symbol, OriginalData, Timestamp, UpdateType);
+            return new DataEvent<K>(data, StreamId, Symbol, OriginalData, ReceiveTime, UpdateType)
+            {
+                DataTime = DataTime
+            };
         }
 
         /// <summary>
-        /// Create a new DataEvent with data in the from of type K based on the current DataEvent. OriginalData and Timestamp will be copied over
+        /// Create a new DataEvent with data in the from of type K based on the current DataEvent. OriginalData and ReceivedTimestamp will be copied over
         /// </summary>
         /// <typeparam name="K">The type of the new data</typeparam>
         /// <param name="data">The new data</param>
@@ -72,11 +80,14 @@ namespace CryptoExchange.Net.Objects.Sockets
         /// <returns></returns>
         public DataEvent<K> As<K>(K data, string? symbol)
         {
-            return new DataEvent<K>(data, StreamId, symbol, OriginalData, Timestamp, UpdateType);
+            return new DataEvent<K>(data, StreamId, symbol, OriginalData, ReceiveTime, UpdateType)
+            {
+                DataTime = DataTime
+            };
         }
 
         /// <summary>
-        /// Create a new DataEvent with data in the from of type K based on the current DataEvent. OriginalData and Timestamp will be copied over
+        /// Create a new DataEvent with data in the from of type K based on the current DataEvent. OriginalData and ReceivedTimestamp will be copied over
         /// </summary>
         /// <typeparam name="K">The type of the new data</typeparam>
         /// <param name="data">The new data</param>
@@ -86,7 +97,10 @@ namespace CryptoExchange.Net.Objects.Sockets
         /// <returns></returns>
         public DataEvent<K> As<K>(K data, string streamId, string? symbol, SocketUpdateType updateType)
         {
-            return new DataEvent<K>(data, streamId, symbol, OriginalData, Timestamp, updateType);
+            return new DataEvent<K>(data, streamId, symbol, OriginalData, ReceiveTime, updateType)
+            {
+                DataTime = DataTime
+            };
         }
 
         /// <summary>
@@ -98,10 +112,12 @@ namespace CryptoExchange.Net.Objects.Sockets
         /// <returns></returns>
         public ExchangeEvent<K> AsExchangeEvent<K>(string exchange, K data)
         {
-            return new ExchangeEvent<K>(exchange, this.As<K>(data));
+            return new ExchangeEvent<K>(exchange, this.As<K>(data))
+            {
+                DataTime = DataTime
+            };
         }
 
-
         /// <summary>
         /// Specify the symbol
         /// </summary>
@@ -135,6 +151,15 @@ namespace CryptoExchange.Net.Objects.Sockets
             return this;
         }
 
+        /// <summary>
+        /// Specify the data timestamp
+        /// </summary>
+        public DataEvent<T> WithDataTimestamp(DateTime? timestamp)
+        {
+            DataTime = timestamp;
+            return this;
+        }
+
         /// <summary>
         /// Create a CallResult from this DataEvent
         /// </summary>

CryptoExchange.Net/Objects/Sockets/UpdateSubscription.cs

@@ -41,7 +41,7 @@ namespace CryptoExchange.Net.Objects.Sockets
 
         /// <summary>
         /// Event when the connection is restored. Timespan parameter indicates the time the socket has been offline for before reconnecting. 
-        /// Note that when the executing code is suspended and resumed at a later period (for example, a laptop going to sleep) the disconnect time will be incorrect as the diconnect
+        /// Note that when the executing code is suspended and resumed at a later period (for example, a laptop going to sleep) the disconnect time will be incorrect as the disconnect
         /// will only be detected after resuming the code, so the initial disconnect time is lost. Use the timespan only for informational purposes.
         /// </summary>
         public event Action<TimeSpan> ConnectionRestored

CryptoExchange.Net/Objects/Sockets/WebSocketParameters.cs

@@ -41,7 +41,7 @@ namespace CryptoExchange.Net.Objects.Sockets
         public ApiProxy? Proxy { get; set; }
 
         /// <summary>
-        /// The maximum time of no data received before considering the connection lost and closting/reconnecting the socket
+        /// The maximum time of no data received before considering the connection lost and closing/reconnecting the socket
         /// </summary>
         public TimeSpan? Timeout { get; set; }
 
@@ -57,13 +57,18 @@ namespace CryptoExchange.Net.Objects.Sockets
         /// <summary>
         /// What to do when rate limit is reached
         /// </summary>
-        public RateLimitingBehaviour RateLimitingBehaviour { get; set; }
+        public RateLimitingBehaviour RateLimitingBehavior { get; set; }
 
         /// <summary>
         /// Encoding for sending/receiving data
         /// </summary>
         public Encoding Encoding { get; set; } = Encoding.UTF8;
 
+        /// <summary>
+        /// The buffer size to use for receiving data
+        /// </summary>
+        public int? ReceiveBufferSize { get; set; } = null;
+
         /// <summary>
         /// ctor
         /// </summary>

CryptoExchange.Net/Objects/TradeEnvironment.cs

@@ -17,7 +17,7 @@
 
     /// <summary>
     /// Trade environment. Contains info about URL's to use to connect to the API. To swap environment select another environment for
-    /// the echange's environment list or create a custom environment using either `[Exchange]Environment.CreateCustom()` or `[Exchange]Environment.[Environment]`, for example `KucoinEnvironment.TestNet` or `BinanceEnvironment.Live`
+    /// the exchange's environment list or create a custom environment using either `[Exchange]Environment.CreateCustom()` or `[Exchange]Environment.[Environment]`, for example `KucoinEnvironment.TestNet` or `BinanceEnvironment.Live`
     /// </summary>
     public class TradeEnvironment
     {

CryptoExchange.Net/OrderBook/SymbolOrderBook.cs

@@ -74,8 +74,7 @@ namespace CryptoExchange.Net.OrderBook
         
         /// <summary>
         /// Whether levels should be strictly enforced. For example, when an order book has 25 levels and a new update comes in which pushes
-        /// the current level 25 ask out of the top 25, should the curent the level 26 entry be removed from the book or does the 
-        /// server handle this
+        /// the current level 25 ask out of the top 25, should the level 26 entry be removed from the book or does the server handle this
         /// </summary>
         protected bool _strictLevels;
 
@@ -250,6 +249,7 @@ namespace CryptoExchange.Net.OrderBook
 
             // Clear any previous messages
             while (_processQueue.TryDequeue(out _)) { }
+
             _processBuffer.Clear();
             _bookSet = false;
 
@@ -407,7 +407,7 @@ namespace CryptoExchange.Net.OrderBook
                 
         /// <summary>
         /// Set the initial data for the order book. Typically the snapshot which was requested from the Rest API, or the first snapshot
-        /// received from a socket subcription
+        /// received from a socket subscription
         /// </summary>
         /// <param name="orderBookSequenceNumber">The last update sequence number until which the snapshot is in sync</param>
         /// <param name="askList">List of asks</param>
@@ -618,6 +618,7 @@ namespace CryptoExchange.Net.OrderBook
                 var bid = book.bids.Count() > i ? book.bids.ElementAt(i): null;
                 stringBuilder.AppendLine($"[{ask?.Quantity.ToString(CultureInfo.InvariantCulture),14}] {ask?.Price.ToString(CultureInfo.InvariantCulture),14} | {bid?.Price.ToString(CultureInfo.InvariantCulture),-14} [{bid?.Quantity.ToString(CultureInfo.InvariantCulture),-14}]");
             }
+
             return stringBuilder.ToString();
         }
 
@@ -636,6 +637,7 @@ namespace CryptoExchange.Net.OrderBook
             _queueEvent.Set();
             // Clear queue
             while (_processQueue.TryDequeue(out _)) { }
+
             _processBuffer.Clear();
             _bookSet = false;
             DoReset();
@@ -732,7 +734,7 @@ namespace CryptoExchange.Net.OrderBook
                     var (prevBestBid, prevBestAsk) = BestOffers;
                     ProcessRangeUpdates(item.StartUpdateId, item.EndUpdateId, item.Bids, item.Asks);
 
-                    if (!_asks.Any() || !_bids.Any())
+                    if (_asks.Count == 0 || _bids.Count == 0)
                         return;
 
                     if (_asks.First().Key < _bids.First().Key)

CryptoExchange.Net/RateLimiting/Guards/RateLimitGuard.cs

@@ -32,9 +32,9 @@ namespace CryptoExchange.Net.RateLimiting.Guards
 
         private readonly IEnumerable<IGuardFilter> _filters;
         private readonly Dictionary<string, IWindowTracker> _trackers;
-        private RateLimitWindowType _windowType;
-        private double? _decayRate;
-        private int? _connectionWeight;
+        private readonly RateLimitWindowType _windowType;
+        private readonly double? _decayRate;
+        private readonly int? _connectionWeight;
         private readonly Func<RequestDefinition, string, string?, string> _keySelector;
 
         /// <inheritdoc />
@@ -90,7 +90,7 @@ namespace CryptoExchange.Net.RateLimiting.Guards
         }
 
         /// <inheritdoc />
-        public LimitCheck Check(RateLimitItemType type, RequestDefinition definition, string host, string? apiKey, int requestWeight)
+        public LimitCheck Check(RateLimitItemType type, RequestDefinition definition, string host, string? apiKey, int requestWeight, string? keySuffix)
         {
             foreach(var filter in _filters)
             {
@@ -101,7 +101,7 @@ namespace CryptoExchange.Net.RateLimiting.Guards
             if (type == RateLimitItemType.Connection)
                 requestWeight = _connectionWeight ?? requestWeight;
 
-            var key = _keySelector(definition, host, apiKey);
+            var key = _keySelector(definition, host, apiKey) + keySuffix;
             if (!_trackers.TryGetValue(key, out var tracker))
             {
                 tracker = CreateTracker();
@@ -116,7 +116,7 @@ namespace CryptoExchange.Net.RateLimiting.Guards
         }
 
         /// <inheritdoc />
-        public RateLimitState ApplyWeight(RateLimitItemType type, RequestDefinition definition, string host, string? apiKey, int requestWeight)
+        public RateLimitState ApplyWeight(RateLimitItemType type, RequestDefinition definition, string host, string? apiKey, int requestWeight, string? keySuffix)
         {
             foreach (var filter in _filters)
             {
@@ -127,7 +127,7 @@ namespace CryptoExchange.Net.RateLimiting.Guards
             if (type == RateLimitItemType.Connection)
                 requestWeight = _connectionWeight ?? requestWeight;
 
-            var key = _keySelector(definition, host, apiKey);
+            var key = _keySelector(definition, host, apiKey) + keySuffix;
             var tracker = _trackers[key];
             tracker.ApplyWeight(requestWeight);
             return RateLimitState.Applied(Limit, TimeSpan, tracker.Current);

CryptoExchange.Net/RateLimiting/Guards/RetryAfterGuard.cs

@@ -42,7 +42,7 @@ namespace CryptoExchange.Net.RateLimiting.Guards
         }
 
         /// <inheritdoc />
-        public LimitCheck Check(RateLimitItemType type, RequestDefinition definition, string host, string? apiKey, int requestWeight)
+        public LimitCheck Check(RateLimitItemType type, RequestDefinition definition, string host, string? apiKey, int requestWeight, string? keySuffix)
         {
             if (type != Type)
                 return LimitCheck.NotApplicable;
@@ -55,7 +55,7 @@ namespace CryptoExchange.Net.RateLimiting.Guards
         }
 
         /// <inheritdoc />
-        public RateLimitState ApplyWeight(RateLimitItemType type, RequestDefinition definition, string host, string? apiKey, int requestWeight)
+        public RateLimitState ApplyWeight(RateLimitItemType type, RequestDefinition definition, string host, string? apiKey, int requestWeight, string? keySuffix)
         {
             return RateLimitState.NotApplied;
         }

CryptoExchange.Net/RateLimiting/Guards/SingleLimitGuard.cs

@@ -19,7 +19,7 @@ namespace CryptoExchange.Net.RateLimiting.Guards
         /// <summary>
         /// Endpoint limit per API key
         /// </summary>
-        public static Func<RequestDefinition, string, string?, string> PerApiKey { get; } = new Func<RequestDefinition, string, string?, string>((def, host, key) => def.Path + def.Method);
+        public static Func<RequestDefinition, string, string?, string> PerApiKey { get; } = new Func<RequestDefinition, string, string?, string>((def, host, key) => def.Path + def.Method + key);
 
         private readonly Dictionary<string, IWindowTracker> _trackers;
         private readonly RateLimitWindowType _windowType;
@@ -53,9 +53,9 @@ namespace CryptoExchange.Net.RateLimiting.Guards
         }
 
         /// <inheritdoc />
-        public LimitCheck Check(RateLimitItemType type, RequestDefinition definition, string host, string? apiKey, int requestWeight)
+        public LimitCheck Check(RateLimitItemType type, RequestDefinition definition, string host, string? apiKey, int requestWeight, string? keySuffix)
         {
-            var key = _keySelector(definition, host, apiKey);
+            var key = _keySelector(definition, host, apiKey) + keySuffix;
             if (!_trackers.TryGetValue(key, out var tracker))
             {
                 tracker = CreateTracker();
@@ -70,9 +70,9 @@ namespace CryptoExchange.Net.RateLimiting.Guards
         }
 
         /// <inheritdoc />
-        public RateLimitState ApplyWeight(RateLimitItemType type, RequestDefinition definition, string host, string? apiKey, int requestWeight)
+        public RateLimitState ApplyWeight(RateLimitItemType type, RequestDefinition definition, string host, string? apiKey, int requestWeight, string? keySuffix)
         {
-            var key = _keySelector(definition, host, apiKey);
+            var key = _keySelector(definition, host, apiKey) + keySuffix;
             var tracker = _trackers[key];
             tracker.ApplyWeight(requestWeight);
             return RateLimitState.Applied(_limit, _period, tracker.Current);

CryptoExchange.Net/RateLimiting/Interfaces/IRateLimitGate.cs

@@ -53,9 +53,10 @@ namespace CryptoExchange.Net.RateLimiting.Interfaces
         /// <param name="apiKey">The API key</param>
         /// <param name="requestWeight">Request weight</param>
         /// <param name="behaviour">Behaviour when rate limit is hit</param>
+        /// <param name="keySuffix">An additional optional suffix for the key selector. Can be used to make rate limiting work based on parameters.</param>
         /// <param name="ct">Cancelation token</param>
         /// <returns>Error if RateLimitingBehaviour is Fail and rate limit is hit</returns>
-        Task<CallResult> ProcessAsync(ILogger logger, int itemId, RateLimitItemType type, RequestDefinition definition, string baseAddress, string? apiKey, int requestWeight, RateLimitingBehaviour behaviour, CancellationToken ct);
+        Task<CallResult> ProcessAsync(ILogger logger, int itemId, RateLimitItemType type, RequestDefinition definition, string baseAddress, string? apiKey, int requestWeight, RateLimitingBehaviour behaviour, string? keySuffix, CancellationToken ct);
 
         /// <summary>
         /// Enforces the rate limit as defined in the request definition. When a rate limit is hit will wait for the rate limit to pass if RateLimitingBehaviour is Wait, or return an error if it is set to Fail
@@ -69,8 +70,9 @@ namespace CryptoExchange.Net.RateLimiting.Interfaces
         /// <param name="apiKey">The API key</param>
         /// <param name="behaviour">Behaviour when rate limit is hit</param>
         /// <param name="requestWeight">The weight to apply to the limit guard</param>
+        /// <param name="keySuffix">An additional optional suffix for the key selector. Can be used to make rate limiting work based on parameters.</param>
         /// <param name="ct">Cancelation token</param>
         /// <returns>Error if RateLimitingBehaviour is Fail and rate limit is hit</returns>
-        Task<CallResult> ProcessSingleAsync(ILogger logger, int itemId, IRateLimitGuard guard, RateLimitItemType type, RequestDefinition definition, string baseAddress, string? apiKey, int requestWeight, RateLimitingBehaviour behaviour, CancellationToken ct);
+        Task<CallResult> ProcessSingleAsync(ILogger logger, int itemId, IRateLimitGuard guard, RateLimitItemType type, RequestDefinition definition, string baseAddress, string? apiKey, int requestWeight, RateLimitingBehaviour behaviour, string? keySuffix, CancellationToken ct);
     }
 }

CryptoExchange.Net/RateLimiting/Interfaces/IRateLimitGuard.cs

@@ -25,8 +25,9 @@ namespace CryptoExchange.Net.RateLimiting.Interfaces
         /// <param name="host">The host address</param>
         /// <param name="apiKey">The API key</param>
         /// <param name="requestWeight">The request weight</param>
+        /// <param name="keySuffix">An additional optional suffix for the key selector. Can be used to make rate limiting work based on parameters.</param>
         /// <returns></returns>
-        LimitCheck Check(RateLimitItemType type, RequestDefinition definition, string host, string? apiKey, int requestWeight);
+        LimitCheck Check(RateLimitItemType type, RequestDefinition definition, string host, string? apiKey, int requestWeight, string? keySuffix);
 
         /// <summary>
         /// Apply the request to this guard with the specified weight
@@ -36,7 +37,8 @@ namespace CryptoExchange.Net.RateLimiting.Interfaces
         /// <param name="host">The host address</param>
         /// <param name="apiKey">The API key</param>
         /// <param name="requestWeight">The request weight</param>
+        /// <param name="keySuffix">An additional optional suffix for the key selector. Can be used to make rate limiting work based on parameters.</param>
         /// <returns></returns>
-        RateLimitState ApplyWeight(RateLimitItemType type, RequestDefinition definition, string host, string? apiKey, int requestWeight);
+        RateLimitState ApplyWeight(RateLimitItemType type, RequestDefinition definition, string host, string? apiKey, int requestWeight, string? keySuffix);
     }
 }

CryptoExchange.Net/RateLimiting/RateLimitGate.cs

@@ -37,14 +37,14 @@ namespace CryptoExchange.Net.RateLimiting
         }
 
         /// <inheritdoc />
-        public async Task<CallResult> ProcessAsync(ILogger logger, int itemId, RateLimitItemType type, RequestDefinition definition, string host, string? apiKey, int requestWeight, RateLimitingBehaviour rateLimitingBehaviour, CancellationToken ct)
+        public async Task<CallResult> ProcessAsync(ILogger logger, int itemId, RateLimitItemType type, RequestDefinition definition, string host, string? apiKey, int requestWeight, RateLimitingBehaviour rateLimitingBehaviour, string? keySuffix, CancellationToken ct)
         {
             await _semaphore.WaitAsync(ct).ConfigureAwait(false);
             bool release = true;
             _waitingCount++;
             try
             {
-                return await CheckGuardsAsync(_guards, logger, itemId, type, definition, host, apiKey, requestWeight, rateLimitingBehaviour, ct).ConfigureAwait(false);
+                return await CheckGuardsAsync(_guards, logger, itemId, type, definition, host, apiKey, requestWeight, rateLimitingBehaviour, keySuffix, ct).ConfigureAwait(false);
             }
             catch (TaskCanceledException)
             {
@@ -71,6 +71,7 @@ namespace CryptoExchange.Net.RateLimiting
             string? apiKey,
              int requestWeight,
             RateLimitingBehaviour rateLimitingBehaviour,
+            string? keySuffix,
             CancellationToken ct)
         {
             await _semaphore.WaitAsync(ct).ConfigureAwait(false);
@@ -78,7 +79,7 @@ namespace CryptoExchange.Net.RateLimiting
             _waitingCount++;
             try
             {
-                return await CheckGuardsAsync(new IRateLimitGuard[] { guard }, logger, itemId, type, definition, host, apiKey, requestWeight, rateLimitingBehaviour, ct).ConfigureAwait(false);
+                return await CheckGuardsAsync(new IRateLimitGuard[] { guard }, logger, itemId, type, definition, host, apiKey, requestWeight, rateLimitingBehaviour, keySuffix, ct).ConfigureAwait(false);
             }
             catch (TaskCanceledException)
             {
@@ -94,12 +95,12 @@ namespace CryptoExchange.Net.RateLimiting
             }
         }
 
-        private async Task<CallResult> CheckGuardsAsync(IEnumerable<IRateLimitGuard> guards, ILogger logger, int itemId, RateLimitItemType type, RequestDefinition definition, string host, string? apiKey, int requestWeight, RateLimitingBehaviour rateLimitingBehaviour, CancellationToken ct)
+        private async Task<CallResult> CheckGuardsAsync(IEnumerable<IRateLimitGuard> guards, ILogger logger, int itemId, RateLimitItemType type, RequestDefinition definition, string host, string? apiKey, int requestWeight, RateLimitingBehaviour rateLimitingBehaviour, string? keySuffix, CancellationToken ct)
         {
             foreach (var guard in guards)
             {
                 // Check if a wait is needed for this guard
-                var result = guard.Check(type, definition, host, apiKey, requestWeight);
+                var result = guard.Check(type, definition, host, apiKey, requestWeight, keySuffix);
                 if (result.Delay != TimeSpan.Zero && rateLimitingBehaviour == RateLimitingBehaviour.Fail)
                 {
                     // Delay is needed and limit behaviour is to fail the request
@@ -126,14 +127,14 @@ namespace CryptoExchange.Net.RateLimiting
                     RateLimitTriggered?.Invoke(new RateLimitEvent(itemId, _name, guard.Description, definition, host, result.Current, requestWeight, result.Limit, result.Period, result.Delay, rateLimitingBehaviour));
                     await Task.Delay((int)result.Delay.TotalMilliseconds + 1, ct).ConfigureAwait(false);
                     await _semaphore.WaitAsync(ct).ConfigureAwait(false);
-                    return await CheckGuardsAsync(guards, logger, itemId, type, definition, host, apiKey, requestWeight, rateLimitingBehaviour, ct).ConfigureAwait(false);
+                    return await CheckGuardsAsync(guards, logger, itemId, type, definition, host, apiKey, requestWeight, rateLimitingBehaviour, keySuffix, ct).ConfigureAwait(false);
                 }
             }
 
             // Apply the weight on each guard
             foreach (var guard in guards)
             {
-                var result = guard.ApplyWeight(type, definition, host, apiKey, requestWeight);
+                var result = guard.ApplyWeight(type, definition, host, apiKey, requestWeight, keySuffix);
                 if (result.IsApplied)
                 {
                     RateLimitUpdated?.Invoke(new RateLimitUpdateEvent(itemId, _name, guard.Description, result.Current, result.Limit, result.Period));

CryptoExchange.Net/RateLimiting/Trackers/DecayWindowTracker.cs

@@ -38,7 +38,7 @@ namespace CryptoExchange.Net.RateLimiting.Trackers
                 if (Current == 0)
                 {
                     throw new Exception("Request limit reached without any prior request. " +
-                        $"This request can never execute with the current rate limiter. Request weight: {weight}, Ratelimit: {Limit}");
+                        $"This request can never execute with the current rate limiter. Request weight: {weight}, RateLimit: {Limit}");
                 }
 
                 // Determine the time to wait before this weight can be applied without going over the rate limit

CryptoExchange.Net/RateLimiting/Trackers/FixedAfterStartWindowTracker.cs

@@ -45,7 +45,7 @@ namespace CryptoExchange.Net.RateLimiting.Trackers
                 if (Current == 0)
                 {
                     throw new Exception("Request limit reached without any prior request. " +
-                        $"This request can never execute with the current rate limiter. Request weight: {weight}, Ratelimit: {Limit}");
+                        $"This request can never execute with the current rate limiter. Request weight: {weight}, RateLimit: {Limit}");
                 }
 
                 // Determine the time to wait before this weight can be applied without going over the rate limit

CryptoExchange.Net/RateLimiting/Trackers/FixedWindowTracker.cs

@@ -41,7 +41,7 @@ namespace CryptoExchange.Net.RateLimiting.Trackers
                 if (Current == 0)
                 {
                     throw new Exception("Request limit reached without any prior request. " +
-                        $"This request can never execute with the current rate limiter. Request weight: {weight}, Ratelimit: {Limit}");
+                        $"This request can never execute with the current rate limiter. Request weight: {weight}, RateLimit: {Limit}");
                 }
 
                 // Determine the time to wait before this weight can be applied without going over the rate limit

CryptoExchange.Net/RateLimiting/Trackers/SlidingWindowTracker.cs

@@ -40,7 +40,7 @@ namespace CryptoExchange.Net.RateLimiting.Trackers
                 if (Current == 0)
                 {
                     throw new Exception("Request limit reached without any prior request. " +
-                        $"This request can never execute with the current rate limiter. Request weight: {weight}, Ratelimit: {Limit}");
+                        $"This request can never execute with the current rate limiter. Request weight: {weight}, RateLimit: {Limit}");
                 }
 
                 // Determine the time to wait before this weight can be applied without going over the rate limit
@@ -102,7 +102,7 @@ namespace CryptoExchange.Net.RateLimiting.Trackers
             }
 
             throw new Exception("Request not possible to execute with current rate limit guard. " +
-                        $" Request weight: {requestWeight}, Ratelimit: {Limit}");
+                        $" Request weight: {requestWeight}, RateLimit: {Limit}");
         }
     }
 }

CryptoExchange.Net/Requests/RequestFactory.cs

@@ -46,6 +46,7 @@ namespace CryptoExchange.Net.Requests
                 handler.DefaultProxyCredentials = CredentialCache.DefaultCredentials;
             }
             catch (PlatformNotSupportedException) { }
+            catch (NotImplementedException) { } // Mono runtime throws NotImplementedException
 
             if (proxy != null)
             {

CryptoExchange.Net/SharedApis/Enums/SharedKlineInterval.cs

@@ -5,6 +5,14 @@
     /// </summary>
     public enum SharedKlineInterval
     {
+        /// <summary>
+        /// 1 min
+        /// </summary>
+        OneMinute = 60,
+        /// <summary>
+        /// 3 min
+        /// </summary>
+        ThreeMinutes = 60 * 3,
         /// <summary>
         /// 5 min
         /// </summary>
@@ -14,10 +22,34 @@
         /// </summary>
         FifteenMinutes = 60 * 15,
         /// <summary>
+        /// Thirty minutes
+        /// </summary>
+        ThirtyMinutes = 60 * 30,
+        /// <summary>
         /// 1 hour
         /// </summary>
         OneHour = 60 * 60,
         /// <summary>
+        /// 2 hours
+        /// </summary>
+        TwoHours = 60 * 60 * 2,
+        /// <summary>
+        /// 4 hours
+        /// </summary>
+        FourHours = 60 * 60 * 4,
+        /// <summary>
+        /// 6 hours
+        /// </summary>
+        SixHours = 60 * 60 * 6,
+        /// <summary>
+        /// 8 hours
+        /// </summary>
+        EightHours = 60 * 60 * 8,
+        /// <summary>
+        /// 12 hours
+        /// </summary>
+        TwelveHours = 60 * 60 * 12,
+        /// <summary>
         /// 1 day
         /// </summary>
         OneDay = 60 * 60 * 24,

CryptoExchange.Net/SharedApis/Models/ExchangeEvent.cs

@@ -21,9 +21,10 @@ namespace CryptoExchange.Net.SharedApis
                 evnt.StreamId,
                 evnt.Symbol,
                 evnt.OriginalData,
-                evnt.Timestamp,
+                evnt.ReceiveTime,
                 evnt.UpdateType)
         {
+            DataTime = evnt.DataTime;
             Exchange = exchange;
         }
 

CryptoExchange.Net/SharedApis/Models/ExchangeParameters.cs

@@ -10,7 +10,7 @@ namespace CryptoExchange.Net.SharedApis
     public class ExchangeParameters
     {
         private readonly List<ExchangeParameter> _parameters;
-        private static List<ExchangeParameter> _staticParameters = new List<ExchangeParameter>();
+        private readonly static List<ExchangeParameter> _staticParameters = new List<ExchangeParameter>();
 
         /// <summary>
         /// ctor

CryptoExchange.Net/SharedApis/Models/ExchangeWebResult.cs

@@ -132,7 +132,6 @@ namespace CryptoExchange.Net.SharedApis
             NextPageToken = nextPageToken;
         }
 
-
         /// <summary>
         /// Copy the ExchangeWebResult to a new data type
         /// </summary>

CryptoExchange.Net/SharedApis/Models/Options/Endpoints/GetKlinesOptions.cs

@@ -31,9 +31,17 @@ namespace CryptoExchange.Net.SharedApis
         {
             SupportIntervals = new[]
             {
+                SharedKlineInterval.OneMinute,
+                SharedKlineInterval.ThreeMinutes,
                 SharedKlineInterval.FiveMinutes,
                 SharedKlineInterval.FifteenMinutes,
+                SharedKlineInterval.ThirtyMinutes,
                 SharedKlineInterval.OneHour,
+                SharedKlineInterval.TwoHours,
+                SharedKlineInterval.FourHours,
+                SharedKlineInterval.SixHours,
+                SharedKlineInterval.EightHours,
+                SharedKlineInterval.TwelveHours,
                 SharedKlineInterval.OneDay,
                 SharedKlineInterval.OneWeek,
                 SharedKlineInterval.OneMonth

CryptoExchange.Net/SharedApis/Models/Options/Subscriptions/SubscribeKlineOptions.cs

@@ -22,10 +22,17 @@ namespace CryptoExchange.Net.SharedApis
         {
             SupportIntervals = new[]
             {
+                SharedKlineInterval.OneMinute,
+                SharedKlineInterval.ThreeMinutes,
                 SharedKlineInterval.FiveMinutes,
                 SharedKlineInterval.FifteenMinutes,
+                SharedKlineInterval.ThirtyMinutes,
                 SharedKlineInterval.OneHour,
-                SharedKlineInterval.FifteenMinutes,
+                SharedKlineInterval.TwoHours,
+                SharedKlineInterval.FourHours,
+                SharedKlineInterval.SixHours,
+                SharedKlineInterval.EightHours,
+                SharedKlineInterval.TwelveHours,
                 SharedKlineInterval.OneDay,
                 SharedKlineInterval.OneWeek,
                 SharedKlineInterval.OneMonth

CryptoExchange.Net/SharedApis/SharedSymbol.cs

@@ -1,12 +1,13 @@
 using CryptoExchange.Net.Objects;
 using System;
+using System.Collections.Generic;
 
 namespace CryptoExchange.Net.SharedApis
 {
     /// <summary>
     /// A symbol representation based on a base and quote asset
     /// </summary>
-    public class SharedSymbol
+    public record SharedSymbol
     {
         /// <summary>
         /// The base asset of the symbol

CryptoExchange.Net/Sockets/CryptoExchangeWebSocketClient.cs

@@ -5,6 +5,7 @@ using CryptoExchange.Net.Objects.Sockets;
 using CryptoExchange.Net.RateLimiting;
 using Microsoft.Extensions.Logging;
 using System;
+using System.Buffers;
 using System.Collections.Concurrent;
 using System.Collections.Generic;
 using System.IO;
@@ -32,6 +33,7 @@ namespace CryptoExchange.Net.Sockets
 
         internal static int _lastStreamId;
         private static readonly object _streamIdLock = new();
+        private static readonly ArrayPool<byte> _receiveBufferPool = ArrayPool<byte>.Shared;
 
         private readonly AsyncResetEvent _sendEvent;
         private readonly ConcurrentQueue<SendItem> _sendBuffer;
@@ -46,14 +48,15 @@ namespace CryptoExchange.Net.Sockets
         private bool _disposed;
         private ProcessState _processState;
         private DateTime _lastReconnectTime;
-        private string _baseAddress;
+        private readonly string _baseAddress;
         private int _reconnectAttempt;
+        private readonly int _receiveBufferSize;
 
-        private const int _receiveBufferSize = 1048576;
+        private const int _defaultReceiveBufferSize = 1048576;
         private const int _sendBufferSize = 4096;
 
         /// <summary>
-        /// Received messages, the size and the timstamp
+        /// Received messages, the size and the timestamp
         /// </summary>
         protected readonly List<ReceiveItem> _receivedMessages;
 
@@ -96,7 +99,7 @@ namespace CryptoExchange.Net.Sockets
                 {
                     UpdateReceivedMessages();
 
-                    if (!_receivedMessages.Any())
+                    if (_receivedMessages.Count == 0)
                         return 0;
 
                     return Math.Round(_receivedMessages.Sum(v => v.Bytes) / 1000d / 3d);
@@ -149,6 +152,7 @@ namespace CryptoExchange.Net.Sockets
             _sendBuffer = new ConcurrentQueue<SendItem>();
             _ctsSource = new CancellationTokenSource();
             _receivedMessagesLock = new object();
+            _receiveBufferSize = websocketParameters.ReceiveBufferSize ?? _defaultReceiveBufferSize;
 
             _closeSem = new SemaphoreSlim(1, 1);
             _socket = CreateSocket();
@@ -219,7 +223,7 @@ namespace CryptoExchange.Net.Sockets
                 if (Parameters.RateLimiter != null)
                 {
                     var definition = new RequestDefinition(Uri.AbsolutePath, HttpMethod.Get) { ConnectionId = Id };
-                    var limitResult = await Parameters.RateLimiter.ProcessAsync(_logger, Id, RateLimitItemType.Connection, definition, _baseAddress, null, 1, Parameters.RateLimitingBehaviour, _ctsSource.Token).ConfigureAwait(false);
+                    var limitResult = await Parameters.RateLimiter.ProcessAsync(_logger, Id, RateLimitItemType.Connection, definition, _baseAddress, null, 1, Parameters.RateLimitingBehavior, null, _ctsSource.Token).ConfigureAwait(false);
                     if (!limitResult)
                         return new CallResult(new ClientRateLimitError("Connection limit reached"));
                 }
@@ -296,7 +300,7 @@ namespace CryptoExchange.Net.Sockets
                     await (OnReconnecting?.Invoke() ?? Task.CompletedTask).ConfigureAwait(false);                    
                 }
 
-                // Delay here to prevent very repid looping when a connection to the server is accepted and immediately disconnected
+                // Delay here to prevent very rapid looping when a connection to the server is accepted and immediately disconnected
                 var initialDelay = GetReconnectDelay();
                 await Task.Delay(initialDelay).ConfigureAwait(false);
 
@@ -491,7 +495,7 @@ namespace CryptoExchange.Net.Sockets
                 {
                     try
                     {
-                        if (!_sendBuffer.Any())
+                        if (_sendBuffer.IsEmpty)
                             await _sendEvent.WaitAsync(ct: _ctsSource.Token).ConfigureAwait(false);
                     }
                     catch (OperationCanceledException)
@@ -508,7 +512,7 @@ namespace CryptoExchange.Net.Sockets
                         {
                             try
                             {
-                                var limitResult = await Parameters.RateLimiter.ProcessAsync(_logger, data.Id, RateLimitItemType.Request, requestDefinition, _baseAddress, null, data.Weight, Parameters.RateLimitingBehaviour, _ctsSource.Token).ConfigureAwait(false);
+                                var limitResult = await Parameters.RateLimiter.ProcessAsync(_logger, data.Id, RateLimitItemType.Request, requestDefinition, _baseAddress, null, data.Weight, Parameters.RateLimitingBehavior, null, _ctsSource.Token).ConfigureAwait(false);
                                 if (!limitResult)
                                 {
                                     await (OnRequestRateLimited?.Invoke(data.Id) ?? Task.CompletedTask).ConfigureAwait(false);
@@ -566,8 +570,8 @@ namespace CryptoExchange.Net.Sockets
         /// <returns></returns>
         private async Task ReceiveLoopAsync()
         {
-            var buffer = new ArraySegment<byte>(new byte[_receiveBufferSize]);
-            var received = 0;
+            byte[] rentedBuffer = _receiveBufferPool.Rent(_receiveBufferSize);
+            var buffer = new ArraySegment<byte>(rentedBuffer);
             try
             {
                 while (true)
@@ -583,15 +587,14 @@ namespace CryptoExchange.Net.Sockets
                         try
                         {
                             receiveResult = await _socket.ReceiveAsync(buffer, _ctsSource.Token).ConfigureAwait(false);
-                            received += receiveResult.Count;
                             lock (_receivedMessagesLock)
                                 _receivedMessages.Add(new ReceiveItem(DateTime.UtcNow, receiveResult.Count));
                         }
                         catch (OperationCanceledException ex)
                         {
-                            if (ex.InnerException?.InnerException?.Message.Equals("The WebSocket didn't recieve a Pong frame in response to a Ping frame within the configured KeepAliveTimeout.") == true)
+                            if (ex.InnerException?.InnerException?.Message.Contains("KeepAliveTimeout") == true)
                             {
-                                // Spefic case that the websocket connection got closed because of a ping frame timeout
+                                // Specific case that the websocket connection got closed because of a ping frame timeout
                                 // Unfortunately doesn't seem to be a nicer way to catch
                                 _logger.SocketPingTimeout(Id);
                             }
@@ -604,7 +607,7 @@ namespace CryptoExchange.Net.Sockets
                         }
                         catch (Exception wse)
                         {
-                            if (!_ctsSource.Token.IsCancellationRequested)
+                            if (!_ctsSource.Token.IsCancellationRequested && !_stopRequested)
                                 // Connection closed unexpectedly
                                 await (OnError?.Invoke(wse) ?? Task.CompletedTask).ConfigureAwait(false);
 
@@ -649,7 +652,7 @@ namespace CryptoExchange.Net.Sockets
                             {
                                 // Received a complete message and it's not multi part
                                 _logger.SocketReceivedSingleMessage(Id, receiveResult.Count);
-                                await ProcessData(receiveResult.MessageType, new ReadOnlyMemory<byte>(buffer.Array, buffer.Offset, receiveResult.Count)).ConfigureAwait(false);
+                                await ProcessData(receiveResult.MessageType, new ReadOnlyMemory<byte>(buffer.Array!, buffer.Offset, receiveResult.Count)).ConfigureAwait(false);
                             }
                             else
                             {
@@ -679,11 +682,11 @@ namespace CryptoExchange.Net.Sockets
 
                     if (multiPartMessage)
                     {
-                        // When the connection gets interupted we might not have received a full message
+                        // When the connection gets interrupted we might not have received a full message
                         if (receiveResult?.EndOfMessage == true)
                         {
                             _logger.SocketReassembledMessage(Id, multipartStream!.Length);
-                            // Get the underlying buffer of the memorystream holding the written data and delimit it (GetBuffer return the full array, not only the written part)
+                            // Get the underlying buffer of the memory stream holding the written data and delimit it (GetBuffer return the full array, not only the written part)
                             await ProcessData(receiveResult.MessageType, new ReadOnlyMemory<byte>(multipartStream.GetBuffer(), 0, (int)multipartStream.Length)).ConfigureAwait(false);
                         }
                         else
@@ -705,12 +708,13 @@ namespace CryptoExchange.Net.Sockets
             }
             finally
             {
+                _receiveBufferPool.Return(rentedBuffer, true);
                 _logger.SocketReceiveLoopFinished(Id);
             }
         }
 
         /// <summary>
-        /// Proccess a stream message
+        /// Process a stream message
         /// </summary>
         /// <param name="type"></param>
         /// <param name="data"></param>
@@ -742,6 +746,7 @@ namespace CryptoExchange.Net.Sockets
                         _ = ReconnectAsync().ConfigureAwait(false);
                         return;
                     }
+
                     try
                     {
                         await Task.Delay(500, _ctsSource.Token).ConfigureAwait(false);

CryptoExchange.Net/Sockets/SocketConnection.cs

@@ -143,7 +143,7 @@ namespace CryptoExchange.Net.Sockets
         public DateTime? DisconnectTime { get; set; }
 
         /// <summary>
-        /// Tag for identificaion
+        /// Tag for identification
         /// </summary>
         public string Tag { get; set; }
         
@@ -214,7 +214,7 @@ namespace CryptoExchange.Net.Sockets
         private readonly IByteMessageAccessor _accessor;
 
         /// <summary>
-        /// The task that is sending periodic data on the websocket. Can be used for sending Ping messages every x seconds or similair. Not necesarry.
+        /// The task that is sending periodic data on the websocket. Can be used for sending Ping messages every x seconds or similar. Not necessary.
         /// </summary>
         protected Task? periodicTask;
 
@@ -286,7 +286,7 @@ namespace CryptoExchange.Net.Sockets
 
                 foreach (var query in _listeners.OfType<Query>().ToList())
                 {
-                    query.Fail(new WebError("Connection interupted"));
+                    query.Fail(new WebError("Connection interrupted"));
                     _listeners.Remove(query);
                 }
             }
@@ -311,7 +311,7 @@ namespace CryptoExchange.Net.Sockets
 
                 foreach (var query in _listeners.OfType<Query>().ToList())
                 {
-                    query.Fail(new WebError("Connection interupted"));
+                    query.Fail(new WebError("Connection interrupted"));
                     _listeners.Remove(query);
                 }
             }
@@ -340,7 +340,7 @@ namespace CryptoExchange.Net.Sockets
             {
                 foreach (var query in _listeners.OfType<Query>().ToList())
                 {
-                    query.Fail(new WebError("Connection interupted"));
+                    query.Fail(new WebError("Connection interrupted"));
                     _listeners.Remove(query);
                 }
             }
@@ -369,7 +369,7 @@ namespace CryptoExchange.Net.Sockets
                 }
                 catch(Exception ex)
                 {
-                    _logger.UnkownExceptionWhileProcessingReconnection(SocketId, ex);
+                    _logger.UnknownExceptionWhileProcessingReconnection(SocketId, ex);
                     _ = _socket.ReconnectAsync().ConfigureAwait(false);
                 }
             });
@@ -392,7 +392,7 @@ namespace CryptoExchange.Net.Sockets
         }
 
         /// <summary>
-        /// Handler for whenever a request is rate limited and rate limit behaviour is set to fail
+        /// Handler for whenever a request is rate limited and rate limit behavior is set to fail
         /// </summary>
         /// <param name="requestId"></param>
         /// <returns></returns>

CryptoExchange.Net/Testing/Comparers/JsonNetComparer.cs

@@ -172,7 +172,7 @@ namespace CryptoExchange.Net.Testing.Comparers
                     throw new Exception($"{method}: Property `{propertyName}` has no value while input json `{propName}` has value {propValue}");
             }
 
-            if (propertyValue == default && (propValue.Type == JTokenType.Null || string.IsNullOrEmpty(propValue.ToString())) || propValue.ToString() == "0")
+            if ((propertyValue == default && (propValue.Type == JTokenType.Null || string.IsNullOrEmpty(propValue.ToString()))) || propValue.ToString() == "0")
                 return;
 
             if (propertyValue!.GetType().GetInterfaces().Contains(typeof(IDictionary)))

CryptoExchange.Net/Testing/Comparers/SystemTextJsonComparer.cs

@@ -69,11 +69,11 @@ namespace CryptoExchange.Net.Testing.Comparers
             }
             else if (jsonObject!.Type == JTokenType.Array)
             {
-                var jObjs = (JArray)jsonObject;
+                var jArray = (JArray)jsonObject;
                 if (resultData is IEnumerable list)
                 {
                     var enumerator = list.GetEnumerator();
-                    foreach (var jObj in jObjs)
+                    foreach (var jObj in jArray)
                     {
                         if (!enumerator.MoveNext())
                         {
@@ -105,7 +105,7 @@ namespace CryptoExchange.Net.Testing.Comparers
                             int i = 0;
                             foreach (var item in jObj.Children())
                             {
-                                var arrayProp = resultProps.Where(p => p.Item2 != null).SingleOrDefault(p => p.Item2!.Index == i).p;
+                                var arrayProp = resultProps.Where(p => p.Item2 != null).FirstOrDefault(p => p.Item2!.Index == i).p;
                                 if (arrayProp != null)
                                     CheckPropertyValue(method, item, arrayProp.GetValue(resultObj), arrayProp.PropertyType, arrayProp.Name, "Array index " + i, ignoreProperties!);
                                 i++;
@@ -123,7 +123,7 @@ namespace CryptoExchange.Net.Testing.Comparers
                 {
                     var resultProps = resultData.GetType().GetProperties().Select(p => (p, p.GetCustomAttributes(typeof(ArrayPropertyAttribute), true).Cast<ArrayPropertyAttribute>().SingleOrDefault()));
                     int i = 0;
-                    foreach (var item in jObjs.Children())
+                    foreach (var item in jArray.Children())
                     {
                         var arrayProp = resultProps.Where(p => p.Item2 != null).SingleOrDefault(p => p.Item2!.Index == i).p;
                         if (arrayProp != null)
@@ -196,7 +196,7 @@ namespace CryptoExchange.Net.Testing.Comparers
                     throw new Exception($"{method}: Property `{propertyName}` has no value while input json `{propName}` has value {propValue}");
             }
 
-            if (propertyValue == default && (propValue.Type == JTokenType.Null || string.IsNullOrEmpty(propValue.ToString())) || propValue.ToString() == "0")
+            if ((propertyValue == default && (propValue.Type == JTokenType.Null || string.IsNullOrEmpty(propValue.ToString()))) || propValue.ToString() == "0")
                 return;
 
             if (propertyValue!.GetType().GetInterfaces().Contains(typeof(IDictionary)))
@@ -227,10 +227,10 @@ namespace CryptoExchange.Net.Testing.Comparers
                 if (propValue.Type != JTokenType.Array)
                     return;
 
-                var jObjs = (JArray)propValue;
+                var jArray = (JArray)propValue;
                 var list = (IEnumerable)propertyValue;
                 var enumerator = list.GetEnumerator();
-                foreach (JToken jtoken in jObjs)
+                foreach (JToken jToken in jArray)
                 {
                     var moved = enumerator.MoveNext();
                     if (!moved)
@@ -241,9 +241,9 @@ namespace CryptoExchange.Net.Testing.Comparers
                         // Custom converter for the type, skip
                         continue;
 
-                    if (jtoken.Type == JTokenType.Object)
+                    if (jToken.Type == JTokenType.Object)
                     {
-                        foreach (var subProp in ((JObject)jtoken).Properties())
+                        foreach (var subProp in ((JObject)jToken).Properties())
                         {
                             if (ignoreProperties?.Contains(subProp.Name) == true)
                                 continue;
@@ -251,7 +251,7 @@ namespace CryptoExchange.Net.Testing.Comparers
                             CheckObject(method, subProp, enumerator.Current, ignoreProperties);
                         }
                     }
-                    else if (jtoken.Type == JTokenType.Array)
+                    else if (jToken.Type == JTokenType.Array)
                     {
                         var resultObj = enumerator.Current;
                         var resultProps = resultObj.GetType().GetProperties().Select(p => (p, p.GetCustomAttributes(typeof(ArrayPropertyAttribute), true).Cast<ArrayPropertyAttribute>().SingleOrDefault()));
@@ -262,11 +262,11 @@ namespace CryptoExchange.Net.Testing.Comparers
                             continue;
 
                         int i = 0;
-                        foreach (var item in jtoken.Children())
+                        foreach (var item in jToken.Children())
                         {
-                            var arrayProp = resultProps.Where(p => p.Item2 != null).SingleOrDefault(p => p.Item2!.Index == i).p;
+                            var arrayProp = resultProps.Where(p => p.Item2 != null).FirstOrDefault(p => p.Item2!.Index == i).p;
                             if (arrayProp != null)
-                                CheckPropertyValue(method, item, arrayProp.GetValue(resultObj), propertyType, arrayProp.Name, "Array index " + i, ignoreProperties);
+                                CheckPropertyValue(method, item, arrayProp.GetValue(resultObj), arrayProp.PropertyType, arrayProp.Name, "Array index " + i, ignoreProperties);
 
                             i++;
                         }
@@ -274,10 +274,10 @@ namespace CryptoExchange.Net.Testing.Comparers
                     else
                     {
                         var value = enumerator.Current;
-                        if (value == default && ((JValue)jtoken).Type != JTokenType.Null)
-                            throw new Exception($"{method}: Property `{propertyName}` has no value while input json `{propName}` has value {jtoken}");
+                        if (value == default && ((JValue)jToken).Type != JTokenType.Null)
+                            throw new Exception($"{method}: Property `{propertyName}` has no value while input json `{propName}` has value {jToken}");
 
-                        CheckValues(method, propertyName!, propertyType, (JValue)jtoken, value!);
+                        CheckValues(method, propertyName!, propertyType, (JValue)jToken, value!);
                     }
                 }
             }
@@ -298,11 +298,11 @@ namespace CryptoExchange.Net.Testing.Comparers
                 }
                 else if (propValue.Type == JTokenType.Array)
                 {
-                    var jObjs = (JArray)propValue;
+                    var jArray = (JArray)propValue;
                     if (propertyValue is IEnumerable list)
                     {
                         var enumerator = list.GetEnumerator();
-                        foreach (var jObj in jObjs)
+                        foreach (var jObj in jArray)
                         {
                             if (!enumerator.MoveNext())
                             {
@@ -348,9 +348,9 @@ namespace CryptoExchange.Net.Testing.Comparers
                     {
                         var resultProps = propertyValue.GetType().GetProperties().Select(p => (p, p.GetCustomAttributes(typeof(ArrayPropertyAttribute), true).Cast<ArrayPropertyAttribute>().SingleOrDefault()));
                         int i = 0;
-                        foreach (var item in jObjs.Children())
+                        foreach (var item in jArray.Children())
                         {
-                            var arrayProp = resultProps.Where(p => p.Item2 != null).SingleOrDefault(p => p.Item2!.Index == i).p;
+                            var arrayProp = resultProps.Where(p => p.Item2 != null).FirstOrDefault(p => p.Item2!.Index == i).p;
                             if (arrayProp != null)
                                 CheckPropertyValue(method, item, arrayProp.GetValue(propertyValue), arrayProp.PropertyType, arrayProp.Name, "Array index " + i, ignoreProperties!);
                             i++;

CryptoExchange.Net/Testing/RestIntegrationTest.cs

@@ -11,7 +11,7 @@ namespace CryptoExchange.Net.Testing
     /// Base class for executing REST API integration tests
     /// </summary>
     /// <typeparam name="TClient">Client type</typeparam>
-    public abstract class RestIntergrationTest<TClient>
+    public abstract class RestIntegrationTest<TClient>
     {
         /// <summary>
         /// Get a client instance

CryptoExchange.Net/Testing/SocketSubscriptionValidator.cs

@@ -113,7 +113,6 @@ namespace CryptoExchange.Net.Testing
                     if (lastMessage == null)
                         throw new Exception($"{name} expected to {line} to be send to server but did not receive anything");
 
-
                     var lastMessageJson = JToken.Parse(lastMessage);
                     var expectedJson = JToken.Parse(line.Substring(2));
                     foreach(var item in expectedJson)
@@ -133,7 +132,9 @@ namespace CryptoExchange.Net.Testing
                                 overrideValue = lastMessageJson[prop.Name]?.Value<decimal>().ToString();
                             }
                             else if (lastMessageJson[prop.Name]?.Value<string>() != val.ToString() && ignoreProperties?.Contains(prop.Name) != true)
+                            {
                                 throw new Exception($"{name} Expected {prop.Name} to be {val}, but was {lastMessageJson[prop.Name]?.Value<string>()}");
+                            }
                         }
 
                         // TODO check objects and arrays

CryptoExchange.Net/Trackers/Klines/IKlineTracker.cs

@@ -94,7 +94,7 @@ namespace CryptoExchange.Net.Trackers.Klines
         IEnumerable<SharedKline> GetData(DateTime? fromTimestamp = null, DateTime? toTimestamp = null);
 
         /// <summary>
-        /// Get statitistics on the klines
+        /// Get statistics on the klines
         /// </summary>
         /// <param name="fromTimestamp">Start timestamp to get the data from, defaults to tracked data start time</param>
         /// <param name="toTimestamp">End timestamp to get the data until, defaults to current time</param>

CryptoExchange.Net/Trackers/Trades/ITradeTracker.cs

@@ -90,7 +90,7 @@ namespace CryptoExchange.Net.Trackers.Trades
         IEnumerable<SharedTrade> GetData(DateTime? fromTimestamp = null, DateTime? toTimestamp = null);
 
         /// <summary>
-        /// Get statitistics on the trades
+        /// Get statistics on the trades
         /// </summary>
         /// <param name="fromTimestamp">Start timestamp to get the data from, defaults to tracked data start time</param>
         /// <param name="toTimestamp">End timestamp to get the data until, defaults to current time</param>

CryptoExchange.Net/Trackers/Trades/TradeTracker.cs

@@ -163,7 +163,7 @@ namespace CryptoExchange.Net.Trackers.Trades
             Period = period;
         }
 
-        private TradesStats GetStats(IEnumerable<SharedTrade> trades)
+        private static TradesStats GetStats(IEnumerable<SharedTrade> trades)
         {
             if (!trades.Any())
                 return new TradesStats();
@@ -350,7 +350,7 @@ namespace CryptoExchange.Net.Trackers.Trades
                     _data.Add(item);
                 }
 
-                if (_data.Any())
+                if (_data.Count != 0)
                     _firstTimestamp = _data.Min(v => v.Timestamp);
 
                 ApplyWindow(false);
@@ -431,7 +431,6 @@ namespace CryptoExchange.Net.Trackers.Trades
                 SetSyncStatus();
         }
 
-
         private void HandleConnectionLost()
         {
             _logger.TradeTrackerConnectionLost(SymbolName);

CryptoExchange.Net/Trackers/Trades/TradesStats.cs

@@ -47,7 +47,7 @@ namespace CryptoExchange.Net.Trackers.Trades
         public bool Complete { get; set; }
 
         /// <summary>
-        /// Compare 2 stat snapshots to eachother
+        /// Compare 2 stat snapshots to each other
         /// </summary>
         public TradesCompare CompareTo(TradesStats otherStats)
         {

Examples/BlazorClient/BlazorClient.csproj

@@ -5,24 +5,26 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Binance.Net" Version="10.16.1" />
-    <PackageReference Include="Bitfinex.Net" Version="7.13.1" />
-    <PackageReference Include="BitMart.Net" Version="1.12.1" />
-    <PackageReference Include="Bybit.Net" Version="4.0.2" />
-    <PackageReference Include="CoinEx.Net" Version="7.13.2" />
-    <PackageReference Include="CryptoCom.Net" Version="1.5.1" />
-    <PackageReference Include="GateIo.Net" Version="1.17.1" />
-    <PackageReference Include="HyperLiquid.Net" Version="1.0.0" />
-    <PackageReference Include="JK.BingX.Net" Version="1.19.1" />
-    <PackageReference Include="JK.Bitget.Net" Version="1.19.1" />
-    <PackageReference Include="JK.Mexc.Net" Version="1.15.1" />
-    <PackageReference Include="JK.OKX.Net" Version="2.14.1" />
-    <PackageReference Include="JKorf.Coinbase.Net" Version="1.7.2" />
-    <PackageReference Include="JKorf.HTX.Net" Version="6.8.1" />
-    <PackageReference Include="KrakenExchange.Net" Version="5.5.3" />
-    <PackageReference Include="Kucoin.Net" Version="5.23.4" />
+    <PackageReference Include="Binance.Net" Version="10.18.0" />
+    <PackageReference Include="Bitfinex.Net" Version="8.1.1" />
+    <PackageReference Include="BitMart.Net" Version="1.14.0" />
+    <PackageReference Include="Bybit.Net" Version="4.3.2" />
+    <PackageReference Include="CoinEx.Net" Version="8.0.1" />
+    <PackageReference Include="CryptoCom.Net" Version="1.6.0" />
+    <PackageReference Include="DeepCoin.Net" Version="1.0.0" />
+    <PackageReference Include="GateIo.Net" Version="1.20.1" />
+    <PackageReference Include="HyperLiquid.Net" Version="1.1.0" />
+    <PackageReference Include="JK.BingX.Net" Version="1.21.0" />
+    <PackageReference Include="JK.Bitget.Net" Version="1.21.0" />
+    <PackageReference Include="JK.Mexc.Net" Version="2.1.0" />
+    <PackageReference Include="JK.OKX.Net" Version="2.15.0" />
+    <PackageReference Include="JKorf.BitMEX.Net" Version="1.1.0" />
+    <PackageReference Include="JKorf.Coinbase.Net" Version="1.8.1" />
+    <PackageReference Include="JKorf.HTX.Net" Version="6.9.0" />
+    <PackageReference Include="KrakenExchange.Net" Version="5.7.1" />
+    <PackageReference Include="Kucoin.Net" Version="6.0.0" />
     <PackageReference Include="Serilog.AspNetCore" Version="9.0.0" />
-    <PackageReference Include="WhiteBit.Net" Version="1.3.2" />
+    <PackageReference Include="WhiteBit.Net" Version="1.4.0" />
   </ItemGroup>
 
 </Project>

Examples/BlazorClient/Pages/Index.razor

@@ -2,12 +2,14 @@
 @inject IBinanceRestClient binanceClient
 @inject IBingXRestClient bingXClient
 @inject IBitfinexRestClient bitfinexClient
-@inject IBitMartRestClient bitmartClient
 @inject IBitgetRestClient bitgetClient
+@inject IBitMartRestClient bitmartClient
+@inject IBitMEXRestClient bitmexClient
 @inject IBybitRestClient bybitClient
 @inject ICoinbaseRestClient coinbaseClient
 @inject ICoinExRestClient coinexClient
 @inject ICryptoComRestClient cryptocomClient
+@inject IDeepCoinRestClient deepCoinClient
 @inject IGateIoRestClient gateioClient
 @inject IHTXRestClient htxClient
 @inject IHyperLiquidRestClient hyperLiquidClient
@@ -33,10 +35,12 @@
         var bitfinexTask = bitfinexClient.SpotApi.ExchangeData.GetTickerAsync("tBTCUSD");
         var bitgetTask = bitgetClient.SpotApi.ExchangeData.GetTickerAsync("BTCUSDT_SPBL");
         var bitmartTask = bitmartClient.SpotApi.ExchangeData.GetTickerAsync("BTC_USDT");
+        var bitmexTask = bitmexClient.ExchangeApi.ExchangeData.GetSymbolsAsync("XBT_USDT");
         var bybitTask = bybitClient.V5Api.ExchangeData.GetSpotTickersAsync("BTCUSDT");
         var coinbaseTask = coinbaseClient.AdvancedTradeApi.ExchangeData.GetSymbolAsync("BTC-USDT");
-        var coinexTask = coinexClient.SpotApi.ExchangeData.GetTickerAsync("BTCUSDT");
+        var coinexTask = coinexClient.SpotApiV2.ExchangeData.GetTickersAsync(["BTCUSDT"]);
         var cryptocomTask = cryptocomClient.ExchangeApi.ExchangeData.GetTickersAsync("BTC_USDT");
+        var deepCoinTask = deepCoinClient.ExchangeApi.ExchangeData.GetTickersAsync(DeepCoin.Net.Enums.SymbolType.Spot);
         var gateioTask = gateioClient.SpotApi.ExchangeData.GetTickersAsync("BTC_USDT");
         var htxTask = htxClient.SpotApi.ExchangeData.GetTickerAsync("btcusdt");
         var hyperLiquidTask = hyperLiquidClient.FuturesApi.ExchangeData.GetExchangeInfoAndTickersAsync(); // HyperLiquid does not have BTC spot trading
@@ -46,7 +50,7 @@
         var okxTask = okxClient.UnifiedApi.ExchangeData.GetTickerAsync("BTCUSDT");
         var whitebitTask = whitebitClient.V4Api.ExchangeData.GetTickersAsync();
 
-        await Task.WhenAll(binanceTask, bingXTask, bitfinexTask, bitgetTask, bitmartTask, bybitTask, coinexTask, gateioTask, htxTask, krakenTask, kucoinTask, mexcTask, okxTask);
+        await Task.WhenAll(binanceTask, bingXTask, bitfinexTask, bitgetTask, bitmartTask, bybitTask, coinexTask, deepCoinTask, gateioTask, htxTask, krakenTask, kucoinTask, mexcTask, okxTask);
 
         if (binanceTask.Result.Success)
             _prices.Add("Binance", binanceTask.Result.Data.LastPrice);
@@ -63,6 +67,9 @@
         if (bitmartTask.Result.Success)
             _prices.Add("BitMart", bitgetTask.Result.Data.ClosePrice);
 
+        if (bitmexTask.Result.Success)
+            _prices.Add("BitMEX", bitmexTask.Result.Data.First().LastPrice);
+
         if (bybitTask.Result.Success)
             _prices.Add("Bybit", bybitTask.Result.Data.List.First().LastPrice);
 
@@ -70,11 +77,18 @@
             _prices.Add("Coinbase", coinbaseTask.Result.Data.LastPrice ?? 0);
 
         if (coinexTask.Result.Success)
-            _prices.Add("CoinEx", coinexTask.Result.Data.Ticker.LastPrice);
+            _prices.Add("CoinEx", coinexTask.Result.Data.Single().LastPrice);
 
         if (cryptocomTask.Result.Success)
             _prices.Add("CryptoCom", cryptocomTask.Result.Data.First().LastPrice ?? 0);
 
+        if (deepCoinTask.Result.Success)
+        {
+            // DeepCoin API doesn't offer an endpoint to filter for a specific ticker, so we have to filter client side
+            var tickers = deepCoinTask.Result.Data;
+            _prices.Add("DeepCoin", tickers.Single(x => x.Symbol == "BTC-USDT").LastPrice ?? 0);
+        }
+
         if (gateioTask.Result.Success)
             _prices.Add("GateIo", gateioTask.Result.Data.First().LastPrice);
 

Examples/BlazorClient/Pages/LiveData.razor

@@ -4,10 +4,12 @@
 @inject IBitfinexSocketClient bitfinexSocketClient
 @inject IBitgetSocketClient bitgetSocketClient
 @inject IBitMartSocketClient bitmartSocketClient
+@inject IBitMEXSocketClient bitmexSocketClient
 @inject IBybitSocketClient bybitSocketClient
 @inject ICoinbaseSocketClient coinbaseSocketClient
 @inject ICoinExSocketClient coinExSocketClient
 @inject ICryptoComSocketClient cryptocomSocketClient
+@inject IDeepCoinSocketClient deepCoinSocketClient
 @inject IGateIoSocketClient gateioSocketClient
 @inject IHTXSocketClient htxSocketClient
 @inject IHyperLiquidSocketClient hyperLiquidSocketClient
@@ -41,15 +43,17 @@
             bitfinexSocketClient.SpotApi.SubscribeToTickerUpdatesAsync("tETHBTC", data => UpdateData("Bitfinex", data.Data.LastPrice)),
             bitgetSocketClient.SpotApi.SubscribeToTickerUpdatesAsync("ETHBTC", data => UpdateData("Bitget", data.Data.LastPrice)),
             bitmartSocketClient.SpotApi.SubscribeToTickerUpdatesAsync("ETH_BTC", data => UpdateData("BitMart", data.Data.LastPrice)),
+            bitmexSocketClient.ExchangeApi.SubscribeToSymbolUpdatesAsync("ETH_XBT", data => UpdateData("BitMEX", data.Data.LastPrice ?? 0)),
             bybitSocketClient.V5SpotApi.SubscribeToTickerUpdatesAsync("ETHBTC", data => UpdateData("Bybit", data.Data.LastPrice)),
-            coinExSocketClient.SpotApi.SubscribeToTickerUpdatesAsync("ETHBTC", data => UpdateData("CoinEx", data.Data.LastPrice)),
+            coinExSocketClient.SpotApiV2.SubscribeToTickerUpdatesAsync(["ETHBTC"], data => UpdateData("CoinEx", data.Data.First().LastPrice)),
             coinbaseSocketClient.AdvancedTradeApi.SubscribeToTickerUpdatesAsync("ETH-BTC", data => UpdateData("Coinbase", data.Data.LastPrice ?? 0)),
             cryptocomSocketClient.ExchangeApi.SubscribeToTickerUpdatesAsync("ETH_BTC", data => UpdateData("CryptoCom", data.Data.LastPrice ?? 0)),
+            deepCoinSocketClient.ExchangeApi.SubscribeToSymbolUpdatesAsync("ETH-BTC", data => UpdateData("DeepCoin", data.Data.LastPrice ?? 0)),
             gateioSocketClient.SpotApi.SubscribeToTickerUpdatesAsync("ETH_BTC", data => UpdateData("GateIo", data.Data.LastPrice)),
             htxSocketClient.SpotApi.SubscribeToTickerUpdatesAsync("ethbtc", data => UpdateData("HTX", data.Data.ClosePrice ?? 0)),
             // HyperLiquid doesn't support the ETH/BTC pair
             //hyperLiquidSocketClient.SpotApi.SubscribeToSymbolUpdatesAsync("ETH", data => UpdateData("HyperLiquid", data.Data.MidPrice ?? 0)),
-            krakenSocketClient.SpotApi.SubscribeToTickerUpdatesAsync("ETH/XBT", data => UpdateData("Kraken", data.Data.LastPrice)),
+            krakenSocketClient.SpotApi.SubscribeToTickerUpdatesAsync("ETH/BTC", data => UpdateData("Kraken", data.Data.LastPrice)),
             kucoinSocketClient.SpotApi.SubscribeToTickerUpdatesAsync("ETH-BTC", data => UpdateData("Kucoin", data.Data.LastPrice ?? 0)),
             mexcSocketClient.SpotApi.SubscribeToMiniTickerUpdatesAsync("ETHBTC", data => UpdateData("Mexc", data.Data.LastPrice)),
             okxSocketClient.UnifiedApi.ExchangeData.SubscribeToTickerUpdatesAsync("ETH-BTC", data => UpdateData("OKX", data.Data.LastPrice ?? 0)),

Examples/BlazorClient/Pages/OrderBooks.razor

@@ -6,11 +6,13 @@
 @using Bitfinex.Net.Interfaces
 @using Bitget.Net.Interfaces;
 @using BitMart.Net.Interfaces;
+@using BitMEX.Net.Interfaces;
 @using Bybit.Net.Interfaces
 @using CoinEx.Net.Interfaces
 @using Coinbase.Net.Interfaces
 @using CryptoExchange.Net.Interfaces
 @using CryptoCom.Net.Interfaces
+@using DeepCoin.Net.Interfaces
 @using GateIo.Net.Interfaces
 @using HTX.Net.Interfaces
 @using HyperLiquid.Net.Interfaces
@@ -25,10 +27,12 @@
 @inject IBitfinexOrderBookFactory bitfinexFactory
 @inject IBitgetOrderBookFactory bitgetFactory
 @inject IBitMartOrderBookFactory bitmartFactory
+@inject IBitMEXOrderBookFactory bitmexFactory
 @inject IBybitOrderBookFactory bybitFactory
 @inject ICoinbaseOrderBookFactory coinbaseFactory
 @inject ICoinExOrderBookFactory coinExFactory
 @inject ICryptoComOrderBookFactory cryptocomFactory
+@inject IDeepCoinOrderBookFactory deepCoinFactory
 @inject IGateIoOrderBookFactory gateioFactory
 @inject IHTXOrderBookFactory htxFactory
 @inject IHyperLiquidOrderBookFactory hyperLiquidFactory
@@ -75,11 +79,13 @@
                 { "Bitfinex", bitfinexFactory.Create("tETHBTC") },
                 { "Bitget", bitgetFactory.CreateSpot("ETHBTC") },
                 { "BitMart", bitmartFactory.CreateSpot("ETH_BTC", null) },
+                { "BitMEX", bitmexFactory.Create("ETH_XBT") },
                 { "Bybit", bybitFactory.Create("ETHBTC", Bybit.Net.Enums.Category.Spot) },
                 { "Coinbase", coinbaseFactory.Create("ETH-BTC", null) },
                 { "CoinEx", coinExFactory.CreateSpot("ETHBTC") },
                 { "CryptoCom", cryptocomFactory.Create("ETH_BTC") },
                 { "GateIo", gateioFactory.CreateSpot("ETH_BTC") },
+                { "DeepCoin", deepCoinFactory.Create("ETH-BTC") },
                 { "HTX", htxFactory.CreateSpot("ethbtc") },
                 // HyperLiquid does not support the ETH/BTC pair
                 //{ "HyperLiquid", hyperLiquidFactory.Create("ETH/BTC") },

Examples/BlazorClient/Pages/SpotClient.razor

@@ -1,5 +1,6 @@
 @page "/SpotClient"
 @using CryptoExchange.Net.SharedApis
+@using System.Diagnostics
 @inject IEnumerable<ISpotTickerRestClient> restClients
 
 <h3>ETH-BTC prices:</h3>
@@ -20,6 +21,8 @@
         {
             if (ticker.Success)
                 _prices.Add(ticker.Exchange, ticker.Data.LastPrice);
+            else
+                Debug.WriteLine($"{ticker.Exchange} failed: {ticker.Error}");
         }
     }
 

Examples/BlazorClient/Pages/Trackers.razor

@@ -5,6 +5,7 @@
 @using BingX.Net.Interfaces
 @using Bitfinex.Net.Interfaces
 @using Bitget.Net.Interfaces;
+@using BitMEX.Net.Interfaces;
 @using BitMart.Net.Interfaces;
 @using Bybit.Net.Interfaces
 @using CoinEx.Net.Interfaces
@@ -13,6 +14,7 @@
 @using CryptoCom.Net.Interfaces
 @using CryptoExchange.Net.SharedApis
 @using CryptoExchange.Net.Trackers.Trades
+@using DeepCoin.Net.Interfaces
 @using GateIo.Net.Interfaces
 @using HTX.Net.Interfaces
 @using HyperLiquid.Net.Interfaces
@@ -27,10 +29,12 @@
 @inject IBitfinexTrackerFactory bitfinexFactory
 @inject IBitgetTrackerFactory bitgetFactory
 @inject IBitMartTrackerFactory bitmartFactory
+@inject IBitMEXTrackerFactory bitmexFactory
 @inject IBybitTrackerFactory bybitFactory
 @inject ICoinbaseTrackerFactory coinbaseFactory
 @inject ICoinExTrackerFactory coinExFactory
 @inject ICryptoComTrackerFactory cryptocomFactory
+@inject IDeepCoinTrackerFactory deepCoinFactory
 @inject IGateIoTrackerFactory gateioFactory
 @inject IHTXTrackerFactory htxFactory
 @inject IHyperLiquidTrackerFactory hyperLiquidFactory
@@ -70,10 +74,12 @@
                 { bitfinexFactory.CreateTradeTracker(usdtSymbol, period: TimeSpan.FromMinutes(5)) },
                 { bitgetFactory.CreateTradeTracker(usdtSymbol, period: TimeSpan.FromMinutes(5)) },
                 { bitmartFactory.CreateTradeTracker(usdtSymbol, period: TimeSpan.FromMinutes(5)) },
+                { bitmexFactory.CreateTradeTracker(usdtSymbol, period: TimeSpan.FromMinutes(5)) },
                 { bybitFactory.CreateTradeTracker(usdtSymbol, period: TimeSpan.FromMinutes(5)) },
                 { coinbaseFactory.CreateTradeTracker(usdtSymbol, period: TimeSpan.FromMinutes(5)) },
                 { coinExFactory.CreateTradeTracker(usdtSymbol, period: TimeSpan.FromMinutes(5)) },
                 { cryptocomFactory.CreateTradeTracker(usdtSymbol, period: TimeSpan.FromMinutes(5)) },
+                { deepCoinFactory.CreateTradeTracker(usdtSymbol, period: TimeSpan.FromMinutes(5)) },
                 { gateioFactory.CreateTradeTracker(usdtSymbol, period: TimeSpan.FromMinutes(5)) },
                 { htxFactory.CreateTradeTracker(usdtSymbol, period: TimeSpan.FromMinutes(5)) },
                 // HyperLiquid doesn't support spot pair, but does have a futures BTC/USDC pair

Examples/BlazorClient/Startup.cs

@@ -40,10 +40,12 @@ namespace BlazorClient
             services.AddBitfinex();
             services.AddBitget();
             services.AddBitMart();
+            services.AddBitMEX();
             services.AddBybit();
             services.AddCoinbase();
             services.AddCoinEx();
             services.AddCryptoCom();
+            services.AddDeepCoin();
             services.AddGateIo();
             services.AddHyperLiquid();
             services.AddHTX();

Examples/BlazorClient/_Imports.razor

@@ -13,10 +13,12 @@
 @using Bitfinex.Net.Interfaces.Clients;
 @using Bitget.Net.Interfaces.Clients;
 @using BitMart.Net.Interfaces.Clients;
+@using BitMEX.Net.Interfaces.Clients;
 @using Bybit.Net.Interfaces.Clients;
 @using Coinbase.Net.Interfaces.Clients;
 @using CoinEx.Net.Interfaces.Clients;
 @using CryptoCom.Net.Interfaces.Clients;
+@using DeepCoin.Net.Interfaces.Clients;
 @using GateIo.Net.Interfaces.Clients;
 @using HTX.Net.Interfaces.Clients;
 @using HyperLiquid.Net.Interfaces.Clients;

README.md

@@ -17,11 +17,13 @@ The following API's are directly supported. Note that there are 3rd party implem
 |Bitfinex|[JKorf/Bitfinex.Net](https://github.com/JKorf/Bitfinex.Net)|[![Nuget version](https://img.shields.io/nuget/v/Bitfinex.net.svg?style=flat-square)](https://www.nuget.org/packages/Bitfinex.Net)|
 |Bitget|[JKorf/Bitget.Net](https://github.com/JKorf/Bitget.Net)|[![Nuget version](https://img.shields.io/nuget/v/JK.Bitget.net.svg?style=flat-square)](https://www.nuget.org/packages/JK.Bitget.Net)|
 |BitMart|[JKorf/BitMart.Net](https://github.com/JKorf/BitMart.Net)|[![Nuget version](https://img.shields.io/nuget/v/BitMart.net.svg?style=flat-square)](https://www.nuget.org/packages/BitMart.Net)|
+|BitMEX|[JKorf/BitMEX.Net](https://github.com/JKorf/BitMEX.Net)|[![Nuget version](https://img.shields.io/nuget/v/JKorf.BitMEX.net.svg?style=flat-square)](https://www.nuget.org/packages/JKorf.BitMEX.Net)|
 |Bybit|[JKorf/Bybit.Net](https://github.com/JKorf/Bybit.Net)|[![Nuget version](https://img.shields.io/nuget/v/Bybit.net.svg?style=flat-square)](https://www.nuget.org/packages/Bybit.Net)|
 |Coinbase|[JKorf/Coinbase.Net](https://github.com/JKorf/Coinbase.Net)|[![Nuget version](https://img.shields.io/nuget/v/JKorf.Coinbase.Net.svg?style=flat-square)](https://www.nuget.org/packages/JKorf.Coinbase.Net)|
 |CoinEx|[JKorf/CoinEx.Net](https://github.com/JKorf/CoinEx.Net)|[![Nuget version](https://img.shields.io/nuget/v/CoinEx.net.svg?style=flat-square)](https://www.nuget.org/packages/CoinEx.Net)|
 |CoinGecko|[JKorf/CoinGecko.Net](https://github.com/JKorf/CoinGecko.Net)|[![Nuget version](https://img.shields.io/nuget/v/CoinGecko.net.svg?style=flat-square)](https://www.nuget.org/packages/CoinGecko.Net)|
 |Crypto.com|[JKorf/CryptoCom.Net](https://github.com/JKorf/CryptoCom.Net)|[![Nuget version](https://img.shields.io/nuget/v/CryptoCom.net.svg?style=flat-square)](https://www.nuget.org/packages/CryptoCom.Net)|
+|DeepCoin|[JKorf/DeepCoin.Net](https://github.com/JKorf/DeepCoin.Net)|[![Nuget version](https://img.shields.io/nuget/v/DeepCoin.net.svg?style=flat-square)](https://www.nuget.org/packages/DeepCoin.Net)|
 |Gate.io|[JKorf/GateIo.Net](https://github.com/JKorf/GateIo.Net)|[![Nuget version](https://img.shields.io/nuget/v/GateIo.net.svg?style=flat-square)](https://www.nuget.org/packages/GateIo.Net)|
 |HTX|[JKorf/HTX.Net](https://github.com/JKorf/HTX.Net)|[![Nuget version](https://img.shields.io/nuget/v/JKorf.HTX.net.svg?style=flat-square)](https://www.nuget.org/packages/JKorf.HTX.Net)|
 |HyperLiquid|[JKorf/HyperLiquid.Net](https://github.com/JKorf/HyperLiquid.Net)|[![Nuget version](https://img.shields.io/nuget/v/HyperLiquid.Net.svg?style=flat-square)](https://www.nuget.org/packages/HyperLiquid.Net)|
@@ -50,6 +52,7 @@ When creating an account on new exchanges please consider using a referral link
 |Coinbase|[https://advanced.coinbase.com/join/T6H54H8](https://advanced.coinbase.com/join/T6H54H8)|
 |CoinEx|[https://www.coinex.com/register?refer_code=hd6gn](https://www.coinex.com/register?refer_code=hd6gn)|
 |Crypto.com|[https://crypto.com/exch/26ge92xbkn](https://crypto.com/exch/26ge92xbkn)|
+|DeepCoin|[https://s.deepcoin.com/jddhfca)|
 |HTX|[https://www.htx.com/invite/en-us/1f?invite_code=fxp9](https://www.htx.com/invite/en-us/1f?invite_code=fxp9)|
 |HyperLiquid|[https://app.hyperliquid.xyz/join/JKORF](https://app.hyperliquid.xyz/join/JKORF)|
 |Kucoin|[https://www.kucoin.com/r/rf/QBS4FPED](https://www.kucoin.com/r/rf/QBS4FPED)|
@@ -68,6 +71,24 @@ Make a one time donation in a crypto currency of your choice. If you prefer to d
 Alternatively, sponsor me on Github using [Github Sponsors](https://github.com/sponsors/JKorf). 
 
 ## Release notes
+* Version 8.8.0 - 10 Feb 2025
+    * Split DataEvent.Timestamp in DataEvent.ReceivedTime and DataEvent.DataTime
+    * Added SharedKlineInterval enum values
+    * Fixed some typos
+
+* Version 8.7.4 - 08 Feb 2025
+    * Fixed exception when creating rest client for mono runtime
+
+* Version 8.7.3 - 05 Feb 2025
+    * Added handling of negative number DateTime deserialization to default
+    * Updated SharedSymbol from class to record
+    * Fixed issue with serialization of nullable types in System.Text.Json ArrayConverter
+    * Fix for unnecessary error message in logging when closing websocket connection
+
+* Version 8.7.2 - 27 Jan 2025
+    * Some small fixes in the System.Text.Json ArrayConverter
+    * Added support for Flags enum deserialization in System.Text.Json EnumConverter
+
 * Version 8.7.1 - 24 Jan 2025
     * Added Authenticated property to IBaseApiClient interface to check if a client was provided API credentials
 

docs/index.html

@@ -151,11 +151,13 @@
 			<tr><td>Bitfinex</td><td><a href="https://github.com/JKorf/Bitfinex.Net">JKorf/Bitfinex.Net</a></td><td><a href="https://www.nuget.org/packages/Bitfinex.Net" target="_blank"><img src="https://img.shields.io/nuget/v/Bitfinex.net.svg?style=flat-square" /></a></td></tr>
 			<tr><td>Bitget</td><td><a href="https://github.com/JKorf/Bitget.Net">JKorf/Bitget.Net</a></td><td><a href="https://www.nuget.org/packages/JK.Bitget.Net" target="_blank"><img src="https://img.shields.io/nuget/v/JK.Bitget.net.svg?style=flat-square" /></a></td></tr>
 			<tr><td>BitMart</td><td><a href="https://github.com/JKorf/BitMart.Net">JKorf/BitMart.Net</a></td><td><a href="https://www.nuget.org/packages/BitMart.Net" target="_blank"><img src="https://img.shields.io/nuget/v/BitMart.net.svg?style=flat-square" /></a></td></tr>
+			<tr><td>BitMEX</td><td><a href="https://github.com/JKorf/BitMEX.Net">JKorf/BitMEX.Net</a></td><td><a href="https://www.nuget.org/packages/JKorf.BitMEX.Net" target="_blank"><img src="https://img.shields.io/nuget/v/JKorf.BitMEX.net.svg?style=flat-square" /></a></td></tr>
 			<tr><td>Bybit</td><td><a href="https://github.com/JKorf/Bybit.Net">JKorf/Bybit.Net</a></td><td><a href="https://www.nuget.org/packages/Bybit.Net" target="_blank"><img src="https://img.shields.io/nuget/v/Bybit.net.svg?style=flat-square" /></a></td></tr>
 			<tr><td>Coinbase</td><td><a href="https://github.com/JKorf/Coinbase.Net">JKorf/Coinbase.Net</a></td><td><a href="https://www.nuget.org/packages/JKorf.Coinbase.Net" target="_blank"><img src="https://img.shields.io/nuget/v/JKorf.Coinbase.net.svg?style=flat-square" /></a></td></tr>
 			<tr><td>CoinEx</td><td><a href="https://github.com/JKorf/CoinEx.Net">JKorf/CoinEx.Net</a></td><td><a href="https://www.nuget.org/packages/CoinEx.Net" target="_blank"><img src="https://img.shields.io/nuget/v/CoinEx.net.svg?style=flat-square" /></a></td></tr>
 			<tr><td>CoinGecko</td><td><a href="https://github.com/JKorf/CoinGecko.Net">JKorf/CoinGecko.Net</a></td><td><a href="https://www.nuget.org/packages/CoinGecko.Net" target="_blank"><img src="https://img.shields.io/nuget/v/CoinGecko.net.svg?style=flat-square" /></a></td></tr>
 			<tr><td>Crypto.com</td><td><a href="https://github.com/JKorf/CryptoCom.Net">JKorf/CryptoCom.Net</a></td><td><a href="https://www.nuget.org/packages/CryptoCom.Net" target="_blank"><img src="https://img.shields.io/nuget/v/CryptoCom.net.svg?style=flat-square" /></a></td></tr>
+			<tr><td>DeepCoin</td><td><a href="https://github.com/JKorf/DeepCoin.Net">JKorf/DeepCoin.Net</a></td><td><a href="https://www.nuget.org/packages/DeepCoin.Net" target="_blank"><img src="https://img.shields.io/nuget/v/DeepCoin.net.svg?style=flat-square" /></a></td></tr>
 			<tr><td>Gate.io</td><td><a href="https://github.com/JKorf/GateIo.Net">JKorf/GateIo.Net</a></td><td><a href="https://www.nuget.org/packages/GateIo.Net" target="_blank"><img src="https://img.shields.io/nuget/v/GateIo.net.svg?style=flat-square" /></a></td></tr>
 			<tr><td>HTX</td><td><a href="https://github.com/JKorf/HTX.Net">JKorf/HTX.Net</a></td><td><a href="https://www.nuget.org/packages/JKorf.HTX.Net" target="_blank"><img src="https://img.shields.io/nuget/v/JKorf.HTX.net.svg?style=flat-square" /></a></td></tr>
 			<tr><td>HyperLiquid</td><td><a href="https://github.com/JKorf/HyperLiquid.Net">JKorf/HyperLiquid.Net</a></td><td><a href="https://www.nuget.org/packages/HyperLiquid.Net" target="_blank"><img src="https://img.shields.io/nuget/v/HyperLiquid.net.svg?style=flat-square" /></a></td></tr>
@@ -203,7 +205,8 @@
 		  <tr><td>Bybit</td><td>https://partner.bybit.com/b/jkorf</td></tr>
 		  <tr><td>Coinbase</td><td>https://advanced.coinbase.com/join/T6H54H8</td></tr>
 		  <tr><td>CoinEx</td><td>https://www.coinex.com/register?refer_code=hd6gn</td></tr>
-		  <tr><td>Crypto.com</td><td>https://crypto.com/exch/26ge92xbkn</td></tr>
+		  <tr><td>Crypto.com</td><td>https://crypto.com/exch/26ge92xbkn</td></tr>		  
+		  <tr><td>DeepCoin</td><td>https://s.deepcoin.com/jddhfca</td></tr>
 		  <tr><td>HTX</td><td>https://www.htx.com/invite/en-us/1f?invite_code=fxp9</td></tr>
 		  <tr><td>HyperLiquid</td><td>https://app.hyperliquid.xyz/join/JKORF</td></tr>
 		  <tr><td>Kucoin</td><td>https://www.kucoin.com/r/rf/QBS4FPED</td></tr>