Update CryptoExchange.Net.csproj

.github/workflows/dotnet.yml

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

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

@@ -1,530 +0,0 @@
-using CryptoExchange.Net.Converters.MessageParsing;
-using CryptoExchange.Net.Interfaces;
-using CryptoExchange.Net.Objects;
-using ProtoBuf;
-using ProtoBuf.Meta;
-using System;
-using System.Diagnostics.CodeAnalysis;
-using System.IO;
-using System.Runtime.InteropServices.ComTypes;
-using System.Text;
-using System.Text.Json;
-using System.Threading.Tasks;
-
-namespace CryptoExchange.Net.Converters.Protobuf
-{
-    /// <summary>
-    /// System.Text.Json message accessor
-    /// </summary>
-#if NET5_0_OR_GREATER
-    public abstract class ProtobufMessageAccessor<
-        [DynamicallyAccessedMembers(
-#if NET8_0_OR_GREATER
-        DynamicallyAccessedMemberTypes.NonPublicConstructors |
-        DynamicallyAccessedMemberTypes.PublicFields |
-        DynamicallyAccessedMemberTypes.NonPublicFields |
-        DynamicallyAccessedMemberTypes.NonPublicNestedTypes |
-        DynamicallyAccessedMemberTypes.PublicProperties |
-        DynamicallyAccessedMemberTypes.NonPublicProperties |
-#endif
-        DynamicallyAccessedMemberTypes.PublicNestedTypes |
-        DynamicallyAccessedMemberTypes.NonPublicMethods |
-        DynamicallyAccessedMemberTypes.PublicMethods
-        )]
-    TIntermediateType> : IMessageAccessor
-#else
-    public abstract class ProtobufMessageAccessor<TIntermediateType> : IMessageAccessor
-#endif
-    {
-        /// <summary>
-        /// The intermediate deserialization object
-        /// </summary>
-        protected TIntermediateType? _intermediateType;
-        /// <summary>
-        /// Runtime type model
-        /// </summary>
-        protected RuntimeTypeModel _model;
-
-        /// <inheritdoc />
-        public bool IsValid { get; set; }
-
-        /// <inheritdoc />
-        public abstract bool OriginalDataAvailable { get; }
-
-        /// <inheritdoc />
-        public object? Underlying => _intermediateType;
-
-        /// <summary>
-        /// ctor
-        /// </summary>
-        public ProtobufMessageAccessor(RuntimeTypeModel model)
-        {
-            _model = model;
-        }
-
-        /// <inheritdoc />
-        public NodeType? GetNodeType()
-        {
-            throw new NotImplementedException();
-        }
-
-        /// <inheritdoc />
-        public NodeType? GetNodeType(MessagePath path)
-        {
-            if (_intermediateType == null)
-                throw new InvalidOperationException("Data not read");
-
-            object? value = _intermediateType;
-            foreach (var step in path)
-            {
-                if (value == null)
-                    break;
-
-                if (step.Type == 0)
-                {
-                    // array index
-                }
-                else if (step.Type == 1)
-                {
-                    // property value
-#pragma warning disable IL2075 // Type is already annotated
-                    value = value.GetType().GetProperty(step.Property!)?.GetValue(value);
-#pragma warning restore
-                }
-                else
-                {
-                    // property name
-                }
-            }
-
-            if (value == null)
-                return null;
-
-            var valueType = value.GetType();
-            if (valueType.IsArray)
-                return NodeType.Array;
-
-            if (IsSimple(valueType))
-                return NodeType.Value;
-
-            return NodeType.Object;
-        }
-
-        private static bool IsSimple(Type type)
-        {
-            if (type.IsGenericType && type.GetGenericTypeDefinition() == typeof(Nullable<>))
-            {
-                // nullable type, check if the nested type is simple.
-                return IsSimple(type.GetGenericArguments()[0]);
-            }
-            return type.IsPrimitive
-              || type.IsEnum
-              || type == typeof(string)
-              || type == typeof(decimal);
-        }
-
-
-        /// <inheritdoc />
-#if NET5_0_OR_GREATER
-        [UnconditionalSuppressMessage("AssemblyLoadTrimming", "IL2075:RequiresUnreferencedCode", Justification = "JsonSerializerOptions provided here has TypeInfoResolver set")]
-#endif
-        public T? GetValue<T>(MessagePath path)
-        {
-            if (_intermediateType == null)
-                throw new InvalidOperationException("Data not read");
-
-            object? value = _intermediateType;
-            foreach(var step in path)
-            {
-                if (value == null)
-                    break;
-
-                if (step.Type == 0)
-                {
-                    // array index
-                }
-                else if (step.Type == 1)
-                {
-                    // property value
-#pragma warning disable IL2075 // Type is already annotated
-                    value = value.GetType().GetProperty(step.Property!)?.GetValue(value);
-#pragma warning restore
-                }
-                else
-                {
-                    // property name
-                }
-            }
-
-            return (T?)value;
-        }
-
-        /// <inheritdoc />
-        public T?[]? GetValues<T>(MessagePath path)
-        {
-            throw new NotImplementedException();
-        }
-
-        /// <inheritdoc />
-        public abstract string GetOriginalString();
-
-        /// <inheritdoc />
-        public abstract void Clear();
-
-        /// <inheritdoc />
-#if NET5_0_OR_GREATER
-        [UnconditionalSuppressMessage("AssemblyLoadTrimming", "IL2092:RequiresUnreferencedCode", Justification = "JsonSerializerOptions provided here has TypeInfoResolver set")]
-        [UnconditionalSuppressMessage("AssemblyLoadTrimming", "IL2095:RequiresUnreferencedCode", Justification = "JsonSerializerOptions provided here has TypeInfoResolver set")]
-#endif
-        public abstract CallResult<object> Deserialize(
-#if NET5_0_OR_GREATER
-            [DynamicallyAccessedMembers(
-#if NET8_0_OR_GREATER
-            DynamicallyAccessedMemberTypes.NonPublicConstructors |
-            DynamicallyAccessedMemberTypes.PublicFields |
-            DynamicallyAccessedMemberTypes.NonPublicFields |
-            DynamicallyAccessedMemberTypes.NonPublicNestedTypes |
-            DynamicallyAccessedMemberTypes.PublicProperties |
-            DynamicallyAccessedMemberTypes.NonPublicProperties |
-            DynamicallyAccessedMemberTypes.PublicConstructors |
-#endif
-            DynamicallyAccessedMemberTypes.PublicNestedTypes |
-            DynamicallyAccessedMemberTypes.NonPublicMethods |
-            DynamicallyAccessedMemberTypes.PublicMethods
-            )]
-#endif
-        Type type, MessagePath? path = null);
-
-        /// <inheritdoc />
-#if NET5_0_OR_GREATER
-        [UnconditionalSuppressMessage("AssemblyLoadTrimming", "IL2092:RequiresUnreferencedCode", Justification = "JsonSerializerOptions provided here has TypeInfoResolver set")]
-        [UnconditionalSuppressMessage("AssemblyLoadTrimming", "IL2095:RequiresUnreferencedCode", Justification = "JsonSerializerOptions provided here has TypeInfoResolver set")]
-#endif
-        public abstract CallResult<T> Deserialize<
-#if NET5_0_OR_GREATER
-        [DynamicallyAccessedMembers(
-#if NET8_0_OR_GREATER
-            DynamicallyAccessedMemberTypes.NonPublicConstructors |
-            DynamicallyAccessedMemberTypes.PublicFields |
-            DynamicallyAccessedMemberTypes.NonPublicFields |
-            DynamicallyAccessedMemberTypes.NonPublicNestedTypes |
-            DynamicallyAccessedMemberTypes.PublicProperties |
-            DynamicallyAccessedMemberTypes.NonPublicProperties |
-            DynamicallyAccessedMemberTypes.PublicConstructors |
-#endif
-            DynamicallyAccessedMemberTypes.PublicNestedTypes |
-            DynamicallyAccessedMemberTypes.NonPublicMethods |
-            DynamicallyAccessedMemberTypes.PublicMethods
-            )]
-#endif
-        T>(MessagePath? path = null);
-    }
-
-    /// <summary>
-    /// System.Text.Json stream message accessor
-    /// </summary>
-    public class ProtobufStreamMessageAccessor<
-#if NET5_0_OR_GREATER
-            [DynamicallyAccessedMembers(
-#if NET8_0_OR_GREATER
-            DynamicallyAccessedMemberTypes.NonPublicConstructors |
-            DynamicallyAccessedMemberTypes.PublicFields |
-            DynamicallyAccessedMemberTypes.NonPublicFields |
-            DynamicallyAccessedMemberTypes.NonPublicNestedTypes |
-            DynamicallyAccessedMemberTypes.PublicProperties |
-            DynamicallyAccessedMemberTypes.NonPublicProperties |
-            DynamicallyAccessedMemberTypes.PublicConstructors |
-#endif
-            DynamicallyAccessedMemberTypes.PublicNestedTypes |
-            DynamicallyAccessedMemberTypes.NonPublicMethods |
-            DynamicallyAccessedMemberTypes.PublicMethods
-            )]
-#endif
-    TIntermediate> : ProtobufMessageAccessor<TIntermediate>, IStreamMessageAccessor
-    {
-        private Stream? _stream;
-
-        /// <inheritdoc />
-        public override bool OriginalDataAvailable => _stream?.CanSeek == true;
-
-        /// <summary>
-        /// ctor
-        /// </summary>
-        public ProtobufStreamMessageAccessor(RuntimeTypeModel model) : base(model)
-        {
-        }
-
-        /// <inheritdoc />
-#if NET5_0_OR_GREATER
-        [UnconditionalSuppressMessage("AssemblyLoadTrimming", "IL2092:RequiresUnreferencedCode", Justification = "JsonSerializerOptions provided here has TypeInfoResolver set")]
-        [UnconditionalSuppressMessage("AssemblyLoadTrimming", "IL2095:RequiresUnreferencedCode", Justification = "JsonSerializerOptions provided here has TypeInfoResolver set")]
-#endif
-        public override CallResult<object> Deserialize(
-#if NET5_0_OR_GREATER
-            [DynamicallyAccessedMembers(
-#if NET8_0_OR_GREATER
-            DynamicallyAccessedMemberTypes.NonPublicConstructors |
-            DynamicallyAccessedMemberTypes.PublicFields |
-            DynamicallyAccessedMemberTypes.NonPublicFields |
-            DynamicallyAccessedMemberTypes.NonPublicNestedTypes |
-            DynamicallyAccessedMemberTypes.PublicProperties |
-            DynamicallyAccessedMemberTypes.NonPublicProperties |
-            DynamicallyAccessedMemberTypes.PublicConstructors |
-#endif
-            DynamicallyAccessedMemberTypes.PublicNestedTypes |
-            DynamicallyAccessedMemberTypes.NonPublicMethods |
-            DynamicallyAccessedMemberTypes.PublicMethods
-            )]
-#endif
-        Type type, MessagePath? path = null)
-        {
-            try
-            {
-                var result = _model.Deserialize(type, _stream);
-                return new CallResult<object>(result);
-            }
-            catch (Exception ex)
-            {
-                return new CallResult<object>(new DeserializeError("Protobuf deserialization failed: " + ex.Message, ex));
-            }
-        }
-
-        /// <inheritdoc />
-#if NET5_0_OR_GREATER
-        [UnconditionalSuppressMessage("AssemblyLoadTrimming", "IL2092:RequiresUnreferencedCode", Justification = "JsonSerializerOptions provided here has TypeInfoResolver set")]
-        [UnconditionalSuppressMessage("AssemblyLoadTrimming", "IL2095:RequiresUnreferencedCode", Justification = "JsonSerializerOptions provided here has TypeInfoResolver set")]
-#endif
-        public override CallResult<T> Deserialize<            
-#if NET5_0_OR_GREATER
-            [DynamicallyAccessedMembers(
-#if NET8_0_OR_GREATER
-            DynamicallyAccessedMemberTypes.NonPublicConstructors |
-            DynamicallyAccessedMemberTypes.PublicFields |
-            DynamicallyAccessedMemberTypes.NonPublicFields |
-            DynamicallyAccessedMemberTypes.NonPublicNestedTypes |
-            DynamicallyAccessedMemberTypes.PublicProperties |
-            DynamicallyAccessedMemberTypes.NonPublicProperties |
-            DynamicallyAccessedMemberTypes.PublicConstructors |
-#endif
-            DynamicallyAccessedMemberTypes.PublicNestedTypes |
-            DynamicallyAccessedMemberTypes.NonPublicMethods |
-            DynamicallyAccessedMemberTypes.PublicMethods
-            )]
-#endif
-        T>(MessagePath? path = null)
-        {
-            try
-            {
-                var result = _model.Deserialize<T>(_stream);
-                return new CallResult<T>(result);
-            }
-            catch(Exception ex)
-            {
-                return new CallResult<T>(new DeserializeError("Protobuf deserialization failed: " + ex.Message, ex));
-            }
-        }
-
-        /// <inheritdoc />
-        public Task<CallResult> Read(Stream stream, bool bufferStream)
-        {
-            if (bufferStream && stream is not MemoryStream)
-            {
-                // We need to be buffer the stream, and it's not currently a seekable stream, so copy it to a new memory stream
-                _stream = new MemoryStream();
-                stream.CopyTo(_stream);
-                _stream.Position = 0;
-            }
-            else if (bufferStream)
-            {
-                // We need to buffer the stream, and the current stream is seekable, store as is
-                _stream = stream;
-            }
-            else
-            {
-                // We don't need to buffer the stream, so don't bother keeping the reference
-            }
-
-            try
-            {
-                _intermediateType = _model.Deserialize<TIntermediate>(_stream);
-                IsValid = true;
-                return Task.FromResult(CallResult.SuccessResult);
-            }
-            catch (Exception ex)
-            {
-                // Not a json message
-                IsValid = false;
-                return Task.FromResult(new CallResult(new DeserializeError("Protobuf deserialization failed: " + ex.Message, ex)));
-            }
-        }
-
-        /// <inheritdoc />
-        public override string GetOriginalString()
-        {
-            if (_stream is null)
-                throw new NullReferenceException("Stream not initialized");
-
-            _stream.Position = 0;
-            using var textReader = new StreamReader(_stream, Encoding.UTF8, false, 1024, true);
-            return textReader.ReadToEnd();
-        }
-
-        /// <inheritdoc />
-        public override void Clear()
-        {
-            _stream?.Dispose();
-            _stream = null;
-            _intermediateType = default;
-        }
-
-    }
-
-    /// <summary>
-    /// Protobuf byte message accessor
-    /// </summary>
-    public class ProtobufByteMessageAccessor<
-#if NET5_0_OR_GREATER
-            [DynamicallyAccessedMembers(
-#if NET8_0_OR_GREATER
-            DynamicallyAccessedMemberTypes.NonPublicConstructors |
-            DynamicallyAccessedMemberTypes.PublicFields |
-            DynamicallyAccessedMemberTypes.NonPublicFields |
-            DynamicallyAccessedMemberTypes.NonPublicNestedTypes |
-            DynamicallyAccessedMemberTypes.PublicProperties |
-            DynamicallyAccessedMemberTypes.NonPublicProperties |
-            DynamicallyAccessedMemberTypes.PublicConstructors |
-#endif
-            DynamicallyAccessedMemberTypes.PublicNestedTypes |
-            DynamicallyAccessedMemberTypes.NonPublicMethods |
-            DynamicallyAccessedMemberTypes.PublicMethods
-            )]
-#endif
-    TIntermediate> : ProtobufMessageAccessor<TIntermediate>, IByteMessageAccessor
-    {
-        private ReadOnlyMemory<byte> _bytes;
-
-        /// <summary>
-        /// ctor
-        /// </summary>
-        public ProtobufByteMessageAccessor(RuntimeTypeModel model) : base(model)
-        {
-        }
-
-        /// <inheritdoc />
-#if NET5_0_OR_GREATER
-        [UnconditionalSuppressMessage("AssemblyLoadTrimming", "IL2092:RequiresUnreferencedCode", Justification = "JsonSerializerOptions provided here has TypeInfoResolver set")]
-        [UnconditionalSuppressMessage("AssemblyLoadTrimming", "IL2095:RequiresUnreferencedCode", Justification = "JsonSerializerOptions provided here has TypeInfoResolver set")]
-#endif
-        public override CallResult<object> Deserialize(
-
-#if NET5_0_OR_GREATER
-            [UnconditionalSuppressMessage("AssemblyLoadTrimming", "IL2092:RequiresUnreferencedCode", Justification = "JsonSerializerOptions provided here has TypeInfoResolver set")]
-            [UnconditionalSuppressMessage("AssemblyLoadTrimming", "IL2095:RequiresUnreferencedCode", Justification = "JsonSerializerOptions provided here has TypeInfoResolver set")]
-            [DynamicallyAccessedMembers(
-#if NET8_0_OR_GREATER
-            DynamicallyAccessedMemberTypes.NonPublicConstructors |
-            DynamicallyAccessedMemberTypes.PublicFields |
-            DynamicallyAccessedMemberTypes.NonPublicFields |
-            DynamicallyAccessedMemberTypes.NonPublicNestedTypes |
-            DynamicallyAccessedMemberTypes.PublicProperties |
-            DynamicallyAccessedMemberTypes.NonPublicProperties |
-            DynamicallyAccessedMemberTypes.PublicConstructors |
-#endif
-            DynamicallyAccessedMemberTypes.PublicNestedTypes |
-            DynamicallyAccessedMemberTypes.NonPublicMethods |
-            DynamicallyAccessedMemberTypes.PublicMethods
-            )]
-#endif
-        Type type, MessagePath? path = null)
-        {
-            try
-            {
-                using var stream = new MemoryStream(_bytes.ToArray());
-                stream.Position = 0;
-                var result = _model.Deserialize(type, stream);
-                return new CallResult<object>(result);
-            }
-            catch (Exception ex)
-            {
-                return new CallResult<object>(new DeserializeError("Protobuf deserialization failed: " + ex.Message, ex));
-            }
-        }
-
-        /// <inheritdoc />
-#if NET5_0_OR_GREATER
-        [UnconditionalSuppressMessage("AssemblyLoadTrimming", "IL2092:RequiresUnreferencedCode", Justification = "JsonSerializerOptions provided here has TypeInfoResolver set")]
-        [UnconditionalSuppressMessage("AssemblyLoadTrimming", "IL2095:RequiresUnreferencedCode", Justification = "JsonSerializerOptions provided here has TypeInfoResolver set")]
-#endif
-#if NET5_0_OR_GREATER
-        public override CallResult<T> Deserialize<
-            [UnconditionalSuppressMessage("AssemblyLoadTrimming", "IL2092:RequiresUnreferencedCode", Justification = "JsonSerializerOptions provided here has TypeInfoResolver set")]
-            [UnconditionalSuppressMessage("AssemblyLoadTrimming", "IL2095:RequiresUnreferencedCode", Justification = "JsonSerializerOptions provided here has TypeInfoResolver set")]
-            [DynamicallyAccessedMembers(
-#if NET8_0_OR_GREATER
-            DynamicallyAccessedMemberTypes.NonPublicConstructors |
-            DynamicallyAccessedMemberTypes.PublicFields |
-            DynamicallyAccessedMemberTypes.NonPublicFields |
-            DynamicallyAccessedMemberTypes.NonPublicNestedTypes |
-            DynamicallyAccessedMemberTypes.PublicProperties |
-            DynamicallyAccessedMemberTypes.NonPublicProperties |
-            DynamicallyAccessedMemberTypes.PublicConstructors |
-#endif
-            DynamicallyAccessedMemberTypes.PublicNestedTypes |
-            DynamicallyAccessedMemberTypes.NonPublicMethods |
-            DynamicallyAccessedMemberTypes.PublicMethods
-            )]
-        T>(MessagePath? path = null)
-#else
-        public override CallResult<T> Deserialize<T>(MessagePath? path = null)
-#endif
-        {
-            try
-            {
-                var result = _model.Deserialize<T>(_bytes);
-                return new CallResult<T>(result);
-            }
-            catch (Exception ex)
-            {
-                return new CallResult<T>(new DeserializeError("Protobuf deserialization failed: " + ex.Message, ex));
-            }
-        }
-
-        /// <inheritdoc />
-        public CallResult Read(ReadOnlyMemory<byte> data)
-        {
-            _bytes = data;
-
-            try
-            {
-                _intermediateType = _model.Deserialize<TIntermediate>(data);
-                IsValid = true;
-                return CallResult.SuccessResult;
-            }
-            catch (Exception ex)
-            {
-                // Not a json message
-                IsValid = false;
-                return new CallResult(new DeserializeError("Protobuf deserialization failed: " + ex.Message, ex));
-            }
-        }
-
-        /// <inheritdoc />
-        public override string GetOriginalString() =>
-            // NetStandard 2.0 doesn't support GetString from a ReadonlySpan<byte>, so use ToArray there instead
-#if NETSTANDARD2_0
-            Encoding.UTF8.GetString(_bytes.ToArray());
-#else
-            Encoding.UTF8.GetString(_bytes.Span);
-#endif
-
-        /// <inheritdoc />
-        public override bool OriginalDataAvailable => true;
-
-        /// <inheritdoc />
-        public override void Clear()
-        {
-            _bytes = null;
-            _intermediateType = default;
-        }
-    }
-}

CryptoExchange.Net.Protobuf/Converters/Protobuf/ProtobufMessageSerializer.cs

@@ -1,53 +0,0 @@
-using CryptoExchange.Net.Interfaces;
-using ProtoBuf.Meta;
-using System.Diagnostics.CodeAnalysis;
-using System.IO;
-using System.Reflection;
-
-namespace CryptoExchange.Net.Converters.Protobuf
-{
-    /// <inheritdoc />
-    public class ProtobufMessageSerializer : IByteMessageSerializer
-    {
-        private RuntimeTypeModel _model;
-
-        /// <summary>
-        /// ctor
-        /// </summary>
-        public ProtobufMessageSerializer(RuntimeTypeModel model)
-        {
-            _model = model;
-        }
-
-        /// <inheritdoc />
-#if NET5_0_OR_GREATER
-        [UnconditionalSuppressMessage("AssemblyLoadTrimming", "IL2092:RequiresUnreferencedCode", Justification = "JsonSerializerOptions provided here has TypeInfoResolver set")]
-        [UnconditionalSuppressMessage("AssemblyLoadTrimming", "IL2095:RequiresUnreferencedCode", Justification = "JsonSerializerOptions provided here has TypeInfoResolver set")]
-#endif
-#if NET5_0_OR_GREATER
-        public byte[] Serialize<
-            [DynamicallyAccessedMembers(
-#if NET8_0_OR_GREATER
-            DynamicallyAccessedMemberTypes.NonPublicConstructors |
-            DynamicallyAccessedMemberTypes.PublicFields |
-            DynamicallyAccessedMemberTypes.NonPublicFields |
-            DynamicallyAccessedMemberTypes.NonPublicNestedTypes |
-            DynamicallyAccessedMemberTypes.PublicProperties |
-            DynamicallyAccessedMemberTypes.NonPublicProperties |
-            DynamicallyAccessedMemberTypes.PublicConstructors |
-#endif
-            DynamicallyAccessedMemberTypes.PublicNestedTypes |
-            DynamicallyAccessedMemberTypes.NonPublicMethods |
-            DynamicallyAccessedMemberTypes.PublicMethods
-            )]
-        T>(T message)
-#else
-        public byte[] Serialize<T>(T message)
-#endif
-        {
-            using var memoryStream = new MemoryStream();
-            _model.Serialize(memoryStream, message);
-            return memoryStream.ToArray();
-        }
-    }
-}

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

@@ -1,47 +0,0 @@
-<Project Sdk="Microsoft.NET.Sdk">
-  <PropertyGroup>
-    <TargetFrameworks>netstandard2.0;netstandard2.1;net8.0;net9.0;net10.0</TargetFrameworks>
-  </PropertyGroup>
-  <PropertyGroup>
-    <PackageId>CryptoExchange.Net.Protobuf</PackageId>
-    <Authors>JKorf</Authors>
-    <Description>Protobuf support for CryptoExchange.Net</Description>
-    <PackageVersion>10.0.1</PackageVersion>
-    <AssemblyVersion>10.0.1</AssemblyVersion>
-    <FileVersion>10.0.1</FileVersion>
-    <PackageRequireLicenseAcceptance>false</PackageRequireLicenseAcceptance>
-    <PackageTags>CryptoExchange;CryptoExchange.Net</PackageTags>
-    <RepositoryType>git</RepositoryType>
-    <RepositoryUrl>https://github.com/JKorf/CryptoExchange.Net.git</RepositoryUrl>
-    <PackageProjectUrl>https://github.com/JKorf/CryptoExchange.Net/tree/master/CryptoExchange.Net.Protobuf</PackageProjectUrl>
-    <NeutralLanguage>en</NeutralLanguage>
-    <PackageReadmeFile>README.md</PackageReadmeFile>
-    <PackageIcon>icon.png</PackageIcon>
-    <GeneratePackageOnBuild>true</GeneratePackageOnBuild>
-    <PackageReleaseNotes>https://github.com/JKorf/CryptoExchange.Net?tab=readme-ov-file#release-notes</PackageReleaseNotes>
-    <Nullable>enable</Nullable>
-    <LangVersion>12.0</LangVersion>
-    <PackageLicenseExpression>MIT</PackageLicenseExpression>
-  </PropertyGroup>
-  <ItemGroup>
-    <None Include="..\CryptoExchange.Net\Icon\icon.png" Pack="true" PackagePath="\" />
-    <None Include="README.md" Pack="true" PackagePath="\" />
-  </ItemGroup>
-  <PropertyGroup Label="AOT" Condition="$([MSBuild]::IsTargetFrameworkCompatible('$(TargetFramework)', 'net7.0'))">
-    <IsAotCompatible>true</IsAotCompatible>
-  </PropertyGroup>
-  <PropertyGroup Label="Deterministic Build" Condition="'$(Configuration)' == 'Release'">
-    <PublishRepositoryUrl>true</PublishRepositoryUrl>
-    <IncludeSymbols>true</IncludeSymbols>
-    <SymbolPackageFormat>snupkg</SymbolPackageFormat>
-    <EmbedUntrackedSources>true</EmbedUntrackedSources>
-    <ContinuousIntegrationBuild>true</ContinuousIntegrationBuild>
-  </PropertyGroup>
-  <PropertyGroup>
-    <DocumentationFile>CryptoExchange.Net.Protobuf.xml</DocumentationFile>
-  </PropertyGroup>
-  <ItemGroup>
-    <PackageReference Include="CryptoExchange.Net" Version="10.0.2" />
-    <PackageReference Include="protobuf-net" Version="3.2.56" />
-  </ItemGroup>
-</Project>

CryptoExchange.Net.Protobuf/CryptoExchange.Net.Protobuf.xml

@@ -1,128 +0,0 @@
-<?xml version="1.0"?>
-<doc>
-    <assembly>
-        <name>CryptoExchange.Net.Protobuf</name>
-    </assembly>
-    <members>
-        <member name="T:CryptoExchange.Net.Converters.Protobuf.ProtobufMessageAccessor`1">
-            <summary>
-            System.Text.Json message accessor
-            </summary>
-        </member>
-        <member name="F:CryptoExchange.Net.Converters.Protobuf.ProtobufMessageAccessor`1._intermediateType">
-            <summary>
-            The intermediate deserialization object
-            </summary>
-        </member>
-        <member name="F:CryptoExchange.Net.Converters.Protobuf.ProtobufMessageAccessor`1._model">
-            <summary>
-            Runtime type model
-            </summary>
-        </member>
-        <member name="P:CryptoExchange.Net.Converters.Protobuf.ProtobufMessageAccessor`1.IsValid">
-            <inheritdoc />
-        </member>
-        <member name="P:CryptoExchange.Net.Converters.Protobuf.ProtobufMessageAccessor`1.OriginalDataAvailable">
-            <inheritdoc />
-        </member>
-        <member name="P:CryptoExchange.Net.Converters.Protobuf.ProtobufMessageAccessor`1.Underlying">
-            <inheritdoc />
-        </member>
-        <member name="M:CryptoExchange.Net.Converters.Protobuf.ProtobufMessageAccessor`1.#ctor(ProtoBuf.Meta.RuntimeTypeModel)">
-            <summary>
-            ctor
-            </summary>
-        </member>
-        <member name="M:CryptoExchange.Net.Converters.Protobuf.ProtobufMessageAccessor`1.GetNodeType">
-            <inheritdoc />
-        </member>
-        <member name="M:CryptoExchange.Net.Converters.Protobuf.ProtobufMessageAccessor`1.GetNodeType(CryptoExchange.Net.Converters.MessageParsing.MessagePath)">
-            <inheritdoc />
-        </member>
-        <member name="M:CryptoExchange.Net.Converters.Protobuf.ProtobufMessageAccessor`1.GetValue``1(CryptoExchange.Net.Converters.MessageParsing.MessagePath)">
-            <inheritdoc />
-        </member>
-        <member name="M:CryptoExchange.Net.Converters.Protobuf.ProtobufMessageAccessor`1.GetValues``1(CryptoExchange.Net.Converters.MessageParsing.MessagePath)">
-            <inheritdoc />
-        </member>
-        <member name="M:CryptoExchange.Net.Converters.Protobuf.ProtobufMessageAccessor`1.GetOriginalString">
-            <inheritdoc />
-        </member>
-        <member name="M:CryptoExchange.Net.Converters.Protobuf.ProtobufMessageAccessor`1.Clear">
-            <inheritdoc />
-        </member>
-        <member name="M:CryptoExchange.Net.Converters.Protobuf.ProtobufMessageAccessor`1.Deserialize(System.Type,System.Nullable{CryptoExchange.Net.Converters.MessageParsing.MessagePath})">
-            <inheritdoc />
-        </member>
-        <member name="M:CryptoExchange.Net.Converters.Protobuf.ProtobufMessageAccessor`1.Deserialize``1(System.Nullable{CryptoExchange.Net.Converters.MessageParsing.MessagePath})">
-            <inheritdoc />
-        </member>
-        <member name="T:CryptoExchange.Net.Converters.Protobuf.ProtobufStreamMessageAccessor`1">
-            <summary>
-            System.Text.Json stream message accessor
-            </summary>
-        </member>
-        <member name="P:CryptoExchange.Net.Converters.Protobuf.ProtobufStreamMessageAccessor`1.OriginalDataAvailable">
-            <inheritdoc />
-        </member>
-        <member name="M:CryptoExchange.Net.Converters.Protobuf.ProtobufStreamMessageAccessor`1.#ctor(ProtoBuf.Meta.RuntimeTypeModel)">
-            <summary>
-            ctor
-            </summary>
-        </member>
-        <member name="M:CryptoExchange.Net.Converters.Protobuf.ProtobufStreamMessageAccessor`1.Deserialize(System.Type,System.Nullable{CryptoExchange.Net.Converters.MessageParsing.MessagePath})">
-            <inheritdoc />
-        </member>
-        <member name="M:CryptoExchange.Net.Converters.Protobuf.ProtobufStreamMessageAccessor`1.Deserialize``1(System.Nullable{CryptoExchange.Net.Converters.MessageParsing.MessagePath})">
-            <inheritdoc />
-        </member>
-        <member name="M:CryptoExchange.Net.Converters.Protobuf.ProtobufStreamMessageAccessor`1.Read(System.IO.Stream,System.Boolean)">
-            <inheritdoc />
-        </member>
-        <member name="M:CryptoExchange.Net.Converters.Protobuf.ProtobufStreamMessageAccessor`1.GetOriginalString">
-            <inheritdoc />
-        </member>
-        <member name="M:CryptoExchange.Net.Converters.Protobuf.ProtobufStreamMessageAccessor`1.Clear">
-            <inheritdoc />
-        </member>
-        <member name="T:CryptoExchange.Net.Converters.Protobuf.ProtobufByteMessageAccessor`1">
-            <summary>
-            Protobuf byte message accessor
-            </summary>
-        </member>
-        <member name="M:CryptoExchange.Net.Converters.Protobuf.ProtobufByteMessageAccessor`1.#ctor(ProtoBuf.Meta.RuntimeTypeModel)">
-            <summary>
-            ctor
-            </summary>
-        </member>
-        <member name="M:CryptoExchange.Net.Converters.Protobuf.ProtobufByteMessageAccessor`1.Deserialize(System.Type,System.Nullable{CryptoExchange.Net.Converters.MessageParsing.MessagePath})">
-            <inheritdoc />
-        </member>
-        <member name="M:CryptoExchange.Net.Converters.Protobuf.ProtobufByteMessageAccessor`1.Deserialize``1(System.Nullable{CryptoExchange.Net.Converters.MessageParsing.MessagePath})">
-            <inheritdoc />
-        </member>
-        <member name="M:CryptoExchange.Net.Converters.Protobuf.ProtobufByteMessageAccessor`1.Read(System.ReadOnlyMemory{System.Byte})">
-            <inheritdoc />
-        </member>
-        <member name="M:CryptoExchange.Net.Converters.Protobuf.ProtobufByteMessageAccessor`1.GetOriginalString">
-            <inheritdoc />
-        </member>
-        <member name="P:CryptoExchange.Net.Converters.Protobuf.ProtobufByteMessageAccessor`1.OriginalDataAvailable">
-            <inheritdoc />
-        </member>
-        <member name="M:CryptoExchange.Net.Converters.Protobuf.ProtobufByteMessageAccessor`1.Clear">
-            <inheritdoc />
-        </member>
-        <member name="T:CryptoExchange.Net.Converters.Protobuf.ProtobufMessageSerializer">
-            <inheritdoc />
-        </member>
-        <member name="M:CryptoExchange.Net.Converters.Protobuf.ProtobufMessageSerializer.#ctor(ProtoBuf.Meta.RuntimeTypeModel)">
-            <summary>
-            ctor
-            </summary>
-        </member>
-        <member name="M:CryptoExchange.Net.Converters.Protobuf.ProtobufMessageSerializer.Serialize``1(``0)">
-            <inheritdoc />
-        </member>
-    </members>
-</doc>

CryptoExchange.Net.Protobuf/README.md

@@ -1,52 +0,0 @@
-# ![.CryptoExchange.Net](https://github.com/JKorf/CryptoExchange.Net/blob/ffcb7db8ff597c2f14982d68464015a748815580/CryptoExchange.Net/Icon/icon.png) CryptoExchange.Net.Proto  
-
-[![.NET](https://img.shields.io/github/actions/workflow/status/JKorf/CryptoExchange.Net/dotnet.yml?style=for-the-badge)](https://github.com/JKorf/CryptoExchange.Net/actions/workflows/dotnet.yml) [![Nuget downloads](https://img.shields.io/nuget/dt/CryptoExchange.Net.Protobuf.svg?style=for-the-badge)](https://www.nuget.org/packages/CryptoExchange.Net.Protobuf) ![License](https://img.shields.io/github/license/JKorf/CryptoExchange.Net?style=for-the-badge)
-
-Protobuf support for CryptoExchange.Net.
-
-## Release notes
-* Version 10.0.1 - 16 Dec 2025
-    * Updated CryptoExchange.Net version to 10.0.0, see https://github.com/JKorf/CryptoExchange.Net/releases/
-
-* Version 10.0.0 - 16 Dec 2025
-    * Updated CryptoExchange.Net version to 10.0.0, see https://github.com/JKorf/CryptoExchange.Net/releases/
-
-* Version 9.13.0 - 10 Nov 2025
-    * Updated CryptoExchange.Net version to 9.13.0, see https://github.com/JKorf/CryptoExchange.Net/releases/
-
-* 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
-
-* Version 9.5.0 - 19 Aug 2025
-    * Updated CryptoExchange.Net version to 9.5.0
-
-* Version 9.4.0 - 04 Aug 2025
-    * Updated CryptoExchange.Net to version 9.4.0, see https://github.com/JKorf/CryptoExchange.Net/releases/
-    * Updated protobuf-net package version to 3.2.56
-
-* Version 9.3.0 - 23 Jul 2025
-    * Updated CryptoExchange.Net to version 9.3.0, see https://github.com/JKorf/CryptoExchange.Net/releases/
-
-* Version 9.2.0 - 14 Jul 2025
-    * Initial release

CryptoExchange.Net.UnitTests/AsyncResetEventTests.cs

@@ -4,7 +4,7 @@ using NUnit.Framework.Legacy;
 using System;
 using System.Collections.Generic;
 using System.Linq;
-using System.Threading;
+using System.Text;
 using System.Threading.Tasks;
 
 namespace CryptoExchange.Net.UnitTests
@@ -106,7 +106,6 @@ namespace CryptoExchange.Net.UnitTests
             for(var i = 1; i <= 10; i++)
             {
                 evnt.Set();
-                await Task.Delay(1); // Wait for the continuation.
                 Assert.That(10 - i == waiters.Count(w => w.Status != TaskStatus.RanToCompletion));
             }
 
@@ -140,17 +139,5 @@ namespace CryptoExchange.Net.UnitTests
 
             ClassicAssert.False(result1);
         }
-
-        [Test]
-        public async Task CancellingWait_Should_ReturnFalse()
-        {
-            var evnt = new AsyncResetEvent(false, true);
-
-            var waiter1 = evnt.WaitAsync(ct: new CancellationTokenSource(50).Token);
-
-            var result1 = await waiter1;
-
-            ClassicAssert.False(result1);
-        }
     }
 }

CryptoExchange.Net.UnitTests/BaseClientTests.cs

@@ -1,5 +1,11 @@
-using NUnit.Framework;
+using CryptoExchange.Net.Authentication;
+using CryptoExchange.Net.Objects;
+using CryptoExchange.Net.UnitTests.TestImplementations;
+using Microsoft.Extensions.Logging;
+using NUnit.Framework;
 using NUnit.Framework.Legacy;
+using System;
+using System.Collections.Generic;
 
 namespace CryptoExchange.Net.UnitTests
 {
@@ -19,6 +25,20 @@ namespace CryptoExchange.Net.UnitTests
             Assert.That(result.Success);
         }
 
+        [TestCase]
+        public void DeserializingInvalidJson_Should_GiveErrorResult()
+        {
+            // arrange
+            var client = new TestBaseClient();
+
+            // act
+            var result = client.SubClient.Deserialize<object>("{\"testProperty\": 123");
+
+            // assert
+            ClassicAssert.IsFalse(result.Success);
+            Assert.That(result.Error != null);
+        }
+
         [TestCase("https://api.test.com/api", new[] { "path1", "path2" }, "https://api.test.com/api/path1/path2")]
         [TestCase("https://api.test.com/api", new[] { "path1", "/path2" }, "https://api.test.com/api/path1/path2")]
         [TestCase("https://api.test.com/api", new[] { "path1/", "path2" }, "https://api.test.com/api/path1/path2")]

CryptoExchange.Net.UnitTests/CallResultTests.cs

@@ -1,11 +1,12 @@
 using CryptoExchange.Net.Objects;
-using CryptoExchange.Net.Objects.Errors;
 using NUnit.Framework;
 using NUnit.Framework.Legacy;
 using System;
 using System.Collections.Generic;
-using System.Net;
+using System.Linq;
 using System.Net.Http;
+using System.Text;
+using System.Threading.Tasks;
 
 namespace CryptoExchange.Net.UnitTests
 {
@@ -15,9 +16,9 @@ namespace CryptoExchange.Net.UnitTests
         [Test]
         public void TestBasicErrorCallResult()
         {
-            var result = new CallResult(new ServerError("TestError", ErrorInfo.Unknown));
+            var result = new CallResult(new ServerError("TestError"));
 
-            ClassicAssert.AreSame(result.Error.ErrorCode, "TestError");
+            ClassicAssert.AreSame(result.Error.Message, "TestError");
             ClassicAssert.IsFalse(result);
             ClassicAssert.IsFalse(result.Success);
         }
@@ -35,9 +36,9 @@ namespace CryptoExchange.Net.UnitTests
         [Test]
         public void TestCallResultError()
         {
-            var result = new CallResult<object>(new ServerError("TestError", ErrorInfo.Unknown));
+            var result = new CallResult<object>(new ServerError("TestError"));
 
-            ClassicAssert.AreSame(result.Error.ErrorCode, "TestError");
+            ClassicAssert.AreSame(result.Error.Message, "TestError");
             ClassicAssert.IsNull(result.Data);
             ClassicAssert.IsFalse(result);
             ClassicAssert.IsFalse(result.Success);
@@ -70,11 +71,11 @@ namespace CryptoExchange.Net.UnitTests
         [Test]
         public void TestCallResultErrorAs()
         {
-            var result = new CallResult<TestObjectResult>(new ServerError("TestError", ErrorInfo.Unknown));
+            var result = new CallResult<TestObjectResult>(new ServerError("TestError"));
             var asResult = result.As<TestObject2>(default);
 
             ClassicAssert.IsNotNull(asResult.Error);
-            ClassicAssert.AreSame(asResult.Error.ErrorCode, "TestError");
+            ClassicAssert.AreSame(asResult.Error.Message, "TestError");
             ClassicAssert.IsNull(asResult.Data);
             ClassicAssert.IsFalse(asResult);
             ClassicAssert.IsFalse(asResult.Success);
@@ -83,11 +84,11 @@ namespace CryptoExchange.Net.UnitTests
         [Test]
         public void TestCallResultErrorAsError()
         {
-            var result = new CallResult<TestObjectResult>(new ServerError("TestError", ErrorInfo.Unknown));
-            var asResult = result.AsError<TestObject2>(new ServerError("TestError2", ErrorInfo.Unknown));
+            var result = new CallResult<TestObjectResult>(new ServerError("TestError"));
+            var asResult = result.AsError<TestObject2>(new ServerError("TestError2"));
 
             ClassicAssert.IsNotNull(asResult.Error);
-            ClassicAssert.AreSame(asResult.Error.ErrorCode, "TestError2");
+            ClassicAssert.AreSame(asResult.Error.Message, "TestError2");
             ClassicAssert.IsNull(asResult.Data);
             ClassicAssert.IsFalse(asResult);
             ClassicAssert.IsFalse(asResult.Success);
@@ -96,11 +97,11 @@ namespace CryptoExchange.Net.UnitTests
         [Test]
         public void TestWebCallResultErrorAsError()
         {
-            var result = new WebCallResult<TestObjectResult>(new ServerError("TestError", ErrorInfo.Unknown));
-            var asResult = result.AsError<TestObject2>(new ServerError("TestError2", ErrorInfo.Unknown));
+            var result = new WebCallResult<TestObjectResult>(new ServerError("TestError"));
+            var asResult = result.AsError<TestObject2>(new ServerError("TestError2"));
 
             ClassicAssert.IsNotNull(asResult.Error);
-            ClassicAssert.AreSame(asResult.Error.ErrorCode, "TestError2");
+            ClassicAssert.AreSame(asResult.Error.Message, "TestError2");
             ClassicAssert.IsNull(asResult.Data);
             ClassicAssert.IsFalse(asResult);
             ClassicAssert.IsFalse(asResult.Success);
@@ -111,8 +112,7 @@ namespace CryptoExchange.Net.UnitTests
         {
             var result = new WebCallResult<TestObjectResult>(
                 System.Net.HttpStatusCode.OK,
-                HttpVersion.Version11,
-                new HttpResponseMessage().Headers,
+                new List<KeyValuePair<string, IEnumerable<string>>>(),
                 TimeSpan.FromSeconds(1),
                 null,
                 "{}",
@@ -120,14 +120,14 @@ namespace CryptoExchange.Net.UnitTests
                 "https://test.com/api",
                 null,
                 HttpMethod.Get,
-                new HttpRequestMessage().Headers,
+                new List<KeyValuePair<string, IEnumerable<string>>>(),
                 ResultDataSource.Server,
                 new TestObjectResult(),
                 null);
-            var asResult = result.AsError<TestObject2>(new ServerError("TestError2", ErrorInfo.Unknown));
+            var asResult = result.AsError<TestObject2>(new ServerError("TestError2"));
 
             ClassicAssert.IsNotNull(asResult.Error);
-            Assert.That(asResult.Error.ErrorCode == "TestError2");
+            Assert.That(asResult.Error.Message == "TestError2");
             Assert.That(asResult.ResponseStatusCode == System.Net.HttpStatusCode.OK);
             Assert.That(asResult.ResponseTime == TimeSpan.FromSeconds(1));
             Assert.That(asResult.RequestUrl == "https://test.com/api");
@@ -142,8 +142,7 @@ namespace CryptoExchange.Net.UnitTests
         {
             var result = new WebCallResult<TestObjectResult>(
                 System.Net.HttpStatusCode.OK,
-                HttpVersion.Version11,
-                new HttpResponseMessage().Headers,
+                new List<KeyValuePair<string, IEnumerable<string>>>(),
                 TimeSpan.FromSeconds(1),
                 null,
                 "{}",
@@ -151,7 +150,7 @@ namespace CryptoExchange.Net.UnitTests
                 "https://test.com/api",
                 null,
                 HttpMethod.Get,
-                new HttpRequestMessage().Headers,
+                new List<KeyValuePair<string, IEnumerable<string>>>(),
                 ResultDataSource.Server,
                 new TestObjectResult(),
                 null);

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

@@ -1,15 +1,15 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>net10.0</TargetFramework>
+    <TargetFramework>net6.0</TargetFramework>
     <IsPackable>false</IsPackable>
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="18.0.1"></PackageReference>
-    <PackageReference Include="Moq" Version="4.20.72" />
-    <PackageReference Include="NUnit" Version="4.4.0"></PackageReference>
-    <PackageReference Include="NUnit3TestAdapter" Version="6.0.1"></PackageReference>
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.9.0"></PackageReference>
+    <PackageReference Include="Moq" Version="4.20.70" />
+    <PackageReference Include="NUnit" Version="4.1.0"></PackageReference>
+    <PackageReference Include="NUnit3TestAdapter" Version="4.5.0"></PackageReference>
   </ItemGroup>
 
   <ItemGroup>

CryptoExchange.Net.UnitTests/ExchangeHelpersTests.cs

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

CryptoExchange.Net.UnitTests/ExchangeSymbolCacheTests.cs

@@ -1,465 +0,0 @@
-using CryptoExchange.Net.SharedApis;
-using NUnit.Framework;
-using System;
-using System.Linq;
-
-namespace CryptoExchange.Net.UnitTests
-{
-    [TestFixture()]
-    public class ExchangeSymbolCacheTests
-    {
-        private SharedSpotSymbol[] CreateTestSymbols()
-        {
-            return new[]
-            {
-                new SharedSpotSymbol("BTC", "USDT", "BTCUSDT", true, TradingMode.Spot),
-                new SharedSpotSymbol("ETH", "USDT", "ETHUSDT", true, TradingMode.Spot),
-                new SharedSpotSymbol("BTC", "EUR", "BTCEUR", true, TradingMode.Spot),
-                new SharedSpotSymbol("ETH", "BTC", "ETHBTC", true, TradingMode.Spot),
-                new SharedSpotSymbol("XRP", "USDT", "XRPUSDT", false, TradingMode.Spot)
-            };
-        }
-
-        private SharedSpotSymbol[] CreateFuturesSymbols()
-        {
-            return new[]
-            {
-                new SharedSpotSymbol("BTC", "USDT", "BTCUSDT-PERP", true, TradingMode.PerpetualLinear),
-                new SharedSpotSymbol("ETH", "USDT", "ETHUSDT-PERP", true, TradingMode.PerpetualLinear)
-            };
-        }
-
-        [Test]
-        public void UpdateSymbolInfo_NewTopic_Should_AddToCache()
-        {
-            // arrange
-            var topicId = "NewExchange";
-            var symbols = CreateTestSymbols();
-
-            // act
-            ExchangeSymbolCache.UpdateSymbolInfo(topicId, symbols);
-            var hasCached = ExchangeSymbolCache.HasCached(topicId);
-
-            // assert
-            Assert.That(hasCached, Is.True);
-        }
-
-        [Test]
-        public void UpdateSymbolInfo_Should_StoreAllSymbols()
-        {
-            // arrange
-            var topicId = "ExchangeWithSymbols";
-            var symbols = CreateTestSymbols();
-
-            // act
-            ExchangeSymbolCache.UpdateSymbolInfo(topicId, symbols);
-
-            // assert
-            Assert.That(ExchangeSymbolCache.SupportsSymbol(topicId, "BTCUSDT"), Is.True);
-            Assert.That(ExchangeSymbolCache.SupportsSymbol(topicId, "ETHUSDT"), Is.True);
-            Assert.That(ExchangeSymbolCache.SupportsSymbol(topicId, "BTCEUR"), Is.True);
-            Assert.That(ExchangeSymbolCache.SupportsSymbol(topicId, "ETHBTC"), Is.True);
-            Assert.That(ExchangeSymbolCache.SupportsSymbol(topicId, "XRPUSDT"), Is.True);
-        }
-
-        [Test]
-        public void UpdateSymbolInfo_CalledTwiceWithinAnHour_Should_NotUpdate()
-        {
-            // arrange
-            var topicId = "ExchangeNoUpdate";
-            var initialSymbols = new[]
-            {
-                new SharedSpotSymbol("BTC", "USDT", "BTCUSDT", true, TradingMode.Spot)
-            };
-            var updatedSymbols = new[]
-            {
-                new SharedSpotSymbol("BTC", "USDT", "BTCUSDT", true, TradingMode.Spot),
-                new SharedSpotSymbol("ETH", "USDT", "ETHUSDT", true, TradingMode.Spot)
-            };
-
-            // act
-            ExchangeSymbolCache.UpdateSymbolInfo(topicId, initialSymbols);
-            ExchangeSymbolCache.UpdateSymbolInfo(topicId, updatedSymbols);
-
-            // assert - should still have only the initial symbol since less than 60 minutes passed
-            Assert.That(ExchangeSymbolCache.SupportsSymbol(topicId, "BTCUSDT"), Is.True);
-            // The second update should not have been applied
-            Assert.That(ExchangeSymbolCache.SupportsSymbol(topicId, "ETHUSDT"), Is.False);
-        }
-
-        [Test]
-        public void UpdateSymbolInfo_WithEmptyArray_Should_CreateEmptyCache()
-        {
-            // arrange
-            var topicId = "EmptyExchange";
-            var symbols = Array.Empty<SharedSpotSymbol>();
-
-            // act
-            ExchangeSymbolCache.UpdateSymbolInfo(topicId, symbols);
-            var hasCached = ExchangeSymbolCache.HasCached(topicId);
-
-            // assert
-            Assert.That(hasCached, Is.False);
-        }
-
-        [Test]
-        public void HasCached_NonExistentTopic_Should_ReturnFalse()
-        {
-            // arrange
-            var nonExistentTopic = "NonExistent_" + Guid.NewGuid();
-
-            // act
-            var result = ExchangeSymbolCache.HasCached(nonExistentTopic);
-
-            // assert
-            Assert.That(result, Is.False);
-        }
-
-        [Test]
-        public void HasCached_ExistingTopicWithSymbols_Should_ReturnTrue()
-        {
-            // arrange
-            var topicId = "ExchangeWithData";
-            var symbols = CreateTestSymbols();
-            ExchangeSymbolCache.UpdateSymbolInfo(topicId, symbols);
-
-            // act
-            var result = ExchangeSymbolCache.HasCached(topicId);
-
-            // assert
-            Assert.That(result, Is.True);
-        }
-
-        [Test]
-        public void HasCached_ExistingTopicWithNoSymbols_Should_ReturnFalse()
-        {
-            // arrange
-            var topicId = "ExchangeNoData";
-            ExchangeSymbolCache.UpdateSymbolInfo(topicId, Array.Empty<SharedSpotSymbol>());
-
-            // act
-            var result = ExchangeSymbolCache.HasCached(topicId);
-
-            // assert
-            Assert.That(result, Is.False);
-        }
-
-        [Test]
-        public void SupportsSymbol_ByName_ExistingSymbol_Should_ReturnTrue()
-        {
-            // arrange
-            var topicId = "ExchangeSupports";
-            var symbols = CreateTestSymbols();
-            ExchangeSymbolCache.UpdateSymbolInfo(topicId, symbols);
-
-            // act
-            var result = ExchangeSymbolCache.SupportsSymbol(topicId, "BTCUSDT");
-
-            // assert
-            Assert.That(result, Is.True);
-        }
-
-        [Test]
-        public void SupportsSymbol_ByName_NonExistingSymbol_Should_ReturnFalse()
-        {
-            // arrange
-            var topicId = "ExchangeNoSupport";
-            var symbols = CreateTestSymbols();
-            ExchangeSymbolCache.UpdateSymbolInfo(topicId, symbols);
-
-            // act
-            var result = ExchangeSymbolCache.SupportsSymbol(topicId, "LINKUSDT");
-
-            // assert
-            Assert.That(result, Is.False);
-        }
-
-        [Test]
-        public void SupportsSymbol_ByName_NonExistentTopic_Should_ReturnFalse()
-        {
-            // arrange
-            var nonExistentTopic = "NonExistent_" + Guid.NewGuid();
-
-            // act
-            var result = ExchangeSymbolCache.SupportsSymbol(nonExistentTopic, "BTCUSDT");
-
-            // assert
-            Assert.That(result, Is.False);
-        }
-
-        [Test]
-        public void SupportsSymbol_BySharedSymbol_ExistingSymbol_Should_ReturnTrue()
-        {
-            // arrange
-            var topicId = "ExchangeSharedSymbol";
-            var symbols = CreateTestSymbols();
-            ExchangeSymbolCache.UpdateSymbolInfo(topicId, symbols);
-            var sharedSymbol = new SharedSymbol(TradingMode.Spot, "BTC", "USDT");
-
-            // act
-            var result = ExchangeSymbolCache.SupportsSymbol(topicId, sharedSymbol);
-
-            // assert
-            Assert.That(result, Is.True);
-        }
-
-        [Test]
-        public void SupportsSymbol_BySharedSymbol_NonExistingSymbol_Should_ReturnFalse()
-        {
-            // arrange
-            var topicId = "ExchangeNoSharedSymbol";
-            var symbols = CreateTestSymbols();
-            ExchangeSymbolCache.UpdateSymbolInfo(topicId, symbols);
-            var sharedSymbol = new SharedSymbol(TradingMode.Spot, "LINK", "USDT");
-
-            // act
-            var result = ExchangeSymbolCache.SupportsSymbol(topicId, sharedSymbol);
-
-            // assert
-            Assert.That(result, Is.False);
-        }
-
-        [Test]
-        public void SupportsSymbol_BySharedSymbol_DifferentTradingMode_Should_ReturnFalse()
-        {
-            // arrange
-            var topicId = "ExchangeDifferentMode";
-            var symbols = CreateTestSymbols();
-            ExchangeSymbolCache.UpdateSymbolInfo(topicId, symbols);
-            var sharedSymbol = new SharedSymbol(TradingMode.PerpetualLinear, "BTC", "USDT");
-
-            // act
-            var result = ExchangeSymbolCache.SupportsSymbol(topicId, sharedSymbol);
-
-            // assert
-            Assert.That(result, Is.False);
-        }
-
-        [Test]
-        public void SupportsSymbol_BySharedSymbol_NonExistentTopic_Should_ReturnFalse()
-        {
-            // arrange
-            var nonExistentTopic = "NonExistent_" + Guid.NewGuid();
-            var sharedSymbol = new SharedSymbol(TradingMode.Spot, "BTC", "USDT");
-
-            // act
-            var result = ExchangeSymbolCache.SupportsSymbol(nonExistentTopic, sharedSymbol);
-
-            // assert
-            Assert.That(result, Is.False);
-        }
-
-        [Test]
-        public void GetSymbolsForBaseAsset_ExistingBaseAsset_Should_ReturnMatchingSymbols()
-        {
-            // arrange
-            var topicId = "ExchangeBaseAsset";
-            var symbols = CreateTestSymbols();
-            ExchangeSymbolCache.UpdateSymbolInfo(topicId, symbols);
-
-            // act
-            var result = ExchangeSymbolCache.GetSymbolsForBaseAsset(topicId, "BTC");
-
-            // assert
-            Assert.That(result, Is.Not.Null);
-            Assert.That(result.Length, Is.EqualTo(2));
-            Assert.That(result.Any(x => x.QuoteAsset == "USDT"), Is.True);
-            Assert.That(result.Any(x => x.QuoteAsset == "EUR"), Is.True);
-        }
-
-        [Test]
-        public void GetSymbolsForBaseAsset_CaseInsensitive_Should_ReturnMatchingSymbols()
-        {
-            // arrange
-            var topicId = "ExchangeCaseInsensitive";
-            var symbols = CreateTestSymbols();
-            ExchangeSymbolCache.UpdateSymbolInfo(topicId, symbols);
-
-            // act
-            var result = ExchangeSymbolCache.GetSymbolsForBaseAsset(topicId, "btc");
-
-            // assert
-            Assert.That(result, Is.Not.Null);
-            Assert.That(result.Length, Is.EqualTo(2));
-        }
-
-        [Test]
-        public void GetSymbolsForBaseAsset_NonExistingBaseAsset_Should_ReturnEmptyArray()
-        {
-            // arrange
-            var topicId = "ExchangeNoBaseAsset";
-            var symbols = CreateTestSymbols();
-            ExchangeSymbolCache.UpdateSymbolInfo(topicId, symbols);
-
-            // act
-            var result = ExchangeSymbolCache.GetSymbolsForBaseAsset(topicId, "LINK");
-
-            // assert
-            Assert.That(result, Is.Not.Null);
-            Assert.That(result.Length, Is.EqualTo(0));
-        }
-
-        [Test]
-        public void GetSymbolsForBaseAsset_NonExistentTopic_Should_ReturnEmptyArray()
-        {
-            // arrange
-            var nonExistentTopic = "NonExistent_" + Guid.NewGuid();
-
-            // act
-            var result = ExchangeSymbolCache.GetSymbolsForBaseAsset(nonExistentTopic, "BTC");
-
-            // assert
-            Assert.That(result, Is.Not.Null);
-            Assert.That(result.Length, Is.EqualTo(0));
-        }
-
-        [Test]
-        public void ParseSymbol_ExistingSymbol_Should_ReturnSharedSymbol()
-        {
-            // arrange
-            var topicId = "ExchangeParse";
-            var symbols = CreateTestSymbols();
-            ExchangeSymbolCache.UpdateSymbolInfo(topicId, symbols);
-
-            // act
-            var result = ExchangeSymbolCache.ParseSymbol(topicId, "BTCUSDT");
-
-            // assert
-            Assert.That(result, Is.Not.Null);
-            Assert.That(result.BaseAsset, Is.EqualTo("BTC"));
-            Assert.That(result.QuoteAsset, Is.EqualTo("USDT"));
-            Assert.That(result.TradingMode, Is.EqualTo(TradingMode.Spot));
-            Assert.That(result.SymbolName, Is.EqualTo("BTCUSDT"));
-        }
-
-        [Test]
-        public void ParseSymbol_NonExistingSymbol_Should_ReturnNull()
-        {
-            // arrange
-            var topicId = "ExchangeNoParse";
-            var symbols = CreateTestSymbols();
-            ExchangeSymbolCache.UpdateSymbolInfo(topicId, symbols);
-
-            // act
-            var result = ExchangeSymbolCache.ParseSymbol(topicId, "LINKUSDT");
-
-            // assert
-            Assert.That(result, Is.Null);
-        }
-
-        [Test]
-        public void ParseSymbol_NullSymbolName_Should_ReturnNull()
-        {
-            // arrange
-            var topicId = "ExchangeNullSymbol";
-            var symbols = CreateTestSymbols();
-            ExchangeSymbolCache.UpdateSymbolInfo(topicId, symbols);
-
-            // act
-            var result = ExchangeSymbolCache.ParseSymbol(topicId, null);
-
-            // assert
-            Assert.That(result, Is.Null);
-        }
-
-        [Test]
-        public void ParseSymbol_NonExistentTopic_Should_ReturnNull()
-        {
-            // arrange
-            var nonExistentTopic = "NonExistent_" + Guid.NewGuid();
-
-            // act
-            var result = ExchangeSymbolCache.ParseSymbol(nonExistentTopic, "BTCUSDT");
-
-            // assert
-            Assert.That(result, Is.Null);
-        }
-
-        [Test]
-        public void MultipleTopics_Should_MaintainSeparateData()
-        {
-            // arrange
-            var topic1 = "Exchange1";
-            var topic2 = "Exchange2";
-            var symbols1 = new[]
-            {
-                new SharedSpotSymbol("BTC", "USDT", "BTCUSDT", true, TradingMode.Spot)
-            };
-            var symbols2 = new[]
-            {
-                new SharedSpotSymbol("ETH", "USDT", "ETHUSDT", true, TradingMode.Spot)
-            };
-
-            // act
-            ExchangeSymbolCache.UpdateSymbolInfo(topic1, symbols1);
-            ExchangeSymbolCache.UpdateSymbolInfo(topic2, symbols2);
-
-            // assert
-            Assert.That(ExchangeSymbolCache.SupportsSymbol(topic1, "BTCUSDT"), Is.True);
-            Assert.That(ExchangeSymbolCache.SupportsSymbol(topic1, "ETHUSDT"), Is.False);
-            Assert.That(ExchangeSymbolCache.SupportsSymbol(topic2, "ETHUSDT"), Is.True);
-            Assert.That(ExchangeSymbolCache.SupportsSymbol(topic2, "BTCUSDT"), Is.False);
-        }
-
-        [Test]
-        public void UpdateSymbolInfo_WithDifferentTradingModes_Should_StoreCorrectly()
-        {
-            // arrange
-            var topicId = "ExchangeMixedModes";
-            var spotSymbols = CreateTestSymbols();
-            var futuresSymbols = CreateFuturesSymbols();
-            var allSymbols = spotSymbols.Concat(futuresSymbols).ToArray();
-
-            // act
-            ExchangeSymbolCache.UpdateSymbolInfo(topicId, allSymbols);
-
-            // assert
-            var spotSymbol = new SharedSymbol(TradingMode.Spot, "BTC", "USDT");
-            var futuresSymbol = new SharedSymbol(TradingMode.PerpetualLinear, "BTC", "USDT");
-
-            Assert.That(ExchangeSymbolCache.SupportsSymbol(topicId, spotSymbol), Is.True);
-            Assert.That(ExchangeSymbolCache.SupportsSymbol(topicId, futuresSymbol), Is.True);
-        }
-
-        [Test]
-        public void GetSymbolsForBaseAsset_Should_ReturnAllTradingModes()
-        {
-            // arrange
-            var topicId = "ExchangeAllModes";
-            var spotSymbols = CreateTestSymbols();
-            var futuresSymbols = CreateFuturesSymbols();
-            var allSymbols = spotSymbols.Concat(futuresSymbols).ToArray();
-            ExchangeSymbolCache.UpdateSymbolInfo(topicId, allSymbols);
-
-            // act
-            var result = ExchangeSymbolCache.GetSymbolsForBaseAsset(topicId, "BTC");
-
-            // assert
-            Assert.That(result.Length, Is.GreaterThanOrEqualTo(2));
-            Assert.That(result.Any(x => x.TradingMode == TradingMode.Spot), Is.True);
-            Assert.That(result.Any(x => x.TradingMode == TradingMode.PerpetualLinear), Is.True);
-        }
-
-        [Test]
-        public void GetSymbolsForBaseAsset_WithMultipleMatchingSymbols_Should_ReturnAll()
-        {
-            // arrange
-            var topicId = "ExchangeMultiple";
-            var symbols = new[]
-            {
-                new SharedSpotSymbol("ETH", "USDT", "ETHUSDT", true, TradingMode.Spot),
-                new SharedSpotSymbol("ETH", "BTC", "ETHBTC", true, TradingMode.Spot),
-                new SharedSpotSymbol("ETH", "EUR", "ETHEUR", true, TradingMode.Spot)
-            };
-            ExchangeSymbolCache.UpdateSymbolInfo(topicId, symbols);
-
-            // act
-            var result = ExchangeSymbolCache.GetSymbolsForBaseAsset(topicId, "ETH");
-
-            // assert
-            Assert.That(result.Length, Is.EqualTo(3));
-            Assert.That(result.All(x => x.BaseAsset == "ETH"), Is.True);
-        }
-
-    }
-}

CryptoExchange.Net.UnitTests/JsonNetConverterTests.cs

@@ -0,0 +1,248 @@
+using CryptoExchange.Net.Attributes;
+using CryptoExchange.Net.Converters;
+using CryptoExchange.Net.Converters.JsonNet;
+using Newtonsoft.Json;
+using NUnit.Framework;
+using NUnit.Framework.Legacy;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace CryptoExchange.Net.UnitTests
+{
+    [TestFixture()]
+    public class JsonNetConverterTests
+    {
+        [TestCase("2021-05-12")]
+        [TestCase("20210512")]
+        [TestCase("210512")]
+        [TestCase("1620777600.000")]
+        [TestCase("1620777600000")]
+        [TestCase("2021-05-12T00:00:00.000Z")]
+        [TestCase("2021-05-12T00:00:00.000000000Z")]
+        [TestCase("0.000000", true)]
+        [TestCase("0", true)]
+        [TestCase("", true)]
+        [TestCase("  ", true)]
+        public void TestDateTimeConverterString(string input, bool expectNull = false)
+        {
+            var output = JsonConvert.DeserializeObject<TimeObject>($"{{ \"time\": \"{input}\" }}");
+            Assert.That(output.Time == (expectNull ? null: new DateTime(2021, 05, 12, 0, 0, 0, DateTimeKind.Utc)));
+        }
+
+        [TestCase(1620777600.000)]
+        [TestCase(1620777600000d)]
+        public void TestDateTimeConverterDouble(double input)
+        {
+            var output = JsonConvert.DeserializeObject<TimeObject>($"{{ \"time\": {input} }}");
+            Assert.That(output.Time == new DateTime(2021, 05, 12, 0, 0, 0, DateTimeKind.Utc));
+        }
+
+        [TestCase(1620777600)]
+        [TestCase(1620777600000)]
+        [TestCase(1620777600000000)]
+        [TestCase(1620777600000000000)]
+        [TestCase(0, true)]
+        public void TestDateTimeConverterLong(long input, bool expectNull = false)
+        {
+            var output = JsonConvert.DeserializeObject<TimeObject>($"{{ \"time\": {input} }}");
+            Assert.That(output.Time == (expectNull ? null : new DateTime(2021, 05, 12, 0, 0, 0, DateTimeKind.Utc)));
+        }
+
+        [TestCase(1620777600)]
+        [TestCase(1620777600.000)]
+        public void TestDateTimeConverterFromSeconds(double input)
+        {
+            var output = DateTimeConverter.ConvertFromSeconds(input);
+            Assert.That(output == new DateTime(2021, 05, 12, 0, 0, 0, DateTimeKind.Utc));
+        }
+
+        [Test]
+        public void TestDateTimeConverterToSeconds()
+        {
+            var output = DateTimeConverter.ConvertToSeconds(new DateTime(2021, 05, 12, 0, 0, 0, DateTimeKind.Utc));
+            Assert.That(output == 1620777600);
+        }
+
+        [TestCase(1620777600000)]
+        [TestCase(1620777600000.000)]
+        public void TestDateTimeConverterFromMilliseconds(double input)
+        {
+            var output = DateTimeConverter.ConvertFromMilliseconds(input);
+            Assert.That(output == new DateTime(2021, 05, 12, 0, 0, 0, DateTimeKind.Utc));
+        }
+
+        [Test]
+        public void TestDateTimeConverterToMilliseconds()
+        {
+            var output = DateTimeConverter.ConvertToMilliseconds(new DateTime(2021, 05, 12, 0, 0, 0, DateTimeKind.Utc));
+            Assert.That(output == 1620777600000);
+        }
+
+        [TestCase(1620777600000000)]
+        public void TestDateTimeConverterFromMicroseconds(long input)
+        {
+            var output = DateTimeConverter.ConvertFromMicroseconds(input);
+            Assert.That(output == new DateTime(2021, 05, 12, 0, 0, 0, DateTimeKind.Utc));
+        }
+
+        [Test]
+        public void TestDateTimeConverterToMicroseconds()
+        {
+            var output = DateTimeConverter.ConvertToMicroseconds(new DateTime(2021, 05, 12, 0, 0, 0, DateTimeKind.Utc));
+            Assert.That(output == 1620777600000000);
+        }
+
+        [TestCase(1620777600000000000)]
+        public void TestDateTimeConverterFromNanoseconds(long input)
+        {
+            var output = DateTimeConverter.ConvertFromNanoseconds(input);
+            Assert.That(output == new DateTime(2021, 05, 12, 0, 0, 0, DateTimeKind.Utc));
+        }
+
+        [Test]
+        public void TestDateTimeConverterToNanoseconds()
+        {
+            var output = DateTimeConverter.ConvertToNanoseconds(new DateTime(2021, 05, 12, 0, 0, 0, DateTimeKind.Utc));
+            Assert.That(output == 1620777600000000000);
+        }
+
+        [TestCase()]
+        public void TestDateTimeConverterNull()
+        {
+            var output = JsonConvert.DeserializeObject<TimeObject>($"{{ \"time\": null }}");
+            Assert.That(output.Time == null);
+        }
+
+        [TestCase(TestEnum.One, "1")]
+        [TestCase(TestEnum.Two, "2")]
+        [TestCase(TestEnum.Three, "three")]
+        [TestCase(TestEnum.Four, "Four")]
+        [TestCase(null, null)]
+        public void TestEnumConverterNullableGetStringTests(TestEnum? value, string expected)
+        {
+            var output = EnumConverter.GetString(value);
+            Assert.That(output == expected);
+        }
+
+        [TestCase(TestEnum.One, "1")]
+        [TestCase(TestEnum.Two, "2")]
+        [TestCase(TestEnum.Three, "three")]
+        [TestCase(TestEnum.Four, "Four")]
+        public void TestEnumConverterGetStringTests(TestEnum value, string expected)
+        {
+            var output = EnumConverter.GetString(value);
+            Assert.That(output == expected);
+        }
+
+        [TestCase("1", TestEnum.One)]
+        [TestCase("2", TestEnum.Two)]
+        [TestCase("3", TestEnum.Three)]
+        [TestCase("three", TestEnum.Three)]
+        [TestCase("Four", TestEnum.Four)]
+        [TestCase("four", TestEnum.Four)]
+        [TestCase("Four1", null)]
+        [TestCase(null, null)]
+        public void TestEnumConverterNullableDeserializeTests(string value, TestEnum? expected)
+        {
+            var val = value == null ? "null" : $"\"{value}\"";
+            var output = JsonConvert.DeserializeObject<EnumObject>($"{{ \"Value\": {val} }}");
+            Assert.That(output.Value == expected);
+        }
+
+        [TestCase("1", TestEnum.One)]
+        [TestCase("2", TestEnum.Two)]
+        [TestCase("3", TestEnum.Three)]
+        [TestCase("three", TestEnum.Three)]
+        [TestCase("Four", TestEnum.Four)]
+        [TestCase("four", TestEnum.Four)]
+        [TestCase("Four1", TestEnum.One)]
+        [TestCase(null, TestEnum.One)]
+        public void TestEnumConverterNotNullableDeserializeTests(string value, TestEnum? expected)
+        {
+            var val = value == null ? "null" : $"\"{value}\"";
+            var output = JsonConvert.DeserializeObject<NotNullableEnumObject>($"{{ \"Value\": {val} }}");
+            Assert.That(output.Value == expected);
+        }
+
+        [TestCase("1", true)]
+        [TestCase("true", true)]
+        [TestCase("yes", true)]
+        [TestCase("y", true)]
+        [TestCase("on", true)]
+        [TestCase("-1", false)]
+        [TestCase("0", false)]
+        [TestCase("n", false)]
+        [TestCase("no", false)]
+        [TestCase("false", false)]
+        [TestCase("off", false)]
+        [TestCase("", null)]
+        public void TestBoolConverter(string value, bool? expected)
+        {
+            var val = value == null ? "null" : $"\"{value}\"";
+            var output = JsonConvert.DeserializeObject<BoolObject>($"{{ \"Value\": {val} }}");
+            Assert.That(output.Value == expected);
+        }
+
+        [TestCase("1", true)]
+        [TestCase("true", true)]
+        [TestCase("yes", true)]
+        [TestCase("y", true)]
+        [TestCase("on", true)]
+        [TestCase("-1", false)]
+        [TestCase("0", false)]
+        [TestCase("n", false)]
+        [TestCase("no", false)]
+        [TestCase("false", false)]
+        [TestCase("off", false)]
+        [TestCase("", false)]
+        public void TestBoolConverterNotNullable(string value, bool expected)
+        {
+            var val = value == null ? "null" : $"\"{value}\"";
+            var output = JsonConvert.DeserializeObject<NotNullableBoolObject>($"{{ \"Value\": {val} }}");
+            Assert.That(output.Value == expected);
+        }
+    }
+
+    public class TimeObject
+    {
+        [JsonConverter(typeof(DateTimeConverter))]
+        public DateTime? Time { get; set; }
+    }
+
+    public class EnumObject
+    {
+        public TestEnum? Value { get; set; }
+    }
+
+    public class NotNullableEnumObject
+    {
+        public TestEnum Value { get; set; }
+    }
+
+    public class BoolObject
+    {
+        [JsonConverter(typeof(BoolConverter))]
+        public bool? Value { get; set; }
+    }
+
+    public class NotNullableBoolObject
+    {
+        [JsonConverter(typeof(BoolConverter))]
+        public bool Value { get; set; }
+    }
+
+    [JsonConverter(typeof(EnumConverter))]
+    public enum TestEnum
+    {
+        [Map("1")]
+        One,
+        [Map("2")]
+        Two,
+        [Map("three", "3")]
+        Three,
+        Four
+    }
+}

CryptoExchange.Net.UnitTests/OptionsTests.cs

@@ -1,8 +1,15 @@
 using CryptoExchange.Net.Authentication;
+using CryptoExchange.Net.Objects;
 using CryptoExchange.Net.Objects.Options;
 using CryptoExchange.Net.UnitTests.TestImplementations;
+using Microsoft.Extensions.Logging;
 using NUnit.Framework;
+using NUnit.Framework.Legacy;
 using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
 
 namespace CryptoExchange.Net.UnitTests
 {
@@ -44,8 +51,8 @@ namespace CryptoExchange.Net.UnitTests
 
             // assert
             Assert.That(options.ReceiveWindow == TimeSpan.FromSeconds(10));
-            Assert.That(options.ApiCredentials.Key == "123");
-            Assert.That(options.ApiCredentials.Secret == "456");
+            Assert.That(options.ApiCredentials.Key.GetString() == "123");
+            Assert.That(options.ApiCredentials.Secret.GetString() == "456");
         }
 
         [Test]
@@ -57,10 +64,10 @@ namespace CryptoExchange.Net.UnitTests
             options.Api2Options.ApiCredentials = new ApiCredentials("789", "101");
 
             // assert
-            Assert.That(options.Api1Options.ApiCredentials.Key == "123");
-            Assert.That(options.Api1Options.ApiCredentials.Secret == "456");
-            Assert.That(options.Api2Options.ApiCredentials.Key == "789");
-            Assert.That(options.Api2Options.ApiCredentials.Secret == "101");
+            Assert.That(options.Api1Options.ApiCredentials.Key.GetString() == "123");
+            Assert.That(options.Api1Options.ApiCredentials.Secret.GetString() == "456");
+            Assert.That(options.Api2Options.ApiCredentials.Key.GetString() == "789");
+            Assert.That(options.Api2Options.ApiCredentials.Secret.GetString() == "101");
         }
 
         [Test]
@@ -93,10 +100,6 @@ namespace CryptoExchange.Net.UnitTests
             Assert.That(authProvider1.GetSecret() == "222");
             Assert.That(authProvider2.GetKey() == "123");
             Assert.That(authProvider2.GetSecret() == "456");
-
-            // Cleanup static values
-            TestClientOptions.Default.ApiCredentials = null;
-            TestClientOptions.Default.Api1Options.ApiCredentials = null;
         }
 
         [Test]
@@ -118,10 +121,6 @@ namespace CryptoExchange.Net.UnitTests
             Assert.That(authProvider2.GetKey() == "123");
             Assert.That(authProvider2.GetSecret() == "456");
             Assert.That(client.Api2.BaseAddress == "https://localhost:123");
-
-            // Cleanup static values
-            TestClientOptions.Default.ApiCredentials = null;
-            TestClientOptions.Default.Api1Options.ApiCredentials = null;
         }
     }
 
@@ -135,14 +134,6 @@ namespace CryptoExchange.Net.UnitTests
             Environment = new TestEnvironment("test", "https://test.com")
         };
 
-        /// <summary>
-        /// ctor
-        /// </summary>
-        public TestClientOptions()
-        {
-            Default?.Set(this);
-        }
-
         /// <summary>
         /// The default receive window for requests
         /// </summary>
@@ -152,12 +143,12 @@ namespace CryptoExchange.Net.UnitTests
 
         public RestApiOptions Api2Options { get; set; } = new RestApiOptions();
 
-        internal TestClientOptions Set(TestClientOptions targetOptions)
+        internal TestClientOptions Copy()
         {
-            targetOptions = base.Set<TestClientOptions>(targetOptions);
-            targetOptions.Api1Options = Api1Options.Set(targetOptions.Api1Options);
-            targetOptions.Api2Options = Api2Options.Set(targetOptions.Api2Options);
-            return targetOptions;
+            var options = Copy<TestClientOptions>();
+            options.Api1Options = Api1Options.Copy<RestApiOptions>();
+            options.Api2Options = Api2Options.Copy<RestApiOptions>();
+            return options;
         }
     }
 }

CryptoExchange.Net.UnitTests/RestClientTests.cs

@@ -1,18 +1,23 @@
-using CryptoExchange.Net.Objects;
+using CryptoExchange.Net.Authentication;
+using CryptoExchange.Net.Objects;
 using CryptoExchange.Net.UnitTests.TestImplementations;
+using Newtonsoft.Json;
 using NUnit.Framework;
 using System;
 using System.Collections.Generic;
+using System.Diagnostics;
 using System.Linq;
+using CryptoExchange.Net.Interfaces;
+using Microsoft.Extensions.Logging;
 using System.Net.Http;
 using System.Threading.Tasks;
 using System.Threading;
 using NUnit.Framework.Legacy;
 using CryptoExchange.Net.RateLimiting;
+using System.Net;
 using CryptoExchange.Net.RateLimiting.Guards;
 using CryptoExchange.Net.RateLimiting.Filters;
 using CryptoExchange.Net.RateLimiting.Interfaces;
-using System.Text.Json;
 
 namespace CryptoExchange.Net.UnitTests
 {
@@ -25,7 +30,7 @@ namespace CryptoExchange.Net.UnitTests
             // arrange
             var client = new TestRestClient();
             var expected = new TestObject() { DecimalData = 1.23M, IntData = 10, StringData = "Some data" };
-            client.SetResponse(JsonSerializer.Serialize(expected, new JsonSerializerOptions { TypeInfoResolver = new TestSerializerContext() }), out _);
+            client.SetResponse(JsonConvert.SerializeObject(expected), out _);
 
             // act
             var result = client.Api1.Request<TestObject>().Result;
@@ -79,25 +84,8 @@ namespace CryptoExchange.Net.UnitTests
             ClassicAssert.IsFalse(result.Success);
             Assert.That(result.Error != null);
             Assert.That(result.Error is ServerError);
-        }
-
-
-        [TestCase]
-        public async Task ReceivingErrorAndNotParsingErrorAndInvalidJson_Should_ContainData()
-        {
-            // arrange
-            var client = new TestRestClient();
-            var response = "<html>...</html>";
-            client.SetErrorWithResponse(response, System.Net.HttpStatusCode.BadRequest);
-
-            // act
-            var result = await client.Api1.Request<TestObject>();
-
-            // assert
-            ClassicAssert.IsFalse(result.Success);
-            Assert.That(result.Error != null);
-            Assert.That(result.Error is DeserializeError);
-            Assert.That(result.Error.Message.Contains(response));
+            Assert.That(result.Error.Message.Contains("Invalid request"));
+            Assert.That(result.Error.Message.Contains("123"));
         }
 
         [TestCase]
@@ -114,7 +102,7 @@ namespace CryptoExchange.Net.UnitTests
             ClassicAssert.IsFalse(result.Success);
             Assert.That(result.Error != null);
             Assert.That(result.Error is ServerError);
-            Assert.That(result.Error.ErrorCode == "123");
+            Assert.That(result.Error.Code == 123);
             Assert.That(result.Error.Message == "Invalid request");
         }
 
@@ -152,7 +140,7 @@ namespace CryptoExchange.Net.UnitTests
 
             client.SetResponse("{}", out var request);
 
-            await client.Api1.RequestWithParams<TestObject>(new HttpMethod(method), new ParameterCollection
+            await client.Api1.RequestWithParams<TestObject>(new HttpMethod(method), new Dictionary<string, object>
             {
                 { "TestParam1", "Value1" },
                 { "TestParam2", 2 },
@@ -188,19 +176,19 @@ namespace CryptoExchange.Net.UnitTests
 
             for (var i = 0; i < requests + 1; i++)
             {
-                var result1 = await rateLimiter.ProcessAsync(new TraceLogger(), 1, RateLimitItemType.Request, requestDefinition, "https://test.com", "123", 1, RateLimitingBehaviour.Wait, null, default);             
+                var result1 = await rateLimiter.ProcessAsync(new TraceLogger(), 1, RateLimitItemType.Request, requestDefinition, "https://test.com", "123".ToSecureString(), 1, RateLimitingBehaviour.Wait, default);             
                 Assert.That(i == requests? triggered : !triggered);
             }
             triggered = false;
             await Task.Delay((int)Math.Round(perSeconds * 1000) + 10);
-            var result2 = await rateLimiter.ProcessAsync(new TraceLogger(), 1, RateLimitItemType.Request, requestDefinition, "https://test.com", "123", 1,  RateLimitingBehaviour.Wait, null, default);
+            var result2 = await rateLimiter.ProcessAsync(new TraceLogger(), 1, RateLimitItemType.Request, requestDefinition, "https://test.com", "123".ToSecureString(), 1,  RateLimitingBehaviour.Wait, default);
             Assert.That(!triggered);
         }
 
         [TestCase("/sapi/test1", true)]
         [TestCase("/sapi/test2", true)]
         [TestCase("/api/test1", false)]
-        [TestCase("sapi/test1", true)]
+        [TestCase("sapi/test1", false)]
         [TestCase("/sapi/", true)]
         public async Task PartialEndpointRateLimiterEndpoints(string endpoint, bool expectLimiting)
         {
@@ -213,7 +201,7 @@ namespace CryptoExchange.Net.UnitTests
             rateLimiter.RateLimitTriggered += (x) => { evnt = x; };
             for (var i = 0; i < 2; i++)
             {
-                var result1 = await rateLimiter.ProcessAsync(new TraceLogger(), 1, RateLimitItemType.Request, requestDefinition, "https://test.com", "123", 1, RateLimitingBehaviour.Wait, null, default);
+                var result1 = await rateLimiter.ProcessAsync(new TraceLogger(), 1, RateLimitItemType.Request, requestDefinition, "https://test.com", "123".ToSecureString(), 1, RateLimitingBehaviour.Wait, default);
                 bool expected = i == 1 ? (expectLimiting ? evnt.DelayTime > TimeSpan.Zero : evnt == null) : evnt == null;
                 Assert.That(expected);
             }
@@ -234,9 +222,9 @@ namespace CryptoExchange.Net.UnitTests
             RateLimitEvent evnt = null;
             rateLimiter.RateLimitTriggered += (x) => { evnt = x; };
 
-            var result1 = await rateLimiter.ProcessAsync(new TraceLogger(), 1, RateLimitItemType.Request, requestDefinition1, "https://test.com", "123", 1, RateLimitingBehaviour.Wait, null, default);
+            var result1 = await rateLimiter.ProcessAsync(new TraceLogger(), 1, RateLimitItemType.Request, requestDefinition1, "https://test.com", "123".ToSecureString(), 1, RateLimitingBehaviour.Wait, default);
             Assert.That(evnt == null);
-            var result2 = await rateLimiter.ProcessAsync(new TraceLogger(), 1, RateLimitItemType.Request, requestDefinition2, "https://test.com", "123", 1, RateLimitingBehaviour.Wait, null, default);
+            var result2 = await rateLimiter.ProcessAsync(new TraceLogger(), 1, RateLimitItemType.Request, requestDefinition2, "https://test.com", "123".ToSecureString(), 1, RateLimitingBehaviour.Wait, default);
             Assert.That(expectLimiting ? evnt != null : evnt == null);
         }
 
@@ -255,12 +243,12 @@ namespace CryptoExchange.Net.UnitTests
 
             for (var i = 0; i < requests + 1; i++)
             {
-                var result1 = await rateLimiter.ProcessAsync(new TraceLogger(), 1, RateLimitItemType.Request, requestDefinition, "https://test.com", "123", 1, RateLimitingBehaviour.Wait, null, default);
+                var result1 = await rateLimiter.ProcessAsync(new TraceLogger(), 1, RateLimitItemType.Request, requestDefinition, "https://test.com", "123".ToSecureString(), 1, RateLimitingBehaviour.Wait, default);
                 Assert.That(i == requests ? triggered : !triggered);
             }
             triggered = false;
             await Task.Delay((int)Math.Round(perSeconds * 1000) + 10);
-            var result2 = await rateLimiter.ProcessAsync(new TraceLogger(), 1, RateLimitItemType.Request, requestDefinition, "https://test.com", "123", 1, RateLimitingBehaviour.Wait, null, default);
+            var result2 = await rateLimiter.ProcessAsync(new TraceLogger(), 1, RateLimitItemType.Request, requestDefinition, "https://test.com", "123".ToSecureString(), 1, RateLimitingBehaviour.Wait, default);
             Assert.That(!triggered);
         }
 
@@ -278,7 +266,7 @@ namespace CryptoExchange.Net.UnitTests
             rateLimiter.RateLimitTriggered += (x) => { evnt = x; };
             for (var i = 0; i < 2; i++)
             {
-                var result1 = await rateLimiter.ProcessAsync(new TraceLogger(), 1, RateLimitItemType.Request, requestDefinition, "https://test.com", "123", 1, RateLimitingBehaviour.Wait, null, default);
+                var result1 = await rateLimiter.ProcessAsync(new TraceLogger(), 1, RateLimitItemType.Request, requestDefinition, "https://test.com", "123".ToSecureString(), 1, RateLimitingBehaviour.Wait, default);
                 bool expected = i == 1 ? (expectLimited ? evnt.DelayTime > TimeSpan.Zero : evnt == null) : evnt == null;
                 Assert.That(expected);
             }
@@ -298,7 +286,7 @@ namespace CryptoExchange.Net.UnitTests
             rateLimiter.RateLimitTriggered += (x) => { evnt = x; };
             for (var i = 0; i < 2; i++)
             {
-                var result1 = await rateLimiter.ProcessAsync(new TraceLogger(), 1, RateLimitItemType.Request, requestDefinition, "https://test.com", "123", 1, RateLimitingBehaviour.Wait, null, default);
+                var result1 = await rateLimiter.ProcessAsync(new TraceLogger(), 1, RateLimitItemType.Request, requestDefinition, "https://test.com", "123".ToSecureString(), 1, RateLimitingBehaviour.Wait, default);
                 bool expected = i == 1 ? (expectLimited ? evnt.DelayTime > TimeSpan.Zero : evnt == null) : evnt == null;
                 Assert.That(expected);
             }
@@ -314,16 +302,16 @@ namespace CryptoExchange.Net.UnitTests
         public async Task ApiKeyRateLimiterBasics(string key1, string key2, string endpoint1, string endpoint2, bool expectLimited)
         {
             var rateLimiter = new RateLimitGate("Test");
-            rateLimiter.AddGuard(new RateLimitGuard(RateLimitGuard.PerApiKey, new AuthenticatedEndpointFilter(true), 1, TimeSpan.FromSeconds(0.1), RateLimitWindowType.Sliding));
+            rateLimiter.AddGuard(new RateLimitGuard(RateLimitGuard.PerApiKey, new AuthenticatedEndpointFilter(true), 1, TimeSpan.FromSeconds(0.1), RateLimitWindowType.Fixed));
             var requestDefinition1 = new RequestDefinition(endpoint1, HttpMethod.Get) { Authenticated = key1 != null };
             var requestDefinition2 = new RequestDefinition(endpoint2, HttpMethod.Get) { Authenticated = key2 != null };
 
             RateLimitEvent evnt = null;
             rateLimiter.RateLimitTriggered += (x) => { evnt = x; };
 
-            var result1 = await rateLimiter.ProcessAsync(new TraceLogger(), 1, RateLimitItemType.Request, requestDefinition1, "https://test.com", key1, 1, RateLimitingBehaviour.Wait, null, default);
+            var result1 = await rateLimiter.ProcessAsync(new TraceLogger(), 1, RateLimitItemType.Request, requestDefinition1, "https://test.com", key1?.ToSecureString(), 1, RateLimitingBehaviour.Wait, default);
             Assert.That(evnt == null);
-            var result2 = await rateLimiter.ProcessAsync(new TraceLogger(), 1, RateLimitItemType.Request, requestDefinition2, "https://test.com", key2, 1, RateLimitingBehaviour.Wait, null, default);
+            var result2 = await rateLimiter.ProcessAsync(new TraceLogger(), 1, RateLimitItemType.Request, requestDefinition2, "https://test.com", key2?.ToSecureString(), 1, RateLimitingBehaviour.Wait, default);
             Assert.That(expectLimited ? evnt != null : evnt == null);
         }
 
@@ -340,9 +328,9 @@ namespace CryptoExchange.Net.UnitTests
             RateLimitEvent evnt = null;
             rateLimiter.RateLimitTriggered += (x) => { evnt = x; };
 
-            var result1 = await rateLimiter.ProcessAsync(new TraceLogger(), 1, RateLimitItemType.Request, requestDefinition1, "https://test.com", "123", 1, RateLimitingBehaviour.Wait, null, default);
+            var result1 = await rateLimiter.ProcessAsync(new TraceLogger(), 1, RateLimitItemType.Request, requestDefinition1, "https://test.com", "123".ToSecureString(), 1, RateLimitingBehaviour.Wait, default);
             Assert.That(evnt == null);
-            var result2 = await rateLimiter.ProcessAsync(new TraceLogger(), 1, RateLimitItemType.Request, requestDefinition2, "https://test.com", null, 1, RateLimitingBehaviour.Wait, null, default);
+            var result2 = await rateLimiter.ProcessAsync(new TraceLogger(), 1, RateLimitItemType.Request, requestDefinition2, "https://test.com", null, 1, RateLimitingBehaviour.Wait, default);
             Assert.That(expectLimited ? evnt != null : evnt == null);
         }
 
@@ -360,9 +348,9 @@ namespace CryptoExchange.Net.UnitTests
             RateLimitEvent evnt = null;
             rateLimiter.RateLimitTriggered += (x) => { evnt = x; };
 
-            var result1 = await rateLimiter.ProcessAsync(new TraceLogger(), 1, RateLimitItemType.Request, requestDefinition1, host1, "123", 1, RateLimitingBehaviour.Wait, null, default);
+            var result1 = await rateLimiter.ProcessAsync(new TraceLogger(), 1, RateLimitItemType.Request, requestDefinition1, host1, "123".ToSecureString(), 1, RateLimitingBehaviour.Wait, default);
             Assert.That(evnt == null);
-            var result2 = await rateLimiter.ProcessAsync(new TraceLogger(), 1, RateLimitItemType.Request, requestDefinition1, host2, "123", 1, RateLimitingBehaviour.Wait, null, default);
+            var result2 = await rateLimiter.ProcessAsync(new TraceLogger(), 1, RateLimitItemType.Request, requestDefinition1, host2, "123".ToSecureString(), 1, RateLimitingBehaviour.Wait, default);
             Assert.That(expectLimited ? evnt != null : evnt == null);
         }
 
@@ -377,25 +365,10 @@ namespace CryptoExchange.Net.UnitTests
             RateLimitEvent evnt = null;
             rateLimiter.RateLimitTriggered += (x) => { evnt = x; };
 
-            var result1 = await rateLimiter.ProcessAsync(new TraceLogger(), 1, RateLimitItemType.Connection, new RequestDefinition("1", HttpMethod.Get), host1, "123", 1, RateLimitingBehaviour.Wait, null, default);
+            var result1 = await rateLimiter.ProcessAsync(new TraceLogger(), 1, RateLimitItemType.Connection, new RequestDefinition("1", HttpMethod.Get), host1, "123".ToSecureString(), 1, RateLimitingBehaviour.Wait, default);
             Assert.That(evnt == null);
-            var result2 = await rateLimiter.ProcessAsync(new TraceLogger(), 1, RateLimitItemType.Connection, new RequestDefinition("1", HttpMethod.Get), host2, "123", 1, RateLimitingBehaviour.Wait, null, default);
+            var result2 = await rateLimiter.ProcessAsync(new TraceLogger(), 1, RateLimitItemType.Connection, new RequestDefinition("1", HttpMethod.Get), host2, "123".ToSecureString(), 1, RateLimitingBehaviour.Wait, default);
             Assert.That(expectLimited ? evnt != null : evnt == null);
         }
-
-        [Test]
-        public async Task ConnectionRateLimiterCancel()
-        {
-            var rateLimiter = new RateLimitGate("Test");
-            rateLimiter.AddGuard(new RateLimitGuard(RateLimitGuard.PerHost, new LimitItemTypeFilter(RateLimitItemType.Connection), 1, TimeSpan.FromSeconds(10), RateLimitWindowType.Fixed));
-
-            RateLimitEvent evnt = null;
-            rateLimiter.RateLimitTriggered += (x) => { evnt = x; };
-            var ct = new CancellationTokenSource(TimeSpan.FromSeconds(0.2));
-
-            var result1 = await rateLimiter.ProcessAsync(new TraceLogger(), 1, RateLimitItemType.Connection, new RequestDefinition("1", HttpMethod.Get), "https://test.com", "123", 1, RateLimitingBehaviour.Wait, null, ct.Token);
-            var result2 = await rateLimiter.ProcessAsync(new TraceLogger(), 1, RateLimitItemType.Connection, new RequestDefinition("1", HttpMethod.Get), "https://test.com", "123", 1, RateLimitingBehaviour.Wait, null, ct.Token);
-            Assert.That(result2.Error, Is.TypeOf<CancellationRequestedError>());
-        }
     }
 }

CryptoExchange.Net.UnitTests/SharedQuantityTests.cs

@@ -1,633 +0,0 @@
-using CryptoExchange.Net.SharedApis;
-using NUnit.Framework;
-using System;
-
-namespace CryptoExchange.Net.UnitTests
-{
-    [TestFixture()]
-    public class SharedQuantityTests
-    {
-        [Test]
-        public void SharedQuantityReference_IsZero_AllNull_Should_ReturnTrue()
-        {
-            // arrange
-            var quantity = new SharedOrderQuantity(null, null, null);
-
-            // act & assert
-            Assert.That(quantity.IsZero, Is.True);
-        }
-
-        [Test]
-        public void SharedQuantityReference_IsZero_AllZero_Should_ReturnTrue()
-        {
-            // arrange
-            var quantity = new SharedOrderQuantity(0, 0, 0);
-
-            // act & assert
-            Assert.That(quantity.IsZero, Is.True);
-        }
-
-        [Test]
-        public void SharedQuantityReference_IsZero_BaseAssetSet_Should_ReturnFalse()
-        {
-            // arrange
-            var quantity = new SharedOrderQuantity(1.5m, null, null);
-
-            // act & assert
-            Assert.That(quantity.IsZero, Is.False);
-        }
-
-        [Test]
-        public void SharedQuantityReference_IsZero_QuoteAssetSet_Should_ReturnFalse()
-        {
-            // arrange
-            var quantity = new SharedOrderQuantity(null, 100m, null);
-
-            // act & assert
-            Assert.That(quantity.IsZero, Is.False);
-        }
-
-        [Test]
-        public void SharedQuantityReference_IsZero_ContractsSet_Should_ReturnFalse()
-        {
-            // arrange
-            var quantity = new SharedOrderQuantity(null, null, 10m);
-
-            // act & assert
-            Assert.That(quantity.IsZero, Is.False);
-        }
-
-        [Test]
-        public void SharedQuantityReference_IsZero_NegativeValue_Should_ReturnTrue()
-        {
-            // arrange
-            var quantity = new SharedOrderQuantity(-1m, 0, 0);
-
-            // act & assert
-            Assert.That(quantity.IsZero, Is.True);
-        }
-
-        [Test]
-        public void SharedQuantity_DefaultConstructor_Should_SetAllPropertiesToNull()
-        {
-            // arrange & act
-            var quantity = new SharedQuantity();
-
-            // assert
-            Assert.That(quantity.QuantityInBaseAsset, Is.Null);
-            Assert.That(quantity.QuantityInQuoteAsset, Is.Null);
-            Assert.That(quantity.QuantityInContracts, Is.Null);
-            Assert.That(quantity.IsZero, Is.True);
-        }
-
-        [Test]
-        public void SharedQuantity_Base_Should_SetBaseAssetQuantity()
-        {
-            // arrange
-            var expectedQuantity = 1.5m;
-
-            // act
-            var quantity = SharedQuantity.Base(expectedQuantity);
-
-            // assert
-            Assert.That(quantity.QuantityInBaseAsset, Is.EqualTo(expectedQuantity));
-            Assert.That(quantity.QuantityInQuoteAsset, Is.Null);
-            Assert.That(quantity.QuantityInContracts, Is.Null);
-        }
-
-        [Test]
-        public void SharedQuantity_Base_WithZero_Should_SetZeroQuantity()
-        {
-            // arrange & act
-            var quantity = SharedQuantity.Base(0m);
-
-            // assert
-            Assert.That(quantity.QuantityInBaseAsset, Is.EqualTo(0m));
-            Assert.That(quantity.IsZero, Is.True);
-        }
-
-        [Test]
-        public void SharedQuantity_Base_WithLargeValue_Should_SetCorrectly()
-        {
-            // arrange
-            var largeValue = 999999.123456789m;
-
-            // act
-            var quantity = SharedQuantity.Base(largeValue);
-
-            // assert
-            Assert.That(quantity.QuantityInBaseAsset, Is.EqualTo(largeValue));
-        }
-
-        [Test]
-        public void SharedQuantity_Quote_Should_SetQuoteAssetQuantity()
-        {
-            // arrange
-            var expectedQuantity = 100m;
-
-            // act
-            var quantity = SharedQuantity.Quote(expectedQuantity);
-
-            // assert
-            Assert.That(quantity.QuantityInBaseAsset, Is.Null);
-            Assert.That(quantity.QuantityInQuoteAsset, Is.EqualTo(expectedQuantity));
-            Assert.That(quantity.QuantityInContracts, Is.Null);
-        }
-
-        [Test]
-        public void SharedQuantity_Quote_WithDecimal_Should_PreserveDecimals()
-        {
-            // arrange
-            var expectedQuantity = 50.123456m;
-
-            // act
-            var quantity = SharedQuantity.Quote(expectedQuantity);
-
-            // assert
-            Assert.That(quantity.QuantityInQuoteAsset, Is.EqualTo(expectedQuantity));
-        }
-
-        [Test]
-        public void SharedQuantity_Contracts_Should_SetContractQuantity()
-        {
-            // arrange
-            var expectedQuantity = 10m;
-
-            // act
-            var quantity = SharedQuantity.Contracts(expectedQuantity);
-
-            // assert
-            Assert.That(quantity.QuantityInBaseAsset, Is.Null);
-            Assert.That(quantity.QuantityInQuoteAsset, Is.Null);
-            Assert.That(quantity.QuantityInContracts, Is.EqualTo(expectedQuantity));
-        }
-
-        [Test]
-        public void SharedQuantity_Contracts_WithFractionalValue_Should_SetCorrectly()
-        {
-            // arrange
-            var expectedQuantity = 2.5m;
-
-            // act
-            var quantity = SharedQuantity.Contracts(expectedQuantity);
-
-            // assert
-            Assert.That(quantity.QuantityInContracts, Is.EqualTo(expectedQuantity));
-        }
-
-        [Test]
-        public void SharedQuantity_BaseFromQuote_Should_CalculateCorrectly()
-        {
-            // arrange
-            var quoteQuantity = 100m;
-            var price = 50m;
-            var expectedBase = 2m; // 100 / 50 = 2
-
-            // act
-            var quantity = SharedQuantity.BaseFromQuote(quoteQuantity, price);
-
-            // assert
-            Assert.That(quantity.QuantityInBaseAsset, Is.EqualTo(expectedBase));
-            Assert.That(quantity.QuantityInQuoteAsset, Is.Null);
-            Assert.That(quantity.QuantityInContracts, Is.Null);
-        }
-
-        [Test]
-        public void SharedQuantity_BaseFromQuote_WithCustomDecimals_Should_RoundCorrectly()
-        {
-            // arrange
-            var quoteQuantity = 100m;
-            var price = 3m;
-            var decimalPlaces = 2;
-
-            // act
-            var quantity = SharedQuantity.BaseFromQuote(quoteQuantity, price, decimalPlaces);
-
-            // assert
-            // 100 / 3 = 33.333... should round to 33.33
-            Assert.That(quantity.QuantityInBaseAsset, Is.EqualTo(33.33m));
-        }
-
-        [Test]
-        public void SharedQuantity_BaseFromQuote_WithLotSize_Should_AdjustToLotSize()
-        {
-            // arrange
-            var quoteQuantity = 100m;
-            var price = 7m;
-            var lotSize = 0.1m;
-
-            // act
-            var quantity = SharedQuantity.BaseFromQuote(quoteQuantity, price, 8, lotSize);
-
-            // assert
-            // 100 / 7 = 14.285714... should adjust to nearest 0.1 = 14.3
-            Assert.That(quantity.QuantityInBaseAsset, Is.EqualTo(14.3m));
-        }
-
-        [Test]
-        public void SharedQuantity_BaseFromQuote_WithHighPrecision_Should_HandleCorrectly()
-        {
-            // arrange
-            var quoteQuantity = 1000m;
-            var price = 0.00001m;
-            var decimalPlaces = 8;
-
-            // act
-            var quantity = SharedQuantity.BaseFromQuote(quoteQuantity, price, decimalPlaces);
-
-            // assert
-            Assert.That(quantity.QuantityInBaseAsset, Is.GreaterThan(0));
-        }
-
-        [Test]
-        public void SharedQuantity_QuoteFromBase_Should_CalculateCorrectly()
-        {
-            // arrange
-            var baseQuantity = 2m;
-            var price = 50m;
-            var expectedQuote = 100m; // 2 * 50 = 100
-
-            // act
-            var quantity = SharedQuantity.QuoteFromBase(baseQuantity, price);
-
-            // assert
-            Assert.That(quantity.QuantityInBaseAsset, Is.EqualTo(expectedQuote));
-            Assert.That(quantity.QuantityInQuoteAsset, Is.Null);
-            Assert.That(quantity.QuantityInContracts, Is.Null);
-        }
-
-        [Test]
-        public void SharedQuantity_QuoteFromBase_WithCustomDecimals_Should_RoundCorrectly()
-        {
-            // arrange
-            var baseQuantity = 1.234567m;
-            var price = 10m;
-            var decimalPlaces = 2;
-
-            // act
-            var quantity = SharedQuantity.QuoteFromBase(baseQuantity, price, decimalPlaces);
-
-            // assert
-            // 1.234567 * 10 = 12.34567 should round to 12.35
-            Assert.That(quantity.QuantityInBaseAsset, Is.EqualTo(12.35m));
-        }
-
-        [Test]
-        public void SharedQuantity_QuoteFromBase_WithLotSize_Should_AdjustToLotSize()
-        {
-            // arrange
-            var baseQuantity = 3.456m;
-            var price = 10m;
-            var lotSize = 1m;
-
-            // act
-            var quantity = SharedQuantity.QuoteFromBase(baseQuantity, price, 8, lotSize);
-
-            // assert
-            // 3.456 * 10 = 34.56 should adjust to nearest 1 = 35
-            Assert.That(quantity.QuantityInBaseAsset, Is.EqualTo(35m));
-        }
-
-        [Test]
-        public void SharedQuantity_QuoteFromBase_WithSmallValues_Should_HandleCorrectly()
-        {
-            // arrange
-            var baseQuantity = 0.001m;
-            var price = 0.1m;
-            var decimalPlaces = 8;
-
-            // act
-            var quantity = SharedQuantity.QuoteFromBase(baseQuantity, price, decimalPlaces);
-
-            // assert
-            Assert.That(quantity.QuantityInBaseAsset, Is.EqualTo(0.0001m));
-        }
-
-        [Test]
-        public void SharedQuantity_ContractsFromBase_Should_CalculateCorrectly()
-        {
-            // arrange
-            var baseQuantity = 100m;
-            var contractSize = 10m;
-            var expectedContracts = 10m; // 100 / 10 = 10
-
-            // act
-            var quantity = SharedQuantity.ContractsFromBase(baseQuantity, contractSize);
-
-            // assert
-            Assert.That(quantity.QuantityInBaseAsset, Is.EqualTo(expectedContracts));
-            Assert.That(quantity.QuantityInQuoteAsset, Is.Null);
-            Assert.That(quantity.QuantityInContracts, Is.Null);
-        }
-
-        [Test]
-        public void SharedQuantity_ContractsFromBase_WithCustomDecimals_Should_RoundCorrectly()
-        {
-            // arrange
-            var baseQuantity = 100m;
-            var contractSize = 3m;
-            var decimalPlaces = 2;
-
-            // act
-            var quantity = SharedQuantity.ContractsFromBase(baseQuantity, contractSize, decimalPlaces);
-
-            // assert
-            // 100 / 3 = 33.333... should round to 33.33
-            Assert.That(quantity.QuantityInBaseAsset, Is.EqualTo(33.33m));
-        }
-
-        [Test]
-        public void SharedQuantity_ContractsFromBase_WithLotSize_Should_AdjustToLotSize()
-        {
-            // arrange
-            var baseQuantity = 100m;
-            var contractSize = 7m;
-            var lotSize = 0.5m;
-
-            // act
-            var quantity = SharedQuantity.ContractsFromBase(baseQuantity, contractSize, 8, lotSize);
-
-            // assert
-            // 100 / 7 = 14.285714... should adjust to nearest 0.5 = 14.5
-            Assert.That(quantity.QuantityInBaseAsset, Is.EqualTo(14.5m));
-        }
-
-        [Test]
-        public void SharedQuantity_ContractsFromBase_WithFractionalContract_Should_HandleCorrectly()
-        {
-            // arrange
-            var baseQuantity = 1m;
-            var contractSize = 0.1m;
-
-            // act
-            var quantity = SharedQuantity.ContractsFromBase(baseQuantity, contractSize);
-
-            // assert
-            Assert.That(quantity.QuantityInBaseAsset, Is.EqualTo(10m));
-        }
-
-        [Test]
-        public void SharedQuantity_ContractsFromQuote_Should_CalculateCorrectly()
-        {
-            // arrange
-            var quoteQuantity = 1000m;
-            var contractSize = 10m;
-            var price = 50m;
-            var expectedContracts = 2m; // 1000 / 50 / 10 = 2
-
-            // act
-            var quantity = SharedQuantity.ContractsFromQuote(quoteQuantity, contractSize, price);
-
-            // assert
-            Assert.That(quantity.QuantityInBaseAsset, Is.EqualTo(expectedContracts));
-            Assert.That(quantity.QuantityInQuoteAsset, Is.Null);
-            Assert.That(quantity.QuantityInContracts, Is.Null);
-        }
-
-        [Test]
-        public void SharedQuantity_ContractsFromQuote_WithCustomDecimals_Should_RoundCorrectly()
-        {
-            // arrange
-            var quoteQuantity = 100m;
-            var contractSize = 3m;
-            var price = 7m;
-            var decimalPlaces = 2;
-
-            // act
-            var quantity = SharedQuantity.ContractsFromQuote(quoteQuantity, contractSize, price, decimalPlaces);
-
-            // assert
-            // 100 / 7 / 3 = 4.761904... should round to 4.76
-            Assert.That(quantity.QuantityInBaseAsset, Is.EqualTo(4.76m));
-        }
-
-        [Test]
-        public void SharedQuantity_ContractsFromQuote_WithLotSize_Should_AdjustToLotSize()
-        {
-            // arrange
-            var quoteQuantity = 1000m;
-            var contractSize = 7m;
-            var price = 13m;
-            var lotSize = 0.5m;
-
-            // act
-            var quantity = SharedQuantity.ContractsFromQuote(quoteQuantity, contractSize, price, 8, lotSize);
-
-            // assert
-            // 1000 / 13 / 7 = 10.989... should adjust to nearest 0.5 = 11.0
-            Assert.That(quantity.QuantityInBaseAsset, Is.EqualTo(11.0m));
-        }
-
-        [Test]
-        public void SharedQuantity_ContractsFromQuote_WithComplexValues_Should_CalculateCorrectly()
-        {
-            // arrange
-            var quoteQuantity = 5000m;
-            var contractSize = 0.01m;
-            var price = 25000m;
-            var decimalPlaces = 4;
-
-            // act
-            var quantity = SharedQuantity.ContractsFromQuote(quoteQuantity, contractSize, price, decimalPlaces);
-
-            // assert
-            // 5000 / 25000 / 0.01 = 20
-            Assert.That(quantity.QuantityInBaseAsset, Is.EqualTo(20m));
-        }
-
-        [Test]
-        public void SharedOrderQuantity_DefaultConstructor_Should_SetAllPropertiesToNull()
-        {
-            // arrange & act
-            var quantity = new SharedOrderQuantity();
-
-            // assert
-            Assert.That(quantity.QuantityInBaseAsset, Is.Null);
-            Assert.That(quantity.QuantityInQuoteAsset, Is.Null);
-            Assert.That(quantity.QuantityInContracts, Is.Null);
-            Assert.That(quantity.IsZero, Is.True);
-        }
-
-        [Test]
-        public void SharedOrderQuantity_ParameterizedConstructor_Should_SetBaseAsset()
-        {
-            // arrange
-            var baseAsset = 5m;
-
-            // act
-            var quantity = new SharedOrderQuantity(baseAssetQuantity: baseAsset);
-
-            // assert
-            Assert.That(quantity.QuantityInBaseAsset, Is.EqualTo(baseAsset));
-            Assert.That(quantity.QuantityInQuoteAsset, Is.Null);
-            Assert.That(quantity.QuantityInContracts, Is.Null);
-        }
-
-        [Test]
-        public void SharedOrderQuantity_ParameterizedConstructor_Should_SetQuoteAsset()
-        {
-            // arrange
-            var quoteAsset = 100m;
-
-            // act
-            var quantity = new SharedOrderQuantity(quoteAssetQuantity: quoteAsset);
-
-            // assert
-            Assert.That(quantity.QuantityInBaseAsset, Is.Null);
-            Assert.That(quantity.QuantityInQuoteAsset, Is.EqualTo(quoteAsset));
-            Assert.That(quantity.QuantityInContracts, Is.Null);
-        }
-
-        [Test]
-        public void SharedOrderQuantity_ParameterizedConstructor_Should_SetContracts()
-        {
-            // arrange
-            var contracts = 10m;
-
-            // act
-            var quantity = new SharedOrderQuantity(contractQuantity: contracts);
-
-            // assert
-            Assert.That(quantity.QuantityInBaseAsset, Is.Null);
-            Assert.That(quantity.QuantityInQuoteAsset, Is.Null);
-            Assert.That(quantity.QuantityInContracts, Is.EqualTo(contracts));
-        }
-
-        [Test]
-        public void SharedOrderQuantity_ParameterizedConstructor_Should_SetAllValues()
-        {
-            // arrange
-            var baseAsset = 1m;
-            var quoteAsset = 50m;
-            var contracts = 5m;
-
-            // act
-            var quantity = new SharedOrderQuantity(baseAsset, quoteAsset, contracts);
-
-            // assert
-            Assert.That(quantity.QuantityInBaseAsset, Is.EqualTo(baseAsset));
-            Assert.That(quantity.QuantityInQuoteAsset, Is.EqualTo(quoteAsset));
-            Assert.That(quantity.QuantityInContracts, Is.EqualTo(contracts));
-            Assert.That(quantity.IsZero, Is.False);
-        }
-
-        [Test]
-        public void SharedOrderQuantity_ParameterizedConstructor_WithNullValues_Should_HandleCorrectly()
-        {
-            // arrange & act
-            var quantity = new SharedOrderQuantity(null, null, null);
-
-            // assert
-            Assert.That(quantity.QuantityInBaseAsset, Is.Null);
-            Assert.That(quantity.QuantityInQuoteAsset, Is.Null);
-            Assert.That(quantity.QuantityInContracts, Is.Null);
-            Assert.That(quantity.IsZero, Is.True);
-        }
-
-        [Test]
-        public void SharedQuantity_RecordEquality_SameValues_Should_BeEqual()
-        {
-            // arrange
-            var quantity1 = SharedQuantity.Base(10m);
-            var quantity2 = SharedQuantity.Base(10m);
-
-            // act & assert
-            Assert.That(quantity1, Is.EqualTo(quantity2));
-        }
-
-        [Test]
-        public void SharedQuantity_RecordEquality_DifferentValues_Should_NotBeEqual()
-        {
-            // arrange
-            var quantity1 = SharedQuantity.Base(10m);
-            var quantity2 = SharedQuantity.Base(20m);
-
-            // act & assert
-            Assert.That(quantity1, Is.Not.EqualTo(quantity2));
-        }
-
-        [Test]
-        public void SharedQuantity_RecordEquality_DifferentTypes_Should_NotBeEqual()
-        {
-            // arrange
-            var quantity1 = SharedQuantity.Base(10m);
-            var quantity2 = SharedQuantity.Quote(10m);
-
-            // act & assert
-            Assert.That(quantity1, Is.Not.EqualTo(quantity2));
-        }
-
-        [Test]
-        public void SharedOrderQuantity_RecordEquality_SameValues_Should_BeEqual()
-        {
-            // arrange
-            var quantity1 = new SharedOrderQuantity(5m, 100m, 2m);
-            var quantity2 = new SharedOrderQuantity(5m, 100m, 2m);
-
-            // act & assert
-            Assert.That(quantity1, Is.EqualTo(quantity2));
-        }
-
-        [Test]
-        public void SharedQuantity_BaseFromQuote_WithDefaultParameters_Should_UseDefaults()
-        {
-            // arrange
-            var quoteQuantity = 100m;
-            var price = 3m;
-
-            // act
-            var quantity = SharedQuantity.BaseFromQuote(quoteQuantity, price);
-
-            // assert
-            // Default decimalPlaces = 8, default lotSize = 0.00000001
-            Assert.That(quantity.QuantityInBaseAsset, Is.Not.Null);
-            Assert.That(quantity.QuantityInBaseAsset, Is.GreaterThan(0));
-        }
-
-        [Test]
-        public void SharedQuantity_QuoteFromBase_WithDefaultParameters_Should_UseDefaults()
-        {
-            // arrange
-            var baseQuantity = 1.234567m;
-            var price = 10m;
-
-            // act
-            var quantity = SharedQuantity.QuoteFromBase(baseQuantity, price);
-
-            // assert
-            Assert.That(quantity.QuantityInBaseAsset, Is.Not.Null);
-            Assert.That(quantity.QuantityInBaseAsset, Is.GreaterThan(0));
-        }
-
-        [Test]
-        public void SharedQuantity_ContractsFromBase_WithDefaultParameters_Should_UseDefaults()
-        {
-            // arrange
-            var baseQuantity = 100m;
-            var contractSize = 3m;
-
-            // act
-            var quantity = SharedQuantity.ContractsFromBase(baseQuantity, contractSize);
-
-            // assert
-            Assert.That(quantity.QuantityInBaseAsset, Is.Not.Null);
-            Assert.That(quantity.QuantityInBaseAsset, Is.GreaterThan(0));
-        }
-
-        [Test]
-        public void SharedQuantity_ContractsFromQuote_WithDefaultParameters_Should_UseDefaults()
-        {
-            // arrange
-            var quoteQuantity = 1000m;
-            var contractSize = 10m;
-            var price = 50m;
-
-            // act
-            var quantity = SharedQuantity.ContractsFromQuote(quoteQuantity, contractSize, price);
-
-            // assert
-            Assert.That(quantity.QuantityInBaseAsset, Is.Not.Null);
-            Assert.That(quantity.QuantityInBaseAsset, Is.GreaterThan(0));
-        }
-    }
-}

CryptoExchange.Net.UnitTests/SharedSymbolTests.cs

@@ -1,400 +0,0 @@
-using CryptoExchange.Net.SharedApis;
-using NUnit.Framework;
-using System;
-
-namespace CryptoExchange.Net.UnitTests
-{
-    [TestFixture()]
-    public class SharedSymbolTests
-    {
-        [Test]
-        public void SharedSymbol_Constructor_Should_SetAllProperties()
-        {
-            // arrange
-            var tradingMode = TradingMode.Spot;
-            var baseAsset = "BTC";
-            var quoteAsset = "USDT";
-
-            // act
-            var symbol = new SharedSymbol(tradingMode, baseAsset, quoteAsset);
-
-            // assert
-            Assert.That(symbol.TradingMode, Is.EqualTo(tradingMode));
-            Assert.That(symbol.BaseAsset, Is.EqualTo(baseAsset));
-            Assert.That(symbol.QuoteAsset, Is.EqualTo(quoteAsset));
-            Assert.That(symbol.DeliverTime, Is.Null);
-            Assert.That(symbol.SymbolName, Is.Null);
-        }
-
-        [Test]
-        public void SharedSymbol_Constructor_WithDeliveryTime_Should_SetDeliveryTime()
-        {
-            // arrange
-            var tradingMode = TradingMode.DeliveryLinear;
-            var baseAsset = "BTC";
-            var quoteAsset = "USDT";
-            var deliveryTime = new DateTime(2026, 6, 25, 0, 0, 0, DateTimeKind.Utc);
-
-            // act
-            var symbol = new SharedSymbol(tradingMode, baseAsset, quoteAsset, deliveryTime);
-
-            // assert
-            Assert.That(symbol.TradingMode, Is.EqualTo(tradingMode));
-            Assert.That(symbol.BaseAsset, Is.EqualTo(baseAsset));
-            Assert.That(symbol.QuoteAsset, Is.EqualTo(quoteAsset));
-            Assert.That(symbol.DeliverTime, Is.EqualTo(deliveryTime));
-            Assert.That(symbol.SymbolName, Is.Null);
-        }
-
-        [Test]
-        public void SharedSymbol_Constructor_WithNullDeliveryTime_Should_SetToNull()
-        {
-            // arrange
-            var tradingMode = TradingMode.Spot;
-            var baseAsset = "ETH";
-            var quoteAsset = "BTC";
-
-            // act
-            var symbol = new SharedSymbol(tradingMode, baseAsset, quoteAsset, deliverTime: null);
-
-            // assert
-            Assert.That(symbol.DeliverTime, Is.Null);
-        }
-
-        [TestCase(TradingMode.Spot)]
-        [TestCase(TradingMode.PerpetualLinear)]
-        [TestCase(TradingMode.PerpetualInverse)]
-        [TestCase(TradingMode.DeliveryLinear)]
-        [TestCase(TradingMode.DeliveryInverse)]
-        public void SharedSymbol_Constructor_WithDifferentTradingModes_Should_SetCorrectly(TradingMode tradingMode)
-        {
-            // arrange
-            var baseAsset = "BTC";
-            var quoteAsset = "USDT";
-
-            // act
-            var symbol = new SharedSymbol(tradingMode, baseAsset, quoteAsset);
-
-            // assert
-            Assert.That(symbol.TradingMode, Is.EqualTo(tradingMode));
-        }
-
-        [Test]
-        public void SharedSymbol_ConstructorWithSymbolName_Should_SetSymbolName()
-        {
-            // arrange
-            var tradingMode = TradingMode.Spot;
-            var baseAsset = "BTC";
-            var quoteAsset = "USDT";
-            var symbolName = "BTC-USDT";
-
-            // act
-            var symbol = new SharedSymbol(tradingMode, baseAsset, quoteAsset, symbolName);
-
-            // assert
-            Assert.That(symbol.TradingMode, Is.EqualTo(tradingMode));
-            Assert.That(symbol.BaseAsset, Is.EqualTo(baseAsset));
-            Assert.That(symbol.QuoteAsset, Is.EqualTo(quoteAsset));
-            Assert.That(symbol.SymbolName, Is.EqualTo(symbolName));
-            Assert.That(symbol.DeliverTime, Is.Null);
-        }
-
-        [Test]
-        public void SharedSymbol_ConstructorWithSymbolName_WithCustomFormat_Should_SetCorrectly()
-        {
-            // arrange
-            var tradingMode = TradingMode.PerpetualLinear;
-            var baseAsset = "ETH";
-            var quoteAsset = "USDT";
-            var symbolName = "ETHUSDT-PERP";
-
-            // act
-            var symbol = new SharedSymbol(tradingMode, baseAsset, quoteAsset, symbolName);
-
-            // assert
-            Assert.That(symbol.SymbolName, Is.EqualTo(symbolName));
-        }
-
-        [Test]
-        public void SharedSymbol_ConstructorWithSymbolName_WithEmptyString_Should_SetEmptyString()
-        {
-            // arrange
-            var tradingMode = TradingMode.Spot;
-            var baseAsset = "BTC";
-            var quoteAsset = "USDT";
-            var symbolName = "";
-
-            // act
-            var symbol = new SharedSymbol(tradingMode, baseAsset, quoteAsset, symbolName);
-
-            // assert
-            Assert.That(symbol.SymbolName, Is.EqualTo(""));
-        }
-
-        [Test]
-        public void GetSymbol_WithSymbolNameSet_Should_ReturnSymbolName()
-        {
-            // arrange
-            var symbol = new SharedSymbol(TradingMode.Spot, "BTC", "USDT", "CUSTOM-BTC-USDT");
-            var formatFunc = new Func<string, string, TradingMode, DateTime?, string>(
-                (b, q, t, d) => $"{b}{q}");
-
-            // act
-            var result = symbol.GetSymbol(formatFunc);
-
-            // assert
-            Assert.That(result, Is.EqualTo("CUSTOM-BTC-USDT"));
-        }
-
-        [Test]
-        public void GetSymbol_WithSymbolNameNull_Should_UseFormatFunction()
-        {
-            // arrange
-            var symbol = new SharedSymbol(TradingMode.Spot, "BTC", "USDT");
-            var formatFunc = new Func<string, string, TradingMode, DateTime?, string>(
-                (b, q, t, d) => $"{b}/{q}");
-
-            // act
-            var result = symbol.GetSymbol(formatFunc);
-
-            // assert
-            Assert.That(result, Is.EqualTo("BTC/USDT"));
-        }
-
-        [Test]
-        public void GetSymbol_WithComplexFormatFunction_Should_ApplyCorrectly()
-        {
-            // arrange
-            var symbol = new SharedSymbol(TradingMode.PerpetualLinear, "ETH", "USDT");
-            var formatFunc = new Func<string, string, TradingMode, DateTime?, string>(
-                (b, q, t, d) => t == TradingMode.PerpetualLinear ? $"{b}{q}-PERP" : $"{b}{q}");
-
-            // act
-            var result = symbol.GetSymbol(formatFunc);
-
-            // assert
-            Assert.That(result, Is.EqualTo("ETHUSDT-PERP"));
-        }
-
-        [Test]
-        public void GetSymbol_WithDeliveryTime_Should_PassDeliveryTimeToFormatter()
-        {
-            // arrange
-            var deliveryTime = new DateTime(2026, 6, 25);
-            var symbol = new SharedSymbol(TradingMode.DeliveryLinear, "BTC", "USDT", deliveryTime);
-            var formatFunc = new Func<string, string, TradingMode, DateTime?, string>(
-                (b, q, t, d) => d.HasValue ? $"{b}{q}_{d.Value:yyyyMMdd}" : $"{b}{q}");
-
-            // act
-            var result = symbol.GetSymbol(formatFunc);
-
-            // assert
-            Assert.That(result, Is.EqualTo("BTCUSDT_20260625"));
-        }
-
-        [Test]
-        public void GetSymbol_WithTradingMode_Should_PassTradingModeToFormatter()
-        {
-            // arrange
-            var symbol = new SharedSymbol(TradingMode.PerpetualInverse, "BTC", "USD");
-            var formatFunc = new Func<string, string, TradingMode, DateTime?, string>(
-                (b, q, t, d) =>
-                {
-                    return t switch
-                    {
-                        TradingMode.Spot => $"{b}{q}",
-                        TradingMode.PerpetualLinear => $"{b}{q}-PERP",
-                        TradingMode.PerpetualInverse => $"{b}{q}I-PERP",
-                        _ => $"{b}{q}"
-                    };
-                });
-
-            // act
-            var result = symbol.GetSymbol(formatFunc);
-
-            // assert
-            Assert.That(result, Is.EqualTo("BTCUSDI-PERP"));
-        }
-
-        [Test]
-        public void GetSymbol_WithEmptySymbolName_Should_UseFormatFunction()
-        {
-            // arrange
-            var symbol = new SharedSymbol(TradingMode.Spot, "BTC", "USDT", "");
-            var formatFunc = new Func<string, string, TradingMode, DateTime?, string>(
-                (b, q, t, d) => $"{b}-{q}");
-
-            // act
-            var result = symbol.GetSymbol(formatFunc);
-
-            // assert
-            Assert.That(result, Is.EqualTo("BTC-USDT"));
-        }
-
-        [Test]
-        public void GetSymbol_WithWhitespaceSymbolName_Should_ReturnWhitespace()
-        {
-            // arrange
-            var symbol = new SharedSymbol(TradingMode.Spot, "BTC", "USDT", "   ");
-            var formatFunc = new Func<string, string, TradingMode, DateTime?, string>(
-                (b, q, t, d) => $"{b}-{q}");
-
-            // act
-            var result = symbol.GetSymbol(formatFunc);
-
-            // assert
-            Assert.That(result, Is.EqualTo("   "));
-        }
-
-        [Test]
-        public void SharedSymbol_RecordEquality_SameValues_Should_BeEqual()
-        {
-            // arrange
-            var symbol1 = new SharedSymbol(TradingMode.Spot, "BTC", "USDT");
-            var symbol2 = new SharedSymbol(TradingMode.Spot, "BTC", "USDT");
-
-            // act & assert
-            Assert.That(symbol1, Is.EqualTo(symbol2));
-        }
-
-        [Test]
-        public void SharedSymbol_RecordEquality_DifferentBaseAsset_Should_NotBeEqual()
-        {
-            // arrange
-            var symbol1 = new SharedSymbol(TradingMode.Spot, "BTC", "USDT");
-            var symbol2 = new SharedSymbol(TradingMode.Spot, "ETH", "USDT");
-
-            // act & assert
-            Assert.That(symbol1, Is.Not.EqualTo(symbol2));
-        }
-
-        [Test]
-        public void SharedSymbol_RecordEquality_DifferentQuoteAsset_Should_NotBeEqual()
-        {
-            // arrange
-            var symbol1 = new SharedSymbol(TradingMode.Spot, "BTC", "USDT");
-            var symbol2 = new SharedSymbol(TradingMode.Spot, "BTC", "EUR");
-
-            // act & assert
-            Assert.That(symbol1, Is.Not.EqualTo(symbol2));
-        }
-
-        [Test]
-        public void SharedSymbol_RecordEquality_DifferentTradingMode_Should_NotBeEqual()
-        {
-            // arrange
-            var symbol1 = new SharedSymbol(TradingMode.Spot, "BTC", "USDT");
-            var symbol2 = new SharedSymbol(TradingMode.PerpetualLinear, "BTC", "USDT");
-
-            // act & assert
-            Assert.That(symbol1, Is.Not.EqualTo(symbol2));
-        }
-
-        [Test]
-        public void SharedSymbol_RecordEquality_DifferentDeliveryTime_Should_NotBeEqual()
-        {
-            // arrange
-            var deliveryTime1 = new DateTime(2026, 6, 25);
-            var deliveryTime2 = new DateTime(2026, 9, 25);
-            var symbol1 = new SharedSymbol(TradingMode.DeliveryLinear, "BTC", "USDT", deliveryTime1);
-            var symbol2 = new SharedSymbol(TradingMode.DeliveryLinear, "BTC", "USDT", deliveryTime2);
-
-            // act & assert
-            Assert.That(symbol1, Is.Not.EqualTo(symbol2));
-        }
-
-        [Test]
-        public void SharedSymbol_RecordEquality_DifferentSymbolName_Should_NotBeEqual()
-        {
-            // arrange
-            var symbol1 = new SharedSymbol(TradingMode.Spot, "BTC", "USDT", "BTCUSDT");
-            var symbol2 = new SharedSymbol(TradingMode.Spot, "BTC", "USDT", "BTC-USDT");
-
-            // act & assert
-            Assert.That(symbol1, Is.Not.EqualTo(symbol2));
-        }
-
-        [Test]
-        public void SharedSymbol_RecordEquality_OneWithSymbolNameOneWithout_Should_NotBeEqual()
-        {
-            // NOTE; although this should probably be equal it's considered not because the SymbolName property isn't equal
-            // Overridding equality to ignore SymbolName would be possible but would break the default record equality behavior and cause confusion
-
-            // arrange
-            var symbol1 = new SharedSymbol(TradingMode.Spot, "BTC", "USDT", "BTCUSDT");
-            var symbol2 = new SharedSymbol(TradingMode.Spot, "BTC", "USDT");
-
-            // act & assert
-            Assert.That(symbol1, Is.Not.EqualTo(symbol2));
-        }
-
-        [Test]
-        public void SharedSymbol_RecordEquality_WithAllPropertiesSet_Should_BeEqual()
-        {
-            // arrange
-            var deliveryTime = new DateTime(2026, 6, 25);
-            var symbol1 = new SharedSymbol(TradingMode.DeliveryLinear, "BTC", "USDT", deliveryTime)
-            {
-                SymbolName = "BTCUSDT-0625"
-            };
-            var symbol2 = new SharedSymbol(TradingMode.DeliveryLinear, "BTC", "USDT", deliveryTime)
-            {
-                SymbolName = "BTCUSDT-0625"
-            };
-
-            // act & assert
-            Assert.That(symbol1, Is.EqualTo(symbol2));
-        }
-
-        [Test]
-        public void SharedSymbol_Properties_Should_BeSettable()
-        {
-            // arrange
-            var symbol = new SharedSymbol(TradingMode.Spot, "BTC", "USDT");
-
-            // act
-            symbol.BaseAsset = "ETH";
-            symbol.QuoteAsset = "EUR";
-            symbol.TradingMode = TradingMode.PerpetualLinear;
-            symbol.SymbolName = "CUSTOM";
-            symbol.DeliverTime = DateTime.UtcNow;
-
-            // assert
-            Assert.That(symbol.BaseAsset, Is.EqualTo("ETH"));
-            Assert.That(symbol.QuoteAsset, Is.EqualTo("EUR"));
-            Assert.That(symbol.TradingMode, Is.EqualTo(TradingMode.PerpetualLinear));
-            Assert.That(symbol.SymbolName, Is.EqualTo("CUSTOM"));
-            Assert.That(symbol.DeliverTime, Is.Not.Null);
-        }
-
-        [Test]
-        public void SharedSymbol_WithSpecialCharactersInAssets_Should_HandleCorrectly()
-        {
-            // arrange
-            var baseAsset = "BTC-123";
-            var quoteAsset = "USDT_2.0";
-
-            // act
-            var symbol = new SharedSymbol(TradingMode.Spot, baseAsset, quoteAsset);
-
-            // assert
-            Assert.That(symbol.BaseAsset, Is.EqualTo(baseAsset));
-            Assert.That(symbol.QuoteAsset, Is.EqualTo(quoteAsset));
-        }
-
-        [Test]
-        public void SharedSymbol_WithLongAssetNames_Should_HandleCorrectly()
-        {
-            // arrange
-            var baseAsset = "VERYLONGASSETNAMEFORTESTING";
-            var quoteAsset = "ANOTHERVERYLONGASSETNAME";
-
-            // act
-            var symbol = new SharedSymbol(TradingMode.Spot, baseAsset, quoteAsset);
-
-            // assert
-            Assert.That(symbol.BaseAsset, Is.EqualTo(baseAsset));
-            Assert.That(symbol.QuoteAsset, Is.EqualTo(quoteAsset));
-        }
-    }
-}

CryptoExchange.Net.UnitTests/SocketClientTests.cs

@@ -1,234 +1,235 @@
-//using CryptoExchange.Net.Objects;
-//using CryptoExchange.Net.Objects.Sockets;
-//using CryptoExchange.Net.Sockets;
-//using CryptoExchange.Net.Testing.Implementations;
-//using CryptoExchange.Net.UnitTests.TestImplementations;
-//using CryptoExchange.Net.UnitTests.TestImplementations.Sockets;
-//using Microsoft.Extensions.Logging;
-//using Moq;
-//using NUnit.Framework;
-//using NUnit.Framework.Legacy;
-//using System;
-//using System.Collections.Generic;
-//using System.Net.Sockets;
-//using System.Text.Json;
-//using System.Threading;
-//using System.Threading.Tasks;
+using System;
+using System.Collections.Generic;
+using System.Threading;
+using System.Threading.Tasks;
+using CryptoExchange.Net.Objects;
+using CryptoExchange.Net.Objects.Sockets;
+using CryptoExchange.Net.Sockets;
+using CryptoExchange.Net.UnitTests.TestImplementations;
+using CryptoExchange.Net.UnitTests.TestImplementations.Sockets;
+using Microsoft.Extensions.Logging;
+using Moq;
+using Newtonsoft.Json;
+using NUnit.Framework;
+using NUnit.Framework.Legacy;
 
-//namespace CryptoExchange.Net.UnitTests
-//{
-//    [TestFixture]
-//    public class SocketClientTests
-//    {
-//        [TestCase]
-//        public void SettingOptions_Should_ResultInOptionsSet()
-//        {
-//            //arrange
-//            //act
-//            var client = new TestSocketClient(options =>
-//            {
-//                options.SubOptions.ApiCredentials = new Authentication.ApiCredentials("1", "2");
-//                options.SubOptions.MaxSocketConnections = 1;
-//            });
+namespace CryptoExchange.Net.UnitTests
+{
+    [TestFixture]
+    public class SocketClientTests
+    {
+        [TestCase]
+        public void SettingOptions_Should_ResultInOptionsSet()
+        {
+            //arrange
+            //act
+            var client = new TestSocketClient(options =>
+            {
+                options.SubOptions.ApiCredentials = new Authentication.ApiCredentials("1", "2");
+                options.SubOptions.MaxSocketConnections = 1;
+            });
 
-//            //assert
-//            ClassicAssert.NotNull(client.SubClient.ApiOptions.ApiCredentials);
-//            Assert.That(1 == client.SubClient.ApiOptions.MaxSocketConnections);
-//        }
+            //assert
+            ClassicAssert.NotNull(client.SubClient.ApiOptions.ApiCredentials);
+            Assert.That(1 == client.SubClient.ApiOptions.MaxSocketConnections);
+        }
 
-//        [TestCase(true)]
-//        [TestCase(false)]
-//        public void ConnectSocket_Should_ReturnConnectionResult(bool canConnect)
-//        {
-//            //arrange
-//            var client = new TestSocketClient();
-//            var socket = client.CreateSocket();
-//            socket.CanConnect = canConnect;
+        [TestCase(true)]
+        [TestCase(false)]
+        public void ConnectSocket_Should_ReturnConnectionResult(bool canConnect)
+        {
+            //arrange
+            var client = new TestSocketClient();
+            var socket = client.CreateSocket();
+            socket.CanConnect = canConnect;
 
-//            //act
-//            var connectResult = client.SubClient.ConnectSocketSub(
-//                new SocketConnection(new TraceLogger(), new TestWebsocketFactory(socket), new WebSocketParameters(new Uri("https://localhost/"), ReconnectPolicy.Disabled), client.SubClient, ""));
+            //act
+            var connectResult = client.SubClient.ConnectSocketSub(new SocketConnection(new TraceLogger(), client.SubClient, socket, null));
 
-//            //assert
-//            Assert.That(connectResult.Success == canConnect);
-//        }
+            //assert
+            Assert.That(connectResult.Success == canConnect);
+        }
 
-//        [TestCase]
-//        public void SocketMessages_Should_BeProcessedInDataHandlers()
-//        {
-//            // arrange
-//            var client = new TestSocketClient(options => {
-//                options.ReconnectInterval = TimeSpan.Zero;
-//            });
-//            var socket = client.CreateSocket();
-//            socket.CanConnect = true;
-//            var sub = new SocketConnection(new TraceLogger(), new TestWebsocketFactory(socket), new WebSocketParameters(new Uri("https://localhost/"), ReconnectPolicy.Disabled), client.SubClient, "");
-//            var rstEvent = new ManualResetEvent(false);
-//            Dictionary<string, string> result = null;
+        [TestCase]
+        public void SocketMessages_Should_BeProcessedInDataHandlers()
+        {
+            // arrange
+            var client = new TestSocketClient(options => {
+                options.ReconnectInterval = TimeSpan.Zero;
+            });
+            var socket = client.CreateSocket();
+            socket.ShouldReconnect = true;
+            socket.CanConnect = true;
+            socket.DisconnectTime = DateTime.UtcNow;
+            var sub = new SocketConnection(new TraceLogger(), client.SubClient, socket, null);
+            var rstEvent = new ManualResetEvent(false);
+            Dictionary<string, string> result = null;
 
-//            client.SubClient.ConnectSocketSub(sub);
+            client.SubClient.ConnectSocketSub(sub);
 
-//            var subObj = new TestSubscription<Dictionary<string, string>>(Mock.Of<ILogger>(), (messageEvent) =>
-//            {
-//                result = messageEvent.Data;
-//                rstEvent.Set();
-//            });
-//            sub.AddSubscription(subObj);
+            var subObj = new TestSubscription<Dictionary<string, string>>(Mock.Of<ILogger>(), (messageEvent) =>
+            {
+                result = messageEvent.Data;
+                rstEvent.Set();
+            });
+            sub.AddSubscription(subObj);
 
-//            // act
-//            socket.InvokeMessage("{\"property\": \"123\", \"action\": \"update\", \"topic\": \"topic\"}");
-//            rstEvent.WaitOne(1000);
+            // act
+            socket.InvokeMessage("{\"property\": \"123\", \"topic\": \"topic\"}");
+            rstEvent.WaitOne(1000);
 
-//            // assert
-//            Assert.That(result["property"] == "123");
-//        }
+            // assert
+            Assert.That(result["property"] == "123");
+        }
 
-//        [TestCase(false)]
-//        [TestCase(true)]
-//        public void SocketMessages_Should_ContainOriginalDataIfEnabled(bool enabled)
-//        {
-//            // arrange
-//            var client = new TestSocketClient(options =>
-//            {
-//                options.ReconnectInterval = TimeSpan.Zero;
-//                options.SubOptions.OutputOriginalData = enabled;
-//            });
-//            var socket = client.CreateSocket();
-//            socket.CanConnect = true;
-//            var sub = new SocketConnection(new TraceLogger(), new TestWebsocketFactory(socket), new WebSocketParameters(new Uri("https://localhost/"), ReconnectPolicy.Disabled), client.SubClient, "");
-//            var rstEvent = new ManualResetEvent(false);
-//            string original = null;
+        [TestCase(false)]
+        [TestCase(true)]
+        public void SocketMessages_Should_ContainOriginalDataIfEnabled(bool enabled)
+        {
+            // arrange
+            var client = new TestSocketClient(options =>
+            {
+                options.ReconnectInterval = TimeSpan.Zero;
+                options.SubOptions.OutputOriginalData = enabled;
+            });
+            var socket = client.CreateSocket();
+            socket.ShouldReconnect = true;
+            socket.CanConnect = true;
+            socket.DisconnectTime = DateTime.UtcNow;
+            var sub = new SocketConnection(new TraceLogger(), client.SubClient, socket, null);
+            var rstEvent = new ManualResetEvent(false);
+            string original = null;
 
-//            client.SubClient.ConnectSocketSub(sub);
-//            var subObj = new TestSubscription<Dictionary<string, string>>(Mock.Of<ILogger>(), (messageEvent) =>
-//            {
-//                original = messageEvent.OriginalData;
-//                rstEvent.Set();
-//            });
-//            sub.AddSubscription(subObj);
-//            var msgToSend = JsonSerializer.Serialize(new { topic = "topic", action = "update", property = "123" });
+            client.SubClient.ConnectSocketSub(sub);
+            var subObj = new TestSubscription<Dictionary<string, string>>(Mock.Of<ILogger>(), (messageEvent) =>
+            {
+                original = messageEvent.OriginalData;
+                rstEvent.Set();
+            });
+            sub.AddSubscription(subObj);
+            var msgToSend = JsonConvert.SerializeObject(new { topic = "topic", property = 123 });
 
-//            // act
-//            socket.InvokeMessage(msgToSend);
-//            rstEvent.WaitOne(1000);
+            // act
+            socket.InvokeMessage(msgToSend);
+            rstEvent.WaitOne(1000);
 
-//            // assert
-//            Assert.That(original == (enabled ? msgToSend : null));
-//        }
+            // assert
+            Assert.That(original == (enabled ? msgToSend : null));
+        }
 
-//        [TestCase()]
-//        public void UnsubscribingStream_Should_CloseTheSocket()
-//        {
-//            // arrange
-//            var client = new TestSocketClient(options =>
-//            {
-//                options.ReconnectInterval = TimeSpan.Zero;
-//            });
-//            var socket = client.CreateSocket();
-//            socket.CanConnect = true;
-//            var sub = new SocketConnection(new TraceLogger(), new TestWebsocketFactory(socket), new WebSocketParameters(new Uri("https://localhost/"), ReconnectPolicy.Disabled), client.SubClient, "");
-//            client.SubClient.ConnectSocketSub(sub);
+        [TestCase()]
+        public void UnsubscribingStream_Should_CloseTheSocket()
+        {
+            // arrange
+            var client = new TestSocketClient(options =>
+            {
+                options.ReconnectInterval = TimeSpan.Zero;
+            });
+            var socket = client.CreateSocket();
+            socket.CanConnect = true;
+            var sub = new SocketConnection(new TraceLogger(), client.SubClient, socket, null);
+            client.SubClient.ConnectSocketSub(sub);
 
-//            var subscription = new TestSubscription<Dictionary<string, string>>(Mock.Of<ILogger>(), (messageEvent) => { });
-//            var ups = new UpdateSubscription(sub, subscription);
-//            sub.AddSubscription(subscription);
+            var subscription = new TestSubscription<Dictionary<string, string>>(Mock.Of<ILogger>(), (messageEvent) => { });
+            var ups = new UpdateSubscription(sub, subscription);
+            sub.AddSubscription(subscription);
 
-//            // act
-//            client.UnsubscribeAsync(ups).Wait();
+            // act
+            client.UnsubscribeAsync(ups).Wait();
 
-//            // assert
-//            Assert.That(socket.Connected == false);
-//        }
+            // assert
+            Assert.That(socket.Connected == false);
+        }
 
-//        [TestCase()]
-//        public void UnsubscribingAll_Should_CloseAllSockets()
-//        {
-//            // arrange
-//            var client = new TestSocketClient(options => { options.ReconnectInterval = TimeSpan.Zero; });
-//            var socket1 = client.CreateSocket();
-//            var socket2 = client.CreateSocket();
-//            socket1.CanConnect = true;
-//            socket2.CanConnect = true;
-//            var sub1 = new SocketConnection(new TraceLogger(), new TestWebsocketFactory(socket1), new WebSocketParameters(new Uri("https://localhost/"), ReconnectPolicy.Disabled), client.SubClient, "");
-//            var sub2 = new SocketConnection(new TraceLogger(), new TestWebsocketFactory(socket2), new WebSocketParameters(new Uri("https://localhost/"), ReconnectPolicy.Disabled), client.SubClient, "");
-//            client.SubClient.ConnectSocketSub(sub1);
-//            client.SubClient.ConnectSocketSub(sub2);
-//            var subscription1 = new TestSubscription<Dictionary<string, string>>(Mock.Of<ILogger>(), (messageEvent) => { });
-//            var subscription2 = new TestSubscription<Dictionary<string, string>>(Mock.Of<ILogger>(), (messageEvent) => { });
+        [TestCase()]
+        public void UnsubscribingAll_Should_CloseAllSockets()
+        {
+            // arrange
+            var client = new TestSocketClient(options => { options.ReconnectInterval = TimeSpan.Zero; });
+            var socket1 = client.CreateSocket();
+            var socket2 = client.CreateSocket();
+            socket1.CanConnect = true;
+            socket2.CanConnect = true;
+            var sub1 = new SocketConnection(new TraceLogger(), client.SubClient, socket1, null);
+            var sub2 = new SocketConnection(new TraceLogger(), client.SubClient, socket2, null);
+            client.SubClient.ConnectSocketSub(sub1);
+            client.SubClient.ConnectSocketSub(sub2);
+            var subscription1 = new TestSubscription<Dictionary<string, string>>(Mock.Of<ILogger>(), (messageEvent) => { });
+            var subscription2 = new TestSubscription<Dictionary<string, string>>(Mock.Of<ILogger>(), (messageEvent) => { });
 
-//            sub1.AddSubscription(subscription1);
-//            sub2.AddSubscription(subscription2);
-//            var ups1 = new UpdateSubscription(sub1, subscription1);
-//            var ups2 = new UpdateSubscription(sub2, subscription2);
+            sub1.AddSubscription(subscription1);
+            sub2.AddSubscription(subscription2);
+            var ups1 = new UpdateSubscription(sub1, subscription1);
+            var ups2 = new UpdateSubscription(sub2, subscription2);
 
-//            // act
-//            client.UnsubscribeAllAsync().Wait();
+            // act
+            client.UnsubscribeAllAsync().Wait();
 
-//            // assert
-//            Assert.That(socket1.Connected == false);
-//            Assert.That(socket2.Connected == false);
-//        }
+            // assert
+            Assert.That(socket1.Connected == false);
+            Assert.That(socket2.Connected == false);
+        }
 
-//        [TestCase()]
-//        public void FailingToConnectSocket_Should_ReturnError()
-//        {
-//            // arrange
-//            var client = new TestSocketClient(options => { options.ReconnectInterval = TimeSpan.Zero; });
-//            var socket = client.CreateSocket();
-//            socket.CanConnect = false;
-//            var sub1 = new SocketConnection(new TraceLogger(), new TestWebsocketFactory(socket), new WebSocketParameters(new Uri("https://localhost/"), ReconnectPolicy.Disabled), client.SubClient, "");
+        [TestCase()]
+        public void FailingToConnectSocket_Should_ReturnError()
+        {
+            // arrange
+            var client = new TestSocketClient(options => { options.ReconnectInterval = TimeSpan.Zero; });
+            var socket = client.CreateSocket();
+            socket.CanConnect = false;
+            var sub1 = new SocketConnection(new TraceLogger(), client.SubClient, socket, null);
 
-//            // act
-//            var connectResult = client.SubClient.ConnectSocketSub(sub1);
+            // act
+            var connectResult = client.SubClient.ConnectSocketSub(sub1);
 
-//            // assert
-//            ClassicAssert.IsFalse(connectResult.Success);
-//        }
+            // assert
+            ClassicAssert.IsFalse(connectResult.Success);
+        }
 
-//        [TestCase()]
-//        public async Task ErrorResponse_ShouldNot_ConfirmSubscription()
-//        {
-//            // arrange
-//            var channel = "trade_btcusd";
-//            var client = new TestSocketClient(opt =>
-//            {
-//                opt.OutputOriginalData = true;
-//                opt.SocketSubscriptionsCombineTarget = 1;
-//            });
-//            var socket = client.CreateSocket();
-//            socket.CanConnect = true;
-//            client.SubClient.ConnectSocketSub(new SocketConnection(new TraceLogger(), new TestWebsocketFactory(socket), new WebSocketParameters(new Uri("https://localhost/"), ReconnectPolicy.Disabled), client.SubClient, ""));
+        [TestCase()]
+        public async Task ErrorResponse_ShouldNot_ConfirmSubscription()
+        {
+            // arrange
+            var channel = "trade_btcusd";
+            var client = new TestSocketClient(opt =>
+            {
+                opt.OutputOriginalData = true;
+                opt.SocketSubscriptionsCombineTarget = 1;
+            });
+            var socket = client.CreateSocket();
+            socket.CanConnect = true;
+            client.SubClient.ConnectSocketSub(new SocketConnection(new TraceLogger(), client.SubClient, socket, "https://test.test"));
 
-//            // act
-//            var sub = client.SubClient.SubscribeToSomethingAsync(channel, onUpdate => {}, ct: default);
-//            socket.InvokeMessage(JsonSerializer.Serialize(new { channel, action = "subscribe", status = "error" }));
-//            await sub;
+            // act
+            var sub = client.SubClient.SubscribeToSomethingAsync(channel, onUpdate => {}, ct: default);
+            socket.InvokeMessage(JsonConvert.SerializeObject(new { channel, status = "error" }));
+            await sub;
 
-//            // assert
-//            ClassicAssert.IsTrue(client.SubClient.TestSubscription.Status != SubscriptionStatus.Subscribed);
-//        }
+            // assert
+            ClassicAssert.IsFalse(client.SubClient.TestSubscription.Confirmed);
+        }
 
-//        [TestCase()]
-//        public async Task SuccessResponse_Should_ConfirmSubscription()
-//        {
-//            // arrange
-//            var channel = "trade_btcusd";
-//            var client = new TestSocketClient(opt =>
-//            {
-//                opt.OutputOriginalData = true;
-//                opt.SocketSubscriptionsCombineTarget = 1;
-//            });
-//            var socket = client.CreateSocket();
-//            socket.CanConnect = true;
-//            client.SubClient.ConnectSocketSub(new SocketConnection(new TraceLogger(), new TestWebsocketFactory(socket), new WebSocketParameters(new Uri("https://localhost/"), ReconnectPolicy.Disabled), client.SubClient, ""));
+        [TestCase()]
+        public async Task SuccessResponse_Should_ConfirmSubscription()
+        {
+            // arrange
+            var channel = "trade_btcusd";
+            var client = new TestSocketClient(opt =>
+            {
+                opt.OutputOriginalData = true;
+                opt.SocketSubscriptionsCombineTarget = 1;
+            });
+            var socket = client.CreateSocket();
+            socket.CanConnect = true;
+            client.SubClient.ConnectSocketSub(new SocketConnection(new TraceLogger(), client.SubClient, socket, "https://test.test"));
 
-//            // act
-//            var sub = client.SubClient.SubscribeToSomethingAsync(channel, onUpdate => {}, ct: default);
-//            socket.InvokeMessage(JsonSerializer.Serialize(new { channel, action = "subscribe", status = "confirmed" }));
-//            await sub;
+            // act
+            var sub = client.SubClient.SubscribeToSomethingAsync(channel, onUpdate => {}, ct: default);
+            socket.InvokeMessage(JsonConvert.SerializeObject(new { channel, status = "confirmed" }));
+            await sub;
 
-//            // assert
-//            Assert.That(client.SubClient.TestSubscription.Status == SubscriptionStatus.Subscribed);
-//        }
-//    }
-//}
+            // assert
+            Assert.That(client.SubClient.TestSubscription.Confirmed);
+        }
+    }
+}

CryptoExchange.Net.UnitTests/SystemTextJsonConverterTests.cs

@@ -4,8 +4,7 @@ using System.Text.Json;
 using NUnit.Framework;
 using System;
 using System.Text.Json.Serialization;
-using CryptoExchange.Net.Converters;
-using CryptoExchange.Net.SharedApis;
+using NUnit.Framework.Legacy;
 
 namespace CryptoExchange.Net.UnitTests
 {
@@ -145,7 +144,7 @@ namespace CryptoExchange.Net.UnitTests
         public void TestEnumConverterNullableDeserializeTests(string value, TestEnum? expected)
         {
             var val = value == null ? "null" : $"\"{value}\"";
-            var output = JsonSerializer.Deserialize<STJEnumObject>($"{{ \"Value\": {val} }}", SerializerOptions.WithConverters(new SerializationContext()));
+            var output = JsonSerializer.Deserialize<STJEnumObject>($"{{ \"Value\": {val} }}");
             Assert.That(output.Value == expected);
         }
 
@@ -164,20 +163,6 @@ namespace CryptoExchange.Net.UnitTests
             Assert.That(output.Value == expected);
         }
 
-        [TestCase("1", TestEnum.One)]
-        [TestCase("2", TestEnum.Two)]
-        [TestCase("3", TestEnum.Three)]
-        [TestCase("three", TestEnum.Three)]
-        [TestCase("Four", TestEnum.Four)]
-        [TestCase("four", TestEnum.Four)]
-        [TestCase("Four1", null)]
-        [TestCase(null, null)]
-        public void TestEnumConverterParseStringTests(string value, TestEnum? expected)
-        {
-            var result = EnumConverter.ParseString<TestEnum>(value);
-            Assert.That(result == expected);
-        }
-
         [TestCase("1", true)]
         [TestCase("true", true)]
         [TestCase("yes", true)]
@@ -193,7 +178,7 @@ namespace CryptoExchange.Net.UnitTests
         public void TestBoolConverter(string value, bool? expected)
         {
             var val = value == null ? "null" : $"\"{value}\"";
-            var output = JsonSerializer.Deserialize<STJBoolObject>($"{{ \"Value\": {val} }}", SerializerOptions.WithConverters(new SerializationContext()));
+            var output = JsonSerializer.Deserialize<STJBoolObject>($"{{ \"Value\": {val} }}");
             Assert.That(output.Value == expected);
         }
 
@@ -212,136 +197,9 @@ namespace CryptoExchange.Net.UnitTests
         public void TestBoolConverterNotNullable(string value, bool expected)
         {
             var val = value == null ? "null" : $"\"{value}\"";
-            var output = JsonSerializer.Deserialize<NotNullableSTJBoolObject>($"{{ \"Value\": {val} }}", SerializerOptions.WithConverters(new SerializationContext()));
+            var output = JsonSerializer.Deserialize<NotNullableSTJBoolObject>($"{{ \"Value\": {val} }}");
             Assert.That(output.Value == expected);
         }
-
-        [TestCase("1", 1)]
-        [TestCase("1.1", 1.1)]
-        [TestCase("-1.1", -1.1)]
-        [TestCase(null, null)]
-        [TestCase("", null)]
-        [TestCase("null", null)]
-        [TestCase("nan", null)]
-        [TestCase("1E+2", 100)]
-        [TestCase("1E-2", 0.01)]
-        [TestCase("Infinity", 999)] // 999 is workaround for not being able to specify decimal.MinValue
-        [TestCase("-Infinity", -999)] // -999 is workaround for not being able to specify decimal.MaxValue
-        [TestCase("80228162514264337593543950335", 999)] // 999 is workaround for not being able to specify decimal.MaxValue
-        [TestCase("-80228162514264337593543950335", -999)] // -999 is workaround for not being able to specify decimal.MaxValue
-        public void TestDecimalConverterString(string value, decimal? expected)
-        {
-            var result = JsonSerializer.Deserialize<STJDecimalObject>("{ \"test\": \""+ value + "\"}");
-            Assert.That(result.Test, Is.EqualTo(expected == -999 ? decimal.MinValue : expected == 999 ? decimal.MaxValue: expected));
-        }
-
-        [TestCase("1", 1)]
-        [TestCase("1.1", 1.1)]
-        [TestCase("-1.1", -1.1)]
-        [TestCase("null", null)]
-        [TestCase("1E+2", 100)]
-        [TestCase("1E-2", 0.01)]
-        [TestCase("80228162514264337593543950335", -999)] // -999 is workaround for not being able to specify decimal.MaxValue
-        public void TestDecimalConverterNumber(string value, decimal? expected)
-        {
-            var result = JsonSerializer.Deserialize<STJDecimalObject>("{ \"test\": " + value + "}");
-            Assert.That(result.Test, Is.EqualTo(expected == -999 ? decimal.MaxValue : expected));
-        }
-
-        [Test()]
-        public void TestArrayConverter()
-        {
-            var data = new Test()
-            {
-                Prop1 = 2,
-                Prop2 = null,
-                Prop3 = "123",
-                Prop3Again = "123",
-                Prop4 = null,
-                Prop5 = new Test2
-                {
-                    Prop21 = 3,
-                    Prop22 = "456"
-                },
-                Prop6 = new Test3
-                {
-                    Prop31 = 4,
-                    Prop32 = "789"
-                },
-                Prop7 = TestEnum.Two,
-                TestInternal = new Test
-                {
-                    Prop1 = 10
-                },
-                Prop8 = new Test3
-                {
-                    Prop31 = 5,
-                    Prop32 = "101"
-                },
-            };
-
-            var options = new JsonSerializerOptions()
-            {
-                TypeInfoResolver = new SerializationContext()
-            };
-            var serialized = JsonSerializer.Serialize(data);
-            var deserialized = JsonSerializer.Deserialize<Test>(serialized);
-
-            Assert.That(deserialized.Prop1, Is.EqualTo(2));
-            Assert.That(deserialized.Prop2, Is.Null);
-            Assert.That(deserialized.Prop3, Is.EqualTo("123"));
-            Assert.That(deserialized.Prop3Again, Is.EqualTo("123"));
-            Assert.That(deserialized.Prop4, Is.Null);
-            Assert.That(deserialized.Prop5.Prop21, Is.EqualTo(3));
-            Assert.That(deserialized.Prop5.Prop22, Is.EqualTo("456"));
-            Assert.That(deserialized.Prop6.Prop31, Is.EqualTo(4));
-            Assert.That(deserialized.Prop6.Prop32, Is.EqualTo("789"));
-            Assert.That(deserialized.Prop7, Is.EqualTo(TestEnum.Two));
-            Assert.That(deserialized.TestInternal.Prop1, Is.EqualTo(10));
-            Assert.That(deserialized.Prop8.Prop31, Is.EqualTo(5));
-            Assert.That(deserialized.Prop8.Prop32, Is.EqualTo("101"));
-        }
-
-        [TestCase(TradingMode.Spot, "ETH", "USDT", null)]
-        [TestCase(TradingMode.PerpetualLinear, "ETH", "USDT", null)]
-        [TestCase(TradingMode.DeliveryLinear, "ETH", "USDT", 1748432430)]
-        public void TestSharedSymbolConversion(TradingMode tradingMode, string baseAsset, string quoteAsset, int? deliverTime)
-        {
-            DateTime? time = deliverTime == null ? null : DateTimeConverter.ParseFromDouble(deliverTime.Value);
-            var symbol = new SharedSymbol(tradingMode, baseAsset, quoteAsset, time);
-
-            var serialized = JsonSerializer.Serialize(symbol);
-            var restored = JsonSerializer.Deserialize<SharedSymbol>(serialized);
-
-            Assert.That(restored.TradingMode, Is.EqualTo(symbol.TradingMode));
-            Assert.That(restored.BaseAsset, Is.EqualTo(symbol.BaseAsset));
-            Assert.That(restored.QuoteAsset, Is.EqualTo(symbol.QuoteAsset));
-            Assert.That(restored.DeliverTime, Is.EqualTo(symbol.DeliverTime));
-        }
-
-        [TestCase(0.1, null, null)]
-        [TestCase(0.1, 0.1, null)]
-        [TestCase(0.1, 0.1, 0.1)]
-        [TestCase(null, 0.1, null)]
-        [TestCase(null, 0.1, 0.1)]
-        public void TestSharedQuantityConversion(double? baseQuantity, double? quoteQuantity, double? contractQuantity)
-        {
-            var symbol = new SharedOrderQuantity((decimal?)baseQuantity, (decimal?)quoteQuantity, (decimal?)contractQuantity);
-
-            var serialized = JsonSerializer.Serialize(symbol);
-            var restored = JsonSerializer.Deserialize<SharedOrderQuantity>(serialized);
-
-            Assert.That(restored.QuantityInBaseAsset, Is.EqualTo(symbol.QuantityInBaseAsset));
-            Assert.That(restored.QuantityInQuoteAsset, Is.EqualTo(symbol.QuantityInQuoteAsset));
-            Assert.That(restored.QuantityInContracts, Is.EqualTo(symbol.QuantityInContracts));
-        }
-    }
-
-    public class STJDecimalObject
-    {
-        [JsonConverter(typeof(DecimalConverter))]
-        [JsonPropertyName("test")]
-        public decimal? Test { get; set; }
     }
 
     public class STJTimeObject
@@ -353,88 +211,25 @@ namespace CryptoExchange.Net.UnitTests
 
     public class STJEnumObject
     {
+        [JsonConverter(typeof(EnumConverter))]
         public TestEnum? Value { get; set; }
     }
 
     public class NotNullableSTJEnumObject
     {
+        [JsonConverter(typeof(EnumConverter))]
         public TestEnum Value { get; set; }
     }
 
     public class STJBoolObject
     {
+        [JsonConverter(typeof(BoolConverter))]
         public bool? Value { get; set; }
     }
 
     public class NotNullableSTJBoolObject
     {
+        [JsonConverter(typeof(BoolConverter))]
         public bool Value { get; set; }
     }
-
-    [JsonConverter(typeof(ArrayConverter<Test>))]
-    record Test
-    {
-        [ArrayProperty(0)]
-        public int Prop1 { get; set; }
-        [ArrayProperty(1)]
-        public int? Prop2 { get; set; }
-        [ArrayProperty(2)]
-        public string Prop3 { get; set; }
-        [ArrayProperty(2)]
-        public string Prop3Again { get; set; }
-        [ArrayProperty(3)]
-        public string Prop4 { get; set; }
-        [ArrayProperty(4)]
-        public Test2 Prop5 { get; set; }
-        [ArrayProperty(5)]
-        public Test3 Prop6 { get; set; }
-        [ArrayProperty(6), JsonConverter(typeof(EnumConverter<TestEnum>))]
-        public TestEnum? Prop7 { get; set; }
-        [ArrayProperty(7)]
-        public Test TestInternal { get; set; }
-        [ArrayProperty(8), JsonConversion]
-        public Test3 Prop8 { get; set; }
-    }
-
-    [JsonConverter(typeof(ArrayConverter<Test2>))]
-    record Test2
-    {
-        [ArrayProperty(0)]
-        public int Prop21 { get; set; }
-        [ArrayProperty(1)]
-        public string Prop22 { get; set; }
-    }
-
-    record Test3
-    {
-        [JsonPropertyName("prop31")]
-        public int Prop31 { get; set; }
-        [JsonPropertyName("prop32")]
-        public string Prop32 { get; set; }
-    }
-
-    [JsonConverter(typeof(EnumConverter<TestEnum>))]
-    public enum TestEnum
-    {
-        [Map("1")]
-        One,
-        [Map("2")]
-        Two,
-        [Map("three", "3")]
-        Three,
-        Four
-    }
-
-    [JsonSerializable(typeof(Test))]
-    [JsonSerializable(typeof(Test2))]
-    [JsonSerializable(typeof(Test3))]
-    [JsonSerializable(typeof(NotNullableSTJBoolObject))]
-    [JsonSerializable(typeof(STJBoolObject))]
-    [JsonSerializable(typeof(NotNullableSTJEnumObject))]
-    [JsonSerializable(typeof(STJEnumObject))]
-    [JsonSerializable(typeof(STJDecimalObject))]
-    [JsonSerializable(typeof(STJTimeObject))]
-    internal partial class SerializationContext : JsonSerializerContext
-    {
-    }
 }

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

@@ -0,0 +1,45 @@
+using CryptoExchange.Net.Objects;
+using CryptoExchange.Net.Objects.Sockets;
+using CryptoExchange.Net.Sockets;
+using Newtonsoft.Json;
+using System;
+using System.Collections.Generic;
+using System.Threading.Tasks;
+
+namespace CryptoExchange.Net.UnitTests.TestImplementations.Sockets
+{
+    internal class SubResponse
+    {
+        [JsonProperty("channel")]
+        public string Channel { get; set; } = null!;
+
+        [JsonProperty("status")]
+        public string Status { get; set; } = null!;
+    }
+
+    internal class UnsubResponse
+    {
+        [JsonProperty("status")]
+        public string Status { get; set; } = null!;
+    }
+
+    internal class TestChannelQuery : Query<SubResponse>
+    {
+        public override HashSet<string> ListenerIdentifiers { get; set; }
+
+        public TestChannelQuery(string channel, string request, bool authenticated, int weight = 1) : base(request, authenticated, weight)
+        {
+            ListenerIdentifiers = new HashSet<string> { channel };
+        }
+
+        public override CallResult<SubResponse> HandleMessage(SocketConnection connection, DataEvent<SubResponse> message)
+        {
+            if (!message.Data.Status.Equals("confirmed", StringComparison.OrdinalIgnoreCase))
+            {
+                return new CallResult<SubResponse>(new ServerError(message.Data.Status));
+            }
+
+            return base.HandleMessage(connection, message);
+        }
+    }
+}

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

@@ -0,0 +1,19 @@
+using CryptoExchange.Net.Sockets;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace CryptoExchange.Net.UnitTests.TestImplementations.Sockets
+{
+    internal class TestQuery : Query<object>
+    {
+        public override HashSet<string> ListenerIdentifiers { get; set; }
+
+        public TestQuery(string identifier, object request, bool authenticated, int weight = 1) : base(request, authenticated, weight)
+        {
+            ListenerIdentifiers = new HashSet<string> { identifier };
+        }
+    }
+}

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

@@ -0,0 +1,36 @@
+using CryptoExchange.Net.Interfaces;
+using CryptoExchange.Net.Objects;
+using CryptoExchange.Net.Objects.Sockets;
+using CryptoExchange.Net.Sockets;
+using Microsoft.Extensions.Logging;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace CryptoExchange.Net.UnitTests.TestImplementations.Sockets
+{
+    internal class TestSubscription<T> : Subscription<object, object>
+    {
+        private readonly Action<DataEvent<T>> _handler;
+
+        public override HashSet<string> ListenerIdentifiers { get; set; } = new HashSet<string> { "topic" };
+
+        public TestSubscription(ILogger logger, Action<DataEvent<T>> handler) : base(logger, false)
+        {
+            _handler = handler;
+        }
+
+        public override CallResult DoHandleMessage(SocketConnection connection, DataEvent<object> message)
+        {
+            var data = (T)message.Data;
+            _handler.Invoke(message.As(data));
+            return new CallResult(null);
+        }
+
+        public override Type GetMessageType(IMessageAccessor message) => typeof(T);
+        public override Query GetSubQuery(SocketConnection connection) => new TestQuery("sub", new object(), false, 1);
+        public override Query GetUnsubQuery() => new TestQuery("unsub", new object(), false, 1);
+    }
+}

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

@@ -0,0 +1,38 @@
+using CryptoExchange.Net.Interfaces;
+using CryptoExchange.Net.Objects;
+using CryptoExchange.Net.Objects.Sockets;
+using CryptoExchange.Net.Sockets;
+using Microsoft.Extensions.Logging;
+using Moq;
+using System;
+using System.Collections.Generic;
+using System.Threading.Tasks;
+
+namespace CryptoExchange.Net.UnitTests.TestImplementations.Sockets
+{
+    internal class TestSubscriptionWithResponseCheck<T> : Subscription<SubResponse, UnsubResponse>
+    {
+        private readonly Action<DataEvent<T>> _handler;
+        private readonly string _channel;
+
+        public override HashSet<string> ListenerIdentifiers { get; set; }
+
+        public TestSubscriptionWithResponseCheck(string channel, Action<DataEvent<T>> handler) : base(Mock.Of<ILogger>(), false)
+        {
+            ListenerIdentifiers = new HashSet<string>() { channel };
+            _handler = handler;
+            _channel = channel;
+        }
+
+        public override CallResult DoHandleMessage(SocketConnection connection, DataEvent<object> message)
+        {
+            var data = (T)message.Data;
+            _handler.Invoke(message.As(data));
+            return new CallResult(null);
+        }
+
+        public override Type GetMessageType(IMessageAccessor message) => typeof(T);
+        public override Query GetSubQuery(SocketConnection connection) => new TestChannelQuery(_channel, "subscribe", false, 1);
+        public override Query GetUnsubQuery() => new TestChannelQuery(_channel, "unsubscribe", false, 1);
+    }
+}

CryptoExchange.Net.UnitTests/TestImplementations/TestBaseClient.cs

@@ -1,19 +1,15 @@
 using System;
+using System.Collections.Generic;
 using System.IO;
+using System.Net.Http;
 using System.Text;
-using System.Text.Json;
 using System.Threading.Tasks;
 using CryptoExchange.Net.Authentication;
 using CryptoExchange.Net.Clients;
-using CryptoExchange.Net.Converters.MessageParsing.DynamicConverters;
-using CryptoExchange.Net.Converters.SystemTextJson;
-using CryptoExchange.Net.Interfaces;
 using CryptoExchange.Net.Objects;
-using CryptoExchange.Net.Objects.Errors;
 using CryptoExchange.Net.Objects.Options;
-using CryptoExchange.Net.SharedApis;
+using CryptoExchange.Net.UnitTests.TestImplementations;
 using Microsoft.Extensions.Logging;
-using Microsoft.Extensions.Logging.Abstractions;
 
 namespace CryptoExchange.Net.UnitTests
 {
@@ -23,15 +19,13 @@ namespace CryptoExchange.Net.UnitTests
 
         public TestBaseClient(): base(null, "Test")
         {
-            var options = new TestClientOptions();
-            _logger = NullLogger.Instance;
+            var options = TestClientOptions.Default.Copy();
             Initialize(options);
             SubClient = AddApiClient(new TestSubClient(options, new RestApiOptions()));
         }
 
         public TestBaseClient(TestClientOptions exchangeOptions) : base(null, "Test")
         {
-            _logger = NullLogger.Instance;
             Initialize(exchangeOptions);
             SubClient = AddApiClient(new TestSubClient(exchangeOptions, new RestApiOptions()));
         }
@@ -44,47 +38,41 @@ namespace CryptoExchange.Net.UnitTests
 
     public class TestSubClient : RestApiClient
     {
-        protected override IRestMessageHandler MessageHandler => throw new NotImplementedException();
-
         public TestSubClient(RestExchangeOptions<TestEnvironment> options, RestApiOptions apiOptions) : base(new TraceLogger(), null, "https://localhost:123", options, apiOptions)
         {
         }
 
         public CallResult<T> Deserialize<T>(string data)
         {
-            return new CallResult<T>(JsonSerializer.Deserialize<T>(data));
+            var stream = new MemoryStream(Encoding.UTF8.GetBytes(data));
+            var accessor = CreateAccessor();
+            var valid = accessor.Read(stream, true).Result;
+            if (!valid)
+                return new CallResult<T>(new ServerError(data));
+            
+            var deserializeResult = accessor.Deserialize<T>();
+            return deserializeResult;
         }
 
         /// <inheritdoc />
-        public override string FormatSymbol(string baseAsset, string quoteAsset, TradingMode futuresType, DateTime? deliverDate = null) => $"{baseAsset.ToUpperInvariant()}{quoteAsset.ToUpperInvariant()}";
-        protected override IMessageSerializer CreateSerializer() => new SystemTextJsonMessageSerializer(new System.Text.Json.JsonSerializerOptions());
+        public override string FormatSymbol(string baseAsset, string quoteAsset) => $"{baseAsset.ToUpperInvariant()}{quoteAsset.ToUpperInvariant()}";
+        public override TimeSpan? GetTimeOffset() => null;
+        public override TimeSyncInfo GetTimeSyncInfo() => null;
         protected override AuthenticationProvider CreateAuthenticationProvider(ApiCredentials credentials) => throw new NotImplementedException();
         protected override Task<WebCallResult<DateTime>> GetServerTimestampAsync() => throw new NotImplementedException();
     }
 
     public class TestAuthProvider : AuthenticationProvider
     {
-        public override ApiCredentialsType[] SupportedCredentialTypes => [ApiCredentialsType.Hmac];
-
         public TestAuthProvider(ApiCredentials credentials) : base(credentials)
         {
         }
 
-        public override void ProcessRequest(RestApiClient apiClient, RestRequestConfiguration requestConfig)
+        public override void AuthenticateRequest(RestApiClient apiClient, Uri uri, HttpMethod method, IDictionary<string, object> uriParams, IDictionary<string, object> bodyParams, Dictionary<string, string> headers, bool auth, ArrayParametersSerialization arraySerialization, HttpMethodParameterPosition parameterPosition, RequestBodyFormat bodyFormat)
         {
         }
-        
-        public string GetKey() => _credentials.Key;
-        public string GetSecret() => _credentials.Secret;
-    }
 
-    public class TestEnvironment : TradeEnvironment
-    {
-        public string TestAddress { get; }
-
-        public TestEnvironment(string name, string url) : base(name)
-        {
-            TestAddress = url;
-        }
+        public string GetKey() => _credentials.Key.GetString();
+        public string GetSecret() => _credentials.Secret.GetString();
     }
 }

CryptoExchange.Net.UnitTests/TestImplementations/TestObjects.cs

@@ -1,14 +1,12 @@
-using System.Text.Json.Serialization;
+using Newtonsoft.Json;
 
 namespace CryptoExchange.Net.UnitTests.TestImplementations
 {
     public class TestObject
     {
-        [JsonPropertyName("other")]
+        [JsonProperty("other")]
         public string StringData { get; set; }
-        [JsonPropertyName("intData")]
         public int IntData { get; set; }
-        [JsonPropertyName("decimalData")]
         public decimal DecimalData { get; set; }
     }
 }

CryptoExchange.Net.UnitTests/TestImplementations/TestRestClient.cs

@@ -1,6 +1,7 @@
 using CryptoExchange.Net.Interfaces;
 using CryptoExchange.Net.Objects;
 using Moq;
+using Newtonsoft.Json.Linq;
 using System;
 using System.IO;
 using System.Net;
@@ -11,15 +12,9 @@ using System.Threading;
 using System.Threading.Tasks;
 using CryptoExchange.Net.Authentication;
 using System.Collections.Generic;
+using CryptoExchange.Net.Objects.Options;
 using Microsoft.Extensions.Logging;
 using CryptoExchange.Net.Clients;
-using Microsoft.Extensions.Options;
-using System.Linq;
-using CryptoExchange.Net.Converters.SystemTextJson;
-using System.Text.Json.Serialization;
-using System.Net.Http.Headers;
-using CryptoExchange.Net.SharedApis;
-using CryptoExchange.Net.Converters.MessageParsing.DynamicConverters;
 
 namespace CryptoExchange.Net.UnitTests.TestImplementations
 {
@@ -28,17 +23,22 @@ namespace CryptoExchange.Net.UnitTests.TestImplementations
         public TestRestApi1Client Api1 { get; }
         public TestRestApi2Client Api2 { get; }
 
-        public TestRestClient(Action<TestClientOptions> optionsDelegate = null)
-            : this(null, null, Options.Create(ApplyOptionsDelegate(optionsDelegate)))
+        public TestRestClient(Action<TestClientOptions> optionsFunc) : this(optionsFunc, null)
         {
         }
 
-        public TestRestClient(HttpClient httpClient, ILoggerFactory loggerFactory, IOptions<TestClientOptions> options) : base(loggerFactory, "Test")
+        public TestRestClient(ILoggerFactory loggerFactory = null, HttpClient httpClient = null) : this((x) => { }, httpClient, loggerFactory)
         {
-            Initialize(options.Value);
+        }
 
-            Api1 = new TestRestApi1Client(options.Value);
-            Api2 = new TestRestApi2Client(options.Value);
+        public TestRestClient(Action<TestClientOptions> optionsFunc, HttpClient httpClient = null, ILoggerFactory loggerFactory = null) : base(loggerFactory, "Test")
+        {
+            var options = TestClientOptions.Default.Copy();
+            optionsFunc(options);
+            Initialize(options);
+
+            Api1 = new TestRestApi1Client(options);
+            Api2 = new TestRestApi2Client(options);
         }
 
         public void SetResponse(string responseData, out IRequest requestObj)
@@ -50,19 +50,19 @@ namespace CryptoExchange.Net.UnitTests.TestImplementations
 
             var response = new Mock<IResponse>();
             response.Setup(c => c.IsSuccessStatusCode).Returns(true);
-            response.Setup(c => c.GetResponseStreamAsync(It.IsAny<CancellationToken>())).Returns(Task.FromResult((Stream)responseStream));
+            response.Setup(c => c.GetResponseStreamAsync()).Returns(Task.FromResult((Stream)responseStream));
             
-            var headers = new HttpRequestMessage().Headers;
+            var headers = new Dictionary<string, IEnumerable<string>>();
             var request = new Mock<IRequest>();
             request.Setup(c => c.Uri).Returns(new Uri("http://www.test.com"));
             request.Setup(c => c.GetResponseAsync(It.IsAny<CancellationToken>())).Returns(Task.FromResult(response.Object));
             request.Setup(c => c.SetContent(It.IsAny<string>(), It.IsAny<string>())).Callback(new Action<string, string>((content, type) => { request.Setup(r => r.Content).Returns(content); }));
-            request.Setup(c => c.AddHeader(It.IsAny<string>(), It.IsAny<string>())).Callback<string, string>((key, val) => headers.Add(key, new string[] { val }));
+            request.Setup(c => c.AddHeader(It.IsAny<string>(), It.IsAny<string>())).Callback<string, string>((key, val) => headers.Add(key, new List<string> { val }));
             request.Setup(c => c.GetHeaders()).Returns(() => headers);
 
             var factory = Mock.Get(Api1.RequestFactory);
-            factory.Setup(c => c.Create(It.IsAny<Version>(), It.IsAny<HttpMethod>(), It.IsAny<Uri>(), It.IsAny<int>()))
-                .Callback<Version, HttpMethod, Uri, int>((version, method, uri, id) => 
+            factory.Setup(c => c.Create(It.IsAny<HttpMethod>(), It.IsAny<Uri>(), It.IsAny<int>()))
+                .Callback<HttpMethod, Uri, int>((method, uri, id) => 
                 { 
                     request.Setup(a => a.Uri).Returns(uri);
                     request.Setup(a => a.Method).Returns(method); 
@@ -70,8 +70,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>()))
-                .Callback<Version, HttpMethod, Uri, int>((version, method, uri, id) =>
+            factory.Setup(c => c.Create(It.IsAny<HttpMethod>(), It.IsAny<Uri>(), It.IsAny<int>()))
+                .Callback<HttpMethod, Uri, int>((method, uri, id) =>
                 {
                     request.Setup(a => a.Uri).Returns(uri);
                     request.Setup(a => a.Method).Returns(method);
@@ -87,16 +87,16 @@ namespace CryptoExchange.Net.UnitTests.TestImplementations
            
             var request = new Mock<IRequest>();
             request.Setup(c => c.Uri).Returns(new Uri("http://www.test.com"));
-            request.Setup(c => c.GetHeaders()).Returns(new HttpRequestMessage().Headers);
+            request.Setup(c => c.GetHeaders()).Returns(new Dictionary<string, IEnumerable<string>>());
             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);
         }
 
@@ -109,49 +109,45 @@ namespace CryptoExchange.Net.UnitTests.TestImplementations
 
             var response = new Mock<IResponse>();
             response.Setup(c => c.IsSuccessStatusCode).Returns(false);
-            response.Setup(c => c.GetResponseStreamAsync(It.IsAny<CancellationToken>())).Returns(Task.FromResult((Stream)responseStream));
+            response.Setup(c => c.GetResponseStreamAsync()).Returns(Task.FromResult((Stream)responseStream));
 
-            var headers = new List<KeyValuePair<string, string[]>>();
+            var headers = new Dictionary<string, IEnumerable<string>>();
             var request = new Mock<IRequest>();
             request.Setup(c => c.Uri).Returns(new Uri("http://www.test.com"));
             request.Setup(c => c.GetResponseAsync(It.IsAny<CancellationToken>())).Returns(Task.FromResult(response.Object));
-            request.Setup(c => c.AddHeader(It.IsAny<string>(), It.IsAny<string>())).Callback<string, string>((key, val) => headers.Add(new KeyValuePair<string, string[]>(key, new string[] { val })));
-            request.Setup(c => c.GetHeaders()).Returns(new HttpRequestMessage().Headers);
+            request.Setup(c => c.AddHeader(It.IsAny<string>(), It.IsAny<string>())).Callback<string, string>((key, val) => headers.Add(key, new List<string> { val }));
+            request.Setup(c => c.GetHeaders()).Returns(headers);
 
             var factory = Mock.Get(Api1.RequestFactory);
-            factory.Setup(c => c.Create(It.IsAny<Version>(), 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))
+            factory.Setup(c => c.Create(It.IsAny<HttpMethod>(), It.IsAny<Uri>(), It.IsAny<int>()))
+                .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>()))
-                .Callback<Version, HttpMethod, Uri, int>((version, method, uri, id) => request.Setup(a => a.Uri).Returns(uri))
+            factory.Setup(c => c.Create(It.IsAny<HttpMethod>(), It.IsAny<Uri>(), It.IsAny<int>()))
+                .Callback<HttpMethod, Uri, int>((method, uri, id) => request.Setup(a => a.Uri).Returns(uri))
                 .Returns(request.Object);
         }
     }
 
     public class TestRestApi1Client : RestApiClient
     {
-        protected override IRestMessageHandler MessageHandler { get; } = new TestRestMessageHandler();
-
         public TestRestApi1Client(TestClientOptions options) : base(new TraceLogger(), null, "https://localhost:123", options, options.Api1Options)
         {
             RequestFactory = new Mock<IRequestFactory>().Object;
         }
 
         /// <inheritdoc />
-        public override string FormatSymbol(string baseAsset, string quoteAsset, TradingMode futuresType, DateTime? deliverDate = null) => $"{baseAsset.ToUpperInvariant()}{quoteAsset.ToUpperInvariant()}";
-
-        protected override IMessageSerializer CreateSerializer() => new SystemTextJsonMessageSerializer(new System.Text.Json.JsonSerializerOptions());
+        public override string FormatSymbol(string baseAsset, string quoteAsset) => $"{baseAsset.ToUpperInvariant()}{quoteAsset.ToUpperInvariant()}";
 
         public async Task<CallResult<T>> Request<T>(CancellationToken ct = default) where T : class
         {
-            return await SendAsync<T>("http://www.test.com", new RequestDefinition("/", HttpMethod.Get) { Weight = 0 }, null, ct);
+            return await SendRequestAsync<T>(new Uri("http://www.test.com"), HttpMethod.Get, ct, requestWeight: 0);
         }
 
-        public async Task<CallResult<T>> RequestWithParams<T>(HttpMethod method, ParameterCollection parameters, Dictionary<string, string> headers) where T : class
+        public async Task<CallResult<T>> RequestWithParams<T>(HttpMethod method, Dictionary<string, object> parameters, Dictionary<string, string> headers) where T : class
         {
-            return await SendAsync<T>("http://www.test.com", new RequestDefinition("/", method) { Weight = 0 }, parameters, default, additionalHeaders: headers);
+            return await SendRequestAsync<T>(new Uri("http://www.test.com"), method, default, parameters, requestWeight: 0, additionalHeaders: headers);
         }
 
         public void SetParameterPosition(HttpMethod method, HttpMethodParameterPosition position)
@@ -159,6 +155,11 @@ namespace CryptoExchange.Net.UnitTests.TestImplementations
             ParameterPositions[method] = position;
         }
 
+        public override TimeSpan? GetTimeOffset()
+        {
+            throw new NotImplementedException();
+        }
+
         protected override AuthenticationProvider CreateAuthenticationProvider(ApiCredentials credentials)
             => new TestAuthProvider(credentials);
 
@@ -166,27 +167,40 @@ namespace CryptoExchange.Net.UnitTests.TestImplementations
         {
             throw new NotImplementedException();
         }
+
+        public override TimeSyncInfo GetTimeSyncInfo()
+        {
+            throw new NotImplementedException();
+        }
     }
 
     public class TestRestApi2Client : RestApiClient
     {
-        protected override IRestMessageHandler MessageHandler { get; } = new TestRestMessageHandler();
-
         public TestRestApi2Client(TestClientOptions options) : base(new TraceLogger(), null, "https://localhost:123", options, options.Api2Options)
         {
             RequestFactory = new Mock<IRequestFactory>().Object;
         }
 
-        protected override IMessageSerializer CreateSerializer() => new SystemTextJsonMessageSerializer(new System.Text.Json.JsonSerializerOptions());
-
         /// <inheritdoc />
-        public override string FormatSymbol(string baseAsset, string quoteAsset, TradingMode futuresType, DateTime? deliverDate = null) => $"{baseAsset.ToUpperInvariant()}{quoteAsset.ToUpperInvariant()}";
+        public override string FormatSymbol(string baseAsset, string quoteAsset) => $"{baseAsset.ToUpperInvariant()}{quoteAsset.ToUpperInvariant()}";
 
         public async Task<CallResult<T>> Request<T>(CancellationToken ct = default) where T : class
         {
-            return await SendAsync<T>("http://www.test.com", new RequestDefinition("/", HttpMethod.Get) { Weight = 0 }, null, ct);
+            return await SendRequestAsync<T>(new Uri("http://www.test.com"), HttpMethod.Get, ct, requestWeight: 0);
         }
-        
+
+        protected override Error ParseErrorResponse(int httpStatusCode, IEnumerable<KeyValuePair<string, IEnumerable<string>>> responseHeaders, IMessageAccessor accessor)
+        {
+            var errorData = accessor.Deserialize<TestError>();
+
+            return new ServerError(errorData.Data.ErrorCode, errorData.Data.ErrorMessage);
+        }
+
+        public override TimeSpan? GetTimeOffset()
+        {
+            throw new NotImplementedException();
+        }
+
         protected override AuthenticationProvider CreateAuthenticationProvider(ApiCredentials credentials)
             => new TestAuthProvider(credentials);
 
@@ -195,13 +209,15 @@ namespace CryptoExchange.Net.UnitTests.TestImplementations
             throw new NotImplementedException();
         }
 
+        public override TimeSyncInfo GetTimeSyncInfo()
+        {
+            throw new NotImplementedException();
+        }
     }
 
     public class TestError
     {
-        [JsonPropertyName("errorCode")]
         public int ErrorCode { get; set; }
-        [JsonPropertyName("errorMessage")]
         public string ErrorMessage { get; set; }
     }
 

CryptoExchange.Net.UnitTests/TestImplementations/TestRestMessageHandler.cs

@@ -1,32 +0,0 @@
-using CryptoExchange.Net.Converters.MessageParsing.DynamicConverters;
-using CryptoExchange.Net.Converters.SystemTextJson.MessageHandlers;
-using CryptoExchange.Net.Objects;
-using CryptoExchange.Net.Objects.Errors;
-using System;
-using System.Collections.Generic;
-using System.IO;
-using System.Linq;
-using System.Net.Http.Headers;
-using System.Text;
-using System.Text.Json;
-using System.Threading;
-using System.Threading.Tasks;
-
-namespace CryptoExchange.Net.UnitTests.TestImplementations
-{
-    internal class TestRestMessageHandler : JsonRestMessageHandler
-    {
-        private ErrorMapping _errorMapping = new ErrorMapping([]);
-        public override JsonSerializerOptions Options => new JsonSerializerOptions();
-
-        public override async ValueTask<Error> ParseErrorResponse(int httpStatusCode, HttpResponseHeaders responseHeaders, Stream responseStream)
-        {
-            var result = await GetJsonDocument(responseStream).ConfigureAwait(false);
-            if (result.Item1 != null)
-                return result.Item1;
-
-            var errorData = result.Item2.Deserialize<TestError>();
-            return new ServerError(errorData.ErrorCode, _errorMapping.GetErrorInfo(errorData.ErrorCode.ToString(), errorData.ErrorMessage));
-        }
-    }
-}

CryptoExchange.Net.UnitTests/TestImplementations/TestSocket.cs

@@ -0,0 +1,131 @@
+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 Action<WebSocketMessageType, ReadOnlyMemory<byte>> 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 void Send(int requestId, string data, int weight)
+        {
+            if(!Connected)
+                throw new Exception("Socket not connected");
+            OnRequestSent?.Invoke(requestId);
+        }
+
+        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)));
+        }
+
+        public void SetProxy(ApiProxy proxy)
+        {
+            throw new NotImplementedException();
+        }
+
+        public void InvokeError(Exception error)
+        {
+            OnError?.Invoke(error);
+        }
+        public Task ReconnectAsync() => Task.CompletedTask;
+    }
+}

CryptoExchange.Net.UnitTests/TestImplementations/TestSocketClient.cs

@@ -0,0 +1,122 @@
+using System;
+using System.Collections.Generic;
+using System.Threading;
+using System.Threading.Tasks;
+using CryptoExchange.Net.Authentication;
+using CryptoExchange.Net.Clients;
+using CryptoExchange.Net.Converters.MessageParsing;
+using CryptoExchange.Net.Interfaces;
+using CryptoExchange.Net.Objects;
+using CryptoExchange.Net.Objects.Options;
+using CryptoExchange.Net.Objects.Sockets;
+using CryptoExchange.Net.Sockets;
+using CryptoExchange.Net.UnitTests.TestImplementations.Sockets;
+using Microsoft.Extensions.Logging;
+using Moq;
+using Newtonsoft.Json.Linq;
+
+namespace CryptoExchange.Net.UnitTests.TestImplementations
+{
+    public class TestSocketClient: BaseSocketClient
+    {
+        public TestSubSocketClient SubClient { get; }
+
+        public TestSocketClient(ILoggerFactory loggerFactory = null) : this((x) => { }, loggerFactory)
+        {
+        }
+
+        /// <summary>
+        /// Create a new instance of KucoinSocketClient
+        /// </summary>
+        /// <param name="optionsFunc">Configure the options to use for this client</param>
+        public TestSocketClient(Action<TestSocketOptions> optionsFunc) : this(optionsFunc, null)
+        {
+        }
+
+        public TestSocketClient(Action<TestSocketOptions> optionsFunc, ILoggerFactory loggerFactory = null) : base(loggerFactory, "Test")
+        {
+            var options = TestSocketOptions.Default.Copy<TestSocketOptions>();
+            optionsFunc(options);
+            Initialize(options);
+
+            SubClient = AddApiClient(new TestSubSocketClient(options, options.SubOptions));
+            SubClient.SocketFactory = new Mock<IWebsocketFactory>().Object;
+            Mock.Get(SubClient.SocketFactory).Setup(f => f.CreateWebsocket(It.IsAny<ILogger>(), It.IsAny<WebSocketParameters>())).Returns(new TestSocket());
+        }
+
+        public TestSocket CreateSocket()
+        {
+            Mock.Get(SubClient.SocketFactory).Setup(f => f.CreateWebsocket(It.IsAny<ILogger>(), It.IsAny<WebSocketParameters>())).Returns(new TestSocket());
+            return (TestSocket)SubClient.CreateSocketInternal("https://localhost:123/");
+        }
+                
+    }
+
+    public class TestEnvironment : TradeEnvironment
+    {
+        public string TestAddress { get; }
+
+        public TestEnvironment(string name, string url) : base(name)
+        {
+            TestAddress = url;
+        }
+    }
+
+    public class TestSocketOptions: SocketExchangeOptions<TestEnvironment>
+    {
+        public static TestSocketOptions Default = new TestSocketOptions
+        {
+            Environment = new TestEnvironment("Live", "https://test.test")
+        };
+
+        public SocketApiOptions SubOptions { get; set; } = new SocketApiOptions();
+    }
+
+    public class TestSubSocketClient : SocketApiClient
+    {
+        private MessagePath _channelPath = MessagePath.Get().Property("channel");
+        private MessagePath _topicPath = MessagePath.Get().Property("topic");
+
+        public Subscription TestSubscription { get; private set; } = null;
+
+        public TestSubSocketClient(TestSocketOptions options, SocketApiOptions apiOptions) : base(new TraceLogger(), options.Environment.TestAddress, options, apiOptions)
+        {
+
+        }
+
+        /// <inheritdoc />
+        public override string FormatSymbol(string baseAsset, string quoteAsset) => $"{baseAsset.ToUpperInvariant()}{quoteAsset.ToUpperInvariant()}";
+
+        internal IWebsocket CreateSocketInternal(string address)
+        {
+            return CreateSocket(address);
+        }
+
+        protected override AuthenticationProvider CreateAuthenticationProvider(ApiCredentials credentials)
+            => new TestAuthProvider(credentials);
+
+        public CallResult ConnectSocketSub(SocketConnection sub)
+        {
+            return ConnectSocketAsync(sub).Result;
+        }
+
+        public override string GetListenerIdentifier(IMessageAccessor message)
+        {
+            if (!message.IsJson)
+            {
+                return "topic";
+            }
+
+            var id = message.GetValue<string>(_channelPath);
+            id ??= message.GetValue<string>(_topicPath);
+
+            return id;
+        }
+
+        public Task<CallResult<UpdateSubscription>> SubscribeToSomethingAsync(string channel, Action<DataEvent<string>> onUpdate, CancellationToken ct)
+        {
+            TestSubscription = new TestSubscriptionWithResponseCheck<string>(channel, onUpdate);
+            return SubscribeAsync(TestSubscription, ct);
+        }        
+    }
+}

CryptoExchange.Net.UnitTests/TestSerializerContext.cs

@@ -1,17 +0,0 @@
-using CryptoExchange.Net.UnitTests.TestImplementations;
-using System.Collections.Generic;
-using System.Text.Json.Serialization;
-
-namespace CryptoExchange.Net.UnitTests
-{
-    [JsonSerializable(typeof(string))]
-    [JsonSerializable(typeof(int))]
-    [JsonSerializable(typeof(Dictionary<string, string>))]
-    [JsonSerializable(typeof(IDictionary<string, string>))]
-    [JsonSerializable(typeof(Dictionary<string, object>))]
-    [JsonSerializable(typeof(IDictionary<string, object>))]
-    [JsonSerializable(typeof(TestObject))]
-    internal partial class TestSerializerContext : JsonSerializerContext
-    {
-    }
-}

CryptoExchange.Net.sln

@@ -11,11 +11,7 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "BlazorClient", "Examples\Bl
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Examples", "Examples", "{5734C2A9-F12C-4754-A8B9-640C24DC4E02}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ConsoleClient", "Examples\ConsoleClient\ConsoleClient.csproj", "{23480C58-23BF-4EBF-A173-B7F51A043A99}"
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SharedClients", "Examples\SharedClients\SharedClients.csproj", "{988A87EF-EAEA-4313-A6CF-FA869813D5AB}"
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "CryptoExchange.Net.Protobuf", "CryptoExchange.Net.Protobuf\CryptoExchange.Net.Protobuf.csproj", "{CC6A807A-9183-6F41-8EF1-8A70172B0E83}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ConsoleClient", "Examples\ConsoleClient\ConsoleClient.csproj", "{23480C58-23BF-4EBF-A173-B7F51A043A99}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
@@ -39,14 +35,6 @@ Global
 		{23480C58-23BF-4EBF-A173-B7F51A043A99}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{23480C58-23BF-4EBF-A173-B7F51A043A99}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{23480C58-23BF-4EBF-A173-B7F51A043A99}.Release|Any CPU.Build.0 = Release|Any CPU
-		{988A87EF-EAEA-4313-A6CF-FA869813D5AB}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{988A87EF-EAEA-4313-A6CF-FA869813D5AB}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{988A87EF-EAEA-4313-A6CF-FA869813D5AB}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{988A87EF-EAEA-4313-A6CF-FA869813D5AB}.Release|Any CPU.Build.0 = Release|Any CPU
-		{CC6A807A-9183-6F41-8EF1-8A70172B0E83}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{CC6A807A-9183-6F41-8EF1-8A70172B0E83}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{CC6A807A-9183-6F41-8EF1-8A70172B0E83}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{CC6A807A-9183-6F41-8EF1-8A70172B0E83}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
@@ -54,7 +42,6 @@ Global
 	GlobalSection(NestedProjects) = preSolution
 		{AF4F5C19-162E-48F4-8B0B-BA5A2D7CE06A} = {5734C2A9-F12C-4754-A8B9-640C24DC4E02}
 		{23480C58-23BF-4EBF-A173-B7F51A043A99} = {5734C2A9-F12C-4754-A8B9-640C24DC4E02}
-		{988A87EF-EAEA-4313-A6CF-FA869813D5AB} = {5734C2A9-F12C-4754-A8B9-640C24DC4E02}
 	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
 		SolutionGuid = {0D1B9CE9-E0B7-4B8B-88BF-6EA2CC8CA3D7}

CryptoExchange.Net/Attributes/MapAttribute.cs

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

CryptoExchange.Net/Attributes/NullableAttributes.cs

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

CryptoExchange.Net/Authentication/ApiCredentials.cs

@@ -1,92 +1,79 @@
 using System;
 using System.IO;
-using System.Threading.Tasks;
+using System.Security;
+using CryptoExchange.Net.Converters.SystemTextJson;
+using CryptoExchange.Net.Converters.MessageParsing;
 
 namespace CryptoExchange.Net.Authentication
 {
     /// <summary>
     /// Api credentials, used to sign requests accessing private endpoints
     /// </summary>
-    public class ApiCredentials
+    public class ApiCredentials: IDisposable
     {
         /// <summary>
-        /// The api key / label to authenticate requests
+        /// The api key to authenticate requests
         /// </summary>
-        public string Key { get; set; }
+        public SecureString? Key { get; }
 
         /// <summary>
-        /// The api secret or private key to authenticate requests
+        /// The api secret to authenticate requests
         /// </summary>
-        public string Secret { get; set; }
-
-        /// <summary>
-        /// The api passphrase. Not needed on all exchanges
-        /// </summary>
-        public string? Pass { get; set; }
+        public SecureString? Secret { get; }
 
         /// <summary>
         /// Type of the credentials
         /// </summary>
-        public ApiCredentialsType CredentialType { get; set; }
+        public ApiCredentialsType CredentialType { get; }
 
         /// <summary>
         /// Create Api credentials providing an api key and secret for authentication
         /// </summary>
-        /// <param name="key">The api key / label used for identification</param>
-        /// <param name="secret">The api secret or private key used for signing</param>
-        /// <param name="pass">The api pass for the key. Not always needed</param>
-        /// <param name="credentialType">The type of credentials</param>
-        public ApiCredentials(string key, string secret, string? pass = null, ApiCredentialsType credentialType = ApiCredentialsType.Hmac)
+        /// <param name="key">The api key used for identification</param>
+        /// <param name="secret">The api secret used for signing</param>
+        public ApiCredentials(SecureString key, SecureString secret) : this(key, secret, ApiCredentialsType.Hmac)
+        {
+        }
+
+        /// <summary>
+        /// Create Api credentials providing an api key and secret for authentication
+        /// </summary>
+        /// <param name="key">The api key used for identification</param>
+        /// <param name="secret">The api secret used for signing</param>
+        /// <param name="credentialsType">The type of credentials</param>
+        public ApiCredentials(SecureString key, SecureString secret, ApiCredentialsType credentialsType)
+        {
+            if (key == null || secret == null)
+                throw new ArgumentException("Key and secret can't be null/empty");
+
+            CredentialType = credentialsType;
+            Key = key;
+            Secret = secret;
+        }
+
+        /// <summary>
+        /// Create Api credentials providing an api key and secret for authentication
+        /// </summary>
+        /// <param name="key">The api key used for identification</param>
+        /// <param name="secret">The api secret used for signing</param>
+        public ApiCredentials(string key, string secret) : this(key, secret, ApiCredentialsType.Hmac)
+        {
+        }
+
+        /// <summary>
+        /// Create Api credentials providing an api key and secret for authentication
+        /// </summary>
+        /// <param name="key">The api key used for identification</param>
+        /// <param name="secret">The api secret used for signing</param>
+        /// <param name="credentialsType">The type of credentials</param>
+        public ApiCredentials(string key, string secret, ApiCredentialsType credentialsType)
         {
             if (string.IsNullOrEmpty(key) || string.IsNullOrEmpty(secret))
                 throw new ArgumentException("Key and secret can't be null/empty");
 
-            CredentialType = credentialType;
-            Key = key;
-            Secret = secret;
-            Pass = pass;
-        }
-
-        /// <summary>
-        /// Create API credentials using an API key and secret generated by the server
-        /// </summary>
-        public static ApiCredentials HmacCredentials(string apiKey, string apiSecret, string? pass)
-        {
-            return new ApiCredentials(apiKey, apiSecret, pass, ApiCredentialsType.Hmac);
-        }
-
-        /// <summary>
-        /// Create API credentials using an API key and an RSA private key in PEM format
-        /// </summary>
-        public static ApiCredentials RsaPemCredentials(string apiKey, string privateKey)
-        {
-            return new ApiCredentials(apiKey, privateKey, credentialType: ApiCredentialsType.RsaPem);
-        }
-
-        /// <summary>
-        /// Create API credentials using an API key and an RSA private key in XML format
-        /// </summary>
-        public static ApiCredentials RsaXmlCredentials(string apiKey, string privateKey)
-        {
-            return new ApiCredentials(apiKey, privateKey, credentialType: ApiCredentialsType.RsaXml);
-        }
-
-        /// <summary>
-        /// Create API credentials using an API key and an Ed25519 private key
-        /// </summary>
-        public static ApiCredentials Ed25519Credentials(string apiKey, string privateKey)
-        {
-            return new ApiCredentials(apiKey, privateKey, credentialType: ApiCredentialsType.Ed25519);
-        }
-
-        /// <summary>
-        /// Load a key from a file
-        /// </summary>
-        public static string ReadFromFile(string path)
-        {
-            using var fileStream = File.OpenRead(path);
-            using var streamReader = new StreamReader(fileStream);
-            return streamReader.ReadToEnd();
+            CredentialType = credentialsType;
+            Key = key.ToSecureString();
+            Secret = secret.ToSecureString();
         }
 
         /// <summary>
@@ -95,7 +82,40 @@ namespace CryptoExchange.Net.Authentication
         /// <returns></returns>
         public virtual ApiCredentials Copy()
         {
-            return new ApiCredentials(Key, Secret, Pass, CredentialType);
+            // Use .GetString() to create a copy of the SecureString
+            return new ApiCredentials(Key!.GetString(), Secret!.GetString(), CredentialType);
+        }
+
+        /// <summary>
+        /// Create Api credentials providing a stream containing json data. The json data should include two values: apiKey and apiSecret
+        /// </summary>
+        /// <param name="inputStream">The stream containing the json data</param>
+        /// <param name="identifierKey">A key to identify the credentials for the API. For example, when set to `binanceKey` the json data should contain a value for the property `binanceKey`. Defaults to 'apiKey'.</param>
+        /// <param name="identifierSecret">A key to identify the credentials for the API. For example, when set to `binanceSecret` the json data should contain a value for the property `binanceSecret`. Defaults to 'apiSecret'.</param>
+        public ApiCredentials(Stream inputStream, string? identifierKey = null, string? identifierSecret = null)
+        {
+            var accessor = new SystemTextJsonStreamMessageAccessor();
+            if (!accessor.Read(inputStream, false).Result)
+                throw new ArgumentException("Input stream not valid json data");
+
+            var key = accessor.GetValue<string>(MessagePath.Get().Property(identifierKey ?? "apiKey"));
+            var secret = accessor.GetValue<string>(MessagePath.Get().Property(identifierSecret ?? "apiSecret"));
+            if (key == null || secret == null)
+                throw new ArgumentException("apiKey or apiSecret value not found in Json credential file");
+
+            Key = key.ToSecureString();
+            Secret = secret.ToSecureString();
+
+            inputStream.Seek(0, SeekOrigin.Begin);
+        }
+
+        /// <summary>
+        /// Dispose
+        /// </summary>
+        public void Dispose()
+        {
+            Key?.Dispose();
+            Secret?.Dispose();
         }
     }
 }

CryptoExchange.Net/Authentication/ApiCredentialsType.cs

@@ -16,10 +16,6 @@
         /// <summary>
         /// Rsa keys credentials in pem/base64 format. Only available for .NetStandard 2.1 and up, use xml format for lower.
         /// </summary>
-        RsaPem,
-        /// <summary>
-        /// Ed25519 keys credentials
-        /// </summary>
-        Ed25519
+        RsaPem
     }
 }

CryptoExchange.Net/Authentication/AuthenticationProvider.cs

@@ -2,32 +2,22 @@
 using CryptoExchange.Net.Converters.SystemTextJson;
 using CryptoExchange.Net.Interfaces;
 using CryptoExchange.Net.Objects;
-#if NET8_0_OR_GREATER
-using NSec.Cryptography;
-#endif
 using System;
 using System.Collections.Generic;
-using System.Linq;
 using System.Globalization;
+using System.Net.Http;
 using System.Security.Cryptography;
 using System.Text;
-using CryptoExchange.Net.Sockets;
-using CryptoExchange.Net.Sockets.Default;
 
 namespace CryptoExchange.Net.Authentication
 {
     /// <summary>
     /// Base class for authentication providers
     /// </summary>
-    public abstract class AuthenticationProvider
+    public abstract class AuthenticationProvider : IDisposable
     {
         internal IAuthTimeProvider TimeProvider { get; set; } = new AuthTimeProvider();
 
-        /// <summary>
-        /// The supported credential types
-        /// </summary>
-        public abstract ApiCredentialsType[] SupportedCredentialTypes { get; }
-
         /// <summary>
         /// Provided credentials
         /// </summary>
@@ -38,59 +28,44 @@ namespace CryptoExchange.Net.Authentication
         /// </summary>
         protected byte[] _sBytes;
 
-#if NET8_0_OR_GREATER
-        /// <summary>
-        /// The Ed25519 private key
-        /// </summary>
-        protected Key? Ed25519Key;
-#endif
-
-        /// <summary>
-        /// Get the API key of the current credentials
-        /// </summary>
-        public string ApiKey => _credentials.Key!;
-        /// <summary>
-        /// Get the Passphrase of the current credentials
-        /// </summary>
-        public string? Pass => _credentials.Pass;
-
         /// <summary>
         /// ctor
         /// </summary>
         /// <param name="credentials"></param>
         protected AuthenticationProvider(ApiCredentials credentials)
         {
-            if (credentials.Key == null || credentials.Secret == null)
+            if (credentials.Secret == null)
                 throw new ArgumentException("ApiKey/Secret needed");
 
-            if (!SupportedCredentialTypes.Any(x => x == credentials.CredentialType))
-                throw new ArgumentException($"Credential type {credentials.CredentialType} not supported");
-
-            if (credentials.CredentialType == ApiCredentialsType.Ed25519)
-            {
-#if !NET8_0_OR_GREATER
-                throw new ArgumentException($"Credential type Ed25519 only supported on Net8.0 or newer");
-#endif
-            }
-
             _credentials = credentials;
-            _sBytes = Encoding.UTF8.GetBytes(credentials.Secret);
+            _sBytes = Encoding.UTF8.GetBytes(credentials.Secret.GetString());
         }
 
         /// <summary>
-        /// Authenticate a REST request
+        /// Authenticate a request. Output parameters should include the providedParameters input
         /// </summary>
-        /// <param name="apiClient">The API client sending the request</param>
-        /// <param name="requestConfig">The request configuration</param>
-        public abstract void ProcessRequest(RestApiClient apiClient, RestRequestConfiguration requestConfig);
-
-        /// <summary>
-        /// Get an authentication query for a websocket
-        /// </summary>
-        /// <param name="apiClient">The API client sending the request</param>
-        /// <param name="connection">The connection to authenticate</param>
-        /// <param name="context">Optional context required for creating the authentication query</param>
-        public virtual Query? GetAuthenticationQuery(SocketApiClient apiClient, SocketConnection connection, Dictionary<string, object?>? context = null) => null;
+        /// <param name="apiClient">The Api client sending the request</param>
+        /// <param name="uri">The uri for the request</param>
+        /// <param name="method">The method of the request</param>
+        /// <param name="auth">If the requests should be authenticated</param>
+        /// <param name="arraySerialization">Array serialization type</param>
+        /// <param name="requestBodyFormat">The formatting of the request body</param>
+        /// <param name="uriParameters">Parameters that need to be in the Uri of the request. Should include the provided parameters if they should go in the uri</param>
+        /// <param name="bodyParameters">Parameters that need to be in the body of the request. Should include the provided parameters if they should go in the body</param>
+        /// <param name="headers">The headers that should be send with the request</param>
+        /// <param name="parameterPosition">The position where the providedParameters should go</param>
+        public abstract void AuthenticateRequest(
+            RestApiClient apiClient,
+            Uri uri,
+            HttpMethod method,
+            IDictionary<string, object> uriParameters,
+            IDictionary<string, object> bodyParameters,
+            Dictionary<string, string> headers,
+            bool auth,
+            ArrayParametersSerialization arraySerialization,
+            HttpMethodParameterPosition parameterPosition,
+            RequestBodyFormat requestBodyFormat
+            );
 
         /// <summary>
         /// SHA256 sign the data and return the bytes
@@ -384,44 +359,14 @@ namespace CryptoExchange.Net.Authentication
             return outputType == SignOutputType.Base64 ? BytesToBase64String(resultBytes) : BytesToHexString(resultBytes);
         }
 
-        /// <summary>
-        /// Ed25519 sign the data 
-        /// </summary>
-        public string SignEd25519(string data, SignOutputType? outputType = null)
-            => SignEd25519(Encoding.ASCII.GetBytes(data), outputType);
-
-        /// <summary>
-        /// Ed25519 sign the data 
-        /// </summary>
-        public string SignEd25519(byte[] data, SignOutputType? outputType = null)
-        {
-#if NET8_0_OR_GREATER
-            if (Ed25519Key == null)
-            {
-                var key = _credentials.Secret!
-                        .Replace("\n", "")
-                        .Replace("-----BEGIN PRIVATE KEY-----", "")
-                        .Replace("-----END PRIVATE KEY-----", "")
-                        .Trim();
-                var keyBytes = Convert.FromBase64String(key);
-                Ed25519Key = Key.Import(SignatureAlgorithm.Ed25519, keyBytes, KeyBlobFormat.PkixPrivateKey);
-            }
-
-            var resultBytes = SignatureAlgorithm.Ed25519.Sign(Ed25519Key, data);
-            return outputType == SignOutputType.Base64 ? BytesToBase64String(resultBytes) : BytesToHexString(resultBytes);
-#else
-            throw new InvalidOperationException();
-#endif
-        }
-
         private RSA CreateRSA()
         {
             var rsa = RSA.Create();
             if (_credentials.CredentialType == ApiCredentialsType.RsaPem)
             {
-#if NETSTANDARD2_1_OR_GREATER || NET9_0_OR_GREATER
+#if NETSTANDARD2_1_OR_GREATER
                 // Read from pem private key
-                var key = _credentials.Secret!
+                var key = _credentials.Secret!.GetString()
                         .Replace("\n", "")
                         .Replace("-----BEGIN PRIVATE KEY-----", "")
                         .Replace("-----END PRIVATE KEY-----", "")
@@ -436,7 +381,7 @@ namespace CryptoExchange.Net.Authentication
             else if (_credentials.CredentialType == ApiCredentialsType.RsaXml)
             {
                 // Read from xml private key format
-                rsa.FromXmlString(_credentials.Secret!);
+                rsa.FromXmlString(_credentials.Secret!.GetString());
             }
             else
             {
@@ -452,43 +397,11 @@ namespace CryptoExchange.Net.Authentication
         /// <param name="buff"></param>
         /// <returns></returns>
         protected static string BytesToHexString(byte[] buff)
-            => BytesToHexString(new ArraySegment<byte>(buff));
-
-        /// <summary>
-        /// Convert byte array to hex string
-        /// </summary>
-        /// <param name="buff"></param>
-        /// <returns></returns>
-        protected static string BytesToHexString(ArraySegment<byte> buff)
         {
-#if NET9_0_OR_GREATER
-            return Convert.ToHexString(buff);
-#else
             var result = string.Empty;
             foreach (var t in buff)
                 result += t.ToString("X2");
             return result;
-#endif
-        }
-
-        /// <summary>
-        /// Convert a hex encoded string to byte array
-        /// </summary>
-        /// <param name="hexString"></param>
-        /// <returns></returns>
-        protected static byte[] HexToBytesString(string hexString)
-        {
-            if (hexString.StartsWith("0x"))
-                hexString = hexString.Substring(2);
-
-            byte[] bytes = new byte[hexString.Length / 2];
-            for (int i = 0; i < hexString.Length; i += 2)
-            {
-                string hexSubstring = hexString.Substring(i, 2);
-                bytes[i / 2] = Convert.ToByte(hexSubstring, 16);
-            }
-
-            return bytes;
         }
 
         /// <summary>
@@ -504,53 +417,22 @@ namespace CryptoExchange.Net.Authentication
         /// <summary>
         /// Get current timestamp including the time sync offset from the api client
         /// </summary>
-        protected DateTime GetTimestamp(RestApiClient apiClient, bool includeOneSecondOffset = true)
+        /// <param name="apiClient"></param>
+        /// <returns></returns>
+        protected DateTime GetTimestamp(RestApiClient apiClient)
         {
-            var result =  TimeProvider.GetTime().Add(TimeOffsetManager.GetRestOffset(apiClient.ClientName) ?? TimeSpan.Zero)!;
-            if (includeOneSecondOffset)
-                result = result.AddSeconds(-1);
-
-            return result;
-        }
-
-        /// <summary>
-        /// Get current timestamp including the time sync offset from the api client
-        /// </summary>
-        protected DateTime GetTimestamp(SocketApiClient apiClient, bool includeOneSecondOffset = true)
-        {
-            var timestamp = TimeProvider.GetTime();
-            if(apiClient.ApiOptions.AutoTimestamp ?? apiClient.ClientOptions.AutoTimestamp)
-                timestamp = timestamp.Add(-TimeOffsetManager.GetSocketOffset(apiClient.ClientName) ?? TimeSpan.Zero)!;
-
-            if (includeOneSecondOffset)
-                timestamp = timestamp.AddSeconds(-1);
-
-            return timestamp;
+            return TimeProvider.GetTime().Add(apiClient.GetTimeOffset() ?? TimeSpan.Zero)!;
         }
 
         /// <summary>
         /// Get millisecond timestamp as a string including the time sync offset from the api client
         /// </summary>
-        protected string GetMillisecondTimestamp(RestApiClient apiClient, bool includeOneSecondOffset = true)
-            => DateTimeConverter.ConvertToMilliseconds(GetTimestamp(apiClient, includeOneSecondOffset)).Value.ToString(CultureInfo.InvariantCulture);
-
-        /// <summary>
-        /// Get millisecond timestamp as a string including the time sync offset from the api client
-        /// </summary>
-        protected string GetMillisecondTimestamp(SocketApiClient apiClient, bool includeOneSecondOffset = true)
-            => DateTimeConverter.ConvertToMilliseconds(GetTimestamp(apiClient, includeOneSecondOffset)).Value.ToString(CultureInfo.InvariantCulture);
-
-        /// <summary>
-        /// Get millisecond timestamp as a long including the time sync offset from the api client
-        /// </summary>
-        protected long GetMillisecondTimestampLong(RestApiClient apiClient, bool includeOneSecondOffset = true)
-            => DateTimeConverter.ConvertToMilliseconds(GetTimestamp(apiClient, includeOneSecondOffset)).Value;
-
-        /// <summary>
-        /// Get millisecond timestamp as a long including the time sync offset from the api client
-        /// </summary>
-        protected long GetMillisecondTimestampLong(SocketApiClient apiClient, bool includeOneSecondOffset = true)
-            => DateTimeConverter.ConvertToMilliseconds(GetTimestamp(apiClient, includeOneSecondOffset)).Value;
+        /// <param name="apiClient"></param>
+        /// <returns></returns>
+        protected string GetMillisecondTimestamp(RestApiClient apiClient)
+        {
+            return DateTimeConverter.ConvertToMilliseconds(GetTimestamp(apiClient)).Value.ToString(CultureInfo.InvariantCulture);
+        }
 
         /// <summary>
         /// Return the serialized request body
@@ -558,15 +440,18 @@ namespace CryptoExchange.Net.Authentication
         /// <param name="serializer"></param>
         /// <param name="parameters"></param>
         /// <returns></returns>
-        protected static string GetSerializedBody(IMessageSerializer serializer, IDictionary<string, object> parameters)
+        protected string GetSerializedBody(IMessageSerializer serializer, IDictionary<string, object> parameters)
         {
-            if (serializer is not IStringMessageSerializer stringSerializer)
-                throw new InvalidOperationException("Non-string message serializer can't get serialized request body");
-
-            if (parameters?.Count == 1 && parameters.TryGetValue(Constants.BodyPlaceHolderKey, out object? value))
-                return stringSerializer.Serialize(value);
+            if (parameters.Count == 1 && parameters.ContainsKey(Constants.BodyPlaceHolderKey))
+                return serializer.Serialize(parameters[Constants.BodyPlaceHolderKey]);
             else
-                return stringSerializer.Serialize(parameters);
+                return serializer.Serialize(parameters);
+        }
+
+        /// <inheritdoc />
+        public void Dispose()
+        {
+            _credentials?.Dispose();
         }
     }
 

CryptoExchange.Net/Caching/MemoryCache.cs

@@ -1,18 +1,11 @@
 using System;
 using System.Collections.Concurrent;
-using System.Linq;
-using System.Threading;
 
 namespace CryptoExchange.Net.Caching
 {
     internal class MemoryCache
     {
         private readonly ConcurrentDictionary<string, CacheItem> _cache = new ConcurrentDictionary<string, CacheItem>();
-#if NET9_0_OR_GREATER
-        private readonly Lock _lock = new Lock();
-#else
-        private readonly object _lock = new object();
-#endif
 
         /// <summary>
         /// Add a new cache entry. Will override an existing entry if it already exists
@@ -33,13 +26,16 @@ namespace CryptoExchange.Net.Caching
         /// <returns>Cached value if it was in cache</returns>
         public object? Get(string key, TimeSpan maxAge)
         {
-            foreach (var item in _cache.Where(x => DateTime.UtcNow - x.Value.CacheTime > maxAge).ToList())
-                _cache.TryRemove(item.Key, out _);
-            
-            _cache.TryGetValue(key, out CacheItem? value);
+            _cache.TryGetValue(key, out CacheItem value);
             if (value == null)
                 return null;
 
+            if (DateTime.UtcNow - value.CacheTime > maxAge)
+            {
+                _cache.TryRemove(key, out _);
+                return null;
+            }
+
             return value.Value;
         }
 

CryptoExchange.Net/Clients/BaseApiClient.cs

@@ -1,9 +1,7 @@
 using System;
 using CryptoExchange.Net.Authentication;
-using CryptoExchange.Net.Interfaces.Clients;
-using CryptoExchange.Net.Objects.Errors;
+using CryptoExchange.Net.Interfaces;
 using CryptoExchange.Net.Objects.Options;
-using CryptoExchange.Net.SharedApis;
 using Microsoft.Extensions.Logging;
 
 namespace CryptoExchange.Net.Clients
@@ -13,11 +11,6 @@ namespace CryptoExchange.Net.Clients
     /// </summary>
     public abstract class BaseApiClient : IDisposable, IBaseApiClient
     {
-        /// <summary>
-        /// Client name
-        /// </summary>
-        protected string? _clientName;
-
         /// <summary>
         /// Logger
         /// </summary>
@@ -28,21 +21,6 @@ namespace CryptoExchange.Net.Clients
         /// </summary>
         protected bool _disposing;
 
-        /// <summary>
-        /// Name of the client
-        /// </summary>
-        protected internal string ClientName
-        {
-            get
-            {
-                if (_clientName != null)
-                    return _clientName;
-
-                _clientName = GetType().Name;
-                return _clientName;
-            }
-        }
-
         /// <summary>
         /// The authentication provider for this API client. (null if no credentials are set)
         /// </summary>
@@ -58,12 +36,6 @@ namespace CryptoExchange.Net.Clients
         /// </summary>
         public bool OutputOriginalData { get; }
 
-        /// <inheritdoc />
-        public bool Authenticated => ApiCredentials != null;
-
-        /// <inheritdoc />
-        public ApiCredentials? ApiCredentials { get; set; }
-
         /// <summary>
         /// Api options
         /// </summary>
@@ -74,16 +46,11 @@ namespace CryptoExchange.Net.Clients
         /// </summary>
         public ExchangeOptions ClientOptions { get; }
 
-        /// <summary>
-        /// Mapping of a response code to known error types
-        /// </summary>
-        protected internal virtual ErrorMapping ErrorMapping { get; } = new ErrorMapping([]);
-
         /// <summary>
         /// ctor
         /// </summary>
         /// <param name="logger">Logger</param>
-        /// <param name="outputOriginalData">Should data from this client include the original data in the call result</param>
+        /// <param name="outputOriginalData">Should data from this client include the orginal data in the call result</param>
         /// <param name="baseAddress">Base address for this API client</param>
         /// <param name="apiCredentials">Api credentials</param>
         /// <param name="clientOptions">Client options</param>
@@ -96,10 +63,12 @@ namespace CryptoExchange.Net.Clients
             ApiOptions = apiOptions;
             OutputOriginalData = outputOriginalData;
             BaseAddress = baseAddress;
-            ApiCredentials = apiCredentials?.Copy();
 
-            if (ApiCredentials != null)
-                AuthenticationProvider = CreateAuthenticationProvider(ApiCredentials);
+            if (apiCredentials != null)
+            {
+                AuthenticationProvider?.Dispose();
+                AuthenticationProvider = CreateAuthenticationProvider(apiCredentials.Copy());
+            }
         }
 
         /// <summary>
@@ -110,35 +79,16 @@ namespace CryptoExchange.Net.Clients
         protected abstract AuthenticationProvider CreateAuthenticationProvider(ApiCredentials credentials);
 
         /// <inheritdoc />
-        public abstract string FormatSymbol(string baseAsset, string quoteAsset, TradingMode tradingMode, DateTime? deliverDate = null);
-
-        /// <summary>
-        /// Get error info for a response code
-        /// </summary>
-        public ErrorInfo GetErrorInfo(int code, string? message = null) => GetErrorInfo(code.ToString(), message);
-
-        /// <summary>
-        /// Get error info for a response code
-        /// </summary>
-        public ErrorInfo GetErrorInfo(string code, string? message = null) => ErrorMapping.GetErrorInfo(code.ToString(), message);
+        public abstract string FormatSymbol(string baseAsset, string quoteAsset);
 
         /// <inheritdoc />
         public void SetApiCredentials<T>(T credentials) where T : ApiCredentials
         {
-            ApiCredentials = credentials?.Copy();
-            if (ApiCredentials != null)
-                AuthenticationProvider = CreateAuthenticationProvider(ApiCredentials);
-        }
-
-        /// <inheritdoc />
-        public virtual void SetOptions<T>(UpdateOptions<T> options) where T : ApiCredentials
-        {
-            ClientOptions.Proxy = options.Proxy;
-            ClientOptions.RequestTimeout = options.RequestTimeout ?? ClientOptions.RequestTimeout;
-
-            ApiCredentials = options.ApiCredentials?.Copy() ?? ApiCredentials;
-            if (ApiCredentials != null)
-                AuthenticationProvider = CreateAuthenticationProvider(ApiCredentials);
+            if (credentials != null)
+            {
+                AuthenticationProvider?.Dispose();
+                AuthenticationProvider = CreateAuthenticationProvider(credentials.Copy());
+            }
         }
 
         /// <summary>
@@ -147,6 +97,7 @@ namespace CryptoExchange.Net.Clients
         public virtual void Dispose()
         {
             _disposing = true;
+            AuthenticationProvider?.Dispose();
         }
     }
 }

CryptoExchange.Net/Clients/BaseClient.cs

@@ -1,9 +1,9 @@
 using CryptoExchange.Net.Authentication;
 using CryptoExchange.Net.Objects.Options;
 using Microsoft.Extensions.Logging;
+using Microsoft.Extensions.Logging.Abstractions;
 using System;
 using System.Collections.Generic;
-using System.Threading;
 
 namespace CryptoExchange.Net.Clients
 {
@@ -12,38 +12,11 @@ namespace CryptoExchange.Net.Clients
     /// </summary>
     public abstract class BaseClient : IDisposable
     {
-        /// <summary>
-        /// Version of the CryptoExchange.Net base library
-        /// </summary>
-        public Version CryptoExchangeLibVersion { get; } = typeof(BaseClient).Assembly.GetName().Version!;
-
-        /// <summary>
-        /// Version of the client implementation
-        /// </summary>
-        public Version ExchangeLibVersion
-        { 
-            get
-            {
-               lock(_versionLock)
-                {
-                    if (_exchangeVersion == null)
-                        _exchangeVersion = GetType().Assembly.GetName().Version!;
-
-                    return _exchangeVersion;
-                }
-            }
-        }
-
         /// <summary>
         /// The name of the API the client is for
         /// </summary>
         public string Exchange { get; }
 
-        /// <summary>
-        /// Whether client is disposed
-        /// </summary>
-        public bool Disposed { get; private set; }
-
         /// <summary>
         /// Api clients in this client
         /// </summary>
@@ -54,13 +27,6 @@ namespace CryptoExchange.Net.Clients
         /// </summary>
         protected internal ILogger _logger;
 
-#if NET9_0_OR_GREATER
-        private readonly Lock _versionLock = new Lock();
-#else
-        private readonly object _versionLock = new object();
-#endif
-        private Version _exchangeVersion;
-
         /// <summary>
         /// Provided client options
         /// </summary>
@@ -75,6 +41,8 @@ namespace CryptoExchange.Net.Clients
         protected BaseClient(ILoggerFactory? logger, string exchange)
 #pragma warning restore CS8618 // Non-nullable field must contain a non-null value when exiting constructor. Consider declaring as nullable.
         {
+            _logger = logger?.CreateLogger(exchange) ?? NullLoggerFactory.Instance.CreateLogger(exchange);
+
             Exchange = exchange;
         }
 
@@ -89,7 +57,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{typeof(BaseClient).Assembly.GetName().Version}, {Exchange}.Net: v{GetType().Assembly.GetName().Version}");
         }
 
         /// <summary>
@@ -111,27 +79,17 @@ namespace CryptoExchange.Net.Clients
             if (ClientOptions == null)
                 throw new InvalidOperationException("Client should have called Initialize before adding API clients");
 
+            _logger.Log(LogLevel.Trace, $"  {apiClient.GetType().Name}, base address: {apiClient.BaseAddress}");
             ApiClients.Add(apiClient);
             return apiClient;
         }
 
-        /// <summary>
-        /// Apply the options delegate to a new options instance
-        /// </summary>
-        protected static T ApplyOptionsDelegate<T>(Action<T>? del) where T: new()
-        {
-            var opts = new T();
-            del?.Invoke(opts);
-            return opts;
-        }
-
         /// <summary>
         /// Dispose
         /// </summary>
         public virtual void Dispose()
         {
-            Disposed = true;
-
+            _logger.Log(LogLevel.Debug, "Disposing client");
             foreach (var client in ApiClients)
                 client.Dispose();
         }

CryptoExchange.Net/Clients/BaseRestClient.cs

@@ -1,7 +1,6 @@
 using System.Linq;
-using CryptoExchange.Net.Interfaces.Clients;
+using CryptoExchange.Net.Interfaces;
 using Microsoft.Extensions.Logging;
-using Microsoft.Extensions.Logging.Abstractions;
 
 namespace CryptoExchange.Net.Clients
 {
@@ -20,9 +19,6 @@ namespace CryptoExchange.Net.Clients
         /// <param name="name">The name of the API this client is for</param>
         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,14 +1,12 @@
-using CryptoExchange.Net.Interfaces.Clients;
-using CryptoExchange.Net.Logging.Extensions;
-using CryptoExchange.Net.Objects.Options;
-using CryptoExchange.Net.Objects.Sockets;
-using Microsoft.Extensions.Logging;
-using Microsoft.Extensions.Logging.Abstractions;
-using System;
+using System;
 using System.Collections.Generic;
 using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
+using CryptoExchange.Net.Interfaces;
+using CryptoExchange.Net.Logging.Extensions;
+using CryptoExchange.Net.Objects.Sockets;
+using Microsoft.Extensions.Logging;
 
 namespace CryptoExchange.Net.Clients
 {
@@ -30,21 +28,15 @@ namespace CryptoExchange.Net.Clients
         public int CurrentSubscriptions => ApiClients.OfType<SocketApiClient>().Sum(s => s.CurrentSubscriptions);
         /// <inheritdoc />
         public double IncomingKbps => ApiClients.OfType<SocketApiClient>().Sum(s => s.IncomingKbps);
-
-        /// <inheritdoc />
-        public new SocketExchangeOptions ClientOptions => (SocketExchangeOptions)base.ClientOptions;
         #endregion
 
         /// <summary>
         /// ctor
         /// </summary>
-        /// <param name="loggerFactory">Logger factory</param>
-        /// <param name="name">The name of the exchange this client is for</param>
-        protected BaseSocketClient(ILoggerFactory? loggerFactory, string name) : base(loggerFactory, name)
+        /// <param name="logger">Logger</param>
+        /// <param name="exchange">The name of the exchange this client is for</param>
+        protected BaseSocketClient(ILoggerFactory? logger, string exchange) : base(logger, exchange)
         {
-            _logger = loggerFactory?.CreateLogger(name + ".SocketClient") ?? NullLoggerFactory.Instance.CreateLogger(name);
-
-            LibraryHelpers.StaticLogger = loggerFactory?.CreateLogger("CryptoExchange");
         }
 
         /// <summary>
@@ -101,7 +93,6 @@ namespace CryptoExchange.Net.Clients
             {
                 tasks.Add(client.ReconnectAsync());
             }
-
             await Task.WhenAll(tasks.ToArray()).ConfigureAwait(false);
         }
 
@@ -115,7 +106,6 @@ namespace CryptoExchange.Net.Clients
             {
                 result.AppendLine(client.GetSubscriptionsState());
             }
-
             return result.ToString();
         }
 
@@ -130,7 +120,6 @@ namespace CryptoExchange.Net.Clients
             {
                 result.Add(client.GetState());
             }
-
             return result;
         }
     }

CryptoExchange.Net/Clients/CryptoBaseClient.cs

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

CryptoExchange.Net/Clients/CryptoRestClient.cs

@@ -1,5 +1,9 @@
-using CryptoExchange.Net.Interfaces.Clients;
+using CryptoExchange.Net.Interfaces;
+using CryptoExchange.Net.Interfaces.CommonClients;
+using Microsoft.Extensions.DependencyInjection;
 using System;
+using System.Collections.Generic;
+using System.Linq;
 
 namespace CryptoExchange.Net.Clients
 {
@@ -20,5 +24,24 @@ namespace CryptoExchange.Net.Clients
         public CryptoRestClient(IServiceProvider serviceProvider) : base(serviceProvider)
         {
         }
+
+        /// <summary>
+        /// Get a list of the registered ISpotClient implementations
+        /// </summary>
+        /// <returns></returns>
+        public IEnumerable<ISpotClient> GetSpotClients()
+        {
+            if (_serviceProvider == null)
+                return new List<ISpotClient>();
+
+            return _serviceProvider.GetServices<ISpotClient>().ToList();
+        }
+
+        /// <summary>
+        /// Get an ISpotClient implementation by exchange name
+        /// </summary>
+        /// <param name="exchangeName"></param>
+        /// <returns></returns>
+        public ISpotClient? SpotClient(string exchangeName) => _serviceProvider?.GetServices<ISpotClient>()?.SingleOrDefault(s => s.ExchangeName.Equals(exchangeName, StringComparison.InvariantCultureIgnoreCase));
     }
-}
+}

CryptoExchange.Net/Clients/CryptoSocketClient.cs

@@ -1,4 +1,4 @@
-using CryptoExchange.Net.Interfaces.Clients;
+using CryptoExchange.Net.Interfaces;
 using System;
 
 namespace CryptoExchange.Net.Clients

CryptoExchange.Net/Clients/SocketApiClient.cs

@@ -1,21 +1,14 @@
-using CryptoExchange.Net.Converters.MessageParsing.DynamicConverters;
+using CryptoExchange.Net.Converters.JsonNet;
 using CryptoExchange.Net.Interfaces;
-using CryptoExchange.Net.Interfaces.Clients;
 using CryptoExchange.Net.Logging.Extensions;
 using CryptoExchange.Net.Objects;
-using CryptoExchange.Net.Objects.Errors;
 using CryptoExchange.Net.Objects.Options;
 using CryptoExchange.Net.Objects.Sockets;
-using CryptoExchange.Net.RateLimiting;
 using CryptoExchange.Net.RateLimiting.Interfaces;
 using CryptoExchange.Net.Sockets;
-using CryptoExchange.Net.Sockets.Default;
-using CryptoExchange.Net.Sockets.Default.Interfaces;
-using CryptoExchange.Net.Sockets.HighPerf;
-using CryptoExchange.Net.Sockets.HighPerf.Interfaces;
-using CryptoExchange.Net.Sockets.Interfaces;
 using Microsoft.Extensions.Logging;
 using System;
+using System.Collections;
 using System.Collections.Concurrent;
 using System.Collections.Generic;
 using System.Linq;
@@ -32,22 +25,13 @@ namespace CryptoExchange.Net.Clients
     public abstract class SocketApiClient : BaseApiClient, ISocketApiClient
     {
         #region Fields
-
         /// <inheritdoc/>
         public IWebsocketFactory SocketFactory { get; set; } = new WebsocketFactory();
 
-        /// <inheritdoc/>
-        public IHighPerfConnectionFactory? HighPerfConnectionFactory { get; set; }
-
         /// <summary>
         /// List of socket connections currently connecting/connected
         /// </summary>
-        protected internal ConcurrentDictionary<int, SocketConnection> _socketConnections = new();
-
-        /// <summary>
-        /// List of HighPerf socket connections currently connecting/connected
-        /// </summary>
-        protected internal ConcurrentDictionary<int, HighPerfSocketConnection> _highPerfSocketConnections = new();
+        protected internal ConcurrentDictionary<int, SocketConnection> socketConnections = new();
 
         /// <summary>
         /// Semaphore used while creating sockets
@@ -59,11 +43,6 @@ namespace CryptoExchange.Net.Clients
         /// </summary>
         protected TimeSpan KeepAliveInterval { get; set; } = TimeSpan.FromSeconds(10);
 
-        /// <summary>
-        /// Keep alive timeout for websocket connection
-        /// </summary>
-        protected TimeSpan KeepAliveTimeout { get; set; } = TimeSpan.FromSeconds(10);
-
         /// <summary>
         /// Handlers for data from the socket which doesn't need to be forwarded to the caller. Ping or welcome messages for example.
         /// </summary>
@@ -88,41 +67,36 @@ namespace CryptoExchange.Net.Clients
         /// Periodic task registrations
         /// </summary>
         protected List<PeriodicTaskRegistration> PeriodicTaskRegistrations { get; set; } = new List<PeriodicTaskRegistration>();
-        
+
         /// <summary>
         /// List of address to keep an alive connection to
         /// </summary>
         protected List<DedicatedConnectionConfig> DedicatedConnectionConfigs { get; set; } = new List<DedicatedConnectionConfig>();
 
-        /// <summary>
-        /// Whether to allow multiple subscriptions with the same topic on the same connection
-        /// </summary>
-        protected bool AllowTopicsOnTheSameConnection { get; set; } = true;
-
         /// <inheritdoc />
         public double IncomingKbps
         {
             get
             {
-                if (_socketConnections.IsEmpty)
+                if (!socketConnections.Any())
                     return 0;
 
-                return _socketConnections.Sum(s => s.Value.IncomingKbps);
+                return socketConnections.Sum(s => s.Value.IncomingKbps);
             }
         }
 
         /// <inheritdoc />
-        public int CurrentConnections => _socketConnections.Count;
+        public int CurrentConnections => socketConnections.Count;
 
         /// <inheritdoc />
         public int CurrentSubscriptions
         {
             get
             {
-                if (_socketConnections.IsEmpty)
+                if (!socketConnections.Any())
                     return 0;
 
-                return _socketConnections.Sum(s => s.Value.UserSubscriptionCount);
+                return socketConnections.Sum(s => s.Value.UserSubscriptionCount);
             }
         }
 
@@ -132,15 +106,6 @@ namespace CryptoExchange.Net.Clients
         /// <inheritdoc />
         public new SocketApiOptions ApiOptions => (SocketApiOptions)base.ApiOptions;
 
-        /// <summary>
-        /// The max number of individual subscriptions on a single connection
-        /// </summary>
-        public int? MaxIndividualSubscriptionsPerConnection { get; set; }
-
-        /// <summary>
-        /// Whether or not to enforce that sequence number updates are always (lastSequenceNumber + 1)
-        /// </summary>
-        public bool EnforceSequenceNumbers { get; set; }
         #endregion
 
         /// <summary>
@@ -160,11 +125,17 @@ namespace CryptoExchange.Net.Clients
         {
         }
 
+        /// <summary>
+        /// Create a message accessor instance
+        /// </summary>
+        /// <returns></returns>
+        protected internal virtual IByteMessageAccessor CreateAccessor() => new JsonNetByteMessageAccessor();
+
         /// <summary>
         /// Create a serializer instance
         /// </summary>
         /// <returns></returns>
-        protected internal abstract IMessageSerializer CreateSerializer();
+        protected internal virtual IMessageSerializer CreateSerializer() => new JsonNetMessageSerializer();
 
         /// <summary>
         /// Keep an open connection to this url
@@ -176,24 +147,6 @@ namespace CryptoExchange.Net.Clients
             DedicatedConnectionConfigs.Add(new DedicatedConnectionConfig() { SocketAddress = url, Authenticated = auth });
         }
 
-        /// <summary>
-        /// Update the timestamp offset between client and server based on the timestamp
-        /// </summary>
-        /// <param name="timestamp">Timestamp received from the server</param>
-        public virtual void UpdateTimeOffset(DateTime timestamp)
-        {
-            if (timestamp == default)
-                return;
-
-            TimeOffsetManager.UpdateSocketOffset(ClientName, (DateTime.UtcNow - timestamp).TotalMilliseconds);
-        }
-
-        /// <summary>
-        /// Get the time offset between client and server
-        /// </summary>
-        /// <returns></returns>
-        public virtual TimeSpan? GetTimeOffset() => TimeOffsetManager.GetSocketOffset(ClientName);
-
         /// <summary>
         /// Add a query to periodically send on each connection
         /// </summary>
@@ -201,7 +154,7 @@ namespace CryptoExchange.Net.Clients
         /// <param name="interval"></param>
         /// <param name="queryDelegate"></param>
         /// <param name="callback"></param>
-        protected virtual void RegisterPeriodicQuery(string identifier, TimeSpan interval, Func<ISocketConnection, Query> queryDelegate, Action<SocketConnection, CallResult>? callback)
+        protected virtual void RegisterPeriodicQuery(string identifier, TimeSpan interval, Func<SocketConnection, Query> queryDelegate, Action<CallResult>? callback)
         {
             PeriodicTaskRegistrations.Add(new PeriodicTaskRegistration
             {
@@ -236,13 +189,7 @@ namespace CryptoExchange.Net.Clients
                 return new CallResult<UpdateSubscription>(new InvalidOperationError("Client disposed, can't subscribe"));
 
             if (subscription.Authenticated && AuthenticationProvider == null)
-            {
-                _logger.LogWarning("Failed to subscribe, private subscription but no API credentials set");
                 return new CallResult<UpdateSubscription>(new NoApiCredentialsError());
-            }
-
-            if (subscription.IndividualSubscriptionCount > MaxIndividualSubscriptionsPerConnection)
-                return new CallResult<UpdateSubscription>(ArgumentError.Invalid("subscriptions", $"Max number of subscriptions in a single call is {MaxIndividualSubscriptionsPerConnection}"));
 
             SocketConnection socketConnection;
             var released = false;
@@ -252,9 +199,9 @@ namespace CryptoExchange.Net.Clients
             {
                 await semaphoreSlim.WaitAsync(ct).ConfigureAwait(false);
             }
-            catch (OperationCanceledException tce)
+            catch (OperationCanceledException)
             {
-                return new CallResult<UpdateSubscription>(new CancellationRequestedError(tce));
+                return new CallResult<UpdateSubscription>(new CancellationRequestedError());
             }
 
             try
@@ -262,7 +209,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, subscription.IndividualSubscriptionCount).ConfigureAwait(false);
+                    var socketResult = await GetSocketConnection(url, subscription.Authenticated, false).ConfigureAwait(false);
                     if (!socketResult)
                         return socketResult.As<UpdateSubscription>(null);
 
@@ -285,7 +232,7 @@ namespace CryptoExchange.Net.Clients
 
                     var needsConnecting = !socketConnection.Connected;
 
-                    var connectResult = await ConnectIfNeededAsync(socketConnection, subscription.Authenticated, ct).ConfigureAwait(false);
+                    var connectResult = await ConnectIfNeededAsync(socketConnection, subscription.Authenticated).ConfigureAwait(false);
                     if (!connectResult)
                         return new CallResult<UpdateSubscription>(connectResult.Error!);
 
@@ -301,121 +248,59 @@ namespace CryptoExchange.Net.Clients
             if (socketConnection.PausedActivity)
             {
                 _logger.HasBeenPausedCantSubscribeAtThisMoment(socketConnection.SocketId);
-                return new CallResult<UpdateSubscription>(new ServerError(new ErrorInfo(ErrorType.WebsocketPaused, "Socket is paused")));
+                return new CallResult<UpdateSubscription>(new ServerError("Socket is paused"));
             }
 
-            var subscribeResult = await socketConnection.TrySubscribeAsync(subscription, true, ct).ConfigureAwait(false);
-            if (!subscribeResult)
-                return new CallResult<UpdateSubscription>(subscribeResult.Error!);
-
-            _logger.SubscriptionCompletedSuccessfully(socketConnection.SocketId, subscription.Id);
-            return new CallResult<UpdateSubscription>(new UpdateSubscription(socketConnection, subscription));
-        }
-
-        /// <summary>
-        /// Connect to an url and listen for data
-        /// </summary>
-        /// <param name="url">The URL to connect to</param>
-        /// <param name="subscription">The subscription</param>
-        /// <param name="connectionFactory">The factory for creating a socket connection</param>
-        /// <param name="ct">Cancellation token for closing this subscription</param>
-        /// <returns></returns>
-        protected virtual async Task<CallResult<HighPerfUpdateSubscription>> SubscribeHighPerfAsync<TUpdateType>(
-            string url,
-            HighPerfSubscription<TUpdateType> subscription,
-            IHighPerfConnectionFactory connectionFactory,
-            CancellationToken ct)
-        {
-            if (_disposing)
-                return new CallResult<HighPerfUpdateSubscription>(new InvalidOperationError("Client disposed, can't subscribe"));
-
-            HighPerfSocketConnection<TUpdateType> socketConnection;
-            var released = false;
-            // Wait for a semaphore here, so we only connect 1 socket at a time.
-            // This is necessary for being able to see if connections can be combined
-            try
-            {
-                await semaphoreSlim.WaitAsync(ct).ConfigureAwait(false);
-            }
-            catch (OperationCanceledException tce)
-            {
-                return new CallResult<HighPerfUpdateSubscription>(new CancellationRequestedError(tce));
-            }
-
-            try
-            {
-                while (true)
-                {
-                    // Get a new or existing socket connection
-                    var socketResult = await GetHighPerfSocketConnection<TUpdateType>(url, connectionFactory, ct).ConfigureAwait(false);
-                    if (!socketResult)
-                        return socketResult.As<HighPerfUpdateSubscription>(null);
-
-                    socketConnection = socketResult.Data;
-
-                    // Add a subscription on the socket connection
-                    var success = socketConnection.AddSubscription(subscription);
-                    if (!success)
-                    {
-                        _logger.FailedToAddSubscriptionRetryOnDifferentConnection(socketConnection.SocketId);
-                        continue;
-                    }
-
-                    if (ClientOptions.SocketSubscriptionsCombineTarget == 1)
-                    {
-                        // Only 1 subscription per connection, so no need to wait for connection since a new subscription will create a new connection anyway
-                        semaphoreSlim.Release();
-                        released = true;
-                    }
-
-                    var needsConnecting = !socketConnection.Connected;
-
-                    var connectResult = await ConnectIfNeededAsync(socketConnection, false, ct).ConfigureAwait(false);
-                    if (!connectResult)
-                        return new CallResult<HighPerfUpdateSubscription>(connectResult.Error!);
-
-                    break;
-                }
-            }
-            finally
-            {
-                if (!released)
-                    semaphoreSlim.Release();
-            }
-
-            var subRequest = subscription.CreateSubscriptionQuery(socketConnection);
-            if (subRequest != null)
+            var waitEvent = new ManualResetEvent(false);
+            var subQuery = subscription.GetSubQuery(socketConnection);
+            if (subQuery != null)
             {
                 // Send the request and wait for answer
-                var sendResult = await socketConnection.SendAsync(subRequest).ConfigureAwait(false);
-                if (!sendResult)
+                var subResult = await socketConnection.SendAndWaitQueryAsync(subQuery, waitEvent).ConfigureAwait(false);
+                if (!subResult)
                 {
-                    await socketConnection.CloseAsync().ConfigureAwait(false);
-                    return new CallResult<HighPerfUpdateSubscription>(sendResult.Error!);                    
+                    waitEvent?.Set();
+                    var isTimeout = subResult.Error is CancellationRequestedError;
+                    if (isTimeout && subscription.Confirmed)
+                    {
+                        // No response received, but the subscription did receive updates. We'll assume success
+                    }
+                    else
+                    {
+                        _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
+                        await socketConnection.CloseAsync(subscription, isTimeout).ConfigureAwait(false);
+                        return new CallResult<UpdateSubscription>(subResult.Error!);
+                    }
                 }
+
+                subscription.HandleSubQueryResponse(subQuery.Response!);
             }
 
+            subscription.Confirmed = true;
             if (ct != default)
             {
                 subscription.CancellationTokenRegistration = ct.Register(async () =>
                 {
                     _logger.CancellationTokenSetClosingSubscription(socketConnection.SocketId, subscription.Id);
-                    await socketConnection.CloseAsync().ConfigureAwait(false);
+                    await socketConnection.CloseAsync(subscription).ConfigureAwait(false);
                 }, false);
             }
 
+            waitEvent?.Set();
             _logger.SubscriptionCompletedSuccessfully(socketConnection.SocketId, subscription.Id);
-            return new CallResult<HighPerfUpdateSubscription>(new HighPerfUpdateSubscription(socketConnection, subscription));
+            return new CallResult<UpdateSubscription>(new UpdateSubscription(socketConnection, subscription));
         }
 
         /// <summary>
         /// Send a query on a socket connection to the BaseAddress and wait for the response
         /// </summary>
         /// <typeparam name="THandlerResponse">Expected result type</typeparam>
+        /// <typeparam name="TServerResponse">The type returned to the caller</typeparam>
         /// <param name="query">The query</param>
         /// <param name="ct">Cancellation token</param>
         /// <returns></returns>
-        protected virtual Task<CallResult<THandlerResponse>> QueryAsync<THandlerResponse>(Query<THandlerResponse> query, CancellationToken ct = default)
+        protected virtual Task<CallResult<THandlerResponse>> QueryAsync<TServerResponse, THandlerResponse>(Query<TServerResponse, THandlerResponse> query, CancellationToken ct = default)
         {
             return QueryAsync(BaseAddress, query, ct);
         }
@@ -424,11 +309,12 @@ namespace CryptoExchange.Net.Clients
         /// Send a query on a socket connection and wait for the response
         /// </summary>
         /// <typeparam name="THandlerResponse">Expected result type</typeparam>
+        /// <typeparam name="TServerResponse">The type returned to the caller</typeparam>
         /// <param name="url">The url for the request</param>
         /// <param name="query">The query</param>
         /// <param name="ct">Cancellation token</param>
         /// <returns></returns>
-        protected virtual async Task<CallResult<THandlerResponse>> QueryAsync<THandlerResponse>(string url, Query<THandlerResponse> query, CancellationToken ct = default)
+        protected virtual async Task<CallResult<THandlerResponse>> QueryAsync<TServerResponse, THandlerResponse>(string url, Query<TServerResponse, THandlerResponse> query, CancellationToken ct = default)
         {
             if (_disposing)
                 return new CallResult<THandlerResponse>(new InvalidOperationError("Client disposed, can't query"));
@@ -441,7 +327,7 @@ namespace CryptoExchange.Net.Clients
             await semaphoreSlim.WaitAsync().ConfigureAwait(false);
             try
             {
-                var socketResult = await GetSocketConnection(url, query.Authenticated, true, ct).ConfigureAwait(false);
+                var socketResult = await GetSocketConnection(url, query.Authenticated, true).ConfigureAwait(false);
                 if (!socketResult)
                     return socketResult.As<THandlerResponse>(default);
 
@@ -454,7 +340,7 @@ namespace CryptoExchange.Net.Clients
                     released = true;
                 }
 
-                var connectResult = await ConnectIfNeededAsync(socketConnection, query.Authenticated, ct).ConfigureAwait(false);
+                var connectResult = await ConnectIfNeededAsync(socketConnection, query.Authenticated).ConfigureAwait(false);
                 if (!connectResult)
                     return new CallResult<THandlerResponse>(connectResult.Error!);
             }
@@ -467,13 +353,13 @@ namespace CryptoExchange.Net.Clients
             if (socketConnection.PausedActivity)
             {
                 _logger.HasBeenPausedCantSendQueryAtThisMoment(socketConnection.SocketId);
-                return new CallResult<THandlerResponse>(new ServerError(new ErrorInfo(ErrorType.WebsocketPaused, "Socket is paused")));
+                return new CallResult<THandlerResponse>(new ServerError("Socket is paused"));
             }
 
             if (ct.IsCancellationRequested)
                 return new CallResult<THandlerResponse>(new CancellationRequestedError());
 
-            return await socketConnection.SendAndWaitQueryAsync(query, ct).ConfigureAwait(false);
+            return await socketConnection.SendAndWaitQueryAsync(query, null, ct).ConfigureAwait(false);
         }
 
         /// <summary>
@@ -481,14 +367,13 @@ namespace CryptoExchange.Net.Clients
         /// </summary>
         /// <param name="socket">The connection to check</param>
         /// <param name="authenticated">Whether the socket should authenticated</param>
-        /// <param name="ct">Cancellation token</param>
         /// <returns></returns>
-        protected virtual async Task<CallResult> ConnectIfNeededAsync(ISocketConnection socket, bool authenticated, CancellationToken ct)
+        protected virtual async Task<CallResult> ConnectIfNeededAsync(SocketConnection socket, bool authenticated)
         {
             if (socket.Connected)
-                return CallResult.SuccessResult;
+                return new CallResult(null);
 
-            var connectResult = await ConnectSocketAsync(socket, ct).ConfigureAwait(false);
+            var connectResult = await ConnectSocketAsync(socket).ConfigureAwait(false);
             if (!connectResult)
                 return connectResult;
 
@@ -496,12 +381,9 @@ namespace CryptoExchange.Net.Clients
                 await Task.Delay(ClientOptions.DelayAfterConnect).ConfigureAwait(false);
 
             if (!authenticated || socket.Authenticated)
-                return CallResult.SuccessResult;
+                return new CallResult(null);
 
-            if (socket is not SocketConnection sc)
-                throw new InvalidOperationException("HighPerfSocketConnection not supported for authentication");
-
-            var result = await AuthenticateSocketAsync(sc).ConfigureAwait(false);
+            var result = await AuthenticateSocketAsync(socket).ConfigureAwait(false);
             if (!result)
                 await socket.CloseAsync().ConfigureAwait(false);
 
@@ -519,7 +401,7 @@ namespace CryptoExchange.Net.Clients
                 return new CallResult(new NoApiCredentialsError());
 
             _logger.AttemptingToAuthenticate(socket.SocketId);
-            var authRequest = await GetAuthenticationRequestAsync(socket).ConfigureAwait(false);
+            var authRequest = GetAuthenticationRequest(socket);
             if (authRequest != null)
             {
                 var result = await socket.SendAndWaitQueryAsync(authRequest).ConfigureAwait(false);
@@ -533,20 +415,18 @@ namespace CryptoExchange.Net.Clients
                     result.Error!.Message = "Authentication failed: " + result.Error.Message;
                     return new CallResult(result.Error)!;
                 }
-
-                _logger.Authenticated(socket.SocketId);
             }
 
+            _logger.Authenticated(socket.SocketId);
             socket.Authenticated = true;
-            return CallResult.SuccessResult;
+            return new CallResult(null);
         }
 
         /// <summary>
         /// Should return the request which can be used to authenticate a socket connection
         /// </summary>
         /// <returns></returns>
-        protected internal virtual Task<Query?> GetAuthenticationRequestAsync(SocketConnection connection) => 
-            Task.FromResult(AuthenticationProvider!.GetAuthenticationQuery(this, connection));
+        protected internal virtual Query? GetAuthenticationRequest(SocketConnection connection) => throw new NotImplementedException();
 
         /// <summary>
         /// Adds a system subscription. Used for example to reply to ping requests
@@ -555,7 +435,7 @@ namespace CryptoExchange.Net.Clients
         protected void AddSystemSubscription(SystemSubscription systemSubscription)
         {
             systemSubscriptions.Add(systemSubscription);
-            foreach (var connection in _socketConnections.Values)
+            foreach (var connection in socketConnections.Values)
                 connection.AddSubscription(systemSubscription);
         }
 
@@ -575,7 +455,7 @@ namespace CryptoExchange.Net.Clients
         /// </summary>
         /// <param name="connection"></param>
         /// <returns></returns>
-        protected internal virtual Task<Uri?> GetReconnectUriAsync(ISocketConnection connection)
+        protected internal virtual Task<Uri?> GetReconnectUriAsync(SocketConnection connection)
         {
             return Task.FromResult<Uri?>(connection.ConnectionUri);
         }
@@ -587,7 +467,7 @@ namespace CryptoExchange.Net.Clients
         /// <returns></returns>
         protected internal virtual Task<CallResult> RevitalizeRequestAsync(Subscription subscription)
         {
-            return Task.FromResult(CallResult.SuccessResult);
+            return Task.FromResult(new CallResult(null));
         }
 
         /// <summary>
@@ -596,95 +476,32 @@ 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>
-        /// <param name="individualSubscriptionCount">The number of individual subscriptions in this subscribe request</param>
         /// <returns></returns>
-        protected virtual async Task<CallResult<SocketConnection>> GetSocketConnection(
-            string address,
-            bool authenticated,
-            bool dedicatedRequestConnection, 
-            CancellationToken ct,
-            string? topic = null,
-            int individualSubscriptionCount = 1)
+        protected virtual async Task<CallResult<SocketConnection>> GetSocketConnection(string address, bool authenticated, bool dedicatedRequestConnection)
         {
-            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)))
-                                                .Select(x => x.Value)
-                                                .ToList();
+                                                      && (s.Value.Authenticated == authenticated || !authenticated)
+                                                      && 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
-            var delayStart = DateTime.UtcNow;
-            var delayed = false;
-            while (socketQuery.Count >= 1 && socketQuery.All(x => x.Status == SocketStatus.Reconnecting || x.Status == SocketStatus.Resubscribing))
-            {
-                if (DateTime.UtcNow - delayStart > TimeSpan.FromSeconds(10))
-                {
-                    if (socketQuery.Count >= 1 && socketQuery.All(x => x.Status == SocketStatus.Reconnecting || x.Status == 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 == SocketStatus.None || s.Status == SocketStatus.Connected)                                                     
-                                                && (s.Authenticated == authenticated || !authenticated)
-                                                && s.Connected).ToList();
-
-            SocketConnection? connection;
+            SocketConnection connection;
             if (!dedicatedRequestConnection)
             {
-                connection = socketQuery.Where(s => !s.DedicatedRequestConnection.IsDedicatedRequestConnection).OrderBy(s => s.UserSubscriptionCount).FirstOrDefault();
+                connection = socketQuery.Where(s => !s.Value.DedicatedRequestConnection).OrderBy(s => s.Value.UserSubscriptionCount).FirstOrDefault().Value;
             }
             else
             {
-                connection = socketQuery.Where(s => s.DedicatedRequestConnection.IsDedicatedRequestConnection).FirstOrDefault();
-                if (connection != null && !connection.DedicatedRequestConnection.Authenticated)
-                    // Mark dedicated request connection as authenticated if the request is authenticated
-                    connection.DedicatedRequestConnection.Authenticated = authenticated;
-
-                if (connection == null)
-                    // Fall back to an existing connection if there is no dedicated request connection available
-                    connection = socketQuery.OrderBy(s => s.UserSubscriptionCount).FirstOrDefault();
+                connection = socketQuery.Where(s => s.Value.DedicatedRequestConnection).FirstOrDefault().Value;
             }
 
-            bool maxConnectionsReached = _socketConnections.Count >= (ApiOptions.MaxSocketConnections ?? ClientOptions.MaxSocketConnections);
             if (connection != null)
             {
-                bool lessThanBatchSubCombineTarget = connection.UserSubscriptionCount < ClientOptions.SocketSubscriptionsCombineTarget;
-                bool lessThanIndividualSubCombineTarget = connection.Subscriptions.Sum(x => x.IndividualSubscriptionCount) < ClientOptions.SocketIndividualSubscriptionCombineTarget;
-
-                if ((lessThanBatchSubCombineTarget && lessThanIndividualSubCombineTarget)
-                    || maxConnectionsReached) 
-                {
+                if (connection.UserSubscriptionCount < ClientOptions.SocketSubscriptionsCombineTarget || socketConnections.Count >= (ApiOptions.MaxSocketConnections ?? ClientOptions.MaxSocketConnections) && socketConnections.All(s => s.Value.UserSubscriptionCount >= ClientOptions.SocketSubscriptionsCombineTarget))
                     // Use existing socket if it has less than target connections OR it has the least connections and we can't make new
-                    // If there is a max subscriptions per connection limit also only use existing if the new subscription doesn't go over the limit
-                    if (MaxIndividualSubscriptionsPerConnection == null)
-                        return new CallResult<SocketConnection>(connection);
-                                        
-                    var currentCount = connection.Subscriptions.Sum(x => x.IndividualSubscriptionCount);
-                    if (currentCount + individualSubscriptionCount <= MaxIndividualSubscriptionsPerConnection)
-                        return new CallResult<SocketConnection>(connection);
-                }
+                    return new CallResult<SocketConnection>(connection);
             }
 
-            if (maxConnectionsReached)
-                return new CallResult<SocketConnection>(new InvalidOperationError("Max amount of socket connections reached"));
-
             var connectionAddress = await GetConnectionUrlAsync(address, authenticated).ConfigureAwait(false);
             if (!connectionAddress)
             {
@@ -695,17 +512,11 @@ namespace CryptoExchange.Net.Clients
             if (connectionAddress.Data != address)
                 _logger.ConnectionAddressSetTo(connectionAddress.Data!);
 
-            // Create new socket connection
-            var socketConnection = new SocketConnection(_logger, SocketFactory, GetWebSocketParameters(connectionAddress.Data!), this, address);
-            socketConnection.ConnectRateLimitedAsync += HandleConnectRateLimitedAsync;
-            if (dedicatedRequestConnection)
-            {
-                socketConnection.DedicatedRequestConnection = new DedicatedConnectionState
-                {
-                    IsDedicatedRequestConnection = dedicatedRequestConnection,
-                    Authenticated = authenticated
-                };
-            }
+            // Create new socket
+            var socket = CreateSocket(connectionAddress.Data!);
+            var socketConnection = new SocketConnection(_logger, this, socket, address);
+            socketConnection.UnhandledMessage += HandleUnhandledMessage;
+            socketConnection.DedicatedRequestConnection = dedicatedRequestConnection;
 
             foreach (var ptg in PeriodicTaskRegistrations)
                 socketConnection.QueryPeriodic(ptg.Identifier, ptg.Interval, ptg.QueryDelegate, ptg.Callback);
@@ -716,74 +527,25 @@ namespace CryptoExchange.Net.Clients
             return new CallResult<SocketConnection>(socketConnection);
         }
 
-
-        /// <summary>
-        /// Gets a connection for a new subscription or query. Can be an existing if there are open position or a new one.
-        /// </summary>
-        /// <param name="address">The address the socket is for</param>
-        /// <param name="connectionFactory">The factory for creating a socket connection</param>
-        /// <param name="ct">Cancellation token</param>
-        /// <returns></returns>
-        protected virtual async Task<CallResult<HighPerfSocketConnection<TUpdateType>>> GetHighPerfSocketConnection<TUpdateType>(
-            string address,
-            IHighPerfConnectionFactory connectionFactory,
-            CancellationToken ct)
-        {
-            var connectionAddress = await GetConnectionUrlAsync(address, false).ConfigureAwait(false);
-            if (!connectionAddress)
-            {
-                _logger.FailedToDetermineConnectionUrl(connectionAddress.Error?.ToString());
-                return connectionAddress.As<HighPerfSocketConnection<TUpdateType>>(null);
-            }
-
-            if (connectionAddress.Data != address)
-                _logger.ConnectionAddressSetTo(connectionAddress.Data!);
-
-            // Create new socket connection
-            var socketConnection = connectionFactory.CreateHighPerfConnection<TUpdateType>(_logger, SocketFactory, GetWebSocketParameters(connectionAddress.Data!), this, address);
-            foreach (var ptg in PeriodicTaskRegistrations)
-                socketConnection.QueryPeriodic(ptg.Identifier, ptg.Interval, (con) => ptg.QueryDelegate(con).Request);
-
-            return new CallResult<HighPerfSocketConnection<TUpdateType>>(socketConnection);
-        }
-
         /// <summary>
         /// Process an unhandled message
         /// </summary>
-        /// <param name="connection">The socket connection</param>
-        /// <param name="typeIdentifier">The type as identified</param>
-        /// <param name="data">The data</param>
-        protected internal virtual bool HandleUnhandledMessage(SocketConnection connection, string typeIdentifier, ReadOnlySpan<byte> data) => false;
-
-        /// <summary>
-        /// Process connect rate limited
-        /// </summary>
-        protected async virtual Task HandleConnectRateLimitedAsync()
+        /// <param name="message">The message that wasn't processed</param>
+        protected virtual void HandleUnhandledMessage(IMessageAccessor message)
         {
-            if (ClientOptions.RateLimiterEnabled && ClientOptions.ConnectDelayAfterRateLimited.HasValue)
-            {
-                var retryAfter = DateTime.UtcNow.Add(ClientOptions.ConnectDelayAfterRateLimited.Value);
-                _logger.AddingRetryAfterGuard(retryAfter);
-                RateLimiter ??= new RateLimitGate("Connection");
-                await RateLimiter.SetRetryAfterGuardAsync(retryAfter, RateLimitItemType.Connection).ConfigureAwait(false);
-            }
         }
 
         /// <summary>
         /// Connect a socket
         /// </summary>
         /// <param name="socketConnection">The socket to connect</param>
-        /// <param name="ct">Cancellation token</param>
         /// <returns></returns>
-        protected virtual async Task<CallResult> ConnectSocketAsync(ISocketConnection socketConnection, CancellationToken ct)
+        protected virtual async Task<CallResult> ConnectSocketAsync(SocketConnection socketConnection)
         {
-            var connectResult = await socketConnection.ConnectAsync(ct).ConfigureAwait(false);
+            var connectResult = await socketConnection.ConnectAsync().ConfigureAwait(false);
             if (connectResult)
             {
-                if (socketConnection is SocketConnection sc)
-                    _socketConnections.TryAdd(socketConnection.SocketId, sc);
-                else if (socketConnection is HighPerfSocketConnection hsc)
-                    _highPerfSocketConnections.TryAdd(socketConnection.SocketId, hsc);
+                socketConnections.TryAdd(socketConnection.SocketId, socketConnection);
                 return connectResult;
             }
 
@@ -800,15 +562,25 @@ namespace CryptoExchange.Net.Clients
             => new(new Uri(address), ClientOptions.ReconnectPolicy)
             {
                 KeepAliveInterval = KeepAliveInterval,
-                KeepAliveTimeout = KeepAliveTimeout,
                 ReconnectInterval = ClientOptions.ReconnectInterval,
                 RateLimiter = ClientOptions.RateLimiterEnabled ? RateLimiter : null,
-                RateLimitingBehavior = ClientOptions.RateLimitingBehaviour,
+                RateLimitingBehaviour = ClientOptions.RateLimitingBehaviour,
                 Proxy = ClientOptions.Proxy,
-                Timeout = ApiOptions.SocketNoDataTimeout ?? ClientOptions.SocketNoDataTimeout,
-                ReceiveBufferSize = ClientOptions.ReceiveBufferSize,
+                Timeout = ApiOptions.SocketNoDataTimeout ?? ClientOptions.SocketNoDataTimeout
             };
 
+        /// <summary>
+        /// Create a socket for an address
+        /// </summary>
+        /// <param name="address">The address the socket should connect to</param>
+        /// <returns></returns>
+        protected virtual IWebsocket CreateSocket(string address)
+        {
+            var socket = SocketFactory.CreateWebsocket(_logger, GetWebSocketParameters(address));
+            _logger.SocketCreatedForAddress(socket.Id, address);
+            return socket;
+        }
+
         /// <summary>
         /// Unsubscribe an update subscription
         /// </summary>
@@ -818,7 +590,7 @@ namespace CryptoExchange.Net.Clients
         {
             Subscription? subscription = null;
             SocketConnection? connection = null;
-            foreach (var socket in _socketConnections.Values.ToList())
+            foreach (var socket in socketConnections.Values.ToList())
             {
                 subscription = socket.GetSubscription(subscriptionId);
                 if (subscription != null)
@@ -856,25 +628,18 @@ namespace CryptoExchange.Net.Clients
         /// <returns></returns>
         public virtual async Task UnsubscribeAllAsync()
         {
-            var sum = _socketConnections.Sum(s => s.Value.UserSubscriptionCount) + _highPerfSocketConnections.Sum(s => s.Value.UserSubscriptionCount);
+            var sum = socketConnections.Sum(s => s.Value.UserSubscriptionCount);
             if (sum == 0)
                 return;
 
-            _logger.UnsubscribingAll(sum);
+            _logger.UnsubscribingAll(socketConnections.Sum(s => s.Value.UserSubscriptionCount));
             var tasks = new List<Task>();
-            
-            var socketList = _socketConnections.Values;
-            foreach (var connection in socketList)
             {
-                foreach(var subscription in connection.Subscriptions.Where(x => x.UserSubscription))
-                    tasks.Add(connection.CloseAsync(subscription));
+                var socketList = socketConnections.Values;
+                foreach (var connection in socketList.Where(s => !s.DedicatedRequestConnection))
+                    tasks.Add(connection.CloseAsync());
             }
 
-            var highPerfSocketList = _highPerfSocketConnections.Values;
-            foreach (var connection in highPerfSocketList)
-                tasks.Add(connection.CloseAsync());
-            
-
             await Task.WhenAll(tasks.ToArray()).ConfigureAwait(false);
         }
 
@@ -884,10 +649,10 @@ namespace CryptoExchange.Net.Clients
         /// <returns></returns>
         public virtual async Task ReconnectAsync()
         {
-            _logger.ReconnectingAllConnections(_socketConnections.Count);
+            _logger.ReconnectingAllConnections(socketConnections.Count);
             var tasks = new List<Task>();
             {
-                var socketList = _socketConnections.Values;
+                var socketList = socketConnections.Values;
                 foreach (var sub in socketList)
                     tasks.Add(sub.TriggerReconnectAsync());
             }
@@ -900,35 +665,16 @@ 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();
 
-                var connectResult = await ConnectIfNeededAsync(socketResult.Data, item.Authenticated, default).ConfigureAwait(false);
+                var connectResult = await ConnectIfNeededAsync(socketResult.Data, item.Authenticated).ConfigureAwait(false);
                 if (!connectResult)
                     return new CallResult(connectResult.Error!);
             }
 
-            return CallResult.SuccessResult;
-        }
-
-        /// <inheritdoc />
-        public override void SetOptions<T>(UpdateOptions<T> options)
-        {
-            var previousProxyIsSet = ClientOptions.Proxy != null;
-            base.SetOptions(options);
-
-            if ((!previousProxyIsSet && options.Proxy == null)
-                || _socketConnections.IsEmpty)
-            {
-                return;
-            }
-
-            _logger.LogInformation("Reconnecting websockets to apply proxy");
-
-            // Update proxy, also triggers reconnect
-            foreach (var connection in _socketConnections)
-                _ = connection.Value.UpdateProxy(options.Proxy);
+            return new CallResult(null);
         }
 
         /// <summary>
@@ -946,15 +692,15 @@ namespace CryptoExchange.Net.Clients
         /// <returns></returns>
         public SocketApiClientState GetState(bool includeSubDetails = true)
         {
-            var connectionStates = new List<SocketConnectionState>();
-            foreach (var socketIdAndConnection in _socketConnections)
+            var connectionStates = new List<SocketConnection.SocketConnectionState>();
+            foreach (var socketIdAndConnection in socketConnections)
             {
                 SocketConnection connection = socketIdAndConnection.Value;
-                SocketConnectionState connectionState = connection.GetState(includeSubDetails);
+                SocketConnection.SocketConnectionState connectionState = connection.GetState(includeSubDetails);
                 connectionStates.Add(connectionState);
             }
 
-            return new SocketApiClientState(_socketConnections.Count, CurrentSubscriptions, IncomingKbps, connectionStates);
+            return new SocketApiClientState(socketConnections.Count, CurrentSubscriptions, IncomingKbps, connectionStates);
         }
 
         /// <summary>
@@ -968,7 +714,7 @@ namespace CryptoExchange.Net.Clients
             int Connections,
             int Subscriptions,
             double DownloadSpeed,
-            List<SocketConnectionState> ConnectionStates)
+            List<SocketConnection.SocketConnectionState> ConnectionStates)
         {
             /// <summary>
             /// Print the state of the client
@@ -997,8 +743,9 @@ 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: [{string.Join(",", subState.Identifiers)}]");
                         });
                     }
                 });
@@ -1015,7 +762,7 @@ namespace CryptoExchange.Net.Clients
             _disposing = true;
             var tasks = new List<Task>();
             {
-                var socketList = _socketConnections.Values.Where(x => x.UserSubscriptionCount > 0 || x.Connected);
+                var socketList = socketConnections.Values.Where(x => x.UserSubscriptionCount > 0 || x.Connected);
                 if (socketList.Any())
                     _logger.DisposingSocketClient();
 
@@ -1030,14 +777,18 @@ namespace CryptoExchange.Net.Clients
         }
 
         /// <summary>
-        /// Preprocess a stream message
+        /// Get the listener identifier for the message
         /// </summary>
-        public virtual ReadOnlySpan<byte> PreprocessStreamMessage(SocketConnection connection, WebSocketMessageType type, ReadOnlySpan<byte> data) => data;
+        /// <param name="messageAccessor"></param>
+        /// <returns></returns>
+        public abstract string? GetListenerIdentifier(IMessageAccessor messageAccessor);
 
         /// <summary>
-        /// Create a new message converter instance
+        /// Preprocess a stream message
         /// </summary>
+        /// <param name="type"></param>
+        /// <param name="data"></param>
         /// <returns></returns>
-        public abstract ISocketMessageHandler CreateMessageConverter(WebSocketMessageType messageType);
+        public virtual ReadOnlyMemory<byte> PreprocessStreamMessage(WebSocketMessageType type, ReadOnlyMemory<byte> data) => data;
     }
 }

CryptoExchange.Net/CommonObjects/Balance.cs

@@ -0,0 +1,21 @@
+namespace CryptoExchange.Net.CommonObjects
+{
+    /// <summary>
+    /// Balance data
+    /// </summary>
+    public class Balance: BaseCommonObject
+    {
+        /// <summary>
+        /// The asset name
+        /// </summary>
+        public string Asset { get; set;  } = string.Empty;
+        /// <summary>
+        /// Quantity available
+        /// </summary>
+        public decimal? Available { get; set; }
+        /// <summary>
+        /// Total quantity
+        /// </summary>
+        public decimal? Total { get; set;  }
+    }
+}

CryptoExchange.Net/CommonObjects/BaseComonObject.cs

@@ -0,0 +1,13 @@
+namespace CryptoExchange.Net.CommonObjects
+{
+    /// <summary>
+    /// Base class for common objects
+    /// </summary>
+    public class BaseCommonObject
+    {
+        /// <summary>
+        /// The source object the data is derived from
+        /// </summary>
+        public object SourceObject { get; set; } = null!;
+    }
+}

CryptoExchange.Net/CommonObjects/Enums.cs

@@ -0,0 +1,73 @@
+namespace CryptoExchange.Net.CommonObjects
+{
+    /// <summary>
+    /// Order type
+    /// </summary>
+    public enum CommonOrderType
+    {
+        /// <summary>
+        /// Limit type
+        /// </summary>
+        Limit,
+        /// <summary>
+        /// Market type
+        /// </summary>
+        Market,
+        /// <summary>
+        /// Other order type
+        /// </summary>
+        Other
+    }
+
+    /// <summary>
+    /// Order side
+    /// </summary>
+    public enum CommonOrderSide
+    {
+        /// <summary>
+        /// Buy order
+        /// </summary>
+        Buy,
+        /// <summary>
+        /// Sell order
+        /// </summary>
+        Sell
+    }
+    /// <summary>
+    /// Order status
+    /// </summary>
+    public enum CommonOrderStatus
+    {
+        /// <summary>
+        /// placed and not fully filled order
+        /// </summary>
+        Active,
+        /// <summary>
+        /// canceled order
+        /// </summary>
+        Canceled,
+        /// <summary>
+        /// filled order
+        /// </summary>
+        Filled
+    }
+    
+    /// <summary>
+    /// Position side
+    /// </summary>
+    public enum CommonPositionSide
+    {
+        /// <summary>
+        /// Long position
+        /// </summary>
+        Long,
+        /// <summary>
+        /// Short position
+        /// </summary>
+        Short,
+        /// <summary>
+        /// Both
+        /// </summary>
+        Both
+    }
+}

CryptoExchange.Net/CommonObjects/Kline.cs

@@ -0,0 +1,35 @@
+using System;
+
+namespace CryptoExchange.Net.CommonObjects
+{
+    /// <summary>
+    /// Kline data
+    /// </summary>
+    public class Kline: BaseCommonObject
+    {
+        /// <summary>
+        /// Opening time of the kline
+        /// </summary>
+        public DateTime OpenTime { get; set; }
+        /// <summary>
+        /// Price at the open time
+        /// </summary>
+        public decimal? OpenPrice { get; set; }
+        /// <summary>
+        /// Highest price of the kline
+        /// </summary>
+        public decimal? HighPrice { get; set; }
+        /// <summary>
+        /// Lowest price of the kline
+        /// </summary>
+        public decimal? LowPrice { get; set; }
+        /// <summary>
+        /// Close price of the kline
+        /// </summary>
+        public decimal? ClosePrice { get; set; }
+        /// <summary>
+        /// Volume of the kline
+        /// </summary>
+        public decimal? Volume { get; set; }
+    }
+}

CryptoExchange.Net/CommonObjects/Order.cs

@@ -0,0 +1,47 @@
+using System;
+
+namespace CryptoExchange.Net.CommonObjects
+{
+    /// <summary>
+    /// Order data
+    /// </summary>
+    public class Order: BaseCommonObject
+    {
+        /// <summary>
+        /// Id of the order
+        /// </summary>
+        public string Id { get; set; } = string.Empty;
+        /// <summary>
+        /// Symbol of the order
+        /// </summary>
+        public string Symbol { get; set; } = string.Empty;
+        /// <summary>
+        /// Price of the order
+        /// </summary>
+        public decimal? Price { get; set; }
+        /// <summary>
+        /// Quantity of the order
+        /// </summary>
+        public decimal? Quantity { get; set; }
+        /// <summary>
+        /// The quantity of the order which has been filled
+        /// </summary>
+        public decimal? QuantityFilled { get; set; }
+        /// <summary>
+        /// Status of the order
+        /// </summary>
+        public CommonOrderStatus Status { get; set; }
+        /// <summary>
+        /// Side of the order
+        /// </summary>
+        public CommonOrderSide Side { get; set; }
+        /// <summary>
+        /// Type of the order
+        /// </summary>
+        public CommonOrderType Type { get; set; }
+        /// <summary>
+        /// Order time
+        /// </summary>
+        public DateTime Timestamp { get; set; }
+    }
+}

CryptoExchange.Net/CommonObjects/OrderBook.cs

@@ -0,0 +1,20 @@
+using System;
+using System.Collections.Generic;
+
+namespace CryptoExchange.Net.CommonObjects
+{
+    /// <summary>
+    /// Order book data
+    /// </summary>
+    public class OrderBook: BaseCommonObject
+    {
+        /// <summary>
+        /// List of bids
+        /// </summary>
+        public IEnumerable<OrderBookEntry> Bids { get; set; } = Array.Empty<OrderBookEntry>();
+        /// <summary>
+        /// List of asks
+        /// </summary>
+        public IEnumerable<OrderBookEntry> Asks { get; set; } = Array.Empty<OrderBookEntry>();
+    }
+}

CryptoExchange.Net/CommonObjects/OrderBookEntry.cs

@@ -0,0 +1,17 @@
+namespace CryptoExchange.Net.CommonObjects
+{
+    /// <summary>
+    /// Order book entry
+    /// </summary>
+    public class OrderBookEntry
+    {
+        /// <summary>
+        /// Quantity of the entry
+        /// </summary>
+        public decimal Quantity { get; set; }
+        /// <summary>
+        /// Price of the entry
+        /// </summary>
+        public decimal Price { get; set; }
+    }
+}

CryptoExchange.Net/CommonObjects/OrderId.cs

@@ -0,0 +1,13 @@
+namespace CryptoExchange.Net.CommonObjects
+{
+    /// <summary>
+    /// Id of an order
+    /// </summary>
+    public class OrderId: BaseCommonObject
+    {
+        /// <summary>
+        /// Id of an order
+        /// </summary>
+        public string Id { get; set; } = string.Empty;
+    }
+}

CryptoExchange.Net/CommonObjects/Position.cs

@@ -0,0 +1,65 @@
+namespace CryptoExchange.Net.CommonObjects
+{
+    /// <summary>
+    /// Position data
+    /// </summary>
+    public class Position: BaseCommonObject
+    {
+        /// <summary>
+        /// Id of the position
+        /// </summary>
+        public string? Id { get; set; }
+        /// <summary>
+        /// Symbol of the position
+        /// </summary>
+        public string Symbol { get; set; } = string.Empty;
+        /// <summary>
+        /// Leverage
+        /// </summary>
+        public decimal Leverage { get; set; }
+        /// <summary>
+        /// Position quantity
+        /// </summary>
+        public decimal Quantity { get; set; }
+        /// <summary>
+        /// Entry price
+        /// </summary>
+        public decimal? EntryPrice { get; set; }
+        /// <summary>
+        /// Liquidation price
+        /// </summary>
+        public decimal? LiquidationPrice { get; set; }
+        /// <summary>
+        /// Unrealized profit and loss
+        /// </summary>
+        public decimal? UnrealizedPnl { get; set; }
+        /// <summary>
+        /// Realized profit and loss
+        /// </summary>
+        public decimal? RealizedPnl { get; set; }
+        /// <summary>
+        /// Mark price
+        /// </summary>
+        public decimal? MarkPrice { get; set; }
+        /// <summary>
+        /// Auto adding margin
+        /// </summary>
+        public bool? AutoMargin { get; set; }
+        /// <summary>
+        /// Position margin
+        /// </summary>
+        public decimal? PositionMargin { get; set; }
+        /// <summary>
+        /// Position side
+        /// </summary>
+        public CommonPositionSide? Side { get; set; }
+        /// <summary>
+        /// Is isolated
+        /// </summary>
+        public bool? Isolated { get; set; }
+        /// <summary>
+        /// Maintenance margin
+        /// </summary>
+        public decimal? MaintananceMargin { get; set; }
+    }
+}

CryptoExchange.Net/CommonObjects/Symbol.cs

@@ -0,0 +1,33 @@
+namespace CryptoExchange.Net.CommonObjects
+{
+    /// <summary>
+    /// Symbol data
+    /// </summary>
+    public class Symbol: BaseCommonObject
+    {
+        /// <summary>
+        /// Name of the symbol
+        /// </summary>
+        public string Name { get; set; } = string.Empty;
+        /// <summary>
+        /// Minimal quantity of an order
+        /// </summary>
+        public decimal? MinTradeQuantity { get; set; }
+        /// <summary>
+        /// Step with which the quantity should increase
+        /// </summary>
+        public decimal? QuantityStep { get; set; } 
+        /// <summary>
+        /// step with which the price should increase
+        /// </summary>
+        public decimal? PriceStep { get; set; } 
+        /// <summary>
+        /// The max amount of decimals for quantity
+        /// </summary>
+        public int? QuantityDecimals { get; set; } 
+        /// <summary>
+        /// The max amount of decimal for price
+        /// </summary>
+        public int? PriceDecimals { get; set; } 
+    }
+}

CryptoExchange.Net/CommonObjects/Ticker.cs

@@ -0,0 +1,33 @@
+namespace CryptoExchange.Net.CommonObjects
+{
+    /// <summary>
+    /// Ticker data
+    /// </summary>
+    public class Ticker: BaseCommonObject
+    {
+        /// <summary>
+        /// Symbol
+        /// </summary>
+        public string Symbol { get; set; } = string.Empty;
+        /// <summary>
+        /// Price 24 hours ago
+        /// </summary>
+        public decimal? Price24H { get; set; }
+        /// <summary>
+        /// Last trade price
+        /// </summary>
+        public decimal? LastPrice { get; set; }
+        /// <summary>
+        /// 24 hour low price
+        /// </summary>
+        public decimal? LowPrice { get; set; }
+        /// <summary>
+        /// 24 hour high price
+        /// </summary>
+        public decimal? HighPrice { get; set; }
+        /// <summary>
+        /// 24 hour volume
+        /// </summary>
+        public decimal? Volume { get; set; }
+    }
+}

CryptoExchange.Net/CommonObjects/Trade.cs

@@ -0,0 +1,50 @@
+using System;
+
+namespace CryptoExchange.Net.CommonObjects
+{
+    /// <summary>
+    /// Trade data
+    /// </summary>
+    public class Trade: BaseCommonObject
+    {
+        /// <summary>
+        /// Symbol of the trade
+        /// </summary>
+        public string Symbol { get; set; } = string.Empty;
+        /// <summary>
+        /// Price of the trade
+        /// </summary>
+        public decimal Price { get; set; }
+        /// <summary>
+        /// Quantity of the trade
+        /// </summary>
+        public decimal Quantity { get; set; }
+        /// <summary>
+        /// Timestamp of the trade
+        /// </summary>
+        public DateTime Timestamp { get; set; }
+    }
+
+    /// <summary>
+    /// User trade info
+    /// </summary>
+    public class UserTrade: Trade
+    {
+        /// <summary>
+        /// Id of the trade
+        /// </summary>
+        public string Id { get; set; } = string.Empty;
+        /// <summary>
+        /// Order id of the trade
+        /// </summary>
+        public string? OrderId { get; set; }
+        /// <summary>
+        /// Fee of the trade
+        /// </summary>
+        public decimal? Fee { get; set; }
+        /// <summary>
+        /// The asset the fee is paid in
+        /// </summary>
+        public string? FeeAsset { get; set; }
+    }
+}

CryptoExchange.Net/Converters/JsonNet/ArrayConverter.cs

@@ -0,0 +1,195 @@
+using System;
+using System.Collections;
+using System.Collections.Concurrent;
+using System.Globalization;
+using System.Linq;
+using System.Reflection;
+using CryptoExchange.Net.Attributes;
+using Newtonsoft.Json;
+using Newtonsoft.Json.Linq;
+
+namespace CryptoExchange.Net.Converters.JsonNet
+{
+    /// <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
+    /// </summary>
+    public class ArrayConverter : JsonConverter
+    {
+        private static readonly ConcurrentDictionary<(MemberInfo, Type), Attribute> _attributeByMemberInfoAndTypeCache = new ConcurrentDictionary<(MemberInfo, Type), Attribute>();
+        private static readonly ConcurrentDictionary<(Type, Type), Attribute> _attributeByTypeAndTypeCache = new ConcurrentDictionary<(Type, Type), Attribute>();
+
+        /// <inheritdoc />
+        public override bool CanConvert(Type objectType)
+        {
+            return true;
+        }
+        
+        /// <inheritdoc />
+        public override object? ReadJson(JsonReader reader, Type objectType, object? existingValue, JsonSerializer serializer)
+        {
+            if (reader.TokenType == JsonToken.Null)
+                return null;
+
+            if (objectType == typeof(JToken))
+                return JToken.Load(reader);
+
+            var result = Activator.CreateInstance(objectType);
+            var arr = JArray.Load(reader);
+            return ParseObject(arr, result, objectType);
+        }
+
+        private static object ParseObject(JArray arr, object result, Type objectType)
+        {
+            foreach (var property in objectType.GetProperties())
+            {
+                var attribute = GetCustomAttribute<ArrayPropertyAttribute>(property);
+
+                if (attribute == null)
+                    continue;
+
+                if (attribute.Index >= arr.Count)
+                    continue;
+
+                if (property.PropertyType.BaseType == typeof(Array))
+                {
+                    var objType = property.PropertyType.GetElementType();
+                    var innerArray = (JArray)arr[attribute.Index];
+                    var count = 0;
+                    if (innerArray.Count == 0)
+                    {
+                        var arrayResult = (IList)Activator.CreateInstance(property.PropertyType, new [] { 0 });
+                        property.SetValue(result, arrayResult);
+                    }
+                    else if (innerArray[0].Type == JTokenType.Array)
+                    {
+                        var arrayResult = (IList)Activator.CreateInstance(property.PropertyType, new [] { innerArray.Count });
+                        foreach (var obj in innerArray)
+                        {
+                            var innerObj = Activator.CreateInstance(objType!);
+                            arrayResult[count] = ParseObject((JArray)obj, innerObj, objType!);
+                            count++;
+                        }
+                        property.SetValue(result, arrayResult);
+                    }
+                    else
+                    {
+                        var arrayResult = (IList)Activator.CreateInstance(property.PropertyType, new [] { 1 });
+                        var innerObj = Activator.CreateInstance(objType!);
+                        arrayResult[0] = ParseObject(innerArray, innerObj, objType!);
+                        property.SetValue(result, arrayResult);
+                    }
+                    continue;
+                }
+
+                var converterAttribute = GetCustomAttribute<JsonConverterAttribute>(property) ?? GetCustomAttribute<JsonConverterAttribute>(property.PropertyType);
+                var conversionAttribute = GetCustomAttribute<JsonConversionAttribute>(property) ?? GetCustomAttribute<JsonConversionAttribute>(property.PropertyType);
+
+                object? value;
+                if (converterAttribute != null)
+                {
+                    value = arr[attribute.Index].ToObject(property.PropertyType, new JsonSerializer {Converters = {(JsonConverter) Activator.CreateInstance(converterAttribute.ConverterType)}});
+                }
+                else if (conversionAttribute != null)
+                {
+                    value = arr[attribute.Index].ToObject(property.PropertyType);
+                }
+                else
+                {
+                    value = arr[attribute.Index];
+                }
+
+                if (value != null && property.PropertyType.IsInstanceOfType(value))
+                {
+                    property.SetValue(result, value);
+                }
+                else
+                {
+                    if (value is JToken token)
+                    {
+                        if (token.Type == JTokenType.Null)
+                            value = null;
+
+                        if (token.Type == JTokenType.Float)
+                            value = token.Value<decimal>();
+                    }
+
+                    if (value is decimal)
+                    {
+                        property.SetValue(result, value);
+                    }
+                    else if ((property.PropertyType == typeof(decimal)
+                     || property.PropertyType == typeof(decimal?))
+                     && (value != null && value.ToString().IndexOf("e", StringComparison.OrdinalIgnoreCase) >= 0))
+                    {
+                        var v = value.ToString();
+                        if (decimal.TryParse(v, NumberStyles.Float, CultureInfo.InvariantCulture, out var dec))
+                            property.SetValue(result, dec);
+                    }
+                    else
+                    {
+                        property.SetValue(result, value == null ? null : Convert.ChangeType(value, property.PropertyType));
+                    }
+                }
+            }
+            return result;
+        }
+
+        /// <inheritdoc />
+        public override void WriteJson(JsonWriter writer, object? value, JsonSerializer serializer)
+        {
+            if (value == null)
+                return;
+
+            writer.WriteStartArray();
+            var props = value.GetType().GetProperties();
+            var ordered = props.OrderBy(p => GetCustomAttribute<ArrayPropertyAttribute>(p)?.Index);
+
+            var last = -1;
+            foreach (var prop in ordered)
+            {
+                var arrayProp = GetCustomAttribute<ArrayPropertyAttribute>(prop);
+                if (arrayProp == null)
+                    continue;
+
+                if (arrayProp.Index == last)
+                    continue;
+
+                while (arrayProp.Index != last + 1)
+                {
+                    writer.WriteValue((string?)null);
+                    last += 1;
+                }
+
+                last = arrayProp.Index;
+                var converterAttribute = GetCustomAttribute<JsonConverterAttribute>(prop);
+                if (converterAttribute != null)
+                    writer.WriteRawValue(JsonConvert.SerializeObject(prop.GetValue(value), (JsonConverter)Activator.CreateInstance(converterAttribute.ConverterType)));
+                else if (!IsSimple(prop.PropertyType))
+                    serializer.Serialize(writer, prop.GetValue(value));
+                else
+                    writer.WriteValue(prop.GetValue(value));
+            }
+            writer.WriteEndArray();
+        }
+
+        private static bool IsSimple(Type type)
+        {
+            if (type.IsGenericType && type.GetGenericTypeDefinition() == typeof(Nullable<>))
+            {
+                // nullable type, check if the nested type is simple.
+                return IsSimple(type.GetGenericArguments()[0]);
+            }
+            return type.IsPrimitive
+              || type.IsEnum
+              || type == typeof(string)
+              || type == typeof(decimal);
+        }
+
+        private static T? GetCustomAttribute<T>(MemberInfo memberInfo) where T : Attribute =>
+            (T?)_attributeByMemberInfoAndTypeCache.GetOrAdd((memberInfo, typeof(T)), tuple => memberInfo.GetCustomAttribute(typeof(T)));
+
+        private static T? GetCustomAttribute<T>(Type type) where T : Attribute =>
+            (T?)_attributeByTypeAndTypeCache.GetOrAdd((type, typeof(T)), tuple => type.GetCustomAttribute(typeof(T)));
+    }
+}

CryptoExchange.Net/Converters/JsonNet/BaseConverter.cs

@@ -0,0 +1,98 @@
+using System;
+using System.Collections.Generic;
+using System.Diagnostics;
+using System.Linq;
+using Newtonsoft.Json;
+
+namespace CryptoExchange.Net.Converters.JsonNet
+{
+    /// <summary>
+    /// Base class for enum converters
+    /// </summary>
+    /// <typeparam name="T">Type of enum to convert</typeparam>
+    public abstract class BaseConverter<T>: JsonConverter where T: struct
+    {
+        /// <summary>
+        /// The enum->string mapping
+        /// </summary>
+        protected abstract List<KeyValuePair<T, string>> Mapping { get; }
+        private readonly bool _quotes;
+        
+        /// <summary>
+        /// ctor
+        /// </summary>
+        /// <param name="useQuotes"></param>
+        protected BaseConverter(bool useQuotes)
+        {
+            _quotes = useQuotes;
+        }
+
+        /// <inheritdoc />
+        public override void WriteJson(JsonWriter writer, object? value, JsonSerializer serializer)
+        {
+            var stringValue = value == null? null: GetValue((T) value);
+            if (_quotes)
+                writer.WriteValue(stringValue);
+            else
+                writer.WriteRawValue(stringValue);
+        }
+
+        /// <inheritdoc />
+        public override object? ReadJson(JsonReader reader, Type objectType, object? existingValue, JsonSerializer serializer)
+        {
+            if (reader.Value == null)
+                return null;
+
+            var stringValue = reader.Value.ToString();
+            if (string.IsNullOrWhiteSpace(stringValue))
+                return null;
+
+            if (!GetValue(stringValue, out var result))
+            {
+                Trace.WriteLine($"{DateTime.Now:yyyy/MM/dd HH:mm:ss:fff} | Warning | Cannot map enum value. EnumType: {typeof(T)}, Value: {reader.Value}, Known values: {string.Join(", ", Mapping.Select(m => m.Value))}. If you think {reader.Value} should added please open an issue on the Github repo");
+                return null;
+            }
+
+            return result;
+        }
+
+        /// <summary>
+        /// Convert a string value
+        /// </summary>
+        /// <param name="data"></param>
+        /// <returns></returns>
+        public T ReadString(string data)
+        {
+            return Mapping.FirstOrDefault(v => v.Value == data).Key;
+        }
+
+        /// <inheritdoc />
+        public override bool CanConvert(Type objectType)
+        {
+            // Check if it is type, or nullable of type
+            return objectType == typeof(T) || Nullable.GetUnderlyingType(objectType) == typeof(T);
+        }
+
+        private bool GetValue(string value, out T result)
+        {
+            // Check for exact match first, then if not found fallback to a case insensitive match 
+            var mapping = Mapping.FirstOrDefault(kv => kv.Value.Equals(value, StringComparison.InvariantCulture));
+            if(mapping.Equals(default(KeyValuePair<T, string>)))
+                mapping = Mapping.FirstOrDefault(kv => kv.Value.Equals(value, StringComparison.InvariantCultureIgnoreCase));
+
+            if (!mapping.Equals(default(KeyValuePair<T, string>)))
+            {
+                result = mapping.Key;
+                return true;
+            }
+
+            result = default;
+            return false;
+        }
+
+        private string GetValue(T value)
+        {
+            return Mapping.FirstOrDefault(v => v.Key.Equals(value)).Value;
+        }
+    }
+}

CryptoExchange.Net/Converters/JsonNet/BoolConverter.cs

@@ -0,0 +1,80 @@
+using System;
+using Newtonsoft.Json;
+
+namespace CryptoExchange.Net.Converters.JsonNet
+{
+    /// <summary>
+    /// Boolean converter with support for "0"/"1" (strings)
+    /// </summary>
+    public class BoolConverter : JsonConverter
+    {
+        /// <summary>
+        /// Determines whether this instance can convert the specified object type.
+        /// </summary>
+        /// <param name="objectType">Type of the object.</param>
+        /// <returns>
+        /// <c>true</c> if this instance can convert the specified object type; otherwise, <c>false</c>.
+        /// </returns>
+        public override bool CanConvert(Type objectType)
+        {
+            if (Nullable.GetUnderlyingType(objectType) != null)
+                return Nullable.GetUnderlyingType(objectType) == typeof(bool);
+            return objectType == typeof(bool);
+        }
+
+        /// <summary>
+        /// Reads the JSON representation of the object.
+        /// </summary>
+        /// <param name="reader">The <see cref="T:Newtonsoft.Json.JsonReader"/> to read from.</param>
+        /// <param name="objectType">Type of the object.</param>
+        /// <param name="existingValue">The existing value of object being read.</param>
+        /// <param name="serializer">The calling serializer.</param>
+        /// <returns>
+        /// The object value.
+        /// </returns>
+        public override object? ReadJson(JsonReader reader, Type objectType, object? existingValue, JsonSerializer serializer)
+        {
+            var value = reader.Value?.ToString().ToLower().Trim();
+            if (value == null || value == "")
+            {
+                if (Nullable.GetUnderlyingType(objectType) != null)
+                    return null;
+
+                return false;
+            }
+
+            switch (value)
+            {
+                case "true":
+                case "yes":
+                case "y":
+                case "1":
+                case "on":
+                    return true;
+                case "false":
+                case "no":
+                case "n":
+                case "0":
+                case "off":
+                case "-1":
+                    return false;
+            }
+
+            // If we reach here, we're pretty much going to throw an error so let's let Json.NET throw it's pretty-fied error message.
+            return new JsonSerializer().Deserialize(reader, objectType);
+        }
+
+        /// <summary>
+        /// Specifies that this converter will not participate in writing results.
+        /// </summary>
+        public override bool CanWrite { get { return false; } }
+
+        /// <summary>
+        /// Writes the JSON representation of the object.
+        /// </summary>
+        /// <param name="writer">The <see cref="T:Newtonsoft.Json.JsonWriter"/> to write to.</param><param name="value">The value.</param><param name="serializer">The calling serializer.</param>
+        public override void WriteJson(JsonWriter writer, object? value, JsonSerializer serializer)
+        {
+        }
+    }
+}

CryptoExchange.Net/Converters/JsonNet/DateTimeConverter.cs

@@ -0,0 +1,241 @@
+using Microsoft.Extensions.Primitives;
+using Newtonsoft.Json;
+using System;
+using System.Diagnostics;
+using System.Diagnostics.CodeAnalysis;
+using System.Globalization;
+
+namespace CryptoExchange.Net.Converters.JsonNet
+{
+    /// <summary>
+    /// Datetime converter. Supports converting from string/long/double to DateTime and back. Numbers are assumed to be the time since 1970-01-01.
+    /// </summary>
+    public class DateTimeConverter: JsonConverter
+    {
+        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 / 1000;
+        private const decimal _ticksPerNanosecond = TimeSpan.TicksPerMillisecond / 1000m / 1000;
+
+        /// <inheritdoc />
+        public override bool CanConvert(Type objectType)
+        {
+            return objectType == typeof(DateTime) || objectType == typeof(DateTime?);
+        }
+
+        /// <inheritdoc />
+        public override object? ReadJson(JsonReader reader, Type objectType, object? existingValue, JsonSerializer serializer)
+        {
+            if (reader.Value == null)
+            {
+                if (objectType == typeof(DateTime))
+                    return default(DateTime);
+
+                return null;
+            }
+
+            if(reader.TokenType is JsonToken.Integer)
+            {
+                var longValue = (long)reader.Value;
+                if (longValue == 0 || longValue == -1)
+                    return objectType == typeof(DateTime) ? default(DateTime): null;
+
+                return ParseFromLong(longValue);
+            }
+            else if (reader.TokenType is JsonToken.Float)
+            {
+                var doubleValue = (double)reader.Value;
+                if (doubleValue == 0 || doubleValue == -1)
+                    return objectType == typeof(DateTime) ? default(DateTime) : null;
+
+                if (doubleValue < 19999999999)
+                    return ConvertFromSeconds(doubleValue);
+                
+                return ConvertFromMilliseconds(doubleValue);
+            }
+            else if(reader.TokenType is JsonToken.String)
+            {
+                var stringValue = (string)reader.Value;
+                if (string.IsNullOrWhiteSpace(stringValue)
+                    || stringValue == "-1"
+                    || (double.TryParse(stringValue, out var doubleVal) && doubleVal == 0))
+                {
+                    return objectType == typeof(DateTime) ? default(DateTime) : null;
+                }
+
+                return ParseFromString(stringValue);
+            }
+            else if(reader.TokenType == JsonToken.Date)
+            {
+                return (DateTime)reader.Value;
+            }
+            else
+            {
+                Trace.WriteLine("{DateTime.Now:yyyy/MM/dd HH:mm:ss:fff} | Warning | Unknown DateTime format: " + reader.Value);
+                return default;
+            }
+        }
+
+        /// <summary>
+        /// Parse a long value to datetime
+        /// </summary>
+        /// <param name="longValue"></param>
+        /// <returns></returns>
+        public static DateTime ParseFromLong(long longValue)
+        {
+            if (longValue < 19999999999)
+                return ConvertFromSeconds(longValue);
+            if (longValue < 19999999999999)
+                return ConvertFromMilliseconds(longValue);
+            if (longValue < 19999999999999999)
+                return ConvertFromMicroseconds(longValue);
+
+            return ConvertFromNanoseconds(longValue);
+        }
+
+        /// <summary>
+        /// Parse a string value to datetime
+        /// </summary>
+        /// <param name="stringValue"></param>
+        /// <returns></returns>
+        public static DateTime ParseFromString(string stringValue)
+        {
+            if (stringValue.Length == 12 && stringValue.StartsWith("202"))
+            {
+                // Parse 202303261200 format
+                if (!int.TryParse(stringValue.Substring(0, 4), out var year)
+                    || !int.TryParse(stringValue.Substring(4, 2), out var month)
+                    || !int.TryParse(stringValue.Substring(6, 2), out var day)
+                    || !int.TryParse(stringValue.Substring(8, 2), out var hour)
+                    || !int.TryParse(stringValue.Substring(10, 2), out var minute))
+                {
+                    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);
+            }
+
+            if (stringValue.Length == 8)
+            {
+                // Parse 20211103 format
+                if (!int.TryParse(stringValue.Substring(0, 4), out var year)
+                    || !int.TryParse(stringValue.Substring(4, 2), out var month)
+                    || !int.TryParse(stringValue.Substring(6, 2), out var day))
+                {
+                    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);
+            }
+
+            if (stringValue.Length == 6)
+            {
+                // Parse 211103 format
+                if (!int.TryParse(stringValue.Substring(0, 2), out var year)
+                    || !int.TryParse(stringValue.Substring(2, 2), out var month)
+                    || !int.TryParse(stringValue.Substring(4, 2), out var day))
+                {
+                    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 (double.TryParse(stringValue, NumberStyles.Float, CultureInfo.InvariantCulture, out var doubleValue))
+            {
+                // Parse 1637745563.000 format
+                if (doubleValue < 19999999999)
+                    return ConvertFromSeconds(doubleValue);
+                if (doubleValue < 19999999999999)
+                    return ConvertFromMilliseconds((long)doubleValue);
+                if (doubleValue < 19999999999999999)
+                    return ConvertFromMicroseconds((long)doubleValue);
+
+                return ConvertFromNanoseconds((long)doubleValue);
+            }
+
+            if (stringValue.Length == 10)
+            {
+                // Parse 2021-11-03 format
+                var values = stringValue.Split('-');
+                if (!int.TryParse(values[0], out var year)
+                    || !int.TryParse(values[1], out var month)
+                    || !int.TryParse(values[2], out var day))
+                {
+                    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);
+            }
+
+            return DateTime.Parse(stringValue, CultureInfo.InvariantCulture, DateTimeStyles.AdjustToUniversal | DateTimeStyles.AssumeUniversal);
+        }
+
+        /// <summary>
+        /// Convert a seconds since epoch (01-01-1970) value to DateTime
+        /// </summary>
+        /// <param name="seconds"></param>
+        /// <returns></returns>
+        public static DateTime ConvertFromSeconds(double seconds) => _epoch.AddTicks((long)Math.Round(seconds * _ticksPerSecond));
+        /// <summary>
+        /// Convert a milliseconds since epoch (01-01-1970) value to DateTime
+        /// </summary>
+        /// <param name="milliseconds"></param>
+        /// <returns></returns>
+        public static DateTime ConvertFromMilliseconds(double milliseconds) => _epoch.AddTicks((long)Math.Round(milliseconds * TimeSpan.TicksPerMillisecond));
+        /// <summary>
+        /// Convert a microseconds since epoch (01-01-1970) value to DateTime
+        /// </summary>
+        /// <param name="microseconds"></param>
+        /// <returns></returns>
+        public static DateTime ConvertFromMicroseconds(long microseconds) => _epoch.AddTicks((long)Math.Round(microseconds * _ticksPerMicrosecond));
+        /// <summary>
+        /// Convert a nanoseconds since epoch (01-01-1970) value to DateTime
+        /// </summary>
+        /// <param name="nanoseconds"></param>
+        /// <returns></returns>
+        public static DateTime ConvertFromNanoseconds(long nanoseconds) => _epoch.AddTicks((long)Math.Round(nanoseconds * _ticksPerNanosecond));
+        /// <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);
+
+
+        /// <inheritdoc />
+        public override void WriteJson(JsonWriter writer, object? value, JsonSerializer serializer)
+        {
+            var datetimeValue = (DateTime?)value;
+            if (datetimeValue == null)
+                writer.WriteValue((DateTime?)null);
+            if(datetimeValue == default(DateTime))
+                writer.WriteValue((DateTime?)null);
+            else
+                writer.WriteValue((long)Math.Round(((DateTime)value! - new DateTime(1970, 1, 1)).TotalMilliseconds));
+        }
+    }
+}

CryptoExchange.Net/Converters/JsonNet/DecimalStringWriterConverter.cs

@@ -0,0 +1,27 @@
+using Newtonsoft.Json;
+using System;
+using System.Globalization;
+
+namespace CryptoExchange.Net.Converters.JsonNet
+{
+    /// <summary>
+    /// Converter for serializing decimal values as string
+    /// </summary>
+    public class DecimalStringWriterConverter : JsonConverter
+    {
+        /// <inheritdoc />
+        public override bool CanRead => false;
+
+        /// <inheritdoc />
+        public override bool CanConvert(Type objectType) => objectType == typeof(decimal) || objectType == typeof(decimal?);
+
+        /// <inheritdoc />
+        public override object? ReadJson(JsonReader reader, Type objectType, object? existingValue, JsonSerializer serializer)
+        {
+            throw new NotImplementedException();
+        }
+
+        /// <inheritdoc />
+        public override void WriteJson(JsonWriter writer, object? value, JsonSerializer serializer) => writer.WriteValue(((decimal?)value)?.ToString(CultureInfo.InvariantCulture) ?? null);
+    }
+}

CryptoExchange.Net/Converters/JsonNet/EnumConverter.cs

@@ -0,0 +1,176 @@
+using CryptoExchange.Net.Attributes;
+using Newtonsoft.Json;
+using System;
+using System.Collections.Concurrent;
+using System.Collections.Generic;
+using System.Diagnostics;
+using System.Diagnostics.CodeAnalysis;
+using System.Linq;
+
+namespace CryptoExchange.Net.Converters.JsonNet
+{
+    /// <summary>
+    /// Converter for enum values. Enums entries should be noted with a MapAttribute to map the enum value to a string value
+    /// </summary>
+    public class EnumConverter : JsonConverter
+    {
+        private bool _warnOnMissingEntry = true;
+        private bool _writeAsInt;
+
+        /// <summary>
+        /// </summary>
+        public EnumConverter() { }
+
+        /// <summary>
+        /// </summary>
+        /// <param name="writeAsInt"></param>
+        /// <param name="warnOnMissingEntry"></param>
+        public EnumConverter(bool writeAsInt, bool warnOnMissingEntry)
+        {
+            _writeAsInt = writeAsInt;
+            _warnOnMissingEntry = warnOnMissingEntry;
+        }   
+
+        private static readonly ConcurrentDictionary<Type, List<KeyValuePair<object, string>>> _mapping = new();
+
+        /// <inheritdoc />
+        public override bool CanConvert(Type objectType)
+        {
+            return objectType.IsEnum || Nullable.GetUnderlyingType(objectType)?.IsEnum == true;
+        }
+
+        /// <inheritdoc />
+        public override object? ReadJson(JsonReader reader, Type objectType, object? existingValue, JsonSerializer serializer)
+        {
+            var enumType = Nullable.GetUnderlyingType(objectType) ?? objectType;
+            if (!_mapping.TryGetValue(enumType, out var mapping))
+                mapping = AddMapping(enumType);
+
+            var stringValue = reader.Value?.ToString();
+            if (stringValue == null || stringValue == "")
+            {
+                // Received null value
+                var emptyResult = GetDefaultValue(objectType, enumType);
+                if(emptyResult != null)
+                    // If the property we're parsing to isn't nullable there isn't a correct way to return this as null will either throw an exception (.net framework) or the default enum value (dotnet core).
+                    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: {enumType.Name}. If you think {enumType.Name} should be nullable please open an issue on the Github repo");
+
+                return emptyResult;
+            }
+
+            if (!GetValue(enumType, mapping, stringValue!, out var result))
+            {
+                var defaultValue = GetDefaultValue(objectType, enumType);
+                if (string.IsNullOrWhiteSpace(stringValue))
+                {
+                    if (defaultValue != null)
+                        // We received an empty string and have no mapping for it, and the property isn't nullable
+                        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: {enumType.Name}. If you think {enumType.Name} should be nullable please open an issue on the Github repo");
+                }
+                else
+                {
+                    // We received an enum value but weren't able to parse it.
+                    if (_warnOnMissingEntry)
+                        Trace.WriteLine($"{DateTime.Now:yyyy/MM/dd HH:mm:ss:fff} | Warning | Cannot map enum value. EnumType: {enumType.Name}, Value: {reader.Value}, Known values: {string.Join(", ", mapping.Select(m => m.Value))}. If you think {reader.Value} should added please open an issue on the Github repo");
+                }
+            
+                return defaultValue;
+            }
+
+            return result;
+        }
+
+        private static object? GetDefaultValue(Type objectType, Type enumType)
+        {
+            if (Nullable.GetUnderlyingType(objectType) != null)
+                return null;
+
+            return Activator.CreateInstance(enumType); // return default value
+        }
+
+        private static List<KeyValuePair<object, string>> AddMapping(Type objectType) 
+        {
+            var mapping = new List<KeyValuePair<object, string>>();
+            var enumMembers = objectType.GetMembers();
+            foreach (var member in enumMembers)
+            {
+                var maps = member.GetCustomAttributes(typeof(MapAttribute), false);
+                foreach (MapAttribute attribute in maps)
+                {
+                    foreach (var value in attribute.Values)
+                        mapping.Add(new KeyValuePair<object, string>(Enum.Parse(objectType, member.Name), value));
+                }
+            }
+            _mapping.TryAdd(objectType, mapping);
+            return mapping;
+        }
+
+        private static bool GetValue(Type objectType, List<KeyValuePair<object, string>> enumMapping, string value, out object? result)
+        {
+            // Check for exact match first, then if not found fallback to a case insensitive match 
+            var mapping = enumMapping.FirstOrDefault(kv => kv.Value.Equals(value, StringComparison.InvariantCulture));
+            if (mapping.Equals(default(KeyValuePair<object, string>)))
+                mapping = enumMapping.FirstOrDefault(kv => kv.Value.Equals(value, StringComparison.InvariantCultureIgnoreCase));
+
+            if (!mapping.Equals(default(KeyValuePair<object, string>)))
+            {
+                result = mapping.Key;
+                return true;
+            }
+
+            try
+            {
+                // If no explicit mapping is found try to parse string
+                result = Enum.Parse(objectType, value, true);
+                return true;
+            }
+            catch (Exception)
+            {
+                result = default;
+                return false;
+            }
+        }
+
+        /// <summary>
+        /// Get the string value for an enum value using the MapAttribute mapping. When multiple values are mapped for a enum entry the first value will be returned
+        /// </summary>
+        /// <typeparam name="T"></typeparam>
+        /// <param name="enumValue"></param>
+        /// <returns></returns>
+        [return: NotNullIfNotNull("enumValue")]
+        public static string? GetString<T>(T enumValue) => GetString(typeof(T), enumValue);     
+        
+
+        [return: NotNullIfNotNull("enumValue")]
+        private static string? GetString(Type objectType, object? enumValue)
+        {
+            objectType = Nullable.GetUnderlyingType(objectType) ?? objectType;
+
+            if (!_mapping.TryGetValue(objectType, out var mapping))
+                mapping = AddMapping(objectType);
+
+            return enumValue == null ? null : (mapping.FirstOrDefault(v => v.Key.Equals(enumValue)).Value ?? enumValue.ToString());
+        }
+
+        /// <inheritdoc />
+        public override void WriteJson(JsonWriter writer, object? value, JsonSerializer serializer)
+        {
+            if (value == null)
+            {
+                writer.WriteNull();
+            }
+            else
+            {
+                if (!_writeAsInt)
+                {
+                    var stringValue = GetString(value.GetType(), value);
+                    writer.WriteValue(stringValue);
+                }
+                else
+                {
+                    writer.WriteValue((int)value);
+                }
+            }
+        }
+    }
+}

CryptoExchange.Net/Converters/JsonNet/JsonNetMessageAccessor.cs

@@ -0,0 +1,338 @@
+using CryptoExchange.Net.Converters.MessageParsing;
+using CryptoExchange.Net.Interfaces;
+using CryptoExchange.Net.Objects;
+using Newtonsoft.Json;
+using Newtonsoft.Json.Linq;
+using System;
+using System.Collections.Generic;
+using System.IO;
+using System.Linq;
+using System.Runtime.InteropServices;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace CryptoExchange.Net.Converters.JsonNet
+{
+    /// <summary>
+    /// Json.Net message accessor
+    /// </summary>
+    public abstract class JsonNetMessageAccessor : IMessageAccessor
+    {
+        /// <summary>
+        /// The json token loaded
+        /// </summary>
+        protected JToken? _token;
+        private static readonly JsonSerializer _serializer = JsonSerializer.Create(SerializerOptions.WithConverters);
+
+        /// <inheritdoc />
+        public bool IsJson { get; protected set; }
+
+        /// <inheritdoc />
+        public abstract bool OriginalDataAvailable { get; }
+
+        /// <inheritdoc />
+        public object? Underlying => _token;
+
+        /// <inheritdoc />
+        public CallResult<object> Deserialize(Type type, MessagePath? path = null)
+        {
+            if (!IsJson)
+                return new CallResult<object>(GetOriginalString());
+
+            var source = _token;
+            if (path != null)
+                source = GetPathNode(path.Value);
+
+            try
+            {
+                var result = source!.ToObject(type, _serializer)!;
+                return new CallResult<object>(result);
+            }
+            catch (JsonReaderException jre)
+            {
+                var info = $"Deserialize JsonReaderException: {jre.Message}, Path: {jre.Path}, LineNumber: {jre.LineNumber}, LinePosition: {jre.LinePosition}";
+                return new CallResult<object>(new DeserializeError(info, OriginalDataAvailable ? GetOriginalString() : "[Data only available when OutputOriginal = true in client options]"));
+            }
+            catch (JsonSerializationException jse)
+            {
+                var info = $"Deserialize JsonSerializationException: {jse.Message}";
+                return new CallResult<object>(new DeserializeError(info, OriginalDataAvailable ? GetOriginalString() : "[Data only available when OutputOriginal = true in client options]"));
+            }
+            catch (Exception ex)
+            {
+                var exceptionInfo = ex.ToLogString();
+                var info = $"Deserialize Unknown Exception: {exceptionInfo}";
+                return new CallResult<object>(new DeserializeError(info, OriginalDataAvailable ? GetOriginalString() : "[Data only available when OutputOriginal = true in client options]"));
+            }
+        }
+
+        /// <inheritdoc />
+        public CallResult<T> Deserialize<T>(MessagePath? path = null)
+        {
+            var source = _token;
+            if (path != null)
+                source = GetPathNode(path.Value);
+
+            try
+            {
+                var result = source!.ToObject<T>(_serializer)!;
+                return new CallResult<T>(result);
+            }
+            catch (JsonReaderException jre)
+            {
+                var info = $"Deserialize JsonReaderException: {jre.Message}, Path: {jre.Path}, LineNumber: {jre.LineNumber}, LinePosition: {jre.LinePosition}";
+                return new CallResult<T>(new DeserializeError(info, OriginalDataAvailable ? GetOriginalString() : "[Data only available when OutputOriginal = true in client options]"));
+            }
+            catch (JsonSerializationException jse)
+            {
+                var info = $"Deserialize JsonSerializationException: {jse.Message}";
+                return new CallResult<T>(new DeserializeError(info, OriginalDataAvailable ? GetOriginalString() : "[Data only available when OutputOriginal = true in client options]"));
+            }
+            catch (Exception ex)
+            {
+                var exceptionInfo = ex.ToLogString();
+                var info = $"Deserialize Unknown Exception: {exceptionInfo}";
+                return new CallResult<T>(new DeserializeError(info, OriginalDataAvailable ? GetOriginalString() : "[Data only available when OutputOriginal = true in client options]"));
+            }
+        }
+
+        /// <inheritdoc />
+        public NodeType? GetNodeType()
+        {
+            if (!IsJson)
+                throw new InvalidOperationException("Can't access json data on non-json message");
+
+            if (_token == null)
+                return null;
+
+            if (_token.Type == JTokenType.Object)
+                return NodeType.Object;
+
+            if (_token.Type == JTokenType.Array)
+                return NodeType.Array;
+
+            return NodeType.Value;
+        }
+
+        /// <inheritdoc />
+        public NodeType? GetNodeType(MessagePath path)
+        {
+            if (!IsJson)
+                throw new InvalidOperationException("Can't access json data on non-json message");
+
+            var node = GetPathNode(path);
+            if (node == null)
+                return null;
+
+            if (node.Type == JTokenType.Object)
+                return NodeType.Object;
+
+            if (node.Type == JTokenType.Array)
+                return NodeType.Array;
+
+            return NodeType.Value;
+        }
+
+        /// <inheritdoc />
+        public T? GetValue<T>(MessagePath path)
+        {
+            if (!IsJson)
+                throw new InvalidOperationException("Can't access json data on non-json message");
+
+            var value = GetPathNode(path);
+            if (value == null)
+                return default;
+
+            if (value.Type == JTokenType.Object || value.Type == JTokenType.Array)
+                return default;
+
+            return value!.Value<T>();
+        }
+
+        /// <inheritdoc />
+        public List<T?>? GetValues<T>(MessagePath path)
+        {
+            if (!IsJson)
+                throw new InvalidOperationException("Can't access json data on non-json message");
+
+            var value = GetPathNode(path);
+            if (value == null)
+                return default;
+
+            if (value.Type == JTokenType.Object)
+                return default;
+
+            return value!.Values<T>().ToList();
+        }
+
+        private JToken? GetPathNode(MessagePath path)
+        {
+            if (!IsJson)
+                throw new InvalidOperationException("Can't access json data on non-json message");
+
+            var currentToken = _token;
+            foreach (var node in path)
+            {
+                if (node.Type == 0)
+                {
+                    // Int value
+                    var val = node.Index!.Value;
+                    if (currentToken!.Type != JTokenType.Array || ((JArray)currentToken).Count <= val)
+                        return null;
+
+                    currentToken = currentToken[val];
+                }
+                else if (node.Type == 1)
+                {
+                    // String value
+                    if (currentToken!.Type != JTokenType.Object)
+                        return null;
+
+                    currentToken = currentToken[node.Property!];
+                }
+                else
+                {
+                    // Property name
+                    if (currentToken!.Type != JTokenType.Object)
+                        return null;
+
+                    currentToken = (currentToken.First as JProperty)?.Name;
+                }
+
+                if (currentToken == null)
+                    return null;
+            }
+
+            return currentToken;
+        }
+
+        /// <inheritdoc />
+        public abstract string GetOriginalString();
+
+        /// <inheritdoc />
+        public abstract void Clear();
+    }
+
+    /// <summary>
+    /// Json.Net stream message accessor
+    /// </summary>
+    public class JsonNetStreamMessageAccessor : JsonNetMessageAccessor, IStreamMessageAccessor
+    {
+        private Stream? _stream;
+
+        /// <inheritdoc />
+        public override bool OriginalDataAvailable => _stream?.CanSeek == true;
+
+        /// <inheritdoc />
+        public async Task<CallResult> Read(Stream stream, bool bufferStream)
+        {
+            if (bufferStream && stream is not MemoryStream)
+            {
+                // We need to be buffer the stream, and it's not currently a seekable stream, so copy it to a new memory stream
+                _stream = new MemoryStream();
+                stream.CopyTo(_stream);
+                _stream.Position = 0;
+            }
+            else if (bufferStream)
+            {
+                // We need to buffer the stream, and the current stream is seekable, store as is
+                _stream = stream;
+            }
+            else
+            {
+                // We don't need to buffer the stream, so don't bother keeping the reference
+            }
+
+            var readStream = _stream ?? stream;
+            var length = readStream.CanSeek ? readStream.Length : 4096;
+            using var reader = new StreamReader(readStream, Encoding.UTF8, false, (int)Math.Max(2, length), true);
+            using var jsonTextReader = new JsonTextReader(reader);
+
+            try
+            {
+                _token = await JToken.LoadAsync(jsonTextReader).ConfigureAwait(false);
+                IsJson = true;
+                return new CallResult(null);
+            }
+            catch (Exception ex)
+            {
+                // Not a json message
+                IsJson = false;
+                return new CallResult(new ServerError("JsonError: " + ex.Message));
+            }
+
+        }
+        /// <inheritdoc />
+        public override string GetOriginalString()
+        {
+            if (_stream is null)
+                throw new NullReferenceException("Stream not initialized");
+
+            _stream.Position = 0;
+            using var textReader = new StreamReader(_stream, Encoding.UTF8, false, 1024, true);
+            return textReader.ReadToEnd();
+        }
+
+        /// <inheritdoc />
+        public override void Clear()
+        {
+            _stream?.Dispose();
+            _stream = null;
+            _token = null;
+        }
+
+    }
+
+    /// <summary>
+    /// Json.Net byte message accessor
+    /// </summary>
+    public class JsonNetByteMessageAccessor : JsonNetMessageAccessor, IByteMessageAccessor
+    {
+        private ReadOnlyMemory<byte> _bytes;
+
+        /// <inheritdoc />
+        public CallResult Read(ReadOnlyMemory<byte> data)
+        {
+            _bytes = data;
+
+            // Try getting the underlying byte[] instead of the ToArray to prevent creating a copy
+            using var stream = MemoryMarshal.TryGetArray(data, out var arraySegment)
+                ? new MemoryStream(arraySegment.Array, arraySegment.Offset, arraySegment.Count)
+                : new MemoryStream(data.ToArray());
+            using var reader = new StreamReader(stream, Encoding.UTF8, false, Math.Max(2, data.Length), true);
+            using var jsonTextReader = new JsonTextReader(reader);
+
+            try
+            {
+                _token = JToken.Load(jsonTextReader);
+                IsJson = true;
+                return new CallResult(null);
+            }
+            catch (Exception ex)
+            {
+                // Not a json message
+                IsJson = false;
+                return new CallResult(new ServerError("JsonError: " + ex.Message));
+            }
+        }
+
+        /// <inheritdoc />
+        public override string GetOriginalString() =>
+            // Netstandard 2.0 doesn't support GetString from a ReadonlySpan<byte>, so use ToArray there instead
+#if NETSTANDARD2_0
+            Encoding.UTF8.GetString(_bytes.ToArray());
+#else
+            Encoding.UTF8.GetString(_bytes.Span);
+#endif
+
+        /// <inheritdoc />
+        public override bool OriginalDataAvailable => true;
+
+        /// <inheritdoc />
+        public override void Clear()
+        {
+            _bytes = null;
+            _token = null;
+        }
+    }
+}

CryptoExchange.Net/Converters/JsonNet/JsonNetMessageSerializer.cs

@@ -0,0 +1,12 @@
+using CryptoExchange.Net.Interfaces;
+using Newtonsoft.Json;
+
+namespace CryptoExchange.Net.Converters.JsonNet
+{
+    /// <inheritdoc />
+    public class JsonNetMessageSerializer : IMessageSerializer
+    {
+        /// <inheritdoc />
+        public string Serialize(object message) => JsonConvert.SerializeObject(message, Formatting.None);
+    }
+}

CryptoExchange.Net/Converters/JsonNet/SerializerOptions.cs

@@ -0,0 +1,35 @@
+using Newtonsoft.Json;
+using System.Globalization;
+
+namespace CryptoExchange.Net.Converters.JsonNet
+{
+    /// <summary>
+    /// Serializer options
+    /// </summary>
+    public static class SerializerOptions
+    {
+        /// <summary>
+        /// Json serializer settings which includes the EnumConverter, DateTimeConverter and BoolConverter
+        /// </summary>
+        public static JsonSerializerSettings WithConverters => new JsonSerializerSettings
+        {
+            DateTimeZoneHandling = DateTimeZoneHandling.Utc,
+            Culture = CultureInfo.InvariantCulture,
+            Converters =
+            {
+                new EnumConverter(),
+                new DateTimeConverter(),
+                new BoolConverter()
+            }
+        };
+
+        /// <summary>
+        /// Default json serializer settings
+        /// </summary>
+        public static JsonSerializerSettings Default => new JsonSerializerSettings
+        {
+            DateTimeZoneHandling = DateTimeZoneHandling.Utc,
+            Culture = CultureInfo.InvariantCulture
+        };
+    }
+}

CryptoExchange.Net/Converters/JsonSerializerContextCache.cs

@@ -1,29 +0,0 @@
-using System;
-using System.Collections.Concurrent;
-using System.Text.Json.Serialization;
-
-namespace CryptoExchange.Net.Converters
-{
-    /// <summary>
-    /// Caching for JsonSerializerContext instances
-    /// </summary>
-    public static class JsonSerializerContextCache
-    {
-        private static ConcurrentDictionary<Type, JsonSerializerContext> _cache = new ConcurrentDictionary<Type, JsonSerializerContext>();
-
-        /// <summary>
-        /// Get the instance of the provided type T. It will be created if it doesn't exist yet.
-        /// </summary>
-        /// <typeparam name="T">Implementation type of the JsonSerializerContext</typeparam>
-        public static JsonSerializerContext GetOrCreate<T>() where T: JsonSerializerContext, new()
-        {
-            var contextType = typeof(T);
-            if (_cache.TryGetValue(contextType, out var context))
-                return context;
-
-            var instance = new T();
-            _cache[contextType] = instance;
-            return instance;
-        }
-    }
-}

CryptoExchange.Net/Converters/MessageParsing/DynamicConverters/IRestMessageHandler.cs

@@ -1,64 +0,0 @@
-using CryptoExchange.Net.Objects;
-using System.IO;
-using System.Net.Http.Headers;
-using System.Threading;
-using System.Threading.Tasks;
-
-namespace CryptoExchange.Net.Converters.MessageParsing.DynamicConverters
-{
-    /// <summary>
-    /// REST message handler
-    /// </summary>
-    public interface IRestMessageHandler
-    {
-        /// <summary>
-        /// The `accept` HTTP response header for the request
-        /// </summary>
-        MediaTypeWithQualityHeaderValue AcceptHeader { get; }
-
-        /// <summary>
-        /// Whether a seekable stream is required
-        /// </summary>
-        bool RequiresSeekableStream { get; }
-
-        /// <summary>
-        /// Parse the response when the HTTP response status indicated an error
-        /// </summary>
-        ValueTask<Error> ParseErrorResponse(
-            int httpStatusCode,
-            HttpResponseHeaders responseHeaders,
-            Stream responseStream);
-
-        /// <summary>
-        /// Parse the response when the HTTP response status indicated a rate limit error
-        /// </summary>
-        ValueTask<ServerRateLimitError> ParseErrorRateLimitResponse(
-            int httpStatusCode,
-            HttpResponseHeaders responseHeaders,
-            Stream responseStream);
-
-        /// <summary>
-        /// Check if the response is an error response; if so return the error.<br />
-        /// Note that if the API returns a standard result wrapper, something like this:
-        /// <code>{ "code": 400, "msg": "error", "data": {} }</code> 
-        /// then the `CheckDeserializedResponse` method should be used for checking the result
-        /// </summary>
-        ValueTask<Error?> CheckForErrorResponse(
-            RequestDefinition request,
-            HttpResponseHeaders responseHeaders,
-            Stream responseStream);
-
-        /// <summary>
-        /// Deserialize the response stream
-        /// </summary>
-        ValueTask<(T? Result, Error? Error)> TryDeserializeAsync<T>(
-            Stream responseStream,
-            CancellationToken ct);
-
-        /// <summary>
-        /// Check whether the resulting T object indicates an error or not
-        /// </summary>
-        Error? CheckDeserializedResponse<T>(HttpResponseHeaders responseHeaders, T result);
-    }
-
-}

CryptoExchange.Net/Converters/MessageParsing/DynamicConverters/ISocketMessageHandler.cs

@@ -1,27 +0,0 @@
-using System;
-using System.Net.WebSockets;
-
-namespace CryptoExchange.Net.Converters.MessageParsing.DynamicConverters
-{
-    /// <summary>
-    /// WebSocket message handler
-    /// </summary>
-    public interface ISocketMessageHandler
-    {
-        /// <summary>
-        /// Get an identifier for the message which can be used to determine the type of the message
-        /// </summary>
-        string? GetTypeIdentifier(ReadOnlySpan<byte> data, WebSocketMessageType? webSocketMessageType);
-
-        /// <summary>
-        /// Get optional topic filter, for example a symbol name
-        /// </summary>
-        string? GetTopicFilter(object deserializedObject);
-
-        /// <summary>
-        /// Deserialize to the provided type
-        /// </summary>
-        object Deserialize(ReadOnlySpan<byte> data, Type type);
-    }
-
-}

CryptoExchange.Net/Converters/MessageParsing/DynamicConverters/MessageConverterTypes.cs

@@ -1,46 +0,0 @@
-using System;
-
-namespace CryptoExchange.Net.Converters.MessageParsing.DynamicConverters
-{
-    /// <summary>
-    /// Message type definition
-    /// </summary>
-    public class MessageTypeDefinition
-    {
-        /// <summary>
-        /// Whether to immediately select the definition when it is matched. Can only be used when the evaluator has a single unique field to look for
-        /// </summary>
-        public bool ForceIfFound { get; set; }
-        /// <summary>
-        /// The fields a message needs to contain for this definition
-        /// </summary>
-        public MessageFieldReference[] Fields { get; set; } = [];
-        /// <summary>
-        /// The callback for getting the identifier string
-        /// </summary>
-        public Func<SearchResult, string>? TypeIdentifierCallback { get; set; }
-        /// <summary>
-        /// The static identifier string to return when this evaluator is matched
-        /// </summary>
-        public string? StaticIdentifier { get; set; }
-        
-        internal string? GetMessageType(SearchResult result)
-        {
-            if (StaticIdentifier != null)
-                return StaticIdentifier;
-
-            return TypeIdentifierCallback!(result);
-        }
-
-        internal bool Satisfied(SearchResult result)
-        {
-            foreach(var field in Fields)
-            {
-                if (!result.Contains(field))
-                    return false;
-            }
-
-            return true;
-        }
-    }
-}

CryptoExchange.Net/Converters/MessageParsing/DynamicConverters/MessageEvalutorFieldReference.cs

@@ -1,15 +0,0 @@
-namespace CryptoExchange.Net.Converters.MessageParsing.DynamicConverters
-{
-    internal class MessageEvalutorFieldReference
-    {
-        public bool SkipReading { get; set; }
-        public bool OverlappingField { get; set; }
-        public MessageFieldReference Field { get; set; }
-        public MessageTypeDefinition? ForceEvaluator { get; set; }
-
-        public MessageEvalutorFieldReference(MessageFieldReference field)
-        {
-            Field = field;
-        }
-    }
-}

CryptoExchange.Net/Converters/MessageParsing/DynamicConverters/MessageFieldReference.cs

@@ -1,152 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Text;
-
-namespace CryptoExchange.Net.Converters.MessageParsing.DynamicConverters
-{
-    /// <summary>
-    /// Reference to a message field
-    /// </summary>
-    public abstract class MessageFieldReference
-    {
-        /// <summary>
-        /// The name for this search field
-        /// </summary>
-        public string SearchName { get; set; }
-        /// <summary>
-        /// The depth at which to look for this field
-        /// </summary>
-        public int Depth { get; set; } = 1;
-        /// <summary>
-        /// Callback to check if the field value matches an expected constraint
-        /// </summary>
-        public Func<string?, bool>? Constraint { get; private set; }
-
-        /// <summary>
-        /// Check whether the value is one of the string values in the set
-        /// </summary>
-        public MessageFieldReference WithFilterConstraint(HashSet<string?> set)
-        {
-            Constraint = set.Contains;
-            return this;
-        }
-
-        /// <summary>
-        /// Check whether the value is equal to a string
-        /// </summary>
-        public MessageFieldReference WithEqualConstraint(string compare)
-        {
-            Constraint = x => x != null && x.Equals(compare, StringComparison.Ordinal);
-            return this;
-        }
-
-        /// <summary>
-        /// Check whether the value is not equal to a string
-        /// </summary>
-        public MessageFieldReference WithNotEqualConstraint(string compare)
-        {
-            Constraint = x => x == null || !x.Equals(compare, StringComparison.Ordinal);
-            return this;
-        }
-
-        /// <summary>
-        /// Check whether the value is not null
-        /// </summary>
-        public MessageFieldReference WithNotNullConstraint()
-        {
-            Constraint = x => x != null;
-            return this;
-        }
-
-        /// <summary>
-        /// Check whether the value starts with a certain string
-        /// </summary>
-        public MessageFieldReference WithStartsWithConstraint(string start)
-        {
-            Constraint = x => x != null && x.StartsWith(start, StringComparison.Ordinal);
-            return this;
-        }
-
-        /// <summary>
-        /// Check whether the value starts with a certain string
-        /// </summary>
-        public MessageFieldReference WithStartsWithConstraints(params string[] startValues)
-        {
-            Constraint = x =>
-            {
-                if (x == null)
-                    return false;
-
-                foreach (var item in startValues)
-                {
-                    if (x!.StartsWith(item, StringComparison.Ordinal))
-                        return true;
-                }
-
-                return false;
-            };
-            return this;
-        }
-
-        /// <summary>
-        /// Check whether the value starts with a certain string
-        /// </summary>
-        public MessageFieldReference WithCustomConstraint(Func<string?, bool> constraint)
-        {
-            Constraint = constraint;
-            return this;
-        }
-
-        /// <summary>
-        /// ctor
-        /// </summary>
-        public MessageFieldReference(string searchName)
-        {
-            SearchName = searchName;
-        }
-    }
-
-    /// <summary>
-    /// Reference to a property message field
-    /// </summary>
-    public class PropertyFieldReference : MessageFieldReference
-    {
-        /// <summary>
-        /// The property name in the JSON
-        /// </summary>
-        public byte[] PropertyName { get; set; }
-        /// <summary>
-        /// Whether the property value is array values
-        /// </summary>
-        public bool ArrayValues { get; set; }
-
-        /// <summary>
-        /// ctor
-        /// </summary>
-        public PropertyFieldReference(string propertyName) : base(propertyName)
-        {
-            PropertyName = Encoding.UTF8.GetBytes(propertyName);
-        }
-    }
-
-    /// <summary>
-    /// Reference to an array message field
-    /// </summary>
-    public class ArrayFieldReference : MessageFieldReference
-    {
-        /// <summary>
-        /// The index in the array
-        /// </summary>
-        public int ArrayIndex { get; set; }
-
-        /// <summary>
-        /// ctor
-        /// </summary>
-        public ArrayFieldReference(string searchName, int depth, int index) : base(searchName)
-        {
-            Depth = depth;
-            ArrayIndex = index;
-        }
-    }
-
-}

CryptoExchange.Net/Converters/MessageParsing/DynamicConverters/SearchResult.cs

@@ -1,60 +0,0 @@
-using System;
-using System.Collections.Generic;
-
-namespace CryptoExchange.Net.Converters.MessageParsing.DynamicConverters
-{
-    /// <summary>
-    /// The results of a search for fields in a JSON message
-    /// </summary>
-    public class SearchResult
-    {
-        private List<SearchResultItem> _items = new List<SearchResultItem>();
-
-        /// <summary>
-        /// Get the value of a field
-        /// </summary>
-        public string? FieldValue(string searchName)
-        {
-            foreach (var item in _items)
-            {
-                if (item.Field.SearchName.Equals(searchName, StringComparison.Ordinal))
-                    return item.Value;
-            }
-
-            throw new Exception($"No field value found for {searchName}");
-        }
-
-        /// <summary>
-        /// The number of found search field values
-        /// </summary>
-        public int Count => _items.Count;
-
-        /// <summary>
-        /// Clear the search result
-        /// </summary>
-        public void Clear() => _items.Clear();
-
-        /// <summary>
-        /// Whether the value for a specific field was found
-        /// </summary>
-        public bool Contains(MessageFieldReference field)
-        {
-            foreach (var item in _items)
-            {
-                if (item.Field == field)
-                    return true;
-            }
-
-            return false;
-        }
-
-        /// <summary>
-        /// Write a value to the result
-        /// </summary>
-        public void Write(MessageFieldReference field, string? value) => _items.Add(new SearchResultItem
-        {
-            Field = field,
-            Value = value
-        });
-    }
-}

CryptoExchange.Net/Converters/MessageParsing/DynamicConverters/SearchResultItem.cs

@@ -1,17 +0,0 @@
-namespace CryptoExchange.Net.Converters.MessageParsing.DynamicConverters
-{
-    /// <summary>
-    /// Search result value
-    /// </summary>
-    public struct SearchResultItem
-    {
-        /// <summary>
-        /// The field the values is for
-        /// </summary>
-        public MessageFieldReference Field { get; set; }
-        /// <summary>
-        /// The value of the field
-        /// </summary>
-        public string? Value { get; set; }
-    }
-}

CryptoExchange.Net/Converters/MessageParsing/MessageNode.cs

@@ -0,0 +1,49 @@
+namespace CryptoExchange.Net.Converters.MessageParsing
+{
+    /// <summary>
+    /// Node accessor
+    /// </summary>
+    public struct NodeAccessor
+    {
+        /// <summary>
+        /// Index
+        /// </summary>
+        public int? Index { get; }
+        /// <summary>
+        /// Property name
+        /// </summary>
+        public string? Property { get; }
+
+        /// <summary>
+        /// Type (0 = int, 1 = string, 2 = prop name)
+        /// </summary>
+        public int Type { get; }
+
+        private NodeAccessor(int? index, string? property, int type)
+        {
+            Index = index;
+            Property = property;
+            Type = type;
+        }
+
+        /// <summary>
+        /// Create an int node accessor
+        /// </summary>
+        /// <param name="value"></param>
+        /// <returns></returns>
+        public static NodeAccessor Int(int value) { return new NodeAccessor(value, null, 0); }
+
+        /// <summary>
+        /// Create a string node accessor
+        /// </summary>
+        /// <param name="value"></param>
+        /// <returns></returns>
+        public static NodeAccessor String(string value) { return new NodeAccessor(null, value, 1); }
+
+        /// <summary>
+        /// Create a property name node accessor
+        /// </summary>
+        /// <returns></returns>
+        public static NodeAccessor PropertyName() { return new NodeAccessor(null, null, 2); }
+    }
+}

CryptoExchange.Net/Converters/MessageParsing/MessagePath.cs

@@ -0,0 +1,50 @@
+using System.Collections;
+using System.Collections.Generic;
+
+namespace CryptoExchange.Net.Converters.MessageParsing
+{
+    /// <summary>
+    /// Message access definition
+    /// </summary>
+    public struct MessagePath : IEnumerable<NodeAccessor>
+    {
+        private List<NodeAccessor> _path;
+
+        internal void Add(NodeAccessor node)
+        {
+            _path.Add(node);
+        }
+
+        /// <summary>
+        /// ctor
+        /// </summary>
+        public MessagePath()
+        {
+            _path = new List<NodeAccessor>();
+        }
+
+        /// <summary>
+        /// Create a new message path
+        /// </summary>
+        /// <returns></returns>
+        public static MessagePath Get()
+        {
+            return new MessagePath();
+        }
+
+        /// <summary>
+        /// IEnumerable implementation
+        /// </summary>
+        /// <returns></returns>
+        public IEnumerator<NodeAccessor> GetEnumerator()
+        {
+            for (var i = 0; i < _path.Count; i++)
+                yield return _path[i];
+        }
+
+        IEnumerator IEnumerable.GetEnumerator()
+        {
+            return GetEnumerator();
+        }
+    }
+}

CryptoExchange.Net/Converters/MessageParsing/MessagePathExtension.cs

@@ -0,0 +1,43 @@
+namespace CryptoExchange.Net.Converters.MessageParsing
+{
+    /// <summary>
+    /// Message path extension methods
+    /// </summary>
+    public static class MessagePathExtension
+    {
+        /// <summary>
+        /// Add a string node accessor
+        /// </summary>
+        /// <param name="path"></param>
+        /// <param name="propName"></param>
+        /// <returns></returns>
+        public static MessagePath Property(this MessagePath path, string propName)
+        {
+            path.Add(NodeAccessor.String(propName));
+            return path;
+        }
+
+        /// <summary>
+        /// Add a property name node accessor
+        /// </summary>
+        /// <param name="path"></param>
+        /// <returns></returns>
+        public static MessagePath PropertyName(this MessagePath path)
+        {
+            path.Add(NodeAccessor.PropertyName());
+            return path;
+        }
+
+        /// <summary>
+        /// Add a int node accessor
+        /// </summary>
+        /// <param name="path"></param>
+        /// <param name="index"></param>
+        /// <returns></returns>
+        public static MessagePath Index(this MessagePath path, int index)
+        {
+            path.Add(NodeAccessor.Int(index));
+            return path;
+        }
+    }
+}

CryptoExchange.Net/Converters/MessageParsing/NodeType.cs

@@ -0,0 +1,21 @@
+namespace CryptoExchange.Net.Converters.MessageParsing
+{
+    /// <summary>
+    /// Message node type
+    /// </summary>
+    public enum NodeType
+    {
+        /// <summary>
+        /// Array node
+        /// </summary>
+        Array,
+        /// <summary>
+        /// Object node
+        /// </summary>
+        Object,
+        /// <summary>
+        /// Value node
+        /// </summary>
+        Value
+    }
+}

CryptoExchange.Net/Converters/SystemTextJson/ArrayConverter.cs

@@ -1,13 +1,12 @@
-using CryptoExchange.Net.Exceptions;
-using System;
-using System.Collections.Generic;
-using System.Diagnostics.CodeAnalysis;
+using System;
+using System.Collections.Concurrent;
 using System.Globalization;
 using System.Linq;
 using System.Reflection;
-using System.Text.Json;
 using System.Text.Json.Serialization;
-using System.Threading;
+using System.Text.Json;
+using CryptoExchange.Net.Attributes;
+using System.Collections.Generic;
 
 namespace CryptoExchange.Net.Converters.SystemTextJson
 {
@@ -15,147 +14,102 @@ namespace CryptoExchange.Net.Converters.SystemTextJson
     /// 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
     /// </summary>
-#if NET5_0_OR_GREATER
-    public class ArrayConverter<[DynamicallyAccessedMembers(DynamicallyAccessedMemberTypes.PublicProperties)] T> : JsonConverter<T> where T : new()
-#else
-    public class ArrayConverter<T> : JsonConverter<T> where T : new()
-#endif
+    public class ArrayConverter : JsonConverterFactory
     {
-        private static SortedDictionary<int, List<ArrayPropertyInfo>>? _typePropertyInfo;
+        /// <inheritdoc />
+        public override bool CanConvert(Type typeToConvert) => true;
 
         /// <inheritdoc />
-#if NET5_0_OR_GREATER
-        [UnconditionalSuppressMessage("AssemblyLoadTrimming", "IL3050:RequiresUnreferencedCode", Justification = "JsonSerializerOptions provided here has TypeInfoResolver set")]
-        [UnconditionalSuppressMessage("AssemblyLoadTrimming", "IL2026:RequiresUnreferencedCode", Justification = "JsonSerializerOptions provided here has TypeInfoResolver set")]
-#endif
-        public override void Write(Utf8JsonWriter writer, T value, JsonSerializerOptions options)
+        public override JsonConverter CreateConverter(Type typeToConvert, JsonSerializerOptions options)
         {
-            if (value == null)
-            {
-                writer.WriteNullValue();
-                return;
-            }
-
-            if (_typePropertyInfo == null)
-                _typePropertyInfo = CacheTypeAttributes();
-
-            writer.WriteStartArray();
-            var last = -1;
-            foreach (var indexProps in _typePropertyInfo)
-            {
-                foreach (var prop in indexProps.Value)
-                {
-                    if (prop.ArrayProperty.Index == last)
-                        // Don't write the same index twice
-                        continue;
-
-                    while (prop.ArrayProperty.Index != last + 1)
-                    {
-                        writer.WriteNullValue();
-                        last += 1;
-                    }
-
-                    last = prop.ArrayProperty.Index;
-
-                    var objValue = prop.PropertyInfo.GetValue(value);
-                    if (objValue == null)
-                    {
-                        writer.WriteNullValue();
-                        continue;
-                    }
-
-                    JsonSerializerOptions? typeOptions = null;
-                    if (prop.JsonConverter != null)
-                    {
-                        typeOptions = new JsonSerializerOptions
-                        {
-                            NumberHandling = JsonNumberHandling.AllowReadingFromString | JsonNumberHandling.AllowNamedFloatingPointLiterals,
-                            PropertyNameCaseInsensitive = false,
-                            TypeInfoResolver = options.TypeInfoResolver,
-                        };
-                        typeOptions.Converters.Add(prop.JsonConverter);
-                    }
-
-                    if (prop.JsonConverter == null && IsSimple(prop.PropertyInfo.PropertyType))
-                    {
-                        if (prop.TargetType == typeof(string))
-                            writer.WriteStringValue(Convert.ToString(objValue, CultureInfo.InvariantCulture));
-                        else if (prop.TargetType == typeof(bool))
-                            writer.WriteBooleanValue((bool)objValue);
-                        else
-                            writer.WriteRawValue(Convert.ToString(objValue, CultureInfo.InvariantCulture)!);
-                    }
-                    else
-                    {
-                        JsonSerializer.Serialize(writer, objValue, typeOptions ?? options);
-                    }
-                }
-            }
-
-            writer.WriteEndArray();
+            Type converterType = typeof(ArrayConverterInner<>).MakeGenericType(typeToConvert);
+            return (JsonConverter)Activator.CreateInstance(converterType);
         }
 
-        /// <inheritdoc />
-        public override T? Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
+        private class ArrayPropertyInfo
         {
-            if (reader.TokenType == JsonTokenType.Null)
-                return default;
-
-            var result = new T();
-            return ParseObject(ref reader, result, options);
+            public PropertyInfo PropertyInfo { get; set; } = null!;
+            public ArrayPropertyAttribute ArrayProperty { get; set; } = null!;
+            public Type? JsonConverterType { get; set; }
+            public bool DefaultDeserialization { get; set; }
         }
 
-
-#if NET5_0_OR_GREATER
-        [UnconditionalSuppressMessage("AssemblyLoadTrimming", "IL3050:RequiresUnreferencedCode", Justification = "JsonSerializerOptions provided here has TypeInfoResolver set")]
-        [UnconditionalSuppressMessage("AssemblyLoadTrimming", "IL2026:RequiresUnreferencedCode", Justification = "JsonSerializerOptions provided here has TypeInfoResolver set")]
-        private static T ParseObject(ref Utf8JsonReader reader, T result, JsonSerializerOptions options)
-#else
-        private static T ParseObject(ref Utf8JsonReader reader, T result, JsonSerializerOptions options)
-#endif
+        private class ArrayConverterInner<T> : JsonConverter<T>
         {
-            if (reader.TokenType != JsonTokenType.StartArray)
-                throw new CeDeserializationException("Not an array");
+            private static readonly ConcurrentDictionary<Type, List<ArrayPropertyInfo>> _typeAttributesCache = new ConcurrentDictionary<Type, List<ArrayPropertyInfo>>();
 
 
-            if (_typePropertyInfo == null)
-                _typePropertyInfo = CacheTypeAttributes();
-
-            int index = 0;
-            while (reader.Read())
+            public override void Write(Utf8JsonWriter writer, T value, JsonSerializerOptions options)
             {
-                if (reader.TokenType == JsonTokenType.EndArray)
-                    break;
+                // TODO
+                throw new NotImplementedException();
+            }
 
-                if(!_typePropertyInfo.TryGetValue(index, out var indexAttributes))
+            /// <inheritdoc />
+            public override T? Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
+            {
+                if (reader.TokenType == JsonTokenType.Null)
+                    return default;
+
+                var result = Activator.CreateInstance(typeToConvert);
+                return (T)ParseObject(ref reader, result, typeToConvert);
+            }
+
+            private static List<ArrayPropertyInfo> CacheTypeAttributes(Type type)
+            {
+                var attributes = new List<ArrayPropertyInfo>();
+                var properties = type.GetProperties();
+                foreach (var property in properties)
                 {
-                    index++;
-                    continue;
+                    var att = property.GetCustomAttribute<ArrayPropertyAttribute>();
+                    if (att == null)
+                        continue;
+
+                    attributes.Add(new ArrayPropertyInfo
+                    {
+                        ArrayProperty = att,
+                        PropertyInfo = property,
+                        DefaultDeserialization = property.GetCustomAttribute<JsonConversionAttribute>() != null,
+                        JsonConverterType = property.GetCustomAttribute<JsonConverterAttribute>()?.ConverterType
+                    });
                 }
 
-                foreach (var attribute in indexAttributes)
+                _typeAttributesCache.TryAdd(type, attributes);
+                return attributes;
+            }
+
+            private static object ParseObject(ref Utf8JsonReader reader, object result, Type objectType)
+            {
+                if (reader.TokenType != JsonTokenType.StartArray)
+                    throw new Exception("Not an array");
+
+                if (!_typeAttributesCache.TryGetValue(objectType, out var attributes))
+                    attributes = CacheTypeAttributes(objectType);
+
+                int index = 0;
+                while (reader.Read())
                 {
-                    var targetType = attribute.TargetType;
+                    if (reader.TokenType == JsonTokenType.EndArray)
+                        break;
+
+                    var attribute = attributes.SingleOrDefault(a => a.ArrayProperty.Index == index);
+                    if (attribute == null)
+                        continue;
+
+                    var targetType = attribute.PropertyInfo.PropertyType;
+
                     object? value = null;
-                    if (attribute.JsonConverter != null)
+                    if (attribute.JsonConverterType != null)
                     {
-                        if (attribute.JsonSerializerOptions == null)
-                        {
-                            attribute.JsonSerializerOptions = new JsonSerializerOptions
-                            {
-                                NumberHandling = JsonNumberHandling.AllowReadingFromString | JsonNumberHandling.AllowNamedFloatingPointLiterals,
-                                PropertyNameCaseInsensitive = false,
-                                Converters = { attribute.JsonConverter },
-                                TypeInfoResolver = options.TypeInfoResolver,
-                            };
-                        }
-
-                        var doc = JsonDocument.ParseValue(ref reader);
-                        value = doc.Deserialize(attribute.PropertyInfo.PropertyType, attribute.JsonSerializerOptions);
+                        // Has JsonConverter attribute
+                        var options = new JsonSerializerOptions();
+                        options.Converters.Add((JsonConverter)Activator.CreateInstance(attribute.JsonConverterType));
+                        value = JsonDocument.ParseValue(ref reader).Deserialize(targetType, options);
                     }
                     else if (attribute.DefaultDeserialization)
                     {
-                        value = JsonDocument.ParseValue(ref reader).Deserialize(options.GetTypeInfo(attribute.PropertyInfo.PropertyType));
+                        // Use default deserialization
+                        value = JsonDocument.ParseValue(ref reader).Deserialize(targetType);
                     }
                     else
                     {
@@ -166,81 +120,17 @@ namespace CryptoExchange.Net.Converters.SystemTextJson
                             JsonTokenType.True => true,
                             JsonTokenType.String => reader.GetString(),
                             JsonTokenType.Number => reader.GetDecimal(),
-                            JsonTokenType.StartObject => JsonSerializer.Deserialize(ref reader, attribute.TargetType, options),
-                            _ => throw new CeDeserializationException($"Array deserialization of type {reader.TokenType} not supported"),
+                            _ => throw new NotImplementedException($"Array deserialization of type {reader.TokenType} not supported"),
                         };
                     }
 
-                    if (targetType.IsAssignableFrom(value?.GetType()))
-                        attribute.PropertyInfo.SetValue(result, value);
-                    else
-                        attribute.PropertyInfo.SetValue(result, value == null ? null : Convert.ChangeType(value, targetType, CultureInfo.InvariantCulture));
+                    attribute.PropertyInfo.SetValue(result, value == null ? null : Convert.ChangeType(value, attribute.PropertyInfo.PropertyType, CultureInfo.InvariantCulture));
+                    
+                    index++;
                 }
 
-                index++;
+                return result;
             }
-
-            return result;
-        }
-
-        private static bool IsSimple(Type type)
-        {
-            if (type.IsGenericType && type.GetGenericTypeDefinition() == typeof(Nullable<>))
-            {
-                // nullable type, check if the nested type is simple.
-                return IsSimple(type.GetGenericArguments()[0]);
-            }
-            return type.IsPrimitive
-              || type.IsEnum
-              || type == typeof(string)
-              || type == typeof(decimal);
-        }
-
-#if NET5_0_OR_GREATER
-        [UnconditionalSuppressMessage("AssemblyLoadTrimming", "IL3050:RequiresUnreferencedCode", Justification = "JsonSerializerOptions provided here has TypeInfoResolver set")]
-        [UnconditionalSuppressMessage("AssemblyLoadTrimming", "IL2026:RequiresUnreferencedCode", Justification = "JsonSerializerOptions provided here has TypeInfoResolver set")]
-        private static SortedDictionary<int, List<ArrayPropertyInfo>> CacheTypeAttributes()
-#else
-        private static SortedDictionary<int, List<ArrayPropertyInfo>> CacheTypeAttributes()
-#endif
-        {
-            var result = new SortedDictionary<int, List<ArrayPropertyInfo>>();
-            var properties = typeof(T).GetProperties();
-            foreach (var property in properties)
-            {
-                var att = property.GetCustomAttribute<ArrayPropertyAttribute>();
-                if (att == null)
-                    continue;
-
-                var targetType = Nullable.GetUnderlyingType(property.PropertyType) ?? property.PropertyType;
-                var converterType = property.GetCustomAttribute<JsonConverterAttribute>()?.ConverterType ?? targetType.GetCustomAttribute<JsonConverterAttribute>()?.ConverterType;
-                if (!result.TryGetValue(att.Index, out var indexList))
-                {
-                    indexList = new List<ArrayPropertyInfo>();
-                    result[att.Index] = indexList;
-                }
-
-                indexList.Add(new ArrayPropertyInfo
-                {
-                    ArrayProperty = att,
-                    PropertyInfo = property,
-                    DefaultDeserialization = property.GetCustomAttribute<CryptoExchange.Net.Attributes.JsonConversionAttribute>() != null,
-                    JsonConverter = converterType == null ? null : (JsonConverter)Activator.CreateInstance(converterType)!,
-                    TargetType = targetType
-                });
-            }
-
-            return result;
-        }
-
-        private class ArrayPropertyInfo
-        {
-            public PropertyInfo PropertyInfo { get; set; } = null!;
-            public ArrayPropertyAttribute ArrayProperty { get; set; } = null!;
-            public JsonConverter? JsonConverter { get; set; }
-            public bool DefaultDeserialization { get; set; }
-            public Type TargetType { get; set; } = null!;
-            public JsonSerializerOptions? JsonSerializerOptions { get; set; } = null;
         }
     }
 }

CryptoExchange.Net/Converters/SystemTextJson/BigDecimalConverter.cs

@@ -1,46 +0,0 @@
-using System;
-using System.Globalization;
-using System.Text.Json;
-using System.Text.Json.Serialization;
-
-namespace CryptoExchange.Net.Converters.SystemTextJson
-{
-    /// <summary>
-    /// Decimal converter that handles overflowing decimal values (by setting it to decimal.MaxValue)
-    /// </summary>
-    public class BigDecimalConverter : JsonConverter<decimal>
-    {
-        /// <inheritdoc />
-        public override decimal Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
-        {
-            if (reader.TokenType == JsonTokenType.String)
-            {
-                try
-                {
-                    return decimal.Parse(reader.GetString()!, NumberStyles.Float, CultureInfo.InvariantCulture);
-                }
-                catch(OverflowException)
-                {
-                    // Value doesn't fit decimal, default to max value
-                    return decimal.MaxValue;
-                }
-            }
-
-            try
-            {
-                return reader.GetDecimal();
-            }
-            catch(FormatException)
-            {
-                // Format issue, assume value is too large
-                return decimal.MaxValue;
-            }
-        }
-
-        /// <inheritdoc />
-        public override void Write(Utf8JsonWriter writer, decimal value, JsonSerializerOptions options)
-        {
-            writer.WriteNumberValue(value);
-        }
-    }
-}

CryptoExchange.Net/Converters/SystemTextJson/BoolConverter.cs

@@ -1,5 +1,5 @@
-using Microsoft.Extensions.Logging;
-using System;
+using System;
+using System.Diagnostics;
 using System.Runtime.Serialization;
 using System.Text.Json;
 using System.Text.Json.Serialization;
@@ -20,15 +20,59 @@ namespace CryptoExchange.Net.Converters.SystemTextJson
         /// <inheritdoc />
         public override JsonConverter CreateConverter(Type typeToConvert, JsonSerializerOptions options)
         {
-            return typeToConvert == typeof(bool) ? new BoolConverterInner() : new BoolConverterInnerNullable();
+            Type converterType = typeof(BoolConverterInner<>).MakeGenericType(typeToConvert);
+            return (JsonConverter)Activator.CreateInstance(converterType);
         }
 
-        private class BoolConverterInnerNullable : JsonConverter<bool?>
+        private class BoolConverterInner<T> : JsonConverter<T>
         {
-            public override bool? Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
-                => ReadBool(ref reader, typeToConvert, options);
+            public override T Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
+                => (T)((object?)ReadBool(ref reader, typeToConvert, options) ?? default(T))!;
             
-            public override void Write(Utf8JsonWriter writer, bool? value, JsonSerializerOptions options)
+            public bool? ReadBool(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
+            {
+                if (reader.TokenType == JsonTokenType.True)
+                    return true;
+
+                if (reader.TokenType == JsonTokenType.False)
+                    return false;
+
+                var value = reader.TokenType switch
+                {
+                    JsonTokenType.String => reader.GetString(),
+                    JsonTokenType.Number => reader.GetInt16().ToString(),
+                    _ => null
+                };
+
+                value = value?.ToLowerInvariant().Trim();
+                if (string.IsNullOrEmpty(value))
+                {
+                    if (typeToConvert == typeof(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;
+                }
+
+                switch (value)
+                {
+                    case "true":
+                    case "yes":
+                    case "y":
+                    case "1":
+                    case "on":
+                        return true;
+                    case "false":
+                    case "no":
+                    case "n":
+                    case "0":
+                    case "off":
+                    case "-1":
+                        return false;
+                }
+
+                throw new SerializationException($"Can't convert bool value {value}");
+            }
+
+            public override void Write(Utf8JsonWriter writer, T value, JsonSerializerOptions options)
             {
                 if (value is bool boolVal)
                     writer.WriteBooleanValue(boolVal);
@@ -37,59 +81,5 @@ namespace CryptoExchange.Net.Converters.SystemTextJson
             }
         }
 
-        private class BoolConverterInner : JsonConverter<bool>
-        {
-            public override bool Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
-                => ReadBool(ref reader, typeToConvert, options) ?? false;
-
-            public override void Write(Utf8JsonWriter writer, bool value, JsonSerializerOptions options)
-            {
-                writer.WriteBooleanValue(value);
-            }
-        }
-
-        private static bool? ReadBool(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
-        {
-            if (reader.TokenType == JsonTokenType.True)
-                return true;
-
-            if (reader.TokenType == JsonTokenType.False)
-                return false;
-
-            var value = reader.TokenType switch
-            {
-                JsonTokenType.String => reader.GetString(),
-                JsonTokenType.Number => reader.GetInt16().ToString(),
-                _ => null
-            };
-
-            value = value?.ToLowerInvariant().Trim();
-            if (string.IsNullOrEmpty(value))
-            {
-                if (typeToConvert == typeof(bool))
-                    LibraryHelpers.StaticLogger?.LogWarning("Received null or empty bool value, but property type is not a nullable bool. Resolver: {Resolver}", options.TypeInfoResolver?.GetType()?.Name);
-                return default;
-            }
-
-            switch (value)
-            {
-                case "true":
-                case "yes":
-                case "y":
-                case "1":
-                case "on":
-                    return true;
-                case "false":
-                case "no":
-                case "n":
-                case "0":
-                case "off":
-                case "-1":
-                    return false;
-            }
-
-            throw new SerializationException($"Can't convert bool value {value}");
-        }
-
     }
 }

CryptoExchange.Net/Converters/SystemTextJson/CommaSplitEnumConverter.cs

@@ -1,35 +0,0 @@
-using System;
-using System.Diagnostics.CodeAnalysis;
-using System.Linq;
-using System.Text.Json;
-using System.Text.Json.Serialization;
-
-namespace CryptoExchange.Net.Converters.SystemTextJson
-{
-    /// <summary>
-    /// Converter for comma separated enum values
-    /// </summary>
-#if NET5_0_OR_GREATER
-    public class CommaSplitEnumConverter<[DynamicallyAccessedMembers(DynamicallyAccessedMemberTypes.PublicParameterlessConstructor | DynamicallyAccessedMemberTypes.PublicFields)] T> : JsonConverter<T[]> where T : struct, Enum
-#else
-    public class CommaSplitEnumConverter<T> : JsonConverter<T[]> where T : struct, Enum
-#endif
-
-    {
-        /// <inheritdoc />
-        public override T[]? Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
-        {
-            var str = reader.GetString();
-            if (string.IsNullOrEmpty(str))
-                return [];
-
-            return str!.Split(',').Select(x => (T)EnumConverter.ParseString<T>(x)!).ToArray() ?? [];
-        }
-
-        /// <inheritdoc />
-        public override void Write(Utf8JsonWriter writer, T[] value, JsonSerializerOptions options)
-        {
-            writer.WriteStringValue(string.Join(",", value.Select(x => EnumConverter.GetString(x))));
-        }
-    }
-}

CryptoExchange.Net/Converters/SystemTextJson/CommaSplitStringConverter.cs

@@ -1,30 +0,0 @@
-using System;
-using System.Diagnostics.CodeAnalysis;
-using System.Linq;
-using System.Text.Json;
-using System.Text.Json.Serialization;
-
-namespace CryptoExchange.Net.Converters.SystemTextJson
-{
-    /// <summary>
-    /// Converter for comma separated string values
-    /// </summary>
-    public class CommaSplitStringConverter : JsonConverter<string[]>
-    {
-        /// <inheritdoc />
-        public override string[]? Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
-        {
-            var str = reader.GetString();
-            if (string.IsNullOrEmpty(str))
-                return [];
-
-            return str!.Split(',').ToArray() ?? [];
-        }
-
-        /// <inheritdoc />
-        public override void Write(Utf8JsonWriter writer, string[] value, JsonSerializerOptions options)
-        {
-            writer.WriteStringValue(string.Join(",", value));
-        }
-    }
-}

CryptoExchange.Net/Converters/SystemTextJson/DateTimeConverter.cs

@@ -1,5 +1,6 @@
-using Microsoft.Extensions.Logging;
+using Microsoft.Extensions.Primitives;
 using System;
+using System.Diagnostics;
 using System.Diagnostics.CodeAnalysis;
 using System.Globalization;
 using System.Text.Json;
@@ -14,8 +15,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 decimal _ticksPerNanosecond = TimeSpan.TicksPerMillisecond / 1000m / 1000;
+        private const double _ticksPerMicrosecond = TimeSpan.TicksPerMillisecond / 1000d;
+        private const double _ticksPerNanosecond = TimeSpan.TicksPerMillisecond / 1000d / 1000;
 
         /// <inheritdoc />
         public override bool CanConvert(Type typeToConvert)
@@ -26,107 +27,90 @@ namespace CryptoExchange.Net.Converters.SystemTextJson
         /// <inheritdoc />
         public override JsonConverter CreateConverter(Type typeToConvert, JsonSerializerOptions options)
         {
-            return typeToConvert == typeof(DateTime) ? new DateTimeConverterInner() : new NullableDateTimeConverterInner();
+            Type converterType = typeof(DateTimeConverterInner<>).MakeGenericType(typeToConvert);
+            return (JsonConverter)Activator.CreateInstance(converterType);
         }
 
-        private class NullableDateTimeConverterInner : JsonConverter<DateTime?>
+        private class DateTimeConverterInner<T> : JsonConverter<T>
         {
-            public override DateTime? Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
-                => ReadDateTime(ref reader, typeToConvert, options);
+            public override T Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
+                => (T)((object?)ReadDateTime(ref reader, typeToConvert, options) ?? default(T))!;
 
-            public override void Write(Utf8JsonWriter writer, DateTime? value, JsonSerializerOptions options)
+            private DateTime? ReadDateTime(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
+            {
+                if (reader.TokenType == JsonTokenType.Null)
+                {
+                    if (typeToConvert == typeof(DateTime))
+                        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 longValue = reader.GetDouble();
+                    if (longValue == 0 || longValue == -1)
+                        return default;
+
+                    return ParseFromDouble(longValue);
+                }
+                else if (reader.TokenType is JsonTokenType.String)
+                {
+                    var stringValue = reader.GetString();
+                    if (string.IsNullOrWhiteSpace(stringValue)
+                        || stringValue == "-1"
+                        || double.TryParse(stringValue, out var doubleVal) && doubleVal == 0)
+                    {
+                        return default;
+                    }
+
+                    return ParseFromString(stringValue!);
+                }
+                else
+                {
+                    return reader.GetDateTime();
+                }
+            }
+
+            public override void Write(Utf8JsonWriter writer, T value, JsonSerializerOptions options)
             {
                 if (value == null)
-                {
                     writer.WriteNullValue();
-                    return;
-                }
-
-                if (value.Value == default)
-                    writer.WriteStringValue(default(DateTime));
                 else
-                    writer.WriteNumberValue((long)Math.Round((value.Value - new DateTime(1970, 1, 1)).TotalMilliseconds));
-            }
-        }
-
-        private class DateTimeConverterInner : JsonConverter<DateTime>
-        {
-            public override DateTime Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
-                => ReadDateTime(ref reader, typeToConvert, options) ?? default;            
-
-            public override void Write(Utf8JsonWriter writer, DateTime value, JsonSerializerOptions options)
-            {
-                var dtValue = value;
-                if (dtValue == default)
-                    writer.WriteStringValue(default(DateTime));
-                else
-                    writer.WriteNumberValue((long)Math.Round((dtValue - new DateTime(1970, 1, 1)).TotalMilliseconds));
-            }
-        }
-
-        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. Resolver: {Resolver}", options.TypeInfoResolver?.GetType()?.Name);
-                return default;
-            }
-
-            if (reader.TokenType is JsonTokenType.Number)
-            {
-                var decValue = reader.GetDecimal();
-                if (decValue == 0 || decValue < 0)
-                    return default;
-
-                return ParseFromDecimal(decValue);
-            }
-            else if (reader.TokenType is JsonTokenType.String)
-            {
-                var stringValue = reader.GetString();
-                if (string.IsNullOrWhiteSpace(stringValue)
-                    || stringValue!.Equals("-1", StringComparison.Ordinal)
-                    || stringValue!.Equals("0001-01-01T00:00:00Z", StringComparison.OrdinalIgnoreCase)
-                    || decimal.TryParse(stringValue, out var decVal) && decVal == 0)
                 {
-                    return default;
+                    var dtValue = (DateTime)(object)value;
+                    if (dtValue == default)
+                        writer.WriteStringValue(default(DateTime));
+                    else
+                        writer.WriteNumberValue((long)Math.Round((dtValue - new DateTime(1970, 1, 1)).TotalMilliseconds));
                 }
-
-                return ParseFromString(stringValue!, options.TypeInfoResolver?.GetType()?.Name);
-            }
-            else
-            {
-                return reader.GetDateTime();
             }
         }
 
         /// <summary>
-        /// Parse a double value to datetime
+        /// Parse a long value to datetime
         /// </summary>
-        public static DateTime ParseFromDouble(double value)
-            => ParseFromDecimal((decimal)value);
-
-        /// <summary>
-        /// Parse a decimal value to datetime
-        /// </summary>
-        public static DateTime ParseFromDecimal(decimal value)
+        /// <param name="longValue"></param>
+        /// <returns></returns>
+        public static DateTime ParseFromDouble(double longValue)
         {
-            if (value < 19999999999)
-                return ConvertFromSeconds(value);
-            if (value < 19999999999999)
-                return ConvertFromMilliseconds(value);
-            if (value < 19999999999999999)
-                return ConvertFromMicroseconds(value);
+            if (longValue < 19999999999)
+                return ConvertFromSeconds(longValue);
+            if (longValue < 19999999999999)
+                return ConvertFromMilliseconds(longValue);
+            if (longValue < 19999999999999999)
+                return ConvertFromMicroseconds(longValue);
 
-            return ConvertFromNanoseconds(value);
+            return ConvertFromNanoseconds(longValue);
         }
 
         /// <summary>
         /// Parse a string value to datetime
         /// </summary>
-        public static DateTime ParseFromString(string stringValue, string? resolverName)
+        /// <param name="stringValue"></param>
+        /// <returns></returns>
+        public static DateTime ParseFromString(string stringValue)
         {
-            if (stringValue!.Length == 12 && stringValue.StartsWith("202", StringComparison.OrdinalIgnoreCase))
+            if (stringValue!.Length == 12 && stringValue.StartsWith("202"))
             {
                 // Parse 202303261200 format
                 if (!int.TryParse(stringValue.Substring(0, 4), out var year)
@@ -135,7 +119,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: {Value}. Resolver: {Resolver}", stringValue, resolverName);
+                    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);
@@ -148,7 +132,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: {Value}. Resolver: {Resolver}", stringValue, resolverName);
+                    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);
@@ -161,25 +145,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: {Value}. Resolver: {Resolver}", stringValue, resolverName);
+                    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)
-                    return ConvertFromSeconds(decimalValue);
-                if (decimalValue < 19999999999999)
-                    return ConvertFromMilliseconds(decimalValue);
-                if (decimalValue < 19999999999999999)
-                    return ConvertFromMicroseconds(decimalValue);
+                if (doubleValue < 19999999999)
+                    return ConvertFromSeconds(doubleValue);
+                if (doubleValue < 19999999999999)
+                    return ConvertFromMilliseconds((long)doubleValue);
+                if (doubleValue < 19999999999999999)
+                    return ConvertFromMicroseconds((long)doubleValue);
 
-                return ConvertFromNanoseconds(decimalValue);
+                return ConvertFromNanoseconds((long)doubleValue);
             }
 
             if (stringValue.Length == 10)
@@ -190,7 +174,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: {Value}. Resolver: {Resolver}", stringValue, resolverName);
+                    Trace.WriteLine("{DateTime.Now:yyyy/MM/dd HH:mm:ss:fff} | Warning | Unknown DateTime format: " + stringValue);
                     return default;
                 }
 
@@ -203,70 +187,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));
-        /// <summary>
-        /// Convert a nanoseconds since epoch (01-01-1970) value to DateTime
-        /// </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);
+        /// <param name="seconds"></param>
+        /// <returns></returns>
+        public static DateTime ConvertFromSeconds(double seconds) => _epoch.AddTicks((long)Math.Round(seconds * _ticksPerSecond));
         /// <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));
-        /// <summary>
-        /// Convert a nanoseconds since epoch (01-01-1970) value to DateTime
-        /// </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);
+        /// <param name="milliseconds"></param>
+        /// <returns></returns>
+        public static DateTime ConvertFromMilliseconds(double milliseconds) => _epoch.AddTicks((long)Math.Round(milliseconds * TimeSpan.TicksPerMillisecond));
         /// <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);
-        /// <summary>
-        /// Convert a nanoseconds since epoch (01-01-1970) value to DateTime
-        /// </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);
+        /// <param name="nanoseconds"></param>
+        /// <returns></returns>
+        public static DateTime ConvertFromNanoseconds(double nanoseconds) => _epoch.AddTicks((long)Math.Round(nanoseconds * _ticksPerNanosecond));
 
         /// <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,4 +1,5 @@
 using System;
+using System.Globalization;
 using System.Text.Json;
 using System.Text.Json.Serialization;
 
@@ -18,18 +19,13 @@ namespace CryptoExchange.Net.Converters.SystemTextJson
             if (reader.TokenType == JsonTokenType.String)
             {
                 var value = reader.GetString();
-                return ExchangeHelpers.ParseDecimal(value);
+                if (string.IsNullOrEmpty(value))
+                    return null;
+
+                return decimal.Parse(value, NumberStyles.Float, CultureInfo.InvariantCulture);
             }
 
-            try
-            {
-                return reader.GetDecimal();
-            }
-            catch(FormatException)
-            {
-                // Format issue, assume value is too large
-                return decimal.MaxValue;
-            }
+            return reader.GetDecimal();
         }
 
         /// <inheritdoc />

CryptoExchange.Net/Converters/SystemTextJson/EnumConverter.cs

@@ -1,11 +1,8 @@
 using CryptoExchange.Net.Attributes;
-using Microsoft.Extensions.Logging;
 using System;
 using System.Collections.Concurrent;
-#if NET8_0_OR_GREATER
-using System.Collections.Frozen;
-#endif
 using System.Collections.Generic;
+using System.Diagnostics;
 using System.Diagnostics.CodeAnalysis;
 using System.Linq;
 using System.Reflection;
@@ -14,96 +11,127 @@ using System.Text.Json.Serialization;
 
 namespace CryptoExchange.Net.Converters.SystemTextJson
 {
-    /// <summary>
-    /// Static EnumConverter methods
-    /// </summary>
-    public static class EnumConverter
-    {
-        /// <summary>
-        /// Get the enum value from a string
-        /// </summary>
-        /// <param name="value">String value</param>
-        /// <returns></returns>
-#if NET5_0_OR_GREATER
-        public static T? ParseString<[DynamicallyAccessedMembers(DynamicallyAccessedMemberTypes.PublicParameterlessConstructor | DynamicallyAccessedMemberTypes.PublicFields)] T>(string value) where T : struct, Enum
-#else
-        public static T? ParseString<T>(string value) where T : struct, Enum
-#endif
-            => EnumConverter<T>.ParseString(value);
-
-        /// <summary>
-        /// Get the string value for an enum value using the MapAttribute mapping. When multiple values are mapped for a enum entry the first value will be returned
-        /// </summary>
-        /// <param name="enumValue"></param>
-        /// <returns></returns>
-#if NET5_0_OR_GREATER
-        public static string GetString<[DynamicallyAccessedMembers(DynamicallyAccessedMemberTypes.PublicParameterlessConstructor | DynamicallyAccessedMemberTypes.PublicFields)] T>(T enumValue) where T : struct, Enum
-#else
-        public static string GetString<T>(T enumValue) where T : struct, Enum
-#endif
-            => EnumConverter<T>.GetString(enumValue);
-
-        /// <summary>
-        /// Get the string value for an enum value using the MapAttribute mapping. When multiple values are mapped for a enum entry the first value will be returned
-        /// </summary>
-        /// <param name="enumValue"></param>
-        /// <returns></returns>
-        [return: NotNullIfNotNull("enumValue")]
-#if NET5_0_OR_GREATER
-        public static string? GetString<[DynamicallyAccessedMembers(DynamicallyAccessedMemberTypes.PublicParameterlessConstructor | DynamicallyAccessedMemberTypes.PublicFields)] T>(T? enumValue) where T : struct, Enum
-#else
-        public static string? GetString<T>(T? enumValue) where T : struct, Enum
-#endif
-            => EnumConverter<T>.GetString(enumValue);
-    }
-
     /// <summary>
     /// Converter for enum values. Enums entries should be noted with a MapAttribute to map the enum value to a string value
     /// </summary>
-#if NET5_0_OR_GREATER
-    public class EnumConverter<[DynamicallyAccessedMembers(DynamicallyAccessedMemberTypes.PublicParameterlessConstructor | DynamicallyAccessedMemberTypes.PublicFields)] T>
-#else
-    public class EnumConverter<T>
-#endif
-         : JsonConverter<T>, INullableConverterFactory where T : struct, Enum
+    public class EnumConverter : JsonConverterFactory
     {
-        class EnumMapping
-        {
-            public T Value { get; set; }
-            public string StringValue { get; set; }
+        private bool _warnOnMissingEntry = true;
+        private bool _writeAsInt;
+        private static readonly ConcurrentDictionary<Type, List<KeyValuePair<object, string>>> _mapping = new();
 
-            public EnumMapping(T value, string stringValue)
-            {
-                Value = value;
-                StringValue = stringValue;
-            }
+        /// <summary>
+        /// </summary>
+        public EnumConverter() { }
+
+        /// <summary>
+        /// </summary>
+        /// <param name="writeAsInt"></param>
+        /// <param name="warnOnMissingEntry"></param>
+        public EnumConverter(bool writeAsInt, bool warnOnMissingEntry)
+        {
+            _writeAsInt = writeAsInt;
+            _warnOnMissingEntry = warnOnMissingEntry;
         }
 
-#if NET8_0_OR_GREATER
-        private static FrozenSet<EnumMapping>? _mappingToEnum = null;
-        private static FrozenDictionary<T, string>? _mappingToString = null;
-#else
-        private static List<EnumMapping>? _mappingToEnum = null;
-        private static Dictionary<T, string>? _mappingToString = null;
-#endif
-        private NullableEnumConverter? _nullableEnumConverter = null;
-
-        private static ConcurrentBag<string> _unknownValuesWarned = new ConcurrentBag<string>();
-
-        internal class NullableEnumConverter : JsonConverter<T?>
+        /// <inheritdoc />
+        public override bool CanConvert(Type typeToConvert)
         {
-            private readonly EnumConverter<T> _enumConverter;
+            return typeToConvert.IsEnum || Nullable.GetUnderlyingType(typeToConvert)?.IsEnum == true;
+        }
 
-            public NullableEnumConverter(EnumConverter<T> enumConverter)
+        /// <inheritdoc />
+        public override JsonConverter? CreateConverter(Type typeToConvert, JsonSerializerOptions options)
+        {
+            JsonConverter converter = (JsonConverter)Activator.CreateInstance(
+                typeof(EnumConverterInner<>).MakeGenericType(
+                    new Type[] { typeToConvert }),
+                BindingFlags.Instance | BindingFlags.Public,
+                binder: null,
+                args: new object[] { _writeAsInt, _warnOnMissingEntry },
+                culture: null)!;
+
+            return converter;
+        }
+
+        private static List<KeyValuePair<object, string>> AddMapping(Type objectType)
+        {
+            var mapping = new List<KeyValuePair<object, string>>();
+            var enumMembers = objectType.GetMembers();
+            foreach (var member in enumMembers)
             {
-                _enumConverter = enumConverter;
+                var maps = member.GetCustomAttributes(typeof(MapAttribute), false);
+                foreach (MapAttribute attribute in maps)
+                {
+                    foreach (var value in attribute.Values)
+                        mapping.Add(new KeyValuePair<object, string>(Enum.Parse(objectType, member.Name), value));
+                }
             }
+            _mapping.TryAdd(objectType, mapping);
+            return mapping;
+        }
+
+        private class EnumConverterInner<T> : JsonConverter<T>
+        {
+            private bool _warnOnMissingEntry = true;
+            private bool _writeAsInt;
+
+            public EnumConverterInner(bool writeAsInt, bool warnOnMissingEntry)
+            {
+                _warnOnMissingEntry = warnOnMissingEntry;
+                _writeAsInt = writeAsInt;
+            }
+
             public override T? Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
             {
-                return _enumConverter.ReadNullable(ref reader, typeToConvert, options, out var isEmptyString);
+                var enumType = Nullable.GetUnderlyingType(typeToConvert) ?? typeToConvert;
+                if (!_mapping.TryGetValue(enumType, out var mapping))
+                    mapping = AddMapping(enumType);
+
+                var stringValue = reader.TokenType switch
+                {
+                    JsonTokenType.String => reader.GetString(),
+                    JsonTokenType.Number => reader.GetInt16().ToString(),
+                    JsonTokenType.True => reader.GetBoolean().ToString(),
+                    JsonTokenType.False => reader.GetBoolean().ToString(),
+                    JsonTokenType.Null => null,
+                    _ => throw new Exception("Invalid token type for enum deserialization: " + reader.TokenType)
+                };
+
+                if (string.IsNullOrEmpty(stringValue))
+                {
+                    // Received null value
+                    var emptyResult = GetDefaultValue(typeToConvert, enumType);
+                    if (emptyResult != null)
+                        // If the property we're parsing to isn't nullable there isn't a correct way to return this as null will either throw an exception (.net framework) or the default enum value (dotnet core).
+                        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: {enumType.Name}. If you think {enumType.Name} should be nullable please open an issue on the Github repo");
+
+                    return (T?)emptyResult;
+                }
+
+                if (!GetValue(enumType, mapping, stringValue!, out var result))
+                {
+                    var defaultValue = GetDefaultValue(typeToConvert, enumType);
+                    if (string.IsNullOrWhiteSpace(stringValue))
+                    {
+                        if (defaultValue != null)
+                            // We received an empty string and have no mapping for it, and the property isn't nullable
+                            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: {enumType.Name}. If you think {enumType.Name} should be nullable please open an issue on the Github repo");
+                    }
+                    else
+                    {
+                        // We received an enum value but weren't able to parse it.
+                        if (_warnOnMissingEntry)
+                            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");
+                    }
+
+                    return (T?)defaultValue;
+                }
+
+                return (T?)result;
             }
 
-            public override void Write(Utf8JsonWriter writer, T? value, JsonSerializerOptions options)
+            public override void Write(Utf8JsonWriter writer, T value, JsonSerializerOptions options)
             {
                 if (value == null)
                 {
@@ -111,255 +139,77 @@ namespace CryptoExchange.Net.Converters.SystemTextJson
                 }
                 else
                 {
-                    _enumConverter.Write(writer, value.Value, options);
-                }
-            }
-        }
-
-        /// <inheritdoc />
-        public override T Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
-        {
-            var t = ReadNullable(ref reader, typeToConvert, options, out var isEmptyString);
-            if (t == null)
-            {
-                if (isEmptyString && !_unknownValuesWarned.Contains(null))
-                {
-                    // 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");
-                }
-
-                return new T(); // return default value
-            }
-            else
-            {
-                return t.Value;
-            }
-        }
-
-        private T? ReadNullable(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options, out bool isEmptyString)
-        {
-            isEmptyString = false;
-            var enumType = typeof(T);
-            if (_mappingToEnum == null)
-                CreateMapping();
-
-            var stringValue = reader.TokenType switch
-            {
-                JsonTokenType.String => reader.GetString(),
-                JsonTokenType.Number => reader.GetInt32().ToString(),
-                JsonTokenType.True => reader.GetBoolean().ToString(),
-                JsonTokenType.False => reader.GetBoolean().ToString(),
-                JsonTokenType.Null => null,
-                _ => throw new Exception("Invalid token type for enum deserialization: " + reader.TokenType)
-            };
-
-            if (stringValue is null)
-                return null;
-
-            if (!GetValue(enumType, stringValue, out var result))
-            {
-                if (string.IsNullOrWhiteSpace(stringValue))
-                {
-                    isEmptyString = true;
-                }
-                else
-                {
-                    // We received an enum value but weren't able to parse it.
-                    if (!_unknownValuesWarned.Contains(stringValue))
+                    if (!_writeAsInt)
                     {
-                        _unknownValuesWarned.Add(stringValue!);
-                        LibraryHelpers.StaticLogger?.LogWarning($"Cannot map enum value. EnumType: {enumType.FullName}, Value: {stringValue}, Known values: [{string.Join(", ", _mappingToEnum!.Select(m => $"{m.StringValue}: {m.Value}"))}]. If you think {stringValue} should added please open an issue on the Github repo");
+                        var stringValue = GetString(value.GetType(), value);
+                        writer.WriteStringValue(stringValue);
+                    }
+                    else
+                    {
+                        writer.WriteNumberValue((int)Convert.ChangeType(value, typeof(int)));
                     }
                 }
-
-                return null;
             }
 
-            return result;
-        }
-
-        /// <inheritdoc />
-        public override void Write(Utf8JsonWriter writer, T value, JsonSerializerOptions options)
-        {
-            var stringValue = GetString(value);
-            writer.WriteStringValue(stringValue);
-        }
-
-        private static bool GetValue(Type objectType, string value, out T? result)
-        {
-            if (_mappingToEnum != null)
+            private static object? GetDefaultValue(Type objectType, Type enumType)
             {
-                EnumMapping? mapping = null;
-                // Try match on full equals
-                foreach (var item in _mappingToEnum)
-                {
-                    if (item.StringValue.Equals(value, StringComparison.Ordinal))
-                    {
-                        mapping = item;
-                        break;
-                    }
-                }
+                if (Nullable.GetUnderlyingType(objectType) != null)
+                    return null;
 
-                // If not found, try matching ignoring case
-                if (mapping == null)
-                {
-                    foreach (var item in _mappingToEnum)
-                    {
-                        if (item.StringValue.Equals(value, StringComparison.OrdinalIgnoreCase))
-                        {
-                            mapping = item;
-                            break;
-                        }
-                    }
-                }
+                return Activator.CreateInstance(enumType); // return default value
+            }
 
-                if (mapping != null)
+            private static bool GetValue(Type objectType, List<KeyValuePair<object, string>> enumMapping, string value, out object? result)
+            {
+                // Check for exact match first, then if not found fallback to a case insensitive match 
+                var mapping = enumMapping.FirstOrDefault(kv => kv.Value.Equals(value, StringComparison.InvariantCulture));
+                if (mapping.Equals(default(KeyValuePair<object, string>)))
+                    mapping = enumMapping.FirstOrDefault(kv => kv.Value.Equals(value, StringComparison.InvariantCultureIgnoreCase));
+
+                if (!mapping.Equals(default(KeyValuePair<object, string>)))
                 {
-                    result = mapping.Value;
+                    result = mapping.Key;
                     return true;
                 }
-            }
 
-            if (objectType.IsDefined(typeof(FlagsAttribute)))
-            {
-                var intValue = int.Parse(value);
-                result = (T)Enum.ToObject(objectType, intValue);
-                return true;
-            }
-
-            if (_unknownValuesWarned.Contains(value))
-            {
-                // Check if it is an known unknown value
-                // Done here to prevent lookup overhead for normal conversions, but prevent expensive exception throwing
-                result = default;
-                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
-                result = (T)Enum.Parse(objectType, value, true);
-                if (!Enum.IsDefined(objectType, result))
+                try
+                {
+                    // If no explicit mapping is found try to parse string
+                    result = Enum.Parse(objectType, value, true);
+                    return true;
+                }
+                catch (Exception)
                 {
                     result = default;
                     return false;
                 }
-
-                return true;
             }
-            catch (Exception)
-            {
-                result = default;
-                return false;
-            }
-        }
-
-        private static void CreateMapping()
-        {
-            var mappingToEnum = new List<EnumMapping>();
-            var mappingToString = new Dictionary<T, string>();
-
-            var enumType = Nullable.GetUnderlyingType(typeof(T)) ?? typeof(T);
-            var enumMembers = enumType.GetFields();
-            foreach (var member in enumMembers)
-            {
-                var maps = member.GetCustomAttributes(typeof(MapAttribute), false);
-                foreach (MapAttribute attribute in maps)
-                {
-                    foreach (var value in attribute.Values)
-                    {
-                        var enumVal = (T)Enum.Parse(enumType, member.Name);
-                        mappingToEnum.Add(new EnumMapping(enumVal, value));
-                        if (!mappingToString.ContainsKey(enumVal))
-                            mappingToString.Add(enumVal, value);
-                    }
-                }
-            }
-
-#if NET8_0_OR_GREATER
-            _mappingToEnum = mappingToEnum.ToFrozenSet();
-            _mappingToString = mappingToString.ToFrozenDictionary();
-#else
-            _mappingToEnum = mappingToEnum;
-            _mappingToString = mappingToString;
-#endif
         }
 
         /// <summary>
         /// Get the string value for an enum value using the MapAttribute mapping. When multiple values are mapped for a enum entry the first value will be returned
         /// </summary>
+        /// <typeparam name="T"></typeparam>
         /// <param name="enumValue"></param>
         /// <returns></returns>
         [return: NotNullIfNotNull("enumValue")]
-        public static string? GetString(T? enumValue)
-        {
-            if (_mappingToString == null)
-                CreateMapping();
-
-            return enumValue == null ? null : (_mappingToString!.TryGetValue(enumValue.Value, out var str) ? str : enumValue.ToString());
-        }
+        public static string? GetString<T>(T enumValue) => GetString(typeof(T), enumValue);
 
         /// <summary>
-        /// Get the enum value from a string
+        /// Get the string value for an enum value using the MapAttribute mapping. When multiple values are mapped for a enum entry the first value will be returned
         /// </summary>
-        /// <param name="value">String value</param>
+        /// <param name="objectType"></param>
+        /// <param name="enumValue"></param>
         /// <returns></returns>
-        public static T? ParseString(string value)
+        [return: NotNullIfNotNull("enumValue")]
+        public static string? GetString(Type objectType, object? enumValue)
         {
-            var type = Nullable.GetUnderlyingType(typeof(T)) ?? typeof(T);
-            if (_mappingToEnum == null)
-                CreateMapping();
+            objectType = Nullable.GetUnderlyingType(objectType) ?? objectType;
 
-            EnumMapping? mapping = null;
-            // Try match on full equals
-            foreach(var item in _mappingToEnum!)
-            {
-                if (item.StringValue.Equals(value, StringComparison.Ordinal))
-                {
-                    mapping = item;
-                    break;
-                }
-            }
+            if (!_mapping.TryGetValue(objectType, out var mapping))
+                mapping = AddMapping(objectType);
 
-            // If not found, try matching ignoring case
-            if (mapping == null)
-            {
-                foreach (var item in _mappingToEnum)
-                {
-                    if (item.StringValue.Equals(value, StringComparison.OrdinalIgnoreCase))
-                    {
-                        mapping = item;
-                        break;
-                    }
-                }
-            }
-
-            if (mapping != null)
-                return mapping.Value;
-
-            try
-            {
-                // If no explicit mapping is found try to parse string
-                return (T)Enum.Parse(type, value, true);
-            }
-            catch (Exception)
-            {
-                return default;
-            }
-        }
-
-        /// <inheritdoc />
-        public JsonConverter CreateNullableConverter()
-        {
-            _nullableEnumConverter ??= new NullableEnumConverter(this);
-            return _nullableEnumConverter;
+            return enumValue == null ? null : (mapping.FirstOrDefault(v => v.Key.Equals(enumValue)).Value ?? enumValue.ToString());
         }
     }
 }

CryptoExchange.Net/Converters/SystemTextJson/EnumIntWriterConverter.cs

@@ -1,22 +0,0 @@
-using System;
-using System.Text.Json;
-using System.Text.Json.Serialization;
-
-namespace CryptoExchange.Net.Converters.SystemTextJson
-{
-    /// <summary>
-    /// Converter for serializing enum values as int
-    /// </summary>
-    public class EnumIntWriterConverter<T> : JsonConverter<T> where T: struct, Enum
-    {
-        /// <inheritdoc />
-        public override T Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
-        {
-            throw new NotImplementedException();
-        }
-
-        /// <inheritdoc />
-        public override void Write(Utf8JsonWriter writer, T value, JsonSerializerOptions options)
-            => writer.WriteNumberValue((int)(object)value);
-    }
-}

CryptoExchange.Net/Converters/SystemTextJson/INullableConverterFactory.cs

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

CryptoExchange.Net/Converters/SystemTextJson/IntBoolConverter.cs

@@ -1,38 +0,0 @@
-using System;
-using System.Text.Json;
-using System.Text.Json.Serialization;
-
-namespace CryptoExchange.Net.Converters.SystemTextJson
-{
-    /// <summary>
-    /// Bool converter
-    /// </summary>
-    public class IntBoolConverter : JsonConverter<bool>
-    {
-        private readonly int _trueValue;
-
-        /// <summary>
-        /// ctor
-        /// </summary>
-        /// <param name="trueValue">The int value representing the true value</param>
-        public IntBoolConverter(int trueValue)
-        {
-            _trueValue = trueValue;
-        }
-
-        /// <inheritdoc />
-        public override bool Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
-        {
-            if (reader.TokenType != JsonTokenType.Number)
-                return false;
-
-            return reader.GetDecimal() == _trueValue;              
-        }
-
-        /// <inheritdoc />
-        public override void Write(Utf8JsonWriter writer, bool value, JsonSerializerOptions options)
-        {
-            writer.WriteNumberValue(_trueValue);
-        }
-    }
-}

CryptoExchange.Net/Converters/SystemTextJson/MessageHandlers/JsonRestMessageHandler.cs

@@ -1,131 +0,0 @@
-using CryptoExchange.Net.Converters.MessageParsing.DynamicConverters;
-using CryptoExchange.Net.Objects;
-using CryptoExchange.Net.Objects.Errors;
-using System;
-using System.Diagnostics.CodeAnalysis;
-using System.IO;
-using System.Linq;
-using System.Net.Http.Headers;
-using System.Text.Json;
-using System.Threading;
-using System.Threading.Tasks;
-
-namespace CryptoExchange.Net.Converters.SystemTextJson.MessageHandlers
-{
-    /// <summary>
-    /// JSON REST message handler
-    /// </summary>
-    public abstract class JsonRestMessageHandler : IRestMessageHandler
-    {
-        private static MediaTypeWithQualityHeaderValue _acceptJsonContent = new MediaTypeWithQualityHeaderValue(Constants.JsonContentHeader);
-        private const int _errorResponseSnippetLimit = 128;
-
-        /// <summary>
-        /// Empty rate limit error
-        /// </summary>
-        protected static readonly ServerRateLimitError _emptyRateLimitError = new ServerRateLimitError();
-
-        /// <inheritdoc />
-        public virtual bool RequiresSeekableStream => false;
-
-        /// <summary>
-        /// The serializer options to use
-        /// </summary>
-        public abstract JsonSerializerOptions Options { get; }
-
-        /// <inheritdoc />
-        public MediaTypeWithQualityHeaderValue AcceptHeader => _acceptJsonContent;
-
-        /// <inheritdoc />
-        public virtual ValueTask<ServerRateLimitError> ParseErrorRateLimitResponse(
-            int httpStatusCode,
-            HttpResponseHeaders responseHeaders,
-            Stream responseStream)
-        {
-            // Handle retry after header
-            var retryAfterHeader = responseHeaders.SingleOrDefault(r => r.Key.Equals("Retry-After", StringComparison.InvariantCultureIgnoreCase));
-            if (retryAfterHeader.Value?.Any() != true)
-                return new ValueTask<ServerRateLimitError>(_emptyRateLimitError);
-
-            var value = retryAfterHeader.Value.First();
-            if (int.TryParse(value, out var seconds))
-                return new ValueTask<ServerRateLimitError>(new ServerRateLimitError() { RetryAfter = DateTime.UtcNow.AddSeconds(seconds) });
-
-            if (DateTime.TryParse(value, out var datetime))
-                return new ValueTask<ServerRateLimitError>(new ServerRateLimitError() { RetryAfter = datetime });
-
-            return new ValueTask<ServerRateLimitError>(_emptyRateLimitError);
-        }
-
-        /// <inheritdoc />
-        public abstract ValueTask<Error> ParseErrorResponse(
-            int httpStatusCode,
-            HttpResponseHeaders responseHeaders,
-            Stream responseStream);
-
-        /// <inheritdoc />
-        public virtual ValueTask<Error?> CheckForErrorResponse(
-            RequestDefinition request,
-            HttpResponseHeaders responseHeaders,
-            Stream responseStream) => new ValueTask<Error?>((Error?)null);
-
-        /// <summary>
-        /// Read the response into a JsonDocument object
-        /// </summary>
-        protected virtual async ValueTask<(Error?, JsonDocument?)> GetJsonDocument(Stream stream)
-        {
-            try
-            {
-                var document = await JsonDocument.ParseAsync(stream).ConfigureAwait(false);
-                return (null, document);
-            }
-            catch (Exception ex)
-            {
-                var errorMsg = "Deserialization failed, invalid JSON";
-                if (stream.CanSeek)
-                {
-                    var dataSnippet = new char[_errorResponseSnippetLimit];
-                    stream.Seek(0, SeekOrigin.Begin);
-                    var written = new StreamReader(stream).ReadBlock(dataSnippet, 0, _errorResponseSnippetLimit);
-                    var data = new string(dataSnippet, 0, written);
-                    errorMsg += $": {data}";
-                    if (data.Length == _errorResponseSnippetLimit)
-                        errorMsg += " (truncated)";
-                }
-
-                var error = new DeserializeError(errorMsg, ex);
-                return (error, null);
-            }
-        }
-
-        /// <inheritdoc />
-#if NET5_0_OR_GREATER
-        [UnconditionalSuppressMessage("AssemblyLoadTrimming", "IL3050:RequiresUnreferencedCode", Justification = "JsonSerializerOptions provided here has TypeInfoResolver set")]
-        [UnconditionalSuppressMessage("AssemblyLoadTrimming", "IL2026:RequiresUnreferencedCode", Justification = "JsonSerializerOptions provided here has TypeInfoResolver set")]
-#endif
-        public async ValueTask<(T? Result, Error? Error)> TryDeserializeAsync<T>(Stream responseStream, CancellationToken cancellationToken)
-        {
-            try
-            {
-#pragma warning disable IL2026 // Members annotated with 'RequiresUnreferencedCodeAttribute' require dynamic access otherwise can break functionality when trimming application code
-#pragma warning disable IL3050 // Calling members annotated with 'RequiresDynamicCodeAttribute' may break functionality when AOT compiling.
-                var result = await JsonSerializer.DeserializeAsync<T>(responseStream, Options)!.ConfigureAwait(false)!;
-#pragma warning restore IL3050 // Calling members annotated with 'RequiresDynamicCodeAttribute' may break functionality when AOT compiling.
-#pragma warning restore IL2026 // Members annotated with 'RequiresUnreferencedCodeAttribute' require dynamic access otherwise can break functionality when trimming application code
-                return (result, null);
-            }            
-            catch (JsonException ex)
-            {
-                var info = $"Json deserialization failed: {ex.Message}, Path: {ex.Path}, LineNumber: {ex.LineNumber}, LinePosition: {ex.BytePositionInLine}";
-                return (default, new DeserializeError(info, ex));
-            }
-            catch (Exception ex)
-            {
-                return (default, new DeserializeError($"Json deserialization failed: {ex.Message}", ex));
-            }
-        }
-
-        /// <inheritdoc />
-        public virtual Error? CheckDeserializedResponse<T>(HttpResponseHeaders responseHeaders, T result) => null;
-    }
-}

CryptoExchange.Net/Converters/SystemTextJson/MessageHandlers/JsonSocketMessageHandler.cs

@@ -1,362 +0,0 @@
-using CryptoExchange.Net.Converters.MessageParsing.DynamicConverters;
-using System;
-using System.Collections.Generic;
-using System.Diagnostics.CodeAnalysis;
-using System.Linq;
-using System.Net.WebSockets;
-using System.Text;
-using System.Text.Json;
-
-namespace CryptoExchange.Net.Converters.SystemTextJson.MessageHandlers
-{
-    /// <summary>
-    /// JSON WebSocket message handler, sequentially read the JSON and looks for specific predefined fields to identify the message
-    /// </summary>
-    public abstract class JsonSocketMessageHandler : ISocketMessageHandler
-    {
-        /// <summary>
-        /// The serializer options to use
-        /// </summary>
-        public abstract JsonSerializerOptions Options { get; }
-
-        /// <summary>
-        /// Message evaluators
-        /// </summary>
-        protected abstract MessageTypeDefinition[] TypeEvaluators { get; }
-
-        private readonly SearchResult _searchResult = new();
-
-        private bool _hasArraySearches;
-        private bool _initialized;
-        private int _maxSearchDepth;
-        private MessageTypeDefinition? _topEvaluator;
-        private List<MessageEvalutorFieldReference>? _searchFields;
-        private Dictionary<Type, Func<object, string?>>? _baseTypeMapping;
-        private Dictionary<Type, Func<object, string?>>? _mapping;
-
-        /// <summary>
-        /// Add a mapping of a specific object of a type to a specific topic
-        /// </summary>
-        /// <typeparam name="T">Type to get topic for</typeparam>
-        /// <param name="mapping">The topic retrieve delegate</param>
-        protected void AddTopicMapping<T>(Func<T, string?> mapping)
-        {
-            _mapping ??= new Dictionary<Type, Func<object, string?>>();
-            _mapping.Add(typeof(T), x => mapping((T)x));
-        }
-
-        private void InitializeConverter()
-        {
-            if (_initialized)
-                return;
-
-            _maxSearchDepth = int.MinValue;
-            _searchFields = new List<MessageEvalutorFieldReference>();
-            foreach (var evaluator in TypeEvaluators)
-            {
-                _topEvaluator ??= evaluator;
-                foreach (var field in evaluator.Fields)
-                {
-                    var overlapping = _searchFields.Where(otherField =>
-                    {
-                        if (field is PropertyFieldReference propRef
-                            && otherField.Field is PropertyFieldReference otherPropRef)
-                        {
-                            return field.Depth == otherPropRef.Depth && propRef.PropertyName.SequenceEqual(otherPropRef.PropertyName);
-                        }
-                        else if (field is ArrayFieldReference arrayRef
-                            && otherField.Field is ArrayFieldReference otherArrayPropRef)
-                        {
-                            return field.Depth == otherArrayPropRef.Depth && arrayRef.ArrayIndex == otherArrayPropRef.ArrayIndex;
-                        }
-
-                        return false;
-                    }).ToList();
-
-                    if (overlapping.Any())
-                    {
-                        foreach (var overlap in overlapping)
-                            overlap.OverlappingField = true;
-                    }
-
-                    List<MessageEvalutorFieldReference>? existingSameSearchField = new();
-                    if (field is ArrayFieldReference arrayField)
-                    {
-                        _hasArraySearches = true;
-                        existingSameSearchField = _searchFields.Where(x =>
-                            x.Field is ArrayFieldReference arrayFieldRef
-                            && arrayFieldRef.ArrayIndex == arrayField.ArrayIndex
-                            && arrayFieldRef.Depth == arrayField.Depth
-                            && arrayFieldRef.Constraint == null && arrayField.Constraint == null).ToList();
-                    }
-                    else if (field is PropertyFieldReference propField)
-                    {
-                        existingSameSearchField = _searchFields.Where(x =>
-                            x.Field is PropertyFieldReference propFieldRef
-                            && propFieldRef.PropertyName.SequenceEqual(propField.PropertyName)
-                            && propFieldRef.Depth == propField.Depth
-                            && propFieldRef.Constraint == null && propFieldRef.Constraint == null).ToList();
-                    }
-
-                    foreach(var sameSearchField in existingSameSearchField)
-                    {
-                        if (sameSearchField.SkipReading == true
-                            && (evaluator.TypeIdentifierCallback != null || field.Constraint != null))
-                        {
-                            sameSearchField.SkipReading = false;
-                        }
-
-                        if (evaluator.ForceIfFound)
-                        {
-                            if (evaluator.Fields.Length > 1 || sameSearchField.ForceEvaluator != null)
-                                throw new Exception("Invalid config");
-
-                            //sameSearchField.ForceEvaluator = evaluator;
-                        }
-                    }
-
-                    _searchFields.Add(new MessageEvalutorFieldReference(field)
-                    {
-                        SkipReading = evaluator.TypeIdentifierCallback == null && field.Constraint == null,
-                        ForceEvaluator = !existingSameSearchField.Any() ? evaluator.ForceIfFound ? evaluator : null : null,
-                        OverlappingField = overlapping.Any()
-                    });
-
-                    if (field.Depth > _maxSearchDepth)
-                        _maxSearchDepth = field.Depth;
-                }
-            }
-
-            _initialized = true;
-        }
-
-        /// <inheritdoc />
-        public virtual string? GetTopicFilter(object deserializedObject)
-        {
-            if (_mapping == null)
-                return null;
-
-            // Cache the found type for future 
-            var currentType = deserializedObject.GetType();
-            if (_baseTypeMapping != null)
-            {
-                if (_baseTypeMapping.TryGetValue(currentType, out var typeMapping))
-                    return typeMapping(deserializedObject);
-            }
-
-            var mappedBase = false;
-            while (currentType != null)
-            {
-                if (_mapping.TryGetValue(currentType, out var mapping))
-                {
-                    if (mappedBase) 
-                    {
-                        _baseTypeMapping ??= new Dictionary<Type, Func<object, string?>>();
-                        _baseTypeMapping.Add(deserializedObject.GetType(), mapping);
-                    }
-
-                    return mapping(deserializedObject);
-                }
-
-                mappedBase = true;
-                currentType = currentType.BaseType;
-            }
-
-            return null;
-        }
-
-        /// <summary>
-        /// Return type identifier for non-json messages
-        /// </summary>
-        protected virtual string? GetTypeIdentifierNonJson(ReadOnlySpan<byte> data, WebSocketMessageType? webSocketMessageType)
-        {
-            return null;
-        }
-
-        /// <inheritdoc />
-        public virtual string? GetTypeIdentifier(ReadOnlySpan<byte> data, WebSocketMessageType? webSocketMessageType)
-        {
-            InitializeConverter();
-
-            int? arrayIndex = null;
-
-            _searchResult.Clear();
-            if (data[0] != 0x5B && data[0] != 0x7B)
-            {
-                // Message doesn't start with `{` or `[`, not valid for processing as json
-                return GetTypeIdentifierNonJson(data, webSocketMessageType);
-            }
-
-            var reader = new Utf8JsonReader(data);
-            while (reader.Read())
-            {
-                if ((reader.TokenType == JsonTokenType.StartArray
-                    || reader.TokenType == JsonTokenType.StartObject)
-                    && reader.CurrentDepth == _maxSearchDepth)
-                {
-                    // There is no field we need to search for on a depth deeper than this, skip
-                    reader.Skip();
-                    continue;
-                }
-
-                if (reader.TokenType == JsonTokenType.StartArray)
-                    arrayIndex = -1;
-                else if (reader.TokenType == JsonTokenType.EndArray)
-                    arrayIndex = null;
-                else if (arrayIndex != null)
-                    arrayIndex++;
-
-                if (reader.TokenType == JsonTokenType.PropertyName
-                    || arrayIndex != null && _hasArraySearches)
-                {
-                    bool written = false;
-
-                    string? value = null;
-                    byte[]? propName = null;
-                    foreach (var field in _searchFields!)
-                    {
-                        if (field.Field.Depth != reader.CurrentDepth)
-                            continue;
-
-                        bool readArrayValues = false;
-                        if (field.Field is PropertyFieldReference propFieldRef)
-                        {
-                            if (propName == null)
-                            {
-                                if (reader.TokenType != JsonTokenType.PropertyName)
-                                    continue;
-
-                                if (!reader.ValueTextEquals(propFieldRef.PropertyName))
-                                    continue;
-
-                                propName = propFieldRef.PropertyName;
-                                readArrayValues = propFieldRef.ArrayValues;
-                                reader.Read();
-                            }
-                            else if (!propFieldRef.PropertyName.SequenceEqual(propName))
-                            {
-                                continue;
-                            }
-                        }
-                        else if (field.Field is ArrayFieldReference arrayFieldRef)
-                        {
-                            if (propName != null)
-                                continue;
-
-                            if (reader.TokenType == JsonTokenType.PropertyName)
-                                continue;
-
-                            if (arrayFieldRef.ArrayIndex != arrayIndex)
-                                continue;
-                        }
-
-                        if (!field.SkipReading)
-                        {
-                            if (value == null)
-                            {
-                                if (readArrayValues)
-                                {
-                                    if (reader.TokenType != JsonTokenType.StartArray)
-                                        // error
-                                        return null;
-
-                                    var sb = new StringBuilder();
-                                    reader.Read();// Read start array
-                                    bool first = true;
-                                    while(reader.TokenType != JsonTokenType.EndArray)
-                                    {
-                                        if (!first)
-                                            sb.Append(",");
-
-                                        first = false;
-                                        sb.Append(reader.GetString());
-                                        reader.Read();
-                                    }
-
-                                    value = first ? null : sb.ToString();
-                                }
-                                else
-                                {
-                                    switch (reader.TokenType)
-                                    {
-                                        case JsonTokenType.Number:
-                                            value = reader.GetDecimal().ToString();
-                                            break;
-                                        case JsonTokenType.String:
-                                            value = reader.GetString()!;
-                                            break;
-                                        case JsonTokenType.True:
-                                        case JsonTokenType.False:
-                                            value = reader.GetBoolean().ToString()!;
-                                            break;
-                                        case JsonTokenType.Null:
-                                            value = null;
-                                            break;
-                                        case JsonTokenType.StartObject:
-                                        case JsonTokenType.StartArray:
-                                            value = null;
-                                            break;
-                                        default:
-                                            continue;
-                                    }
-                                }
-                            }
-
-                            if (field.Field.Constraint != null
-                                && !field.Field.Constraint(value))
-                            {
-                                continue;
-                            }
-                        }
-
-                        _searchResult.Write(field.Field, value);
-
-                        if (field.ForceEvaluator != null)
-                        {
-                            if (field.ForceEvaluator.StaticIdentifier != null)
-                                return field.ForceEvaluator.StaticIdentifier;
-
-                            // Force the immediate return upon encountering this field
-                            return field.ForceEvaluator.GetMessageType(_searchResult);
-                        }
-
-                        written = true;
-                        if (!field.OverlappingField)
-                            break;
-                    }
-
-                    if (!written)
-                        continue;
-
-                    if (_topEvaluator!.Satisfied(_searchResult))
-                        return _topEvaluator.GetMessageType(_searchResult);
-
-                    if (_searchFields.Count == _searchResult.Count)
-                        break;
-                }
-            }
-
-            foreach (var evaluator in TypeEvaluators)
-            {
-                if (evaluator.Satisfied(_searchResult))
-                    return evaluator.GetMessageType(_searchResult);
-            }
-
-            return null;
-        }
-
-        /// <inheritdoc />
-#if NET5_0_OR_GREATER
-        [UnconditionalSuppressMessage("AssemblyLoadTrimming", "IL3050:RequiresUnreferencedCode", Justification = "JsonSerializerOptions provided here has TypeInfoResolver set")]
-        [UnconditionalSuppressMessage("AssemblyLoadTrimming", "IL2026:RequiresUnreferencedCode", Justification = "JsonSerializerOptions provided here has TypeInfoResolver set")]
-#endif
-        public virtual object Deserialize(ReadOnlySpan<byte> data, Type type)
-        {
-#pragma warning disable IL2026 // Members annotated with 'RequiresUnreferencedCodeAttribute' require dynamic access otherwise can break functionality when trimming application code
-#pragma warning disable IL3050 // Calling members annotated with 'RequiresDynamicCodeAttribute' may break functionality when AOT compiling.
-            return JsonSerializer.Deserialize(data, type, Options)!;
-#pragma warning restore IL3050 // Calling members annotated with 'RequiresDynamicCodeAttribute' may break functionality when AOT compiling.
-#pragma warning restore IL2026 // Members annotated with 'RequiresUnreferencedCodeAttribute' require dynamic access otherwise can break functionality when trimming application code
-        }
-    }
-}

CryptoExchange.Net/Converters/SystemTextJson/MessageHandlers/JsonSocketPreloadMessageHandler.cs

@@ -1,63 +0,0 @@
-using CryptoExchange.Net.Converters.MessageParsing.DynamicConverters;
-using System;
-using System.Net.WebSockets;
-using System.Text.Json;
-
-namespace CryptoExchange.Net.Converters.SystemTextJson.MessageHandlers
-{
-    /// <summary>
-    /// JSON WebSocket message handler, reads the json data info a JsonDocument after which the data can be inspected to identify the message
-    /// </summary>
-    public abstract class JsonSocketPreloadMessageHandler : ISocketMessageHandler
-    {
-        /// <summary>
-        /// The serializer options to use
-        /// </summary>
-        public abstract JsonSerializerOptions Options { get; }
-
-        /// <inheritdoc />
-        public virtual string? GetTypeIdentifier(ReadOnlySpan<byte> data, WebSocketMessageType? webSocketMessageType)
-        {
-            var reader = new Utf8JsonReader(data);
-            var jsonDocument = JsonDocument.ParseValue(ref reader);
-
-            return GetTypeIdentifier(jsonDocument);
-        }
-
-        /// <summary>
-        /// Get the message identifier for this document
-        /// </summary>
-        protected abstract string? GetTypeIdentifier(JsonDocument document);
-
-        /// <summary>
-        /// Get optional topic filter, for example a symbol name
-        /// </summary>
-        public virtual string? GetTopicFilter(object deserializedObject) => null;
-
-        /// <inheritdoc />
-        public virtual object Deserialize(ReadOnlySpan<byte> data, Type type)
-        {
-#pragma warning disable IL2026 // Members annotated with 'RequiresUnreferencedCodeAttribute' require dynamic access otherwise can break functionality when trimming application code
-#pragma warning disable IL3050 // Calling members annotated with 'RequiresDynamicCodeAttribute' may break functionality when AOT compiling.
-            return JsonSerializer.Deserialize(data, type, Options)!;
-#pragma warning restore IL3050 // Calling members annotated with 'RequiresDynamicCodeAttribute' may break functionality when AOT compiling.
-#pragma warning restore IL2026 // Members annotated with 'RequiresUnreferencedCodeAttribute' require dynamic access otherwise can break functionality when trimming application code
-        }
-
-        /// <summary>
-        /// Get the string value for a path, or an emtpy string if not found
-        /// </summary>
-        protected string StringOrEmpty(JsonDocument document, string path)
-        {
-            if (!document.RootElement.TryGetProperty(path, out var element))
-                return string.Empty;
-
-            if (element.ValueKind == JsonValueKind.String)
-                return element.GetString() ?? string.Empty;
-            else if (element.ValueKind == JsonValueKind.Number)
-                return element.GetDecimal().ToString();
-
-            return string.Empty;
-        }
-    }
-}

CryptoExchange.Net/Converters/SystemTextJson/NullableEnumConverterFactory.cs

@@ -1,41 +0,0 @@
-using System;
-using System.Text.Json.Serialization.Metadata;
-using System.Text.Json;
-using System.Text.Json.Serialization;
-
-namespace CryptoExchange.Net.Converters.SystemTextJson
-{
-    internal class NullableEnumConverterFactory : JsonConverterFactory
-    {
-        private readonly IJsonTypeInfoResolver _jsonTypeInfoResolver;
-        private static readonly JsonSerializerOptions _options = new JsonSerializerOptions();
-
-        public NullableEnumConverterFactory(IJsonTypeInfoResolver jsonTypeInfoResolver)
-        {
-            _jsonTypeInfoResolver = jsonTypeInfoResolver;
-        }
-
-        public override bool CanConvert(Type typeToConvert)
-        {
-            var b = Nullable.GetUnderlyingType(typeToConvert);
-            if (b == null)
-                return false;
-
-            var typeInfo = _jsonTypeInfoResolver.GetTypeInfo(b, _options);
-            if (typeInfo == null)
-                return false;
-
-            return typeInfo.Converter is INullableConverterFactory;
-        }
-
-        public override JsonConverter? CreateConverter(Type typeToConvert, JsonSerializerOptions options)
-        {
-            var b = Nullable.GetUnderlyingType(typeToConvert) ?? throw new ArgumentNullException($"Not nullable {typeToConvert.Name}");
-            var typeInfo = _jsonTypeInfoResolver.GetTypeInfo(b, _options) ?? throw new ArgumentNullException($"Can find type {typeToConvert.Name}");
-            if (typeInfo.Converter is not INullableConverterFactory nullConverterFactory)
-                throw new ArgumentNullException($"Can find type converter for {typeToConvert.Name}");
-            
-            return nullConverterFactory.CreateNullableConverter();
-        }
-    }
-}

CryptoExchange.Net/Converters/SystemTextJson/NumberStringConverter.cs

@@ -1,42 +0,0 @@
-using System;
-using System.Text.Json;
-using System.Text.Json.Serialization;
-
-namespace CryptoExchange.Net.Converters.SystemTextJson
-{
-    /// <summary>
-    /// Read string or number as string
-    /// </summary>
-    public class NumberStringConverter : JsonConverter<string?>
-    {
-        /// <inheritdoc />
-        public override string? Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
-        {
-            if (reader.TokenType == JsonTokenType.Null)
-                return null;
-
-            if (reader.TokenType == JsonTokenType.Number)
-            {
-                if (reader.TryGetInt64(out var value))
-                    return value.ToString();
-
-                return reader.GetDecimal().ToString();
-            }
-
-            try
-            {
-                return reader.GetString();
-            }
-            catch (Exception)
-            {
-                return null;
-            }
-        }
-
-        /// <inheritdoc />
-        public override void Write(Utf8JsonWriter writer, string? value, JsonSerializerOptions options)
-        {
-            writer.WriteStringValue(value);
-        }
-    }
-}

CryptoExchange.Net/Converters/SystemTextJson/ObjectOrArrayConverter.cs

@@ -1,58 +0,0 @@
-using System;
-using System.Text.Json;
-using System.Text.Json.Serialization;
-
-#pragma warning disable IL2026 // Members annotated with 'RequiresUnreferencedCodeAttribute' require dynamic access otherwise can break functionality when trimming application code
-#pragma warning disable IL3050 // Calling members annotated with 'RequiresDynamicCodeAttribute' may break functionality when AOT compiling.
-
-namespace CryptoExchange.Net.Converters.SystemTextJson
-{
-    /// <summary>
-    /// Converter for parsing object or array responses
-    /// </summary>
-    public class ObjectOrArrayConverter : JsonConverterFactory
-    {
-        /// <inheritdoc />
-        public override bool CanConvert(Type typeToConvert) => true;
-        /// <inheritdoc />
-        public override JsonConverter? CreateConverter(Type typeToConvert, JsonSerializerOptions options)
-        {
-            var type = typeof(InternalObjectOrArrayConverter<>).MakeGenericType(typeToConvert);
-            return (JsonConverter)Activator.CreateInstance(type)!;
-        }
-
-        private class InternalObjectOrArrayConverter<T> : JsonConverter<T>
-        {
-            public override T? Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
-            {
-                if (reader.TokenType == JsonTokenType.StartObject && !typeToConvert.IsArray)
-                {
-                    // Object to object
-                    return JsonDocument.ParseValue(ref reader).Deserialize<T>(options);
-                }
-                else if (reader.TokenType == JsonTokenType.StartArray && typeToConvert.IsArray)
-                {
-                    // Array to array
-                    return JsonDocument.ParseValue(ref reader).Deserialize<T>(options);
-                }
-                else if (reader.TokenType == JsonTokenType.StartArray)
-                {
-                    // Array to object
-                    JsonDocument.ParseValue(ref reader).Deserialize<T[]>(options);
-                    return default;
-                }
-                else
-                {
-                    // Object to array
-                    JsonDocument.ParseValue(ref reader);
-                    return default;
-                }
-            }
-
-            public override void Write(Utf8JsonWriter writer, T value, JsonSerializerOptions options)
-            {
-                JsonSerializer.Serialize(writer, value, options);
-            }
-        }
-    }
-}

CryptoExchange.Net/Converters/SystemTextJson/ObjectStringConverter.cs

@@ -1,20 +1,21 @@
 using System;
+using System.Collections.Generic;
+using System.Diagnostics;
+using System.Runtime.Serialization;
+using System.Text;
 using System.Text.Json.Serialization;
 using System.Text.Json;
-using System.Diagnostics.CodeAnalysis;
+using System.Globalization;
 
 namespace CryptoExchange.Net.Converters.SystemTextJson
 {
     /// <summary>
-    /// Converter for values which contain a nested json value
+    /// 
     /// </summary>
+    /// <typeparam name="T"></typeparam>
     public class ObjectStringConverter<T> : JsonConverter<T>
     {
         /// <inheritdoc />
-#if NET5_0_OR_GREATER
-        [UnconditionalSuppressMessage("AssemblyLoadTrimming", "IL3050:RequiresUnreferencedCode", Justification = "JsonSerializerOptions provided here has TypeInfoResolver set")]
-        [UnconditionalSuppressMessage("AssemblyLoadTrimming", "IL2026:RequiresUnreferencedCode", Justification = "JsonSerializerOptions provided here has TypeInfoResolver set")]
-#endif
         public override T? Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
         {
             if (reader.TokenType == JsonTokenType.Null)
@@ -24,14 +25,10 @@ namespace CryptoExchange.Net.Converters.SystemTextJson
             if (string.IsNullOrEmpty(value))
                 return default;
 
-            return (T?)JsonDocument.Parse(value!).Deserialize(typeof(T), options);
+            return (T?)JsonDocument.Parse(value!).Deserialize(typeof(T));
         }
 
         /// <inheritdoc />
-#if NET5_0_OR_GREATER
-        [UnconditionalSuppressMessage("AssemblyLoadTrimming", "IL3050:RequiresUnreferencedCode", Justification = "JsonSerializerOptions provided here has TypeInfoResolver set")]
-        [UnconditionalSuppressMessage("AssemblyLoadTrimming", "IL2026:RequiresUnreferencedCode", Justification = "JsonSerializerOptions provided here has TypeInfoResolver set")]
-#endif
         public override void Write(Utf8JsonWriter writer, T? value, JsonSerializerOptions options)
         {
             if (value is null)

CryptoExchange.Net/Converters/SystemTextJson/ReplaceConverter.cs

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

CryptoExchange.Net/Converters/SystemTextJson/SerializationModel.cs

@@ -1,21 +0,0 @@
-using System;
-
-namespace CryptoExchange.Net.Converters.SystemTextJson
-{
-    /// <summary>
-    /// Attribute to mark a model as json serializable. Used for AOT compilation.
-    /// </summary>
-    [AttributeUsage(System.AttributeTargets.Class | AttributeTargets.Enum | System.AttributeTargets.Interface)]
-    public class SerializationModelAttribute : Attribute
-    {
-        /// <summary>
-        /// ctor
-        /// </summary>
-        public SerializationModelAttribute() { }
-        /// <summary>
-        /// ctor
-        /// </summary>
-        /// <param name="type"></param>
-        public SerializationModelAttribute(Type type) { }
-    }
-}

CryptoExchange.Net/Converters/SystemTextJson/SerializerOptions.cs

@@ -1,5 +1,4 @@
-using System.Collections.Concurrent;
-using System.Text.Json;
+using System.Text.Json;
 using System.Text.Json.Serialization;
 
 namespace CryptoExchange.Net.Converters.SystemTextJson
@@ -9,39 +8,22 @@ namespace CryptoExchange.Net.Converters.SystemTextJson
     /// </summary>
     public static class SerializerOptions
     {
-        private static readonly ConcurrentDictionary<JsonSerializerContext, JsonSerializerOptions> _cache = new ConcurrentDictionary<JsonSerializerContext, JsonSerializerOptions>();
-
         /// <summary>
-        /// Get Json serializer settings which includes standard converters for DateTime, bool, enum and number types
+        /// Json serializer settings which includes the EnumConverter, DateTimeConverter, BoolConverter and DecimalConverter
         /// </summary>
-        public static JsonSerializerOptions WithConverters(JsonSerializerContext typeResolver, params JsonConverter[] additionalConverters)
+        public static JsonSerializerOptions WithConverters { get; } = new JsonSerializerOptions
         {
-            if (!_cache.TryGetValue(typeResolver, out var options))
-            {
-                options = new JsonSerializerOptions
-                {
-                    NumberHandling = JsonNumberHandling.AllowReadingFromString | JsonNumberHandling.AllowNamedFloatingPointLiterals,
-                    PropertyNameCaseInsensitive = false,
-                    Converters =
+            NumberHandling = JsonNumberHandling.AllowReadingFromString | JsonNumberHandling.AllowNamedFloatingPointLiterals,
+            PropertyNameCaseInsensitive = false,
+            Converters =
                     {
                         new DateTimeConverter(),
+                        new EnumConverter(),
                         new BoolConverter(),
                         new DecimalConverter(),
                         new IntConverter(),
-                        new LongConverter(),
-                        new NullableEnumConverterFactory(typeResolver)
-                    },
-                    TypeInfoResolver = typeResolver,
-                };
-
-                foreach (var converter in additionalConverters)
-                    options.Converters.Add(converter);
-
-                options.TypeInfoResolver = typeResolver;
-                _cache.TryAdd(typeResolver, options);
-            }
-
-            return options;
-        }
+                        new LongConverter()
+                    }
+        };
     }
 }