API: Always calculate fees

Fixes DeviaVir#1193
defkev · Jan 22, 2018 · 06f8cae · 06f8cae
1 parent 11a2138
commit 06f8cae
Showing 1 changed file with 20 additions and 4 deletions.
diff --git a/lib/engine.js b/lib/engine.js
@@ -579,20 +579,28 @@ module.exports = function container (get, set, clear) {
       if (s.buy_order) {
         if (so.mode === 'live' || trade.price <= Number(s.buy_order.price)) {
           price = s.buy_order.price
+          if (so.order_type === 'maker') {
+            if (s.exchange.makerFee) {
+              fee = n(s.buy_order.size).multiply(s.exchange.makerFee / 100).value()
+            }
+          }
+          if (so.order_type === 'taker') {
+            if (s.exchange.takerFee) {
+              fee = n(s.buy_order.size).multiply(s.exchange.takerFee / 100).value()
+            }
+          }
           if (so.mode !== 'live') {
             s.balance.asset = n(s.balance.asset).add(s.buy_order.size).format('0.00000000')
             let total = n(price).multiply(s.buy_order.size)
             s.balance.currency = n(s.balance.currency).subtract(total).format('0.00000000')
             if (so.order_type === 'maker') {
               price = n(s.buy_order.price).add(n(s.buy_order.price).multiply(so.avg_slippage_pct / 100)).format('0.00000000')
               if (s.exchange.makerFee) {
-                fee = n(s.buy_order.size).multiply(s.exchange.makerFee / 100).value()
                 s.balance.asset = n(s.balance.asset).subtract(fee).format('0.00000000')
               }
             }
             if (so.order_type === 'taker') {
               if (s.exchange.takerFee) {
-                fee = n(s.buy_order.size).multiply(s.exchange.takerFee / 100).value()
                 s.balance.asset = n(s.balance.asset).subtract(fee).format('0.00000000')
               }
             }
@@ -631,20 +639,28 @@ module.exports = function container (get, set, clear) {
       else if (s.sell_order) {
         if (so.mode === 'live' || trade.price >= s.sell_order.price) {
           price = s.sell_order.price
+          if (so.order_type === 'maker') {
+            if (s.exchange.makerFee) {
+              fee = n(s.sell_order.size).multiply(s.exchange.makerFee / 100).multiply(price).value()
+            }
+          }
+          if (so.order_type === 'taker') {
+            if (s.exchange.takerFee) {
+              fee = n(s.sell_order.size).multiply(s.exchange.takerFee / 100).multiply(price).value()
+            }
+          }
           if (so.mode !== 'live') {
             s.balance.asset = n(s.balance.asset).subtract(s.sell_order.size).value()
             let total = n(price).multiply(s.sell_order.size)
             s.balance.currency = n(s.balance.currency).add(total).value()
             if (so.order_type === 'maker') {
               price = n(s.sell_order.price).subtract(n(s.sell_order.price).multiply(so.avg_slippage_pct / 100)).format('0.00000000')
               if (s.exchange.makerFee) {
-                fee = n(s.sell_order.size).multiply(s.exchange.makerFee / 100).multiply(price).value()
                 s.balance.currency = n(s.balance.currency).subtract(fee).format('0.00000000')
               }
             }
             if (so.order_type === 'taker') {
               if (s.exchange.takerFee) {
-                fee = n(s.sell_order.size).multiply(s.exchange.takerFee / 100).multiply(price).value()
                 s.balance.currency = n(s.balance.currency).subtract(fee).format('0.00000000')
               }
             }