wip

AOT support

.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: 9.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
@@ -140,17 +140,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 KeyValuePair<string, string[]>[0],
                 TimeSpan.FromSeconds(1),
                 null,
                 "{}",
@@ -120,14 +120,14 @@ namespace CryptoExchange.Net.UnitTests
                 "https://test.com/api",
                 null,
                 HttpMethod.Get,
-                new HttpRequestMessage().Headers,
+                new KeyValuePair<string, string[]>[0],
                 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 KeyValuePair<string, string[]>[0],
                 TimeSpan.FromSeconds(1),
                 null,
                 "{}",
@@ -151,7 +150,7 @@ namespace CryptoExchange.Net.UnitTests
                 "https://test.com/api",
                 null,
                 HttpMethod.Get,
-                new HttpRequestMessage().Headers,
+                new KeyValuePair<string, string[]>[0],
                 ResultDataSource.Server,
                 new TestObjectResult(),
                 null);

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

@@ -1,15 +1,15 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>net10.0</TargetFramework>
+    <TargetFramework>net9.0</TargetFramework>
     <IsPackable>false</IsPackable>
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="18.0.1"></PackageReference>
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.12.0"></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="NUnit" Version="4.2.2"></PackageReference>
+    <PackageReference Include="NUnit3TestAdapter" Version="4.6.0"></PackageReference>
   </ItemGroup>
 
   <ItemGroup>

CryptoExchange.Net.UnitTests/ExchangeHelpersTests.cs

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

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

@@ -2,8 +2,14 @@
 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
 {
@@ -30,13 +36,7 @@ namespace CryptoExchange.Net.UnitTests
             // act
             // assert
             Assert.Throws(typeof(ArgumentException),
-                () => {
-                    var opts = new RestExchangeOptions<TestEnvironment, HMACCredential>()
-                    {
-                        ApiCredentials = new HMACCredential(key, secret)
-                    };
-                    opts.ApiCredentials.Validate();
-                });
+                () => new RestExchangeOptions<TestEnvironment, ApiCredentials>() { ApiCredentials = new ApiCredentials(key, secret) });
         }
 
         [Test]
@@ -45,7 +45,7 @@ namespace CryptoExchange.Net.UnitTests
             // arrange, act
             var options = new TestClientOptions
             {
-                ApiCredentials = new HMACCredential("123", "456"),
+                ApiCredentials = new ApiCredentials("123", "456"),
                 ReceiveWindow = TimeSpan.FromSeconds(10)
             };
 
@@ -56,65 +56,83 @@ namespace CryptoExchange.Net.UnitTests
         }
 
         [Test]
-        public void TestSetOptionsRest()
+        public void TestApiOptionsAreSet()
         {
-            var client = new TestRestClient();
-            client.SetOptions(new UpdateOptions
-            {
-                RequestTimeout = TimeSpan.FromSeconds(2),
-                Proxy = new ApiProxy("http://testproxy", 1234)
-            });
+            // arrange, act
+            var options = new TestClientOptions();
+            options.Api1Options.ApiCredentials = new ApiCredentials("123", "456");
+            options.Api2Options.ApiCredentials = new ApiCredentials("789", "101");
 
-            Assert.That(client.Api1.ClientOptions.Proxy, Is.Not.Null);
-            Assert.That(client.Api1.ClientOptions.Proxy.Host, Is.EqualTo("http://testproxy"));
-            Assert.That(client.Api1.ClientOptions.Proxy.Port, Is.EqualTo(1234));
-            Assert.That(client.Api1.ClientOptions.RequestTimeout, Is.EqualTo(TimeSpan.FromSeconds(2)));
+            // 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");
         }
 
         [Test]
-        public void TestSetOptionsRestWithCredentials()
+        public void TestClientUsesCorrectOptions()
         {
-            var client = new TestRestClient();
-            client.SetOptions(new UpdateOptions<HMACCredential>
-            {
-                ApiCredentials = new HMACCredential("123", "456"),
-                RequestTimeout = TimeSpan.FromSeconds(2),
-                Proxy = new ApiProxy("http://testproxy", 1234)
+            var client = new TestRestClient(options => {
+                options.Api1Options.ApiCredentials = new ApiCredentials("111", "222");
+                options.ApiCredentials = new ApiCredentials("333", "444");
             });
 
-            Assert.That(client.Api1.ApiCredentials, Is.Not.Null);
-            Assert.That(client.Api1.ApiCredentials.Key, Is.EqualTo("123"));
-            Assert.That(client.Api1.ClientOptions.Proxy, Is.Not.Null);
-            Assert.That(client.Api1.ClientOptions.Proxy.Host, Is.EqualTo("http://testproxy"));
-            Assert.That(client.Api1.ClientOptions.Proxy.Port, Is.EqualTo(1234));
-            Assert.That(client.Api1.ClientOptions.RequestTimeout, Is.EqualTo(TimeSpan.FromSeconds(2)));
+            var authProvider1 = (TestAuthProvider)client.Api1.AuthenticationProvider;
+            var authProvider2 = (TestAuthProvider)client.Api2.AuthenticationProvider;
+            Assert.That(authProvider1.GetKey() == "111");
+            Assert.That(authProvider1.GetSecret() == "222");
+            Assert.That(authProvider2.GetKey() == "333");
+            Assert.That(authProvider2.GetSecret() == "444");
         }
 
         [Test]
-        public void TestWhenUpdatingSettingsExistingClientsAreNotAffected()
+        public void TestClientUsesCorrectOptionsWithDefault()
         {
-            TestClientOptions.Default = new TestClientOptions
+            TestClientOptions.Default.ApiCredentials = new ApiCredentials("123", "456");
+            TestClientOptions.Default.Api1Options.ApiCredentials = new ApiCredentials("111", "222");
+
+            var client = new TestRestClient();
+
+            var authProvider1 = (TestAuthProvider)client.Api1.AuthenticationProvider;
+            var authProvider2 = (TestAuthProvider)client.Api2.AuthenticationProvider;
+            Assert.That(authProvider1.GetKey() == "111");
+            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]
+        public void TestClientUsesCorrectOptionsWithOverridingDefault()
+        {
+            TestClientOptions.Default.ApiCredentials = new ApiCredentials("123", "456");
+            TestClientOptions.Default.Api1Options.ApiCredentials = new ApiCredentials("111", "222");
+
+            var client = new TestRestClient(options =>
             {
-                ApiCredentials = new HMACCredential("111", "222"),
-                RequestTimeout = TimeSpan.FromSeconds(1),
-            };
+                options.Api1Options.ApiCredentials = new ApiCredentials("333", "444");
+                options.Environment = new TestEnvironment("Test", "https://test.test");
+            });
 
-            var client1 = new TestRestClient();
+            var authProvider1 = (TestAuthProvider)client.Api1.AuthenticationProvider;
+            var authProvider2 = (TestAuthProvider)client.Api2.AuthenticationProvider;
+            Assert.That(authProvider1.GetKey() == "333");
+            Assert.That(authProvider1.GetSecret() == "444");
+            Assert.That(authProvider2.GetKey() == "123");
+            Assert.That(authProvider2.GetSecret() == "456");
+            Assert.That(client.Api2.BaseAddress == "https://localhost:123");
 
-            Assert.That(client1.ClientOptions.RequestTimeout, Is.EqualTo(TimeSpan.FromSeconds(1)));
-            Assert.That(client1.ClientOptions.ApiCredentials.Key, Is.EqualTo("111"));
-
-            TestClientOptions.Default.ApiCredentials = new HMACCredential("333", "444");
-            TestClientOptions.Default.RequestTimeout = TimeSpan.FromSeconds(2);
-
-            var client2 = new TestRestClient();
-
-            Assert.That(client2.ClientOptions.RequestTimeout, Is.EqualTo(TimeSpan.FromSeconds(2)));
-            Assert.That(client2.ClientOptions.ApiCredentials.Key, Is.EqualTo("333"));
+            // Cleanup static values
+            TestClientOptions.Default.ApiCredentials = null;
+            TestClientOptions.Default.Api1Options.ApiCredentials = null;
         }
     }
 
-    public class TestClientOptions: RestExchangeOptions<TestEnvironment, HMACCredential>
+    public class TestClientOptions: RestExchangeOptions<TestEnvironment, ApiCredentials>
     {
         /// <summary>
         /// Default options for the futures client

CryptoExchange.Net.UnitTests/RestClientTests.cs

@@ -9,6 +9,7 @@ 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;
@@ -79,25 +80,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 +98,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");
         }
 
@@ -200,7 +184,7 @@ namespace CryptoExchange.Net.UnitTests
         [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)
         {

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,231 @@
-//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.Text.Json;
+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 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.CanConnect = true;
+            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\", \"action\": \"update\", \"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.CanConnect = true;
+            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 = JsonSerializer.Serialize(new { topic = "topic", action = "update", 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(JsonSerializer.Serialize(new { channel, action = "subscribe", 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(JsonSerializer.Serialize(new { channel, action = "subscribe", 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

@@ -1,15 +1,12 @@
 using CryptoExchange.Net.Attributes;
-using CryptoExchange.Net.Converters;
 using CryptoExchange.Net.Converters.SystemTextJson;
-using CryptoExchange.Net.Objects;
-using CryptoExchange.Net.SharedApis;
-using CryptoExchange.Net.Testing;
-using Newtonsoft.Json.Linq;
+using System.Text.Json;
 using NUnit.Framework;
 using System;
-using System.Diagnostics;
-using System.Text.Json;
 using System.Text.Json.Serialization;
+using NUnit.Framework.Legacy;
+using CryptoExchange.Net.Converters;
+using CryptoExchange.Net.Testing.Comparers;
 
 namespace CryptoExchange.Net.UnitTests
 {
@@ -159,22 +156,15 @@ namespace CryptoExchange.Net.UnitTests
         [TestCase("three", TestEnum.Three)]
         [TestCase("Four", TestEnum.Four)]
         [TestCase("four", TestEnum.Four)]
-        [TestCase("Four1", (TestEnum)(-9))]
-        [TestCase(null, (TestEnum)(-9))]
-        public void TestEnumConverterNotNullableDeserializeTests(string value, TestEnum expected)
+        [TestCase("Four1", TestEnum.One)]
+        [TestCase(null, TestEnum.One)]
+        public void TestEnumConverterNotNullableDeserializeTests(string value, TestEnum? expected)
         {
             var val = value == null ? "null" : $"\"{value}\"";
             var output = JsonSerializer.Deserialize<NotNullableSTJEnumObject>($"{{ \"Value\": {val} }}");
             Assert.That(output.Value == expected);
         }
 
-        [Test]
-        public void TestEnumConverterMapsUndefinedValueCorrectlyIfDefaultIsDefined()
-        {
-            var output = JsonSerializer.Deserialize<TestEnum2>($"\"TestUndefined\"");
-            Assert.That((int)output == -99);
-        }
-
         [TestCase("1", TestEnum.One)]
         [TestCase("2", TestEnum.Two)]
         [TestCase("3", TestEnum.Three)]
@@ -189,31 +179,6 @@ namespace CryptoExchange.Net.UnitTests
             Assert.That(result == expected);
         }
 
-        [Test]
-        public void TestEnumConverterParseNullOnNonNullableOnlyLogsOnce()
-        {
-            LibraryHelpers.StaticLogger = new TraceLogger();
-            var listener = new EnumValueTraceListener();
-            Trace.Listeners.Add(listener);
-            EnumConverter<TestEnum>.Reset();
-            try
-            {
-                Assert.Throws<Exception>(() =>
-                {
-                    var result = JsonSerializer.Deserialize<NotNullableSTJEnumObject>("{\"Value\": null}", SerializerOptions.WithConverters(new SerializationContext()));
-                });
-
-                Assert.DoesNotThrow(() =>
-                {
-                    var result2 = JsonSerializer.Deserialize<NotNullableSTJEnumObject>("{\"Value\": null}", SerializerOptions.WithConverters(new SerializationContext()));
-                });
-            }
-            finally
-            {
-                Trace.Listeners.Remove(listener);
-            }
-        }
-
         [TestCase("1", true)]
         [TestCase("true", true)]
         [TestCase("yes", true)]
@@ -258,17 +223,13 @@ namespace CryptoExchange.Net.UnitTests
         [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
+        [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));
+            Assert.That(result.Test, Is.EqualTo(expected == -999 ? decimal.MaxValue : expected));
         }
 
         [TestCase("1", 1)]
@@ -308,18 +269,9 @@ namespace CryptoExchange.Net.UnitTests
                 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);
 
@@ -334,42 +286,6 @@ namespace CryptoExchange.Net.UnitTests
             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));
         }
     }
 
@@ -407,7 +323,7 @@ namespace CryptoExchange.Net.UnitTests
         public bool Value { get; set; }
     }
 
-    [JsonConverter(typeof(ArrayConverter<Test>))]
+    [JsonConverter(typeof(ArrayConverter<Test, SerializationContext>))]
     record Test
     {
         [ArrayProperty(0)]
@@ -428,11 +344,9 @@ namespace CryptoExchange.Net.UnitTests
         public TestEnum? Prop7 { get; set; }
         [ArrayProperty(7)]
         public Test TestInternal { get; set; }
-        [ArrayProperty(8), JsonConversion]
-        public Test3 Prop8 { get; set; }
     }
 
-    [JsonConverter(typeof(ArrayConverter<Test2>))]
+    [JsonConverter(typeof(ArrayConverter<Test2, SerializationContext>))]
     record Test2
     {
         [ArrayProperty(0)]
@@ -461,20 +375,6 @@ namespace CryptoExchange.Net.UnitTests
         Four
     }
 
-    [JsonConverter(typeof(EnumConverter<TestEnum2>))]
-    public enum TestEnum2
-    {
-        [Map("-9")]
-        Minus9 = -9,
-        [Map("1")]
-        One,
-        [Map("2")]
-        Two,
-        [Map("three", "3")]
-        Three,
-        Four
-    }
-
     [JsonSerializable(typeof(Test))]
     [JsonSerializable(typeof(Test2))]
     [JsonSerializable(typeof(Test3))]

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

@@ -0,0 +1,51 @@
+using CryptoExchange.Net.Objects;
+using CryptoExchange.Net.Objects.Sockets;
+using CryptoExchange.Net.Sockets;
+using System;
+using System.Collections.Generic;
+using System.Text.Json.Serialization;
+
+namespace CryptoExchange.Net.UnitTests.TestImplementations.Sockets
+{
+    internal class SubResponse
+    {
+
+        [JsonPropertyName("action")]
+        public string Action { get; set; } = null!;
+
+        [JsonPropertyName("channel")]
+        public string Channel { get; set; } = null!;
+
+        [JsonPropertyName("status")]
+        public string Status { get; set; } = null!;
+    }
+
+    internal class UnsubResponse
+    {
+        [JsonPropertyName("action")]
+        public string Action { get; set; } = null!;
+
+        [JsonPropertyName("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> { request + "-" + 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> { "update-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,19 @@
 using System;
+using System.Collections.Generic;
 using System.IO;
+using System.Net.Http;
 using System.Text;
-using System.Text.Json;
+using System.Text.Json.Serialization;
 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
 {
@@ -24,14 +24,12 @@ namespace CryptoExchange.Net.UnitTests
         public TestBaseClient(): base(null, "Test")
         {
             var options = new TestClientOptions();
-            _logger = NullLogger.Instance;
             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()));
         }
@@ -42,47 +40,45 @@ namespace CryptoExchange.Net.UnitTests
         }
     }
 
-    public class TestSubClient : RestApiClient<TestEnvironment, TestAuthProvider, HMACCredential>
+    public class TestSubClient : RestApiClient
     {
-        protected override IRestMessageHandler MessageHandler => throw new NotImplementedException();
-
-        public TestSubClient(RestExchangeOptions<TestEnvironment, HMACCredential> options, RestApiOptions apiOptions) : base(new TraceLogger(), null, "https://localhost:123", options, apiOptions)
+        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()}";
+        public override TimeSpan? GetTimeOffset() => null;
+        public override TimeSyncInfo GetTimeSyncInfo() => null;
+        protected override IStreamMessageAccessor CreateAccessor() => new SystemTextJsonStreamMessageAccessor(new System.Text.Json.JsonSerializerOptions());
         protected override IMessageSerializer CreateSerializer() => new SystemTextJsonMessageSerializer(new System.Text.Json.JsonSerializerOptions());
-        protected override TestAuthProvider CreateAuthenticationProvider(HMACCredential credentials) => throw new NotImplementedException();
+        protected override AuthenticationProvider CreateAuthenticationProvider(ApiCredentials credentials) => throw new NotImplementedException();
         protected override Task<WebCallResult<DateTime>> GetServerTimestampAsync() => throw new NotImplementedException();
     }
 
-    public class TestAuthProvider : AuthenticationProvider<HMACCredential, HMACCredential>
+    public class TestAuthProvider : AuthenticationProvider
     {
-        public TestAuthProvider(HMACCredential credentials) : base(credentials, credentials)
+        public TestAuthProvider(ApiCredentials credentials) : base(credentials)
         {
         }
 
-        public override void ProcessRequest(RestApiClient apiClient, RestRequestConfiguration requestConfig)
+        public override void AuthenticateRequest(RestApiClient apiClient, Uri uri, HttpMethod method, ref IDictionary<string, object> uriParams, ref IDictionary<string, object> bodyParams, ref Dictionary<string, string> headers, bool auth, ArrayParametersSerialization arraySerialization, HttpMethodParameterPosition parameterPosition, RequestBodyFormat bodyFormat)
         {
         }
 
-        public string GetKey() => Credential.Key;
-        public string GetSecret() => Credential.Secret;
-    }
-
-    public class TestEnvironment : TradeEnvironment
-    {
-        public string TestAddress { get; }
-
-        public TestEnvironment(string name, string url) : base(name)
-        {
-            TestAddress = url;
-        }
+        public string GetKey() => _credentials.Key;
+        public string GetSecret() => _credentials.Secret;
     }
 }

CryptoExchange.Net.UnitTests/TestImplementations/TestRestClient.cs

@@ -13,17 +13,15 @@ using CryptoExchange.Net.Authentication;
 using System.Collections.Generic;
 using Microsoft.Extensions.Logging;
 using CryptoExchange.Net.Clients;
+using CryptoExchange.Net.SharedApis;
 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
 {
-    public class TestRestClient: BaseRestClient<TestEnvironment, HMACCredential>
+    public class TestRestClient: BaseRestClient
     {
         public TestRestApi1Client Api1 { get; }
         public TestRestApi2Client Api2 { get; }
@@ -37,8 +35,8 @@ namespace CryptoExchange.Net.UnitTests.TestImplementations
         {
             Initialize(options.Value);
 
-            Api1 = AddApiClient(new TestRestApi1Client(options.Value));
-            Api2 = AddApiClient(new TestRestApi2Client(options.Value));
+            Api1 = new TestRestApi1Client(options.Value);
+            Api2 = new TestRestApi2Client(options.Value);
         }
 
         public void SetResponse(string responseData, out IRequest requestObj)
@@ -50,19 +48,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, 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<Encoding>(), It.IsAny<string>())).Callback(new Action<string, Encoding, string>((content, encoding, type) => { request.Setup(r => r.Content).Returns(content); }));
+            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.GetHeaders()).Returns(() => headers);
+            request.Setup(c => c.GetHeaders()).Returns(() => headers.ToArray());
 
             var factory = Mock.Get(Api1.RequestFactory);
-            factory.Setup(c => c.Create(It.IsAny<Version>(), It.IsAny<HttpMethod>(), It.IsAny<Uri>(), It.IsAny<int>()))
-                .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 +68,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 +85,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 KeyValuePair<string, string[]>[0]);
             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,31 +107,29 @@ 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 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.GetHeaders()).Returns(headers.ToArray());
 
             var factory = Mock.Get(Api1.RequestFactory);
-            factory.Setup(c => c.Create(It.IsAny<Version>(), It.IsAny<HttpMethod>(), It.IsAny<Uri>(), It.IsAny<int>()))
-                .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<TestEnvironment, TestAuthProvider, HMACCredential>
+    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;
@@ -142,6 +138,7 @@ namespace CryptoExchange.Net.UnitTests.TestImplementations
         /// <inheritdoc />
         public override string FormatSymbol(string baseAsset, string quoteAsset, TradingMode futuresType, DateTime? deliverDate = null) => $"{baseAsset.ToUpperInvariant()}{quoteAsset.ToUpperInvariant()}";
 
+        protected override IStreamMessageAccessor CreateAccessor() => new SystemTextJsonStreamMessageAccessor(new System.Text.Json.JsonSerializerOptions() { TypeInfoResolver = new TestSerializerContext() });
         protected override IMessageSerializer CreateSerializer() => new SystemTextJsonMessageSerializer(new System.Text.Json.JsonSerializerOptions());
 
         public async Task<CallResult<T>> Request<T>(CancellationToken ct = default) where T : class
@@ -159,24 +156,33 @@ namespace CryptoExchange.Net.UnitTests.TestImplementations
             ParameterPositions[method] = position;
         }
 
-        protected override TestAuthProvider CreateAuthenticationProvider(HMACCredential credentials)
+        public override TimeSpan? GetTimeOffset()
+        {
+            throw new NotImplementedException();
+        }
+
+        protected override AuthenticationProvider CreateAuthenticationProvider(ApiCredentials credentials)
             => new TestAuthProvider(credentials);
 
         protected override Task<WebCallResult<DateTime>> GetServerTimestampAsync()
         {
             throw new NotImplementedException();
         }
+
+        public override TimeSyncInfo GetTimeSyncInfo()
+        {
+            throw new NotImplementedException();
+        }
     }
 
-    public class TestRestApi2Client : RestApiClient<TestEnvironment, TestAuthProvider, HMACCredential>
+    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 IStreamMessageAccessor CreateAccessor() => new SystemTextJsonStreamMessageAccessor(new System.Text.Json.JsonSerializerOptions());
         protected override IMessageSerializer CreateSerializer() => new SystemTextJsonMessageSerializer(new System.Text.Json.JsonSerializerOptions());
 
         /// <inheritdoc />
@@ -187,7 +193,19 @@ namespace CryptoExchange.Net.UnitTests.TestImplementations
             return await SendAsync<T>("http://www.test.com", new RequestDefinition("/", HttpMethod.Get) { Weight = 0 }, null, ct);
         }
 
-        protected override TestAuthProvider CreateAuthenticationProvider(HMACCredential credentials)
+        protected override Error ParseErrorResponse(int httpStatusCode, KeyValuePair<string, 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);
 
         protected override Task<WebCallResult<DateTime>> GetServerTimestampAsync()
@@ -195,6 +213,10 @@ namespace CryptoExchange.Net.UnitTests.TestImplementations
             throw new NotImplementedException();
         }
 
+        public override TimeSyncInfo GetTimeSyncInfo()
+        {
+            throw new NotImplementedException();
+        }
     }
 
     public class TestError

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

CryptoExchange.Net.UnitTests/TestImplementations/TestSocketClient.cs

@@ -0,0 +1,139 @@
+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 CryptoExchange.Net.Testing.Implementations;
+using CryptoExchange.Net.SharedApis;
+using Microsoft.Extensions.Options;
+using CryptoExchange.Net.Converters.SystemTextJson;
+
+namespace CryptoExchange.Net.UnitTests.TestImplementations
+{
+    internal class TestSocketClient: BaseSocketClient
+    {
+        public TestSubSocketClient SubClient { get; }
+
+        /// <summary>
+        /// Create a new instance of KucoinSocketClient
+        /// </summary>
+        /// <param name="optionsFunc">Configure the options to use for this client</param>
+        public TestSocketClient(Action<TestSocketOptions> optionsDelegate = null)
+            : this(Options.Create(ApplyOptionsDelegate(optionsDelegate)), null)
+        {
+        }
+
+        public TestSocketClient(IOptions<TestSocketOptions> options, ILoggerFactory loggerFactory = null) : base(loggerFactory, "Test")
+        {
+            Initialize(options.Value);
+
+            SubClient = AddApiClient(new TestSubSocketClient(options.Value, options.Value.SubOptions));
+            SubClient.SocketFactory = new Mock<IWebsocketFactory>().Object;
+            Mock.Get(SubClient.SocketFactory).Setup(f => f.CreateWebsocket(It.IsAny<ILogger>(), It.IsAny<WebSocketParameters>())).Returns(new TestSocket("https://test.com"));
+        }
+
+        public TestSocket CreateSocket()
+        {
+            Mock.Get(SubClient.SocketFactory).Setup(f => f.CreateWebsocket(It.IsAny<ILogger>(), It.IsAny<WebSocketParameters>())).Returns(new TestSocket("https://test.com"));
+            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")
+        };
+
+        /// <summary>
+        /// ctor
+        /// </summary>
+        public TestSocketOptions()
+        {
+            Default?.Set(this);
+        }
+
+        public SocketApiOptions SubOptions { get; set; } = new SocketApiOptions();
+
+        internal TestSocketOptions Set(TestSocketOptions targetOptions)
+        {
+            targetOptions = base.Set<TestSocketOptions>(targetOptions);
+            targetOptions.SubOptions = SubOptions.Set(targetOptions.SubOptions);
+            return targetOptions;
+        }
+    }
+
+    public class TestSubSocketClient : SocketApiClient
+    {
+        private MessagePath _channelPath = MessagePath.Get().Property("channel");
+        private MessagePath _actionPath = MessagePath.Get().Property("action");
+        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)
+        {
+
+        }
+
+        protected internal override IByteMessageAccessor CreateAccessor() => new SystemTextJsonByteMessageAccessor(new System.Text.Json.JsonSerializerOptions());
+        protected internal 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()}";
+
+        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 message.GetValue<string>(_actionPath) + "-" + 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,6 +1,10 @@
 using CryptoExchange.Net.UnitTests.TestImplementations;
+using System;
 using System.Collections.Generic;
+using System.Linq;
+using System.Text;
 using System.Text.Json.Serialization;
+using System.Threading.Tasks;
 
 namespace CryptoExchange.Net.UnitTests
 {

CryptoExchange.Net.sln

@@ -15,8 +15,6 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ConsoleClient", "Examples\C
 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}"
-EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -43,10 +41,6 @@ Global
 		{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

CryptoExchange.Net/Authentication/ApiCredentials.cs

@@ -1,19 +1,60 @@
-namespace CryptoExchange.Net.Authentication
+using System;
+using System.IO;
+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 abstract class ApiCredentials
+    public class ApiCredentials
     {
         /// <summary>
-        /// Validate the API credentials
+        /// The api key / label to authenticate requests
         /// </summary>
-        public abstract void Validate();
+        public string Key { get; set; }
+
+        /// <summary>
+        /// The api secret or private key to authenticate requests
+        /// </summary>
+        public string Secret { get; set; }
+
+        /// <summary>
+        /// The api passphrase. Not needed on all exchanges
+        /// </summary>
+        public string? Pass { get; set; }
+
+        /// <summary>
+        /// Type of the credentials
+        /// </summary>
+        public ApiCredentialsType CredentialType { get; set; }
+
+        /// <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)
+        {
+            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>
         /// Copy the credentials
         /// </summary>
         /// <returns></returns>
-        public abstract ApiCredentials Copy();
+        public virtual ApiCredentials Copy()
+        {
+            return new ApiCredentials(Key, Secret, Pass, CredentialType);
+        }
     }
 }

CryptoExchange.Net/Authentication/ApiCredentialsType.cs

@@ -0,0 +1,21 @@
+namespace CryptoExchange.Net.Authentication
+{
+    /// <summary>
+    /// Credentials type
+    /// </summary>
+    public enum ApiCredentialsType
+    {
+        /// <summary>
+        /// Hmac keys credentials
+        /// </summary>
+        Hmac,
+        /// <summary>
+        /// Rsa keys credentials in xml format
+        /// </summary>
+        RsaXml,
+        /// <summary>
+        /// Rsa keys credentials in pem/base64 format. Only available for .NetStandard 2.1 and up, use xml format for lower.
+        /// </summary>
+        RsaPem
+    }
+}

CryptoExchange.Net/Authentication/AuthenticationProvider.cs

@@ -2,18 +2,12 @@
 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;
-using System.Net;
 
 namespace CryptoExchange.Net.Authentication
 {
@@ -25,24 +19,62 @@ namespace CryptoExchange.Net.Authentication
         internal IAuthTimeProvider TimeProvider { get; set; } = new AuthTimeProvider();
 
         /// <summary>
-        /// The public identifier for the provided credentials
+        /// Provided credentials
         /// </summary>
-        public abstract string Key { get; }
+        protected internal readonly ApiCredentials _credentials;
 
         /// <summary>
-        /// Authenticate a REST request
+        /// Byte representation of the secret
         /// </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);
+        protected byte[] _sBytes;
 
         /// <summary>
-        /// Get an authentication query for a websocket
+        /// Get the API key of the current credentials
         /// </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;
+        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)
+                throw new ArgumentException("ApiKey/Secret needed");
+
+            _credentials = credentials;
+            _sBytes = Encoding.UTF8.GetBytes(credentials.Secret);
+        }
+
+        /// <summary>
+        /// Authenticate a request. Output parameters should include the providedParameters input
+        /// </summary>
+        /// <param name="apiClient">The Api client sending the request</param>
+        /// <param name="uri">The uri for the request</param>
+        /// <param name="method">The method of the request</param>
+        /// <param name="auth">If the requests should be authenticated</param>
+        /// <param name="arraySerialization">Array serialization type</param>
+        /// <param name="requestBodyFormat">The formatting of the request body</param>
+        /// <param name="uriParameters">Parameters that need to be in the Uri of the request. Should include the provided parameters if they should go in the uri</param>
+        /// <param name="bodyParameters">Parameters that need to be in the body of the request. Should include the provided parameters if they should go in the body</param>
+        /// <param name="headers">The headers that should be send with the request</param>
+        /// <param name="parameterPosition">The position where the providedParameters should go</param>
+        public abstract void AuthenticateRequest(
+            RestApiClient apiClient,
+            Uri uri,
+            HttpMethod method,
+            ref IDictionary<string, object>? uriParameters,
+            ref IDictionary<string, object>? bodyParameters,
+            ref Dictionary<string, string>? headers,
+            bool auth,
+            ArrayParametersSerialization arraySerialization,
+            HttpMethodParameterPosition parameterPosition,
+            RequestBodyFormat requestBodyFormat
+            );
 
         /// <summary>
         /// SHA256 sign the data and return the bytes
@@ -225,278 +257,6 @@ namespace CryptoExchange.Net.Authentication
             return encryptor.ComputeHash(Encoding.UTF8.GetBytes(data));
         }
 
-        /// <summary>
-        /// HMACSHA256 sign the data and return the hash
-        /// </summary>
-        protected string SignHMACSHA256(HMACCredential credential, string data, SignOutputType? outputType = null)
-            => SignHMACSHA256(credential,Encoding.UTF8.GetBytes(data), outputType);
-
-        /// <summary>
-        /// HMACSHA256 sign the data and return the hash
-        /// </summary>
-        protected string SignHMACSHA256(HMACCredential credential, byte[] data, SignOutputType? outputType = null)
-        {
-            using var encryptor = new HMACSHA256(credential.GetSBytes());
-            var resultBytes = encryptor.ComputeHash(data);
-            return outputType == SignOutputType.Base64 ? BytesToBase64String(resultBytes) : BytesToHexString(resultBytes);
-        }
-
-        /// <summary>
-        /// HMACSHA384 sign the data and return the hash
-        /// </summary>
-        protected string SignHMACSHA384(HMACCredential credential, string data, SignOutputType? outputType = null)
-            => SignHMACSHA384(credential, Encoding.UTF8.GetBytes(data), outputType);
-
-        /// <summary>
-        /// HMACSHA384 sign the data and return the hash
-        /// </summary>
-        protected string SignHMACSHA384(HMACCredential credential, byte[] data, SignOutputType? outputType = null)
-        {
-            using var encryptor = new HMACSHA384(credential.GetSBytes());
-            var resultBytes = encryptor.ComputeHash(data);
-            return outputType == SignOutputType.Base64 ? BytesToBase64String(resultBytes) : BytesToHexString(resultBytes);
-        }
-
-        /// <summary>
-        /// HMACSHA512 sign the data and return the hash
-        /// </summary>
-        protected string SignHMACSHA512(HMACCredential credential, string data, SignOutputType? outputType = null)
-            => SignHMACSHA512(credential, Encoding.UTF8.GetBytes(data), outputType);
-
-        /// <summary>
-        /// HMACSHA512 sign the data and return the hash
-        /// </summary>
-        protected string SignHMACSHA512(HMACCredential credential, byte[] data, SignOutputType? outputType = null)
-        {
-            using var encryptor = new HMACSHA512(credential.GetSBytes());
-            var resultBytes = encryptor.ComputeHash(data);
-            return outputType == SignOutputType.Base64 ? BytesToBase64String(resultBytes) : BytesToHexString(resultBytes);
-        }
-
-        /// <summary>
-        /// SHA256 sign the data
-        /// </summary>
-        protected string SignRSASHA256(RSACredential credential, byte[] data, SignOutputType? outputType = null)
-        {
-            var rsa = credential.GetSigner();
-            using var sha256 = SHA256.Create();
-            var hash = sha256.ComputeHash(data);
-            var resultBytes = rsa.SignHash(hash, HashAlgorithmName.SHA256, RSASignaturePadding.Pkcs1);
-            return outputType == SignOutputType.Base64 ? BytesToBase64String(resultBytes) : BytesToHexString(resultBytes);
-        }
-
-        /// <summary>
-        /// SHA384 sign the data
-        /// </summary>
-        protected string SignRSASHA384(RSACredential credential, byte[] data, SignOutputType? outputType = null)
-        {
-            var rsa = credential.GetSigner();
-            using var sha384 = SHA384.Create();
-            var hash = sha384.ComputeHash(data);
-            var resultBytes = rsa.SignHash(hash, HashAlgorithmName.SHA384, RSASignaturePadding.Pkcs1);
-            return outputType == SignOutputType.Base64 ? BytesToBase64String(resultBytes) : BytesToHexString(resultBytes);
-        }
-
-        /// <summary>
-        /// SHA512 sign the data
-        /// </summary>
-        protected string SignRSASHA512(RSACredential credential, byte[] data, SignOutputType? outputType = null)
-        {
-            var rsa = credential.GetSigner();
-            using var sha512 = SHA512.Create();
-            var hash = sha512.ComputeHash(data);
-            var resultBytes = rsa.SignHash(hash, HashAlgorithmName.SHA512, RSASignaturePadding.Pkcs1);
-            return outputType == SignOutputType.Base64 ? BytesToBase64String(resultBytes) : BytesToHexString(resultBytes);
-        }
-
-#if NET8_0_OR_GREATER
-        /// <summary>
-        /// Ed25519 sign the data 
-        /// </summary>
-        public string SignEd25519(Ed25519Credential credential, string data, SignOutputType? outputType = null)
-            => SignEd25519(credential, Encoding.ASCII.GetBytes(data), outputType);
-
-        /// <summary>
-        /// Ed25519 sign the data 
-        /// </summary>
-        public string SignEd25519(Ed25519Credential credential, byte[] data, SignOutputType? outputType = null)
-        {
-            var signKey = credential.GetSigningKey();
-            var resultBytes = SignatureAlgorithm.Ed25519.Sign(signKey, data);
-            return outputType == SignOutputType.Base64 ? BytesToBase64String(resultBytes) : BytesToHexString(resultBytes);
-        }
-#endif
-
-        /// <summary>
-        /// Convert byte array to hex string
-        /// </summary>
-        /// <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>
-        /// Convert byte array to base64 string
-        /// </summary>
-        /// <param name="buff"></param>
-        /// <returns></returns>
-        protected static string BytesToBase64String(byte[] buff)
-        {
-            return Convert.ToBase64String(buff);
-        }
-
-        /// <summary>
-        /// Get current timestamp including the time sync offset from the api client
-        /// </summary>
-        protected DateTime GetTimestamp(RestApiClient apiClient, bool includeOneSecondOffset = true)
-        {
-            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;
-        }
-
-        /// <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;
-
-        /// <summary>
-        /// Return the serialized request body
-        /// </summary>
-        /// <param name="serializer"></param>
-        /// <param name="parameters"></param>
-        /// <returns></returns>
-        protected static 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);
-            else
-                return stringSerializer.Serialize(parameters);
-        }
-    }
-
-    /// <inheritdoc />
-    public abstract class AuthenticationProvider<TApiCredentials> : AuthenticationProvider
-        where TApiCredentials: ApiCredentials
-    {
-        /// <summary>
-        /// API credentials used for signing requests
-        /// </summary>
-        public TApiCredentials ApiCredentials { get; set; }
-
-        /// <summary>
-        /// ctor
-        /// </summary>
-        protected AuthenticationProvider(TApiCredentials credentials)
-        {
-            credentials.Validate();
-
-            ApiCredentials = credentials;
-        }
-    }
-
-    /// <inheritdoc />
-    public abstract class AuthenticationProvider<TApiCredentials, TCredentialType> : AuthenticationProvider<TApiCredentials>
-        where TApiCredentials : ApiCredentials
-        where TCredentialType : CredentialSet
-    {
-        /// <summary>
-        /// The specific credential type used for signing requests.
-        /// </summary>
-        public TCredentialType Credential { get; }
-
-        /// <inheritdoc />
-        public override string Key => Credential.Key;
-
-        /// <summary>
-        /// ctor
-        /// </summary>
-        protected AuthenticationProvider(
-            TApiCredentials credentials,
-            TCredentialType? credential) : base(credentials)
-        {
-            if (credential == null)
-                throw new ArgumentException($"Missing \"{typeof(TCredentialType).Name}\" credentials on \"{credentials.GetType().Name}\"");
-
-            Credential = credential;
-        }
-        
         /// <summary>
         /// HMACSHA256 sign the data and return the hash
         /// </summary>
@@ -514,10 +274,9 @@ namespace CryptoExchange.Net.Authentication
         /// <returns></returns>
         protected string SignHMACSHA256(byte[] data, SignOutputType? outputType = null)
         {
-            if (Credential is not HMACCredential hmacCredential)
-                throw new InvalidOperationException($"Invalid HMAC signing without HMAC credentials provided");
-
-            return SignHMACSHA256(hmacCredential, data, outputType);
+            using var encryptor = new HMACSHA256(_sBytes);
+            var resultBytes = encryptor.ComputeHash(data);
+            return outputType == SignOutputType.Base64 ? BytesToBase64String(resultBytes) : BytesToHexString(resultBytes);
         }
 
         /// <summary>
@@ -537,10 +296,9 @@ namespace CryptoExchange.Net.Authentication
         /// <returns></returns>
         protected string SignHMACSHA384(byte[] data, SignOutputType? outputType = null)
         {
-            if (Credential is not HMACCredential hmacCredential)
-                throw new InvalidOperationException($"Invalid HMAC signing without HMAC credentials provided");
-
-            return SignHMACSHA384(hmacCredential, data, outputType);
+            using var encryptor = new HMACSHA384(_sBytes);
+            var resultBytes = encryptor.ComputeHash(data);
+            return outputType == SignOutputType.Base64 ? BytesToBase64String(resultBytes) : BytesToHexString(resultBytes);
         }
 
         /// <summary>
@@ -560,10 +318,9 @@ namespace CryptoExchange.Net.Authentication
         /// <returns></returns>
         protected string SignHMACSHA512(byte[] data, SignOutputType? outputType = null)
         {
-            if (Credential is not HMACCredential hmacCredential)
-                throw new InvalidOperationException($"Invalid HMAC signing without HMAC credentials provided");
-
-            return SignHMACSHA512(hmacCredential, data, outputType);
+            using var encryptor = new HMACSHA512(_sBytes);
+            var resultBytes = encryptor.ComputeHash(data);
+            return outputType == SignOutputType.Base64 ? BytesToBase64String(resultBytes) : BytesToHexString(resultBytes);
         }
 
         /// <summary>
@@ -574,10 +331,11 @@ namespace CryptoExchange.Net.Authentication
         /// <returns></returns>
         protected string SignRSASHA256(byte[] data, SignOutputType? outputType = null)
         {
-            if (Credential is not RSACredential rsaCredential)
-                throw new InvalidOperationException($"Invalid RSA signing without RSA credentials provided");
-
-            return SignRSASHA256(rsaCredential, data, outputType);
+            using var rsa = CreateRSA();
+            using var sha256 = SHA256.Create();
+            var hash = sha256.ComputeHash(data);
+            var resultBytes = rsa.SignHash(hash, HashAlgorithmName.SHA256, RSASignaturePadding.Pkcs1);
+            return outputType == SignOutputType.Base64? BytesToBase64String(resultBytes) : BytesToHexString(resultBytes);
         }
 
         /// <summary>
@@ -588,10 +346,11 @@ namespace CryptoExchange.Net.Authentication
         /// <returns></returns>
         protected string SignRSASHA384(byte[] data, SignOutputType? outputType = null)
         {
-            if (Credential is not RSACredential rsaCredential)
-                throw new InvalidOperationException($"Invalid RSA signing without RSA credentials provided");
-
-            return SignRSASHA384(rsaCredential, data, outputType);
+            using var rsa = CreateRSA();
+            using var sha384 = SHA384.Create();
+            var hash = sha384.ComputeHash(data);
+            var resultBytes = rsa.SignHash(hash, HashAlgorithmName.SHA384, RSASignaturePadding.Pkcs1);
+            return outputType == SignOutputType.Base64 ? BytesToBase64String(resultBytes) : BytesToHexString(resultBytes);
         }
 
         /// <summary>
@@ -602,29 +361,129 @@ namespace CryptoExchange.Net.Authentication
         /// <returns></returns>
         protected string SignRSASHA512(byte[] data, SignOutputType? outputType = null)
         {
-            if (Credential is not RSACredential rsaCredential)
-                throw new InvalidOperationException($"Invalid RSA signing without RSA credentials provided");
-
-            return SignRSASHA512(rsaCredential, data, outputType);
+            using var rsa = CreateRSA();
+            using var sha512 = SHA512.Create();
+            var hash = sha512.ComputeHash(data);
+            var resultBytes = rsa.SignHash(hash, HashAlgorithmName.SHA512, RSASignaturePadding.Pkcs1);
+            return outputType == SignOutputType.Base64 ? BytesToBase64String(resultBytes) : BytesToHexString(resultBytes);
         }
 
-#if NET8_0_OR_GREATER
-        /// <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)
+        private RSA CreateRSA()
         {
-            if (Credential is not Ed25519Credential ed25519Credential)
-                throw new InvalidOperationException($"Invalid Ed25519 signing without Ed25519 credentials provided");
-
-            return SignEd25519(ed25519Credential, data, outputType);
-        }
+            var rsa = RSA.Create();
+            if (_credentials.CredentialType == ApiCredentialsType.RsaPem)
+            {
+#if NETSTANDARD2_1_OR_GREATER || NET9_0_OR_GREATER
+                // Read from pem private key
+                var key = _credentials.Secret!
+                        .Replace("\n", "")
+                        .Replace("-----BEGIN PRIVATE KEY-----", "")
+                        .Replace("-----END PRIVATE KEY-----", "")
+                        .Trim();
+                rsa.ImportPkcs8PrivateKey(Convert.FromBase64String(
+                    key)
+                    , out _);
+#else
+                throw new Exception("Pem format not supported when running from .NetStandard2.0. Convert the private key to xml format.");
 #endif
+            }
+            else if (_credentials.CredentialType == ApiCredentialsType.RsaXml)
+            {
+                // Read from xml private key format
+                rsa.FromXmlString(_credentials.Secret!);
+            }
+            else
+            {
+                throw new Exception("Invalid credentials type");
+            }
+
+            return rsa;
+        }
+
+        /// <summary>
+        /// Convert byte array to hex string
+        /// </summary>
+        /// <param name="buff"></param>
+        /// <returns></returns>
+        protected static string BytesToHexString(byte[] buff)
+        {
+#if NET9_0_OR_GREATER
+            return Convert.ToHexString(buff);
+#else
+            var result = string.Empty;
+            foreach (var t in buff)
+                result += t.ToString("X2");
+            return result;
+#endif
+        }
+
+        /// <summary>
+        /// Convert byte array to base64 string
+        /// </summary>
+        /// <param name="buff"></param>
+        /// <returns></returns>
+        protected static string BytesToBase64String(byte[] buff)
+        {
+            return Convert.ToBase64String(buff);
+        }
+
+        /// <summary>
+        /// Get current timestamp including the time sync offset from the api client
+        /// </summary>
+        /// <param name="apiClient"></param>
+        /// <returns></returns>
+        protected DateTime GetTimestamp(RestApiClient apiClient)
+        {
+            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>
+        /// <param name="apiClient"></param>
+        /// <returns></returns>
+        protected string GetMillisecondTimestamp(RestApiClient apiClient)
+        {
+            return DateTimeConverter.ConvertToMilliseconds(GetTimestamp(apiClient)).Value.ToString(CultureInfo.InvariantCulture);
+        }
+
+        /// <summary>
+        /// Get millisecond timestamp as a long including the time sync offset from the api client
+        /// </summary>
+        /// <param name="apiClient"></param>
+        /// <returns></returns>
+        protected long GetMillisecondTimestampLong(RestApiClient apiClient)
+        {
+            return DateTimeConverter.ConvertToMilliseconds(GetTimestamp(apiClient)).Value;
+        }
+
+        /// <summary>
+        /// Return the serialized request body
+        /// </summary>
+        /// <param name="serializer"></param>
+        /// <param name="parameters"></param>
+        /// <returns></returns>
+        protected static string GetSerializedBody(IMessageSerializer serializer, IDictionary<string, object> parameters)
+        {
+            if (parameters.Count == 1 && parameters.TryGetValue(Constants.BodyPlaceHolderKey, out object? value))
+                return serializer.Serialize(value);
+            else
+                return serializer.Serialize(parameters);
+        }
+    }
+
+    /// <inheritdoc />
+    public abstract class AuthenticationProvider<TApiCredentials> : AuthenticationProvider where TApiCredentials : ApiCredentials
+    {
+        /// <inheritdoc />
+        protected new TApiCredentials _credentials => (TApiCredentials)base._credentials;
+
+        /// <summary>
+        /// ctor
+        /// </summary>
+        /// <param name="credentials"></param>
+        protected AuthenticationProvider(TApiCredentials credentials) : base(credentials)
+        {
+        }
     }
 }

CryptoExchange.Net/Authentication/CredentialSet.cs

@@ -1,569 +0,0 @@
-using System;
-using System.Security.Cryptography;
-using System.Text;
-
-#pragma warning disable CS8618 // Non-nullable field must contain a non-null value when exiting constructor. Consider adding the 'required' modifier or declaring as nullable.
-
-namespace CryptoExchange.Net.Authentication
-{
-    /// <summary>
-    /// Base class for a set of credentials
-    /// </summary>
-    public abstract class CredentialSet : ApiCredentials
-    {
-        /// <summary>
-        /// The (public) key/identifier for this credential pair
-        /// </summary>
-        public string Key { get; set; }
-
-        /// <summary>
-        /// ctor
-        /// </summary>
-        public CredentialSet() { }
-
-        /// <summary>
-        /// ctor
-        /// </summary>
-        public CredentialSet(string key)
-        {
-            Key = key;
-        }
-
-        /// <summary>
-        /// Validate the API credential
-        /// </summary>
-        public override void Validate()
-        {
-            if (string.IsNullOrEmpty(Key))
-                throw new ArgumentException($"Key not set on {GetType().Name}", nameof(Key));
-        }
-    }
-
-    /// <summary>
-    /// Api key credentials
-    /// </summary>
-    public class ApiKeyCredential : CredentialSet
-    {
-        /// <summary>
-        /// ctor
-        /// </summary>
-        /// <param name="key">Api key</param>
-        public ApiKeyCredential(string key) : base(key)
-        {
-        }
-
-        /// <inheritdoc />
-        public override ApiCredentials Copy() => new ApiKeyCredential(Key);
-
-    }
-
-    /// <summary>
-    /// HMAC credentials
-    /// </summary>
-    public class HMACCredential : CredentialSet
-    {
-        private byte[]? _sBytes;
-
-        /// <summary>
-        /// API secret
-        /// </summary>
-        public string Secret { get; set; }
-
-        /// <summary>
-        /// ctor
-        /// </summary>
-        public HMACCredential()
-        {
-        }
-
-        /// <summary>
-        /// ctor
-        /// </summary>
-        /// <param name="key">Api key/label</param>
-        /// <param name="secret">Api secret</param>
-        public HMACCredential(string key, string secret) : base(key)
-        {
-            Secret = secret;
-        }
-
-        /// <summary>
-        /// Get the secret value bytes
-        /// </summary>
-        /// <returns></returns>
-        public byte[] GetSBytes()
-        {
-            return _sBytes ??= Encoding.UTF8.GetBytes(Secret);
-        }
-
-        /// <inheritdoc />
-        public override ApiCredentials Copy() => new HMACCredential(Key, Secret);
-
-        /// <inheritdoc />
-        public override void Validate()
-        {
-            base.Validate();
-            if (string.IsNullOrEmpty(Secret))
-                throw new ArgumentException($"Secret not set on {GetType().Name}", nameof(Secret));
-        }
-    }
-
-    /// <summary>
-    /// HMAC credentials
-    /// </summary>
-    public class HMACPassCredential : HMACCredential
-    {
-        /// <summary>
-        /// Passphrase
-        /// </summary>
-        public string Pass { get; set; }
-
-        /// <summary>
-        /// ctor
-        /// </summary>
-        public HMACPassCredential()
-        {
-        }
-
-        /// <summary>
-        /// ctor
-        /// </summary>
-        /// <param name="key">Api key/label</param>
-        /// <param name="secret">Api secret</param>
-        /// <param name="pass">Passphrase</param>
-        public HMACPassCredential(string key, string secret, string pass) : base(key, secret)
-        {
-            Pass = pass;
-        }
-
-
-        /// <inheritdoc />
-        public override ApiCredentials Copy() => new HMACPassCredential(Key, Secret, Pass);
-
-        /// <inheritdoc />
-        public override void Validate()
-        {
-            base.Validate();
-            if (string.IsNullOrEmpty(Pass))
-                throw new ArgumentException($"Pass not set on {GetType().Name}", nameof(Pass));
-        }
-    }
-
-    /// <summary>
-    /// RSA credentials
-    /// </summary>
-    public abstract class RSACredential : CredentialSet
-    {
-        /// <summary>
-        /// Private key
-        /// </summary>
-        public string PrivateKey { get; set; }
-
-        /// <summary>
-        /// ctor
-        /// </summary>
-        public RSACredential()
-        {
-        }
-
-        /// <summary>
-        /// ctor
-        /// </summary>
-        /// <param name="key">Public key</param>
-        /// <param name="privateKey">Private key</param>
-        public RSACredential(string key, string privateKey) : base(key)
-        {
-            PrivateKey = privateKey;
-        }
-
-        /// <summary>
-        /// Get RSA signer
-        /// </summary>
-        public abstract RSA GetSigner();
-
-        /// <inheritdoc />
-        public override void Validate()
-        {
-            base.Validate();
-            if (string.IsNullOrEmpty(PrivateKey))
-                throw new ArgumentException($"PrivateKey not set on {GetType().Name}", nameof(PrivateKey));
-        }
-    }
-
-    /// <summary>
-    /// RSA credentials
-    /// </summary>
-    public abstract class RSAPassCredential : RSACredential
-    {
-        /// <summary>
-        /// Passphrase
-        /// </summary>
-        public string Pass { get; set; }
-
-        /// <summary>
-        /// ctor
-        /// </summary>
-        public RSAPassCredential()
-        {
-        }
-
-        /// <summary>
-        /// ctor
-        /// </summary>
-        /// <param name="key">Public key</param>
-        /// <param name="privateKey">Private key</param>
-        /// <param name="pass">Passphrase</param>
-        public RSAPassCredential(string key, string privateKey, string pass) : base(key, privateKey)
-        {
-            PrivateKey = privateKey;
-            Pass = pass;
-        }
-
-        /// <inheritdoc />
-        public override void Validate()
-        {
-            base.Validate();
-            if (string.IsNullOrEmpty(Pass))
-                throw new ArgumentException($"PrivateKey not set on {GetType().Name}", nameof(PrivateKey));
-        }
-    }
-
-#if NETSTANDARD2_1_OR_GREATER || NET7_0_OR_GREATER
-    /// <summary>
-    /// RSA credentials in PEM/base64 format
-    /// </summary>
-    public class RSAPemCredential : RSACredential
-    {
-        /// <summary>
-        /// ctor
-        /// </summary>
-        public RSAPemCredential()
-        {
-        }
-
-        /// <summary>
-        /// ctor
-        /// </summary>
-        /// <param name="key">Public key</param>
-        /// <param name="privateKey">Private key</param>
-        public RSAPemCredential(string key, string privateKey) : base(key, privateKey)
-        {
-        }
-
-        /// <summary>
-        /// Get RSA signer
-        /// </summary>
-        public override RSA GetSigner()
-        {
-            var rsa = RSA.Create();
-            var key = PrivateKey!
-                        .Replace("\n", "")
-                        .Replace("-----BEGIN PRIVATE KEY-----", "")
-                        .Replace("-----END PRIVATE KEY-----", "")
-                        .Trim();
-            rsa.ImportPkcs8PrivateKey(Convert.FromBase64String(
-                key)
-                , out _);
-
-            return rsa;
-        }
-
-        /// <inheritdoc />
-        public override ApiCredentials Copy() => new RSAPemCredential(Key, PrivateKey);        
-    }
-
-    /// <summary>
-    /// RSA PEM/Base64 credentials
-    /// </summary>
-    public class RSAPemPassCredential : RSAPassCredential
-    {
-        /// <summary>
-        /// ctor
-        /// </summary>
-        public RSAPemPassCredential()
-        {
-        }
-
-        /// <summary>
-        /// ctor
-        /// </summary>
-        /// <param name="key">Api key/label</param>
-        /// <param name="privateKey">Api secret</param>
-        /// <param name="pass">Passphrase</param>
-        public RSAPemPassCredential(string key, string privateKey, string pass) : base(key, privateKey, pass)
-        {
-        }
-
-        /// <summary>
-        /// Get RSA signer
-        /// </summary>
-        public override RSA GetSigner()
-        {
-            var rsa = RSA.Create();
-            var key = PrivateKey!
-                        .Replace("\n", "")
-                        .Replace("-----BEGIN PRIVATE KEY-----", "")
-                        .Replace("-----END PRIVATE KEY-----", "")
-                        .Trim();
-            rsa.ImportPkcs8PrivateKey(Convert.FromBase64String(
-                key)
-                , out _);
-
-            return rsa;
-        }
-
-        /// <inheritdoc />
-        public override ApiCredentials Copy() => new RSAPemPassCredential(Key, PrivateKey, Pass);
-    }
-#endif
-
-    /// <summary>
-    /// RSA credentials in XML format
-    /// </summary>
-    public class RSAXmlCredential : RSACredential
-    {
-        /// <summary>
-        /// ctor
-        /// </summary>
-        public RSAXmlCredential()
-        {
-        }
-
-        /// <summary>
-        /// ctor
-        /// </summary>
-        /// <param name="key">Public key</param>
-        /// <param name="privateKey">Private key</param>
-        public RSAXmlCredential(string key, string privateKey) : base(key, privateKey)
-        {
-        }
-
-        /// <summary>
-        /// Get RSA signer
-        /// </summary>
-        public override RSA GetSigner()
-        {
-            var rsa = RSA.Create();
-            rsa.FromXmlString(PrivateKey);
-            return rsa;
-        }
-
-        /// <inheritdoc />
-        public override ApiCredentials Copy() => new RSAXmlCredential(Key, PrivateKey);
-    }
-
-    /// <summary>
-    /// RSA XML credentials
-    /// </summary>
-    public class RSAXmlPassCredential : RSAPassCredential
-    {
-        /// <summary>
-        /// ctor
-        /// </summary>
-        public RSAXmlPassCredential()
-        {
-        }
-
-        /// <summary>
-        /// ctor
-        /// </summary>
-        /// <param name="key">Api key/label</param>
-        /// <param name="privateKey">Api secret</param>
-        /// <param name="pass">Passphrase</param>
-        public RSAXmlPassCredential(string key, string privateKey, string pass) : base(key, privateKey, pass)
-        {
-        }
-
-        /// <summary>
-        /// Get RSA signer
-        /// </summary>
-        public override RSA GetSigner()
-        {
-            var rsa = RSA.Create();
-            rsa.FromXmlString(PrivateKey);
-            return rsa;
-        }
-
-        /// <inheritdoc />
-        public override ApiCredentials Copy() => new RSAXmlPassCredential(Key, PrivateKey, Pass);
-    }
-
-#if NET8_0_OR_GREATER
-    /// <summary>
-    /// Credentials in Ed25519 format
-    /// </summary>
-    public class Ed25519Credential : CredentialSet
-    {
-        private NSec.Cryptography.Key? _signKey;
-
-        /// <summary>
-        /// Private key
-        /// </summary>
-        public string PrivateKey { get; set; }
-        
-        /// <summary>
-        /// ctor
-        /// </summary>
-        public Ed25519Credential()
-        {
-        }
-
-        /// <summary>
-        /// ctor
-        /// </summary>
-        /// <param name="key">Public key</param>
-        /// <param name="privateKey">Private key</param>
-        public Ed25519Credential(string key, string privateKey) : base(key)
-        {
-            PrivateKey = privateKey;
-        }
-
-        /// <summary>
-        /// Get signing key
-        /// </summary>
-        public NSec.Cryptography.Key GetSigningKey()
-        {
-            if (_signKey != null)
-                return _signKey;
-
-            var key = PrivateKey!
-                        .Replace("\n", "")
-                        .Replace("-----BEGIN PRIVATE KEY-----", "")
-                        .Replace("-----END PRIVATE KEY-----", "")
-                        .Trim();
-            var keyBytes = Convert.FromBase64String(key);
-            _signKey = NSec.Cryptography.Key.Import(NSec.Cryptography.SignatureAlgorithm.Ed25519, keyBytes, NSec.Cryptography.KeyBlobFormat.PkixPrivateKey);
-            return _signKey;
-        }
-
-        /// <inheritdoc />
-        public override ApiCredentials Copy() => new Ed25519Credential(Key, PrivateKey);
-        
-        /// <inheritdoc />
-        public override void Validate()
-        {
-            base.Validate();
-            if (string.IsNullOrEmpty(PrivateKey))
-                throw new ArgumentException($"PrivateKey not set on {GetType().Name}", nameof(PrivateKey));
-        }
-    }
-
-    /// <summary>
-    /// Ed25519 credentials
-    /// </summary>
-    public class Ed25519PassCredential : Ed25519Credential
-    {
-        /// <summary>
-        /// Passphrase
-        /// </summary>
-        public string Pass { get; set; }
-
-        /// <summary>
-        /// ctor
-        /// </summary>
-        public Ed25519PassCredential()
-        {
-        }
-
-        /// <summary>
-        /// ctor
-        /// </summary>
-        /// <param name="key">Api key/label</param>
-        /// <param name="privateKey">Private key</param>
-        /// <param name="pass">Passphrase</param>
-        public Ed25519PassCredential(string key, string privateKey, string pass) : base(key, privateKey)
-        {
-            Pass = pass;
-        }
-
-        /// <inheritdoc />
-        public override ApiCredentials Copy() => new Ed25519PassCredential(Key, PrivateKey, Pass);
-
-        /// <inheritdoc />
-        public override void Validate()
-        {
-            base.Validate();
-            if (string.IsNullOrEmpty(Pass))
-                throw new ArgumentException($"Pass not set on {GetType().Name}", nameof(Pass));
-        }
-    }
-#endif
-
-    /// <summary>
-    /// Credentials in ECDsa format
-    /// </summary>
-    public class ECDsaCredential : CredentialSet
-    {
-        /// <summary>
-        /// Private key
-        /// </summary>
-        public string PrivateKey { get; set; }
-
-        /// <summary>
-        /// ctor
-        /// </summary>
-        public ECDsaCredential()
-        {
-        }
-
-        /// <summary>
-        /// ctor
-        /// </summary>
-        /// <param name="key">Public key</param>
-        /// <param name="privateKey">Private key</param>
-        public ECDsaCredential(string key, string privateKey) : base(key)
-        {
-            PrivateKey = privateKey;
-        }
-
-        /// <inheritdoc />
-        public override ApiCredentials Copy() => new ECDsaCredential(Key, PrivateKey);
-
-        /// <inheritdoc />
-        public override void Validate()
-        {
-            base.Validate();
-            if (string.IsNullOrEmpty(PrivateKey))
-                throw new ArgumentException($"PrivateKey not set on {GetType().Name}", nameof(PrivateKey));
-        }
-    }
-
-    /// <summary>
-    /// ECDsa credentials
-    /// </summary>
-    public class ECDsaPassCredential : ECDsaCredential
-    {
-        /// <summary>
-        /// Passphrase
-        /// </summary>
-        public string Pass { get; set; }
-
-        /// <summary>
-        /// ctor
-        /// </summary>
-        public ECDsaPassCredential()
-        {
-        }
-
-        /// <summary>
-        /// ctor
-        /// </summary>
-        /// <param name="key">Api key/label</param>
-        /// <param name="privateKey">Private key</param>
-        /// <param name="pass">Passphrase</param>
-        public ECDsaPassCredential(string key, string privateKey, string pass) : base(key, privateKey)
-        {
-            Pass = pass;
-        }
-
-        /// <inheritdoc />
-        public override ApiCredentials Copy() => new ECDsaPassCredential(Key, PrivateKey, Pass);
-
-        /// <inheritdoc />
-        public override void Validate()
-        {
-            base.Validate();
-            if (string.IsNullOrEmpty(Pass))
-                throw new ArgumentException($"Pass not set on {GetType().Name}", nameof(Pass));
-        }
-    }
-}

CryptoExchange.Net/Authentication/Signing/CeAbiEncoder.cs

@@ -1,147 +0,0 @@
-using System;
-using System.Linq;
-using System.Numerics;
-using System.Text;
-
-namespace CryptoExchange.Net.Authentication.Signing
-{
-    /// <summary>
-    /// ABI encoding
-    /// </summary>
-    public static class CeAbiEncoder
-    {
-        /// <summary>
-        /// ABI encode string as Sha3Keccack hashed byte value
-        /// </summary>
-        public static byte[] AbiValueEncodeString(string value)
-        {
-            var abiValueEncoded = CeSha3Keccack.CalculateHash(Encoding.UTF8.GetBytes(value));
-            return abiValueEncoded;
-        }
-
-        /// <summary>
-        /// ABI encode bool value as uint256 with 1 for true and 0 for false, as per ABI specification
-        /// </summary>
-        public static byte[] AbiValueEncodeBool(bool value)
-            => AbiValueEncodeInt((byte)(value ? 1 : 0));
-
-        /// <summary>
-        /// ABI encode byte value as uint256, as per ABI specification
-        /// </summary>
-        public static byte[] AbiValueEncodeInt(byte value)
-            => AbiValueEncodeBigInteger(false, new BigInteger(value));
-
-        /// <summary>
-        /// ABI encode short value as int256, as per ABI specification  
-        /// </summary>
-        public static byte[] AbiValueEncodeInt(short value)
-            => AbiValueEncodeBigInteger(true, new BigInteger(value));
-
-        /// <summary>
-        /// ABI encode int value as int256, as per ABI specification
-        /// </summary>
-        /// <param name="value"></param>
-        /// <returns></returns>
-        public static byte[] AbiValueEncodeInt(int value)
-            => AbiValueEncodeBigInteger(true, new BigInteger(value));
-
-        /// <summary>
-        /// ABI encode long value as int256, as per ABI specification
-        /// </summary>
-        public static byte[] AbiValueEncodeInt(long value)
-            => AbiValueEncodeBigInteger(true, new BigInteger(value));
-
-        /// <summary>
-        /// ABI encode ushort value as uint256, as per ABI specification
-        /// </summary>
-        public static byte[] AbiValueEncodeInt(ushort value)
-            => AbiValueEncodeBigInteger(false, new BigInteger(value));
-
-        /// <summary>
-        /// ABI encode uint value as uint256, as per ABI specification
-        /// </summary>
-        /// <param name="value"></param>
-        /// <returns></returns>
-        public static byte[] AbiValueEncodeInt(uint value)
-            => AbiValueEncodeBigInteger(false, new BigInteger(value));
-
-        /// <summary>
-        /// ABI encode ulong value as uint256, as per ABI specification
-        /// </summary>
-        /// <param name="value"></param>
-        /// <returns></returns>
-        public static byte[] AbiValueEncodeInt(ulong value)
-            => AbiValueEncodeBigInteger(false, new BigInteger(value));
-
-        /// <summary>
-        /// ABI encode big integer value as int256 or uint256, as per ABI specification
-        /// </summary>
-        public static byte[] AbiValueEncodeBigInteger(bool signed, BigInteger value)
-        {
-            var result = new byte[32];
-            if (signed && value < 0)
-            {
-                // Pad with FF
-                for (int i = 0; i < result.Length; i++)
-                {
-                    result[i] = 0xFF;
-                }
-            }
-
-            var t = value.ToByteArray();
-            if (t.Length == 33)
-            {
-                // Strip last byte
-                var strip1 = new byte[32];
-                Array.Copy(t, 0, strip1, 0, 32);
-                t = strip1;
-            }
-
-            if (BitConverter.IsLittleEndian)
-                t = t.AsEnumerable().Reverse().ToArray();
-
-            t.CopyTo(result, result.Length - t.Length);
-            return result;
-        }
-
-        /// <summary>
-        /// ABI encode address value as uint256, as per ABI specification
-        /// </summary>
-        public static byte[] AbiValueEncodeAddress(string value)
-        {
-            var result = new byte[32];
-            var h = value.HexStringToBytes();
-            h.CopyTo(result, result.Length - h.Length);
-            return result;
-        }
-
-        /// <summary>
-        /// ABI encode hex string value as bytes32, as per ABI specification. The hex string is expected to be a 0x prefixed string, and the resulting bytes will be right aligned in the 32 bytes result, with leading zeros if the hex string is shorter than 32 bytes. If the hex string is longer than 32 bytes, an exception will be thrown.
-        /// </summary>
-        /// <param name="length"></param>
-        /// <param name="value"></param>
-        /// <returns></returns>
-        public static byte[] AbiValueEncodeHexBytes(int length, string value)
-            => AbiValueEncodeBytes(value.Length, value.HexStringToBytes());
-
-        /// <summary>
-        /// ABI encode byte array value as bytes32, as per ABI specification. The resulting bytes will be right aligned in the 32 bytes result, with leading zeros if the byte array is shorter than 32 bytes. If the byte array is longer than 32 bytes, an exception will be thrown.
-        /// </summary>
-        /// <param name="length"></param>
-        /// <param name="value"></param>
-        /// <returns></returns>
-        /// <exception cref="Exception"></exception>
-        public static byte[] AbiValueEncodeBytes(int length, byte[] value)
-        {
-            if (length != 32)
-                throw new Exception("Only 32 bytes size supported");
-
-            if (value.Length == 32)
-                return value;
-
-            var result = new byte[32];
-            value.CopyTo(result, result.Length - value.Length);
-            return result;
-        }
-    }
-}

CryptoExchange.Net/Authentication/Signing/CeEip712TypedDataEncoder.cs

@@ -1,304 +0,0 @@
-using System;
-using System.Collections;
-using System.Collections.Generic;
-using System.IO;
-using System.Linq;
-using System.Numerics;
-using System.Text;
-using System.Text.RegularExpressions;
-
-namespace CryptoExchange.Net.Authentication.Signing
-{
-    /// <summary>
-    /// EIP712 Typed Data Encoder
-    /// </summary>
-    public static class CeEip712TypedDataEncoder
-    {
-        /// <summary>
-        /// Encode EIP712 typed data according to the specification, with the provided primary type, domain fields and message fields.
-        /// The resulting byte array is the 0x19 0x01 prefix followed by the hash of the domain and the hash of the message, which can be signed with ECDsa secp256k1 to produce a signature that can be verified on chain with EIP712.
-        /// Note that this implementation does not support all possible EIP712 types, but it should cover most common use cases
-        /// </summary>
-        public static byte[] EncodeEip721(
-            string primaryType,
-            IEnumerable<(string Name, string Type, object Value)> domainFields,
-            IEnumerable<(string Name, string Type, object Value)> messageFields)
-        {
-            var data = new CeTypedDataRaw()
-            {
-                PrimaryType = primaryType,
-                DomainRawValues = domainFields.Select(x => new CeMemberValue
-                {
-                    TypeName = x.Type,
-                    Value = x.Value,
-                }).ToArray(),
-
-                Message = messageFields.Select(x => new CeMemberValue
-                {
-                    TypeName = x.Type,
-                    Value = x.Value,
-                }).ToArray(),
-                Types = new Dictionary<string, CeMemberDescription[]>
-                {
-                    {
-                        "EIP712Domain",
-                        domainFields.Select(x => new CeMemberDescription
-                        {
-                            Name = x.Name,
-                            Type = x.Type
-                        }).ToArray()
-                    },
-                    {
-                        primaryType,
-                        messageFields.Select(x => new CeMemberDescription
-                        {
-                            Name = x.Name,
-                            Type = x.Type
-                        }).ToArray()
-                    }
-                }
-            };
-
-            return EncodeTypedDataRaw(data);
-        }
-
-        /// <summary>
-        /// Encode EIP712 typed data according to the specification, with the provided primary type, domain fields and message fields.
-        /// The resulting byte array is the 0x19 0x01 prefix followed by the hash of the domain and the hash of the message, which can be signed with ECDsa secp256k1 to produce a signature that can be verified on chain with EIP712.
-        /// Note that this implementation does not support all possible EIP712 types, but it should cover most common use cases
-        /// </summary>
-        public static byte[] EncodeTypedDataRaw(CeTypedDataRaw typedData)
-        {
-            using var memoryStream = new MemoryStream();
-            using var writer = new BinaryWriter(memoryStream);
-            
-            // Write 0x19 0x01 prefix
-            writer.Write((byte)0x19);
-            writer.Write((byte)0x01);
-
-            // Write domain
-            writer.Write(HashStruct(typedData.Types, "EIP712Domain", typedData.DomainRawValues));
-
-            // Write message
-            writer.Write(HashStruct(typedData.Types, typedData.PrimaryType, typedData.Message));
-
-            writer.Flush();
-            var result = memoryStream.ToArray();
-            return result;
-            
-        }
-
-        private static byte[] HashStruct(IDictionary<string, CeMemberDescription[]> types, string primaryType, IEnumerable<CeMemberValue> message)
-        {
-            var memoryStream = new MemoryStream();
-            var writer = new BinaryWriter(memoryStream);
-            
-            // Encode the type header
-            EncodeType(writer, types, primaryType);
-
-            // Encode the data
-            EncodeData(writer, types, message);
-
-            writer.Flush();
-            return CeSha3Keccack.CalculateHash(memoryStream.ToArray());
-            
-        }
-
-        private static void EncodeData(BinaryWriter writer, IDictionary<string, CeMemberDescription[]> types, IEnumerable<CeMemberValue> memberValues)
-        {
-            foreach (var memberValue in memberValues)
-            {
-                switch (memberValue.TypeName)
-                {
-                    case var refType when IsReferenceType(refType):
-                        writer.Write(HashStruct(types, memberValue.TypeName, (IEnumerable<CeMemberValue>)memberValue.Value));
-                        break;
-
-                    case "string":
-                        writer.Write(CeAbiEncoder.AbiValueEncodeString((string)memberValue.Value));
-                        break;
-
-                    case "bool":
-                        writer.Write(CeAbiEncoder.AbiValueEncodeBool((bool)memberValue.Value));
-                        break;
-
-                    case "address":
-                        writer.Write(CeAbiEncoder.AbiValueEncodeAddress((string)memberValue.Value));
-                        break;
-
-                    default:
-                        if (memberValue.TypeName.Contains("["))
-                        {
-                            var items = (IList)memberValue.Value;
-                            var itemsMemberValues = new List<CeMemberValue>();
-                            foreach (var item in items)
-                            {
-                                itemsMemberValues.Add(new CeMemberValue()
-                                {
-                                    TypeName = memberValue.TypeName.Substring(0, memberValue.TypeName.LastIndexOf("[")),
-                                    Value = item
-                                });
-                            }
-
-                            var memoryStream = new MemoryStream();
-                            var writerItem = new BinaryWriter(memoryStream);
-
-                            EncodeData(writerItem, types, itemsMemberValues);
-                            writerItem.Flush();
-                            writer.Write(CeSha3Keccack.CalculateHash(memoryStream.ToArray()));
-                        }
-                        else if (memberValue.TypeName.StartsWith("int") || memberValue.TypeName.StartsWith("uint"))
-                        {
-                            if (memberValue.Value is string v)
-                            {
-                                if (!BigInteger.TryParse(v, out BigInteger parsedOutput))
-                                    throw new Exception($"Failed to encode BigInteger string {v}");
-
-                                writer.Write(CeAbiEncoder.AbiValueEncodeBigInteger(memberValue.TypeName[0] != 'u', parsedOutput));
-                            }
-                            else if (memberValue.Value is byte b)
-                            {
-                                writer.Write(CeAbiEncoder.AbiValueEncodeInt(b));
-                            }
-                            else if (memberValue.Value is short s)
-                            {
-                                writer.Write(CeAbiEncoder.AbiValueEncodeInt(s));
-                            }
-                            else if (memberValue.Value is int i)
-                            {
-                                writer.Write(CeAbiEncoder.AbiValueEncodeInt(i));
-                            }
-                            else if (memberValue.Value is long l)
-                            {
-                                writer.Write(CeAbiEncoder.AbiValueEncodeInt(l));
-                            }
-                            else if (memberValue.Value is ushort us)
-                            {
-                                writer.Write(CeAbiEncoder.AbiValueEncodeInt(us));
-                            }
-                            else if (memberValue.Value is uint ui)
-                            {
-                                writer.Write(CeAbiEncoder.AbiValueEncodeInt(ui));
-                            }
-                            else if (memberValue.Value is ulong ul)
-                            {
-                                writer.Write(CeAbiEncoder.AbiValueEncodeInt(ul));
-                            }
-                            else
-                            {
-                                throw new Exception("Unknown number value");
-                            }
-                        }
-                        else if (memberValue.TypeName.StartsWith("bytes"))
-                        {
-                            var length = memberValue.TypeName.Length == 5 ? 32 : int.Parse(memberValue.TypeName.Substring(5));
-                            writer.Write(CeAbiEncoder.AbiValueEncodeBytes(length, (byte[])memberValue.Value));
-                        }
-                        break;
-
-                }
-            }
-        }
-
-        private static void EncodeType(BinaryWriter writer, IDictionary<string, CeMemberDescription[]> types, string typeName)
-        {
-            var encodedTypes = EncodeTypes(types, typeName);
-            var encodedPrimaryType = encodedTypes.Single(x => x.Key == typeName);
-            var encodedReferenceTypes = encodedTypes.Where(x => x.Key != typeName).OrderBy(x => x.Key).Select(x => x.Value);
-            var fullyEncodedType = encodedPrimaryType.Value + string.Join(string.Empty, encodedReferenceTypes.ToArray());
-
-            writer.Write(CeSha3Keccack.CalculateHash(Encoding.UTF8.GetBytes(fullyEncodedType)));
-        }
-
-        /// <summary>
-        /// Create a list of type => type(parameters), for example:<br />
-        /// { IP712Domain, EIP712Domain(string name,string version,uint256 chainId,address verifyingContract) }
-        /// </summary>
-        private static IList<KeyValuePair<string, string>> EncodeTypes(IDictionary<string, CeMemberDescription[]> types, string currentTypeName)
-        {
-            var currentTypeMembers = types[currentTypeName];
-            var currentTypeMembersEncoded = currentTypeMembers.Select(x => x.Type + " " + x.Name);
-            var result = new List<KeyValuePair<string, string>>
-            {
-                new KeyValuePair<string, string>(currentTypeName, currentTypeName + "(" + string.Join(",", currentTypeMembersEncoded.ToArray()) + ")")
-            };
-
-            result.AddRange(currentTypeMembers.Select(x => x.Type.Contains("[") ? x.Type.Substring(0, x.Type.IndexOf("[")) : x.Type)
-                                              .Distinct()
-                                              .Where(IsReferenceType)
-                                              .SelectMany(x => EncodeTypes(types, x)));
-            return result;
-        }
-
-        internal static bool IsReferenceType(string typeName)
-        {
-            switch (typeName)
-            {
-                case var bytes when new Regex("bytes\\d+").IsMatch(bytes):
-                case var @uint when new Regex("uint\\d+").IsMatch(@uint):
-                case var @int when new Regex("int\\d+").IsMatch(@int):
-                case "bytes":
-                case "string":
-                case "bool":
-                case "address":
-                case var array when array.Contains("["):
-                    return false;
-                default:
-                    return true;
-            }
-        }
-    }
-
-    /// <summary>
-    /// Member description
-    /// </summary>
-    public class CeMemberDescription
-    {
-        /// <summary>
-        /// Name
-        /// </summary>
-        public string Name { get; set; } = string.Empty;
-        /// <summary>
-        /// Type
-        /// </summary>
-        public string Type { get; set; } = string.Empty;
-    }
-
-    /// <summary>
-    /// Member value
-    /// </summary>
-    public class CeMemberValue
-    {
-        /// <summary>
-        /// Type name
-        /// </summary>
-        public string TypeName { get; set; } = string.Empty;
-        /// <summary>
-        /// Value
-        /// </summary>
-        public object Value { get; set; } = string.Empty;
-    }
-
-    /// <summary>
-    /// Typed data raw, used for encoding EIP712 typed data with the provided primary type, domain fields and message fields.
-    /// </summary>
-    public class CeTypedDataRaw
-    {
-        /// <summary>
-        /// Type dictionary
-        /// </summary>
-        public IDictionary<string, CeMemberDescription[]> Types { get; set; } = new Dictionary<string, CeMemberDescription[]>();
-        /// <summary>
-        /// Primary type
-        /// </summary>
-        public string PrimaryType { get; set; } = string.Empty;
-        /// <summary>
-        /// Message values
-        /// </summary>
-        public CeMemberValue[] Message { get; set; } = [];
-        /// <summary>
-        /// Domain values
-        /// </summary>
-        public CeMemberValue[] DomainRawValues { get; set; } = [];
-    }
-}

CryptoExchange.Net/Authentication/Signing/CeSha3Keccack.cs

@@ -1,385 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Diagnostics;
-using System.Text;
-
-namespace CryptoExchange.Net.Authentication.Signing
-{
-    /// <summary>
-    /// Sha3 Keccack hashing, as per Ethereum specification, with 256 bit output
-    /// </summary>
-    public class CeSha3Keccack
-    {
-        /// <summary>
-        /// Calculate the Keccack256 hash of the provided data, as per Ethereum specification
-        /// </summary>
-        public static byte[] CalculateHash(byte[] data)
-        {
-            var digest = new CeKeccakDigest256();
-            var output = new byte[digest.GetDigestSize()];
-            digest.BlockUpdate(data, data.Length);
-            digest.DoFinal(output, 0);
-            return output;
-        }
-    }
-
-    internal class CeKeccakDigest256
-    {
-        private static readonly ulong[] _keccakRoundConstants = KeccakInitializeRoundConstants();
-        private static readonly int[] _keccakRhoOffsets = KeccakInitializeRhoOffsets();
-
-        private readonly int _rate;
-        private const int _stateLength = 1600 / 8;
-        private readonly ulong[] _state = new ulong[_stateLength / 8];
-        private readonly byte[] _dataQueue = new byte[1536 / 8];
-        private int _bitsInQueue;
-        private int _fixedOutputLength;
-        private bool _squeezing;
-        private int _bitsAvailableForSqueezing;
-
-        public CeKeccakDigest256()
-        {
-            _rate = 1600 - (256 << 1);
-            _bitsInQueue = 0;
-            _squeezing = false;
-            _bitsAvailableForSqueezing = 0;
-            _fixedOutputLength = 1600 - _rate >> 1;
-        }
-
-        internal void BlockUpdate(byte[] data, int length)
-        {
-            int bytesInQueue = _bitsInQueue >> 3;
-            int rateBytes = _rate >> 3;
-
-            int count = 0;
-            while (count < length)
-            {
-                if (bytesInQueue == 0 && count <= length - rateBytes)
-                {
-                    do
-                    {
-                        KeccakAbsorb(data, count);
-                        count += rateBytes;
-                    } while (count <= length - rateBytes);
-                }
-                else
-                {
-                    int partialBlock = Math.Min(rateBytes - bytesInQueue, length - count);
-                    Array.Copy(data, count, _dataQueue, bytesInQueue, partialBlock);
-
-                    bytesInQueue += partialBlock;
-                    count += partialBlock;
-
-                    if (bytesInQueue == rateBytes)
-                    {
-                        KeccakAbsorb(_dataQueue, 0);
-                        bytesInQueue = 0;
-                    }
-                }
-            }
-
-            _bitsInQueue = bytesInQueue << 3;
-        }
-
-        internal void DoFinal(byte[] output, int outOff)
-        {
-            Squeeze(output, outOff, _fixedOutputLength >> 3);
-        }
-
-        internal int GetDigestSize() => _fixedOutputLength >> 3;
-
-        protected void Squeeze(byte[] output, int off, int len)
-        {
-            if (!_squeezing)
-                PadAndSwitchToSqueezingPhase();
-
-            long outputLength = (long)len << 3;
-            long i = 0;
-            while (i < outputLength)
-            {
-                if (_bitsAvailableForSqueezing == 0)
-                {
-                    KeccakPermutation();
-                    KeccakExtract();
-                    _bitsAvailableForSqueezing = _rate;
-                }
-
-                int partialBlock = (int)Math.Min(_bitsAvailableForSqueezing, outputLength - i);
-                Array.Copy(_dataQueue, _rate - _bitsAvailableForSqueezing >> 3, output, off + (int)(i >> 3),
-                    partialBlock >> 3);
-                _bitsAvailableForSqueezing -= partialBlock;
-                i += partialBlock;
-            }
-        }
-
-        private static ulong[] KeccakInitializeRoundConstants()
-        {
-            ulong[] keccakRoundConstants = new ulong[24];
-            byte LFSRState = 0x01;
-
-            for (int i = 0; i < 24; i++)
-            {
-                keccakRoundConstants[i] = 0;
-                for (int j = 0; j < 7; j++)
-                {
-                    int bitPosition = (1 << j) - 1;
-
-                    // LFSR86540
-
-                    bool loBit = (LFSRState & 0x01) != 0;
-                    if (loBit)
-                        keccakRoundConstants[i] ^= 1UL << bitPosition;
-
-                    bool hiBit = (LFSRState & 0x80) != 0;
-                    LFSRState <<= 1;
-                    if (hiBit)
-                        LFSRState ^= 0x71;
-                }
-            }
-
-            return keccakRoundConstants;
-        }
-        private static int[] KeccakInitializeRhoOffsets()
-        {
-            int[] keccakRhoOffsets = new int[25];
-            int x, y, t, newX, newY;
-
-            int rhoOffset = 0;
-            keccakRhoOffsets[0] = rhoOffset;
-            x = 1;
-            y = 0;
-            for (t = 1; t < 25; t++)
-            {
-                rhoOffset = rhoOffset + t & 63;
-                keccakRhoOffsets[x % 5 + 5 * (y % 5)] = rhoOffset;
-                newX = (0 * x + 1 * y) % 5;
-                newY = (2 * x + 3 * y) % 5;
-                x = newX;
-                y = newY;
-            }
-
-            return keccakRhoOffsets;
-        }
-
-        private void KeccakAbsorb(byte[] data, int off)
-        {
-            int count = _rate >> 6;
-            for (int i = 0; i < count; ++i)
-            {
-                _state[i] ^= Pack.LeToUInt64(data, off);
-                off += 8;
-            }
-
-            KeccakPermutation();
-        }
-
-        private void KeccakPermutation()
-        {
-            for (int i = 0; i < 24; i++)
-            {
-                Theta(_state);
-                Rho(_state);
-                Pi(_state);
-                Chi(_state);
-                Iota(_state, i);
-            }
-        }
-        private static ulong LeftRotate(ulong v, int r)
-        {
-            return v << r | v >> -r;
-        }
-
-        private static void Theta(ulong[] A)
-        {
-            ulong C0 = A[0 + 0] ^ A[0 + 5] ^ A[0 + 10] ^ A[0 + 15] ^ A[0 + 20];
-            ulong C1 = A[1 + 0] ^ A[1 + 5] ^ A[1 + 10] ^ A[1 + 15] ^ A[1 + 20];
-            ulong C2 = A[2 + 0] ^ A[2 + 5] ^ A[2 + 10] ^ A[2 + 15] ^ A[2 + 20];
-            ulong C3 = A[3 + 0] ^ A[3 + 5] ^ A[3 + 10] ^ A[3 + 15] ^ A[3 + 20];
-            ulong C4 = A[4 + 0] ^ A[4 + 5] ^ A[4 + 10] ^ A[4 + 15] ^ A[4 + 20];
-
-            ulong dX = LeftRotate(C1, 1) ^ C4;
-
-            A[0] ^= dX;
-            A[5] ^= dX;
-            A[10] ^= dX;
-            A[15] ^= dX;
-            A[20] ^= dX;
-
-            dX = LeftRotate(C2, 1) ^ C0;
-
-            A[1] ^= dX;
-            A[6] ^= dX;
-            A[11] ^= dX;
-            A[16] ^= dX;
-            A[21] ^= dX;
-
-            dX = LeftRotate(C3, 1) ^ C1;
-
-            A[2] ^= dX;
-            A[7] ^= dX;
-            A[12] ^= dX;
-            A[17] ^= dX;
-            A[22] ^= dX;
-
-            dX = LeftRotate(C4, 1) ^ C2;
-
-            A[3] ^= dX;
-            A[8] ^= dX;
-            A[13] ^= dX;
-            A[18] ^= dX;
-            A[23] ^= dX;
-
-            dX = LeftRotate(C0, 1) ^ C3;
-
-            A[4] ^= dX;
-            A[9] ^= dX;
-            A[14] ^= dX;
-            A[19] ^= dX;
-            A[24] ^= dX;
-        }
-
-        private static void Rho(ulong[] A)
-        {
-            // KeccakRhoOffsets[0] == 0
-            for (int x = 1; x < 25; x++)
-            {
-                A[x] = LeftRotate(A[x], _keccakRhoOffsets[x]);
-            }
-        }
-
-        private static void Pi(ulong[] A)
-        {
-            ulong a1 = A[1];
-            A[1] = A[6];
-            A[6] = A[9];
-            A[9] = A[22];
-            A[22] = A[14];
-            A[14] = A[20];
-            A[20] = A[2];
-            A[2] = A[12];
-            A[12] = A[13];
-            A[13] = A[19];
-            A[19] = A[23];
-            A[23] = A[15];
-            A[15] = A[4];
-            A[4] = A[24];
-            A[24] = A[21];
-            A[21] = A[8];
-            A[8] = A[16];
-            A[16] = A[5];
-            A[5] = A[3];
-            A[3] = A[18];
-            A[18] = A[17];
-            A[17] = A[11];
-            A[11] = A[7];
-            A[7] = A[10];
-            A[10] = a1;
-        }
-
-        private static void Chi(ulong[] A)
-        {
-            ulong chiC0, chiC1, chiC2, chiC3, chiC4;
-
-            for (int yBy5 = 0; yBy5 < 25; yBy5 += 5)
-            {
-                chiC0 = A[0 + yBy5] ^ ~A[(0 + 1) % 5 + yBy5] & A[(0 + 2) % 5 + yBy5];
-                chiC1 = A[1 + yBy5] ^ ~A[(1 + 1) % 5 + yBy5] & A[(1 + 2) % 5 + yBy5];
-                chiC2 = A[2 + yBy5] ^ ~A[(2 + 1) % 5 + yBy5] & A[(2 + 2) % 5 + yBy5];
-                chiC3 = A[3 + yBy5] ^ ~A[(3 + 1) % 5 + yBy5] & A[(3 + 2) % 5 + yBy5];
-                chiC4 = A[4 + yBy5] ^ ~A[(4 + 1) % 5 + yBy5] & A[(4 + 2) % 5 + yBy5];
-
-                A[0 + yBy5] = chiC0;
-                A[1 + yBy5] = chiC1;
-                A[2 + yBy5] = chiC2;
-                A[3 + yBy5] = chiC3;
-                A[4 + yBy5] = chiC4;
-            }
-        }
-
-        private static void Iota(ulong[] A, int indexRound)
-        {
-            A[0] ^= _keccakRoundConstants[indexRound];
-        }
-
-        private void PadAndSwitchToSqueezingPhase()
-        {
-            Debug.Assert(_bitsInQueue < _rate);
-
-            _dataQueue[_bitsInQueue >> 3] |= (byte)(1U << (_bitsInQueue & 7));
-
-            if (++_bitsInQueue == _rate)
-            {
-                KeccakAbsorb(_dataQueue, 0);
-                _bitsInQueue = 0;
-            }
-
-            {
-                int full = _bitsInQueue >> 6, partial = _bitsInQueue & 63;
-                int off = 0;
-                for (int i = 0; i < full; ++i)
-                {
-                    _state[i] ^= Pack.LeToUInt64(_dataQueue, off);
-                    off += 8;
-                }
-
-                if (partial > 0)
-                {
-                    ulong mask = (1UL << partial) - 1UL;
-                    _state[full] ^= Pack.LeToUInt64(_dataQueue, off) & mask;
-                }
-
-                _state[_rate - 1 >> 6] ^= 1UL << 63;
-            }
-
-            KeccakPermutation();
-            KeccakExtract();
-            _bitsAvailableForSqueezing = _rate;
-
-            _bitsInQueue = 0;
-            _squeezing = true;
-        }
-        private void KeccakExtract()
-        {
-            Pack.UInt64ToLe(_state, 0, _rate >> 6, _dataQueue, 0);
-        }
-
-        static class Pack
-        {
-            internal static ulong LeToUInt64(byte[] bs, int off)
-            {
-                uint lo = LeToUInt32(bs, off);
-                uint hi = LeToUInt32(bs, off + 4);
-                return (ulong)hi << 32 | lo;
-            }
-            internal static uint LeToUInt32(byte[] bs, int off)
-            {
-                return bs[off]
-                       | (uint)bs[off + 1] << 8
-                       | (uint)bs[off + 2] << 16
-                       | (uint)bs[off + 3] << 24;
-            }
-
-            internal static void UInt64ToLe(ulong[] ns, int nsOff, int nsLen, byte[] bs, int bsOff)
-            {
-                for (int i = 0; i < nsLen; ++i)
-                {
-                    UInt64ToLe(ns[nsOff + i], bs, bsOff);
-                    bsOff += 8;
-                }
-            }
-            internal static void UInt64ToLe(ulong n, byte[] bs, int off)
-            {
-                UInt32ToLe((uint)n, bs, off);
-                UInt32ToLe((uint)(n >> 32), bs, off + 4);
-            }
-
-            internal static void UInt32ToLe(uint n, byte[] bs, int off)
-            {
-                bs[off] = (byte)n;
-                bs[off + 1] = (byte)(n >> 8);
-                bs[off + 2] = (byte)(n >> 16);
-                bs[off + 3] = (byte)(n >> 24);
-            }
-        }
-    }
-}

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);
             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,6 +1,7 @@
 using System;
-using CryptoExchange.Net.Interfaces.Clients;
-using CryptoExchange.Net.Objects.Errors;
+using CryptoExchange.Net.Authentication;
+using CryptoExchange.Net.Interfaces;
+using CryptoExchange.Net.Objects;
 using CryptoExchange.Net.Objects.Options;
 using CryptoExchange.Net.SharedApis;
 using Microsoft.Extensions.Logging;
@@ -12,11 +13,6 @@ namespace CryptoExchange.Net.Clients
     /// </summary>
     public abstract class BaseApiClient : IDisposable, IBaseApiClient
     {
-        /// <summary>
-        /// Client name
-        /// </summary>
-        protected string? _clientName;
-
         /// <summary>
         /// Logger
         /// </summary>
@@ -28,24 +24,9 @@ namespace CryptoExchange.Net.Clients
         protected bool _disposing;
 
         /// <summary>
-        /// Whether a proxy is configured
+        /// The authentication provider for this API client. (null if no credentials are set)
         /// </summary>
-        protected bool _proxyConfigured;
-
-        /// <summary>
-        /// Name of the client
-        /// </summary>
-        protected internal string ClientName
-        {
-            get
-            {
-                if (_clientName != null)
-                    return _clientName;
-
-                _clientName = GetType().Name;
-                return _clientName;
-            }
-        }
+        public AuthenticationProvider? AuthenticationProvider { get; private set; }
 
         /// <summary>
         /// The environment this client communicates to
@@ -57,6 +38,9 @@ namespace CryptoExchange.Net.Clients
         /// </summary>
         public bool OutputOriginalData { get; }
 
+        /// <inheritdoc />
+        public bool Authenticated => ApiOptions.ApiCredentials != null || ClientOptions.ApiCredentials != null;
+
         /// <summary>
         /// Api options
         /// </summary>
@@ -67,25 +51,16 @@ 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="baseAddress">Base address for this API client</param>
+        /// <param name="apiCredentials">Api credentials</param>
         /// <param name="clientOptions">Client options</param>
         /// <param name="apiOptions">Api options</param>
-        protected BaseApiClient(
-            ILogger logger,
-            bool outputOriginalData,
-            string baseAddress,
-            ExchangeOptions clientOptions,
-            ApiOptions apiOptions)
+        protected BaseApiClient(ILogger logger, bool outputOriginalData, ApiCredentials? apiCredentials, string baseAddress, ExchangeOptions clientOptions, ApiOptions apiOptions)
         {
             _logger = logger;
 
@@ -94,21 +69,38 @@ namespace CryptoExchange.Net.Clients
             OutputOriginalData = outputOriginalData;
             BaseAddress = baseAddress;
 
-            _proxyConfigured = ClientOptions.Proxy != null;
+            if (apiCredentials != null)
+                AuthenticationProvider = CreateAuthenticationProvider(apiCredentials.Copy());
         }
 
+        /// <summary>
+        /// Create an AuthenticationProvider implementation instance based on the provided credentials
+        /// </summary>
+        /// <param name="credentials"></param>
+        /// <returns></returns>
+        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);
+        /// <inheritdoc />
+        public void SetApiCredentials<T>(T credentials) where T : ApiCredentials
+        {
+            ApiOptions.ApiCredentials = credentials;
+            if (credentials != null)
+                AuthenticationProvider = CreateAuthenticationProvider(credentials.Copy());
+        }
 
-        /// <summary>
-        /// Get error info for a response code
-        /// </summary>
-        public ErrorInfo GetErrorInfo(string code, string? message = null) => ErrorMapping.GetErrorInfo(code.ToString(), message);
+        /// <inheritdoc />
+        public virtual void SetOptions<T>(UpdateOptions<T> options) where T : ApiCredentials
+        {
+            ClientOptions.Proxy = options.Proxy;
+            ClientOptions.RequestTimeout = options.RequestTimeout ?? ClientOptions.RequestTimeout;
+
+            ApiOptions.ApiCredentials = options.ApiCredentials ?? ClientOptions.ApiCredentials;
+            if (options.ApiCredentials != null)
+                AuthenticationProvider = CreateAuthenticationProvider(options.ApiCredentials.Copy());
+        }
 
         /// <summary>
         /// Dispose

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
 {
@@ -39,11 +39,6 @@ namespace CryptoExchange.Net.Clients
         /// </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,11 +49,7 @@ 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>
@@ -75,6 +66,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;
         }
 
@@ -92,6 +85,16 @@ namespace CryptoExchange.Net.Clients
             _logger.Log(LogLevel.Trace, $"Client configuration: {options}, CryptoExchange.Net: v{CryptoExchangeLibVersion}, {Exchange}.Net: v{ExchangeLibVersion}");
         }
 
+        /// <summary>
+        /// Set the API credentials for this client. All Api clients in this client will use the new credentials, regardless of earlier set options.
+        /// </summary>
+        /// <param name="credentials">The credentials to set</param>
+        protected virtual void SetApiCredentials<T>(T credentials) where T : ApiCredentials
+        {
+            foreach (var apiClient in ApiClients)
+                apiClient.SetApiCredentials(credentials);
+        }
+
         /// <summary>
         /// Register an API client
         /// </summary>
@@ -101,6 +104,7 @@ namespace CryptoExchange.Net.Clients
             if (ClientOptions == null)
                 throw new InvalidOperationException("Client should have called Initialize before adding API clients");
 
+            _logger.Log(LogLevel.Trace, $"  {apiClient.GetType().Name}, base address: {apiClient.BaseAddress}");
             ApiClients.Add(apiClient);
             return apiClient;
         }
@@ -120,8 +124,7 @@ namespace CryptoExchange.Net.Clients
         /// </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,11 +1,6 @@
-using CryptoExchange.Net.Authentication;
-using CryptoExchange.Net.Interfaces.Clients;
-using CryptoExchange.Net.Objects;
-using CryptoExchange.Net.Objects.Options;
-using Microsoft.Extensions.Logging;
-using Microsoft.Extensions.Logging.Abstractions;
-using System.Collections.Generic;
 using System.Linq;
+using CryptoExchange.Net.Interfaces;
+using Microsoft.Extensions.Logging;
 
 namespace CryptoExchange.Net.Clients
 {
@@ -14,11 +9,6 @@ namespace CryptoExchange.Net.Clients
     /// </summary>
     public abstract class BaseRestClient : BaseClient, IRestClient
     {
-        /// <summary>
-        /// Api clients in this client
-        /// </summary>
-        internal new List<RestApiClient> ApiClients => base.ApiClients.OfType<RestApiClient>().ToList();
-
         /// <inheritdoc />
         public int TotalRequestsMade => ApiClients.OfType<RestApiClient>().Sum(s => s.TotalRequestsMade);
 
@@ -29,63 +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");
-        }
-
-        /// <summary>
-        /// Update options
-        /// </summary>
-        public virtual void SetOptions(UpdateOptions options)
-        {
-            foreach (var apiClient in ApiClients)
-                apiClient.SetOptions(options);
         }
     }
-
-    /// <inheritdoc />
-    public abstract class BaseRestClient<TEnvironment, TApiCredentials> : BaseRestClient, IRestClient<TApiCredentials>
-        where TEnvironment : TradeEnvironment
-        where TApiCredentials : ApiCredentials
-    {
-        /// <summary>
-        /// Api clients in this client
-        /// </summary>
-        internal new List<RestApiClient<TEnvironment, TApiCredentials>> ApiClients => base.ApiClients.OfType<RestApiClient<TEnvironment, TApiCredentials>>().ToList();
-
-        /// <summary>
-        /// Provided client options
-        /// </summary>
-        public new RestExchangeOptions<TEnvironment, TApiCredentials> ClientOptions => (RestExchangeOptions<TEnvironment, TApiCredentials>)base.ClientOptions;
-
-        /// <summary>
-        /// ctor
-        /// </summary>
-        /// <param name="loggerFactory">Logger factory</param>
-        /// <param name="name">The name of the API this client is for</param>
-        protected BaseRestClient(ILoggerFactory? loggerFactory, string name) : base(loggerFactory, name)
-        {
-        }
-
-        /// <summary>
-        /// Set the API credentials for this client. All Api clients in this client will use the new credentials, regardless of earlier set options.
-        /// </summary>
-        /// <param name="credentials">The credentials to set</param>
-        public void SetApiCredentials(TApiCredentials credentials)
-        {
-            foreach (var apiClient in ApiClients)
-                apiClient.SetApiCredentials(credentials);
-        }
-
-        /// <summary>
-        /// Update options
-        /// </summary>
-        public virtual void SetOptions(UpdateOptions<TApiCredentials> options)
-        {
-            foreach (var apiClient in ApiClients)
-                apiClient.SetOptions(options);
-        }
-
-    }
-}
+}

CryptoExchange.Net/Clients/BaseSocketClient.cs

@@ -1,16 +1,12 @@
-using CryptoExchange.Net.Authentication;
-using CryptoExchange.Net.Interfaces.Clients;
-using CryptoExchange.Net.Logging.Extensions;
-using CryptoExchange.Net.Objects;
-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
 {
@@ -21,11 +17,6 @@ namespace CryptoExchange.Net.Clients
     {
         #region fields
 
-        /// <summary>
-        /// Api clients in this client
-        /// </summary>
-        internal new List<SocketApiClient> ApiClients => base.ApiClients.OfType<SocketApiClient>().ToList();
-
         /// <summary>
         /// If client is disposing
         /// </summary>
@@ -37,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>
@@ -140,58 +125,5 @@ namespace CryptoExchange.Net.Clients
 
             return result;
         }
-
-        /// <summary>
-        /// Update options
-        /// </summary>
-        public virtual void SetOptions(UpdateOptions options)
-        {
-            foreach (var apiClient in ApiClients)
-                apiClient.SetOptions(options);
-        }
-    }
-
-    /// <inheritdoc />
-    public abstract class BaseSocketClient<TEnvironment, TApiCredentials> : BaseSocketClient, ISocketClient<TApiCredentials>
-        where TEnvironment : TradeEnvironment
-        where TApiCredentials : ApiCredentials
-    {
-        /// <summary>
-        /// Api clients in this client
-        /// </summary>
-        internal new List<SocketApiClient<TEnvironment, TApiCredentials>> ApiClients => base.ApiClients.OfType<SocketApiClient<TEnvironment, TApiCredentials>>().ToList();
-
-        /// <summary>
-        /// Provided client options
-        /// </summary>
-        public new SocketExchangeOptions<TEnvironment, TApiCredentials> ClientOptions => (SocketExchangeOptions<TEnvironment, TApiCredentials>)base.ClientOptions;
-
-        /// <summary>
-        /// ctor
-        /// </summary>
-        /// <param name="loggerFactory">Logger factory</param>
-        /// <param name="name">The name of the API this client is for</param>
-        protected BaseSocketClient(ILoggerFactory? loggerFactory, string name) : base(loggerFactory, name)
-        {
-        }
-
-        /// <summary>
-        /// Set the API credentials for this client. All Api clients in this client will use the new credentials, regardless of earlier set options.
-        /// </summary>
-        /// <param name="credentials">The credentials to set</param>
-        public virtual void SetApiCredentials(TApiCredentials credentials)
-        {
-            foreach (var apiClient in ApiClients)
-                apiClient.SetApiCredentials(credentials);
-        }
-
-        /// <summary>
-        /// Update options
-        /// </summary>
-        public virtual void SetOptions(UpdateOptions<TApiCredentials> options)
-        {
-            foreach (var apiClient in ApiClients)
-                apiClient.SetOptions(options);
-        }
     }
 }

CryptoExchange.Net/Clients/CryptoBaseClient.cs

@@ -0,0 +1,67 @@
+using Microsoft.Extensions.DependencyInjection;
+using System;
+using System.Collections.Generic;
+
+namespace CryptoExchange.Net.Clients
+{
+    /// <summary>
+    /// Base crypto client
+    /// </summary>
+    public class CryptoBaseClient : IDisposable
+    {
+        private readonly Dictionary<Type, object> _serviceCache = new Dictionary<Type, object>();
+
+        /// <summary>
+        /// Service provider
+        /// </summary>
+        protected readonly IServiceProvider? _serviceProvider;
+
+        /// <summary>
+        /// ctor
+        /// </summary>
+        public CryptoBaseClient() { }
+
+        /// <summary>
+        /// ctor
+        /// </summary>
+        /// <param name="serviceProvider"></param>
+        public CryptoBaseClient(IServiceProvider serviceProvider)
+        {
+            _serviceProvider = serviceProvider;
+            _serviceCache = new Dictionary<Type, object>();
+        }
+
+        /// <summary>
+        /// Try get a client by type for the service collection
+        /// </summary>
+        /// <typeparam name="T"></typeparam>
+        /// <returns></returns>
+        public T TryGet<T>(Func<T> createFunc)
+        {
+            var type = typeof(T);
+            if (_serviceCache.TryGetValue(type, out var value))
+                return (T)value;
+
+            if (_serviceProvider == null)
+            {
+                // Create with default options
+                var createResult = createFunc();
+                _serviceCache.Add(typeof(T), createResult!);
+                return createResult;
+            }
+
+            var result = _serviceProvider.GetService<T>() 
+                ?? throw new InvalidOperationException($"No service was found for {typeof(T).Name}, make sure the exchange is registered in dependency injection with the `services.Add[Exchange]()` method");
+            _serviceCache.Add(type, result!);
+            return result;
+        }
+
+        /// <summary>
+        /// Dispose
+        /// </summary>
+        public void Dispose()
+        {
+            _serviceCache.Clear();
+        }
+    }
+}

CryptoExchange.Net/Clients/CryptoRestClient.cs

@@ -0,0 +1,27 @@
+using CryptoExchange.Net.Interfaces;
+using Microsoft.Extensions.DependencyInjection;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+
+namespace CryptoExchange.Net.Clients
+{
+    /// <inheritdoc />
+    public class CryptoRestClient : CryptoBaseClient, ICryptoRestClient
+    {
+        /// <summary>
+        /// ctor
+        /// </summary>
+        public CryptoRestClient()
+        {
+        }
+
+        /// <summary>
+        /// ctor
+        /// </summary>
+        /// <param name="serviceProvider"></param>
+        public CryptoRestClient(IServiceProvider serviceProvider) : base(serviceProvider)
+        {
+        }
+    }
+}

CryptoExchange.Net/Clients/CryptoSocketClient.cs

@@ -0,0 +1,24 @@
+using CryptoExchange.Net.Interfaces;
+using System;
+
+namespace CryptoExchange.Net.Clients
+{
+    /// <inheritdoc />
+    public class CryptoSocketClient : CryptoBaseClient, ICryptoSocketClient
+    {
+        /// <summary>
+        /// ctor
+        /// </summary>
+        public CryptoSocketClient()
+        {
+        }
+
+        /// <summary>
+        /// ctor
+        /// </summary>
+        /// <param name="serviceProvider"></param>
+        public CryptoSocketClient(IServiceProvider serviceProvider) : base(serviceProvider)
+        {
+        }
+    }
+}

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 readonly 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 readonly struct MessagePath : IEnumerable<NodeAccessor>
+    {
+        private readonly 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,13 @@
-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;
+using System.Diagnostics.CodeAnalysis;
 
 namespace CryptoExchange.Net.Converters.SystemTextJson
 {
@@ -16,12 +16,13 @@ namespace CryptoExchange.Net.Converters.SystemTextJson
     /// 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()
+    public class ArrayConverter<[DynamicallyAccessedMembers(DynamicallyAccessedMemberTypes.PublicProperties)] T, [DynamicallyAccessedMembers(DynamicallyAccessedMemberTypes.PublicParameterlessConstructor)] TContext> : JsonConverter<T> where T : new() where TContext: JsonSerializerContext
+# else
+    public class ArrayConverter<T, TContext> : JsonConverter<T> where T : new() where TContext: JsonSerializerContext
 #endif
     {
-        private static SortedDictionary<int, List<ArrayPropertyInfo>>? _typePropertyInfo;
+        private static readonly ConcurrentDictionary<Type, List<ArrayPropertyInfo>> _typeAttributesCache = new ConcurrentDictionary<Type, List<ArrayPropertyInfo>>();
+        private static readonly ConcurrentDictionary<JsonConverter, JsonSerializerOptions> _converterOptionsCache = new ConcurrentDictionary<JsonConverter, JsonSerializerOptions>();
 
         /// <inheritdoc />
 #if NET5_0_OR_GREATER
@@ -36,59 +37,58 @@ namespace CryptoExchange.Net.Converters.SystemTextJson
                 return;
             }
 
-            if (_typePropertyInfo == null)
-                _typePropertyInfo = CacheTypeAttributes();
-
             writer.WriteStartArray();
+
+            var valueType = typeof(T);
+            if (!_typeAttributesCache.TryGetValue(valueType, out var typeAttributes))
+                typeAttributes = CacheTypeAttributes(valueType);
+
+            var ordered = typeAttributes.Where(x => x.ArrayProperty != null).OrderBy(p => p.ArrayProperty.Index);
             var last = -1;
-            foreach (var indexProps in _typePropertyInfo)
+            foreach (var prop in ordered)
             {
-                foreach (var prop in indexProps.Value)
+                if (prop.ArrayProperty.Index == last)
+                    continue;
+
+                while (prop.ArrayProperty.Index != last + 1)
                 {
-                    if (prop.ArrayProperty.Index == last)
-                        // Don't write the same index twice
-                        continue;
+                    writer.WriteNullValue();
+                    last += 1;
+                }
 
-                    while (prop.ArrayProperty.Index != 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
                     {
-                        writer.WriteNullValue();
-                        last += 1;
-                    }
+                        NumberHandling = JsonNumberHandling.AllowReadingFromString | JsonNumberHandling.AllowNamedFloatingPointLiterals,
+                        PropertyNameCaseInsensitive = false,
+                        TypeInfoResolver = (TContext)Activator.CreateInstance(typeof(TContext))!,
+                    };
+                    typeOptions.Converters.Add(prop.JsonConverter);
+                }
 
-                    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)!);
-                    }
+                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
-                    {
-                        JsonSerializer.Serialize(writer, objValue, typeOptions ?? options);
-                    }
+                        writer.WriteRawValue(Convert.ToString(objValue, CultureInfo.InvariantCulture)!);
+                }
+                else
+                {
+                    JsonSerializer.Serialize(writer, objValue, typeOptions ?? options);
                 }
             }
 
@@ -101,86 +101,8 @@ namespace CryptoExchange.Net.Converters.SystemTextJson
             if (reader.TokenType == JsonTokenType.Null)
                 return default;
 
-            var result = new T();
-            return ParseObject(ref reader, result, options);
-        }
-
-
-#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
-        {
-            if (reader.TokenType != JsonTokenType.StartArray)
-                throw new CeDeserializationException("Not an array");
-
-
-            if (_typePropertyInfo == null)
-                _typePropertyInfo = CacheTypeAttributes();
-
-            int index = 0;
-            while (reader.Read())
-            {
-                if (reader.TokenType == JsonTokenType.EndArray)
-                    break;
-
-                if(!_typePropertyInfo.TryGetValue(index, out var indexAttributes))
-                {
-                    index++;
-                    continue;
-                }
-
-                foreach (var attribute in indexAttributes)
-                {
-                    var targetType = attribute.TargetType;
-                    object? value = null;
-                    if (attribute.JsonConverter != 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);
-                    }
-                    else if (attribute.DefaultDeserialization)
-                    {
-                        value = JsonDocument.ParseValue(ref reader).Deserialize(options.GetTypeInfo(attribute.PropertyInfo.PropertyType));
-                    }
-                    else
-                    {
-                        value = reader.TokenType switch
-                        {
-                            JsonTokenType.Null => null,
-                            JsonTokenType.False => false,
-                            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"),
-                        };
-                    }
-
-                    if (targetType.IsAssignableFrom(value?.GetType()))
-                        attribute.PropertyInfo.SetValue(result, value);
-                    else
-                        attribute.PropertyInfo.SetValue(result, value == null ? null : Convert.ChangeType(value, targetType, CultureInfo.InvariantCulture));
-                }
-
-                index++;
-            }
-
-            return result;
+            var result = Activator.CreateInstance(typeof(T))!;
+            return (T)ParseObject(ref reader, result, typeof(T), options);
         }
 
         private static bool IsSimple(Type type)
@@ -199,13 +121,13 @@ namespace CryptoExchange.Net.Converters.SystemTextJson
 #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()
+        private static List<ArrayPropertyInfo> CacheTypeAttributes([DynamicallyAccessedMembers(DynamicallyAccessedMemberTypes.PublicProperties)] Type type)
 #else
-        private static SortedDictionary<int, List<ArrayPropertyInfo>> CacheTypeAttributes()
+        private static List<ArrayPropertyInfo> CacheTypeAttributes(Type type)
 #endif
         {
-            var result = new SortedDictionary<int, List<ArrayPropertyInfo>>();
-            var properties = typeof(T).GetProperties();
+            var attributes = new List<ArrayPropertyInfo>();
+            var properties = type.GetProperties();
             foreach (var property in properties)
             {
                 var att = property.GetCustomAttribute<ArrayPropertyAttribute>();
@@ -214,13 +136,7 @@ namespace CryptoExchange.Net.Converters.SystemTextJson
 
                 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
+                attributes.Add(new ArrayPropertyInfo
                 {
                     ArrayProperty = att,
                     PropertyInfo = property,
@@ -230,6 +146,87 @@ namespace CryptoExchange.Net.Converters.SystemTextJson
                 });
             }
 
+            _typeAttributesCache.TryAdd(type, attributes);
+            return attributes;
+        }
+
+
+#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 object ParseObject(ref Utf8JsonReader reader, object result, [DynamicallyAccessedMembers(DynamicallyAccessedMemberTypes.PublicProperties)] Type objectType, JsonSerializerOptions options)
+#else
+        private static object ParseObject(ref Utf8JsonReader reader, object result, Type objectType, JsonSerializerOptions options)
+#endif
+        {
+            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())
+            {
+                if (reader.TokenType == JsonTokenType.EndArray)
+                    break;
+
+                var indexAttributes = attributes.Where(a => a.ArrayProperty.Index == index);
+                if (!indexAttributes.Any())
+                {
+                    index++;
+                    continue;
+                }
+
+                foreach (var attribute in indexAttributes)
+                {
+                    var targetType = attribute.TargetType;
+                    object? value = null;
+                    if (attribute.JsonConverter != null)
+                    {
+                        if (!_converterOptionsCache.TryGetValue(attribute.JsonConverter, out var newOptions))
+                        {                            
+                            newOptions = new JsonSerializerOptions
+                            {
+                                NumberHandling = JsonNumberHandling.AllowReadingFromString | JsonNumberHandling.AllowNamedFloatingPointLiterals,
+                                PropertyNameCaseInsensitive = false,
+                                Converters = { attribute.JsonConverter },
+                                TypeInfoResolver = options.TypeInfoResolver,
+                            };
+                            _converterOptionsCache.TryAdd(attribute.JsonConverter, newOptions);
+                        }
+
+                        var doc = JsonDocument.ParseValue(ref reader);
+                        value = doc.Deserialize(attribute.PropertyInfo.PropertyType, newOptions);
+                    }
+                    else if (attribute.DefaultDeserialization)
+                    {
+                        // Use default deserialization
+                        value = JsonDocument.ParseValue(ref reader).Deserialize(attribute.PropertyInfo.PropertyType, SerializerOptions.WithConverters((TContext)Activator.CreateInstance(typeof(TContext))!));
+                    }
+                    else
+                    {
+                        value = reader.TokenType switch
+                        {
+                            JsonTokenType.Null => null,
+                            JsonTokenType.False => false,
+                            JsonTokenType.True => true,
+                            JsonTokenType.String => reader.GetString(),
+                            JsonTokenType.Number => reader.GetDecimal(),
+                            JsonTokenType.StartObject => JsonSerializer.Deserialize(ref reader, attribute.TargetType, options),
+                            _ => 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));
+                }
+
+                index++;
+            }
+
             return result;
         }
 
@@ -240,7 +237,6 @@ namespace CryptoExchange.Net.Converters.SystemTextJson
             public JsonConverter? JsonConverter { get; set; }
             public bool DefaultDeserialization { get; set; }
             public Type TargetType { get; set; } = null!;
-            public JsonSerializerOptions? JsonSerializerOptions { get; set; } = null;
         }
     }
 }

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,58 @@ namespace CryptoExchange.Net.Converters.SystemTextJson
         /// <inheritdoc />
         public override JsonConverter CreateConverter(Type typeToConvert, JsonSerializerOptions options)
         {
-            return typeToConvert == typeof(bool) ? new BoolConverterInner() : new BoolConverterInnerNullable();
+            return typeToConvert == typeof(bool) ? new BoolConverterInner<bool>() : new BoolConverterInner<bool?>();
         }
 
-        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 +80,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,6 +1,8 @@
 using System;
+using System.Collections.Generic;
 using System.Diagnostics.CodeAnalysis;
 using System.Linq;
+using System.Text;
 using System.Text.Json;
 using System.Text.Json.Serialization;
 
@@ -19,11 +21,7 @@ namespace CryptoExchange.Net.Converters.SystemTextJson
         /// <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() ?? [];
+            return (reader.GetString()?.Split(',').Select(x => (T)EnumConverter.ParseString<T>(x)!).ToArray() ?? []);
         }
 
         /// <inheritdoc />

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,5 @@
-using Microsoft.Extensions.Logging;
-using System;
+using System;
+using System.Diagnostics;
 using System.Diagnostics.CodeAnalysis;
 using System.Globalization;
 using System.Text.Json;
@@ -14,8 +14,8 @@ namespace CryptoExchange.Net.Converters.SystemTextJson
     {
         private static readonly DateTime _epoch = new(1970, 1, 1, 0, 0, 0, DateTimeKind.Utc);
         private const long _ticksPerSecond = TimeSpan.TicksPerMillisecond * 1000;
-        private const decimal _ticksPerMicrosecond = TimeSpan.TicksPerMillisecond / 1000m;
-        private const 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 +26,92 @@ namespace CryptoExchange.Net.Converters.SystemTextJson
         /// <inheritdoc />
         public override JsonConverter CreateConverter(Type typeToConvert, JsonSerializerOptions options)
         {
-            return typeToConvert == typeof(DateTime) ? new DateTimeConverterInner() : new NullableDateTimeConverterInner();
+            return typeToConvert == typeof(DateTime) ? new DateTimeConverterInner<DateTime>() : new DateTimeConverterInner<DateTime?>();
         }
 
-        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 < 0)
+                        return default;
+
+                    return ParseFromDouble(longValue);
+                }
+                else if (reader.TokenType is JsonTokenType.String)
+                {
+                    var stringValue = reader.GetString();
+                    if (string.IsNullOrWhiteSpace(stringValue)
+                        || stringValue == "-1"
+                        || stringValue == "0001-01-01T00:00:00Z"
+                        || 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 +120,7 @@ namespace CryptoExchange.Net.Converters.SystemTextJson
                     || !int.TryParse(stringValue.Substring(8, 2), out var hour)
                     || !int.TryParse(stringValue.Substring(10, 2), out var minute))
                 {
-                    LibraryHelpers.StaticLogger?.LogWarning("Unknown DateTime format: {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 +133,7 @@ namespace CryptoExchange.Net.Converters.SystemTextJson
                     || !int.TryParse(stringValue.Substring(4, 2), out var month)
                     || !int.TryParse(stringValue.Substring(6, 2), out var day))
                 {
-                    LibraryHelpers.StaticLogger?.LogWarning("Unknown DateTime format: {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 +146,25 @@ namespace CryptoExchange.Net.Converters.SystemTextJson
                     || !int.TryParse(stringValue.Substring(2, 2), out var month)
                     || !int.TryParse(stringValue.Substring(4, 2), out var day))
                 {
-                    LibraryHelpers.StaticLogger?.LogWarning("Unknown DateTime format: {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 +175,7 @@ namespace CryptoExchange.Net.Converters.SystemTextJson
                     || !int.TryParse(values[1], out var month)
                     || !int.TryParse(values[2], out var day))
                 {
-                    LibraryHelpers.StaticLogger?.LogWarning("Unknown DateTime format: {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 +188,54 @@ namespace CryptoExchange.Net.Converters.SystemTextJson
         /// <summary>
         /// Convert a seconds since epoch (01-01-1970) value to DateTime
         /// </summary>
-        public static DateTime ConvertFromSeconds(decimal seconds) => _epoch.AddTicks((long)Math.Round(seconds * _ticksPerSecond));
-        /// <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,7 +19,22 @@ namespace CryptoExchange.Net.Converters.SystemTextJson
             if (reader.TokenType == JsonTokenType.String)
             {
                 var value = reader.GetString();
-                return ExchangeHelpers.ParseDecimal(value);
+                if (string.IsNullOrEmpty(value) || string.Equals("null", value, StringComparison.OrdinalIgnoreCase))
+                    return null;
+
+                if (string.Equals("Infinity", value, StringComparison.Ordinal))
+                    // Infinity returned by the server, default to max value
+                    return decimal.MaxValue;
+
+                try
+                {
+                    return decimal.Parse(value, NumberStyles.Float, CultureInfo.InvariantCulture);
+                }
+                catch(OverflowException)
+                {
+                    // Value doesn't fit decimal, default to max value
+                    return decimal.MaxValue;
+                }
             }
 
             try

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;
@@ -67,30 +64,9 @@ namespace CryptoExchange.Net.Converters.SystemTextJson
 #endif
          : JsonConverter<T>, INullableConverterFactory where T : struct, Enum
     {
-        class EnumMapping
-        {
-            public T Value { get; set; }
-            public string StringValue { get; set; }
-
-            public EnumMapping(T value, string stringValue)
-            {
-                Value = value;
-                StringValue = stringValue;
-            }
-        }
-
-#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 static List<KeyValuePair<T, string>>? _mapping = null;
         private NullableEnumConverter? _nullableEnumConverter = null;
 
-        private static T? _undefinedEnumValue;
-        private static ConcurrentBag<string> _unknownValuesWarned = new ConcurrentBag<string>();
-
         internal class NullableEnumConverter : JsonConverter<T?>
         {
             private readonly EnumConverter<T> _enumConverter;
@@ -120,73 +96,56 @@ namespace CryptoExchange.Net.Converters.SystemTextJson
         /// <inheritdoc />
         public override T Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
         {
-            var t = ReadNullable(ref reader, typeToConvert, options, out var isEmptyStringOrNull);
-            if (t != null)
-                return t.Value;
-            
-            if (isEmptyStringOrNull && !_unknownValuesWarned.Contains(null))
+            var t = ReadNullable(ref reader, typeToConvert, options, out var isEmptyString);
+            if (t == null)
             {
-                // We received an empty string and have no mapping for it, and the property isn't nullable
-                _unknownValuesWarned.Add(null!);
-                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");
+                if (isEmptyString)
+                {
+                    // 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: {typeof(T).Name}. If you think {typeof(T).Name} should be nullable please open an issue on the Github repo");
+                }
+                else
+                {
+                    Trace.WriteLine($"{DateTime.Now:yyyy/MM/dd HH:mm:ss:fff} | Warning | Received null enum value, but property type is not a nullable enum. EnumType: {typeof(T).Name}. If you think {typeof(T).Name} should be nullable please open an issue on the Github repo");
+                }
+                return new T(); // return default value
             }
-
-            return GetUndefinedEnumValue();
-        }
-
-        private T GetUndefinedEnumValue()
-        {
-            if (_undefinedEnumValue != null)
-                return _undefinedEnumValue.Value;
-
-            var type = typeof(T);
-            if (!Enum.IsDefined(type, -9))
-                _undefinedEnumValue = (T)Enum.ToObject(type, -9);
-            else if (!Enum.IsDefined(type, -99))
-                _undefinedEnumValue = (T)Enum.ToObject(type, -99);
             else
-                _undefinedEnumValue = (T)Enum.ToObject(type, -999);
-
-            return (T)_undefinedEnumValue;
+            {
+                return t.Value;
+            }
         }
 
-        private T? ReadNullable(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options, out bool isEmptyStringOrNull)
+        private T? ReadNullable(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options, out bool isEmptyString)
         {
-            isEmptyStringOrNull = false;
+            isEmptyString = false;
             var enumType = typeof(T);
-            if (_mappingToEnum == null)
-                CreateMapping();
+            if (_mapping == null)
+                _mapping = AddMapping();
 
             var stringValue = reader.TokenType switch
             {
                 JsonTokenType.String => reader.GetString(),
-                JsonTokenType.Number => reader.GetInt32().ToString(),
+                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 (stringValue is null)
-            {
-                isEmptyStringOrNull = true;
+            if (string.IsNullOrEmpty(stringValue))
                 return null;
-            }
 
-            if (!GetValue(enumType, stringValue, out var result))
+            if (!GetValue(enumType, stringValue!, out var result))
             {
                 if (string.IsNullOrWhiteSpace(stringValue))
                 {
-                    isEmptyStringOrNull = true;
+                    isEmptyString = true;
                 }
                 else
                 {
                     // We received an enum value but weren't able to parse it.
-                    if (!_unknownValuesWarned.Contains(stringValue))
-                    {
-                        _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");
-                    }
+                    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 null;
@@ -204,35 +163,16 @@ namespace CryptoExchange.Net.Converters.SystemTextJson
 
         private static bool GetValue(Type objectType, string value, out T? result)
         {
-            if (_mappingToEnum != null)
+            if (_mapping != null)
             {
-                EnumMapping? mapping = null;
-                // Try match on full equals
-                foreach (var item in _mappingToEnum)
-                {
-                    if (item.StringValue.Equals(value, StringComparison.Ordinal))
-                    {
-                        mapping = item;
-                        break;
-                    }
-                }
+                // 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 not found, try matching ignoring case
-                if (mapping == null)
+                if (!mapping.Equals(default(KeyValuePair<T, string>)))
                 {
-                    foreach (var item in _mappingToEnum)
-                    {
-                        if (item.StringValue.Equals(value, StringComparison.OrdinalIgnoreCase))
-                        {
-                            mapping = item;
-                            break;
-                        }
-                    }
-                }
-
-                if (mapping != null)
-                {
-                    result = mapping.Value;
+                    result = mapping.Key;
                     return true;
                 }
             }
@@ -244,31 +184,10 @@ namespace CryptoExchange.Net.Converters.SystemTextJson
                 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))
-                {
-                    result = default;
-                    return false;
-                }
-
                 return true;
             }
             catch (Exception)
@@ -278,11 +197,9 @@ namespace CryptoExchange.Net.Converters.SystemTextJson
             }
         }
 
-        private static void CreateMapping()
+        private static List<KeyValuePair<T, string>> AddMapping()
         {
-            var mappingToEnum = new List<EnumMapping>();
-            var mappingToString = new Dictionary<T, string>();
-
+            var mapping = new List<KeyValuePair<T, string>>();
             var enumType = Nullable.GetUnderlyingType(typeof(T)) ?? typeof(T);
             var enumMembers = enumType.GetFields();
             foreach (var member in enumMembers)
@@ -291,28 +208,12 @@ namespace CryptoExchange.Net.Converters.SystemTextJson
                 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);
-                    }
+                        mapping.Add(new KeyValuePair<T, string>((T)Enum.Parse(enumType, member.Name), value));
                 }
             }
 
-#if NET8_0_OR_GREATER
-            _mappingToEnum = mappingToEnum.ToFrozenSet();
-            _mappingToString = mappingToString.ToFrozenDictionary();
-#else
-            _mappingToEnum = mappingToEnum;
-            _mappingToString = mappingToString;
-#endif
-        }
-
-        internal static void Reset()
-        {
-            _undefinedEnumValue = null;
-            _unknownValuesWarned = new ConcurrentBag<string>();
+            _mapping = mapping;
+            return mapping;
         }
 
         /// <summary>
@@ -323,10 +224,10 @@ namespace CryptoExchange.Net.Converters.SystemTextJson
         [return: NotNullIfNotNull("enumValue")]
         public static string? GetString(T? enumValue)
         {
-            if (_mappingToString == null)
-                CreateMapping();
+            if (_mapping == null)
+                _mapping = AddMapping();
 
-            return enumValue == null ? null : (_mappingToString!.TryGetValue(enumValue.Value, out var str) ? str : enumValue.ToString());
+            return enumValue == null ? null : (_mapping.FirstOrDefault(v => v.Key.Equals(enumValue)).Value ?? enumValue.ToString());
         }
 
         /// <summary>
@@ -337,35 +238,15 @@ namespace CryptoExchange.Net.Converters.SystemTextJson
         public static T? ParseString(string value)
         {
             var type = Nullable.GetUnderlyingType(typeof(T)) ?? typeof(T);
-            if (_mappingToEnum == null)
-                CreateMapping();
+            if (_mapping == null)
+                _mapping = AddMapping();
 
-            EnumMapping? mapping = null;
-            // Try match on full equals
-            foreach(var item in _mappingToEnum!)
-            {
-                if (item.StringValue.Equals(value, StringComparison.Ordinal))
-                {
-                    mapping = item;
-                    break;
-                }
-            }
+            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 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;
+            if (!mapping.Equals(default(KeyValuePair<T, string>)))
+                return mapping.Key;
 
             try
             {

CryptoExchange.Net/Converters/SystemTextJson/EnumIntWriterConverter.cs

@@ -1,4 +1,5 @@
 using System;
+using System.Globalization;
 using System.Text.Json;
 using System.Text.Json.Serialization;
 

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,4 +1,6 @@
 using System;
+using System.Collections.Generic;
+using System.Text;
 using System.Text.Json.Serialization.Metadata;
 using System.Text.Json;
 using System.Text.Json.Serialization;

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

@@ -1,4 +1,6 @@
 using System;
+using System.Collections.Generic;
+using System.Text;
 
 namespace CryptoExchange.Net.Converters.SystemTextJson
 {

CryptoExchange.Net/Converters/SystemTextJson/SerializerOptions.cs

@@ -14,7 +14,7 @@ namespace CryptoExchange.Net.Converters.SystemTextJson
         /// <summary>
         /// Get Json serializer settings which includes standard converters for DateTime, bool, enum and number types
         /// </summary>
-        public static JsonSerializerOptions WithConverters(JsonSerializerContext typeResolver, params JsonConverter[] additionalConverters)
+        public static JsonSerializerOptions WithConverters(JsonSerializerContext typeResolver)
         {
             if (!_cache.TryGetValue(typeResolver, out var options))
             {
@@ -33,11 +33,6 @@ namespace CryptoExchange.Net.Converters.SystemTextJson
                     },
                     TypeInfoResolver = typeResolver,
                 };
-
-                foreach (var converter in additionalConverters)
-                    options.Converters.Add(converter);
-
-                options.TypeInfoResolver = typeResolver;
                 _cache.TryAdd(typeResolver, options);
             }
 

CryptoExchange.Net/Converters/SystemTextJson/SharedQuantityConverter.cs

@@ -1,58 +0,0 @@
-using CryptoExchange.Net.SharedApis;
-using System;
-using System.Text.Json;
-using System.Text.Json.Serialization;
-
-namespace CryptoExchange.Net.Converters.SystemTextJson
-{
-    internal class SharedQuantityConverter : SharedQuantityReferenceConverter<SharedQuantity> { }
-    internal class SharedOrderQuantityConverter : SharedQuantityReferenceConverter<SharedOrderQuantity> { }
-
-    internal class SharedQuantityReferenceConverter<T> : JsonConverter<T> where T: SharedQuantityReference, new()
-    {
-        public override T? Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
-        {
-            if (reader.TokenType != JsonTokenType.StartArray)
-                throw new Exception("Invalid JSON structure");
-
-            reader.Read(); // Start array
-            var baseQuantity = reader.TokenType == JsonTokenType.Null ? (decimal?)null : reader.GetDecimal();
-            reader.Read();
-            var quoteQuantity = reader.TokenType == JsonTokenType.Null ? (decimal?)null : reader.GetDecimal();
-            reader.Read();
-            var contractQuantity = reader.TokenType == JsonTokenType.Null ? (decimal?)null : reader.GetDecimal();
-            reader.Read();
-
-            if (reader.TokenType != JsonTokenType.EndArray)
-                throw new Exception("Invalid JSON structure");
-
-            reader.Read(); // End array
-
-            var result = new T();
-            result.QuantityInBaseAsset = baseQuantity;
-            result.QuantityInQuoteAsset = quoteQuantity;
-            result.QuantityInContracts = contractQuantity;
-            return result;
-        }
-
-        public override void Write(Utf8JsonWriter writer, T value, JsonSerializerOptions options)
-        {
-            writer.WriteStartArray();
-            if (value.QuantityInBaseAsset == null)
-                writer.WriteNullValue();
-            else
-                writer.WriteNumberValue(value.QuantityInBaseAsset.Value);
-
-            if (value.QuantityInQuoteAsset == null)
-                writer.WriteNullValue();
-            else
-                writer.WriteNumberValue(value.QuantityInQuoteAsset.Value);
-
-            if (value.QuantityInContracts == null)
-                writer.WriteNullValue();
-            else
-                writer.WriteNumberValue(value.QuantityInContracts.Value);
-            writer.WriteEndArray();
-        }
-    }
-}

CryptoExchange.Net/Converters/SystemTextJson/SharedSymbolConverter.cs

@@ -1,44 +0,0 @@
-using CryptoExchange.Net.SharedApis;
-using System;
-using System.Text.Json;
-using System.Text.Json.Serialization;
-
-namespace CryptoExchange.Net.Converters.SystemTextJson
-{
-    internal class SharedSymbolConverter : JsonConverter<SharedSymbol>
-    {
-        public override SharedSymbol? Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
-        {
-            if (reader.TokenType != JsonTokenType.StartArray)
-                throw new Exception("Invalid JSON structure");
-
-            reader.Read(); // Start array
-            var tradingMode = (TradingMode)Enum.Parse(typeof(TradingMode), reader.GetString()!);
-            reader.Read();
-            var baseAsset = reader.GetString()!;
-            reader.Read();
-            var quoteAsset = reader.GetString()!;
-            reader.Read();
-            var timeStr = reader.GetString()!;
-            var deliverTime = string.IsNullOrEmpty(timeStr) ? (DateTime?)null : DateTime.Parse(timeStr);
-            reader.Read();
-
-            if (reader.TokenType != JsonTokenType.EndArray)
-                throw new Exception("Invalid JSON structure");
-
-            reader.Read(); // End array
-
-            return new SharedSymbol(tradingMode, baseAsset, quoteAsset, deliverTime);
-        }
-
-        public override void Write(Utf8JsonWriter writer, SharedSymbol value, JsonSerializerOptions options)
-        {
-            writer.WriteStartArray();
-            writer.WriteStringValue(value.TradingMode.ToString());
-            writer.WriteStringValue(value.BaseAsset);
-            writer.WriteStringValue(value.QuoteAsset);
-            writer.WriteStringValue(value.DeliverTime?.ToString());
-            writer.WriteEndArray();
-        }
-    }
-}

CryptoExchange.Net/Converters/SystemTextJson/SystemTextJsonMessageAccessor.cs

@@ -0,0 +1,376 @@
+using CryptoExchange.Net.Converters.MessageParsing;
+using CryptoExchange.Net.Interfaces;
+using CryptoExchange.Net.Objects;
+using System;
+using System.Collections.Generic;
+using System.Diagnostics.CodeAnalysis;
+using System.IO;
+using System.Text;
+using System.Text.Json;
+using System.Threading.Tasks;
+
+namespace CryptoExchange.Net.Converters.SystemTextJson
+{
+    /// <summary>
+    /// System.Text.Json message accessor
+    /// </summary>
+    public abstract class SystemTextJsonMessageAccessor : IMessageAccessor
+    {
+        /// <summary>
+        /// The JsonDocument loaded
+        /// </summary>
+        protected JsonDocument? _document;
+
+        private readonly JsonSerializerOptions? _customSerializerOptions;
+
+        /// <inheritdoc />
+        public bool IsJson { get; set; }
+
+        /// <inheritdoc />
+        public abstract bool OriginalDataAvailable { get; }
+
+        /// <inheritdoc />
+        public object? Underlying => throw new NotImplementedException();
+
+        /// <summary>
+        /// ctor
+        /// </summary>
+        public SystemTextJsonMessageAccessor(JsonSerializerOptions options)
+        {
+            _customSerializerOptions = options;
+        }
+
+        /// <inheritdoc />
+#if NET5_0_OR_GREATER
+        [UnconditionalSuppressMessage("AssemblyLoadTrimming", "IL2026:RequiresUnreferencedCode", Justification = "JsonSerializerOptions provided here has TypeInfoResolver set")]
+        [UnconditionalSuppressMessage("AssemblyLoadTrimming", "IL3050:RequiresUnreferencedCode", Justification = "JsonSerializerOptions provided here has TypeInfoResolver set")]
+#endif
+        public CallResult<object> Deserialize(Type type, MessagePath? path = null)
+        {
+            if (!IsJson)
+                return new CallResult<object>(GetOriginalString());
+
+            if (_document == null)
+                throw new InvalidOperationException("No json document loaded");
+
+            try
+            {
+                var result = _document.Deserialize(type, _customSerializerOptions);
+                return new CallResult<object>(result!);
+            }
+            catch (JsonException ex)
+            {
+                var info = $"Deserialize JsonException: {ex.Message}, Path: {ex.Path}, LineNumber: {ex.LineNumber}, LinePosition: {ex.BytePositionInLine}";
+                return new CallResult<object>(new DeserializeError(info, OriginalDataAvailable ? GetOriginalString() : "[Data only available when OutputOriginal = true in client options]"));
+            }
+            catch (Exception ex)
+            {
+                var info = $"Deserialize unknown Exception: {ex.Message}";
+                return new CallResult<object>(new DeserializeError(info, OriginalDataAvailable ? GetOriginalString() : "[Data only available when OutputOriginal = true in client options]"));
+            }
+        }
+
+        /// <inheritdoc />
+#if NET5_0_OR_GREATER
+        [UnconditionalSuppressMessage("AssemblyLoadTrimming", "IL2026:RequiresUnreferencedCode", Justification = "JsonSerializerOptions provided here has TypeInfoResolver set")]
+        [UnconditionalSuppressMessage("AssemblyLoadTrimming", "IL3050:RequiresUnreferencedCode", Justification = "JsonSerializerOptions provided here has TypeInfoResolver set")]
+#endif
+        public CallResult<T> Deserialize<T>(MessagePath? path = null)
+        {
+            if (_document == null)
+                throw new InvalidOperationException("No json document loaded");
+
+            try
+            {
+                var result = _document.Deserialize<T>(_customSerializerOptions);
+                return new CallResult<T>(result!);
+            }
+            catch (JsonException ex)
+            {
+                var info = $"Deserialize JsonException: {ex.Message}, Path: {ex.Path}, LineNumber: {ex.LineNumber}, LinePosition: {ex.BytePositionInLine}";
+                return new CallResult<T>(new DeserializeError(info, OriginalDataAvailable ? GetOriginalString() : "[Data only available when OutputOriginal = true in client options]"));
+            }
+            catch (Exception ex)
+            {
+                var info = $"Unknown exception: {ex.Message}";
+                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 (_document == null)
+                throw new InvalidOperationException("No json document loaded");
+
+            return _document.RootElement.ValueKind switch
+            {
+                JsonValueKind.Object => NodeType.Object,
+                JsonValueKind.Array => NodeType.Array,
+                _ => 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.HasValue)
+                return null;
+
+            return node.Value.ValueKind switch
+            {
+                JsonValueKind.Object => NodeType.Object,
+                JsonValueKind.Array => NodeType.Array,
+                _ => NodeType.Value
+            };
+        }
+
+        /// <inheritdoc />
+#if NET5_0_OR_GREATER
+        [UnconditionalSuppressMessage("AssemblyLoadTrimming", "IL2026:RequiresUnreferencedCode", Justification = "JsonSerializerOptions provided here has TypeInfoResolver set")]
+        [UnconditionalSuppressMessage("AssemblyLoadTrimming", "IL3050:RequiresUnreferencedCode", Justification = "JsonSerializerOptions provided here has TypeInfoResolver set")]
+#endif
+        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.Value.ValueKind == JsonValueKind.Object || value.Value.ValueKind == JsonValueKind.Array)
+            {
+                try
+                {
+                    return value.Value.Deserialize<T>(_customSerializerOptions);
+                }
+                catch { }
+
+                return default;
+            }
+
+            if (typeof(T) == typeof(string))
+            {
+                if (value.Value.ValueKind == JsonValueKind.Number)
+                    return (T)(object)value.Value.GetInt64().ToString();
+            }
+
+            return value.Value.Deserialize<T>(_customSerializerOptions);
+        }
+
+        /// <inheritdoc />
+#if NET5_0_OR_GREATER
+        [UnconditionalSuppressMessage("AssemblyLoadTrimming", "IL2026:RequiresUnreferencedCode", Justification = "JsonSerializerOptions provided here has TypeInfoResolver set")]
+        [UnconditionalSuppressMessage("AssemblyLoadTrimming", "IL3050:RequiresUnreferencedCode", Justification = "JsonSerializerOptions provided here has TypeInfoResolver set")]
+#endif
+        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.Value.ValueKind != JsonValueKind.Array)
+                return default;
+
+            return value.Value.Deserialize<List<T>>(_customSerializerOptions)!;
+        }
+
+        private JsonElement? GetPathNode(MessagePath path)
+        {
+            if (!IsJson)
+                throw new InvalidOperationException("Can't access json data on non-json message");
+
+            if (_document == null)
+                throw new InvalidOperationException("No json document loaded");
+
+            JsonElement? currentToken = _document.RootElement;
+            foreach (var node in path)
+            {
+                if (node.Type == 0)
+                {
+                    // Int value
+                    var val = node.Index!.Value;
+                    if (currentToken!.Value.ValueKind != JsonValueKind.Array || currentToken.Value.GetArrayLength() <= val)
+                        return null;
+
+                    currentToken = currentToken.Value[val];
+                }
+                else if (node.Type == 1)
+                {
+                    // String value
+                    if (currentToken!.Value.ValueKind != JsonValueKind.Object)
+                        return null;
+
+                    if (!currentToken.Value.TryGetProperty(node.Property!, out var token))
+                        return null;
+                    currentToken = token;
+                }
+                else
+                {
+                    // Property name
+                    if (currentToken!.Value.ValueKind != JsonValueKind.Object)
+                        return null;
+
+                    throw new NotImplementedException();
+                }
+
+                if (currentToken == null)
+                    return null;
+            }
+
+            return currentToken;
+        }
+
+        /// <inheritdoc />
+        public abstract string GetOriginalString();
+
+        /// <inheritdoc />
+        public abstract void Clear();
+    }
+
+    /// <summary>
+    /// System.Text.Json stream message accessor
+    /// </summary>
+    public class SystemTextJsonStreamMessageAccessor : SystemTextJsonMessageAccessor, IStreamMessageAccessor
+    {
+        private Stream? _stream;
+
+        /// <inheritdoc />
+        public override bool OriginalDataAvailable => _stream?.CanSeek == true;
+
+        /// <summary>
+        /// ctor
+        /// </summary>
+        public SystemTextJsonStreamMessageAccessor(JsonSerializerOptions options): base(options)
+        {
+        }
+
+        /// <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
+            }
+
+            try
+            {
+                _document = await JsonDocument.ParseAsync(_stream ?? stream).ConfigureAwait(false);
+                IsJson = true;
+                return CallResult.SuccessResult;
+            }
+            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;
+            _document?.Dispose();
+            _document = null;
+        }
+
+    }
+
+    /// <summary>
+    /// System.Text.Json byte message accessor
+    /// </summary>
+    public class SystemTextJsonByteMessageAccessor : SystemTextJsonMessageAccessor, IByteMessageAccessor
+    {
+        private ReadOnlyMemory<byte> _bytes;
+
+        /// <summary>
+        /// ctor
+        /// </summary>
+        public SystemTextJsonByteMessageAccessor(JsonSerializerOptions options) : base(options)
+        {
+        }
+
+        /// <inheritdoc />
+        public CallResult Read(ReadOnlyMemory<byte> data)
+        {
+            _bytes = data;
+
+            try
+            {
+                var firstByte = data.Span[0];
+                if (firstByte != 0x7b && firstByte != 0x5b)
+                {
+                    // Value doesn't start with `{` or `[`, prevent deserialization attempt as it's slow
+                    IsJson = false;
+                    return new CallResult(new ServerError("Not a json value"));
+                }
+
+                _document = JsonDocument.Parse(data);
+                IsJson = true;
+                return CallResult.SuccessResult;
+            }
+            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;
+            _document?.Dispose();
+            _document = null;
+        }
+    }
+}

CryptoExchange.Net/Converters/SystemTextJson/SystemTextJsonMessageSerializer.cs

@@ -1,11 +1,13 @@
 using CryptoExchange.Net.Interfaces;
 using System.Diagnostics.CodeAnalysis;
 using System.Text.Json;
+using System.Text.Json.Serialization;
+using System.Text.Json.Serialization.Metadata;
 
 namespace CryptoExchange.Net.Converters.SystemTextJson
 {
     /// <inheritdoc />
-    public class SystemTextJsonMessageSerializer : IStringMessageSerializer
+    public class SystemTextJsonMessageSerializer : IMessageSerializer
     {
         private readonly JsonSerializerOptions _options;
 

CryptoExchange.Net/CryptoExchange.Net.csproj

@@ -1,16 +1,16 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TargetFrameworks>netstandard2.0;netstandard2.1;net8.0;net9.0;net10.0</TargetFrameworks>
+    <TargetFrameworks>netstandard2.0;netstandard2.1;net8.0;net9.0</TargetFrameworks>
   </PropertyGroup>
   <PropertyGroup>
     <PackageId>CryptoExchange.Net</PackageId>
     <Authors>JKorf</Authors>
     <Description>CryptoExchange.Net is a base library which is used to implement different cryptocurrency (exchange) API's. It provides a standardized way of implementing different API's, which results in a very similar experience for users of the API implementations.</Description>
-    <PackageVersion>11.0.3</PackageVersion>
-    <AssemblyVersion>11.0.3</AssemblyVersion>
-    <FileVersion>11.0.3</FileVersion>
+    <PackageVersion>8.8.0</PackageVersion>
+    <AssemblyVersion>8.8.0</AssemblyVersion>
+    <FileVersion>8.8.0</FileVersion>
     <PackageRequireLicenseAcceptance>false</PackageRequireLicenseAcceptance>
-    <PackageTags>OKX;OKX.Net;Mexc;Mexc.Net;Kucoin;Kucoin.Net;Kraken;Kraken.Net;Huobi;Huobi.Net;CoinEx;CoinEx.Net;Bybit;Bybit.Net;Bitget;Bitget.Net;Bitfinex;Bitfinex.Net;Binance;Binance.Net;CryptoCurrency;CryptoCurrency Exchange;CryptoExchange.Net</PackageTags>
+    <PackageTags>OKX;OKX.Net;Mexc;Mexc.Net;Kucoin;Kucoin.Net;Kraken;Kraken.Net;Huobi;Huobi.Net;CoinEx;CoinEx.Net;Bybit;Bybit.Net;Bitget;Bitget.Net;Bitfinex;Bitfinex.Net;Binance;Binance.Net;CryptoCurrency;CryptoCurrency Exchange</PackageTags>
     <RepositoryType>git</RepositoryType>
     <RepositoryUrl>https://github.com/JKorf/CryptoExchange.Net.git</RepositoryUrl>
     <PackageProjectUrl>https://github.com/JKorf/CryptoExchange.Net</PackageProjectUrl>
@@ -20,15 +20,15 @@
     <GeneratePackageOnBuild>true</GeneratePackageOnBuild>
     <PackageReleaseNotes>https://github.com/JKorf/CryptoExchange.Net?tab=readme-ov-file#release-notes</PackageReleaseNotes>
     <Nullable>enable</Nullable>
-    <LangVersion>latest</LangVersion>
+    <LangVersion>12.0</LangVersion>
     <PackageLicenseExpression>MIT</PackageLicenseExpression>
   </PropertyGroup>
   <ItemGroup>
     <None Include="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 Label="AOT" Condition=" '$(TargetFramework)' == 'NET8_0' Or '$(TargetFramework)' == 'NET9_0' ">
+	  <IsAotCompatible>true</IsAotCompatible>
   </PropertyGroup>
   <PropertyGroup Label="Deterministic Build" Condition="'$(Configuration)' == 'Release'">
     <PublishRepositoryUrl>true</PublishRepositoryUrl>
@@ -37,6 +37,12 @@
     <EmbedUntrackedSources>true</EmbedUntrackedSources>
     <ContinuousIntegrationBuild>true</ContinuousIntegrationBuild>
   </PropertyGroup>
+  <ItemGroup Label="Deterministic Build" Condition="'$(Configuration)' == 'Release'">
+    <PackageReference Include="Microsoft.SourceLink.GitHub" Version="8.0.0">
+      <PrivateAssets>all</PrivateAssets>
+      <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
+    </PackageReference>
+  </ItemGroup>
   <PropertyGroup>
     <DocumentationFile>CryptoExchange.Net.xml</DocumentationFile>
   </PropertyGroup>
@@ -45,19 +51,16 @@
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>
-    <PackageReference Include="Microsoft.CodeAnalysis.NetAnalyzers" Version="10.0.101">
+    <PackageReference Include="Microsoft.CodeAnalysis.NetAnalyzers" Version="9.0.0">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>
   </ItemGroup>
   <ItemGroup>
-    <PackageReference Include="Microsoft.Extensions.Logging" Version="10.0.1" />
-    <PackageReference Include="System.Text.Json" Version="10.0.1" />
-    <PackageReference Include="NSec.Cryptography" Version="25.4.0" Condition="$([MSBuild]::IsTargetFrameworkCompatible('$(TargetFramework)', 'net8.0'))" />
-  </ItemGroup>
-  <ItemGroup Label="Transitive Client Packages">
-    <PackageReference Include="Microsoft.Extensions.Configuration.Binder" Version="10.0.1" />
-    <PackageReference Include="Microsoft.Extensions.Http" Version="10.0.1" />
-    <PackageReference Include="System.Threading.Channels" Version="10.0.1" />
+    <PackageReference Include="Microsoft.Extensions.Http" Version="9.0.0" />
+    <PackageReference Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="9.0.0" />
+    <PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="9.0.0" />
+    <PackageReference Include="System.Text.Json" Version="9.0.0" />
+    <PackageReference Include="Microsoft.Extensions.Options.ConfigurationExtensions" Version="9.0.0" />
   </ItemGroup>
 </Project>

CryptoExchange.Net/Exceptions/CeDeserializationException.cs

@@ -1,24 +0,0 @@
-using System;
-
-namespace CryptoExchange.Net.Exceptions
-{
-    /// <summary>
-    /// Exception during deserialization
-    /// </summary>
-    public class CeDeserializationException : Exception
-    {
-        /// <summary>
-        /// ctor
-        /// </summary>
-        public CeDeserializationException(string message) : base(message)
-        {
-        }
-
-        /// <summary>
-        /// ctor
-        /// </summary>
-        public CeDeserializationException(string message, Exception innerException) : base(message, innerException)
-        {
-        }
-    }
-}

CryptoExchange.Net/ExchangeHelpers.cs

@@ -1,10 +1,7 @@
 using CryptoExchange.Net.Objects;
-using CryptoExchange.Net.Objects.Sockets;
 using CryptoExchange.Net.SharedApis;
 using System;
 using System.Collections.Generic;
-using System.Globalization;
-using System.Linq;
 using System.Runtime.CompilerServices;
 using System.Security.Cryptography;
 using System.Threading;
@@ -90,6 +87,8 @@ namespace CryptoExchange.Net
                     value -= offset;
                 else value += (step.Value - offset);
             }
+
+            value = RoundDown(value, 8);
                 
             return value.Normalize();
         }
@@ -113,34 +112,6 @@ namespace CryptoExchange.Net
             return RoundToSignificantDigits(value, precision.Value, roundingType);
         }
 
-        /// <summary>
-        /// Apply the provided rules to the value
-        /// </summary>
-        /// <param name="value">Value to be adjusted</param>
-        /// <param name="decimals">Max decimal places</param>
-        /// <param name="valueStep">The value step for increase/decrease value</param>
-        /// <returns></returns>
-        public static decimal ApplyRules(
-            decimal value,
-            int? decimals = null,
-            decimal? valueStep = null)
-        {
-            if (valueStep.HasValue)
-            {
-                var offset = value % valueStep.Value;
-                if (offset != 0)
-                {
-                    if (offset < valueStep.Value / 2)
-                        value -= offset;
-                    else value += (valueStep.Value - offset);
-                }
-            }
-            if (decimals.HasValue)
-                value = Math.Round(value, decimals.Value);
-
-            return value;
-        }
-
         /// <summary>
         /// Round a value to have the provided total number of digits. For example, value 253.12332 with 5 digits would be 253.12 
         /// </summary>
@@ -243,7 +214,8 @@ namespace CryptoExchange.Net
         /// <summary>
         /// Generate a long value
         /// </summary>
-        /// <param name="maxLength">Max number of digits</param>
+        /// <param name="maxLength">Max character length</param>
+        /// <returns></returns>
         public static long RandomLong(int maxLength)
         {
 #if NETSTANDARD2_1_OR_GREATER || NET9_0_OR_GREATER
@@ -259,25 +231,6 @@ namespace CryptoExchange.Net
                 return value;
         }
 
-        /// <summary>
-        /// Generate a long value between two values
-        /// </summary>
-        /// <param name="minValue">Min value</param>
-        /// <param name="maxValue">Max value</param>
-        /// <returns></returns>
-        public static long RandomLong(long minValue, long maxValue)
-        {
-#if NET8_0_OR_GREATER
-            var buf = RandomNumberGenerator.GetBytes(8);
-#else
-            byte[] buf = new byte[8];
-            var random = new Random();
-            random.NextBytes(buf);
-#endif
-            long longRand = BitConverter.ToInt64(buf, 0);
-            return (Math.Abs(longRand % (maxValue - minValue)) + minValue);
-        }
-
         /// <summary>
         /// Generate a random string of specified length
         /// </summary>
@@ -311,11 +264,11 @@ namespace CryptoExchange.Net
         /// <param name="request">The request parameters</param>
         /// <param name="ct">Cancellation token</param>
         /// <returns></returns>
-        public static async IAsyncEnumerable<ExchangeWebResult<T[]>> ExecutePages<T, U>(Func<U, PageRequest?, CancellationToken, Task<ExchangeWebResult<T[]>>> paginatedFunc, U request, [EnumeratorCancellation]CancellationToken ct = default)
+        public static async IAsyncEnumerable<ExchangeWebResult<T[]>> ExecutePages<T, U>(Func<U, INextPageToken?, CancellationToken, Task<ExchangeWebResult<T[]>>> paginatedFunc, U request, [EnumeratorCancellation]CancellationToken ct = default)
         {
             var result = new List<T>();
             ExchangeWebResult<T[]> batch;
-            PageRequest? nextPageToken = null;
+            INextPageToken? nextPageToken = null;
             while (true)
             {
                 batch = await paginatedFunc(request, nextPageToken, ct).ConfigureAwait(false);
@@ -324,42 +277,12 @@ namespace CryptoExchange.Net
                     break;
 
                 result.AddRange(batch.Data);
-                nextPageToken = batch.NextPageRequest;
+                nextPageToken = batch.NextPageToken;
                 if (nextPageToken == null)
                     break;
             }
         }
 
-        /// <summary>
-        /// Apply filters to the data set
-        /// </summary>
-        /// <typeparam name="T">Type</typeparam>
-        /// <param name="data">Data set</param>
-        /// <param name="timeSelector">Time selector for the data</param>
-        /// <param name="startTime">Start time filter</param>
-        /// <param name="endTime">End time filter</param>
-        /// <param name="direction">Data direction</param>
-        public static IEnumerable<T> ApplyFilter<T>(
-            IEnumerable<T> data,
-            Func<T, DateTime> timeSelector,
-            DateTime? startTime,
-            DateTime? endTime,
-            DataDirection direction)
-        {
-            if (direction == DataDirection.Ascending)
-                data = data.OrderBy(timeSelector);
-            else
-                data = data.OrderByDescending(timeSelector);
-
-            if (startTime != null)
-                data = data.Where(x => timeSelector(x) >= startTime.Value);
-
-            if (endTime != null)
-                data = data.Where(x => timeSelector(x) < endTime.Value);
-
-            return data;
-        }
-
         /// <summary>
         /// Apply the rules (price and quantity step size and decimals precision, min/max quantity) from the symbol to the quantity and price
         /// </summary>
@@ -390,191 +313,5 @@ namespace CryptoExchange.Net
             adjustedQuantity = symbol.QuantityDecimals.HasValue ? (minNotionalAdjust ? RoundUp(adjustedQuantity, symbol.QuantityDecimals.Value) : RoundDown(adjustedQuantity, symbol.QuantityDecimals.Value)) : adjustedQuantity;
 
         }
-
-        /// <summary>
-        /// Queue updates received from a websocket subscriptions and process them async
-        /// </summary>
-        /// <typeparam name="T">The queued update type</typeparam>
-        /// <param name="subscribeCall">The subscribe call</param>
-        /// <param name="asyncHandler">The async update handler</param>
-        /// <param name="maxQueuedItems">The max number of updates to be queued up. When happens when the queue is full and a new write is attempted can be specified with <see>fullMode</see></param>
-        /// <param name="fullBehavior">What should happen if the queue contains <see>maxQueuedItems</see> pending updates. If no max is set this setting is ignored</param>
-        public static async Task<CallResult<UpdateSubscription>> ProcessQueuedAsync<T>(
-            Func<Action<DataEvent<T>>, Task<CallResult<UpdateSubscription>>> subscribeCall,
-            Func<DataEvent<T>, Task> asyncHandler,
-            int? maxQueuedItems = null,
-            QueueFullBehavior? fullBehavior = null)
-        {
-            var processor = new ProcessQueue<DataEvent<T>>(asyncHandler, maxQueuedItems, fullBehavior);
-            await processor.StartAsync().ConfigureAwait(false);
-            var result = await subscribeCall(upd => processor.Write(upd)).ConfigureAwait(false);
-            if (!result)
-            {
-                await processor.StopAsync().ConfigureAwait(false);
-                return result;
-            }
-
-            processor.Exception += result.Data._subscription.InvokeExceptionHandler;
-            result.Data.SubscriptionStatusChanged += (upd) =>
-            {
-                if (upd == CryptoExchange.Net.Objects.SubscriptionStatus.Closed)
-                    _ = processor.StopAsync(true);
-            };
-
-            return result;
-        }
-
-        /// <summary>
-        /// Queue updates and process them async
-        /// </summary>
-        /// <typeparam name="T">The queued update type</typeparam>
-        /// <param name="subscribeCall">The subscribe call</param>
-        /// <param name="asyncHandler">The async update handler</param>
-        /// <param name="maxQueuedItems">The max number of updates to be queued up. When happens when the queue is full and a new write is attempted can be specified with <see>fullMode</see></param>
-        /// <param name="fullBehavior">What should happen if the queue contains <see>maxQueuedItems</see> pending updates. If no max is set this setting is ignored</param>
-        /// <param name="ct">Cancellation token to stop the processing</param>
-        public static async Task ProcessQueuedAsync<T>(
-            Func<Action<T>, Task> subscribeCall,
-            Func<T, Task> asyncHandler,
-            CancellationToken ct,
-            int? maxQueuedItems = null,
-            QueueFullBehavior? fullBehavior = null)
-        {
-            var processor = new ProcessQueue<T>(asyncHandler, maxQueuedItems, fullBehavior);
-            await processor.StartAsync().ConfigureAwait(false);
-            ct.Register(async () =>
-            {
-                await processor.StopAsync().ConfigureAwait(false);
-            });
-
-            await subscribeCall(upd => processor.Write(upd)).ConfigureAwait(false);
-        }
-
-        /// <summary>
-        /// Queue updates received from a websocket subscriptions and process them async
-        /// </summary>
-        /// <typeparam name="TEventType">The type of the queued item</typeparam>
-        /// <typeparam name="TOutputType">The type of the item to pass to the processor</typeparam>
-        /// <param name="subscribeCall">The subscribe call</param>
-        /// <param name="mapper">The mapper function to go from <see>TEventType</see> to <see>TOutputType</see></param>
-        /// <param name="asyncHandler">The async update handler</param>
-        /// <param name="maxQueuedItems">The max number of updates to be queued up. When happens when the queue is full and a new write is attempted can be specified with <see>fullMode</see></param>
-        /// <param name="fullBehavior">What should happen if the queue contains <see>maxQueuedItems</see> pending updates. If no max is set this setting is ignored</param>
-        public static async Task<CallResult<UpdateSubscription>> ProcessQueuedAsync<TEventType, TOutputType>(
-            Func<ProcessQueue<DataEvent<TEventType>>, Task<CallResult<UpdateSubscription>>> subscribeCall,
-            Func<DataEvent<TEventType>, DataEvent<TOutputType>> mapper,
-            Func<DataEvent<TOutputType>, Task> asyncHandler,
-            int? maxQueuedItems = null,
-            QueueFullBehavior? fullBehavior = null
-            )
-        {
-            var processor = new ProcessQueue<DataEvent<TEventType>>((update) => {
-                return asyncHandler.Invoke(mapper.Invoke(update));
-            }, maxQueuedItems, fullBehavior);
-            await processor.StartAsync().ConfigureAwait(false);
-            var result = await subscribeCall(processor).ConfigureAwait(false);
-            if (!result)
-            {
-                await processor.StopAsync().ConfigureAwait(false);
-                return result;
-            }
-
-            processor.Exception += result.Data._subscription.InvokeExceptionHandler;
-            result.Data.SubscriptionStatusChanged += (upd) =>
-            {
-                if (upd == SubscriptionStatus.Closed)
-                    _ = processor.StopAsync(true);
-            };
-
-            return result;
-        }
-
-        /// <summary>
-        /// Parse a decimal value from a string
-        /// </summary>
-        public static decimal? ParseDecimal(string? value)
-        {
-            // Value is null or empty is the most common case to return null so check before trying to parse
-            if (string.IsNullOrEmpty(value))            
-                return null;            
-
-            // Try parse, only fails for these reasons:
-            // 1. string is null or empty
-            // 2. value is larger or smaller than decimal max/min
-            // 3. unparsable format
-            if (decimal.TryParse(value, NumberStyles.Float, CultureInfo.InvariantCulture, out var decValue))
-                return decValue;
-
-            // Check for values which should be parsed to null
-            if (string.Equals("null", value, StringComparison.OrdinalIgnoreCase)
-                || string.Equals("NaN", value, StringComparison.OrdinalIgnoreCase))
-            {
-                return null;
-            }
-
-            // Infinity value should be parsed to min/max value
-            if (string.Equals("Infinity", value, StringComparison.OrdinalIgnoreCase))
-                return decimal.MaxValue;
-            else if(string.Equals("-Infinity", value, StringComparison.OrdinalIgnoreCase))
-                    return decimal.MinValue;
-
-            if (value!.Length > 27 && decimal.TryParse(value.Substring(0, 27), out var overflowValue))
-            {
-                // Not a valid decimal value and more than 27 chars, from which the first part can be parsed correctly.
-                // assume overflow
-                if (overflowValue < 0)
-                    return decimal.MinValue;
-                else
-                    return decimal.MaxValue;
-            }
-
-            // Unknown decimal format, return null
-            return null;
-        }
-
-        /// <summary>
-        /// Convert byte array to hex string
-        /// </summary>
-        /// <param name="buff"></param>
-        /// <returns></returns>
-        public static string BytesToHexString(byte[] buff)
-            => BytesToHexString(new ArraySegment<byte>(buff));
-
-        /// <summary>
-        /// Convert byte array to hex string
-        /// </summary>
-        /// <param name="buff"></param>
-        /// <returns></returns>
-        public 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>
-        public 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;
-        }
     }
 }

CryptoExchange.Net/ExchangeSymbolCache.cs

@@ -3,6 +3,7 @@ using System;
 using System.Collections.Concurrent;
 using System.Collections.Generic;
 using System.Linq;
+using System.Text;
 
 namespace CryptoExchange.Net
 {
@@ -22,74 +23,14 @@ namespace CryptoExchange.Net
         {
             if(!_symbolInfos.TryGetValue(topicId, out var exchangeInfo))
             {
-                exchangeInfo = new ExchangeInfo(DateTime.UtcNow, updateData.ToDictionary(x => x.Name, x => x.SharedSymbol));                
+                exchangeInfo = new ExchangeInfo(DateTime.UtcNow, updateData.ToDictionary(x => x.Name, x => new SharedSymbol(x.TradingMode, x.BaseAsset, x.QuoteAsset, (x as SharedFuturesSymbol)?.DeliveryTime) { SymbolName = x.Name }));                
                 _symbolInfos.TryAdd(topicId, exchangeInfo);
             }
 
             if (DateTime.UtcNow - exchangeInfo.UpdateTime < TimeSpan.FromMinutes(60))
                 return;
 
-            _symbolInfos[topicId] = new ExchangeInfo(DateTime.UtcNow, updateData.ToDictionary(x => x.Name, x => x.SharedSymbol));
-        }
-
-        /// <summary>
-        /// Whether the specific topic has been cached
-        /// </summary>
-        /// <param name="topicId">Id</param>
-        public static bool HasCached(string topicId)
-        {
-            if (!_symbolInfos.TryGetValue(topicId, out var exchangeInfo))
-                return false;
-
-            return exchangeInfo.Symbols.Count > 0;
-        }
-
-        /// <summary>
-        /// Whether a specific exchange(topic) support the provided symbol
-        /// </summary>
-        /// <param name="topicId">Id for the provided data</param>
-        /// <param name="symbolName">The symbol name</param>
-        public static bool SupportsSymbol(string topicId, string symbolName)
-        {
-            if (!_symbolInfos.TryGetValue(topicId, out var exchangeInfo))
-                return false;
-
-            if (!exchangeInfo.Symbols.TryGetValue(symbolName, out var symbolInfo))
-                return false;
-
-            return true;
-        }
-
-        /// <summary>
-        /// Whether a specific exchange(topic) support the provided symbol
-        /// </summary>
-        /// <param name="topicId">Id for the provided data</param>
-        /// <param name="symbol">The symbol info</param>
-        public static bool SupportsSymbol(string topicId, SharedSymbol symbol)
-        {
-            if (!_symbolInfos.TryGetValue(topicId, out var exchangeInfo))
-                return false;
-
-            return exchangeInfo.Symbols.Any(x => 
-                x.Value.TradingMode == symbol.TradingMode 
-                && x.Value.BaseAsset == symbol.BaseAsset 
-                && x.Value.QuoteAsset == symbol.QuoteAsset);
-        }
-
-        /// <summary>
-        /// Get all symbols for a specific base asset
-        /// </summary>
-        /// <param name="topicId">Id for the provided data</param>
-        /// <param name="baseAsset">Base asset name</param>
-        public static SharedSymbol[] GetSymbolsForBaseAsset(string topicId, string baseAsset)
-        {
-            if (!_symbolInfos.TryGetValue(topicId, out var exchangeInfo))
-                return [];
-
-            return exchangeInfo.Symbols
-                .Where(x => x.Value.BaseAsset.Equals(baseAsset, StringComparison.InvariantCultureIgnoreCase))
-                .Select(x => x.Value)
-                .ToArray();
+            _symbolInfos[topicId] = new ExchangeInfo(DateTime.UtcNow, updateData.ToDictionary(x => x.Name, x => new SharedSymbol(x.TradingMode, x.BaseAsset, x.QuoteAsset, (x as SharedFuturesSymbol)?.DeliveryTime) { SymbolName = x.Name }));
         }
 
         /// <summary>

CryptoExchange.Net/ExtensionMethods.cs

@@ -1,15 +1,18 @@
-using CryptoExchange.Net.Objects;
-using CryptoExchange.Net.SharedApis;
-using Microsoft.Extensions.DependencyInjection;
-using System;
+using System;
 using System.Collections.Generic;
-using System.Globalization;
-using System.IO;
 using System.IO.Compression;
+using System.IO;
 using System.Linq;
 using System.Runtime.InteropServices;
 using System.Text;
 using System.Web;
+using CryptoExchange.Net.Objects;
+using System.Globalization;
+using Microsoft.Extensions.DependencyInjection;
+using CryptoExchange.Net.SharedApis;
+using System.Text.Json.Serialization.Metadata;
+using System.Text.Json;
+using System.Text.Json.Serialization;
 
 namespace CryptoExchange.Net
 {
@@ -61,80 +64,30 @@ namespace CryptoExchange.Net
         /// <returns></returns>
         public static string CreateParamString(this IDictionary<string, object> parameters, bool urlEncodeValues, ArrayParametersSerialization serializationType)
         {
-            var uriString = new StringBuilder();
-            bool first = true;
-            foreach(var parameter in parameters)
+            var uriString = string.Empty;
+            var arraysParameters = parameters.Where(p => p.Value.GetType().IsArray).ToList();
+            foreach (var arrayEntry in arraysParameters)
             {
-                if (!first)
-                    uriString.Append("&");
-
-                first = false;
-
-                if (parameter.Value.GetType().IsArray)
+                if (serializationType == ArrayParametersSerialization.Array)
                 {
-                    if (serializationType == ArrayParametersSerialization.Array)
-                    {
-                        bool firstArrayValue = true;
-                        foreach (var entry in (Array)parameter.Value)
-                        {
-                            if (!firstArrayValue)
-                                uriString.Append('&');
-                            firstArrayValue = false;
-
-                            uriString.Append(parameter.Key);
-                            uriString.Append("[]=");
-                            if (urlEncodeValues)
-                                uriString.Append(Uri.EscapeDataString(string.Format(CultureInfo.InvariantCulture, "{0}", entry)));
-                            else
-                                uriString.Append(string.Format(CultureInfo.InvariantCulture, "{0}", entry));
-                        }
-                    }
-                    else if (serializationType == ArrayParametersSerialization.MultipleValues)
-                    {
-                        bool firstArrayValue = true;
-                        foreach (var entry in (Array)parameter.Value)
-                        {
-                            if (!firstArrayValue)
-                                uriString.Append('&');
-                            firstArrayValue = false;
-                            uriString.Append(parameter.Key);
-                            uriString.Append("=");
-                            if (urlEncodeValues)
-                                uriString.Append(Uri.EscapeDataString(string.Format(CultureInfo.InvariantCulture, "{0}", entry)));
-                            else
-                                uriString.Append(string.Format(CultureInfo.InvariantCulture, "{0}", entry));
-                        }
-                    }
-                    else
-                    {
-                        uriString.Append('[');
-                        var firstArrayEntry = true;
-                        foreach (var entry in (Array)parameter.Value)
-                        {
-                            if (!firstArrayEntry)
-                                uriString.Append(',');                            
-
-                            firstArrayEntry = false;
-                            if (urlEncodeValues)
-                                uriString.Append(Uri.EscapeDataString(string.Format(CultureInfo.InvariantCulture, "{0}", entry)));
-                            else
-                                uriString.Append(string.Format(CultureInfo.InvariantCulture, "{0}", entry));
-                        }
-                        uriString.Append(']');
-                    }
+                    uriString += $"{string.Join("&", ((object[])(urlEncodeValues ? Uri.EscapeDataString(arrayEntry.Value.ToString()!) : arrayEntry.Value)).Select(v => $"{arrayEntry.Key}[]={string.Format(CultureInfo.InvariantCulture, "{0}", v)}"))}&";
                 }
-                else 
+                else if (serializationType == ArrayParametersSerialization.MultipleValues)
                 {
-                    uriString.Append(parameter.Key);
-                    uriString.Append('=');
-                    if (urlEncodeValues)
-                        uriString.Append(Uri.EscapeDataString(string.Format(CultureInfo.InvariantCulture, "{0}", parameter.Value)));
-                    else
-                        uriString.Append(string.Format(CultureInfo.InvariantCulture, "{0}", parameter.Value));
+                    var array = (Array)arrayEntry.Value;
+                    uriString += string.Join("&", array.OfType<object>().Select(a => $"{arrayEntry.Key}={Uri.EscapeDataString(string.Format(CultureInfo.InvariantCulture, "{0}", a))}"));
+                    uriString += "&";
+                }
+                else
+                {
+                    var array = (Array)arrayEntry.Value;
+                    uriString += $"{arrayEntry.Key}=[{string.Join(",", array.OfType<object>().Select(a => string.Format(CultureInfo.InvariantCulture, "{0}", a)))}]&";
                 }
             }
 
-            return uriString.ToString();
+            uriString += $"{string.Join("&", parameters.Where(p => !p.Value.GetType().IsArray).Select(s => $"{s.Key}={(urlEncodeValues ? Uri.EscapeDataString(string.Format(CultureInfo.InvariantCulture, "{0}", s.Value)) : string.Format(CultureInfo.InvariantCulture, "{0}", s.Value))}"))}";
+            uriString = uriString.TrimEnd('&');
+            return uriString;
         }
 
         /// <summary>
@@ -280,45 +233,173 @@ namespace CryptoExchange.Net
         /// <summary>
         /// Append a base url with provided path
         /// </summary>
+        /// <param name="url"></param>
+        /// <param name="path"></param>
+        /// <returns></returns>
         public static string AppendPath(this string url, params string[] path)
         {
-            var sb = new StringBuilder(url.TrimEnd('/'));
-            foreach (var subPath in path)
+            if (!url.EndsWith("/"))
+                url += "/";
+
+            foreach (var item in path)
+                url += item.Trim('/') + "/";
+
+            return url.TrimEnd('/');
+        }
+
+        /// <summary>
+        /// Create a new uri with the provided parameters as query
+        /// </summary>
+        /// <param name="parameters"></param>
+        /// <param name="baseUri"></param>
+        /// <param name="arraySerialization"></param>
+        /// <returns></returns>
+        public static Uri SetParameters(this Uri baseUri, IDictionary<string, object> parameters, ArrayParametersSerialization arraySerialization)
+        {
+            var uriBuilder = new UriBuilder();
+            uriBuilder.Scheme = baseUri.Scheme;
+            uriBuilder.Host = baseUri.Host;
+            uriBuilder.Port = baseUri.Port;
+            uriBuilder.Path = baseUri.AbsolutePath;
+            var httpValueCollection = HttpUtility.ParseQueryString(string.Empty);
+            foreach (var parameter in parameters)
             {
-                sb.Append('/');
-                sb.Append(subPath.Trim('/'));
+                if (parameter.Value.GetType().IsArray)
+                {
+                    if (arraySerialization == ArrayParametersSerialization.JsonArray)
+                    {
+                        httpValueCollection.Add(parameter.Key, $"[{string.Join(",", (object[])parameter.Value)}]");
+                    }
+                    else
+                    {
+                        foreach (var item in (object[])parameter.Value)
+                        {
+                            if (arraySerialization == ArrayParametersSerialization.Array)
+                            {
+                                httpValueCollection.Add(parameter.Key + "[]", item.ToString());
+                            }
+                            else
+                            {
+                                httpValueCollection.Add(parameter.Key, item.ToString());
+                            }
+                        }
+                    }
+                }
+                else
+                {
+                    httpValueCollection.Add(parameter.Key, parameter.Value.ToString());
+                }
             }
 
-            return sb.ToString();
+            uriBuilder.Query = httpValueCollection.ToString();
+            return uriBuilder.Uri;
+        }
+
+        /// <summary>
+        /// Create a new uri with the provided parameters as query
+        /// </summary>
+        /// <param name="parameters"></param>
+        /// <param name="baseUri"></param>
+        /// <param name="arraySerialization"></param>
+        /// <returns></returns>
+        public static Uri SetParameters(this Uri baseUri, IOrderedEnumerable<KeyValuePair<string, object>> parameters, ArrayParametersSerialization arraySerialization)
+        {
+            var uriBuilder = new UriBuilder();
+            uriBuilder.Scheme = baseUri.Scheme;
+            uriBuilder.Host = baseUri.Host;
+            uriBuilder.Port = baseUri.Port;
+            uriBuilder.Path = baseUri.AbsolutePath;
+            var httpValueCollection = HttpUtility.ParseQueryString(string.Empty);
+            foreach (var parameter in parameters)
+            {
+                if (parameter.Value.GetType().IsArray)
+                {
+                    if (arraySerialization == ArrayParametersSerialization.JsonArray)
+                    {
+                        httpValueCollection.Add(parameter.Key, $"[{string.Join(",", (object[])parameter.Value)}]");
+                    }
+                    else
+                    {
+                        foreach (var item in (object[])parameter.Value)
+                        {
+                            if (arraySerialization == ArrayParametersSerialization.Array)
+                            {
+                                httpValueCollection.Add(parameter.Key + "[]", item.ToString());
+                            }
+                            else
+                            {
+                                httpValueCollection.Add(parameter.Key, item.ToString());
+                            }
+                        }
+                    }
+                }
+                else
+                {
+                    httpValueCollection.Add(parameter.Key, parameter.Value.ToString());
+                }
+            }
+
+            uriBuilder.Query = httpValueCollection.ToString();
+            return uriBuilder.Uri;
+        }
+
+        /// <summary>
+        /// Add parameter to URI
+        /// </summary>
+        /// <param name="uri"></param>
+        /// <param name="name"></param>
+        /// <param name="value"></param>
+        /// <returns></returns>
+        public static Uri AddQueryParameter(this Uri uri, string name, string value)
+        {
+            var httpValueCollection = HttpUtility.ParseQueryString(uri.Query);
+
+            httpValueCollection.Remove(name);
+            httpValueCollection.Add(name, value);
+
+            var ub = new UriBuilder(uri);
+            ub.Query = httpValueCollection.ToString();
+
+            return ub.Uri;
         }
 
         /// <summary>
         /// Decompress using GzipStream
         /// </summary>
-        public static ReadOnlySpan<byte> DecompressGzip(this ReadOnlySpan<byte> data)
+        /// <param name="data"></param>
+        /// <returns></returns>
+        public static ReadOnlyMemory<byte> DecompressGzip(this ReadOnlyMemory<byte> data)
         {
             using var decompressedStream = new MemoryStream();
+            using var dataStream = MemoryMarshal.TryGetArray(data, out var arraySegment)
+                ? new MemoryStream(arraySegment.Array!, arraySegment.Offset, arraySegment.Count)
+                : new MemoryStream(data.ToArray());
             using var deflateStream = new GZipStream(new MemoryStream(data.ToArray()), CompressionMode.Decompress);
             deflateStream.CopyTo(decompressedStream);
-            return new ReadOnlySpan<byte>(decompressedStream.GetBuffer(), 0, (int)decompressedStream.Length);
+            return new ReadOnlyMemory<byte>(decompressedStream.GetBuffer(), 0, (int)decompressedStream.Length);
         }
 
         /// <summary>
-        /// Decompress using GzipStream
+        /// Decompress using DeflateStream
         /// </summary>
-        public static ReadOnlySpan<byte> Decompress(this ReadOnlySpan<byte> input)
+        /// <param name="input"></param>
+        /// <returns></returns>
+        public static ReadOnlyMemory<byte> Decompress(this ReadOnlyMemory<byte> input)
         {
-            using var output = new MemoryStream();
-            using var compressStream = new MemoryStream(input.ToArray());
-            using var decompressor = new DeflateStream(compressStream, CompressionMode.Decompress);
-            decompressor.CopyTo(output);
-            return new ReadOnlySpan<byte>(output.GetBuffer(), 0, (int)output.Length);
+            var output = new MemoryStream();
+
+            using (var compressStream = new MemoryStream(input.ToArray()))
+            using (var decompressor = new DeflateStream(compressStream, CompressionMode.Decompress))
+                decompressor.CopyTo(output);
+
+            output.Position = 0;
+            return new ReadOnlyMemory<byte>(output.GetBuffer(), 0, (int)output.Length);
         }
 
         /// <summary>
         /// Whether the trading mode is linear
         /// </summary>
-        public static bool IsLinear(this TradingMode type) => type == TradingMode.PerpetualLinear || type == TradingMode.DeliveryLinear;        
+        public static bool IsLinear(this TradingMode type) => type == TradingMode.PerpetualLinear || type == TradingMode.DeliveryLinear;
 
         /// <summary>
         /// Whether the trading mode is inverse
@@ -335,36 +416,6 @@ namespace CryptoExchange.Net
         /// </summary>
         public static bool IsDelivery(this TradingMode type) => type == TradingMode.DeliveryInverse || type == TradingMode.DeliveryLinear;
 
-        /// <summary>
-        /// Whether the account type is a futures account
-        /// </summary>
-        public static bool IsFuturesAccount(this SharedAccountType type) =>
-            type == SharedAccountType.PerpetualLinearFutures
-            || type == SharedAccountType.DeliveryLinearFutures
-            || type == SharedAccountType.PerpetualInverseFutures
-            || type == SharedAccountType.DeliveryInverseFutures;
-
-        /// <summary>
-        /// Whether the account type is a margin account
-        /// </summary>
-        public static bool IsMarginAccount(this SharedAccountType type) =>
-            type == SharedAccountType.CrossMargin
-            || type == SharedAccountType.IsolatedMargin;
-
-        /// <summary>
-        /// Map a TradingMode value to a SharedAccountType enum value
-        /// </summary>
-        public static SharedAccountType ToAccountType(this TradingMode mode)
-        {
-            if (mode == TradingMode.Spot) return SharedAccountType.Spot;
-            if (mode == TradingMode.PerpetualLinear) return SharedAccountType.PerpetualLinearFutures;
-            if (mode == TradingMode.PerpetualInverse) return SharedAccountType.PerpetualInverseFutures;
-            if (mode == TradingMode.DeliveryInverse) return SharedAccountType.DeliveryInverseFutures;
-            if (mode == TradingMode.DeliveryLinear) return SharedAccountType.DeliveryLinearFutures;
-
-            throw new ArgumentException(nameof(mode), "Unmapped trading mode");
-        }
-
         /// <summary>
         /// Register rest client interfaces
         /// </summary>
@@ -392,10 +443,6 @@ namespace CryptoExchange.Net
                 services.AddTransient(x => (IWithdrawRestClient)client(x)!);
             if (typeof(IFeeRestClient).IsAssignableFrom(typeof(T)))
                 services.AddTransient(x => (IFeeRestClient)client(x)!);
-            if (typeof(IBookTickerRestClient).IsAssignableFrom(typeof(T)))
-                services.AddTransient(x => (IBookTickerRestClient)client(x)!);
-            if (typeof(ITransferRestClient).IsAssignableFrom(typeof(T)))
-                services.AddTransient(x => (ITransferRestClient)client(x)!);
 
             if (typeof(ISpotOrderRestClient).IsAssignableFrom(typeof(T)))
                 services.AddTransient(x => (ISpotOrderRestClient)client(x)!);
@@ -403,10 +450,6 @@ namespace CryptoExchange.Net
                 services.AddTransient(x => (ISpotSymbolRestClient)client(x)!);
             if (typeof(ISpotTickerRestClient).IsAssignableFrom(typeof(T)))
                 services.AddTransient(x => (ISpotTickerRestClient)client(x)!);
-            if (typeof(ISpotTriggerOrderRestClient).IsAssignableFrom(typeof(T)))
-                services.AddTransient(x => (ISpotTriggerOrderRestClient)client(x)!);
-            if (typeof(ISpotOrderClientIdRestClient).IsAssignableFrom(typeof(T)))
-                services.AddTransient(x => (ISpotOrderClientIdRestClient)client(x)!);
 
             if (typeof(IFundingRateRestClient).IsAssignableFrom(typeof(T)))
                 services.AddTransient(x => (IFundingRateRestClient)client(x)!);
@@ -428,12 +471,6 @@ namespace CryptoExchange.Net
                 services.AddTransient(x => (IPositionHistoryRestClient)client(x)!);
             if (typeof(IPositionModeRestClient).IsAssignableFrom(typeof(T)))
                 services.AddTransient(x => (IPositionModeRestClient)client(x)!);
-            if (typeof(IFuturesTpSlRestClient).IsAssignableFrom(typeof(T)))
-                services.AddTransient(x => (IFuturesTpSlRestClient)client(x)!);
-            if (typeof(IFuturesTriggerOrderRestClient).IsAssignableFrom(typeof(T)))
-                services.AddTransient(x => (IFuturesTriggerOrderRestClient)client(x)!);
-            if (typeof(IFuturesOrderClientIdRestClient).IsAssignableFrom(typeof(T)))
-                services.AddTransient(x => (IFuturesOrderClientIdRestClient)client(x)!);
 
             return services;
         }
@@ -449,8 +486,8 @@ namespace CryptoExchange.Net
                 services.AddTransient(x => (IBookTickerSocketClient)client(x)!);
             if (typeof(IKlineSocketClient).IsAssignableFrom(typeof(T)))
                 services.AddTransient(x => (IKlineSocketClient)client(x)!);
-            if (typeof(IOrderBookSocketClient).IsAssignableFrom(typeof(T)))
-                services.AddTransient(x => (IOrderBookSocketClient)client(x)!);
+            if (typeof(IOrderBookRestClient).IsAssignableFrom(typeof(T)))
+                services.AddTransient(x => (IOrderBookRestClient)client(x)!);
             if (typeof(ITickerSocketClient).IsAssignableFrom(typeof(T)))
                 services.AddTransient(x => (ITickerSocketClient)client(x)!);
             if (typeof(ITickersSocketClient).IsAssignableFrom(typeof(T)))
@@ -470,26 +507,6 @@ namespace CryptoExchange.Net
 
             return services;
         }
-
-        /// <summary>
-        /// Convert a hex encoded string to byte array
-        /// </summary>
-        /// <param name="hexString"></param>
-        /// <returns></returns>
-        public static byte[] HexStringToBytes(this 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;
-        }
     }
 }
 

CryptoExchange.Net/Interfaces/Clients/IBaseApiClient.cs

@@ -1,28 +0,0 @@
-using CryptoExchange.Net.Authentication;
-using CryptoExchange.Net.Objects.Options;
-using CryptoExchange.Net.SharedApis;
-using System;
-
-namespace CryptoExchange.Net.Interfaces.Clients
-{
-    /// <summary>
-    /// Base api client
-    /// </summary>
-    public interface IBaseApiClient
-    {
-        /// <summary>
-        /// Base address
-        /// </summary>
-        string BaseAddress { get; }
-
-        /// <summary>
-        /// Format a base and quote asset to an exchange accepted symbol 
-        /// </summary>
-        /// <param name="baseAsset">The base asset</param>
-        /// <param name="quoteAsset">The quote asset</param>
-        /// <param name="tradingMode">The trading mode</param>
-        /// <param name="deliverDate">The deliver date for a delivery futures symbol</param>
-        /// <returns></returns>
-        string FormatSymbol(string baseAsset, string quoteAsset, TradingMode tradingMode, DateTime? deliverDate = null);
-    }
-}

CryptoExchange.Net/Interfaces/Clients/IRestApiClient.cs

@@ -1,42 +0,0 @@
-using CryptoExchange.Net.Authentication;
-using CryptoExchange.Net.Objects.Options;
-
-namespace CryptoExchange.Net.Interfaces.Clients
-{
-    /// <summary>
-    /// Base rest API client
-    /// </summary>
-    public interface IRestApiClient : IBaseApiClient
-    {
-        /// <summary>
-        /// The factory for creating requests. Used for unit testing
-        /// </summary>
-        IRequestFactory RequestFactory { get; set; }
-
-        /// <summary>
-        /// Total amount of requests made with this API client
-        /// </summary>
-        int TotalRequestsMade { get; set; }
-    }
-
-    /// <inheritdoc />
-    public interface IRestApiClient<TApiCredentials> : IRestApiClient
-        where TApiCredentials : ApiCredentials
-    {
-        /// <summary>
-        /// Whether or not API credentials have been configured for this client. Does not check the credentials are actually valid.
-        /// </summary>
-        bool Authenticated { get; }
-
-        /// <summary>
-        /// Set the API credentials for this API client
-        /// </summary>
-        void SetApiCredentials(TApiCredentials credentials);
-
-        /// <summary>
-        /// Set new options. Note that when using a proxy this should be provided in the options even when already set before or it will be reset.
-        /// </summary>
-        /// <param name="options">Options to set</param>
-        void SetOptions(UpdateOptions<TApiCredentials> options);
-    }
-}

CryptoExchange.Net/Interfaces/Clients/IRestClient.cs

@@ -1,54 +0,0 @@
-using System;
-using CryptoExchange.Net.Authentication;
-using CryptoExchange.Net.Objects.Options;
-
-namespace CryptoExchange.Net.Interfaces.Clients
-{
-    /// <summary>
-    /// Base class for rest API implementations
-    /// </summary>
-    public interface IRestClient : IDisposable
-    {
-        /// <summary>
-        /// The options provided for this client
-        /// </summary>
-        ExchangeOptions ClientOptions { get; }
-
-        /// <summary>
-        /// The total amount of requests made with this client
-        /// </summary>
-        int TotalRequestsMade { get; }
-
-        /// <summary>
-        /// The exchange name
-        /// </summary>
-        string Exchange { get; }
-
-        /// <summary>
-        /// Whether client is disposed
-        /// </summary>
-        bool Disposed { get; }
-
-        /// <summary>
-        /// Update specific options
-        /// </summary>
-        /// <param name="options">Options to update. Only specific options are changeable after the client has been created</param>
-        void SetOptions(UpdateOptions options);
-    }
-
-    /// <inheritdoc />
-    public interface IRestClient<TApiCredentials> : IRestClient where TApiCredentials : ApiCredentials
-    {
-        /// <summary>
-        /// Set the API credentials for this client. All Api clients in this client will use the new credentials, regardless of earlier set options.
-        /// </summary>
-        /// <param name="credentials">The credentials to set</param>
-        void SetApiCredentials(TApiCredentials credentials);
-
-        /// <summary>
-        /// Update specific options
-        /// </summary>
-        /// <param name="options">Options to update. Only specific options are changeable after the client has been created</param>
-        void SetOptions(UpdateOptions<TApiCredentials> options);
-    }
-}

CryptoExchange.Net/Interfaces/IBaseApiClient.cs

@@ -0,0 +1,48 @@
+using CryptoExchange.Net.Authentication;
+using CryptoExchange.Net.Objects;
+using CryptoExchange.Net.Objects.Options;
+using CryptoExchange.Net.SharedApis;
+using System;
+
+namespace CryptoExchange.Net.Interfaces
+{
+    /// <summary>
+    /// Base api client
+    /// </summary>
+    public interface IBaseApiClient
+    {
+        /// <summary>
+        /// Base address
+        /// </summary>
+        string BaseAddress { get; }
+
+        /// <summary>
+        /// Whether or not API credentials have been configured for this client. Does not check the credentials are actually valid.
+        /// </summary>
+        bool Authenticated { get; }
+
+        /// <summary>
+        /// Format a base and quote asset to an exchange accepted symbol 
+        /// </summary>
+        /// <param name="baseAsset">The base asset</param>
+        /// <param name="quoteAsset">The quote asset</param>
+        /// <param name="tradingMode">The trading mode</param>
+        /// <param name="deliverDate">The deliver date for a delivery futures symbol</param>
+        /// <returns></returns>
+        string FormatSymbol(string baseAsset, string quoteAsset, TradingMode tradingMode, DateTime? deliverDate = null);
+
+        /// <summary>
+        /// Set the API credentials for this API client
+        /// </summary>
+        /// <typeparam name="T"></typeparam>
+        /// <param name="credentials"></param>
+        void SetApiCredentials<T>(T credentials) where T : ApiCredentials;
+
+        /// <summary>
+        /// Set new options. Note that when using a proxy this should be provided in the options even when already set before or it will be reset.
+        /// </summary>
+        /// <typeparam name="T">Api credentials type</typeparam>
+        /// <param name="options">Options to set</param>
+        void SetOptions<T>(UpdateOptions<T> options) where T : ApiCredentials;
+    }
+}

CryptoExchange.Net/Interfaces/ICryptoRestClient.cs

@@ -0,0 +1,17 @@
+using System;
+
+namespace CryptoExchange.Net.Interfaces
+{
+    /// <summary>
+    /// Client for accessing REST API's for different exchanges
+    /// </summary>
+    public interface ICryptoRestClient
+    {
+        /// <summary>
+        /// Try get 
+        /// </summary>
+        /// <typeparam name="T"></typeparam>
+        /// <returns></returns>
+        T TryGet<T>(Func<T> createFunc);
+    }
+}

CryptoExchange.Net/Interfaces/ICryptoSocketClient.cs

@@ -0,0 +1,17 @@
+using System;
+
+namespace CryptoExchange.Net.Interfaces
+{
+    /// <summary>
+    /// Client for accessing Websocket API's for different exchanges
+    /// </summary>
+    public interface ICryptoSocketClient
+    {
+        /// <summary>
+        /// Try get a client by type for the service collection
+        /// </summary>
+        /// <typeparam name="T"></typeparam>
+        /// <returns></returns>
+        T TryGet<T>(Func<T> createFunc);
+    }
+}

CryptoExchange.Net/Interfaces/IExchangeService.cs

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

CryptoExchange.Net/Interfaces/IMessageAccessor.cs

@@ -0,0 +1,101 @@
+using CryptoExchange.Net.Converters.MessageParsing;
+using CryptoExchange.Net.Objects;
+using System;
+using System.Collections.Generic;
+using System.IO;
+using System.Threading.Tasks;
+
+namespace CryptoExchange.Net.Interfaces
+{
+    /// <summary>
+    /// Message accessor
+    /// </summary>
+    public interface IMessageAccessor
+    {
+        /// <summary>
+        /// Is this a json message
+        /// </summary>
+        bool IsJson { get; }
+        /// <summary>
+        /// Is the original data available for retrieval
+        /// </summary>
+        bool OriginalDataAvailable { get; }
+        /// <summary>
+        /// The underlying data object
+        /// </summary>
+        object? Underlying { get; }
+        /// <summary>
+        /// Clear internal data structure
+        /// </summary>
+        void Clear();
+        /// <summary>
+        /// Get the type of node
+        /// </summary>
+        /// <returns></returns>
+        NodeType? GetNodeType();
+        /// <summary>
+        /// Get the type of node
+        /// </summary>
+        /// <param name="path">Access path</param>
+        /// <returns></returns>
+        NodeType? GetNodeType(MessagePath path);
+        /// <summary>
+        /// Get the value of a path
+        /// </summary>
+        /// <typeparam name="T"></typeparam>
+        /// <param name="path"></param>
+        /// <returns></returns>
+        T? GetValue<T>(MessagePath path);
+        /// <summary>
+        /// Get the values of an array
+        /// </summary>
+        /// <typeparam name="T"></typeparam>
+        /// <param name="path"></param>
+        /// <returns></returns>
+        List<T?>? GetValues<T>(MessagePath path);
+        /// <summary>
+        /// Deserialize the message into this type
+        /// </summary>
+        /// <param name="type"></param>
+        /// <param name="path"></param>
+        /// <returns></returns>
+        CallResult<object> Deserialize(Type type, MessagePath? path = null);
+        /// <summary>
+        /// Deserialize the message into this type
+        /// </summary>
+        /// <param name="path"></param>
+        /// <returns></returns>
+        CallResult<T> Deserialize<T>(MessagePath? path = null);
+
+        /// <summary>
+        /// Get the original string value
+        /// </summary>
+        /// <returns></returns>
+        string GetOriginalString();
+    }
+
+    /// <summary>
+    /// Stream message accessor
+    /// </summary>
+    public interface IStreamMessageAccessor : IMessageAccessor
+    {
+        /// <summary>
+        /// Load a stream message
+        /// </summary>
+        /// <param name="stream"></param>
+        /// <param name="bufferStream"></param>
+        Task<CallResult> Read(Stream stream, bool bufferStream);
+    }
+
+    /// <summary>
+    /// Byte message accessor
+    /// </summary>
+    public interface IByteMessageAccessor : IMessageAccessor
+    {
+        /// <summary>
+        /// Load a data message
+        /// </summary>
+        /// <param name="data"></param>
+        CallResult Read(ReadOnlyMemory<byte> data);
+    }
+}

CryptoExchange.Net/Interfaces/IMessageProcessor.cs

@@ -0,0 +1,44 @@
+using CryptoExchange.Net.Objects;
+using CryptoExchange.Net.Objects.Sockets;
+using CryptoExchange.Net.Sockets;
+using System;
+using System.Collections.Generic;
+using System.Threading.Tasks;
+
+namespace CryptoExchange.Net.Interfaces
+{
+    /// <summary>
+    /// Message processor
+    /// </summary>
+    public interface IMessageProcessor
+    {
+        /// <summary>
+        /// Id of the processor
+        /// </summary>
+        public int Id { get; }
+        /// <summary>
+        /// The identifiers for this processor
+        /// </summary>
+        public HashSet<string> ListenerIdentifiers { get; }
+        /// <summary>
+        /// Handle a message
+        /// </summary>
+        /// <param name="connection"></param>
+        /// <param name="message"></param>
+        /// <returns></returns>
+        Task<CallResult> Handle(SocketConnection connection, DataEvent<object> message);
+        /// <summary>
+        /// Get the type the message should be deserialized to
+        /// </summary>
+        /// <param name="messageAccessor"></param>
+        /// <returns></returns>
+        Type? GetMessageType(IMessageAccessor messageAccessor);
+        /// <summary>
+        /// Deserialize a message into object of type
+        /// </summary>
+        /// <param name="accessor"></param>
+        /// <param name="type"></param>
+        /// <returns></returns>
+        CallResult<object> Deserialize(IMessageAccessor accessor, Type type);
+    }
+}

CryptoExchange.Net/Interfaces/IMessageSerializer.cs

@@ -4,26 +4,6 @@
     /// Serializer interface
     /// </summary>
     public interface IMessageSerializer
-    {
-    }
-
-    /// <summary>
-    /// Serialize to byte array
-    /// </summary>
-    public interface IByteMessageSerializer: IMessageSerializer
-    {
-        /// <summary>
-        /// Serialize an object to a string
-        /// </summary>
-        /// <param name="message"></param>
-        /// <returns></returns>
-        byte[] Serialize<T>(T message);
-    }
-
-    /// <summary>
-    /// Serialize to string
-    /// </summary>
-    public interface IStringMessageSerializer: IMessageSerializer
     {
         /// <summary>
         /// Serialize an object to a string

CryptoExchange.Net/Interfaces/IRequest.cs

@@ -1,7 +1,6 @@
 using System;
+using System.Collections.Generic;
 using System.Net.Http;
-using System.Net.Http.Headers;
-using System.Text;
 using System.Threading;
 using System.Threading.Tasks;
 
@@ -15,7 +14,7 @@ namespace CryptoExchange.Net.Interfaces
         /// <summary>
         /// Accept header
         /// </summary>
-        MediaTypeWithQualityHeaderValue Accept { set; }
+        string Accept { set; }
         /// <summary>
         /// Content
         /// </summary>
@@ -29,10 +28,6 @@ namespace CryptoExchange.Net.Interfaces
         /// </summary>
         Uri Uri { get; }
         /// <summary>
-        /// HTTP protocol version
-        /// </summary>
-        Version HttpVersion { get; }
-        /// <summary>
         /// internal request id for tracing
         /// </summary>
         int RequestId { get; }
@@ -44,7 +39,9 @@ namespace CryptoExchange.Net.Interfaces
         /// <summary>
         /// Set string content
         /// </summary>
-        void SetContent(string data, Encoding? encoding, string contentType);
+        /// <param name="data"></param>
+        /// <param name="contentType"></param>
+        void SetContent(string data, string contentType);
 
         /// <summary>
         /// Add a header to the request
@@ -57,7 +54,7 @@ namespace CryptoExchange.Net.Interfaces
         /// Get all headers
         /// </summary>
         /// <returns></returns>
-        HttpRequestHeaders GetHeaders();
+        KeyValuePair<string, string[]>[] GetHeaders();
 
         /// <summary>
         /// Get the response

CryptoExchange.Net/Interfaces/IRequestFactory.cs

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

CryptoExchange.Net/Interfaces/IResponse.cs

@@ -1,8 +1,6 @@
-using System;
+using System.Collections.Generic;
 using System.IO;
 using System.Net;
-using System.Net.Http.Headers;
-using System.Threading;
 using System.Threading.Tasks;
 
 namespace CryptoExchange.Net.Interfaces
@@ -17,11 +15,6 @@ namespace CryptoExchange.Net.Interfaces
         /// </summary>
         HttpStatusCode StatusCode { get; }
 
-        /// <summary>
-        /// Http protocol version
-        /// </summary>
-        Version HttpVersion { get; }
-
         /// <summary>
         /// Whether the status code indicates a success status
         /// </summary>
@@ -35,13 +28,13 @@ namespace CryptoExchange.Net.Interfaces
         /// <summary>
         /// The response headers
         /// </summary>
-        HttpResponseHeaders ResponseHeaders { get; }
+        KeyValuePair<string, string[]>[] ResponseHeaders { get; }
 
         /// <summary>
         /// Get the response stream
         /// </summary>
         /// <returns></returns>
-        Task<Stream> GetResponseStreamAsync(CancellationToken cancellationToken);
+        Task<Stream> GetResponseStreamAsync();
 
         /// <summary>
         /// Close the response

CryptoExchange.Net/Interfaces/IRestApiClient.cs

@@ -0,0 +1,18 @@
+namespace CryptoExchange.Net.Interfaces
+{
+    /// <summary>
+    /// Base rest API client
+    /// </summary>
+    public interface IRestApiClient : IBaseApiClient
+    {
+        /// <summary>
+        /// The factory for creating requests. Used for unit testing
+        /// </summary>
+        IRequestFactory RequestFactory { get; set; }
+
+        /// <summary>
+        /// Total amount of requests made with this API client
+        /// </summary>
+        int TotalRequestsMade { get; set; }
+    }
+}

CryptoExchange.Net/Interfaces/IRestClient.cs

@@ -0,0 +1,26 @@
+using System;
+using CryptoExchange.Net.Objects.Options;
+
+namespace CryptoExchange.Net.Interfaces
+{
+    /// <summary>
+    /// Base class for rest API implementations
+    /// </summary>
+    public interface IRestClient: IDisposable
+    {
+        /// <summary>
+        /// The options provided for this client
+        /// </summary>
+        ExchangeOptions ClientOptions { get; }
+
+        /// <summary>
+        /// The total amount of requests made with this client
+        /// </summary>
+        int TotalRequestsMade { get; }
+
+        /// <summary>
+        /// The exchange name
+        /// </summary>
+        string Exchange { get; }
+    }
+}

CryptoExchange.Net/Interfaces/ISocketApiClient.cs

@@ -1,17 +1,14 @@
-using CryptoExchange.Net.Authentication;
-using CryptoExchange.Net.Objects;
+using CryptoExchange.Net.Objects;
 using CryptoExchange.Net.Objects.Options;
 using CryptoExchange.Net.Objects.Sockets;
-using CryptoExchange.Net.Sockets.Default.Interfaces;
-using CryptoExchange.Net.Sockets.HighPerf.Interfaces;
 using System.Threading.Tasks;
 
-namespace CryptoExchange.Net.Interfaces.Clients
+namespace CryptoExchange.Net.Interfaces
 {
     /// <summary>
     /// Socket API client
     /// </summary>
-    public interface ISocketApiClient : IBaseApiClient
+    public interface ISocketApiClient: IBaseApiClient
     {
         /// <summary>
         /// The current amount of socket connections on the API client
@@ -30,10 +27,6 @@ namespace CryptoExchange.Net.Interfaces.Clients
         /// </summary>
         IWebsocketFactory SocketFactory { get; set; }
         /// <summary>
-        /// High performance websocket factory
-        /// </summary>
-        IHighPerfConnectionFactory? HighPerfConnectionFactory { get; set; }
-        /// <summary>
         /// Current client options
         /// </summary>
         SocketExchangeOptions ClientOptions { get; }
@@ -74,25 +67,4 @@ namespace CryptoExchange.Net.Interfaces.Clients
         /// <returns></returns>
         Task<CallResult> PrepareConnectionsAsync();
     }
-
-    /// <inheritdoc />
-    public interface ISocketApiClient<TApiCredentials> : ISocketApiClient
-        where TApiCredentials : ApiCredentials
-    {
-
-        /// <summary>
-        /// Whether or not API credentials have been configured for this client. Does not check the credentials are actually valid.
-        /// </summary>
-        bool Authenticated { get; }
-        /// <summary>
-        /// Set the API credentials for this API client
-        /// </summary>
-        void SetApiCredentials(TApiCredentials credentials);
-
-        /// <summary>
-        /// Set new options. Note that when using a proxy this should be provided in the options even when already set before or it will be reset.
-        /// </summary>
-        /// <param name="options">Options to set</param>
-        void SetOptions(UpdateOptions<TApiCredentials> options);
-    }
 }

CryptoExchange.Net/Interfaces/ISocketClient.cs

@@ -1,15 +1,14 @@
 using System;
 using System.Threading.Tasks;
-using CryptoExchange.Net.Authentication;
 using CryptoExchange.Net.Objects.Options;
 using CryptoExchange.Net.Objects.Sockets;
 
-namespace CryptoExchange.Net.Interfaces.Clients
+namespace CryptoExchange.Net.Interfaces
 {
     /// <summary>
     /// Base class for socket API implementations
     /// </summary>
-    public interface ISocketClient : IDisposable
+    public interface ISocketClient: IDisposable
     {
         /// <summary>
         /// The exchange name
@@ -36,11 +35,6 @@ namespace CryptoExchange.Net.Interfaces.Clients
         /// </summary>
         public int CurrentSubscriptions { get; }
 
-        /// <summary>
-        /// Whether client is disposed
-        /// </summary>
-        bool Disposed { get; }
-
         /// <summary>
         /// Unsubscribe from a stream using the subscription id received when starting the subscription
         /// </summary>
@@ -60,28 +54,5 @@ namespace CryptoExchange.Net.Interfaces.Clients
         /// </summary>
         /// <returns></returns>
         Task UnsubscribeAllAsync();
-
-        /// <summary>
-        /// Update specific options
-        /// </summary>
-        /// <param name="options">Options to update. Only specific options are changeable after the client has been created</param>
-        void SetOptions(UpdateOptions options);
-    }
-
-    /// <inheritdoc />
-    public interface ISocketClient<TApiCredentials> : ISocketClient where TApiCredentials : ApiCredentials
-    {
-
-        /// <summary>
-        /// Set the API credentials for this client. All Api clients in this client will use the new credentials, regardless of earlier set options.
-        /// </summary>
-        /// <param name="credentials">The credentials to set</param>
-        void SetApiCredentials(TApiCredentials credentials);
-
-        /// <summary>
-        /// Update specific options
-        /// </summary>
-        /// <param name="options">Options to update. Only specific options are changeable after the client has been created</param>
-        void SetOptions(UpdateOptions<TApiCredentials> options);
     }
 }