From b0805724de94bc223e27d402c5a2299c401d46c6 Mon Sep 17 00:00:00 2001
From: atp4al <36592911+atp4al@users.noreply.github.com>
Date: Thu, 19 Jul 2018 17:19:50 +0200
Subject: [PATCH] Improve Bitstamp API and add a way to retrieve fees (#212)

* Add the possibility to send market orders with Bitstamp

When the order type is Market:
- we add "/market" in the url
- we do not send the price

* Delete .orig file

* Add .nuget

* Add the possibility to send market orders with Bitstamp

When the order type is Market:
- we add "/market" in the url
- we do not send the price

* Add .nuget

* Add a way to retrieve fees for each currency pair and implement the method for Bitstamp

Refactor the methods OnGetAmountsAsync, OnGetAmountsAvailableToTradeAsync to use the same logic as in OnGetFeesAsync
---
 .nuget/Nuget.config                           |  9 ++++
 .../Exchanges/Bitstamp/ExchangeBitstampAPI.cs | 53 ++++++++++++-------
 .../API/Exchanges/_Base/ExchangeAPI.cs        | 19 +++++++
 .../API/Exchanges/_Base/IExchangeAPI.cs       | 12 +++++
 4 files changed, 74 insertions(+), 19 deletions(-)
 create mode 100644 .nuget/Nuget.config

diff --git a/.nuget/Nuget.config b/.nuget/Nuget.config
new file mode 100644
index 00000000..49430d5e
--- /dev/null
+++ b/.nuget/Nuget.config
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<configuration>
+    <config>
+        <add key="repositoryPath" value="..\..\packages" />
+    </config>
+    <packageRestore>
+        <add key="enabled" value="True" />
+    </packageRestore>
+</configuration>
\ No newline at end of file
diff --git a/ExchangeSharp/API/Exchanges/Bitstamp/ExchangeBitstampAPI.cs b/ExchangeSharp/API/Exchanges/Bitstamp/ExchangeBitstampAPI.cs
index cf00d5b1..802d01b7 100644
--- a/ExchangeSharp/API/Exchanges/Bitstamp/ExchangeBitstampAPI.cs
+++ b/ExchangeSharp/API/Exchanges/Bitstamp/ExchangeBitstampAPI.cs
@@ -151,36 +151,45 @@ protected override async Task<Dictionary<string, decimal>> OnGetAmountsAsync()
         {
             string url = "/balance/";
             var payload = await OnGetNoncePayloadAsync();
-            JObject responseObject = await MakeJsonRequestAsync<JObject>(url, null, payload, "POST");
-            Dictionary<string, decimal> balances = new Dictionary<string, decimal>();
-            foreach (var property in responseObject)
-            {
-                if (property.Key.Contains("_balance"))
-                {
-                    decimal balance = property.Value.ConvertInvariant<decimal>();
-                    if (balance == 0) { continue; }
-                    balances.Add(property.Key.Replace("_balance", "").Trim(), balance);
-                }
-            }
-            return balances;
+            var responseObject = await MakeJsonRequestAsync<JObject>(url, null, payload, "POST");
+            return ExtractDictionary(responseObject, "balance");
+        }
+
+
+        protected override async Task<Dictionary<string, decimal>> OnGetFeesAsync()
+        {
+            string url = "/balance/";
+            var payload = await OnGetNoncePayloadAsync();
+            var responseObject = await MakeJsonRequestAsync<JObject>(url, null, payload, "POST");
+            return ExtractDictionary(responseObject, "fee");
         }
 
         protected override async Task<Dictionary<string, decimal>> OnGetAmountsAvailableToTradeAsync()
         {
             string url = "/balance/";
             var payload = await OnGetNoncePayloadAsync();
-            JObject responseObject = await MakeJsonRequestAsync<JObject>(url, null, payload, "POST");
-            Dictionary<string, decimal> balances = new Dictionary<string, decimal>();
+            var responseObject = await MakeJsonRequestAsync<JObject>(url, null, payload, "POST");
+            return ExtractDictionary(responseObject, "available");
+        }
+
+        private static Dictionary<string, decimal> ExtractDictionary(JObject responseObject, string key)
+        {
+            var result = new Dictionary<string, decimal>();
+            var suffix = $"_{key}";
             foreach (var property in responseObject)
             {
-                if (property.Key.Contains("_available"))
+                if (property.Key.Contains(suffix))
                 {
-                    decimal balance = property.Value.ConvertInvariant<decimal>();
-                    if (balance == 0) { continue; }
-                    balances.Add(property.Key.Replace("_available", "").Trim(), balance);
+                    decimal value = property.Value.ConvertInvariant<decimal>();
+                    if (value == 0)
+                    {
+                        continue;
+                    }
+
+                    result.Add(property.Key.Replace(suffix, "").Trim(), value);
                 }
             }
-            return balances;
+            return result;
         }
 
         protected override async Task<ExchangeOrderResult> OnPlaceOrderAsync(ExchangeOrderRequest order)
@@ -197,6 +206,12 @@ protected override async Task<ExchangeOrderResult> OnPlaceOrderAsync(ExchangeOrd
                 payload["price"] = order.Price.ToStringInvariant();
             }
 
+            payload["amount"] = order.Amount.ToStringInvariant();
+            foreach (var kv in order.ExtraParameters)
+            {
+                payload["price"] = order.Price.ToStringInvariant();
+            }
+
             payload["amount"] = order.RoundAmount().ToStringInvariant();
             order.ExtraParameters.CopyTo(payload);
 
diff --git a/ExchangeSharp/API/Exchanges/_Base/ExchangeAPI.cs b/ExchangeSharp/API/Exchanges/_Base/ExchangeAPI.cs
index 5c5b7067..3bd2a4a6 100644
--- a/ExchangeSharp/API/Exchanges/_Base/ExchangeAPI.cs
+++ b/ExchangeSharp/API/Exchanges/_Base/ExchangeAPI.cs
@@ -118,6 +118,7 @@ await GetHistoricalTradesAsync((e) =>
         protected virtual Task<IEnumerable<ExchangeTransaction>> OnGetDepositHistoryAsync(string symbol) => throw new NotImplementedException();
         protected virtual Task<IEnumerable<MarketCandle>> OnGetCandlesAsync(string symbol, int periodSeconds, DateTime? startDate = null, DateTime? endDate = null, int? limit = null) => throw new NotImplementedException();
         protected virtual Task<Dictionary<string, decimal>> OnGetAmountsAsync() => throw new NotImplementedException();
+        protected virtual Task<Dictionary<string, decimal>> OnGetFeesAsync() => throw new NotImplementedException();
         protected virtual Task<Dictionary<string, decimal>> OnGetAmountsAvailableToTradeAsync() => throw new NotImplementedException();
         protected virtual Task<ExchangeOrderResult> OnPlaceOrderAsync(ExchangeOrderRequest order) => throw new NotImplementedException();
         protected virtual Task<ExchangeOrderResult> OnGetOrderDetailsAsync(string orderId, string symbol = null) => throw new NotImplementedException();
@@ -846,6 +847,24 @@ public async Task<Dictionary<string, decimal>> GetAmountsAsync()
             return await OnGetAmountsAsync();
         }
 
+
+        /// <summary>
+        ///  Get fees
+        /// </summary>
+        /// <returns>The customer trading fees</returns>
+        public Dictionary<string, decimal> GetFees() => GetFeesAync().GetAwaiter().GetResult();
+
+        /// <summary>
+        /// ASYNC - Get fees
+        /// </summary>
+        /// <returns>The customer trading fees</returns>
+        public async Task<Dictionary<string, decimal>> GetFeesAync()
+        {
+            await new SynchronizationContextRemover();
+            return await OnGetFeesAsync();
+        }
+
+
         /// <summary>
         /// Get amounts available to trade, symbol / amount dictionary
         /// </summary>
diff --git a/ExchangeSharp/API/Exchanges/_Base/IExchangeAPI.cs b/ExchangeSharp/API/Exchanges/_Base/IExchangeAPI.cs
index f2942407..60d51346 100644
--- a/ExchangeSharp/API/Exchanges/_Base/IExchangeAPI.cs
+++ b/ExchangeSharp/API/Exchanges/_Base/IExchangeAPI.cs
@@ -438,6 +438,18 @@ public interface IExchangeAPI : IDisposable
         /// <param name="symbol">Symbol</param>
         /// <returns>Close margin position result</returns>
         Task<ExchangeCloseMarginPositionResult> CloseMarginPositionAsync(string symbol);
+         
+        /// <summary>
+        /// Get fees
+        /// </summary>
+        /// <returns>The customer trading fees</returns>
+        Dictionary<string, decimal> GetFees();
+
+        /// <summary>
+        /// ASYNC - Get fees
+        /// </summary>
+        /// <returns>The customer trading fees</returns>
+        Task<Dictionary<string, decimal>> GetFeesAync();
 
         #endregion REST