mohammadian7/freqtrade
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix bug closing trades while recalculating

Browse Source 
closes #9186
This commit is contained in:
Matthias
2023-09-16 14:43:23 +02:00
parent 6d2d5f93d0
commit 3d858f6599
2 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
freqtrade/freqtradebot.py
+1 -1
View File
@@ -1888,7 +1888,7 @@ class FreqtradeBot(LoggingMixin):
self.handle_order_fee(trade, order_obj, order) self.handle_order_fee(trade, order_obj, order)
trade.update_trade(order_obj) trade.update_trade(order_obj, not send_msg)
trade = self._update_trade_after_fill(trade, order_obj) trade = self._update_trade_after_fill(trade, order_obj)
Trade.commit() Trade.commit()
freqtrade/persistence/trade_model.py
+3 -2
View File
@@ -728,7 +728,7 @@ class LocalTrade:
f"Trailing stoploss saved us: " f"Trailing stoploss saved us: "
f"{float(self.stop_loss) - float(self.initial_stop_loss or 0.0):.8f}.") f"{float(self.stop_loss) - float(self.initial_stop_loss or 0.0):.8f}.")
def update_trade(self, order: Order) -> None: def update_trade(self, order: Order, recalculating: bool = False) -> None:
""" """
Updates this entity with amount and actual open/close rates. Updates this entity with amount and actual open/close rates.
:param order: order retrieved by exchange.fetch_order() :param order: order retrieved by exchange.fetch_order()
@@ -770,8 +770,9 @@ class LocalTrade:
self.precision_mode, self.contract_size) self.precision_mode, self.contract_size)
if ( if (
isclose(order.safe_amount_after_fee, amount_tr, abs_tol=MATH_CLOSE_PREC) isclose(order.safe_amount_after_fee, amount_tr, abs_tol=MATH_CLOSE_PREC)
or order.safe_amount_after_fee > amount_tr or (not recalculating and order.safe_amount_after_fee > amount_tr)
): ):
# When recalculating a trade, only comming out to 0 can force a close
self.close(order.safe_price) self.close(order.safe_price)
else: else:
self.recalc_trade_from_orders() self.recalc_trade_from_orders()