lychiyu/freqtrade_origin
1
0
Fork 0
mirror of https://github.com/freqtrade/freqtrade.git synced 2024-11-10 10:21:59 +00:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

handle pre existing open order cancelation on trade exit

Browse Source
This commit is contained in:
Axel-CH 2024-09-11 21:11:20 -04:00
parent 1fccdd8cda
commit 2811a470aa
2 changed files with 43 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
freqtrade/freqtradebot.py
View File

@ -1683,13 +1683,15 @@ class FreqtradeBot(LoggingMixin):
logger.warning(f"Unable to replace order for {trade.pair}: {exception}") logger.warning(f"Unable to replace order for {trade.pair}: {exception}")
self.replace_order_failed(trade, f"Could not replace order for {trade}.") self.replace_order_failed(trade, f"Could not replace order for {trade}.")
def cancel_all_open_orders(self) -> None: def cancel_open_orders_of_trade(self, trade: Trade, reason: str, sides: List[str]) -> None:
""" """
Cancel all orders that are currently open Cancel trade orders of specified sides that are currently open
:param trade: Trade object of the trade we're analyzing
:param reason: The reason for that cancelation
:param sides: The sides where cancellation should take place
:return: None :return: None
""" """
for trade in Trade.get_open_trades():
for open_order in trade.open_orders: for open_order in trade.open_orders:
try: try:
order = self.exchange.fetch_order(open_order.order_id, trade.pair) order = self.exchange.fetch_order(open_order.order_id, trade.pair)
@ -1697,15 +1699,30 @@ class FreqtradeBot(LoggingMixin):
logger.info("Can't query order for %s due to %s", trade, traceback.format_exc()) logger.info("Can't query order for %s due to %s", trade, traceback.format_exc())
continue continue
for side in sides:
if (order["side"] == side):
if order["side"] == trade.entry_side: if order["side"] == trade.entry_side:
self.handle_cancel_enter( self.handle_cancel_enter(
trade, order, open_order, constants.CANCEL_REASON["ALL_CANCELLED"] trade, order, open_order, reason
) )
elif order["side"] == trade.exit_side: elif order["side"] == trade.exit_side:
self.handle_cancel_exit( self.handle_cancel_exit(
trade, order, open_order, constants.CANCEL_REASON["ALL_CANCELLED"] trade, order, open_order, reason
) )
def cancel_all_open_orders(self) -> None:
"""
Cancel all orders that are currently open
:return: None
"""
for trade in Trade.get_open_trades():
self.cancel_open_orders_of_trade(
trade, constants.CANCEL_REASON["ALL_CANCELLED"],
[trade.entry_side, trade.exit_side]
)
Trade.commit() Trade.commit()
def handle_cancel_enter( def handle_cancel_enter(
@ -1951,6 +1968,14 @@ class FreqtradeBot(LoggingMixin):
limit = self.get_valid_price(custom_exit_price, proposed_limit_rate) limit = self.get_valid_price(custom_exit_price, proposed_limit_rate)
if trade.has_open_orders:
# cancel any open order of this trade
self.cancel_open_orders_of_trade(
trade, constants.CANCEL_REASON["REPLACE"],
[trade.exit_side]
)
Trade.commit()
# First cancelling stoploss on exchange ... # First cancelling stoploss on exchange ...
trade = self.cancel_stoploss_on_exchange(trade) trade = self.cancel_stoploss_on_exchange(trade)

4
tests/freqtradebot/test_integration.py
View File

@ -497,7 +497,9 @@ def test_dca_order_adjust(default_conf_usdt, ticker_usdt, leverage, fee, mocker,
print("AFTER Process trade.orders") print("AFTER Process trade.orders")
print(trade.orders) print(trade.orders)
assert len(trade.orders) == 5 assert trade.orders[-2].status == "canceled"
assert len(trade.orders) == 6
assert trade.orders[-1].side == trade.exit_side
assert trade.orders[-1].status == "open" assert trade.orders[-1].status == "open"
assert trade.orders[-1].price == 2.02 assert trade.orders[-1].price == 2.02
# Adjust entry price cannot be called - this is an exit order # Adjust entry price cannot be called - this is an exit order