From 47748961697994c82fa30b8b825699382ae0d446 Mon Sep 17 00:00:00 2001
From: Matthias <xmatthias@outlook.com>
Date: Mon, 20 Jul 2020 19:39:12 +0200
Subject: [PATCH] Evaluate average before price in order returns

---
 freqtrade/exchange/exchange.py | 1 +
 freqtrade/freqtradebot.py      | 4 ++--
 freqtrade/persistence.py       | 6 +++---
 3 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/freqtrade/exchange/exchange.py b/freqtrade/exchange/exchange.py
index e6ea75a63..9858eb518 100644
--- a/freqtrade/exchange/exchange.py
+++ b/freqtrade/exchange/exchange.py
@@ -475,6 +475,7 @@ class Exchange:
             "id": order_id,
             'pair': pair,
             'price': rate,
+            'average': rate,
             'amount': _amount,
             'cost': _amount * rate,
             'type': ordertype,
diff --git a/freqtrade/freqtradebot.py b/freqtrade/freqtradebot.py
index 5da7223c4..8c5b5b460 100644
--- a/freqtrade/freqtradebot.py
+++ b/freqtrade/freqtradebot.py
@@ -554,14 +554,14 @@ class FreqtradeBot:
                                )
                 stake_amount = order['cost']
                 amount = order['filled']
-                buy_limit_filled_price = order['price']
+                buy_limit_filled_price = safe_value_fallback(order, 'average', 'price')
                 order_id = None
 
         # in case of FOK the order may be filled immediately and fully
         elif order_status == 'closed':
             stake_amount = order['cost']
             amount = safe_value_fallback(order, 'filled', 'amount')
-            buy_limit_filled_price = order['price']
+            buy_limit_filled_price = safe_value_fallback(order, 'average', 'price')
 
         # Fee is applied twice because we make a LIMIT_BUY and LIMIT_SELL
         fee = self.exchange.get_fee(symbol=pair, taker_or_maker='maker')
diff --git a/freqtrade/persistence.py b/freqtrade/persistence.py
index 7dc533c07..fdb816eab 100644
--- a/freqtrade/persistence.py
+++ b/freqtrade/persistence.py
@@ -369,20 +369,20 @@ class Trade(_DECL_BASE):
         """
         order_type = order['type']
         # Ignore open and cancelled orders
-        if order['status'] == 'open' or order['price'] is None:
+        if order['status'] == 'open' or safe_value_fallback(order, 'average', 'price') is None:
             return
 
         logger.info('Updating trade (id=%s) ...', self.id)
 
         if order_type in ('market', 'limit') and order['side'] == 'buy':
             # Update open rate and actual amount
-            self.open_rate = Decimal(order['price'])
+            self.open_rate = Decimal(safe_value_fallback(order, 'average', 'price'))
             self.amount = Decimal(safe_value_fallback(order, 'filled', 'amount'))
             self.recalc_open_trade_price()
             logger.info('%s_BUY has been fulfilled for %s.', order_type.upper(), self)
             self.open_order_id = None
         elif order_type in ('market', 'limit') and order['side'] == 'sell':
-            self.close(order['price'])
+            self.close(safe_value_fallback(order, 'average', 'price'))
             logger.info('%s_SELL has been fulfilled for %s.', order_type.upper(), self)
         elif order_type in ('stop_loss_limit', 'stop-loss', 'stop'):
             self.stoploss_order_id = None