Fix for Kraken web socket

Author: jjxtra

ExchangeSharp/API/Exchanges/Kraken/ExchangeKrakenAPI.cs

@@ -498,11 +498,14 @@ protected override async Task<IEnumerable<ExchangeMarket>> OnGetMarketSymbolsMet
             foreach (JProperty prop in res.Where(p => !p.Name.EndsWith(".d")))
             {
                 JToken pair = prop.Value;
+                JToken child = prop.Children().FirstOrDefault();
                 var quantityStepSize = Math.Pow(0.1, pair["lot_decimals"].ConvertInvariant<int>()).ConvertInvariant<decimal>();
                 var market = new ExchangeMarket
                 {
                     IsActive = true,
                     MarketSymbol = prop.Name,
+					AltMarketSymbol = child["altname"].ToStringInvariant(),
+					AltMarketSymbol2 = child["wsname"].ToStringInvariant(),
                     MinTradeSize = quantityStepSize,
                     MarginEnabled = pair["leverage_buy"].Children().Any() || pair["leverage_sell"].Children().Any(),
                     BaseCurrency = pair["base"].ToStringInvariant(),
@@ -856,20 +859,38 @@ protected override async Task<IWebSocket> OnGetTradesWebSocketAsync(Func<KeyValu
 				}
 			}, connectCallback: async (_socket) =>
 			{
-				//{
-				//  "event": "subscribe",
-				//  "pair": [
-				//    "XBT/USD","XBT/EUR"
-				//  ],
-				//  "subscription": {
-				//    "name": "ticker"
-				//  }
-				//}
-				await _socket.SendMessageAsync(new
+                //{
+                //  "event": "subscribe",
+                //  "pair": [
+                //    "XBT/USD","XBT/EUR"
+                //  ],
+                //  "subscription": {
+                //    "name": "ticker"
+                //  }
+                //}
+                Task<string>[] marketSymbolsArray = marketSymbols.Select(async (m) =>
+                {
+                    ExchangeMarket market = await GetExchangeMarketFromCacheAsync(m);
+                    if (market == null)
+                    {
+                        return null;
+                    }
+                    return market.AltMarketSymbol2;
+                }).ToArray();
+                List<string> marketSymbolList = new List<string>();
+                foreach (Task<string> ms in marketSymbolsArray)
+                {
+                    string result = await ms;
+                    if (result != null)
+                    {
+                        marketSymbolList.Add(result);
+                    }
+                }
+                await _socket.SendMessageAsync(new
 				{
 					@event = "subscribe",
-					pair = marketSymbols,
-					subscription = new { name = "trade" },
+					pair = marketSymbolList,
+                    subscription = new { name = "trade" }
 				});
 			});
 		}

ExchangeSharp/Model/ExchangeMarket.cs

@@ -1,4 +1,4 @@
-/*
+/*
 MIT LICENSE
 
 Copyright 2017 Digital Ruby, LLC - http://www.digitalruby.com
@@ -21,8 +21,14 @@ public sealed class ExchangeMarket
         /// <summary>Gets or sets the symbol representing the market's currency pair.</summary>
         public string MarketSymbol { get; set; }
 
-        /// <summary>A value indicating whether the market is active.</summary>
-        public bool IsActive { get; set; }
+		/// <summary>Aternate market symbol</summary>
+		public string AltMarketSymbol { get; set; }
+
+		/// <summary>Second aternate market symbol</summary>
+		public string AltMarketSymbol2 { get; set; }
+
+		/// <summary>A value indicating whether the market is active.</summary>
+		public bool IsActive { get; set; }
 
         /// <summary>In a pair like ZRX/BTC, BTC is the quote currency.</summary>
         public string QuoteCurrency { get; set; }
@@ -72,4 +78,4 @@ public override string ToString()
             return $"{MarketSymbol}, {BaseCurrency}-{QuoteCurrency}";
         }
     }
-}
+}

ExchangeSharpTests/ExchangeBitBankTests.cs

@@ -10,7 +10,7 @@ namespace ExchangeSharpTests
     [TestClass]
     public sealed class ExchangeBitBankTests
     {
-        private ExchangeBitBankAPI makeMockRequestMaker(string response = null)
+        private ExchangeBitBankAPI MakeMockRequestMaker(string response = null)
         {
             var requestMaker = new MockAPIRequestMaker();
             if (response != null)
@@ -38,7 +38,7 @@ public async Task ShouldParseGetTickerResult()
                 }
             }
             ";
-            var api = makeMockRequestMaker(data);
+            var api = MakeMockRequestMaker(data);
             var ticker = await api.GetTickerAsync("BTC-JPY");
             ticker.MarketSymbol.Should().Be("btc_jpy");
             ticker.Ask.Should().Be(395733m);
@@ -73,7 +73,7 @@ public async Task ShouldGetTransactions()
                 }
             }
             ";
-            var api = makeMockRequestMaker(data);
+            var api = MakeMockRequestMaker(data);
             ExchangeOrderBook resp = await api.GetOrderBookAsync("BTC-JPY");
             resp.MarketSymbol.Should().Be("btc_jpy");
             resp.Asks.Should().HaveCount(1);
@@ -114,7 +114,7 @@ public async Task ShouldGetCandleStick()
                 }
             }
             ";
-            var api = makeMockRequestMaker(data);
+            var api = MakeMockRequestMaker(data);
             // starttime is required.
             // await Assert.ThrowsExceptionAsync<APIException>(async () => await api.GetCandlesAsync("BTC-JPY", 3600));
             var resp = await api.GetCandlesAsync("BTC-JPY", 3600, CryptoUtility.UtcNow);
@@ -157,7 +157,7 @@ public async Task ShouldGetAssets()
                 }
             }
             ";
-            var api = makeMockRequestMaker(data);
+            var api = MakeMockRequestMaker(data);
             var resp = await api.GetAmountsAsync();
             resp.First().Key.Should().Equals("JPY");
             resp.First().Value.Should().Equals(3551.9501m);
@@ -185,7 +185,7 @@ public async Task ShouldGetOrderDetail()
                 }
             }
             ";
-            var api = makeMockRequestMaker(data);
+            var api = MakeMockRequestMaker(data);
             // Throws error when no Market Symbol
             var resp = await api.GetOrderDetailsAsync("558167000", "BTC-JPY");
             ExchangeOrderResult resp2 = await api.GetOrderDetailsAsync("58037954");
@@ -219,7 +219,7 @@ public async Task ShouldGetOrders()
                 }
             }
             ";
-            var api = makeMockRequestMaker(data);
+            var api = MakeMockRequestMaker(data);
             var orderBooks = await api.GetOpenOrderDetailsAsync();
             ExchangeOrderResult order = orderBooks.First();
             order.IsBuy.Should().BeFalse();