mirror of
				https://github.com/JKorf/CryptoExchange.Net
				synced 2025-10-31 02:17:45 +00:00 
			
		
		
		
	Compare commits
	
		
			No commits in common. "master" and "CryptoExchange.Net.9.9.0" have entirely different histories.
		
	
	
		
			master
			...
			CryptoExch
		
	
		
| @ -6,9 +6,9 @@ | ||||
|     <PackageId>CryptoExchange.Net.Protobuf</PackageId> | ||||
|     <Authors>JKorf</Authors> | ||||
|     <Description>Protobuf support for CryptoExchange.Net</Description> | ||||
|     <PackageVersion>9.11.1</PackageVersion> | ||||
|     <AssemblyVersion>9.11.1</AssemblyVersion> | ||||
|     <FileVersion>9.11.1</FileVersion> | ||||
|     <PackageVersion>9.8.0</PackageVersion> | ||||
|     <AssemblyVersion>9.8.0</AssemblyVersion> | ||||
|     <FileVersion>9.8.0</FileVersion> | ||||
|     <PackageRequireLicenseAcceptance>false</PackageRequireLicenseAcceptance> | ||||
|     <PackageTags>CryptoExchange;CryptoExchange.Net</PackageTags> | ||||
|     <RepositoryType>git</RepositoryType> | ||||
| @ -41,7 +41,7 @@ | ||||
|     <DocumentationFile>CryptoExchange.Net.Protobuf.xml</DocumentationFile> | ||||
|   </PropertyGroup> | ||||
|   <ItemGroup> | ||||
|     <PackageReference Include="CryptoExchange.Net" Version="9.11.0" /> | ||||
|     <PackageReference Include="CryptoExchange.Net" Version="9.8.0" /> | ||||
|     <PackageReference Include="protobuf-net" Version="3.2.56" /> | ||||
|   </ItemGroup> | ||||
| </Project> | ||||
| @ -5,18 +5,6 @@ | ||||
| Protobuf support for CryptoExchange.Net. | ||||
| 
 | ||||
| ## Release notes | ||||
| * 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/ | ||||
| 
 | ||||
|  | ||||
| @ -6,10 +6,10 @@ | ||||
|   </PropertyGroup> | ||||
| 
 | ||||
|   <ItemGroup> | ||||
|     <PackageReference Include="Microsoft.NET.Test.Sdk" Version="18.0.0"></PackageReference> | ||||
|     <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.14.1"></PackageReference> | ||||
|     <PackageReference Include="Moq" Version="4.20.72" /> | ||||
|     <PackageReference Include="NUnit" Version="4.4.0"></PackageReference> | ||||
|     <PackageReference Include="NUnit3TestAdapter" Version="5.2.0"></PackageReference> | ||||
|     <PackageReference Include="NUnit" Version="4.3.2"></PackageReference> | ||||
|     <PackageReference Include="NUnit3TestAdapter" Version="5.0.0"></PackageReference> | ||||
|   </ItemGroup> | ||||
| 
 | ||||
|   <ItemGroup> | ||||
|  | ||||
| @ -21,8 +21,6 @@ namespace CryptoExchange.Net.Clients | ||||
|         protected BaseRestClient(ILoggerFactory? loggerFactory, string name) : base(loggerFactory, name) | ||||
|         { | ||||
|             _logger = loggerFactory?.CreateLogger(name + ".RestClient") ?? NullLoggerFactory.Instance.CreateLogger(name); | ||||
| 
 | ||||
|             LibraryHelpers.StaticLogger = loggerFactory?.CreateLogger(name); | ||||
|         } | ||||
|     } | ||||
| } | ||||
|  | ||||
| @ -40,8 +40,6 @@ namespace CryptoExchange.Net.Clients | ||||
|         protected BaseSocketClient(ILoggerFactory? loggerFactory, string name) : base(loggerFactory, name) | ||||
|         { | ||||
|             _logger = loggerFactory?.CreateLogger(name + ".SocketClient") ?? NullLoggerFactory.Instance.CreateLogger(name); | ||||
| 
 | ||||
|             LibraryHelpers.StaticLogger = loggerFactory?.CreateLogger(name); | ||||
|         } | ||||
| 
 | ||||
|         /// <summary> | ||||
|  | ||||
| @ -1,5 +1,4 @@ | ||||
| using Microsoft.Extensions.Logging; | ||||
| using System; | ||||
| using System; | ||||
| using System.Diagnostics; | ||||
| using System.Runtime.Serialization; | ||||
| using System.Text.Json; | ||||
| @ -48,7 +47,7 @@ namespace CryptoExchange.Net.Converters.SystemTextJson | ||||
|                 if (string.IsNullOrEmpty(value)) | ||||
|                 { | ||||
|                     if (typeToConvert == typeof(bool)) | ||||
|                         LibraryHelpers.StaticLogger?.LogWarning("Received null bool value, but property type is not a nullable bool"); | ||||
|                         Trace.WriteLine($"{DateTime.Now:yyyy/MM/dd HH:mm:ss:fff} | Warning | Received null bool value, but property type is not a nullable bool"); | ||||
|                     return default; | ||||
|                 } | ||||
| 
 | ||||
|  | ||||
| @ -1,5 +1,4 @@ | ||||
| using Microsoft.Extensions.Logging; | ||||
| using System; | ||||
| using System; | ||||
| using System.Diagnostics; | ||||
| using System.Diagnostics.CodeAnalysis; | ||||
| using System.Globalization; | ||||
| @ -15,8 +14,8 @@ namespace CryptoExchange.Net.Converters.SystemTextJson | ||||
|     { | ||||
|         private static readonly DateTime _epoch = new(1970, 1, 1, 0, 0, 0, DateTimeKind.Utc); | ||||
|         private const long _ticksPerSecond = TimeSpan.TicksPerMillisecond * 1000; | ||||
|         private const decimal _ticksPerMicrosecond = TimeSpan.TicksPerMillisecond / 1000m; | ||||
|         private const 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) | ||||
| @ -40,17 +39,17 @@ namespace CryptoExchange.Net.Converters.SystemTextJson | ||||
|                 if (reader.TokenType == JsonTokenType.Null) | ||||
|                 { | ||||
|                     if (typeToConvert == typeof(DateTime)) | ||||
|                         LibraryHelpers.StaticLogger?.LogWarning("DateTime value of null, but property is not nullable"); | ||||
|                         Trace.WriteLine($"{DateTime.Now:yyyy/MM/dd HH:mm:ss:fff} | Warning | DateTime value of null, but property is not nullable"); | ||||
|                     return default; | ||||
|                 } | ||||
| 
 | ||||
|                 if (reader.TokenType is JsonTokenType.Number) | ||||
|                 { | ||||
|                     var decValue = reader.GetDecimal(); | ||||
|                     if (decValue == 0 || decValue < 0) | ||||
|                     var longValue = reader.GetDouble(); | ||||
|                     if (longValue == 0 || longValue < 0) | ||||
|                         return default; | ||||
| 
 | ||||
|                     return ParseFromDecimal(decValue); | ||||
|                     return ParseFromDouble(longValue); | ||||
|                 } | ||||
|                 else if (reader.TokenType is JsonTokenType.String) | ||||
|                 { | ||||
| @ -58,7 +57,7 @@ namespace CryptoExchange.Net.Converters.SystemTextJson | ||||
|                     if (string.IsNullOrWhiteSpace(stringValue) | ||||
|                         || stringValue == "-1" | ||||
|                         || stringValue == "0001-01-01T00:00:00Z" | ||||
|                         || decimal.TryParse(stringValue, out var decVal) && decVal == 0) | ||||
|                         || double.TryParse(stringValue, out var doubleVal) && doubleVal == 0) | ||||
|                     { | ||||
|                         return default; | ||||
|                     } | ||||
| @ -89,24 +88,20 @@ namespace CryptoExchange.Net.Converters.SystemTextJson | ||||
|         } | ||||
| 
 | ||||
|         /// <summary> | ||||
|         /// Parse a double value to datetime | ||||
|         /// Parse a long value to datetime | ||||
|         /// </summary> | ||||
|         public static DateTime ParseFromDouble(double value) | ||||
|             => 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> | ||||
| @ -125,7 +120,7 @@ namespace CryptoExchange.Net.Converters.SystemTextJson | ||||
|                     || !int.TryParse(stringValue.Substring(8, 2), out var hour) | ||||
|                     || !int.TryParse(stringValue.Substring(10, 2), out var minute)) | ||||
|                 { | ||||
|                     LibraryHelpers.StaticLogger?.LogWarning("Unknown DateTime format: " + stringValue); | ||||
|                     Trace.WriteLine($"{DateTime.Now:yyyy/MM/dd HH:mm:ss:fff} | Warning | Unknown DateTime format: " + stringValue); | ||||
|                     return default; | ||||
|                 } | ||||
|                 return new DateTime(year, month, day, hour, minute, 0, DateTimeKind.Utc); | ||||
| @ -138,7 +133,7 @@ namespace CryptoExchange.Net.Converters.SystemTextJson | ||||
|                     || !int.TryParse(stringValue.Substring(4, 2), out var month) | ||||
|                     || !int.TryParse(stringValue.Substring(6, 2), out var day)) | ||||
|                 { | ||||
|                     LibraryHelpers.StaticLogger?.LogWarning("Unknown DateTime format: " + stringValue); | ||||
|                     Trace.WriteLine($"{DateTime.Now:yyyy/MM/dd HH:mm:ss:fff} | Warning | Unknown DateTime format: " + stringValue); | ||||
|                     return default; | ||||
|                 } | ||||
|                 return new DateTime(year, month, day, 0, 0, 0, DateTimeKind.Utc); | ||||
| @ -151,25 +146,25 @@ namespace CryptoExchange.Net.Converters.SystemTextJson | ||||
|                     || !int.TryParse(stringValue.Substring(2, 2), out var month) | ||||
|                     || !int.TryParse(stringValue.Substring(4, 2), out var day)) | ||||
|                 { | ||||
|                     LibraryHelpers.StaticLogger?.LogWarning("Unknown DateTime format: " + stringValue); | ||||
|                     Trace.WriteLine("{DateTime.Now:yyyy/MM/dd HH:mm:ss:fff} | Warning | Unknown DateTime format: " + stringValue); | ||||
|                     return default; | ||||
|                 } | ||||
|                 return new DateTime(year + 2000, month, day, 0, 0, 0, DateTimeKind.Utc); | ||||
|             } | ||||
| 
 | ||||
|             if (decimal.TryParse(stringValue, NumberStyles.Float, CultureInfo.InvariantCulture, out var decimalValue)) | ||||
|             if (double.TryParse(stringValue, NumberStyles.Float, CultureInfo.InvariantCulture, out var doubleValue)) | ||||
|             { | ||||
|                 // Parse 1637745563.000 format | ||||
|                 if (decimalValue <= 0) | ||||
|                 if (doubleValue <= 0) | ||||
|                     return default; | ||||
|                 if (decimalValue < 19999999999) | ||||
|                     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) | ||||
| @ -180,7 +175,7 @@ namespace CryptoExchange.Net.Converters.SystemTextJson | ||||
|                     || !int.TryParse(values[1], out var month) | ||||
|                     || !int.TryParse(values[2], out var day)) | ||||
|                 { | ||||
|                     LibraryHelpers.StaticLogger?.LogWarning("Unknown DateTime format: " + stringValue); | ||||
|                     Trace.WriteLine("{DateTime.Now:yyyy/MM/dd HH:mm:ss:fff} | Warning | Unknown DateTime format: " + stringValue); | ||||
|                     return default; | ||||
|                 } | ||||
| 
 | ||||
| @ -193,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); | ||||
|     } | ||||
|  | ||||
| @ -1,6 +1,4 @@ | ||||
| using CryptoExchange.Net.Attributes; | ||||
| using Microsoft.Extensions.Logging; | ||||
| using Microsoft.Extensions.Logging.Abstractions; | ||||
| using System; | ||||
| using System.Collections.Concurrent; | ||||
| using System.Collections.Generic; | ||||
| @ -81,7 +79,7 @@ namespace CryptoExchange.Net.Converters.SystemTextJson | ||||
|             } | ||||
|             public override T? Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options) | ||||
|             { | ||||
|                 return _enumConverter.ReadNullable(ref reader, typeToConvert, options, out var isEmptyString); | ||||
|                 return _enumConverter.ReadNullable(ref reader, typeToConvert, options, out var isEmptyString, out var warn); | ||||
|             } | ||||
| 
 | ||||
|             public override void Write(Utf8JsonWriter writer, T? value, JsonSerializerOptions options) | ||||
| @ -100,13 +98,20 @@ namespace CryptoExchange.Net.Converters.SystemTextJson | ||||
|         /// <inheritdoc /> | ||||
|         public override T Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options) | ||||
|         { | ||||
|             var t = ReadNullable(ref reader, typeToConvert, options, out var isEmptyString); | ||||
|             var t = ReadNullable(ref reader, typeToConvert, options, out var isEmptyString, out var warn); | ||||
|             if (t == null) | ||||
|             { | ||||
|                 if (isEmptyString && !_unknownValuesWarned.Contains(null)) | ||||
|                 if (warn) | ||||
|                 { | ||||
|                     // We received an empty string and have no mapping for it, and the property isn't nullable | ||||
|                     LibraryHelpers.StaticLogger?.LogWarning($"Received null or empty enum value, but property type is not a nullable enum. EnumType: {typeof(T).Name}. If you think {typeof(T).Name} 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 | ||||
| @ -117,9 +122,10 @@ namespace CryptoExchange.Net.Converters.SystemTextJson | ||||
|             } | ||||
|         } | ||||
| 
 | ||||
|         private T? ReadNullable(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options, out bool isEmptyString) | ||||
|         private T? ReadNullable(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options, out bool isEmptyString, out bool warn) | ||||
|         { | ||||
|             isEmptyString = false; | ||||
|             warn = false; | ||||
|             var enumType = typeof(T); | ||||
|             if (_mapping == null) | ||||
|                 _mapping = AddMapping(); | ||||
| @ -148,8 +154,9 @@ namespace CryptoExchange.Net.Converters.SystemTextJson | ||||
|                     // We received an enum value but weren't able to parse it. | ||||
|                     if (!_unknownValuesWarned.Contains(stringValue)) | ||||
|                     { | ||||
|                         warn = true; | ||||
|                         _unknownValuesWarned.Add(stringValue!); | ||||
|                         LibraryHelpers.StaticLogger?.LogWarning($"Cannot map enum value. EnumType: {enumType.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"); | ||||
|                         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"); | ||||
|                     } | ||||
|                 } | ||||
| 
 | ||||
|  | ||||
| @ -6,9 +6,9 @@ | ||||
|     <PackageId>CryptoExchange.Net</PackageId> | ||||
|     <Authors>JKorf</Authors> | ||||
|     <Description>CryptoExchange.Net is a base library which is used to implement different cryptocurrency (exchange) API's. It provides a standardized way of implementing different API's, which results in a very similar experience for users of the API implementations.</Description> | ||||
|     <PackageVersion>9.11.0</PackageVersion> | ||||
|     <AssemblyVersion>9.11.0</AssemblyVersion> | ||||
|     <FileVersion>9.11.0</FileVersion> | ||||
|     <PackageVersion>9.9.0</PackageVersion> | ||||
|     <AssemblyVersion>9.9.0</AssemblyVersion> | ||||
|     <FileVersion>9.9.0</FileVersion> | ||||
|     <PackageRequireLicenseAcceptance>false</PackageRequireLicenseAcceptance> | ||||
|     <PackageTags>OKX;OKX.Net;Mexc;Mexc.Net;Kucoin;Kucoin.Net;Kraken;Kraken.Net;Huobi;Huobi.Net;CoinEx;CoinEx.Net;Bybit;Bybit.Net;Bitget;Bitget.Net;Bitfinex;Bitfinex.Net;Binance;Binance.Net;CryptoCurrency;CryptoCurrency Exchange;CryptoExchange.Net</PackageTags> | ||||
|     <RepositoryType>git</RepositoryType> | ||||
| @ -51,11 +51,11 @@ | ||||
|     </PackageReference> | ||||
|   </ItemGroup> | ||||
|   <ItemGroup> | ||||
|     <PackageReference Include="Microsoft.Extensions.Logging" Version="9.0.10" /> | ||||
|     <PackageReference Include="System.Text.Json" Version="9.0.10" /> | ||||
|     <PackageReference Include="Microsoft.Extensions.Logging" Version="9.0.6" /> | ||||
|     <PackageReference Include="System.Text.Json" Version="9.0.6" /> | ||||
|   </ItemGroup> | ||||
|   <ItemGroup Label="Transitive Client Packages"> | ||||
|     <PackageReference Include="Microsoft.Extensions.Configuration.Binder" Version="9.0.10" /> | ||||
|     <PackageReference Include="Microsoft.Extensions.Http" Version="9.0.10" /> | ||||
|     <PackageReference Include="Microsoft.Extensions.Configuration.Binder" Version="9.0.6" /> | ||||
|     <PackageReference Include="Microsoft.Extensions.Http" Version="9.0.6" /> | ||||
|   </ItemGroup> | ||||
| </Project> | ||||
| @ -399,7 +399,7 @@ namespace CryptoExchange.Net | ||||
|         /// <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 | ||||
| @ -416,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> | ||||
| @ -475,8 +445,6 @@ namespace CryptoExchange.Net | ||||
|                 services.AddTransient(x => (IFeeRestClient)client(x)!); | ||||
|             if (typeof(IBookTickerRestClient).IsAssignableFrom(typeof(T))) | ||||
|                 services.AddTransient(x => (IBookTickerRestClient)client(x)!); | ||||
|             if (typeof(ITransferRestClient).IsAssignableFrom(typeof(T))) | ||||
|                 services.AddTransient(x => (ITransferRestClient)client(x)!); | ||||
| 
 | ||||
|             if (typeof(ISpotOrderRestClient).IsAssignableFrom(typeof(T))) | ||||
|                 services.AddTransient(x => (ISpotOrderRestClient)client(x)!); | ||||
|  | ||||
| @ -1,5 +1,4 @@ | ||||
| using CryptoExchange.Net.Objects; | ||||
| using Microsoft.Extensions.Logging; | ||||
| using System; | ||||
| using System.Collections.Generic; | ||||
| using System.Net; | ||||
| @ -13,50 +12,11 @@ namespace CryptoExchange.Net | ||||
|     /// </summary> | ||||
|     public static class LibraryHelpers | ||||
|     { | ||||
|         private static ILogger? _staticLogger; | ||||
|         /// <summary> | ||||
|         /// Static logger | ||||
|         /// </summary> | ||||
|         public static ILogger? StaticLogger | ||||
|         { | ||||
|             get => _staticLogger; | ||||
|             internal set   | ||||
|             { | ||||
|                 if (_staticLogger != null) | ||||
|                     return; | ||||
| 
 | ||||
|                 _staticLogger = value; | ||||
|             } | ||||
|         } | ||||
| 
 | ||||
|         /// <summary> | ||||
|         /// Client order id separator | ||||
|         /// </summary> | ||||
|         public const string ClientOrderIdSeparator = "JK"; | ||||
| 
 | ||||
|         private static Dictionary<string, string> _defaultClientReferences = new Dictionary<string, string>() | ||||
|         { | ||||
|             { "Binance.Spot", "x-VICEW9VV" }, | ||||
|             { "Binance.Futures", "x-d63tKbx3" }, | ||||
|             { "BingX", "easytrading" }, | ||||
|             { "Bitfinex", "kCCe-CNBO" }, | ||||
|             { "Bitget", "6x21p" }, | ||||
|             { "BitMart", "EASYTRADING0001" }, | ||||
|             { "BitMEX", "Sent from JKorf" }, | ||||
|             { "BloFin", "5c07cf695885c282" }, | ||||
|             { "Bybit", "Zx000356" }, | ||||
|             { "CoinEx", "x-147866029-" }, | ||||
|             { "GateIo", "copytraderpw" }, | ||||
|             { "HTX", "AA1ef14811" }, | ||||
|             { "Kucoin.FuturesName", "Easytradingfutures" }, | ||||
|             { "Kucoin.FuturesKey", "9e08c05f-454d-4580-82af-2f4c7027fd00" }, | ||||
|             { "Kucoin.SpotName", "Easytrading" }, | ||||
|             { "Kucoin.SpotKey", "f8ae62cb-2b3d-420c-8c98-e1c17dd4e30a" }, | ||||
|             { "Mexc", "EASYT" }, | ||||
|             { "OKX", "1425d83a94fbBCDE" }, | ||||
|             { "XT", "4XWeqN10M1fcoI5L" }, | ||||
|         }; | ||||
| 
 | ||||
|         /// <summary> | ||||
|         /// Apply broker id to a client order id | ||||
|         /// </summary> | ||||
| @ -87,22 +47,6 @@ namespace CryptoExchange.Net | ||||
|             return clientOrderId; | ||||
|         } | ||||
| 
 | ||||
|         /// <summary> | ||||
|         /// Get the client reference for an exchange if available | ||||
|         /// </summary> | ||||
|         public static string GetClientReference(Func<string?> optionsReference, string exchange, string? topic = null) | ||||
|         { | ||||
|             var optionsValue = optionsReference(); | ||||
|             if (!string.IsNullOrEmpty(optionsValue)) | ||||
|                 return optionsValue!; | ||||
| 
 | ||||
|             var key = exchange; | ||||
|             if (topic != null) | ||||
|                 key += "." + topic; | ||||
| 
 | ||||
|             return _defaultClientReferences.TryGetValue(key, out var id) ? id : throw new KeyNotFoundException($"{exchange} not found in configuration"); | ||||
|         } | ||||
| 
 | ||||
|         /// <summary> | ||||
|         /// Create a new HttpMessageHandler instance | ||||
|         /// </summary>   | ||||
|  | ||||
| @ -1,63 +0,0 @@ | ||||
| using System; | ||||
| using System.Collections.Generic; | ||||
| using System.Text; | ||||
| 
 | ||||
| namespace CryptoExchange.Net.SharedApis | ||||
| { | ||||
|     /// <summary> | ||||
|     /// Account type | ||||
|     /// </summary> | ||||
|     public enum SharedAccountType | ||||
|     { | ||||
|         /// <summary> | ||||
|         /// Unified account, combined account for multiple different types of trading | ||||
|         /// </summary> | ||||
|         Unified, | ||||
|          | ||||
|         /// <summary> | ||||
|         /// Funding account, where withdrawals and deposits are made from and to | ||||
|         /// </summary> | ||||
|         Funding, | ||||
| 
 | ||||
|         /// <summary> | ||||
|         /// Spot trading account | ||||
|         /// </summary> | ||||
|         Spot, | ||||
| 
 | ||||
|         /// <summary> | ||||
|         /// Cross margin account | ||||
|         /// </summary> | ||||
|         CrossMargin, | ||||
|         /// <summary> | ||||
|         /// Isolated margin account | ||||
|         /// </summary> | ||||
|         IsolatedMargin, | ||||
| 
 | ||||
|         /// <summary> | ||||
|         /// Perpetual linear futures account | ||||
|         /// </summary> | ||||
|         PerpetualLinearFutures, | ||||
|         /// <summary> | ||||
|         /// Delivery linear futures account | ||||
|         /// </summary> | ||||
|         DeliveryLinearFutures, | ||||
|         /// <summary> | ||||
|         /// Perpetual inverse futures account | ||||
|         /// </summary> | ||||
|         PerpetualInverseFutures, | ||||
|         /// <summary> | ||||
|         /// Delivery inverse futures account | ||||
|         /// </summary> | ||||
|         DeliveryInverseFutures, | ||||
| 
 | ||||
|         /// <summary> | ||||
|         /// Option account | ||||
|         /// </summary> | ||||
|         Option, | ||||
| 
 | ||||
|         /// <summary> | ||||
|         /// Other | ||||
|         /// </summary> | ||||
|         Other | ||||
|     } | ||||
| } | ||||
| @ -12,7 +12,7 @@ namespace CryptoExchange.Net.SharedApis | ||||
|         /// <summary> | ||||
|         /// Balances request options | ||||
|         /// </summary> | ||||
|         GetBalancesOptions GetBalancesOptions { get; } | ||||
|         EndpointOptions<GetBalancesRequest> GetBalancesOptions { get; } | ||||
| 
 | ||||
|         /// <summary> | ||||
|         /// Get balances for the user | ||||
|  | ||||
| @ -1,25 +0,0 @@ | ||||
| using CryptoExchange.Net.Objects; | ||||
| using System.Collections.Generic; | ||||
| using System.Threading; | ||||
| using System.Threading.Tasks; | ||||
| 
 | ||||
| namespace CryptoExchange.Net.SharedApis | ||||
| { | ||||
|     /// <summary> | ||||
|     /// Client for transferring funds between account types | ||||
|     /// </summary> | ||||
|     public interface ITransferRestClient : ISharedClient | ||||
|     { | ||||
|         /// <summary> | ||||
|         /// Transfer request options | ||||
|         /// </summary> | ||||
|         TransferOptions TransferOptions { get; } | ||||
| 
 | ||||
|         /// <summary> | ||||
|         /// Transfer funds between account types | ||||
|         /// </summary> | ||||
|         /// <param name="request">Request info</param> | ||||
|         /// <param name="ct">Cancellation token</param> | ||||
|         Task<ExchangeWebResult<SharedId>> TransferAsync(TransferRequest request, CancellationToken ct = default); | ||||
|     } | ||||
| } | ||||
| @ -1,96 +0,0 @@ | ||||
| using CryptoExchange.Net.Objects; | ||||
| using System.Linq; | ||||
| 
 | ||||
| namespace CryptoExchange.Net.SharedApis | ||||
| { | ||||
|     /// <summary> | ||||
|     /// Options for requesting a transfer | ||||
|     /// </summary> | ||||
|     public class GetBalancesOptions : EndpointOptions<GetBalancesRequest> | ||||
|     { | ||||
|         /// <summary> | ||||
|         /// Supported account types | ||||
|         /// </summary> | ||||
|         public AccountTypeFilter[] SupportedAccountTypes { get; set; } | ||||
| 
 | ||||
|         /// <summary> | ||||
|         /// ctor | ||||
|         /// </summary> | ||||
|         public GetBalancesOptions(params AccountTypeFilter[] accountTypes) : base(true) | ||||
|         { | ||||
|             SupportedAccountTypes = accountTypes; | ||||
|         } | ||||
| 
 | ||||
|         /// <summary> | ||||
|         /// Validate a request | ||||
|         /// </summary> | ||||
|         public Error? ValidateRequest( | ||||
|             string exchange, | ||||
|             GetBalancesRequest request, | ||||
|             TradingMode[] supportedApiTypes) | ||||
|         { | ||||
|             if (request.AccountType != null && !IsValid(request.AccountType.Value)) | ||||
|                 return ArgumentError.Invalid(nameof(request.AccountType), "Invalid AccountType"); | ||||
| 
 | ||||
|             return base.ValidateRequest(exchange, request, null, supportedApiTypes); | ||||
|         } | ||||
| 
 | ||||
|         /// <summary> | ||||
|         /// Is the account type valid for this client | ||||
|         /// </summary> | ||||
|         /// <param name="accountType"></param> | ||||
|         /// <returns></returns> | ||||
|         public bool IsValid(SharedAccountType accountType) | ||||
|         { | ||||
|             if (accountType == SharedAccountType.Funding) | ||||
|                 return SupportedAccountTypes.Contains(AccountTypeFilter.Funding); | ||||
| 
 | ||||
|             if (accountType == SharedAccountType.Spot)  | ||||
|                 return SupportedAccountTypes.Contains(AccountTypeFilter.Spot); | ||||
| 
 | ||||
|             if (accountType == SharedAccountType.PerpetualLinearFutures | ||||
|                 || accountType == SharedAccountType.PerpetualInverseFutures | ||||
|                 || accountType == SharedAccountType.DeliveryLinearFutures | ||||
|                 || accountType == SharedAccountType.DeliveryInverseFutures) | ||||
|             { | ||||
|                 return SupportedAccountTypes.Contains(AccountTypeFilter.Futures); | ||||
|             } | ||||
| 
 | ||||
| 
 | ||||
|             if (accountType == SharedAccountType.CrossMargin | ||||
|                 || accountType == SharedAccountType.IsolatedMargin) | ||||
|             { | ||||
|                 return SupportedAccountTypes.Contains(AccountTypeFilter.Margin); | ||||
|             } | ||||
| 
 | ||||
|             return SupportedAccountTypes.Contains(AccountTypeFilter.Option); | ||||
|         } | ||||
|     } | ||||
| 
 | ||||
|     /// <summary> | ||||
|     /// Account type filter | ||||
|     /// </summary> | ||||
|     public enum AccountTypeFilter | ||||
|     { | ||||
|         /// <summary> | ||||
|         /// Funding account | ||||
|         /// </summary> | ||||
|         Funding, | ||||
|         /// <summary> | ||||
|         /// Spot account | ||||
|         /// </summary> | ||||
|         Spot, | ||||
|         /// <summary> | ||||
|         /// Futures account | ||||
|         /// </summary> | ||||
|         Futures, | ||||
|         /// <summary> | ||||
|         /// Margin account | ||||
|         /// </summary> | ||||
|         Margin, | ||||
|         /// <summary> | ||||
|         /// Option account | ||||
|         /// </summary> | ||||
|         Option | ||||
|     } | ||||
| } | ||||
| @ -1,42 +0,0 @@ | ||||
| using CryptoExchange.Net.Objects; | ||||
| using System.Linq; | ||||
| 
 | ||||
| namespace CryptoExchange.Net.SharedApis | ||||
| { | ||||
|     /// <summary> | ||||
|     /// Options for requesting a transfer | ||||
|     /// </summary> | ||||
|     public class TransferOptions : EndpointOptions<TransferRequest> | ||||
|     { | ||||
|         /// <summary> | ||||
|         /// Supported account types | ||||
|         /// </summary> | ||||
|         public SharedAccountType[] SupportedAccountTypes { get; set; } | ||||
| 
 | ||||
|         /// <summary> | ||||
|         /// ctor | ||||
|         /// </summary> | ||||
|         public TransferOptions(SharedAccountType[] accountTypes) : base(true) | ||||
|         { | ||||
|             SupportedAccountTypes = accountTypes; | ||||
|         } | ||||
| 
 | ||||
|         /// <summary> | ||||
|         /// Validate a request | ||||
|         /// </summary> | ||||
|         public new Error? ValidateRequest( | ||||
|             string exchange, | ||||
|             TransferRequest request, | ||||
|             TradingMode? tradingMode, | ||||
|             TradingMode[] supportedApiTypes) | ||||
|         { | ||||
|             if (!SupportedAccountTypes.Contains(request.FromAccountType)) | ||||
|                 return ArgumentError.Invalid(nameof(request.FromAccountType), "Invalid FromAccountType"); | ||||
| 
 | ||||
|             if (!SupportedAccountTypes.Contains(request.ToAccountType)) | ||||
|                 return ArgumentError.Invalid(nameof(request.FromAccountType), "Invalid ToAccountType"); | ||||
| 
 | ||||
|             return base.ValidateRequest(exchange, request, tradingMode, supportedApiTypes); | ||||
|         } | ||||
|     } | ||||
| } | ||||
| @ -8,28 +8,18 @@ namespace CryptoExchange.Net.SharedApis | ||||
|     public record GetBalancesRequest : SharedRequest | ||||
|     { | ||||
|         /// <summary> | ||||
|         /// Account type | ||||
|         /// Trading mode | ||||
|         /// </summary> | ||||
|         public SharedAccountType? AccountType { get; set; } | ||||
|         public TradingMode? TradingMode { get; set; } | ||||
| 
 | ||||
|         /// <summary> | ||||
|         /// ctor | ||||
|         /// </summary> | ||||
|         /// <param name="tradingMode">Trading mode</param> | ||||
|         /// <param name="exchangeParameters">Exchange specific parameters</param> | ||||
|         public GetBalancesRequest(TradingMode tradingMode, ExchangeParameters? exchangeParameters = null) : base(exchangeParameters) | ||||
|         public GetBalancesRequest(TradingMode? tradingMode = null, ExchangeParameters? exchangeParameters = null) : base(exchangeParameters) | ||||
|         { | ||||
|             AccountType = tradingMode.ToAccountType(); | ||||
|         } | ||||
| 
 | ||||
|         /// <summary> | ||||
|         /// ctor | ||||
|         /// </summary> | ||||
|         /// <param name="accountType">Account type</param> | ||||
|         /// <param name="exchangeParameters">Exchange specific parameters</param> | ||||
|         public GetBalancesRequest(SharedAccountType? accountType = null, ExchangeParameters? exchangeParameters = null) : base(exchangeParameters) | ||||
|         { | ||||
|             AccountType = accountType; | ||||
|             TradingMode = tradingMode; | ||||
|         } | ||||
|     } | ||||
| } | ||||
|  | ||||
| @ -1,61 +0,0 @@ | ||||
| namespace CryptoExchange.Net.SharedApis | ||||
| { | ||||
|     /// <summary> | ||||
|     /// Request to transfer funds between account types | ||||
|     /// </summary> | ||||
|     public record TransferRequest : SharedRequest | ||||
|     { | ||||
|         /// <summary> | ||||
|         /// Asset | ||||
|         /// </summary> | ||||
|         public string Asset { get; set; } | ||||
|         /// <summary> | ||||
|         /// Quantity | ||||
|         /// </summary> | ||||
|         public decimal Quantity { get; set; } | ||||
|         /// <summary> | ||||
|         /// From symbol | ||||
|         /// </summary> | ||||
|         public string? FromSymbol { get; set; } | ||||
|         /// <summary> | ||||
|         /// To symbol | ||||
|         /// </summary> | ||||
|         public string? ToSymbol { get; set; } | ||||
| 
 | ||||
|         /// <summary> | ||||
|         /// From account type | ||||
|         /// </summary> | ||||
|         public SharedAccountType FromAccountType { get; set; } | ||||
|         /// <summary> | ||||
|         /// To account type | ||||
|         /// </summary> | ||||
|         public SharedAccountType ToAccountType { get; set; } | ||||
| 
 | ||||
|         /// <summary> | ||||
|         /// ctor | ||||
|         /// </summary> | ||||
|         /// <param name="asset">The asset to transfer</param> | ||||
|         /// <param name="quantity">Quantity to transfer</param> | ||||
|         /// <param name="fromAccount">From account type</param> | ||||
|         /// <param name="toAccount">To account type</param> | ||||
|         /// <param name="fromSymbol">From symbol</param> | ||||
|         /// <param name="toSymbol">To symbol</param> | ||||
|         /// <param name="exchangeParameters">Exchange specific parameters</param> | ||||
|         public TransferRequest( | ||||
|             string asset, | ||||
|             decimal quantity, | ||||
|             SharedAccountType fromAccount, | ||||
|             SharedAccountType toAccount, | ||||
|             string? fromSymbol = null, | ||||
|             string? toSymbol = null, | ||||
|             ExchangeParameters? exchangeParameters = null) : base(exchangeParameters) | ||||
|         { | ||||
|             Asset = asset; | ||||
|             Quantity = quantity; | ||||
|             FromAccountType = fromAccount; | ||||
|             ToAccountType = toAccount; | ||||
|             FromSymbol = fromSymbol; | ||||
|             ToSymbol = toSymbol; | ||||
|         } | ||||
|     } | ||||
| } | ||||
| @ -17,7 +17,6 @@ | ||||
|         /// Total quantity | ||||
|         /// </summary> | ||||
|         public decimal Total { get; set; } | ||||
| 
 | ||||
|         /// <summary> | ||||
|         /// Isolated margin symbol, only applicable for isolated margin futures | ||||
|         /// </summary> | ||||
|  | ||||
| @ -28,10 +28,6 @@ namespace CryptoExchange.Net.SharedApis | ||||
|         /// </summary> | ||||
|         public string OrderId { get; set; } | ||||
|         /// <summary> | ||||
|         /// The client order id | ||||
|         /// </summary> | ||||
|         public string? ClientOrderId { get; set; } | ||||
|         /// <summary> | ||||
|         /// Side of the trade | ||||
|         /// </summary> | ||||
|         public SharedOrderSide? Side { get; set; } | ||||
|  | ||||
| @ -415,7 +415,7 @@ namespace CryptoExchange.Net.Testing.Comparers | ||||
|                 var value = jsonValue.GetDecimal(); | ||||
|                 if (objectValue is DateTime time) | ||||
|                 { | ||||
|                     if (time != DateTimeConverter.ParseFromDecimal(value)) | ||||
|                     if (time != DateTimeConverter.ParseFromDouble((double)value)) | ||||
|                         throw new Exception($"{method}: {property} not equal: {DateTimeConverter.ParseFromDouble((double)value!)} vs {time}"); | ||||
|                 } | ||||
|                 else if (propertyType.IsEnum || Nullable.GetUnderlyingType(propertyType)?.IsEnum == true) | ||||
|  | ||||
| @ -325,12 +325,9 @@ namespace CryptoExchange.Net.Trackers.Trades | ||||
|                 if (Period != null) | ||||
|                     items = items.Where(e => e.Timestamp >= DateTime.UtcNow.Add(-Period.Value)); | ||||
| 
 | ||||
|                 if (items.Any()) | ||||
|                 { | ||||
|                     _snapshotId = data.Max(d => d.Timestamp.Ticks); | ||||
|                     foreach (var item in items.OrderBy(d => d.Timestamp)) | ||||
|                         _data.Add(item); | ||||
|                 } | ||||
|                 _snapshotId = data.Max(d => d.Timestamp.Ticks); | ||||
|                 foreach (var item in items.OrderBy(d => d.Timestamp)) | ||||
|                     _data.Add(item); | ||||
| 
 | ||||
|                 _snapshotSet = true; | ||||
|                 _changed = true; | ||||
|  | ||||
| @ -5,32 +5,31 @@ | ||||
|   </PropertyGroup> | ||||
| 
 | ||||
|   <ItemGroup> | ||||
|     <PackageReference Include="Binance.Net" Version="11.9.0" /> | ||||
|     <PackageReference Include="Bitfinex.Net" Version="9.9.0" /> | ||||
|     <PackageReference Include="BitMart.Net" Version="2.10.0" /> | ||||
|     <PackageReference Include="BloFin.Net" Version="1.2.0" /> | ||||
|     <PackageReference Include="Bybit.Net" Version="5.10.1" /> | ||||
|     <PackageReference Include="CoinEx.Net" Version="9.9.0" /> | ||||
|     <PackageReference Include="CoinW.Net" Version="1.6.0" /> | ||||
|     <PackageReference Include="CryptoCom.Net" Version="2.10.0" /> | ||||
|     <PackageReference Include="DeepCoin.Net" Version="2.9.0" /> | ||||
|     <PackageReference Include="GateIo.Net" Version="2.11.0" /> | ||||
|     <PackageReference Include="HyperLiquid.Net" Version="2.14.0" /> | ||||
|     <PackageReference Include="JK.BingX.Net" Version="2.9.0" /> | ||||
|     <PackageReference Include="JK.Bitget.Net" Version="2.9.0" /> | ||||
|     <PackageReference Include="JK.Mexc.Net" Version="3.10.0" /> | ||||
|     <PackageReference Include="JK.OKX.Net" Version="3.9.0" /> | ||||
|     <PackageReference Include="Jkorf.Aster.Net" Version="1.1.0" /> | ||||
|     <PackageReference Include="JKorf.BitMEX.Net" Version="2.9.0" /> | ||||
|     <PackageReference Include="JKorf.Coinbase.Net" Version="2.9.0" /> | ||||
|     <PackageReference Include="JKorf.HTX.Net" Version="7.9.0" /> | ||||
|     <PackageReference Include="JKorf.Upbit.Net" Version="1.0.0" /> | ||||
|     <PackageReference Include="KrakenExchange.Net" Version="6.9.0" /> | ||||
|     <PackageReference Include="Kucoin.Net" Version="7.9.0" /> | ||||
|     <PackageReference Include="Binance.Net" Version="11.8.0" /> | ||||
|     <PackageReference Include="Bitfinex.Net" Version="9.8.0" /> | ||||
|     <PackageReference Include="BitMart.Net" Version="2.9.0" /> | ||||
|     <PackageReference Include="BloFin.Net" Version="1.1.0" /> | ||||
|     <PackageReference Include="Bybit.Net" Version="5.9.0" /> | ||||
|     <PackageReference Include="CoinEx.Net" Version="9.8.0" /> | ||||
|     <PackageReference Include="CoinW.Net" Version="1.5.0" /> | ||||
|     <PackageReference Include="CryptoCom.Net" Version="2.9.0" /> | ||||
|     <PackageReference Include="DeepCoin.Net" Version="2.8.0" /> | ||||
|     <PackageReference Include="GateIo.Net" Version="2.9.1" /> | ||||
|     <PackageReference Include="HyperLiquid.Net" Version="2.13.0" /> | ||||
|     <PackageReference Include="JK.BingX.Net" Version="2.8.0" /> | ||||
|     <PackageReference Include="JK.Bitget.Net" Version="2.8.0" /> | ||||
|     <PackageReference Include="JK.Mexc.Net" Version="3.9.0" /> | ||||
|     <PackageReference Include="JK.OKX.Net" Version="3.8.0" /> | ||||
|     <PackageReference Include="Jkorf.Aster.Net" Version="1.0.0" /> | ||||
|     <PackageReference Include="JKorf.BitMEX.Net" Version="2.8.0" /> | ||||
|     <PackageReference Include="JKorf.Coinbase.Net" Version="2.8.0" /> | ||||
|     <PackageReference Include="JKorf.HTX.Net" Version="7.8.0" /> | ||||
|     <PackageReference Include="KrakenExchange.Net" Version="6.8.0" /> | ||||
|     <PackageReference Include="Kucoin.Net" Version="7.8.0" /> | ||||
|     <PackageReference Include="Serilog.AspNetCore" Version="9.0.0" /> | ||||
|     <PackageReference Include="Toobit.Net" Version="1.8.0" /> | ||||
|     <PackageReference Include="WhiteBit.Net" Version="2.10.0" /> | ||||
|     <PackageReference Include="XT.Net" Version="2.9.0" /> | ||||
|     <PackageReference Include="Toobit.Net" Version="1.7.0" /> | ||||
|     <PackageReference Include="WhiteBit.Net" Version="2.9.0" /> | ||||
|     <PackageReference Include="XT.Net" Version="2.8.0" /> | ||||
|   </ItemGroup> | ||||
| 
 | ||||
| </Project> | ||||
|  | ||||
| @ -21,7 +21,6 @@ | ||||
| @inject IMexcRestClient mexcClient | ||||
| @inject IOKXRestClient okxClient | ||||
| @inject IToobitRestClient toobitClient | ||||
| @inject IUpbitRestClient upbitClient | ||||
| @inject IWhiteBitRestClient whitebitClient | ||||
| @inject IXTRestClient xtClient | ||||
| 
 | ||||
| @ -58,7 +57,6 @@ | ||||
|         var mexcTask = mexcClient.SpotApi.ExchangeData.GetTickerAsync("BTCUSDT"); | ||||
|         var okxTask = okxClient.UnifiedApi.ExchangeData.GetTickerAsync("BTC-USDT"); | ||||
|         var toobitTask = toobitClient.SpotApi.ExchangeData.GetTickersAsync("BTCUSDT"); | ||||
|         var upbitTask = upbitClient.SpotApi.ExchangeData.GetTickerAsync("USDT-BTC"); | ||||
|         var whitebitTask = whitebitClient.V4Api.ExchangeData.GetTickersAsync(); | ||||
|         var xtTask = xtClient.SpotApi.ExchangeData.GetTickersAsync("btc_usdt"); | ||||
| 
 | ||||
| @ -138,9 +136,6 @@ | ||||
|         if (toobitTask.Result.Success) | ||||
|             _prices.Add("Toobit", toobitTask.Result.Data.Single().LastPrice ?? 0); | ||||
| 
 | ||||
|         if (upbitTask.Result.Success) | ||||
|             _prices.Add("Upbit", upbitTask.Result.Data.LastPrice); | ||||
| 
 | ||||
|         if (whitebitTask.Result.Success){ | ||||
|             // WhiteBit API doesn't offer an endpoint to filter for a specific ticker, so we have to filter client side | ||||
|             var tickers = whitebitTask.Result.Data; | ||||
|  | ||||
| @ -21,7 +21,6 @@ | ||||
| @inject IMexcSocketClient mexcSocketClient | ||||
| @inject IOKXSocketClient okxSocketClient | ||||
| @inject IToobitSocketClient toobitSocketClient | ||||
| @inject IUpbitSocketClient upbitSocketClient | ||||
| @inject IWhiteBitSocketClient whitebitSocketClient | ||||
| @inject IXTSocketClient xtSocketClient | ||||
| @using System.Collections.Concurrent | ||||
| @ -73,7 +72,6 @@ | ||||
|             okxSocketClient.UnifiedApi.ExchangeData.SubscribeToTickerUpdatesAsync("ETH-BTC", data => UpdateData("OKX", data.Data.LastPrice ?? 0)), | ||||
|             // Toobit doesn't support the ETH/BTC pair | ||||
|             //toobitSocketClient.SpotApi.SubscribeToTickerUpdatesAsync("ETHBTC", data => UpdateData("Toobit", data.Data.LastPrice ?? 0)), | ||||
|             upbitSocketClient.SpotApi.SubscribeToTickerUpdatesAsync("BTC-ETH", data => UpdateData("Upbit", data.Data.LastPrice)), | ||||
|             whitebitSocketClient.V4Api.SubscribeToTickerUpdatesAsync("ETH_BTC", data => UpdateData("WhiteBit", data.Data.Ticker.LastPrice)), | ||||
|         }; | ||||
| 
 | ||||
|  | ||||
| @ -25,7 +25,6 @@ | ||||
| @using Kucoin.Net.Interfaces | ||||
| @using Mexc.Net.Interfaces | ||||
| @using OKX.Net.Interfaces; | ||||
| @using Upbit.Net.Interfaces; | ||||
| @using Toobit.Net.Interfaces; | ||||
| @using WhiteBit.Net.Interfaces | ||||
| @using XT.Net.Interfaces | ||||
| @ -51,7 +50,6 @@ | ||||
| @inject IMexcOrderBookFactory mexcFactory | ||||
| @inject IOKXOrderBookFactory okxFactory | ||||
| @inject IToobitOrderBookFactory toobitFactory | ||||
| @inject IUpbitOrderBookFactory upbitFactory | ||||
| @inject IWhiteBitOrderBookFactory whitebitFactory | ||||
| @inject IXTOrderBookFactory xtFactory | ||||
| @implements IDisposable | ||||
| @ -109,7 +107,6 @@ | ||||
|                 { "Mexc", mexcFactory.CreateSpot("ETHBTC") }, | ||||
|                 { "OKX", okxFactory.Create("ETH-BTC") }, | ||||
|                 { "Toobit", toobitFactory.CreateSpot("ETHUSDT") }, | ||||
|                 { "Upbit", upbitFactory.CreateSpot("BTC-ETH") }, | ||||
|                 { "WhiteBit", whitebitFactory.CreateV4("ETH_BTC") }, | ||||
|                 { "XT", xtFactory.CreateSpot("eth_btc") }, | ||||
|             }; | ||||
|  | ||||
| @ -26,7 +26,6 @@ | ||||
| @using Kucoin.Net.Interfaces | ||||
| @using Mexc.Net.Interfaces | ||||
| @using OKX.Net.Interfaces; | ||||
| @using Upbit.Net.Interfaces; | ||||
| @using Toobit.Net.Interfaces; | ||||
| @using WhiteBit.Net.Interfaces | ||||
| @using XT.Net.Interfaces | ||||
| @ -52,12 +51,11 @@ | ||||
| @inject IMexcTrackerFactory mexcFactory | ||||
| @inject IOKXTrackerFactory okxFactory | ||||
| @inject IToobitTrackerFactory toobitFactory | ||||
| @inject IUpbitTrackerFactory upbitFactory | ||||
| @inject IWhiteBitTrackerFactory whitebitFactory | ||||
| @inject IXTTrackerFactory xtFactory | ||||
| @implements IDisposable | ||||
| 
 | ||||
| <h3>Trade Trackers, live updates:</h3> | ||||
| <h3>ETH-BTC trade Trackers, live updates:</h3> | ||||
| <div style="display:flex; flex-wrap: wrap;"> | ||||
|     @foreach (var tracker in _trackers.OrderBy(p => p.Exchange)) | ||||
|     { | ||||
| @ -105,12 +103,11 @@ | ||||
|                 { mexcFactory.CreateTradeTracker(usdtSpotSymbol, period: TimeSpan.FromMinutes(5)) }, | ||||
|                 { okxFactory.CreateTradeTracker(usdtSpotSymbol, period: TimeSpan.FromMinutes(5)) }, | ||||
|                 { toobitFactory.CreateTradeTracker(usdtSpotSymbol, period: TimeSpan.FromMinutes(5)) }, | ||||
|                 { upbitFactory.CreateTradeTracker(usdtSpotSymbol, period: TimeSpan.FromMinutes(5)) }, | ||||
|                 { whitebitFactory.CreateTradeTracker(usdtSpotSymbol, period: TimeSpan.FromMinutes(5)) }, | ||||
|                 { xtFactory.CreateTradeTracker(usdtSpotSymbol, period: TimeSpan.FromMinutes(5)) }, | ||||
|             }; | ||||
| 
 | ||||
|         await Task.WhenAll(_trackers.Select(b => b.StartAsync(false))); | ||||
|         await Task.WhenAll(_trackers.Select(b => b.StartAsync())); | ||||
| 
 | ||||
|         // Use a manual update timer so the page isn't refreshed too often | ||||
|         _timer = new Timer(500); | ||||
|  | ||||
| @ -54,7 +54,6 @@ namespace BlazorClient | ||||
|             services.AddMexc(); | ||||
|             services.AddOKX(); | ||||
|             services.AddToobit(); | ||||
|             services.AddUpbit(); | ||||
|             services.AddWhiteBit(); | ||||
|             services.AddXT(); | ||||
|         } | ||||
|  | ||||
| @ -29,7 +29,6 @@ | ||||
| @using Kucoin.Net.Interfaces.Clients; | ||||
| @using Mexc.Net.Interfaces.Clients; | ||||
| @using OKX.Net.Interfaces.Clients; | ||||
| @using Upbit.Net.Interfaces.Clients; | ||||
| @using Toobit.Net.Interfaces.Clients; | ||||
| @using WhiteBit.Net.Interfaces.Clients | ||||
| @using XT.Net.Interfaces.Clients | ||||
|  | ||||
| @ -6,20 +6,20 @@ | ||||
|   </PropertyGroup> | ||||
| 
 | ||||
| 	<ItemGroup> | ||||
| 		<PackageReference Include="Binance.Net" Version="11.9.0" /> | ||||
| 	<PackageReference Include="Bitfinex.Net" Version="9.9.0" /> | ||||
| 	<PackageReference Include="BitMart.Net" Version="2.10.0" /> | ||||
| 	<PackageReference Include="Bybit.Net" Version="5.10.1" /> | ||||
| 	<PackageReference Include="CoinEx.Net" Version="9.9.0" /> | ||||
| 	<PackageReference Include="CryptoCom.Net" Version="2.10.0" /> | ||||
| 	<PackageReference Include="GateIo.Net" Version="2.11.0" /> | ||||
| 	<PackageReference Include="JK.Bitget.Net" Version="2.9.0" /> | ||||
| 	<PackageReference Include="JK.Mexc.Net" Version="3.10.0" /> | ||||
| 	<PackageReference Include="JK.OKX.Net" Version="3.9.0" /> | ||||
| 	<PackageReference Include="JKorf.Coinbase.Net" Version="2.9.0" /> | ||||
| 	<PackageReference Include="JKorf.HTX.Net" Version="7.9.0" /> | ||||
| 	<PackageReference Include="KrakenExchange.Net" Version="6.9.0" /> | ||||
| 		<PackageReference Include="Kucoin.Net" Version="7.9.0" /> | ||||
| 		<PackageReference Include="Binance.Net" Version="11.1.0" /> | ||||
| 	<PackageReference Include="Bitfinex.Net" Version="9.1.0" /> | ||||
| 	<PackageReference Include="BitMart.Net" Version="2.1.0" /> | ||||
| 	<PackageReference Include="Bybit.Net" Version="5.1.0" /> | ||||
| 	<PackageReference Include="CoinEx.Net" Version="9.1.0" /> | ||||
| 	<PackageReference Include="CryptoCom.Net" Version="2.1.0" /> | ||||
| 	<PackageReference Include="GateIo.Net" Version="2.1.0" /> | ||||
| 	<PackageReference Include="JK.Bitget.Net" Version="2.1.0" /> | ||||
| 	<PackageReference Include="JK.Mexc.Net" Version="3.1.0" /> | ||||
| 	<PackageReference Include="JK.OKX.Net" Version="3.1.0" /> | ||||
| 	<PackageReference Include="JKorf.Coinbase.Net" Version="2.1.0" /> | ||||
| 	<PackageReference Include="JKorf.HTX.Net" Version="7.1.0" /> | ||||
| 	<PackageReference Include="KrakenExchange.Net" Version="6.1.0" /> | ||||
| 		<PackageReference Include="Kucoin.Net" Version="7.1.0" /> | ||||
| 	</ItemGroup> | ||||
| 
 | ||||
| </Project> | ||||
|  | ||||
| @ -8,9 +8,9 @@ | ||||
|   </PropertyGroup> | ||||
| 
 | ||||
|   <ItemGroup> | ||||
|     <PackageReference Include="Binance.Net" Version="11.9.0" /> | ||||
|     <PackageReference Include="BitMart.Net" Version="2.10.0" /> | ||||
|     <PackageReference Include="JK.OKX.Net" Version="3.9.0" /> | ||||
|     <PackageReference Include="Binance.Net" Version="11.1.0" /> | ||||
|     <PackageReference Include="BitMart.Net" Version="2.1.0" /> | ||||
|     <PackageReference Include="JK.OKX.Net" Version="3.1.0" /> | ||||
|   </ItemGroup> | ||||
| 
 | ||||
| </Project> | ||||
|  | ||||
							
								
								
									
										13
									
								
								README.md
									
									
									
									
									
								
							
							
						
						
									
										13
									
								
								README.md
									
									
									
									
									
								
							| @ -35,7 +35,6 @@ Full list of all libraries part of the CryptoExchange.Net ecosystem. Consider us | ||||
| ||Mexc|CEX|[JKorf/Mexc.Net](https://github.com/JKorf/Mexc.Net)|[](https://www.nuget.org/packages/JK.Mexc.Net)|-|-| | ||||
| ||OKX|CEX|[JKorf/OKX.Net](https://github.com/JKorf/OKX.Net)|[](https://www.nuget.org/packages/JK.OKX.Net)|[Link](https://www.okx.com/join/14592495)|20%| | ||||
| ||Toobit|CEX|[JKorf/Toobit.Net](https://github.com/JKorf/Toobit.Net)|[](https://www.nuget.org/packages/Toobit.Net)|[Link](https://www.toobit.com/en-US/register?invite_code=zsV19h)|-| | ||||
| ||Upbit|CEX|[JKorf/Upbit.Net](https://github.com/JKorf/Upbit.Net)|[](https://www.nuget.org/packages/JKorf.Upbit.Net)|-|-| | ||||
| ||WhiteBit|CEX|[JKorf/WhiteBit.Net](https://github.com/JKorf/WhiteBit.Net)|[](https://www.nuget.org/packages/WhiteBit.Net)|[Link](https://whitebit.com/referral/a8e59b59-186c-4662-824c-3095248e0edf)|-| | ||||
| ||XT|CEX|[JKorf/XT.Net](https://github.com/JKorf/XT.Net)|[](https://www.nuget.org/packages/XT.Net)|[Link](https://www.xt.com/ru/accounts/register?ref=CZG39C)|25%| | ||||
| 
 | ||||
| @ -66,18 +65,6 @@ Make a one time donation in a crypto currency of your choice. If you prefer to d | ||||
| Alternatively, sponsor me on Github using [Github Sponsors](https://github.com/sponsors/JKorf).  | ||||
| 
 | ||||
| ## Release notes | ||||
| * Version 9.11.0 - 30 Oct 2025 | ||||
|     * Added StaticLogger to LibraryHelpers, updated warning logging for converters to use StaticLogger | ||||
|     * Added client reference helper to LibraryHelpers | ||||
|     * Fixed exception when initial trade snapshot has no items in TradeTracker | ||||
| 
 | ||||
| * Version 9.10.0 - 15 Oct 2025 | ||||
|     * Added ITransferRestClient Shared interface	 | ||||
|     * Added ClientOrderId property to SharedUserTrade model | ||||
|     * Updated IBalanceRestClient, GetBalancesRequest now mainly works with SharedAccountType type, allowing more options | ||||
|     * Updated IBalanceRestClient, GetBalanceOptions now specifies supported account types | ||||
|     * Updated DateTimeConverter to work primarily with decimal instead of double to prevent some floating point issues | ||||
| 
 | ||||
| * Version 9.9.0 - 06 Oct 2025 | ||||
|     * Updated socket Subscription status handling | ||||
|     * Added SubscriptionStatusChanged event to UpdateSubscription (SubscribeAsync methods reponse) | ||||
|  | ||||
		Loading…
	
	
			
			x
			
			
		
	
		Reference in New Issue
	
	Block a user