turgayacar · turgayacar · Feb 20, 2018 · Feb 20, 2018 · Feb 20, 2018 · Feb 20, 2018
diff --git a/.travis.yml b/.travis.yml
@@ -0,0 +1,7 @@
+language: csharp
+mono: none
+dotnet: 2.1
+script:
+ - dotnet build src/Binance --framework "netstandard2.0"
+ - dotnet test test/Binance.Tests
+
diff --git a/Binance.sln b/Binance.sln
@@ -1,7 +1,7 @@
 
 Microsoft Visual Studio Solution File, Format Version 12.00
 # Visual Studio 15
-VisualStudioVersion = 15.0.27130.2024
+VisualStudioVersion = 15.0.27130.2036
 MinimumVisualStudioVersion = 10.0.40219.1
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Samples", "Samples", "{8871736C-4CDB-47C5-B73A-BED3CA46164A}"
 EndProject
@@ -32,13 +32,7 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Tools", "Tools", "{4D701143
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Binance24HourStatistics", "samples\Binance24HourStatistics\Binance24HourStatistics.csproj", "{DF3370A6-FB19-4160-B46C-4EAAAFB510AD}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "BinanceClassicConsoleApp", "samples\BinanceClassicConsoleApp\BinanceClassicConsoleApp.csproj", "{BC43C0B3-1EF1-458E-9A97-B9A4FD9FE5F9}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "BinanceWebApp", "samples\BinanceWebApp\BinanceWebApp.csproj", "{A9FA64FF-B0CF-4B5B-8AC9-2491F11747EE}"
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "BinanceClassicWebApp", "samples\BinanceClassicWebApp\BinanceClassicWebApp.csproj", "{6C70F1C4-86BE-40E0-9B9A-6F5373E21F28}"
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Binance.WebSocket.WebSocketSharp", "samples\Binance.WebSocket.WebSocketSharp\Binance.WebSocket.WebSocketSharp.csproj", "{FE699962-ABF9-4BD9-B27A-DA242D6C7F11}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Binance.WebSocket.WebSocketSharp", "samples\Binance.WebSocket.WebSocketSharp\Binance.WebSocket.WebSocketSharp.csproj", "{FE699962-ABF9-4BD9-B27A-DA242D6C7F11}"
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Binance.WebSocket.WebSocket4Net", "samples\Binance.WebSocket.WebSocket4Net\Binance.WebSocket.WebSocket4Net.csproj", "{67C1BE38-527F-424D-85A6-DFD8117E21D1}"
 EndProject
@@ -84,18 +78,6 @@ Global
 		{DF3370A6-FB19-4160-B46C-4EAAAFB510AD}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{DF3370A6-FB19-4160-B46C-4EAAAFB510AD}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{DF3370A6-FB19-4160-B46C-4EAAAFB510AD}.Release|Any CPU.Build.0 = Release|Any CPU
-		{BC43C0B3-1EF1-458E-9A97-B9A4FD9FE5F9}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{BC43C0B3-1EF1-458E-9A97-B9A4FD9FE5F9}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{BC43C0B3-1EF1-458E-9A97-B9A4FD9FE5F9}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{BC43C0B3-1EF1-458E-9A97-B9A4FD9FE5F9}.Release|Any CPU.Build.0 = Release|Any CPU
-		{A9FA64FF-B0CF-4B5B-8AC9-2491F11747EE}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{A9FA64FF-B0CF-4B5B-8AC9-2491F11747EE}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{A9FA64FF-B0CF-4B5B-8AC9-2491F11747EE}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{A9FA64FF-B0CF-4B5B-8AC9-2491F11747EE}.Release|Any CPU.Build.0 = Release|Any CPU
-		{6C70F1C4-86BE-40E0-9B9A-6F5373E21F28}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{6C70F1C4-86BE-40E0-9B9A-6F5373E21F28}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{6C70F1C4-86BE-40E0-9B9A-6F5373E21F28}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{6C70F1C4-86BE-40E0-9B9A-6F5373E21F28}.Release|Any CPU.Build.0 = Release|Any CPU
 		{FE699962-ABF9-4BD9-B27A-DA242D6C7F11}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{FE699962-ABF9-4BD9-B27A-DA242D6C7F11}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{FE699962-ABF9-4BD9-B27A-DA242D6C7F11}.Release|Any CPU.ActiveCfg = Release|Any CPU
@@ -117,9 +99,6 @@ Global
 		{6B373EAC-2ADD-49BB-B2FC-01A873DF752B} = {8871736C-4CDB-47C5-B73A-BED3CA46164A}
 		{D4767C0E-FDF3-43E0-8E3C-D29D6FC0A667} = {4D701143-0BA1-49BB-9838-AC64DA88FBD7}
 		{DF3370A6-FB19-4160-B46C-4EAAAFB510AD} = {8871736C-4CDB-47C5-B73A-BED3CA46164A}
-		{BC43C0B3-1EF1-458E-9A97-B9A4FD9FE5F9} = {8871736C-4CDB-47C5-B73A-BED3CA46164A}
-		{A9FA64FF-B0CF-4B5B-8AC9-2491F11747EE} = {8871736C-4CDB-47C5-B73A-BED3CA46164A}
-		{6C70F1C4-86BE-40E0-9B9A-6F5373E21F28} = {8871736C-4CDB-47C5-B73A-BED3CA46164A}
 		{FE699962-ABF9-4BD9-B27A-DA242D6C7F11} = {8871736C-4CDB-47C5-B73A-BED3CA46164A}
 		{67C1BE38-527F-424D-85A6-DFD8117E21D1} = {8871736C-4CDB-47C5-B73A-BED3CA46164A}
 	EndGlobalSection

diff --git a/README.md b/README.md
@@ -1,32 +1,38 @@
 # Binance ![](https://github.com/sonvister/Binance/blob/master/images/logo.png?raw=true)
-A full-featured .NET **[Binance API](https://www.binance.com/restapipub.html)** designed for ease of use.
+A .NET API library (a.k.a. wrapper) for the **[official Binance web API](https://github.com/binance-exchange/binance-official-api-docs)**.
+
+Compatible with **.NET Standard 2.0** and **.NET Framework 4.7.1**
+
+Built using [TAP (Task-based Asynchronous Pattern)](https://docs.microsoft.com/en-us/dotnet/standard/asynchronous-programming-patterns/task-based-asynchronous-pattern-tap).
 
 [![](https://img.shields.io/github/last-commit/sonvister/Binance.svg)](https://github.com/sonvister/Binance)
 
 ## Features
-* Compatible with **.NET Standard 2.0** and **.NET Framework 4.7.1**.
-* **Complete** coverage of the [Binance API](https://www.binance.com/restapipub.html) including all REST and WebSocket endpoints (*with combined streams*).
-  * A Binance account API Key is *not required* to access *public* REST and WebSocket endpoints (*most market data*).
-* **Simple** API abstraction using domain/value objects that do not expose underlying (*HTTP/REST*) behavior.
+* **Beta** release with majority coverage of the official [Binance API](https://github.com/binance-exchange/binance-official-api-docs) including REST API and Web Sockets.
+  * *NOTE: Not actively adding new features or providing support...*
+  * Binance account API-Key is *not required* to access the *public* REST and Web Socket endpoints (*most market data*).
+* Easy-to-use **Web Socket managers** (*with combined streams*) and **in-memory cache** implementations (*with events*).
 * **Convenient** assets and symbols (e.g. `Symbol.BTC_USDT`) with exchange info (*price/quantity: min, max, etc.*).
   * With methods for validating (*w/ or w/o exceptions*) client order price, quantity, and type for a symbol.
-* Consistent use of **domain models** whether you're querying the API or using real-time WebSocket client events.
-* Customizable **dual-layer API** with access to JSON responses (*low-level*) or deserialized domain/value objects.
-  * Same serializers used in `BinanceApi` are available to provide application-level deserialization of JSON data.
-* API exceptions provide the Binance server response **ERROR code and message** for easier troubleshooting.
-* Unique implementation supports **multiple users** and requires user authentication only where necessary.
-* Web API interface includes automatic **rate limiting** and system-to-server **time synchronization** for reliability.
+* REST API includes automatic **rate limiting** and system-to-server **time synchronization** for reliability.
   * Advanced rate limiting includes distinct (request and order) rate limiters with **endpoint weights** incorporated. 
-* Easy-to-use **WebSocket endpoint clients** and various ready-to-use **caching** implementations (*with events*).
-* Low-level `BinanceHttpClient` API utilizes a single, cached HttpClient for performance (*and implemented as singleton*).
-* **Limited dependencies** and use of Microsoft extensions for **dependency injection**, **logging**, and **options**.
+* Unique REST API implementation supports **multiple users** and requires user authentication only where necessary.
+* REST API exceptions provide the Binance server response **ERROR code and message** for easier troubleshooting.
+* REST API (*low-level*) utilizes a single, cached `HttpClient` for performance (*implemented as singleton*).
+* **Simple** API abstraction using domain/value objects that do not expose underlying (*HTTP/REST*) behavior.
+  * Consistent use of **domain models** between REST API queries and real-time Web Socket client events.
+* Customizable **multi-layer API** with access to (*low-level*) JSON responses or deserialized domain/value objects.
+  * Same serializers used in `BinanceApi` are available for application-level deserialization of JSON data.
+* **Limited dependencies** with use of Microsoft extensions for **dependency injection**, **logging**, and **options**.
 * Multiple .NET **sample applications** including live displays of market depth, trades, and candlesticks for a symbol.
   * Alternative `IWebSocketClients` for using **WebSocketSharp** or **WebSocket4Net** (*for Windows 7 compatibility*).
   * How to **efficiently** use combined streams with a single, application-wide, web socket (`BinanceWebSocketStream`).
 
 ## Getting Started
 ### Binance Sign-up
-To use the private (*authenticated*) API methods you must have an account with Binance and create an API Key. Please use my Referral ID: **10899093** when you [**Register**](https://www.binance.com/register.html?ref=10899093) (*an account is not required to access the public market data*).
+To use the private (*authenticated*) API methods you must have an account with Binance and create an API-Key. Please use my Referral ID: **10899093** when you [**Register**](https://www.binance.com/register.html?ref=10899093) (*it's an easy way to give back at no cost to you*).
+
+*NOTE*: An account is *not* required to access the public market data.
 
 ### Installation
 Using [Nuget](https://www.nuget.org/packages/Binance/) Package Manager:
@@ -36,25 +42,139 @@ PM> Install-Package Binance
 [![](https://img.shields.io/nuget/v/Binance.svg)](https://www.nuget.org/packages/Binance)\
 [![](https://img.shields.io/nuget/dt/Binance.svg)](https://www.nuget.org/packages/Binance)
 
+### Example Usage
+#### REST API
+Test connectivity.
+
+```C#
+using Binance;
+
+// Initialize REST API client.
+var api = new BinanceApi();
+
+// Check connectivity.
+if (await api.PingAsync())
+{
+    Console.WriteLine("Successful!");
+}
+```
+
+Place a TEST market order.
+
+```C#
+using Binance;
+
+var api = new BinanceApi();
+
+// Create user with API-Key and API-Secret.
+using (var user = new BinanceApiUser("<API-Key>", "<API-Secret>"))
+{
+    // Create a client (MARKET) order.
+    var clientOrder = new MarketOrder(user)
+    {
+        Symbol = Symbol.BTC_USDT,
+        Side = OrderSide.Buy,
+        Quantity = 0.01m
+    };
+
+    try
+    {
+        // Send the TEST order.
+        await api.TestPlaceAsync(clientOrder);
+
+        Console.WriteLine("TEST Order Successful!");
+    }
+    catch (Exception e)
+    {
+        Console.WriteLine($"TEST Order Failed: \"{e.Message}\"");
+    }
+}
+```
+
+#### Web Socket
+Get real-time aggregate trades (*with automatic web socket re-connect*).
+
+```C#
+using Binance;
+using Binance.WebSocket;
+
+// Initialize web socket client (with automatic streaming).
+var webSocketClient = new AggregateTradeWebSocketClient();
+
+// Handle error events.
+webSocketClient.Error += (s, e) => { Console.WriteLine(e.Exception.Message); };
+
+// Subscribe callback to BTC/USDT (automatically begin streaming).
+webSocketClient.Subscribe(Symbol.BTC_USDT, evt =>
+{
+    var side = evt.Trade.IsBuyerMaker ? "SELL" : "BUY ";
+
+    // Handle aggregate trade events.
+    Console.WriteLine($"{evt.Trade.Symbol} {side} {evt.Trade.Quantity} @ {evt.Trade.Price}");
+});
+
+// ...
+
+// Unsubscribe (automatically end streaming).
+webSocketClient.Unsubscribe();
+```
+
+Maintain real-time order book (market depth) cache.
+
+```C#
+using Binance;
+using Binance.Cache;
+using Binance.WebSocket;
+
+// Initialize web socket cache (with automatic streaming).
+var webSocketCache = new DepthWebSocketCache();
+
+// Handle error events.
+webSocketCache.Error += (s, e) => { Console.WriteLine(e.Exception.Message); };
+
+// Subscribe callback to BTC/USDT (automatically begin streaming).
+webSocketCache.Subscribe(Symbol.BTC_USDT, evt =>
+{
+    // Get symbol from cache (update cache if a symbol is missing).
+    var symbol = Symbol.Cache.Get(evt.OrderBook.Symbol);
+
+    var minBidPrice = evt.OrderBook.Bids.Last().Price;
+    var maxAskPrice = evt.OrderBook.Asks.Last().Price;
+
+    // Handle order book update events.
+    Console.WriteLine($"Bid Quantity: {evt.OrderBook.Depth(minBidPrice)} {symbol.BaseAsset} - " +
+                      $"Ask Quantity: {evt.OrderBook.Depth(maxAskPrice)} {symbol.BaseAsset}");
+});
+
+// ...
+
+// Unsubscribe (automatically end streaming).
+webSocketCache.Unsubscribe();
+```
+
+## Documentation
+See: [**Wiki**](https://github.com/sonvister/Binance/wiki)
+
+***NOTE**: The [samples](https://github.com/sonvister/Binance/blob/master/samples) demonstrate up-to-date usage of this library.*
+
+### Binance Exchange API (*for reference*)
+REST/WebSocket details: [Binance Official Documentation](https://github.com/binance-exchange/binance-official-api-docs)\
+REST/WebSocket questions: [Binance Official API Telegram](https://t.me/binance_api_english) (*not for questions about this library*)
+
 ## Development
 The master branch is *currently* used for development and may differ from the latest release.\
 To get the source code for a particular release, first select the corresponding **Tag**.
 
 ### Build Environment
 [Microsoft Visual Studio Community 2017](https://www.visualstudio.com/vs/community/)
 
-## Documentation
-See [**Wiki**](https://github.com/sonvister/Binance/wiki)
-
-*NOTE: Some information is currently out-of-date ...will be updated soon.*
+![Build status](https://travis-ci.org/sonvister/Binance.svg?branch=master)
 
 ## Donate
-DCR: Dsog2jYLS65Y3N2jDQSxsiBYC3SRqq7TGd4\
-LTC: MNhGkftcFDE7TsFFvtE6W9VVKhxH74T3eM\
-XEM: NC3HR4-V46BTS-LIKEE4-2GZQBB-FHBUXO-CG7EBO-VIMP\
-DASH: XmFvpRgwfDRdN9wbrZjHZeH63Rt9CwHqUf\
-ZEC: t1Ygz58dkcx2WXuGCjGiPo8w7Q1dcCSscGJ\
-ETH: 0x3BFd7B3EAA6aE6BCF861B9B1803d67abe9360bca\
-BTC: 3JjG3tRR1dx98UJyNdpzpkrxRjXmPfQHk9
+**Decred (DCR)**: Dsd7amDBfC7n6G93NJzbaJjUdiSeN5D3tmR
 
 Thank you.
+
+Follow [@sonvister](https://twitter.com/sonvister)
+
+[![Donate NIM](https://www.nimiq.com/accept-donations/img/donationBtnImg/orange-small.svg)](https://safe.nimiq.com/#_request/NQ13481VT3VVKRENJJL39B5J7DJMHF4CRCVL_)
diff --git a/images/architecture.png b/images/architecture.png
diff --git a/images/logo.png b/images/logo.png
diff --git a/samples/Binance.Application/Binance.Application.csproj b/samples/Binance.Application/Binance.Application.csproj
@@ -13,7 +13,8 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.Extensions.Configuration.Abstractions" Version="2.0.0" />
+    <PackageReference Include="Microsoft.Extensions.Configuration.Abstractions" Version="2.2.0" />
+    <PackageReference Include="Microsoft.Extensions.Logging" Version="2.2.0" />
   </ItemGroup>
 
   <ItemGroup>

diff --git a/...ion/Extensions/LoggerFactoryExtensions.cs → ...on/Extensions/LoggingBuilderExtensions.cs b/...ion/Extensions/LoggerFactoryExtensions.cs → ...on/Extensions/LoggingBuilderExtensions.cs
@@ -6,9 +6,9 @@
 // ReSharper disable once CheckNamespace
 namespace Binance.Application
 {
-    public static class LoggerFactoryExtensions
+    public static class LoggingBuilderExtensions
     {
-        public static ILoggerFactory AddFile(this ILoggerFactory factory, IConfiguration configuration)
+        public static ILoggingBuilder AddFile(this ILoggingBuilder builder, IConfiguration configuration)
         {
             if (configuration == null)
                 throw new ArgumentNullException(nameof(configuration));
@@ -37,20 +37,20 @@ public static ILoggerFactory AddFile(this ILoggerFactory factory, IConfiguration
                 }
             }
 
-            return AddFile(factory, filePath, level);
+            return AddFile(builder, filePath, level);
         }
 
-        public static ILoggerFactory AddFile(this ILoggerFactory factory, string filePath, LogLevel level = LogLevel.Information)
+        public static ILoggingBuilder AddFile(this ILoggingBuilder builder, string filePath, LogLevel level = LogLevel.Information)
         {
-            if (factory == null)
-                throw new ArgumentNullException(nameof(factory), $"{nameof(ILoggerFactory)} is null (add Microsoft.Extensions.Logging NuGet package).");
+            if (builder == null)
+                throw new ArgumentNullException(nameof(builder), $"{nameof(ILoggerFactory)} is null (add Microsoft.Extensions.Logging NuGet package).");
 
             if (filePath == null)
                 throw new ArgumentNullException(nameof(filePath));
 
-            factory.AddProvider(new FileLoggerProvider(filePath, level));
+            builder.AddProvider(new FileLoggerProvider(filePath, level));
 
-            return factory;
+            return builder;
         }
     }
 }
diff --git a/samples/Binance.Application/Extensions/OrderBookExtensions.cs b/samples/Binance.Application/Extensions/OrderBookExtensions.cs
@@ -2,7 +2,6 @@
 using System.IO;
 using System.Linq;
 using System.Text;
-using Binance.Market;
 
 // ReSharper disable once CheckNamespace
 namespace Binance.Application

diff --git a/samples/Binance.Application/Logging/FileLogger.cs b/samples/Binance.Application/Logging/FileLogger.cs
@@ -8,7 +8,7 @@ public sealed class FileLogger : ILogger
     {
         #region Private Constants
 
-        private const string Spaces = "      ";
+        private const string Spaces = "       ";
 
         #endregion Private Constants
 
@@ -78,9 +78,14 @@ public void Log<TState>(LogLevel logLevel, EventId eventId, TState state, Except
                             streamWriter.WriteLine($"{Spaces}{line}");
                         }
 
-                        if (exception != null)
+                        var prefix = string.Empty;
+
+                        while (exception != null)
                         {
-                            streamWriter.WriteLine($"{Spaces}(exception: \"{exception.Message}\")");
+                            streamWriter.WriteLine($"{Spaces}{prefix}(exception: \"{exception.Message}\")");
+
+                            prefix += "  ";
+                            exception = exception.InnerException;
                         }
 
                         streamWriter.Flush();

diff --git a/samples/Binance.WebSocket.WebSocket4Net/Binance.WebSocket.WebSocket4Net.csproj b/samples/Binance.WebSocket.WebSocket4Net/Binance.WebSocket.WebSocket4Net.csproj
@@ -2,17 +2,17 @@
 
   <PropertyGroup>
     <TargetFramework>netstandard2.0</TargetFramework>
-    <Version>0.1.1</Version>
-    <AssemblyVersion>0.1.1.0</AssemblyVersion>
-    <FileVersion>0.1.1.0</FileVersion>
+    <Version>0.2.0</Version>
+    <AssemblyVersion>0.2.0.1</AssemblyVersion>
+    <FileVersion>0.2.0.1</FileVersion>
     <Authors>sonvister</Authors>
     <Company />
     <Copyright>Copyright © 2018 sonvister</Copyright>
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="2.0.0" />
-    <PackageReference Include="WebSocket4Net" Version="0.15.1" />
+    <PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="2.2.0" />
+    <PackageReference Include="WebSocket4Net" Version="0.15.2" />
   </ItemGroup>
 
   <ItemGroup>