From 95a1570627284f139db37bb294ba4a7b6cbb49b9 Mon Sep 17 00:00:00 2001 From: vslee Date: Wed, 4 Sep 2019 07:36:56 -0700 Subject: [PATCH] LBank: fixed marketsymbol bug in ParseTicker()ParseTicker - fixes #431 - fixed KuCoinTrade.cs capitalization in filename/git --- .../Models/KuCoinTrade.cs} | 0 .../API/Exchanges/LBank/ExchangeLBankAPI.cs | 83 +++++++++++++------ 2 files changed, 56 insertions(+), 27 deletions(-) rename ExchangeSharp/API/Exchanges/{Kucoin/Models/KucoinTrade.cs => KuCoin/Models/KuCoinTrade.cs} (100%) diff --git a/ExchangeSharp/API/Exchanges/Kucoin/Models/KucoinTrade.cs b/ExchangeSharp/API/Exchanges/KuCoin/Models/KuCoinTrade.cs similarity index 100% rename from ExchangeSharp/API/Exchanges/Kucoin/Models/KucoinTrade.cs rename to ExchangeSharp/API/Exchanges/KuCoin/Models/KuCoinTrade.cs diff --git a/ExchangeSharp/API/Exchanges/LBank/ExchangeLBankAPI.cs b/ExchangeSharp/API/Exchanges/LBank/ExchangeLBankAPI.cs index f71f79c8..f8af9e50 100644 --- a/ExchangeSharp/API/Exchanges/LBank/ExchangeLBankAPI.cs +++ b/ExchangeSharp/API/Exchanges/LBank/ExchangeLBankAPI.cs @@ -174,33 +174,62 @@ private List> ParseTickers(JToken obj) return tickerList; } - private ExchangeTicker ParseTicker(JToken resp) - { - string symbol = resp["symbol"].ConvertInvariant(); - DateTime timestamp = CryptoUtility.UnixTimeStampToDateTimeMilliseconds(resp["timestamp"].ConvertInvariant()); - JToken obj = resp["ticker"]; - decimal volume = obj["vol"].ConvertInvariant(); - - ExchangeTicker ticker = new ExchangeTicker - { - Ask = obj["high"].ConvertInvariant(), - Bid = obj["low"].ConvertInvariant(), - Last = obj["latest"].ConvertInvariant(), - //PercentChange = obj["change"].ConvertInvariant(), - Volume = new ExchangeVolume - { - BaseCurrencyVolume = volume, - BaseCurrency = symbol, - QuoteCurrencyVolume = volume * obj["latest"].ConvertInvariant(), - QuoteCurrency = symbol, - Timestamp = timestamp - } - }; - - return ticker; - } - - private List ParseRecentTrades(JToken trades, string symbol) + private ExchangeTicker ParseTicker(JToken resp) + { + //{[ + //{ + //"symbol": "tky_eth", + //"ticker": { + //"change": 0, + //"high": 9.59E-06, + //"latest": 9.59E-06, + //"low": 9.59E-06, + //"turnover": 0.0, + //"vol": 0.0 + //}, + //"timestamp": 1567593631127 + //}, + //{ + //"symbol": "ali_eth", + //"ticker": { + //"change": 0, + //"high": 4.8E-07, + //"latest": 4.8E-07, + //"low": 4.8E-07, + //"turnover": 0.0, + //"vol": 0.0 + //}, + //"timestamp": 1567593631338 + //}, + string symbol = resp["symbol"].ConvertInvariant(); + string[] pair = symbol.ToUpperInvariant().Split(this.MarketSymbolSeparator[0]); + DateTime timestamp = CryptoUtility.UnixTimeStampToDateTimeMilliseconds(resp["timestamp"].ConvertInvariant()); + JToken obj = resp["ticker"]; + decimal volume = obj["vol"].ConvertInvariant(); + + ExchangeTicker ticker = new ExchangeTicker + { + MarketSymbol = symbol, + Ask = obj["high"].ConvertInvariant(), + Bid = obj["low"].ConvertInvariant(), + Last = obj["latest"].ConvertInvariant(), + //PercentChange = obj["change"].ConvertInvariant(), + Volume = new ExchangeVolume + { + BaseCurrencyVolume = volume, + //BaseCurrency = symbol, + BaseCurrency = pair[0], + QuoteCurrencyVolume = volume * obj["latest"].ConvertInvariant(), + //QuoteCurrency = symbol, + QuoteCurrency = pair[1], + Timestamp = timestamp + } + }; + + return ticker; + } + + private List ParseRecentTrades(JToken trades, string symbol) { List exTradeList = new List(trades.Count());