From 6db6d8dcd29d16d00023f8ad9622b34af151ac33 Mon Sep 17 00:00:00 2001
From: Kavinkumar <33546454+mkavinkumar1@users.noreply.github.com>
Date: Sun, 27 Feb 2022 10:09:35 +0530
Subject: [PATCH] fix rpc

---
 freqtrade/freqtradebot.py       | 12 ++++++-----
 freqtrade/persistence/models.py | 37 ++++++++++++++++-----------------
 2 files changed, 25 insertions(+), 24 deletions(-)

diff --git a/freqtrade/freqtradebot.py b/freqtrade/freqtradebot.py
index 86d86ec30..c22d99a2d 100644
--- a/freqtrade/freqtradebot.py
+++ b/freqtrade/freqtradebot.py
@@ -709,7 +709,7 @@ class FreqtradeBot(LoggingMixin):
             'stake_amount': trade.stake_amount,
             'stake_currency': self.config['stake_currency'],
             'fiat_currency': self.config.get('fiat_display_currency', None),
-            'amount': order.get('filled') or order.get('amount'),
+            'amount': order.get('amount') if fill else order.get('filled'),
             'open_date': trade.open_date or datetime.utcnow(),
             'current_rate': current_rate,
             'sub_trade': sub_trade,
@@ -1257,10 +1257,9 @@ class FreqtradeBot(LoggingMixin):
         if sub_trade:
             amount = order.get('filled') or order.get('amount') or 0
             profit_rate = order.get('average') or order.get('price') or 0
-            profit = trade.process_sell_sub_trade(order, is_closed=False)
+            profit = self.close_profit_abs
             open_rate = trade.get_open_rate(profit, profit_rate, amount)
-            open_cost=open_rate * amount * (1+ trade.fee_open)
-            profit_ratio =  ( open_cost + profit)/open_cost - 1
+            profit_ratio =  self.close_profit
         else:    
             profit_rate = trade.close_rate if trade.close_rate else trade.close_rate_requested
             profit = trade.calc_profit(rate=profit_rate)
@@ -1484,6 +1483,7 @@ class FreqtradeBot(LoggingMixin):
                 return order_amount
         return self.fee_detection_from_trades(trade, order, order_amount, order.get('trades', []))
 
+    rpc_msg = {}
     def fee_detection_from_trades(self, trade: Trade, order: Dict, order_amount: float,
                                   trades: List) -> float:
         """
@@ -1502,7 +1502,9 @@ class FreqtradeBot(LoggingMixin):
 
                     
             }
-            self.rpc.send_msg(msg)
+            if not self.rpc_msg.get(trade.id):
+                self.rpc.send_msg(msg)
+                self.rpc_msg[trade.id] = 1
             return order_amount
         fee_currency = None
         amount = 0
diff --git a/freqtrade/persistence/models.py b/freqtrade/persistence/models.py
index db757d14b..ea8158927 100644
--- a/freqtrade/persistence/models.py
+++ b/freqtrade/persistence/models.py
@@ -491,7 +491,7 @@ class LocalTrade():
             raise ValueError(f'Unknown order type: {order_type}')
         Trade.commit()
 
-    def process_sell_sub_trade(self, order: Dict, is_closed: bool = True) -> float:
+    def process_sell_sub_trade(self, order: Dict) -> float:
         orders = (self.select_filled_orders('buy'))
         
         if len(orders)<1:
@@ -502,11 +502,11 @@ class LocalTrade():
         # is_closed = order['ft_is_open']
         sell_amount = order.get('filled') or order.get('amount')
         sell_rate = order.get('average') or order.get('price')
-        if is_closed:
-            if sell_amount == self.amount:
-                self.close(sell_rate)
-                Trade.commit()
-                return
+        sell_stake_amount = sell_rate * sell_amount * (1 - self.fee_close)
+        if sell_amount == self.amount:
+            self.close(sell_rate)
+            Trade.commit()
+            return
         profit = 0.0
         idx = -1
         while sell_amount:
@@ -515,26 +515,25 @@ class LocalTrade():
             buy_rate = b_order.average or b_order.price
             if sell_amount < buy_amount:
                 amount = sell_amount
-                if is_closed:
-                    b_order.filled -= amount
+                b_order.filled -= amount
             else:
-                if is_closed:
-                    b_order.is_fully_realized = True
-                    b_order.order_update_date = datetime.now(timezone.utc)
-                    self.update_order(b_order)
+                b_order.is_fully_realized = True
+                b_order.order_update_date = datetime.now(timezone.utc)
+                self.update_order(b_order)
                 idx -= 1
                 amount = buy_amount
             sell_amount -= amount
             profit += self.calc_profit2(buy_rate, sell_rate, amount)
         b_order2 = orders[idx]
         amount2 = b_order2.filled or b_order2.amount
-        if is_closed:
-            b_order2.average = (b_order2.average * amount2 - profit) / amount2
-            b_order2.order_update_date = datetime.now(timezone.utc)
-            self.update_order(b_order2)
-            Order.query.session.commit()
-            self.recalc_trade_from_orders()
-            Trade.commit()
+        b_order2.average = (b_order2.average * amount2 - profit) / amount2
+        b_order2.order_update_date = datetime.now(timezone.utc)
+        self.update_order(b_order2)
+        Order.query.session.commit()
+        self.recalc_trade_from_orders()
+        self.close_profit_abs = profit
+        self.close_profit = sell_stake_amount / (sell_stake_amount - profit) -1
+        Trade.commit()
         return profit
 
     def calc_profit2(self, open_rate: float, close_rate: float,