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

Split stop_price parameter from property

Browse Source
This commit is contained in:
Matthias
2023-09-26 06:34:10 +02:00
parent e518e741af
commit 927d1d2686
2 changed files with 6 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
freqtrade/exchange/exchange.py
+5 -4
View File
@@ -61,7 +61,8 @@ class Exchange:
# or by specifying them in the configuration. # or by specifying them in the configuration.
_ft_has_default: Dict = { _ft_has_default: Dict = {
"stoploss_on_exchange": False, "stoploss_on_exchange": False,
"stop_price_param": "stopPrice", "stop_price_param": "stopPrice", # Used for stoploss_on_exchange request
"stop_price_prop": "stopPrice", # Used for stoploss_on_exchange response parsing
"order_time_in_force": ["GTC"], "order_time_in_force": ["GTC"],
"ohlcv_params": {}, "ohlcv_params": {},
"ohlcv_candle_limit": 500, "ohlcv_candle_limit": 500,
@@ -855,7 +856,7 @@ class Exchange:
} }
if stop_loss: if stop_loss:
dry_order["info"] = {"stopPrice": dry_order["price"]} dry_order["info"] = {"stopPrice": dry_order["price"]}
dry_order[self._ft_has['stop_price_param']] = dry_order["price"] dry_order[self._ft_has['stop_price_prop']] = dry_order["price"]
# Workaround to avoid filling stoploss orders immediately # Workaround to avoid filling stoploss orders immediately
dry_order["ft_order_type"] = "stoploss" dry_order["ft_order_type"] = "stoploss"
orderbook: Optional[OrderBook] = None orderbook: Optional[OrderBook] = None
@@ -1007,7 +1008,7 @@ class Exchange:
from freqtrade.persistence import Order from freqtrade.persistence import Order
order = Order.order_by_id(order_id) order = Order.order_by_id(order_id)
if order: if order:
ccxt_order = order.to_ccxt_object(self._ft_has['stop_price_param']) ccxt_order = order.to_ccxt_object(self._ft_has['stop_price_prop'])
self._dry_run_open_orders[order_id] = ccxt_order self._dry_run_open_orders[order_id] = ccxt_order
return ccxt_order return ccxt_order
# Gracefully handle errors with dry-run orders. # Gracefully handle errors with dry-run orders.
@@ -1115,7 +1116,7 @@ class Exchange:
""" """
if not self._ft_has.get('stoploss_on_exchange'): if not self._ft_has.get('stoploss_on_exchange'):
raise OperationalException(f"stoploss is not implemented for {self.name}.") raise OperationalException(f"stoploss is not implemented for {self.name}.")
price_param = self._ft_has['stop_price_param'] price_param = self._ft_has['stop_price_prop']
return ( return (
order.get(price_param, None) is None order.get(price_param, None) is None
or ((side == "sell" and stop_loss > float(order[price_param])) or or ((side == "sell" and stop_loss > float(order[price_param])) or
freqtrade/exchange/okx.py
+1
View File
@@ -30,6 +30,7 @@ class Okx(Exchange):
"stoploss_order_types": {"limit": "limit"}, "stoploss_order_types": {"limit": "limit"},
"stoploss_on_exchange": True, "stoploss_on_exchange": True,
"stop_price_param": "stopLossPrice", "stop_price_param": "stopLossPrice",
"stop_price_prop": "stopLossPrice",
} }
_ft_has_futures: Dict = { _ft_has_futures: Dict = {
"tickers_have_quoteVolume": False, "tickers_have_quoteVolume": False,