adelorenzo/stable
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Extract order_has_fee method

Browse Source
This commit is contained in:
Matthias 2020-04-30 07:06:06 +02:00
parent 7936120afc
commit b125dd3728
1 changed files with 13 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
freqtrade/freqtradebot.py
View File

@ -1162,6 +1162,17 @@ class FreqtradeBot:
return False return False
def _order_has_fee(self, order: Dict) -> bool:
"""
Verifies if the passed in order dict has the needed keys to extract fees
:param order: Order or trade (one trade) dict
:return: True if the fee substructure contains currency and cost, false otherwise
"""
if not isinstance(order, dict):
return False
return ('fee' in order and order['fee'] is not None and
(order['fee'].keys() >= {'currency', 'cost'}))
def get_real_amount(self, trade: Trade, order: Dict, order_amount: float = None) -> float: def get_real_amount(self, trade: Trade, order: Dict, order_amount: float = None) -> float:
""" """
Get real amount for the trade Get real amount for the trade
@ -1175,8 +1186,7 @@ class FreqtradeBot:
trade_base_currency = self.exchange.get_pair_base_currency(trade.pair) trade_base_currency = self.exchange.get_pair_base_currency(trade.pair)
# use fee from order-dict if possible # use fee from order-dict if possible
if ('fee' in order and order['fee'] is not None and if self._order_has_fee(order):
(order['fee'].keys() >= {'currency', 'cost'})):
if (order['fee']['currency'] is not None and if (order['fee']['currency'] is not None and
order['fee']['cost'] is not None and order['fee']['cost'] is not None and
trade_base_currency == order['fee']['currency']): trade_base_currency == order['fee']['currency']):
@ -1196,8 +1206,7 @@ class FreqtradeBot:
fee_abs = 0 fee_abs = 0
for exectrade in trades: for exectrade in trades:
amount += exectrade['amount'] amount += exectrade['amount']
if ("fee" in exectrade and exectrade['fee'] is not None and if self._order_has_fee(exectrade):
(exectrade['fee'].keys() >= {'currency', 'cost'})):
# only applies if fee is in quote currency! # only applies if fee is in quote currency!
if (exectrade['fee']['currency'] is not None and if (exectrade['fee']['currency'] is not None and
exectrade['fee']['cost'] is not None and exectrade['fee']['cost'] is not None and