unicex 0.5.0__py3-none-any.whl → 0.8.0__py3-none-any.whl

unicex/okx/client.py

@@ -205,76 +205,2649 @@ class Client(BaseClient):
             method=method, endpoint=endpoint, params=params, data=data, signed=signed
         )
 
-    # topic: Order Book Trading
-    # sub-topic: Market Data
+    # topic: Trading Account
 
-    async def tickers(
+    async def get_account_instruments(
+        self,
+        inst_type: Literal["SPOT", "MARGIN", "SWAP", "FUTURES", "OPTION"],
+        inst_family: str | None = None,
+        inst_id: str | None = None,
+    ) -> dict:
+        """Получение доступных инструментов аккаунта.
+
+        https://www.okx.com/docs-v5/en/#trading-account-rest-api-get-instruments
+        """
+        params = {
+            "instType": inst_type,
+            "instFamily": inst_family,
+            "instId": inst_id,
+        }
+
+        return await self._make_request(
+            "GET",
+            endpoint="/api/v5/account/instruments",
+            params=params,
+            signed=True,
+        )
+
+    async def get_balance(self, ccy: str | None = None) -> dict:
+        """Получение баланса аккаунта.
+
+        https://www.okx.com/docs-v5/en/#trading-account-rest-api-get-balance
+        """
+        params = {
+            "ccy": ccy,
+        }
+
+        return await self._make_request(
+            "GET",
+            endpoint="/api/v5/account/balance",
+            params=params,
+            signed=True,
+        )
+
+    async def get_positions(
+        self,
+        inst_type: Literal["MARGIN", "SWAP", "FUTURES", "OPTION"] | None = None,
+        inst_id: str | None = None,
+        pos_id: str | None = None,
+    ) -> dict:
+        """Получение текущих позиций аккаунта.
+
+        https://www.okx.com/docs-v5/en/#trading-account-rest-api-get-positions
+        """
+        params = {
+            "instType": inst_type,
+            "instId": inst_id,
+            "posId": pos_id,
+        }
+
+        return await self._make_request(
+            "GET",
+            endpoint="/api/v5/account/positions",
+            params=params,
+            signed=True,
+        )
+
+    async def get_positions_history(
+        self,
+        inst_type: Literal["MARGIN", "SWAP", "FUTURES", "OPTION"] | None = None,
+        inst_id: str | None = None,
+        mgn_mode: Literal["cross", "isolated"] | None = None,
+        type_: str | None = None,
+        pos_id: str | None = None,
+        after: int | None = None,
+        before: int | None = None,
+        limit: int | None = None,
+    ) -> dict:
+        """Получение истории позиций аккаунта.
+
+        https://www.okx.com/docs-v5/en/#trading-account-rest-api-get-positions-history
+        """
+        params = {
+            "instType": inst_type,
+            "instId": inst_id,
+            "mgnMode": mgn_mode,
+            "type": type_,
+            "posId": pos_id,
+            "after": after,
+            "before": before,
+            "limit": limit,
+        }
+
+        return await self._make_request(
+            "GET",
+            endpoint="/api/v5/account/positions-history",
+            params=params,
+            signed=True,
+        )
+
+    async def get_account_position_risk(
+        self, inst_type: Literal["MARGIN", "SWAP", "FUTURES", "OPTION"] | None = None
+    ) -> dict:
+        """Получение риска по аккаунту и позициям.
+
+        https://www.okx.com/docs-v5/en/#trading-account-rest-api-get-account-and-position-risk
+        """
+        params = {
+            "instType": inst_type,
+        }
+
+        return await self._make_request(
+            "GET",
+            endpoint="/api/v5/account/account-position-risk",
+            params=params,
+            signed=True,
+        )
+
+    async def get_account_bills(
+        self,
+        inst_type: Literal["SPOT", "MARGIN", "SWAP", "FUTURES", "OPTION"] | None = None,
+        inst_id: str | None = None,
+        ccy: str | None = None,
+        mgn_mode: Literal["isolated", "cross"] | None = None,
+        ct_type: Literal["linear", "inverse"] | None = None,
+        type_: str | None = None,
+        sub_type: str | None = None,
+        after: str | None = None,
+        before: str | None = None,
+        begin: int | None = None,
+        end: int | None = None,
+        limit: int | None = None,
+    ) -> dict:
+        """Получение выписок за последние 7 дней.
+
+        https://www.okx.com/docs-v5/en/#trading-account-rest-api-get-bills-details-last-7-days
+        """
+        params = {
+            "instType": inst_type,
+            "instId": inst_id,
+            "ccy": ccy,
+            "mgnMode": mgn_mode,
+            "ctType": ct_type,
+            "type": type_,
+            "subType": sub_type,
+            "after": after,
+            "before": before,
+            "begin": begin,
+            "end": end,
+            "limit": limit,
+        }
+
+        return await self._make_request(
+            "GET",
+            endpoint="/api/v5/account/bills",
+            params=params,
+            signed=True,
+        )
+
+    async def get_account_bills_archive(
+        self,
+        inst_type: Literal["SPOT", "MARGIN", "SWAP", "FUTURES", "OPTION"] | None = None,
+        inst_id: str | None = None,
+        ccy: str | None = None,
+        mgn_mode: Literal["isolated", "cross"] | None = None,
+        ct_type: Literal["linear", "inverse"] | None = None,
+        type_: str | None = None,
+        sub_type: str | None = None,
+        after: str | None = None,
+        before: str | None = None,
+        begin: int | None = None,
+        end: int | None = None,
+        limit: int | None = None,
+    ) -> dict:
+        """Получение выписок за последние 3 месяца.
+
+        https://www.okx.com/docs-v5/en/#trading-account-rest-api-get-bills-details-last-3-months
+        """
+        params = {
+            "instType": inst_type,
+            "instId": inst_id,
+            "ccy": ccy,
+            "mgnMode": mgn_mode,
+            "ctType": ct_type,
+            "type": type_,
+            "subType": sub_type,
+            "after": after,
+            "before": before,
+            "begin": begin,
+            "end": end,
+            "limit": limit,
+        }
+
+        return await self._make_request(
+            "GET",
+            endpoint="/api/v5/account/bills-archive",
+            params=params,
+            signed=True,
+        )
+
+    async def apply_bills_history_archive(
+        self, year: str, quarter: Literal["Q1", "Q2", "Q3", "Q4"]
+    ) -> dict:
+        """Запрос на формирование архива выписок.
+
+        https://www.okx.com/docs-v5/en/#trading-account-rest-api-apply-bills-details-since-2021
+        """
+        data = {
+            "year": year,
+            "quarter": quarter,
+        }
+
+        return await self._make_request(
+            "POST",
+            endpoint="/api/v5/account/bills-history-archive",
+            data=data,
+            signed=True,
+        )
+
+    async def get_bills_history_archive(
+        self, year: str, quarter: Literal["Q1", "Q2", "Q3", "Q4"]
+    ) -> dict:
+        """Получение ссылки на архив выписок.
+
+        https://www.okx.com/docs-v5/en/#trading-account-rest-api-get-bills-details-since-2021
+        """
+        params = {
+            "year": year,
+            "quarter": quarter,
+        }
+
+        return await self._make_request(
+            "GET",
+            endpoint="/api/v5/account/bills-history-archive",
+            params=params,
+            signed=True,
+        )
+
+    async def get_account_config(self) -> dict:
+        """Получение конфигурации аккаунта.
+
+        https://www.okx.com/docs-v5/en/#trading-account-rest-api-get-account-configuration
+        """
+        return await self._make_request(
+            "GET",
+            endpoint="/api/v5/account/config",
+            signed=True,
+        )
+
+    async def set_position_mode(self, pos_mode: Literal["long_short_mode", "net_mode"]) -> dict:
+        """Изменение режима позиций.
+
+        https://www.okx.com/docs-v5/en/#trading-account-rest-api-set-position-mode
+        """
+        data = {
+            "posMode": pos_mode,
+        }
+
+        return await self._make_request(
+            "POST",
+            endpoint="/api/v5/account/set-position-mode",
+            data=data,
+            signed=True,
+        )
+
+    async def set_leverage(
+        self,
+        lever: str,
+        mgn_mode: Literal["isolated", "cross"],
+        inst_id: str | None = None,
+        ccy: str | None = None,
+        pos_side: Literal["long", "short"] | None = None,
+    ) -> dict:
+        """Установка плеча.
+
+        https://www.okx.com/docs-v5/en/#trading-account-rest-api-set-leverage
+        """
+        data = {
+            "instId": inst_id,
+            "ccy": ccy,
+            "lever": lever,
+            "mgnMode": mgn_mode,
+            "posSide": pos_side,
+        }
+
+        return await self._make_request(
+            "POST",
+            endpoint="/api/v5/account/set-leverage",
+            data=data,
+            signed=True,
+        )
+
+    async def get_max_order_size(
+        self,
+        inst_id: str,
+        td_mode: Literal["cross", "isolated", "cash", "spot_isolated"],
+        ccy: str | None = None,
+        px: str | None = None,
+        leverage: str | None = None,
+        trade_quote_ccy: str | None = None,
+    ) -> dict:
+        """Получение максимального размера ордера.
+
+        https://www.okx.com/docs-v5/en/#trading-account-rest-api-get-maximum-order-quantity
+        """
+        params = {
+            "instId": inst_id,
+            "tdMode": td_mode,
+            "ccy": ccy,
+            "px": px,
+            "leverage": leverage,
+            "tradeQuoteCcy": trade_quote_ccy,
+        }
+
+        return await self._make_request(
+            "GET",
+            endpoint="/api/v5/account/max-size",
+            params=params,
+            signed=True,
+        )
+
+    async def get_max_avail_size(
+        self,
+        inst_id: str,
+        td_mode: Literal["cross", "isolated", "cash", "spot_isolated"],
+        ccy: str | None = None,
+        reduce_only: bool | None = None,
+        px: str | None = None,
+        trade_quote_ccy: str | None = None,
+    ) -> dict:
+        """Получение максимального доступного баланса/эквити.
+
+        https://www.okx.com/docs-v5/en/#trading-account-rest-api-get-maximum-available-balance-equity
+        """
+        params = {
+            "instId": inst_id,
+            "ccy": ccy,
+            "tdMode": td_mode,
+            "reduceOnly": reduce_only,
+            "px": px,
+            "tradeQuoteCcy": trade_quote_ccy,
+        }
+
+        return await self._make_request(
+            "GET",
+            endpoint="/api/v5/account/max-avail-size",
+            params=params,
+            signed=True,
+        )
+
+    async def adjustment_margin(
+        self,
+        inst_id: str,
+        pos_side: Literal["long", "short", "net"],
+        type_: Literal["add", "reduce"],
+        amt: str,
+        ccy: str | None = None,
+    ) -> dict:
+        """Изменение маржи изолированной позиции.
+
+        https://www.okx.com/docs-v5/en/#trading-account-rest-api-increase-decrease-margin
+        """
+        data = {
+            "instId": inst_id,
+            "posSide": pos_side,
+            "type": type_,
+            "amt": amt,
+            "ccy": ccy,
+        }
+
+        return await self._make_request(
+            "POST",
+            endpoint="/api/v5/account/position/margin-balance",
+            data=data,
+            signed=True,
+        )
+
+    async def get_leverage(
+        self,
+        mgn_mode: Literal["isolated", "cross"],
+        inst_id: str | None = None,
+        ccy: str | None = None,
+    ) -> dict:
+        """Получение текущего плеча.
+
+        https://www.okx.com/docs-v5/en/#trading-account-rest-api-get-leverage
+        """
+        params = {
+            "instId": inst_id,
+            "ccy": ccy,
+            "mgnMode": mgn_mode,
+        }
+
+        return await self._make_request(
+            "GET",
+            endpoint="/api/v5/account/leverage-info",
+            params=params,
+            signed=True,
+        )
+
+    async def get_leverage_estimated_info(
+        self,
+        inst_type: Literal["MARGIN", "SWAP", "FUTURES"],
+        mgn_mode: Literal["isolated", "cross"],
+        lever: str,
+        inst_id: str | None = None,
+        ccy: str | None = None,
+        pos_side: Literal["net", "long", "short"] | None = None,
+    ) -> dict:
+        """Получение оценочных данных по плечу.
+
+        https://www.okx.com/docs-v5/en/#trading-account-rest-api-get-leverage-estimated-info
+        """
+        params = {
+            "instType": inst_type,
+            "mgnMode": mgn_mode,
+            "lever": lever,
+            "instId": inst_id,
+            "ccy": ccy,
+            "posSide": pos_side,
+        }
+
+        return await self._make_request(
+            "GET",
+            endpoint="/api/v5/account/adjust-leverage-info",
+            params=params,
+            signed=True,
+        )
+
+    async def get_max_loan(
+        self,
+        mgn_mode: Literal["isolated", "cross"],
+        inst_id: str | None = None,
+        ccy: str | None = None,
+        mgn_ccy: str | None = None,
+        trade_quote_ccy: str | None = None,
+    ) -> dict:
+        """Получение максимального объема заимствования.
+
+        https://www.okx.com/docs-v5/en/#trading-account-rest-api-get-the-maximum-loan-of-instrument
+        """
+        params = {
+            "mgnMode": mgn_mode,
+            "instId": inst_id,
+            "ccy": ccy,
+            "mgnCcy": mgn_ccy,
+            "tradeQuoteCcy": trade_quote_ccy,
+        }
+
+        return await self._make_request(
+            "GET",
+            endpoint="/api/v5/account/max-loan",
+            params=params,
+            signed=True,
+        )
+
+    async def get_fee_rates(
+        self,
+        inst_type: Literal["SPOT", "MARGIN", "SWAP", "FUTURES", "OPTION"],
+        inst_id: str | None = None,
+        inst_family: str | None = None,
+        rule_type: Literal["normal", "pre_market"] | None = None,
+    ) -> dict:
+        """Получение торговых комиссий.
+
+        https://www.okx.com/docs-v5/en/#trading-account-rest-api-get-fee-rates
+        """
+        params = {
+            "instType": inst_type,
+            "instId": inst_id,
+            "instFamily": inst_family,
+            "ruleType": rule_type,
+        }
+
+        return await self._make_request(
+            "GET",
+            endpoint="/api/v5/account/trade-fee",
+            params=params,
+            signed=True,
+        )
+
+    async def get_interest_accrued(
+        self,
+        type_: str | None = None,
+        ccy: str | None = None,
+        inst_id: str | None = None,
+        mgn_mode: Literal["cross", "isolated"] | None = None,
+        after: int | None = None,
+        before: int | None = None,
+        limit: int | None = None,
+    ) -> dict:
+        """Получение данных по начисленным процентам.
+
+        https://www.okx.com/docs-v5/en/#trading-account-rest-api-get-interest-accrued-data
+        """
+        params = {
+            "type": type_,
+            "ccy": ccy,
+            "instId": inst_id,
+            "mgnMode": mgn_mode,
+            "after": after,
+            "before": before,
+            "limit": limit,
+        }
+
+        return await self._make_request(
+            "GET",
+            endpoint="/api/v5/account/interest-accrued",
+            params=params,
+            signed=True,
+        )
+
+    async def get_interest_rate(self, ccy: str | None = None) -> dict:
+        """Получение текущих процентных ставок.
+
+        https://www.okx.com/docs-v5/en/#trading-account-rest-api-get-interest-rate
+        """
+        params = {
+            "ccy": ccy,
+        }
+
+        return await self._make_request(
+            "GET",
+            endpoint="/api/v5/account/interest-rate",
+            params=params,
+            signed=True,
+        )
+
+    async def set_fee_type(self, fee_type: Literal["0", "1"]) -> dict:
+        """Настройка типа комиссии.
+
+        https://www.okx.com/docs-v5/en/#trading-account-rest-api-set-fee-type
+        """
+        data = {
+            "feeType": fee_type,
+        }
+
+        return await self._make_request(
+            "POST",
+            endpoint="/api/v5/account/set-fee-type",
+            data=data,
+            signed=True,
+        )
+
+    async def set_greeks(self, greeks_type: Literal["PA", "BS"]) -> dict:
+        """Настройка формата греков.
+
+        https://www.okx.com/docs-v5/en/#trading-account-rest-api-set-greeks-pa-bs
+        """
+        data = {
+            "greeksType": greeks_type,
+        }
+
+        return await self._make_request(
+            "POST",
+            endpoint="/api/v5/account/set-greeks",
+            data=data,
+            signed=True,
+        )
+
+    async def set_isolated_mode(
+        self,
+        iso_mode: Literal["auto_transfers_ccy", "automatic"],
+        type_: Literal["MARGIN", "CONTRACTS"],
+    ) -> dict:
+        """Настройка режима изолированной маржи.
+
+        https://www.okx.com/docs-v5/en/#trading-account-rest-api-isolated-margin-trading-settings
+        """
+        data = {
+            "isoMode": iso_mode,
+            "type": type_,
+        }
+
+        return await self._make_request(
+            "POST",
+            endpoint="/api/v5/account/set-isolated-mode",
+            data=data,
+            signed=True,
+        )
+
+    async def get_max_withdrawal(self, ccy: str | None = None) -> dict:
+        """Получение максимальной суммы вывода из трейдингового аккаунта.
+
+        https://www.okx.com/docs-v5/en/#trading-account-rest-api-get-maximum-withdrawals
+        """
+        params = {
+            "ccy": ccy,
+        }
+
+        return await self._make_request(
+            "GET",
+            endpoint="/api/v5/account/max-withdrawal",
+            params=params,
+            signed=True,
+        )
+
+    async def get_risk_state(self) -> dict:
+        """Получение статуса рисков аккаунта.
+
+        https://www.okx.com/docs-v5/en/#trading-account-rest-api-get-account-risk-state
+        """
+        return await self._make_request(
+            "GET",
+            endpoint="/api/v5/account/risk-state",
+            signed=True,
+        )
+
+    async def get_interest_limits(
+        self,
+        type_: str | None = None,
+        ccy: str | None = None,
+    ) -> dict:
+        """Получение лимитов и процентов заимствования.
+
+        https://www.okx.com/docs-v5/en/#trading-account-rest-api-get-borrow-interest-and-limit
+        """
+        params = {
+            "type": type_,
+            "ccy": ccy,
+        }
+
+        return await self._make_request(
+            "GET",
+            endpoint="/api/v5/account/interest-limits",
+            params=params,
+            signed=True,
+        )
+
+    async def spot_manual_borrow_repay(
+        self, ccy: str, side: Literal["borrow", "repay"], amt: str
+    ) -> dict:
+        """Ручное заимствование или погашение в спотовом режиме.
+
+        https://www.okx.com/docs-v5/en/#trading-account-rest-api-manual-borrow-repay
+        """
+        data = {
+            "ccy": ccy,
+            "side": side,
+            "amt": amt,
+        }
+
+        return await self._make_request(
+            "POST",
+            endpoint="/api/v5/account/spot-manual-borrow-repay",
+            data=data,
+            signed=True,
+        )
+
+    async def set_auto_repay(self, auto_repay: bool) -> dict:
+        """Настройка автоматического погашения в спотовом режиме.
+
+        https://www.okx.com/docs-v5/en/#trading-account-rest-api-set-auto-repay
+        """
+        data = {
+            "autoRepay": auto_repay,
+        }
+
+        return await self._make_request(
+            "POST",
+            endpoint="/api/v5/account/set-auto-repay",
+            data=data,
+            signed=True,
+        )
+
+    async def spot_borrow_repay_history(
+        self,
+        ccy: str | None = None,
+        type_: Literal["auto_borrow", "auto_repay", "manual_borrow", "manual_repay"] | None = None,
+        after: int | None = None,
+        before: int | None = None,
+        limit: int | None = None,
+    ) -> dict:
+        """Получение истории заимствований и погашений в спотовом режиме.
+
+        https://www.okx.com/docs-v5/en/#trading-account-rest-api-get-borrow-repay-history
+        """
+        params = {
+            "ccy": ccy,
+            "type": type_,
+            "after": after,
+            "before": before,
+            "limit": limit,
+        }
+
+        return await self._make_request(
+            "GET",
+            endpoint="/api/v5/account/spot-borrow-repay-history",
+            params=params,
+            signed=True,
+        )
+
+    async def position_builder(
+        self,
+        acct_lv: str | None = None,
+        incl_real_pos_and_eq: bool | None = None,
+        lever: str | None = None,
+        sim_pos: list[dict[str, Any]] | None = None,
+        sim_asset: list[dict[str, Any]] | None = None,
+        greeks_type: Literal["BS", "PA", "CASH"] | None = None,
+        idx_vol: str | None = None,
+    ) -> dict:
+        """Расчет параметров портфеля с виртуальными позициями.
+
+        https://www.okx.com/docs-v5/en/#trading-account-rest-api-position-builder-new
+        """
+        data = {
+            "acctLv": acct_lv,
+            "inclRealPosAndEq": incl_real_pos_and_eq,
+            "lever": lever,
+            "simPos": sim_pos,
+            "simAsset": sim_asset,
+            "greeksType": greeks_type,
+            "idxVol": idx_vol,
+        }
+
+        return await self._make_request(
+            "POST",
+            endpoint="/api/v5/account/position-builder",
+            data=data,
+            signed=True,
+        )
+
+    async def position_builder_graph(
+        self,
+        type_: Literal["mmr"],
+        incl_real_pos_and_eq: bool | None = None,
+        sim_pos: list[dict[str, Any]] | None = None,
+        sim_asset: list[dict[str, Any]] | None = None,
+        greeks_type: Literal["BS", "PA", "CASH"] | None = None,
+        mmr_config: dict[str, Any] | None = None,
+    ) -> dict:
+        """Расчет графика тренда риск-параметров.
+
+        https://www.okx.com/docs-v5/en/#trading-account-rest-api-position-builder-trend-graph
+        """
+        data = {
+            "inclRealPosAndEq": incl_real_pos_and_eq,
+            "simPos": sim_pos,
+            "simAsset": sim_asset,
+            "greeksType": greeks_type,
+            "type": type_,
+            "mmrConfig": mmr_config,
+        }
+
+        return await self._make_request(
+            "POST",
+            endpoint="/api/v5/account/position-builder-graph",
+            data=data,
+            signed=True,
+        )
+
+    async def set_risk_offset_amount(self, ccy: str, cl_spot_in_use_amt: str) -> dict:
+        """Установка величины спотового риск-офсета.
+
+        https://www.okx.com/docs-v5/en/#trading-account-rest-api-set-risk-offset-amount
+        """
+        data = {
+            "ccy": ccy,
+            "clSpotInUseAmt": cl_spot_in_use_amt,
+        }
+
+        return await self._make_request(
+            "POST",
+            endpoint="/api/v5/account/set-riskOffset-amt",
+            data=data,
+            signed=True,
+        )
+
+    async def get_greeks(self, ccy: str | None = None) -> dict:
+        """Получение греков по активам.
+
+        https://www.okx.com/docs-v5/en/#trading-account-rest-api-get-greeks
+        """
+        params = {
+            "ccy": ccy,
+        }
+
+        return await self._make_request(
+            "GET",
+            endpoint="/api/v5/account/greeks",
+            params=params,
+            signed=True,
+        )
+
+    async def get_account_position_tiers(
+        self,
+        inst_type: Literal["SWAP", "FUTURES", "OPTION"],
+        inst_family: str,
+        uly: str | None = None,
+    ) -> dict:
+        """Получение лимитов позиций в PM режиме.
+
+        https://www.okx.com/docs-v5/en/#trading-account-rest-api-get-pm-position-limitation
+        """
+        params = {
+            "instType": inst_type,
+            "instFamily": inst_family,
+            "uly": uly,
+        }
+
+        return await self._make_request(
+            "GET",
+            endpoint="/api/v5/account/position-tiers",
+            params=params,
+            signed=True,
+        )
+
+    async def activate_option(self) -> dict:
+        """Активация торговли опционами.
+
+        https://www.okx.com/docs-v5/en/#trading-account-rest-api-activate-option
+        """
+        return await self._make_request(
+            "POST",
+            endpoint="/api/v5/account/activate-option",
+            data={},
+            signed=True,
+        )
+
+    async def set_auto_loan(self, auto_loan: bool | None = None) -> dict:
+        """Настройка автоматического заимствования.
+
+        https://www.okx.com/docs-v5/en/#trading-account-rest-api-set-auto-loan
+        """
+        data = {
+            "autoLoan": auto_loan,
+        }
+
+        return await self._make_request(
+            "POST",
+            endpoint="/api/v5/account/set-auto-loan",
+            data=data,
+            signed=True,
+        )
+
+    async def account_level_switch_preset(
+        self, acct_lv: Literal["2", "3", "4"], lever: str | None = None
+    ) -> dict:
+        """Преднастройка смены режима аккаунта.
+
+        https://www.okx.com/docs-v5/en/#trading-account-rest-api-preset-account-mode-switch
+        """
+        data = {
+            "acctLv": acct_lv,
+            "lever": lever,
+        }
+
+        return await self._make_request(
+            "POST",
+            endpoint="/api/v5/account/account-level-switch-preset",
+            data=data,
+            signed=True,
+        )
+
+    async def get_account_switch_precheck(self, acct_lv: Literal["1", "2", "3", "4"]) -> dict:
+        """Предварительная проверка смены режима аккаунта.
+
+        https://www.okx.com/docs-v5/en/#trading-account-rest-api-precheck-account-mode-switch
+        """
+        params = {
+            "acctLv": acct_lv,
+        }
+
+        return await self._make_request(
+            "GET",
+            endpoint="/api/v5/account/set-account-switch-precheck",
+            params=params,
+            signed=True,
+        )
+
+    async def set_account_level(self, acct_lv: Literal["1", "2", "3", "4"]) -> dict:
+        """Смена режима аккаунта.
+
+        https://www.okx.com/docs-v5/en/#trading-account-rest-api-set-account-mode
+        """
+        data = {
+            "acctLv": acct_lv,
+        }
+
+        return await self._make_request(
+            "POST",
+            endpoint="/api/v5/account/set-account-level",
+            data=data,
+            signed=True,
+        )
+
+    async def set_collateral_assets(
+        self,
+        type_: Literal["all", "custom"],
+        collateral_enabled: bool,
+        ccy_list: list[str] | None = None,
+    ) -> dict:
+        """Настройка списка коллатеральных активов.
+
+        https://www.okx.com/docs-v5/en/#trading-account-rest-api-set-collateral-assets
+        """
+        data = {
+            "type": type_,
+            "collateralEnabled": collateral_enabled,
+            "ccyList": ccy_list,
+        }
+
+        return await self._make_request(
+            "POST",
+            endpoint="/api/v5/account/set-collateral-assets",
+            data=data,
+            signed=True,
+        )
+
+    async def get_collateral_assets(
+        self, ccy: str | None = None, collateral_enabled: bool | None = None
+    ) -> dict:
+        """Получение списка коллатеральных активов.
+
+        https://www.okx.com/docs-v5/en/#trading-account-rest-api-get-collateral-assets
+        """
+        params = {
+            "ccy": ccy,
+            "collateralEnabled": collateral_enabled,
+        }
+
+        return await self._make_request(
+            "GET",
+            endpoint="/api/v5/account/collateral-assets",
+            params=params,
+            signed=True,
+        )
+
+    async def reset_mmp_status(
+        self, inst_family: str, inst_type: Literal["OPTION"] | None = None
+    ) -> dict:
+        """Сброс статуса MMP.
+
+        https://www.okx.com/docs-v5/en/#trading-account-rest-api-reset-mmp-status
+        """
+        data = {
+            "instType": inst_type,
+            "instFamily": inst_family,
+        }
+
+        return await self._make_request(
+            "POST",
+            endpoint="/api/v5/account/mmp-reset",
+            data=data,
+            signed=True,
+        )
+
+    async def set_mmp(
+        self,
+        inst_family: str,
+        time_interval: str,
+        frozen_interval: str,
+        qty_limit: str,
+    ) -> dict:
+        """Настройка параметров MMP.
+
+        https://www.okx.com/docs-v5/en/#trading-account-rest-api-set-mmp
+        """
+        data = {
+            "instFamily": inst_family,
+            "timeInterval": time_interval,
+            "frozenInterval": frozen_interval,
+            "qtyLimit": qty_limit,
+        }
+
+        return await self._make_request(
+            "POST",
+            endpoint="/api/v5/account/mmp-config",
+            data=data,
+            signed=True,
+        )
+
+    async def get_mmp_config(self, inst_family: str | None = None) -> dict:
+        """Получение настроек MMP.
+
+        https://www.okx.com/docs-v5/en/#trading-account-rest-api-get-mmp-config
+        """
+        params = {
+            "instFamily": inst_family,
+        }
+
+        return await self._make_request(
+            "GET",
+            endpoint="/api/v5/account/mmp-config",
+            params=params,
+            signed=True,
+        )
+
+    async def move_positions(
+        self,
+        from_acct: str,
+        to_acct: str,
+        legs: list[dict[str, Any]],
+        client_id: str,
+    ) -> dict:
+        """Перемещение позиций между аккаунтами.
+
+        https://www.okx.com/docs-v5/en/#trading-account-rest-api-move-positions
+        """
+        data = {
+            "fromAcct": from_acct,
+            "toAcct": to_acct,
+            "legs": legs,
+            "clientId": client_id,
+        }
+
+        return await self._make_request(
+            "POST",
+            endpoint="/api/v5/account/move-positions",
+            data=data,
+            signed=True,
+        )
+
+    async def get_move_positions_history(
+        self,
+        block_td_id: str | None = None,
+        client_id: str | None = None,
+        begin_ts: int | None = None,
+        end_ts: int | None = None,
+        limit: int | None = None,
+        state: Literal["filled", "pending"] | None = None,
+    ) -> dict:
+        """Получение истории перемещения позиций.
+
+        https://www.okx.com/docs-v5/en/#trading-account-rest-api-get-move-positions-history
+        """
+        params = {
+            "blockTdId": block_td_id,
+            "clientId": client_id,
+            "beginTs": begin_ts,
+            "endTs": end_ts,
+            "limit": limit,
+            "state": state,
+        }
+
+        return await self._make_request(
+            "GET",
+            endpoint="/api/v5/account/move-positions-history",
+            params=params,
+            signed=True,
+        )
+
+    async def set_auto_earn(
+        self,
+        ccy: str,
+        action: Literal["turn_on", "turn_off"],
+        earn_type: Literal["0", "1"] | None = None,
+    ) -> dict:
+        """Настройка автоматического Earn.
+
+        https://www.okx.com/docs-v5/en/#trading-account-rest-api-set-auto-earn
+        """
+        data = {
+            "earnType": earn_type,
+            "ccy": ccy,
+            "action": action,
+        }
+
+        return await self._make_request(
+            "POST",
+            endpoint="/api/v5/account/set-auto-earn",
+            data=data,
+            signed=True,
+        )
+
+    async def set_settle_currency(self, settle_ccy: str) -> dict:
+        """Настройка расчетной валюты для USD-маржинальных контрактов.
+
+        https://www.okx.com/docs-v5/en/#trading-account-rest-api-set-settle-currency
+        """
+        data = {
+            "settleCcy": settle_ccy,
+        }
+
+        return await self._make_request(
+            "POST",
+            endpoint="/api/v5/account/set-settle-currency",
+            data=data,
+            signed=True,
+        )
+
+    # topic: Order Book Trading (Trade)
+
+    async def place_order(
+        self,
+        inst_id: str,
+        td_mode: Literal["cross", "isolated", "cash", "spot_isolated"],
+        side: Literal["buy", "sell"],
+        ord_type: Literal[
+            "market",
+            "limit",
+            "post_only",
+            "fok",
+            "ioc",
+            "optimal_limit_ioc",
+            "mmp",
+            "mmp_and_post_only",
+            "op_fok",
+        ],
+        sz: str,
+        ccy: str | None = None,
+        cl_ord_id: str | None = None,
+        tag: str | None = None,
+        pos_side: Literal["net", "long", "short"] | None = None,
+        px: str | None = None,
+        px_usd: str | None = None,
+        px_vol: str | None = None,
+        reduce_only: bool | None = None,
+        tgt_ccy: Literal["base_ccy", "quote_ccy"] | None = None,
+        ban_amend: bool | None = None,
+        px_amend_type: Literal["0", "1"] | None = None,
+        trade_quote_ccy: str | None = None,
+        stp_mode: Literal["cancel_maker", "cancel_taker", "cancel_both"] | None = None,
+        quick_mgn_type: str | None = None,
+        attach_algo_orders: list[dict[str, Any]] | None = None,
+        extra_params: dict[str, Any] | None = None,
+    ) -> dict:
+        """Создание ордера.
+
+        https://www.okx.com/docs-v5/en/#order-book-trading-trade-post-place-order
+        """
+        data: dict[str, Any] = {
+            "instId": inst_id,
+            "tdMode": td_mode,
+            "side": side,
+            "ordType": ord_type,
+            "sz": sz,
+            "ccy": ccy,
+            "clOrdId": cl_ord_id,
+            "tag": tag,
+            "posSide": pos_side,
+            "px": px,
+            "pxUsd": px_usd,
+            "pxVol": px_vol,
+            "reduceOnly": reduce_only,
+            "tgtCcy": tgt_ccy,
+            "banAmend": ban_amend,
+            "pxAmendType": px_amend_type,
+            "tradeQuoteCcy": trade_quote_ccy,
+            "stpMode": stp_mode,
+            "quickMgnType": quick_mgn_type,
+        }
+        if attach_algo_orders is not None:
+            data["attachAlgoOrds"] = [filter_params(order) for order in attach_algo_orders]
+        if extra_params:
+            data.update(extra_params)
+
+        return await self._make_request(
+            "POST",
+            endpoint="/api/v5/trade/order",
+            data=filter_params(data),
+            signed=True,
+        )
+
+    async def place_multiple_orders(self, orders: list[dict[str, Any]]) -> dict:
+        """Создание ордеров пакетно.
+
+        https://www.okx.com/docs-v5/en/#order-book-trading-trade-post-place-multiple-orders
+        """
+        data = [filter_params(order) for order in orders]
+
+        return await self._make_request(
+            "POST",
+            endpoint="/api/v5/trade/batch-orders",
+            data=data,  # type: ignore
+            signed=True,
+        )
+
+    async def cancel_order(
+        self,
+        inst_id: str,
+        ord_id: str | None = None,
+        cl_ord_id: str | None = None,
+    ) -> dict:
+        """Отмена ордера.
+
+        https://www.okx.com/docs-v5/en/#order-book-trading-trade-post-cancel-order
+        """
+        if not ord_id and not cl_ord_id:
+            raise ValueError("Either ord_id or cl_ord_id must be provided")
+
+        data = filter_params(
+            {
+                "instId": inst_id,
+                "ordId": ord_id,
+                "clOrdId": cl_ord_id,
+            }
+        )
+
+        return await self._make_request(
+            "POST",
+            endpoint="/api/v5/trade/cancel-order",
+            data=data,
+            signed=True,
+        )
+
+    async def cancel_multiple_orders(self, orders: list[dict[str, Any]]) -> dict:
+        """Отмена ордеров пакетно.
+
+        https://www.okx.com/docs-v5/en/#order-book-trading-trade-post-cancel-multiple-orders
+        """
+        data = [filter_params(order) for order in orders]
+
+        return await self._make_request(
+            "POST",
+            endpoint="/api/v5/trade/cancel-batch-orders",
+            data=data,  # type: ignore
+            signed=True,
+        )
+
+    async def amend_order(
+        self,
+        inst_id: str,
+        ord_id: str | None = None,
+        cl_ord_id: str | None = None,
+        *,
+        new_sz: str | None = None,
+        new_px: str | None = None,
+        new_px_usd: str | None = None,
+        new_px_vol: str | None = None,
+        cxl_on_fail: bool | None = None,
+        req_id: str | None = None,
+        px_amend_type: Literal["0", "1"] | None = None,
+        attach_algo_orders: list[dict[str, Any]] | None = None,
+        extra_params: dict[str, Any] | None = None,
+    ) -> dict:
+        """Изменение параметров ордера.
+
+        https://www.okx.com/docs-v5/en/#order-book-trading-trade-post-amend-order
+        """
+        if not ord_id and not cl_ord_id:
+            raise ValueError("Either ord_id or cl_ord_id must be provided")
+
+        data: dict[str, Any] = {
+            "instId": inst_id,
+            "ordId": ord_id,
+            "clOrdId": cl_ord_id,
+            "newSz": new_sz,
+            "newPx": new_px,
+            "newPxUsd": new_px_usd,
+            "newPxVol": new_px_vol,
+            "cxlOnFail": cxl_on_fail,
+            "reqId": req_id,
+            "pxAmendType": px_amend_type,
+        }
+        if attach_algo_orders is not None:
+            data["attachAlgoOrds"] = [filter_params(order) for order in attach_algo_orders]
+        if extra_params:
+            data.update(extra_params)
+
+        return await self._make_request(
+            "POST",
+            endpoint="/api/v5/trade/amend-order",
+            data=filter_params(data),
+            signed=True,
+        )
+
+    async def amend_multiple_orders(self, orders: list[dict[str, Any]]) -> dict:
+        """Изменение параметров ордеров пакетно.
+
+        https://www.okx.com/docs-v5/en/#order-book-trading-trade-post-amend-multiple-orders
+        """
+        data = [filter_params(order) for order in orders]
+
+        return await self._make_request(
+            "POST",
+            endpoint="/api/v5/trade/amend-batch-orders",
+            data=data,  # type: ignore
+            signed=True,
+        )
+
+    async def close_positions(
+        self,
+        inst_id: str,
+        mgn_mode: Literal["cross", "isolated"],
+        pos_side: Literal["net", "long", "short"] | None = None,
+        ccy: str | None = None,
+        auto_cxl: bool | None = None,
+        cl_ord_id: str | None = None,
+        tag: str | None = None,
+        extra_params: dict[str, Any] | None = None,
+    ) -> dict:
+        """Закрытие позиции рыночным ордером.
+
+        https://www.okx.com/docs-v5/en/#order-book-trading-trade-post-close-positions
+        """
+        data: dict[str, Any] = {
+            "instId": inst_id,
+            "mgnMode": mgn_mode,
+            "posSide": pos_side,
+            "ccy": ccy,
+            "autoCxl": auto_cxl,
+            "clOrdId": cl_ord_id,
+            "tag": tag,
+        }
+        if extra_params:
+            data.update(extra_params)
+
+        return await self._make_request(
+            "POST",
+            endpoint="/api/v5/trade/close-position",
+            data=filter_params(data),
+            signed=True,
+        )
+
+    async def get_order(
+        self,
+        inst_id: str,
+        ord_id: str | None = None,
+        cl_ord_id: str | None = None,
+    ) -> dict:
+        """Получение информации об ордере.
+
+        https://www.okx.com/docs-v5/en/#order-book-trading-trade-get-order-details
+        """
+        if not ord_id and not cl_ord_id:
+            raise ValueError("Either ord_id or cl_ord_id must be provided")
+
+        params = filter_params(
+            {
+                "instId": inst_id,
+                "ordId": ord_id,
+                "clOrdId": cl_ord_id,
+            }
+        )
+
+        return await self._make_request(
+            "GET",
+            endpoint="/api/v5/trade/order",
+            params=params,
+            signed=True,
+        )
+
+    async def get_order_list(
+        self,
+        inst_type: str | None = None,
+        inst_family: str | None = None,
+        inst_id: str | None = None,
+        ord_type: str | None = None,
+        state: Literal["live", "partially_filled"] | None = None,
+        after: str | None = None,
+        before: str | None = None,
+        limit: int | None = None,
+    ) -> dict:
+        """Получение списка активных ордеров.
+
+        https://www.okx.com/docs-v5/en/#order-book-trading-trade-get-order-list
+        """
+        params = filter_params(
+            {
+                "instType": inst_type,
+                "instFamily": inst_family,
+                "instId": inst_id,
+                "ordType": ord_type,
+                "state": state,
+                "after": after,
+                "before": before,
+                "limit": limit,
+            }
+        )
+
+        return await self._make_request(
+            "GET",
+            endpoint="/api/v5/trade/orders-pending",
+            params=params,
+            signed=True,
+        )
+
+    async def get_orders_history(
+        self,
+        inst_type: str,
+        inst_family: str | None = None,
+        inst_id: str | None = None,
+        ord_type: str | None = None,
+        state: str | None = None,
+        category: str | None = None,
+        after: str | None = None,
+        before: str | None = None,
+        begin: int | None = None,
+        end: int | None = None,
+        limit: int | None = None,
+    ) -> dict:
+        """Получение истории ордеров за 7 дней.
+
+        https://www.okx.com/docs-v5/en/#order-book-trading-trade-get-order-history-last-7-days
+        """
+        params = filter_params(
+            {
+                "instType": inst_type,
+                "instFamily": inst_family,
+                "instId": inst_id,
+                "ordType": ord_type,
+                "state": state,
+                "category": category,
+                "after": after,
+                "before": before,
+                "begin": begin,
+                "end": end,
+                "limit": limit,
+            }
+        )
+
+        return await self._make_request(
+            "GET",
+            endpoint="/api/v5/trade/orders-history",
+            params=params,
+            signed=True,
+        )
+
+    async def get_orders_history_archive(
+        self,
+        inst_type: str,
+        inst_family: str | None = None,
+        inst_id: str | None = None,
+        ord_type: str | None = None,
+        state: str | None = None,
+        category: str | None = None,
+        after: str | None = None,
+        before: str | None = None,
+        begin: int | None = None,
+        end: int | None = None,
+        limit: int | None = None,
+    ) -> dict:
+        """Получение истории ордеров за 3 месяца.
+
+        https://www.okx.com/docs-v5/en/#order-book-trading-trade-get-order-history-last-3-months
+        """
+        params = filter_params(
+            {
+                "instType": inst_type,
+                "instFamily": inst_family,
+                "instId": inst_id,
+                "ordType": ord_type,
+                "state": state,
+                "category": category,
+                "after": after,
+                "before": before,
+                "begin": begin,
+                "end": end,
+                "limit": limit,
+            }
+        )
+
+        return await self._make_request(
+            "GET",
+            endpoint="/api/v5/trade/orders-history-archive",
+            params=params,
+            signed=True,
+        )
+
+    async def get_fills(
+        self,
+        inst_type: str | None = None,
+        inst_family: str | None = None,
+        inst_id: str | None = None,
+        ord_id: str | None = None,
+        sub_type: str | None = None,
+        after: str | None = None,
+        before: str | None = None,
+        begin: int | None = None,
+        end: int | None = None,
+        limit: int | None = None,
+    ) -> dict:
+        """Получение сделок за 3 дня.
+
+        https://www.okx.com/docs-v5/en/#order-book-trading-trade-get-transaction-details-last-3-days
+        """
+        params = filter_params(
+            {
+                "instType": inst_type,
+                "instFamily": inst_family,
+                "instId": inst_id,
+                "ordId": ord_id,
+                "subType": sub_type,
+                "after": after,
+                "before": before,
+                "begin": begin,
+                "end": end,
+                "limit": limit,
+            }
+        )
+
+        return await self._make_request(
+            "GET",
+            endpoint="/api/v5/trade/fills",
+            params=params,
+            signed=True,
+        )
+
+    async def get_fills_history(
+        self,
+        inst_type: str,
+        inst_family: str | None = None,
+        inst_id: str | None = None,
+        ord_id: str | None = None,
+        sub_type: str | None = None,
+        after: str | None = None,
+        before: str | None = None,
+        begin: int | None = None,
+        end: int | None = None,
+        limit: int | None = None,
+    ) -> dict:
+        """Получение сделок за 3 месяца.
+
+        https://www.okx.com/docs-v5/en/#order-book-trading-trade-get-transaction-details-last-3-months
+        """
+        params = filter_params(
+            {
+                "instType": inst_type,
+                "instFamily": inst_family,
+                "instId": inst_id,
+                "ordId": ord_id,
+                "subType": sub_type,
+                "after": after,
+                "before": before,
+                "begin": begin,
+                "end": end,
+                "limit": limit,
+            }
+        )
+
+        return await self._make_request(
+            "GET",
+            endpoint="/api/v5/trade/fills-history",
+            params=params,
+            signed=True,
+        )
+
+    async def get_easy_convert_currency_list(self, source: Literal["1", "2"] | None = None) -> dict:
+        """Получение списка валют для Easy Convert.
+
+        https://www.okx.com/docs-v5/en/#order-book-trading-trade-get-easy-convert-currency-list
+        """
+        params = filter_params({"source": source})
+
+        return await self._make_request(
+            "GET",
+            endpoint="/api/v5/trade/easy-convert-currency-list",
+            params=params,
+            signed=True,
+        )
+
+    async def easy_convert(
+        self,
+        from_ccy: list[str],
+        to_ccy: str,
+        source: Literal["1", "2"] | None = None,
+    ) -> dict:
+        """Конвертация мелких остатков через Easy Convert.
+
+        https://www.okx.com/docs-v5/en/#order-book-trading-trade-post-place-easy-convert
+        """
+        data = filter_params(
+            {
+                "fromCcy": from_ccy,
+                "toCcy": to_ccy,
+                "source": source,
+            }
+        )
+
+        return await self._make_request(
+            "POST",
+            endpoint="/api/v5/trade/easy-convert",
+            data=data,
+            signed=True,
+        )
+
+    async def get_easy_convert_history(
+        self,
+        after: str | None = None,
+        before: str | None = None,
+        limit: int | None = None,
+    ) -> dict:
+        """Получение истории Easy Convert.
+
+        https://www.okx.com/docs-v5/en/#order-book-trading-trade-get-easy-convert-history
+        """
+        params = filter_params(
+            {
+                "after": after,
+                "before": before,
+                "limit": limit,
+            }
+        )
+
+        return await self._make_request(
+            "GET",
+            endpoint="/api/v5/trade/easy-convert-history",
+            params=params,
+            signed=True,
+        )
+
+    async def get_one_click_repay_currency_list(
+        self,
+        debt_type: Literal["cross", "isolated"] | None = None,
+    ) -> dict:
+        """Получение списка валют для One-click Repay.
+
+        https://www.okx.com/docs-v5/en/#order-book-trading-trade-get-one-click-repay-currency-list
+        """
+        params = filter_params({"debtType": debt_type})
+
+        return await self._make_request(
+            "GET",
+            endpoint="/api/v5/trade/one-click-repay-currency-list",
+            params=params,
+            signed=True,
+        )
+
+    async def trade_one_click_repay(
+        self,
+        debt_ccy: list[str],
+        repay_ccy: str,
+    ) -> dict:
+        """Совершение One-click Repay.
+
+        https://www.okx.com/docs-v5/en/#order-book-trading-trade-post-trade-one-click-repay
+        """
+        data = filter_params({"debtCcy": debt_ccy, "repayCcy": repay_ccy})
+
+        return await self._make_request(
+            "POST",
+            endpoint="/api/v5/trade/one-click-repay",
+            data=data,
+            signed=True,
+        )
+
+    async def get_one_click_repay_history(
+        self,
+        after: str | None = None,
+        before: str | None = None,
+        limit: int | None = None,
+    ) -> dict:
+        """Получение истории One-click Repay.
+
+        https://www.okx.com/docs-v5/en/#order-book-trading-trade-get-one-click-repay-history
+        """
+        params = filter_params(
+            {
+                "after": after,
+                "before": before,
+                "limit": limit,
+            }
+        )
+
+        return await self._make_request(
+            "GET",
+            endpoint="/api/v5/trade/one-click-repay-history",
+            params=params,
+            signed=True,
+        )
+
+    async def get_one_click_repay_currency_list_v2(self) -> dict:
+        """Получение списка валют для One-click Repay (v2).
+
+        https://www.okx.com/docs-v5/en/#order-book-trading-trade-get-one-click-repay-currency-list-new
+        """
+        return await self._make_request(
+            "GET",
+            endpoint="/api/v5/trade/one-click-repay-currency-list-v2",
+            signed=True,
+        )
+
+    async def trade_one_click_repay_v2(
+        self,
+        debt_ccy: str,
+        repay_ccy_list: list[str],
+    ) -> dict:
+        """Совершение One-click Repay (v2).
+
+        https://www.okx.com/docs-v5/en/#order-book-trading-trade-post-trade-one-click-repay-new
+        """
+        data = filter_params({"debtCcy": debt_ccy, "repayCcyList": repay_ccy_list})
+
+        return await self._make_request(
+            "POST",
+            endpoint="/api/v5/trade/one-click-repay-v2",
+            data=data,
+            signed=True,
+        )
+
+    async def get_one_click_repay_history_v2(
+        self,
+        after: str | None = None,
+        before: str | None = None,
+        limit: int | None = None,
+    ) -> dict:
+        """Получение истории One-click Repay (v2).
+
+        https://www.okx.com/docs-v5/en/#order-book-trading-trade-get-one-click-repay-history-new
+        """
+        params = filter_params(
+            {
+                "after": after,
+                "before": before,
+                "limit": limit,
+            }
+        )
+
+        return await self._make_request(
+            "GET",
+            endpoint="/api/v5/trade/one-click-repay-history-v2",
+            params=params,
+            signed=True,
+        )
+
+    async def mass_cancel_orders(
+        self,
+        inst_type: Literal["OPTION"],
+        inst_family: str,
+        lock_interval: str | None = None,
+    ) -> dict:
+        """Массовое снятие MMP-ордеров.
+
+        https://www.okx.com/docs-v5/en/#order-book-trading-trade-post-mass-cancel-order
+        """
+        data = filter_params(
+            {
+                "instType": inst_type,
+                "instFamily": inst_family,
+                "lockInterval": lock_interval,
+            }
+        )
+
+        return await self._make_request(
+            "POST",
+            endpoint="/api/v5/trade/mass-cancel",
+            data=data,
+            signed=True,
+        )
+
+    async def cancel_all_after(
+        self,
+        time_out: str,
+        tag: str | None = None,
+    ) -> dict:
+        """Установка Cancel All After.
+
+        https://www.okx.com/docs-v5/en/#order-book-trading-trade-post-cancel-all-after
+        """
+        data = filter_params({"timeOut": time_out, "tag": tag})
+
+        return await self._make_request(
+            "POST",
+            endpoint="/api/v5/trade/cancel-all-after",
+            data=data,
+            signed=True,
+        )
+
+    async def get_account_rate_limit(self) -> dict:
+        """Получение информации о лимитах запросов аккаунта.
+
+        https://www.okx.com/docs-v5/en/#order-book-trading-trade-get-account-rate-limit
+        """
+        return await self._make_request(
+            "GET",
+            endpoint="/api/v5/trade/account-rate-limit",
+            signed=True,
+        )
+
+    async def order_precheck(
+        self,
+        inst_id: str,
+        td_mode: Literal["cross", "isolated", "cash", "spot_isolated"],
+        side: Literal["buy", "sell"],
+        ord_type: Literal[
+            "market",
+            "limit",
+            "post_only",
+            "fok",
+            "ioc",
+            "optimal_limit_ioc",
+        ],
+        sz: str,
+        pos_side: Literal["net", "long", "short"] | None = None,
+        px: str | None = None,
+        reduce_only: bool | None = None,
+        tgt_ccy: Literal["base_ccy", "quote_ccy"] | None = None,
+        attach_algo_orders: list[dict[str, Any]] | None = None,
+        extra_params: dict[str, Any] | None = None,
+    ) -> dict:
+        """Превентивная проверка перед размещением ордера.
+
+        https://www.okx.com/docs-v5/en/#order-book-trading-trade-post-order-precheck
+        """
+        data: dict[str, Any] = {
+            "instId": inst_id,
+            "tdMode": td_mode,
+            "side": side,
+            "ordType": ord_type,
+            "sz": sz,
+            "posSide": pos_side,
+            "px": px,
+            "reduceOnly": reduce_only,
+            "tgtCcy": tgt_ccy,
+        }
+        if attach_algo_orders is not None:
+            data["attachAlgoOrds"] = [filter_params(order) for order in attach_algo_orders]
+        if extra_params:
+            data.update(extra_params)
+
+        return await self._make_request(
+            "POST",
+            endpoint="/api/v5/trade/order-precheck",
+            data=filter_params(data),
+            signed=True,
+        )
+
+    # topic: Order Book Trading (Market Data)
+
+    async def get_tickers(
         self,
         inst_type: Literal["SPOT", "SWAP", "FUTURES", "OPTION"],
-        inst_family: Literal["FUTURES", "SWAP", "OPTION"] | None = None,
+        inst_family: str | None = None,
+    ) -> dict:
+        """Получение списка тикеров с основными метриками.
+
+        https://www.okx.com/docs-v5/en/#order-book-trading-market-data-get-tickers
+        """
+        params = {
+            "instType": inst_type,
+            "instFamily": inst_family,
+        }
+
+        return await self._make_request(
+            "GET",
+            endpoint="/api/v5/market/tickers",
+            params=params,
+        )
+
+    async def get_ticker(self, inst_id: str) -> dict:
+        """Получение тикера инструмента с данными за 24 часа.
+
+        https://www.okx.com/docs-v5/en/#order-book-trading-market-data-get-ticker
+        """
+        params = {
+            "instId": inst_id,
+        }
+
+        return await self._make_request(
+            "GET",
+            endpoint="/api/v5/market/ticker",
+            params=params,
+        )
+
+    async def get_order_book(self, inst_id: str, sz: int | None = None) -> dict:
+        """Получение книги ордеров с обновлением каждые 50 мс.
+
+        https://www.okx.com/docs-v5/en/#order-book-trading-market-data-get-order-book
+        """
+        params = {
+            "instId": inst_id,
+            "sz": sz,
+        }
+
+        return await self._make_request(
+            "GET",
+            endpoint="/api/v5/market/books",
+            params=params,
+        )
+
+    async def get_full_order_book(self, inst_id: str, sz: int | None = None) -> dict:
+        """Получение полной книги ордеров с глубиной до 5000 уровней.
+
+        https://www.okx.com/docs-v5/en/#order-book-trading-market-data-get-full-order-book
+        """
+        params = {
+            "instId": inst_id,
+            "sz": sz,
+        }
+
+        return await self._make_request(
+            "GET",
+            endpoint="/api/v5/market/books-full",
+            params=params,
+        )
+
+    async def get_candlesticks(
+        self,
+        inst_id: str,
+        bar: str | None = None,
+        after: int | None = None,
+        before: int | None = None,
+        limit: int | None = None,
+    ) -> dict:
+        """Получение списка свечей с максимальной глубиной в 1440 записей.
+
+        https://www.okx.com/docs-v5/en/#order-book-trading-market-data-get-candlesticks
+        """
+        params = {
+            "instId": inst_id,
+            "bar": bar,
+            "after": after,
+            "before": before,
+            "limit": limit,
+        }
+
+        return await self._make_request(
+            "GET",
+            endpoint="/api/v5/market/candles",
+            params=params,
+        )
+
+    async def get_candlesticks_history(
+        self,
+        inst_id: str,
+        after: int | None = None,
+        before: int | None = None,
+        bar: str | None = None,
+        limit: int | None = None,
+    ) -> dict:
+        """Получение исторических свечей за прошлые периоды.
+
+        https://www.okx.com/docs-v5/en/#order-book-trading-market-data-get-candlesticks-history
+        """
+        params = {
+            "instId": inst_id,
+            "after": after,
+            "before": before,
+            "bar": bar,
+            "limit": limit,
+        }
+
+        return await self._make_request(
+            "GET",
+            endpoint="/api/v5/market/history-candles",
+            params=params,
+        )
+
+    async def get_trades(self, inst_id: str, limit: int | None = None) -> dict:
+        """Получение последних сделок по инструменту.
+
+        https://www.okx.com/docs-v5/en/#order-book-trading-market-data-get-trades
+        """
+        params = {
+            "instId": inst_id,
+            "limit": limit,
+        }
+
+        return await self._make_request(
+            "GET",
+            endpoint="/api/v5/market/trades",
+            params=params,
+        )
+
+    async def get_trades_history(
+        self,
+        inst_id: str,
+        type_: Literal["1", "2"] | None = None,
+        after: str | None = None,
+        before: str | None = None,
+        limit: int | None = None,
+    ) -> dict:
+        """Получение истории сделок с пагинацией за последние три месяца.
+
+        https://www.okx.com/docs-v5/en/#order-book-trading-market-data-get-trades-history
+        """
+        params = {
+            "instId": inst_id,
+            "type": type_,
+            "after": after,
+            "before": before,
+            "limit": limit,
+        }
+
+        return await self._make_request(
+            "GET",
+            endpoint="/api/v5/market/history-trades",
+            params=params,
+        )
+
+    async def get_option_trades_by_family(self, inst_family: str) -> dict:
+        """Получение сделок по всем опционам в рамках семьи инструментов.
+
+        https://www.okx.com/docs-v5/en/#order-book-trading-market-data-get-option-trades-by-instrument-family
+        """
+        params = {
+            "instFamily": inst_family,
+        }
+
+        return await self._make_request(
+            "GET",
+            endpoint="/api/v5/market/option/instrument-family-trades",
+            params=params,
+        )
+
+    async def get_option_trades(
+        self,
+        inst_id: str | None = None,
+        inst_family: str | None = None,
+        opt_type: Literal["C", "P"] | None = None,
+    ) -> dict:
+        """Получение сделок по выбранным опционам.
+
+        https://www.okx.com/docs-v5/en/#order-book-trading-market-data-get-option-trades
+        """
+        params = {
+            "instId": inst_id,
+            "instFamily": inst_family,
+            "optType": opt_type,
+        }
+
+        return await self._make_request(
+            "GET",
+            endpoint="/api/v5/public/option-trades",
+            params=params,
+        )
+
+    async def get_24h_total_volume(self) -> dict:
+        """Получение совокупного 24-часового объема торгов по платформе.
+
+        https://www.okx.com/docs-v5/en/#order-book-trading-market-data-get-24h-total-volume
+        """
+        return await self._make_request(
+            "GET",
+            endpoint="/api/v5/market/platform-24-volume",
+        )
+
+    async def get_call_auction_details(self, inst_id: str) -> dict:
+        """Получение данных по предторговому аукциону инструмента.
+
+        https://www.okx.com/docs-v5/en/#order-book-trading-market-data-get-call-auction-details
+        """
+        params = {
+            "instId": inst_id,
+        }
+
+        return await self._make_request(
+            "GET",
+            endpoint="/api/v5/market/call-auction-details",
+            params=params,
+        )
+
+    # topic: Public Data
+
+    async def get_instruments(
+        self,
+        inst_type: Literal["SPOT", "MARGIN", "SWAP", "FUTURES", "OPTION"],
+        inst_family: str | None = None,
+        inst_id: str | None = None,
+    ) -> dict:
+        """Получение списка доступных публичных инструментов.
+
+        https://www.okx.com/docs-v5/en/#public-data-rest-api-get-instruments
+        """
+        params = {
+            "instType": inst_type,
+            "instFamily": inst_family,
+            "instId": inst_id,
+        }
+
+        return await self._make_request(
+            "GET",
+            endpoint="/api/v5/public/instruments",
+            params=params,
+        )
+
+    async def get_estimated_delivery_price(self, inst_id: str) -> dict:
+        """Получение оценочной цены поставки или исполнения опциона.
+
+        https://www.okx.com/docs-v5/en/#public-data-rest-api-get-estimated-delivery-exercise-price
+        """
+        params = {
+            "instId": inst_id,
+        }
+
+        return await self._make_request(
+            "GET",
+            endpoint="/api/v5/public/estimated-price",
+            params=params,
+        )
+
+    async def get_delivery_exercise_history(
+        self,
+        inst_type: Literal["FUTURES", "OPTION"],
+        inst_family: str,
+        after: int | None = None,
+        before: int | None = None,
+        limit: int | None = None,
+    ) -> dict:
+        """Получение истории поставок и исполнений за последние три месяца.
+
+        https://www.okx.com/docs-v5/en/#public-data-rest-api-get-delivery-exercise-history
+        """
+        params = {
+            "instType": inst_type,
+            "instFamily": inst_family,
+            "after": after,
+            "before": before,
+            "limit": limit,
+        }
+
+        return await self._make_request(
+            "GET",
+            endpoint="/api/v5/public/delivery-exercise-history",
+            params=params,
+        )
+
+    async def get_estimated_settlement_info(self, inst_id: str) -> dict:
+        """Получение оценочной цены ближайшего расчета по фьючерсу.
+
+        https://www.okx.com/docs-v5/en/#public-data-rest-api-get-estimated-future-settlement-price
+        """
+        params = {
+            "instId": inst_id,
+        }
+
+        return await self._make_request(
+            "GET",
+            endpoint="/api/v5/public/estimated-settlement-info",
+            params=params,
+        )
+
+    async def get_futures_settlement_history(
+        self,
+        inst_family: str,
+        after: int | None = None,
+        before: int | None = None,
+        limit: int | None = None,
+    ) -> dict:
+        """Получение истории расчетов фьючерсов за последние три месяца.
+
+        https://www.okx.com/docs-v5/en/#public-data-rest-api-get-futures-settlement-history
+        """
+        params = {
+            "instFamily": inst_family,
+            "after": after,
+            "before": before,
+            "limit": limit,
+        }
+
+        return await self._make_request(
+            "GET",
+            endpoint="/api/v5/public/settlement-history",
+            params=params,
+        )
+
+    async def get_funding_rate(self, inst_id: str) -> dict:
+        """Получение текущей ставки финансирования.
+
+        https://www.okx.com/docs-v5/en/#public-data-rest-api-get-funding-rate
+        """
+        params = {
+            "instId": inst_id,
+        }
+
+        return await self._make_request(
+            "GET",
+            endpoint="/api/v5/public/funding-rate",
+            params=params,
+        )
+
+    async def get_funding_rate_history(
+        self,
+        inst_id: str,
+        before: int | None = None,
+        after: int | None = None,
+        limit: int | None = None,
+    ) -> dict:
+        """Получение истории ставок финансирования за последние три месяца.
+
+        https://www.okx.com/docs-v5/en/#public-data-rest-api-get-funding-rate-history
+        """
+        params = {
+            "instId": inst_id,
+            "before": before,
+            "after": after,
+            "limit": limit,
+        }
+
+        return await self._make_request(
+            "GET",
+            endpoint="/api/v5/public/funding-rate-history",
+            params=params,
+        )
+
+    async def get_open_interest(
+        self,
+        inst_type: Literal["SWAP", "FUTURES", "OPTION"],
+        inst_family: str | None = None,
+        inst_id: str | None = None,
+    ) -> dict:
+        """Получение общего открытого интереса по контрактам OKX.
+
+        https://www.okx.com/docs-v5/en/#public-data-rest-api-get-open-interest
+        """
+        params = {
+            "instType": inst_type,
+            "instFamily": inst_family,
+            "instId": inst_id,
+        }
+
+        return await self._make_request(
+            "GET",
+            endpoint="/api/v5/public/open-interest",
+            params=params,
+        )
+
+    async def get_price_limit(self, inst_id: str) -> dict:
+        """Получение верхнего и нижнего лимитов цен для инструмента.
+
+        https://www.okx.com/docs-v5/en/#public-data-rest-api-get-limit-price
+        """
+        params = {
+            "instId": inst_id,
+        }
+
+        return await self._make_request(
+            "GET",
+            endpoint="/api/v5/public/price-limit",
+            params=params,
+        )
+
+    async def get_option_market_data(
+        self,
+        inst_family: str,
+        exp_time: str | None = None,
     ) -> dict:
-        """Получение информации о тикерах.
+        """Получение сводных рыночных данных по опционам.
 
-        https://www.okx.com/docs-v5/en/#order-book-trading-market-data-get-tickers
+        https://www.okx.com/docs-v5/en/#public-data-rest-api-get-option-market-data
+        """
+        params = {
+            "instFamily": inst_family,
+            "expTime": exp_time,
+        }
+
+        return await self._make_request(
+            "GET",
+            endpoint="/api/v5/public/opt-summary",
+            params=params,
+        )
+
+    async def get_discount_rate_quota(
+        self,
+        ccy: str | None = None,
+        discount_lv: str | None = None,
+    ) -> dict:
+        """Получение ставок скидок и беспроцентных квот.
+
+        https://www.okx.com/docs-v5/en/#public-data-rest-api-get-discount-rate-and-interest-free-quota
+        """
+        params = {
+            "ccy": ccy,
+            "discountLv": discount_lv,
+        }
+
+        return await self._make_request(
+            "GET",
+            endpoint="/api/v5/public/discount-rate-interest-free-quota",
+            params=params,
+        )
+
+    async def get_system_time(self) -> dict:
+        """Получение времени сервера OKX.
+
+        https://www.okx.com/docs-v5/en/#public-data-rest-api-get-system-time
+        """
+        return await self._make_request(
+            "GET",
+            endpoint="/api/v5/public/time",
+        )
+
+    async def get_mark_price(
+        self,
+        inst_type: Literal["MARGIN", "SWAP", "FUTURES", "OPTION"],
+        inst_family: str | None = None,
+        inst_id: str | None = None,
+    ) -> dict:
+        """Получение маржинальной цены инструмента.
+
+        https://www.okx.com/docs-v5/en/#public-data-rest-api-get-mark-price
+        """
+        params = {
+            "instType": inst_type,
+            "instFamily": inst_family,
+            "instId": inst_id,
+        }
+
+        return await self._make_request(
+            "GET",
+            endpoint="/api/v5/public/mark-price",
+            params=params,
+        )
+
+    async def get_position_tiers(
+        self,
+        inst_type: Literal["MARGIN", "SWAP", "FUTURES", "OPTION"],
+        td_mode: Literal["cross", "isolated"],
+        inst_family: str | None = None,
+        inst_id: str | None = None,
+        ccy: str | None = None,
+        tier: str | None = None,
+    ) -> dict:
+        """Получение уровней позиций и допустимого плеча.
+
+        https://www.okx.com/docs-v5/en/#public-data-rest-api-get-position-tiers
+        """
+        params = {
+            "instType": inst_type,
+            "tdMode": td_mode,
+            "instFamily": inst_family,
+            "instId": inst_id,
+            "ccy": ccy,
+            "tier": tier,
+        }
+
+        return await self._make_request(
+            "GET",
+            endpoint="/api/v5/public/position-tiers",
+            params=params,
+        )
+
+    async def get_interest_rate_loan_quota(self) -> dict:
+        """Получение ставок и квот заимствования.
+
+        https://www.okx.com/docs-v5/en/#public-data-rest-api-get-interest-rate-and-loan-quota
+        """
+        return await self._make_request(
+            "GET",
+            endpoint="/api/v5/public/interest-rate-loan-quota",
+        )
+
+    async def get_underlying(self, inst_type: Literal["SWAP", "FUTURES", "OPTION"]) -> dict:
+        """Получение списка базовых активов по типу инструмента.
+
+        https://www.okx.com/docs-v5/en/#public-data-rest-api-get-underlying
+        """
+        params = {
+            "instType": inst_type,
+        }
+
+        return await self._make_request(
+            "GET",
+            endpoint="/api/v5/public/underlying",
+            params=params,
+        )
+
+    async def get_insurance_fund(
+        self,
+        inst_type: Literal["MARGIN", "SWAP", "FUTURES", "OPTION"],
+        type_: Literal[
+            "regular_update",
+            "liquidation_balance_deposit",
+            "bankruptcy_loss",
+            "platform_revenue",
+            "adl",
+        ]
+        | None = None,
+        inst_family: str | None = None,
+        ccy: str | None = None,
+        before: int | None = None,
+        after: int | None = None,
+        limit: int | None = None,
+    ) -> dict:
+        """Получение данных страхового фонда.
 
+        https://www.okx.com/docs-v5/en/#public-data-rest-api-get-insurance-fund
         """
         params = {
             "instType": inst_type,
+            "type": type_,
+            "instFamily": inst_family,
+            "ccy": ccy,
+            "before": before,
+            "after": after,
+            "limit": limit,
+        }
+
+        return await self._make_request(
+            "GET",
+            endpoint="/api/v5/public/insurance-fund",
+            params=params,
+        )
+
+    async def convert_contract_coin(
+        self,
+        inst_id: str,
+        sz: str,
+        type_: Literal["1", "2"] | None = None,
+        px: str | None = None,
+        unit: Literal["coin", "usds"] | None = None,
+        op_type: Literal["open", "close"] | None = None,
+    ) -> dict:
+        """Конвертация размера контракта и количества монет.
+
+        https://www.okx.com/docs-v5/en/#public-data-rest-api-unit-convert
+        """
+        params = {
+            "type": type_,
+            "instId": inst_id,
+            "sz": sz,
+            "px": px,
+            "unit": unit,
+            "opType": op_type,
+        }
+
+        return await self._make_request(
+            "GET",
+            endpoint="/api/v5/public/convert-contract-coin",
+            params=params,
+        )
+
+    async def get_option_tick_bands(self, inst_family: str | None = None) -> dict:
+        """Получение доступных ценовых диапазонов опционов.
+
+        https://www.okx.com/docs-v5/en/#public-data-rest-api-get-option-tick-bands
+        """
+        params = {
+            "instType": "OPTION",
             "instFamily": inst_family,
         }
-        return await self._make_request("GET", endpoint="/api/v5/market/tickers", params=params)
 
-    async def candles(
+        return await self._make_request(
+            "GET",
+            endpoint="/api/v5/public/instrument-tick-bands",
+            params=params,
+        )
+
+    async def get_premium_history(
+        self,
+        inst_id: str,
+        after: int | None = None,
+        before: int | None = None,
+        limit: int | None = None,
+    ) -> dict:
+        """Получение истории премии индекса за полгода.
+
+        https://www.okx.com/docs-v5/en/#public-data-rest-api-get-premium-history
+        """
+        params = {
+            "instId": inst_id,
+            "after": after,
+            "before": before,
+            "limit": limit,
+        }
+
+        return await self._make_request(
+            "GET",
+            endpoint="/api/v5/public/premium-history",
+            params=params,
+        )
+
+    async def get_index_tickers(
+        self,
+        quote_ccy: str | None = None,
+        inst_id: str | None = None,
+    ) -> dict:
+        """Получение индексов и ключевых метрик по ним.
+
+        https://www.okx.com/docs-v5/en/#public-data-rest-api-get-index-tickers
+        """
+        params = {
+            "quoteCcy": quote_ccy,
+            "instId": inst_id,
+        }
+
+        return await self._make_request(
+            "GET",
+            endpoint="/api/v5/market/index-tickers",
+            params=params,
+        )
+
+    async def get_index_candlesticks(
         self,
         inst_id: str,
+        after: int | None = None,
+        before: int | None = None,
         bar: str | None = None,
+        limit: int | None = None,
+    ) -> dict:
+        """Получение свечей по индексным значениям.
+
+        https://www.okx.com/docs-v5/en/#public-data-rest-api-get-index-candlesticks
+        """
+        params = {
+            "instId": inst_id,
+            "after": after,
+            "before": before,
+            "bar": bar,
+            "limit": limit,
+        }
+
+        return await self._make_request(
+            "GET",
+            endpoint="/api/v5/market/index-candles",
+            params=params,
+        )
+
+    async def get_index_candlesticks_history(
+        self,
+        inst_id: str,
         after: int | None = None,
         before: int | None = None,
+        bar: str | None = None,
         limit: int | None = None,
     ) -> dict:
-        """Получение свечей.
+        """Получение исторических свечей по индексам.
 
-        https://www.okx.com/docs-v5/en/#order-book-trading-market-data-get-candlesticks
+        https://www.okx.com/docs-v5/en/#public-data-rest-api-get-index-candlesticks-history
         """
         params = {
             "instId": inst_id,
+            "after": after,
+            "before": before,
             "bar": bar,
+            "limit": limit,
+        }
+
+        return await self._make_request(
+            "GET",
+            endpoint="/api/v5/market/history-index-candles",
+            params=params,
+        )
+
+    async def get_mark_price_candlesticks(
+        self,
+        inst_id: str,
+        after: int | None = None,
+        before: int | None = None,
+        bar: str | None = None,
+        limit: int | None = None,
+    ) -> dict:
+        """Получение свечей по маржинальной цене инструмента.
+
+        https://www.okx.com/docs-v5/en/#public-data-rest-api-get-mark-price-candlesticks
+        """
+        params = {
+            "instId": inst_id,
             "after": after,
             "before": before,
+            "bar": bar,
             "limit": limit,
         }
-        return await self._make_request("GET", endpoint="/api/v5/market/candles", params=params)
 
-    # topic: Public Data
-    # sub-topic: REST API
+        return await self._make_request(
+            "GET",
+            endpoint="/api/v5/market/mark-price-candles",
+            params=params,
+        )
 
-    async def get_funding_rate(self, inst_id: str) -> dict:
-        """Получение информации о ставке финансирования.
+    async def get_mark_price_candlesticks_history(
+        self,
+        inst_id: str,
+        after: int | None = None,
+        before: int | None = None,
+        bar: str | None = None,
+        limit: int | None = None,
+    ) -> dict:
+        """Получение исторических свечей по маржинальной цене.
 
-        https://www.okx.com/docs-v5/en/#public-data-rest-api-get-funding-rate
+        https://www.okx.com/docs-v5/en/#public-data-rest-api-get-mark-price-candlesticks-history
         """
         params = {
             "instId": inst_id,
+            "after": after,
+            "before": before,
+            "bar": bar,
+            "limit": limit,
         }
+
+        return await self._make_request(
+            "GET",
+            endpoint="/api/v5/market/history-mark-price-candles",
+            params=params,
+        )
+
+    async def get_exchange_rate(self) -> dict:
+        """Получение средневзвешенного курса USD/CNY за две недели.
+
+        https://www.okx.com/docs-v5/en/#public-data-rest-api-get-exchange-rate
+        """
         return await self._make_request(
-            "GET", endpoint="/api/v5/public/funding-rate", params=params
+            "GET",
+            endpoint="/api/v5/market/exchange-rate",
         )
 
-    async def get_open_interest(
+    async def get_index_components(self, index: str) -> dict:
+        """Получение состава выбранного индекса.
+
+        https://www.okx.com/docs-v5/en/#public-data-rest-api-get-index-components
+        """
+        params = {
+            "index": index,
+        }
+
+        return await self._make_request(
+            "GET",
+            endpoint="/api/v5/market/index-components",
+            params=params,
+        )
+
+    async def get_economic_calendar(
         self,
-        inst_type: Literal["SWAP", "FUTURES", "OPTION"],
-        inst_family: str | None = None,
-        inst_id: str | None = None,
+        region: str | None = None,
+        importance: Literal["1", "2", "3"] | None = None,
+        before: int | None = None,
+        after: int | None = None,
+        limit: int | None = None,
     ) -> dict:
-        """Получение информации по открытому интересу.
+        """Получение данных макроэкономического календаря.
 
-        https://www.okx.com/docs-v5/en/#public-data-rest-api-get-open-interest
+        https://www.okx.com/docs-v5/en/#public-data-rest-api-get-economic-calendar-data
+        """
+        params = {
+            "region": region,
+            "importance": importance,
+            "before": before,
+            "after": after,
+            "limit": limit,
+        }
+
+        return await self._make_request(
+            "GET",
+            endpoint="/api/v5/public/economic-calendar",
+            params=params,
+            signed=True,
+        )
+
+    async def get_market_data_history(
+        self,
+        module: Literal["1", "2", "3", "6"],
+        inst_type: Literal["SPOT", "FUTURES", "SWAP", "OPTION"],
+        begin: int,
+        end: int,
+        inst_id_list: str | None = None,
+        inst_family_list: str | None = None,
+        date_aggr_type: Literal["daily", "monthly"] = "daily",
+    ) -> dict:
+        """Получение ссылок на исторические рыночные данные OKX.
+
+        https://www.okx.com/docs-v5/en/#public-data-rest-api-get-historical-market-data
         """
         params = {
+            "module": module,
             "instType": inst_type,
-            "instFamily": inst_family,
-            "instId": inst_id,
+            "instIdList": inst_id_list,
+            "instFamilyList": inst_family_list,
+            "dateAggrType": date_aggr_type,
+            "begin": begin,
+            "end": end,
         }
+
         return await self._make_request(
-            "GET", endpoint="/api/v5/public/open-interest", params=params
+            "GET",
+            endpoint="/api/v5/public/market-data-history",
+            params=params,
         )