diff --git a/CryptoExchange.Net/Converters/TimestampConverter.cs b/CryptoExchange.Net/Converters/TimestampConverter.cs index 977b7c1..7dd9c21 100644 --- a/CryptoExchange.Net/Converters/TimestampConverter.cs +++ b/CryptoExchange.Net/Converters/TimestampConverter.cs @@ -20,6 +20,9 @@ namespace CryptoExchange.Net.Converters if (reader.Value == null) return null; + if (reader.Value is double d) + return new DateTime(1970, 1, 1, 0, 0, 0, DateTimeKind.Utc).AddMilliseconds(d); + var t = long.Parse(reader.Value.ToString()); return new DateTime(1970, 1, 1, 0, 0, 0, DateTimeKind.Utc).AddMilliseconds(t); } diff --git a/CryptoExchange.Net/CryptoExchange.Net.xml b/CryptoExchange.Net/CryptoExchange.Net.xml index d49f94d..401ad90 100644 --- a/CryptoExchange.Net/CryptoExchange.Net.xml +++ b/CryptoExchange.Net/CryptoExchange.Net.xml @@ -538,12 +538,12 @@ - Amount available + Quantity available - Total amount + Total quantity @@ -752,7 +752,7 @@ - cancelled order + canceled order @@ -765,22 +765,22 @@ Common kline - + High price for this kline - + Low price for this kline - + Open price for this kline - + Close price for this kline @@ -895,9 +895,9 @@ Symbol name - + - Minimum trade size + Minimum trade quantity @@ -910,12 +910,12 @@ Symbol name - + High price - + Low price @@ -1382,7 +1382,7 @@ Event when the BestBid or BestAsk changes ie a Pricing Tick - + Timestamp of the last update @@ -2554,7 +2554,7 @@ Event when order book was updated, containing the changed bids and asks. Be careful! It can generate a lot of events at high-liquidity markets - + Timestamp of the last update @@ -4044,7 +4044,9 @@ - + + +System.Diagnostics.CodeAnalysis.AllowNullAttribute"> Specifies that is allowed as an input even if the corresponding type disallows it. diff --git a/CryptoExchange.Net/ExchangeInterfaces/ICommonBalance.cs b/CryptoExchange.Net/ExchangeInterfaces/ICommonBalance.cs index 22b6802..816b351 100644 --- a/CryptoExchange.Net/ExchangeInterfaces/ICommonBalance.cs +++ b/CryptoExchange.Net/ExchangeInterfaces/ICommonBalance.cs @@ -10,11 +10,11 @@ /// public string CommonAsset { get; } /// - /// Amount available + /// Quantity available /// public decimal CommonAvailable { get; } /// - /// Total amount + /// Total quantity /// public decimal CommonTotal { get; } } diff --git a/CryptoExchange.Net/ExchangeInterfaces/IExchangeClient.cs b/CryptoExchange.Net/ExchangeInterfaces/IExchangeClient.cs index 395676d..c40bb80 100644 --- a/CryptoExchange.Net/ExchangeInterfaces/IExchangeClient.cs +++ b/CryptoExchange.Net/ExchangeInterfaces/IExchangeClient.cs @@ -165,7 +165,7 @@ namespace CryptoExchange.Net.ExchangeInterfaces /// Active, /// - /// cancelled order + /// canceled order /// Canceled, /// diff --git a/CryptoExchange.Net/ExchangeInterfaces/IKline.cs b/CryptoExchange.Net/ExchangeInterfaces/IKline.cs index c8548bf..8dbb535 100644 --- a/CryptoExchange.Net/ExchangeInterfaces/IKline.cs +++ b/CryptoExchange.Net/ExchangeInterfaces/IKline.cs @@ -10,19 +10,19 @@ namespace CryptoExchange.Net.ExchangeInterfaces /// /// High price for this kline /// - decimal CommonHigh { get; } + decimal CommonHighPrice { get; } /// /// Low price for this kline /// - decimal CommonLow { get; } + decimal CommonLowPrice { get; } /// /// Open price for this kline /// - decimal CommonOpen { get; } + decimal CommonOpenPrice { get; } /// /// Close price for this kline /// - decimal CommonClose { get; } + decimal CommonClosePrice { get; } /// /// Open time for this kline /// diff --git a/CryptoExchange.Net/ExchangeInterfaces/ISymbol.cs b/CryptoExchange.Net/ExchangeInterfaces/ISymbol.cs index c937112..9cb73de 100644 --- a/CryptoExchange.Net/ExchangeInterfaces/ISymbol.cs +++ b/CryptoExchange.Net/ExchangeInterfaces/ISymbol.cs @@ -10,8 +10,8 @@ /// public string CommonName { get; } /// - /// Minimum trade size + /// Minimum trade quantity /// - public decimal CommonMinimumTradeSize { get; } + public decimal CommonMinimumTradeQuantity { get; } } } diff --git a/CryptoExchange.Net/ExchangeInterfaces/ITicker.cs b/CryptoExchange.Net/ExchangeInterfaces/ITicker.cs index c72f05d..f2c7360 100644 --- a/CryptoExchange.Net/ExchangeInterfaces/ITicker.cs +++ b/CryptoExchange.Net/ExchangeInterfaces/ITicker.cs @@ -12,11 +12,11 @@ /// /// High price /// - public decimal CommonHigh { get; } + public decimal CommonHighPrice { get; } /// /// Low price /// - public decimal CommonLow { get; } + public decimal CommonLowPrice { get; } /// /// Volume /// diff --git a/CryptoExchange.Net/Interfaces/ISymbolOrderBook.cs b/CryptoExchange.Net/Interfaces/ISymbolOrderBook.cs index f1382be..886e39b 100644 --- a/CryptoExchange.Net/Interfaces/ISymbolOrderBook.cs +++ b/CryptoExchange.Net/Interfaces/ISymbolOrderBook.cs @@ -39,7 +39,7 @@ namespace CryptoExchange.Net.Interfaces /// /// Timestamp of the last update /// - DateTime LastOrderBookUpdate { get; } + DateTime UpdateTime { get; } /// /// The number of asks in the book diff --git a/CryptoExchange.Net/OrderBook/SymbolOrderBook.cs b/CryptoExchange.Net/OrderBook/SymbolOrderBook.cs index 51f7262..2a8c937 100644 --- a/CryptoExchange.Net/OrderBook/SymbolOrderBook.cs +++ b/CryptoExchange.Net/OrderBook/SymbolOrderBook.cs @@ -107,7 +107,7 @@ namespace CryptoExchange.Net.OrderBook /// /// Timestamp of the last update /// - public DateTime LastOrderBookUpdate { get; private set; } + public DateTime UpdateTime { get; private set; } /// /// The number of asks in the book @@ -416,7 +416,7 @@ namespace CryptoExchange.Net.OrderBook AskCount = asks.Count; BidCount = bids.Count; - LastOrderBookUpdate = DateTime.UtcNow; + UpdateTime = DateTime.UtcNow; log.Write(LogLevel.Debug, $"{Id} order book {Symbol} data set: {BidCount} bids, {AskCount} asks. #{item.EndUpdateId}"); CheckProcessBuffer(); OnOrderBookUpdate?.Invoke((item.Bids, item.Asks)); @@ -645,7 +645,7 @@ namespace CryptoExchange.Net.OrderBook return false; } - LastOrderBookUpdate = DateTime.UtcNow; + UpdateTime = DateTime.UtcNow; var listToChange = type == OrderBookEntryType.Ask ? asks : bids; if (entry.Quantity == 0) { diff --git a/CryptoExchange.Net/RestClient.cs b/CryptoExchange.Net/RestClient.cs index a90074d..54fd412 100644 --- a/CryptoExchange.Net/RestClient.cs +++ b/CryptoExchange.Net/RestClient.cs @@ -316,7 +316,7 @@ namespace CryptoExchange.Net { if (canceledException.CancellationToken == cancellationToken) { - // Cancellation token cancelled by caller + // Cancellation token canceled by caller log.Write(LogLevel.Warning, $"[{request.RequestId}] Request cancel requested"); return new WebCallResult(null, null, default, new CancellationRequestedError()); } diff --git a/CryptoExchange.Net/Sockets/CryptoExchangeWebSocketClient.cs b/CryptoExchange.Net/Sockets/CryptoExchangeWebSocketClient.cs index 5564dcf..d3ee1cc 100644 --- a/CryptoExchange.Net/Sockets/CryptoExchangeWebSocketClient.cs +++ b/CryptoExchange.Net/Sockets/CryptoExchangeWebSocketClient.cs @@ -417,7 +417,7 @@ namespace CryptoExchange.Net.Sockets } catch (OperationCanceledException) { - // cancelled + // canceled break; } catch (IOException ioe) @@ -478,7 +478,7 @@ namespace CryptoExchange.Net.Sockets } catch (OperationCanceledException) { - // cancelled + // canceled break; } catch (WebSocketException wse) @@ -645,7 +645,7 @@ namespace CryptoExchange.Net.Sockets } catch (OperationCanceledException) { - // cancelled + // canceled break; } }