Merge pull request #13 from morpheums/development

Development

Author: morpheums

Binance.API.Csharp.Client.Domain/Interfaces/IBinanceClient.cs

@@ -51,14 +51,14 @@ public interface IBinanceClient
         /// <param name="interval">Time interval to retreive.</param>
         /// <param name="limit">Limit of records to retrieve.</param>
         /// <returns></returns>
-        Task<IEnumerable<Candlestick>> GetCandleSticks(string symbol, TimeInterval interval, int limit = 500);
+        Task<IEnumerable<Candlestick>> GetCandleSticks(string symbol, TimeInterval interval, DateTime? startTime = null, DateTime? endTime = null, int limit = 500);
 
         /// <summary>
         /// 24 hour price change statistics.
         /// </summary>
         /// <param name="symbol">Ticker symbol.</param>
         /// <returns></returns>
-        Task<PriceChangeInfo> GetPriceChange24H(string symbol);
+        Task<IEnumerable<PriceChangeInfo>> GetPriceChange24H(string symbol);
 
         /// <summary>
         /// Latest price for all symbols.

Binance.API.Csharp.Client.Models/Market/PriceChangeInfo.cs

@@ -4,6 +4,8 @@ namespace Binance.API.Csharp.Client.Models.Market
 {
     public class PriceChangeInfo
     {
+        [JsonProperty("symbol")]
+        public string Symbol { get; set; }
         [JsonProperty("priceChange")]
         public decimal PriceChange { get; set; }
         [JsonProperty("priceChangePercent")]

Binance.API.Csharp.Client.Test/BinanceTest.cs

@@ -9,7 +9,7 @@ namespace Binance.API.Csharp.Client.Test
     public class BinanceTest
     {
         private static ApiClient apiClient = new ApiClient("@YourApiKey", "@YourApiSecret");
-        private static BinanceClient binanceClient = new BinanceClient(apiClient);
+        private static BinanceClient binanceClient = new BinanceClient(apiClient,false);
 
         #region General
         [TestMethod]
@@ -35,7 +35,7 @@ public void GetOrderBook()
         [TestMethod]
         public void GetCandleSticks()
         {
-            var candlestick = binanceClient.GetCandleSticks("ethbtc", TimeInterval.Minutes_15).Result;
+            var candlestick = binanceClient.GetCandleSticks("ethbtc", TimeInterval.Minutes_15, new System.DateTime(2017,11,24), new System.DateTime(2017, 11, 26)).Result;
         }
 
         [TestMethod]
@@ -47,7 +47,7 @@ public void GetAggregateTrades()
         [TestMethod]
         public void GetPriceChange24H()
         {
-            var priceChangeInfo = binanceClient.GetPriceChange24H("ethbtc").Result;
+            var priceChangeInfo = binanceClient.GetPriceChange24H().Result;
         }
 
         [TestMethod]

Binance.API.Csharp.Client/Binance.API.Csharp.Client.nuspec

@@ -2,15 +2,15 @@
 <package >
   <metadata>
     <id>Binance.API.Csharp.Client</id>
-    <version>1.2.0</version>
+    <version>1.2.1</version>
     <title>Binance.API.Csharp.Client</title>
     <authors>Jose Mejia</authors>
     <owners>Jose Mejia</owners>
     <projectUrl>https://github.com/morpheums/Binance.API.Csharp.Helper</projectUrl>
     <iconUrl>https://github.com/morpheums/Binance.API.Csharp.Client/blob/master/Binance.API.Csharp.Client/BinanceLogo.png?raw=true</iconUrl>
     <requireLicenseAcceptance>false</requireLicenseAcceptance>
     <description>C#.NET client for Binance Exchange API.</description>
-    <releaseNotes>Fixing issue when calling "LoadTradingRules" method.</releaseNotes>
+    <releaseNotes>Fixing issue including dependencies dlls.</releaseNotes>
     <copyright>Copyright 2017</copyright>
     <tags>Criptocurrency Binance API dotnet csharp wrapper</tags>
     <dependencies>

Binance.API.Csharp.Client/BinanceClient.cs

@@ -22,9 +22,9 @@ public class BinanceClient : BinanceClientAbstract, IBinanceClient
         /// </summary>
         /// <param name="apiClient">API client to be used for API calls.</param>
         /// <param name="loadTradingRules">Optional parameter to skip loading trading rules.</param>
-        public BinanceClient(IApiClient apiClient, bool loadTradingRules = true) : base(apiClient)
+        public BinanceClient(IApiClient apiClient, bool loadTradingRules = false) : base(apiClient)
         {
-            if(loadTradingRules)
+            if (loadTradingRules)
             {
                 LoadTradingRules();
             }
@@ -164,14 +164,19 @@ public async Task<IEnumerable<AggregateTrade>> GetAggregateTrades(string symbol,
         /// <param name="interval">Time interval to retreive.</param>
         /// <param name="limit">Limit of records to retrieve.</param>
         /// <returns></returns>
-        public async Task<IEnumerable<Candlestick>> GetCandleSticks(string symbol, TimeInterval interval, int limit = 500)
+        public async Task<IEnumerable<Candlestick>> GetCandleSticks(string symbol, TimeInterval interval, DateTime? startTime = null, DateTime? endTime = null, int limit = 500)
         {
             if (string.IsNullOrWhiteSpace(symbol))
             {
                 throw new ArgumentException("symbol cannot be empty. ", "symbol");
             }
 
-            var result = await _apiClient.CallAsync<dynamic>(ApiMethod.GET, EndPoints.Candlesticks, false, $"symbol={symbol.ToUpper()}&interval={interval.GetDescription()}&limit={limit}");
+            var args = $"symbol={symbol.ToUpper()}&interval={interval.GetDescription()}"
+                + (startTime .HasValue ? $"&startTime={startTime.Value.GetUnixTimeStamp()}" : "")
+                + (endTime.HasValue ? $"&endTime={endTime.Value.GetUnixTimeStamp()}" : "")
+                + $"&limit={limit}";
+
+            var result = await _apiClient.CallAsync<dynamic>(ApiMethod.GET, EndPoints.Candlesticks, false, args);
 
             var parser = new CustomParser();
             var parsedResult = parser.GetParsedCandlestick(result);
@@ -184,14 +189,11 @@ public async Task<IEnumerable<Candlestick>> GetCandleSticks(string symbol, TimeI
         /// </summary>
         /// <param name="symbol">Ticker symbol.</param>
         /// <returns></returns>
-        public async Task<PriceChangeInfo> GetPriceChange24H(string symbol)
+        public async Task<IEnumerable<PriceChangeInfo>> GetPriceChange24H(string symbol = "")
         {
-            if (string.IsNullOrWhiteSpace(symbol))
-            {
-                throw new ArgumentException("symbol cannot be empty. ", "symbol");
-            }
+            var args = string.IsNullOrWhiteSpace(symbol) ? "" : $"symbol={symbol.ToUpper()}";
 
-            var result = await _apiClient.CallAsync<PriceChangeInfo>(ApiMethod.GET, EndPoints.TickerPriceChange24H, false, $"symbol={symbol.ToUpper()}");
+            var result = await _apiClient.CallAsync<IEnumerable< PriceChangeInfo>>(ApiMethod.GET, EndPoints.TickerPriceChange24H, false, args);
 
             return result;
         }
@@ -461,8 +463,8 @@ public async Task<DepositHistory> GetDepositHistory(string asset, DepositStatus?
 
             var args = $"asset={asset.ToUpper()}"
               + (status.HasValue ? $"&status={(int)status}" : "")
-              + (startTime.HasValue ? $"&startTime={Utilities.GenerateTimeStamp(startTime.Value)}" : "")
-              + (endTime.HasValue ? $"&endTime={Utilities.GenerateTimeStamp(endTime.Value)}" : "")
+              + (startTime.HasValue ? $"&startTime={startTime.Value.GetUnixTimeStamp()}" : "")
+              + (endTime.HasValue ? $"&endTime={endTime.Value.GetUnixTimeStamp()}" : "")
               + $"&recvWindow={recvWindow}";
 
             var result = await _apiClient.CallAsync<DepositHistory>(ApiMethod.POST, EndPoints.DepositHistory, true, args);

Binance.API.Csharp.Client/Utils/ExtensionMethods.cs

@@ -22,5 +22,15 @@ public static string GetDescription(this Enum value)
                     .Single(x => x.GetValue(null).Equals(value)),
                 typeof(DescriptionAttribute)))?.Description ?? value.ToString();
         }
+
+        /// <summary>
+        /// Gets a timestamp in milliseconds.
+        /// </summary>
+        /// <returns>Timestamp in milliseconds.</returns>
+        public static string GetUnixTimeStamp(this DateTime baseDateTime)
+        {
+            var dtOffset = new DateTimeOffset(baseDateTime);
+            return dtOffset.ToUnixTimeMilliseconds().ToString();
+        }
     }
 }