From 05d93cda16ffb9582e2c8e44ba2022a2b67adb4c Mon Sep 17 00:00:00 2001 From: hroff-1902 Date: Thu, 27 Jun 2019 01:03:38 +0300 Subject: [PATCH] fix #1963 --- freqtrade/freqtradebot.py | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/freqtrade/freqtradebot.py b/freqtrade/freqtradebot.py index b6fc005dd..b3e0ef59d 100644 --- a/freqtrade/freqtradebot.py +++ b/freqtrade/freqtradebot.py @@ -478,8 +478,11 @@ class FreqtradeBot(object): return order_amount # use fee from order-dict if possible - if 'fee' in order and order['fee'] and (order['fee'].keys() >= {'currency', 'cost'}): - if trade.pair.startswith(order['fee']['currency']): + if 'fee' in order and order['fee'] is not None and \ + (order['fee'].keys() >= {'currency', 'cost'}): + if order['fee']['currency'] is not None and \ + order['fee']['cost'] is not None and \ + trade.pair.startswith(order['fee']['currency']): new_amount = order_amount - order['fee']['cost'] logger.info("Applying fee on amount for %s (from %s to %s) from Order", trade, order['amount'], new_amount) @@ -496,9 +499,12 @@ class FreqtradeBot(object): fee_abs = 0 for exectrade in trades: amount += exectrade['amount'] - if "fee" in exectrade and (exectrade['fee'].keys() >= {'currency', 'cost'}): + if "fee" in exectrade and exectrade['fee'] is not None and \ + (exectrade['fee'].keys() >= {'currency', 'cost'}): # only applies if fee is in quote currency! - if trade.pair.startswith(exectrade['fee']['currency']): + if exectrade['fee']['currency'] is not None and \ + exectrade['fee']['cost'] is not None and \ + trade.pair.startswith(exectrade['fee']['currency']): fee_abs += exectrade['fee']['cost'] if amount != order_amount: