.

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.12.0</PackageVersion>
+    <PackageVersion>9.6.0</PackageVersion>
-    <AssemblyVersion>9.12.0</AssemblyVersion>
+    <AssemblyVersion>9.6.0</AssemblyVersion>
-    <FileVersion>9.12.0</FileVersion>
+    <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.12.0" />
+    <PackageReference Include="CryptoExchange.Net" Version="9.6.0" />
     <PackageReference Include="protobuf-net" Version="3.2.56" />
   </ItemGroup>
 </Project>

CryptoExchange.Net.Protobuf/README.md

@@ -5,27 +5,6 @@
 Protobuf support for CryptoExchange.Net.
 
 ## Release notes
-* Version 9.12.0 - 03 Nov 2025
-    * Updated CryptoExchange.Net version to 9.12.0, see https://github.com/JKorf/CryptoExchange.Net/releases/
-
-* Version 9.11.1 - 30 Oct 2025
-    * Updated CryptoExchange.Net version to 9.11.0, see https://github.com/JKorf/CryptoExchange.Net/releases/
-
-* Version 9.11.0 - 30 Oct 2025
-    * Updated CryptoExchange.Net version to 9.11.0, see https://github.com/JKorf/CryptoExchange.Net/releases/
-
-* Version 9.10.0 - 15 Oct 2025
-    * Updated CryptoExchange.Net version to 9.10.0, see https://github.com/JKorf/CryptoExchange.Net/releases/
-
-* Version 9.9.0 - 06 Oct 2025
-    * Updated CryptoExchange.Net version to 9.9.0, see https://github.com/JKorf/CryptoExchange.Net/releases/
-
-* Version 9.8.0 - 30 Sep 2025
-    * Updated CryptoExchange.Net version to 9.8.0, see https://github.com/JKorf/CryptoExchange.Net/releases/
-
-* Version 9.7.0 - 01 Sep 2025
-    * Updated CryptoExchange.Net version to 9.7.0, see https://github.com/JKorf/CryptoExchange.Net/releases/
-
 * Version 9.6.0 - 25 Aug 2025
     * Updated CryptoExchange.Net version to 9.6.0
 

CryptoExchange.Net.UnitTests/CallResultTests.cs

@@ -5,7 +5,6 @@ using NUnit.Framework.Legacy;
 using System;
 using System.Collections.Generic;
 using System.Linq;
-using System.Net;
 using System.Net.Http;
 using System.Text;
 using System.Threading.Tasks;
@@ -114,7 +113,6 @@ namespace CryptoExchange.Net.UnitTests
         {
             var result = new WebCallResult<TestObjectResult>(
                 System.Net.HttpStatusCode.OK,
-                HttpVersion.Version11,
                 new KeyValuePair<string, string[]>[0],
                 TimeSpan.FromSeconds(1),
                 null,
@@ -145,7 +143,6 @@ namespace CryptoExchange.Net.UnitTests
         {
             var result = new WebCallResult<TestObjectResult>(
                 System.Net.HttpStatusCode.OK,
-                HttpVersion.Version11,
                 new KeyValuePair<string, string[]>[0],
                 TimeSpan.FromSeconds(1),
                 null,

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

@@ -6,10 +6,14 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="18.0.0"></PackageReference>
+    <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" />
-    <PackageReference Include="NUnit" Version="4.4.0"></PackageReference>
+    <PackageReference Include="NUnit" Version="4.3.2"></PackageReference>
-    <PackageReference Include="NUnit3TestAdapter" Version="5.2.0"></PackageReference>
+    <PackageReference Include="NUnit3TestAdapter" Version="5.0.0"></PackageReference>
   </ItemGroup>
 
   <ItemGroup>

CryptoExchange.Net.UnitTests/ExchangeHelpersTests.cs

@@ -32,7 +32,6 @@ namespace CryptoExchange.Net.UnitTests
         [TestCase(0.1, 1, 0.0001, RoundingType.Closest, 0.532, 0.532)]
         [TestCase(0.1, 1, 0.0001, RoundingType.Down, 0.5516592, 0.5516)]
         [TestCase(0.1, 1, 0.0001, RoundingType.Closest, 0.5516592, 0.5517)]
-        [TestCase(0, 1, 0.000000001, RoundingType.Closest, 0.0000097232, 0.000009723)]
         public void AdjustValueStepTests(decimal min, decimal max, decimal? step, RoundingType roundingType, decimal input, decimal expected)
         {
             var result = ExchangeHelpers.AdjustValueStep(min, max, step, roundingType, input);

CryptoExchange.Net.UnitTests/SocketClientTests.cs

@@ -202,7 +202,7 @@ namespace CryptoExchange.Net.UnitTests
             await sub;
 
             // assert
-            ClassicAssert.IsTrue(client.SubClient.TestSubscription.Status != SubscriptionStatus.Subscribed);
+            ClassicAssert.IsFalse(client.SubClient.TestSubscription.Confirmed);
         }
 
         [TestCase()]
@@ -225,7 +225,7 @@ namespace CryptoExchange.Net.UnitTests
             await sub;
 
             // assert
-            Assert.That(client.SubClient.TestSubscription.Status == SubscriptionStatus.Subscribed);
+            Assert.That(client.SubClient.TestSubscription.Confirmed);
         }
     }
 }

CryptoExchange.Net.UnitTests/TestImplementations/TestRestClient.cs

@@ -60,8 +60,8 @@ namespace CryptoExchange.Net.UnitTests.TestImplementations
             request.Setup(c => c.GetHeaders()).Returns(() => headers.ToArray());
 
             var factory = Mock.Get(Api1.RequestFactory);
-            factory.Setup(c => c.Create(It.IsAny<Version>(), It.IsAny<HttpMethod>(), It.IsAny<Uri>(), It.IsAny<int>()))
+            factory.Setup(c => c.Create(It.IsAny<HttpMethod>(), It.IsAny<Uri>(), It.IsAny<int>()))
-                .Callback<Version, HttpMethod, Uri, int>((version, method, uri, id) => 
+                .Callback<HttpMethod, Uri, int>((method, uri, id) => 
                 { 
                     request.Setup(a => a.Uri).Returns(uri);
                     request.Setup(a => a.Method).Returns(method); 
@@ -69,8 +69,8 @@ namespace CryptoExchange.Net.UnitTests.TestImplementations
                 .Returns(request.Object);
 
             factory = Mock.Get(Api2.RequestFactory);
-            factory.Setup(c => c.Create(It.IsAny<Version>(), It.IsAny<HttpMethod>(), It.IsAny<Uri>(), It.IsAny<int>()))
+            factory.Setup(c => c.Create(It.IsAny<HttpMethod>(), It.IsAny<Uri>(), It.IsAny<int>()))
-                .Callback<Version, HttpMethod, Uri, int>((version, method, uri, id) =>
+                .Callback<HttpMethod, Uri, int>((method, uri, id) =>
                 {
                     request.Setup(a => a.Uri).Returns(uri);
                     request.Setup(a => a.Method).Returns(method);
@@ -90,12 +90,12 @@ namespace CryptoExchange.Net.UnitTests.TestImplementations
             request.Setup(c => c.GetResponseAsync(It.IsAny<CancellationToken>())).Throws(we);
 
             var factory = Mock.Get(Api1.RequestFactory);
-            factory.Setup(c => c.Create(It.IsAny<Version>(), It.IsAny<HttpMethod>(), It.IsAny<Uri>(), It.IsAny<int>()))
+            factory.Setup(c => c.Create(It.IsAny<HttpMethod>(), It.IsAny<Uri>(), It.IsAny<int>()))
                 .Returns(request.Object);
 
 
             factory = Mock.Get(Api2.RequestFactory);
-            factory.Setup(c => c.Create(It.IsAny<Version>(), It.IsAny<HttpMethod>(), It.IsAny<Uri>(), It.IsAny<int>()))
+            factory.Setup(c => c.Create(It.IsAny<HttpMethod>(), It.IsAny<Uri>(), It.IsAny<int>()))
                 .Returns(request.Object);
         }
 
@@ -118,13 +118,13 @@ namespace CryptoExchange.Net.UnitTests.TestImplementations
             request.Setup(c => c.GetHeaders()).Returns(headers.ToArray());
 
             var factory = Mock.Get(Api1.RequestFactory);
-            factory.Setup(c => c.Create(It.IsAny<Version>(), It.IsAny<HttpMethod>(), It.IsAny<Uri>(), It.IsAny<int>()))
+            factory.Setup(c => c.Create(It.IsAny<HttpMethod>(), It.IsAny<Uri>(), It.IsAny<int>()))
-                .Callback<Version, HttpMethod, Uri, int>((version, method, uri, id) => request.Setup(a => a.Uri).Returns(uri))
+                .Callback<HttpMethod, Uri, int>((method, uri, id) => request.Setup(a => a.Uri).Returns(uri))
                 .Returns(request.Object);
 
             factory = Mock.Get(Api2.RequestFactory);
-            factory.Setup(c => c.Create(It.IsAny<Version>(), It.IsAny<HttpMethod>(), It.IsAny<Uri>(), It.IsAny<int>()))
+            factory.Setup(c => c.Create(It.IsAny<HttpMethod>(), It.IsAny<Uri>(), It.IsAny<int>()))
-                .Callback<Version, HttpMethod, Uri, int>((version, method, uri, id) => request.Setup(a => a.Uri).Returns(uri))
+                .Callback<HttpMethod, Uri, int>((method, uri, id) => request.Setup(a => a.Uri).Returns(uri))
                 .Returns(request.Object);
         }
     }

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;
-using System.IO;
+
-using CryptoExchange.Net.Converters.SystemTextJson;
+namespace CryptoExchange.Net.Authentication;
-using CryptoExchange.Net.Converters.MessageParsing;
 
-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>
@@ -209,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);
     }
@@ -222,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);
     }
@@ -234,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));
     }
 
@@ -460,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
@@ -470,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,15 +1,13 @@
 using System;
-using System.Collections.Generic;
 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>
@@ -126,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,6 +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}, base address: {BaseAddress}", apiClient.GetType().Name, apiClient.BaseAddress);
         ApiClients.Add(apiClient);
         return apiClient;
     }
@@ -119,10 +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>
@@ -21,8 +21,5 @@ namespace CryptoExchange.Net.Clients
     protected BaseRestClient(ILoggerFactory? loggerFactory, string name) : base(loggerFactory, name)
     {
         _logger = loggerFactory?.CreateLogger(name + ".RestClient") ?? NullLoggerFactory.Instance.CreateLogger(name);
-
-            LibraryHelpers.StaticLogger = loggerFactory?.CreateLogger("CryptoExchange");
-        }
     }
 }

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>
@@ -40,8 +39,6 @@ namespace CryptoExchange.Net.Clients
     protected BaseSocketClient(ILoggerFactory? loggerFactory, string name) : base(loggerFactory, name)
     {
         _logger = loggerFactory?.CreateLogger(name + ".SocketClient") ?? NullLoggerFactory.Instance.CreateLogger(name);
-
-            LibraryHelpers.StaticLogger = loggerFactory?.CreateLogger("CryptoExchange");
     }
 
     /// <summary>
@@ -131,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 CryptoExchange.Net.Interfaces;
-using Microsoft.Extensions.DependencyInjection;
 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

@@ -18,8 +18,8 @@ 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>
@@ -106,7 +106,7 @@ namespace CryptoExchange.Net.Clients
               options,
               apiOptions)
     {
-            RequestFactory.Configure(options, httpClient);
+        RequestFactory.Configure(options.Proxy, options.RequestTimeout, httpClient);
     }
 
     /// <summary>
@@ -388,7 +388,7 @@ namespace CryptoExchange.Net.Clients
             queryString = $"?{queryString}";
 
         var uri = new Uri(baseAddress.AppendPath(definition.Path) + queryString);
-            var request = RequestFactory.Create(ClientOptions.HttpVersion, definition.Method, uri, requestId);
+        var request = RequestFactory.Create(definition.Method, uri, requestId);
         request.Accept = Constants.JsonContentHeader;
 
         foreach (var header in requestConfiguration.Headers)
@@ -443,6 +443,9 @@ namespace CryptoExchange.Net.Clients
         {
             response = await request.GetResponseAsync(cancellationToken).ConfigureAwait(false);
             sw.Stop();
+            var statusCode = response.StatusCode;
+            var headers = response.ResponseHeaders;
+            var responseLength = response.ContentLength;
             responseStream = await response.GetResponseStreamAsync().ConfigureAwait(false);
             var outputOriginalData = ApiOptions.OutputOriginalData ?? ClientOptions.OutputOriginalData;
 
@@ -472,18 +475,18 @@ namespace CryptoExchange.Net.Clients
                 if (error.Code == null || error.Code == 0)
                     error.Code = (int)response.StatusCode;
 
-                    return new WebCallResult<T>(response.StatusCode, response.HttpVersion, response.ResponseHeaders, sw.Elapsed, response.ContentLength, 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, error!);
             }
 
             var valid = await accessor.Read(responseStream, outputOriginalData).ConfigureAwait(false);
             if (typeof(T) == typeof(object))
                 // Success status code and expected empty response, assume it's correct
-                    return new WebCallResult<T>(response.StatusCode, response.HttpVersion, response.ResponseHeaders, sw.Elapsed, 0, accessor.OriginalDataAvailable ? accessor.GetOriginalString() : "[Data only available when OutputOriginal = true in client options]", request.RequestId, request.Uri.ToString(), request.Content, request.Method, request.GetHeaders(), ResultDataSource.Server, default, null);
+                return new WebCallResult<T>(statusCode, headers, sw.Elapsed, 0, accessor.OriginalDataAvailable ? accessor.GetOriginalString() : "[Data only available when OutputOriginal = true in client options]", request.RequestId, request.Uri.ToString(), request.Content, request.Method, request.GetHeaders(), ResultDataSource.Server, default, null);
 
             if (!valid)
             {
                 // Invalid json
-                    return new WebCallResult<T>(response.StatusCode, response.HttpVersion, response.ResponseHeaders, sw.Elapsed, response.ContentLength, OutputOriginalData ? accessor.GetOriginalString() : null, request.RequestId, request.Uri.ToString(), request.Content, request.Method, request.GetHeaders(), ResultDataSource.Server, default, valid.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
@@ -500,55 +503,33 @@ namespace CryptoExchange.Net.Clients
                 }
 
                 // Success status code, but TryParseError determined it was an error response
-                    return new WebCallResult<T>(response.StatusCode, response.HttpVersion, response.ResponseHeaders, sw.Elapsed, response.ContentLength, OutputOriginalData ? accessor.GetOriginalString() : null, request.RequestId, request.Uri.ToString(), request.Content, request.Method, request.GetHeaders(), ResultDataSource.Server, default, parsedError);
+                return new WebCallResult<T>(response.StatusCode, response.ResponseHeaders, sw.Elapsed, responseLength, OutputOriginalData ? accessor.GetOriginalString() : null, request.RequestId, request.Uri.ToString(), request.Content, request.Method, request.GetHeaders(), ResultDataSource.Server, default, parsedError);
             }
 
             var deserializeResult = accessor.Deserialize<T>();
-                return new WebCallResult<T>(response.StatusCode, response.HttpVersion, response.ResponseHeaders, sw.Elapsed, response.ContentLength, OutputOriginalData ? accessor.GetOriginalString() : null, request.RequestId, request.Uri.ToString(), request.Content, request.Method, request.GetHeaders(), ResultDataSource.Server, deserializeResult.Data, deserializeResult.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, deserializeResult.Data, deserializeResult.Error);
         }
         catch (HttpRequestException requestException)
         {
             // Request exception, can't reach server for instance
             var error = new WebError(requestException.Message, requestException);
-                return new WebCallResult<T>(null, null, null, sw.Elapsed, null, null, request.RequestId, request.Uri.ToString(), request.Content, request.Method, request.GetHeaders(), ResultDataSource.Server, default, error);
+            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)
         {
             if (cancellationToken != default && canceledException.CancellationToken == cancellationToken)
             {
                 // Cancellation token canceled by caller
-                    return new WebCallResult<T>(null, null, null, sw.Elapsed, null, null, request.RequestId, request.Uri.ToString(), request.Content, request.Method, request.GetHeaders(), ResultDataSource.Server, default, new CancellationRequestedError(canceledException));
+                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 CancellationRequestedError(canceledException));
             }
             else
             {
                 // Request timed out
                 var error = new WebError($"Request timed out", exception: canceledException);
                 error.ErrorType = ErrorType.Timeout;
-                    return new WebCallResult<T>(null, null, null, sw.Elapsed, null, null, request.RequestId, request.Uri.ToString(), request.Content, request.Method, request.GetHeaders(), ResultDataSource.Server, default, error);
+                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 (ArgumentException argumentException)
-            {
-                if (argumentException.Message.StartsWith("Only HTTP/"))
-                {
-                    // Unsupported HTTP version error .net framework
-                    var error = ArgumentError.Invalid(nameof(RestExchangeOptions.HttpVersion), $"Invalid HTTP version {request.HttpVersion}: " + argumentException.Message);
-                    return new WebCallResult<T>(null, null, null, sw.Elapsed, null, null, request.RequestId, request.Uri.ToString(), request.Content, request.Method, request.GetHeaders(), ResultDataSource.Server, default, error);
-                }
-
-                throw;
-            }
-            catch (NotSupportedException notSupportedException)
-            {
-                if (notSupportedException.Message.StartsWith("Request version value must be one of"))
-                {
-                    // Unsupported HTTP version error dotnet code
-                    var error = ArgumentError.Invalid(nameof(RestExchangeOptions.HttpVersion), $"Invalid HTTP version {request.HttpVersion}: " + notSupportedException.Message);
-                    return new WebCallResult<T>(null, null, null, sw.Elapsed, null, null, request.RequestId, request.Uri.ToString(), request.Content, request.Method, request.GetHeaders(), ResultDataSource.Server, default, error);
-                }
-
-                throw;
-            }
         finally
         {
             accessor?.Clear();
@@ -656,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();
@@ -693,21 +674,21 @@ namespace CryptoExchange.Net.Clients
     {
         base.SetOptions(options);
 
-            RequestFactory.UpdateSettings(options.Proxy, options.RequestTimeout ?? ClientOptions.RequestTimeout, ClientOptions.HttpKeepAliveInterval);
+        RequestFactory.UpdateSettings(options.Proxy, options.RequestTimeout ?? ClientOptions.RequestTimeout);
     }
 
     internal async Task<WebCallResult<bool>> SyncTimeAsync()
     {
         var timeSyncParams = GetTimeSyncInfo();
         if (timeSyncParams == null)
-                return new WebCallResult<bool>(null, null, null, null, null, null, null, null, null, null, null, ResultDataSource.Server, true, null);
+            return new WebCallResult<bool>(null, null, null, null, null, null, null, null, null, null, ResultDataSource.Server, true, null);
 
         if (await timeSyncParams.TimeSyncState.Semaphore.WaitAsync(0).ConfigureAwait(false))
         {
             if (!timeSyncParams.SyncTime || DateTime.UtcNow - timeSyncParams.TimeSyncState.LastSyncTime < timeSyncParams.RecalculationInterval)
             {
                 timeSyncParams.TimeSyncState.Semaphore.Release();
-                    return new WebCallResult<bool>(null, null, null, null, null, null, null, null, null, null, null, ResultDataSource.Server, true, null);
+                return new WebCallResult<bool>(null, null, null, null, null, null, null, null, null, null, ResultDataSource.Server, true, null);
             }
 
             var localTime = DateTime.UtcNow;
@@ -736,7 +717,7 @@ namespace CryptoExchange.Net.Clients
             timeSyncParams.TimeSyncState.Semaphore.Release();
         }
 
-            return new WebCallResult<bool>(null, null, null, null, null, null, null, null, null, null, null, ResultDataSource.Server, true, null);
+        return new WebCallResult<bool>(null, null, null, null, null, null, null, null, null, null, ResultDataSource.Server, true, null);
     }
 
     private bool ShouldCache(RequestDefinition definition)
@@ -744,4 +725,3 @@ namespace CryptoExchange.Net.Clients
         && definition.Method == HttpMethod.Get
         && !definition.PreventCaching;
 }
-}

CryptoExchange.Net/Clients/SocketApiClient.cs

@@ -17,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>
@@ -86,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
@@ -227,7 +227,7 @@ namespace CryptoExchange.Net.Clients
             while (true)
             {
                 // Get a new or existing socket connection
-                    var socketResult = await GetSocketConnection(url, subscription.Authenticated, false, ct, subscription.Topic).ConfigureAwait(false);
+                var socketResult = await GetSocketConnection(url, subscription.Authenticated, false, subscription.Topic).ConfigureAwait(false);
                 if (!socketResult)
                     return socketResult.As<UpdateSubscription>(null);
 
@@ -269,7 +269,6 @@ namespace CryptoExchange.Net.Clients
             return new CallResult<UpdateSubscription>(new ServerError(new ErrorInfo(ErrorType.WebsocketPaused, "Socket is paused")));
         }
 
-            subscription.Status = SubscriptionStatus.Subscribing;
         var waitEvent = new AsyncResetEvent(false);
         var subQuery = subscription.CreateSubscriptionQuery(socketConnection);
         if (subQuery != null)
@@ -280,7 +279,7 @@ namespace CryptoExchange.Net.Clients
             {
                 waitEvent?.Set();
                 var isTimeout = subResult.Error is CancellationRequestedError;
-                    if (isTimeout && subscription.Status == SubscriptionStatus.Subscribed)
+                if (isTimeout && subscription.Confirmed)
                 {
                     // No response received, but the subscription did receive updates. We'll assume success
                 }
@@ -288,7 +287,6 @@ namespace CryptoExchange.Net.Clients
                 {
                     _logger.FailedToSubscribe(socketConnection.SocketId, subResult.Error?.ToString());
                     // If this was a timeout we still need to send an unsubscribe to prevent messages coming in later
-                        subscription.Status = SubscriptionStatus.Pending;
                     await socketConnection.CloseAsync(subscription).ConfigureAwait(false);
                     return new CallResult<UpdateSubscription>(subResult.Error!);
                 }
@@ -297,7 +295,7 @@ namespace CryptoExchange.Net.Clients
             subscription.HandleSubQueryResponse(subQuery.Response!);
         }
 
-            subscription.Status = SubscriptionStatus.Subscribed;
+        subscription.Confirmed = true;
         if (ct != default)
         {
             subscription.CancellationTokenRegistration = ct.Register(async () =>
@@ -342,10 +340,16 @@ namespace CryptoExchange.Net.Clients
 
         SocketConnection socketConnection;
         var released = false;
-            await semaphoreSlim.WaitAsync().ConfigureAwait(false);
+
         try
         {
-                var socketResult = await GetSocketConnection(url, query.Authenticated, true, ct).ConfigureAwait(false);
+            await semaphoreSlim.WaitAsync(ct).ConfigureAwait(false);
+        }
+        catch (OperationCanceledException) { }
+
+        try
+        {
+            var socketResult = await GetSocketConnection(url, query.Authenticated, true).ConfigureAwait(false);
             if (!socketResult)
                 return socketResult.As<THandlerResponse>(default);
 
@@ -397,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;
@@ -496,56 +506,25 @@ namespace CryptoExchange.Net.Clients
     /// <param name="address">The address the socket is for</param>
     /// <param name="authenticated">Whether the socket should be authenticated</param>
     /// <param name="dedicatedRequestConnection">Whether a dedicated request connection should be returned</param>
-        /// <param name="ct">Cancellation token</param>
     /// <param name="topic">The subscription topic, can be provided when multiple of the same topics are not allowed on a connection</param>
     /// <returns></returns>
-        protected virtual async Task<CallResult<SocketConnection>> GetSocketConnection(string address, bool authenticated, bool dedicatedRequestConnection, CancellationToken ct, string? topic = null)
+    protected virtual async Task<CallResult<SocketConnection>> GetSocketConnection(string address, bool authenticated, bool dedicatedRequestConnection, string? topic = null)
     {
-            var socketQuery = socketConnections.Where(s => s.Value.Tag.TrimEnd('/') == address.TrimEnd('/')
+        var socketQuery = socketConnections.Where(s => (s.Value.Status == SocketConnection.SocketStatus.None || s.Value.Status == SocketConnection.SocketStatus.Connected)
+                                                  && s.Value.Tag.TrimEnd('/') == address.TrimEnd('/')
                                                   && s.Value.ApiClient.GetType() == GetType()
-                                                      && (AllowTopicsOnTheSameConnection || !s.Value.Topics.Contains(topic)))
+                                                  && (s.Value.Authenticated == authenticated || !authenticated)
-                                                .Select(x => x.Value)
+                                                  && (AllowTopicsOnTheSameConnection || !s.Value.Topics.Contains(topic))
-                                                .ToList();
+                                                  && s.Value.Connected);
 
-            // If all current socket connections are reconnecting or resubscribing wait for that to finish as we can probably use the existing connection
+        SocketConnection connection;
-            var delayStart = DateTime.UtcNow;
-            var delayed = false;
-            while (socketQuery.Count >= 1 && socketQuery.All(x => x.Status == SocketConnection.SocketStatus.Reconnecting || x.Status == SocketConnection.SocketStatus.Resubscribing))
-            {
-                if (DateTime.UtcNow - delayStart > TimeSpan.FromSeconds(10))
-                {
-                    if (socketQuery.Count >= 1 && socketQuery.All(x => x.Status == SocketConnection.SocketStatus.Reconnecting || x.Status == SocketConnection.SocketStatus.Resubscribing))
-                    {
-                        // If after this time we still trying to reconnect/reprocess there is some issue in the connection
-                        _logger.TimeoutWaitingForReconnectingSocket();
-                        return new CallResult<SocketConnection>(new CantConnectError());
-                    }
-
-                    break;
-                }
-
-                delayed = true;
-                try { await Task.Delay(50, ct).ConfigureAwait(false); } catch (Exception) { }
-
-                if (ct.IsCancellationRequested)
-                    return new CallResult<SocketConnection>(new CancellationRequestedError());
-            }
-
-            if (delayed)
-                _logger.WaitedForReconnectingSocket((long)(DateTime.UtcNow - delayStart).TotalMilliseconds);
-
-            socketQuery = socketQuery.Where(s => (s.Status == SocketConnection.SocketStatus.None || s.Status == SocketConnection.SocketStatus.Connected)                                                     
-                                                && (s.Authenticated == authenticated || !authenticated)
-                                                && s.Connected).ToList();
-
-            SocketConnection? connection;
         if (!dedicatedRequestConnection)
         {
-                connection = socketQuery.Where(s => !s.DedicatedRequestConnection.IsDedicatedRequestConnection).OrderBy(s => s.UserSubscriptionCount).FirstOrDefault();
+            connection = socketQuery.Where(s => !s.Value.DedicatedRequestConnection.IsDedicatedRequestConnection).OrderBy(s => s.Value.UserSubscriptionCount).FirstOrDefault().Value;
         }
         else
         {
-                connection = socketQuery.Where(s => s.DedicatedRequestConnection.IsDedicatedRequestConnection).FirstOrDefault();
+            connection = socketQuery.Where(s => s.Value.DedicatedRequestConnection.IsDedicatedRequestConnection).FirstOrDefault().Value;
             if (connection != null && !connection.DedicatedRequestConnection.Authenticated)
                 // Mark dedicated request connection as authenticated if the request is authenticated
                 connection.DedicatedRequestConnection.Authenticated = authenticated;
@@ -553,13 +532,10 @@ namespace CryptoExchange.Net.Clients
 
         if (connection != null)
         {
-                if (connection.UserSubscriptionCount < ClientOptions.SocketSubscriptionsCombineTarget
+            if (connection.UserSubscriptionCount < ClientOptions.SocketSubscriptionsCombineTarget || (socketConnections.Count >= (ApiOptions.MaxSocketConnections ?? ClientOptions.MaxSocketConnections) && socketConnections.All(s => s.Value.UserSubscriptionCount >= ClientOptions.SocketSubscriptionsCombineTarget)))
-                    || (socketConnections.Count >= (ApiOptions.MaxSocketConnections ?? ClientOptions.MaxSocketConnections) && socketConnections.All(s => s.Value.UserSubscriptionCount >= ClientOptions.SocketSubscriptionsCombineTarget)))
-                {
                 // Use existing socket if it has less than target connections OR it has the least connections and we can't make new
                 return new CallResult<SocketConnection>(connection);
         }
-            }
 
         var connectionAddress = await GetConnectionUrlAsync(address, authenticated).ConfigureAwait(false);
         if (!connectionAddress)
@@ -752,7 +728,7 @@ namespace CryptoExchange.Net.Clients
     {
         foreach (var item in DedicatedConnectionConfigs)
         {
-                var socketResult = await GetSocketConnection(item.SocketAddress, item.Authenticated, true, CancellationToken.None).ConfigureAwait(false);
+            var socketResult = await GetSocketConnection(item.SocketAddress, item.Authenticated, true).ConfigureAwait(false);
             if (!socketResult)
                 return socketResult.AsDataless();
 
@@ -849,7 +825,7 @@ namespace CryptoExchange.Net.Clients
                     cs.SubscriptionStates.ForEach(subState =>
                     {
                         sb.AppendLine($"\t\t\tId: {subState.Id}");
-                            sb.AppendLine($"\t\t\tStatus: {subState.Status}");
+                        sb.AppendLine($"\t\t\tConfirmed: {subState.Confirmed}");
                         sb.AppendLine($"\t\t\tInvocations: {subState.Invocations}");
                         sb.AppendLine($"\t\t\tIdentifiers: [{subState.ListenMatcher.ToString()}]");
                     });
@@ -863,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>();
         {
@@ -879,7 +858,7 @@ namespace CryptoExchange.Net.Clients
         }
 
         semaphoreSlim?.Dispose();
-            base.Dispose();
+        base.Dispose(disposing);
     }
 
     /// <summary>
@@ -898,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;
-using System.Collections.Concurrent;
 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,12 +1,11 @@
-using Microsoft.Extensions.Logging;
 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>
@@ -29,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;
@@ -48,7 +47,7 @@ namespace CryptoExchange.Net.Converters.SystemTextJson
             if (string.IsNullOrEmpty(value))
             {
                 if (typeToConvert == typeof(bool))
-                        LibraryHelpers.StaticLogger?.LogWarning("Received null bool value, but property type is not a nullable bool");
+                    Trace.WriteLine($"{DateTime.Now:yyyy/MM/dd HH:mm:ss:fff} | Warning | Received null bool value, but property type is not a nullable bool");
                 return default;
             }
 
@@ -82,4 +81,3 @@ namespace CryptoExchange.Net.Converters.SystemTextJson
     }
 
 }
-}

CryptoExchange.Net/Converters/SystemTextJson/CommaSplitEnumConverter.cs

@@ -1,13 +1,13 @@
-using System;
+using System;
-using System.Collections.Generic;
+#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,4 +1,3 @@
-using Microsoft.Extensions.Logging;
 using System;
 using System.Diagnostics;
 using System.Diagnostics.CodeAnalysis;
@@ -6,8 +5,8 @@ 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>
@@ -15,8 +14,8 @@ namespace CryptoExchange.Net.Converters.SystemTextJson
 {
     private static readonly DateTime _epoch = new(1970, 1, 1, 0, 0, 0, DateTimeKind.Utc);
     private const long _ticksPerSecond = TimeSpan.TicksPerMillisecond * 1000;
-        private const decimal _ticksPerMicrosecond = TimeSpan.TicksPerMillisecond / 1000m;
+    private const double _ticksPerMicrosecond = TimeSpan.TicksPerMillisecond / 1000d;
-        private const decimal _ticksPerNanosecond = TimeSpan.TicksPerMillisecond / 1000m / 1000;
+    private const double _ticksPerNanosecond = TimeSpan.TicksPerMillisecond / 1000d / 1000;
 
     /// <inheritdoc />
     public override bool CanConvert(Type typeToConvert)
@@ -35,22 +34,22 @@ 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)
             {
                 if (typeToConvert == typeof(DateTime))
-                        LibraryHelpers.StaticLogger?.LogWarning("DateTime value of null, but property is not nullable");
+                    Trace.WriteLine($"{DateTime.Now:yyyy/MM/dd HH:mm:ss:fff} | Warning | DateTime value of null, but property is not nullable");
                 return default;
             }
 
             if (reader.TokenType is JsonTokenType.Number)
             {
-                    var decValue = reader.GetDecimal();
+                var longValue = reader.GetDouble();
-                    if (decValue == 0 || decValue < 0)
+                if (longValue == 0 || longValue < 0)
                     return default;
 
-                    return ParseFromDecimal(decValue);
+                return ParseFromDouble(longValue);
             }
             else if (reader.TokenType is JsonTokenType.String)
             {
@@ -58,7 +57,7 @@ namespace CryptoExchange.Net.Converters.SystemTextJson
                 if (string.IsNullOrWhiteSpace(stringValue)
                     || stringValue == "-1"
                     || stringValue == "0001-01-01T00:00:00Z"
-                        || decimal.TryParse(stringValue, out var decVal) && decVal == 0)
+                    || double.TryParse(stringValue, out var doubleVal) && doubleVal == 0)
                 {
                     return default;
                 }
@@ -89,24 +88,20 @@ namespace CryptoExchange.Net.Converters.SystemTextJson
     }
 
     /// <summary>
-        /// Parse a double value to datetime
+    /// Parse a long value to datetime
     /// </summary>
-        public static DateTime ParseFromDouble(double value)
+    /// <param name="longValue"></param>
-            => ParseFromDecimal((decimal)value);
+    /// <returns></returns>
-
+    public static DateTime ParseFromDouble(double longValue)
-        /// <summary>
-        /// Parse a decimal value to datetime
-        /// </summary>
-        public static DateTime ParseFromDecimal(decimal value)
     {
-            if (value < 19999999999)
+        if (longValue < 19999999999)
-                return ConvertFromSeconds(value);
+            return ConvertFromSeconds(longValue);
-            if (value < 19999999999999)
+        if (longValue < 19999999999999)
-                return ConvertFromMilliseconds(value);
+            return ConvertFromMilliseconds(longValue);
-            if (value < 19999999999999999)
+        if (longValue < 19999999999999999)
-                return ConvertFromMicroseconds(value);
+            return ConvertFromMicroseconds(longValue);
 
-            return ConvertFromNanoseconds(value);
+        return ConvertFromNanoseconds(longValue);
     }
 
     /// <summary>
@@ -125,7 +120,7 @@ namespace CryptoExchange.Net.Converters.SystemTextJson
                 || !int.TryParse(stringValue.Substring(8, 2), out var hour)
                 || !int.TryParse(stringValue.Substring(10, 2), out var minute))
             {
-                    LibraryHelpers.StaticLogger?.LogWarning("Unknown DateTime format: " + stringValue);
+                Trace.WriteLine($"{DateTime.Now:yyyy/MM/dd HH:mm:ss:fff} | Warning | Unknown DateTime format: " + stringValue);
                 return default;
             }
             return new DateTime(year, month, day, hour, minute, 0, DateTimeKind.Utc);
@@ -138,7 +133,7 @@ namespace CryptoExchange.Net.Converters.SystemTextJson
                 || !int.TryParse(stringValue.Substring(4, 2), out var month)
                 || !int.TryParse(stringValue.Substring(6, 2), out var day))
             {
-                    LibraryHelpers.StaticLogger?.LogWarning("Unknown DateTime format: " + stringValue);
+                Trace.WriteLine($"{DateTime.Now:yyyy/MM/dd HH:mm:ss:fff} | Warning | Unknown DateTime format: " + stringValue);
                 return default;
             }
             return new DateTime(year, month, day, 0, 0, 0, DateTimeKind.Utc);
@@ -151,25 +146,25 @@ namespace CryptoExchange.Net.Converters.SystemTextJson
                 || !int.TryParse(stringValue.Substring(2, 2), out var month)
                 || !int.TryParse(stringValue.Substring(4, 2), out var day))
             {
-                    LibraryHelpers.StaticLogger?.LogWarning("Unknown DateTime format: " + stringValue);
+                Trace.WriteLine("{DateTime.Now:yyyy/MM/dd HH:mm:ss:fff} | Warning | Unknown DateTime format: " + stringValue);
                 return default;
             }
             return new DateTime(year + 2000, month, day, 0, 0, 0, DateTimeKind.Utc);
         }
 
-            if (decimal.TryParse(stringValue, NumberStyles.Float, CultureInfo.InvariantCulture, out var decimalValue))
+        if (double.TryParse(stringValue, NumberStyles.Float, CultureInfo.InvariantCulture, out var doubleValue))
         {
             // Parse 1637745563.000 format
-                if (decimalValue <= 0)
+            if (doubleValue <= 0)
                 return default;
-                if (decimalValue < 19999999999)
+            if (doubleValue < 19999999999)
-                    return ConvertFromSeconds(decimalValue);
+                return ConvertFromSeconds(doubleValue);
-                if (decimalValue < 19999999999999)
+            if (doubleValue < 19999999999999)
-                    return ConvertFromMilliseconds(decimalValue);
+                return ConvertFromMilliseconds((long)doubleValue);
-                if (decimalValue < 19999999999999999)
+            if (doubleValue < 19999999999999999)
-                    return ConvertFromMicroseconds(decimalValue);
+                return ConvertFromMicroseconds((long)doubleValue);
 
-                return ConvertFromNanoseconds(decimalValue);
+            return ConvertFromNanoseconds((long)doubleValue);
         }
 
         if (stringValue.Length == 10)
@@ -180,7 +175,7 @@ namespace CryptoExchange.Net.Converters.SystemTextJson
                 || !int.TryParse(values[1], out var month)
                 || !int.TryParse(values[2], out var day))
             {
-                    LibraryHelpers.StaticLogger?.LogWarning("Unknown DateTime format: " + stringValue);
+                Trace.WriteLine("{DateTime.Now:yyyy/MM/dd HH:mm:ss:fff} | Warning | Unknown DateTime format: " + stringValue);
                 return default;
             }
 
@@ -193,71 +188,54 @@ namespace CryptoExchange.Net.Converters.SystemTextJson
     /// <summary>
     /// Convert a seconds since epoch (01-01-1970) value to DateTime
     /// </summary>
-        public static DateTime ConvertFromSeconds(decimal seconds) => _epoch.AddTicks((long)Math.Round(seconds * _ticksPerSecond));
+    /// <param name="seconds"></param>
-        /// <summary>
+    /// <returns></returns>
-        /// Convert a nanoseconds since epoch (01-01-1970) value to DateTime
+    public static DateTime ConvertFromSeconds(double seconds) => _epoch.AddTicks((long)Math.Round(seconds * _ticksPerSecond));
-        /// </summary>
-        public static DateTime ConvertFromSeconds(double seconds) => ConvertFromSeconds((decimal)seconds);
-        /// <summary>
-        /// Convert a nanoseconds since epoch (01-01-1970) value to DateTime
-        /// </summary>
-        public static DateTime ConvertFromSeconds(long seconds) => ConvertFromSeconds((decimal)seconds);
     /// <summary>
     /// Convert a milliseconds since epoch (01-01-1970) value to DateTime
     /// </summary>
-        public static DateTime ConvertFromMilliseconds(decimal milliseconds) => _epoch.AddTicks((long)Math.Round(milliseconds * TimeSpan.TicksPerMillisecond));
+    /// <param name="milliseconds"></param>
-        /// <summary>
+    /// <returns></returns>
-        /// Convert a nanoseconds since epoch (01-01-1970) value to DateTime
+    public static DateTime ConvertFromMilliseconds(double milliseconds) => _epoch.AddTicks((long)Math.Round(milliseconds * TimeSpan.TicksPerMillisecond));
-        /// </summary>
-        public static DateTime ConvertFromMilliseconds(double milliseconds) => ConvertFromMilliseconds((decimal)milliseconds);
-        /// <summary>
-        /// Convert a nanoseconds since epoch (01-01-1970) value to DateTime
-        /// </summary>
-        public static DateTime ConvertFromMilliseconds(long milliseconds) => ConvertFromMilliseconds((decimal)milliseconds);
     /// <summary>
     /// Convert a microseconds since epoch (01-01-1970) value to DateTime
     /// </summary>
-        public static DateTime ConvertFromMicroseconds(decimal microseconds) => _epoch.AddTicks((long)Math.Round(microseconds * _ticksPerMicrosecond));
+    /// <param name="microseconds"></param>
+    /// <returns></returns>
+    public static DateTime ConvertFromMicroseconds(double microseconds) => _epoch.AddTicks((long)Math.Round(microseconds * _ticksPerMicrosecond));
     /// <summary>
     /// Convert a nanoseconds since epoch (01-01-1970) value to DateTime
     /// </summary>
-        public static DateTime ConvertFromMicroseconds(double microseconds) => ConvertFromMicroseconds((decimal)microseconds);
+    /// <param name="nanoseconds"></param>
-        /// <summary>
+    /// <returns></returns>
-        /// Convert a nanoseconds since epoch (01-01-1970) value to DateTime
+    public static DateTime ConvertFromNanoseconds(double nanoseconds) => _epoch.AddTicks((long)Math.Round(nanoseconds * _ticksPerNanosecond));
-        /// </summary>
-        public static DateTime ConvertFromMicroseconds(long microseconds) => ConvertFromMicroseconds((decimal)microseconds);
-        /// <summary>
-        /// Convert a nanoseconds since epoch (01-01-1970) value to DateTime
-        /// </summary>
-        public static DateTime ConvertFromNanoseconds(decimal nanoseconds) => _epoch.AddTicks((long)Math.Round(nanoseconds * _ticksPerNanosecond));
-        /// <summary>
-        /// Convert a nanoseconds since epoch (01-01-1970) value to DateTime
-        /// </summary>
-        public static DateTime ConvertFromNanoseconds(double nanoseconds) => ConvertFromNanoseconds((decimal)nanoseconds);
-        /// <summary>
-        /// Convert a nanoseconds since epoch (01-01-1970) value to DateTime
-        /// </summary>
-        public static DateTime ConvertFromNanoseconds(long nanoseconds) => ConvertFromNanoseconds((decimal)nanoseconds);
 
     /// <summary>
     /// Convert a DateTime value to seconds since epoch (01-01-1970) value
     /// </summary>
+    /// <param name="time"></param>
+    /// <returns></returns>
     [return: NotNullIfNotNull("time")]
     public static long? ConvertToSeconds(DateTime? time) => time == null ? null : (long)Math.Round((time.Value - _epoch).TotalSeconds);
     /// <summary>
     /// Convert a DateTime value to milliseconds since epoch (01-01-1970) value
     /// </summary>
+    /// <param name="time"></param>
+    /// <returns></returns>
     [return: NotNullIfNotNull("time")]
     public static long? ConvertToMilliseconds(DateTime? time) => time == null ? null : (long)Math.Round((time.Value - _epoch).TotalMilliseconds);
     /// <summary>
     /// Convert a DateTime value to microseconds since epoch (01-01-1970) value
     /// </summary>
+    /// <param name="time"></param>
+    /// <returns></returns>
     [return: NotNullIfNotNull("time")]
     public static long? ConvertToMicroseconds(DateTime? time) => time == null ? null : (long)Math.Round((time.Value - _epoch).Ticks / _ticksPerMicrosecond);
     /// <summary>
     /// Convert a DateTime value to nanoseconds since epoch (01-01-1970) value
     /// </summary>
+    /// <param name="time"></param>
+    /// <returns></returns>
     [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;
-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
 /// </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,6 +1,4 @@
-using CryptoExchange.Net.Attributes;
+using CryptoExchange.Net.Attributes;
-using Microsoft.Extensions.Logging;
-using Microsoft.Extensions.Logging.Abstractions;
 using System;
 using System.Collections.Concurrent;
 using System.Collections.Generic;
@@ -11,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>
@@ -66,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 static List<KeyValuePair<T, string>>? _mapping;
-        private NullableEnumConverter? _nullableEnumConverter = null;
+    private NullableEnumConverter? _nullableEnumConverter;
 
     private static ConcurrentBag<string> _unknownValuesWarned = new ConcurrentBag<string>();
 
@@ -81,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);
+            return EnumConverter<T>.ReadNullable(ref reader, typeToConvert, options, out var isEmptyString, out var warn);
         }
 
         public override void Write(Utf8JsonWriter writer, T? value, JsonSerializerOptions options)
@@ -100,13 +98,20 @@ namespace CryptoExchange.Net.Converters.SystemTextJson
     /// <inheritdoc />
     public override T Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
     {
-            var t = ReadNullable(ref reader, typeToConvert, options, out var isEmptyString);
+        var t = ReadNullable(ref reader, typeToConvert, options, out var isEmptyString, out var warn);
         if (t == null)
         {
-                if (isEmptyString && !_unknownValuesWarned.Contains(null))
+            if (warn)
+            {
+                if (isEmptyString)
                 {
                     // We received an empty string and have no mapping for it, and the property isn't nullable
-                    LibraryHelpers.StaticLogger?.LogWarning($"Received null or empty enum value, but property type is not a nullable enum. EnumType: {typeof(T).FullName}. If you think {typeof(T).FullName} should be nullable please open an issue on the Github repo");
+                    Trace.WriteLine($"{DateTime.Now:yyyy/MM/dd HH:mm:ss:fff} | Warning | Received empty string as enum value, but property type is not a nullable enum. EnumType: {typeof(T).Name}. If you think {typeof(T).Name} should be nullable please open an issue on the Github repo");
+                }
+                else
+                {
+                    Trace.WriteLine($"{DateTime.Now:yyyy/MM/dd HH:mm:ss:fff} | Warning | Received null enum value, but property type is not a nullable enum. EnumType: {typeof(T).Name}. If you think {typeof(T).Name} should be nullable please open an issue on the Github repo");
+                }
             }
 
             return new T(); // return default value
@@ -117,9 +122,10 @@ namespace CryptoExchange.Net.Converters.SystemTextJson
         }
     }
 
-        private T? ReadNullable(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options, out bool isEmptyString)
+    private static T? ReadNullable(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options, out bool isEmptyString, out bool warn)
     {
         isEmptyString = false;
+        warn = false;
         var enumType = typeof(T);
         if (_mapping == null)
             _mapping = AddMapping();
@@ -134,10 +140,10 @@ namespace CryptoExchange.Net.Converters.SystemTextJson
             _ => throw new Exception("Invalid token type for enum deserialization: " + reader.TokenType)
         };
 
-            if (stringValue is null)
+        if (string.IsNullOrEmpty(stringValue))
             return null;
 
-            if (!GetValue(enumType, stringValue, out var result))
+        if (!GetValue(enumType, stringValue!, out var result))
         {
             if (string.IsNullOrWhiteSpace(stringValue))
             {
@@ -148,8 +154,9 @@ namespace CryptoExchange.Net.Converters.SystemTextJson
                 // We received an enum value but weren't able to parse it.
                 if (!_unknownValuesWarned.Contains(stringValue))
                 {
+                    warn = true;
                     _unknownValuesWarned.Add(stringValue!);
-                        LibraryHelpers.StaticLogger?.LogWarning($"Cannot map enum value. EnumType: {enumType.FullName}, Value: {stringValue}, Known values: {string.Join(", ", _mapping.Select(m => m.Value))}. If you think {stringValue} should added please open an issue on the Github repo");
+                    Trace.WriteLine($"{DateTime.Now:yyyy/MM/dd HH:mm:ss:fff} | Warning | Cannot map enum value. EnumType: {enumType.Name}, Value: {stringValue}, Known values: {string.Join(", ", _mapping.Select(m => m.Value))}. If you think {stringValue} should added please open an issue on the Github repo");
                 }
             }
 
@@ -197,13 +204,6 @@ namespace CryptoExchange.Net.Converters.SystemTextJson
             return false;
         }
 
-            if (String.IsNullOrEmpty(value))
-            {
-                // An empty/null value will always fail when parsing, so just return here
-                result = default;
-                return false;
-            }
-
         try
         {
             // If no explicit mapping is found try to parse string
@@ -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;
-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 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;
-using System.Collections.Generic;
-using System.Text;
 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;
-using System.Collections.Generic;
+
-using System.Text;
+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>
@@ -240,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;
 
@@ -371,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.13.0</PackageVersion>
+    <PackageVersion>9.6.0</PackageVersion>
-    <AssemblyVersion>9.13.0</AssemblyVersion>
+    <AssemblyVersion>9.6.0</AssemblyVersion>
-    <FileVersion>9.13.0</FileVersion>
+    <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>
@@ -51,11 +58,14 @@
     </PackageReference>
   </ItemGroup>
   <ItemGroup>
-    <PackageReference Include="Microsoft.Extensions.Logging" Version="9.0.10" />
+    <PackageReference Include="Microsoft.Extensions.Logging" Version="9.0.6" />
-    <PackageReference Include="System.Text.Json" Version="9.0.10" />
+    <PackageReference Include="System.Text.Json" Version="9.0.6" />
   </ItemGroup>
   <ItemGroup Label="Transitive Client Packages">
-    <PackageReference Include="Microsoft.Extensions.Configuration.Binder" Version="9.0.10" />
+    <PackageReference Include="Microsoft.Extensions.Configuration.Binder" Version="9.0.6" />
-    <PackageReference Include="Microsoft.Extensions.Http" Version="9.0.10" />
+    <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>
@@ -89,6 +91,8 @@ namespace CryptoExchange.Net
             else value += (step.Value - offset);
         }
 
+        value = RoundDown(value, 8);
+            
         return value.Normalize();
     }
 
@@ -285,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="TResult">Type of the client</typeparam>
-        /// <typeparam name="U">Type of the request</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>();
+        var result = new List<TResult>();
-            ExchangeWebResult<T[]> batch;
+        ExchangeWebResult<TResult[]> batch;
         INextPageToken? nextPageToken = null;
         while (true)
         {
@@ -384,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>
@@ -416,36 +413,6 @@ namespace CryptoExchange.Net
     /// </summary>
     public static bool IsDelivery(this TradingMode type) => type == TradingMode.DeliveryInverse || type == TradingMode.DeliveryLinear;
 
-        /// <summary>
-        /// Whether the account type is a futures account
-        /// </summary>
-        public static bool IsFuturesAccount(this SharedAccountType type) =>
-            type == SharedAccountType.PerpetualLinearFutures
-            || type == SharedAccountType.DeliveryLinearFutures
-            || type == SharedAccountType.PerpetualInverseFutures
-            || type == SharedAccountType.DeliveryInverseFutures;
-
-        /// <summary>
-        /// Whether the account type is a margin account
-        /// </summary>
-        public static bool IsMarginAccount(this SharedAccountType type) =>
-            type == SharedAccountType.CrossMargin
-            || type == SharedAccountType.IsolatedMargin;
-
-        /// <summary>
-        /// Map a TradingMode value to a SharedAccountType enum value
-        /// </summary>
-        public static SharedAccountType ToAccountType(this TradingMode mode)
-        {
-            if (mode == TradingMode.Spot) return SharedAccountType.Spot;
-            if (mode == TradingMode.PerpetualLinear) return SharedAccountType.PerpetualLinearFutures;
-            if (mode == TradingMode.PerpetualInverse) return SharedAccountType.PerpetualInverseFutures;
-            if (mode == TradingMode.DeliveryInverse) return SharedAccountType.DeliveryInverseFutures;
-            if (mode == TradingMode.DeliveryLinear) return SharedAccountType.DeliveryLinearFutures;
-
-            throw new ArgumentException(nameof(mode), "Unmapped trading mode");
-        }
-
     /// <summary>
     /// Register rest client interfaces
     /// </summary>
@@ -475,8 +442,6 @@ namespace CryptoExchange.Net
             services.AddTransient(x => (IFeeRestClient)client(x)!);
         if (typeof(IBookTickerRestClient).IsAssignableFrom(typeof(T)))
             services.AddTransient(x => (IBookTickerRestClient)client(x)!);
-            if (typeof(ITransferRestClient).IsAssignableFrom(typeof(T)))
-                services.AddTransient(x => (ITransferRestClient)client(x)!);
 
         if (typeof(ISpotOrderRestClient).IsAssignableFrom(typeof(T)))
             services.AddTransient(x => (ISpotOrderRestClient)client(x)!);
@@ -552,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.Authentication;
-using CryptoExchange.Net.Objects;
 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/IExchangeService.cs

@@ -1,13 +0,0 @@
-namespace CryptoExchange.Net.Interfaces
-{
-    /// <summary>
-    /// Service for an exchange
-    /// </summary>
-    public interface IExchangeService
-    {
-        /// <summary>
-        /// The exchange the service is for
-        /// </summary>
-        public string ExchangeName { get; }
-    }
-}

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>
@@ -28,10 +28,6 @@ namespace CryptoExchange.Net.Interfaces
     /// </summary>
     Uri Uri { get; }
     /// <summary>
-        /// HTTP protocol version
-        /// </summary>
-        Version HttpVersion { get; }
-        /// <summary>
     /// internal request id for tracing
     /// </summary>
     int RequestId { get; }
@@ -67,4 +63,3 @@ namespace CryptoExchange.Net.Interfaces
     /// <returns></returns>
     Task<IResponse> GetResponseAsync(CancellationToken cancellationToken);
 }
-}

CryptoExchange.Net/Interfaces/IRequestFactory.cs

@@ -1,10 +1,9 @@
-using CryptoExchange.Net.Objects;
+using CryptoExchange.Net.Objects;
-using CryptoExchange.Net.Objects.Options;
 using System;
 using System.Net.Http;
 
-namespace CryptoExchange.Net.Interfaces
+namespace CryptoExchange.Net.Interfaces;
-{
+
 /// <summary>
 /// Request factory interface
 /// </summary>
@@ -13,21 +12,24 @@ namespace CryptoExchange.Net.Interfaces
     /// <summary>
     /// Create a request for an uri
     /// </summary>
-        IRequest Create(Version httpRequestVersion, HttpMethod method, Uri uri, int requestId);
+    /// <param name="method"></param>
+    /// <param name="uri"></param>
+    /// <param name="requestId"></param>
+    /// <returns></returns>
+    IRequest Create(HttpMethod method, Uri uri, int requestId);
 
     /// <summary>
     /// Configure the requests created by this factory
     /// </summary>
-        /// <param name="options">Rest client options</param>
+    /// <param name="requestTimeout">Request timeout to use</param>
     /// <param name="httpClient">Optional shared http client instance</param>
-        void Configure(RestExchangeOptions options, HttpClient? httpClient = null);
+    /// <param name="proxy">Optional proxy to use when no http client is provided</param>
+    void Configure(ApiProxy? proxy, TimeSpan requestTimeout, HttpClient? httpClient = null);
 
     /// <summary>
     /// Update settings
     /// </summary>
     /// <param name="proxy">Proxy to use</param>
     /// <param name="requestTimeout">Request timeout to use</param>
-        /// <param name="httpKeepAliveInterval">Http client keep alive interval</param>
+    void UpdateSettings(ApiProxy? proxy, TimeSpan requestTimeout);
-        void UpdateSettings(ApiProxy? proxy, TimeSpan requestTimeout, TimeSpan? httpKeepAliveInterval);
-    }
 }

CryptoExchange.Net/Interfaces/IResponse.cs

@@ -1,11 +1,10 @@
-using System;
 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>
@@ -16,11 +15,6 @@ namespace CryptoExchange.Net.Interfaces
     /// </summary>
     HttpStatusCode StatusCode { get; }
 
-        /// <summary>
-        /// Http protocol version
-        /// </summary>
-        Version HttpVersion { get; }
-
     /// <summary>
     /// Whether the status code indicates a success status
     /// </summary>
@@ -47,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;
-using System.Collections.Generic;
 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/ITrackerFactory.cs

@@ -1,45 +0,0 @@
-using CryptoExchange.Net.SharedApis;
-using CryptoExchange.Net.Trackers.Klines;
-using CryptoExchange.Net.Trackers.Trades;
-using System;
-
-namespace CryptoExchange.Net.Interfaces
-{
-    /// <summary>
-    /// Tracker factory
-    /// </summary>
-    public interface ITrackerFactory
-    {
-        /// <summary>
-        /// Whether the factory supports creating a KlineTracker instance for this symbol and interval
-        /// </summary>
-        /// <param name="symbol">The symbol</param>
-        /// <param name="interval">The kline interval</param>
-        bool CanCreateKlineTracker(SharedSymbol symbol, SharedKlineInterval interval);
-
-        /// <summary>
-        /// Create a new kline tracker
-        /// </summary>
-        /// <param name="symbol">The symbol</param>
-        /// <param name="interval">Kline interval</param>
-        /// <param name="limit">The max amount of klines to retain</param>
-        /// <param name="period">The max period the data should be retained</param>
-        /// <returns></returns>
-        IKlineTracker CreateKlineTracker(SharedSymbol symbol, SharedKlineInterval interval, int? limit = null, TimeSpan? period = null);
-
-        /// <summary>
-        /// Whether the factory supports creating a TradeTracker instance for this symbol
-        /// </summary>
-        /// <param name="symbol">The symbol</param>
-        bool CanCreateTradeTracker(SharedSymbol symbol);
-
-        /// <summary>
-        /// Create a new trade tracker for a symbol
-        /// </summary>
-        /// <param name="symbol">The symbol</param>
-        /// <param name="limit">The max amount of trades to retain</param>
-        /// <param name="period">The max period the data should be retained</param>
-        /// <returns></returns>
-        ITradeTracker CreateTradeTracker(SharedSymbol symbol, int? limit = null, TimeSpan? period = null);
-    }
-}

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,62 +1,15 @@
-using CryptoExchange.Net.Objects;
+namespace CryptoExchange.Net;
-using Microsoft.Extensions.Logging;
-using System;
-using System.Collections.Generic;
-using System.Net;
-using System.Net.Http;
-using System.Text;
 
-namespace CryptoExchange.Net
-{
 /// <summary>
 /// Helpers for client libraries
 /// </summary>
 public static class LibraryHelpers
 {
-        private static ILogger? _staticLogger;
-        /// <summary>
-        /// Static logger
-        /// </summary>
-        public static ILogger? StaticLogger
-        {
-            get => _staticLogger;
-            internal set  
-            {
-                if (_staticLogger != null)
-                    return;
-
-                _staticLogger = value;
-            }
-        }
-
     /// <summary>
     /// Client order id separator
     /// </summary>
     public const string ClientOrderIdSeparator = "JK";
 
-        private static Dictionary<string, string> _defaultClientReferences = new Dictionary<string, string>()
-        {
-            { "Binance.Spot", "x-VICEW9VV" },
-            { "Binance.Futures", "x-d63tKbx3" },
-            { "BingX", "easytrading" },
-            { "Bitfinex", "kCCe-CNBO" },
-            { "Bitget", "6x21p" },
-            { "BitMart", "EASYTRADING0001" },
-            { "BitMEX", "Sent from JKorf" },
-            { "BloFin", "5c07cf695885c282" },
-            { "Bybit", "Zx000356" },
-            { "CoinEx", "x-147866029-" },
-            { "GateIo", "copytraderpw" },
-            { "HTX", "AA1ef14811" },
-            { "Kucoin.FuturesName", "Easytradingfutures" },
-            { "Kucoin.FuturesKey", "9e08c05f-454d-4580-82af-2f4c7027fd00" },
-            { "Kucoin.SpotName", "Easytrading" },
-            { "Kucoin.SpotKey", "f8ae62cb-2b3d-420c-8c98-e1c17dd4e30a" },
-            { "Mexc", "EASYT" },
-            { "OKX", "1425d83a94fbBCDE" },
-            { "XT", "4XWeqN10M1fcoI5L" },
-        };
-
     /// <summary>
     /// Apply broker id to a client order id
     /// </summary>
@@ -86,74 +39,4 @@ namespace CryptoExchange.Net
 
         return clientOrderId;
     }
-
-        /// <summary>
-        /// Get the client reference for an exchange if available
-        /// </summary>
-        public static string GetClientReference(Func<string?> optionsReference, string exchange, string? topic = null)
-        {
-            var optionsValue = optionsReference();
-            if (!string.IsNullOrEmpty(optionsValue))
-                return optionsValue!;
-
-            var key = exchange;
-            if (topic != null)
-                key += "." + topic;
-
-            return _defaultClientReferences.TryGetValue(key, out var id) ? id : throw new KeyNotFoundException($"{exchange} not found in configuration");
-        }
-
-        /// <summary>
-        /// Create a new HttpMessageHandler instance
-        /// </summary>  
-        public static HttpMessageHandler CreateHttpClientMessageHandler(ApiProxy? proxy, TimeSpan? keepAliveInterval)
-        {
-#if NET5_0_OR_GREATER
-            var socketHandler = new SocketsHttpHandler();
-            try
-            {
-                if (keepAliveInterval != null && keepAliveInterval != TimeSpan.Zero)
-                {
-                    socketHandler.KeepAlivePingPolicy = HttpKeepAlivePingPolicy.Always;
-                    socketHandler.KeepAlivePingDelay = keepAliveInterval.Value;
-                    socketHandler.KeepAlivePingTimeout = TimeSpan.FromSeconds(10);
-                }
-
-                socketHandler.AutomaticDecompression = DecompressionMethods.GZip | DecompressionMethods.Deflate;
-                socketHandler.DefaultProxyCredentials = CredentialCache.DefaultCredentials;
-            }
-            catch (PlatformNotSupportedException) { }
-            catch (NotImplementedException) { } // Mono runtime throws NotImplementedException
-
-            if (proxy != null)
-            {
-                socketHandler.Proxy = new WebProxy
-                {
-                    Address = new Uri($"{proxy.Host}:{proxy.Port}"),
-                    Credentials = proxy.Password == null ? null : new NetworkCredential(proxy.Login, proxy.Password)
-                };
-            }
-            return socketHandler;
-#else
-            var httpHandler = new HttpClientHandler();
-            try
-            {
-                httpHandler.AutomaticDecompression = DecompressionMethods.GZip | DecompressionMethods.Deflate;
-                httpHandler.DefaultProxyCredentials = CredentialCache.DefaultCredentials;
-            }
-            catch (PlatformNotSupportedException) { }
-            catch (NotImplementedException) { } // Mono runtime throws NotImplementedException
-
-            if (proxy != null)
-            {
-                httpHandler.Proxy = new WebProxy
-                {
-                    Address = new Uri($"{proxy.Host}:{proxy.Port}"),
-                    Credentials = proxy.Password == null ? null : new NetworkCredential(proxy.Login, proxy.Password)
-                };
-            }
-            return httpHandler;
-#endif
-        }
-    }
 }

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
 {
@@ -23,8 +23,6 @@ namespace CryptoExchange.Net.Logging.Extensions
     private static readonly Action<ILogger, int, int, Exception?> _unsubscribingSubscription;
     private static readonly Action<ILogger, int, Exception?> _reconnectingAllConnections;
     private static readonly Action<ILogger, DateTime, Exception?> _addingRetryAfterGuard;
-        private static readonly Action<ILogger, Exception?> _timeoutWaitingForReconnectingSocket;
-        private static readonly Action<ILogger, long, Exception?> _waitedForReconnectingSocket;
 
     static SocketApiClientLoggingExtension()
     {
@@ -112,16 +110,6 @@ namespace CryptoExchange.Net.Logging.Extensions
             LogLevel.Warning,
             new EventId(3018, "AddRetryAfterGuard"),
             "Adding RetryAfterGuard ({RetryAfter}) because the connection attempt was rate limited");
-
-            _timeoutWaitingForReconnectingSocket = LoggerMessage.Define(
-                LogLevel.Debug,
-                new EventId(3019, "TimeoutWaitingForReconnectingSocket"),
-                "Timeout while waiting for existing socket reconnection, failing request");
-
-            _waitedForReconnectingSocket = LoggerMessage.Define<long>(
-                LogLevel.Trace,
-                new EventId(3020, "WaitedForReconnectingSocket"),
-                "Waited for reconnecting socket for {Timespan}ms");
     }
 
     public static void FailedToAddSubscriptionRetryOnDifferentConnection(this ILogger logger, int socketId)
@@ -208,14 +196,4 @@ namespace CryptoExchange.Net.Logging.Extensions
     {
         _addingRetryAfterGuard(logger, retryAfter, null);
     }
-
-        public static void TimeoutWaitingForReconnectingSocket(this ILogger logger)
-        {
-            _timeoutWaitingForReconnectingSocket(logger, null);
-        }
-        public static void WaitedForReconnectingSocket(this ILogger logger, long milliseconds)
-        {
-            _waitedForReconnectingSocket(logger, milliseconds, 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
 {
@@ -13,6 +13,7 @@ namespace CryptoExchange.Net.Logging.Extensions
     private static readonly Action<ILogger, int, Exception?> _unknownExceptionWhileProcessingReconnection;
     private static readonly Action<ILogger, int, WebSocketError, string?, Exception?> _webSocketErrorCodeAndDetails;
     private static readonly Action<ILogger, int, string?, Exception?> _webSocketError;
+    private static readonly Action<ILogger, int, int, Exception?> _messageSentNotPending;
     private static readonly Action<ILogger, int, string, Exception?> _receivedData;
     private static readonly Action<ILogger, int, string, Exception?> _failedToParse;
     private static readonly Action<ILogger, int, string, Exception?> _failedToEvaluateMessage;
@@ -71,6 +72,11 @@ namespace CryptoExchange.Net.Logging.Extensions
             new EventId(2005, "WebSocketError"),
             "[Sckt {SocketId}] error: {ErrorMessage}");
 
+        _messageSentNotPending = LoggerMessage.Define<int, int>(
+            LogLevel.Debug,
+            new EventId(2006, "MessageSentNotPending"),
+            "[Sckt {SocketId}] [Req {RequestId}] message sent, but not pending");
+
         _receivedData = LoggerMessage.Define<int, string>(
             LogLevel.Trace,
             new EventId(2007, "ReceivedData"),
@@ -228,6 +234,11 @@ namespace CryptoExchange.Net.Logging.Extensions
         _webSocketError(logger, socketId, errorMessage, e);
     }
 
+    public static void MessageSentNotPending(this ILogger logger, int socketId, int requestId)
+    {
+        _messageSentNotPending(logger, socketId, requestId, null);
+    }
+
     public static void ReceivedData(this ILogger logger, int socketId, string originalData)
     {
         _receivedData(logger, socketId, originalData, null);
@@ -335,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,18 +1,10 @@
-using System;
+namespace CryptoExchange.Net.Objects;
-using System.Collections.Generic;
-using System.Text;
 
-namespace CryptoExchange.Net.Objects
-{
 /// <summary>
 /// An alias used by the exchange for an asset commonly known by another name
 /// </summary>
 public class AssetAlias
 {
-        /// <summary>
-        /// Alias type
-        /// </summary>
-        public AliasType Type { get; set; }
     /// <summary>
     /// The name of the asset on the exchange
     /// </summary>
@@ -25,26 +17,9 @@ namespace CryptoExchange.Net.Objects
     /// <summary>
     /// ctor
     /// </summary>
-        public AssetAlias(string exchangeName, string commonName, AliasType type = AliasType.BothWays)
+    public AssetAlias(string exchangeName, string commonName)
     {
         ExchangeAssetName = exchangeName;
         CommonAssetName = commonName;
-            Type = type;
-        }
-    }
-
-    /// <summary>
-    /// Alias type
-    /// </summary>
-    public enum AliasType
-    {
-        /// <summary>
-        /// Translate both from and to exchange
-        /// </summary>
-        BothWays,
-        /// <summary>
-        /// Only translate when converting to exchange
-        /// </summary>
-        OnlyToExchange
     }
 }

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>
@@ -23,22 +20,11 @@ namespace CryptoExchange.Net.Objects
     /// <summary>
     /// Map the common name to an exchange name for an asset. If there is no alias the input name is returned
     /// </summary>
-        public string CommonToExchangeName(string commonName) => !AutoConvertEnabled ? commonName : Aliases.FirstOrDefault(x => x.CommonAssetName == commonName)?.ExchangeAssetName ?? commonName;
+    public string CommonToExchangeName(string commonName) => !AutoConvertEnabled ? commonName : Aliases.SingleOrDefault(x => x.CommonAssetName == commonName)?.ExchangeAssetName ?? commonName;
 
     /// <summary>
     /// Map the exchange name to a common name for an asset. If there is no alias the input name is returned
     /// </summary>
-        public string ExchangeToCommonName(string exchangeName)
+    public string ExchangeToCommonName(string exchangeName) => !AutoConvertEnabled ? exchangeName : Aliases.SingleOrDefault(x => x.ExchangeAssetName == exchangeName)?.CommonAssetName ?? exchangeName;
-        {
-            if (!AutoConvertEnabled)
-                return exchangeName;
-
-            var alias = Aliases.FirstOrDefault(x => x.ExchangeAssetName == exchangeName);
-            if (alias == null || alias.Type == AliasType.OnlyToExchange)
-                return exchangeName;
-
-            return alias.CommonAssetName;
-        }
 
 }
-}

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 />
@@ -206,11 +206,6 @@ namespace CryptoExchange.Net.Objects
     /// </summary>
     public HttpMethod? RequestMethod { get; set; }
 
-        /// <summary>
-        /// HTTP protocol version
-        /// </summary>
-        public Version? HttpVersion { get; set; }
-
     /// <summary>
     /// The headers sent with the request
     /// </summary>
@@ -256,7 +251,6 @@ namespace CryptoExchange.Net.Objects
     /// </summary>
     public WebCallResult(
         HttpStatusCode? code,
-            Version? httpVersion,
         KeyValuePair<string, string[]>[]? responseHeaders,
         TimeSpan? responseTime,
         string? originalData,
@@ -268,7 +262,6 @@ namespace CryptoExchange.Net.Objects
         Error? error) : base(error)
     {
         ResponseStatusCode = code;
-            HttpVersion = httpVersion;
         ResponseHeaders = responseHeaders;
         ResponseTime = responseTime;
         RequestId = requestId;
@@ -293,55 +286,55 @@ namespace CryptoExchange.Net.Objects
     /// <returns></returns>
     public WebCallResult AsError(Error error)
     {
-            return new WebCallResult(ResponseStatusCode, HttpVersion, ResponseHeaders, ResponseTime, OriginalData, RequestId, RequestUrl, RequestBody, RequestMethod, RequestHeaders, error);
+        return new WebCallResult(ResponseStatusCode, ResponseHeaders, ResponseTime, OriginalData, RequestId, RequestUrl, RequestBody, RequestMethod, RequestHeaders, 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 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, HttpVersion, 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, HttpVersion, 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 />
@@ -362,11 +355,6 @@ namespace CryptoExchange.Net.Objects
     /// </summary>
     public HttpMethod? RequestMethod { get; set; }
 
-        /// <summary>
-        /// HTTP protocol version
-        /// </summary>
-        public Version? HttpVersion { get; set; }
-
     /// <summary>
     /// The headers sent with the request
     /// </summary>
@@ -415,9 +403,21 @@ namespace CryptoExchange.Net.Objects
     /// <summary>
     /// Create a new result
     /// </summary>
+    /// <param name="code"></param>
+    /// <param name="responseHeaders"></param>
+    /// <param name="responseTime"></param>
+    /// <param name="responseLength"></param>
+    /// <param name="originalData"></param>
+    /// <param name="requestId"></param>
+    /// <param name="requestUrl"></param>
+    /// <param name="requestBody"></param>
+    /// <param name="requestMethod"></param>
+    /// <param name="requestHeaders"></param>
+    /// <param name="dataSource"></param>
+    /// <param name="data"></param>
+    /// <param name="error"></param>
     public WebCallResult(
         HttpStatusCode? code,
-            Version? httpVersion,
         KeyValuePair<string, string[]>[]? responseHeaders,
         TimeSpan? responseTime,
         long? responseLength,
@@ -431,7 +431,6 @@ namespace CryptoExchange.Net.Objects
         [AllowNull] T data,
         Error? error) : base(data, originalData, error)
     {
-            HttpVersion = httpVersion;
         ResponseStatusCode = code;
         ResponseHeaders = responseHeaders;
         ResponseTime = responseTime;
@@ -451,7 +450,7 @@ namespace CryptoExchange.Net.Objects
     /// <returns></returns>
     public new WebCallResult AsDataless()
     {
-            return new WebCallResult(ResponseStatusCode, HttpVersion, ResponseHeaders, ResponseTime, OriginalData, RequestId, RequestUrl, RequestBody, RequestMethod, RequestHeaders, Error);
+        return new WebCallResult(ResponseStatusCode, ResponseHeaders, ResponseTime, OriginalData, RequestId, RequestUrl, RequestBody, RequestMethod, RequestHeaders, Error);
     }
     /// <summary>
     /// Copy as a dataless result
@@ -459,47 +458,47 @@ namespace CryptoExchange.Net.Objects
     /// <returns></returns>
     public new WebCallResult AsDatalessError(Error error)
     {
-            return new WebCallResult(ResponseStatusCode, HttpVersion, ResponseHeaders, ResponseTime, OriginalData, RequestId, RequestUrl, RequestBody, RequestMethod, RequestHeaders, error);
+        return new WebCallResult(ResponseStatusCode, ResponseHeaders, ResponseTime, OriginalData, RequestId, RequestUrl, RequestBody, RequestMethod, RequestHeaders, error);
     }
 
     /// <summary>
     /// Create a new error result
     /// </summary>
     /// <param name="error">The error</param>
-        public WebCallResult(Error? error) : this(null, null, null, null, null, null, null, null, null, null, null, ResultDataSource.Server, default, error) { }
+    public WebCallResult(Error? error) : this(null, null, null, null, null, null, null, null, null, null, ResultDataSource.Server, 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 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, HttpVersion, 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, HttpVersion, 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, HttpVersion, 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>
@@ -527,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>
@@ -570,7 +569,7 @@ namespace CryptoExchange.Net.Objects
     /// <returns></returns>
     internal WebCallResult<T> Cached()
     {
-            return new WebCallResult<T>(ResponseStatusCode, HttpVersion, ResponseHeaders, ResponseTime, ResponseLength, OriginalData, RequestId, RequestUrl, RequestBody, RequestMethod, RequestHeaders, ResultDataSource.Cache, Data, Error);
+        return new WebCallResult<T>(ResponseStatusCode, ResponseHeaders, ResponseTime, ResponseLength, OriginalData, RequestId, RequestUrl, RequestBody, RequestMethod, RequestHeaders, ResultDataSource.Cache, Data, Error);
     }
 
     /// <inheritdoc />
@@ -586,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>
@@ -266,32 +264,3 @@ namespace CryptoExchange.Net.Objects
     /// </summary>
     Succeed
 }
-
-    /// <summary>
-    /// Subscription status
-    /// </summary>
-    public enum SubscriptionStatus
-    {
-        /// <summary>
-        /// Pending, waiting before (re)subscription can be started
-        /// </summary>
-        Pending,
-        /// <summary>
-        /// Currently (re)subscribing, will start producing updates soon if subscription is successful
-        /// </summary>
-        Subscribing,
-        /// <summary>
-        /// Subscribed and listening to updates
-        /// </summary>
-        Subscribed,
-        /// <summary>
-        /// Subscription is being closed and will stop producing updates
-        /// </summary>
-        Closing,
-        /// <summary>
-        /// Subscription is closed and will no long produce updates
-        /// </summary>
-        Closed
-    }
-
-}

CryptoExchange.Net/Objects/Error.cs

@@ -1,14 +1,13 @@
-using CryptoExchange.Net.Objects.Errors;
+using CryptoExchange.Net.Objects.Errors;
 using System;
 
-namespace CryptoExchange.Net.Objects
+namespace CryptoExchange.Net.Objects;
-{
+
 /// <summary>
 /// Base class for errors
 /// </summary>
 public abstract class Error
 {
-
     private int? _code;
     /// <summary>
     /// The int error code the server returned; or the http status code int value if there was no error code.<br />
@@ -91,17 +90,17 @@ namespace CryptoExchange.Net.Objects
     /// <summary>
     /// Default error info
     /// </summary>
-        protected static readonly ErrorInfo _errorInfo = new ErrorInfo(ErrorType.UnableToConnect, false, "Can't connect to the server");
+    protected static readonly ErrorInfo errorInfo = new ErrorInfo(ErrorType.UnableToConnect, false, "Can't connect to the server");
 
     /// <summary>
     /// ctor
     /// </summary>
-        public CantConnectError() : base(null, _errorInfo, null) { }
+    public CantConnectError() : base(null, errorInfo, null) { }
 
     /// <summary>
     /// ctor
     /// </summary>
-        public CantConnectError(Exception? exception) : base(null, _errorInfo, exception) { }
+    public CantConnectError(Exception? exception) : base(null, errorInfo, exception) { }
 
     /// <summary>
     /// ctor
@@ -117,12 +116,12 @@ namespace CryptoExchange.Net.Objects
     /// <summary>
     /// Default error info
     /// </summary>
-        protected static readonly ErrorInfo _errorInfo = new ErrorInfo(ErrorType.MissingCredentials, false, "No credentials provided for private endpoint");
+    protected static readonly ErrorInfo errorInfo = new ErrorInfo(ErrorType.MissingCredentials, false, "No credentials provided for private endpoint");
 
     /// <summary>
     /// ctor
     /// </summary>
-        public NoApiCredentialsError() : base(null, _errorInfo, null) { }
+    public NoApiCredentialsError() : base(null, errorInfo, null) { }
 
     /// <summary>
     /// ctor
@@ -161,12 +160,12 @@ namespace CryptoExchange.Net.Objects
     /// <summary>
     /// Default error info
     /// </summary>
-        protected static readonly ErrorInfo _errorInfo = new ErrorInfo(ErrorType.NetworkError, true, "Failed to complete the request to the server due to a network error");
+    protected static readonly ErrorInfo errorInfo = new ErrorInfo(ErrorType.NetworkError, true, "Failed to complete the request to the server due to a network error");
 
     /// <summary>
     /// ctor
     /// </summary>
-        public WebError(string? message = null, Exception? exception = null) : base(null, _errorInfo with { Message = (message?.Length > 0 ? _errorInfo.Message + ": " + message : _errorInfo.Message) }, exception) { }
+    public WebError(string? message = null, Exception? exception = null) : base(null, errorInfo with { Message = (message?.Length > 0 ? errorInfo.Message + ": " + message : errorInfo.Message) }, exception) { }
 }
 
 /// <summary>
@@ -177,12 +176,12 @@ namespace CryptoExchange.Net.Objects
     /// <summary>
     /// Default error info
     /// </summary>
-        protected static readonly ErrorInfo _errorInfo = new ErrorInfo(ErrorType.Timeout, false, "Failed to receive a response from the server in time");
+    protected static readonly ErrorInfo errorInfo = new ErrorInfo(ErrorType.Timeout, false, "Failed to receive a response from the server in time");
 
     /// <summary>
     /// ctor
     /// </summary>
-        public TimeoutError(string? message = null, Exception? exception = null) : base(null, _errorInfo with { Message = (message?.Length > 0 ? _errorInfo.Message + ": " + message : _errorInfo.Message) }, exception) { }
+    public TimeoutError(string? message = null, Exception? exception = null) : base(null, errorInfo with { Message = (message?.Length > 0 ? errorInfo.Message + ": " + message : errorInfo.Message) }, exception) { }
 }
 
 /// <summary>
@@ -193,12 +192,12 @@ namespace CryptoExchange.Net.Objects
     /// <summary>
     /// Default error info
     /// </summary>
-        protected static readonly ErrorInfo _errorInfo = new ErrorInfo(ErrorType.DeserializationFailed, false, "Failed to deserialize data");
+    protected static readonly ErrorInfo errorInfo = new ErrorInfo(ErrorType.DeserializationFailed, false, "Failed to deserialize data");
 
     /// <summary>
     /// ctor
     /// </summary>
-        public DeserializeError(string? message = null, Exception? exception = null) : base(null, _errorInfo with { Message = (message?.Length > 0 ? _errorInfo.Message + ": " + message : _errorInfo.Message) }, exception) { }
+    public DeserializeError(string? message = null, Exception? exception = null) : base(null, errorInfo with { Message = (message?.Length > 0 ? errorInfo.Message + ": " + message : errorInfo.Message) }, exception) { }
 }
 
 /// <summary>
@@ -209,21 +208,21 @@ namespace CryptoExchange.Net.Objects
     /// <summary>
     /// Default error info for missing parameter
     /// </summary>
-        protected static readonly ErrorInfo _missingInfo = new ErrorInfo(ErrorType.MissingParameter, false, "Missing parameter");
+    protected static readonly ErrorInfo missingInfo = new ErrorInfo(ErrorType.MissingParameter, false, "Missing parameter");
     /// <summary>
     /// Default error info for invalid parameter
     /// </summary>
-        protected static readonly ErrorInfo _invalidInfo = new ErrorInfo(ErrorType.InvalidParameter, false, "Invalid parameter");
+    protected static readonly ErrorInfo invalidInfo = new ErrorInfo(ErrorType.InvalidParameter, false, "Invalid parameter");
 
     /// <summary>
     /// ctor
     /// </summary>
-        public static ArgumentError Missing(string parameterName, string? message = null) => new ArgumentError(_missingInfo with { Message = message == null ? $"{_missingInfo.Message} '{parameterName}'" : $"{_missingInfo.Message} '{parameterName}': {message}" }, null);
+    public static ArgumentError Missing(string parameterName, string? message = null) => new ArgumentError(missingInfo with { Message = message == null ? $"{missingInfo.Message} '{parameterName}'" : $"{missingInfo.Message} '{parameterName}': {message}" }, null);
 
     /// <summary>
     /// ctor
     /// </summary>
-        public static ArgumentError Invalid(string parameterName, string message) => new ArgumentError(_invalidInfo with { Message = $"{_invalidInfo.Message} '{parameterName}': {message}" }, null);
+    public static ArgumentError Invalid(string parameterName, string message) => new ArgumentError(invalidInfo with { Message = $"{invalidInfo.Message} '{parameterName}': {message}" }, null);
 
     /// <summary>
     /// ctor
@@ -255,12 +254,12 @@ namespace CryptoExchange.Net.Objects
     /// <summary>
     /// Default error info
     /// </summary>
-        protected static readonly ErrorInfo _errorInfo = new ErrorInfo(ErrorType.RateLimitRequest, false, "Client rate limit exceeded");
+    protected static readonly ErrorInfo errorInfo = new ErrorInfo(ErrorType.RateLimitRequest, false, "Client rate limit exceeded");
 
     /// <summary>
     /// ctor
     /// </summary>
-        public ClientRateLimitError(string? message = null, Exception? exception = null) : base(_errorInfo with { Message = (message?.Length > 0 ? _errorInfo.Message + ": " + message : _errorInfo.Message) }, exception) { }
+    public ClientRateLimitError(string? message = null, Exception? exception = null) : base(errorInfo with { Message = (message?.Length > 0 ? errorInfo.Message + ": " + message : errorInfo.Message) }, exception) { }
 
     /// <summary>
     /// ctor
@@ -276,12 +275,12 @@ namespace CryptoExchange.Net.Objects
     /// <summary>
     /// Default error info
     /// </summary>
-        protected static readonly ErrorInfo _errorInfo = new ErrorInfo(ErrorType.RateLimitRequest, false, "Server rate limit exceeded");
+    protected static readonly ErrorInfo errorInfo = new ErrorInfo(ErrorType.RateLimitRequest, false, "Server rate limit exceeded");
 
     /// <summary>
     /// ctor
     /// </summary>
-        public ServerRateLimitError(string? message = null, Exception? exception = null) : base(_errorInfo with { Message = (message?.Length > 0 ? _errorInfo.Message + ": " + message : _errorInfo.Message) }, exception) { }
+    public ServerRateLimitError(string? message = null, Exception? exception = null) : base(errorInfo with { Message = (message?.Length > 0 ? errorInfo.Message + ": " + message : errorInfo.Message) }, exception) { }
 
     /// <summary>
     /// ctor
@@ -297,12 +296,12 @@ namespace CryptoExchange.Net.Objects
     /// <summary>
     /// Default error info
     /// </summary>
-        protected static readonly ErrorInfo _errorInfo = new ErrorInfo(ErrorType.CancellationRequested, false, "Cancellation requested");
+    protected static readonly ErrorInfo errorInfo = new ErrorInfo(ErrorType.CancellationRequested, false, "Cancellation requested");
 
     /// <summary>
     /// ctor
     /// </summary>
-        public CancellationRequestedError(Exception? exception = null) : base(null, _errorInfo, null) { }
+    public CancellationRequestedError(Exception? exception = null) : base(null, errorInfo, null) { }
 
     /// <summary>
     /// ctor
@@ -318,16 +317,15 @@ namespace CryptoExchange.Net.Objects
     /// <summary>
     /// Default error info
     /// </summary>
-        protected static readonly ErrorInfo _errorInfo = new ErrorInfo(ErrorType.InvalidOperation, false, "Operation invalid");
+    protected static readonly ErrorInfo errorInfo = new ErrorInfo(ErrorType.InvalidOperation, false, "Operation invalid");
 
     /// <summary>
     /// ctor
     /// </summary>
-        public InvalidOperationError(string message) : base(null, _errorInfo with { Message = message }, null) { }
+    public InvalidOperationError(string message) : base(null, errorInfo with { Message = message }, null) { }
 
     /// <summary>
     /// ctor
     /// </summary>
     protected InvalidOperationError(ErrorInfo info, Exception? exception) : base(null, info, exception) { }
 }
-}

CryptoExchange.Net/Objects/Errors/ErrorEvaluator.cs

@@ -1,9 +1,7 @@
-using System;
+using System;
-using System.Collections.Generic;
+
-using System.Text;
+namespace CryptoExchange.Net.Objects.Errors;
 
-namespace CryptoExchange.Net.Objects.Errors
-{
 /// <summary>
 /// Error evaluator
 /// </summary>
@@ -37,4 +35,3 @@ namespace CryptoExchange.Net.Objects.Errors
         ErrorTypeEvaluator = errorTypeEvaluator;
     }
 }
-}