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

rpc fix

Browse Source
This commit is contained in:
Kavinkumar 2022-02-27 12:02:08 +05:30
parent 6db6d8dcd2
commit 993b05d1ab
2 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
freqtrade/freqtradebot.py
View File

@ -690,6 +690,7 @@ class FreqtradeBot(LoggingMixin):
Sends rpc notification when a buy occurred. Sends rpc notification when a buy occurred.
""" """
open_rate = safe_value_fallback(order, 'average', 'price') open_rate = safe_value_fallback(order, 'average', 'price')
amount = order.get('filled') or order.get('amount')
if open_rate is None: if open_rate is None:
open_rate = trade.open_rate open_rate = trade.open_rate
@ -709,7 +710,7 @@ class FreqtradeBot(LoggingMixin):
'stake_amount': trade.stake_amount, 'stake_amount': trade.stake_amount,
'stake_currency': self.config['stake_currency'], 'stake_currency': self.config['stake_currency'],
'fiat_currency': self.config.get('fiat_display_currency', None), 'fiat_currency': self.config.get('fiat_display_currency', None),
'amount': order.get('amount') if fill else order.get('filled'), 'amount': order.get('amount') if fill else amount,
'open_date': trade.open_date or datetime.utcnow(), 'open_date': trade.open_date or datetime.utcnow(),
'current_rate': current_rate, 'current_rate': current_rate,
'sub_trade': sub_trade, 'sub_trade': sub_trade,
@ -1257,9 +1258,9 @@ class FreqtradeBot(LoggingMixin):
if sub_trade: if sub_trade:
amount = order.get('filled') or order.get('amount') or 0 amount = order.get('filled') or order.get('amount') or 0
profit_rate = order.get('average') or order.get('price') or 0 profit_rate = order.get('average') or order.get('price') or 0
profit = self.close_profit_abs
open_rate = trade.get_open_rate(profit, profit_rate, amount) open_rate = trade.get_open_rate(profit, profit_rate, amount)
profit_ratio = self.close_profit profit_ratio = trade.close_profit
profit = trade.close_profit_abs
else: else:
profit_rate = trade.close_rate if trade.close_rate else trade.close_rate_requested profit_rate = trade.close_rate if trade.close_rate else trade.close_rate_requested
profit = trade.calc_profit(rate=profit_rate) profit = trade.calc_profit(rate=profit_rate)

4
freqtrade/persistence/models.py
View File

@ -717,9 +717,9 @@ class LocalTrade():
:param is_open: Only search for open orders? :param is_open: Only search for open orders?
:return: latest Order object if it exists, else None :return: latest Order object if it exists, else None
""" """
orders = self.orders orders = [o for o in self.orders if not o.is_fully_realized]
if order_side: if order_side:
orders = [o for o in self.orders if o.ft_order_side == order_side] orders = [o for o in orders if o.ft_order_side == order_side]
if is_open is not None: if is_open is not None:
orders = [o for o in orders if o.ft_is_open == is_open] orders = [o for o in orders if o.ft_is_open == is_open]
if len(orders) > 0: if len(orders) > 0: