mirror of
https://github.com/JKorf/CryptoExchange.Net.git
synced 2026-08-13 17:33:02 +00:00
Compare commits
4 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
 Jkorf
|
813bd9f5a1 | ||
|
Jkorf
|
c8d2b4f09d | ||
|
Jkorf
|
6560b82a3e | ||
|
JKorf
|
e151af8f37 |
@@ -168,7 +168,7 @@ namespace CryptoExchange.Net.Converters.SystemTextJson
|
||||
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.Value))}. If you think {stringValue} should added please open an issue on the Github repo");
|
||||
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");
|
||||
}
|
||||
}
|
||||
|
||||
@@ -246,6 +246,12 @@ namespace CryptoExchange.Net.Converters.SystemTextJson
|
||||
{
|
||||
// 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)
|
||||
|
||||
@@ -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>10.5.2</PackageVersion>
|
||||
<AssemblyVersion>10.5.2</AssemblyVersion>
|
||||
<FileVersion>10.5.2</FileVersion>
|
||||
<PackageVersion>10.5.3</PackageVersion>
|
||||
<AssemblyVersion>10.5.3</AssemblyVersion>
|
||||
<FileVersion>10.5.3</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>
|
||||
|
||||
@@ -19,6 +19,7 @@ namespace CryptoExchange.Net.Trackers.UserData.ItemTrackers
|
||||
private readonly IFuturesOrderSocketClient? _socketClient;
|
||||
private readonly ExchangeParameters? _exchangeParameters;
|
||||
private readonly bool _requiresSymbolParameterOpenOrders;
|
||||
private readonly Dictionary<string, int> _openOrderNotReturnedTimes = new();
|
||||
|
||||
internal event Func<UpdateSource, SharedUserTrade[], Task>? OnTradeUpdate;
|
||||
|
||||
@@ -251,10 +252,38 @@ namespace CryptoExchange.Net.Trackers.UserData.ItemTrackers
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
if (!_firstPollDone && anyError)
|
||||
return anyError;
|
||||
|
||||
// Check all current open orders
|
||||
// Keep track of the orders no longer returned in the open list
|
||||
// Order should be set to canceled state when it's no longer returned in the open list
|
||||
// but also is not returned in the closed list
|
||||
foreach (var order in Values.Where(x => x.Status == SharedOrderStatus.Open))
|
||||
{
|
||||
if (openOrders.Any(x => x.OrderId == order.OrderId))
|
||||
continue;
|
||||
|
||||
if (!_openOrderNotReturnedTimes.ContainsKey(order.OrderId))
|
||||
_openOrderNotReturnedTimes[order.OrderId] = 0;
|
||||
|
||||
_openOrderNotReturnedTimes[order.OrderId] += 1;
|
||||
}
|
||||
|
||||
foreach (var symbol in _symbols.ToList())
|
||||
{
|
||||
// Determine the timestamp from which we need to check order status
|
||||
// Use the timestamp we last know the correct state of the data
|
||||
var fromTimeOrders = _lastDataTimeBeforeDisconnect ?? _lastPollTime ?? _startTime;
|
||||
// If we're tracking open orders with a create time before this time we need to use that timestamp to make sure that order is included in the response
|
||||
var trackedOrdersMinOpenTime = Values
|
||||
.Where(x => x.Status == SharedOrderStatus.Open && x.SharedSymbol!.BaseAsset == symbol.BaseAsset && x.SharedSymbol.QuoteAsset == symbol.QuoteAsset)
|
||||
.OrderBy(x => x.CreateTime)
|
||||
.FirstOrDefault()?.CreateTime;
|
||||
if (trackedOrdersMinOpenTime != null && trackedOrdersMinOpenTime < fromTimeOrders)
|
||||
fromTimeOrders = trackedOrdersMinOpenTime.Value.AddMilliseconds(-1);
|
||||
|
||||
var updatedPollTime = DateTime.UtcNow;
|
||||
var closedOrdersResult = await _restClient.GetClosedFuturesOrdersAsync(new GetClosedOrdersRequest(symbol, startTime: fromTimeOrders, exchangeParameters: _exchangeParameters)).ConfigureAwait(false);
|
||||
if (!closedOrdersResult.Success)
|
||||
@@ -279,10 +308,16 @@ namespace CryptoExchange.Net.Trackers.UserData.ItemTrackers
|
||||
|
||||
// Check for orders which are no longer returned in either open/closed and assume they're canceled without fill
|
||||
var openOrdersNotReturned = Values.Where(x =>
|
||||
x.SharedSymbol!.BaseAsset == symbol.BaseAsset && x.SharedSymbol.QuoteAsset == symbol.QuoteAsset // Orders for the same symbol
|
||||
&& x.QuantityFilled?.IsZero == true // With no filled value
|
||||
&& !openOrders.Any(r => r.OrderId == x.OrderId) // Not returned in open orders
|
||||
&& !relevantOrders.Any(r => r.OrderId == x.OrderId) // Not return in closed orders
|
||||
// Orders for the same symbol
|
||||
x.SharedSymbol!.BaseAsset == symbol.BaseAsset && x.SharedSymbol.QuoteAsset == symbol.QuoteAsset
|
||||
// With no filled value
|
||||
&& x.QuantityFilled?.IsZero == true
|
||||
// Not returned in open orders
|
||||
&& !openOrders.Any(r => r.OrderId == x.OrderId)
|
||||
// Not returned in closed orders
|
||||
&& !relevantOrders.Any(r => r.OrderId == x.OrderId)
|
||||
// Open order has not been returned in the open list at least 2 times
|
||||
&& (_openOrderNotReturnedTimes.TryGetValue(x.OrderId, out var notReturnedTimes) ? notReturnedTimes >= 2 : false)
|
||||
).ToList();
|
||||
|
||||
var additionalUpdates = new List<SharedFuturesOrder>();
|
||||
|
||||
@@ -19,6 +19,7 @@ namespace CryptoExchange.Net.Trackers.UserData.ItemTrackers
|
||||
private readonly ISpotOrderSocketClient? _socketClient;
|
||||
private readonly ExchangeParameters? _exchangeParameters;
|
||||
private readonly bool _requiresSymbolParameterOpenOrders;
|
||||
private readonly Dictionary<string, int> _openOrderNotReturnedTimes = new();
|
||||
|
||||
internal event Func<UpdateSource, SharedUserTrade[], Task>? OnTradeUpdate;
|
||||
|
||||
@@ -266,9 +267,34 @@ namespace CryptoExchange.Net.Trackers.UserData.ItemTrackers
|
||||
if (!_firstPollDone && anyError)
|
||||
return anyError;
|
||||
|
||||
// Check all current open orders
|
||||
// Keep track of the orders no longer returned in the open list
|
||||
// Order should be set to canceled state when it's no longer returned in the open list
|
||||
// but also is not returned in the closed list
|
||||
foreach (var order in Values.Where(x => x.Status == SharedOrderStatus.Open))
|
||||
{
|
||||
if (openOrders.Any(x => x.OrderId == order.OrderId))
|
||||
continue;
|
||||
|
||||
if (!_openOrderNotReturnedTimes.ContainsKey(order.OrderId))
|
||||
_openOrderNotReturnedTimes[order.OrderId] = 0;
|
||||
|
||||
_openOrderNotReturnedTimes[order.OrderId] += 1;
|
||||
}
|
||||
|
||||
foreach (var symbol in _symbols.ToList())
|
||||
{
|
||||
// Determine the timestamp from which we need to check order status
|
||||
// Use the timestamp we last know the correct state of the data
|
||||
var fromTimeOrders = _lastDataTimeBeforeDisconnect ?? _lastPollTime ?? _startTime;
|
||||
// If we're tracking open orders with a create time before this time we need to use that timestamp to make sure that order is included in the response
|
||||
var trackedOrdersMinOpenTime = Values
|
||||
.Where(x => x.Status == SharedOrderStatus.Open && x.SharedSymbol!.BaseAsset == symbol.BaseAsset && x.SharedSymbol.QuoteAsset == symbol.QuoteAsset)
|
||||
.OrderBy(x => x.CreateTime)
|
||||
.FirstOrDefault()?.CreateTime;
|
||||
if (trackedOrdersMinOpenTime != null && trackedOrdersMinOpenTime < fromTimeOrders)
|
||||
fromTimeOrders = trackedOrdersMinOpenTime.Value.AddMilliseconds(-1);
|
||||
|
||||
var updatedPollTime = DateTime.UtcNow;
|
||||
var closedOrdersResult = await _restClient.GetClosedSpotOrdersAsync(new GetClosedOrdersRequest(symbol, startTime: fromTimeOrders, exchangeParameters: _exchangeParameters)).ConfigureAwait(false);
|
||||
if (!closedOrdersResult.Success)
|
||||
@@ -293,10 +319,16 @@ namespace CryptoExchange.Net.Trackers.UserData.ItemTrackers
|
||||
|
||||
// Check for orders which are no longer returned in either open/closed and assume they're canceled without fill
|
||||
var openOrdersNotReturned = Values.Where(x =>
|
||||
x.SharedSymbol!.BaseAsset == symbol.BaseAsset && x.SharedSymbol.QuoteAsset == symbol.QuoteAsset // Orders for the same symbol
|
||||
&& x.QuantityFilled?.IsZero == true // With no filled value
|
||||
&& !openOrders.Any(r => r.OrderId == x.OrderId) // Not returned in open orders
|
||||
&& !relevantOrders.Any(r => r.OrderId == x.OrderId) // Not return in closed orders
|
||||
// Orders for the same symbol
|
||||
x.SharedSymbol!.BaseAsset == symbol.BaseAsset && x.SharedSymbol.QuoteAsset == symbol.QuoteAsset
|
||||
// With no filled value
|
||||
&& x.QuantityFilled?.IsZero == true
|
||||
// Not returned in open orders
|
||||
&& !openOrders.Any(r => r.OrderId == x.OrderId)
|
||||
// Not returned in closed orders
|
||||
&& !relevantOrders.Any(r => r.OrderId == x.OrderId)
|
||||
// Open order has not been returned in the open list at least 2 times
|
||||
&& (_openOrderNotReturnedTimes.TryGetValue(x.OrderId, out var notReturnedTimes) ? notReturnedTimes >= 2 : false)
|
||||
).ToList();
|
||||
|
||||
var additionalUpdates = new List<SharedSpotOrder>();
|
||||
|
||||
@@ -5,32 +5,32 @@
|
||||
</PropertyGroup>
|
||||
|
||||
<ItemGroup>
|
||||
<PackageReference Include="Binance.Net" Version="12.1.0" />
|
||||
<PackageReference Include="Bitfinex.Net" Version="10.2.0" />
|
||||
<PackageReference Include="BitMart.Net" Version="3.1.0" />
|
||||
<PackageReference Include="BloFin.Net" Version="2.1.1" />
|
||||
<PackageReference Include="Bybit.Net" Version="6.1.0" />
|
||||
<PackageReference Include="CoinEx.Net" Version="10.1.0" />
|
||||
<PackageReference Include="CoinW.Net" Version="2.1.1" />
|
||||
<PackageReference Include="CryptoCom.Net" Version="3.1.0" />
|
||||
<PackageReference Include="DeepCoin.Net" Version="3.1.0" />
|
||||
<PackageReference Include="GateIo.Net" Version="3.1.0" />
|
||||
<PackageReference Include="HyperLiquid.Net" Version="3.2.0" />
|
||||
<PackageReference Include="JK.BingX.Net" Version="3.1.0" />
|
||||
<PackageReference Include="JK.Bitget.Net" Version="3.1.0" />
|
||||
<PackageReference Include="JK.Mexc.Net" Version="4.1.0" />
|
||||
<PackageReference Include="JK.OKX.Net" Version="4.1.0" />
|
||||
<PackageReference Include="Jkorf.Aster.Net" Version="2.1.0" />
|
||||
<PackageReference Include="JKorf.BitMEX.Net" Version="3.1.0" />
|
||||
<PackageReference Include="JKorf.Coinbase.Net" Version="3.1.0" />
|
||||
<PackageReference Include="JKorf.HTX.Net" Version="8.1.0" />
|
||||
<PackageReference Include="JKorf.Upbit.Net" Version="2.1.0" />
|
||||
<PackageReference Include="KrakenExchange.Net" Version="7.1.0" />
|
||||
<PackageReference Include="Kucoin.Net" Version="8.1.0" />
|
||||
<PackageReference Include="Binance.Net" Version="12.5.0" />
|
||||
<PackageReference Include="Bitfinex.Net" Version="10.6.0" />
|
||||
<PackageReference Include="BitMart.Net" Version="3.5.0" />
|
||||
<PackageReference Include="BloFin.Net" Version="2.5.0" />
|
||||
<PackageReference Include="Bybit.Net" Version="6.5.0" />
|
||||
<PackageReference Include="CoinEx.Net" Version="10.5.0" />
|
||||
<PackageReference Include="CoinW.Net" Version="2.5.0" />
|
||||
<PackageReference Include="CryptoCom.Net" Version="3.5.0" />
|
||||
<PackageReference Include="DeepCoin.Net" Version="3.5.0" />
|
||||
<PackageReference Include="GateIo.Net" Version="3.5.0" />
|
||||
<PackageReference Include="HyperLiquid.Net" Version="3.7.0" />
|
||||
<PackageReference Include="JK.BingX.Net" Version="3.5.0" />
|
||||
<PackageReference Include="JK.Bitget.Net" Version="3.5.0" />
|
||||
<PackageReference Include="JK.Mexc.Net" Version="4.5.0" />
|
||||
<PackageReference Include="JK.OKX.Net" Version="4.5.0" />
|
||||
<PackageReference Include="Jkorf.Aster.Net" Version="2.5.0" />
|
||||
<PackageReference Include="JKorf.BitMEX.Net" Version="3.5.0" />
|
||||
<PackageReference Include="JKorf.Coinbase.Net" Version="3.5.1" />
|
||||
<PackageReference Include="JKorf.HTX.Net" Version="8.5.0" />
|
||||
<PackageReference Include="JKorf.Upbit.Net" Version="2.5.0" />
|
||||
<PackageReference Include="KrakenExchange.Net" Version="7.5.0" />
|
||||
<PackageReference Include="Kucoin.Net" Version="8.5.0" />
|
||||
<PackageReference Include="Serilog.AspNetCore" Version="10.0.0" />
|
||||
<PackageReference Include="Toobit.Net" Version="2.1.0" />
|
||||
<PackageReference Include="WhiteBit.Net" Version="3.1.0" />
|
||||
<PackageReference Include="XT.Net" Version="3.1.0" />
|
||||
<PackageReference Include="Toobit.Net" Version="3.5.0" />
|
||||
<PackageReference Include="WhiteBit.Net" Version="3.5.0" />
|
||||
<PackageReference Include="XT.Net" Version="3.5.0" />
|
||||
</ItemGroup>
|
||||
|
||||
</Project>
|
||||
|
||||
@@ -6,20 +6,20 @@
|
||||
</PropertyGroup>
|
||||
|
||||
<ItemGroup>
|
||||
<PackageReference Include="Binance.Net" Version="12.1.0" />
|
||||
<PackageReference Include="Bitfinex.Net" Version="10.2.0" />
|
||||
<PackageReference Include="BitMart.Net" Version="3.1.0" />
|
||||
<PackageReference Include="Bybit.Net" Version="6.1.0" />
|
||||
<PackageReference Include="CoinEx.Net" Version="10.1.0" />
|
||||
<PackageReference Include="CryptoCom.Net" Version="3.1.0" />
|
||||
<PackageReference Include="GateIo.Net" Version="3.1.0" />
|
||||
<PackageReference Include="JK.Bitget.Net" Version="3.1.0" />
|
||||
<PackageReference Include="JK.Mexc.Net" Version="4.1.0" />
|
||||
<PackageReference Include="JK.OKX.Net" Version="4.1.0" />
|
||||
<PackageReference Include="JKorf.Coinbase.Net" Version="3.1.0" />
|
||||
<PackageReference Include="JKorf.HTX.Net" Version="8.1.0" />
|
||||
<PackageReference Include="KrakenExchange.Net" Version="7.1.0" />
|
||||
<PackageReference Include="Kucoin.Net" Version="8.1.0" />
|
||||
<PackageReference Include="Binance.Net" Version="12.5.0" />
|
||||
<PackageReference Include="Bitfinex.Net" Version="10.6.0" />
|
||||
<PackageReference Include="BitMart.Net" Version="3.5.0" />
|
||||
<PackageReference Include="Bybit.Net" Version="6.5.0" />
|
||||
<PackageReference Include="CoinEx.Net" Version="10.5.0" />
|
||||
<PackageReference Include="CryptoCom.Net" Version="3.5.0" />
|
||||
<PackageReference Include="GateIo.Net" Version="3.5.0" />
|
||||
<PackageReference Include="JK.Bitget.Net" Version="3.5.0" />
|
||||
<PackageReference Include="JK.Mexc.Net" Version="4.5.0" />
|
||||
<PackageReference Include="JK.OKX.Net" Version="4.5.0" />
|
||||
<PackageReference Include="JKorf.Coinbase.Net" Version="3.5.1" />
|
||||
<PackageReference Include="JKorf.HTX.Net" Version="8.5.0" />
|
||||
<PackageReference Include="KrakenExchange.Net" Version="7.5.0" />
|
||||
<PackageReference Include="Kucoin.Net" Version="8.5.0" />
|
||||
</ItemGroup>
|
||||
|
||||
</Project>
|
||||
|
||||
@@ -8,9 +8,9 @@
|
||||
</PropertyGroup>
|
||||
|
||||
<ItemGroup>
|
||||
<PackageReference Include="Binance.Net" Version="12.1.0" />
|
||||
<PackageReference Include="BitMart.Net" Version="3.1.0" />
|
||||
<PackageReference Include="JK.OKX.Net" Version="4.1.0" />
|
||||
<PackageReference Include="Binance.Net" Version="12.5.0" />
|
||||
<PackageReference Include="BitMart.Net" Version="3.5.0" />
|
||||
<PackageReference Include="JK.OKX.Net" Version="4.5.0" />
|
||||
</ItemGroup>
|
||||
|
||||
</Project>
|
||||
|
||||
@@ -67,6 +67,10 @@ 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 10.5.3 - 11 Feb 2026
|
||||
* Fixed orders getting incorrectly set to canceled state for UserDataTracker spot and futures orders
|
||||
* Added check EnumConverter to detect undefined int value parsing
|
||||
|
||||
* Version 10.5.2 - 10 Feb 2026
|
||||
* Added check for subscribe queries with TimeoutBehavior.Success to complete when subscription has received update
|
||||
* Added call to ApiClient.HandleUnhandledMessage when no websocket message processor is found based on topic to allow additional processing
|
||||
|
||||
Reference in New Issue
Block a user