[pull] develop from freqtrade:develop

README.md

@@ -32,10 +32,11 @@ Please read the [exchange specific notes](docs/exchanges.md) to learn about even
 - [X] [BingX](https://bingx.com/invite/0EM9RX)
 - [X] [Bybit](https://bybit.com/)
 - [X] [Gate.io](https://www.gate.io/ref/6266643)
-- [X] [HTX](https://www.htx.com/) (Former Huobi)
+- [X] [HTX](https://www.htx.com/)
 - [X] [Hyperliquid](https://hyperliquid.xyz/) (A decentralized exchange, or DEX)
 - [X] [Kraken](https://kraken.com/)
-- [X] [OKX](https://okx.com/) (Former OKEX)
+- [X] [OKX](https://okx.com/)
+- [X] [MyOKX](https://okx.com/) (OKX EEA)
 - [ ] [potentially many others](https://github.com/ccxt/ccxt/). _(We cannot guarantee they will work)_
 
 ### Supported Futures Exchanges (experimental)

docs/exchanges.md

@@ -217,12 +217,12 @@ Kucoin supports [time_in_force](configuration.md#understand-order_time_in_force)
 For Kucoin, it is suggested to add `"KCS/<STAKE>"` to your blacklist to avoid issues, unless you are willing to maintain enough extra `KCS` on the account or unless you're willing to disable using `KCS` for fees. 
 Kucoin accounts may use `KCS` for fees, and if a trade happens to be on `KCS`, further trades may consume this position and make the initial `KCS` trade unsellable as the expected amount is not there anymore.
 
-## HTX (formerly Huobi)
+## HTX
 
 !!! Tip "Stoploss on Exchange"
     HTX supports `stoploss_on_exchange` and uses `stop-limit` orders. It provides great advantages, so we recommend to benefit from it by enabling stoploss on exchange.
 
-## OKX (former OKEX)
+## OKX
 
 OKX requires a passphrase for each api key, you will therefore need to add this key into the configuration so your exchange section looks as follows:
 
@@ -236,6 +236,9 @@ OKX requires a passphrase for each api key, you will therefore need to add this
 }
 ```
 
+If you've registered with OKX on the host my.okx.com (OKX EAA)- you will need to use `"myokx"` as the exchange name.
+Using the wrong exchange will result in the error "OKX Error 50119: API key doesn't exist" - as the 2 are separate entities.
+
 !!! Warning
     OKX only provides 100 candles per api call. Therefore, the strategy will only have a pretty low amount of data available in backtesting mode.
 

docs/index.md

@@ -44,10 +44,11 @@ Please read the [exchange specific notes](exchanges.md) to learn about eventual,
 - [X] [Bitmart](https://bitmart.com/)
 - [X] [Bybit](https://bybit.com/)
 - [X] [Gate.io](https://www.gate.io/ref/6266643)
-- [X] [HTX](https://www.htx.com/) (Former Huobi)
+- [X] [HTX](https://www.htx.com/)
 - [X] [Hyperliquid](https://hyperliquid.xyz/) (A decentralized exchange, or DEX)
 - [X] [Kraken](https://kraken.com/)
-- [X] [OKX](https://okx.com/) (Former OKEX)
+- [X] [OKX](https://okx.com/)
+- [X] [MyOKX](https://okx.com/) (OKX EEA)
 - [ ] [potentially many others through <img alt="ccxt" width="30px" src="assets/ccxt-logo.svg" />](https://github.com/ccxt/ccxt/). _(We cannot guarantee they will work)_
 
 ### Supported Futures Exchanges (experimental)

docs/stoploss.md

@@ -30,8 +30,8 @@ The Order-type will be ignored if only one mode is available.
 |----------|-------------|
 | Binance  | limit |
 | Binance Futures  | market, limit |
-| Bingx  | market, limit |
-| HTX (former Huobi)    | limit |
+| Bingx    | market, limit |
+| HTX      | limit |
 | kraken   | market, limit |
 | Gate     | limit |
 | Okx      | limit |

freqtrade/exchange/common.py

@@ -47,6 +47,7 @@ def _get_logging_mixin():
     "binanceje": "binance",
     "binanceusdm": "binance",
     "okex": "okx",
+    "myokx": "okx",
     "gateio": "gate",
     "huboi": "htx",
 }

freqtrade/exchange/exchange.py

@@ -3666,7 +3666,7 @@ def dry_run_liquidation_price(
             Wherein, "+" or "-" depends on whether the contract goes long or short:
             "-" for long, and "+" for short.
 
-         okex: https://www.okx.com/support/hc/en-us/articles/
+         okx: https://www.okx.com/support/hc/en-us/articles/
             360053909592-VI-Introduction-to-the-isolated-mode-of-Single-Multi-currency-Portfolio-margin
 
         :param pair: Pair to calculate liquidation price for

freqtrade/exchange/exchange_utils.py

@@ -23,6 +23,7 @@
     BAD_EXCHANGES,
     EXCHANGE_HAS_OPTIONAL,
     EXCHANGE_HAS_REQUIRED,
+    MAP_EXCHANGE_CHILDCLASS,
     SUPPORTED_EXCHANGES,
 )
 from freqtrade.exchange.exchange_utils_timeframe import timeframe_to_minutes, timeframe_to_prev_date
@@ -91,21 +92,24 @@ def validate_exchange(exchange: str) -> tuple[bool, str, ccxt.Exchange | None]:
 def _build_exchange_list_entry(
     exchange_name: str, exchangeClasses: dict[str, Any]
 ) -> ValidExchangesType:
+    exchange_name = exchange_name.lower()
     valid, comment, ex_mod = validate_exchange(exchange_name)
+    mapped_exchange_name = MAP_EXCHANGE_CHILDCLASS.get(exchange_name, exchange_name).lower()
+    is_alias = getattr(ex_mod, "alias", False)
     result: ValidExchangesType = {
         "name": getattr(ex_mod, "name", exchange_name),
         "classname": exchange_name,
         "valid": valid,
-        "supported": exchange_name.lower() in SUPPORTED_EXCHANGES,
+        "supported": mapped_exchange_name in SUPPORTED_EXCHANGES and not is_alias,
         "comment": comment,
         "dex": getattr(ex_mod, "dex", False),
-        "is_alias": getattr(ex_mod, "alias", False),
+        "is_alias": is_alias,
         "alias_for": inspect.getmro(ex_mod.__class__)[1]().id
         if getattr(ex_mod, "alias", False)
         else None,
         "trade_modes": [{"trading_mode": "spot", "margin_mode": ""}],
     }
-    if resolved := exchangeClasses.get(exchange_name.lower()):
+    if resolved := exchangeClasses.get(mapped_exchange_name):
         supported_modes = [{"trading_mode": "spot", "margin_mode": ""}] + [
             {"trading_mode": tm.value, "margin_mode": mm.value}
             for tm, mm in resolved["class"]._supported_trading_mode_margin_pairs

freqtrade/persistence/trade_model.py

@@ -1249,7 +1249,11 @@ def recalc_trade_from_orders(self, *, is_closing: bool = False):
         if current_amount_tr > 0.0:
             # Trade is still open
             # Leverage not updated, as we don't allow changing leverage through DCA at the moment.
-            self.open_rate = float(current_stake / current_amount)
+            self.open_rate = price_to_precision(
+                float(current_stake / current_amount),
+                self.price_precision,
+                self.precision_mode_price,
+            )
             self.amount = current_amount_tr
             self.stake_amount = float(current_stake) / (self.leverage or 1.0)
             self.fee_open_cost = self.fee_open * float(self.max_stake_amount)

freqtrade/rpc/telegram.py

@@ -1829,7 +1829,7 @@ async def _help(self, update: Update, context: CallbackContext) -> None:
             "*/fx <trade_id>|all:* `Alias to /forceexit`\n"
             f"{force_enter_text if self._config.get('force_entry_enable', False) else ''}"
             "*/delete <trade_id>:* `Instantly delete the given trade in the database`\n"
-            "*/reload_trade <trade_id>:* `Relade trade from exchange Orders`\n"
+            "*/reload_trade <trade_id>:* `Reload trade from exchange Orders`\n"
             "*/cancel_open_order <trade_id>:* `Cancels open orders for trade. "
             "Only valid when the trade has open orders.`\n"
             "*/coo <trade_id>|all:* `Alias to /cancel_open_order`\n"

requirements.txt

@@ -4,7 +4,7 @@ bottleneck==1.4.2
 numexpr==2.10.2
 pandas-ta==0.3.14b
 
-ccxt==4.4.42
+ccxt==4.4.43
 cryptography==42.0.8; platform_machine == 'armv7l'
 cryptography==44.0.0; platform_machine != 'armv7l'
 aiohttp==3.10.11

tests/persistence/test_persistence.py

@@ -8,6 +8,7 @@
 from freqtrade.constants import CUSTOM_TAG_MAX_LENGTH, DATETIME_PRINT_FORMAT
 from freqtrade.enums import TradingMode
 from freqtrade.exceptions import DependencyException
+from freqtrade.exchange.exchange_utils import TICK_SIZE
 from freqtrade.persistence import LocalTrade, Order, Trade, init_db
 from freqtrade.util import dt_now
 from tests.conftest import (
@@ -2833,6 +2834,8 @@ def test_recalc_trade_from_orders_dca(data) -> None:
         is_short=False,
         leverage=1.0,
         trading_mode=TradingMode.SPOT,
+        price_precision=0.001,
+        precision_mode_price=TICK_SIZE,
     )
     Trade.session.add(trade)