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.

.github/workflows/dotnet.yml

@@ -16,7 +16,7 @@ jobs:
     - name: Setup .NET
       uses: actions/setup-dotnet@v1
       with:
-        dotnet-version: 8.0.x
+        dotnet-version: 9.0.x
     - name: Restore dependencies
       run: dotnet restore
     - name: Build

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/CryptoExchange.Net.UnitTests.csproj

@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>net8.0</TargetFramework>
+    <TargetFramework>net9.0</TargetFramework>
     <IsPackable>false</IsPackable>
   </PropertyGroup>
 

CryptoExchange.Net.UnitTests/ExchangeHelpersTests.cs

@@ -1,6 +1,7 @@
 using CryptoExchange.Net.Objects;
 using NUnit.Framework;
 using NUnit.Framework.Legacy;
+using System.Diagnostics;
 using System.Globalization;
 
 namespace CryptoExchange.Net.UnitTests
@@ -70,5 +71,20 @@ namespace CryptoExchange.Net.UnitTests
             var result = ExchangeHelpers.Normalize(input);
             Assert.That(expected == result.ToString(CultureInfo.InvariantCulture));
         }
+
+        [Test]
+        [TestCase("123", "BKR", 32, true, "BKRJK123")]
+        [TestCase("123", "BKR", 32, false, "123")]
+        [TestCase("123123123123123123123123123123", "BKR", 32, true, "123123123123123123123123123123")] // 30
+        [TestCase("12312312312312312312312312312", "BKR", 32, true, "12312312312312312312312312312")] // 27
+        [TestCase("123123123123123123123123123", "BKR", 32, true, "BKRJK123123123123123123123123123")] // 25
+        [TestCase(null, "BKR", 32, true, null)]
+        public void ApplyBrokerIdTests(string clientOrderId, string brokerId, int maxLength, bool allowValueAdjustement, string expected)
+        {
+            var result = LibraryHelpers.ApplyBrokerId(clientOrderId, brokerId, maxLength, allowValueAdjustement);
+            
+            if (expected != null)
+                Assert.That(result, Is.EqualTo(expected));
+        }
     }
 }

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 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, 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/Attributes/NullableAttributes.cs

@@ -1,4 +1,4 @@
-#if !NETSTANDARD2_1
+#if NETSTANDARD2_0
 namespace System.Diagnostics.CodeAnalysis
 {
     using System;

CryptoExchange.Net/Authentication/AuthenticationProvider.cs

@@ -369,7 +369,7 @@ namespace CryptoExchange.Net.Authentication
             var rsa = RSA.Create();
             if (_credentials.CredentialType == ApiCredentialsType.RsaPem)
             {
-#if NETSTANDARD2_1_OR_GREATER
+#if NETSTANDARD2_1_OR_GREATER || NET9_0_OR_GREATER
                 // Read from pem private key
                 var key = _credentials.Secret!
                         .Replace("\n", "")
@@ -403,10 +403,14 @@ namespace CryptoExchange.Net.Authentication
         /// <returns></returns>
         protected static string BytesToHexString(byte[] buff)
         {
+#if NET9_0_OR_GREATER
+            return Convert.ToHexString(buff);
+#else
             var result = string.Empty;
             foreach (var t in buff)
                 result += t.ToString("X2");
             return result;
+#endif
         }
 
         /// <summary>
@@ -439,16 +443,26 @@ namespace CryptoExchange.Net.Authentication
             return DateTimeConverter.ConvertToMilliseconds(GetTimestamp(apiClient)).Value.ToString(CultureInfo.InvariantCulture);
         }
 
+        /// <summary>
+        /// Get millisecond timestamp as a long including the time sync offset from the api client
+        /// </summary>
+        /// <param name="apiClient"></param>
+        /// <returns></returns>
+        protected long GetMillisecondTimestampLong(RestApiClient apiClient)
+        {
+            return DateTimeConverter.ConvertToMilliseconds(GetTimestamp(apiClient)).Value;
+        }
+
         /// <summary>
         /// Return the serialized request body
         /// </summary>
         /// <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))
+            if (parameters.Count == 1 && parameters.TryGetValue(Constants.BodyPlaceHolderKey, out object? value))
-                return serializer.Serialize(parameters[Constants.BodyPlaceHolderKey]);
+                return serializer.Serialize(value);
             else
                 return serializer.Serialize(parameters);
         }

CryptoExchange.Net/Caching/MemoryCache.cs

@@ -26,7 +26,7 @@ namespace CryptoExchange.Net.Caching
         /// <returns>Cached value if it was in cache</returns>
         public object? Get(string key, TimeSpan maxAge)
         {
-            _cache.TryGetValue(key, out CacheItem value);
+            _cache.TryGetValue(key, out CacheItem? value);
             if (value == null)
                 return null;
 

CryptoExchange.Net/Clients/BaseApiClient.cs

@@ -38,9 +38,7 @@ namespace CryptoExchange.Net.Clients
         /// </summary>
         public bool OutputOriginalData { get; }
 
-        /// <summary>
+        /// <inheritdoc />
-        /// Whether or not API credentials have been configured for this client. Does not check the credentials are actually valid.
-        /// </summary>
         public bool Authenticated => ApiOptions.ApiCredentials != null || ClientOptions.ApiCredentials != null;
 
         /// <summary>
@@ -57,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>
@@ -93,6 +91,17 @@ namespace CryptoExchange.Net.Clients
                 AuthenticationProvider = CreateAuthenticationProvider(credentials.Copy());
         }
 
+        /// <inheritdoc />
+        public virtual void SetOptions<T>(UpdateOptions<T> options) where T : ApiCredentials
+        {
+            ClientOptions.Proxy = options.Proxy;
+            ClientOptions.RequestTimeout = options.RequestTimeout ?? ClientOptions.RequestTimeout;
+
+            ApiOptions.ApiCredentials = options.ApiCredentials ?? ClientOptions.ApiCredentials;
+            if (options.ApiCredentials != null)
+                AuthenticationProvider = CreateAuthenticationProvider(options.ApiCredentials.Copy());
+        }
+
         /// <summary>
         /// Dispose
         /// </summary>

CryptoExchange.Net/Clients/BaseClient.cs

@@ -15,7 +15,7 @@ namespace CryptoExchange.Net.Clients
         /// <summary>
         /// Version of the CryptoExchange.Net base library
         /// </summary>
-        public Version CryptoExchangeLibVersion { get; } = typeof(BaseClient).Assembly.GetName().Version;
+        public Version CryptoExchangeLibVersion { get; } = typeof(BaseClient).Assembly.GetName().Version!;
 
         /// <summary>
         /// Version of the client implementation
@@ -27,7 +27,7 @@ namespace CryptoExchange.Net.Clients
                lock(_versionLock)
                 {
                     if (_exchangeVersion == null)
-                        _exchangeVersion = GetType().Assembly.GetName().Version;
+                        _exchangeVersion = GetType().Assembly.GetName().Version!;
 
                     return _exchangeVersion;
                 }
@@ -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
@@ -154,6 +154,8 @@ namespace CryptoExchange.Net.Clients
         /// <param name="cancellationToken">Cancellation token</param>
         /// <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,
@@ -161,7 +163,9 @@ namespace CryptoExchange.Net.Clients
             ParameterCollection? parameters,
             CancellationToken cancellationToken,
             Dictionary<string, string>? additionalHeaders = null,
-            int? weight = null) where T : class
+            int? weight = null,
+            int? weightSingleLimiter = null,
+            string? rateLimitKeySuffix = null)
         {
             var parameterPosition = definition.ParameterPosition ?? ParameterPositions[definition.Method];
             return SendAsync<T>(
@@ -171,7 +175,9 @@ namespace CryptoExchange.Net.Clients
                 parameterPosition == HttpMethodParameterPosition.InBody ? parameters : null,
                 cancellationToken,
                 additionalHeaders,
-                weight);
+                weight,
+                weightSingleLimiter,
+                rateLimitKeySuffix);
         }
 
         /// <summary>
@@ -185,6 +191,8 @@ namespace CryptoExchange.Net.Clients
         /// <param name="cancellationToken">Cancellation token</param>
         /// <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,
@@ -193,7 +201,9 @@ namespace CryptoExchange.Net.Clients
             ParameterCollection? bodyParameters,
             CancellationToken cancellationToken,
             Dictionary<string, string>? additionalHeaders = null,
-            int? weight = null) where T : class
+            int? weight = null,
+            int? weightSingleLimiter = null,
+            string? rateLimitKeySuffix = null)
         {
             string? cacheKey = null;
             if (ShouldCache(definition))
@@ -217,7 +227,7 @@ namespace CryptoExchange.Net.Clients
                 currentTry++;
                 var requestId = ExchangeHelpers.NextId();
 
-                var prepareResult = await PrepareAsync(requestId, baseAddress, definition, cancellationToken, additionalHeaders, weight).ConfigureAwait(false);
+                var prepareResult = await PrepareAsync(requestId, baseAddress, definition, cancellationToken, additionalHeaders, weight, weightSingleLimiter, rateLimitKeySuffix).ConfigureAwait(false);
                 if (!prepareResult)
                     return new WebCallResult<T>(prepareResult.Error!);
 
@@ -231,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)
+                if (result.Error is not CancellationRequestedError)
-                    _logger.RestApiErrorReceived(result.RequestId, result.ResponseStatusCode, (long)Math.Floor(result.ResponseTime!.Value.TotalMilliseconds), result.Error?.ToString());
+                {
+                    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;
@@ -258,6 +275,8 @@ namespace CryptoExchange.Net.Clients
         /// <param name="cancellationToken">Cancellation token</param>
         /// <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(
@@ -266,10 +285,10 @@ namespace CryptoExchange.Net.Clients
             RequestDefinition definition,
             CancellationToken cancellationToken,
             Dictionary<string, string>? additionalHeaders = null,
-            int? weight = null)
+            int? weight = null,
+            int? weightSingleLimiter = null,
+            string? rateLimitKeySuffix = null)
         {
-            var requestWeight = weight ?? definition.Weight;
-
             // Time sync
             if (definition.Authenticated)
             {
@@ -295,6 +314,7 @@ namespace CryptoExchange.Net.Clients
             }            
 
             // Rate limiting
+            var requestWeight = weight ?? definition.Weight;
             if (requestWeight != 0)
             {
                 if (definition.RateLimitGate == null)
@@ -302,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!);
                 }
@@ -316,7 +336,8 @@ namespace CryptoExchange.Net.Clients
 
                 if (ClientOptions.RateLimiterEnabled)
                 {
-                    var limitResult = await definition.RateLimitGate.ProcessSingleAsync(_logger, requestId, definition.LimitGuard, RateLimitItemType.Request, definition, baseAddress, AuthenticationProvider?._credentials.Key, ClientOptions.RateLimitingBehaviour, cancellationToken).ConfigureAwait(false);
+                    var singleRequestWeight = weightSingleLimiter ?? 1;
+                    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!);
                 }
@@ -602,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!);
                 }
@@ -617,7 +638,7 @@ namespace CryptoExchange.Net.Clients
                 paramString = $" with request body '{request.Content}'";
 
             var headers = request.GetHeaders();
-            if (headers.Any())
+            if (headers.Count != 0)
                 paramString += " with headers " + string.Join(", ", headers.Select(h => h.Key + $"=[{string.Join(",", h.Value)}]"));
 
             TotalRequestsMade++;
@@ -693,10 +714,21 @@ namespace CryptoExchange.Net.Clients
                 }
 
                 // Json response received
-                var parsedError = TryParseError(accessor);
+                var parsedError = TryParseError(response.ResponseHeaders, accessor);
                 if (parsedError != null)
+                {
+                    if (parsedError is ServerRateLimitError rateError)
+                    {
+                        if (rateError.RetryAfter != null && gate != null && ClientOptions.RateLimiterEnabled)
+                        {
+                            _logger.RestApiRateLimitPauseUntil(request.RequestId, rateError.RetryAfter.Value);
+                            await gate.SetRetryAfterGuardAsync(rateError.RetryAfter.Value).ConfigureAwait(false);
+                        }
+                    }
+
                     // Success status code, but TryParseError determined it was an error response
                     return new WebCallResult<T>(response.StatusCode, response.ResponseHeaders, sw.Elapsed, responseLength, OutputOriginalData ? accessor.GetOriginalString() : null, request.RequestId, request.Uri.ToString(), request.Content, request.Method, request.GetHeaders(), ResultDataSource.Server, default, parsedError);
+                }
 
                 var deserializeResult = accessor.Deserialize<T>();
                 return new WebCallResult<T>(response.StatusCode, response.ResponseHeaders, sw.Elapsed, responseLength, OutputOriginalData ? accessor.GetOriginalString() : null, request.RequestId, request.Uri.ToString(), request.Content, request.Method, request.GetHeaders(), ResultDataSource.Server, deserializeResult.Data, deserializeResult.Error);
@@ -730,12 +762,13 @@ namespace CryptoExchange.Net.Clients
 
         /// <summary>
         /// Can be used to parse an error even though response status indicates success. Some apis always return 200 OK, even though there is an error.
-        /// When setting manualParseError to true this method will be called for each response to be able to check if the response is an error or not.
+        /// This method will be called for each response to be able to check if the response is an error or not.
         /// If the response is an error this method should return the parsed error, else it should return null
         /// </summary>
         /// <param name="accessor">Data accessor</param>
+        /// <param name="responseHeaders">The response headers</param>
         /// <returns>Null if not an error, Error otherwise</returns>
-        protected virtual ServerError? TryParseError(IMessageAccessor accessor) => null;
+        protected virtual Error? TryParseError(IEnumerable<KeyValuePair<string, IEnumerable<string>>> responseHeaders, IMessageAccessor accessor) => null;
 
         /// <summary>
         /// Can be used to indicate that a request should be retried. Defaults to false. Make sure to retry a max number of times (based on the the tries parameter) or the request will retry forever.
@@ -752,7 +785,7 @@ namespace CryptoExchange.Net.Clients
                 // Only retry once
                 return false;
 
-            if ((int?)callResult.ResponseStatusCode == 429 
+            if (callResult.Error is ServerRateLimitError
                 && ClientOptions.RateLimiterEnabled
                 && ClientOptions.RateLimitingBehaviour != RateLimitingBehaviour.Fail
                 && gate != null)
@@ -807,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>();
@@ -889,8 +922,8 @@ namespace CryptoExchange.Net.Clients
             {
                 // Write the parameters as json in the body
                 string stringData;
-                if (parameters.Count == 1 && parameters.ContainsKey(Constants.BodyPlaceHolderKey))
+                if (parameters.Count == 1 && parameters.TryGetValue(Constants.BodyPlaceHolderKey, out object? value))
-                    stringData = CreateSerializer().Serialize(parameters[Constants.BodyPlaceHolderKey]);
+                    stringData = CreateSerializer().Serialize(value);
                 else
                     stringData = CreateSerializer().Serialize(parameters);
                 request.SetContent(stringData, contentType);
@@ -961,6 +994,14 @@ namespace CryptoExchange.Net.Clients
         /// <returns>Server time</returns>
         protected virtual Task<WebCallResult<DateTime>> GetServerTimestampAsync() => throw new NotImplementedException();
 
+        /// <inheritdoc />
+        public override void SetOptions<T>(UpdateOptions<T> options)
+        {
+            base.SetOptions(options);
+
+            RequestFactory.UpdateSettings(options.Proxy, options.RequestTimeout ?? ClientOptions.RequestTimeout);
+        }
+
         internal async Task<WebCallResult<bool>> SyncTimeAsync()
         {
             var timeSyncParams = GetTimeSyncInfo();

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);
@@ -158,7 +158,7 @@ namespace CryptoExchange.Net.Clients
         /// <param name="interval"></param>
         /// <param name="queryDelegate"></param>
         /// <param name="callback"></param>
-        protected virtual void RegisterPeriodicQuery(string identifier, TimeSpan interval, Func<SocketConnection, Query> queryDelegate, Action<CallResult>? callback)
+        protected virtual void RegisterPeriodicQuery(string identifier, TimeSpan interval, Func<SocketConnection, Query> queryDelegate, Action<SocketConnection, CallResult>? callback)
         {
             PeriodicTaskRegistrations.Add(new PeriodicTaskRegistration
             {
@@ -422,9 +422,10 @@ namespace CryptoExchange.Net.Clients
                     result.Error!.Message = "Authentication failed: " + result.Error.Message;
                     return new CallResult(result.Error)!;
                 }
+
+                _logger.Authenticated(socket.SocketId);
             }
 
-            _logger.Authenticated(socket.SocketId);
             socket.Authenticated = true;
             return new CallResult(null);
         }
@@ -509,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);
             }
@@ -597,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>
@@ -669,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))
+                foreach (var connection in socketList)
-                    tasks.Add(connection.CloseAsync());
+                {
+                    foreach(var subscription in connection.Subscriptions.Where(x => x.UserSubscription))
+                        tasks.Add(connection.CloseAsync(subscription));
+                }
             }
 
             await Task.WhenAll(tasks.ToArray()).ConfigureAwait(false);
@@ -710,6 +715,25 @@ namespace CryptoExchange.Net.Clients
             return new CallResult(null);
         }
 
+        /// <inheritdoc />
+        public override void SetOptions<T>(UpdateOptions<T> options)
+        {
+            var previousProxyIsSet = ClientOptions.Proxy != null;
+            base.SetOptions(options);
+
+            if ((!previousProxyIsSet && options.Proxy == null)
+                || socketConnections.IsEmpty)
+            {
+                return;
+            }
+
+            _logger.LogInformation("Reconnecting websockets to apply proxy");
+
+            // Update proxy, also triggers reconnect
+            foreach (var connection in socketConnections)
+                _ = connection.Value.UpdateProxy(options.Proxy);
+        }
+
         /// <summary>
         /// Log the current state of connections and subscriptions
         /// </summary>

CryptoExchange.Net/Converters/JsonNet/ArrayConverter.cs

@@ -36,7 +36,7 @@ namespace CryptoExchange.Net.Converters.JsonNet
 
             var result = Activator.CreateInstance(objectType);
             var arr = JArray.Load(reader);
-            return ParseObject(arr, result, objectType);
+            return ParseObject(arr, result!, objectType);
         }
 
         private static object ParseObject(JArray arr, object result, Type objectType)
@@ -58,25 +58,25 @@ namespace CryptoExchange.Net.Converters.JsonNet
                     var count = 0;
                     if (innerArray.Count == 0)
                     {
-                        var arrayResult = (IList)Activator.CreateInstance(property.PropertyType, new [] { 0 });
+                        var arrayResult = (IList)Activator.CreateInstance(property.PropertyType, new [] { 0 })!;
                         property.SetValue(result, arrayResult);
                     }
                     else if (innerArray[0].Type == JTokenType.Array)
                     {
-                        var arrayResult = (IList)Activator.CreateInstance(property.PropertyType, new [] { innerArray.Count });
+                        var arrayResult = (IList)Activator.CreateInstance(property.PropertyType, new [] { innerArray.Count })!;
                         foreach (var obj in innerArray)
                         {
                             var innerObj = Activator.CreateInstance(objType!);
-                            arrayResult[count] = ParseObject((JArray)obj, innerObj, objType!);
+                            arrayResult[count] = ParseObject((JArray)obj, innerObj!, objType!);
                             count++;
                         }
                         property.SetValue(result, arrayResult);
                     }
                     else
                     {
-                        var arrayResult = (IList)Activator.CreateInstance(property.PropertyType, new [] { 1 });
+                        var arrayResult = (IList)Activator.CreateInstance(property.PropertyType, new [] { 1 })!;
                         var innerObj = Activator.CreateInstance(objType!);
-                        arrayResult[0] = ParseObject(innerArray, innerObj, objType!);
+                        arrayResult[0] = ParseObject(innerArray, innerObj!, objType!);
                         property.SetValue(result, arrayResult);
                     }
                     continue;
@@ -88,7 +88,7 @@ namespace CryptoExchange.Net.Converters.JsonNet
                 object? value;
                 if (converterAttribute != null)
                 {
-                    value = arr[attribute.Index].ToObject(property.PropertyType, new JsonSerializer {Converters = {(JsonConverter) Activator.CreateInstance(converterAttribute.ConverterType)}});
+                    value = arr[attribute.Index].ToObject(property.PropertyType, new JsonSerializer {Converters = {(JsonConverter) Activator.CreateInstance(converterAttribute.ConverterType)!}});
                 }
                 else if (conversionAttribute != null)
                 {
@@ -120,7 +120,7 @@ namespace CryptoExchange.Net.Converters.JsonNet
                     }
                     else if ((property.PropertyType == typeof(decimal)
                      || property.PropertyType == typeof(decimal?))
-                     && (value != null && value.ToString().IndexOf("e", StringComparison.OrdinalIgnoreCase) >= 0))
+                     && (value != null && value.ToString()!.IndexOf("e", StringComparison.OrdinalIgnoreCase) >= 0))
                     {
                         var v = value.ToString();
                         if (decimal.TryParse(v, NumberStyles.Float, CultureInfo.InvariantCulture, out var dec))
@@ -164,7 +164,7 @@ namespace CryptoExchange.Net.Converters.JsonNet
                 last = arrayProp.Index;
                 var converterAttribute = GetCustomAttribute<JsonConverterAttribute>(prop);
                 if (converterAttribute != null)
-                    writer.WriteRawValue(JsonConvert.SerializeObject(prop.GetValue(value), (JsonConverter)Activator.CreateInstance(converterAttribute.ConverterType)));
+                    writer.WriteRawValue(JsonConvert.SerializeObject(prop.GetValue(value), (JsonConverter)Activator.CreateInstance(converterAttribute.ConverterType)!));
                 else if (!IsSimple(prop.PropertyType))
                     serializer.Serialize(writer, prop.GetValue(value));
                 else
@@ -187,9 +187,9 @@ namespace CryptoExchange.Net.Converters.JsonNet
         }
 
         private static T? GetCustomAttribute<T>(MemberInfo memberInfo) where T : Attribute =>
-            (T?)_attributeByMemberInfoAndTypeCache.GetOrAdd((memberInfo, typeof(T)), tuple => memberInfo.GetCustomAttribute(typeof(T)));
+            (T?)_attributeByMemberInfoAndTypeCache.GetOrAdd((memberInfo, typeof(T)), tuple => memberInfo.GetCustomAttribute(typeof(T))!);
 
         private static T? GetCustomAttribute<T>(Type type) where T : Attribute =>
-            (T?)_attributeByTypeAndTypeCache.GetOrAdd((type, typeof(T)), tuple => type.GetCustomAttribute(typeof(T)));
+            (T?)_attributeByTypeAndTypeCache.GetOrAdd((type, typeof(T)), tuple => type.GetCustomAttribute(typeof(T))!);
     }
 }

CryptoExchange.Net/Converters/JsonNet/BigDecimalConverter.cs

@@ -27,7 +27,7 @@ namespace CryptoExchange.Net.Converters.JsonNet
             {
                 try
                 {
-                    return decimal.Parse(reader.Value!.ToString(), NumberStyles.Float, CultureInfo.InvariantCulture);
+                    return decimal.Parse(reader.Value!.ToString()!, NumberStyles.Float, CultureInfo.InvariantCulture);
                 }
                 catch (OverflowException) 
                 {
@@ -40,7 +40,7 @@ namespace CryptoExchange.Net.Converters.JsonNet
             {
                 try
                 {
-                    var value = reader.Value!.ToString();
+                    var value = reader.Value!.ToString()!;
                     return decimal.Parse(value, NumberStyles.Float, CultureInfo.InvariantCulture);
                 }
                 catch (OverflowException)

CryptoExchange.Net/Converters/JsonNet/BoolConverter.cs

@@ -34,7 +34,7 @@ namespace CryptoExchange.Net.Converters.JsonNet
         /// </returns>
         public override object? ReadJson(JsonReader reader, Type objectType, object? existingValue, JsonSerializer serializer)
         {
-            var value = reader.Value?.ToString().ToLower().Trim();
+            var value = reader.Value?.ToString()!.ToLower().Trim();
             if (value == null || value == "")
             {
                 if (Nullable.GetUnderlyingType(objectType) != null)

CryptoExchange.Net/Converters/JsonNet/JsonNetMessageAccessor.cs

@@ -297,7 +297,7 @@ namespace CryptoExchange.Net.Converters.JsonNet
 
             // Try getting the underlying byte[] instead of the ToArray to prevent creating a copy
             using var stream = MemoryMarshal.TryGetArray(data, out var arraySegment)
-                ? new MemoryStream(arraySegment.Array, arraySegment.Offset, arraySegment.Count)
+                ? new MemoryStream(arraySegment.Array!, arraySegment.Offset, arraySegment.Count)
                 : new MemoryStream(data.ToArray());
             using var reader = new StreamReader(stream, Encoding.UTF8, false, Math.Max(2, data.Length), true);
             using var jsonTextReader = new JsonTextReader(reader);

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

@@ -23,7 +23,7 @@ namespace CryptoExchange.Net.Converters.SystemTextJson
         public override JsonConverter CreateConverter(Type typeToConvert, JsonSerializerOptions options)
         {
             Type converterType = typeof(ArrayConverterInner<>).MakeGenericType(typeToConvert);
-            return (JsonConverter)Activator.CreateInstance(converterType);
+            return (JsonConverter)Activator.CreateInstance(converterType)!;
         }
 
         private class ArrayPropertyInfo
@@ -79,7 +79,7 @@ namespace CryptoExchange.Net.Converters.SystemTextJson
                     JsonSerializerOptions? typeOptions = null;
                     if (prop.JsonConverterType != null)
                     {
-                        var converter = (JsonConverter)Activator.CreateInstance(prop.JsonConverterType);
+                        var converter = (JsonConverter)Activator.CreateInstance(prop.JsonConverterType)!;
                         typeOptions = new JsonSerializerOptions();
                         typeOptions.Converters.Clear();
                         typeOptions.Converters.Add(converter);
@@ -87,10 +87,14 @@ 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));
+                            writer.WriteRawValue(Convert.ToString(objValue, CultureInfo.InvariantCulture)!);
                     }
                     else
                     {
@@ -107,7 +111,7 @@ namespace CryptoExchange.Net.Converters.SystemTextJson
                 if (reader.TokenType == JsonTokenType.Null)
                     return default;
 
-                var result = Activator.CreateInstance(typeToConvert);
+                var result = Activator.CreateInstance(typeToConvert)!;
                 return (T)ParseObject(ref reader, result, typeToConvert, options);
             }
 
@@ -177,7 +181,7 @@ namespace CryptoExchange.Net.Converters.SystemTextJson
                         {
                             if (!_converterOptionsCache.TryGetValue(attribute.JsonConverterType, out var newOptions))
                             {
-                                var converter = (JsonConverter)Activator.CreateInstance(attribute.JsonConverterType);
+                                var converter = (JsonConverter)Activator.CreateInstance(attribute.JsonConverterType)!;
                                 newOptions = new JsonSerializerOptions
                                 {
                                     NumberHandling = SerializerOptions.WithConverters.NumberHandling,
@@ -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
                         {
@@ -209,7 +213,7 @@ namespace CryptoExchange.Net.Converters.SystemTextJson
                         }
 
                         if (targetType.IsAssignableFrom(value?.GetType()))
-                            attribute.PropertyInfo.SetValue(result, value == null ? null : value);
+                            attribute.PropertyInfo.SetValue(result, value);
                         else
                             attribute.PropertyInfo.SetValue(result, value == null ? null : Convert.ChangeType(value, targetType, CultureInfo.InvariantCulture));
                     }

CryptoExchange.Net/Converters/SystemTextJson/BigDecimalConverter.cs

@@ -17,7 +17,7 @@ namespace CryptoExchange.Net.Converters.SystemTextJson
             {
                 try
                 {
-                    return decimal.Parse(reader.GetString(), NumberStyles.Float, CultureInfo.InvariantCulture);
+                    return decimal.Parse(reader.GetString()!, NumberStyles.Float, CultureInfo.InvariantCulture);
                 }
                 catch(OverflowException)
                 {

CryptoExchange.Net/Converters/SystemTextJson/BoolConverter.cs

@@ -21,7 +21,7 @@ namespace CryptoExchange.Net.Converters.SystemTextJson
         public override JsonConverter CreateConverter(Type typeToConvert, JsonSerializerOptions options)
         {
             Type converterType = typeof(BoolConverterInner<>).MakeGenericType(typeToConvert);
-            return (JsonConverter)Activator.CreateInstance(converterType);
+            return (JsonConverter)Activator.CreateInstance(converterType)!;
         }
 
         private class BoolConverterInner<T> : JsonConverter<T>

CryptoExchange.Net/Converters/SystemTextJson/DateTimeConverter.cs

@@ -27,7 +27,7 @@ namespace CryptoExchange.Net.Converters.SystemTextJson
         public override JsonConverter CreateConverter(Type typeToConvert, JsonSerializerOptions options)
         {
             Type converterType = typeof(DateTimeConverterInner<>).MakeGenericType(typeToConvert);
-            return (JsonConverter)Activator.CreateInstance(converterType);
+            return (JsonConverter)Activator.CreateInstance(converterType)!;
         }
 
         private class DateTimeConverterInner<T> : JsonConverter<T>
@@ -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);
@@ -74,7 +74,9 @@ namespace CryptoExchange.Net.Converters.SystemTextJson
             public override void Write(Utf8JsonWriter writer, T value, JsonSerializerOptions options)
             {
                 if (value == null)
+                {
                     writer.WriteNullValue();
+                }
                 else
                 {
                     var dtValue = (DateTime)(object)value;

CryptoExchange.Net/Converters/SystemTextJson/EmptyArrayObjectConverter.cs

@@ -0,0 +1,37 @@
+using System;
+using System.Text.Json;
+using System.Text.Json.Serialization;
+
+namespace CryptoExchange.Net.Converters.SystemTextJson
+{
+    /// <summary>
+    /// Converter mapping to an object but also handles when an empty array is send
+    /// </summary>
+    /// <typeparam name="T"></typeparam>
+    public class EmptyArrayObjectConverter<T> : JsonConverter<T>
+    {
+        private static JsonSerializerOptions _defaultConverter = SerializerOptions.WithConverters;
+
+        /// <inheritdoc />
+        public override T? Read(
+            ref Utf8JsonReader reader,
+            Type typeToConvert,
+            JsonSerializerOptions options)
+        {
+            switch (reader.TokenType)
+            {
+                case JsonTokenType.StartArray:
+                    _ = JsonSerializer.Deserialize<object[]>(ref reader, options);
+                    return default;
+                case JsonTokenType.StartObject:
+                    return JsonSerializer.Deserialize<T>(ref reader, _defaultConverter);
+            };
+
+            return default;
+        }
+
+        /// <inheritdoc />
+        public override void Write(Utf8JsonWriter writer, T value, JsonSerializerOptions options)
+            => JsonSerializer.Serialize(writer, (object?)value, options);
+    }
+}

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/JsonConverterCtorAttribute.cs

@@ -0,0 +1,31 @@
+using System;
+using System.Text.Json.Serialization;
+
+namespace CryptoExchange.Net.Converters.SystemTextJson
+{
+    /// <summary>
+    /// Attribute for allowing specifying a JsonConverter with constructor parameters
+    /// </summary>
+    [AttributeUsage(AttributeTargets.Property)]
+    public class JsonConverterCtorAttribute : JsonConverterAttribute
+    {
+        private readonly object[] _parameters;
+        private readonly Type _type;
+
+        /// <summary>
+        /// ctor
+        /// </summary>
+        public JsonConverterCtorAttribute(Type type, params object[] parameters)
+        {
+            _type = type;
+            _parameters = parameters;
+        }
+
+        /// <inheritdoc />
+        public override JsonConverter CreateConverter(Type typeToConvert)
+        {
+            return (JsonConverter)Activator.CreateInstance(_type, _parameters)!;
+        }
+    }
+
+}

CryptoExchange.Net/Converters/SystemTextJson/ReplaceConverter.cs

@@ -0,0 +1,41 @@
+using System;
+using System.Linq;
+using System.Text.Json;
+using System.Text.Json.Serialization;
+
+namespace CryptoExchange.Net.Converters.SystemTextJson
+{
+    /// <summary>
+    /// Replace a value on a string property
+    /// </summary>
+    public class ReplaceConverter : JsonConverter<string>
+    {
+        private readonly (string ValueToReplace, string ValueToReplaceWith)[] _replacementSets;
+
+        /// <summary>
+        /// ctor
+        /// </summary>
+        public ReplaceConverter(params string[] replaceSets)
+        {
+            _replacementSets = replaceSets.Select(x =>
+            {
+                var split = x.Split(new string[] { "->" }, StringSplitOptions.None);
+                if (split.Length != 2)
+                    throw new ArgumentException("Invalid replacement config");
+                return (split[0], split[1]);
+            }).ToArray();
+        }
+
+        /// <inheritdoc />
+        public override string? Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
+        {
+            var value = reader.GetString();
+            foreach (var set in _replacementSets)
+                value = value?.Replace(set.ValueToReplace, set.ValueToReplaceWith);
+            return value;
+        }
+
+        /// <inheritdoc />
+        public override void Write(Utf8JsonWriter writer, string value, JsonSerializerOptions options) => writer.WriteStringValue(value);
+    }
+}

CryptoExchange.Net/Converters/SystemTextJson/SystemTextJsonMessageAccessor.cs

@@ -20,7 +20,8 @@ namespace CryptoExchange.Net.Converters.SystemTextJson
         /// </summary>
         protected JsonDocument? _document;
 
-        private static JsonSerializerOptions _serializerOptions = SerializerOptions.WithConverters;
+        private static readonly JsonSerializerOptions _serializerOptions = SerializerOptions.WithConverters;
+        private readonly JsonSerializerOptions? _customSerializerOptions;
 
         /// <inheritdoc />
         public bool IsJson { get; set; }
@@ -31,6 +32,21 @@ namespace CryptoExchange.Net.Converters.SystemTextJson
         /// <inheritdoc />
         public object? Underlying => throw new NotImplementedException();
 
+        /// <summary>
+        /// ctor
+        /// </summary>
+        public SystemTextJsonMessageAccessor()
+        {
+        }
+
+        /// <summary>
+        /// ctor
+        /// </summary>
+        public SystemTextJsonMessageAccessor(JsonSerializerOptions options)
+        {
+            _customSerializerOptions = options;
+        }
+
         /// <inheritdoc />
         public CallResult<object> Deserialize(Type type, MessagePath? path = null)
         {
@@ -42,7 +58,7 @@ namespace CryptoExchange.Net.Converters.SystemTextJson
 
             try
             {
-                var result = _document.Deserialize(type, _serializerOptions);
+                var result = _document.Deserialize(type, _customSerializerOptions ?? _serializerOptions);
                 return new CallResult<object>(result!);
             }
             catch (JsonException ex)
@@ -65,7 +81,7 @@ namespace CryptoExchange.Net.Converters.SystemTextJson
 
             try
             {
-                var result = _document.Deserialize<T>(_serializerOptions);
+                var result = _document.Deserialize<T>(_customSerializerOptions ?? _serializerOptions);
                 return new CallResult<T>(result!);
             }
             catch (JsonException ex)
@@ -129,9 +145,10 @@ namespace CryptoExchange.Net.Converters.SystemTextJson
             {
                 try
                 {
-                    return value.Value.Deserialize<T>(_serializerOptions);
+                    return value.Value.Deserialize<T>(_customSerializerOptions ?? _serializerOptions);
                 }
                 catch { }
+
                 return default;
             }
 
@@ -223,6 +240,20 @@ namespace CryptoExchange.Net.Converters.SystemTextJson
         /// <inheritdoc />
         public override bool OriginalDataAvailable => _stream?.CanSeek == true;
 
+        /// <summary>
+        /// ctor
+        /// </summary>
+        public SystemTextJsonStreamMessageAccessor(): base()
+        {
+        }
+
+        /// <summary>
+        /// ctor
+        /// </summary>
+        public SystemTextJsonStreamMessageAccessor(JsonSerializerOptions options): base(options)
+        {
+        }
+
         /// <inheritdoc />
         public async Task<CallResult> Read(Stream stream, bool bufferStream)
         {
@@ -286,6 +317,20 @@ namespace CryptoExchange.Net.Converters.SystemTextJson
     {
         private ReadOnlyMemory<byte> _bytes;
 
+        /// <summary>
+        /// ctor
+        /// </summary>
+        public SystemTextJsonByteMessageAccessor() : base()
+        {
+        }
+
+        /// <summary>
+        /// ctor
+        /// </summary>
+        public SystemTextJsonByteMessageAccessor(JsonSerializerOptions options) : base(options)
+        {
+        }
+
         /// <inheritdoc />
         public CallResult Read(ReadOnlyMemory<byte> data)
         {
@@ -315,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

@@ -1,14 +1,14 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TargetFrameworks>netstandard2.0;netstandard2.1</TargetFrameworks>
+    <TargetFrameworks>netstandard2.0;netstandard2.1;net9.0</TargetFrameworks>
   </PropertyGroup>
   <PropertyGroup>
     <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.4.0</PackageVersion>
+    <PackageVersion>8.8.0</PackageVersion>
-    <AssemblyVersion>8.4.0</AssemblyVersion>
+    <AssemblyVersion>8.8.0</AssemblyVersion>
-    <FileVersion>8.4.0</FileVersion>
+    <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>
@@ -20,7 +20,7 @@
     <GeneratePackageOnBuild>true</GeneratePackageOnBuild>
     <PackageReleaseNotes>https://github.com/JKorf/CryptoExchange.Net?tab=readme-ov-file#release-notes</PackageReleaseNotes>
     <Nullable>enable</Nullable>
-    <LangVersion>10.0</LangVersion>
+    <LangVersion>12.0</LangVersion>
     <PackageLicenseExpression>MIT</PackageLicenseExpression>
   </PropertyGroup>
   <ItemGroup>

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);
@@ -180,7 +180,7 @@ namespace CryptoExchange.Net
         {
             var randomChars = new char[length];
 
-#if NETSTANDARD2_1_OR_GREATER
+#if NETSTANDARD2_1_OR_GREATER || NET9_0_OR_GREATER
             for (int i = 0; i < length; i++)
                 randomChars[i] = _allowedRandomChars[RandomNumberGenerator.GetInt32(0, _allowedRandomChars.Length)];
 #else
@@ -261,6 +261,7 @@ namespace CryptoExchange.Net
             if (price != null)
             {
                 adjustedPrice = AdjustValueStep(0, decimal.MaxValue, symbol.PriceStep, RoundingType.Down, price.Value);
+                adjustedPrice = symbol.PriceSignificantFigures.HasValue ? RoundToSignificantDigits(adjustedPrice.Value, symbol.PriceSignificantFigures.Value, RoundingType.Closest) : adjustedPrice;
                 adjustedPrice = symbol.PriceDecimals.HasValue ? RoundDown(price.Value, symbol.PriceDecimals.Value) : adjustedPrice;
                 if (adjustedPrice != 0 && adjustedPrice * quantity < symbol.MinNotionalValue)
                 {

CryptoExchange.Net/ExtensionMethods.cs

@@ -67,7 +67,7 @@ namespace CryptoExchange.Net
             {
                 if (serializationType == ArrayParametersSerialization.Array)
                 {
-                    uriString += $"{string.Join("&", ((object[])(urlEncodeValues ? Uri.EscapeDataString(arrayEntry.Value.ToString()) : arrayEntry.Value)).Select(v => $"{arrayEntry.Key}[]={string.Format(CultureInfo.InvariantCulture, "{0}", v)}"))}&";
+                    uriString += $"{string.Join("&", ((object[])(urlEncodeValues ? Uri.EscapeDataString(arrayEntry.Value.ToString()!) : arrayEntry.Value)).Select(v => $"{arrayEntry.Key}[]={string.Format(CultureInfo.InvariantCulture, "{0}", v)}"))}&";
                 }
                 else if (serializationType == ArrayParametersSerialization.MultipleValues)
                 {
@@ -111,7 +111,8 @@ namespace CryptoExchange.Net
                     formData.Add(kvp.Key, string.Format(CultureInfo.InvariantCulture, "{0}", kvp.Value));
                 }
             }
-            return formData.ToString();
+
+            return formData.ToString()!;
         }
 
         /// <summary>
@@ -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);
 
@@ -366,7 +369,7 @@ namespace CryptoExchange.Net
         {
             using var decompressedStream = new MemoryStream();
             using var dataStream = MemoryMarshal.TryGetArray(data, out var arraySegment)
-                ? new MemoryStream(arraySegment.Array, arraySegment.Offset, arraySegment.Count)
+                ? new MemoryStream(arraySegment.Array!, arraySegment.Offset, arraySegment.Count)
                 : new MemoryStream(data.ToArray());
             using var deflateStream = new GZipStream(new MemoryStream(data.ToArray()), CompressionMode.Decompress);
             deflateStream.CopyTo(decompressedStream);
@@ -435,6 +438,8 @@ namespace CryptoExchange.Net
                 services.AddTransient(x => (IWithdrawalRestClient)client(x)!);
             if (typeof(IWithdrawRestClient).IsAssignableFrom(typeof(T)))
                 services.AddTransient(x => (IWithdrawRestClient)client(x)!);
+            if (typeof(IFeeRestClient).IsAssignableFrom(typeof(T)))
+                services.AddTransient(x => (IFeeRestClient)client(x)!);
 
             if (typeof(ISpotOrderRestClient).IsAssignableFrom(typeof(T)))
                 services.AddTransient(x => (ISpotOrderRestClient)client(x)!);

CryptoExchange.Net/Interfaces/IBaseApiClient.cs

@@ -1,5 +1,6 @@
 using CryptoExchange.Net.Authentication;
 using CryptoExchange.Net.Objects;
+using CryptoExchange.Net.Objects.Options;
 using CryptoExchange.Net.SharedApis;
 using System;
 
@@ -15,6 +16,11 @@ namespace CryptoExchange.Net.Interfaces
         /// </summary>
         string BaseAddress { get; }
 
+        /// <summary>
+        /// Whether or not API credentials have been configured for this client. Does not check the credentials are actually valid.
+        /// </summary>
+        bool Authenticated { get; }
+
         /// <summary>
         /// Format a base and quote asset to an exchange accepted symbol 
         /// </summary>
@@ -31,5 +37,12 @@ namespace CryptoExchange.Net.Interfaces
         /// <typeparam name="T"></typeparam>
         /// <param name="credentials"></param>
         void SetApiCredentials<T>(T credentials) where T : ApiCredentials;
+
+        /// <summary>
+        /// Set new options. Note that when using a proxy this should be provided in the options even when already set before or it will be reset.
+        /// </summary>
+        /// <typeparam name="T">Api credentials type</typeparam>
+        /// <param name="options">Options to set</param>
+        void SetOptions<T>(UpdateOptions<T> options) where T : ApiCredentials;
     }
 }

CryptoExchange.Net/Interfaces/IRequestFactory.cs

@@ -24,6 +24,13 @@ namespace CryptoExchange.Net.Interfaces
         /// <param name="requestTimeout">Request timeout to use</param>
         /// <param name="httpClient">Optional shared http client instance</param>
         /// <param name="proxy">Optional proxy to use when no http client is provided</param>
-        void Configure(ApiProxy? proxy, TimeSpan requestTimeout, HttpClient? httpClient=null);
+        void Configure(ApiProxy? proxy, TimeSpan requestTimeout, HttpClient? httpClient = null);
+
+        /// <summary>
+        /// Update settings
+        /// </summary>
+        /// <param name="proxy">Proxy to use</param>
+        /// <param name="requestTimeout">Request timeout to use</param>
+        void UpdateSettings(ApiProxy? proxy, TimeSpan requestTimeout);
     }
 }

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; }
 
@@ -93,5 +93,10 @@ namespace CryptoExchange.Net.Interfaces
         /// </summary>
         /// <returns></returns>
         Task CloseAsync();
+
+        /// <summary>
+        /// Update proxy setting
+        /// </summary>
+        void UpdateProxy(ApiProxy? proxy);
     }
 }

CryptoExchange.Net/LibraryHelpers.cs

@@ -0,0 +1,47 @@
+using System;
+using System.Collections.Generic;
+using System.Text;
+
+namespace CryptoExchange.Net
+{
+    /// <summary>
+    /// Helpers for client libraries
+    /// </summary>
+    public static class LibraryHelpers
+    {
+        /// <summary>
+        /// Client order id separator
+        /// </summary>
+        public const string ClientOrderIdSeparator = "JK";
+
+        /// <summary>
+        /// Apply broker id to a client order id
+        /// </summary>
+        /// <param name="clientOrderId"></param>
+        /// <param name="brokerId"></param>
+        /// <param name="maxLength"></param>
+        /// <param name="allowValueAdjustment"></param>
+        /// <returns></returns>
+        public static string ApplyBrokerId(string? clientOrderId, string brokerId, int maxLength, bool allowValueAdjustment)
+        {
+            var reservedLength = brokerId.Length + ClientOrderIdSeparator.Length;
+
+            if ((clientOrderId?.Length + reservedLength) > maxLength)
+                return clientOrderId!;
+
+            if (!string.IsNullOrEmpty(clientOrderId))
+            {
+                if (allowValueAdjustment)
+                    clientOrderId = brokerId + ClientOrderIdSeparator + clientOrderId;
+
+                return clientOrderId!;
+            }
+            else
+            {
+                clientOrderId = ExchangeHelpers.AppendRandomString(brokerId + ClientOrderIdSeparator, maxLength);
+            }
+
+            return clientOrderId;
+        }
+    }
+}

CryptoExchange.Net/Logging/Extensions/CryptoExchangeWebSocketClientLoggingExtension.cs

@@ -33,8 +33,9 @@ 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;
 
         static CryptoExchangeWebSocketClientLoggingExtension()
         {
@@ -168,8 +169,8 @@ 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.Debug,
+                LogLevel.Warning,
                 new EventId(1027, "NoDataReceiveTimeoutReconnect"),
                 "[Sckt {SocketId}] no data received for {Timeout}, reconnecting socket");
 
@@ -180,9 +181,14 @@ namespace CryptoExchange.Net.Logging.Extensions
 
             _socketProcessingStateChanged = LoggerMessage.Define<int, string, string>(
                 LogLevel.Trace,
-                new EventId(1028, "SocketProcessingStateChanged"),
+                new EventId(1029, "SocketProcessingStateChanged"),
                 "[Sckt {Id}] processing state change: {PreviousState} -> {NewState}");
 
+            _socketPingTimeout = LoggerMessage.Define<int>(
+                LogLevel.Warning,
+                new EventId(1030, "SocketPingTimeout"),
+                "[Sckt {Id}] ping frame timeout; reconnecting socket");
+
         }
 
         public static void SocketConnecting(
@@ -350,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(
@@ -358,5 +364,11 @@ namespace CryptoExchange.Net.Logging.Extensions
         {
             _socketProcessingStateChanged(logger, socketId, prevState, newState, null);
         }
+
+        public static void SocketPingTimeout(
+            this ILogger logger, int socketId)
+        {
+            _socketPingTimeout(logger, socketId, null);
+        }
     }
 }

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");
@@ -183,7 +183,7 @@ namespace CryptoExchange.Net.Logging.Extensions
             _sendingData = LoggerMessage.Define<int, int, string>(
                 LogLevel.Trace,
                 new EventId(2028, "SendingData"),
-                "[Sckt {SocketId}] [Req {RequestId}] sending messsage: {Data}");
+                "[Sckt {SocketId}] [Req {RequestId}] sending message: {Data}");
 
             _receivedMessageNotMatchedToAnyListener = LoggerMessage.Define<int, string, string>(
                 LogLevel.Warning,
@@ -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)
+                    if (_signaled)
-                        _signaled = false;
-                    return _completed;
-                }
-                else
-                {
-                    if (ct.IsCancellationRequested)
-                        return _completed;
-
-                    var tcs = new TaskCompletionSource<bool>(TaskCreationOptions.RunContinuationsAsynchronously);
-                    if (timeout.HasValue)
                     {
-                        var timeoutSource = new CancellationTokenSource(timeout.Value);
+                        if (_reset)
-                        var cancellationSource = CancellationTokenSource.CreateLinkedTokenSource(timeoutSource.Token, ct);
+                            _signaled = false;
-                        ct = cancellationSource.Token;
                     }
-
+                    else if (!ct.IsCancellationRequested)
-                    var registration = ct.Register(() =>
                     {
-                        lock (_waits)
+                        var tcs = new TaskCompletionSource<bool>(TaskCreationOptions.RunContinuationsAsynchronously);
+                        if (timeout.HasValue)
                         {
-                            tcs.TrySetResult(false);
+                            var timeoutSource = new CancellationTokenSource(timeout.Value);
-
+                            var cancellationSource = CancellationTokenSource.CreateLinkedTokenSource(timeoutSource.Token, ct);
-                            // Not the cleanest but it works
+                            ct = cancellationSource.Token;
-                            _waits = new Queue<TaskCompletionSource<bool>>(_waits.Where(i => i != tcs));
                         }
-                    }, useSynchronizationContext: false);
-                    
 
-                    _waits.Enqueue(tcs);
+                        registration = ct.Register(() =>
-                    return tcs.Task;
+                        {
+                            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/ByteOrderComparer.cs

@@ -14,7 +14,7 @@ namespace CryptoExchange.Net.Objects
         /// <param name="x"></param>
         /// <param name="y"></param>
         /// <returns></returns>
-        public int Compare(byte[] x, byte[] y)
+        public int Compare(byte[]? x, byte[]? y)
         {
             // Shortcuts: If both are null, they are the same.
             if (x == null && y == null) return 0;

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
     }
@@ -235,4 +237,18 @@
         Cache
     }
 
+    /// <summary>
+    /// Type of exchange
+    /// </summary>
+    public enum ExchangeType
+    {
+        /// <summary>
+        /// Centralized
+        /// </summary>
+        CEX,
+        /// <summary>
+        /// Decentralized
+        /// </summary>
+        DEX
+    }
 }

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/Options/UpdateOptions.cs

@@ -0,0 +1,29 @@
+using CryptoExchange.Net.Authentication;
+using System;
+using System.Collections.Generic;
+using System.Text;
+
+namespace CryptoExchange.Net.Objects.Options
+{
+    /// <summary>
+    /// Options to update
+    /// </summary>
+    public class UpdateOptions<T> where T : ApiCredentials
+    {
+        /// <summary>
+        /// Proxy setting. Note that if this is not provided any previously set proxy will be reset
+        /// </summary>
+        public ApiProxy? Proxy { get; set; }
+        /// <summary>
+        /// Api credentials
+        /// </summary>
+        public T? ApiCredentials { get; set; }
+        /// <summary>
+        /// Request timeout
+        /// </summary>
+        public TimeSpan? RequestTimeout { get; set; }
+    }
+
+    /// <inheritdoc />
+    public class UpdateOptions : UpdateOptions<ApiCredentials> { }
+}

CryptoExchange.Net/Objects/OrderedStringComparer.cs

@@ -13,7 +13,7 @@ namespace CryptoExchange.Net.Objects
         /// <param name="x"></param>
         /// <param name="y"></param>
         /// <returns></returns>
-        public int Compare(string x, string y)
+        public int Compare(string? x, string? y)
         {
             // Shortcuts: If both are null, they are the same.
             if (x == null && y == null) return 0;

CryptoExchange.Net/Objects/ParameterCollection.cs

@@ -156,7 +156,7 @@ namespace CryptoExchange.Net.Objects
         /// <param name="value"></param>
         public void AddSecondsString(string key, DateTime value)
         {
-            Add(key, DateTimeConverter.ConvertToSeconds(value).ToString());
+            Add(key, DateTimeConverter.ConvertToSeconds(value).ToString()!);
         }
 
         /// <summary>
@@ -167,7 +167,7 @@ namespace CryptoExchange.Net.Objects
         public void AddOptionalSecondsString(string key, DateTime? value)
         {
             if (value != null)
-                Add(key, DateTimeConverter.ConvertToSeconds(value).ToString());
+                Add(key, DateTimeConverter.ConvertToSeconds(value).ToString()!);
         }
 
         /// <summary>
@@ -187,7 +187,7 @@ namespace CryptoExchange.Net.Objects
         /// <param name="value"></param>
         public void AddEnumAsInt<T>(string key, T value)
         {
-            var stringVal = EnumConverter.GetString(value);
+            var stringVal = EnumConverter.GetString(value)!;
             Add(key, int.Parse(stringVal)!);
         }
 

CryptoExchange.Net/Objects/RequestDefinition.cs

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

CryptoExchange.Net/Objects/RequestDefinitionCache.cs

@@ -58,9 +58,38 @@ namespace CryptoExchange.Net.Objects
             HttpMethodParameterPosition? parameterPosition = null,
             ArrayParametersSerialization? arraySerialization = null,
             bool? preventCaching = null)
+            => GetOrCreate(method + path, method, path, rateLimitGate, weight, authenticated, limitGuard, requestBodyFormat, parameterPosition, arraySerialization, preventCaching);
+
+        /// <summary>
+        /// Get a definition if it is already in the cache or create a new definition and add it to the cache
+        /// </summary>
+        /// <param name="identifier">Request identifier</param>
+        /// <param name="method">The HttpMethod</param>
+        /// <param name="path">Endpoint path</param>
+        /// <param name="rateLimitGate">The rate limit gate</param>
+        /// <param name="limitGuard">The rate limit guard for this specific endpoint</param>
+        /// <param name="weight">Request weight</param>
+        /// <param name="authenticated">Endpoint is authenticated</param>
+        /// <param name="requestBodyFormat">Request body format</param>
+        /// <param name="parameterPosition">Parameter position</param>
+        /// <param name="arraySerialization">Array serialization type</param>
+        /// <param name="preventCaching">Prevent request caching</param>
+        /// <returns></returns>
+        public RequestDefinition GetOrCreate(
+            string identifier,
+            HttpMethod method,
+            string path,
+            IRateLimitGate? rateLimitGate,
+            int weight,
+            bool authenticated,
+            IRateLimitGuard? limitGuard = null,
+            RequestBodyFormat? requestBodyFormat = null,
+            HttpMethodParameterPosition? parameterPosition = null,
+            ArrayParametersSerialization? arraySerialization = null,
+            bool? preventCaching = null)
         {
 
-            if (!_definitions.TryGetValue(method + path, out var def))
+            if (!_definitions.TryGetValue(identifier, out var def))
             {
                 def = new RequestDefinition(path, method)
                 {
@@ -73,7 +102,7 @@ namespace CryptoExchange.Net.Objects
                     ParameterPosition = parameterPosition,
                     PreventCaching = preventCaching ?? false
                 };
-                _definitions.TryAdd(method + path, def);
+                _definitions.TryAdd(identifier, def);
             }
 
             return def;

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/TimeSyncState.cs

@@ -82,12 +82,12 @@ namespace CryptoExchange.Net.Objects
             TimeSyncState.LastSyncTime = DateTime.UtcNow;
             if (offset.TotalMilliseconds > 0 && offset.TotalMilliseconds < 500)
             {
-                Logger.Log(LogLevel.Information, $"{TimeSyncState.ApiName} Time offset within limits, set offset to 0ms");
+                Logger.Log(LogLevel.Information, "{TimeSyncState.ApiName} Time offset within limits, set offset to 0ms", TimeSyncState.ApiName);
                 TimeSyncState.TimeOffset = TimeSpan.Zero;
             }
             else
             {
-                Logger.Log(LogLevel.Information, $"{TimeSyncState.ApiName} Time offset set to {Math.Round(offset.TotalMilliseconds)}ms");
+                Logger.Log(LogLevel.Information, "{TimeSyncState.ApiName} Time offset set to {Offset}ms", TimeSyncState.ApiName, Math.Round(offset.TotalMilliseconds));
                 TimeSyncState.TimeOffset = offset;
             }
         }

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 
+        /// 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
-        /// 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)
@@ -843,9 +845,9 @@ namespace CryptoExchange.Net.OrderBook
 
     internal class DescComparer<T> : IComparer<T>
     {
-        public int Compare(T x, T y)
+        public int Compare(T? x, T? y)
         {
-            return Comparer<T>.Default.Compare(y, x);
+            return Comparer<T>.Default.Compare(y!, x!);
         }
     }
 }

CryptoExchange.Net/RateLimiting/Guards/RateLimitGuard.cs

@@ -20,7 +20,7 @@ namespace CryptoExchange.Net.RateLimiting.Guards
         /// <summary>
         /// Apply guard per connection
         /// </summary>
-        public static Func<RequestDefinition, string, string?, string> PerConnection { get; } = new Func<RequestDefinition, string, string?, string>((def, host, key) => def.ConnectionId.ToString());
+        public static Func<RequestDefinition, string, string?, string> PerConnection { get; } = new Func<RequestDefinition, string, string?, string>((def, host, key) => def.ConnectionId.ToString()!);
         /// <summary>
         /// Apply guard per API key
         /// </summary>
@@ -32,9 +32,9 @@ namespace CryptoExchange.Net.RateLimiting.Guards
 
         private readonly IEnumerable<IGuardFilter> _filters;
         private readonly Dictionary<string, IWindowTracker> _trackers;
-        private RateLimitWindowType _windowType;
+        private readonly RateLimitWindowType _windowType;
-        private double? _decayRate;
+        private readonly double? _decayRate;
-        private int? _connectionWeight;
+        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
@@ -68,8 +69,10 @@ namespace CryptoExchange.Net.RateLimiting.Interfaces
         /// <param name="baseAddress">The host address</param>
         /// <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, 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)
             {
@@ -69,7 +69,9 @@ namespace CryptoExchange.Net.RateLimiting
             RequestDefinition definition, 
             string host,
             string? apiKey,
+             int requestWeight,
             RateLimitingBehaviour rateLimitingBehaviour,
+            string? keySuffix,
             CancellationToken ct)
         {
             await _semaphore.WaitAsync(ct).ConfigureAwait(false);
@@ -77,7 +79,7 @@ namespace CryptoExchange.Net.RateLimiting
             _waitingCount++;
             try
             {
-                return await CheckGuardsAsync(new IRateLimitGuard[] { guard }, logger, itemId, type, definition, host, apiKey, 1, rateLimitingBehaviour, ct).ConfigureAwait(false);
+                return await CheckGuardsAsync(new IRateLimitGuard[] { guard }, logger, itemId, type, definition, host, apiKey, requestWeight, rateLimitingBehaviour, keySuffix, ct).ConfigureAwait(false);
             }
             catch (TaskCanceledException)
             {
@@ -93,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
@@ -125,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/Request.cs

@@ -48,7 +48,7 @@ namespace CryptoExchange.Net.Requests
         }
 
         /// <inheritdoc />
-        public Uri Uri => _request.RequestUri;
+        public Uri Uri => _request.RequestUri!;
 
         /// <inheritdoc />
         public int RequestId { get; }

CryptoExchange.Net/Requests/RequestFactory.cs

@@ -17,28 +17,7 @@ namespace CryptoExchange.Net.Requests
         public void Configure(ApiProxy? proxy, TimeSpan requestTimeout, HttpClient? client = null)
         {
             if (client == null)
-            {
+                client = CreateClient(proxy, requestTimeout);
-                var handler = new HttpClientHandler();
-                try
-                {
-                    handler.AutomaticDecompression = DecompressionMethods.GZip | DecompressionMethods.Deflate;
-                }
-                catch (PlatformNotSupportedException) { }
-
-                if (proxy != null)
-                {
-                    handler.Proxy = new WebProxy
-                    {
-                        Address = new Uri($"{proxy.Host}:{proxy.Port}"),
-                        Credentials = proxy.Password == null ? null : new NetworkCredential(proxy.Login, proxy.Password)
-                    };
-                }
-
-                client = new HttpClient(handler)
-                {
-                    Timeout = requestTimeout
-                };
-            }
 
             _httpClient = client;
         }
@@ -51,5 +30,38 @@ namespace CryptoExchange.Net.Requests
 
             return new Request(new HttpRequestMessage(method, uri), _httpClient, requestId);
         }
+
+        /// <inheritdoc />
+        public void UpdateSettings(ApiProxy? proxy, TimeSpan requestTimeout)
+        {
+            _httpClient = CreateClient(proxy, requestTimeout);
+        }
+
+        private static HttpClient CreateClient(ApiProxy? proxy, TimeSpan requestTimeout)
+        {
+            var handler = new HttpClientHandler();
+            try
+            {
+                handler.AutomaticDecompression = DecompressionMethods.GZip | DecompressionMethods.Deflate;
+                handler.DefaultProxyCredentials = CredentialCache.DefaultCredentials;
+            }
+            catch (PlatformNotSupportedException) { }
+            catch (NotImplementedException) { } // Mono runtime throws NotImplementedException
+
+            if (proxy != null)
+            {
+                handler.Proxy = new WebProxy
+                {
+                    Address = new Uri($"{proxy.Host}:{proxy.Port}"),
+                    Credentials = proxy.Password == null ? null : new NetworkCredential(proxy.Login, proxy.Password)
+                };
+            }
+
+            var client = new HttpClient(handler)
+            {
+                Timeout = requestTimeout
+            };
+            return client;
+        }
     }
 }

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/EndpointOptions.cs

@@ -60,8 +60,8 @@ namespace CryptoExchange.Net.SharedApis
                 }
                 else
                 {
-                    if (param.Names.All(x => ExchangeParameters.HasValue(exchangeParameters, exchange, x, param.ValueType) != true))
+                    if (param.Names!.All(x => ExchangeParameters.HasValue(exchangeParameters, exchange, x, param.ValueType) != true))
-                        return new ArgumentError($"One of exchange parameters `{string.Join(", ", param.Names)}` for exchange `{exchange}` should be provided. Example: {param.ExampleValue}");
+                        return new ArgumentError($"One of exchange parameters `{string.Join(", ", param.Names!)}` for exchange `{exchange}` should be provided. Example: {param.ExampleValue}");
                 }
             }
 
@@ -113,13 +113,13 @@ namespace CryptoExchange.Net.SharedApis
             {
                 if (!string.IsNullOrEmpty(param.Name))
                 {
-                    if (typeof(T).GetProperty(param.Name).GetValue(request, null) == null)
+                    if (typeof(T).GetProperty(param.Name)!.GetValue(request, null) == null)
                         return new ArgumentError($"Required optional parameter `{param.Name}` for exchange `{exchange}` is missing. Example: {param.ExampleValue}");
                 }
                 else
                 {
-                    if (param.Names.All(x => typeof(T).GetProperty(param.Name).GetValue(request, null) == null))
+                    if (param.Names!.All(x => typeof(T).GetProperty(param.Name!)!.GetValue(request, null) == null))
-                        return new ArgumentError($"One of optional parameters `{string.Join(", ", param.Names)}` for exchange `{exchange}` should be provided. Example: {param.ExampleValue}");
+                        return new ArgumentError($"One of optional parameters `{string.Join(", ", param.Names!)}` for exchange `{exchange}` should be provided. Example: {param.ExampleValue}");
                 }
 
             }

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/Endpoints/GetOrderBookOptions.cs

@@ -64,7 +64,7 @@ namespace CryptoExchange.Net.SharedApis
         public override string ToString(string exchange)
         {
             var sb = new StringBuilder(base.ToString(exchange));
-            sb.AppendLine($"Supported limit values: [{(SupportedLimits == null ? string.Join(", ", SupportedLimits) : $"{MinLimit}..{MaxLimit}")}]");
+            sb.AppendLine($"Supported limit values: [{(SupportedLimits != null ? string.Join(", ", SupportedLimits) : $"{MinLimit}..{MaxLimit}")}]");
             return sb.ToString();
         }
     }

CryptoExchange.Net/SharedApis/Models/Options/ParameterDescription.cs

@@ -55,7 +55,7 @@ namespace CryptoExchange.Net.SharedApis
         {
             if (Name != null)
                 return $"[{ValueType.Name}] {Name}: {Description} | example: {ExampleValue}";
-            return $"[{ValueType.Name}] {string.Join(" / ", Names)}: {Description} | example: {ExampleValue}";
+            return $"[{ValueType.Name}] {string.Join(" / ", Names!)}: {Description} | example: {ExampleValue}";
         }
     }
 }

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/ResponseModels/SharedSpotSymbol.cs

@@ -46,6 +46,10 @@
         /// </summary>
         public int? PriceDecimals { get; set; }
         /// <summary>
+        /// The max amount of significant figures to use for price. For example with value of 5 these values are valid: 0.00001, 0.12300, 123.53, 12345, but this is not: 12345.1
+        /// </summary>
+        public int? PriceSignificantFigures { get; set; }
+        /// <summary>
         /// Whether the symbol is currently available for trading
         /// </summary>
         public bool Trading { get; set; }

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,12 +152,19 @@ 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();
             _baseAddress = $"{Uri.Scheme}://{Uri.Host}";
         }
 
+        /// <inheritdoc />
+        public void UpdateProxy(ApiProxy? proxy)
+        {
+            Parameters.Proxy = proxy;
+        }
+
         /// <inheritdoc />
         public virtual async Task<CallResult> ConnectAsync()
         {
@@ -189,9 +199,12 @@ namespace CryptoExchange.Net.Sockets
                     socket.Options.SetBuffer(_receiveBufferSize, _sendBufferSize);
                 if (Parameters.Proxy != null)
                     SetProxy(socket, Parameters.Proxy);
-                #if NET6_0_OR_GREATER
+#if NET6_0_OR_GREATER
                 socket.Options.CollectHttpResponseDetails = true;
-                #endif
+#endif
+#if NET9_0_OR_GREATER
+                socket.Options.KeepAliveTimeout = TimeSpan.FromSeconds(10);
+#endif
             }
             catch (PlatformNotSupportedException)
             {
@@ -210,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"));
                 }
@@ -229,13 +242,13 @@ namespace CryptoExchange.Net.Sockets
 
                 if (e is WebSocketException we)
                 {
-                    #if (NET6_0_OR_GREATER)
+#if (NET6_0_OR_GREATER)
                     if (_socket.HttpStatusCode == HttpStatusCode.TooManyRequests)
                     {
                         await (OnConnectRateLimited?.Invoke() ?? Task.CompletedTask).ConfigureAwait(false);
                         return new CallResult(new ServerRateLimitError(we.Message));
                     }
-                    #else
+#else
                     // ClientWebSocket.HttpStatusCode is only available in .NET6+ https://learn.microsoft.com/en-us/dotnet/api/system.net.websockets.clientwebsocket.httpstatuscode?view=net-8.0
                     // Try to read 429 from the message instead
                     if (we.Message.Contains("429"))
@@ -243,7 +256,7 @@ namespace CryptoExchange.Net.Sockets
                         await (OnConnectRateLimited?.Invoke() ?? Task.CompletedTask).ConfigureAwait(false);
                         return new CallResult(new ServerRateLimitError(we.Message));
                     }
-                    #endif
+#endif
                 }
 
                 return new CallResult(new CantConnectError());
@@ -287,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);
 
@@ -435,8 +448,8 @@ namespace CryptoExchange.Net.Sockets
                     {
                         // Wait until we receive close confirmation
                         await Task.Delay(10).ConfigureAwait(false);
-                        if (DateTime.UtcNow - startWait > TimeSpan.FromSeconds(5))
+                        if (DateTime.UtcNow - startWait > TimeSpan.FromSeconds(1))
-                            break; // Wait for max 5 seconds, then just abort the connection
+                            break; // Wait for max 1 second, then just abort the connection
                     }
                 }
             }
@@ -482,7 +495,7 @@ namespace CryptoExchange.Net.Sockets
                 {
                     try
                     {
-                        if (!_sendBuffer.Any())
+                        if (_sendBuffer.IsEmpty)
                             await _sendEvent.WaitAsync(ct: _ctsSource.Token).ConfigureAwait(false);
                     }
                     catch (OperationCanceledException)
@@ -499,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);
@@ -557,8 +570,8 @@ namespace CryptoExchange.Net.Sockets
         /// <returns></returns>
         private async Task ReceiveLoopAsync()
         {
-            var buffer = new ArraySegment<byte>(new byte[_receiveBufferSize]);
+            byte[] rentedBuffer = _receiveBufferPool.Rent(_receiveBufferSize);
-            var received = 0;
+            var buffer = new ArraySegment<byte>(rentedBuffer);
             try
             {
                 while (true)
@@ -574,19 +587,30 @@ 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)
+                        catch (OperationCanceledException ex)
                         {
+                            if (ex.InnerException?.InnerException?.Message.Contains("KeepAliveTimeout") == true)
+                            {
+                                // 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);
+                            }
+
+                            if (_closeTask?.IsCompleted != false)
+                                _closeTask = CloseInternalAsync();
+
                             // canceled
                             break;
                         }
                         catch (Exception wse)
                         {
-                            // Connection closed unexpectedly
+                            if (!_ctsSource.Token.IsCancellationRequested && !_stopRequested)
-                            await (OnError?.Invoke(wse) ?? Task.CompletedTask).ConfigureAwait(false);
+                                // Connection closed unexpectedly
+                                await (OnError?.Invoke(wse) ?? Task.CompletedTask).ConfigureAwait(false);
+
                             if (_closeTask?.IsCompleted != false)
                                 _closeTask = CloseInternalAsync();
                             break;
@@ -598,14 +622,14 @@ namespace CryptoExchange.Net.Sockets
                             if (_socket.State == WebSocketState.CloseReceived)
                             {
                                 // Close received means it server initiated, we should send a confirmation and close the socket
-                                _logger.SocketReceivedCloseMessage(Id, receiveResult.CloseStatus.ToString(), receiveResult.CloseStatusDescription);
+                                _logger.SocketReceivedCloseMessage(Id, receiveResult.CloseStatus.ToString()!, receiveResult.CloseStatusDescription ?? string.Empty);
                                 if (_closeTask?.IsCompleted != false)
                                     _closeTask = CloseInternalAsync();
                             }
                             else
                             {
                                 // Means the socket is now closed and we were the one initiating it
-                                _logger.SocketReceivedCloseConfirmation(Id, receiveResult.CloseStatus.ToString(), receiveResult.CloseStatusDescription);
+                                _logger.SocketReceivedCloseConfirmation(Id, receiveResult.CloseStatus.ToString()!, receiveResult.CloseStatusDescription ?? string.Empty);
                             }
 
                             break;
@@ -620,7 +644,7 @@ namespace CryptoExchange.Net.Sockets
                             // Write the data to a memory stream to be reassembled later
                             if (multipartStream == null)
                                 multipartStream = new MemoryStream();
-                            multipartStream.Write(buffer.Array, buffer.Offset, receiveResult.Count);
+                            multipartStream.Write(buffer.Array!, buffer.Offset, receiveResult.Count);
                         }
                         else
                         {
@@ -628,13 +652,13 @@ 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
                             {
                                 // Received the end of a multipart message, write to memory stream for reassembling
                                 _logger.SocketReceivedPartialMessage(Id, receiveResult.Count);
-                                multipartStream!.Write(buffer.Array, buffer.Offset, receiveResult.Count);
+                                multipartStream!.Write(buffer.Array!, buffer.Offset, receiveResult.Count);
                             }
 
                             break;
@@ -658,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
@@ -684,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>
@@ -721,6 +746,7 @@ namespace CryptoExchange.Net.Sockets
                         _ = ReconnectAsync().ConfigureAwait(false);
                         return;
                     }
+
                     try
                     {
                         await Task.Delay(500, _ctsSource.Token).ConfigureAwait(false);

CryptoExchange.Net/Sockets/PeriodicTaskRegistration.cs

@@ -23,6 +23,6 @@ namespace CryptoExchange.Net.Sockets
         /// <summary>
         /// Callback after query
         /// </summary>
-        public Action<CallResult>? Callback { get; set; }
+        public Action<SocketConnection, CallResult>? Callback { get; set; }
     }
 }

CryptoExchange.Net/Sockets/Query.cs

@@ -23,6 +23,11 @@ namespace CryptoExchange.Net.Sockets
         /// </summary>
         public bool Completed { get; set; }
 
+        /// <summary>
+        /// Timeout for the request
+        /// </summary>
+        public TimeSpan? RequestTimeout { get; set; }
+
         /// <summary>
         /// The number of required responses. Can be more than 1 when for example subscribing multiple symbols streams in a single request,
         /// and each symbol receives it's own confirmation response

CryptoExchange.Net/Sockets/SocketConnection.cs

@@ -11,6 +11,8 @@ using System.Diagnostics;
 using CryptoExchange.Net.Clients;
 using CryptoExchange.Net.Logging.Extensions;
 using System.Threading;
+using CryptoExchange.Net.Objects.Options;
+using CryptoExchange.Net.Authentication;
 
 namespace CryptoExchange.Net.Sockets
 {
@@ -141,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; }
         
@@ -212,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;
 
@@ -284,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);
                 }
             }
@@ -309,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);
                 }
             }
@@ -338,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);
                 }
             }
@@ -367,7 +369,7 @@ namespace CryptoExchange.Net.Sockets
                 }
                 catch(Exception ex)
                 {
-                    _logger.UnkownExceptionWhileProcessingReconnection(SocketId, ex);
+                    _logger.UnknownExceptionWhileProcessingReconnection(SocketId, ex);
                     _ = _socket.ReconnectAsync().ConfigureAwait(false);
                 }
             });
@@ -390,13 +392,13 @@ 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>
         protected virtual Task HandleRequestRateLimitedAsync(int requestId)
         {
-            Query query;
+            Query? query;
             lock (_listenersLock)
             {
                 query = _listeners.OfType<Query>().FirstOrDefault(x => x.Id == requestId);
@@ -425,7 +427,7 @@ namespace CryptoExchange.Net.Sockets
         /// <param name="requestId">Id of the request sent</param>
         protected virtual Task HandleRequestSentAsync(int requestId)
         {
-            Query query;
+            Query? query;
             lock (_listenersLock)
             {
                 query = _listeners.OfType<Query>().FirstOrDefault(x => x.Id == requestId);
@@ -437,7 +439,7 @@ namespace CryptoExchange.Net.Sockets
                 return Task.CompletedTask;
             }
 
-            query.IsSend(ApiClient.ClientOptions.RequestTimeout);
+            query.IsSend(query.RequestTimeout ?? ApiClient.ClientOptions.RequestTimeout);
             return Task.CompletedTask;
         }
 
@@ -583,6 +585,16 @@ namespace CryptoExchange.Net.Sockets
         /// <returns></returns>
         public async Task TriggerReconnectAsync() => await _socket.ReconnectAsync().ConfigureAwait(false);
 
+        /// <summary>
+        /// Update the proxy setting and reconnect
+        /// </summary>
+        /// <param name="proxy">New proxy setting</param>
+        public async Task UpdateProxy(ApiProxy? proxy)
+        {
+            _socket.UpdateProxy(proxy);
+            await TriggerReconnectAsync().ConfigureAwait(false);
+        }
+
         /// <summary>
         /// Close the connection
         /// </summary>
@@ -988,7 +1000,7 @@ namespace CryptoExchange.Net.Sockets
         /// <param name="interval">How often</param>
         /// <param name="queryDelegate">Method returning the query to send</param>
         /// <param name="callback">The callback for processing the response</param>
-        public virtual void QueryPeriodic(string identifier, TimeSpan interval, Func<SocketConnection, Query> queryDelegate, Action<CallResult>? callback)
+        public virtual void QueryPeriodic(string identifier, TimeSpan interval, Func<SocketConnection, Query> queryDelegate, Action<SocketConnection, CallResult>? callback)
         {
             if (queryDelegate == null)
                 throw new ArgumentNullException(nameof(queryDelegate));
@@ -1020,7 +1032,7 @@ namespace CryptoExchange.Net.Sockets
                     try
                     {
                         var result = await SendAndWaitQueryAsync(query).ConfigureAwait(false);
-                        callback?.Invoke(result);
+                        callback?.Invoke(this, result);
                     }
                     catch (Exception ex)
                     {

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)))
@@ -378,7 +378,7 @@ namespace CryptoExchange.Net.Testing.Comparers
                 if (objectValue is bool boolVal && jsonValue.Value<bool>() != boolVal)
                     throw new Exception($"{method}: {property} not equal: {jsonValue.Value<bool>()} vs {(bool)objectValue}");
 
-                if (jsonValue.Value<bool>() != bool.Parse(objectValue.ToString()))
+                if (jsonValue.Value<bool>() != bool.Parse(objectValue.ToString()!))
                     throw new Exception($"{method}: {property} not equal: {jsonValue.Value<bool>()} vs {(bool)objectValue}");
             }
         }

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)))
@@ -211,7 +211,7 @@ namespace CryptoExchange.Net.Testing.Comparers
 
                     if (dictProp.Value.Type == JTokenType.Object)
                     {
-                        CheckPropertyValue(method, dictProp.Value, dict[dictProp.Name]!, dict[dictProp.Name].GetType(), null, null, ignoreProperties);
+                        CheckPropertyValue(method, dictProp.Value, dict[dictProp.Name]!, dict[dictProp.Name]!.GetType(), null, null, ignoreProperties);
                     }
                     else
                     {
@@ -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)
+                        if (value == default && ((JValue)jToken).Type != JTokenType.Null)
-                            throw new Exception($"{method}: Property `{propertyName}` has no value while input json `{propName}` has value {jtoken}");
+                            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/EnumValueTraceListener.cs

@@ -5,8 +5,11 @@ namespace CryptoExchange.Net.Testing
 {
     internal class EnumValueTraceListener : TraceListener
     {
-        public override void Write(string message)
+        public override void Write(string? message)
         {
+            if (message == null)
+                return;
+
             if (message.Contains("Cannot map"))
                 throw new Exception("Enum value error: " + message);
 
@@ -14,8 +17,11 @@ namespace CryptoExchange.Net.Testing
                 throw new Exception("Enum null error: " + message);
         }
 
-        public override void WriteLine(string message)
+        public override void WriteLine(string? message)
         {
+            if (message == null)
+                return;
+
             if (message.Contains("Cannot map"))
                 throw new Exception("Enum value error: " + message);
 

CryptoExchange.Net/Testing/Implementations/TestRequestFactory.cs

@@ -25,5 +25,7 @@ namespace CryptoExchange.Net.Testing.Implementations
             _request.RequestId = requestId;
             return _request;
         }
+
+        public void UpdateSettings(ApiProxy? proxy, TimeSpan requestTimeout) {}
     }
 }

CryptoExchange.Net/Testing/Implementations/TestSocket.cs

@@ -92,5 +92,7 @@ namespace CryptoExchange.Net.Testing.Implementations
 
         public Task ReconnectAsync() => throw new NotImplementedException();
         public void Dispose() { }
+
+        public void UpdateProxy(ApiProxy? proxy) => throw new NotImplementedException();
     }
 }

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/Testing/TestHelpers.cs

@@ -150,9 +150,9 @@ namespace CryptoExchange.Net.Testing
         /// </summary>
         /// <typeparam name="TClient"></typeparam>
         /// <exception cref="Exception"></exception>
-        public static void CheckForMissingRestInterfaces<TClient>()
+        public static void CheckForMissingRestInterfaces<TClient>(string[]? excludeInterfaces = null)
         {
-            CheckForMissingInterfaces(typeof(TClient), typeof(Task));
+            CheckForMissingInterfaces(typeof(TClient), typeof(Task), excludeInterfaces);
         }
 
         /// <summary>
@@ -160,28 +160,32 @@ namespace CryptoExchange.Net.Testing
         /// </summary>
         /// <typeparam name="TClient"></typeparam>
         /// <exception cref="Exception"></exception>
-        public static void CheckForMissingSocketInterfaces<TClient>()
+        public static void CheckForMissingSocketInterfaces<TClient>(string[]? excludeInterfaces = null)
         {
-            CheckForMissingInterfaces(typeof(TClient), typeof(Task<CallResult<UpdateSubscription>>));
+            CheckForMissingInterfaces(typeof(TClient), typeof(Task<CallResult<UpdateSubscription>>), excludeInterfaces);
         }
 
-        private static void CheckForMissingInterfaces(Type clientType, Type implementationTypes)
+        private static void CheckForMissingInterfaces(Type clientType, Type implementationTypes, string[]? excludeInterfaces = null)
         {
             var assembly = Assembly.GetAssembly(clientType);
             var interfaceType = clientType.GetInterface("I" + clientType.Name);
-            var clientInterfaces = assembly.GetTypes().Where(t => t.Name.StartsWith("I" + clientType.Name) && !t.Name.EndsWith("Shared"));
+            var clientInterfaces = assembly!.GetTypes()
+                .Where(t => t.Name.StartsWith("I" + clientType.Name)
+                        && !t.Name.EndsWith("Shared")
+                        && (excludeInterfaces?.Contains(t.Name) != true));
 
             foreach (var clientInterface in clientInterfaces)
             {
-                var implementations = assembly.GetTypes().Where(t => clientInterface.IsAssignableFrom(t) && t != clientInterface);
+                var implementations = assembly.GetTypes().Where(t => clientInterface.IsAssignableFrom(t) && !t.IsInterface && t != clientInterface);
                 foreach (var implementation in implementations)
                 {
                     int methods = 0;
                     foreach (var method in implementation.GetMethods().Where(m => implementationTypes.IsAssignableFrom(m.ReturnType)))
                     {
-                        var interfaceMethod = clientInterface.GetMethod(method.Name, method.GetParameters().Select(p => p.ParameterType).ToArray());
+                        var interfaceMethod = 
-                        if (interfaceMethod == null)
+                            clientInterface.GetMethod(method.Name, method.GetParameters().Select(p => p.ParameterType).ToArray())
-                            throw new Exception($"Missing interface for method {method.Name} in {implementation.Name} implementing interface {clientInterface.Name}");
+                            ?? clientInterface.GetInterfaces().Select(x => x.GetMethod(method.Name, method.GetParameters().Select(p => p.ParameterType).ToArray())).FirstOrDefault()
+                            ?? throw new Exception($"Missing interface for method {method.Name} in {implementation.Name} implementing interface {clientInterface.Name}");
                         methods++;
                     }
 

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/Klines/KlineTracker.cs

@@ -23,7 +23,7 @@ namespace CryptoExchange.Net.Trackers.Klines
         /// <summary>
         /// The internal data structure
         /// </summary>
-        protected readonly Dictionary<DateTime, SharedKline> _data = new Dictionary<DateTime, SharedKline>();
+        protected readonly SortedDictionary<DateTime, SharedKline> _data = new SortedDictionary<DateTime, SharedKline>();
         /// <summary>
         /// The pre-snapshot queue buffering updates received before the snapshot is set and which will be applied after the snapshot was set
         /// </summary>

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,8 @@ namespace CryptoExchange.Net.Trackers.Trades
                     _data.Add(item);
                 }
 
-                _firstTimestamp = _data.Min(v => v.Timestamp);
+                if (_data.Count != 0)
+                    _firstTimestamp = _data.Min(v => v.Timestamp);
 
                 ApplyWindow(false);
             }
@@ -430,7 +431,6 @@ namespace CryptoExchange.Net.Trackers.Trades
                 SetSyncStatus();
         }
 
-
         private void HandleConnectionLost()
         {
             _logger.TradeTrackerConnectionLost(SymbolName);