.

CryptoExchange.Net.Protobuf/Converters/Protobuf/ProtobufMessageAccessor.cs

@@ -285,7 +285,7 @@ namespace CryptoExchange.Net.Converters.Protobuf
             }
             catch (Exception ex)
             {
-                return new CallResult<object>(new DeserializeError(ex.Message));
+                return new CallResult<object>(new DeserializeError("Protobuf deserialization failed: " + ex.Message, ex));
             }
         }
 
@@ -320,7 +320,7 @@ namespace CryptoExchange.Net.Converters.Protobuf
             }
             catch(Exception ex)
             {
-                return new CallResult<T>(new DeserializeError(ex.ToLogString()));
+                return new CallResult<T>(new DeserializeError("Protobuf deserialization failed: " + ex.Message, ex));
             }
         }
 
@@ -354,7 +354,7 @@ namespace CryptoExchange.Net.Converters.Protobuf
             {
                 // Not a json message
                 IsValid = false;
-                return Task.FromResult(new CallResult(new DeserializeError("ProtoBufError: " + ex.Message, ex)));
+                return Task.FromResult(new CallResult(new DeserializeError("Protobuf deserialization failed: " + ex.Message, ex)));
             }
         }
 
@@ -446,7 +446,7 @@ namespace CryptoExchange.Net.Converters.Protobuf
             }
             catch (Exception ex)
             {
-                return new CallResult<object>(new DeserializeError(ex.ToLogString()));
+                return new CallResult<object>(new DeserializeError("Protobuf deserialization failed: " + ex.Message, ex));
             }
         }
 
@@ -485,7 +485,7 @@ namespace CryptoExchange.Net.Converters.Protobuf
             }
             catch (Exception ex)
             {
-                return new CallResult<T>(new DeserializeError(ex.Message));
+                return new CallResult<T>(new DeserializeError("Protobuf deserialization failed: " + ex.Message, ex));
             }
         }
 
@@ -504,7 +504,7 @@ namespace CryptoExchange.Net.Converters.Protobuf
             {
                 // Not a json message
                 IsValid = false;
-                return new CallResult(new DeserializeError("ProtobufError: " + ex.Message, ex));
+                return new CallResult(new DeserializeError("Protobuf deserialization failed: " + ex.Message, ex));
             }
         }
 

CryptoExchange.Net.Protobuf/CryptoExchange.Net.Protobuf.csproj

@@ -6,9 +6,9 @@
     <PackageId>CryptoExchange.Net.Protobuf</PackageId>
     <Authors>JKorf</Authors>
     <Description>Protobuf support for CryptoExchange.Net</Description>
-    <PackageVersion>9.3.0</PackageVersion>
-    <AssemblyVersion>9.3.0</AssemblyVersion>
-    <FileVersion>9.3.0</FileVersion>
+    <PackageVersion>9.6.0</PackageVersion>
+    <AssemblyVersion>9.6.0</AssemblyVersion>
+    <FileVersion>9.6.0</FileVersion>
     <PackageRequireLicenseAcceptance>false</PackageRequireLicenseAcceptance>
     <PackageTags>CryptoExchange;CryptoExchange.Net</PackageTags>
     <RepositoryType>git</RepositoryType>
@@ -41,7 +41,7 @@
     <DocumentationFile>CryptoExchange.Net.Protobuf.xml</DocumentationFile>
   </PropertyGroup>
   <ItemGroup>
-    <PackageReference Include="CryptoExchange.Net" Version="9.3.0" />
-    <PackageReference Include="protobuf-net" Version="3.2.52" />
+    <PackageReference Include="CryptoExchange.Net" Version="9.6.0" />
+    <PackageReference Include="protobuf-net" Version="3.2.56" />
   </ItemGroup>
 </Project>

CryptoExchange.Net.Protobuf/README.md

@@ -5,6 +5,16 @@
 Protobuf support for CryptoExchange.Net.
 
 ## Release notes
+* Version 9.6.0 - 25 Aug 2025
+    * Updated CryptoExchange.Net version to 9.6.0
+
+* Version 9.5.0 - 19 Aug 2025
+    * Updated CryptoExchange.Net version to 9.5.0
+
+* Version 9.4.0 - 04 Aug 2025
+    * Updated CryptoExchange.Net to version 9.4.0, see https://github.com/JKorf/CryptoExchange.Net/releases/
+    * Updated protobuf-net package version to 3.2.56
+
 * Version 9.3.0 - 23 Jul 2025
     * Updated CryptoExchange.Net to version 9.3.0, see https://github.com/JKorf/CryptoExchange.Net/releases/
 

CryptoExchange.Net.UnitTests/CallResultTests.cs

@@ -1,4 +1,5 @@
 using CryptoExchange.Net.Objects;
+using CryptoExchange.Net.Objects.Errors;
 using NUnit.Framework;
 using NUnit.Framework.Legacy;
 using System;
@@ -16,9 +17,9 @@ namespace CryptoExchange.Net.UnitTests
         [Test]
         public void TestBasicErrorCallResult()
         {
-            var result = new CallResult(new ServerError("TestError"));
+            var result = new CallResult(new ServerError("TestError", ErrorInfo.Unknown));
 
-            ClassicAssert.AreSame(result.Error.Message, "TestError");
+            ClassicAssert.AreSame(result.Error.ErrorCode, "TestError");
             ClassicAssert.IsFalse(result);
             ClassicAssert.IsFalse(result.Success);
         }
@@ -36,9 +37,9 @@ namespace CryptoExchange.Net.UnitTests
         [Test]
         public void TestCallResultError()
         {
-            var result = new CallResult<object>(new ServerError("TestError"));
+            var result = new CallResult<object>(new ServerError("TestError", ErrorInfo.Unknown));
 
-            ClassicAssert.AreSame(result.Error.Message, "TestError");
+            ClassicAssert.AreSame(result.Error.ErrorCode, "TestError");
             ClassicAssert.IsNull(result.Data);
             ClassicAssert.IsFalse(result);
             ClassicAssert.IsFalse(result.Success);
@@ -71,11 +72,11 @@ namespace CryptoExchange.Net.UnitTests
         [Test]
         public void TestCallResultErrorAs()
         {
-            var result = new CallResult<TestObjectResult>(new ServerError("TestError"));
+            var result = new CallResult<TestObjectResult>(new ServerError("TestError", ErrorInfo.Unknown));
             var asResult = result.As<TestObject2>(default);
 
             ClassicAssert.IsNotNull(asResult.Error);
-            ClassicAssert.AreSame(asResult.Error.Message, "TestError");
+            ClassicAssert.AreSame(asResult.Error.ErrorCode, "TestError");
             ClassicAssert.IsNull(asResult.Data);
             ClassicAssert.IsFalse(asResult);
             ClassicAssert.IsFalse(asResult.Success);
@@ -84,11 +85,11 @@ namespace CryptoExchange.Net.UnitTests
         [Test]
         public void TestCallResultErrorAsError()
         {
-            var result = new CallResult<TestObjectResult>(new ServerError("TestError"));
-            var asResult = result.AsError<TestObject2>(new ServerError("TestError2"));
+            var result = new CallResult<TestObjectResult>(new ServerError("TestError", ErrorInfo.Unknown));
+            var asResult = result.AsError<TestObject2>(new ServerError("TestError2", ErrorInfo.Unknown));
 
             ClassicAssert.IsNotNull(asResult.Error);
-            ClassicAssert.AreSame(asResult.Error.Message, "TestError2");
+            ClassicAssert.AreSame(asResult.Error.ErrorCode, "TestError2");
             ClassicAssert.IsNull(asResult.Data);
             ClassicAssert.IsFalse(asResult);
             ClassicAssert.IsFalse(asResult.Success);
@@ -97,11 +98,11 @@ namespace CryptoExchange.Net.UnitTests
         [Test]
         public void TestWebCallResultErrorAsError()
         {
-            var result = new WebCallResult<TestObjectResult>(new ServerError("TestError"));
-            var asResult = result.AsError<TestObject2>(new ServerError("TestError2"));
+            var result = new WebCallResult<TestObjectResult>(new ServerError("TestError", ErrorInfo.Unknown));
+            var asResult = result.AsError<TestObject2>(new ServerError("TestError2", ErrorInfo.Unknown));
 
             ClassicAssert.IsNotNull(asResult.Error);
-            ClassicAssert.AreSame(asResult.Error.Message, "TestError2");
+            ClassicAssert.AreSame(asResult.Error.ErrorCode, "TestError2");
             ClassicAssert.IsNull(asResult.Data);
             ClassicAssert.IsFalse(asResult);
             ClassicAssert.IsFalse(asResult.Success);
@@ -124,10 +125,10 @@ namespace CryptoExchange.Net.UnitTests
                 ResultDataSource.Server,
                 new TestObjectResult(),
                 null);
-            var asResult = result.AsError<TestObject2>(new ServerError("TestError2"));
+            var asResult = result.AsError<TestObject2>(new ServerError("TestError2", ErrorInfo.Unknown));
 
             ClassicAssert.IsNotNull(asResult.Error);
-            Assert.That(asResult.Error.Message == "TestError2");
+            Assert.That(asResult.Error.ErrorCode == "TestError2");
             Assert.That(asResult.ResponseStatusCode == System.Net.HttpStatusCode.OK);
             Assert.That(asResult.ResponseTime == TimeSpan.FromSeconds(1));
             Assert.That(asResult.RequestUrl == "https://test.com/api");

CryptoExchange.Net.UnitTests/CryptoExchange.Net.UnitTests.csproj

@@ -5,6 +5,10 @@
     <IsPackable>false</IsPackable>
   </PropertyGroup>
 
+  <ItemGroup>
+    <None Include="..\CryptoExchange.Net\.editorconfig" Link=".editorconfig" />
+  </ItemGroup>
+
   <ItemGroup>
     <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.14.1"></PackageReference>
     <PackageReference Include="Moq" Version="4.20.72" />

CryptoExchange.Net.UnitTests/RestClientTests.cs

@@ -96,7 +96,7 @@ namespace CryptoExchange.Net.UnitTests
             ClassicAssert.IsFalse(result.Success);
             Assert.That(result.Error != null);
             Assert.That(result.Error is ServerError);
-            Assert.That(result.Error.Code == 123);
+            Assert.That(result.Error.ErrorCode == "123");
             Assert.That(result.Error.Message == "Invalid request");
         }
 
@@ -182,7 +182,7 @@ namespace CryptoExchange.Net.UnitTests
         [TestCase("/sapi/test1", true)]
         [TestCase("/sapi/test2", true)]
         [TestCase("/api/test1", false)]
-        [TestCase("sapi/test1", false)]
+        [TestCase("sapi/test1", true)]
         [TestCase("/sapi/", true)]
         public async Task PartialEndpointRateLimiterEndpoints(string endpoint, bool expectLimiting)
         {

CryptoExchange.Net.UnitTests/TestImplementations/Sockets/TestChannelQuery.cs

@@ -1,4 +1,5 @@
 using CryptoExchange.Net.Objects;
+using CryptoExchange.Net.Objects.Errors;
 using CryptoExchange.Net.Objects.Sockets;
 using CryptoExchange.Net.Sockets;
 using System;
@@ -40,7 +41,7 @@ namespace CryptoExchange.Net.UnitTests.TestImplementations.Sockets
         {
             if (!message.Data.Status.Equals("confirmed", StringComparison.OrdinalIgnoreCase))
             {
-                return new CallResult<SubResponse>(new ServerError(message.Data.Status));
+                return new CallResult<SubResponse>(new ServerError(ErrorInfo.Unknown with { Message = message.Data.Status }));
             }
 
             return message.ToCallResult();

CryptoExchange.Net.UnitTests/TestImplementations/Sockets/TestSubscription.cs

@@ -28,7 +28,7 @@ namespace CryptoExchange.Net.UnitTests.TestImplementations.Sockets
             return new CallResult(null);
         }
 
-        public override Query GetSubQuery(SocketConnection connection) => new TestQuery("sub", new object(), false, 1);
-        public override Query GetUnsubQuery() => new TestQuery("unsub", new object(), false, 1);
+        protected override Query GetSubQuery(SocketConnection connection) => new TestQuery("sub", new object(), false, 1);
+        protected override Query GetUnsubQuery(SocketConnection connection) => new TestQuery("unsub", new object(), false, 1);
     }
 }

CryptoExchange.Net.UnitTests/TestImplementations/Sockets/TestSubscriptionWithResponseCheck.cs

@@ -28,7 +28,7 @@ namespace CryptoExchange.Net.UnitTests.TestImplementations.Sockets
             return new CallResult(null);
         }
 
-        public override Query GetSubQuery(SocketConnection connection) => new TestChannelQuery(_channel, "subscribe", false, 1);
-        public override Query GetUnsubQuery() => new TestChannelQuery(_channel, "unsubscribe", false, 1);
+        protected override Query GetSubQuery(SocketConnection connection) => new TestChannelQuery(_channel, "subscribe", false, 1);
+        protected override Query GetUnsubQuery(SocketConnection connection) => new TestChannelQuery(_channel, "unsubscribe", false, 1);
     }
 }

CryptoExchange.Net.UnitTests/TestImplementations/TestBaseClient.cs

@@ -10,6 +10,7 @@ using CryptoExchange.Net.Clients;
 using CryptoExchange.Net.Converters.SystemTextJson;
 using CryptoExchange.Net.Interfaces;
 using CryptoExchange.Net.Objects;
+using CryptoExchange.Net.Objects.Errors;
 using CryptoExchange.Net.Objects.Options;
 using CryptoExchange.Net.SharedApis;
 using CryptoExchange.Net.UnitTests.TestImplementations;
@@ -55,7 +56,7 @@ namespace CryptoExchange.Net.UnitTests
             var accessor = CreateAccessor();
             var valid = accessor.Read(stream, true).Result;
             if (!valid)
-                return new CallResult<T>(new ServerError(data));
+                return new CallResult<T>(new ServerError(ErrorInfo.Unknown with { Message = data }));
             
             var deserializeResult = accessor.Deserialize<T>();
             return deserializeResult;
@@ -77,7 +78,7 @@ namespace CryptoExchange.Net.UnitTests
         {
         }
 
-        public override void AuthenticateRequest(RestApiClient apiClient, Uri uri, HttpMethod method, ref IDictionary<string, object> uriParams, ref IDictionary<string, object> bodyParams, ref Dictionary<string, string> headers, bool auth, ArrayParametersSerialization arraySerialization, HttpMethodParameterPosition parameterPosition, RequestBodyFormat bodyFormat)
+        public override void ProcessRequest(RestApiClient apiClient, RestRequestConfiguration requestConfig)
         {
         }
         

CryptoExchange.Net.UnitTests/TestImplementations/TestRestClient.cs

@@ -18,6 +18,7 @@ using Microsoft.Extensions.Options;
 using System.Linq;
 using CryptoExchange.Net.Converters.SystemTextJson;
 using System.Text.Json.Serialization;
+using CryptoExchange.Net.Objects.Errors;
 
 namespace CryptoExchange.Net.UnitTests.TestImplementations
 {
@@ -197,7 +198,7 @@ namespace CryptoExchange.Net.UnitTests.TestImplementations
         {
             var errorData = accessor.Deserialize<TestError>();
 
-            return new ServerError(errorData.Data.ErrorCode, errorData.Data.ErrorMessage);
+            return new ServerError(errorData.Data.ErrorCode, GetErrorInfo(errorData.Data.ErrorCode, errorData.Data.ErrorMessage));
         }
 
         public override TimeSpan? GetTimeOffset()

CryptoExchange.Net.UnitTests/TestImplementations/TestSocket.cs

@@ -1,132 +0,0 @@
-//using System;
-//using System.IO;
-//using System.Net.WebSockets;
-//using System.Security.Authentication;
-//using System.Text;
-//using System.Threading.Tasks;
-//using CryptoExchange.Net.Interfaces;
-//using CryptoExchange.Net.Objects;
-
-//namespace CryptoExchange.Net.UnitTests.TestImplementations
-//{
-//    public class TestSocket: IWebsocket
-//    {
-//        public bool CanConnect { get; set; }
-//        public bool Connected { get; set; }
-
-//        public event Func<Task> OnClose;
-//#pragma warning disable 0067
-//        public event Func<Task> OnReconnected;
-//        public event Func<Task> OnReconnecting;
-//        public event Func<int, Task> OnRequestRateLimited;
-//#pragma warning restore 0067
-//        public event Func<int, Task> OnRequestSent;
-//        public event Func<WebSocketMessageType, ReadOnlyMemory<byte>, Task> OnStreamMessage;
-//        public event Func<Exception, Task> OnError;
-//        public event Func<Task> OnOpen;
-//        public Func<Task<Uri>> GetReconnectionUrl { get; set; }
-
-//        public int Id { get; }
-//        public bool ShouldReconnect { get; set; }
-//        public TimeSpan Timeout { get; set; }
-//        public Func<string, string> DataInterpreterString { get; set; }
-//        public Func<byte[], string> DataInterpreterBytes { get; set; }
-//        public DateTime? DisconnectTime { get; set; }
-//        public string Url { get; }
-//        public bool IsClosed => !Connected;
-//        public bool IsOpen => Connected;
-//        public bool PingConnection { get; set; }
-//        public TimeSpan PingInterval { get; set; }
-//        public SslProtocols SSLProtocols { get; set; }
-//        public Encoding Encoding { get; set; }
-
-//        public int ConnectCalls { get; private set; }
-//        public bool Reconnecting { get; set; }
-//        public string Origin { get; set; }
-//        public int? RatelimitPerSecond { get; set; }
-
-//        public double IncomingKbps => throw new NotImplementedException();
-
-//        public Uri Uri => new Uri("");
-
-//        public TimeSpan KeepAliveInterval { get; set; }
-
-//        public static int lastId = 0;
-//        public static object lastIdLock = new object();
-
-//        public TestSocket()
-//        {
-//            lock (lastIdLock)
-//            {
-//                Id = lastId + 1;
-//                lastId++;
-//            }
-//        }
-
-//        public Task<CallResult> ConnectAsync()
-//        {
-//            Connected = CanConnect;
-//            ConnectCalls++;
-//            if (CanConnect)
-//                InvokeOpen();
-//            return Task.FromResult(CanConnect ? new CallResult(null) : new CallResult(new CantConnectError()));
-//        }
-
-//        public bool Send(int requestId, string data, int weight)
-//        {
-//            if(!Connected)
-//                throw new Exception("Socket not connected");
-//            OnRequestSent?.Invoke(requestId);
-//            return true;
-//        }
-
-//        public void Reset()
-//        {
-//        }
-
-//        public Task CloseAsync()
-//        {
-//            Connected = false;
-//            DisconnectTime = DateTime.UtcNow;
-//            OnClose?.Invoke();
-//            return Task.FromResult(0);
-//        }
-
-//        public void SetProxy(string host, int port)
-//        {
-//            throw new NotImplementedException();
-//        }
-//        public void Dispose()
-//        {
-//        }
-
-//        public void InvokeClose()
-//        {
-//            Connected = false;
-//            DisconnectTime = DateTime.UtcNow;
-//            Reconnecting = true;
-//            OnClose?.Invoke();
-//        }
-
-//        public void InvokeOpen()
-//        {
-//            OnOpen?.Invoke();
-//        }
-
-//        public void InvokeMessage(string data)
-//        {
-//            OnStreamMessage?.Invoke(WebSocketMessageType.Text, new ReadOnlyMemory<byte>(Encoding.UTF8.GetBytes(data))).Wait();
-//        }
-
-//        public void SetProxy(ApiProxy proxy)
-//        {
-//            throw new NotImplementedException();
-//        }
-
-//        public void InvokeError(Exception error)
-//        {
-//            OnError?.Invoke(error);
-//        }
-//        public Task ReconnectAsync() => Task.CompletedTask;
-//    }
-//}

CryptoExchange.Net/.editorconfig

@@ -0,0 +1,183 @@
+root = true
+
+[*]
+
+# Indentation and spacing
+indent_style = space
+indent_size = 4
+trim_trailing_whitespace = true
+charset = utf-8
+max_line_length = 140
+insert_final_newline = true
+
+# ReSharper code style properties
+resharper_csharp_keep_existing_embedded_arrangement = false
+resharper_csharp_place_accessorholder_attribute_on_same_line = false
+resharper_csharp_wrap_after_declaration_lpar = true
+resharper_csharp_wrap_parameters_style = chop_if_long
+resharper_csharp_blank_lines_around_single_line_auto_property = 1
+resharper_csharp_keep_blank_lines_in_declarations = 1
+resharper_trailing_comma_in_multiline_lists = true
+
+[*.cs]
+
+indent_size = 4
+
+# Code style conventions
+dotnet_style_predefined_type_for_member_access = true:suggestion
+dotnet_style_collection_initializer = true:suggestion
+dotnet_style_object_initializer = true:suggestion
+csharp_style_var_when_type_is_apparent = true:suggestion
+csharp_style_expression_bodied_methods = true:suggestion
+csharp_style_namespace_declarations = file_scoped:warning
+dotnet_style_coalesce_expression = true:suggestion
+dotnet_style_null_propagation = true:suggestion
+dotnet_style_prefer_is_null_check_over_reference_equality_method = true:suggestion
+dotnet_style_prefer_simplified_boolean_expressions = true:suggestion
+csharp_prefer_braces = when_multiline:warning
+
+# Analyzer preferences
+dotnet_diagnostic.CA2007.severity = warning # Call ConfigureAwait on the awaited Task.
+dotnet_code_quality.CA2007.exclude_async_void_methods = true
+dotnet_code_quality.CA2007.output_kind = DynamicallyLinkedLibrary
+
+dotnet_diagnostic.CA1000.severity = none # Do not declare static members on generic types
+dotnet_diagnostic.CA1051.severity = none # Do not declare visible instance fields
+dotnet_diagnostic.CA1510.severity = none # Use ArgumentNullException throw helper
+dotnet_diagnostic.CA1720.severity = none # Identifiers should not contain type names
+dotnet_diagnostic.CA1716.severity = none # Identifiers should not match keywords
+dotnet_diagnostic.CA1835.severity = none # Use ArgumentNullException throw helper
+dotnet_diagnostic.CA1846.severity = none # Prefer AsSpan over Substring
+dotnet_diagnostic.CA1848.severity = none # Use the LoggerMessage delegates
+dotnet_diagnostic.CA1850.severity = none # Prefer static HashData method over ComputeHash
+dotnet_diagnostic.CA1866.severity = none # Use 'string.Method(char)' instead of 'string.Method(string)' for string with single char
+dotnet_diagnostic.CA2201.severity = none # Do not raise reserved exception types
+dotnet_diagnostic.CA2208.severity = none # Do not raise reserved exception types
+dotnet_diagnostic.IDE0005.severity = warning # Using directive is unnecessary
+
+[*.xml]
+ij_xml_space_inside_empty_tag = true
+[*.cs]
+#### Naming styles ####
+
+# Naming rules
+
+dotnet_naming_rule.interface_should_be_begins_with_i.severity = warning
+dotnet_naming_rule.interface_should_be_begins_with_i.symbols = interface
+dotnet_naming_rule.interface_should_be_begins_with_i.style = begins_with_i
+
+dotnet_naming_rule.non_field_members_should_be_pascal_case.severity = warning
+dotnet_naming_rule.non_field_members_should_be_pascal_case.symbols = non_field_members
+dotnet_naming_rule.non_field_members_should_be_pascal_case.style = pascal_case
+
+dotnet_naming_rule.private_or_internal_field_should_be_fields_start_with__.severity = warning
+dotnet_naming_rule.private_or_internal_field_should_be_fields_start_with__.symbols = private_or_internal_field
+dotnet_naming_rule.private_or_internal_field_should_be_fields_start_with__.style = fields_start_with__
+
+# Symbol specifications
+
+dotnet_naming_symbols.interface.applicable_kinds = interface
+dotnet_naming_symbols.interface.applicable_accessibilities = public, internal, private, protected, protected_internal, private_protected
+dotnet_naming_symbols.interface.required_modifiers = 
+
+dotnet_naming_symbols.non_field_members.applicable_kinds = property, event, method
+dotnet_naming_symbols.non_field_members.applicable_accessibilities = public, internal, private, protected, protected_internal, private_protected
+dotnet_naming_symbols.non_field_members.required_modifiers = 
+
+dotnet_naming_symbols.private_or_internal_field.applicable_kinds = field
+dotnet_naming_symbols.private_or_internal_field.applicable_accessibilities = internal, private, private_protected
+dotnet_naming_symbols.private_or_internal_field.required_modifiers = 
+
+# Naming styles
+
+dotnet_naming_style.begins_with_i.required_prefix = I
+dotnet_naming_style.begins_with_i.required_suffix = 
+dotnet_naming_style.begins_with_i.word_separator = 
+dotnet_naming_style.begins_with_i.capitalization = pascal_case
+
+dotnet_naming_style.pascal_case.required_prefix = 
+dotnet_naming_style.pascal_case.required_suffix = 
+dotnet_naming_style.pascal_case.word_separator = 
+dotnet_naming_style.pascal_case.capitalization = pascal_case
+
+dotnet_naming_style.fields_start_with__.required_prefix = _
+dotnet_naming_style.fields_start_with__.required_suffix = 
+dotnet_naming_style.fields_start_with__.word_separator = 
+dotnet_naming_style.fields_start_with__.capitalization = camel_case
+csharp_indent_labels = one_less_than_current
+csharp_using_directive_placement = outside_namespace:suggestion
+csharp_prefer_simple_using_statement = true:suggestion
+csharp_style_prefer_method_group_conversion = true:silent
+csharp_style_prefer_top_level_statements = true:silent
+csharp_style_prefer_primary_constructors = true:suggestion
+csharp_prefer_system_threading_lock = true:suggestion
+csharp_style_expression_bodied_constructors = false:silent
+csharp_style_expression_bodied_operators = false:silent
+csharp_style_expression_bodied_properties = true:suggestion
+csharp_style_expression_bodied_indexers = true:suggestion
+csharp_style_expression_bodied_accessors = true:suggestion
+csharp_style_expression_bodied_lambdas = true:silent
+csharp_style_expression_bodied_local_functions = true:silent
+
+[*.vb]
+#### Naming styles ####
+
+# Naming rules
+
+dotnet_naming_rule.interface_should_be_begins_with_i.severity = suggestion
+dotnet_naming_rule.interface_should_be_begins_with_i.symbols = interface
+dotnet_naming_rule.interface_should_be_begins_with_i.style = begins_with_i
+
+dotnet_naming_rule.non_field_members_should_be_pascal_case.severity = suggestion
+dotnet_naming_rule.non_field_members_should_be_pascal_case.symbols = non_field_members
+dotnet_naming_rule.non_field_members_should_be_pascal_case.style = pascal_case
+
+# Symbol specifications
+
+dotnet_naming_symbols.interface.applicable_kinds = interface
+dotnet_naming_symbols.interface.applicable_accessibilities = public, friend, private, protected, protected_friend, private_protected
+dotnet_naming_symbols.interface.required_modifiers = 
+
+dotnet_naming_symbols.non_field_members.applicable_kinds = property, event, method
+dotnet_naming_symbols.non_field_members.applicable_accessibilities = public, friend, private, protected, protected_friend, private_protected
+dotnet_naming_symbols.non_field_members.required_modifiers = 
+
+# Naming styles
+
+dotnet_naming_style.begins_with_i.required_prefix = I
+dotnet_naming_style.begins_with_i.required_suffix = 
+dotnet_naming_style.begins_with_i.word_separator = 
+dotnet_naming_style.begins_with_i.capitalization = pascal_case
+
+dotnet_naming_style.pascal_case.required_prefix = 
+dotnet_naming_style.pascal_case.required_suffix = 
+dotnet_naming_style.pascal_case.word_separator = 
+dotnet_naming_style.pascal_case.capitalization = pascal_case
+
+[*.{cs,vb}]
+#### Naming styles ####
+
+# Naming rules
+
+dotnet_naming_rule.types_should_be_pascal_case.severity = suggestion
+dotnet_naming_rule.types_should_be_pascal_case.symbols = types
+dotnet_naming_rule.types_should_be_pascal_case.style = pascal_case
+
+# Symbol specifications
+
+dotnet_naming_symbols.types.applicable_kinds = class, struct, interface, enum
+dotnet_naming_symbols.types.applicable_accessibilities = public, internal, private, protected, protected_internal, private_protected
+dotnet_naming_symbols.types.required_modifiers = 
+
+# Naming styles
+
+dotnet_naming_style.pascal_case.required_prefix = 
+dotnet_naming_style.pascal_case.required_suffix = 
+dotnet_naming_style.pascal_case.word_separator = 
+dotnet_naming_style.pascal_case.capitalization = pascal_case
+dotnet_style_operator_placement_when_wrapping = beginning_of_line
+tab_width = 4
+end_of_line = crlf
+dotnet_style_coalesce_expression = true:suggestion
+dotnet_style_null_propagation = true:suggestion
+dotnet_style_prefer_is_null_check_over_reference_equality_method = true:suggestion

CryptoExchange.Net/AssemblyInfo.cs

@@ -1,6 +1,5 @@
-[assembly: System.Runtime.CompilerServices.InternalsVisibleTo("CryptoExchange.Net.UnitTests")]
+[assembly: System.Runtime.CompilerServices.InternalsVisibleTo("CryptoExchange.Net.UnitTests")]
+
+namespace System.Runtime.CompilerServices;
 
-namespace System.Runtime.CompilerServices
-{
 internal static class IsExternalInit { }
-}

CryptoExchange.Net/Attributes/JsonConversionAttribute.cs

@@ -1,7 +1,7 @@
-using System;
+using System;
+
+namespace CryptoExchange.Net.Attributes;
 
-namespace CryptoExchange.Net.Attributes
-{
 /// <summary>
 /// Used for conversion in ArrayConverter
 /// </summary>
@@ -9,4 +9,3 @@ namespace CryptoExchange.Net.Attributes
 public class JsonConversionAttribute: Attribute
 {
 }
-}

CryptoExchange.Net/Attributes/MapAttribute.cs

@@ -1,7 +1,7 @@
-using System;
+using System;
+
+namespace CryptoExchange.Net.Attributes;
 
-namespace CryptoExchange.Net.Attributes
-{
 /// <summary>
 /// Map a enum entry to string values
 /// </summary>
@@ -22,4 +22,3 @@ namespace CryptoExchange.Net.Attributes
         Values = maps;
     }
 }
-}

CryptoExchange.Net/Authentication/ApiCredentials.cs

@@ -1,10 +1,7 @@
-using System;
-using System.IO;
-using CryptoExchange.Net.Converters.SystemTextJson;
-using CryptoExchange.Net.Converters.MessageParsing;
+using System;
+
+namespace CryptoExchange.Net.Authentication;
 
-namespace CryptoExchange.Net.Authentication
-{
 /// <summary>
 /// Api credentials, used to sign requests accessing private endpoints
 /// </summary>
@@ -57,4 +54,3 @@ namespace CryptoExchange.Net.Authentication
         return new ApiCredentials(Key, Secret, Pass, CredentialType);
     }
 }
-}

CryptoExchange.Net/Authentication/ApiCredentialsType.cs

@@ -1,5 +1,5 @@
-namespace CryptoExchange.Net.Authentication
-{
+namespace CryptoExchange.Net.Authentication;
+
 /// <summary>
 /// Credentials type
 /// </summary>
@@ -18,4 +18,3 @@
     /// </summary>
     RsaPem
 }
-}

CryptoExchange.Net/Authentication/AuthenticationProvider.cs

@@ -1,16 +1,15 @@
-using CryptoExchange.Net.Clients;
+using CryptoExchange.Net.Clients;
 using CryptoExchange.Net.Converters.SystemTextJson;
 using CryptoExchange.Net.Interfaces;
 using CryptoExchange.Net.Objects;
 using System;
 using System.Collections.Generic;
 using System.Globalization;
-using System.Net.Http;
 using System.Security.Cryptography;
 using System.Text;
 
-namespace CryptoExchange.Net.Authentication
-{
+namespace CryptoExchange.Net.Authentication;
+
 /// <summary>
 /// Base class for authentication providers
 /// </summary>
@@ -51,30 +50,11 @@ namespace CryptoExchange.Net.Authentication
     }
 
     /// <summary>
-        /// Authenticate a request. Output parameters should include the providedParameters input
+    /// Authenticate a request
     /// </summary>
     /// <param name="apiClient">The Api client sending the request</param>
-        /// <param name="uri">The uri for the request</param>
-        /// <param name="method">The method of the request</param>
-        /// <param name="auth">If the requests should be authenticated</param>
-        /// <param name="arraySerialization">Array serialization type</param>
-        /// <param name="requestBodyFormat">The formatting of the request body</param>
-        /// <param name="uriParameters">Parameters that need to be in the Uri of the request. Should include the provided parameters if they should go in the uri</param>
-        /// <param name="bodyParameters">Parameters that need to be in the body of the request. Should include the provided parameters if they should go in the body</param>
-        /// <param name="headers">The headers that should be send with the request</param>
-        /// <param name="parameterPosition">The position where the providedParameters should go</param>
-        public abstract void AuthenticateRequest(
-            RestApiClient apiClient,
-            Uri uri,
-            HttpMethod method,
-            ref IDictionary<string, object>? uriParameters,
-            ref IDictionary<string, object>? bodyParameters,
-            ref Dictionary<string, string>? headers,
-            bool auth,
-            ArrayParametersSerialization arraySerialization,
-            HttpMethodParameterPosition parameterPosition,
-            RequestBodyFormat requestBodyFormat
-            );
+    /// <param name="requestConfig">The request configuration</param>
+    public abstract void ProcessRequest(RestApiClient apiClient, RestRequestConfiguration requestConfig);
 
     /// <summary>
     /// SHA256 sign the data and return the bytes
@@ -228,7 +208,9 @@ namespace CryptoExchange.Net.Authentication
     /// <returns></returns>
     protected static string SignMD5(string data, SignOutputType? outputType = null)
     {
+#pragma warning disable CA5351
         using var encryptor = MD5.Create();
+#pragma warning restore CA5351
         var resultBytes = encryptor.ComputeHash(Encoding.UTF8.GetBytes(data));
         return outputType == SignOutputType.Base64 ? BytesToBase64String(resultBytes) : BytesToHexString(resultBytes);
     }
@@ -241,7 +223,9 @@ namespace CryptoExchange.Net.Authentication
     /// <returns></returns>
     protected static string SignMD5(byte[] data, SignOutputType? outputType = null)
     {
+#pragma warning disable CA5351
         using var encryptor = MD5.Create();
+#pragma warning restore CA5351
         var resultBytes = encryptor.ComputeHash(data);
         return outputType == SignOutputType.Base64 ? BytesToBase64String(resultBytes) : BytesToHexString(resultBytes);
     }
@@ -253,7 +237,9 @@ namespace CryptoExchange.Net.Authentication
     /// <returns></returns>
     protected static byte[] SignMD5Bytes(string data)
     {
+#pragma warning disable CA5351
         using var encryptor = MD5.Create();
+#pragma warning restore CA5351
         return encryptor.ComputeHash(Encoding.UTF8.GetBytes(data));
     }
 
@@ -479,7 +465,11 @@ namespace CryptoExchange.Net.Authentication
 public abstract class AuthenticationProvider<TApiCredentials> : AuthenticationProvider where TApiCredentials : ApiCredentials
 {
     /// <inheritdoc />
+#pragma warning disable IDE1006 // Naming Styles
+#pragma warning disable CA1707 // Naming Styles
     protected new TApiCredentials _credentials => (TApiCredentials)base._credentials;
+#pragma warning restore IDE1006 // Naming Styles
+#pragma warning restore CA1707 // Naming Styles
 
     /// <summary>
     /// ctor
@@ -489,4 +479,3 @@ namespace CryptoExchange.Net.Authentication
     {
     }
 }
-}

CryptoExchange.Net/Authentication/SignOutputType.cs

@@ -1,5 +1,5 @@
-namespace CryptoExchange.Net.Authentication
-{
+namespace CryptoExchange.Net.Authentication;
+
 /// <summary>
 /// Output string type
 /// </summary>
@@ -14,4 +14,3 @@
     /// </summary>
     Base64
 }
-}

CryptoExchange.Net/Caching/MemoryCache.cs

@@ -1,9 +1,9 @@
-using System;
+using System;
 using System.Collections.Concurrent;
 using System.Linq;
 
-namespace CryptoExchange.Net.Caching
-{
+namespace CryptoExchange.Net.Caching;
+
 internal class MemoryCache
 {
     private readonly ConcurrentDictionary<string, CacheItem> _cache = new ConcurrentDictionary<string, CacheItem>();
@@ -50,4 +50,3 @@ namespace CryptoExchange.Net.Caching
         }
     }
 }
-}

CryptoExchange.Net/Clients/BaseApiClient.cs

@@ -1,13 +1,13 @@
 using System;
 using CryptoExchange.Net.Authentication;
 using CryptoExchange.Net.Interfaces;
-using CryptoExchange.Net.Objects;
+using CryptoExchange.Net.Objects.Errors;
 using CryptoExchange.Net.Objects.Options;
 using CryptoExchange.Net.SharedApis;
 using Microsoft.Extensions.Logging;
 
-namespace CryptoExchange.Net.Clients
-{
+namespace CryptoExchange.Net.Clients;
+
 /// <summary>
 /// Base API for all API clients
 /// </summary>
@@ -54,6 +54,11 @@ namespace CryptoExchange.Net.Clients
     /// </summary>
     public ExchangeOptions ClientOptions { get; }
 
+    /// <summary>
+    /// Mapping of a response code to known error types
+    /// </summary>
+    protected internal virtual ErrorMapping ErrorMapping { get; } = new ErrorMapping([]);
+
     /// <summary>
     /// ctor
     /// </summary>
@@ -87,6 +92,16 @@ namespace CryptoExchange.Net.Clients
     /// <inheritdoc />
     public abstract string FormatSymbol(string baseAsset, string quoteAsset, TradingMode tradingMode, DateTime? deliverDate = null);
 
+    /// <summary>
+    /// Get error info for a response code
+    /// </summary>
+    public ErrorInfo GetErrorInfo(int code, string? message = null) => GetErrorInfo(code.ToString(), message);
+
+    /// <summary>
+    /// Get error info for a response code
+    /// </summary>
+    public ErrorInfo GetErrorInfo(string code, string? message = null) => ErrorMapping.GetErrorInfo(code.ToString(), message);
+
     /// <inheritdoc />
     public void SetApiCredentials<T>(T credentials) where T : ApiCredentials
     {
@@ -109,9 +124,17 @@ namespace CryptoExchange.Net.Clients
     /// <summary>
     /// Dispose
     /// </summary>
-        public virtual void Dispose()
+    public void Dispose()
+    {
+        Dispose(true);
+        GC.SuppressFinalize(this);
+    }
+
+    /// <summary>
+    /// Dispose
+    /// </summary>
+    public virtual void Dispose(bool disposing)
     {
         _disposing = true;
     }
 }
-}

CryptoExchange.Net/Clients/BaseClient.cs

@@ -1,12 +1,11 @@
-using CryptoExchange.Net.Authentication;
+using CryptoExchange.Net.Authentication;
 using CryptoExchange.Net.Objects.Options;
 using Microsoft.Extensions.Logging;
-using Microsoft.Extensions.Logging.Abstractions;
 using System;
 using System.Collections.Generic;
 
-namespace CryptoExchange.Net.Clients
-{
+namespace CryptoExchange.Net.Clients;
+
 /// <summary>
 /// The base for all clients, websocket client and rest client
 /// </summary>
@@ -80,7 +79,7 @@ namespace CryptoExchange.Net.Clients
             throw new ArgumentNullException(nameof(options));
 
         ClientOptions = options;
-            _logger.Log(LogLevel.Trace, $"Client configuration: {options}, CryptoExchange.Net: v{CryptoExchangeLibVersion}, {Exchange}.Net: v{ExchangeLibVersion}");
+        _logger.Log(LogLevel.Trace, "Client configuration: {Options}, CryptoExchange.Net: v{CryptoExchangeVersion}, {Exchange}.Net: v{ExchangeVersion}", options, CryptoExchangeLibVersion, Exchange, ExchangeLibVersion);
     }
 
     /// <summary>
@@ -102,7 +101,7 @@ namespace CryptoExchange.Net.Clients
         if (ClientOptions == null)
             throw new InvalidOperationException("Client should have called Initialize before adding API clients");
 
-            _logger.Log(LogLevel.Trace, $"  {apiClient.GetType().Name}, base address: {apiClient.BaseAddress}");
+        _logger.Log(LogLevel.Trace, "  {ApiClient}, base address: {BaseAddress}", apiClient.GetType().Name, apiClient.BaseAddress);
         ApiClients.Add(apiClient);
         return apiClient;
     }
@@ -120,11 +119,24 @@ namespace CryptoExchange.Net.Clients
     /// <summary>
     /// Dispose
     /// </summary>
-        public virtual void Dispose()
+    public void Dispose()
+    {
+        Dispose(true);
+        GC.SuppressFinalize(this);
+    }
+
+    /// <summary>
+    /// Dispose
+    /// </summary>
+    public virtual void Dispose(bool disposing)
+    {
+        if (disposing)
         {
             _logger.Log(LogLevel.Debug, "Disposing client");
             foreach (var client in ApiClients)
                 client.Dispose();
         }
     }
+
+
 }

CryptoExchange.Net/Clients/BaseRestClient.cs

@@ -3,8 +3,8 @@ using CryptoExchange.Net.Interfaces;
 using Microsoft.Extensions.Logging;
 using Microsoft.Extensions.Logging.Abstractions;
 
-namespace CryptoExchange.Net.Clients
-{
+namespace CryptoExchange.Net.Clients;
+
 /// <summary>
 /// Base rest client
 /// </summary>
@@ -23,4 +23,3 @@ namespace CryptoExchange.Net.Clients
         _logger = loggerFactory?.CreateLogger(name + ".RestClient") ?? NullLoggerFactory.Instance.CreateLogger(name);
     }
 }
-}

CryptoExchange.Net/Clients/BaseSocketClient.cs

@@ -1,17 +1,16 @@
-using System;
+using System;
 using System.Collections.Generic;
 using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
-using System.Xml.Linq;
 using CryptoExchange.Net.Interfaces;
 using CryptoExchange.Net.Logging.Extensions;
 using CryptoExchange.Net.Objects.Sockets;
 using Microsoft.Extensions.Logging;
 using Microsoft.Extensions.Logging.Abstractions;
 
-namespace CryptoExchange.Net.Clients
-{
+namespace CryptoExchange.Net.Clients;
+
 /// <summary>
 /// Base for socket client implementations
 /// </summary>
@@ -129,4 +128,3 @@ namespace CryptoExchange.Net.Clients
         return result;
     }
 }
-}

CryptoExchange.Net/Clients/CryptoBaseClient.cs

@@ -1,9 +1,9 @@
-using Microsoft.Extensions.DependencyInjection;
+using Microsoft.Extensions.DependencyInjection;
 using System;
 using System.Collections.Generic;
 
-namespace CryptoExchange.Net.Clients
-{
+namespace CryptoExchange.Net.Clients;
+
 /// <summary>
 /// Base crypto client
 /// </summary>
@@ -59,9 +59,20 @@ namespace CryptoExchange.Net.Clients
     /// <summary>
     /// Dispose
     /// </summary>
-        public void Dispose()
+    public void Dispose(bool disposing)
+    {
+        if (disposing)
         {
             _serviceCache.Clear();
         }
     }
+
+    /// <summary>
+    /// Dispose
+    /// </summary>
+    public void Dispose()
+    {
+        Dispose(true);
+        GC.SuppressFinalize(this);
+    }
 }

CryptoExchange.Net/Clients/CryptoRestClient.cs

@@ -1,11 +1,8 @@
-using CryptoExchange.Net.Interfaces;
-using Microsoft.Extensions.DependencyInjection;
+using CryptoExchange.Net.Interfaces;
 using System;
-using System.Collections.Generic;
-using System.Linq;
 
-namespace CryptoExchange.Net.Clients
-{
+namespace CryptoExchange.Net.Clients;
+
 /// <inheritdoc />
 public class CryptoRestClient : CryptoBaseClient, ICryptoRestClient
 {
@@ -24,4 +21,3 @@ namespace CryptoExchange.Net.Clients
     {
     }
 }
-}

CryptoExchange.Net/Clients/CryptoSocketClient.cs

@@ -1,8 +1,8 @@
-using CryptoExchange.Net.Interfaces;
+using CryptoExchange.Net.Interfaces;
 using System;
 
-namespace CryptoExchange.Net.Clients
-{
+namespace CryptoExchange.Net.Clients;
+
 /// <inheritdoc />
 public class CryptoSocketClient : CryptoBaseClient, ICryptoSocketClient
 {
@@ -21,4 +21,3 @@ namespace CryptoExchange.Net.Clients
     {
     }
 }
-}

CryptoExchange.Net/Clients/RestApiClient.cs

@@ -11,14 +11,15 @@ using CryptoExchange.Net.Caching;
 using CryptoExchange.Net.Interfaces;
 using CryptoExchange.Net.Logging.Extensions;
 using CryptoExchange.Net.Objects;
+using CryptoExchange.Net.Objects.Errors;
 using CryptoExchange.Net.Objects.Options;
 using CryptoExchange.Net.RateLimiting;
 using CryptoExchange.Net.RateLimiting.Interfaces;
 using CryptoExchange.Net.Requests;
 using Microsoft.Extensions.Logging;
 
-namespace CryptoExchange.Net.Clients
-{
+namespace CryptoExchange.Net.Clients;
+
 /// <summary>
 /// Base rest API client for interacting with a REST API
 /// </summary>
@@ -54,7 +55,7 @@ namespace CryptoExchange.Net.Clients
     /// <summary>
     /// Request headers to be sent with each request
     /// </summary>
-        protected Dictionary<string, string>? StandardRequestHeaders { get; set; }
+    protected Dictionary<string, string> StandardRequestHeaders { get; set; } = [];
 
     /// <summary>
     /// Whether parameters need to be ordered
@@ -238,7 +239,7 @@ namespace CryptoExchange.Net.Clients
                 additionalHeaders);
             _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);
+            var result = await GetResponseAsync<T>(definition, request, definition.RateLimitGate, cancellationToken).ConfigureAwait(false);
             if (result.Error is not CancellationRequestedError)
             {
                 var originalData = OutputOriginalData ? result.OriginalData : "[Data only available when OutputOriginal = true]";
@@ -363,75 +364,59 @@ namespace CryptoExchange.Net.Clients
         ParameterCollection? bodyParameters,
         Dictionary<string, string>? additionalHeaders)
     {
-            var uriParams = uriParameters == null ? null : CreateParameterDictionary(uriParameters);
-            var bodyParams = bodyParameters == null ? null : CreateParameterDictionary(bodyParameters);
+        var requestConfiguration = new RestRequestConfiguration(
+            definition,
+            baseAddress,
+            uriParameters == null ? new Dictionary<string, object>() : CreateParameterDictionary(uriParameters),
+            bodyParameters == null ? new Dictionary<string, object>() : CreateParameterDictionary(bodyParameters),
+            new Dictionary<string, string>(additionalHeaders ?? []),
+            definition.ArraySerialization ?? ArraySerialization,
+            definition.ParameterPosition ?? ParameterPositions[definition.Method],
+            definition.RequestBodyFormat ?? RequestBodyFormat);
 
-            var uri = new Uri(baseAddress.AppendPath(definition.Path));
-            var arraySerialization = definition.ArraySerialization ?? ArraySerialization;
-            var bodyFormat = definition.RequestBodyFormat ?? RequestBodyFormat;
-            var parameterPosition = definition.ParameterPosition ?? ParameterPositions[definition.Method];
-
-            Dictionary<string, string>? headers = null;
-            if (AuthenticationProvider != null)
-            {
         try
         {
-                    AuthenticationProvider.AuthenticateRequest(
-                        this,
-                        uri,
-                        definition.Method,
-                        ref uriParams,
-                        ref bodyParams,
-                        ref headers,
-                        definition.Authenticated,
-                        arraySerialization,
-                        parameterPosition,
-                        bodyFormat                        
-                        );
+            AuthenticationProvider?.ProcessRequest(this, requestConfiguration);
         }
         catch (Exception ex)
         {
             throw new Exception("Failed to authenticate request, make sure your API credentials are correct", ex);
         }
-            }
         
-            // Add the auth parameters to the uri, start with a new URI to be able to sort the parameters including the auth parameters
-            if (uriParams != null)
-                uri = uri.SetParameters(uriParams, arraySerialization);
+        var queryString = requestConfiguration.GetQueryString(true);
+        if (!string.IsNullOrEmpty(queryString) && !queryString.StartsWith("?"))
+            queryString = $"?{queryString}";
 
+        var uri = new Uri(baseAddress.AppendPath(definition.Path) + queryString);
         var request = RequestFactory.Create(definition.Method, uri, requestId);
         request.Accept = Constants.JsonContentHeader;
 
-            if (headers != null)
-            {
-                foreach (var header in headers)
+        foreach (var header in requestConfiguration.Headers)
             request.AddHeader(header.Key, header.Value);            
-            }
 
-            if (additionalHeaders != null)
-            {
-                foreach (var header in additionalHeaders)
-                    request.AddHeader(header.Key, header.Value);
-            }
-
-            if (StandardRequestHeaders != null)
-            {
         foreach (var header in StandardRequestHeaders)
         {
             // Only add it if it isn't overwritten
-                    if (additionalHeaders?.ContainsKey(header.Key) != true)
+            if (!requestConfiguration.Headers.ContainsKey(header.Key))
                 request.AddHeader(header.Key, header.Value);
         }            
-            }
 
-            if (parameterPosition == HttpMethodParameterPosition.InBody)
+        if (requestConfiguration.ParameterPosition == HttpMethodParameterPosition.InBody)
         {
-                var contentType = bodyFormat == RequestBodyFormat.Json ? Constants.JsonContentHeader : Constants.FormContentHeader;
-                if (bodyParams != null && bodyParams.Count != 0)
-                    WriteParamBody(request, bodyParams, contentType);
+            var contentType = requestConfiguration.BodyFormat == RequestBodyFormat.Json ? Constants.JsonContentHeader : Constants.FormContentHeader;
+            var bodyContent = requestConfiguration.GetBodyContent();
+            if (bodyContent != null)
+            {
+                request.SetContent(bodyContent, contentType);
+            }
+            else
+            {
+                if (requestConfiguration.BodyParameters != null && requestConfiguration.BodyParameters.Count != 0)
+                    WriteParamBody(request, requestConfiguration.BodyParameters, contentType);
                 else
                     request.SetContent(RequestBodyEmptyContent, contentType);
             }
+        }
 
         return request;
     }
@@ -439,11 +424,13 @@ namespace CryptoExchange.Net.Clients
     /// <summary>
     /// Executes the request and returns the result deserialized into the type parameter class
     /// </summary>
+    /// <param name="requestDefinition">The request definition</param>
     /// <param name="request">The request object to execute</param>
     /// <param name="gate">The ratelimit gate used</param>
     /// <param name="cancellationToken">Cancellation token</param>
     /// <returns></returns>
     protected virtual async Task<WebCallResult<T>> GetResponseAsync<T>(
+        RequestDefinition requestDefinition,
         IRequest request,
         IRateLimitGate? gate,
         CancellationToken cancellationToken)
@@ -463,7 +450,7 @@ namespace CryptoExchange.Net.Clients
             var outputOriginalData = ApiOptions.OutputOriginalData ?? ClientOptions.OutputOriginalData;
 
             accessor = CreateAccessor();
-                if (!response.IsSuccessStatusCode)
+            if (!response.IsSuccessStatusCode && !requestDefinition.TryParseOnNonSuccess)
             {
                 // Error response
                 var readResult = await accessor.Read(responseStream, true).ConfigureAwait(false);
@@ -499,12 +486,11 @@ namespace CryptoExchange.Net.Clients
             if (!valid)
             {
                 // Invalid json
-                    var error = new DeserializeError("Failed to parse response: " + valid.Error!.Message, valid.Error.Exception);
-                    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, error);
+                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, valid.Error);
             }
 
             // Json response received
-                var parsedError = TryParseError(response.ResponseHeaders, accessor);
+            var parsedError = TryParseError(requestDefinition, response.ResponseHeaders, accessor);
             if (parsedError != null)
             {
                 if (parsedError is ServerRateLimitError rateError)
@@ -526,7 +512,8 @@ namespace CryptoExchange.Net.Clients
         catch (HttpRequestException requestException)
         {
             // Request exception, can't reach server for instance
-                return new WebCallResult<T>(null, null, sw.Elapsed, null, null, request.RequestId, request.Uri.ToString(), request.Content, request.Method, request.GetHeaders(), ResultDataSource.Server, default, new WebError(requestException.Message, exception: requestException));
+            var error = new WebError(requestException.Message, requestException);
+            return new WebCallResult<T>(null, null, sw.Elapsed, null, null, request.RequestId, request.Uri.ToString(), request.Content, request.Method, request.GetHeaders(), ResultDataSource.Server, default, error);
         }
         catch (OperationCanceledException canceledException)
         {
@@ -538,7 +525,9 @@ namespace CryptoExchange.Net.Clients
             else
             {
                 // Request timed out
-                    return new WebCallResult<T>(null, null, sw.Elapsed, null, null, request.RequestId, request.Uri.ToString(), request.Content, request.Method, request.GetHeaders(), ResultDataSource.Server, default, new WebError($"Request timed out", exception: canceledException));
+                var error = new WebError($"Request timed out", exception: canceledException);
+                error.ErrorType = ErrorType.Timeout;
+                return new WebCallResult<T>(null, null, sw.Elapsed, null, null, request.RequestId, request.Uri.ToString(), request.Content, request.Method, request.GetHeaders(), ResultDataSource.Server, default, error);
             }
         }
         finally
@@ -554,10 +543,11 @@ namespace CryptoExchange.Net.Clients
     /// 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="requestDefinition">Request definition</param>
     /// <param name="accessor">Data accessor</param>
     /// <param name="responseHeaders">The response headers</param>
     /// <returns>Null if not an error, Error otherwise</returns>
-        protected virtual Error? TryParseError(KeyValuePair<string, string[]>[] responseHeaders, IMessageAccessor accessor) => null;
+    protected virtual Error? TryParseError(RequestDefinition requestDefinition, KeyValuePair<string, 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.
@@ -633,7 +623,7 @@ namespace CryptoExchange.Net.Clients
     /// <returns></returns>
     protected virtual Error ParseErrorResponse(int httpStatusCode, KeyValuePair<string, string[]>[] responseHeaders, IMessageAccessor accessor, Exception? exception)
     {
-            return new ServerError(null, "Unknown request error", exception);
+        return new ServerError(ErrorInfo.Unknown, exception);
     }
 
     /// <summary>
@@ -647,7 +637,7 @@ namespace CryptoExchange.Net.Clients
     {
         // Handle retry after header
         var retryAfterHeader = responseHeaders.SingleOrDefault(r => r.Key.Equals("Retry-After", StringComparison.InvariantCultureIgnoreCase));
-            if (retryAfterHeader.Value?.Any() != true)
+        if (!(retryAfterHeader.Value.Length > 0))
             return new ServerRateLimitError();
 
         var value = retryAfterHeader.Value.First();
@@ -735,4 +725,3 @@ namespace CryptoExchange.Net.Clients
         && definition.Method == HttpMethod.Get
         && !definition.PreventCaching;
 }
-}

CryptoExchange.Net/Clients/SocketApiClient.cs

@@ -1,6 +1,7 @@
 using CryptoExchange.Net.Interfaces;
 using CryptoExchange.Net.Logging.Extensions;
 using CryptoExchange.Net.Objects;
+using CryptoExchange.Net.Objects.Errors;
 using CryptoExchange.Net.Objects.Options;
 using CryptoExchange.Net.Objects.Sockets;
 using CryptoExchange.Net.RateLimiting;
@@ -16,8 +17,8 @@ using System.Text;
 using System.Threading;
 using System.Threading.Tasks;
 
-namespace CryptoExchange.Net.Clients
-{
+namespace CryptoExchange.Net.Clients;
+
 /// <summary>
 /// Base socket API client for interaction with a websocket API
 /// </summary>
@@ -85,7 +86,7 @@ namespace CryptoExchange.Net.Clients
     /// <summary>
     /// Whether to continue processing and forward unparsable messages to handlers
     /// </summary>
-        protected internal bool ProcessUnparsableMessages { get; set; } = false;
+    protected internal bool ProcessUnparsableMessages { get; set; }
 
     /// <inheritdoc />
     public double IncomingKbps
@@ -265,11 +266,11 @@ namespace CryptoExchange.Net.Clients
         if (socketConnection.PausedActivity)
         {
             _logger.HasBeenPausedCantSubscribeAtThisMoment(socketConnection.SocketId);
-                return new CallResult<UpdateSubscription>(new ServerError("Socket is paused"));
+            return new CallResult<UpdateSubscription>(new ServerError(new ErrorInfo(ErrorType.WebsocketPaused, "Socket is paused")));
         }
 
         var waitEvent = new AsyncResetEvent(false);
-            var subQuery = subscription.GetSubQuery(socketConnection);
+        var subQuery = subscription.CreateSubscriptionQuery(socketConnection);
         if (subQuery != null)
         {
             // Send the request and wait for answer
@@ -339,7 +340,13 @@ namespace CryptoExchange.Net.Clients
 
         SocketConnection socketConnection;
         var released = false;
-            await semaphoreSlim.WaitAsync().ConfigureAwait(false);
+
+        try
+        {
+            await semaphoreSlim.WaitAsync(ct).ConfigureAwait(false);
+        }
+        catch (OperationCanceledException) { }
+
         try
         {
             var socketResult = await GetSocketConnection(url, query.Authenticated, true).ConfigureAwait(false);
@@ -368,7 +375,7 @@ namespace CryptoExchange.Net.Clients
         if (socketConnection.PausedActivity)
         {
             _logger.HasBeenPausedCantSendQueryAtThisMoment(socketConnection.SocketId);
-                return new CallResult<THandlerResponse>(new ServerError("Socket is paused"));
+            return new CallResult<THandlerResponse>(new ServerError(new ErrorInfo(ErrorType.WebsocketPaused, "Socket is paused")));
         }
 
         if (ct.IsCancellationRequested)
@@ -394,7 +401,13 @@ namespace CryptoExchange.Net.Clients
             return connectResult;
 
         if (ClientOptions.DelayAfterConnect != TimeSpan.Zero)
-                await Task.Delay(ClientOptions.DelayAfterConnect).ConfigureAwait(false);
+        {
+            try
+            {
+                await Task.Delay(ClientOptions.DelayAfterConnect, ct).ConfigureAwait(false);
+            }
+            catch (OperationCanceledException) { }
+        }
 
         if (!authenticated || socket.Authenticated)
             return CallResult.SuccessResult;
@@ -826,8 +839,11 @@ namespace CryptoExchange.Net.Clients
     /// <summary>
     /// Dispose the client
     /// </summary>
-        public override void Dispose()
+    public override void Dispose(bool disposing)
     {
+        if (disposing)
+            return;
+
         _disposing = true;
         var tasks = new List<Task>();
         {
@@ -842,7 +858,7 @@ namespace CryptoExchange.Net.Clients
         }
 
         semaphoreSlim?.Dispose();
-            base.Dispose();
+        base.Dispose(disposing);
     }
 
     /// <summary>
@@ -861,4 +877,3 @@ namespace CryptoExchange.Net.Clients
     /// <returns></returns>
     public virtual ReadOnlyMemory<byte> PreprocessStreamMessage(SocketConnection connection, WebSocketMessageType type, ReadOnlyMemory<byte> data) => data;
 }
-}

CryptoExchange.Net/Converters/ArrayPropertyAttribute.cs

@@ -1,7 +1,7 @@
-using System;
+using System;
+
+namespace CryptoExchange.Net.Converters;
 
-namespace CryptoExchange.Net.Converters
-{
 /// <summary>
 /// Mark property as an index in the array
 /// </summary>
@@ -22,4 +22,3 @@ namespace CryptoExchange.Net.Converters
         Index = index;
     }
 }
-}

CryptoExchange.Net/Converters/JsonSerializerContextCache.cs

@@ -1,11 +1,9 @@
-using System;
+using System;
 using System.Collections.Concurrent;
-using System.Collections.Generic;
-using System.Text;
 using System.Text.Json.Serialization;
 
-namespace CryptoExchange.Net.Converters
-{
+namespace CryptoExchange.Net.Converters;
+
 /// <summary>
 /// Caching for JsonSerializerContext instances
 /// </summary>
@@ -28,4 +26,3 @@ namespace CryptoExchange.Net.Converters
         return instance;
     }
 }
-}

CryptoExchange.Net/Converters/MessageParsing/MessageNode.cs

@@ -1,5 +1,5 @@
-namespace CryptoExchange.Net.Converters.MessageParsing
-{
+namespace CryptoExchange.Net.Converters.MessageParsing;
+
 /// <summary>
 /// Node accessor
 /// </summary>
@@ -46,4 +46,3 @@
     /// <returns></returns>
     public static NodeAccessor PropertyName() { return new NodeAccessor(null, null, 2); }
 }
-}

CryptoExchange.Net/Converters/MessageParsing/MessagePath.cs

@@ -1,8 +1,8 @@
-using System.Collections;
+using System.Collections;
 using System.Collections.Generic;
 
-namespace CryptoExchange.Net.Converters.MessageParsing
-{
+namespace CryptoExchange.Net.Converters.MessageParsing;
+
 /// <summary>
 /// Message access definition
 /// </summary>
@@ -47,4 +47,3 @@ namespace CryptoExchange.Net.Converters.MessageParsing
         return GetEnumerator();
     }
 }
-}

CryptoExchange.Net/Converters/MessageParsing/MessagePathExtension.cs

@@ -1,5 +1,5 @@
-namespace CryptoExchange.Net.Converters.MessageParsing
-{
+namespace CryptoExchange.Net.Converters.MessageParsing;
+
 /// <summary>
 /// Message path extension methods
 /// </summary>
@@ -40,4 +40,3 @@
         return path;
     }
 }
-}

CryptoExchange.Net/Converters/MessageParsing/NodeType.cs

@@ -1,5 +1,5 @@
-namespace CryptoExchange.Net.Converters.MessageParsing
-{
+namespace CryptoExchange.Net.Converters.MessageParsing;
+
 /// <summary>
 /// Message node type
 /// </summary>
@@ -18,4 +18,3 @@
     /// </summary>
     Value
 }
-}

CryptoExchange.Net/Converters/SystemTextJson/ArrayConverter.cs

@@ -1,18 +1,17 @@
-using System;
-using System.Collections.Concurrent;
+using System;
 using System.Globalization;
 using System.Linq;
 using System.Reflection;
 using System.Text.Json.Serialization;
 using System.Text.Json;
-using CryptoExchange.Net.Attributes;
 using System.Collections.Generic;
+#if NET5_0_OR_GREATER
 using System.Diagnostics.CodeAnalysis;
+#endif
 using System.Threading;
-using System.Diagnostics;
 
-namespace CryptoExchange.Net.Converters.SystemTextJson
-{
+namespace CryptoExchange.Net.Converters.SystemTextJson;
+
 /// <summary>
 /// Converter for arrays to objects. Can deserialize data like [0.1, 0.2, "test"] to an object. Mapping is done by marking the class with [JsonConverter(typeof(ArrayConverter))] and the properties
 /// with [ArrayProperty(x)] where x is the index of the property in the array
@@ -228,7 +227,6 @@ namespace CryptoExchange.Net.Converters.SystemTextJson
         public JsonConverter? JsonConverter { get; set; }
         public bool DefaultDeserialization { get; set; }
         public Type TargetType { get; set; } = null!;
-            public JsonSerializerOptions? JsonSerializerOptions { get; set; } = null;
-        }
+        public JsonSerializerOptions? JsonSerializerOptions { get; set; }
     }
 }

CryptoExchange.Net/Converters/SystemTextJson/BigDecimalConverter.cs

@@ -1,10 +1,10 @@
-using System;
+using System;
 using System.Globalization;
 using System.Text.Json;
 using System.Text.Json.Serialization;
 
-namespace CryptoExchange.Net.Converters.SystemTextJson
-{
+namespace CryptoExchange.Net.Converters.SystemTextJson;
+
 /// <summary>
 /// Decimal converter that handles overflowing decimal values (by setting it to decimal.MaxValue)
 /// </summary>
@@ -43,4 +43,3 @@ namespace CryptoExchange.Net.Converters.SystemTextJson
         writer.WriteNumberValue(value);
     }
 }
-}

CryptoExchange.Net/Converters/SystemTextJson/BoolConverter.cs

@@ -1,11 +1,11 @@
-using System;
+using System;
 using System.Diagnostics;
 using System.Runtime.Serialization;
 using System.Text.Json;
 using System.Text.Json.Serialization;
 
-namespace CryptoExchange.Net.Converters.SystemTextJson
-{
+namespace CryptoExchange.Net.Converters.SystemTextJson;
+
 /// <summary>
 /// Bool converter
 /// </summary>
@@ -28,7 +28,7 @@ namespace CryptoExchange.Net.Converters.SystemTextJson
         public override T Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
             => (T)((object?)ReadBool(ref reader, typeToConvert, options) ?? default(T))!;
         
-            public bool? ReadBool(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
+        public static bool? ReadBool(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
         {
             if (reader.TokenType == JsonTokenType.True)
                 return true;
@@ -81,4 +81,3 @@ namespace CryptoExchange.Net.Converters.SystemTextJson
     }
 
 }
-}

CryptoExchange.Net/Converters/SystemTextJson/CommaSplitEnumConverter.cs

@@ -1,13 +1,13 @@
-using System;
-using System.Collections.Generic;
+using System;
+#if NET5_0_OR_GREATER
 using System.Diagnostics.CodeAnalysis;
+#endif
 using System.Linq;
-using System.Text;
 using System.Text.Json;
 using System.Text.Json.Serialization;
 
-namespace CryptoExchange.Net.Converters.SystemTextJson
-{
+namespace CryptoExchange.Net.Converters.SystemTextJson;
+
 /// <summary>
 /// Converter for comma separated enum values
 /// </summary>
@@ -34,4 +34,3 @@ namespace CryptoExchange.Net.Converters.SystemTextJson
         writer.WriteStringValue(string.Join(",", value.Select(x => EnumConverter.GetString(x))));
     }
 }
-}

CryptoExchange.Net/Converters/SystemTextJson/DateTimeConverter.cs

@@ -1,12 +1,12 @@
-using System;
+using System;
 using System.Diagnostics;
 using System.Diagnostics.CodeAnalysis;
 using System.Globalization;
 using System.Text.Json;
 using System.Text.Json.Serialization;
 
-namespace CryptoExchange.Net.Converters.SystemTextJson
-{
+namespace CryptoExchange.Net.Converters.SystemTextJson;
+
 /// <summary>
 /// Date time converter
 /// </summary>
@@ -34,7 +34,7 @@ namespace CryptoExchange.Net.Converters.SystemTextJson
         public override T Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
             => (T)((object?)ReadDateTime(ref reader, typeToConvert, options) ?? default(T))!;
 
-            private DateTime? ReadDateTime(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
+        private static DateTime? ReadDateTime(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
         {
             if (reader.TokenType == JsonTokenType.Null)
             {
@@ -239,4 +239,3 @@ namespace CryptoExchange.Net.Converters.SystemTextJson
     [return: NotNullIfNotNull("time")]
     public static long? ConvertToNanoseconds(DateTime? time) => time == null ? null : (long)Math.Round((time.Value - _epoch).Ticks / _ticksPerNanosecond);
 }
-}

CryptoExchange.Net/Converters/SystemTextJson/DecimalConverter.cs

@@ -1,10 +1,9 @@
-using System;
-using System.Globalization;
+using System;
 using System.Text.Json;
 using System.Text.Json.Serialization;
 
-namespace CryptoExchange.Net.Converters.SystemTextJson
-{
+namespace CryptoExchange.Net.Converters.SystemTextJson;
+
 /// <summary>
 /// Decimal converter
 /// </summary>
@@ -42,4 +41,3 @@ namespace CryptoExchange.Net.Converters.SystemTextJson
             writer.WriteNumberValue(value.Value);
     }
 }
-}

CryptoExchange.Net/Converters/SystemTextJson/DecimalStringWriterConverter.cs

@@ -1,10 +1,10 @@
-using System;
+using System;
 using System.Globalization;
 using System.Text.Json;
 using System.Text.Json.Serialization;
 
-namespace CryptoExchange.Net.Converters.SystemTextJson
-{
+namespace CryptoExchange.Net.Converters.SystemTextJson;
+
 /// <summary>
 /// Converter for serializing decimal values as string
 /// </summary>
@@ -20,4 +20,3 @@ namespace CryptoExchange.Net.Converters.SystemTextJson
     public override void Write(Utf8JsonWriter writer, decimal value, JsonSerializerOptions options)
         => writer.WriteStringValue(value.ToString(CultureInfo.InvariantCulture) ?? null);
 }
-}

CryptoExchange.Net/Converters/SystemTextJson/EnumConverter.cs

@@ -1,4 +1,4 @@
-using CryptoExchange.Net.Attributes;
+using CryptoExchange.Net.Attributes;
 using System;
 using System.Collections.Concurrent;
 using System.Collections.Generic;
@@ -9,8 +9,8 @@ using System.Reflection;
 using System.Text.Json;
 using System.Text.Json.Serialization;
 
-namespace CryptoExchange.Net.Converters.SystemTextJson
-{
+namespace CryptoExchange.Net.Converters.SystemTextJson;
+
 /// <summary>
 /// Static EnumConverter methods
 /// </summary>
@@ -64,8 +64,8 @@ namespace CryptoExchange.Net.Converters.SystemTextJson
 #endif
      : JsonConverter<T>, INullableConverterFactory where T : struct, Enum
 {
-        private static List<KeyValuePair<T, string>>? _mapping = null;
-        private NullableEnumConverter? _nullableEnumConverter = null;
+    private static List<KeyValuePair<T, string>>? _mapping;
+    private NullableEnumConverter? _nullableEnumConverter;
 
     private static ConcurrentBag<string> _unknownValuesWarned = new ConcurrentBag<string>();
 
@@ -79,7 +79,7 @@ namespace CryptoExchange.Net.Converters.SystemTextJson
         }
         public override T? Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
         {
-                return _enumConverter.ReadNullable(ref reader, typeToConvert, options, out var isEmptyString, out var warn);
+            return EnumConverter<T>.ReadNullable(ref reader, typeToConvert, options, out var isEmptyString, out var warn);
         }
 
         public override void Write(Utf8JsonWriter writer, T? value, JsonSerializerOptions options)
@@ -122,7 +122,7 @@ namespace CryptoExchange.Net.Converters.SystemTextJson
         }
     }
 
-        private T? ReadNullable(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options, out bool isEmptyString, out bool warn)
+    private static T? ReadNullable(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options, out bool isEmptyString, out bool warn)
     {
         isEmptyString = false;
         warn = false;
@@ -286,4 +286,3 @@ namespace CryptoExchange.Net.Converters.SystemTextJson
         return _nullableEnumConverter;
     }
 }
-}

CryptoExchange.Net/Converters/SystemTextJson/EnumIntWriterConverter.cs

@@ -1,10 +1,9 @@
-using System;
-using System.Globalization;
+using System;
 using System.Text.Json;
 using System.Text.Json.Serialization;
 
-namespace CryptoExchange.Net.Converters.SystemTextJson
-{
+namespace CryptoExchange.Net.Converters.SystemTextJson;
+
 /// <summary>
 /// Converter for serializing enum values as int
 /// </summary>
@@ -20,4 +19,3 @@ namespace CryptoExchange.Net.Converters.SystemTextJson
     public override void Write(Utf8JsonWriter writer, T value, JsonSerializerOptions options)
         => writer.WriteNumberValue((int)(object)value);
 }
-}

CryptoExchange.Net/Converters/SystemTextJson/INullableConverterFactory.cs

@@ -1,9 +1,8 @@
-using System.Text.Json.Serialization;
+using System.Text.Json.Serialization;
+
+namespace CryptoExchange.Net.Converters.SystemTextJson;
 
-namespace CryptoExchange.Net.Converters.SystemTextJson
-{
 internal interface INullableConverterFactory
 {
     JsonConverter CreateNullableConverter();
 }
-}

CryptoExchange.Net/Converters/SystemTextJson/IntConverter.cs

@@ -1,10 +1,10 @@
-using System;
+using System;
 using System.Globalization;
 using System.Text.Json;
 using System.Text.Json.Serialization;
 
-namespace CryptoExchange.Net.Converters.SystemTextJson
-{
+namespace CryptoExchange.Net.Converters.SystemTextJson;
+
 /// <summary>
 /// Int converter
 /// </summary>
@@ -37,4 +37,3 @@ namespace CryptoExchange.Net.Converters.SystemTextJson
             writer.WriteNumberValue(value.Value);
     }
 }
-}

CryptoExchange.Net/Converters/SystemTextJson/LongConverter.cs

@@ -1,10 +1,10 @@
-using System;
+using System;
 using System.Globalization;
 using System.Text.Json;
 using System.Text.Json.Serialization;
 
-namespace CryptoExchange.Net.Converters.SystemTextJson
-{
+namespace CryptoExchange.Net.Converters.SystemTextJson;
+
 /// <summary>
 /// Int converter
 /// </summary>
@@ -37,4 +37,3 @@ namespace CryptoExchange.Net.Converters.SystemTextJson
             writer.WriteNumberValue(value.Value);
     }
 }
-}

CryptoExchange.Net/Converters/SystemTextJson/NullableEnumConverterFactory.cs

@@ -1,12 +1,10 @@
-using System;
-using System.Collections.Generic;
-using System.Text;
+using System;
 using System.Text.Json.Serialization.Metadata;
 using System.Text.Json;
 using System.Text.Json.Serialization;
 
-namespace CryptoExchange.Net.Converters.SystemTextJson
-{
+namespace CryptoExchange.Net.Converters.SystemTextJson;
+
 internal class NullableEnumConverterFactory : JsonConverterFactory
 {
     private readonly IJsonTypeInfoResolver _jsonTypeInfoResolver;
@@ -40,4 +38,3 @@ namespace CryptoExchange.Net.Converters.SystemTextJson
         return nullConverterFactory.CreateNullableConverter();
     }
 }
-}

CryptoExchange.Net/Converters/SystemTextJson/NumberStringConverter.cs

@@ -1,9 +1,9 @@
-using System;
+using System;
 using System.Text.Json;
 using System.Text.Json.Serialization;
 
-namespace CryptoExchange.Net.Converters.SystemTextJson
-{
+namespace CryptoExchange.Net.Converters.SystemTextJson;
+
 /// <summary>
 /// Read string or number as string
 /// </summary>
@@ -39,4 +39,3 @@ namespace CryptoExchange.Net.Converters.SystemTextJson
         writer.WriteStringValue(value);
     }
 }
-}

CryptoExchange.Net/Converters/SystemTextJson/ObjectStringConverter.cs

@@ -1,10 +1,12 @@
-using System;
+using System;
 using System.Text.Json.Serialization;
 using System.Text.Json;
+#if NET5_0_OR_GREATER
 using System.Diagnostics.CodeAnalysis;
+#endif
+
+namespace CryptoExchange.Net.Converters.SystemTextJson;
 
-namespace CryptoExchange.Net.Converters.SystemTextJson
-{
 /// <summary>
 /// Converter for values which contain a nested json value
 /// </summary>
@@ -24,7 +26,7 @@ namespace CryptoExchange.Net.Converters.SystemTextJson
         if (string.IsNullOrEmpty(value))
             return default;
 
-            return (T?)JsonDocument.Parse(value!).Deserialize(typeof(T), options);
+        return JsonDocument.Parse(value!).Deserialize<T>(options);
     }
 
     /// <inheritdoc />
@@ -40,4 +42,3 @@ namespace CryptoExchange.Net.Converters.SystemTextJson
         writer.WriteStringValue(JsonSerializer.Serialize(value, options));
     }
 }
-}

CryptoExchange.Net/Converters/SystemTextJson/ReplaceConverter.cs

@@ -1,10 +1,10 @@
-using System;
+using System;
 using System.Linq;
 using System.Text.Json;
 using System.Text.Json.Serialization;
 
-namespace CryptoExchange.Net.Converters.SystemTextJson
-{
+namespace CryptoExchange.Net.Converters.SystemTextJson;
+
 /// <summary>
 /// Replace a value on a string property
 /// </summary>
@@ -19,7 +19,7 @@ namespace CryptoExchange.Net.Converters.SystemTextJson
     {
         _replacementSets = replaceSets.Select(x =>
         {
-                var split = x.Split(new string[] { "->" }, StringSplitOptions.None);
+            var split = x.Split(["->"], StringSplitOptions.None);
             if (split.Length != 2)
                 throw new ArgumentException("Invalid replacement config");
             return (split[0], split[1]);
@@ -38,4 +38,3 @@ namespace CryptoExchange.Net.Converters.SystemTextJson
     /// <inheritdoc />
     public override void Write(Utf8JsonWriter writer, string value, JsonSerializerOptions options) => writer.WriteStringValue(value);
 }
-}

CryptoExchange.Net/Converters/SystemTextJson/SerializationModel.cs

@@ -1,9 +1,7 @@
-using System;
-using System.Collections.Generic;
-using System.Text;
+using System;
+
+namespace CryptoExchange.Net.Converters.SystemTextJson;
 
-namespace CryptoExchange.Net.Converters.SystemTextJson
-{
 /// <summary>
 /// Attribute to mark a model as json serializable. Used for AOT compilation.
 /// </summary>
@@ -20,4 +18,3 @@ namespace CryptoExchange.Net.Converters.SystemTextJson
     /// <param name="type"></param>
     public SerializationModelAttribute(Type type) { }
 }
-}

CryptoExchange.Net/Converters/SystemTextJson/SerializerOptions.cs

@@ -1,9 +1,9 @@
-using System.Collections.Concurrent;
+using System.Collections.Concurrent;
 using System.Text.Json;
 using System.Text.Json.Serialization;
 
-namespace CryptoExchange.Net.Converters.SystemTextJson
-{
+namespace CryptoExchange.Net.Converters.SystemTextJson;
+
 /// <summary>
 /// Serializer options
 /// </summary>
@@ -44,4 +44,3 @@ namespace CryptoExchange.Net.Converters.SystemTextJson
         return options;
     }
 }
-}

CryptoExchange.Net/Converters/SystemTextJson/SharedQuantityConverter.cs

@@ -1,12 +1,10 @@
-using CryptoExchange.Net.SharedApis;
+using CryptoExchange.Net.SharedApis;
 using System;
-using System.Collections.Generic;
-using System.Text;
 using System.Text.Json;
 using System.Text.Json.Serialization;
 
-namespace CryptoExchange.Net.Converters.SystemTextJson
-{
+namespace CryptoExchange.Net.Converters.SystemTextJson;
+
 internal class SharedQuantityConverter : SharedQuantityReferenceConverter<SharedQuantity> { }
 internal class SharedOrderQuantityConverter : SharedQuantityReferenceConverter<SharedOrderQuantity> { }
 
@@ -57,4 +55,3 @@ namespace CryptoExchange.Net.Converters.SystemTextJson
         writer.WriteEndArray();
     }
 }
-}

CryptoExchange.Net/Converters/SystemTextJson/SharedSymbolConverter.cs

@@ -1,12 +1,10 @@
-using CryptoExchange.Net.SharedApis;
+using CryptoExchange.Net.SharedApis;
 using System;
-using System.Collections.Generic;
-using System.Text;
 using System.Text.Json;
 using System.Text.Json.Serialization;
 
-namespace CryptoExchange.Net.Converters.SystemTextJson
-{
+namespace CryptoExchange.Net.Converters.SystemTextJson;
+
 internal class SharedSymbolConverter : JsonConverter<SharedSymbol>
 {
     public override SharedSymbol? Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
@@ -43,4 +41,3 @@ namespace CryptoExchange.Net.Converters.SystemTextJson
         writer.WriteEndArray();
     }
 }
-}

CryptoExchange.Net/Converters/SystemTextJson/SystemTextJsonMessageAccessor.cs

@@ -1,16 +1,17 @@
-using CryptoExchange.Net.Converters.MessageParsing;
+using CryptoExchange.Net.Converters.MessageParsing;
 using CryptoExchange.Net.Interfaces;
 using CryptoExchange.Net.Objects;
 using System;
-using System.Collections.Generic;
+#if NET5_0_OR_GREATER
 using System.Diagnostics.CodeAnalysis;
+#endif
 using System.IO;
 using System.Text;
 using System.Text.Json;
 using System.Threading.Tasks;
 
-namespace CryptoExchange.Net.Converters.SystemTextJson
-{
+namespace CryptoExchange.Net.Converters.SystemTextJson;
+
 /// <summary>
 /// System.Text.Json message accessor
 /// </summary>
@@ -60,13 +61,12 @@ namespace CryptoExchange.Net.Converters.SystemTextJson
         }
         catch (JsonException ex)
         {
-                var info = $"Deserialize JsonException: {ex.Message}, Path: {ex.Path}, LineNumber: {ex.LineNumber}, LinePosition: {ex.BytePositionInLine}";
+            var info = $"Json deserialization failed: {ex.Message}, Path: {ex.Path}, LineNumber: {ex.LineNumber}, LinePosition: {ex.BytePositionInLine}";
             return new CallResult<object>(new DeserializeError(info, ex));
         }
         catch (Exception ex)
         {
-                var info = $"Deserialize unknown Exception: {ex.Message}";
-                return new CallResult<object>(new DeserializeError(info, ex));
+            return new CallResult<object>(new DeserializeError($"Json deserialization failed: {ex.Message}", ex));
         }
     }
 
@@ -87,13 +87,12 @@ namespace CryptoExchange.Net.Converters.SystemTextJson
         }
         catch (JsonException ex)
         {
-                var info = $"Deserialize JsonException: {ex.Message}, Path: {ex.Path}, LineNumber: {ex.LineNumber}, LinePosition: {ex.BytePositionInLine}";
+            var info = $"Json deserialization failed: {ex.Message}, Path: {ex.Path}, LineNumber: {ex.LineNumber}, LinePosition: {ex.BytePositionInLine}";
             return new CallResult<T>(new DeserializeError(info, ex));
         }
         catch (Exception ex)
         {
-                var info = $"Unknown exception: {ex.Message}";
-                return new CallResult<T>(new DeserializeError(info, ex));
+            return new CallResult<T>(new DeserializeError($"Json deserialization failed: {ex.Message}", ex));
         }
     }
 
@@ -242,7 +241,9 @@ namespace CryptoExchange.Net.Converters.SystemTextJson
 /// <summary>
 /// System.Text.Json stream message accessor
 /// </summary>
+#pragma warning disable CA1001 // Types that own disposable fields should be disposable
 public class SystemTextJsonStreamMessageAccessor : SystemTextJsonMessageAccessor, IStreamMessageAccessor
+#pragma warning restore CA1001 // Types that own disposable fields should be disposable
 {
     private Stream? _stream;
 
@@ -286,7 +287,7 @@ namespace CryptoExchange.Net.Converters.SystemTextJson
         {
             // Not a json message
             IsValid = false;
-                return new CallResult(new DeserializeError("JsonError: " + ex.Message, ex));
+            return new CallResult(new DeserializeError($"Json deserialization failed: {ex.Message}", ex));
         }
     }
 
@@ -338,7 +339,7 @@ namespace CryptoExchange.Net.Converters.SystemTextJson
             {
                 // Value doesn't start with `{` or `[`, prevent deserialization attempt as it's slow
                 IsValid = false;
-                    return new CallResult(new ServerError("Not a json value"));
+                return new CallResult(new DeserializeError("Not a json value"));
             }
 
             _document = JsonDocument.Parse(data);
@@ -349,7 +350,7 @@ namespace CryptoExchange.Net.Converters.SystemTextJson
         {
             // Not a json message
             IsValid = false;
-                return new CallResult(new DeserializeError("JsonError: " + ex.Message, ex));
+            return new CallResult(new DeserializeError($"Json deserialization failed: {ex.Message}", ex));
         }
     }
 
@@ -373,4 +374,3 @@ namespace CryptoExchange.Net.Converters.SystemTextJson
         _document = null;
     }
 }
-}

CryptoExchange.Net/Converters/SystemTextJson/SystemTextJsonMessageSerializer.cs

@@ -1,11 +1,11 @@
-using CryptoExchange.Net.Interfaces;
+using CryptoExchange.Net.Interfaces;
+#if NET5_0_OR_GREATER
 using System.Diagnostics.CodeAnalysis;
+#endif
 using System.Text.Json;
-using System.Text.Json.Serialization;
-using System.Text.Json.Serialization.Metadata;
 
-namespace CryptoExchange.Net.Converters.SystemTextJson
-{
+namespace CryptoExchange.Net.Converters.SystemTextJson;
+
 /// <inheritdoc />
 public class SystemTextJsonMessageSerializer : IStringMessageSerializer
 {
@@ -26,4 +26,3 @@ namespace CryptoExchange.Net.Converters.SystemTextJson
 #endif
     public string Serialize<T>(T message) => JsonSerializer.Serialize(message, _options);
 }
-}

CryptoExchange.Net/CryptoExchange.Net.csproj

@@ -6,9 +6,9 @@
     <PackageId>CryptoExchange.Net</PackageId>
     <Authors>JKorf</Authors>
     <Description>CryptoExchange.Net is a base library which is used to implement different cryptocurrency (exchange) API's. It provides a standardized way of implementing different API's, which results in a very similar experience for users of the API implementations.</Description>
-    <PackageVersion>9.4.0</PackageVersion>
-    <AssemblyVersion>9.4.0</AssemblyVersion>
-    <FileVersion>9.4.0</FileVersion>
+    <PackageVersion>9.6.0</PackageVersion>
+    <AssemblyVersion>9.6.0</AssemblyVersion>
+    <FileVersion>9.6.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;CryptoExchange.Net</PackageTags>
     <RepositoryType>git</RepositoryType>
@@ -24,6 +24,7 @@
     <PackageLicenseExpression>MIT</PackageLicenseExpression>
   </PropertyGroup>
   <ItemGroup>
+    <None Include="C:\Projects\CryptoExchange.Net\CryptoExchange.Net\.editorconfig" />
     <None Include="Icon\icon.png" Pack="true" PackagePath="\" />
     <None Include="..\README.md" Pack="true" PackagePath="\" />
   </ItemGroup>
@@ -40,6 +41,12 @@
   <PropertyGroup>
     <DocumentationFile>CryptoExchange.Net.xml</DocumentationFile>
   </PropertyGroup>
+  <PropertyGroup>
+    <EnableNETAnalyzers>true</EnableNETAnalyzers>
+    <AnalysisMode>Recommended</AnalysisMode>
+    <AnalysisModeGlobalization>None</AnalysisModeGlobalization>
+    <EnforceCodeStyleInBuild>true</EnforceCodeStyleInBuild>
+  </PropertyGroup>
   <ItemGroup>
     <PackageReference Include="ConfigureAwaitChecker.Analyzer" Version="5.0.0.1">
       <PrivateAssets>all</PrivateAssets>
@@ -58,4 +65,7 @@
     <PackageReference Include="Microsoft.Extensions.Configuration.Binder" Version="9.0.6" />
     <PackageReference Include="Microsoft.Extensions.Http" Version="9.0.6" />
   </ItemGroup>
+  <ItemGroup>
+    <EditorConfigFiles Remove="C:\Projects\CryptoExchange.Net\CryptoExchange.Net\.editorconfig" />
+  </ItemGroup>
 </Project>

CryptoExchange.Net/ExchangeHelpers.cs

@@ -1,15 +1,17 @@
-using CryptoExchange.Net.Objects;
+using CryptoExchange.Net.Objects;
 using CryptoExchange.Net.SharedApis;
 using System;
 using System.Collections.Generic;
 using System.Globalization;
 using System.Runtime.CompilerServices;
+#if NETSTANDARD2_1_OR_GREATER || NET9_0_OR_GREATER
 using System.Security.Cryptography;
+#endif
 using System.Threading;
 using System.Threading.Tasks;
 
-namespace CryptoExchange.Net
-{
+namespace CryptoExchange.Net;
+
 /// <summary>
 /// General helpers functions
 /// </summary>
@@ -287,16 +289,16 @@ namespace CryptoExchange.Net
     /// <summary>
     /// Execute multiple requests to retrieve multiple pages of the result set
     /// </summary>
-        /// <typeparam name="T">Type of the client</typeparam>
-        /// <typeparam name="U">Type of the request</typeparam>
+    /// <typeparam name="TResult">Type of the client</typeparam>
+    /// <typeparam name="TRequest">Type of the request</typeparam>
     /// <param name="paginatedFunc">The func to execute with each request</param>
     /// <param name="request">The request parameters</param>
     /// <param name="ct">Cancellation token</param>
     /// <returns></returns>
-        public static async IAsyncEnumerable<ExchangeWebResult<T[]>> ExecutePages<T, U>(Func<U, INextPageToken?, CancellationToken, Task<ExchangeWebResult<T[]>>> paginatedFunc, U request, [EnumeratorCancellation]CancellationToken ct = default)
+    public static async IAsyncEnumerable<ExchangeWebResult<TResult[]>> ExecutePages<TResult, TRequest>(Func<TRequest, INextPageToken?, CancellationToken, Task<ExchangeWebResult<TResult[]>>> paginatedFunc, TRequest request, [EnumeratorCancellation]CancellationToken ct = default)
     {
-            var result = new List<T>();
-            ExchangeWebResult<T[]> batch;
+        var result = new List<TResult>();
+        ExchangeWebResult<TResult[]> batch;
         INextPageToken? nextPageToken = null;
         while (true)
         {
@@ -386,4 +388,3 @@ namespace CryptoExchange.Net
         return null;
     }
 }
-}

CryptoExchange.Net/ExchangeSymbolCache.cs

@@ -1,12 +1,11 @@
-using CryptoExchange.Net.SharedApis;
+using CryptoExchange.Net.SharedApis;
 using System;
 using System.Collections.Concurrent;
 using System.Collections.Generic;
 using System.Linq;
-using System.Text;
 
-namespace CryptoExchange.Net
-{
+namespace CryptoExchange.Net;
+
 /// <summary>
 /// Cache for symbol parsing
 /// </summary>
@@ -67,4 +66,3 @@ namespace CryptoExchange.Net
         }
     }
 }
-}

CryptoExchange.Net/ExtensionMethods.cs

@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.Collections.Generic;
 using System.IO.Compression;
 using System.IO;
@@ -10,12 +10,9 @@ using CryptoExchange.Net.Objects;
 using System.Globalization;
 using Microsoft.Extensions.DependencyInjection;
 using CryptoExchange.Net.SharedApis;
-using System.Text.Json.Serialization.Metadata;
-using System.Text.Json;
-using System.Text.Json.Serialization;
 
-namespace CryptoExchange.Net
-{
+namespace CryptoExchange.Net;
+
 /// <summary>
 /// Helper methods
 /// </summary>
@@ -498,8 +495,8 @@ namespace CryptoExchange.Net
             services.AddTransient(x => (IBookTickerSocketClient)client(x)!);
         if (typeof(IKlineSocketClient).IsAssignableFrom(typeof(T)))
             services.AddTransient(x => (IKlineSocketClient)client(x)!);
-            if (typeof(IOrderBookRestClient).IsAssignableFrom(typeof(T)))
-                services.AddTransient(x => (IOrderBookRestClient)client(x)!);
+        if (typeof(IOrderBookSocketClient).IsAssignableFrom(typeof(T)))
+            services.AddTransient(x => (IOrderBookSocketClient)client(x)!);
         if (typeof(ITickerSocketClient).IsAssignableFrom(typeof(T)))
             services.AddTransient(x => (ITickerSocketClient)client(x)!);
         if (typeof(ITickersSocketClient).IsAssignableFrom(typeof(T)))
@@ -520,5 +517,4 @@ namespace CryptoExchange.Net
         return services;
     }
 }
-}
 

CryptoExchange.Net/Interfaces/IAuthTimeProvider.cs

@@ -1,7 +1,7 @@
-using System;
+using System;
+
+namespace CryptoExchange.Net.Interfaces;
 
-namespace CryptoExchange.Net.Interfaces
-{
 /// <summary>
 /// Time provider
 /// </summary>
@@ -13,4 +13,3 @@ namespace CryptoExchange.Net.Interfaces
     /// <returns></returns>
     DateTime GetTime();
 }
-}

CryptoExchange.Net/Interfaces/IBaseApiClient.cs

@@ -1,11 +1,10 @@
-using CryptoExchange.Net.Authentication;
-using CryptoExchange.Net.Objects;
+using CryptoExchange.Net.Authentication;
 using CryptoExchange.Net.Objects.Options;
 using CryptoExchange.Net.SharedApis;
 using System;
 
-namespace CryptoExchange.Net.Interfaces
-{
+namespace CryptoExchange.Net.Interfaces;
+
 /// <summary>
 /// Base api client
 /// </summary>
@@ -45,4 +44,3 @@ namespace CryptoExchange.Net.Interfaces
     /// <param name="options">Options to set</param>
     void SetOptions<T>(UpdateOptions<T> options) where T : ApiCredentials;
 }
-}

CryptoExchange.Net/Interfaces/ICryptoRestClient.cs

@@ -1,7 +1,7 @@
-using System;
+using System;
+
+namespace CryptoExchange.Net.Interfaces;
 
-namespace CryptoExchange.Net.Interfaces
-{
 /// <summary>
 /// Client for accessing REST API's for different exchanges
 /// </summary>
@@ -14,4 +14,3 @@ namespace CryptoExchange.Net.Interfaces
     /// <returns></returns>
     T TryGet<T>(Func<T> createFunc);
 }
-}

CryptoExchange.Net/Interfaces/ICryptoSocketClient.cs

@@ -1,7 +1,7 @@
-using System;
+using System;
+
+namespace CryptoExchange.Net.Interfaces;
 
-namespace CryptoExchange.Net.Interfaces
-{
 /// <summary>
 /// Client for accessing Websocket API's for different exchanges
 /// </summary>
@@ -14,4 +14,3 @@ namespace CryptoExchange.Net.Interfaces
     /// <returns></returns>
     T TryGet<T>(Func<T> createFunc);
 }
-}

CryptoExchange.Net/Interfaces/IMessageAccessor.cs

@@ -1,13 +1,14 @@
-using CryptoExchange.Net.Converters.MessageParsing;
+using CryptoExchange.Net.Converters.MessageParsing;
 using CryptoExchange.Net.Objects;
 using System;
-using System.Collections.Generic;
+#if NET5_0_OR_GREATER
 using System.Diagnostics.CodeAnalysis;
+#endif
 using System.IO;
 using System.Threading.Tasks;
 
-namespace CryptoExchange.Net.Interfaces
-{
+namespace CryptoExchange.Net.Interfaces;
+
 /// <summary>
 /// Message accessor
 /// </summary>
@@ -107,4 +108,3 @@ namespace CryptoExchange.Net.Interfaces
     /// <param name="data"></param>
     CallResult Read(ReadOnlyMemory<byte> data);
 }
-}

CryptoExchange.Net/Interfaces/IMessageProcessor.cs

@@ -1,12 +1,11 @@
-using CryptoExchange.Net.Objects;
+using CryptoExchange.Net.Objects;
 using CryptoExchange.Net.Objects.Sockets;
 using CryptoExchange.Net.Sockets;
 using System;
-using System.Collections.Generic;
 using System.Threading.Tasks;
 
-namespace CryptoExchange.Net.Interfaces
-{
+namespace CryptoExchange.Net.Interfaces;
+
 /// <summary>
 /// Message processor
 /// </summary>
@@ -32,4 +31,3 @@ namespace CryptoExchange.Net.Interfaces
     /// <returns></returns>
     CallResult<object> Deserialize(IMessageAccessor accessor, Type type);
 }
-}

CryptoExchange.Net/Interfaces/IMessageSerializer.cs

@@ -1,7 +1,5 @@
-using System.Diagnostics.CodeAnalysis;
+namespace CryptoExchange.Net.Interfaces;
 
-namespace CryptoExchange.Net.Interfaces
-{
 /// <summary>
 /// Serializer interface
 /// </summary>
@@ -34,4 +32,3 @@ namespace CryptoExchange.Net.Interfaces
     /// <returns></returns>
     string Serialize<T>(T message);
 }
-}

CryptoExchange.Net/Interfaces/INonceProvider.cs

@@ -1,5 +1,5 @@
-namespace CryptoExchange.Net.Interfaces
-{
+namespace CryptoExchange.Net.Interfaces;
+
 /// <summary>
 /// A provider for a nonce value used when signing requests
 /// </summary>
@@ -11,4 +11,3 @@
     /// <returns>Nonce value</returns>
     long GetNonce();
 }
-}

CryptoExchange.Net/Interfaces/IOrderBookFactory.cs

@@ -1,9 +1,9 @@
-using CryptoExchange.Net.Objects.Options;
+using CryptoExchange.Net.Objects.Options;
 using CryptoExchange.Net.SharedApis;
 using System;
 
-namespace CryptoExchange.Net.Interfaces
-{
+namespace CryptoExchange.Net.Interfaces;
+
 /// <summary>
 /// Factory for ISymbolOrderBook instances
 /// </summary>
@@ -32,4 +32,3 @@ namespace CryptoExchange.Net.Interfaces
     /// <returns></returns>
     public ISymbolOrderBook Create(SharedSymbol symbol, Action<TOptions>? options = null);
 }
-}

CryptoExchange.Net/Interfaces/IRateLimiter.cs

@@ -4,8 +4,8 @@ using System.Net.Http;
 using System.Threading;
 using System.Threading.Tasks;
 
-namespace CryptoExchange.Net.Interfaces
-{
+namespace CryptoExchange.Net.Interfaces;
+
 /// <summary>
 /// Rate limiter interface
 /// </summary>
@@ -25,4 +25,3 @@ namespace CryptoExchange.Net.Interfaces
     /// <returns>The time in milliseconds spend waiting</returns>
     Task<CallResult<int>> LimitRequestAsync(ILogger log, string endpoint, HttpMethod method, bool signed, string? apiKey, RateLimitingBehaviour limitBehaviour, int requestWeight, CancellationToken ct);
 }
-}

CryptoExchange.Net/Interfaces/IRequest.cs

@@ -1,11 +1,11 @@
-using System;
+using System;
 using System.Collections.Generic;
 using System.Net.Http;
 using System.Threading;
 using System.Threading.Tasks;
 
-namespace CryptoExchange.Net.Interfaces
-{
+namespace CryptoExchange.Net.Interfaces;
+
 /// <summary>
 /// Request interface
 /// </summary>
@@ -63,4 +63,3 @@ namespace CryptoExchange.Net.Interfaces
     /// <returns></returns>
     Task<IResponse> GetResponseAsync(CancellationToken cancellationToken);
 }
-}

CryptoExchange.Net/Interfaces/IRequestFactory.cs

@@ -1,9 +1,9 @@
-using CryptoExchange.Net.Objects;
+using CryptoExchange.Net.Objects;
 using System;
 using System.Net.Http;
 
-namespace CryptoExchange.Net.Interfaces
-{
+namespace CryptoExchange.Net.Interfaces;
+
 /// <summary>
 /// Request factory interface
 /// </summary>
@@ -33,4 +33,3 @@ namespace CryptoExchange.Net.Interfaces
     /// <param name="requestTimeout">Request timeout to use</param>
     void UpdateSettings(ApiProxy? proxy, TimeSpan requestTimeout);
 }
-}

CryptoExchange.Net/Interfaces/IResponse.cs

@@ -1,10 +1,10 @@
-using System.Collections.Generic;
+using System.Collections.Generic;
 using System.IO;
 using System.Net;
 using System.Threading.Tasks;
 
-namespace CryptoExchange.Net.Interfaces
-{
+namespace CryptoExchange.Net.Interfaces;
+
 /// <summary>
 /// Response object interface
 /// </summary>
@@ -41,4 +41,3 @@ namespace CryptoExchange.Net.Interfaces
     /// </summary>
     void Close();
 }
-}

CryptoExchange.Net/Interfaces/IRestApiClient.cs

@@ -1,5 +1,5 @@
-namespace CryptoExchange.Net.Interfaces
-{
+namespace CryptoExchange.Net.Interfaces;
+
 /// <summary>
 /// Base rest API client
 /// </summary>
@@ -15,4 +15,3 @@
     /// </summary>
     int TotalRequestsMade { get; set; }
 }
-}

CryptoExchange.Net/Interfaces/IRestClient.cs

@@ -1,8 +1,8 @@
-using System;
+using System;
 using CryptoExchange.Net.Objects.Options;
 
-namespace CryptoExchange.Net.Interfaces
-{
+namespace CryptoExchange.Net.Interfaces;
+
 /// <summary>
 /// Base class for rest API implementations
 /// </summary>
@@ -23,4 +23,3 @@ namespace CryptoExchange.Net.Interfaces
     /// </summary>
     string Exchange { get; }
 }
-}

CryptoExchange.Net/Interfaces/ISocketApiClient.cs

@@ -1,10 +1,10 @@
-using CryptoExchange.Net.Objects;
+using CryptoExchange.Net.Objects;
 using CryptoExchange.Net.Objects.Options;
 using CryptoExchange.Net.Objects.Sockets;
 using System.Threading.Tasks;
 
-namespace CryptoExchange.Net.Interfaces
-{
+namespace CryptoExchange.Net.Interfaces;
+
 /// <summary>
 /// Socket API client
 /// </summary>
@@ -67,4 +67,3 @@ namespace CryptoExchange.Net.Interfaces
     /// <returns></returns>
     Task<CallResult> PrepareConnectionsAsync();
 }
-}

CryptoExchange.Net/Interfaces/ISocketClient.cs

@@ -1,10 +1,10 @@
-using System;
+using System;
 using System.Threading.Tasks;
 using CryptoExchange.Net.Objects.Options;
 using CryptoExchange.Net.Objects.Sockets;
 
-namespace CryptoExchange.Net.Interfaces
-{
+namespace CryptoExchange.Net.Interfaces;
+
 /// <summary>
 /// Base class for socket API implementations
 /// </summary>
@@ -55,4 +55,3 @@ namespace CryptoExchange.Net.Interfaces
     /// <returns></returns>
     Task UnsubscribeAllAsync();
 }
-}

CryptoExchange.Net/Interfaces/ISymbolOrderBook.cs

@@ -1,11 +1,10 @@
-using System;
-using System.Collections.Generic;
+using System;
 using System.Threading;
 using System.Threading.Tasks;
 using CryptoExchange.Net.Objects;
 
-namespace CryptoExchange.Net.Interfaces
-{
+namespace CryptoExchange.Net.Interfaces;
+
 /// <summary>
 /// Interface for order book
 /// </summary>
@@ -128,4 +127,3 @@ namespace CryptoExchange.Net.Interfaces
     /// <returns></returns>
     string ToString(int rows);
 }
-}

CryptoExchange.Net/Interfaces/ISymbolOrderBookEntry.cs

@@ -1,5 +1,5 @@
-namespace CryptoExchange.Net.Interfaces
-{
+namespace CryptoExchange.Net.Interfaces;
+
 /// <summary>
 /// Interface for order book entries
 /// </summary>
@@ -25,4 +25,3 @@
     /// </summary>
     long Sequence { get; set; }
 }
-}

CryptoExchange.Net/Interfaces/IWebsocket.cs

@@ -1,11 +1,11 @@
-using CryptoExchange.Net.Objects;
+using CryptoExchange.Net.Objects;
 using System;
 using System.Net.WebSockets;
 using System.Threading;
 using System.Threading.Tasks;
 
-namespace CryptoExchange.Net.Interfaces
-{
+namespace CryptoExchange.Net.Interfaces;
+
 /// <summary>
 /// Websocket connection interface
 /// </summary>
@@ -107,4 +107,3 @@ namespace CryptoExchange.Net.Interfaces
     /// </summary>
     void UpdateProxy(ApiProxy? proxy);
 }
-}

CryptoExchange.Net/Interfaces/IWebsocketFactory.cs

@@ -1,8 +1,8 @@
-using CryptoExchange.Net.Objects.Sockets;
+using CryptoExchange.Net.Objects.Sockets;
 using Microsoft.Extensions.Logging;
 
-namespace CryptoExchange.Net.Interfaces
-{
+namespace CryptoExchange.Net.Interfaces;
+
 /// <summary>
 /// Websocket factory interface
 /// </summary>
@@ -16,4 +16,3 @@ namespace CryptoExchange.Net.Interfaces
     /// <returns></returns>
     IWebsocket CreateWebsocket(ILogger logger, WebSocketParameters parameters);
 }
-}

CryptoExchange.Net/LibraryHelpers.cs

@@ -1,9 +1,5 @@
-using System;
-using System.Collections.Generic;
-using System.Text;
+namespace CryptoExchange.Net;
 
-namespace CryptoExchange.Net
-{
 /// <summary>
 /// Helpers for client libraries
 /// </summary>
@@ -44,4 +40,3 @@ namespace CryptoExchange.Net
         return clientOrderId;
     }
 }
-}

CryptoExchange.Net/Logging/Extensions/CryptoExchangeWebSocketClientLoggingExtension.cs

@@ -1,8 +1,8 @@
-using Microsoft.Extensions.Logging;
+using Microsoft.Extensions.Logging;
 using System;
 
-namespace CryptoExchange.Net.Logging.Extensions
-{
+namespace CryptoExchange.Net.Logging.Extensions;
+
 #pragma warning disable CS1591 // Missing XML comment for publicly visible type or member
 public static class CryptoExchangeWebSocketClientLoggingExtension
 {
@@ -384,4 +384,3 @@ namespace CryptoExchange.Net.Logging.Extensions
         _connectingCanceled(logger, socketId, null);
     }
 }
-}

CryptoExchange.Net/Logging/Extensions/RateLimitGateLoggingExtensions.cs

@@ -1,8 +1,8 @@
-using Microsoft.Extensions.Logging;
+using Microsoft.Extensions.Logging;
 using System;
 
-namespace CryptoExchange.Net.Logging.Extensions
-{
+namespace CryptoExchange.Net.Logging.Extensions;
+
 #pragma warning disable CS1591 // Missing XML comment for publicly visible type or member
 public static class RateLimitGateLoggingExtensions
 {
@@ -76,4 +76,3 @@ namespace CryptoExchange.Net.Logging.Extensions
         _rateLimitAppliedRequest(logger, requestIdId, path, guard, limit, current, null);
     }
 }
-}

CryptoExchange.Net/Logging/Extensions/RestApiClientLoggingExtensions.cs

@@ -1,11 +1,11 @@
-using CryptoExchange.Net.Objects;
+using CryptoExchange.Net.Objects;
 using Microsoft.Extensions.Logging;
 using System;
 using System.Net;
 using System.Net.Http;
 
-namespace CryptoExchange.Net.Logging.Extensions
-{
+namespace CryptoExchange.Net.Logging.Extensions;
+
 #pragma warning disable CS1591 // Missing XML comment for publicly visible type or member
 public static class RestApiClientLoggingExtensions
 {
@@ -156,4 +156,3 @@ namespace CryptoExchange.Net.Logging.Extensions
         _restApiCancellationRequested(logger, requestId, null);
     }
 }
-}

CryptoExchange.Net/Logging/Extensions/SocketApiClientLoggingExtension.cs

@@ -1,8 +1,8 @@
-using Microsoft.Extensions.Logging;
+using Microsoft.Extensions.Logging;
 using System;
 
-namespace CryptoExchange.Net.Logging.Extensions
-{
+namespace CryptoExchange.Net.Logging.Extensions;
+
 #pragma warning disable CS1591 // Missing XML comment for publicly visible type or member
 public static class SocketApiClientLoggingExtension
 {
@@ -197,4 +197,3 @@ namespace CryptoExchange.Net.Logging.Extensions
         _addingRetryAfterGuard(logger, retryAfter, null);
     }
 }
-}

CryptoExchange.Net/Logging/Extensions/SocketConnectionLoggingExtension.cs

@@ -1,9 +1,9 @@
-using System;
+using System;
 using System.Net.WebSockets;
 using Microsoft.Extensions.Logging;
 
-namespace CryptoExchange.Net.Logging.Extensions
-{
+namespace CryptoExchange.Net.Logging.Extensions;
+
 #pragma warning disable CS1591 // Missing XML comment for publicly visible type or member
 public static class SocketConnectionLoggingExtension
 {
@@ -346,4 +346,3 @@ namespace CryptoExchange.Net.Logging.Extensions
         _sendingByteData(logger, socketId, requestId, length, null);
     }
 }
-}

CryptoExchange.Net/Logging/Extensions/SymbolOrderBookLoggingExtensions.cs

@@ -1,9 +1,9 @@
-using System;
+using System;
 using CryptoExchange.Net.Objects;
 using Microsoft.Extensions.Logging;
 
-namespace CryptoExchange.Net.Logging.Extensions
-{
+namespace CryptoExchange.Net.Logging.Extensions;
+
 #pragma warning disable CS1591 // Missing XML comment for publicly visible type or member
 
 public static class SymbolOrderBookLoggingExtensions
@@ -234,4 +234,3 @@ namespace CryptoExchange.Net.Logging.Extensions
         _orderBookOutOfSyncChecksum(logger, api, symbol, null);
     }
 }
-}

CryptoExchange.Net/Logging/Extensions/TrackerLoggingExtensions.cs

@@ -1,9 +1,9 @@
-using System;
+using System;
 using CryptoExchange.Net.Objects;
 using Microsoft.Extensions.Logging;
 
-namespace CryptoExchange.Net.Logging.Extensions
-{
+namespace CryptoExchange.Net.Logging.Extensions;
+
 #pragma warning disable CS1591 // Missing XML comment for publicly visible type or member
 
 public static class TrackerLoggingExtensions
@@ -288,4 +288,3 @@ namespace CryptoExchange.Net.Logging.Extensions
         _tradeTrackerConnectionRestored(logger, symbol, null);
     }
 }
-}

CryptoExchange.Net/Objects/ApiProxy.cs

@@ -1,5 +1,5 @@
-namespace CryptoExchange.Net.Objects
-{
+namespace CryptoExchange.Net.Objects;
+
 /// <summary>
 /// Proxy info
 /// </summary>
@@ -39,4 +39,3 @@
         Password = password;
     }
 }
-}

CryptoExchange.Net/Objects/AssetAlias.cs

@@ -1,9 +1,5 @@
-using System;
-using System.Collections.Generic;
-using System.Text;
+namespace CryptoExchange.Net.Objects;
 
-namespace CryptoExchange.Net.Objects
-{
 /// <summary>
 /// An alias used by the exchange for an asset commonly known by another name
 /// </summary>
@@ -27,4 +23,3 @@ namespace CryptoExchange.Net.Objects
         CommonAssetName = commonName;
     }
 }
-}

CryptoExchange.Net/Objects/AssetAliasConfiguration.cs

@@ -1,10 +1,7 @@
-using System;
-using System.Collections.Generic;
 using System.Linq;
-using System.Text;
 
-namespace CryptoExchange.Net.Objects
-{
+namespace CryptoExchange.Net.Objects;
+
 /// <summary>
 /// Exchange configuration for asset aliases
 /// </summary>
@@ -31,4 +28,3 @@ namespace CryptoExchange.Net.Objects
     public string ExchangeToCommonName(string exchangeName) => !AutoConvertEnabled ? exchangeName : Aliases.SingleOrDefault(x => x.ExchangeAssetName == exchangeName)?.CommonAssetName ?? exchangeName;
 
 }
-}

CryptoExchange.Net/Objects/AsyncAutoResetEvent.cs

@@ -1,11 +1,11 @@
-using System;
+using System;
 using System.Collections.Generic;
 using System.Linq;
 using System.Threading;
 using System.Threading.Tasks;
 
-namespace CryptoExchange.Net.Objects
-{
+namespace CryptoExchange.Net.Objects;
+
 /// <summary>
 /// Async auto reset based on Stephen Toub`s implementation
 /// https://devblogs.microsoft.com/pfxteam/building-async-coordination-primitives-part-2-asyncautoresetevent/
@@ -106,15 +106,28 @@ namespace CryptoExchange.Net.Objects
                     toRelease.TrySetResult(true);
                 }
                 else if (!_signaled)
+                {
                     _signaled = true;
                 }
             }
         }
+    }
 
     /// <summary>
     /// Dispose
     /// </summary>
     public void Dispose()
+    {
+        Dispose(true);
+        GC.SuppressFinalize(this);
+    }
+
+    /// <summary>
+    /// Dispose
+    /// </summary>
+    public void Dispose(bool disposing)
+    {
+        if (disposing)
         {
             _waits.Clear();
         }

CryptoExchange.Net/Objects/AuthTimeProvider.cs

@@ -1,10 +1,9 @@
-using CryptoExchange.Net.Interfaces;
+using CryptoExchange.Net.Interfaces;
 using System;
 
-namespace CryptoExchange.Net.Objects
-{
+namespace CryptoExchange.Net.Objects;
+
 internal class AuthTimeProvider : IAuthTimeProvider
 {
     public DateTime GetTime() => DateTime.UtcNow;
 }
-}

CryptoExchange.Net/Objects/ByteOrderComparer.cs

@@ -1,8 +1,8 @@
-using System;
+using System;
 using System.Collections.Generic;
 
-namespace CryptoExchange.Net.Objects
-{
+namespace CryptoExchange.Net.Objects;
+
 /// <summary>
 /// Comparer for byte order
 /// </summary>
@@ -55,4 +55,3 @@ namespace CryptoExchange.Net.Objects
         return x.Length < y.Length ? -1 : 1;
     }
 }
-}

CryptoExchange.Net/Objects/CallResult.cs

@@ -1,4 +1,4 @@
-using CryptoExchange.Net.SharedApis;
+using CryptoExchange.Net.SharedApis;
 using System;
 using System.Collections.Generic;
 using System.Diagnostics.CodeAnalysis;
@@ -6,8 +6,8 @@ using System.Net;
 using System.Net.Http;
 using System.Text;
 
-namespace CryptoExchange.Net.Objects
-{
+namespace CryptoExchange.Net.Objects;
+
 /// <summary>
 /// The result of an operation
 /// </summary>
@@ -140,12 +140,12 @@ namespace CryptoExchange.Net.Objects
     /// <summary>
     /// Copy the WebCallResult to a new data type
     /// </summary>
-        /// <typeparam name="K">The new type</typeparam>
+    /// <typeparam name="TNew">The new type</typeparam>
     /// <param name="data">The data of the new type</param>
     /// <returns></returns>
-        public CallResult<K> As<K>([AllowNull] K data)
+    public CallResult<TNew> As<TNew>([AllowNull] TNew data)
     {
-            return new CallResult<K>(data, OriginalData, Error);
+        return new CallResult<TNew>(data, OriginalData, Error);
     }
 
     /// <summary>
@@ -169,24 +169,24 @@ namespace CryptoExchange.Net.Objects
     /// <summary>
     /// Copy the CallResult to a new data type
     /// </summary>
-        /// <typeparam name="K">The new type</typeparam>
+    /// <typeparam name="TNew">The new type</typeparam>
     /// <param name="data">The data</param>
     /// <param name="error">The error returned</param>
     /// <returns></returns>
-        public CallResult<K> AsErrorWithData<K>(Error error, K data)
+    public CallResult<TNew> AsErrorWithData<TNew>(Error error, TNew data)
     {
-            return new CallResult<K>(data, OriginalData, error);
+        return new CallResult<TNew>(data, OriginalData, error);
     }
 
     /// <summary>
     /// Copy the WebCallResult to a new data type
     /// </summary>
-        /// <typeparam name="K">The new type</typeparam>
+    /// <typeparam name="TNew">The new type</typeparam>
     /// <param name="error">The error to return</param>
     /// <returns></returns>
-        public CallResult<K> AsError<K>(Error error)
+    public CallResult<TNew> AsError<TNew>(Error error)
     {
-            return new CallResult<K>(default, OriginalData, error);
+        return new CallResult<TNew>(default, OriginalData, error);
     }
 
     /// <inheritdoc />
@@ -292,49 +292,49 @@ namespace CryptoExchange.Net.Objects
     /// <summary>
     /// Copy the WebCallResult to a new data type
     /// </summary>
-        /// <typeparam name="K">The new type</typeparam>
+    /// <typeparam name="TNew">The new type</typeparam>
     /// <param name="data">The data of the new type</param>
     /// <returns></returns>
-        public WebCallResult<K> As<K>([AllowNull] K data)
+    public WebCallResult<TNew> As<TNew>([AllowNull] TNew data)
     {
-            return new WebCallResult<K>(ResponseStatusCode, ResponseHeaders, ResponseTime, 0, null, RequestId, RequestUrl, RequestBody, RequestMethod, RequestHeaders, ResultDataSource.Server, data, Error);
+        return new WebCallResult<TNew>(ResponseStatusCode, ResponseHeaders, ResponseTime, 0, null, RequestId, RequestUrl, RequestBody, RequestMethod, RequestHeaders, ResultDataSource.Server, data, Error);
     }
 
     /// <summary>
     /// Copy the WebCallResult to an ExchangeWebResult of a new data type
     /// </summary>
-        /// <typeparam name="K">The new type</typeparam>
+    /// <typeparam name="TNew">The new type</typeparam>
     /// <param name="exchange">The exchange</param>
     /// <param name="tradeMode">Trade mode the result applies to</param>
     /// <param name="data">The data</param>
     /// <returns></returns>
-        public ExchangeWebResult<K> AsExchangeResult<K>(string exchange, TradingMode tradeMode, [AllowNull] K data)
+    public ExchangeWebResult<TNew> AsExchangeResult<TNew>(string exchange, TradingMode tradeMode, [AllowNull] TNew data)
     {
-            return new ExchangeWebResult<K>(exchange, tradeMode, this.As<K>(data));
+        return new ExchangeWebResult<TNew>(exchange, tradeMode, this.As<TNew>(data));
     }
 
     /// <summary>
     /// Copy the WebCallResult to an ExchangeWebResult of a new data type
     /// </summary>
-        /// <typeparam name="K">The new type</typeparam>
+    /// <typeparam name="TNew">The new type</typeparam>
     /// <param name="exchange">The exchange</param>
     /// <param name="tradeModes">Trade modes the result applies to</param>
     /// <param name="data">The data</param>
     /// <returns></returns>
-        public ExchangeWebResult<K> AsExchangeResult<K>(string exchange, TradingMode[]? tradeModes, [AllowNull] K data)
+    public ExchangeWebResult<TNew> AsExchangeResult<TNew>(string exchange, TradingMode[]? tradeModes, [AllowNull] TNew data)
     {
-            return new ExchangeWebResult<K>(exchange, tradeModes, this.As<K>(data));
+        return new ExchangeWebResult<TNew>(exchange, tradeModes, this.As<TNew>(data));
     }
 
     /// <summary>
     /// Copy the WebCallResult to a new data type
     /// </summary>
-        /// <typeparam name="K">The new type</typeparam>
+    /// <typeparam name="TNew">The new type</typeparam>
     /// <param name="error">The error returned</param>
     /// <returns></returns>
-        public WebCallResult<K> AsError<K>(Error error)
+    public WebCallResult<TNew> AsError<TNew>(Error error)
     {
-            return new WebCallResult<K>(ResponseStatusCode, ResponseHeaders, ResponseTime, 0, null, RequestId, RequestUrl, RequestBody, RequestMethod, RequestHeaders, ResultDataSource.Server, default, error);
+        return new WebCallResult<TNew>(ResponseStatusCode, ResponseHeaders, ResponseTime, 0, null, RequestId, RequestUrl, RequestBody, RequestMethod, RequestHeaders, ResultDataSource.Server, default, error);
     }
 
     /// <inheritdoc />
@@ -470,35 +470,35 @@ namespace CryptoExchange.Net.Objects
     /// <summary>
     /// Copy the WebCallResult to a new data type
     /// </summary>
-        /// <typeparam name="K">The new type</typeparam>
+    /// <typeparam name="TNew">The new type</typeparam>
     /// <param name="data">The data of the new type</param>
     /// <returns></returns>
-        public new WebCallResult<K> As<K>([AllowNull] K data)
+    public new WebCallResult<TNew> As<TNew>([AllowNull] TNew data)
     {
-            return new WebCallResult<K>(ResponseStatusCode, ResponseHeaders, ResponseTime, ResponseLength, OriginalData, RequestId, RequestUrl, RequestBody, RequestMethod, RequestHeaders, DataSource, data, Error);
+        return new WebCallResult<TNew>(ResponseStatusCode, ResponseHeaders, ResponseTime, ResponseLength, OriginalData, RequestId, RequestUrl, RequestBody, RequestMethod, RequestHeaders, DataSource, data, Error);
     }
 
     /// <summary>
     /// Copy the WebCallResult to a new data type
     /// </summary>
-        /// <typeparam name="K">The new type</typeparam>
+    /// <typeparam name="TNew">The new type</typeparam>
     /// <param name="error">The error returned</param>
     /// <returns></returns>
-        public new WebCallResult<K> AsError<K>(Error error)
+    public new WebCallResult<TNew> AsError<TNew>(Error error)
     {
-            return new WebCallResult<K>(ResponseStatusCode, ResponseHeaders, ResponseTime, ResponseLength, OriginalData, RequestId, RequestUrl, RequestBody, RequestMethod, RequestHeaders, DataSource, default, error);
+        return new WebCallResult<TNew>(ResponseStatusCode, ResponseHeaders, ResponseTime, ResponseLength, OriginalData, RequestId, RequestUrl, RequestBody, RequestMethod, RequestHeaders, DataSource, default, error);
     }
 
     /// <summary>
     /// Copy the WebCallResult to a new data type
     /// </summary>
-        /// <typeparam name="K">The new type</typeparam>
+    /// <typeparam name="TNew">The new type</typeparam>
     /// <param name="data">The data</param>
     /// <param name="error">The error returned</param>
     /// <returns></returns>
-        public new WebCallResult<K> AsErrorWithData<K>(Error error, K data)
+    public new WebCallResult<TNew> AsErrorWithData<TNew>(Error error, TNew data)
     {
-            return new WebCallResult<K>(ResponseStatusCode, ResponseHeaders, ResponseTime, ResponseLength, OriginalData, RequestId, RequestUrl, RequestBody, RequestMethod, RequestHeaders, DataSource, data, error);
+        return new WebCallResult<TNew>(ResponseStatusCode, ResponseHeaders, ResponseTime, ResponseLength, OriginalData, RequestId, RequestUrl, RequestBody, RequestMethod, RequestHeaders, DataSource, data, error);
     }
 
     /// <summary>
@@ -526,41 +526,41 @@ namespace CryptoExchange.Net.Objects
     /// <summary>
     /// Copy the WebCallResult to an ExchangeWebResult of a new data type
     /// </summary>
-        /// <typeparam name="K">The new type</typeparam>
+    /// <typeparam name="TNew">The new type</typeparam>
     /// <param name="exchange">The exchange</param>
     /// <param name="tradeMode">Trade mode the result applies to</param>
     /// <param name="data">Data</param>
     /// <param name="nextPageToken">Next page token</param>
     /// <returns></returns>
-        public ExchangeWebResult<K> AsExchangeResult<K>(string exchange, TradingMode tradeMode, [AllowNull] K data, INextPageToken? nextPageToken = null)
+    public ExchangeWebResult<TNew> AsExchangeResult<TNew>(string exchange, TradingMode tradeMode, [AllowNull] TNew data, INextPageToken? nextPageToken = null)
     {
-            return new ExchangeWebResult<K>(exchange, tradeMode, As<K>(data), nextPageToken);
+        return new ExchangeWebResult<TNew>(exchange, tradeMode, As<TNew>(data), nextPageToken);
     }
 
     /// <summary>
     /// Copy the WebCallResult to an ExchangeWebResult of a new data type
     /// </summary>
-        /// <typeparam name="K">The new type</typeparam>
+    /// <typeparam name="TNew">The new type</typeparam>
     /// <param name="exchange">The exchange</param>
     /// <param name="tradeModes">Trade modes the result applies to</param>
     /// <param name="data">Data</param>
     /// <param name="nextPageToken">Next page token</param>
     /// <returns></returns>
-        public ExchangeWebResult<K> AsExchangeResult<K>(string exchange, TradingMode[]? tradeModes, [AllowNull] K data, INextPageToken? nextPageToken = null)
+    public ExchangeWebResult<TNew> AsExchangeResult<TNew>(string exchange, TradingMode[]? tradeModes, [AllowNull] TNew data, INextPageToken? nextPageToken = null)
     {
-            return new ExchangeWebResult<K>(exchange, tradeModes, As<K>(data), nextPageToken);
+        return new ExchangeWebResult<TNew>(exchange, tradeModes, As<TNew>(data), nextPageToken);
     }
 
     /// <summary>
     /// Copy the WebCallResult to an ExchangeWebResult with a specific error
     /// </summary>
-        /// <typeparam name="K">The new type</typeparam>
+    /// <typeparam name="TNew">The new type</typeparam>
     /// <param name="exchange">The exchange</param>
     /// <param name="error">The error returned</param>
     /// <returns></returns>
-        public ExchangeWebResult<K> AsExchangeError<K>(string exchange, Error error)
+    public ExchangeWebResult<TNew> AsExchangeError<TNew>(string exchange, Error error)
     {
-            return new ExchangeWebResult<K>(exchange, null, AsError<K>(error));
+        return new ExchangeWebResult<TNew>(exchange, null, AsError<TNew>(error));
     }
 
     /// <summary>
@@ -585,4 +585,3 @@ namespace CryptoExchange.Net.Objects
         return sb.ToString();
     }
 }
-}

CryptoExchange.Net/Objects/Constants.cs

@@ -1,5 +1,5 @@
-namespace CryptoExchange.Net.Objects
-{
+namespace CryptoExchange.Net.Objects;
+
 /// <summary>
 /// Constants
 /// </summary>
@@ -18,4 +18,3 @@
     /// </summary>
     public const string BodyPlaceHolderKey = "_BODY_";
 }
-}

CryptoExchange.Net/Objects/Enums.cs

@@ -1,7 +1,5 @@
-using CryptoExchange.Net.Attributes;
+namespace CryptoExchange.Net.Objects;
 
-namespace CryptoExchange.Net.Objects
-{
 /// <summary>
 /// What to do when a request would exceed the rate limit
 /// </summary>
@@ -251,4 +249,18 @@ namespace CryptoExchange.Net.Objects
     /// </summary>
     DEX
 }
+
+/// <summary>
+/// Timeout behavior for queries
+/// </summary>
+public enum TimeoutBehavior
+{
+    /// <summary>
+    /// Fail the request
+    /// </summary>
+    Fail,
+    /// <summary>
+    /// Mark the query as successful
+    /// </summary>
+    Succeed
 }