From 193dcf578dc293d01380c659c7d456ce5092cba4 Mon Sep 17 00:00:00 2001 From: Matthias Date: Fri, 25 Aug 2023 06:47:02 +0200 Subject: [PATCH] Fix logic error in force_exit if no order is open --- freqtrade/rpc/api_server/api_schemas.py | 1 - freqtrade/rpc/rpc.py | 2 +- 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/freqtrade/rpc/api_server/api_schemas.py b/freqtrade/rpc/api_server/api_schemas.py index 892865d43..0e3ac78bf 100644 --- a/freqtrade/rpc/api_server/api_schemas.py +++ b/freqtrade/rpc/api_server/api_schemas.py @@ -304,7 +304,6 @@ class TradeSchema(BaseModel): min_rate: Optional[float] = None max_rate: Optional[float] = None - open_order_id: Optional[str] = None orders: List[OrderSchema] leverage: Optional[float] = None diff --git a/freqtrade/rpc/rpc.py b/freqtrade/rpc/rpc.py index 5697ce15b..aa0eadb5b 100644 --- a/freqtrade/rpc/rpc.py +++ b/freqtrade/rpc/rpc.py @@ -786,7 +786,7 @@ class RPC: self._freqtrade.handle_cancel_exit( trade, order, oo.order_id, CANCEL_REASON['FORCE_EXIT']) - if any(not tocr['cancel_state'] for tocr in trade_entry_cancelation_registry): + if all(tocr['cancel_state'] for tocr in trade_entry_cancelation_registry): if trade.has_open_orders: # Order cancellation failed, so we can't exit. return False