diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 969d1cea2..5024a34fe 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -46,7 +46,7 @@ jobs: uses: actions/cache@v4 with: path: ~/.cache/pip - key: test-${{ matrix.os }}-${{ matrix.python-version }}-pip + key: pip-${{ matrix.python-version }}-ubuntu - name: TA binary *nix if: steps.cache.outputs.cache-hit != 'true' @@ -167,7 +167,7 @@ jobs: uses: actions/cache@v4 with: path: ~/Library/Caches/pip - key: ${{ matrix.os }}-${{ matrix.python-version }}-pip + key: pip-${{ matrix.os }}-${{ matrix.python-version }} - name: TA binary *nix if: steps.cache.outputs.cache-hit != 'true' @@ -196,7 +196,7 @@ jobs: rm /usr/local/bin/python3.11-config || true rm /usr/local/bin/python3.12-config || true - brew install hdf5 c-blosc libomp + brew install libomp - name: Installation (python) run: | @@ -280,7 +280,7 @@ jobs: uses: actions/cache@v4 with: path: ~\AppData\Local\pip\Cache - key: ${{ matrix.os }}-${{ matrix.python-version }}-pip + key: pip-${{ matrix.os }}-${{ matrix.python-version }} - name: Installation run: | @@ -420,7 +420,7 @@ jobs: uses: actions/cache@v4 with: path: ~/.cache/pip - key: test-${{ matrix.os }}-${{ matrix.python-version }}-pip + key: pip-3.12-ubuntu - name: TA binary *nix if: steps.cache.outputs.cache-hit != 'true' @@ -540,12 +540,12 @@ jobs: - name: Publish to PyPI (Test) - uses: pypa/gh-action-pypi-publish@v1.10.3 + uses: pypa/gh-action-pypi-publish@v1.12.2 with: repository-url: https://test.pypi.org/legacy/ - name: Publish to PyPI - uses: pypa/gh-action-pypi-publish@v1.10.3 + uses: pypa/gh-action-pypi-publish@v1.12.2 deploy-docker: diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index 6048e6d45..dbc627c33 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -31,7 +31,7 @@ repos: - repo: https://github.com/charliermarsh/ruff-pre-commit # Ruff version. - rev: 'v0.7.1' + rev: 'v0.8.0' hooks: - id: ruff - id: ruff-format diff --git a/README.md b/README.md index 9f4fc51fb..5a4330bb9 100644 --- a/README.md +++ b/README.md @@ -33,6 +33,7 @@ Please read the [exchange specific notes](docs/exchanges.md) to learn about even - [X] [Bybit](https://bybit.com/) - [X] [Gate.io](https://www.gate.io/ref/6266643) - [X] [HTX](https://www.htx.com/) (Former Huobi) +- [X] [Hyperliquid](https://hyperliquid.xyz/) (A decentralized exchange, or DEX) - [X] [Kraken](https://kraken.com/) - [X] [OKX](https://okx.com/) (Former OKEX) - [ ] [potentially many others](https://github.com/ccxt/ccxt/). _(We cannot guarantee they will work)_ @@ -41,6 +42,7 @@ Please read the [exchange specific notes](docs/exchanges.md) to learn about even - [X] [Binance](https://www.binance.com/) - [X] [Gate.io](https://www.gate.io/ref/6266643) +- [X] [Hyperliquid](https://hyperliquid.xyz/) (A decentralized exchange, or DEX) - [X] [OKX](https://okx.com/) - [X] [Bybit](https://bybit.com/) diff --git a/build_helpers/pyarrow-17.0.0-cp311-cp311-linux_armv7l.whl b/build_helpers/pyarrow-18.0.0-cp311-cp311-linux_armv7l.whl similarity index 62% rename from build_helpers/pyarrow-17.0.0-cp311-cp311-linux_armv7l.whl rename to build_helpers/pyarrow-18.0.0-cp311-cp311-linux_armv7l.whl index 4fe505588..adb13b65f 100644 Binary files a/build_helpers/pyarrow-17.0.0-cp311-cp311-linux_armv7l.whl and b/build_helpers/pyarrow-18.0.0-cp311-cp311-linux_armv7l.whl differ diff --git a/build_helpers/schema.json b/build_helpers/schema.json index 6227829d9..e12b0bf0d 100644 --- a/build_helpers/schema.json +++ b/build_helpers/schema.json @@ -682,12 +682,18 @@ }, "exit_fill": { "description": "Telegram setting for exit fill signals.", - "type": "string", - "enum": [ - "on", - "off", - "silent" + "type": [ + "string", + "object" ], + "additionalProperties": { + "type": "string", + "enum": [ + "on", + "off", + "silent" + ] + }, "default": "on" }, "exit_cancel": { diff --git a/docs/advanced-hyperopt.md b/docs/advanced-hyperopt.md index e276bed94..480b20daf 100644 --- a/docs/advanced-hyperopt.md +++ b/docs/advanced-hyperopt.md @@ -37,8 +37,8 @@ class SuperDuperHyperOptLoss(IHyperOptLoss): min_date: datetime, max_date: datetime, config: Config, - processed: Dict[str, DataFrame], - backtest_stats: Dict[str, Any], + processed: dict[str, DataFrame], + backtest_stats: dict[str, Any], **kwargs, ) -> float: """ @@ -103,7 +103,7 @@ class MyAwesomeStrategy(IStrategy): SKDecimal(0.01, 0.20, decimals=3, name='roi_p3'), ] - def generate_roi_table(params: Dict) -> Dict[int, float]: + def generate_roi_table(params: Dict) -> dict[int, float]: roi_table = {} roi_table[0] = params['roi_p1'] + params['roi_p2'] + params['roi_p3'] diff --git a/docs/backtesting.md b/docs/backtesting.md index 12a6c346e..710c4fd03 100644 --- a/docs/backtesting.md +++ b/docs/backtesting.md @@ -10,12 +10,14 @@ To learn how to get data for the pairs and exchange you're interested in, head o ``` usage: freqtrade backtesting [-h] [-v] [--logfile FILE] [-V] [-c PATH] [-d PATH] [--userdir PATH] [-s NAME] - [--strategy-path PATH] [-i TIMEFRAME] - [--timerange TIMERANGE] - [--data-format-ohlcv {json,jsongz,hdf5}] + [--strategy-path PATH] + [--recursive-strategy-search] + [--freqaimodel NAME] [--freqaimodel-path PATH] + [-i TIMEFRAME] [--timerange TIMERANGE] + [--data-format-ohlcv {json,jsongz,hdf5,feather,parquet}] [--max-open-trades INT] [--stake-amount STAKE_AMOUNT] [--fee FLOAT] - [-p PAIRS [PAIRS ...]] [--eps] [--dmmp] + [-p PAIRS [PAIRS ...]] [--eps] [--enable-protections] [--dry-run-wallet DRY_RUN_WALLET] [--timeframe-detail TIMEFRAME_DETAIL] @@ -24,8 +26,9 @@ usage: freqtrade backtesting [-h] [-v] [--logfile FILE] [-V] [-c PATH] [--export-filename PATH] [--breakdown {day,week,month} [{day,week,month} ...]] [--cache {none,day,week,month}] + [--freqai-backtest-live-models] -optional arguments: +options: -h, --help show this help message and exit -i TIMEFRAME, --timeframe TIMEFRAME Specify timeframe (`1m`, `5m`, `30m`, `1h`, `1d`). @@ -48,10 +51,6 @@ optional arguments: --eps, --enable-position-stacking Allow buying the same pair multiple times (position stacking). - --dmmp, --disable-max-market-positions - Disable applying `max_open_trades` during backtest - (same as setting `max_open_trades` to a very high - number). --enable-protections, --enableprotections Enable protections for backtesting.Will slow backtesting down by a considerable amount, but will @@ -80,10 +79,13 @@ optional arguments: --cache {none,day,week,month} Load a cached backtest result no older than specified age (default: day). + --freqai-backtest-live-models + Run backtest with ready models. Common arguments: -v, --verbose Verbose mode (-vv for more, -vvv to get all messages). - --logfile FILE Log to the file specified. Special values are: + --logfile FILE, --log-file FILE + Log to the file specified. Special values are: 'syslog', 'journald'. See the documentation for more details. -V, --version show program's version number and exit @@ -92,7 +94,7 @@ Common arguments: `userdir/config.json` or `config.json` whichever exists). Multiple --config options may be used. Can be set to `-` to read config from stdin. - -d PATH, --datadir PATH + -d PATH, --datadir PATH, --data-dir PATH Path to directory with historical backtesting data. --userdir PATH, --user-data-dir PATH Path to userdata directory. @@ -102,6 +104,12 @@ Strategy arguments: Specify strategy class name which will be used by the bot. --strategy-path PATH Specify additional strategy lookup path. + --recursive-strategy-search + Recursively search for a strategy in the strategies + folder. + --freqaimodel NAME Specify a custom freqaimodels. + --freqaimodel-path PATH + Specify additional lookup path for freqaimodels. ``` @@ -558,6 +566,7 @@ Since backtesting lacks some detailed information about what happens within a ca - Stoploss - ROI - Trailing stoploss +- Position reversals (futures only) happen if an entry signal in the other direction than the closing trade triggers at the candle the existing trade closes. Taking these assumptions, backtesting tries to mirror real trading as closely as possible. However, backtesting will **never** replace running a strategy in dry-run mode. Also, keep in mind that past results don't guarantee future success. @@ -572,7 +581,7 @@ These limits are usually listed in the exchange documentation as "trading rules" Backtesting (as well as live and dry-run) does honor these limits, and will ensure that a stoploss can be placed below this value - so the value will be slightly higher than what the exchange specifies. Freqtrade has however no information about historic limits. -This can lead to situations where trading-limits are inflated by using a historic price, resulting in minimum amounts > 50$. +This can lead to situations where trading-limits are inflated by using a historic price, resulting in minimum amounts > 50\$. For example: diff --git a/docs/configuration.md b/docs/configuration.md index 074c9a577..9c46b7546 100644 --- a/docs/configuration.md +++ b/docs/configuration.md @@ -146,10 +146,10 @@ Freqtrade can also load many options via command line (CLI) arguments (check out The prevalence for all Options is as follows: -- CLI arguments override any other option -- [Environment Variables](#environment-variables) -- Configuration files are used in sequence (the last file wins) and override Strategy configurations. -- Strategy configurations are only used if they are not set via configuration or command-line arguments. These options are marked with [Strategy Override](#parameters-in-the-strategy) in the below table. +* CLI arguments override any other option +* [Environment Variables](#environment-variables) +* Configuration files are used in sequence (the last file wins) and override Strategy configurations. +* Strategy configurations are only used if they are not set via configuration or command-line arguments. These options are marked with [Strategy Override](#parameters-in-the-strategy) in the below table. ### Parameters table @@ -183,7 +183,7 @@ Mandatory parameters are marked as **Required**, which means that they are requi | `margin_mode` | When trading with leverage, this determines if the collateral owned by the trader will be shared or isolated to each trading pair [leverage documentation](leverage.md).
**Datatype:** String | `liquidation_buffer` | A ratio specifying how large of a safety net to place between the liquidation price and the stoploss to prevent a position from reaching the liquidation price [leverage documentation](leverage.md).
*Defaults to `0.05`.*
**Datatype:** Float | | **Unfilled timeout** -| `unfilledtimeout.entry` | **Required.** How long (in minutes or seconds) the bot will wait for an unfilled entry order to complete, after which the order will be cancelled and repeated at current (new) price, as long as there is a signal. [Strategy Override](#parameters-in-the-strategy).
**Datatype:** Integer +| `unfilledtimeout.entry` | **Required.** How long (in minutes or seconds) the bot will wait for an unfilled entry order to complete, after which the order will be cancelled. [Strategy Override](#parameters-in-the-strategy).
**Datatype:** Integer | `unfilledtimeout.exit` | **Required.** How long (in minutes or seconds) the bot will wait for an unfilled exit order to complete, after which the order will be cancelled and repeated at current (new) price, as long as there is a signal. [Strategy Override](#parameters-in-the-strategy).
**Datatype:** Integer | `unfilledtimeout.unit` | Unit to use in unfilledtimeout setting. Note: If you set unfilledtimeout.unit to "seconds", "internals.process_throttle_secs" must be inferior or equal to timeout [Strategy Override](#parameters-in-the-strategy).
*Defaults to `"minutes"`.*
**Datatype:** String | `unfilledtimeout.exit_timeout_count` | How many times can exit orders time out. Once this number of timeouts is reached, an emergency exit is triggered. 0 to disable and allow unlimited order cancels. [Strategy Override](#parameters-in-the-strategy).
*Defaults to `0`.*
**Datatype:** Integer @@ -295,10 +295,10 @@ Values set in the configuration file always overwrite values set in the strategy * `order_time_in_force` * `unfilledtimeout` * `disable_dataframe_checks` -- `use_exit_signal` +* `use_exit_signal` * `exit_profit_only` -- `exit_profit_offset` -- `ignore_roi_if_entry_signal` +* `exit_profit_offset` +* `ignore_roi_if_entry_signal` * `ignore_buying_expired_candle_after` * `position_adjustment_enable` * `max_entry_position_adjustment` @@ -311,12 +311,12 @@ There are several methods to configure how much of the stake currency the bot wi The minimum stake amount will depend on exchange and pair and is usually listed in the exchange support pages. -Assuming the minimum tradable amount for XRP/USD is 20 XRP (given by the exchange), and the price is 0.6$, the minimum stake amount to buy this pair is `20 * 0.6 ~= 12`. -This exchange has also a limit on USD - where all orders must be > 10$ - which however does not apply in this case. +Assuming the minimum tradable amount for XRP/USD is 20 XRP (given by the exchange), and the price is 0.6\$, the minimum stake amount to buy this pair is `20 * 0.6 ~= 12`. +This exchange has also a limit on USD - where all orders must be > 10\$ - which however does not apply in this case. -To guarantee safe execution, freqtrade will not allow buying with a stake-amount of 10.1$, instead, it'll make sure that there's enough space to place a stoploss below the pair (+ an offset, defined by `amount_reserve_percent`, which defaults to 5%). +To guarantee safe execution, freqtrade will not allow buying with a stake-amount of 10.1\$, instead, it'll make sure that there's enough space to place a stoploss below the pair (+ an offset, defined by `amount_reserve_percent`, which defaults to 5%). -With a reserve of 5%, the minimum stake amount would be ~12.6$ (`12 * (1 + 0.05)`). If we take into account a stoploss of 10% on top of that - we'd end up with a value of ~14$ (`12.6 / (1 - 0.1)`). +With a reserve of 5%, the minimum stake amount would be ~12.6\$ (`12 * (1 + 0.05)`). If we take into account a stoploss of 10% on top of that - we'd end up with a value of ~14\$ (`12.6 / (1 - 0.1)`). To limit this calculation in case of large stoploss values, the calculated minimum stake-limit will never be more than 50% above the real limit. @@ -362,9 +362,9 @@ To overcome this, the option `amend_last_stake_amount` can be set to `True`, whi In the example above this would mean: -- Trade1: 400 USDT -- Trade2: 400 USDT -- Trade3: 200 USDT +* Trade1: 400 USDT +* Trade2: 400 USDT +* Trade3: 200 USDT !!! Note This option only applies with [Static stake amount](#static-stake-amount) - since [Dynamic stake amount](#dynamic-stake-amount) divides the balances evenly. diff --git a/docs/data-download.md b/docs/data-download.md index 59fa23b97..559211c2f 100644 --- a/docs/data-download.md +++ b/docs/data-download.md @@ -11,9 +11,8 @@ Without provided configuration, `--exchange` becomes mandatory. You can use a relative timerange (`--days 20`) or an absolute starting point (`--timerange 20200101-`). For incremental downloads, the relative approach should be used. !!! Tip "Tip: Updating existing data" - If you already have backtesting data available in your data-directory and would like to refresh this data up to today, freqtrade will automatically calculate the data missing for the existing pairs and the download will occur from the latest available point until "now", neither --days or --timerange parameters are required. Freqtrade will keep the available data and only download the missing data. - If you are updating existing data after inserting new pairs that you have no data for, use `--new-pairs-days xx` parameter. Specified number of days will be downloaded for new pairs while old pairs will be updated with missing data only. - If you use `--days xx` parameter alone - data for specified number of days will be downloaded for _all_ pairs. Be careful, if specified number of days is smaller than gap between now and last downloaded candle - freqtrade will delete all existing data to avoid gaps in candle data. + If you already have backtesting data available in your data-directory and would like to refresh this data up to today, freqtrade will automatically calculate the missing timerange for the existing pairs and the download will occur from the latest available point until "now", neither `--days` or `--timerange` parameters are required. Freqtrade will keep the available data and only download the missing data. + If you are updating existing data after inserting new pairs that you have no data for, use the `--new-pairs-days xx` parameter. Specified number of days will be downloaded for new pairs while old pairs will be updated with missing data only. ### Usage @@ -90,7 +89,7 @@ Common arguments: !!! Tip "Downloading all data for one quote currency" Often, you'll want to download data for all pairs of a specific quote-currency. In such cases, you can use the following shorthand: - `freqtrade download-data --exchange binance --pairs .*/USDT <...>`. The provided "pairs" string will be expanded to contain all active pairs on the exchange. + `freqtrade download-data --exchange binance --pairs ".*/USDT" <...>`. The provided "pairs" string will be expanded to contain all active pairs on the exchange. To also download data for inactive (delisted) pairs, add `--include-inactive-pairs` to the command. !!! Note "Startup period" @@ -117,16 +116,17 @@ freqtrade download-data --exchange binance --pairs ETH/USDT XRP/USDT BTC/USDT or as regex (in this case, to download all active USDT pairs) ```bash -freqtrade download-data --exchange binance --pairs .*/USDT +freqtrade download-data --exchange binance --pairs ".*/USDT" ``` ### Other Notes * To use a different directory than the exchange specific default, use `--datadir user_data/data/some_directory`. -* To change the exchange used to download the historical data from, please use a different configuration file (you'll probably need to adjust rate limits etc.) +* To change the exchange used to download the historical data from, either use `--exchange ` - or specify a different configuration file. * To use `pairs.json` from some other directory, use `--pairs-file some_other_dir/pairs.json`. * To download historical candle (OHLCV) data for only 10 days, use `--days 10` (defaults to 30 days). * To download historical candle (OHLCV) data from a fixed starting point, use `--timerange 20200101-` - which will download all data from January 1st, 2020. +* Given starting points are ignored if data is already available, downloading only missing data up to today. * Use `--timeframes` to specify what timeframe download the historical candle (OHLCV) data for. Default is `--timeframes 1m 5m` which will download 1-minute and 5-minute data. * To use exchange, timeframe and list of pairs as defined in your configuration file, use the `-c/--config` option. With this, the script uses the whitelist defined in the config as the list of currency pairs to download data for and does not require the pairs.json file. You can combine `-c/--config` with most other options. diff --git a/docs/developer.md b/docs/developer.md index 4e7d4f2f4..d66f615fd 100644 --- a/docs/developer.md +++ b/docs/developer.md @@ -162,7 +162,7 @@ Hopefully you also want to contribute this back upstream. Whatever your motivations are - This should get you off the ground in trying to develop a new Pairlist Handler. -First of all, have a look at the [VolumePairList](https://github.com/freqtrade/freqtrade/blob/develop/freqtrade/pairlist/VolumePairList.py) Handler, and best copy this file with a name of your new Pairlist Handler. +First of all, have a look at the [VolumePairList](https://github.com/freqtrade/freqtrade/blob/develop/freqtrade/plugins/pairlist/VolumePairList.py) Handler, and best copy this file with a name of your new Pairlist Handler. This is a simple Handler, which however serves as a good example on how to start developing. @@ -226,7 +226,7 @@ In `VolumePairList`, this implements different methods of sorting, does early va ##### sample ``` python - def filter_pairlist(self, pairlist: List[str], tickers: Dict) -> List[str]: + def filter_pairlist(self, pairlist: list[str], tickers: dict) -> List[str]: # Generate dynamic whitelist pairs = self._calculate_pairlist(pairlist, tickers) return pairs diff --git a/docs/exchanges.md b/docs/exchanges.md index f55c45919..34a2e4d14 100644 --- a/docs/exchanges.md +++ b/docs/exchanges.md @@ -252,6 +252,14 @@ OKX requires a passphrase for each api key, you will therefore need to add this Gate.io allows the use of `POINT` to pay for fees. As this is not a tradable currency (no regular market available), automatic fee calculations will fail (and default to a fee of 0). The configuration parameter `exchange.unknown_fee_rate` can be used to specify the exchange rate between Point and the stake currency. Obviously, changing the stake-currency will also require changes to this value. +Gate API keys require the following permissions on top of the market type you want to trade: + +* "Spot Trade" _or_ "Perpetual Futures" (Read and Write) (either select both, or the one matching the market you want to trade) +* "Wallet" (read only) +* "Account" (read only) + +Without these permissions, the bot will not start correctly and show errors like "permission missing". + ## Bybit Futures trading on bybit is currently supported for USDT markets, and will use isolated futures mode. @@ -261,6 +269,7 @@ On startup, freqtrade will set the position mode to "One-way Mode" for the whole As bybit doesn't provide funding rate history, the dry-run calculation is used for live trades as well. API Keys for live futures trading must have the following permissions: + * Read-write * Contract - Orders * Contract - Positions @@ -295,6 +304,41 @@ It's therefore required to pass the UID as well. !!! Warning "Necessary Verification" Bitmart requires Verification Lvl2 to successfully trade on the spot market through the API - even though trading via UI works just fine with just Lvl1 verification. +## Hyperliquid + +!!! Tip "Stoploss on Exchange" + Hyperliquid supports `stoploss_on_exchange` and uses `stop-loss-limit` orders. It provides great advantages, so we recommend to benefit from it. + +Hyperliquid is a Decentralized Exchange (DEX). Decentralized exchanges work a bit different compared to normal exchanges. Instead of authenticating private API calls using an API key, private API calls need to be signed with the private key of your wallet (We recommend using an api Wallet for this, generated either on Hyperliquid or in your wallet of choice). +This needs to be configured like this: + +```json +"exchange": { + "name": "hyperliquid", + "walletAddress": "your_eth_wallet_address", + "privateKey": "your_api_private_key", + // ... +} +``` + +* walletAddress in hex format: `0x<40 hex characters>` - Can be easily copied from your wallet - and should be your wallet address, not your API Wallet Address. +* privateKey in hex format: `0x<64 hex characters>` - Use the key the API Wallet shows on creation. + +Hyperliquid handles deposits and withdrawals on the Arbitrum One chain, a Layer 2 scaling solution built on top of Ethereum. Hyperliquid uses USDC as quote / collateral. The process of depositing USDC on Hyperliquid requires a couple of steps, see [how to start trading](https://hyperliquid.gitbook.io/hyperliquid-docs/onboarding/how-to-start-trading) for details on what steps are needed. + +!!! Note "Hyperliquid general usage Notes" + Hyperliquid does not support market orders, however ccxt will simulate market orders by placing limit orders with a maximum slippage of 5%. + Unfortunately, hyperliquid only offers 5000 historic candles, so backtesting will either need to build candles historically (by waiting and downloading the data incrementally over time) - or will be limited to the last 5000 candles. + +!!! Info "Some general best practices (non exhaustive)" + * Beware of supply chain attacks, like pip package poisoning etcetera. Whenever you use your private key, make sure your environment is safe. + * Don't use your actual wallet private key for trading. Use the Hyperliquid [API generator](https://app.hyperliquid.xyz/API) to create a separate API wallet. + * Don't store your actual wallet private key on the server you use for freqtrade. Use the API wallet private key instead. This key won't allow withdrawals, only trading. + * Always keep your mnemonic phrase and private key private. + * Don't use the same mnemonic as the one you had to backup when initializing a hardware wallet, using the same mnemonic basically deletes the security of your hardware wallet. + * Create a different software wallet, only transfer the funds you want to trade with to that wallet, and use that wallet to trade on Hyperliquid. + * If you have funds you don't want to use for trading (after making a profit for example), transfer them back to your hardware wallet. + ## All exchanges Should you experience constant errors with Nonce (like `InvalidNonce`), it is best to regenerate the API keys. Resetting Nonce is difficult and it's usually easier to regenerate the API keys. @@ -304,7 +348,7 @@ Should you experience constant errors with Nonce (like `InvalidNonce`), it is be * The Ocean (exchange id: `theocean`) exchange uses Web3 functionality and requires `web3` python package to be installed: ```shell -$ pip3 install web3 +pip3 install web3 ``` ### Getting latest price / Incomplete candles diff --git a/docs/faq.md b/docs/faq.md index 134765579..98b106899 100644 --- a/docs/faq.md +++ b/docs/faq.md @@ -100,6 +100,19 @@ You can use the `/stopentry` command in Telegram to prevent future trade entry, Please look at the [advanced setup documentation Page](advanced-setup.md#running-multiple-instances-of-freqtrade). +### I'm getting "Impossible to load Strategy" when starting the bot + +This error message is shown when the bot cannot load the strategy. +Usually, you can use `freqtrade list-strategies` to list all available strategies. +The output of this command will also include a status column, showing if the strategy can be loaded. + +Please check the following: + +* Are you using the correct strategy name? The strategy name is case-sensitive and must correspond to the Strategy class name (not the filename!). +* Is the strategy in the `user_data/strategies` directory, and has the file-ending `.py`? +* Does the bot show other warnings before this error? Maybe you're missing some dependencies for the strategy - which would be highlighted in the log. +* In case of docker - is the strategy directory mounted correctly (check the volumes part of the docker-compose file)? + ### I'm getting "Missing data fillup" messages in the log This message is just a warning that the latest candles had missing candles in them. @@ -146,9 +159,9 @@ The same fix should be applied in the configuration file, if order types are def ### I'm trying to start the bot live, but get an API permission error -Errors like `Invalid API-key, IP, or permissions for action` mean exactly what they actually say. -Your API key is either invalid (copy/paste error? check for leading/trailing spaces in the config), expired, or the IP you're running the bot from is not enabled in the Exchange's API console. -Usually, the permission "Spot Trading" (or the equivalent in the exchange you use) will be necessary. +Errors like `Invalid API-key, IP, or permissions for action` mean exactly what they actually say. +Your API key is either invalid (copy/paste error? check for leading/trailing spaces in the config), expired, or the IP you're running the bot from is not enabled in the Exchange's API console. +Usually, the permission "Spot Trading" (or the equivalent in the exchange you use) will be necessary. Futures will usually have to be enabled specifically. ### How do I search the bot logs for something? diff --git a/docs/freqai-configuration.md b/docs/freqai-configuration.md index 5caa89a42..7ae2535f6 100644 --- a/docs/freqai-configuration.md +++ b/docs/freqai-configuration.md @@ -293,10 +293,10 @@ class MyCoolPyTorchClassifier(BasePyTorchClassifier): super().__init__(**kwargs) config = self.freqai_info.get("model_training_parameters", {}) self.learning_rate: float = config.get("learning_rate", 3e-4) - self.model_kwargs: Dict[str, Any] = config.get("model_kwargs", {}) - self.trainer_kwargs: Dict[str, Any] = config.get("trainer_kwargs", {}) + self.model_kwargs: dict[str, Any] = config.get("model_kwargs", {}) + self.trainer_kwargs: dict[str, Any] = config.get("trainer_kwargs", {}) - def fit(self, data_dictionary: Dict, dk: FreqaiDataKitchen, **kwargs) -> Any: + def fit(self, data_dictionary: dict, dk: FreqaiDataKitchen, **kwargs) -> Any: """ User sets up the training and test data to fit their desired model here :param data_dictionary: the dictionary holding all data for train, test, @@ -359,10 +359,10 @@ class PyTorchMLPRegressor(BasePyTorchRegressor): super().__init__(**kwargs) config = self.freqai_info.get("model_training_parameters", {}) self.learning_rate: float = config.get("learning_rate", 3e-4) - self.model_kwargs: Dict[str, Any] = config.get("model_kwargs", {}) - self.trainer_kwargs: Dict[str, Any] = config.get("trainer_kwargs", {}) + self.model_kwargs: dict[str, Any] = config.get("model_kwargs", {}) + self.trainer_kwargs: dict[str, Any] = config.get("trainer_kwargs", {}) - def fit(self, data_dictionary: Dict, dk: FreqaiDataKitchen, **kwargs) -> Any: + def fit(self, data_dictionary: dict, dk: FreqaiDataKitchen, **kwargs) -> Any: n_features = data_dictionary["train_features"].shape[-1] model = PyTorchMLPModel( input_dim=n_features, @@ -393,7 +393,7 @@ Here we create a `PyTorchMLPRegressor` class that implements the `fit` method. T For example, if you are using a binary classifier to predict price movements as up or down, you can set the class names as follows: ```python - def set_freqai_targets(self, dataframe: DataFrame, metadata: Dict, **kwargs) -> DataFrame: + def set_freqai_targets(self, dataframe: DataFrame, metadata: dict, **kwargs) -> DataFrame: self.freqai.class_names = ["down", "up"] dataframe['&s-up_or_down'] = np.where(dataframe["close"].shift(-100) > dataframe["close"], 'up', 'down') diff --git a/docs/hyperopt.md b/docs/hyperopt.md index 6788f681a..f36b1c6b3 100644 --- a/docs/hyperopt.md +++ b/docs/hyperopt.md @@ -42,11 +42,11 @@ usage: freqtrade hyperopt [-h] [-v] [--logfile FILE] [-V] [-c PATH] [-d PATH] [--recursive-strategy-search] [--freqaimodel NAME] [--freqaimodel-path PATH] [-i TIMEFRAME] [--timerange TIMERANGE] - [--data-format-ohlcv {json,jsongz,hdf5}] + [--data-format-ohlcv {json,jsongz,hdf5,feather,parquet}] [--max-open-trades INT] [--stake-amount STAKE_AMOUNT] [--fee FLOAT] [-p PAIRS [PAIRS ...]] [--hyperopt-path PATH] - [--eps] [--dmmp] [--enable-protections] + [--eps] [--enable-protections] [--dry-run-wallet DRY_RUN_WALLET] [--timeframe-detail TIMEFRAME_DETAIL] [-e INT] [--spaces {all,buy,sell,roi,stoploss,trailing,protection,trades,default} [{all,buy,sell,roi,stoploss,trailing,protection,trades,default} ...]] @@ -55,15 +55,15 @@ usage: freqtrade hyperopt [-h] [-v] [--logfile FILE] [-V] [-c PATH] [-d PATH] [--hyperopt-loss NAME] [--disable-param-export] [--ignore-missing-spaces] [--analyze-per-epoch] -optional arguments: +options: -h, --help show this help message and exit -i TIMEFRAME, --timeframe TIMEFRAME Specify timeframe (`1m`, `5m`, `30m`, `1h`, `1d`). --timerange TIMERANGE Specify what timerange of data to use. - --data-format-ohlcv {json,jsongz,hdf5} + --data-format-ohlcv {json,jsongz,hdf5,feather,parquet} Storage format for downloaded candle (OHLCV) data. - (default: `json`). + (default: `feather`). --max-open-trades INT Override the value of the `max_open_trades` configuration setting. @@ -80,10 +80,6 @@ optional arguments: --eps, --enable-position-stacking Allow buying the same pair multiple times (position stacking). - --dmmp, --disable-max-market-positions - Disable applying `max_open_trades` during backtest - (same as setting `max_open_trades` to a very high - number). --enable-protections, --enableprotections Enable protections for backtesting.Will slow backtesting down by a considerable amount, but will @@ -133,7 +129,8 @@ optional arguments: Common arguments: -v, --verbose Verbose mode (-vv for more, -vvv to get all messages). - --logfile FILE Log to the file specified. Special values are: + --logfile FILE, --log-file FILE + Log to the file specified. Special values are: 'syslog', 'journald'. See the documentation for more details. -V, --version show program's version number and exit @@ -142,7 +139,7 @@ Common arguments: `userdir/config.json` or `config.json` whichever exists). Multiple --config options may be used. Can be set to `-` to read config from stdin. - -d PATH, --datadir PATH + -d PATH, --datadir PATH, --data-dir PATH Path to directory with historical backtesting data. --userdir PATH, --user-data-dir PATH Path to userdata directory. @@ -867,18 +864,15 @@ You can use the `--print-all` command line option if you would like to see all r ## Position stacking and disabling max market positions -In some situations, you may need to run Hyperopt (and Backtesting) with the -`--eps`/`--enable-position-staking` and `--dmmp`/`--disable-max-market-positions` arguments. +In some situations, you may need to run Hyperopt (and Backtesting) with the `--eps`/`--enable-position-staking` argument, or you may need to set `max_open_trades` to a very high number to disable the limit on the number of open trades. By default, hyperopt emulates the behavior of the Freqtrade Live Run/Dry Run, where only one -open trade is allowed for every traded pair. The total number of trades open for all pairs +open trade per pair is allowed. The total number of trades open for all pairs is also limited by the `max_open_trades` setting. During Hyperopt/Backtesting this may lead to -some potential trades to be hidden (or masked) by previously open trades. +potential trades being hidden (or masked) by already open trades. -The `--eps`/`--enable-position-stacking` argument allows emulation of buying the same pair multiple times, -while `--dmmp`/`--disable-max-market-positions` disables applying `max_open_trades` -during Hyperopt/Backtesting (which is equal to setting `max_open_trades` to a very high -number). +The `--eps`/`--enable-position-stacking` argument allows emulation of buying the same pair multiple times. +Using `--max-open-trades` with a very high number will disable the limit on the number of open trades. !!! Note Dry/live runs will **NOT** use position stacking - therefore it does make sense to also validate the strategy without this as it's closer to reality. @@ -919,13 +913,39 @@ Your epochs should therefore be aligned to the possible values - or you should b After you run Hyperopt for the desired amount of epochs, you can later list all results for analysis, select only best or profitable once, and show the details for any of the epochs previously evaluated. This can be done with the `hyperopt-list` and `hyperopt-show` sub-commands. The usage of these sub-commands is described in the [Utils](utils.md#list-hyperopt-results) chapter. +## Output debug messages from your strategy + +If you want to output debug messages from your strategy, you can use the `logging` module. By default, Freqtrade will output all messages with a level of `INFO` or higher. + + +``` python +import logging + + +logger = logging.getLogger(__name__) + + +class MyAwesomeStrategy(IStrategy): + ... + + def populate_entry_trend(self, dataframe: DataFrame, metadata: dict) -> DataFrame: + logger.info("This is a debug message") + ... + +``` + +!!! Note "using print" + Messages printed via `print()` will not be shown in the hyperopt output unless parallelism is disabled (`-j 1`). + It is recommended to use the `logging` module instead. + ## Validate backtesting results Once the optimized strategy has been implemented into your strategy, you should backtest this strategy to make sure everything is working as expected. -To achieve same the results (number of trades, their durations, profit, etc.) as during Hyperopt, please use the same configuration and parameters (timerange, timeframe, ...) used for hyperopt `--dmmp`/`--disable-max-market-positions` and `--eps`/`--enable-position-stacking` for Backtesting. +To achieve same the results (number of trades, their durations, profit, etc.) as during Hyperopt, please use the same configuration and parameters (timerange, timeframe, ...) used for hyperopt for Backtesting. ### Why do my backtest results not match my hyperopt results? + Should results not match, check the following factors: * You may have added parameters to hyperopt in `populate_indicators()` where they will be calculated only once **for all epochs**. If you are, for example, trying to optimise multiple SMA timeperiod values, the hyperoptable timeperiod parameter should be placed in `populate_entry_trend()` which is calculated every epoch. See [Optimizing an indicator parameter](https://www.freqtrade.io/en/stable/hyperopt/#optimizing-an-indicator-parameter). diff --git a/docs/includes/pairlists.md b/docs/includes/pairlists.md index 8d79a7bc1..7e4659807 100644 --- a/docs/includes/pairlists.md +++ b/docs/includes/pairlists.md @@ -352,7 +352,7 @@ The optional `bearer_token` will be included in the requests Authorization Heade #### MarketCapPairList -`MarketCapPairList` employs sorting/filtering of pairs by their marketcap rank based of CoinGecko. It will only recognize coins up to the coin placed at rank 250. The returned pairlist will be sorted based of their marketcap ranks. +`MarketCapPairList` employs sorting/filtering of pairs by their marketcap rank based of CoinGecko. The returned pairlist will be sorted based of their marketcap ranks. ```json "pairlists": [ @@ -366,7 +366,8 @@ The optional `bearer_token` will be included in the requests Authorization Heade ] ``` -`number_assets` defines the maximum number of pairs returned by the pairlist. `max_rank` will determine the maximum rank used in creating/filtering the pairlist. It's expected that some coins within the top `max_rank` marketcap will not be included in the resulting pairlist since not all pairs will have active trading pairs in your preferred market/stake/exchange combination. +`number_assets` defines the maximum number of pairs returned by the pairlist. `max_rank` will determine the maximum rank used in creating/filtering the pairlist. It's expected that some coins within the top `max_rank` marketcap will not be included in the resulting pairlist since not all pairs will have active trading pairs in your preferred market/stake/exchange combination. +While using a `max_rank` bigger than 250 is supported, it's not recommended, as it'll cause multiple API calls to CoinGecko, which can lead to rate limit issues. The `refresh_period` setting defines the interval (in seconds) at which the marketcap rank data will be refreshed. The default is 86,400 seconds (1 day). The pairlist cache (`refresh_period`) applies to both generating pairlists (when in the first position in the list) and filtering instances (when not in the first position in the list). diff --git a/docs/index.md b/docs/index.md index d6dca4880..45871acb9 100644 --- a/docs/index.md +++ b/docs/index.md @@ -28,7 +28,7 @@ Freqtrade is a free and open source crypto trading bot written in Python. It is - Develop your Strategy: Write your strategy in python, using [pandas](https://pandas.pydata.org/). Example strategies to inspire you are available in the [strategy repository](https://github.com/freqtrade/freqtrade-strategies). - Download market data: Download historical data of the exchange and the markets your may want to trade with. - Backtest: Test your strategy on downloaded historical data. -- Optimize: Find the best parameters for your strategy using hyperoptimization which employs machining learning methods. You can optimize buy, sell, take profit (ROI), stop-loss and trailing stop-loss parameters for your strategy. +- Optimize: Find the best parameters for your strategy using hyperoptimization which employs machine learning methods. You can optimize buy, sell, take profit (ROI), stop-loss and trailing stop-loss parameters for your strategy. - Select markets: Create your static list or use an automatic one based on top traded volumes and/or prices (not available during backtesting). You can also explicitly blacklist markets you don't want to trade. - Run: Test your strategy with simulated money (Dry-Run mode) or deploy it with real money (Live-Trade mode). - Run using Edge (optional module): The concept is to find the best historical [trade expectancy](edge.md#expectancy) by markets based on variation of the stop-loss and then allow/reject markets to trade. The sizing of the trade is based on a risk of a percentage of your capital. @@ -40,11 +40,12 @@ Freqtrade is a free and open source crypto trading bot written in Python. It is Please read the [exchange specific notes](exchanges.md) to learn about eventual, special configurations needed for each exchange. - [X] [Binance](https://www.binance.com/) -- [X] [Bitmart](https://bitmart.com/) - [X] [BingX](https://bingx.com/invite/0EM9RX) +- [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] [Hyperliquid](https://hyperliquid.xyz/) (A decentralized exchange, or DEX) - [X] [Kraken](https://kraken.com/) - [X] [OKX](https://okx.com/) (Former OKEX) - [ ] [potentially many others through ccxt](https://github.com/ccxt/ccxt/). _(We cannot guarantee they will work)_ @@ -52,9 +53,10 @@ Please read the [exchange specific notes](exchanges.md) to learn about eventual, ### Supported Futures Exchanges (experimental) - [X] [Binance](https://www.binance.com/) -- [X] [Gate.io](https://www.gate.io/ref/6266643) -- [X] [OKX](https://okx.com/) - [X] [Bybit](https://bybit.com/) +- [X] [Gate.io](https://www.gate.io/ref/6266643) +- [X] [Hyperliquid](https://hyperliquid.xyz/) (A decentralized exchange, or DEX) +- [X] [OKX](https://okx.com/) Please make sure to read the [exchange specific notes](exchanges.md), as well as the [trading with leverage](leverage.md) documentation before diving in. diff --git a/docs/installation.md b/docs/installation.md index 02cbb7f3e..30deb07ba 100644 --- a/docs/installation.md +++ b/docs/installation.md @@ -67,6 +67,18 @@ OS Specific steps are listed first, the common section below is necessary for al sudo apt install -y python3-pip python3-venv python3-dev python3-pandas git curl ``` +=== "MacOS" + #### Install necessary dependencies + + Install [Homebrew](https://brew.sh/) if you don't have it already. + + ```bash + # install packages + brew install gettext libomp + ``` + !!! Note + The `setup.sh` script will install these dependencies for you - assuming brew is installed on your system. + === "RaspberryPi/Raspbian" The following assumes the latest [Raspbian Buster lite image](https://www.raspberrypi.org/downloads/raspbian/). This image comes with python3.11 preinstalled, making it easy to get freqtrade up and running. @@ -76,7 +88,7 @@ OS Specific steps are listed first, the common section below is necessary for al ```bash sudo apt-get install python3-venv libatlas-base-dev cmake curl - # Use pywheels.org to speed up installation + # Use piwheels.org to speed up installation sudo echo "[global]\nextra-index-url=https://www.piwheels.org/simple" > tee /etc/pip.conf git clone https://github.com/freqtrade/freqtrade.git @@ -150,9 +162,7 @@ Each time you open a new terminal, you must run `source .venv/bin/activate` to a source ./.venv/bin/activate ``` -### Congratulations - -[You are ready](#you-are-ready), and run the bot +[You are now ready](#you-are-ready) to run the bot. ### Other options of /setup.sh script @@ -220,7 +230,7 @@ cd .. rm -rf ./ta-lib* ``` -#### Setup Python virtual environment (virtualenv) +### Setup Python virtual environment (virtualenv) You will run freqtrade in separated `virtual environment` @@ -232,19 +242,18 @@ python3 -m venv .venv source .venv/bin/activate ``` -#### Install python dependencies +### Install python dependencies ```bash python3 -m pip install --upgrade pip python3 -m pip install -r requirements.txt +# install freqtrade python3 -m pip install -e . ``` -### Congratulations +[You are now ready](#you-are-ready) to run the bot. -[You are ready](#you-are-ready), and run the bot - -#### (Optional) Post-installation Tasks +### (Optional) Post-installation Tasks !!! Note If you run the bot on a server, you should consider using [Docker](docker_quickstart.md) or a terminal multiplexer like `screen` or [`tmux`](https://en.wikipedia.org/wiki/Tmux) to avoid that the bot is stopped on logout. @@ -333,9 +342,7 @@ cd build_helpers bash install_ta-lib.sh ${CONDA_PREFIX} nosudo ``` -### Congratulations - -[You are ready](#you-are-ready), and run the bot +[You are now ready](#you-are-ready) to run the bot. ### Important shortcuts diff --git a/docs/requirements-docs.txt b/docs/requirements-docs.txt index c757bf951..066a10766 100644 --- a/docs/requirements-docs.txt +++ b/docs/requirements-docs.txt @@ -1,7 +1,7 @@ markdown==3.7 mkdocs==1.6.1 -mkdocs-material==9.5.42 +mkdocs-material==9.5.45 mdx_truly_sane_lists==1.3 -pymdown-extensions==10.11.2 +pymdown-extensions==10.12 jinja2==3.1.4 mike==2.1.3 diff --git a/docs/stoploss.md b/docs/stoploss.md index e0353d4da..7442484de 100644 --- a/docs/stoploss.md +++ b/docs/stoploss.md @@ -36,6 +36,7 @@ The Order-type will be ignored if only one mode is available. | Gate | limit | | Okx | limit | | Kucoin | stop-limit, stop-market| +| Hyperliquid (futures only) | limit | !!! Note "Tight stoploss" Do not set too low/tight stoploss value when using stop loss on exchange! diff --git a/docs/strategy-advanced.md b/docs/strategy-advanced.md index 3cd0259f4..8bb23c5da 100644 --- a/docs/strategy-advanced.md +++ b/docs/strategy-advanced.md @@ -38,9 +38,9 @@ class AwesomeStrategy(IStrategy): trade.set_custom_data(key='entry_type', value=trade_entry_type) return super().bot_loop_start(**kwargs) - def adjust_entry_price(self, trade: Trade, order: Optional[Order], pair: str, + def adjust_entry_price(self, trade: Trade, order: Order | None, pair: str, current_time: datetime, proposed_rate: float, current_order_rate: float, - entry_tag: Optional[str], side: str, **kwargs) -> float: + entry_tag: str | None, side: str, **kwargs) -> float: # Limit orders to use and follow SMA200 as price target for the first 10 minutes since entry trigger for BTC/USDT pair. if ( pair == 'BTC/USDT' diff --git a/docs/strategy-callbacks.md b/docs/strategy-callbacks.md index 6ba225007..44d675055 100644 --- a/docs/strategy-callbacks.md +++ b/docs/strategy-callbacks.md @@ -90,8 +90,8 @@ Called before entering a trade, makes it possible to manage your position size w class AwesomeStrategy(IStrategy): def custom_stake_amount(self, pair: str, current_time: datetime, current_rate: float, - proposed_stake: float, min_stake: Optional[float], max_stake: float, - leverage: float, entry_tag: Optional[str], side: str, + proposed_stake: float, min_stake: float | None, max_stake: float, + leverage: float, entry_tag: str | None, side: str, **kwargs) -> float: dataframe, _ = self.dp.get_analyzed_dataframe(pair=pair, timeframe=self.timeframe) @@ -165,7 +165,8 @@ Called for open trade every iteration (roughly every 5 seconds) until a trade is The usage of the custom stoploss method must be enabled by setting `use_custom_stoploss=True` on the strategy object. -The stoploss price can only ever move upwards - if the stoploss value returned from `custom_stoploss` would result in a lower stoploss price than was previously set, it will be ignored. The traditional `stoploss` value serves as an absolute lower level and will be instated as the initial stoploss (before this method is called for the first time for a trade), and is still mandatory. +The stoploss price can only ever move upwards - if the stoploss value returned from `custom_stoploss` would result in a lower stoploss price than was previously set, it will be ignored. The traditional `stoploss` value serves as an absolute lower level and will be instated as the initial stoploss (before this method is called for the first time for a trade), and is still mandatory. +As custom stoploss acts as regular, changing stoploss, it will behave similar to `trailing_stop` - and trades exiting due to this will have the exit_reason of `"trailing_stop_loss"`. The method must return a stoploss value (float / number) as a percentage of the current price. E.g. If the `current_rate` is 200 USD, then returning `0.02` will set the stoploss price 2% lower, at 196 USD. @@ -212,7 +213,7 @@ class AwesomeStrategy(IStrategy): def custom_stoploss(self, pair: str, trade: Trade, current_time: datetime, current_rate: float, current_profit: float, after_fill: bool, - **kwargs) -> Optional[float]: + **kwargs) -> float | None: """ Custom stoploss logic, returning the new distance relative to current_rate (as ratio). e.g. returning -0.05 would create a stoploss 5% below current_rate. @@ -250,7 +251,7 @@ class AwesomeStrategy(IStrategy): def custom_stoploss(self, pair: str, trade: Trade, current_time: datetime, current_rate: float, current_profit: float, after_fill: bool, - **kwargs) -> Optional[float]: + **kwargs) -> float | None: # Make sure you have the longest interval first - these conditions are evaluated from top to bottom. if current_time - timedelta(minutes=120) > trade.open_date_utc: @@ -276,7 +277,7 @@ class AwesomeStrategy(IStrategy): def custom_stoploss(self, pair: str, trade: Trade, current_time: datetime, current_rate: float, current_profit: float, after_fill: bool, - **kwargs) -> Optional[float]: + **kwargs) -> float | None: if after_fill: # After an additional order, start with a stoploss of 10% below the new open rate @@ -305,7 +306,7 @@ class AwesomeStrategy(IStrategy): def custom_stoploss(self, pair: str, trade: Trade, current_time: datetime, current_rate: float, current_profit: float, after_fill: bool, - **kwargs) -> Optional[float]: + **kwargs) -> float | None: if pair in ("ETH/BTC", "XRP/BTC"): return -0.10 @@ -331,7 +332,7 @@ class AwesomeStrategy(IStrategy): def custom_stoploss(self, pair: str, trade: Trade, current_time: datetime, current_rate: float, current_profit: float, after_fill: bool, - **kwargs) -> Optional[float]: + **kwargs) -> float | None: if current_profit < 0.04: return None # return None to keep using the initial stoploss @@ -363,7 +364,7 @@ class AwesomeStrategy(IStrategy): def custom_stoploss(self, pair: str, trade: Trade, current_time: datetime, current_rate: float, current_profit: float, after_fill: bool, - **kwargs) -> Optional[float]: + **kwargs) -> float | None: # evaluate highest to lowest, so that highest possible stop is used if current_profit > 0.40: @@ -394,7 +395,7 @@ class AwesomeStrategy(IStrategy): def custom_stoploss(self, pair: str, trade: Trade, current_time: datetime, current_rate: float, current_profit: float, after_fill: bool, - **kwargs) -> Optional[float]: + **kwargs) -> float | None: dataframe, _ = self.dp.get_analyzed_dataframe(pair, self.timeframe) last_candle = dataframe.iloc[-1].squeeze() @@ -439,7 +440,7 @@ Stoploss values returned from `custom_stoploss()` must specify a percentage rela def custom_stoploss(self, pair: str, trade: Trade, current_time: datetime, current_rate: float, current_profit: float, after_fill: bool, - **kwargs) -> Optional[float]: + **kwargs) -> float | None: # once the profit has risen above 10%, keep the stoploss at 7% above the open price if current_profit > 0.10: @@ -482,7 +483,7 @@ The helper function `stoploss_from_absolute()` can be used to convert from an ab def custom_stoploss(self, pair: str, trade: Trade, current_time: datetime, current_rate: float, current_profit: float, after_fill: bool, - **kwargs) -> Optional[float]: + **kwargs) -> float | None: dataframe, _ = self.dp.get_analyzed_dataframe(pair, self.timeframe) trade_date = timeframe_to_prev_date(self.timeframe, trade.open_date_utc) candle = dataframe.iloc[-1].squeeze() @@ -519,8 +520,8 @@ class AwesomeStrategy(IStrategy): # ... populate_* methods - def custom_entry_price(self, pair: str, trade: Optional[Trade], current_time: datetime, proposed_rate: float, - entry_tag: Optional[str], side: str, **kwargs) -> float: + def custom_entry_price(self, pair: str, trade: Trade | None, current_time: datetime, proposed_rate: float, + entry_tag: str | None, side: str, **kwargs) -> float: dataframe, last_updated = self.dp.get_analyzed_dataframe(pair=pair, timeframe=self.timeframe) @@ -530,7 +531,7 @@ class AwesomeStrategy(IStrategy): def custom_exit_price(self, pair: str, trade: Trade, current_time: datetime, proposed_rate: float, - current_profit: float, exit_tag: Optional[str], **kwargs) -> float: + current_profit: float, exit_tag: str | None, **kwargs) -> float: dataframe, last_updated = self.dp.get_analyzed_dataframe(pair=pair, timeframe=self.timeframe) @@ -662,7 +663,7 @@ class AwesomeStrategy(IStrategy): # ... populate_* methods def confirm_trade_entry(self, pair: str, order_type: str, amount: float, rate: float, - time_in_force: str, current_time: datetime, entry_tag: Optional[str], + time_in_force: str, current_time: datetime, entry_tag: str | None, side: str, **kwargs) -> bool: """ Called right before placing a entry order. @@ -820,8 +821,8 @@ class DigDeeperStrategy(IStrategy): # This is called when placing the initial order (opening trade) def custom_stake_amount(self, pair: str, current_time: datetime, current_rate: float, - proposed_stake: float, min_stake: Optional[float], max_stake: float, - leverage: float, entry_tag: Optional[str], side: str, + proposed_stake: float, min_stake: float | None, max_stake: float, + leverage: float, entry_tag: str | None, side: str, **kwargs) -> float: # We need to leave most of the funds for possible further DCA orders @@ -830,11 +831,11 @@ class DigDeeperStrategy(IStrategy): def adjust_trade_position(self, trade: Trade, current_time: datetime, current_rate: float, current_profit: float, - min_stake: Optional[float], max_stake: float, + min_stake: float | None, max_stake: float, current_entry_rate: float, current_exit_rate: float, current_entry_profit: float, current_exit_profit: float, **kwargs - ) -> Union[Optional[float], Tuple[Optional[float], Optional[str]]]: + ) -> float | None | tuple[float | None, str | None]: """ Custom trade adjustment logic, returning the stake amount that a trade should be increased or decreased. @@ -890,7 +891,7 @@ class DigDeeperStrategy(IStrategy): # Hope you have a deep wallet! try: # This returns first order stake size - stake_amount = filled_entries[0].stake_amount + stake_amount = filled_entries[0].stake_amount_filled # This then calculates current safety order size stake_amount = stake_amount * (1 + (count_of_entries * 0.25)) return stake_amount, "1/3rd_increase" @@ -946,9 +947,9 @@ class AwesomeStrategy(IStrategy): # ... populate_* methods - def adjust_entry_price(self, trade: Trade, order: Optional[Order], pair: str, + def adjust_entry_price(self, trade: Trade, order: Order | None, pair: str, current_time: datetime, proposed_rate: float, current_order_rate: float, - entry_tag: Optional[str], side: str, **kwargs) -> float: + entry_tag: str | None, side: str, **kwargs) -> float: """ Entry price re-adjustment logic, returning the user desired limit price. This only executes when a order was already placed, still open (unfilled fully or partially) @@ -1003,7 +1004,7 @@ For markets / exchanges that don't support leverage, this method is ignored. class AwesomeStrategy(IStrategy): def leverage(self, pair: str, current_time: datetime, current_rate: float, - proposed_leverage: float, max_leverage: float, entry_tag: Optional[str], side: str, + proposed_leverage: float, max_leverage: float, entry_tag: str | None, side: str, **kwargs) -> float: """ Customize leverage for each new trade. This method is only called in futures mode. diff --git a/docs/strategy-customization.md b/docs/strategy-customization.md index 5e3c65759..f360c411d 100644 --- a/docs/strategy-customization.md +++ b/docs/strategy-customization.md @@ -4,7 +4,7 @@ This page explains how to customize your strategies, add new indicators and set If you haven't already, please familiarize yourself with: -- the [Freqtrade strategy 101](freqtrade-101.md), which provides a quick start to strategy development +- the [Freqtrade strategy 101](strategy-101.md), which provides a quick start to strategy development - the [Freqtrade bot basics](bot-basics.md), which provides overall info on how the bot operates ## Develop your own strategy @@ -582,11 +582,14 @@ When hyperopting, use of the hyperoptable parameter `.value` attribute is not su ??? info "Full documentation" ``` python - def informative(timeframe: str, asset: str = '', - fmt: Optional[Union[str, Callable[[KwArg(str)], str]]] = None, - *, - candle_type: Optional[CandleType] = None, - ffill: bool = True) -> Callable[[PopulateIndicators], PopulateIndicators]: + def informative( + timeframe: str, + asset: str = "", + fmt: str | Callable[[Any], str] | None = None, + *, + candle_type: CandleType | str | None = None, + ffill: bool = True, + ) -> Callable[[PopulateIndicators], PopulateIndicators]: """ A decorator for populate_indicators_Nn(self, dataframe, metadata), allowing these functions to define informative indicators. diff --git a/docs/strategy_analysis_example.md b/docs/strategy_analysis_example.md index 9f37b2975..a1c74162e 100644 --- a/docs/strategy_analysis_example.md +++ b/docs/strategy_analysis_example.md @@ -215,7 +215,7 @@ trades.groupby("pair")["exit_reason"].value_counts() ``` ## Analyze the loaded trades for trade parallelism -This can be useful to find the best `max_open_trades` parameter, when used with backtesting in conjunction with `--disable-max-market-positions`. +This can be useful to find the best `max_open_trades` parameter, when used with backtesting in conjunction with a very high `max_open_trades` setting. `analyze_trade_parallelism()` returns a timeseries dataframe with an "open_trades" column, specifying the number of open trades for each candle. diff --git a/docs/strategy_migration.md b/docs/strategy_migration.md index b423eca6e..07744af58 100644 --- a/docs/strategy_migration.md +++ b/docs/strategy_migration.md @@ -214,8 +214,8 @@ class AwesomeStrategy(IStrategy): ``` python hl_lines="4" class AwesomeStrategy(IStrategy): def custom_stake_amount(self, pair: str, current_time: datetime, current_rate: float, - proposed_stake: float, min_stake: Optional[float], max_stake: float, - entry_tag: Optional[str], side: str, **kwargs) -> float: + proposed_stake: float, min_stake: float | None, max_stake: float, + entry_tag: str | None, side: str, **kwargs) -> float: # ... return proposed_stake ``` @@ -237,7 +237,7 @@ After: ``` python hl_lines="4" class AwesomeStrategy(IStrategy): def confirm_trade_entry(self, pair: str, order_type: str, amount: float, rate: float, - time_in_force: str, current_time: datetime, entry_tag: Optional[str], + time_in_force: str, current_time: datetime, entry_tag: str | None, side: str, **kwargs) -> bool: return True ``` @@ -280,8 +280,8 @@ After: ``` python hl_lines="3" class AwesomeStrategy(IStrategy): - def custom_entry_price(self, pair: str, trade: Optional[Trade], current_time: datetime, proposed_rate: float, - entry_tag: Optional[str], side: str, **kwargs) -> float: + def custom_entry_price(self, pair: str, trade: Trade | None, current_time: datetime, proposed_rate: float, + entry_tag: str | None, side: str, **kwargs) -> float: return proposed_rate ``` @@ -312,7 +312,7 @@ After: ``` python hl_lines="5 7" def custom_stoploss(self, pair: str, trade: 'Trade', current_time: datetime, current_rate: float, current_profit: float, after_fill: bool, - **kwargs) -> Optional[float]: + **kwargs) -> float | None: # once the profit has risen above 10%, keep the stoploss at 7% above the open price if current_profit > 0.10: return stoploss_from_open(0.07, current_profit, is_short=trade.is_short) @@ -329,7 +329,7 @@ After: `order_time_in_force` attributes changed from `"buy"` to `"entry"` and `"sell"` to `"exit"`. ``` python - order_time_in_force: Dict = { + order_time_in_force: dict = { "buy": "gtc", "sell": "gtc", } @@ -338,7 +338,7 @@ After: After: ``` python hl_lines="2 3" - order_time_in_force: Dict = { + order_time_in_force: dict = { "entry": "GTC", "exit": "GTC", } @@ -780,7 +780,7 @@ class MyCoolFreqaiModel(BaseRegressionModel): def predict( self, unfiltered_df: DataFrame, dk: FreqaiDataKitchen, **kwargs - ) -> Tuple[DataFrame, npt.NDArray[np.int_]]: + ) -> tuple[DataFrame, npt.NDArray[np.int_]]: # ... your custom stuff diff --git a/docs/telegram-usage.md b/docs/telegram-usage.md index 8fc8b0cfa..3fc76d58f 100644 --- a/docs/telegram-usage.md +++ b/docs/telegram-usage.md @@ -58,6 +58,7 @@ For the Freqtrade configuration, you can then use the full value (including `-` ```json "chat_id": "-1001332619709" ``` + !!! Warning "Using telegram groups" When using telegram groups, you're giving every member of the telegram group access to your freqtrade bot and to all commands possible via telegram. Please make sure that you can trust everyone in the telegram group to avoid unpleasant surprises. @@ -93,9 +94,12 @@ Example configuration showing the different settings: "trailing_stop_loss": "on", "stop_loss": "on", "stoploss_on_exchange": "on", - "custom_exit": "silent", - "partial_exit": "on" + "custom_exit": "silent", // custom_exit without specifying an exit reason + "partial_exit": "on", + // "custom_exit_message": "silent", // Disable individual custom exit reasons + "*": "off" // Disable all other exit reasons }, + // "exit": "off", // Simplistic configuration to disable all exit messages "exit_cancel": "on", "exit_fill": "off", "protection_trigger": "off", @@ -108,16 +112,16 @@ Example configuration showing the different settings: }, ``` -`entry` notifications are sent when the order is placed, while `entry_fill` notifications are sent when the order is filled on the exchange. -`exit` notifications are sent when the order is placed, while `exit_fill` notifications are sent when the order is filled on the exchange. -`*_fill` notifications are off by default and must be explicitly enabled. -`protection_trigger` notifications are sent when a protection triggers and `protection_trigger_global` notifications trigger when global protections are triggered. -`strategy_msg` - Receive notifications from the strategy, sent via `self.dp.send_msg()` from the strategy [more details](strategy-customization.md#send-notification). -`show_candle` - show candle values as part of entry/exit messages. Only possible values are `"ohlc"` or `"off"`. - -`balance_dust_level` will define what the `/balance` command takes as "dust" - Currencies with a balance below this will be shown. -`allow_custom_messages` completely disable strategy messages. -`reload` allows you to disable reload-buttons on selected messages. +* `entry` notifications are sent when the order is placed, while `entry_fill` notifications are sent when the order is filled on the exchange. +* `exit` notifications are sent when the order is placed, while `exit_fill` notifications are sent when the order is filled on the exchange. + Exit messages (`exit` and `exit_fill`) can be further controlled at individual exit reasons level, with the specific exit reason as the key. the default for all exit reasons is `on` - but can be configured via special `*` key - which will act as a wildcard for all exit reasons that are not explicitly defined. +* `*_fill` notifications are off by default and must be explicitly enabled. +* `protection_trigger` notifications are sent when a protection triggers and `protection_trigger_global` notifications trigger when global protections are triggered. +* `strategy_msg` - Receive notifications from the strategy, sent via `self.dp.send_msg()` from the strategy [more details](strategy-customization.md#send-notification). +* `show_candle` - show candle values as part of entry/exit messages. Only possible values are `"ohlc"` or `"off"`. +* `balance_dust_level` will define what the `/balance` command takes as "dust" - Currencies with a balance below this will be shown. +* `allow_custom_messages` completely disable strategy messages. +* `reload` allows you to disable reload-buttons on selected messages. ## Create a custom keyboard (command shortcut buttons) @@ -238,16 +242,16 @@ Once all positions are sold, run `/stop` to completely stop the bot. For each open trade, the bot will send you the following message. Enter Tag is configurable via Strategy. -> **Trade ID:** `123` `(since 1 days ago)` -> **Current Pair:** CVC/BTC -> **Direction:** Long -> **Leverage:** 1.0 -> **Amount:** `26.64180098` -> **Enter Tag:** Awesome Long Signal -> **Open Rate:** `0.00007489` -> **Current Rate:** `0.00007489` -> **Unrealized Profit:** `12.95%` -> **Stoploss:** `0.00007389 (-0.02%)` +> **Trade ID:** `123` `(since 1 days ago)` +> **Current Pair:** CVC/BTC +> **Direction:** Long +> **Leverage:** 1.0 +> **Amount:** `26.64180098` +> **Enter Tag:** Awesome Long Signal +> **Open Rate:** `0.00007489` +> **Current Rate:** `0.00007489` +> **Unrealized Profit:** `12.95%` +> **Stoploss:** `0.00007389 (-0.02%)` ### /status table @@ -274,34 +278,34 @@ current max Return a summary of your profit/loss and performance. -> **ROI:** Close trades -> ∙ `0.00485701 BTC (2.2%) (15.2 Σ%)` -> ∙ `62.968 USD` -> **ROI:** All trades -> ∙ `0.00255280 BTC (1.5%) (6.43 Σ%)` -> ∙ `33.095 EUR` -> -> **Total Trade Count:** `138` -> **Bot started:** `2022-07-11 18:40:44` -> **First Trade opened:** `3 days ago` -> **Latest Trade opened:** `2 minutes ago` -> **Avg. Duration:** `2:33:45` -> **Best Performing:** `PAY/BTC: 50.23%` -> **Trading volume:** `0.5 BTC` -> **Profit factor:** `1.04` -> **Win / Loss:** `102 / 36` -> **Winrate:** `73.91%` -> **Expectancy (Ratio):** `4.87 (1.66)` -> **Max Drawdown:** `9.23% (0.01255 BTC)` +> **ROI:** Close trades +> ∙ `0.00485701 BTC (2.2%) (15.2 Σ%)` +> ∙ `62.968 USD` +> **ROI:** All trades +> ∙ `0.00255280 BTC (1.5%) (6.43 Σ%)` +> ∙ `33.095 EUR` +> +> **Total Trade Count:** `138` +> **Bot started:** `2022-07-11 18:40:44` +> **First Trade opened:** `3 days ago` +> **Latest Trade opened:** `2 minutes ago` +> **Avg. Duration:** `2:33:45` +> **Best Performing:** `PAY/BTC: 50.23%` +> **Trading volume:** `0.5 BTC` +> **Profit factor:** `1.04` +> **Win / Loss:** `102 / 36` +> **Winrate:** `73.91%` +> **Expectancy (Ratio):** `4.87 (1.66)` +> **Max Drawdown:** `9.23% (0.01255 BTC)` -The relative profit of `1.2%` is the average profit per trade. -The relative profit of `15.2 Σ%` is be based on the starting capital - so in this case, the starting capital was `0.00485701 * 1.152 = 0.00738 BTC`. -Starting capital is either taken from the `available_capital` setting, or calculated by using current wallet size - profits. -Profit Factor is calculated as gross profits / gross losses - and should serve as an overall metric for the strategy. -Expectancy corresponds to the average return per currency unit at risk, i.e. the winrate and the risk-reward ratio (the average gain of winning trades compared to the average loss of losing trades). -Expectancy Ratio is expected profit or loss of a subsequent trade based on the performance of all past trades. -Max drawdown corresponds to the backtesting metric `Absolute Drawdown (Account)` - calculated as `(Absolute Drawdown) / (DrawdownHigh + startingBalance)`. -Bot started date will refer to the date the bot was first started. For older bots, this will default to the first trade's open date. +The relative profit of `1.2%` is the average profit per trade. +The relative profit of `15.2 Σ%` is be based on the starting capital - so in this case, the starting capital was `0.00485701 * 1.152 = 0.00738 BTC`. +**Starting capital(**) is either taken from the `available_capital` setting, or calculated by using current wallet size - profits. +**Profit Factor** is calculated as gross profits / gross losses - and should serve as an overall metric for the strategy. +**Expectancy** corresponds to the average return per currency unit at risk, i.e. the winrate and the risk-reward ratio (the average gain of winning trades compared to the average loss of losing trades). +**Expectancy Ratio** is expected profit or loss of a subsequent trade based on the performance of all past trades. +**Max drawdown** corresponds to the backtesting metric `Absolute Drawdown (Account)` - calculated as `(Absolute Drawdown) / (DrawdownHigh + startingBalance)`. +**Bot started date** will refer to the date the bot was first started. For older bots, this will default to the first trade's open date. ### /forceexit @@ -329,33 +333,34 @@ Note that for this to work, `force_entry_enable` needs to be set to true. ### /performance Return the performance of each crypto-currency the bot has sold. -> Performance: -> 1. `RCN/BTC 0.003 BTC (57.77%) (1)` -> 2. `PAY/BTC 0.0012 BTC (56.91%) (1)` -> 3. `VIB/BTC 0.0011 BTC (47.07%) (1)` -> 4. `SALT/BTC 0.0010 BTC (30.24%) (1)` -> 5. `STORJ/BTC 0.0009 BTC (27.24%) (1)` -> ... +> Performance: +> 1. `RCN/BTC 0.003 BTC (57.77%) (1)` +> 2. `PAY/BTC 0.0012 BTC (56.91%) (1)` +> 3. `VIB/BTC 0.0011 BTC (47.07%) (1)` +> 4. `SALT/BTC 0.0010 BTC (30.24%) (1)` +> 5. `STORJ/BTC 0.0009 BTC (27.24%) (1)` +> ... ### /balance Return the balance of all crypto-currency your have on the exchange. -> **Currency:** BTC -> **Available:** 3.05890234 -> **Balance:** 3.05890234 -> **Pending:** 0.0 - -> **Currency:** CVC -> **Available:** 86.64180098 -> **Balance:** 86.64180098 -> **Pending:** 0.0 +> **Currency:** BTC +> **Available:** 3.05890234 +> **Balance:** 3.05890234 +> **Pending:** 0.0 +> +> **Currency:** CVC +> **Available:** 86.64180098 +> **Balance:** 86.64180098 +> **Pending:** 0.0 ### /daily Per default `/daily` will return the 7 last days. The example below if for `/daily 3`: > **Daily Profit over the last 3 days:** + ``` Day (count) USDT USD Profit % -------------- ------------ ---------- ---------- @@ -370,6 +375,7 @@ Per default `/weekly` will return the 8 last weeks, including the current week. from Monday. The example below if for `/weekly 3`: > **Weekly Profit over the last 3 weeks (starting from Monday):** + ``` Monday (count) Profit BTC Profit USD Profit % ------------- -------------- ------------ ---------- @@ -396,18 +402,18 @@ Month (count) Profit BTC Profit USD Profit % Shows the current whitelist -> Using whitelist `StaticPairList` with 22 pairs +> Using whitelist `StaticPairList` with 22 pairs > `IOTA/BTC, NEO/BTC, TRX/BTC, VET/BTC, ADA/BTC, ETC/BTC, NCASH/BTC, DASH/BTC, XRP/BTC, XVG/BTC, EOS/BTC, LTC/BTC, OMG/BTC, BTG/BTC, LSK/BTC, ZEC/BTC, HOT/BTC, IOTX/BTC, XMR/BTC, AST/BTC, XLM/BTC, NANO/BTC` ### /blacklist [pair] Shows the current blacklist. If Pair is set, then this pair will be added to the pairlist. -Also supports multiple pairs, separated by a space. +Also supports multiple pairs, separated by a space. Use `/reload_config` to reset the blacklist. -> Using blacklist `StaticPairList` with 2 pairs ->`DODGE/BTC`, `HOT/BTC`. +> Using blacklist `StaticPairList` with 2 pairs +>`DODGE/BTC`, `HOT/BTC`. ### /edge diff --git a/docs/trade-object.md b/docs/trade-object.md index 7434b826d..8a6e3b1a7 100644 --- a/docs/trade-object.md +++ b/docs/trade-object.md @@ -143,6 +143,7 @@ Most properties here can be None as they are dependent on the exchange response. | `remaining` | float | Remaining amount | | `cost` | float | Cost of the order - usually average * filled (*Exchange dependent on futures, may contain the cost with or without leverage and may be in contracts.*) | | `stake_amount` | float | Stake amount used for this order. *Added in 2023.7.* | +| `stake_amount_filled` | float | Filled Stake amount used for this order. *Added in 2024.11.* | | `order_date` | datetime | Order creation date **use `order_date_utc` instead** | | `order_date_utc` | datetime | Order creation date (in UTC) | | `order_fill_date` | datetime | Order fill date **use `order_fill_utc` instead** | diff --git a/freqtrade/__init__.py b/freqtrade/__init__.py index 0e69218fe..cf4084162 100644 --- a/freqtrade/__init__.py +++ b/freqtrade/__init__.py @@ -1,6 +1,6 @@ """Freqtrade bot""" -__version__ = "2024.10" +__version__ = "2024.11" if "dev" in __version__: from pathlib import Path diff --git a/freqtrade/commands/arguments.py b/freqtrade/commands/arguments.py index 0bb572ebc..a56185471 100755 --- a/freqtrade/commands/arguments.py +++ b/freqtrade/commands/arguments.py @@ -5,7 +5,7 @@ This module contains the argument manager class from argparse import ArgumentParser, Namespace, _ArgumentGroup from functools import partial from pathlib import Path -from typing import Any, Optional, Union +from typing import Any from freqtrade.commands.cli_options import AVAILABLE_CLI_OPTIONS from freqtrade.constants import DEFAULT_CONFIG @@ -37,7 +37,6 @@ ARGS_COMMON_OPTIMIZE = [ ARGS_BACKTEST = ARGS_COMMON_OPTIMIZE + [ "position_stacking", - "use_max_market_positions", "enable_protections", "dry_run_wallet", "timeframe_detail", @@ -53,7 +52,6 @@ ARGS_HYPEROPT = ARGS_COMMON_OPTIMIZE + [ "hyperopt", "hyperopt_path", "position_stacking", - "use_max_market_positions", "enable_protections", "dry_run_wallet", "timeframe_detail", @@ -117,7 +115,7 @@ ARGS_CREATE_USERDIR = ["user_data_dir", "reset"] ARGS_BUILD_CONFIG = ["config"] ARGS_SHOW_CONFIG = ["user_data_dir", "config", "show_sensitive"] -ARGS_BUILD_STRATEGY = ["user_data_dir", "strategy", "template"] +ARGS_BUILD_STRATEGY = ["user_data_dir", "strategy", "strategy_path", "template"] ARGS_CONVERT_DATA_TRADES = ["pairs", "format_from_trades", "format_to", "erase", "exchange"] ARGS_CONVERT_DATA = ["pairs", "format_from", "format_to", "erase", "exchange"] @@ -242,8 +240,7 @@ ARGS_STRATEGY_UPDATER = ["strategy_list", "strategy_path", "recursive_strategy_s ARGS_LOOKAHEAD_ANALYSIS = [ a for a in ARGS_BACKTEST - if a - not in ("position_stacking", "use_max_market_positions", "backtest_cache", "backtest_breakdown") + if a not in ("position_stacking", "backtest_cache", "backtest_breakdown") ] + ["minimum_trade_amount", "targeted_trade_amount", "lookahead_analysis_exportfilename"] ARGS_RECURSIVE_ANALYSIS = ["timeframe", "timerange", "dataformat_ohlcv", "pairs", "startup_candle"] @@ -278,9 +275,9 @@ class Arguments: Arguments Class. Manage the arguments received by the cli """ - def __init__(self, args: Optional[list[str]]) -> None: + def __init__(self, args: list[str] | None) -> None: self.args = args - self._parsed_arg: Optional[Namespace] = None + self._parsed_arg: Namespace | None = None def get_parsed_arg(self) -> dict[str, Any]: """ @@ -322,9 +319,7 @@ class Arguments: return parsed_arg - def _build_args( - self, optionlist: list[str], parser: Union[ArgumentParser, _ArgumentGroup] - ) -> None: + def _build_args(self, optionlist: list[str], parser: ArgumentParser | _ArgumentGroup) -> None: for val in optionlist: opt = AVAILABLE_CLI_OPTIONS[val] parser.add_argument(*opt.cli, dest=val, **opt.kwargs) diff --git a/freqtrade/commands/cli_options.py b/freqtrade/commands/cli_options.py index d279569c5..6e90a521f 100755 --- a/freqtrade/commands/cli_options.py +++ b/freqtrade/commands/cli_options.py @@ -168,14 +168,6 @@ AVAILABLE_CLI_OPTIONS = { action="store_true", default=False, ), - "use_max_market_positions": Arg( - "--dmmp", - "--disable-max-market-positions", - help="Disable applying `max_open_trades` during backtest " - "(same as setting `max_open_trades` to a very high number).", - action="store_false", - default=True, - ), "backtest_show_pair_list": Arg( "--show-pair-list", help="Show backtesting pairlist sorted by profit.", diff --git a/freqtrade/commands/deploy_commands.py b/freqtrade/commands/deploy_commands.py index 0d188e514..acd975b9b 100644 --- a/freqtrade/commands/deploy_commands.py +++ b/freqtrade/commands/deploy_commands.py @@ -86,7 +86,14 @@ def start_new_strategy(args: dict[str, Any]) -> None: config = setup_utils_configuration(args, RunMode.UTIL_NO_EXCHANGE) if "strategy" in args and args["strategy"]: - new_path = config["user_data_dir"] / USERPATH_STRATEGIES / (args["strategy"] + ".py") + if "strategy_path" in args and args["strategy_path"]: + strategy_dir = Path(args["strategy_path"]) + else: + strategy_dir = config["user_data_dir"] / USERPATH_STRATEGIES + if not strategy_dir.is_dir(): + logger.info(f"Creating strategy directory {strategy_dir}") + strategy_dir.mkdir(parents=True) + new_path = strategy_dir / (args["strategy"] + ".py") if new_path.exists(): raise OperationalException( diff --git a/freqtrade/commands/deploy_ui.py b/freqtrade/commands/deploy_ui.py index 283834b12..a02315bfc 100644 --- a/freqtrade/commands/deploy_ui.py +++ b/freqtrade/commands/deploy_ui.py @@ -1,6 +1,5 @@ import logging from pathlib import Path -from typing import Optional import requests @@ -24,7 +23,7 @@ def clean_ui_subdir(directory: Path): p.rmdir() -def read_ui_version(dest_folder: Path) -> Optional[str]: +def read_ui_version(dest_folder: Path) -> str | None: file = dest_folder / ".uiversion" if not file.is_file(): return None @@ -52,7 +51,7 @@ def download_and_install_ui(dest_folder: Path, dl_url: str, version: str): f.write(version) -def get_ui_download_url(version: Optional[str] = None) -> tuple[str, str]: +def get_ui_download_url(version: str | None = None) -> tuple[str, str]: base_url = "https://api.github.com/repos/freqtrade/frequi/" # Get base UI Repo path diff --git a/freqtrade/commands/hyperopt_commands.py b/freqtrade/commands/hyperopt_commands.py index 4bb33c362..9dfab02c0 100644 --- a/freqtrade/commands/hyperopt_commands.py +++ b/freqtrade/commands/hyperopt_commands.py @@ -15,7 +15,7 @@ def start_hyperopt_list(args: dict[str, Any]) -> None: """ from freqtrade.configuration import setup_utils_configuration from freqtrade.data.btanalysis import get_latest_hyperopt_file - from freqtrade.optimize.hyperopt_output import HyperoptOutput + from freqtrade.optimize.hyperopt.hyperopt_output import HyperoptOutput from freqtrade.optimize.hyperopt_tools import HyperoptTools config = setup_utils_configuration(args, RunMode.UTIL_NO_EXCHANGE) diff --git a/freqtrade/commands/list_commands.py b/freqtrade/commands/list_commands.py index 0279f82ee..c8d476717 100644 --- a/freqtrade/commands/list_commands.py +++ b/freqtrade/commands/list_commands.py @@ -1,7 +1,7 @@ import csv import logging import sys -from typing import Any, Union +from typing import Any from freqtrade.enums import RunMode from freqtrade.exceptions import ConfigurationError, OperationalException @@ -87,7 +87,7 @@ def _print_objs_tabular(objs: list, print_colorized: bool) -> None: from rich.text import Text names = [s["name"] for s in objs] - objs_to_print: list[dict[str, Union[Text, str]]] = [ + objs_to_print: list[dict[str, Text | str]] = [ { "name": Text(s["name"] if s["name"] else "--"), "location": s["location_rel"], diff --git a/freqtrade/configuration/config_schema.py b/freqtrade/configuration/config_schema.py index 2106d928d..30f1f6f28 100644 --- a/freqtrade/configuration/config_schema.py +++ b/freqtrade/configuration/config_schema.py @@ -517,8 +517,11 @@ CONF_SCHEMA = { }, "exit_fill": { "description": "Telegram setting for exit fill signals.", - "type": "string", - "enum": TELEGRAM_SETTING_OPTIONS, + "type": ["string", "object"], + "additionalProperties": { + "type": "string", + "enum": TELEGRAM_SETTING_OPTIONS, + }, "default": "on", }, "exit_cancel": { diff --git a/freqtrade/configuration/configuration.py b/freqtrade/configuration/configuration.py index c9ab86737..796296a7b 100644 --- a/freqtrade/configuration/configuration.py +++ b/freqtrade/configuration/configuration.py @@ -5,9 +5,10 @@ This module contains the configuration class import ast import logging import warnings +from collections.abc import Callable from copy import deepcopy from pathlib import Path -from typing import Any, Callable, Optional +from typing import Any from freqtrade import constants from freqtrade.configuration.deprecated_settings import process_temporary_deprecated_settings @@ -37,9 +38,9 @@ class Configuration: Reuse this class for the bot, backtesting, hyperopt and every script that required configuration """ - def __init__(self, args: dict[str, Any], runmode: Optional[RunMode] = None) -> None: + def __init__(self, args: dict[str, Any], runmode: RunMode | None = None) -> None: self.args = args - self.config: Optional[Config] = None + self.config: Config | None = None self.runmode = runmode def get_config(self) -> Config: @@ -241,11 +242,7 @@ class Configuration: logstring="Parameter --enable-protections detected, enabling Protections. ...", ) - if "use_max_market_positions" in self.args and not self.args["use_max_market_positions"]: - config.update({"use_max_market_positions": False}) - logger.info("Parameter --disable-max-market-positions detected ...") - logger.info("max_open_trades set to unlimited ...") - elif "max_open_trades" in self.args and self.args["max_open_trades"]: + if "max_open_trades" in self.args and self.args["max_open_trades"]: config.update({"max_open_trades": self.args["max_open_trades"]}) logger.info( "Parameter --max-open-trades detected, overriding max_open_trades to: %s ...", @@ -455,8 +452,8 @@ class Configuration: config: Config, argname: str, logstring: str, - logfun: Optional[Callable] = None, - deprecated_msg: Optional[str] = None, + logfun: Callable | None = None, + deprecated_msg: str | None = None, ) -> None: """ :param config: Configuration dictionary diff --git a/freqtrade/configuration/deprecated_settings.py b/freqtrade/configuration/deprecated_settings.py index c4d78e588..202c317de 100644 --- a/freqtrade/configuration/deprecated_settings.py +++ b/freqtrade/configuration/deprecated_settings.py @@ -3,7 +3,6 @@ Functions to handle deprecated settings """ import logging -from typing import Optional from freqtrade.constants import Config from freqtrade.exceptions import ConfigurationError, OperationalException @@ -14,9 +13,9 @@ logger = logging.getLogger(__name__) def check_conflicting_settings( config: Config, - section_old: Optional[str], + section_old: str | None, name_old: str, - section_new: Optional[str], + section_new: str | None, name_new: str, ) -> None: section_new_config = config.get(section_new, {}) if section_new else config @@ -34,7 +33,7 @@ def check_conflicting_settings( def process_removed_setting( - config: Config, section1: str, name1: str, section2: Optional[str], name2: str + config: Config, section1: str, name1: str, section2: str | None, name2: str ) -> None: """ :param section1: Removed section @@ -54,9 +53,9 @@ def process_removed_setting( def process_deprecated_setting( config: Config, - section_old: Optional[str], + section_old: str | None, name_old: str, - section_new: Optional[str], + section_new: str | None, name_new: str, ) -> None: check_conflicting_settings(config, section_old, name_old, section_new, name_new) diff --git a/freqtrade/configuration/directory_operations.py b/freqtrade/configuration/directory_operations.py index 448cf1acd..4cbd444a3 100644 --- a/freqtrade/configuration/directory_operations.py +++ b/freqtrade/configuration/directory_operations.py @@ -1,7 +1,6 @@ import logging import shutil from pathlib import Path -from typing import Optional from freqtrade.configuration.detect_environment import running_in_docker from freqtrade.constants import ( @@ -18,7 +17,7 @@ from freqtrade.exceptions import OperationalException logger = logging.getLogger(__name__) -def create_datadir(config: Config, datadir: Optional[str] = None) -> Path: +def create_datadir(config: Config, datadir: str | None = None) -> Path: folder = Path(datadir) if datadir else Path(f"{config['user_data_dir']}/data") if not datadir: # set datadir diff --git a/freqtrade/configuration/load_config.py b/freqtrade/configuration/load_config.py index 6ff451246..e18707a99 100644 --- a/freqtrade/configuration/load_config.py +++ b/freqtrade/configuration/load_config.py @@ -7,7 +7,7 @@ import re import sys from copy import deepcopy from pathlib import Path -from typing import Any, Optional +from typing import Any import rapidjson @@ -78,7 +78,7 @@ def load_config_file(path: str) -> dict[str, Any]: def load_from_files( - files: list[str], base_path: Optional[Path] = None, level: int = 0 + files: list[str], base_path: Path | None = None, level: int = 0 ) -> dict[str, Any]: """ Recursively load configuration files if specified. diff --git a/freqtrade/configuration/timerange.py b/freqtrade/configuration/timerange.py index 6449086fa..8afee82d1 100644 --- a/freqtrade/configuration/timerange.py +++ b/freqtrade/configuration/timerange.py @@ -5,7 +5,6 @@ This module contains the argument manager class import logging import re from datetime import datetime, timezone -from typing import Optional from typing_extensions import Self @@ -25,24 +24,24 @@ class TimeRange: def __init__( self, - starttype: Optional[str] = None, - stoptype: Optional[str] = None, + starttype: str | None = None, + stoptype: str | None = None, startts: int = 0, stopts: int = 0, ): - self.starttype: Optional[str] = starttype - self.stoptype: Optional[str] = stoptype + self.starttype: str | None = starttype + self.stoptype: str | None = stoptype self.startts: int = startts self.stopts: int = stopts @property - def startdt(self) -> Optional[datetime]: + def startdt(self) -> datetime | None: if self.startts: return datetime.fromtimestamp(self.startts, tz=timezone.utc) return None @property - def stopdt(self) -> Optional[datetime]: + def stopdt(self) -> datetime | None: if self.stopts: return datetime.fromtimestamp(self.stopts, tz=timezone.utc) return None @@ -120,7 +119,7 @@ class TimeRange: self.starttype = "date" @classmethod - def parse_timerange(cls, text: Optional[str]) -> Self: + def parse_timerange(cls, text: str | None) -> Self: """ Parse the value of the argument --timerange to determine what is the range desired :param text: value from --timerange diff --git a/freqtrade/constants.py b/freqtrade/constants.py index 9acb3bdc0..266db9ae5 100644 --- a/freqtrade/constants.py +++ b/freqtrade/constants.py @@ -4,7 +4,7 @@ bot constants """ -from typing import Any, Literal, Optional +from typing import Any, Literal from freqtrade.enums import CandleType, PriceType @@ -38,6 +38,7 @@ HYPEROPT_LOSS_BUILTIN = [ "MaxDrawDownHyperOptLoss", "MaxDrawDownRelativeHyperOptLoss", "ProfitDrawDownHyperOptLoss", + "MultiMetricHyperOptLoss", ] AVAILABLE_PAIRLISTS = [ "StaticPairList", @@ -97,7 +98,7 @@ DL_DATA_TIMEFRAMES = ["1m", "5m"] ENV_VAR_PREFIX = "FREQTRADE__" -CANCELED_EXCHANGE_STATES = ("cancelled", "canceled", "expired") +CANCELED_EXCHANGE_STATES = ("cancelled", "canceled", "expired", "rejected") NON_OPEN_EXCHANGE_STATES = CANCELED_EXCHANGE_STATES + ("closed",) # Define decimals per coin for outputs @@ -193,7 +194,7 @@ ListPairsWithTimeframes = list[PairWithTimeframe] # Type for trades list TradeList = list[list] # ticks, pair, timeframe, CandleType -TickWithTimeframe = tuple[str, str, CandleType, Optional[int], Optional[int]] +TickWithTimeframe = tuple[str, str, CandleType, int | None, int | None] ListTicksWithTimeframes = list[TickWithTimeframe] LongShort = Literal["long", "short"] diff --git a/freqtrade/data/btanalysis.py b/freqtrade/data/btanalysis.py index 7e4d02f75..a9d8648d2 100644 --- a/freqtrade/data/btanalysis.py +++ b/freqtrade/data/btanalysis.py @@ -6,7 +6,7 @@ import logging from copy import copy from datetime import datetime, timezone from pathlib import Path -from typing import Any, Literal, Optional, Union +from typing import Any, Literal import numpy as np import pandas as pd @@ -53,7 +53,7 @@ BT_DATA_COLUMNS = [ ] -def get_latest_optimize_filename(directory: Union[Path, str], variant: str) -> str: +def get_latest_optimize_filename(directory: Path | str, variant: str) -> str: """ Get latest backtest export based on '.last_result.json'. :param directory: Directory to search for last result @@ -84,7 +84,7 @@ def get_latest_optimize_filename(directory: Union[Path, str], variant: str) -> s return data[f"latest_{variant}"] -def get_latest_backtest_filename(directory: Union[Path, str]) -> str: +def get_latest_backtest_filename(directory: Path | str) -> str: """ Get latest backtest export based on '.last_result.json'. :param directory: Directory to search for last result @@ -97,7 +97,7 @@ def get_latest_backtest_filename(directory: Union[Path, str]) -> str: return get_latest_optimize_filename(directory, "backtest") -def get_latest_hyperopt_filename(directory: Union[Path, str]) -> str: +def get_latest_hyperopt_filename(directory: Path | str) -> str: """ Get latest hyperopt export based on '.last_result.json'. :param directory: Directory to search for last result @@ -114,9 +114,7 @@ def get_latest_hyperopt_filename(directory: Union[Path, str]) -> str: return "hyperopt_results.pickle" -def get_latest_hyperopt_file( - directory: Union[Path, str], predef_filename: Optional[str] = None -) -> Path: +def get_latest_hyperopt_file(directory: Path | str, predef_filename: str | None = None) -> Path: """ Get latest hyperopt export based on '.last_result.json'. :param directory: Directory to search for last result @@ -137,7 +135,7 @@ def get_latest_hyperopt_file( return directory / get_latest_hyperopt_filename(directory) -def load_backtest_metadata(filename: Union[Path, str]) -> dict[str, Any]: +def load_backtest_metadata(filename: Path | str) -> dict[str, Any]: """ Read metadata dictionary from backtest results file without reading and deserializing entire file. @@ -154,7 +152,7 @@ def load_backtest_metadata(filename: Union[Path, str]) -> dict[str, Any]: raise OperationalException("Unexpected error while loading backtest metadata.") from e -def load_backtest_stats(filename: Union[Path, str]) -> BacktestResultType: +def load_backtest_stats(filename: Path | str) -> BacktestResultType: """ Load backtest statistics file. :param filename: pathlib.Path object, or string pointing to the file. @@ -276,7 +274,7 @@ def get_backtest_market_change(filename: Path, include_ts: bool = True) -> pd.Da def find_existing_backtest_stats( - dirname: Union[Path, str], run_ids: dict[str, str], min_backtest_date: Optional[datetime] = None + dirname: Path | str, run_ids: dict[str, str], min_backtest_date: datetime | None = None ) -> dict[str, Any]: """ Find existing backtest stats that match specified run IDs and load them. @@ -345,7 +343,7 @@ def _load_backtest_data_df_compatibility(df: pd.DataFrame) -> pd.DataFrame: return df -def load_backtest_data(filename: Union[Path, str], strategy: Optional[str] = None) -> pd.DataFrame: +def load_backtest_data(filename: Path | str, strategy: str | None = None) -> pd.DataFrame: """ Load backtest data file. :param filename: pathlib.Path object, or string pointing to a file or directory @@ -439,7 +437,7 @@ def evaluate_result_multi( return df_final[df_final["open_trades"] > max_open_trades] -def trade_list_to_dataframe(trades: Union[list[Trade], list[LocalTrade]]) -> pd.DataFrame: +def trade_list_to_dataframe(trades: list[Trade] | list[LocalTrade]) -> pd.DataFrame: """ Convert list of Trade objects to pandas Dataframe :param trades: List of trade objects @@ -453,7 +451,7 @@ def trade_list_to_dataframe(trades: Union[list[Trade], list[LocalTrade]]) -> pd. return df -def load_trades_from_db(db_url: str, strategy: Optional[str] = None) -> pd.DataFrame: +def load_trades_from_db(db_url: str, strategy: str | None = None) -> pd.DataFrame: """ Load trades from a DB (using dburl) :param db_url: Sqlite url (default format sqlite:///tradesv3.dry-run.sqlite) @@ -476,7 +474,7 @@ def load_trades( db_url: str, exportfilename: Path, no_trades: bool = False, - strategy: Optional[str] = None, + strategy: str | None = None, ) -> pd.DataFrame: """ Based on configuration option 'trade_source': diff --git a/freqtrade/data/dataprovider.py b/freqtrade/data/dataprovider.py index 491728695..7e4fc36d4 100644 --- a/freqtrade/data/dataprovider.py +++ b/freqtrade/data/dataprovider.py @@ -8,7 +8,7 @@ Common Interface for bot and strategy to access data. import logging from collections import deque from datetime import datetime, timezone -from typing import Any, Optional +from typing import Any from pandas import DataFrame, Timedelta, Timestamp, to_timedelta @@ -40,17 +40,17 @@ class DataProvider: def __init__( self, config: Config, - exchange: Optional[Exchange], + exchange: Exchange | None, pairlists=None, - rpc: Optional[RPCManager] = None, + rpc: RPCManager | None = None, ) -> None: self._config = config self._exchange = exchange self._pairlists = pairlists self.__rpc = rpc self.__cached_pairs: dict[PairWithTimeframe, tuple[DataFrame, datetime]] = {} - self.__slice_index: Optional[int] = None - self.__slice_date: Optional[datetime] = None + self.__slice_index: int | None = None + self.__slice_date: datetime | None = None self.__cached_pairs_backtesting: dict[PairWithTimeframe, DataFrame] = {} self.__producer_pairs_df: dict[ @@ -255,8 +255,8 @@ class DataProvider: def get_producer_df( self, pair: str, - timeframe: Optional[str] = None, - candle_type: Optional[CandleType] = None, + timeframe: str | None = None, + candle_type: CandleType | None = None, producer_name: str = "default", ) -> tuple[DataFrame, datetime]: """ @@ -349,7 +349,7 @@ class DataProvider: return total_candles def get_pair_dataframe( - self, pair: str, timeframe: Optional[str] = None, candle_type: str = "" + self, pair: str, timeframe: str | None = None, candle_type: str = "" ) -> DataFrame: """ Return pair candle (OHLCV) data, either live or cached historical -- depending @@ -437,7 +437,7 @@ class DataProvider: def refresh( self, pairlist: ListPairsWithTimeframes, - helping_pairs: Optional[ListPairsWithTimeframes] = None, + helping_pairs: ListPairsWithTimeframes | None = None, ) -> None: """ Refresh data, called with each cycle @@ -471,7 +471,7 @@ class DataProvider: return list(self._exchange._klines.keys()) def ohlcv( - self, pair: str, timeframe: Optional[str] = None, copy: bool = True, candle_type: str = "" + self, pair: str, timeframe: str | None = None, copy: bool = True, candle_type: str = "" ) -> DataFrame: """ Get candle (OHLCV) data for the given pair as DataFrame @@ -497,7 +497,7 @@ class DataProvider: return DataFrame() def trades( - self, pair: str, timeframe: Optional[str] = None, copy: bool = True, candle_type: str = "" + self, pair: str, timeframe: str | None = None, copy: bool = True, candle_type: str = "" ) -> DataFrame: """ Get candle (TRADES) data for the given pair as DataFrame @@ -529,7 +529,7 @@ class DataProvider: ) return trades_df - def market(self, pair: str) -> Optional[dict[str, Any]]: + def market(self, pair: str) -> dict[str, Any] | None: """ Return market data for the pair :param pair: Pair to get the data for diff --git a/freqtrade/data/history/datahandlers/featherdatahandler.py b/freqtrade/data/history/datahandlers/featherdatahandler.py index 8b1acb09c..46fd7e3ae 100644 --- a/freqtrade/data/history/datahandlers/featherdatahandler.py +++ b/freqtrade/data/history/datahandlers/featherdatahandler.py @@ -1,5 +1,4 @@ import logging -from typing import Optional from pandas import DataFrame, read_feather, to_datetime @@ -37,7 +36,7 @@ class FeatherDataHandler(IDataHandler): ) def _ohlcv_load( - self, pair: str, timeframe: str, timerange: Optional[TimeRange], candle_type: CandleType + self, pair: str, timeframe: str, timerange: TimeRange | None, candle_type: CandleType ) -> DataFrame: """ Internal method used to load data for one pair from disk. @@ -59,20 +58,25 @@ class FeatherDataHandler(IDataHandler): ) if not filename.exists(): return DataFrame(columns=self._columns) - - pairdata = read_feather(filename) - pairdata.columns = self._columns - pairdata = pairdata.astype( - dtype={ - "open": "float", - "high": "float", - "low": "float", - "close": "float", - "volume": "float", - } - ) - pairdata["date"] = to_datetime(pairdata["date"], unit="ms", utc=True) - return pairdata + try: + pairdata = read_feather(filename) + pairdata.columns = self._columns + pairdata = pairdata.astype( + dtype={ + "open": "float", + "high": "float", + "low": "float", + "close": "float", + "volume": "float", + } + ) + pairdata["date"] = to_datetime(pairdata["date"], unit="ms", utc=True) + return pairdata + except Exception as e: + logger.exception( + f"Error loading data from {filename}. Exception: {e}. Returning empty dataframe." + ) + return DataFrame(columns=self._columns) def ohlcv_append( self, pair: str, timeframe: str, data: DataFrame, candle_type: CandleType @@ -108,7 +112,7 @@ class FeatherDataHandler(IDataHandler): raise NotImplementedError() def _trades_load( - self, pair: str, trading_mode: TradingMode, timerange: Optional[TimeRange] = None + self, pair: str, trading_mode: TradingMode, timerange: TimeRange | None = None ) -> DataFrame: """ Load a pair from file, either .json.gz or .json diff --git a/freqtrade/data/history/datahandlers/hdf5datahandler.py b/freqtrade/data/history/datahandlers/hdf5datahandler.py index 99d0a98a6..58ae65849 100644 --- a/freqtrade/data/history/datahandlers/hdf5datahandler.py +++ b/freqtrade/data/history/datahandlers/hdf5datahandler.py @@ -1,5 +1,4 @@ import logging -from typing import Optional import numpy as np import pandas as pd @@ -45,7 +44,7 @@ class HDF5DataHandler(IDataHandler): ) def _ohlcv_load( - self, pair: str, timeframe: str, timerange: Optional[TimeRange], candle_type: CandleType + self, pair: str, timeframe: str, timerange: TimeRange | None, candle_type: CandleType ) -> pd.DataFrame: """ Internal method used to load data for one pair from disk. @@ -69,28 +68,36 @@ class HDF5DataHandler(IDataHandler): ) if not filename.exists(): return pd.DataFrame(columns=self._columns) - where = [] - if timerange: - if timerange.starttype == "date": - where.append(f"date >= Timestamp({timerange.startts * 1e9})") - if timerange.stoptype == "date": - where.append(f"date <= Timestamp({timerange.stopts * 1e9})") + try: + where = [] + if timerange: + if timerange.starttype == "date": + where.append(f"date >= Timestamp({timerange.startts * 1e9})") + if timerange.stoptype == "date": + where.append(f"date <= Timestamp({timerange.stopts * 1e9})") - pairdata = pd.read_hdf(filename, key=key, mode="r", where=where) + pairdata = pd.read_hdf(filename, key=key, mode="r", where=where) - if list(pairdata.columns) != self._columns: - raise ValueError("Wrong dataframe format") - pairdata = pairdata.astype( - dtype={ - "open": "float", - "high": "float", - "low": "float", - "close": "float", - "volume": "float", - } - ) - pairdata = pairdata.reset_index(drop=True) - return pairdata + if list(pairdata.columns) != self._columns: + raise ValueError("Wrong dataframe format") + pairdata = pairdata.astype( + dtype={ + "open": "float", + "high": "float", + "low": "float", + "close": "float", + "volume": "float", + } + ) + pairdata = pairdata.reset_index(drop=True) + return pairdata + except ValueError: + raise + except Exception as e: + logger.exception( + f"Error loading data from {filename}. Exception: {e}. Returning empty dataframe." + ) + return pd.DataFrame(columns=self._columns) def ohlcv_append( self, pair: str, timeframe: str, data: pd.DataFrame, candle_type: CandleType @@ -134,7 +141,7 @@ class HDF5DataHandler(IDataHandler): raise NotImplementedError() def _trades_load( - self, pair: str, trading_mode: TradingMode, timerange: Optional[TimeRange] = None + self, pair: str, trading_mode: TradingMode, timerange: TimeRange | None = None ) -> pd.DataFrame: """ Load a pair from h5 file. diff --git a/freqtrade/data/history/datahandlers/idatahandler.py b/freqtrade/data/history/datahandlers/idatahandler.py index 940c4d71e..330620134 100644 --- a/freqtrade/data/history/datahandlers/idatahandler.py +++ b/freqtrade/data/history/datahandlers/idatahandler.py @@ -10,7 +10,6 @@ from abc import ABC, abstractmethod from copy import deepcopy from datetime import datetime, timezone from pathlib import Path -from typing import Optional from pandas import DataFrame, to_datetime @@ -126,7 +125,7 @@ class IDataHandler(ABC): @abstractmethod def _ohlcv_load( - self, pair: str, timeframe: str, timerange: Optional[TimeRange], candle_type: CandleType + self, pair: str, timeframe: str, timerange: TimeRange | None, candle_type: CandleType ) -> DataFrame: """ Internal method used to load data for one pair from disk. @@ -247,7 +246,7 @@ class IDataHandler(ABC): @abstractmethod def _trades_load( - self, pair: str, trading_mode: TradingMode, timerange: Optional[TimeRange] = None + self, pair: str, trading_mode: TradingMode, timerange: TimeRange | None = None ) -> DataFrame: """ Load a pair from file, either .json.gz or .json @@ -282,7 +281,7 @@ class IDataHandler(ABC): return False def trades_load( - self, pair: str, trading_mode: TradingMode, timerange: Optional[TimeRange] = None + self, pair: str, trading_mode: TradingMode, timerange: TimeRange | None = None ) -> DataFrame: """ Load a pair from file, either .json.gz or .json @@ -370,7 +369,7 @@ class IDataHandler(ABC): timeframe: str, candle_type: CandleType, *, - timerange: Optional[TimeRange] = None, + timerange: TimeRange | None = None, fill_missing: bool = True, drop_incomplete: bool = False, startup_candles: int = 0, @@ -566,7 +565,7 @@ def get_datahandlerclass(datatype: str) -> type[IDataHandler]: def get_datahandler( - datadir: Path, data_format: Optional[str] = None, data_handler: Optional[IDataHandler] = None + datadir: Path, data_format: str | None = None, data_handler: IDataHandler | None = None ) -> IDataHandler: """ :param datadir: Folder to save data diff --git a/freqtrade/data/history/datahandlers/jsondatahandler.py b/freqtrade/data/history/datahandlers/jsondatahandler.py index b97b4b867..1a33b3e2f 100644 --- a/freqtrade/data/history/datahandlers/jsondatahandler.py +++ b/freqtrade/data/history/datahandlers/jsondatahandler.py @@ -1,5 +1,4 @@ import logging -from typing import Optional import numpy as np from pandas import DataFrame, read_json, to_datetime @@ -45,7 +44,7 @@ class JsonDataHandler(IDataHandler): ) def _ohlcv_load( - self, pair: str, timeframe: str, timerange: Optional[TimeRange], candle_type: CandleType + self, pair: str, timeframe: str, timerange: TimeRange | None, candle_type: CandleType ) -> DataFrame: """ Internal method used to load data for one pair from disk. @@ -119,7 +118,7 @@ class JsonDataHandler(IDataHandler): raise NotImplementedError() def _trades_load( - self, pair: str, trading_mode: TradingMode, timerange: Optional[TimeRange] = None + self, pair: str, trading_mode: TradingMode, timerange: TimeRange | None = None ) -> DataFrame: """ Load a pair from file, either .json.gz or .json diff --git a/freqtrade/data/history/datahandlers/parquetdatahandler.py b/freqtrade/data/history/datahandlers/parquetdatahandler.py index e226d4749..1813f9991 100644 --- a/freqtrade/data/history/datahandlers/parquetdatahandler.py +++ b/freqtrade/data/history/datahandlers/parquetdatahandler.py @@ -1,5 +1,4 @@ import logging -from typing import Optional from pandas import DataFrame, read_parquet, to_datetime @@ -35,7 +34,7 @@ class ParquetDataHandler(IDataHandler): data.reset_index(drop=True).loc[:, self._columns].to_parquet(filename) def _ohlcv_load( - self, pair: str, timeframe: str, timerange: Optional[TimeRange], candle_type: CandleType + self, pair: str, timeframe: str, timerange: TimeRange | None, candle_type: CandleType ) -> DataFrame: """ Internal method used to load data for one pair from disk. @@ -57,20 +56,25 @@ class ParquetDataHandler(IDataHandler): ) if not filename.exists(): return DataFrame(columns=self._columns) - - pairdata = read_parquet(filename) - pairdata.columns = self._columns - pairdata = pairdata.astype( - dtype={ - "open": "float", - "high": "float", - "low": "float", - "close": "float", - "volume": "float", - } - ) - pairdata["date"] = to_datetime(pairdata["date"], unit="ms", utc=True) - return pairdata + try: + pairdata = read_parquet(filename) + pairdata.columns = self._columns + pairdata = pairdata.astype( + dtype={ + "open": "float", + "high": "float", + "low": "float", + "close": "float", + "volume": "float", + } + ) + pairdata["date"] = to_datetime(pairdata["date"], unit="ms", utc=True) + return pairdata + except Exception as e: + logger.exception( + f"Error loading data from {filename}. Exception: {e}. Returning empty dataframe." + ) + return DataFrame(columns=self._columns) def ohlcv_append( self, pair: str, timeframe: str, data: DataFrame, candle_type: CandleType @@ -106,7 +110,7 @@ class ParquetDataHandler(IDataHandler): raise NotImplementedError() def _trades_load( - self, pair: str, trading_mode: TradingMode, timerange: Optional[TimeRange] = None + self, pair: str, trading_mode: TradingMode, timerange: TimeRange | None = None ) -> DataFrame: """ Load a pair from file, either .json.gz or .json diff --git a/freqtrade/data/history/history_utils.py b/freqtrade/data/history/history_utils.py index 092faa19a..fd4a5c5ee 100644 --- a/freqtrade/data/history/history_utils.py +++ b/freqtrade/data/history/history_utils.py @@ -2,18 +2,11 @@ import logging import operator from datetime import datetime, timedelta from pathlib import Path -from typing import Optional from pandas import DataFrame, concat from freqtrade.configuration import TimeRange -from freqtrade.constants import ( - DATETIME_PRINT_FORMAT, - DEFAULT_DATAFRAME_COLUMNS, - DL_DATA_TIMEFRAMES, - DOCS_LINK, - Config, -) +from freqtrade.constants import DATETIME_PRINT_FORMAT, DL_DATA_TIMEFRAMES, DOCS_LINK, Config from freqtrade.data.converter import ( clean_ohlcv_dataframe, convert_trades_to_ohlcv, @@ -25,8 +18,9 @@ from freqtrade.enums import CandleType, TradingMode from freqtrade.exceptions import OperationalException from freqtrade.exchange import Exchange from freqtrade.plugins.pairlist.pairlist_helpers import dynamic_expand_pairlist -from freqtrade.util import dt_now, dt_ts, format_ms_time, get_progress_tracker +from freqtrade.util import dt_now, dt_ts, format_ms_time from freqtrade.util.migrations import migrate_data +from freqtrade.util.progress_tracker import CustomProgress, retrieve_progress_tracker logger = logging.getLogger(__name__) @@ -37,12 +31,12 @@ def load_pair_history( timeframe: str, datadir: Path, *, - timerange: Optional[TimeRange] = None, + timerange: TimeRange | None = None, fill_up_missing: bool = True, drop_incomplete: bool = False, startup_candles: int = 0, - data_format: Optional[str] = None, - data_handler: Optional[IDataHandler] = None, + data_format: str | None = None, + data_handler: IDataHandler | None = None, candle_type: CandleType = CandleType.SPOT, ) -> DataFrame: """ @@ -79,13 +73,13 @@ def load_data( timeframe: str, pairs: list[str], *, - timerange: Optional[TimeRange] = None, + timerange: TimeRange | None = None, fill_up_missing: bool = True, startup_candles: int = 0, fail_without_data: bool = False, data_format: str = "feather", candle_type: CandleType = CandleType.SPOT, - user_futures_funding_rate: Optional[int] = None, + user_futures_funding_rate: int | None = None, ) -> dict[str, DataFrame]: """ Load ohlcv history data for a list of pairs. @@ -137,8 +131,8 @@ def refresh_data( timeframe: str, pairs: list[str], exchange: Exchange, - data_format: Optional[str] = None, - timerange: Optional[TimeRange] = None, + data_format: str | None = None, + timerange: TimeRange | None = None, candle_type: CandleType, ) -> None: """ @@ -168,11 +162,11 @@ def refresh_data( def _load_cached_data_for_updating( pair: str, timeframe: str, - timerange: Optional[TimeRange], + timerange: TimeRange | None, data_handler: IDataHandler, candle_type: CandleType, prepend: bool = False, -) -> tuple[DataFrame, Optional[int], Optional[int]]: +) -> tuple[DataFrame, int | None, int | None]: """ Load cached data to download more data. If timerange is passed in, checks whether data from an before the stored data will be @@ -200,14 +194,21 @@ def _load_cached_data_for_updating( candle_type=candle_type, ) if not data.empty: - if not prepend and start and start < data.iloc[0]["date"]: - # Earlier data than existing data requested, redownload all - data = DataFrame(columns=DEFAULT_DATAFRAME_COLUMNS) + if prepend: + end = data.iloc[0]["date"] else: - if prepend: - end = data.iloc[0]["date"] - else: - start = data.iloc[-1]["date"] + if start and start < data.iloc[0]["date"]: + # Earlier data than existing data requested, Update start date + logger.info( + f"{pair}, {timeframe}, {candle_type}: " + f"Requested start date {start:{DATETIME_PRINT_FORMAT}} earlier than local " + f"data start date {data.iloc[0]['date']:{DATETIME_PRINT_FORMAT}}. " + f"Use `--prepend` to download data prior " + f"to {data.iloc[0]['date']:{DATETIME_PRINT_FORMAT}}, or " + "`--erase` to redownload all data." + ) + start = data.iloc[-1]["date"] + start_ms = int(start.timestamp() * 1000) if start else None end_ms = int(end.timestamp() * 1000) if end else None return data, start_ms, end_ms @@ -220,8 +221,8 @@ def _download_pair_history( exchange: Exchange, timeframe: str = "5m", new_pairs_days: int = 30, - data_handler: Optional[IDataHandler] = None, - timerange: Optional[TimeRange] = None, + data_handler: IDataHandler | None = None, + timerange: TimeRange | None = None, candle_type: CandleType, erase: bool = False, prepend: bool = False, @@ -322,21 +323,24 @@ def refresh_backtest_ohlcv_data( timeframes: list[str], datadir: Path, trading_mode: str, - timerange: Optional[TimeRange] = None, + timerange: TimeRange | None = None, new_pairs_days: int = 30, erase: bool = False, - data_format: Optional[str] = None, + data_format: str | None = None, prepend: bool = False, + progress_tracker: CustomProgress | None = None, ) -> list[str]: """ Refresh stored ohlcv data for backtesting and hyperopt operations. Used by freqtrade download-data subcommand. :return: List of pairs that are not available. """ + progress_tracker = retrieve_progress_tracker(progress_tracker) + pairs_not_available = [] data_handler = get_datahandler(datadir, data_format) candle_type = CandleType.get_default(trading_mode) - with get_progress_tracker() as progress: + with progress_tracker as progress: tf_length = len(timeframes) if trading_mode != "futures" else len(timeframes) + 2 timeframe_task = progress.add_task("Timeframe", total=tf_length) pair_task = progress.add_task("Downloading data...", total=len(pairs)) @@ -346,7 +350,7 @@ def refresh_backtest_ohlcv_data( progress.update(timeframe_task, completed=0) if pair not in exchange.markets: - pairs_not_available.append(pair) + pairs_not_available.append(f"{pair}: Pair not available on exchange.") logger.info(f"Skipping pair {pair}...") continue for timeframe in timeframes: @@ -404,7 +408,7 @@ def _download_trades_history( pair: str, *, new_pairs_days: int = 30, - timerange: Optional[TimeRange] = None, + timerange: TimeRange | None = None, data_handler: IDataHandler, trading_mode: TradingMode, ) -> bool: @@ -412,79 +416,74 @@ def _download_trades_history( Download trade history from the exchange. Appends to previously downloaded trades data. """ - try: - until = None - since = 0 - if timerange: - if timerange.starttype == "date": - since = timerange.startts * 1000 - if timerange.stoptype == "date": - until = timerange.stopts * 1000 + until = None + since = 0 + if timerange: + if timerange.starttype == "date": + since = timerange.startts * 1000 + if timerange.stoptype == "date": + until = timerange.stopts * 1000 - trades = data_handler.trades_load(pair, trading_mode) + trades = data_handler.trades_load(pair, trading_mode) - # TradesList columns are defined in constants.DEFAULT_TRADES_COLUMNS - # DEFAULT_TRADES_COLUMNS: 0 -> timestamp - # DEFAULT_TRADES_COLUMNS: 1 -> id + # TradesList columns are defined in constants.DEFAULT_TRADES_COLUMNS + # DEFAULT_TRADES_COLUMNS: 0 -> timestamp + # DEFAULT_TRADES_COLUMNS: 1 -> id - if not trades.empty and since > 0 and since < trades.iloc[0]["timestamp"]: - # since is before the first trade - logger.info( - f"Start ({trades.iloc[0]['date']:{DATETIME_PRINT_FORMAT}}) earlier than " - f"available data. Redownloading trades for {pair}..." - ) - trades = trades_list_to_df([]) - - from_id = trades.iloc[-1]["id"] if not trades.empty else None - if not trades.empty and since < trades.iloc[-1]["timestamp"]: - # Reset since to the last available point - # - 5 seconds (to ensure we're getting all trades) - since = trades.iloc[-1]["timestamp"] - (5 * 1000) - logger.info( - f"Using last trade date -5s - Downloading trades for {pair} " - f"since: {format_ms_time(since)}." - ) - - if not since: - since = dt_ts(dt_now() - timedelta(days=new_pairs_days)) - - logger.debug( - "Current Start: %s", - "None" if trades.empty else f"{trades.iloc[0]['date']:{DATETIME_PRINT_FORMAT}}", + if not trades.empty and since > 0 and since < trades.iloc[0]["timestamp"]: + # since is before the first trade + raise ValueError( + f"Start {format_ms_time(since)} earlier than " + f"available data ({trades.iloc[0]['date']:{DATETIME_PRINT_FORMAT}}). " + f"Please use `--erase` if you'd like to redownload {pair}." ) - logger.debug( - "Current End: %s", - "None" if trades.empty else f"{trades.iloc[-1]['date']:{DATETIME_PRINT_FORMAT}}", - ) - logger.info(f"Current Amount of trades: {len(trades)}") - # Default since_ms to 30 days if nothing is given - new_trades = exchange.get_historic_trades( - pair=pair, - since=since, - until=until, - from_id=from_id, + from_id = trades.iloc[-1]["id"] if not trades.empty else None + if not trades.empty and since < trades.iloc[-1]["timestamp"]: + # Reset since to the last available point + # - 5 seconds (to ensure we're getting all trades) + since = trades.iloc[-1]["timestamp"] - (5 * 1000) + logger.info( + f"Using last trade date -5s - Downloading trades for {pair} " + f"since: {format_ms_time(since)}." ) - new_trades_df = trades_list_to_df(new_trades[1]) - trades = concat([trades, new_trades_df], axis=0) - # Remove duplicates to make sure we're not storing data we don't need - trades = trades_df_remove_duplicates(trades) - data_handler.trades_store(pair, trades, trading_mode) - logger.debug( - "New Start: %s", - "None" if trades.empty else f"{trades.iloc[0]['date']:{DATETIME_PRINT_FORMAT}}", - ) - logger.debug( - "New End: %s", - "None" if trades.empty else f"{trades.iloc[-1]['date']:{DATETIME_PRINT_FORMAT}}", - ) - logger.info(f"New Amount of trades: {len(trades)}") - return True + if not since: + since = dt_ts(dt_now() - timedelta(days=new_pairs_days)) - except Exception: - logger.exception(f'Failed to download and store historic trades for pair: "{pair}". ') - return False + logger.debug( + "Current Start: %s", + "None" if trades.empty else f"{trades.iloc[0]['date']:{DATETIME_PRINT_FORMAT}}", + ) + logger.debug( + "Current End: %s", + "None" if trades.empty else f"{trades.iloc[-1]['date']:{DATETIME_PRINT_FORMAT}}", + ) + logger.info(f"Current Amount of trades: {len(trades)}") + + # Default since_ms to 30 days if nothing is given + new_trades = exchange.get_historic_trades( + pair=pair, + since=since, + until=until, + from_id=from_id, + ) + new_trades_df = trades_list_to_df(new_trades[1]) + trades = concat([trades, new_trades_df], axis=0) + # Remove duplicates to make sure we're not storing data we don't need + trades = trades_df_remove_duplicates(trades) + data_handler.trades_store(pair, trades, trading_mode) + + logger.debug( + "New Start: %s", + "None" if trades.empty else f"{trades.iloc[0]['date']:{DATETIME_PRINT_FORMAT}}", + ) + logger.debug( + "New End: %s", + "None" if trades.empty else f"{trades.iloc[-1]['date']:{DATETIME_PRINT_FORMAT}}", + ) + logger.info(f"New Amount of trades: {len(trades)}") + return True def refresh_backtest_trades_data( @@ -496,20 +495,22 @@ def refresh_backtest_trades_data( new_pairs_days: int = 30, erase: bool = False, data_format: str = "feather", + progress_tracker: CustomProgress | None = None, ) -> list[str]: """ Refresh stored trades data for backtesting and hyperopt operations. Used by freqtrade download-data subcommand. :return: List of pairs that are not available. """ + progress_tracker = retrieve_progress_tracker(progress_tracker) pairs_not_available = [] data_handler = get_datahandler(datadir, data_format=data_format) - with get_progress_tracker() as progress: + with progress_tracker as progress: pair_task = progress.add_task("Downloading data...", total=len(pairs)) for pair in pairs: progress.update(pair_task, description=f"Downloading trades [{pair}]") if pair not in exchange.markets: - pairs_not_available.append(pair) + pairs_not_available.append(f"{pair}: Pair not available on exchange.") logger.info(f"Skipping pair {pair}...") continue @@ -518,14 +519,22 @@ def refresh_backtest_trades_data( logger.info(f"Deleting existing data for pair {pair}.") logger.info(f"Downloading trades for pair {pair}.") - _download_trades_history( - exchange=exchange, - pair=pair, - new_pairs_days=new_pairs_days, - timerange=timerange, - data_handler=data_handler, - trading_mode=trading_mode, - ) + try: + _download_trades_history( + exchange=exchange, + pair=pair, + new_pairs_days=new_pairs_days, + timerange=timerange, + data_handler=data_handler, + trading_mode=trading_mode, + ) + except ValueError as e: + pairs_not_available.append(f"{pair}: {str(e)}") + except Exception: + logger.exception( + f'Failed to download and store historic trades for pair: "{pair}". ' + ) + progress.update(pair_task, advance=1) return pairs_not_available @@ -577,6 +586,22 @@ def validate_backtest_data( def download_data_main(config: Config) -> None: + from freqtrade.resolvers.exchange_resolver import ExchangeResolver + + exchange = ExchangeResolver.load_exchange(config, validate=False) + + download_data(config, exchange) + + +def download_data( + config: Config, + exchange: Exchange, + *, + progress_tracker: CustomProgress | None = None, +) -> None: + """ + Download data function. Used from both cli and API. + """ timerange = TimeRange() if "days" in config: time_since = (datetime.now() - timedelta(days=config["days"])).strftime("%Y%m%d") @@ -590,10 +615,6 @@ def download_data_main(config: Config) -> None: pairs_not_available: list[str] = [] - # Init exchange - from freqtrade.resolvers.exchange_resolver import ExchangeResolver - - exchange = ExchangeResolver.load_exchange(config, validate=False) available_pairs = [ p for p in exchange.get_markets( @@ -605,17 +626,18 @@ def download_data_main(config: Config) -> None: if "timeframes" not in config: config["timeframes"] = DL_DATA_TIMEFRAMES - logger.info( - f"About to download pairs: {expanded_pairs}, " - f"intervals: {config['timeframes']} to {config['datadir']}" - ) - if len(expanded_pairs) == 0: logger.warning( "No pairs available for download. " "Please make sure you're using the correct Pair naming for your selected trade mode. \n" f"More info: {DOCS_LINK}/bot-basics/#pair-naming" ) + return + + logger.info( + f"About to download pairs: {expanded_pairs}, " + f"intervals: {config['timeframes']} to {config['datadir']}" + ) for timeframe in config["timeframes"]: exchange.validate_timeframes(timeframe) @@ -637,6 +659,7 @@ def download_data_main(config: Config) -> None: erase=bool(config.get("erase")), data_format=config["dataformat_trades"], trading_mode=config.get("trading_mode", TradingMode.SPOT), + progress_tracker=progress_tracker, ) if config.get("convert_trades") or not exchange.get_option("ohlcv_has_history", True): @@ -672,10 +695,12 @@ def download_data_main(config: Config) -> None: data_format=config["dataformat_ohlcv"], trading_mode=config.get("trading_mode", "spot"), prepend=config.get("prepend_data", False), + progress_tracker=progress_tracker, ) finally: if pairs_not_available: - logger.info( - f"Pairs [{','.join(pairs_not_available)}] not available " - f"on exchange {exchange.name}." + errors = "\n" + ("\n".join(pairs_not_available)) + logger.warning( + f"Encountered a problem downloading the following pairs from {exchange.name}: " + f"{errors}" ) diff --git a/freqtrade/exchange/binance.py b/freqtrade/exchange/binance.py index c0e46c32a..64b597fe8 100644 --- a/freqtrade/exchange/binance.py +++ b/freqtrade/exchange/binance.py @@ -3,7 +3,6 @@ import logging from datetime import datetime, timezone from pathlib import Path -from typing import Optional import ccxt @@ -53,12 +52,12 @@ class Binance(Exchange): (TradingMode.FUTURES, MarginMode.ISOLATED) ] - def get_tickers(self, symbols: Optional[list[str]] = None, cached: bool = False) -> Tickers: + def get_tickers(self, symbols: list[str] | None = None, *, cached: bool = False) -> Tickers: tickers = super().get_tickers(symbols=symbols, cached=cached) if self.trading_mode == TradingMode.FUTURES: # Binance's future result has no bid/ask values. # Therefore we must fetch that from fetch_bids_asks and combine the two results. - bidsasks = self.fetch_bids_asks(symbols, cached) + bidsasks = self.fetch_bids_asks(symbols, cached=cached) tickers = deep_merge_dicts(bidsasks, tickers, allow_null_overrides=False) return tickers @@ -106,7 +105,7 @@ class Binance(Exchange): candle_type: CandleType, is_new_pair: bool = False, raise_: bool = False, - until_ms: Optional[int] = None, + until_ms: int | None = None, ) -> OHLCVResponse: """ Overwrite to introduce "fast new pair" functionality by detecting the pair's listing date @@ -144,9 +143,7 @@ class Binance(Exchange): """ return open_date.minute == 0 and open_date.second < 15 - def fetch_funding_rates( - self, symbols: Optional[list[str]] = None - ) -> dict[str, dict[str, float]]: + def fetch_funding_rates(self, symbols: list[str] | None = None) -> dict[str, dict[str, float]]: """ Fetch funding rates for the given symbols. :param symbols: List of symbols to fetch funding rates for @@ -177,7 +174,7 @@ class Binance(Exchange): leverage: float, wallet_balance: float, # Or margin balance open_trades: list, - ) -> Optional[float]: + ) -> float | None: """ Important: Must be fetching data from cached values as this is used by backtesting! MARGIN: https://www.binance.com/en/support/faq/f6b010588e55413aa58b7d63ee0125ed @@ -263,3 +260,19 @@ class Binance(Exchange): return self.get_leverage_tiers() else: return {} + + async def _async_get_trade_history_id_startup( + self, pair: str, since: int | None + ) -> tuple[list[list], str]: + """ + override for initial call + + Binance only provides a limited set of historic trades data. + Using from_id=0, we can get the earliest available trades. + So if we don't get any data with the provided "since", we can assume to + download all available data. + """ + t, from_id = await self._async_fetch_trades(pair, since=since) + if not t: + return [], "0" + return t, from_id diff --git a/freqtrade/exchange/binance_leverage_tiers.json b/freqtrade/exchange/binance_leverage_tiers.json index 98512868d..4bcdab66d 100644 --- a/freqtrade/exchange/binance_leverage_tiers.json +++ b/freqtrade/exchange/binance_leverage_tiers.json @@ -1,7 +1,163 @@ { + "1000000MOG/USDT:USDT": [ + { + "tier": 1.0, + "symbol": "1000000MOG/USDT:USDT", + "currency": "USDT", + "minNotional": 0.0, + "maxNotional": 5000.0, + "maintenanceMarginRate": 0.01, + "maxLeverage": 75.0, + "info": { + "bracket": "1", + "initialLeverage": "75", + "notionalCap": "5000", + "notionalFloor": "0", + "maintMarginRatio": "0.01", + "cum": "0.0" + } + }, + { + "tier": 2.0, + "symbol": "1000000MOG/USDT:USDT", + "currency": "USDT", + "minNotional": 5000.0, + "maxNotional": 10000.0, + "maintenanceMarginRate": 0.015, + "maxLeverage": 50.0, + "info": { + "bracket": "2", + "initialLeverage": "50", + "notionalCap": "10000", + "notionalFloor": "5000", + "maintMarginRatio": "0.015", + "cum": "25.0" + } + }, + { + "tier": 3.0, + "symbol": "1000000MOG/USDT:USDT", + "currency": "USDT", + "minNotional": 10000.0, + "maxNotional": 30000.0, + "maintenanceMarginRate": 0.02, + "maxLeverage": 25.0, + "info": { + "bracket": "3", + "initialLeverage": "25", + "notionalCap": "30000", + "notionalFloor": "10000", + "maintMarginRatio": "0.02", + "cum": "75.0" + } + }, + { + "tier": 4.0, + "symbol": "1000000MOG/USDT:USDT", + "currency": "USDT", + "minNotional": 30000.0, + "maxNotional": 60000.0, + "maintenanceMarginRate": 0.025, + "maxLeverage": 20.0, + "info": { + "bracket": "4", + "initialLeverage": "20", + "notionalCap": "60000", + "notionalFloor": "30000", + "maintMarginRatio": "0.025", + "cum": "225.0" + } + }, + { + "tier": 5.0, + "symbol": "1000000MOG/USDT:USDT", + "currency": "USDT", + "minNotional": 60000.0, + "maxNotional": 300000.0, + "maintenanceMarginRate": 0.05, + "maxLeverage": 10.0, + "info": { + "bracket": "5", + "initialLeverage": "10", + "notionalCap": "300000", + "notionalFloor": "60000", + "maintMarginRatio": "0.05", + "cum": "1725.0" + } + }, + { + "tier": 6.0, + "symbol": "1000000MOG/USDT:USDT", + "currency": "USDT", + "minNotional": 300000.0, + "maxNotional": 600000.0, + "maintenanceMarginRate": 0.1, + "maxLeverage": 5.0, + "info": { + "bracket": "6", + "initialLeverage": "5", + "notionalCap": "600000", + "notionalFloor": "300000", + "maintMarginRatio": "0.1", + "cum": "16725.0" + } + }, + { + "tier": 7.0, + "symbol": "1000000MOG/USDT:USDT", + "currency": "USDT", + "minNotional": 600000.0, + "maxNotional": 750000.0, + "maintenanceMarginRate": 0.125, + "maxLeverage": 4.0, + "info": { + "bracket": "7", + "initialLeverage": "4", + "notionalCap": "750000", + "notionalFloor": "600000", + "maintMarginRatio": "0.125", + "cum": "31725.0" + } + }, + { + "tier": 8.0, + "symbol": "1000000MOG/USDT:USDT", + "currency": "USDT", + "minNotional": 750000.0, + "maxNotional": 1500000.0, + "maintenanceMarginRate": 0.25, + "maxLeverage": 2.0, + "info": { + "bracket": "8", + "initialLeverage": "2", + "notionalCap": "1500000", + "notionalFloor": "750000", + "maintMarginRatio": "0.25", + "cum": "125475.0" + } + }, + { + "tier": 9.0, + "symbol": "1000000MOG/USDT:USDT", + "currency": "USDT", + "minNotional": 1500000.0, + "maxNotional": 3000000.0, + "maintenanceMarginRate": 0.5, + "maxLeverage": 1.0, + "info": { + "bracket": "9", + "initialLeverage": "1", + "notionalCap": "3000000", + "notionalFloor": "1500000", + "maintMarginRatio": "0.5", + "cum": "500475.0" + } + } + ], "1000BONK/USDC:USDC": [ { "tier": 1.0, + "symbol": "1000BONK/USDC:USDC", "currency": "USDC", "minNotional": 0.0, "maxNotional": 5000.0, @@ -18,6 +174,7 @@ }, { "tier": 2.0, + "symbol": "1000BONK/USDC:USDC", "currency": "USDC", "minNotional": 5000.0, "maxNotional": 50000.0, @@ -34,6 +191,7 @@ }, { "tier": 3.0, + "symbol": "1000BONK/USDC:USDC", "currency": "USDC", "minNotional": 50000.0, "maxNotional": 600000.0, @@ -50,6 +208,7 @@ }, { "tier": 4.0, + "symbol": "1000BONK/USDC:USDC", "currency": "USDC", "minNotional": 600000.0, "maxNotional": 1200000.0, @@ -66,6 +225,7 @@ }, { "tier": 5.0, + "symbol": "1000BONK/USDC:USDC", "currency": "USDC", "minNotional": 1200000.0, "maxNotional": 3000000.0, @@ -82,6 +242,7 @@ }, { "tier": 6.0, + "symbol": "1000BONK/USDC:USDC", "currency": "USDC", "minNotional": 3000000.0, "maxNotional": 4000000.0, @@ -98,6 +259,7 @@ }, { "tier": 7.0, + "symbol": "1000BONK/USDC:USDC", "currency": "USDC", "minNotional": 4000000.0, "maxNotional": 6000000.0, @@ -114,6 +276,7 @@ }, { "tier": 8.0, + "symbol": "1000BONK/USDC:USDC", "currency": "USDC", "minNotional": 6000000.0, "maxNotional": 10000000.0, @@ -132,6 +295,7 @@ "1000BONK/USDT:USDT": [ { "tier": 1.0, + "symbol": "1000BONK/USDT:USDT", "currency": "USDT", "minNotional": 0.0, "maxNotional": 10000.0, @@ -148,15 +312,16 @@ }, { "tier": 2.0, + "symbol": "1000BONK/USDT:USDT", "currency": "USDT", "minNotional": 10000.0, - "maxNotional": 30000.0, + "maxNotional": 60000.0, "maintenanceMarginRate": 0.015, "maxLeverage": 50.0, "info": { "bracket": "2", "initialLeverage": "50", - "notionalCap": "30000", + "notionalCap": "60000", "notionalFloor": "10000", "maintMarginRatio": "0.015", "cum": "50.0" @@ -164,120 +329,128 @@ }, { "tier": 3.0, + "symbol": "1000BONK/USDT:USDT", "currency": "USDT", - "minNotional": 30000.0, - "maxNotional": 150000.0, + "minNotional": 60000.0, + "maxNotional": 300000.0, "maintenanceMarginRate": 0.02, "maxLeverage": 25.0, "info": { "bracket": "3", "initialLeverage": "25", - "notionalCap": "150000", - "notionalFloor": "30000", + "notionalCap": "300000", + "notionalFloor": "60000", "maintMarginRatio": "0.02", - "cum": "200.0" + "cum": "350.0" } }, { "tier": 4.0, + "symbol": "1000BONK/USDT:USDT", "currency": "USDT", - "minNotional": 150000.0, - "maxNotional": 300000.0, + "minNotional": 300000.0, + "maxNotional": 600000.0, "maintenanceMarginRate": 0.025, "maxLeverage": 20.0, "info": { "bracket": "4", "initialLeverage": "20", - "notionalCap": "300000", - "notionalFloor": "150000", + "notionalCap": "600000", + "notionalFloor": "300000", "maintMarginRatio": "0.025", - "cum": "950.0" + "cum": "1850.0" } }, { "tier": 5.0, + "symbol": "1000BONK/USDT:USDT", "currency": "USDT", - "minNotional": 300000.0, - "maxNotional": 1500000.0, + "minNotional": 600000.0, + "maxNotional": 3000000.0, "maintenanceMarginRate": 0.05, "maxLeverage": 10.0, "info": { "bracket": "5", "initialLeverage": "10", - "notionalCap": "1500000", - "notionalFloor": "300000", + "notionalCap": "3000000", + "notionalFloor": "600000", "maintMarginRatio": "0.05", - "cum": "8450.0" + "cum": "16850.0" } }, { "tier": 6.0, + "symbol": "1000BONK/USDT:USDT", "currency": "USDT", - "minNotional": 1500000.0, - "maxNotional": 3000000.0, + "minNotional": 3000000.0, + "maxNotional": 6000000.0, "maintenanceMarginRate": 0.1, "maxLeverage": 5.0, "info": { "bracket": "6", "initialLeverage": "5", - "notionalCap": "3000000", - "notionalFloor": "1500000", + "notionalCap": "6000000", + "notionalFloor": "3000000", "maintMarginRatio": "0.1", - "cum": "83450.0" + "cum": "166850.0" } }, { "tier": 7.0, + "symbol": "1000BONK/USDT:USDT", "currency": "USDT", - "minNotional": 3000000.0, - "maxNotional": 3750000.0, + "minNotional": 6000000.0, + "maxNotional": 7500000.0, "maintenanceMarginRate": 0.125, "maxLeverage": 4.0, "info": { "bracket": "7", "initialLeverage": "4", - "notionalCap": "3750000", - "notionalFloor": "3000000", + "notionalCap": "7500000", + "notionalFloor": "6000000", "maintMarginRatio": "0.125", - "cum": "158450.0" + "cum": "316850.0" } }, { "tier": 8.0, + "symbol": "1000BONK/USDT:USDT", "currency": "USDT", - "minNotional": 3750000.0, - "maxNotional": 7500000.0, + "minNotional": 7500000.0, + "maxNotional": 15000000.0, "maintenanceMarginRate": 0.25, "maxLeverage": 2.0, "info": { "bracket": "8", "initialLeverage": "2", - "notionalCap": "7500000", - "notionalFloor": "3750000", + "notionalCap": "15000000", + "notionalFloor": "7500000", "maintMarginRatio": "0.25", - "cum": "627200.0" + "cum": "1254350.0" } }, { "tier": 9.0, + "symbol": "1000BONK/USDT:USDT", "currency": "USDT", - "minNotional": 7500000.0, - "maxNotional": 15000000.0, + "minNotional": 15000000.0, + "maxNotional": 30000000.0, "maintenanceMarginRate": 0.5, "maxLeverage": 1.0, "info": { "bracket": "9", "initialLeverage": "1", - "notionalCap": "15000000", - "notionalFloor": "7500000", + "notionalCap": "30000000", + "notionalFloor": "15000000", "maintMarginRatio": "0.5", - "cum": "2502200.0" + "cum": "5004350.0" } } ], "1000CAT/USDT:USDT": [ { "tier": 1.0, + "symbol": "1000CAT/USDT:USDT", "currency": "USDT", "minNotional": 0.0, "maxNotional": 10000.0, @@ -294,6 +467,7 @@ }, { "tier": 2.0, + "symbol": "1000CAT/USDT:USDT", "currency": "USDT", "minNotional": 10000.0, "maxNotional": 20000.0, @@ -310,6 +484,7 @@ }, { "tier": 3.0, + "symbol": "1000CAT/USDT:USDT", "currency": "USDT", "minNotional": 20000.0, "maxNotional": 100000.0, @@ -326,6 +501,7 @@ }, { "tier": 4.0, + "symbol": "1000CAT/USDT:USDT", "currency": "USDT", "minNotional": 100000.0, "maxNotional": 200000.0, @@ -342,6 +518,7 @@ }, { "tier": 5.0, + "symbol": "1000CAT/USDT:USDT", "currency": "USDT", "minNotional": 200000.0, "maxNotional": 1000000.0, @@ -358,6 +535,7 @@ }, { "tier": 6.0, + "symbol": "1000CAT/USDT:USDT", "currency": "USDT", "minNotional": 1000000.0, "maxNotional": 2000000.0, @@ -374,6 +552,7 @@ }, { "tier": 7.0, + "symbol": "1000CAT/USDT:USDT", "currency": "USDT", "minNotional": 2000000.0, "maxNotional": 2500000.0, @@ -390,6 +569,7 @@ }, { "tier": 8.0, + "symbol": "1000CAT/USDT:USDT", "currency": "USDT", "minNotional": 2500000.0, "maxNotional": 5000000.0, @@ -406,6 +586,7 @@ }, { "tier": 9.0, + "symbol": "1000CAT/USDT:USDT", "currency": "USDT", "minNotional": 5000000.0, "maxNotional": 10000000.0, @@ -421,9 +602,165 @@ } } ], + "1000CHEEMS/USDT:USDT": [ + { + "tier": 1.0, + "symbol": "1000CHEEMS/USDT:USDT", + "currency": "USDT", + "minNotional": 0.0, + "maxNotional": 5000.0, + "maintenanceMarginRate": 0.01, + "maxLeverage": 75.0, + "info": { + "bracket": "1", + "initialLeverage": "75", + "notionalCap": "5000", + "notionalFloor": "0", + "maintMarginRatio": "0.01", + "cum": "0.0" + } + }, + { + "tier": 2.0, + "symbol": "1000CHEEMS/USDT:USDT", + "currency": "USDT", + "minNotional": 5000.0, + "maxNotional": 10000.0, + "maintenanceMarginRate": 0.015, + "maxLeverage": 50.0, + "info": { + "bracket": "2", + "initialLeverage": "50", + "notionalCap": "10000", + "notionalFloor": "5000", + "maintMarginRatio": "0.015", + "cum": "25.0" + } + }, + { + "tier": 3.0, + "symbol": "1000CHEEMS/USDT:USDT", + "currency": "USDT", + "minNotional": 10000.0, + "maxNotional": 30000.0, + "maintenanceMarginRate": 0.02, + "maxLeverage": 25.0, + "info": { + "bracket": "3", + "initialLeverage": "25", + "notionalCap": "30000", + "notionalFloor": "10000", + "maintMarginRatio": "0.02", + "cum": "75.0" + } + }, + { + "tier": 4.0, + "symbol": "1000CHEEMS/USDT:USDT", + "currency": "USDT", + "minNotional": 30000.0, + "maxNotional": 60000.0, + "maintenanceMarginRate": 0.025, + "maxLeverage": 20.0, + "info": { + "bracket": "4", + "initialLeverage": "20", + "notionalCap": "60000", + "notionalFloor": "30000", + "maintMarginRatio": "0.025", + "cum": "225.0" + } + }, + { + "tier": 5.0, + "symbol": "1000CHEEMS/USDT:USDT", + "currency": "USDT", + "minNotional": 60000.0, + "maxNotional": 300000.0, + "maintenanceMarginRate": 0.05, + "maxLeverage": 10.0, + "info": { + "bracket": "5", + "initialLeverage": "10", + "notionalCap": "300000", + "notionalFloor": "60000", + "maintMarginRatio": "0.05", + "cum": "1725.0" + } + }, + { + "tier": 6.0, + "symbol": "1000CHEEMS/USDT:USDT", + "currency": "USDT", + "minNotional": 300000.0, + "maxNotional": 600000.0, + "maintenanceMarginRate": 0.1, + "maxLeverage": 5.0, + "info": { + "bracket": "6", + "initialLeverage": "5", + "notionalCap": "600000", + "notionalFloor": "300000", + "maintMarginRatio": "0.1", + "cum": "16725.0" + } + }, + { + "tier": 7.0, + "symbol": "1000CHEEMS/USDT:USDT", + "currency": "USDT", + "minNotional": 600000.0, + "maxNotional": 750000.0, + "maintenanceMarginRate": 0.125, + "maxLeverage": 4.0, + "info": { + "bracket": "7", + "initialLeverage": "4", + "notionalCap": "750000", + "notionalFloor": "600000", + "maintMarginRatio": "0.125", + "cum": "31725.0" + } + }, + { + "tier": 8.0, + "symbol": "1000CHEEMS/USDT:USDT", + "currency": "USDT", + "minNotional": 750000.0, + "maxNotional": 1500000.0, + "maintenanceMarginRate": 0.25, + "maxLeverage": 2.0, + "info": { + "bracket": "8", + "initialLeverage": "2", + "notionalCap": "1500000", + "notionalFloor": "750000", + "maintMarginRatio": "0.25", + "cum": "125475.0" + } + }, + { + "tier": 9.0, + "symbol": "1000CHEEMS/USDT:USDT", + "currency": "USDT", + "minNotional": 1500000.0, + "maxNotional": 3000000.0, + "maintenanceMarginRate": 0.5, + "maxLeverage": 1.0, + "info": { + "bracket": "9", + "initialLeverage": "1", + "notionalCap": "3000000", + "notionalFloor": "1500000", + "maintMarginRatio": "0.5", + "cum": "500475.0" + } + } + ], "1000FLOKI/USDT:USDT": [ { "tier": 1.0, + "symbol": "1000FLOKI/USDT:USDT", "currency": "USDT", "minNotional": 0.0, "maxNotional": 10000.0, @@ -440,15 +777,16 @@ }, { "tier": 2.0, + "symbol": "1000FLOKI/USDT:USDT", "currency": "USDT", "minNotional": 10000.0, - "maxNotional": 30000.0, + "maxNotional": 60000.0, "maintenanceMarginRate": 0.015, "maxLeverage": 50.0, "info": { "bracket": "2", "initialLeverage": "50", - "notionalCap": "30000", + "notionalCap": "60000", "notionalFloor": "10000", "maintMarginRatio": "0.015", "cum": "50.0" @@ -456,120 +794,128 @@ }, { "tier": 3.0, + "symbol": "1000FLOKI/USDT:USDT", "currency": "USDT", - "minNotional": 30000.0, - "maxNotional": 150000.0, + "minNotional": 60000.0, + "maxNotional": 300000.0, "maintenanceMarginRate": 0.02, "maxLeverage": 25.0, "info": { "bracket": "3", "initialLeverage": "25", - "notionalCap": "150000", - "notionalFloor": "30000", + "notionalCap": "300000", + "notionalFloor": "60000", "maintMarginRatio": "0.02", - "cum": "200.0" + "cum": "350.0" } }, { "tier": 4.0, + "symbol": "1000FLOKI/USDT:USDT", "currency": "USDT", - "minNotional": 150000.0, - "maxNotional": 300000.0, + "minNotional": 300000.0, + "maxNotional": 600000.0, "maintenanceMarginRate": 0.025, "maxLeverage": 20.0, "info": { "bracket": "4", "initialLeverage": "20", - "notionalCap": "300000", - "notionalFloor": "150000", + "notionalCap": "600000", + "notionalFloor": "300000", "maintMarginRatio": "0.025", - "cum": "950.0" + "cum": "1850.0" } }, { "tier": 5.0, + "symbol": "1000FLOKI/USDT:USDT", "currency": "USDT", - "minNotional": 300000.0, - "maxNotional": 1500000.0, + "minNotional": 600000.0, + "maxNotional": 3000000.0, "maintenanceMarginRate": 0.05, "maxLeverage": 10.0, "info": { "bracket": "5", "initialLeverage": "10", - "notionalCap": "1500000", - "notionalFloor": "300000", + "notionalCap": "3000000", + "notionalFloor": "600000", "maintMarginRatio": "0.05", - "cum": "8450.0" + "cum": "16850.0" } }, { "tier": 6.0, + "symbol": "1000FLOKI/USDT:USDT", "currency": "USDT", - "minNotional": 1500000.0, - "maxNotional": 3000000.0, + "minNotional": 3000000.0, + "maxNotional": 6000000.0, "maintenanceMarginRate": 0.1, "maxLeverage": 5.0, "info": { "bracket": "6", "initialLeverage": "5", - "notionalCap": "3000000", - "notionalFloor": "1500000", + "notionalCap": "6000000", + "notionalFloor": "3000000", "maintMarginRatio": "0.1", - "cum": "83450.0" + "cum": "166850.0" } }, { "tier": 7.0, + "symbol": "1000FLOKI/USDT:USDT", "currency": "USDT", - "minNotional": 3000000.0, - "maxNotional": 3750000.0, + "minNotional": 6000000.0, + "maxNotional": 7500000.0, "maintenanceMarginRate": 0.125, "maxLeverage": 4.0, "info": { "bracket": "7", "initialLeverage": "4", - "notionalCap": "3750000", - "notionalFloor": "3000000", + "notionalCap": "7500000", + "notionalFloor": "6000000", "maintMarginRatio": "0.125", - "cum": "158450.0" + "cum": "316850.0" } }, { "tier": 8.0, + "symbol": "1000FLOKI/USDT:USDT", "currency": "USDT", - "minNotional": 3750000.0, - "maxNotional": 7500000.0, + "minNotional": 7500000.0, + "maxNotional": 15000000.0, "maintenanceMarginRate": 0.25, "maxLeverage": 2.0, "info": { "bracket": "8", "initialLeverage": "2", - "notionalCap": "7500000", - "notionalFloor": "3750000", + "notionalCap": "15000000", + "notionalFloor": "7500000", "maintMarginRatio": "0.25", - "cum": "627200.0" + "cum": "1254350.0" } }, { "tier": 9.0, + "symbol": "1000FLOKI/USDT:USDT", "currency": "USDT", - "minNotional": 7500000.0, - "maxNotional": 15000000.0, + "minNotional": 15000000.0, + "maxNotional": 30000000.0, "maintenanceMarginRate": 0.5, "maxLeverage": 1.0, "info": { "bracket": "9", "initialLeverage": "1", - "notionalCap": "15000000", - "notionalFloor": "7500000", + "notionalCap": "30000000", + "notionalFloor": "15000000", "maintMarginRatio": "0.5", - "cum": "2502200.0" + "cum": "5004350.0" } } ], "1000LUNC/USDT:USDT": [ { "tier": 1.0, + "symbol": "1000LUNC/USDT:USDT", "currency": "USDT", "minNotional": 0.0, "maxNotional": 5000.0, @@ -586,6 +932,7 @@ }, { "tier": 2.0, + "symbol": "1000LUNC/USDT:USDT", "currency": "USDT", "minNotional": 5000.0, "maxNotional": 25000.0, @@ -602,6 +949,7 @@ }, { "tier": 3.0, + "symbol": "1000LUNC/USDT:USDT", "currency": "USDT", "minNotional": 25000.0, "maxNotional": 400000.0, @@ -618,6 +966,7 @@ }, { "tier": 4.0, + "symbol": "1000LUNC/USDT:USDT", "currency": "USDT", "minNotional": 400000.0, "maxNotional": 1000000.0, @@ -634,6 +983,7 @@ }, { "tier": 5.0, + "symbol": "1000LUNC/USDT:USDT", "currency": "USDT", "minNotional": 1000000.0, "maxNotional": 2000000.0, @@ -650,6 +1000,7 @@ }, { "tier": 6.0, + "symbol": "1000LUNC/USDT:USDT", "currency": "USDT", "minNotional": 2000000.0, "maxNotional": 6000000.0, @@ -666,6 +1017,7 @@ }, { "tier": 7.0, + "symbol": "1000LUNC/USDT:USDT", "currency": "USDT", "minNotional": 6000000.0, "maxNotional": 10000000.0, @@ -684,6 +1036,7 @@ "1000PEPE/USDC:USDC": [ { "tier": 1.0, + "symbol": "1000PEPE/USDC:USDC", "currency": "USDC", "minNotional": 0.0, "maxNotional": 5000.0, @@ -700,6 +1053,7 @@ }, { "tier": 2.0, + "symbol": "1000PEPE/USDC:USDC", "currency": "USDC", "minNotional": 5000.0, "maxNotional": 10000.0, @@ -716,6 +1070,7 @@ }, { "tier": 3.0, + "symbol": "1000PEPE/USDC:USDC", "currency": "USDC", "minNotional": 10000.0, "maxNotional": 50000.0, @@ -732,6 +1087,7 @@ }, { "tier": 4.0, + "symbol": "1000PEPE/USDC:USDC", "currency": "USDC", "minNotional": 50000.0, "maxNotional": 1200000.0, @@ -748,6 +1104,7 @@ }, { "tier": 5.0, + "symbol": "1000PEPE/USDC:USDC", "currency": "USDC", "minNotional": 1200000.0, "maxNotional": 3000000.0, @@ -764,6 +1121,7 @@ }, { "tier": 6.0, + "symbol": "1000PEPE/USDC:USDC", "currency": "USDC", "minNotional": 3000000.0, "maxNotional": 3600000.0, @@ -780,6 +1138,7 @@ }, { "tier": 7.0, + "symbol": "1000PEPE/USDC:USDC", "currency": "USDC", "minNotional": 3600000.0, "maxNotional": 9000000.0, @@ -796,6 +1155,7 @@ }, { "tier": 8.0, + "symbol": "1000PEPE/USDC:USDC", "currency": "USDC", "minNotional": 9000000.0, "maxNotional": 15000000.0, @@ -814,6 +1174,7 @@ "1000PEPE/USDT:USDT": [ { "tier": 1.0, + "symbol": "1000PEPE/USDT:USDT", "currency": "USDT", "minNotional": 0.0, "maxNotional": 20000.0, @@ -830,6 +1191,7 @@ }, { "tier": 2.0, + "symbol": "1000PEPE/USDT:USDT", "currency": "USDT", "minNotional": 20000.0, "maxNotional": 200000.0, @@ -846,6 +1208,7 @@ }, { "tier": 3.0, + "symbol": "1000PEPE/USDT:USDT", "currency": "USDT", "minNotional": 200000.0, "maxNotional": 300000.0, @@ -862,6 +1225,7 @@ }, { "tier": 4.0, + "symbol": "1000PEPE/USDT:USDT", "currency": "USDT", "minNotional": 300000.0, "maxNotional": 1500000.0, @@ -878,6 +1242,7 @@ }, { "tier": 5.0, + "symbol": "1000PEPE/USDT:USDT", "currency": "USDT", "minNotional": 1500000.0, "maxNotional": 3000000.0, @@ -894,6 +1259,7 @@ }, { "tier": 6.0, + "symbol": "1000PEPE/USDT:USDT", "currency": "USDT", "minNotional": 3000000.0, "maxNotional": 15000000.0, @@ -910,6 +1276,7 @@ }, { "tier": 7.0, + "symbol": "1000PEPE/USDT:USDT", "currency": "USDT", "minNotional": 15000000.0, "maxNotional": 30000000.0, @@ -926,6 +1293,7 @@ }, { "tier": 8.0, + "symbol": "1000PEPE/USDT:USDT", "currency": "USDT", "minNotional": 30000000.0, "maxNotional": 37500000.0, @@ -942,6 +1310,7 @@ }, { "tier": 9.0, + "symbol": "1000PEPE/USDT:USDT", "currency": "USDT", "minNotional": 37500000.0, "maxNotional": 75000000.0, @@ -958,6 +1327,7 @@ }, { "tier": 10.0, + "symbol": "1000PEPE/USDT:USDT", "currency": "USDT", "minNotional": 75000000.0, "maxNotional": 150000000.0, @@ -976,6 +1346,7 @@ "1000RATS/USDT:USDT": [ { "tier": 1.0, + "symbol": "1000RATS/USDT:USDT", "currency": "USDT", "minNotional": 0.0, "maxNotional": 10000.0, @@ -992,6 +1363,7 @@ }, { "tier": 2.0, + "symbol": "1000RATS/USDT:USDT", "currency": "USDT", "minNotional": 10000.0, "maxNotional": 20000.0, @@ -1008,6 +1380,7 @@ }, { "tier": 3.0, + "symbol": "1000RATS/USDT:USDT", "currency": "USDT", "minNotional": 20000.0, "maxNotional": 100000.0, @@ -1024,6 +1397,7 @@ }, { "tier": 4.0, + "symbol": "1000RATS/USDT:USDT", "currency": "USDT", "minNotional": 100000.0, "maxNotional": 200000.0, @@ -1040,6 +1414,7 @@ }, { "tier": 5.0, + "symbol": "1000RATS/USDT:USDT", "currency": "USDT", "minNotional": 200000.0, "maxNotional": 1000000.0, @@ -1056,6 +1431,7 @@ }, { "tier": 6.0, + "symbol": "1000RATS/USDT:USDT", "currency": "USDT", "minNotional": 1000000.0, "maxNotional": 2000000.0, @@ -1072,6 +1448,7 @@ }, { "tier": 7.0, + "symbol": "1000RATS/USDT:USDT", "currency": "USDT", "minNotional": 2000000.0, "maxNotional": 2500000.0, @@ -1088,6 +1465,7 @@ }, { "tier": 8.0, + "symbol": "1000RATS/USDT:USDT", "currency": "USDT", "minNotional": 2500000.0, "maxNotional": 5000000.0, @@ -1104,6 +1482,7 @@ }, { "tier": 9.0, + "symbol": "1000RATS/USDT:USDT", "currency": "USDT", "minNotional": 5000000.0, "maxNotional": 10000000.0, @@ -1122,6 +1501,7 @@ "1000SATS/USDT:USDT": [ { "tier": 1.0, + "symbol": "1000SATS/USDT:USDT", "currency": "USDT", "minNotional": 0.0, "maxNotional": 10000.0, @@ -1138,6 +1518,7 @@ }, { "tier": 2.0, + "symbol": "1000SATS/USDT:USDT", "currency": "USDT", "minNotional": 10000.0, "maxNotional": 60000.0, @@ -1154,6 +1535,7 @@ }, { "tier": 3.0, + "symbol": "1000SATS/USDT:USDT", "currency": "USDT", "minNotional": 60000.0, "maxNotional": 300000.0, @@ -1170,6 +1552,7 @@ }, { "tier": 4.0, + "symbol": "1000SATS/USDT:USDT", "currency": "USDT", "minNotional": 300000.0, "maxNotional": 600000.0, @@ -1186,6 +1569,7 @@ }, { "tier": 5.0, + "symbol": "1000SATS/USDT:USDT", "currency": "USDT", "minNotional": 600000.0, "maxNotional": 3000000.0, @@ -1202,6 +1586,7 @@ }, { "tier": 6.0, + "symbol": "1000SATS/USDT:USDT", "currency": "USDT", "minNotional": 3000000.0, "maxNotional": 6000000.0, @@ -1218,6 +1603,7 @@ }, { "tier": 7.0, + "symbol": "1000SATS/USDT:USDT", "currency": "USDT", "minNotional": 6000000.0, "maxNotional": 7500000.0, @@ -1234,6 +1620,7 @@ }, { "tier": 8.0, + "symbol": "1000SATS/USDT:USDT", "currency": "USDT", "minNotional": 7500000.0, "maxNotional": 15000000.0, @@ -1250,6 +1637,7 @@ }, { "tier": 9.0, + "symbol": "1000SATS/USDT:USDT", "currency": "USDT", "minNotional": 15000000.0, "maxNotional": 30000000.0, @@ -1268,6 +1656,7 @@ "1000SHIB/USDC:USDC": [ { "tier": 1.0, + "symbol": "1000SHIB/USDC:USDC", "currency": "USDC", "minNotional": 0.0, "maxNotional": 5000.0, @@ -1284,6 +1673,7 @@ }, { "tier": 2.0, + "symbol": "1000SHIB/USDC:USDC", "currency": "USDC", "minNotional": 5000.0, "maxNotional": 25000.0, @@ -1300,6 +1690,7 @@ }, { "tier": 3.0, + "symbol": "1000SHIB/USDC:USDC", "currency": "USDC", "minNotional": 25000.0, "maxNotional": 150000.0, @@ -1316,6 +1707,7 @@ }, { "tier": 4.0, + "symbol": "1000SHIB/USDC:USDC", "currency": "USDC", "minNotional": 150000.0, "maxNotional": 600000.0, @@ -1332,6 +1724,7 @@ }, { "tier": 5.0, + "symbol": "1000SHIB/USDC:USDC", "currency": "USDC", "minNotional": 600000.0, "maxNotional": 1500000.0, @@ -1348,6 +1741,7 @@ }, { "tier": 6.0, + "symbol": "1000SHIB/USDC:USDC", "currency": "USDC", "minNotional": 1500000.0, "maxNotional": 3000000.0, @@ -1364,6 +1758,7 @@ }, { "tier": 7.0, + "symbol": "1000SHIB/USDC:USDC", "currency": "USDC", "minNotional": 3000000.0, "maxNotional": 5000000.0, @@ -1380,6 +1775,7 @@ }, { "tier": 8.0, + "symbol": "1000SHIB/USDC:USDC", "currency": "USDC", "minNotional": 5000000.0, "maxNotional": 9000000.0, @@ -1396,6 +1792,7 @@ }, { "tier": 9.0, + "symbol": "1000SHIB/USDC:USDC", "currency": "USDC", "minNotional": 9000000.0, "maxNotional": 30000000.0, @@ -1414,6 +1811,7 @@ "1000SHIB/USDT:USDT": [ { "tier": 1.0, + "symbol": "1000SHIB/USDT:USDT", "currency": "USDT", "minNotional": 0.0, "maxNotional": 10000.0, @@ -1430,6 +1828,7 @@ }, { "tier": 2.0, + "symbol": "1000SHIB/USDT:USDT", "currency": "USDT", "minNotional": 10000.0, "maxNotional": 25000.0, @@ -1446,6 +1845,7 @@ }, { "tier": 3.0, + "symbol": "1000SHIB/USDT:USDT", "currency": "USDT", "minNotional": 25000.0, "maxNotional": 150000.0, @@ -1462,15 +1862,16 @@ }, { "tier": 4.0, + "symbol": "1000SHIB/USDT:USDT", "currency": "USDT", "minNotional": 150000.0, - "maxNotional": 300000.0, + "maxNotional": 500000.0, "maintenanceMarginRate": 0.02, "maxLeverage": 25.0, "info": { "bracket": "4", "initialLeverage": "25", - "notionalCap": "300000", + "notionalCap": "500000", "notionalFloor": "150000", "maintMarginRatio": "0.02", "cum": "1572.5" @@ -1478,202 +1879,576 @@ }, { "tier": 5.0, + "symbol": "1000SHIB/USDT:USDT", "currency": "USDT", - "minNotional": 300000.0, - "maxNotional": 600000.0, + "minNotional": 500000.0, + "maxNotional": 1000000.0, "maintenanceMarginRate": 0.025, "maxLeverage": 20.0, "info": { "bracket": "5", "initialLeverage": "20", - "notionalCap": "600000", - "notionalFloor": "300000", + "notionalCap": "1000000", + "notionalFloor": "500000", "maintMarginRatio": "0.025", - "cum": "3072.5" + "cum": "4072.5" } }, { "tier": 6.0, + "symbol": "1000SHIB/USDT:USDT", "currency": "USDT", - "minNotional": 600000.0, - "maxNotional": 3000000.0, + "minNotional": 1000000.0, + "maxNotional": 5000000.0, "maintenanceMarginRate": 0.05, "maxLeverage": 10.0, "info": { "bracket": "6", "initialLeverage": "10", - "notionalCap": "3000000", - "notionalFloor": "600000", + "notionalCap": "5000000", + "notionalFloor": "1000000", "maintMarginRatio": "0.05", - "cum": "18072.5" + "cum": "29072.5" } }, { "tier": 7.0, + "symbol": "1000SHIB/USDT:USDT", "currency": "USDT", - "minNotional": 3000000.0, - "maxNotional": 6000000.0, + "minNotional": 5000000.0, + "maxNotional": 10000000.0, "maintenanceMarginRate": 0.1, "maxLeverage": 5.0, "info": { "bracket": "7", "initialLeverage": "5", - "notionalCap": "6000000", - "notionalFloor": "3000000", + "notionalCap": "10000000", + "notionalFloor": "5000000", "maintMarginRatio": "0.1", - "cum": "168072.5" + "cum": "279072.5" } }, { "tier": 8.0, + "symbol": "1000SHIB/USDT:USDT", "currency": "USDT", - "minNotional": 6000000.0, - "maxNotional": 7500000.0, + "minNotional": 10000000.0, + "maxNotional": 12500000.0, "maintenanceMarginRate": 0.125, "maxLeverage": 4.0, "info": { "bracket": "8", "initialLeverage": "4", - "notionalCap": "7500000", - "notionalFloor": "6000000", + "notionalCap": "12500000", + "notionalFloor": "10000000", "maintMarginRatio": "0.125", - "cum": "318072.5" + "cum": "529072.5" } }, { "tier": 9.0, + "symbol": "1000SHIB/USDT:USDT", "currency": "USDT", - "minNotional": 7500000.0, - "maxNotional": 15000000.0, + "minNotional": 12500000.0, + "maxNotional": 25000000.0, "maintenanceMarginRate": 0.25, "maxLeverage": 2.0, "info": { "bracket": "9", "initialLeverage": "2", - "notionalCap": "15000000", - "notionalFloor": "7500000", + "notionalCap": "25000000", + "notionalFloor": "12500000", "maintMarginRatio": "0.25", - "cum": "1255572.5" + "cum": "2091572.5" } }, { "tier": 10.0, + "symbol": "1000SHIB/USDT:USDT", "currency": "USDT", - "minNotional": 15000000.0, - "maxNotional": 30000000.0, + "minNotional": 25000000.0, + "maxNotional": 50000000.0, "maintenanceMarginRate": 0.5, "maxLeverage": 1.0, "info": { "bracket": "10", "initialLeverage": "1", - "notionalCap": "30000000", - "notionalFloor": "15000000", + "notionalCap": "50000000", + "notionalFloor": "25000000", "maintMarginRatio": "0.5", - "cum": "5005572.5" + "cum": "8341572.5" + } + } + ], + "1000WHY/USDT:USDT": [ + { + "tier": 1.0, + "symbol": "1000WHY/USDT:USDT", + "currency": "USDT", + "minNotional": 0.0, + "maxNotional": 5000.0, + "maintenanceMarginRate": 0.01, + "maxLeverage": 75.0, + "info": { + "bracket": "1", + "initialLeverage": "75", + "notionalCap": "5000", + "notionalFloor": "0", + "maintMarginRatio": "0.01", + "cum": "0.0" + } + }, + { + "tier": 2.0, + "symbol": "1000WHY/USDT:USDT", + "currency": "USDT", + "minNotional": 5000.0, + "maxNotional": 10000.0, + "maintenanceMarginRate": 0.015, + "maxLeverage": 50.0, + "info": { + "bracket": "2", + "initialLeverage": "50", + "notionalCap": "10000", + "notionalFloor": "5000", + "maintMarginRatio": "0.015", + "cum": "25.0" + } + }, + { + "tier": 3.0, + "symbol": "1000WHY/USDT:USDT", + "currency": "USDT", + "minNotional": 10000.0, + "maxNotional": 30000.0, + "maintenanceMarginRate": 0.02, + "maxLeverage": 25.0, + "info": { + "bracket": "3", + "initialLeverage": "25", + "notionalCap": "30000", + "notionalFloor": "10000", + "maintMarginRatio": "0.02", + "cum": "75.0" + } + }, + { + "tier": 4.0, + "symbol": "1000WHY/USDT:USDT", + "currency": "USDT", + "minNotional": 30000.0, + "maxNotional": 60000.0, + "maintenanceMarginRate": 0.025, + "maxLeverage": 20.0, + "info": { + "bracket": "4", + "initialLeverage": "20", + "notionalCap": "60000", + "notionalFloor": "30000", + "maintMarginRatio": "0.025", + "cum": "225.0" + } + }, + { + "tier": 5.0, + "symbol": "1000WHY/USDT:USDT", + "currency": "USDT", + "minNotional": 60000.0, + "maxNotional": 300000.0, + "maintenanceMarginRate": 0.05, + "maxLeverage": 10.0, + "info": { + "bracket": "5", + "initialLeverage": "10", + "notionalCap": "300000", + "notionalFloor": "60000", + "maintMarginRatio": "0.05", + "cum": "1725.0" + } + }, + { + "tier": 6.0, + "symbol": "1000WHY/USDT:USDT", + "currency": "USDT", + "minNotional": 300000.0, + "maxNotional": 600000.0, + "maintenanceMarginRate": 0.1, + "maxLeverage": 5.0, + "info": { + "bracket": "6", + "initialLeverage": "5", + "notionalCap": "600000", + "notionalFloor": "300000", + "maintMarginRatio": "0.1", + "cum": "16725.0" + } + }, + { + "tier": 7.0, + "symbol": "1000WHY/USDT:USDT", + "currency": "USDT", + "minNotional": 600000.0, + "maxNotional": 750000.0, + "maintenanceMarginRate": 0.125, + "maxLeverage": 4.0, + "info": { + "bracket": "7", + "initialLeverage": "4", + "notionalCap": "750000", + "notionalFloor": "600000", + "maintMarginRatio": "0.125", + "cum": "31725.0" + } + }, + { + "tier": 8.0, + "symbol": "1000WHY/USDT:USDT", + "currency": "USDT", + "minNotional": 750000.0, + "maxNotional": 1500000.0, + "maintenanceMarginRate": 0.25, + "maxLeverage": 2.0, + "info": { + "bracket": "8", + "initialLeverage": "2", + "notionalCap": "1500000", + "notionalFloor": "750000", + "maintMarginRatio": "0.25", + "cum": "125475.0" + } + }, + { + "tier": 9.0, + "symbol": "1000WHY/USDT:USDT", + "currency": "USDT", + "minNotional": 1500000.0, + "maxNotional": 3000000.0, + "maintenanceMarginRate": 0.5, + "maxLeverage": 1.0, + "info": { + "bracket": "9", + "initialLeverage": "1", + "notionalCap": "3000000", + "notionalFloor": "1500000", + "maintMarginRatio": "0.5", + "cum": "500475.0" + } + } + ], + "1000X/USDT:USDT": [ + { + "tier": 1.0, + "symbol": "1000X/USDT:USDT", + "currency": "USDT", + "minNotional": 0.0, + "maxNotional": 5000.0, + "maintenanceMarginRate": 0.01, + "maxLeverage": 75.0, + "info": { + "bracket": "1", + "initialLeverage": "75", + "notionalCap": "5000", + "notionalFloor": "0", + "maintMarginRatio": "0.01", + "cum": "0.0" + } + }, + { + "tier": 2.0, + "symbol": "1000X/USDT:USDT", + "currency": "USDT", + "minNotional": 5000.0, + "maxNotional": 10000.0, + "maintenanceMarginRate": 0.015, + "maxLeverage": 50.0, + "info": { + "bracket": "2", + "initialLeverage": "50", + "notionalCap": "10000", + "notionalFloor": "5000", + "maintMarginRatio": "0.015", + "cum": "25.0" + } + }, + { + "tier": 3.0, + "symbol": "1000X/USDT:USDT", + "currency": "USDT", + "minNotional": 10000.0, + "maxNotional": 30000.0, + "maintenanceMarginRate": 0.02, + "maxLeverage": 25.0, + "info": { + "bracket": "3", + "initialLeverage": "25", + "notionalCap": "30000", + "notionalFloor": "10000", + "maintMarginRatio": "0.02", + "cum": "75.0" + } + }, + { + "tier": 4.0, + "symbol": "1000X/USDT:USDT", + "currency": "USDT", + "minNotional": 30000.0, + "maxNotional": 60000.0, + "maintenanceMarginRate": 0.025, + "maxLeverage": 20.0, + "info": { + "bracket": "4", + "initialLeverage": "20", + "notionalCap": "60000", + "notionalFloor": "30000", + "maintMarginRatio": "0.025", + "cum": "225.0" + } + }, + { + "tier": 5.0, + "symbol": "1000X/USDT:USDT", + "currency": "USDT", + "minNotional": 60000.0, + "maxNotional": 300000.0, + "maintenanceMarginRate": 0.05, + "maxLeverage": 10.0, + "info": { + "bracket": "5", + "initialLeverage": "10", + "notionalCap": "300000", + "notionalFloor": "60000", + "maintMarginRatio": "0.05", + "cum": "1725.0" + } + }, + { + "tier": 6.0, + "symbol": "1000X/USDT:USDT", + "currency": "USDT", + "minNotional": 300000.0, + "maxNotional": 600000.0, + "maintenanceMarginRate": 0.1, + "maxLeverage": 5.0, + "info": { + "bracket": "6", + "initialLeverage": "5", + "notionalCap": "600000", + "notionalFloor": "300000", + "maintMarginRatio": "0.1", + "cum": "16725.0" + } + }, + { + "tier": 7.0, + "symbol": "1000X/USDT:USDT", + "currency": "USDT", + "minNotional": 600000.0, + "maxNotional": 750000.0, + "maintenanceMarginRate": 0.125, + "maxLeverage": 4.0, + "info": { + "bracket": "7", + "initialLeverage": "4", + "notionalCap": "750000", + "notionalFloor": "600000", + "maintMarginRatio": "0.125", + "cum": "31725.0" + } + }, + { + "tier": 8.0, + "symbol": "1000X/USDT:USDT", + "currency": "USDT", + "minNotional": 750000.0, + "maxNotional": 1500000.0, + "maintenanceMarginRate": 0.25, + "maxLeverage": 2.0, + "info": { + "bracket": "8", + "initialLeverage": "2", + "notionalCap": "1500000", + "notionalFloor": "750000", + "maintMarginRatio": "0.25", + "cum": "125475.0" + } + }, + { + "tier": 9.0, + "symbol": "1000X/USDT:USDT", + "currency": "USDT", + "minNotional": 1500000.0, + "maxNotional": 3000000.0, + "maintenanceMarginRate": 0.5, + "maxLeverage": 1.0, + "info": { + "bracket": "9", + "initialLeverage": "1", + "notionalCap": "3000000", + "notionalFloor": "1500000", + "maintMarginRatio": "0.5", + "cum": "500475.0" } } ], "1000XEC/USDT:USDT": [ { "tier": 1.0, + "symbol": "1000XEC/USDT:USDT", "currency": "USDT", "minNotional": 0.0, "maxNotional": 5000.0, - "maintenanceMarginRate": 0.02, - "maxLeverage": 20.0, + "maintenanceMarginRate": 0.01, + "maxLeverage": 75.0, "info": { "bracket": "1", - "initialLeverage": "20", + "initialLeverage": "75", "notionalCap": "5000", "notionalFloor": "0", - "maintMarginRatio": "0.02", + "maintMarginRatio": "0.01", "cum": "0.0" } }, { "tier": 2.0, + "symbol": "1000XEC/USDT:USDT", "currency": "USDT", "minNotional": 5000.0, - "maxNotional": 25000.0, - "maintenanceMarginRate": 0.025, - "maxLeverage": 10.0, + "maxNotional": 10000.0, + "maintenanceMarginRate": 0.015, + "maxLeverage": 50.0, "info": { "bracket": "2", - "initialLeverage": "10", - "notionalCap": "25000", + "initialLeverage": "50", + "notionalCap": "10000", "notionalFloor": "5000", - "maintMarginRatio": "0.025", + "maintMarginRatio": "0.015", "cum": "25.0" } }, { "tier": 3.0, + "symbol": "1000XEC/USDT:USDT", "currency": "USDT", - "minNotional": 25000.0, - "maxNotional": 100000.0, - "maintenanceMarginRate": 0.05, - "maxLeverage": 8.0, + "minNotional": 10000.0, + "maxNotional": 30000.0, + "maintenanceMarginRate": 0.02, + "maxLeverage": 25.0, "info": { "bracket": "3", - "initialLeverage": "8", - "notionalCap": "100000", - "notionalFloor": "25000", - "maintMarginRatio": "0.05", - "cum": "650.0" + "initialLeverage": "25", + "notionalCap": "30000", + "notionalFloor": "10000", + "maintMarginRatio": "0.02", + "cum": "75.0" } }, { "tier": 4.0, + "symbol": "1000XEC/USDT:USDT", "currency": "USDT", - "minNotional": 100000.0, - "maxNotional": 250000.0, - "maintenanceMarginRate": 0.1, - "maxLeverage": 5.0, + "minNotional": 30000.0, + "maxNotional": 60000.0, + "maintenanceMarginRate": 0.025, + "maxLeverage": 20.0, "info": { "bracket": "4", - "initialLeverage": "5", - "notionalCap": "250000", - "notionalFloor": "100000", - "maintMarginRatio": "0.1", - "cum": "5650.0" + "initialLeverage": "20", + "notionalCap": "60000", + "notionalFloor": "30000", + "maintMarginRatio": "0.025", + "cum": "225.0" } }, { "tier": 5.0, + "symbol": "1000XEC/USDT:USDT", "currency": "USDT", - "minNotional": 250000.0, - "maxNotional": 1000000.0, - "maintenanceMarginRate": 0.125, - "maxLeverage": 2.0, + "minNotional": 60000.0, + "maxNotional": 300000.0, + "maintenanceMarginRate": 0.05, + "maxLeverage": 10.0, "info": { "bracket": "5", - "initialLeverage": "2", - "notionalCap": "1000000", - "notionalFloor": "250000", - "maintMarginRatio": "0.125", - "cum": "11900.0" + "initialLeverage": "10", + "notionalCap": "300000", + "notionalFloor": "60000", + "maintMarginRatio": "0.05", + "cum": "1725.0" } }, { "tier": 6.0, + "symbol": "1000XEC/USDT:USDT", + "currency": "USDT", + "minNotional": 300000.0, + "maxNotional": 600000.0, + "maintenanceMarginRate": 0.1, + "maxLeverage": 5.0, + "info": { + "bracket": "6", + "initialLeverage": "5", + "notionalCap": "600000", + "notionalFloor": "300000", + "maintMarginRatio": "0.1", + "cum": "16725.0" + } + }, + { + "tier": 7.0, + "symbol": "1000XEC/USDT:USDT", + "currency": "USDT", + "minNotional": 600000.0, + "maxNotional": 1000000.0, + "maintenanceMarginRate": 0.125, + "maxLeverage": 4.0, + "info": { + "bracket": "7", + "initialLeverage": "4", + "notionalCap": "1000000", + "notionalFloor": "600000", + "maintMarginRatio": "0.125", + "cum": "31725.0" + } + }, + { + "tier": 8.0, + "symbol": "1000XEC/USDT:USDT", "currency": "USDT", "minNotional": 1000000.0, + "maxNotional": 1500000.0, + "maintenanceMarginRate": 0.25, + "maxLeverage": 2.0, + "info": { + "bracket": "8", + "initialLeverage": "2", + "notionalCap": "1500000", + "notionalFloor": "1000000", + "maintMarginRatio": "0.25", + "cum": "156725.0" + } + }, + { + "tier": 9.0, + "symbol": "1000XEC/USDT:USDT", + "currency": "USDT", + "minNotional": 1500000.0, "maxNotional": 3000000.0, "maintenanceMarginRate": 0.5, "maxLeverage": 1.0, "info": { - "bracket": "6", + "bracket": "9", "initialLeverage": "1", "notionalCap": "3000000", - "notionalFloor": "1000000", + "notionalFloor": "1500000", "maintMarginRatio": "0.5", - "cum": "386900.0" + "cum": "531725.0" } } ], "1INCH/USDT:USDT": [ { "tier": 1.0, + "symbol": "1INCH/USDT:USDT", "currency": "USDT", "minNotional": 0.0, "maxNotional": 10000.0, @@ -1690,6 +2465,7 @@ }, { "tier": 2.0, + "symbol": "1INCH/USDT:USDT", "currency": "USDT", "minNotional": 10000.0, "maxNotional": 20000.0, @@ -1706,6 +2482,7 @@ }, { "tier": 3.0, + "symbol": "1INCH/USDT:USDT", "currency": "USDT", "minNotional": 20000.0, "maxNotional": 100000.0, @@ -1722,6 +2499,7 @@ }, { "tier": 4.0, + "symbol": "1INCH/USDT:USDT", "currency": "USDT", "minNotional": 100000.0, "maxNotional": 200000.0, @@ -1738,6 +2516,7 @@ }, { "tier": 5.0, + "symbol": "1INCH/USDT:USDT", "currency": "USDT", "minNotional": 200000.0, "maxNotional": 1000000.0, @@ -1754,6 +2533,7 @@ }, { "tier": 6.0, + "symbol": "1INCH/USDT:USDT", "currency": "USDT", "minNotional": 1000000.0, "maxNotional": 2000000.0, @@ -1770,6 +2550,7 @@ }, { "tier": 7.0, + "symbol": "1INCH/USDT:USDT", "currency": "USDT", "minNotional": 2000000.0, "maxNotional": 2500000.0, @@ -1786,6 +2567,7 @@ }, { "tier": 8.0, + "symbol": "1INCH/USDT:USDT", "currency": "USDT", "minNotional": 2500000.0, "maxNotional": 5000000.0, @@ -1802,6 +2584,7 @@ }, { "tier": 9.0, + "symbol": "1INCH/USDT:USDT", "currency": "USDT", "minNotional": 5000000.0, "maxNotional": 10000000.0, @@ -1820,6 +2603,7 @@ "1MBABYDOGE/USDT:USDT": [ { "tier": 1.0, + "symbol": "1MBABYDOGE/USDT:USDT", "currency": "USDT", "minNotional": 0.0, "maxNotional": 10000.0, @@ -1836,6 +2620,7 @@ }, { "tier": 2.0, + "symbol": "1MBABYDOGE/USDT:USDT", "currency": "USDT", "minNotional": 10000.0, "maxNotional": 30000.0, @@ -1852,6 +2637,7 @@ }, { "tier": 3.0, + "symbol": "1MBABYDOGE/USDT:USDT", "currency": "USDT", "minNotional": 30000.0, "maxNotional": 150000.0, @@ -1868,6 +2654,7 @@ }, { "tier": 4.0, + "symbol": "1MBABYDOGE/USDT:USDT", "currency": "USDT", "minNotional": 150000.0, "maxNotional": 300000.0, @@ -1884,6 +2671,7 @@ }, { "tier": 5.0, + "symbol": "1MBABYDOGE/USDT:USDT", "currency": "USDT", "minNotional": 300000.0, "maxNotional": 1500000.0, @@ -1900,6 +2688,7 @@ }, { "tier": 6.0, + "symbol": "1MBABYDOGE/USDT:USDT", "currency": "USDT", "minNotional": 1500000.0, "maxNotional": 3000000.0, @@ -1916,6 +2705,7 @@ }, { "tier": 7.0, + "symbol": "1MBABYDOGE/USDT:USDT", "currency": "USDT", "minNotional": 3000000.0, "maxNotional": 3750000.0, @@ -1932,6 +2722,7 @@ }, { "tier": 8.0, + "symbol": "1MBABYDOGE/USDT:USDT", "currency": "USDT", "minNotional": 3750000.0, "maxNotional": 7500000.0, @@ -1948,6 +2739,7 @@ }, { "tier": 9.0, + "symbol": "1MBABYDOGE/USDT:USDT", "currency": "USDT", "minNotional": 7500000.0, "maxNotional": 15000000.0, @@ -1966,6 +2758,7 @@ "AAVE/USDT:USDT": [ { "tier": 1.0, + "symbol": "AAVE/USDT:USDT", "currency": "USDT", "minNotional": 0.0, "maxNotional": 10000.0, @@ -1982,15 +2775,16 @@ }, { "tier": 2.0, + "symbol": "AAVE/USDT:USDT", "currency": "USDT", "minNotional": 10000.0, - "maxNotional": 40000.0, + "maxNotional": 60000.0, "maintenanceMarginRate": 0.015, "maxLeverage": 50.0, "info": { "bracket": "2", "initialLeverage": "50", - "notionalCap": "40000", + "notionalCap": "60000", "notionalFloor": "10000", "maintMarginRatio": "0.015", "cum": "50.0" @@ -1998,120 +2792,128 @@ }, { "tier": 3.0, + "symbol": "AAVE/USDT:USDT", "currency": "USDT", - "minNotional": 40000.0, - "maxNotional": 200000.0, + "minNotional": 60000.0, + "maxNotional": 300000.0, "maintenanceMarginRate": 0.02, "maxLeverage": 25.0, "info": { "bracket": "3", "initialLeverage": "25", - "notionalCap": "200000", - "notionalFloor": "40000", + "notionalCap": "300000", + "notionalFloor": "60000", "maintMarginRatio": "0.02", - "cum": "250.0" + "cum": "350.0" } }, { "tier": 4.0, + "symbol": "AAVE/USDT:USDT", "currency": "USDT", - "minNotional": 200000.0, - "maxNotional": 400000.0, + "minNotional": 300000.0, + "maxNotional": 600000.0, "maintenanceMarginRate": 0.025, "maxLeverage": 20.0, "info": { "bracket": "4", "initialLeverage": "20", - "notionalCap": "400000", - "notionalFloor": "200000", + "notionalCap": "600000", + "notionalFloor": "300000", "maintMarginRatio": "0.025", - "cum": "1250.0" + "cum": "1850.0" } }, { "tier": 5.0, + "symbol": "AAVE/USDT:USDT", "currency": "USDT", - "minNotional": 400000.0, - "maxNotional": 2000000.0, + "minNotional": 600000.0, + "maxNotional": 3000000.0, "maintenanceMarginRate": 0.05, "maxLeverage": 10.0, "info": { "bracket": "5", "initialLeverage": "10", - "notionalCap": "2000000", - "notionalFloor": "400000", + "notionalCap": "3000000", + "notionalFloor": "600000", "maintMarginRatio": "0.05", - "cum": "11250.0" + "cum": "16850.0" } }, { "tier": 6.0, + "symbol": "AAVE/USDT:USDT", "currency": "USDT", - "minNotional": 2000000.0, - "maxNotional": 4000000.0, + "minNotional": 3000000.0, + "maxNotional": 6000000.0, "maintenanceMarginRate": 0.1, "maxLeverage": 5.0, "info": { "bracket": "6", "initialLeverage": "5", - "notionalCap": "4000000", - "notionalFloor": "2000000", + "notionalCap": "6000000", + "notionalFloor": "3000000", "maintMarginRatio": "0.1", - "cum": "111250.0" + "cum": "166850.0" } }, { "tier": 7.0, + "symbol": "AAVE/USDT:USDT", "currency": "USDT", - "minNotional": 4000000.0, - "maxNotional": 5000000.0, + "minNotional": 6000000.0, + "maxNotional": 7500000.0, "maintenanceMarginRate": 0.125, "maxLeverage": 4.0, "info": { "bracket": "7", "initialLeverage": "4", - "notionalCap": "5000000", - "notionalFloor": "4000000", + "notionalCap": "7500000", + "notionalFloor": "6000000", "maintMarginRatio": "0.125", - "cum": "211250.0" + "cum": "316850.0" } }, { "tier": 8.0, + "symbol": "AAVE/USDT:USDT", "currency": "USDT", - "minNotional": 5000000.0, - "maxNotional": 10000000.0, + "minNotional": 7500000.0, + "maxNotional": 15000000.0, "maintenanceMarginRate": 0.25, "maxLeverage": 2.0, "info": { "bracket": "8", "initialLeverage": "2", - "notionalCap": "10000000", - "notionalFloor": "5000000", + "notionalCap": "15000000", + "notionalFloor": "7500000", "maintMarginRatio": "0.25", - "cum": "836250.0" + "cum": "1254350.0" } }, { "tier": 9.0, + "symbol": "AAVE/USDT:USDT", "currency": "USDT", - "minNotional": 10000000.0, - "maxNotional": 20000000.0, + "minNotional": 15000000.0, + "maxNotional": 30000000.0, "maintenanceMarginRate": 0.5, "maxLeverage": 1.0, "info": { "bracket": "9", "initialLeverage": "1", - "notionalCap": "20000000", - "notionalFloor": "10000000", + "notionalCap": "30000000", + "notionalFloor": "15000000", "maintMarginRatio": "0.5", - "cum": "3336250.0" + "cum": "5004350.0" } } ], "ACE/USDT:USDT": [ { "tier": 1.0, + "symbol": "ACE/USDT:USDT", "currency": "USDT", "minNotional": 0.0, "maxNotional": 5000.0, @@ -2128,6 +2930,7 @@ }, { "tier": 2.0, + "symbol": "ACE/USDT:USDT", "currency": "USDT", "minNotional": 5000.0, "maxNotional": 25000.0, @@ -2144,6 +2947,7 @@ }, { "tier": 3.0, + "symbol": "ACE/USDT:USDT", "currency": "USDT", "minNotional": 25000.0, "maxNotional": 50000.0, @@ -2160,6 +2964,7 @@ }, { "tier": 4.0, + "symbol": "ACE/USDT:USDT", "currency": "USDT", "minNotional": 50000.0, "maxNotional": 500000.0, @@ -2176,6 +2981,7 @@ }, { "tier": 5.0, + "symbol": "ACE/USDT:USDT", "currency": "USDT", "minNotional": 500000.0, "maxNotional": 1000000.0, @@ -2192,6 +2998,7 @@ }, { "tier": 6.0, + "symbol": "ACE/USDT:USDT", "currency": "USDT", "minNotional": 1000000.0, "maxNotional": 1250000.0, @@ -2208,6 +3015,7 @@ }, { "tier": 7.0, + "symbol": "ACE/USDT:USDT", "currency": "USDT", "minNotional": 1250000.0, "maxNotional": 2500000.0, @@ -2224,6 +3032,7 @@ }, { "tier": 8.0, + "symbol": "ACE/USDT:USDT", "currency": "USDT", "minNotional": 2500000.0, "maxNotional": 5000000.0, @@ -2242,6 +3051,7 @@ "ACH/USDT:USDT": [ { "tier": 1.0, + "symbol": "ACH/USDT:USDT", "currency": "USDT", "minNotional": 0.0, "maxNotional": 5000.0, @@ -2258,6 +3068,7 @@ }, { "tier": 2.0, + "symbol": "ACH/USDT:USDT", "currency": "USDT", "minNotional": 5000.0, "maxNotional": 20000.0, @@ -2274,6 +3085,7 @@ }, { "tier": 3.0, + "symbol": "ACH/USDT:USDT", "currency": "USDT", "minNotional": 20000.0, "maxNotional": 25000.0, @@ -2290,6 +3102,7 @@ }, { "tier": 4.0, + "symbol": "ACH/USDT:USDT", "currency": "USDT", "minNotional": 25000.0, "maxNotional": 200000.0, @@ -2306,6 +3119,7 @@ }, { "tier": 5.0, + "symbol": "ACH/USDT:USDT", "currency": "USDT", "minNotional": 200000.0, "maxNotional": 400000.0, @@ -2322,6 +3136,7 @@ }, { "tier": 6.0, + "symbol": "ACH/USDT:USDT", "currency": "USDT", "minNotional": 400000.0, "maxNotional": 500000.0, @@ -2338,6 +3153,7 @@ }, { "tier": 7.0, + "symbol": "ACH/USDT:USDT", "currency": "USDT", "minNotional": 500000.0, "maxNotional": 1000000.0, @@ -2354,6 +3170,7 @@ }, { "tier": 8.0, + "symbol": "ACH/USDT:USDT", "currency": "USDT", "minNotional": 1000000.0, "maxNotional": 2000000.0, @@ -2369,9 +3186,165 @@ } } ], + "ACT/USDT:USDT": [ + { + "tier": 1.0, + "symbol": "ACT/USDT:USDT", + "currency": "USDT", + "minNotional": 0.0, + "maxNotional": 10000.0, + "maintenanceMarginRate": 0.01, + "maxLeverage": 75.0, + "info": { + "bracket": "1", + "initialLeverage": "75", + "notionalCap": "10000", + "notionalFloor": "0", + "maintMarginRatio": "0.01", + "cum": "0.0" + } + }, + { + "tier": 2.0, + "symbol": "ACT/USDT:USDT", + "currency": "USDT", + "minNotional": 10000.0, + "maxNotional": 40000.0, + "maintenanceMarginRate": 0.015, + "maxLeverage": 50.0, + "info": { + "bracket": "2", + "initialLeverage": "50", + "notionalCap": "40000", + "notionalFloor": "10000", + "maintMarginRatio": "0.015", + "cum": "50.0" + } + }, + { + "tier": 3.0, + "symbol": "ACT/USDT:USDT", + "currency": "USDT", + "minNotional": 40000.0, + "maxNotional": 200000.0, + "maintenanceMarginRate": 0.02, + "maxLeverage": 25.0, + "info": { + "bracket": "3", + "initialLeverage": "25", + "notionalCap": "200000", + "notionalFloor": "40000", + "maintMarginRatio": "0.02", + "cum": "250.0" + } + }, + { + "tier": 4.0, + "symbol": "ACT/USDT:USDT", + "currency": "USDT", + "minNotional": 200000.0, + "maxNotional": 400000.0, + "maintenanceMarginRate": 0.025, + "maxLeverage": 20.0, + "info": { + "bracket": "4", + "initialLeverage": "20", + "notionalCap": "400000", + "notionalFloor": "200000", + "maintMarginRatio": "0.025", + "cum": "1250.0" + } + }, + { + "tier": 5.0, + "symbol": "ACT/USDT:USDT", + "currency": "USDT", + "minNotional": 400000.0, + "maxNotional": 2000000.0, + "maintenanceMarginRate": 0.05, + "maxLeverage": 10.0, + "info": { + "bracket": "5", + "initialLeverage": "10", + "notionalCap": "2000000", + "notionalFloor": "400000", + "maintMarginRatio": "0.05", + "cum": "11250.0" + } + }, + { + "tier": 6.0, + "symbol": "ACT/USDT:USDT", + "currency": "USDT", + "minNotional": 2000000.0, + "maxNotional": 4000000.0, + "maintenanceMarginRate": 0.1, + "maxLeverage": 5.0, + "info": { + "bracket": "6", + "initialLeverage": "5", + "notionalCap": "4000000", + "notionalFloor": "2000000", + "maintMarginRatio": "0.1", + "cum": "111250.0" + } + }, + { + "tier": 7.0, + "symbol": "ACT/USDT:USDT", + "currency": "USDT", + "minNotional": 4000000.0, + "maxNotional": 5000000.0, + "maintenanceMarginRate": 0.125, + "maxLeverage": 4.0, + "info": { + "bracket": "7", + "initialLeverage": "4", + "notionalCap": "5000000", + "notionalFloor": "4000000", + "maintMarginRatio": "0.125", + "cum": "211250.0" + } + }, + { + "tier": 8.0, + "symbol": "ACT/USDT:USDT", + "currency": "USDT", + "minNotional": 5000000.0, + "maxNotional": 10000000.0, + "maintenanceMarginRate": 0.25, + "maxLeverage": 2.0, + "info": { + "bracket": "8", + "initialLeverage": "2", + "notionalCap": "10000000", + "notionalFloor": "5000000", + "maintMarginRatio": "0.25", + "cum": "836250.0" + } + }, + { + "tier": 9.0, + "symbol": "ACT/USDT:USDT", + "currency": "USDT", + "minNotional": 10000000.0, + "maxNotional": 20000000.0, + "maintenanceMarginRate": 0.5, + "maxLeverage": 1.0, + "info": { + "bracket": "9", + "initialLeverage": "1", + "notionalCap": "20000000", + "notionalFloor": "10000000", + "maintMarginRatio": "0.5", + "cum": "3336250.0" + } + } + ], "ADA/USDT:USDT": [ { "tier": 1.0, + "symbol": "ADA/USDT:USDT", "currency": "USDT", "minNotional": 0.0, "maxNotional": 10000.0, @@ -2388,6 +3361,7 @@ }, { "tier": 2.0, + "symbol": "ADA/USDT:USDT", "currency": "USDT", "minNotional": 10000.0, "maxNotional": 50000.0, @@ -2404,15 +3378,16 @@ }, { "tier": 3.0, + "symbol": "ADA/USDT:USDT", "currency": "USDT", "minNotional": 50000.0, - "maxNotional": 100000.0, + "maxNotional": 200000.0, "maintenanceMarginRate": 0.015, "maxLeverage": 40.0, "info": { "bracket": "3", "initialLeverage": "40", - "notionalCap": "100000", + "notionalCap": "200000", "notionalFloor": "50000", "maintMarginRatio": "0.015", "cum": "300.0" @@ -2420,120 +3395,128 @@ }, { "tier": 4.0, + "symbol": "ADA/USDT:USDT", "currency": "USDT", - "minNotional": 100000.0, - "maxNotional": 500000.0, + "minNotional": 200000.0, + "maxNotional": 1000000.0, "maintenanceMarginRate": 0.02, "maxLeverage": 25.0, "info": { "bracket": "4", "initialLeverage": "25", - "notionalCap": "500000", - "notionalFloor": "100000", + "notionalCap": "1000000", + "notionalFloor": "200000", "maintMarginRatio": "0.02", - "cum": "800.0" + "cum": "1300.0" } }, { "tier": 5.0, + "symbol": "ADA/USDT:USDT", "currency": "USDT", - "minNotional": 500000.0, - "maxNotional": 1000000.0, + "minNotional": 1000000.0, + "maxNotional": 2000000.0, "maintenanceMarginRate": 0.025, "maxLeverage": 20.0, "info": { "bracket": "5", "initialLeverage": "20", - "notionalCap": "1000000", - "notionalFloor": "500000", + "notionalCap": "2000000", + "notionalFloor": "1000000", "maintMarginRatio": "0.025", - "cum": "3300.0" + "cum": "6300.0" } }, { "tier": 6.0, + "symbol": "ADA/USDT:USDT", "currency": "USDT", - "minNotional": 1000000.0, - "maxNotional": 5000000.0, + "minNotional": 2000000.0, + "maxNotional": 10000000.0, "maintenanceMarginRate": 0.05, "maxLeverage": 10.0, "info": { "bracket": "6", "initialLeverage": "10", - "notionalCap": "5000000", - "notionalFloor": "1000000", + "notionalCap": "10000000", + "notionalFloor": "2000000", "maintMarginRatio": "0.05", - "cum": "28300.0" + "cum": "56300.0" } }, { "tier": 7.0, + "symbol": "ADA/USDT:USDT", "currency": "USDT", - "minNotional": 5000000.0, - "maxNotional": 10000000.0, + "minNotional": 10000000.0, + "maxNotional": 20000000.0, "maintenanceMarginRate": 0.1, "maxLeverage": 5.0, "info": { "bracket": "7", "initialLeverage": "5", - "notionalCap": "10000000", - "notionalFloor": "5000000", + "notionalCap": "20000000", + "notionalFloor": "10000000", "maintMarginRatio": "0.1", - "cum": "278300.0" + "cum": "556300.0" } }, { "tier": 8.0, + "symbol": "ADA/USDT:USDT", "currency": "USDT", - "minNotional": 10000000.0, - "maxNotional": 20000000.0, + "minNotional": 20000000.0, + "maxNotional": 25000000.0, "maintenanceMarginRate": 0.125, "maxLeverage": 4.0, "info": { "bracket": "8", "initialLeverage": "4", - "notionalCap": "20000000", - "notionalFloor": "10000000", + "notionalCap": "25000000", + "notionalFloor": "20000000", "maintMarginRatio": "0.125", - "cum": "528300.0" + "cum": "1056300.0" } }, { "tier": 9.0, + "symbol": "ADA/USDT:USDT", "currency": "USDT", - "minNotional": 20000000.0, - "maxNotional": 30000000.0, + "minNotional": 25000000.0, + "maxNotional": 50000000.0, "maintenanceMarginRate": 0.25, "maxLeverage": 2.0, "info": { "bracket": "9", "initialLeverage": "2", - "notionalCap": "30000000", - "notionalFloor": "20000000", + "notionalCap": "50000000", + "notionalFloor": "25000000", "maintMarginRatio": "0.25", - "cum": "3028300.0" + "cum": "4181300.0" } }, { "tier": 10.0, + "symbol": "ADA/USDT:USDT", "currency": "USDT", - "minNotional": 30000000.0, - "maxNotional": 50000000.0, + "minNotional": 50000000.0, + "maxNotional": 100000000.0, "maintenanceMarginRate": 0.5, "maxLeverage": 1.0, "info": { "bracket": "10", "initialLeverage": "1", - "notionalCap": "50000000", - "notionalFloor": "30000000", + "notionalCap": "100000000", + "notionalFloor": "50000000", "maintMarginRatio": "0.5", - "cum": "10528300.0" + "cum": "16681300.0" } } ], "AERGO/USDT:USDT": [ { "tier": 1.0, + "symbol": "AERGO/USDT:USDT", "currency": "USDT", "minNotional": 0.0, "maxNotional": 5000.0, @@ -2550,6 +3533,7 @@ }, { "tier": 2.0, + "symbol": "AERGO/USDT:USDT", "currency": "USDT", "minNotional": 5000.0, "maxNotional": 10000.0, @@ -2566,6 +3550,7 @@ }, { "tier": 3.0, + "symbol": "AERGO/USDT:USDT", "currency": "USDT", "minNotional": 10000.0, "maxNotional": 20000.0, @@ -2582,6 +3567,7 @@ }, { "tier": 4.0, + "symbol": "AERGO/USDT:USDT", "currency": "USDT", "minNotional": 20000.0, "maxNotional": 40000.0, @@ -2598,6 +3584,7 @@ }, { "tier": 5.0, + "symbol": "AERGO/USDT:USDT", "currency": "USDT", "minNotional": 40000.0, "maxNotional": 200000.0, @@ -2614,6 +3601,7 @@ }, { "tier": 6.0, + "symbol": "AERGO/USDT:USDT", "currency": "USDT", "minNotional": 200000.0, "maxNotional": 400000.0, @@ -2630,6 +3618,7 @@ }, { "tier": 7.0, + "symbol": "AERGO/USDT:USDT", "currency": "USDT", "minNotional": 400000.0, "maxNotional": 500000.0, @@ -2646,6 +3635,7 @@ }, { "tier": 8.0, + "symbol": "AERGO/USDT:USDT", "currency": "USDT", "minNotional": 500000.0, "maxNotional": 1000000.0, @@ -2662,6 +3652,7 @@ }, { "tier": 9.0, + "symbol": "AERGO/USDT:USDT", "currency": "USDT", "minNotional": 1000000.0, "maxNotional": 2000000.0, @@ -2680,6 +3671,7 @@ "AEVO/USDT:USDT": [ { "tier": 1.0, + "symbol": "AEVO/USDT:USDT", "currency": "USDT", "minNotional": 0.0, "maxNotional": 5000.0, @@ -2696,6 +3688,7 @@ }, { "tier": 2.0, + "symbol": "AEVO/USDT:USDT", "currency": "USDT", "minNotional": 5000.0, "maxNotional": 50000.0, @@ -2712,6 +3705,7 @@ }, { "tier": 3.0, + "symbol": "AEVO/USDT:USDT", "currency": "USDT", "minNotional": 50000.0, "maxNotional": 100000.0, @@ -2728,6 +3722,7 @@ }, { "tier": 4.0, + "symbol": "AEVO/USDT:USDT", "currency": "USDT", "minNotional": 100000.0, "maxNotional": 1000000.0, @@ -2744,6 +3739,7 @@ }, { "tier": 5.0, + "symbol": "AEVO/USDT:USDT", "currency": "USDT", "minNotional": 1000000.0, "maxNotional": 2000000.0, @@ -2760,6 +3756,7 @@ }, { "tier": 6.0, + "symbol": "AEVO/USDT:USDT", "currency": "USDT", "minNotional": 2000000.0, "maxNotional": 2500000.0, @@ -2776,6 +3773,7 @@ }, { "tier": 7.0, + "symbol": "AEVO/USDT:USDT", "currency": "USDT", "minNotional": 2500000.0, "maxNotional": 5000000.0, @@ -2792,6 +3790,7 @@ }, { "tier": 8.0, + "symbol": "AEVO/USDT:USDT", "currency": "USDT", "minNotional": 5000000.0, "maxNotional": 10000000.0, @@ -2810,6 +3809,7 @@ "AGIX/USDT:USDT": [ { "tier": 1.0, + "symbol": "AGIX/USDT:USDT", "currency": "USDT", "minNotional": 0.0, "maxNotional": 5000.0, @@ -2826,6 +3826,7 @@ }, { "tier": 2.0, + "symbol": "AGIX/USDT:USDT", "currency": "USDT", "minNotional": 5000.0, "maxNotional": 25000.0, @@ -2842,6 +3843,7 @@ }, { "tier": 3.0, + "symbol": "AGIX/USDT:USDT", "currency": "USDT", "minNotional": 25000.0, "maxNotional": 600000.0, @@ -2858,6 +3860,7 @@ }, { "tier": 4.0, + "symbol": "AGIX/USDT:USDT", "currency": "USDT", "minNotional": 600000.0, "maxNotional": 1600000.0, @@ -2874,6 +3877,7 @@ }, { "tier": 5.0, + "symbol": "AGIX/USDT:USDT", "currency": "USDT", "minNotional": 1600000.0, "maxNotional": 2000000.0, @@ -2890,6 +3894,7 @@ }, { "tier": 6.0, + "symbol": "AGIX/USDT:USDT", "currency": "USDT", "minNotional": 2000000.0, "maxNotional": 6000000.0, @@ -2906,6 +3911,7 @@ }, { "tier": 7.0, + "symbol": "AGIX/USDT:USDT", "currency": "USDT", "minNotional": 6000000.0, "maxNotional": 6500000.0, @@ -2924,6 +3930,7 @@ "AGLD/USDT:USDT": [ { "tier": 1.0, + "symbol": "AGLD/USDT:USDT", "currency": "USDT", "minNotional": 0.0, "maxNotional": 5000.0, @@ -2940,6 +3947,7 @@ }, { "tier": 2.0, + "symbol": "AGLD/USDT:USDT", "currency": "USDT", "minNotional": 5000.0, "maxNotional": 25000.0, @@ -2956,6 +3964,7 @@ }, { "tier": 3.0, + "symbol": "AGLD/USDT:USDT", "currency": "USDT", "minNotional": 25000.0, "maxNotional": 200000.0, @@ -2972,6 +3981,7 @@ }, { "tier": 4.0, + "symbol": "AGLD/USDT:USDT", "currency": "USDT", "minNotional": 200000.0, "maxNotional": 500000.0, @@ -2988,6 +3998,7 @@ }, { "tier": 5.0, + "symbol": "AGLD/USDT:USDT", "currency": "USDT", "minNotional": 500000.0, "maxNotional": 1000000.0, @@ -3004,6 +4015,7 @@ }, { "tier": 6.0, + "symbol": "AGLD/USDT:USDT", "currency": "USDT", "minNotional": 1000000.0, "maxNotional": 3000000.0, @@ -3020,6 +4032,7 @@ }, { "tier": 7.0, + "symbol": "AGLD/USDT:USDT", "currency": "USDT", "minNotional": 3000000.0, "maxNotional": 5000000.0, @@ -3038,6 +4051,7 @@ "AI/USDT:USDT": [ { "tier": 1.0, + "symbol": "AI/USDT:USDT", "currency": "USDT", "minNotional": 0.0, "maxNotional": 5000.0, @@ -3054,6 +4068,7 @@ }, { "tier": 2.0, + "symbol": "AI/USDT:USDT", "currency": "USDT", "minNotional": 5000.0, "maxNotional": 25000.0, @@ -3070,6 +4085,7 @@ }, { "tier": 3.0, + "symbol": "AI/USDT:USDT", "currency": "USDT", "minNotional": 25000.0, "maxNotional": 80000.0, @@ -3086,6 +4102,7 @@ }, { "tier": 4.0, + "symbol": "AI/USDT:USDT", "currency": "USDT", "minNotional": 80000.0, "maxNotional": 800000.0, @@ -3102,6 +4119,7 @@ }, { "tier": 5.0, + "symbol": "AI/USDT:USDT", "currency": "USDT", "minNotional": 800000.0, "maxNotional": 1600000.0, @@ -3118,6 +4136,7 @@ }, { "tier": 6.0, + "symbol": "AI/USDT:USDT", "currency": "USDT", "minNotional": 1600000.0, "maxNotional": 2000000.0, @@ -3134,6 +4153,7 @@ }, { "tier": 7.0, + "symbol": "AI/USDT:USDT", "currency": "USDT", "minNotional": 2000000.0, "maxNotional": 4000000.0, @@ -3150,6 +4170,7 @@ }, { "tier": 8.0, + "symbol": "AI/USDT:USDT", "currency": "USDT", "minNotional": 4000000.0, "maxNotional": 8000000.0, @@ -3165,9 +4186,165 @@ } } ], + "AKT/USDT:USDT": [ + { + "tier": 1.0, + "symbol": "AKT/USDT:USDT", + "currency": "USDT", + "minNotional": 0.0, + "maxNotional": 5000.0, + "maintenanceMarginRate": 0.01, + "maxLeverage": 75.0, + "info": { + "bracket": "1", + "initialLeverage": "75", + "notionalCap": "5000", + "notionalFloor": "0", + "maintMarginRatio": "0.01", + "cum": "0.0" + } + }, + { + "tier": 2.0, + "symbol": "AKT/USDT:USDT", + "currency": "USDT", + "minNotional": 5000.0, + "maxNotional": 10000.0, + "maintenanceMarginRate": 0.015, + "maxLeverage": 50.0, + "info": { + "bracket": "2", + "initialLeverage": "50", + "notionalCap": "10000", + "notionalFloor": "5000", + "maintMarginRatio": "0.015", + "cum": "25.0" + } + }, + { + "tier": 3.0, + "symbol": "AKT/USDT:USDT", + "currency": "USDT", + "minNotional": 10000.0, + "maxNotional": 30000.0, + "maintenanceMarginRate": 0.02, + "maxLeverage": 25.0, + "info": { + "bracket": "3", + "initialLeverage": "25", + "notionalCap": "30000", + "notionalFloor": "10000", + "maintMarginRatio": "0.02", + "cum": "75.0" + } + }, + { + "tier": 4.0, + "symbol": "AKT/USDT:USDT", + "currency": "USDT", + "minNotional": 30000.0, + "maxNotional": 60000.0, + "maintenanceMarginRate": 0.025, + "maxLeverage": 20.0, + "info": { + "bracket": "4", + "initialLeverage": "20", + "notionalCap": "60000", + "notionalFloor": "30000", + "maintMarginRatio": "0.025", + "cum": "225.0" + } + }, + { + "tier": 5.0, + "symbol": "AKT/USDT:USDT", + "currency": "USDT", + "minNotional": 60000.0, + "maxNotional": 300000.0, + "maintenanceMarginRate": 0.05, + "maxLeverage": 10.0, + "info": { + "bracket": "5", + "initialLeverage": "10", + "notionalCap": "300000", + "notionalFloor": "60000", + "maintMarginRatio": "0.05", + "cum": "1725.0" + } + }, + { + "tier": 6.0, + "symbol": "AKT/USDT:USDT", + "currency": "USDT", + "minNotional": 300000.0, + "maxNotional": 600000.0, + "maintenanceMarginRate": 0.1, + "maxLeverage": 5.0, + "info": { + "bracket": "6", + "initialLeverage": "5", + "notionalCap": "600000", + "notionalFloor": "300000", + "maintMarginRatio": "0.1", + "cum": "16725.0" + } + }, + { + "tier": 7.0, + "symbol": "AKT/USDT:USDT", + "currency": "USDT", + "minNotional": 600000.0, + "maxNotional": 750000.0, + "maintenanceMarginRate": 0.125, + "maxLeverage": 4.0, + "info": { + "bracket": "7", + "initialLeverage": "4", + "notionalCap": "750000", + "notionalFloor": "600000", + "maintMarginRatio": "0.125", + "cum": "31725.0" + } + }, + { + "tier": 8.0, + "symbol": "AKT/USDT:USDT", + "currency": "USDT", + "minNotional": 750000.0, + "maxNotional": 1500000.0, + "maintenanceMarginRate": 0.25, + "maxLeverage": 2.0, + "info": { + "bracket": "8", + "initialLeverage": "2", + "notionalCap": "1500000", + "notionalFloor": "750000", + "maintMarginRatio": "0.25", + "cum": "125475.0" + } + }, + { + "tier": 9.0, + "symbol": "AKT/USDT:USDT", + "currency": "USDT", + "minNotional": 1500000.0, + "maxNotional": 3000000.0, + "maintenanceMarginRate": 0.5, + "maxLeverage": 1.0, + "info": { + "bracket": "9", + "initialLeverage": "1", + "notionalCap": "3000000", + "notionalFloor": "1500000", + "maintMarginRatio": "0.5", + "cum": "500475.0" + } + } + ], "ALGO/USDT:USDT": [ { "tier": 1.0, + "symbol": "ALGO/USDT:USDT", "currency": "USDT", "minNotional": 0.0, "maxNotional": 5000.0, @@ -3184,6 +4361,7 @@ }, { "tier": 2.0, + "symbol": "ALGO/USDT:USDT", "currency": "USDT", "minNotional": 5000.0, "maxNotional": 25000.0, @@ -3200,6 +4378,7 @@ }, { "tier": 3.0, + "symbol": "ALGO/USDT:USDT", "currency": "USDT", "minNotional": 25000.0, "maxNotional": 100000.0, @@ -3216,6 +4395,7 @@ }, { "tier": 4.0, + "symbol": "ALGO/USDT:USDT", "currency": "USDT", "minNotional": 100000.0, "maxNotional": 250000.0, @@ -3232,6 +4412,7 @@ }, { "tier": 5.0, + "symbol": "ALGO/USDT:USDT", "currency": "USDT", "minNotional": 250000.0, "maxNotional": 1000000.0, @@ -3248,6 +4429,7 @@ }, { "tier": 6.0, + "symbol": "ALGO/USDT:USDT", "currency": "USDT", "minNotional": 1000000.0, "maxNotional": 2000000.0, @@ -3264,6 +4446,7 @@ }, { "tier": 7.0, + "symbol": "ALGO/USDT:USDT", "currency": "USDT", "minNotional": 2000000.0, "maxNotional": 5000000.0, @@ -3282,6 +4465,7 @@ "ALICE/USDT:USDT": [ { "tier": 1.0, + "symbol": "ALICE/USDT:USDT", "currency": "USDT", "minNotional": 0.0, "maxNotional": 5000.0, @@ -3298,6 +4482,7 @@ }, { "tier": 2.0, + "symbol": "ALICE/USDT:USDT", "currency": "USDT", "minNotional": 5000.0, "maxNotional": 20000.0, @@ -3314,6 +4499,7 @@ }, { "tier": 3.0, + "symbol": "ALICE/USDT:USDT", "currency": "USDT", "minNotional": 20000.0, "maxNotional": 25000.0, @@ -3330,6 +4516,7 @@ }, { "tier": 4.0, + "symbol": "ALICE/USDT:USDT", "currency": "USDT", "minNotional": 25000.0, "maxNotional": 200000.0, @@ -3346,6 +4533,7 @@ }, { "tier": 5.0, + "symbol": "ALICE/USDT:USDT", "currency": "USDT", "minNotional": 200000.0, "maxNotional": 400000.0, @@ -3362,6 +4550,7 @@ }, { "tier": 6.0, + "symbol": "ALICE/USDT:USDT", "currency": "USDT", "minNotional": 400000.0, "maxNotional": 500000.0, @@ -3378,6 +4567,7 @@ }, { "tier": 7.0, + "symbol": "ALICE/USDT:USDT", "currency": "USDT", "minNotional": 500000.0, "maxNotional": 1000000.0, @@ -3394,6 +4584,7 @@ }, { "tier": 8.0, + "symbol": "ALICE/USDT:USDT", "currency": "USDT", "minNotional": 1000000.0, "maxNotional": 2000000.0, @@ -3412,6 +4603,7 @@ "ALPACA/USDT:USDT": [ { "tier": 1.0, + "symbol": "ALPACA/USDT:USDT", "currency": "USDT", "minNotional": 0.0, "maxNotional": 5000.0, @@ -3428,6 +4620,7 @@ }, { "tier": 2.0, + "symbol": "ALPACA/USDT:USDT", "currency": "USDT", "minNotional": 5000.0, "maxNotional": 10000.0, @@ -3444,6 +4637,7 @@ }, { "tier": 3.0, + "symbol": "ALPACA/USDT:USDT", "currency": "USDT", "minNotional": 10000.0, "maxNotional": 20000.0, @@ -3460,6 +4654,7 @@ }, { "tier": 4.0, + "symbol": "ALPACA/USDT:USDT", "currency": "USDT", "minNotional": 20000.0, "maxNotional": 40000.0, @@ -3476,6 +4671,7 @@ }, { "tier": 5.0, + "symbol": "ALPACA/USDT:USDT", "currency": "USDT", "minNotional": 40000.0, "maxNotional": 200000.0, @@ -3492,6 +4688,7 @@ }, { "tier": 6.0, + "symbol": "ALPACA/USDT:USDT", "currency": "USDT", "minNotional": 200000.0, "maxNotional": 400000.0, @@ -3508,6 +4705,7 @@ }, { "tier": 7.0, + "symbol": "ALPACA/USDT:USDT", "currency": "USDT", "minNotional": 400000.0, "maxNotional": 500000.0, @@ -3524,6 +4722,7 @@ }, { "tier": 8.0, + "symbol": "ALPACA/USDT:USDT", "currency": "USDT", "minNotional": 500000.0, "maxNotional": 1000000.0, @@ -3540,6 +4739,7 @@ }, { "tier": 9.0, + "symbol": "ALPACA/USDT:USDT", "currency": "USDT", "minNotional": 1000000.0, "maxNotional": 2000000.0, @@ -3558,6 +4758,7 @@ "ALPHA/USDT:USDT": [ { "tier": 1.0, + "symbol": "ALPHA/USDT:USDT", "currency": "USDT", "minNotional": 0.0, "maxNotional": 5000.0, @@ -3574,6 +4775,7 @@ }, { "tier": 2.0, + "symbol": "ALPHA/USDT:USDT", "currency": "USDT", "minNotional": 5000.0, "maxNotional": 20000.0, @@ -3590,6 +4792,7 @@ }, { "tier": 3.0, + "symbol": "ALPHA/USDT:USDT", "currency": "USDT", "minNotional": 20000.0, "maxNotional": 25000.0, @@ -3606,6 +4809,7 @@ }, { "tier": 4.0, + "symbol": "ALPHA/USDT:USDT", "currency": "USDT", "minNotional": 25000.0, "maxNotional": 200000.0, @@ -3622,6 +4826,7 @@ }, { "tier": 5.0, + "symbol": "ALPHA/USDT:USDT", "currency": "USDT", "minNotional": 200000.0, "maxNotional": 400000.0, @@ -3638,6 +4843,7 @@ }, { "tier": 6.0, + "symbol": "ALPHA/USDT:USDT", "currency": "USDT", "minNotional": 400000.0, "maxNotional": 500000.0, @@ -3654,6 +4860,7 @@ }, { "tier": 7.0, + "symbol": "ALPHA/USDT:USDT", "currency": "USDT", "minNotional": 500000.0, "maxNotional": 1000000.0, @@ -3670,6 +4877,7 @@ }, { "tier": 8.0, + "symbol": "ALPHA/USDT:USDT", "currency": "USDT", "minNotional": 1000000.0, "maxNotional": 2000000.0, @@ -3688,6 +4896,7 @@ "ALT/USDT:USDT": [ { "tier": 1.0, + "symbol": "ALT/USDT:USDT", "currency": "USDT", "minNotional": 0.0, "maxNotional": 5000.0, @@ -3704,6 +4913,7 @@ }, { "tier": 2.0, + "symbol": "ALT/USDT:USDT", "currency": "USDT", "minNotional": 5000.0, "maxNotional": 16000.0, @@ -3720,6 +4930,7 @@ }, { "tier": 3.0, + "symbol": "ALT/USDT:USDT", "currency": "USDT", "minNotional": 16000.0, "maxNotional": 80000.0, @@ -3736,6 +4947,7 @@ }, { "tier": 4.0, + "symbol": "ALT/USDT:USDT", "currency": "USDT", "minNotional": 80000.0, "maxNotional": 160000.0, @@ -3752,6 +4964,7 @@ }, { "tier": 5.0, + "symbol": "ALT/USDT:USDT", "currency": "USDT", "minNotional": 160000.0, "maxNotional": 800000.0, @@ -3768,6 +4981,7 @@ }, { "tier": 6.0, + "symbol": "ALT/USDT:USDT", "currency": "USDT", "minNotional": 800000.0, "maxNotional": 1600000.0, @@ -3784,6 +4998,7 @@ }, { "tier": 7.0, + "symbol": "ALT/USDT:USDT", "currency": "USDT", "minNotional": 1600000.0, "maxNotional": 2000000.0, @@ -3800,6 +5015,7 @@ }, { "tier": 8.0, + "symbol": "ALT/USDT:USDT", "currency": "USDT", "minNotional": 2000000.0, "maxNotional": 4000000.0, @@ -3816,6 +5032,7 @@ }, { "tier": 9.0, + "symbol": "ALT/USDT:USDT", "currency": "USDT", "minNotional": 4000000.0, "maxNotional": 8000000.0, @@ -3834,6 +5051,7 @@ "AMB/USDT:USDT": [ { "tier": 1.0, + "symbol": "AMB/USDT:USDT", "currency": "USDT", "minNotional": 0.0, "maxNotional": 5000.0, @@ -3850,6 +5068,7 @@ }, { "tier": 2.0, + "symbol": "AMB/USDT:USDT", "currency": "USDT", "minNotional": 5000.0, "maxNotional": 25000.0, @@ -3866,6 +5085,7 @@ }, { "tier": 3.0, + "symbol": "AMB/USDT:USDT", "currency": "USDT", "minNotional": 25000.0, "maxNotional": 200000.0, @@ -3882,6 +5102,7 @@ }, { "tier": 4.0, + "symbol": "AMB/USDT:USDT", "currency": "USDT", "minNotional": 200000.0, "maxNotional": 500000.0, @@ -3898,6 +5119,7 @@ }, { "tier": 5.0, + "symbol": "AMB/USDT:USDT", "currency": "USDT", "minNotional": 500000.0, "maxNotional": 1000000.0, @@ -3914,6 +5136,7 @@ }, { "tier": 6.0, + "symbol": "AMB/USDT:USDT", "currency": "USDT", "minNotional": 1000000.0, "maxNotional": 3000000.0, @@ -3930,6 +5153,7 @@ }, { "tier": 7.0, + "symbol": "AMB/USDT:USDT", "currency": "USDT", "minNotional": 3000000.0, "maxNotional": 5000000.0, @@ -3948,6 +5172,7 @@ "ANKR/USDT:USDT": [ { "tier": 1.0, + "symbol": "ANKR/USDT:USDT", "currency": "USDT", "minNotional": 0.0, "maxNotional": 5000.0, @@ -3964,6 +5189,7 @@ }, { "tier": 2.0, + "symbol": "ANKR/USDT:USDT", "currency": "USDT", "minNotional": 5000.0, "maxNotional": 25000.0, @@ -3980,6 +5206,7 @@ }, { "tier": 3.0, + "symbol": "ANKR/USDT:USDT", "currency": "USDT", "minNotional": 25000.0, "maxNotional": 400000.0, @@ -3996,6 +5223,7 @@ }, { "tier": 4.0, + "symbol": "ANKR/USDT:USDT", "currency": "USDT", "minNotional": 400000.0, "maxNotional": 1000000.0, @@ -4012,6 +5240,7 @@ }, { "tier": 5.0, + "symbol": "ANKR/USDT:USDT", "currency": "USDT", "minNotional": 1000000.0, "maxNotional": 2000000.0, @@ -4028,6 +5257,7 @@ }, { "tier": 6.0, + "symbol": "ANKR/USDT:USDT", "currency": "USDT", "minNotional": 2000000.0, "maxNotional": 6000000.0, @@ -4044,6 +5274,7 @@ }, { "tier": 7.0, + "symbol": "ANKR/USDT:USDT", "currency": "USDT", "minNotional": 6000000.0, "maxNotional": 10000000.0, @@ -4062,6 +5293,7 @@ "APE/USDT:USDT": [ { "tier": 1.0, + "symbol": "APE/USDT:USDT", "currency": "USDT", "minNotional": 0.0, "maxNotional": 25000.0, @@ -4078,6 +5310,7 @@ }, { "tier": 2.0, + "symbol": "APE/USDT:USDT", "currency": "USDT", "minNotional": 25000.0, "maxNotional": 50000.0, @@ -4094,6 +5327,7 @@ }, { "tier": 3.0, + "symbol": "APE/USDT:USDT", "currency": "USDT", "minNotional": 50000.0, "maxNotional": 100000.0, @@ -4110,6 +5344,7 @@ }, { "tier": 4.0, + "symbol": "APE/USDT:USDT", "currency": "USDT", "minNotional": 100000.0, "maxNotional": 500000.0, @@ -4126,6 +5361,7 @@ }, { "tier": 5.0, + "symbol": "APE/USDT:USDT", "currency": "USDT", "minNotional": 500000.0, "maxNotional": 1000000.0, @@ -4142,6 +5378,7 @@ }, { "tier": 6.0, + "symbol": "APE/USDT:USDT", "currency": "USDT", "minNotional": 1000000.0, "maxNotional": 5000000.0, @@ -4158,6 +5395,7 @@ }, { "tier": 7.0, + "symbol": "APE/USDT:USDT", "currency": "USDT", "minNotional": 5000000.0, "maxNotional": 10000000.0, @@ -4174,6 +5412,7 @@ }, { "tier": 8.0, + "symbol": "APE/USDT:USDT", "currency": "USDT", "minNotional": 10000000.0, "maxNotional": 12500000.0, @@ -4190,6 +5429,7 @@ }, { "tier": 9.0, + "symbol": "APE/USDT:USDT", "currency": "USDT", "minNotional": 12500000.0, "maxNotional": 25000000.0, @@ -4206,6 +5446,7 @@ }, { "tier": 10.0, + "symbol": "APE/USDT:USDT", "currency": "USDT", "minNotional": 25000000.0, "maxNotional": 50000000.0, @@ -4224,6 +5465,7 @@ "API3/USDT:USDT": [ { "tier": 1.0, + "symbol": "API3/USDT:USDT", "currency": "USDT", "minNotional": 0.0, "maxNotional": 5000.0, @@ -4240,6 +5482,7 @@ }, { "tier": 2.0, + "symbol": "API3/USDT:USDT", "currency": "USDT", "minNotional": 5000.0, "maxNotional": 25000.0, @@ -4256,6 +5499,7 @@ }, { "tier": 3.0, + "symbol": "API3/USDT:USDT", "currency": "USDT", "minNotional": 25000.0, "maxNotional": 100000.0, @@ -4272,6 +5516,7 @@ }, { "tier": 4.0, + "symbol": "API3/USDT:USDT", "currency": "USDT", "minNotional": 100000.0, "maxNotional": 500000.0, @@ -4288,6 +5533,7 @@ }, { "tier": 5.0, + "symbol": "API3/USDT:USDT", "currency": "USDT", "minNotional": 500000.0, "maxNotional": 1600000.0, @@ -4304,6 +5550,7 @@ }, { "tier": 6.0, + "symbol": "API3/USDT:USDT", "currency": "USDT", "minNotional": 1600000.0, "maxNotional": 2000000.0, @@ -4320,6 +5567,7 @@ }, { "tier": 7.0, + "symbol": "API3/USDT:USDT", "currency": "USDT", "minNotional": 2000000.0, "maxNotional": 3000000.0, @@ -4336,6 +5584,7 @@ }, { "tier": 8.0, + "symbol": "API3/USDT:USDT", "currency": "USDT", "minNotional": 3000000.0, "maxNotional": 4000000.0, @@ -4354,6 +5603,7 @@ "APT/USDT:USDT": [ { "tier": 1.0, + "symbol": "APT/USDT:USDT", "currency": "USDT", "minNotional": 0.0, "maxNotional": 10000.0, @@ -4370,6 +5620,7 @@ }, { "tier": 2.0, + "symbol": "APT/USDT:USDT", "currency": "USDT", "minNotional": 10000.0, "maxNotional": 100000.0, @@ -4386,6 +5637,7 @@ }, { "tier": 3.0, + "symbol": "APT/USDT:USDT", "currency": "USDT", "minNotional": 100000.0, "maxNotional": 900000.0, @@ -4402,6 +5654,7 @@ }, { "tier": 4.0, + "symbol": "APT/USDT:USDT", "currency": "USDT", "minNotional": 900000.0, "maxNotional": 1100000.0, @@ -4418,6 +5671,7 @@ }, { "tier": 5.0, + "symbol": "APT/USDT:USDT", "currency": "USDT", "minNotional": 1100000.0, "maxNotional": 5000000.0, @@ -4434,6 +5688,7 @@ }, { "tier": 6.0, + "symbol": "APT/USDT:USDT", "currency": "USDT", "minNotional": 5000000.0, "maxNotional": 10000000.0, @@ -4450,6 +5705,7 @@ }, { "tier": 7.0, + "symbol": "APT/USDT:USDT", "currency": "USDT", "minNotional": 10000000.0, "maxNotional": 12500000.0, @@ -4466,6 +5722,7 @@ }, { "tier": 8.0, + "symbol": "APT/USDT:USDT", "currency": "USDT", "minNotional": 12500000.0, "maxNotional": 25000000.0, @@ -4482,6 +5739,7 @@ }, { "tier": 9.0, + "symbol": "APT/USDT:USDT", "currency": "USDT", "minNotional": 25000000.0, "maxNotional": 50000000.0, @@ -4500,6 +5758,7 @@ "AR/USDT:USDT": [ { "tier": 1.0, + "symbol": "AR/USDT:USDT", "currency": "USDT", "minNotional": 0.0, "maxNotional": 10000.0, @@ -4516,6 +5775,7 @@ }, { "tier": 2.0, + "symbol": "AR/USDT:USDT", "currency": "USDT", "minNotional": 10000.0, "maxNotional": 20000.0, @@ -4532,6 +5792,7 @@ }, { "tier": 3.0, + "symbol": "AR/USDT:USDT", "currency": "USDT", "minNotional": 20000.0, "maxNotional": 100000.0, @@ -4548,6 +5809,7 @@ }, { "tier": 4.0, + "symbol": "AR/USDT:USDT", "currency": "USDT", "minNotional": 100000.0, "maxNotional": 200000.0, @@ -4564,6 +5826,7 @@ }, { "tier": 5.0, + "symbol": "AR/USDT:USDT", "currency": "USDT", "minNotional": 200000.0, "maxNotional": 1000000.0, @@ -4580,6 +5843,7 @@ }, { "tier": 6.0, + "symbol": "AR/USDT:USDT", "currency": "USDT", "minNotional": 1000000.0, "maxNotional": 2000000.0, @@ -4596,6 +5860,7 @@ }, { "tier": 7.0, + "symbol": "AR/USDT:USDT", "currency": "USDT", "minNotional": 2000000.0, "maxNotional": 2500000.0, @@ -4612,6 +5877,7 @@ }, { "tier": 8.0, + "symbol": "AR/USDT:USDT", "currency": "USDT", "minNotional": 2500000.0, "maxNotional": 5000000.0, @@ -4628,6 +5894,7 @@ }, { "tier": 9.0, + "symbol": "AR/USDT:USDT", "currency": "USDT", "minNotional": 5000000.0, "maxNotional": 10000000.0, @@ -4646,6 +5913,7 @@ "ARB/USDC:USDC": [ { "tier": 1.0, + "symbol": "ARB/USDC:USDC", "currency": "USDC", "minNotional": 0.0, "maxNotional": 5000.0, @@ -4662,6 +5930,7 @@ }, { "tier": 2.0, + "symbol": "ARB/USDC:USDC", "currency": "USDC", "minNotional": 5000.0, "maxNotional": 50000.0, @@ -4678,6 +5947,7 @@ }, { "tier": 3.0, + "symbol": "ARB/USDC:USDC", "currency": "USDC", "minNotional": 50000.0, "maxNotional": 600000.0, @@ -4694,6 +5964,7 @@ }, { "tier": 4.0, + "symbol": "ARB/USDC:USDC", "currency": "USDC", "minNotional": 600000.0, "maxNotional": 1200000.0, @@ -4710,6 +5981,7 @@ }, { "tier": 5.0, + "symbol": "ARB/USDC:USDC", "currency": "USDC", "minNotional": 1200000.0, "maxNotional": 3000000.0, @@ -4726,6 +5998,7 @@ }, { "tier": 6.0, + "symbol": "ARB/USDC:USDC", "currency": "USDC", "minNotional": 3000000.0, "maxNotional": 5000000.0, @@ -4742,6 +6015,7 @@ }, { "tier": 7.0, + "symbol": "ARB/USDC:USDC", "currency": "USDC", "minNotional": 5000000.0, "maxNotional": 12000000.0, @@ -4758,6 +6032,7 @@ }, { "tier": 8.0, + "symbol": "ARB/USDC:USDC", "currency": "USDC", "minNotional": 12000000.0, "maxNotional": 20000000.0, @@ -4776,6 +6051,7 @@ "ARB/USDT:USDT": [ { "tier": 1.0, + "symbol": "ARB/USDT:USDT", "currency": "USDT", "minNotional": 0.0, "maxNotional": 5000.0, @@ -4792,6 +6068,7 @@ }, { "tier": 2.0, + "symbol": "ARB/USDT:USDT", "currency": "USDT", "minNotional": 5000.0, "maxNotional": 50000.0, @@ -4808,6 +6085,7 @@ }, { "tier": 3.0, + "symbol": "ARB/USDT:USDT", "currency": "USDT", "minNotional": 50000.0, "maxNotional": 80000.0, @@ -4824,6 +6102,7 @@ }, { "tier": 4.0, + "symbol": "ARB/USDT:USDT", "currency": "USDT", "minNotional": 80000.0, "maxNotional": 300000.0, @@ -4840,6 +6119,7 @@ }, { "tier": 5.0, + "symbol": "ARB/USDT:USDT", "currency": "USDT", "minNotional": 300000.0, "maxNotional": 600000.0, @@ -4856,6 +6136,7 @@ }, { "tier": 6.0, + "symbol": "ARB/USDT:USDT", "currency": "USDT", "minNotional": 600000.0, "maxNotional": 3000000.0, @@ -4872,6 +6153,7 @@ }, { "tier": 7.0, + "symbol": "ARB/USDT:USDT", "currency": "USDT", "minNotional": 3000000.0, "maxNotional": 6000000.0, @@ -4888,6 +6170,7 @@ }, { "tier": 8.0, + "symbol": "ARB/USDT:USDT", "currency": "USDT", "minNotional": 6000000.0, "maxNotional": 7500000.0, @@ -4904,6 +6187,7 @@ }, { "tier": 9.0, + "symbol": "ARB/USDT:USDT", "currency": "USDT", "minNotional": 7500000.0, "maxNotional": 15000000.0, @@ -4920,6 +6204,7 @@ }, { "tier": 10.0, + "symbol": "ARB/USDT:USDT", "currency": "USDT", "minNotional": 15000000.0, "maxNotional": 30000000.0, @@ -4938,6 +6223,7 @@ "ARK/USDT:USDT": [ { "tier": 1.0, + "symbol": "ARK/USDT:USDT", "currency": "USDT", "minNotional": 0.0, "maxNotional": 5000.0, @@ -4954,6 +6240,7 @@ }, { "tier": 2.0, + "symbol": "ARK/USDT:USDT", "currency": "USDT", "minNotional": 5000.0, "maxNotional": 10000.0, @@ -4970,6 +6257,7 @@ }, { "tier": 3.0, + "symbol": "ARK/USDT:USDT", "currency": "USDT", "minNotional": 10000.0, "maxNotional": 20000.0, @@ -4986,6 +6274,7 @@ }, { "tier": 4.0, + "symbol": "ARK/USDT:USDT", "currency": "USDT", "minNotional": 20000.0, "maxNotional": 40000.0, @@ -5002,6 +6291,7 @@ }, { "tier": 5.0, + "symbol": "ARK/USDT:USDT", "currency": "USDT", "minNotional": 40000.0, "maxNotional": 200000.0, @@ -5018,6 +6308,7 @@ }, { "tier": 6.0, + "symbol": "ARK/USDT:USDT", "currency": "USDT", "minNotional": 200000.0, "maxNotional": 500000.0, @@ -5034,6 +6325,7 @@ }, { "tier": 7.0, + "symbol": "ARK/USDT:USDT", "currency": "USDT", "minNotional": 500000.0, "maxNotional": 1000000.0, @@ -5050,6 +6342,7 @@ }, { "tier": 8.0, + "symbol": "ARK/USDT:USDT", "currency": "USDT", "minNotional": 1000000.0, "maxNotional": 3000000.0, @@ -5066,6 +6359,7 @@ }, { "tier": 9.0, + "symbol": "ARK/USDT:USDT", "currency": "USDT", "minNotional": 3000000.0, "maxNotional": 5000000.0, @@ -5084,6 +6378,7 @@ "ARKM/USDT:USDT": [ { "tier": 1.0, + "symbol": "ARKM/USDT:USDT", "currency": "USDT", "minNotional": 0.0, "maxNotional": 10000.0, @@ -5100,15 +6395,16 @@ }, { "tier": 2.0, + "symbol": "ARKM/USDT:USDT", "currency": "USDT", "minNotional": 10000.0, - "maxNotional": 20000.0, + "maxNotional": 30000.0, "maintenanceMarginRate": 0.015, "maxLeverage": 50.0, "info": { "bracket": "2", "initialLeverage": "50", - "notionalCap": "20000", + "notionalCap": "30000", "notionalFloor": "10000", "maintMarginRatio": "0.015", "cum": "50.0" @@ -5116,120 +6412,128 @@ }, { "tier": 3.0, + "symbol": "ARKM/USDT:USDT", "currency": "USDT", - "minNotional": 20000.0, - "maxNotional": 100000.0, + "minNotional": 30000.0, + "maxNotional": 150000.0, "maintenanceMarginRate": 0.02, "maxLeverage": 25.0, "info": { "bracket": "3", "initialLeverage": "25", - "notionalCap": "100000", - "notionalFloor": "20000", + "notionalCap": "150000", + "notionalFloor": "30000", "maintMarginRatio": "0.02", - "cum": "150.0" + "cum": "200.0" } }, { "tier": 4.0, + "symbol": "ARKM/USDT:USDT", "currency": "USDT", - "minNotional": 100000.0, - "maxNotional": 200000.0, + "minNotional": 150000.0, + "maxNotional": 300000.0, "maintenanceMarginRate": 0.025, "maxLeverage": 20.0, "info": { "bracket": "4", "initialLeverage": "20", - "notionalCap": "200000", - "notionalFloor": "100000", + "notionalCap": "300000", + "notionalFloor": "150000", "maintMarginRatio": "0.025", - "cum": "650.0" + "cum": "950.0" } }, { "tier": 5.0, + "symbol": "ARKM/USDT:USDT", "currency": "USDT", - "minNotional": 200000.0, - "maxNotional": 1000000.0, + "minNotional": 300000.0, + "maxNotional": 1500000.0, "maintenanceMarginRate": 0.05, "maxLeverage": 10.0, "info": { "bracket": "5", "initialLeverage": "10", - "notionalCap": "1000000", - "notionalFloor": "200000", + "notionalCap": "1500000", + "notionalFloor": "300000", "maintMarginRatio": "0.05", - "cum": "5650.0" + "cum": "8450.0" } }, { "tier": 6.0, + "symbol": "ARKM/USDT:USDT", "currency": "USDT", - "minNotional": 1000000.0, - "maxNotional": 2000000.0, + "minNotional": 1500000.0, + "maxNotional": 3000000.0, "maintenanceMarginRate": 0.1, "maxLeverage": 5.0, "info": { "bracket": "6", "initialLeverage": "5", - "notionalCap": "2000000", - "notionalFloor": "1000000", + "notionalCap": "3000000", + "notionalFloor": "1500000", "maintMarginRatio": "0.1", - "cum": "55650.0" + "cum": "83450.0" } }, { "tier": 7.0, + "symbol": "ARKM/USDT:USDT", "currency": "USDT", - "minNotional": 2000000.0, - "maxNotional": 2500000.0, + "minNotional": 3000000.0, + "maxNotional": 3750000.0, "maintenanceMarginRate": 0.125, "maxLeverage": 4.0, "info": { "bracket": "7", "initialLeverage": "4", - "notionalCap": "2500000", - "notionalFloor": "2000000", + "notionalCap": "3750000", + "notionalFloor": "3000000", "maintMarginRatio": "0.125", - "cum": "105650.0" + "cum": "158450.0" } }, { "tier": 8.0, + "symbol": "ARKM/USDT:USDT", "currency": "USDT", - "minNotional": 2500000.0, - "maxNotional": 5000000.0, + "minNotional": 3750000.0, + "maxNotional": 7500000.0, "maintenanceMarginRate": 0.25, "maxLeverage": 2.0, "info": { "bracket": "8", "initialLeverage": "2", - "notionalCap": "5000000", - "notionalFloor": "2500000", + "notionalCap": "7500000", + "notionalFloor": "3750000", "maintMarginRatio": "0.25", - "cum": "418150.0" + "cum": "627200.0" } }, { "tier": 9.0, + "symbol": "ARKM/USDT:USDT", "currency": "USDT", - "minNotional": 5000000.0, - "maxNotional": 10000000.0, + "minNotional": 7500000.0, + "maxNotional": 15000000.0, "maintenanceMarginRate": 0.5, "maxLeverage": 1.0, "info": { "bracket": "9", "initialLeverage": "1", - "notionalCap": "10000000", - "notionalFloor": "5000000", + "notionalCap": "15000000", + "notionalFloor": "7500000", "maintMarginRatio": "0.5", - "cum": "1668150.0" + "cum": "2502200.0" } } ], "ARPA/USDT:USDT": [ { "tier": 1.0, + "symbol": "ARPA/USDT:USDT", "currency": "USDT", "minNotional": 0.0, "maxNotional": 5000.0, @@ -5246,6 +6550,7 @@ }, { "tier": 2.0, + "symbol": "ARPA/USDT:USDT", "currency": "USDT", "minNotional": 5000.0, "maxNotional": 25000.0, @@ -5262,6 +6567,7 @@ }, { "tier": 3.0, + "symbol": "ARPA/USDT:USDT", "currency": "USDT", "minNotional": 25000.0, "maxNotional": 600000.0, @@ -5278,6 +6584,7 @@ }, { "tier": 4.0, + "symbol": "ARPA/USDT:USDT", "currency": "USDT", "minNotional": 600000.0, "maxNotional": 1600000.0, @@ -5294,6 +6601,7 @@ }, { "tier": 5.0, + "symbol": "ARPA/USDT:USDT", "currency": "USDT", "minNotional": 1600000.0, "maxNotional": 2000000.0, @@ -5310,6 +6618,7 @@ }, { "tier": 6.0, + "symbol": "ARPA/USDT:USDT", "currency": "USDT", "minNotional": 2000000.0, "maxNotional": 6000000.0, @@ -5326,6 +6635,7 @@ }, { "tier": 7.0, + "symbol": "ARPA/USDT:USDT", "currency": "USDT", "minNotional": 6000000.0, "maxNotional": 10000000.0, @@ -5344,6 +6654,7 @@ "ASTR/USDT:USDT": [ { "tier": 1.0, + "symbol": "ASTR/USDT:USDT", "currency": "USDT", "minNotional": 0.0, "maxNotional": 5000.0, @@ -5360,6 +6671,7 @@ }, { "tier": 2.0, + "symbol": "ASTR/USDT:USDT", "currency": "USDT", "minNotional": 5000.0, "maxNotional": 20000.0, @@ -5376,6 +6688,7 @@ }, { "tier": 3.0, + "symbol": "ASTR/USDT:USDT", "currency": "USDT", "minNotional": 20000.0, "maxNotional": 25000.0, @@ -5392,6 +6705,7 @@ }, { "tier": 4.0, + "symbol": "ASTR/USDT:USDT", "currency": "USDT", "minNotional": 25000.0, "maxNotional": 200000.0, @@ -5408,6 +6722,7 @@ }, { "tier": 5.0, + "symbol": "ASTR/USDT:USDT", "currency": "USDT", "minNotional": 200000.0, "maxNotional": 400000.0, @@ -5424,6 +6739,7 @@ }, { "tier": 6.0, + "symbol": "ASTR/USDT:USDT", "currency": "USDT", "minNotional": 400000.0, "maxNotional": 500000.0, @@ -5440,6 +6756,7 @@ }, { "tier": 7.0, + "symbol": "ASTR/USDT:USDT", "currency": "USDT", "minNotional": 500000.0, "maxNotional": 1000000.0, @@ -5456,6 +6773,7 @@ }, { "tier": 8.0, + "symbol": "ASTR/USDT:USDT", "currency": "USDT", "minNotional": 1000000.0, "maxNotional": 2000000.0, @@ -5474,6 +6792,7 @@ "ATA/USDT:USDT": [ { "tier": 1.0, + "symbol": "ATA/USDT:USDT", "currency": "USDT", "minNotional": 0.0, "maxNotional": 5000.0, @@ -5490,6 +6809,7 @@ }, { "tier": 2.0, + "symbol": "ATA/USDT:USDT", "currency": "USDT", "minNotional": 5000.0, "maxNotional": 25000.0, @@ -5506,6 +6826,7 @@ }, { "tier": 3.0, + "symbol": "ATA/USDT:USDT", "currency": "USDT", "minNotional": 25000.0, "maxNotional": 100000.0, @@ -5522,6 +6843,7 @@ }, { "tier": 4.0, + "symbol": "ATA/USDT:USDT", "currency": "USDT", "minNotional": 100000.0, "maxNotional": 250000.0, @@ -5538,6 +6860,7 @@ }, { "tier": 5.0, + "symbol": "ATA/USDT:USDT", "currency": "USDT", "minNotional": 250000.0, "maxNotional": 1000000.0, @@ -5554,6 +6877,7 @@ }, { "tier": 6.0, + "symbol": "ATA/USDT:USDT", "currency": "USDT", "minNotional": 1000000.0, "maxNotional": 3000000.0, @@ -5572,6 +6896,7 @@ "ATOM/USDT:USDT": [ { "tier": 1.0, + "symbol": "ATOM/USDT:USDT", "currency": "USDT", "minNotional": 0.0, "maxNotional": 10000.0, @@ -5588,6 +6913,7 @@ }, { "tier": 2.0, + "symbol": "ATOM/USDT:USDT", "currency": "USDT", "minNotional": 10000.0, "maxNotional": 50000.0, @@ -5604,6 +6930,7 @@ }, { "tier": 3.0, + "symbol": "ATOM/USDT:USDT", "currency": "USDT", "minNotional": 50000.0, "maxNotional": 80000.0, @@ -5620,6 +6947,7 @@ }, { "tier": 4.0, + "symbol": "ATOM/USDT:USDT", "currency": "USDT", "minNotional": 80000.0, "maxNotional": 200000.0, @@ -5636,6 +6964,7 @@ }, { "tier": 5.0, + "symbol": "ATOM/USDT:USDT", "currency": "USDT", "minNotional": 200000.0, "maxNotional": 600000.0, @@ -5652,6 +6981,7 @@ }, { "tier": 6.0, + "symbol": "ATOM/USDT:USDT", "currency": "USDT", "minNotional": 600000.0, "maxNotional": 2000000.0, @@ -5668,6 +6998,7 @@ }, { "tier": 7.0, + "symbol": "ATOM/USDT:USDT", "currency": "USDT", "minNotional": 2000000.0, "maxNotional": 4000000.0, @@ -5684,6 +7015,7 @@ }, { "tier": 8.0, + "symbol": "ATOM/USDT:USDT", "currency": "USDT", "minNotional": 4000000.0, "maxNotional": 5000000.0, @@ -5700,6 +7032,7 @@ }, { "tier": 9.0, + "symbol": "ATOM/USDT:USDT", "currency": "USDT", "minNotional": 5000000.0, "maxNotional": 12000000.0, @@ -5716,6 +7049,7 @@ }, { "tier": 10.0, + "symbol": "ATOM/USDT:USDT", "currency": "USDT", "minNotional": 12000000.0, "maxNotional": 20000000.0, @@ -5734,6 +7068,7 @@ "AUCTION/USDT:USDT": [ { "tier": 1.0, + "symbol": "AUCTION/USDT:USDT", "currency": "USDT", "minNotional": 0.0, "maxNotional": 5000.0, @@ -5750,6 +7085,7 @@ }, { "tier": 2.0, + "symbol": "AUCTION/USDT:USDT", "currency": "USDT", "minNotional": 5000.0, "maxNotional": 20000.0, @@ -5766,6 +7102,7 @@ }, { "tier": 3.0, + "symbol": "AUCTION/USDT:USDT", "currency": "USDT", "minNotional": 20000.0, "maxNotional": 30000.0, @@ -5782,6 +7119,7 @@ }, { "tier": 4.0, + "symbol": "AUCTION/USDT:USDT", "currency": "USDT", "minNotional": 30000.0, "maxNotional": 300000.0, @@ -5798,6 +7136,7 @@ }, { "tier": 5.0, + "symbol": "AUCTION/USDT:USDT", "currency": "USDT", "minNotional": 300000.0, "maxNotional": 600000.0, @@ -5814,6 +7153,7 @@ }, { "tier": 6.0, + "symbol": "AUCTION/USDT:USDT", "currency": "USDT", "minNotional": 600000.0, "maxNotional": 750000.0, @@ -5830,6 +7170,7 @@ }, { "tier": 7.0, + "symbol": "AUCTION/USDT:USDT", "currency": "USDT", "minNotional": 750000.0, "maxNotional": 1500000.0, @@ -5846,6 +7187,7 @@ }, { "tier": 8.0, + "symbol": "AUCTION/USDT:USDT", "currency": "USDT", "minNotional": 1500000.0, "maxNotional": 3000000.0, @@ -5864,6 +7206,7 @@ "AVAX/USDC:USDC": [ { "tier": 1.0, + "symbol": "AVAX/USDC:USDC", "currency": "USDC", "minNotional": 0.0, "maxNotional": 5000.0, @@ -5880,6 +7223,7 @@ }, { "tier": 2.0, + "symbol": "AVAX/USDC:USDC", "currency": "USDC", "minNotional": 5000.0, "maxNotional": 10000.0, @@ -5896,6 +7240,7 @@ }, { "tier": 3.0, + "symbol": "AVAX/USDC:USDC", "currency": "USDC", "minNotional": 10000.0, "maxNotional": 25000.0, @@ -5912,6 +7257,7 @@ }, { "tier": 4.0, + "symbol": "AVAX/USDC:USDC", "currency": "USDC", "minNotional": 25000.0, "maxNotional": 50000.0, @@ -5928,6 +7274,7 @@ }, { "tier": 5.0, + "symbol": "AVAX/USDC:USDC", "currency": "USDC", "minNotional": 50000.0, "maxNotional": 250000.0, @@ -5944,6 +7291,7 @@ }, { "tier": 6.0, + "symbol": "AVAX/USDC:USDC", "currency": "USDC", "minNotional": 250000.0, "maxNotional": 1000000.0, @@ -5960,6 +7308,7 @@ }, { "tier": 7.0, + "symbol": "AVAX/USDC:USDC", "currency": "USDC", "minNotional": 1000000.0, "maxNotional": 2000000.0, @@ -5976,6 +7325,7 @@ }, { "tier": 8.0, + "symbol": "AVAX/USDC:USDC", "currency": "USDC", "minNotional": 2000000.0, "maxNotional": 5000000.0, @@ -5992,6 +7342,7 @@ }, { "tier": 9.0, + "symbol": "AVAX/USDC:USDC", "currency": "USDC", "minNotional": 5000000.0, "maxNotional": 20000000.0, @@ -6008,6 +7359,7 @@ }, { "tier": 10.0, + "symbol": "AVAX/USDC:USDC", "currency": "USDC", "minNotional": 20000000.0, "maxNotional": 50000000.0, @@ -6026,6 +7378,7 @@ "AVAX/USDT:USDT": [ { "tier": 1.0, + "symbol": "AVAX/USDT:USDT", "currency": "USDT", "minNotional": 0.0, "maxNotional": 5000.0, @@ -6042,6 +7395,7 @@ }, { "tier": 2.0, + "symbol": "AVAX/USDT:USDT", "currency": "USDT", "minNotional": 5000.0, "maxNotional": 25000.0, @@ -6058,6 +7412,7 @@ }, { "tier": 3.0, + "symbol": "AVAX/USDT:USDT", "currency": "USDT", "minNotional": 25000.0, "maxNotional": 80000.0, @@ -6074,6 +7429,7 @@ }, { "tier": 4.0, + "symbol": "AVAX/USDT:USDT", "currency": "USDT", "minNotional": 80000.0, "maxNotional": 400000.0, @@ -6090,6 +7446,7 @@ }, { "tier": 5.0, + "symbol": "AVAX/USDT:USDT", "currency": "USDT", "minNotional": 400000.0, "maxNotional": 800000.0, @@ -6106,6 +7463,7 @@ }, { "tier": 6.0, + "symbol": "AVAX/USDT:USDT", "currency": "USDT", "minNotional": 800000.0, "maxNotional": 4000000.0, @@ -6122,6 +7480,7 @@ }, { "tier": 7.0, + "symbol": "AVAX/USDT:USDT", "currency": "USDT", "minNotional": 4000000.0, "maxNotional": 8000000.0, @@ -6138,6 +7497,7 @@ }, { "tier": 8.0, + "symbol": "AVAX/USDT:USDT", "currency": "USDT", "minNotional": 8000000.0, "maxNotional": 10000000.0, @@ -6154,6 +7514,7 @@ }, { "tier": 9.0, + "symbol": "AVAX/USDT:USDT", "currency": "USDT", "minNotional": 10000000.0, "maxNotional": 20000000.0, @@ -6170,6 +7531,7 @@ }, { "tier": 10.0, + "symbol": "AVAX/USDT:USDT", "currency": "USDT", "minNotional": 20000000.0, "maxNotional": 50000000.0, @@ -6188,6 +7550,7 @@ "AXL/USDT:USDT": [ { "tier": 1.0, + "symbol": "AXL/USDT:USDT", "currency": "USDT", "minNotional": 0.0, "maxNotional": 5000.0, @@ -6204,6 +7567,7 @@ }, { "tier": 2.0, + "symbol": "AXL/USDT:USDT", "currency": "USDT", "minNotional": 5000.0, "maxNotional": 10000.0, @@ -6220,6 +7584,7 @@ }, { "tier": 3.0, + "symbol": "AXL/USDT:USDT", "currency": "USDT", "minNotional": 10000.0, "maxNotional": 30000.0, @@ -6236,6 +7601,7 @@ }, { "tier": 4.0, + "symbol": "AXL/USDT:USDT", "currency": "USDT", "minNotional": 30000.0, "maxNotional": 60000.0, @@ -6252,6 +7618,7 @@ }, { "tier": 5.0, + "symbol": "AXL/USDT:USDT", "currency": "USDT", "minNotional": 60000.0, "maxNotional": 300000.0, @@ -6268,6 +7635,7 @@ }, { "tier": 6.0, + "symbol": "AXL/USDT:USDT", "currency": "USDT", "minNotional": 300000.0, "maxNotional": 600000.0, @@ -6284,6 +7652,7 @@ }, { "tier": 7.0, + "symbol": "AXL/USDT:USDT", "currency": "USDT", "minNotional": 600000.0, "maxNotional": 750000.0, @@ -6300,6 +7669,7 @@ }, { "tier": 8.0, + "symbol": "AXL/USDT:USDT", "currency": "USDT", "minNotional": 750000.0, "maxNotional": 1500000.0, @@ -6316,6 +7686,7 @@ }, { "tier": 9.0, + "symbol": "AXL/USDT:USDT", "currency": "USDT", "minNotional": 1500000.0, "maxNotional": 3000000.0, @@ -6334,6 +7705,7 @@ "AXS/USDT:USDT": [ { "tier": 1.0, + "symbol": "AXS/USDT:USDT", "currency": "USDT", "minNotional": 0.0, "maxNotional": 5000.0, @@ -6350,6 +7722,7 @@ }, { "tier": 2.0, + "symbol": "AXS/USDT:USDT", "currency": "USDT", "minNotional": 5000.0, "maxNotional": 25000.0, @@ -6366,6 +7739,7 @@ }, { "tier": 3.0, + "symbol": "AXS/USDT:USDT", "currency": "USDT", "minNotional": 25000.0, "maxNotional": 400000.0, @@ -6382,6 +7756,7 @@ }, { "tier": 4.0, + "symbol": "AXS/USDT:USDT", "currency": "USDT", "minNotional": 400000.0, "maxNotional": 600000.0, @@ -6398,6 +7773,7 @@ }, { "tier": 5.0, + "symbol": "AXS/USDT:USDT", "currency": "USDT", "minNotional": 600000.0, "maxNotional": 1200000.0, @@ -6414,6 +7790,7 @@ }, { "tier": 6.0, + "symbol": "AXS/USDT:USDT", "currency": "USDT", "minNotional": 1200000.0, "maxNotional": 3200000.0, @@ -6430,6 +7807,7 @@ }, { "tier": 7.0, + "symbol": "AXS/USDT:USDT", "currency": "USDT", "minNotional": 3200000.0, "maxNotional": 5000000.0, @@ -6446,6 +7824,7 @@ }, { "tier": 8.0, + "symbol": "AXS/USDT:USDT", "currency": "USDT", "minNotional": 5000000.0, "maxNotional": 10000000.0, @@ -6462,6 +7841,7 @@ }, { "tier": 9.0, + "symbol": "AXS/USDT:USDT", "currency": "USDT", "minNotional": 10000000.0, "maxNotional": 15000000.0, @@ -6478,6 +7858,7 @@ }, { "tier": 10.0, + "symbol": "AXS/USDT:USDT", "currency": "USDT", "minNotional": 15000000.0, "maxNotional": 20000000.0, @@ -6496,6 +7877,7 @@ "BADGER/USDT:USDT": [ { "tier": 1.0, + "symbol": "BADGER/USDT:USDT", "currency": "USDT", "minNotional": 0.0, "maxNotional": 5000.0, @@ -6512,6 +7894,7 @@ }, { "tier": 2.0, + "symbol": "BADGER/USDT:USDT", "currency": "USDT", "minNotional": 5000.0, "maxNotional": 25000.0, @@ -6528,6 +7911,7 @@ }, { "tier": 3.0, + "symbol": "BADGER/USDT:USDT", "currency": "USDT", "minNotional": 25000.0, "maxNotional": 100000.0, @@ -6544,6 +7928,7 @@ }, { "tier": 4.0, + "symbol": "BADGER/USDT:USDT", "currency": "USDT", "minNotional": 100000.0, "maxNotional": 200000.0, @@ -6560,6 +7945,7 @@ }, { "tier": 5.0, + "symbol": "BADGER/USDT:USDT", "currency": "USDT", "minNotional": 200000.0, "maxNotional": 500000.0, @@ -6576,6 +7962,7 @@ }, { "tier": 6.0, + "symbol": "BADGER/USDT:USDT", "currency": "USDT", "minNotional": 500000.0, "maxNotional": 1000000.0, @@ -6592,6 +7979,7 @@ }, { "tier": 7.0, + "symbol": "BADGER/USDT:USDT", "currency": "USDT", "minNotional": 1000000.0, "maxNotional": 2000000.0, @@ -6610,6 +7998,7 @@ "BAKE/USDT:USDT": [ { "tier": 1.0, + "symbol": "BAKE/USDT:USDT", "currency": "USDT", "minNotional": 0.0, "maxNotional": 5000.0, @@ -6626,6 +8015,7 @@ }, { "tier": 2.0, + "symbol": "BAKE/USDT:USDT", "currency": "USDT", "minNotional": 5000.0, "maxNotional": 25000.0, @@ -6642,6 +8032,7 @@ }, { "tier": 3.0, + "symbol": "BAKE/USDT:USDT", "currency": "USDT", "minNotional": 25000.0, "maxNotional": 100000.0, @@ -6658,6 +8049,7 @@ }, { "tier": 4.0, + "symbol": "BAKE/USDT:USDT", "currency": "USDT", "minNotional": 100000.0, "maxNotional": 250000.0, @@ -6674,6 +8066,7 @@ }, { "tier": 5.0, + "symbol": "BAKE/USDT:USDT", "currency": "USDT", "minNotional": 250000.0, "maxNotional": 1000000.0, @@ -6690,6 +8083,7 @@ }, { "tier": 6.0, + "symbol": "BAKE/USDT:USDT", "currency": "USDT", "minNotional": 1000000.0, "maxNotional": 1500000.0, @@ -6706,6 +8100,7 @@ }, { "tier": 7.0, + "symbol": "BAKE/USDT:USDT", "currency": "USDT", "minNotional": 1500000.0, "maxNotional": 3000000.0, @@ -6724,6 +8119,7 @@ "BAL/USDT:USDT": [ { "tier": 1.0, + "symbol": "BAL/USDT:USDT", "currency": "USDT", "minNotional": 0.0, "maxNotional": 5000.0, @@ -6740,6 +8136,7 @@ }, { "tier": 2.0, + "symbol": "BAL/USDT:USDT", "currency": "USDT", "minNotional": 5000.0, "maxNotional": 25000.0, @@ -6756,6 +8153,7 @@ }, { "tier": 3.0, + "symbol": "BAL/USDT:USDT", "currency": "USDT", "minNotional": 25000.0, "maxNotional": 100000.0, @@ -6772,6 +8170,7 @@ }, { "tier": 4.0, + "symbol": "BAL/USDT:USDT", "currency": "USDT", "minNotional": 100000.0, "maxNotional": 250000.0, @@ -6788,6 +8187,7 @@ }, { "tier": 5.0, + "symbol": "BAL/USDT:USDT", "currency": "USDT", "minNotional": 250000.0, "maxNotional": 1000000.0, @@ -6804,6 +8204,7 @@ }, { "tier": 6.0, + "symbol": "BAL/USDT:USDT", "currency": "USDT", "minNotional": 1000000.0, "maxNotional": 5000000.0, @@ -6819,9 +8220,10 @@ } } ], - "BANANA/USDT:USDT": [ + "BAN/USDT:USDT": [ { "tier": 1.0, + "symbol": "BAN/USDT:USDT", "currency": "USDT", "minNotional": 0.0, "maxNotional": 5000.0, @@ -6838,6 +8240,7 @@ }, { "tier": 2.0, + "symbol": "BAN/USDT:USDT", "currency": "USDT", "minNotional": 5000.0, "maxNotional": 10000.0, @@ -6854,6 +8257,162 @@ }, { "tier": 3.0, + "symbol": "BAN/USDT:USDT", + "currency": "USDT", + "minNotional": 10000.0, + "maxNotional": 30000.0, + "maintenanceMarginRate": 0.02, + "maxLeverage": 25.0, + "info": { + "bracket": "3", + "initialLeverage": "25", + "notionalCap": "30000", + "notionalFloor": "10000", + "maintMarginRatio": "0.02", + "cum": "75.0" + } + }, + { + "tier": 4.0, + "symbol": "BAN/USDT:USDT", + "currency": "USDT", + "minNotional": 30000.0, + "maxNotional": 60000.0, + "maintenanceMarginRate": 0.025, + "maxLeverage": 20.0, + "info": { + "bracket": "4", + "initialLeverage": "20", + "notionalCap": "60000", + "notionalFloor": "30000", + "maintMarginRatio": "0.025", + "cum": "225.0" + } + }, + { + "tier": 5.0, + "symbol": "BAN/USDT:USDT", + "currency": "USDT", + "minNotional": 60000.0, + "maxNotional": 300000.0, + "maintenanceMarginRate": 0.05, + "maxLeverage": 10.0, + "info": { + "bracket": "5", + "initialLeverage": "10", + "notionalCap": "300000", + "notionalFloor": "60000", + "maintMarginRatio": "0.05", + "cum": "1725.0" + } + }, + { + "tier": 6.0, + "symbol": "BAN/USDT:USDT", + "currency": "USDT", + "minNotional": 300000.0, + "maxNotional": 600000.0, + "maintenanceMarginRate": 0.1, + "maxLeverage": 5.0, + "info": { + "bracket": "6", + "initialLeverage": "5", + "notionalCap": "600000", + "notionalFloor": "300000", + "maintMarginRatio": "0.1", + "cum": "16725.0" + } + }, + { + "tier": 7.0, + "symbol": "BAN/USDT:USDT", + "currency": "USDT", + "minNotional": 600000.0, + "maxNotional": 750000.0, + "maintenanceMarginRate": 0.125, + "maxLeverage": 4.0, + "info": { + "bracket": "7", + "initialLeverage": "4", + "notionalCap": "750000", + "notionalFloor": "600000", + "maintMarginRatio": "0.125", + "cum": "31725.0" + } + }, + { + "tier": 8.0, + "symbol": "BAN/USDT:USDT", + "currency": "USDT", + "minNotional": 750000.0, + "maxNotional": 1500000.0, + "maintenanceMarginRate": 0.25, + "maxLeverage": 2.0, + "info": { + "bracket": "8", + "initialLeverage": "2", + "notionalCap": "1500000", + "notionalFloor": "750000", + "maintMarginRatio": "0.25", + "cum": "125475.0" + } + }, + { + "tier": 9.0, + "symbol": "BAN/USDT:USDT", + "currency": "USDT", + "minNotional": 1500000.0, + "maxNotional": 3000000.0, + "maintenanceMarginRate": 0.5, + "maxLeverage": 1.0, + "info": { + "bracket": "9", + "initialLeverage": "1", + "notionalCap": "3000000", + "notionalFloor": "1500000", + "maintMarginRatio": "0.5", + "cum": "500475.0" + } + } + ], + "BANANA/USDT:USDT": [ + { + "tier": 1.0, + "symbol": "BANANA/USDT:USDT", + "currency": "USDT", + "minNotional": 0.0, + "maxNotional": 5000.0, + "maintenanceMarginRate": 0.01, + "maxLeverage": 75.0, + "info": { + "bracket": "1", + "initialLeverage": "75", + "notionalCap": "5000", + "notionalFloor": "0", + "maintMarginRatio": "0.01", + "cum": "0.0" + } + }, + { + "tier": 2.0, + "symbol": "BANANA/USDT:USDT", + "currency": "USDT", + "minNotional": 5000.0, + "maxNotional": 10000.0, + "maintenanceMarginRate": 0.015, + "maxLeverage": 50.0, + "info": { + "bracket": "2", + "initialLeverage": "50", + "notionalCap": "10000", + "notionalFloor": "5000", + "maintMarginRatio": "0.015", + "cum": "25.0" + } + }, + { + "tier": 3.0, + "symbol": "BANANA/USDT:USDT", "currency": "USDT", "minNotional": 10000.0, "maxNotional": 50000.0, @@ -6870,6 +8429,7 @@ }, { "tier": 4.0, + "symbol": "BANANA/USDT:USDT", "currency": "USDT", "minNotional": 50000.0, "maxNotional": 100000.0, @@ -6886,6 +8446,7 @@ }, { "tier": 5.0, + "symbol": "BANANA/USDT:USDT", "currency": "USDT", "minNotional": 100000.0, "maxNotional": 500000.0, @@ -6902,6 +8463,7 @@ }, { "tier": 6.0, + "symbol": "BANANA/USDT:USDT", "currency": "USDT", "minNotional": 500000.0, "maxNotional": 1000000.0, @@ -6918,6 +8480,7 @@ }, { "tier": 7.0, + "symbol": "BANANA/USDT:USDT", "currency": "USDT", "minNotional": 1000000.0, "maxNotional": 1250000.0, @@ -6934,6 +8497,7 @@ }, { "tier": 8.0, + "symbol": "BANANA/USDT:USDT", "currency": "USDT", "minNotional": 1250000.0, "maxNotional": 2500000.0, @@ -6950,6 +8514,7 @@ }, { "tier": 9.0, + "symbol": "BANANA/USDT:USDT", "currency": "USDT", "minNotional": 2500000.0, "maxNotional": 5000000.0, @@ -6968,6 +8533,7 @@ "BAND/USDT:USDT": [ { "tier": 1.0, + "symbol": "BAND/USDT:USDT", "currency": "USDT", "minNotional": 0.0, "maxNotional": 5000.0, @@ -6984,6 +8550,7 @@ }, { "tier": 2.0, + "symbol": "BAND/USDT:USDT", "currency": "USDT", "minNotional": 5000.0, "maxNotional": 20000.0, @@ -7000,6 +8567,7 @@ }, { "tier": 3.0, + "symbol": "BAND/USDT:USDT", "currency": "USDT", "minNotional": 20000.0, "maxNotional": 25000.0, @@ -7016,6 +8584,7 @@ }, { "tier": 4.0, + "symbol": "BAND/USDT:USDT", "currency": "USDT", "minNotional": 25000.0, "maxNotional": 200000.0, @@ -7032,6 +8601,7 @@ }, { "tier": 5.0, + "symbol": "BAND/USDT:USDT", "currency": "USDT", "minNotional": 200000.0, "maxNotional": 400000.0, @@ -7048,6 +8618,7 @@ }, { "tier": 6.0, + "symbol": "BAND/USDT:USDT", "currency": "USDT", "minNotional": 400000.0, "maxNotional": 500000.0, @@ -7064,6 +8635,7 @@ }, { "tier": 7.0, + "symbol": "BAND/USDT:USDT", "currency": "USDT", "minNotional": 500000.0, "maxNotional": 1000000.0, @@ -7080,6 +8652,7 @@ }, { "tier": 8.0, + "symbol": "BAND/USDT:USDT", "currency": "USDT", "minNotional": 1000000.0, "maxNotional": 2000000.0, @@ -7098,6 +8671,7 @@ "BAT/USDT:USDT": [ { "tier": 1.0, + "symbol": "BAT/USDT:USDT", "currency": "USDT", "minNotional": 0.0, "maxNotional": 5000.0, @@ -7114,6 +8688,7 @@ }, { "tier": 2.0, + "symbol": "BAT/USDT:USDT", "currency": "USDT", "minNotional": 5000.0, "maxNotional": 20000.0, @@ -7130,6 +8705,7 @@ }, { "tier": 3.0, + "symbol": "BAT/USDT:USDT", "currency": "USDT", "minNotional": 20000.0, "maxNotional": 25000.0, @@ -7146,6 +8722,7 @@ }, { "tier": 4.0, + "symbol": "BAT/USDT:USDT", "currency": "USDT", "minNotional": 25000.0, "maxNotional": 200000.0, @@ -7162,6 +8739,7 @@ }, { "tier": 5.0, + "symbol": "BAT/USDT:USDT", "currency": "USDT", "minNotional": 200000.0, "maxNotional": 400000.0, @@ -7178,6 +8756,7 @@ }, { "tier": 6.0, + "symbol": "BAT/USDT:USDT", "currency": "USDT", "minNotional": 400000.0, "maxNotional": 500000.0, @@ -7194,6 +8773,7 @@ }, { "tier": 7.0, + "symbol": "BAT/USDT:USDT", "currency": "USDT", "minNotional": 500000.0, "maxNotional": 1000000.0, @@ -7210,6 +8790,7 @@ }, { "tier": 8.0, + "symbol": "BAT/USDT:USDT", "currency": "USDT", "minNotional": 1000000.0, "maxNotional": 2000000.0, @@ -7228,6 +8809,7 @@ "BB/USDT:USDT": [ { "tier": 1.0, + "symbol": "BB/USDT:USDT", "currency": "USDT", "minNotional": 0.0, "maxNotional": 5000.0, @@ -7244,6 +8826,7 @@ }, { "tier": 2.0, + "symbol": "BB/USDT:USDT", "currency": "USDT", "minNotional": 5000.0, "maxNotional": 25000.0, @@ -7260,6 +8843,7 @@ }, { "tier": 3.0, + "symbol": "BB/USDT:USDT", "currency": "USDT", "minNotional": 25000.0, "maxNotional": 80000.0, @@ -7276,6 +8860,7 @@ }, { "tier": 4.0, + "symbol": "BB/USDT:USDT", "currency": "USDT", "minNotional": 80000.0, "maxNotional": 800000.0, @@ -7292,6 +8877,7 @@ }, { "tier": 5.0, + "symbol": "BB/USDT:USDT", "currency": "USDT", "minNotional": 800000.0, "maxNotional": 1600000.0, @@ -7308,6 +8894,7 @@ }, { "tier": 6.0, + "symbol": "BB/USDT:USDT", "currency": "USDT", "minNotional": 1600000.0, "maxNotional": 2000000.0, @@ -7324,6 +8911,7 @@ }, { "tier": 7.0, + "symbol": "BB/USDT:USDT", "currency": "USDT", "minNotional": 2000000.0, "maxNotional": 4000000.0, @@ -7340,6 +8928,7 @@ }, { "tier": 8.0, + "symbol": "BB/USDT:USDT", "currency": "USDT", "minNotional": 4000000.0, "maxNotional": 8000000.0, @@ -7358,6 +8947,7 @@ "BCH/USDC:USDC": [ { "tier": 1.0, + "symbol": "BCH/USDC:USDC", "currency": "USDC", "minNotional": 0.0, "maxNotional": 5000.0, @@ -7374,6 +8964,7 @@ }, { "tier": 2.0, + "symbol": "BCH/USDC:USDC", "currency": "USDC", "minNotional": 5000.0, "maxNotional": 10000.0, @@ -7390,6 +8981,7 @@ }, { "tier": 3.0, + "symbol": "BCH/USDC:USDC", "currency": "USDC", "minNotional": 10000.0, "maxNotional": 50000.0, @@ -7406,6 +8998,7 @@ }, { "tier": 4.0, + "symbol": "BCH/USDC:USDC", "currency": "USDC", "minNotional": 50000.0, "maxNotional": 500000.0, @@ -7422,6 +9015,7 @@ }, { "tier": 5.0, + "symbol": "BCH/USDC:USDC", "currency": "USDC", "minNotional": 500000.0, "maxNotional": 2000000.0, @@ -7438,6 +9032,7 @@ }, { "tier": 6.0, + "symbol": "BCH/USDC:USDC", "currency": "USDC", "minNotional": 2000000.0, "maxNotional": 4000000.0, @@ -7454,6 +9049,7 @@ }, { "tier": 7.0, + "symbol": "BCH/USDC:USDC", "currency": "USDC", "minNotional": 4000000.0, "maxNotional": 8000000.0, @@ -7470,6 +9066,7 @@ }, { "tier": 8.0, + "symbol": "BCH/USDC:USDC", "currency": "USDC", "minNotional": 8000000.0, "maxNotional": 15000000.0, @@ -7486,6 +9083,7 @@ }, { "tier": 9.0, + "symbol": "BCH/USDC:USDC", "currency": "USDC", "minNotional": 15000000.0, "maxNotional": 20000000.0, @@ -7502,6 +9100,7 @@ }, { "tier": 10.0, + "symbol": "BCH/USDC:USDC", "currency": "USDC", "minNotional": 20000000.0, "maxNotional": 50000000.0, @@ -7520,6 +9119,7 @@ "BCH/USDT:USDT": [ { "tier": 1.0, + "symbol": "BCH/USDT:USDT", "currency": "USDT", "minNotional": 0.0, "maxNotional": 5000.0, @@ -7536,6 +9136,7 @@ }, { "tier": 2.0, + "symbol": "BCH/USDT:USDT", "currency": "USDT", "minNotional": 5000.0, "maxNotional": 10000.0, @@ -7552,6 +9153,7 @@ }, { "tier": 3.0, + "symbol": "BCH/USDT:USDT", "currency": "USDT", "minNotional": 10000.0, "maxNotional": 100000.0, @@ -7568,6 +9170,7 @@ }, { "tier": 4.0, + "symbol": "BCH/USDT:USDT", "currency": "USDT", "minNotional": 100000.0, "maxNotional": 500000.0, @@ -7584,6 +9187,7 @@ }, { "tier": 5.0, + "symbol": "BCH/USDT:USDT", "currency": "USDT", "minNotional": 500000.0, "maxNotional": 1000000.0, @@ -7600,6 +9204,7 @@ }, { "tier": 6.0, + "symbol": "BCH/USDT:USDT", "currency": "USDT", "minNotional": 1000000.0, "maxNotional": 5000000.0, @@ -7616,6 +9221,7 @@ }, { "tier": 7.0, + "symbol": "BCH/USDT:USDT", "currency": "USDT", "minNotional": 5000000.0, "maxNotional": 10000000.0, @@ -7632,6 +9238,7 @@ }, { "tier": 8.0, + "symbol": "BCH/USDT:USDT", "currency": "USDT", "minNotional": 10000000.0, "maxNotional": 15000000.0, @@ -7648,6 +9255,7 @@ }, { "tier": 9.0, + "symbol": "BCH/USDT:USDT", "currency": "USDT", "minNotional": 15000000.0, "maxNotional": 25000000.0, @@ -7664,6 +9272,7 @@ }, { "tier": 10.0, + "symbol": "BCH/USDT:USDT", "currency": "USDT", "minNotional": 25000000.0, "maxNotional": 50000000.0, @@ -7682,6 +9291,7 @@ "BEAMX/USDT:USDT": [ { "tier": 1.0, + "symbol": "BEAMX/USDT:USDT", "currency": "USDT", "minNotional": 0.0, "maxNotional": 5000.0, @@ -7698,6 +9308,7 @@ }, { "tier": 2.0, + "symbol": "BEAMX/USDT:USDT", "currency": "USDT", "minNotional": 5000.0, "maxNotional": 10000.0, @@ -7714,6 +9325,7 @@ }, { "tier": 3.0, + "symbol": "BEAMX/USDT:USDT", "currency": "USDT", "minNotional": 10000.0, "maxNotional": 30000.0, @@ -7730,6 +9342,7 @@ }, { "tier": 4.0, + "symbol": "BEAMX/USDT:USDT", "currency": "USDT", "minNotional": 30000.0, "maxNotional": 60000.0, @@ -7746,6 +9359,7 @@ }, { "tier": 5.0, + "symbol": "BEAMX/USDT:USDT", "currency": "USDT", "minNotional": 60000.0, "maxNotional": 300000.0, @@ -7762,6 +9376,7 @@ }, { "tier": 6.0, + "symbol": "BEAMX/USDT:USDT", "currency": "USDT", "minNotional": 300000.0, "maxNotional": 600000.0, @@ -7778,6 +9393,7 @@ }, { "tier": 7.0, + "symbol": "BEAMX/USDT:USDT", "currency": "USDT", "minNotional": 600000.0, "maxNotional": 750000.0, @@ -7794,6 +9410,7 @@ }, { "tier": 8.0, + "symbol": "BEAMX/USDT:USDT", "currency": "USDT", "minNotional": 750000.0, "maxNotional": 1500000.0, @@ -7810,6 +9427,7 @@ }, { "tier": 9.0, + "symbol": "BEAMX/USDT:USDT", "currency": "USDT", "minNotional": 1500000.0, "maxNotional": 3000000.0, @@ -7828,6 +9446,7 @@ "BEL/USDT:USDT": [ { "tier": 1.0, + "symbol": "BEL/USDT:USDT", "currency": "USDT", "minNotional": 0.0, "maxNotional": 5000.0, @@ -7844,6 +9463,7 @@ }, { "tier": 2.0, + "symbol": "BEL/USDT:USDT", "currency": "USDT", "minNotional": 5000.0, "maxNotional": 50000.0, @@ -7860,6 +9480,7 @@ }, { "tier": 3.0, + "symbol": "BEL/USDT:USDT", "currency": "USDT", "minNotional": 50000.0, "maxNotional": 200000.0, @@ -7876,6 +9497,7 @@ }, { "tier": 4.0, + "symbol": "BEL/USDT:USDT", "currency": "USDT", "minNotional": 200000.0, "maxNotional": 500000.0, @@ -7892,6 +9514,7 @@ }, { "tier": 5.0, + "symbol": "BEL/USDT:USDT", "currency": "USDT", "minNotional": 500000.0, "maxNotional": 1000000.0, @@ -7908,6 +9531,7 @@ }, { "tier": 6.0, + "symbol": "BEL/USDT:USDT", "currency": "USDT", "minNotional": 1000000.0, "maxNotional": 1500000.0, @@ -7924,6 +9548,7 @@ }, { "tier": 7.0, + "symbol": "BEL/USDT:USDT", "currency": "USDT", "minNotional": 1500000.0, "maxNotional": 3000000.0, @@ -7942,104 +9567,162 @@ "BICO/USDT:USDT": [ { "tier": 1.0, + "symbol": "BICO/USDT:USDT", "currency": "USDT", "minNotional": 0.0, - "maxNotional": 10000.0, - "maintenanceMarginRate": 0.03, - "maxLeverage": 20.0, + "maxNotional": 5000.0, + "maintenanceMarginRate": 0.01, + "maxLeverage": 75.0, "info": { "bracket": "1", - "initialLeverage": "20", - "notionalCap": "10000", + "initialLeverage": "75", + "notionalCap": "5000", "notionalFloor": "0", - "maintMarginRatio": "0.03", + "maintMarginRatio": "0.01", "cum": "0.0" } }, { "tier": 2.0, + "symbol": "BICO/USDT:USDT", "currency": "USDT", - "minNotional": 10000.0, - "maxNotional": 200000.0, - "maintenanceMarginRate": 0.05, - "maxLeverage": 10.0, + "minNotional": 5000.0, + "maxNotional": 10000.0, + "maintenanceMarginRate": 0.015, + "maxLeverage": 50.0, "info": { "bracket": "2", - "initialLeverage": "10", - "notionalCap": "200000", - "notionalFloor": "10000", - "maintMarginRatio": "0.05", - "cum": "200.0" + "initialLeverage": "50", + "notionalCap": "10000", + "notionalFloor": "5000", + "maintMarginRatio": "0.015", + "cum": "25.0" } }, { "tier": 3.0, + "symbol": "BICO/USDT:USDT", "currency": "USDT", - "minNotional": 200000.0, - "maxNotional": 500000.0, - "maintenanceMarginRate": 0.1, - "maxLeverage": 5.0, + "minNotional": 10000.0, + "maxNotional": 50000.0, + "maintenanceMarginRate": 0.02, + "maxLeverage": 25.0, "info": { "bracket": "3", - "initialLeverage": "5", - "notionalCap": "500000", - "notionalFloor": "200000", - "maintMarginRatio": "0.1", - "cum": "10200.0" + "initialLeverage": "25", + "notionalCap": "50000", + "notionalFloor": "10000", + "maintMarginRatio": "0.02", + "cum": "75.0" } }, { "tier": 4.0, + "symbol": "BICO/USDT:USDT", "currency": "USDT", - "minNotional": 500000.0, - "maxNotional": 1000000.0, - "maintenanceMarginRate": 0.125, - "maxLeverage": 4.0, + "minNotional": 50000.0, + "maxNotional": 100000.0, + "maintenanceMarginRate": 0.025, + "maxLeverage": 20.0, "info": { "bracket": "4", - "initialLeverage": "4", - "notionalCap": "1000000", - "notionalFloor": "500000", - "maintMarginRatio": "0.125", - "cum": "22700.0" + "initialLeverage": "20", + "notionalCap": "100000", + "notionalFloor": "50000", + "maintMarginRatio": "0.025", + "cum": "325.0" } }, { "tier": 5.0, + "symbol": "BICO/USDT:USDT", "currency": "USDT", - "minNotional": 1000000.0, - "maxNotional": 3000000.0, - "maintenanceMarginRate": 0.25, - "maxLeverage": 2.0, + "minNotional": 100000.0, + "maxNotional": 500000.0, + "maintenanceMarginRate": 0.05, + "maxLeverage": 10.0, "info": { "bracket": "5", - "initialLeverage": "2", - "notionalCap": "3000000", - "notionalFloor": "1000000", - "maintMarginRatio": "0.25", - "cum": "147700.0" + "initialLeverage": "10", + "notionalCap": "500000", + "notionalFloor": "100000", + "maintMarginRatio": "0.05", + "cum": "2825.0" } }, { "tier": 6.0, + "symbol": "BICO/USDT:USDT", + "currency": "USDT", + "minNotional": 500000.0, + "maxNotional": 1000000.0, + "maintenanceMarginRate": 0.1, + "maxLeverage": 5.0, + "info": { + "bracket": "6", + "initialLeverage": "5", + "notionalCap": "1000000", + "notionalFloor": "500000", + "maintMarginRatio": "0.1", + "cum": "27825.0" + } + }, + { + "tier": 7.0, + "symbol": "BICO/USDT:USDT", + "currency": "USDT", + "minNotional": 1000000.0, + "maxNotional": 1250000.0, + "maintenanceMarginRate": 0.125, + "maxLeverage": 4.0, + "info": { + "bracket": "7", + "initialLeverage": "4", + "notionalCap": "1250000", + "notionalFloor": "1000000", + "maintMarginRatio": "0.125", + "cum": "52825.0" + } + }, + { + "tier": 8.0, + "symbol": "BICO/USDT:USDT", + "currency": "USDT", + "minNotional": 1250000.0, + "maxNotional": 3000000.0, + "maintenanceMarginRate": 0.25, + "maxLeverage": 2.0, + "info": { + "bracket": "8", + "initialLeverage": "2", + "notionalCap": "3000000", + "notionalFloor": "1250000", + "maintMarginRatio": "0.25", + "cum": "209075.0" + } + }, + { + "tier": 9.0, + "symbol": "BICO/USDT:USDT", "currency": "USDT", "minNotional": 3000000.0, - "maxNotional": 3500000.0, + "maxNotional": 5000000.0, "maintenanceMarginRate": 0.5, "maxLeverage": 1.0, "info": { - "bracket": "6", + "bracket": "9", "initialLeverage": "1", - "notionalCap": "3500000", + "notionalCap": "5000000", "notionalFloor": "3000000", "maintMarginRatio": "0.5", - "cum": "897700.0" + "cum": "959075.0" } } ], "BIGTIME/USDT:USDT": [ { "tier": 1.0, + "symbol": "BIGTIME/USDT:USDT", "currency": "USDT", "minNotional": 0.0, "maxNotional": 10000.0, @@ -8056,6 +9739,7 @@ }, { "tier": 2.0, + "symbol": "BIGTIME/USDT:USDT", "currency": "USDT", "minNotional": 10000.0, "maxNotional": 30000.0, @@ -8072,6 +9756,7 @@ }, { "tier": 3.0, + "symbol": "BIGTIME/USDT:USDT", "currency": "USDT", "minNotional": 30000.0, "maxNotional": 150000.0, @@ -8088,6 +9773,7 @@ }, { "tier": 4.0, + "symbol": "BIGTIME/USDT:USDT", "currency": "USDT", "minNotional": 150000.0, "maxNotional": 300000.0, @@ -8104,6 +9790,7 @@ }, { "tier": 5.0, + "symbol": "BIGTIME/USDT:USDT", "currency": "USDT", "minNotional": 300000.0, "maxNotional": 1500000.0, @@ -8120,6 +9807,7 @@ }, { "tier": 6.0, + "symbol": "BIGTIME/USDT:USDT", "currency": "USDT", "minNotional": 1500000.0, "maxNotional": 3000000.0, @@ -8136,6 +9824,7 @@ }, { "tier": 7.0, + "symbol": "BIGTIME/USDT:USDT", "currency": "USDT", "minNotional": 3000000.0, "maxNotional": 3750000.0, @@ -8152,6 +9841,7 @@ }, { "tier": 8.0, + "symbol": "BIGTIME/USDT:USDT", "currency": "USDT", "minNotional": 3750000.0, "maxNotional": 7500000.0, @@ -8168,6 +9858,7 @@ }, { "tier": 9.0, + "symbol": "BIGTIME/USDT:USDT", "currency": "USDT", "minNotional": 7500000.0, "maxNotional": 15000000.0, @@ -8186,6 +9877,7 @@ "BLUR/USDT:USDT": [ { "tier": 1.0, + "symbol": "BLUR/USDT:USDT", "currency": "USDT", "minNotional": 0.0, "maxNotional": 5000.0, @@ -8202,6 +9894,7 @@ }, { "tier": 2.0, + "symbol": "BLUR/USDT:USDT", "currency": "USDT", "minNotional": 5000.0, "maxNotional": 25000.0, @@ -8218,6 +9911,7 @@ }, { "tier": 3.0, + "symbol": "BLUR/USDT:USDT", "currency": "USDT", "minNotional": 25000.0, "maxNotional": 100000.0, @@ -8234,6 +9928,7 @@ }, { "tier": 4.0, + "symbol": "BLUR/USDT:USDT", "currency": "USDT", "minNotional": 100000.0, "maxNotional": 600000.0, @@ -8250,6 +9945,7 @@ }, { "tier": 5.0, + "symbol": "BLUR/USDT:USDT", "currency": "USDT", "minNotional": 600000.0, "maxNotional": 1600000.0, @@ -8266,6 +9962,7 @@ }, { "tier": 6.0, + "symbol": "BLUR/USDT:USDT", "currency": "USDT", "minNotional": 1600000.0, "maxNotional": 2000000.0, @@ -8282,6 +9979,7 @@ }, { "tier": 7.0, + "symbol": "BLUR/USDT:USDT", "currency": "USDT", "minNotional": 2000000.0, "maxNotional": 6000000.0, @@ -8298,6 +9996,7 @@ }, { "tier": 8.0, + "symbol": "BLUR/USDT:USDT", "currency": "USDT", "minNotional": 6000000.0, "maxNotional": 10000000.0, @@ -8316,6 +10015,7 @@ "BLZ/USDT:USDT": [ { "tier": 1.0, + "symbol": "BLZ/USDT:USDT", "currency": "USDT", "minNotional": 0.0, "maxNotional": 25000.0, @@ -8332,6 +10032,7 @@ }, { "tier": 2.0, + "symbol": "BLZ/USDT:USDT", "currency": "USDT", "minNotional": 25000.0, "maxNotional": 100000.0, @@ -8348,6 +10049,7 @@ }, { "tier": 3.0, + "symbol": "BLZ/USDT:USDT", "currency": "USDT", "minNotional": 100000.0, "maxNotional": 250000.0, @@ -8364,6 +10066,7 @@ }, { "tier": 4.0, + "symbol": "BLZ/USDT:USDT", "currency": "USDT", "minNotional": 250000.0, "maxNotional": 1000000.0, @@ -8380,6 +10083,7 @@ }, { "tier": 5.0, + "symbol": "BLZ/USDT:USDT", "currency": "USDT", "minNotional": 1000000.0, "maxNotional": 1500000.0, @@ -8396,6 +10100,7 @@ }, { "tier": 6.0, + "symbol": "BLZ/USDT:USDT", "currency": "USDT", "minNotional": 1500000.0, "maxNotional": 3000000.0, @@ -8414,6 +10119,7 @@ "BNB/USDC:USDC": [ { "tier": 1.0, + "symbol": "BNB/USDC:USDC", "currency": "USDC", "minNotional": 0.0, "maxNotional": 5000.0, @@ -8430,6 +10136,7 @@ }, { "tier": 2.0, + "symbol": "BNB/USDC:USDC", "currency": "USDC", "minNotional": 5000.0, "maxNotional": 10000.0, @@ -8446,6 +10153,7 @@ }, { "tier": 3.0, + "symbol": "BNB/USDC:USDC", "currency": "USDC", "minNotional": 10000.0, "maxNotional": 50000.0, @@ -8462,6 +10170,7 @@ }, { "tier": 4.0, + "symbol": "BNB/USDC:USDC", "currency": "USDC", "minNotional": 50000.0, "maxNotional": 250000.0, @@ -8478,6 +10187,7 @@ }, { "tier": 5.0, + "symbol": "BNB/USDC:USDC", "currency": "USDC", "minNotional": 250000.0, "maxNotional": 1000000.0, @@ -8494,6 +10204,7 @@ }, { "tier": 6.0, + "symbol": "BNB/USDC:USDC", "currency": "USDC", "minNotional": 1000000.0, "maxNotional": 5000000.0, @@ -8510,6 +10221,7 @@ }, { "tier": 7.0, + "symbol": "BNB/USDC:USDC", "currency": "USDC", "minNotional": 5000000.0, "maxNotional": 10000000.0, @@ -8526,6 +10238,7 @@ }, { "tier": 8.0, + "symbol": "BNB/USDC:USDC", "currency": "USDC", "minNotional": 10000000.0, "maxNotional": 20000000.0, @@ -8542,6 +10255,7 @@ }, { "tier": 9.0, + "symbol": "BNB/USDC:USDC", "currency": "USDC", "minNotional": 20000000.0, "maxNotional": 30000000.0, @@ -8558,6 +10272,7 @@ }, { "tier": 10.0, + "symbol": "BNB/USDC:USDC", "currency": "USDC", "minNotional": 30000000.0, "maxNotional": 50000000.0, @@ -8576,6 +10291,7 @@ "BNB/USDT:USDT": [ { "tier": 1.0, + "symbol": "BNB/USDT:USDT", "currency": "USDT", "minNotional": 0.0, "maxNotional": 10000.0, @@ -8592,6 +10308,7 @@ }, { "tier": 2.0, + "symbol": "BNB/USDT:USDT", "currency": "USDT", "minNotional": 10000.0, "maxNotional": 50000.0, @@ -8608,6 +10325,7 @@ }, { "tier": 3.0, + "symbol": "BNB/USDT:USDT", "currency": "USDT", "minNotional": 50000.0, "maxNotional": 200000.0, @@ -8624,6 +10342,7 @@ }, { "tier": 4.0, + "symbol": "BNB/USDT:USDT", "currency": "USDT", "minNotional": 200000.0, "maxNotional": 1500000.0, @@ -8640,6 +10359,7 @@ }, { "tier": 5.0, + "symbol": "BNB/USDT:USDT", "currency": "USDT", "minNotional": 1500000.0, "maxNotional": 3000000.0, @@ -8656,6 +10376,7 @@ }, { "tier": 6.0, + "symbol": "BNB/USDT:USDT", "currency": "USDT", "minNotional": 3000000.0, "maxNotional": 15000000.0, @@ -8672,6 +10393,7 @@ }, { "tier": 7.0, + "symbol": "BNB/USDT:USDT", "currency": "USDT", "minNotional": 15000000.0, "maxNotional": 30000000.0, @@ -8688,6 +10410,7 @@ }, { "tier": 8.0, + "symbol": "BNB/USDT:USDT", "currency": "USDT", "minNotional": 30000000.0, "maxNotional": 37500000.0, @@ -8704,6 +10427,7 @@ }, { "tier": 9.0, + "symbol": "BNB/USDT:USDT", "currency": "USDT", "minNotional": 37500000.0, "maxNotional": 75000000.0, @@ -8720,6 +10444,7 @@ }, { "tier": 10.0, + "symbol": "BNB/USDT:USDT", "currency": "USDT", "minNotional": 75000000.0, "maxNotional": 150000000.0, @@ -8738,6 +10463,7 @@ "BNT/USDT:USDT": [ { "tier": 1.0, + "symbol": "BNT/USDT:USDT", "currency": "USDT", "minNotional": 0.0, "maxNotional": 5000.0, @@ -8754,6 +10480,7 @@ }, { "tier": 2.0, + "symbol": "BNT/USDT:USDT", "currency": "USDT", "minNotional": 5000.0, "maxNotional": 25000.0, @@ -8770,6 +10497,7 @@ }, { "tier": 3.0, + "symbol": "BNT/USDT:USDT", "currency": "USDT", "minNotional": 25000.0, "maxNotional": 200000.0, @@ -8786,6 +10514,7 @@ }, { "tier": 4.0, + "symbol": "BNT/USDT:USDT", "currency": "USDT", "minNotional": 200000.0, "maxNotional": 500000.0, @@ -8802,6 +10531,7 @@ }, { "tier": 5.0, + "symbol": "BNT/USDT:USDT", "currency": "USDT", "minNotional": 500000.0, "maxNotional": 1000000.0, @@ -8818,6 +10548,7 @@ }, { "tier": 6.0, + "symbol": "BNT/USDT:USDT", "currency": "USDT", "minNotional": 1000000.0, "maxNotional": 3000000.0, @@ -8834,6 +10565,7 @@ }, { "tier": 7.0, + "symbol": "BNT/USDT:USDT", "currency": "USDT", "minNotional": 3000000.0, "maxNotional": 5000000.0, @@ -8852,6 +10584,7 @@ "BNX/USDT:USDT": [ { "tier": 1.0, + "symbol": "BNX/USDT:USDT", "currency": "USDT", "minNotional": 0.0, "maxNotional": 10000.0, @@ -8868,6 +10601,7 @@ }, { "tier": 2.0, + "symbol": "BNX/USDT:USDT", "currency": "USDT", "minNotional": 10000.0, "maxNotional": 20000.0, @@ -8884,6 +10618,7 @@ }, { "tier": 3.0, + "symbol": "BNX/USDT:USDT", "currency": "USDT", "minNotional": 20000.0, "maxNotional": 100000.0, @@ -8900,6 +10635,7 @@ }, { "tier": 4.0, + "symbol": "BNX/USDT:USDT", "currency": "USDT", "minNotional": 100000.0, "maxNotional": 200000.0, @@ -8916,6 +10652,7 @@ }, { "tier": 5.0, + "symbol": "BNX/USDT:USDT", "currency": "USDT", "minNotional": 200000.0, "maxNotional": 1000000.0, @@ -8932,6 +10669,7 @@ }, { "tier": 6.0, + "symbol": "BNX/USDT:USDT", "currency": "USDT", "minNotional": 1000000.0, "maxNotional": 2000000.0, @@ -8948,6 +10686,7 @@ }, { "tier": 7.0, + "symbol": "BNX/USDT:USDT", "currency": "USDT", "minNotional": 2000000.0, "maxNotional": 2500000.0, @@ -8964,6 +10703,7 @@ }, { "tier": 8.0, + "symbol": "BNX/USDT:USDT", "currency": "USDT", "minNotional": 2500000.0, "maxNotional": 3000000.0, @@ -8980,6 +10720,7 @@ }, { "tier": 9.0, + "symbol": "BNX/USDT:USDT", "currency": "USDT", "minNotional": 3000000.0, "maxNotional": 3500000.0, @@ -8998,6 +10739,7 @@ "BOME/USDC:USDC": [ { "tier": 1.0, + "symbol": "BOME/USDC:USDC", "currency": "USDC", "minNotional": 0.0, "maxNotional": 5000.0, @@ -9014,6 +10756,7 @@ }, { "tier": 2.0, + "symbol": "BOME/USDC:USDC", "currency": "USDC", "minNotional": 5000.0, "maxNotional": 50000.0, @@ -9030,6 +10773,7 @@ }, { "tier": 3.0, + "symbol": "BOME/USDC:USDC", "currency": "USDC", "minNotional": 50000.0, "maxNotional": 600000.0, @@ -9046,6 +10790,7 @@ }, { "tier": 4.0, + "symbol": "BOME/USDC:USDC", "currency": "USDC", "minNotional": 600000.0, "maxNotional": 1200000.0, @@ -9062,6 +10807,7 @@ }, { "tier": 5.0, + "symbol": "BOME/USDC:USDC", "currency": "USDC", "minNotional": 1200000.0, "maxNotional": 3000000.0, @@ -9078,6 +10824,7 @@ }, { "tier": 6.0, + "symbol": "BOME/USDC:USDC", "currency": "USDC", "minNotional": 3000000.0, "maxNotional": 4000000.0, @@ -9094,6 +10841,7 @@ }, { "tier": 7.0, + "symbol": "BOME/USDC:USDC", "currency": "USDC", "minNotional": 4000000.0, "maxNotional": 6000000.0, @@ -9110,6 +10858,7 @@ }, { "tier": 8.0, + "symbol": "BOME/USDC:USDC", "currency": "USDC", "minNotional": 6000000.0, "maxNotional": 10000000.0, @@ -9128,6 +10877,7 @@ "BOME/USDT:USDT": [ { "tier": 1.0, + "symbol": "BOME/USDT:USDT", "currency": "USDT", "minNotional": 0.0, "maxNotional": 10000.0, @@ -9144,6 +10894,7 @@ }, { "tier": 2.0, + "symbol": "BOME/USDT:USDT", "currency": "USDT", "minNotional": 10000.0, "maxNotional": 60000.0, @@ -9160,6 +10911,7 @@ }, { "tier": 3.0, + "symbol": "BOME/USDT:USDT", "currency": "USDT", "minNotional": 60000.0, "maxNotional": 300000.0, @@ -9176,6 +10928,7 @@ }, { "tier": 4.0, + "symbol": "BOME/USDT:USDT", "currency": "USDT", "minNotional": 300000.0, "maxNotional": 600000.0, @@ -9192,6 +10945,7 @@ }, { "tier": 5.0, + "symbol": "BOME/USDT:USDT", "currency": "USDT", "minNotional": 600000.0, "maxNotional": 3000000.0, @@ -9208,6 +10962,7 @@ }, { "tier": 6.0, + "symbol": "BOME/USDT:USDT", "currency": "USDT", "minNotional": 3000000.0, "maxNotional": 6000000.0, @@ -9224,6 +10979,7 @@ }, { "tier": 7.0, + "symbol": "BOME/USDT:USDT", "currency": "USDT", "minNotional": 6000000.0, "maxNotional": 7500000.0, @@ -9240,6 +10996,7 @@ }, { "tier": 8.0, + "symbol": "BOME/USDT:USDT", "currency": "USDT", "minNotional": 7500000.0, "maxNotional": 15000000.0, @@ -9256,6 +11013,7 @@ }, { "tier": 9.0, + "symbol": "BOME/USDT:USDT", "currency": "USDT", "minNotional": 15000000.0, "maxNotional": 30000000.0, @@ -9274,6 +11032,7 @@ "BOND/USDT:USDT": [ { "tier": 1.0, + "symbol": "BOND/USDT:USDT", "currency": "USDT", "minNotional": 0.0, "maxNotional": 5000.0, @@ -9290,6 +11049,7 @@ }, { "tier": 2.0, + "symbol": "BOND/USDT:USDT", "currency": "USDT", "minNotional": 5000.0, "maxNotional": 10000.0, @@ -9306,6 +11066,7 @@ }, { "tier": 3.0, + "symbol": "BOND/USDT:USDT", "currency": "USDT", "minNotional": 10000.0, "maxNotional": 100000.0, @@ -9322,6 +11083,7 @@ }, { "tier": 4.0, + "symbol": "BOND/USDT:USDT", "currency": "USDT", "minNotional": 100000.0, "maxNotional": 200000.0, @@ -9338,6 +11100,7 @@ }, { "tier": 5.0, + "symbol": "BOND/USDT:USDT", "currency": "USDT", "minNotional": 200000.0, "maxNotional": 500000.0, @@ -9354,6 +11117,7 @@ }, { "tier": 6.0, + "symbol": "BOND/USDT:USDT", "currency": "USDT", "minNotional": 500000.0, "maxNotional": 1000000.0, @@ -9370,6 +11134,7 @@ }, { "tier": 7.0, + "symbol": "BOND/USDT:USDT", "currency": "USDT", "minNotional": 1000000.0, "maxNotional": 2000000.0, @@ -9388,6 +11153,7 @@ "BRETT/USDT:USDT": [ { "tier": 1.0, + "symbol": "BRETT/USDT:USDT", "currency": "USDT", "minNotional": 0.0, "maxNotional": 5000.0, @@ -9404,6 +11170,7 @@ }, { "tier": 2.0, + "symbol": "BRETT/USDT:USDT", "currency": "USDT", "minNotional": 5000.0, "maxNotional": 10000.0, @@ -9420,6 +11187,7 @@ }, { "tier": 3.0, + "symbol": "BRETT/USDT:USDT", "currency": "USDT", "minNotional": 10000.0, "maxNotional": 30000.0, @@ -9436,6 +11204,7 @@ }, { "tier": 4.0, + "symbol": "BRETT/USDT:USDT", "currency": "USDT", "minNotional": 30000.0, "maxNotional": 60000.0, @@ -9452,6 +11221,7 @@ }, { "tier": 5.0, + "symbol": "BRETT/USDT:USDT", "currency": "USDT", "minNotional": 60000.0, "maxNotional": 300000.0, @@ -9468,6 +11238,7 @@ }, { "tier": 6.0, + "symbol": "BRETT/USDT:USDT", "currency": "USDT", "minNotional": 300000.0, "maxNotional": 600000.0, @@ -9484,6 +11255,7 @@ }, { "tier": 7.0, + "symbol": "BRETT/USDT:USDT", "currency": "USDT", "minNotional": 600000.0, "maxNotional": 750000.0, @@ -9500,6 +11272,7 @@ }, { "tier": 8.0, + "symbol": "BRETT/USDT:USDT", "currency": "USDT", "minNotional": 750000.0, "maxNotional": 1500000.0, @@ -9516,6 +11289,7 @@ }, { "tier": 9.0, + "symbol": "BRETT/USDT:USDT", "currency": "USDT", "minNotional": 1500000.0, "maxNotional": 3000000.0, @@ -9534,6 +11308,7 @@ "BSV/USDT:USDT": [ { "tier": 1.0, + "symbol": "BSV/USDT:USDT", "currency": "USDT", "minNotional": 0.0, "maxNotional": 5000.0, @@ -9550,6 +11325,7 @@ }, { "tier": 2.0, + "symbol": "BSV/USDT:USDT", "currency": "USDT", "minNotional": 5000.0, "maxNotional": 25000.0, @@ -9566,6 +11342,7 @@ }, { "tier": 3.0, + "symbol": "BSV/USDT:USDT", "currency": "USDT", "minNotional": 25000.0, "maxNotional": 100000.0, @@ -9582,6 +11359,7 @@ }, { "tier": 4.0, + "symbol": "BSV/USDT:USDT", "currency": "USDT", "minNotional": 100000.0, "maxNotional": 200000.0, @@ -9598,6 +11376,7 @@ }, { "tier": 5.0, + "symbol": "BSV/USDT:USDT", "currency": "USDT", "minNotional": 200000.0, "maxNotional": 500000.0, @@ -9614,6 +11393,7 @@ }, { "tier": 6.0, + "symbol": "BSV/USDT:USDT", "currency": "USDT", "minNotional": 500000.0, "maxNotional": 1000000.0, @@ -9630,6 +11410,7 @@ }, { "tier": 7.0, + "symbol": "BSV/USDT:USDT", "currency": "USDT", "minNotional": 1000000.0, "maxNotional": 2000000.0, @@ -9648,6 +11429,7 @@ "BSW/USDT:USDT": [ { "tier": 1.0, + "symbol": "BSW/USDT:USDT", "currency": "USDT", "minNotional": 0.0, "maxNotional": 5000.0, @@ -9664,6 +11446,7 @@ }, { "tier": 2.0, + "symbol": "BSW/USDT:USDT", "currency": "USDT", "minNotional": 5000.0, "maxNotional": 10000.0, @@ -9680,6 +11463,7 @@ }, { "tier": 3.0, + "symbol": "BSW/USDT:USDT", "currency": "USDT", "minNotional": 10000.0, "maxNotional": 20000.0, @@ -9696,6 +11480,7 @@ }, { "tier": 4.0, + "symbol": "BSW/USDT:USDT", "currency": "USDT", "minNotional": 20000.0, "maxNotional": 40000.0, @@ -9712,6 +11497,7 @@ }, { "tier": 5.0, + "symbol": "BSW/USDT:USDT", "currency": "USDT", "minNotional": 40000.0, "maxNotional": 200000.0, @@ -9728,6 +11514,7 @@ }, { "tier": 6.0, + "symbol": "BSW/USDT:USDT", "currency": "USDT", "minNotional": 200000.0, "maxNotional": 400000.0, @@ -9744,6 +11531,7 @@ }, { "tier": 7.0, + "symbol": "BSW/USDT:USDT", "currency": "USDT", "minNotional": 400000.0, "maxNotional": 500000.0, @@ -9760,6 +11548,7 @@ }, { "tier": 8.0, + "symbol": "BSW/USDT:USDT", "currency": "USDT", "minNotional": 500000.0, "maxNotional": 1000000.0, @@ -9776,6 +11565,7 @@ }, { "tier": 9.0, + "symbol": "BSW/USDT:USDT", "currency": "USDT", "minNotional": 1000000.0, "maxNotional": 2000000.0, @@ -9794,6 +11584,7 @@ "BTC/USDC:USDC": [ { "tier": 1.0, + "symbol": "BTC/USDC:USDC", "currency": "USDC", "minNotional": 0.0, "maxNotional": 50000.0, @@ -9810,6 +11601,7 @@ }, { "tier": 2.0, + "symbol": "BTC/USDC:USDC", "currency": "USDC", "minNotional": 50000.0, "maxNotional": 500000.0, @@ -9826,6 +11618,7 @@ }, { "tier": 3.0, + "symbol": "BTC/USDC:USDC", "currency": "USDC", "minNotional": 500000.0, "maxNotional": 10000000.0, @@ -9842,6 +11635,7 @@ }, { "tier": 4.0, + "symbol": "BTC/USDC:USDC", "currency": "USDC", "minNotional": 10000000.0, "maxNotional": 80000000.0, @@ -9858,6 +11652,7 @@ }, { "tier": 5.0, + "symbol": "BTC/USDC:USDC", "currency": "USDC", "minNotional": 80000000.0, "maxNotional": 150000000.0, @@ -9874,6 +11669,7 @@ }, { "tier": 6.0, + "symbol": "BTC/USDC:USDC", "currency": "USDC", "minNotional": 150000000.0, "maxNotional": 300000000.0, @@ -9890,6 +11686,7 @@ }, { "tier": 7.0, + "symbol": "BTC/USDC:USDC", "currency": "USDC", "minNotional": 300000000.0, "maxNotional": 450000000.0, @@ -9906,6 +11703,7 @@ }, { "tier": 8.0, + "symbol": "BTC/USDC:USDC", "currency": "USDC", "minNotional": 450000000.0, "maxNotional": 600000000.0, @@ -9922,6 +11720,7 @@ }, { "tier": 9.0, + "symbol": "BTC/USDC:USDC", "currency": "USDC", "minNotional": 600000000.0, "maxNotional": 800000000.0, @@ -9938,6 +11737,7 @@ }, { "tier": 10.0, + "symbol": "BTC/USDC:USDC", "currency": "USDC", "minNotional": 800000000.0, "maxNotional": 1000000000.0, @@ -9956,6 +11756,7 @@ "BTC/USDT:USDT": [ { "tier": 1.0, + "symbol": "BTC/USDT:USDT", "currency": "USDT", "minNotional": 0.0, "maxNotional": 50000.0, @@ -9972,6 +11773,7 @@ }, { "tier": 2.0, + "symbol": "BTC/USDT:USDT", "currency": "USDT", "minNotional": 50000.0, "maxNotional": 600000.0, @@ -9988,6 +11790,7 @@ }, { "tier": 3.0, + "symbol": "BTC/USDT:USDT", "currency": "USDT", "minNotional": 600000.0, "maxNotional": 3000000.0, @@ -10004,6 +11807,7 @@ }, { "tier": 4.0, + "symbol": "BTC/USDT:USDT", "currency": "USDT", "minNotional": 3000000.0, "maxNotional": 12000000.0, @@ -10020,6 +11824,7 @@ }, { "tier": 5.0, + "symbol": "BTC/USDT:USDT", "currency": "USDT", "minNotional": 12000000.0, "maxNotional": 70000000.0, @@ -10036,6 +11841,7 @@ }, { "tier": 6.0, + "symbol": "BTC/USDT:USDT", "currency": "USDT", "minNotional": 70000000.0, "maxNotional": 100000000.0, @@ -10052,6 +11858,7 @@ }, { "tier": 7.0, + "symbol": "BTC/USDT:USDT", "currency": "USDT", "minNotional": 100000000.0, "maxNotional": 230000000.0, @@ -10068,6 +11875,7 @@ }, { "tier": 8.0, + "symbol": "BTC/USDT:USDT", "currency": "USDT", "minNotional": 230000000.0, "maxNotional": 480000000.0, @@ -10084,6 +11892,7 @@ }, { "tier": 9.0, + "symbol": "BTC/USDT:USDT", "currency": "USDT", "minNotional": 480000000.0, "maxNotional": 600000000.0, @@ -10100,6 +11909,7 @@ }, { "tier": 10.0, + "symbol": "BTC/USDT:USDT", "currency": "USDT", "minNotional": 600000000.0, "maxNotional": 800000000.0, @@ -10116,6 +11926,7 @@ }, { "tier": 11.0, + "symbol": "BTC/USDT:USDT", "currency": "USDT", "minNotional": 800000000.0, "maxNotional": 1200000000.0, @@ -10132,6 +11943,7 @@ }, { "tier": 12.0, + "symbol": "BTC/USDT:USDT", "currency": "USDT", "minNotional": 1200000000.0, "maxNotional": 1800000000.0, @@ -10150,6 +11962,7 @@ "BTC/USDT:USDT-241227": [ { "tier": 1.0, + "symbol": "BTC/USDT:USDT-241227", "currency": "USDT", "minNotional": 0.0, "maxNotional": 50000.0, @@ -10166,6 +11979,7 @@ }, { "tier": 2.0, + "symbol": "BTC/USDT:USDT-241227", "currency": "USDT", "minNotional": 50000.0, "maxNotional": 375000.0, @@ -10182,6 +11996,7 @@ }, { "tier": 3.0, + "symbol": "BTC/USDT:USDT-241227", "currency": "USDT", "minNotional": 375000.0, "maxNotional": 2000000.0, @@ -10198,6 +12013,7 @@ }, { "tier": 4.0, + "symbol": "BTC/USDT:USDT-241227", "currency": "USDT", "minNotional": 2000000.0, "maxNotional": 4000000.0, @@ -10214,6 +12030,7 @@ }, { "tier": 5.0, + "symbol": "BTC/USDT:USDT-241227", "currency": "USDT", "minNotional": 4000000.0, "maxNotional": 10000000.0, @@ -10230,6 +12047,7 @@ }, { "tier": 6.0, + "symbol": "BTC/USDT:USDT-241227", "currency": "USDT", "minNotional": 10000000.0, "maxNotional": 20000000.0, @@ -10246,6 +12064,7 @@ }, { "tier": 7.0, + "symbol": "BTC/USDT:USDT-241227", "currency": "USDT", "minNotional": 20000000.0, "maxNotional": 40000000.0, @@ -10262,6 +12081,7 @@ }, { "tier": 8.0, + "symbol": "BTC/USDT:USDT-241227", "currency": "USDT", "minNotional": 40000000.0, "maxNotional": 120000000.0, @@ -10280,6 +12100,7 @@ "BTC/USDT:USDT-250328": [ { "tier": 1.0, + "symbol": "BTC/USDT:USDT-250328", "currency": "USDT", "minNotional": 0.0, "maxNotional": 50000.0, @@ -10296,6 +12117,7 @@ }, { "tier": 2.0, + "symbol": "BTC/USDT:USDT-250328", "currency": "USDT", "minNotional": 50000.0, "maxNotional": 375000.0, @@ -10312,6 +12134,7 @@ }, { "tier": 3.0, + "symbol": "BTC/USDT:USDT-250328", "currency": "USDT", "minNotional": 375000.0, "maxNotional": 2000000.0, @@ -10328,6 +12151,7 @@ }, { "tier": 4.0, + "symbol": "BTC/USDT:USDT-250328", "currency": "USDT", "minNotional": 2000000.0, "maxNotional": 4000000.0, @@ -10344,6 +12168,7 @@ }, { "tier": 5.0, + "symbol": "BTC/USDT:USDT-250328", "currency": "USDT", "minNotional": 4000000.0, "maxNotional": 10000000.0, @@ -10360,6 +12185,7 @@ }, { "tier": 6.0, + "symbol": "BTC/USDT:USDT-250328", "currency": "USDT", "minNotional": 10000000.0, "maxNotional": 20000000.0, @@ -10376,6 +12202,7 @@ }, { "tier": 7.0, + "symbol": "BTC/USDT:USDT-250328", "currency": "USDT", "minNotional": 20000000.0, "maxNotional": 40000000.0, @@ -10392,6 +12219,7 @@ }, { "tier": 8.0, + "symbol": "BTC/USDT:USDT-250328", "currency": "USDT", "minNotional": 40000000.0, "maxNotional": 120000000.0, @@ -10410,6 +12238,7 @@ "BTCDOM/USDT:USDT": [ { "tier": 1.0, + "symbol": "BTCDOM/USDT:USDT", "currency": "USDT", "minNotional": 0.0, "maxNotional": 5000.0, @@ -10426,6 +12255,7 @@ }, { "tier": 2.0, + "symbol": "BTCDOM/USDT:USDT", "currency": "USDT", "minNotional": 5000.0, "maxNotional": 25000.0, @@ -10442,6 +12272,7 @@ }, { "tier": 3.0, + "symbol": "BTCDOM/USDT:USDT", "currency": "USDT", "minNotional": 25000.0, "maxNotional": 100000.0, @@ -10458,6 +12289,7 @@ }, { "tier": 4.0, + "symbol": "BTCDOM/USDT:USDT", "currency": "USDT", "minNotional": 100000.0, "maxNotional": 250000.0, @@ -10474,6 +12306,7 @@ }, { "tier": 5.0, + "symbol": "BTCDOM/USDT:USDT", "currency": "USDT", "minNotional": 250000.0, "maxNotional": 1000000.0, @@ -10490,6 +12323,7 @@ }, { "tier": 6.0, + "symbol": "BTCDOM/USDT:USDT", "currency": "USDT", "minNotional": 1000000.0, "maxNotional": 3000000.0, @@ -10508,6 +12342,7 @@ "BTCST/USDT:USDT": [ { "tier": 1.0, + "symbol": "BTCST/USDT:USDT", "currency": "USDT", "minNotional": 0.0, "maxNotional": 5000.0, @@ -10524,6 +12359,7 @@ }, { "tier": 2.0, + "symbol": "BTCST/USDT:USDT", "currency": "USDT", "minNotional": 5000.0, "maxNotional": 25000.0, @@ -10540,6 +12376,7 @@ }, { "tier": 3.0, + "symbol": "BTCST/USDT:USDT", "currency": "USDT", "minNotional": 25000.0, "maxNotional": 100000.0, @@ -10556,6 +12393,7 @@ }, { "tier": 4.0, + "symbol": "BTCST/USDT:USDT", "currency": "USDT", "minNotional": 100000.0, "maxNotional": 250000.0, @@ -10572,6 +12410,7 @@ }, { "tier": 5.0, + "symbol": "BTCST/USDT:USDT", "currency": "USDT", "minNotional": 250000.0, "maxNotional": 1000000.0, @@ -10588,6 +12427,7 @@ }, { "tier": 6.0, + "symbol": "BTCST/USDT:USDT", "currency": "USDT", "minNotional": 1000000.0, "maxNotional": 9.223372036854776e+18, @@ -10606,6 +12446,7 @@ "C98/USDT:USDT": [ { "tier": 1.0, + "symbol": "C98/USDT:USDT", "currency": "USDT", "minNotional": 0.0, "maxNotional": 5000.0, @@ -10622,6 +12463,7 @@ }, { "tier": 2.0, + "symbol": "C98/USDT:USDT", "currency": "USDT", "minNotional": 5000.0, "maxNotional": 25000.0, @@ -10638,6 +12480,7 @@ }, { "tier": 3.0, + "symbol": "C98/USDT:USDT", "currency": "USDT", "minNotional": 25000.0, "maxNotional": 300000.0, @@ -10654,6 +12497,7 @@ }, { "tier": 4.0, + "symbol": "C98/USDT:USDT", "currency": "USDT", "minNotional": 300000.0, "maxNotional": 800000.0, @@ -10670,6 +12514,7 @@ }, { "tier": 5.0, + "symbol": "C98/USDT:USDT", "currency": "USDT", "minNotional": 800000.0, "maxNotional": 1000000.0, @@ -10686,6 +12531,7 @@ }, { "tier": 6.0, + "symbol": "C98/USDT:USDT", "currency": "USDT", "minNotional": 1000000.0, "maxNotional": 3000000.0, @@ -10702,6 +12548,7 @@ }, { "tier": 7.0, + "symbol": "C98/USDT:USDT", "currency": "USDT", "minNotional": 3000000.0, "maxNotional": 5000000.0, @@ -10720,6 +12567,7 @@ "CAKE/USDT:USDT": [ { "tier": 1.0, + "symbol": "CAKE/USDT:USDT", "currency": "USDT", "minNotional": 0.0, "maxNotional": 5000.0, @@ -10736,6 +12584,7 @@ }, { "tier": 2.0, + "symbol": "CAKE/USDT:USDT", "currency": "USDT", "minNotional": 5000.0, "maxNotional": 10000.0, @@ -10752,6 +12601,7 @@ }, { "tier": 3.0, + "symbol": "CAKE/USDT:USDT", "currency": "USDT", "minNotional": 10000.0, "maxNotional": 50000.0, @@ -10768,6 +12618,7 @@ }, { "tier": 4.0, + "symbol": "CAKE/USDT:USDT", "currency": "USDT", "minNotional": 50000.0, "maxNotional": 100000.0, @@ -10784,6 +12635,7 @@ }, { "tier": 5.0, + "symbol": "CAKE/USDT:USDT", "currency": "USDT", "minNotional": 100000.0, "maxNotional": 500000.0, @@ -10800,6 +12652,7 @@ }, { "tier": 6.0, + "symbol": "CAKE/USDT:USDT", "currency": "USDT", "minNotional": 500000.0, "maxNotional": 1000000.0, @@ -10816,6 +12669,7 @@ }, { "tier": 7.0, + "symbol": "CAKE/USDT:USDT", "currency": "USDT", "minNotional": 1000000.0, "maxNotional": 1250000.0, @@ -10832,6 +12686,7 @@ }, { "tier": 8.0, + "symbol": "CAKE/USDT:USDT", "currency": "USDT", "minNotional": 1250000.0, "maxNotional": 2500000.0, @@ -10848,6 +12703,7 @@ }, { "tier": 9.0, + "symbol": "CAKE/USDT:USDT", "currency": "USDT", "minNotional": 2500000.0, "maxNotional": 5000000.0, @@ -10866,6 +12722,7 @@ "CATI/USDT:USDT": [ { "tier": 1.0, + "symbol": "CATI/USDT:USDT", "currency": "USDT", "minNotional": 0.0, "maxNotional": 10000.0, @@ -10882,6 +12739,7 @@ }, { "tier": 2.0, + "symbol": "CATI/USDT:USDT", "currency": "USDT", "minNotional": 10000.0, "maxNotional": 30000.0, @@ -10898,6 +12756,7 @@ }, { "tier": 3.0, + "symbol": "CATI/USDT:USDT", "currency": "USDT", "minNotional": 30000.0, "maxNotional": 150000.0, @@ -10914,6 +12773,7 @@ }, { "tier": 4.0, + "symbol": "CATI/USDT:USDT", "currency": "USDT", "minNotional": 150000.0, "maxNotional": 300000.0, @@ -10930,6 +12790,7 @@ }, { "tier": 5.0, + "symbol": "CATI/USDT:USDT", "currency": "USDT", "minNotional": 300000.0, "maxNotional": 1500000.0, @@ -10946,6 +12807,7 @@ }, { "tier": 6.0, + "symbol": "CATI/USDT:USDT", "currency": "USDT", "minNotional": 1500000.0, "maxNotional": 3000000.0, @@ -10962,6 +12824,7 @@ }, { "tier": 7.0, + "symbol": "CATI/USDT:USDT", "currency": "USDT", "minNotional": 3000000.0, "maxNotional": 3750000.0, @@ -10978,6 +12841,7 @@ }, { "tier": 8.0, + "symbol": "CATI/USDT:USDT", "currency": "USDT", "minNotional": 3750000.0, "maxNotional": 7500000.0, @@ -10994,6 +12858,7 @@ }, { "tier": 9.0, + "symbol": "CATI/USDT:USDT", "currency": "USDT", "minNotional": 7500000.0, "maxNotional": 15000000.0, @@ -11012,6 +12877,7 @@ "CELO/USDT:USDT": [ { "tier": 1.0, + "symbol": "CELO/USDT:USDT", "currency": "USDT", "minNotional": 0.0, "maxNotional": 5000.0, @@ -11028,6 +12894,7 @@ }, { "tier": 2.0, + "symbol": "CELO/USDT:USDT", "currency": "USDT", "minNotional": 5000.0, "maxNotional": 16000.0, @@ -11044,6 +12911,7 @@ }, { "tier": 3.0, + "symbol": "CELO/USDT:USDT", "currency": "USDT", "minNotional": 16000.0, "maxNotional": 80000.0, @@ -11060,6 +12928,7 @@ }, { "tier": 4.0, + "symbol": "CELO/USDT:USDT", "currency": "USDT", "minNotional": 80000.0, "maxNotional": 160000.0, @@ -11076,6 +12945,7 @@ }, { "tier": 5.0, + "symbol": "CELO/USDT:USDT", "currency": "USDT", "minNotional": 160000.0, "maxNotional": 800000.0, @@ -11092,6 +12962,7 @@ }, { "tier": 6.0, + "symbol": "CELO/USDT:USDT", "currency": "USDT", "minNotional": 800000.0, "maxNotional": 1600000.0, @@ -11108,6 +12979,7 @@ }, { "tier": 7.0, + "symbol": "CELO/USDT:USDT", "currency": "USDT", "minNotional": 1600000.0, "maxNotional": 2000000.0, @@ -11124,6 +12996,7 @@ }, { "tier": 8.0, + "symbol": "CELO/USDT:USDT", "currency": "USDT", "minNotional": 2000000.0, "maxNotional": 4000000.0, @@ -11140,6 +13013,7 @@ }, { "tier": 9.0, + "symbol": "CELO/USDT:USDT", "currency": "USDT", "minNotional": 4000000.0, "maxNotional": 8000000.0, @@ -11158,6 +13032,7 @@ "CELR/USDT:USDT": [ { "tier": 1.0, + "symbol": "CELR/USDT:USDT", "currency": "USDT", "minNotional": 0.0, "maxNotional": 5000.0, @@ -11174,6 +13049,7 @@ }, { "tier": 2.0, + "symbol": "CELR/USDT:USDT", "currency": "USDT", "minNotional": 5000.0, "maxNotional": 25000.0, @@ -11190,6 +13066,7 @@ }, { "tier": 3.0, + "symbol": "CELR/USDT:USDT", "currency": "USDT", "minNotional": 25000.0, "maxNotional": 600000.0, @@ -11206,6 +13083,7 @@ }, { "tier": 4.0, + "symbol": "CELR/USDT:USDT", "currency": "USDT", "minNotional": 600000.0, "maxNotional": 1600000.0, @@ -11222,6 +13100,7 @@ }, { "tier": 5.0, + "symbol": "CELR/USDT:USDT", "currency": "USDT", "minNotional": 1600000.0, "maxNotional": 2000000.0, @@ -11238,6 +13117,7 @@ }, { "tier": 6.0, + "symbol": "CELR/USDT:USDT", "currency": "USDT", "minNotional": 2000000.0, "maxNotional": 6000000.0, @@ -11254,6 +13134,7 @@ }, { "tier": 7.0, + "symbol": "CELR/USDT:USDT", "currency": "USDT", "minNotional": 6000000.0, "maxNotional": 10000000.0, @@ -11269,9 +13150,165 @@ } } ], + "CETUS/USDT:USDT": [ + { + "tier": 1.0, + "symbol": "CETUS/USDT:USDT", + "currency": "USDT", + "minNotional": 0.0, + "maxNotional": 5000.0, + "maintenanceMarginRate": 0.01, + "maxLeverage": 75.0, + "info": { + "bracket": "1", + "initialLeverage": "75", + "notionalCap": "5000", + "notionalFloor": "0", + "maintMarginRatio": "0.01", + "cum": "0.0" + } + }, + { + "tier": 2.0, + "symbol": "CETUS/USDT:USDT", + "currency": "USDT", + "minNotional": 5000.0, + "maxNotional": 10000.0, + "maintenanceMarginRate": 0.015, + "maxLeverage": 50.0, + "info": { + "bracket": "2", + "initialLeverage": "50", + "notionalCap": "10000", + "notionalFloor": "5000", + "maintMarginRatio": "0.015", + "cum": "25.0" + } + }, + { + "tier": 3.0, + "symbol": "CETUS/USDT:USDT", + "currency": "USDT", + "minNotional": 10000.0, + "maxNotional": 30000.0, + "maintenanceMarginRate": 0.02, + "maxLeverage": 25.0, + "info": { + "bracket": "3", + "initialLeverage": "25", + "notionalCap": "30000", + "notionalFloor": "10000", + "maintMarginRatio": "0.02", + "cum": "75.0" + } + }, + { + "tier": 4.0, + "symbol": "CETUS/USDT:USDT", + "currency": "USDT", + "minNotional": 30000.0, + "maxNotional": 60000.0, + "maintenanceMarginRate": 0.025, + "maxLeverage": 20.0, + "info": { + "bracket": "4", + "initialLeverage": "20", + "notionalCap": "60000", + "notionalFloor": "30000", + "maintMarginRatio": "0.025", + "cum": "225.0" + } + }, + { + "tier": 5.0, + "symbol": "CETUS/USDT:USDT", + "currency": "USDT", + "minNotional": 60000.0, + "maxNotional": 300000.0, + "maintenanceMarginRate": 0.05, + "maxLeverage": 10.0, + "info": { + "bracket": "5", + "initialLeverage": "10", + "notionalCap": "300000", + "notionalFloor": "60000", + "maintMarginRatio": "0.05", + "cum": "1725.0" + } + }, + { + "tier": 6.0, + "symbol": "CETUS/USDT:USDT", + "currency": "USDT", + "minNotional": 300000.0, + "maxNotional": 600000.0, + "maintenanceMarginRate": 0.1, + "maxLeverage": 5.0, + "info": { + "bracket": "6", + "initialLeverage": "5", + "notionalCap": "600000", + "notionalFloor": "300000", + "maintMarginRatio": "0.1", + "cum": "16725.0" + } + }, + { + "tier": 7.0, + "symbol": "CETUS/USDT:USDT", + "currency": "USDT", + "minNotional": 600000.0, + "maxNotional": 750000.0, + "maintenanceMarginRate": 0.125, + "maxLeverage": 4.0, + "info": { + "bracket": "7", + "initialLeverage": "4", + "notionalCap": "750000", + "notionalFloor": "600000", + "maintMarginRatio": "0.125", + "cum": "31725.0" + } + }, + { + "tier": 8.0, + "symbol": "CETUS/USDT:USDT", + "currency": "USDT", + "minNotional": 750000.0, + "maxNotional": 1500000.0, + "maintenanceMarginRate": 0.25, + "maxLeverage": 2.0, + "info": { + "bracket": "8", + "initialLeverage": "2", + "notionalCap": "1500000", + "notionalFloor": "750000", + "maintMarginRatio": "0.25", + "cum": "125475.0" + } + }, + { + "tier": 9.0, + "symbol": "CETUS/USDT:USDT", + "currency": "USDT", + "minNotional": 1500000.0, + "maxNotional": 3000000.0, + "maintenanceMarginRate": 0.5, + "maxLeverage": 1.0, + "info": { + "bracket": "9", + "initialLeverage": "1", + "notionalCap": "3000000", + "notionalFloor": "1500000", + "maintMarginRatio": "0.5", + "cum": "500475.0" + } + } + ], "CFX/USDT:USDT": [ { "tier": 1.0, + "symbol": "CFX/USDT:USDT", "currency": "USDT", "minNotional": 0.0, "maxNotional": 10000.0, @@ -11288,6 +13325,7 @@ }, { "tier": 2.0, + "symbol": "CFX/USDT:USDT", "currency": "USDT", "minNotional": 10000.0, "maxNotional": 60000.0, @@ -11304,6 +13342,7 @@ }, { "tier": 3.0, + "symbol": "CFX/USDT:USDT", "currency": "USDT", "minNotional": 60000.0, "maxNotional": 400000.0, @@ -11320,6 +13359,7 @@ }, { "tier": 4.0, + "symbol": "CFX/USDT:USDT", "currency": "USDT", "minNotional": 400000.0, "maxNotional": 600000.0, @@ -11336,6 +13376,7 @@ }, { "tier": 5.0, + "symbol": "CFX/USDT:USDT", "currency": "USDT", "minNotional": 600000.0, "maxNotional": 3000000.0, @@ -11352,6 +13393,7 @@ }, { "tier": 6.0, + "symbol": "CFX/USDT:USDT", "currency": "USDT", "minNotional": 3000000.0, "maxNotional": 6000000.0, @@ -11368,6 +13410,7 @@ }, { "tier": 7.0, + "symbol": "CFX/USDT:USDT", "currency": "USDT", "minNotional": 6000000.0, "maxNotional": 7500000.0, @@ -11384,6 +13427,7 @@ }, { "tier": 8.0, + "symbol": "CFX/USDT:USDT", "currency": "USDT", "minNotional": 7500000.0, "maxNotional": 18000000.0, @@ -11400,6 +13444,7 @@ }, { "tier": 9.0, + "symbol": "CFX/USDT:USDT", "currency": "USDT", "minNotional": 18000000.0, "maxNotional": 30000000.0, @@ -11418,6 +13463,7 @@ "CHESS/USDT:USDT": [ { "tier": 1.0, + "symbol": "CHESS/USDT:USDT", "currency": "USDT", "minNotional": 0.0, "maxNotional": 5000.0, @@ -11434,6 +13480,7 @@ }, { "tier": 2.0, + "symbol": "CHESS/USDT:USDT", "currency": "USDT", "minNotional": 5000.0, "maxNotional": 10000.0, @@ -11450,6 +13497,7 @@ }, { "tier": 3.0, + "symbol": "CHESS/USDT:USDT", "currency": "USDT", "minNotional": 10000.0, "maxNotional": 20000.0, @@ -11466,6 +13514,7 @@ }, { "tier": 4.0, + "symbol": "CHESS/USDT:USDT", "currency": "USDT", "minNotional": 20000.0, "maxNotional": 40000.0, @@ -11482,6 +13531,7 @@ }, { "tier": 5.0, + "symbol": "CHESS/USDT:USDT", "currency": "USDT", "minNotional": 40000.0, "maxNotional": 200000.0, @@ -11498,6 +13548,7 @@ }, { "tier": 6.0, + "symbol": "CHESS/USDT:USDT", "currency": "USDT", "minNotional": 200000.0, "maxNotional": 400000.0, @@ -11514,6 +13565,7 @@ }, { "tier": 7.0, + "symbol": "CHESS/USDT:USDT", "currency": "USDT", "minNotional": 400000.0, "maxNotional": 500000.0, @@ -11530,6 +13582,7 @@ }, { "tier": 8.0, + "symbol": "CHESS/USDT:USDT", "currency": "USDT", "minNotional": 500000.0, "maxNotional": 1000000.0, @@ -11546,6 +13599,7 @@ }, { "tier": 9.0, + "symbol": "CHESS/USDT:USDT", "currency": "USDT", "minNotional": 1000000.0, "maxNotional": 2000000.0, @@ -11561,9 +13615,165 @@ } } ], + "CHILLGUY/USDT:USDT": [ + { + "tier": 1.0, + "symbol": "CHILLGUY/USDT:USDT", + "currency": "USDT", + "minNotional": 0.0, + "maxNotional": 5000.0, + "maintenanceMarginRate": 0.01, + "maxLeverage": 75.0, + "info": { + "bracket": "1", + "initialLeverage": "75", + "notionalCap": "5000", + "notionalFloor": "0", + "maintMarginRatio": "0.01", + "cum": "0.0" + } + }, + { + "tier": 2.0, + "symbol": "CHILLGUY/USDT:USDT", + "currency": "USDT", + "minNotional": 5000.0, + "maxNotional": 10000.0, + "maintenanceMarginRate": 0.015, + "maxLeverage": 50.0, + "info": { + "bracket": "2", + "initialLeverage": "50", + "notionalCap": "10000", + "notionalFloor": "5000", + "maintMarginRatio": "0.015", + "cum": "25.0" + } + }, + { + "tier": 3.0, + "symbol": "CHILLGUY/USDT:USDT", + "currency": "USDT", + "minNotional": 10000.0, + "maxNotional": 30000.0, + "maintenanceMarginRate": 0.02, + "maxLeverage": 25.0, + "info": { + "bracket": "3", + "initialLeverage": "25", + "notionalCap": "30000", + "notionalFloor": "10000", + "maintMarginRatio": "0.02", + "cum": "75.0" + } + }, + { + "tier": 4.0, + "symbol": "CHILLGUY/USDT:USDT", + "currency": "USDT", + "minNotional": 30000.0, + "maxNotional": 60000.0, + "maintenanceMarginRate": 0.025, + "maxLeverage": 20.0, + "info": { + "bracket": "4", + "initialLeverage": "20", + "notionalCap": "60000", + "notionalFloor": "30000", + "maintMarginRatio": "0.025", + "cum": "225.0" + } + }, + { + "tier": 5.0, + "symbol": "CHILLGUY/USDT:USDT", + "currency": "USDT", + "minNotional": 60000.0, + "maxNotional": 300000.0, + "maintenanceMarginRate": 0.05, + "maxLeverage": 10.0, + "info": { + "bracket": "5", + "initialLeverage": "10", + "notionalCap": "300000", + "notionalFloor": "60000", + "maintMarginRatio": "0.05", + "cum": "1725.0" + } + }, + { + "tier": 6.0, + "symbol": "CHILLGUY/USDT:USDT", + "currency": "USDT", + "minNotional": 300000.0, + "maxNotional": 600000.0, + "maintenanceMarginRate": 0.1, + "maxLeverage": 5.0, + "info": { + "bracket": "6", + "initialLeverage": "5", + "notionalCap": "600000", + "notionalFloor": "300000", + "maintMarginRatio": "0.1", + "cum": "16725.0" + } + }, + { + "tier": 7.0, + "symbol": "CHILLGUY/USDT:USDT", + "currency": "USDT", + "minNotional": 600000.0, + "maxNotional": 750000.0, + "maintenanceMarginRate": 0.125, + "maxLeverage": 4.0, + "info": { + "bracket": "7", + "initialLeverage": "4", + "notionalCap": "750000", + "notionalFloor": "600000", + "maintMarginRatio": "0.125", + "cum": "31725.0" + } + }, + { + "tier": 8.0, + "symbol": "CHILLGUY/USDT:USDT", + "currency": "USDT", + "minNotional": 750000.0, + "maxNotional": 1500000.0, + "maintenanceMarginRate": 0.25, + "maxLeverage": 2.0, + "info": { + "bracket": "8", + "initialLeverage": "2", + "notionalCap": "1500000", + "notionalFloor": "750000", + "maintMarginRatio": "0.25", + "cum": "125475.0" + } + }, + { + "tier": 9.0, + "symbol": "CHILLGUY/USDT:USDT", + "currency": "USDT", + "minNotional": 1500000.0, + "maxNotional": 3000000.0, + "maintenanceMarginRate": 0.5, + "maxLeverage": 1.0, + "info": { + "bracket": "9", + "initialLeverage": "1", + "notionalCap": "3000000", + "notionalFloor": "1500000", + "maintMarginRatio": "0.5", + "cum": "500475.0" + } + } + ], "CHR/USDT:USDT": [ { "tier": 1.0, + "symbol": "CHR/USDT:USDT", "currency": "USDT", "minNotional": 0.0, "maxNotional": 5000.0, @@ -11580,6 +13790,7 @@ }, { "tier": 2.0, + "symbol": "CHR/USDT:USDT", "currency": "USDT", "minNotional": 5000.0, "maxNotional": 25000.0, @@ -11596,6 +13807,7 @@ }, { "tier": 3.0, + "symbol": "CHR/USDT:USDT", "currency": "USDT", "minNotional": 25000.0, "maxNotional": 200000.0, @@ -11612,6 +13824,7 @@ }, { "tier": 4.0, + "symbol": "CHR/USDT:USDT", "currency": "USDT", "minNotional": 200000.0, "maxNotional": 500000.0, @@ -11628,6 +13841,7 @@ }, { "tier": 5.0, + "symbol": "CHR/USDT:USDT", "currency": "USDT", "minNotional": 500000.0, "maxNotional": 1000000.0, @@ -11644,6 +13858,7 @@ }, { "tier": 6.0, + "symbol": "CHR/USDT:USDT", "currency": "USDT", "minNotional": 1000000.0, "maxNotional": 5000000.0, @@ -11662,6 +13877,7 @@ "CHZ/USDT:USDT": [ { "tier": 1.0, + "symbol": "CHZ/USDT:USDT", "currency": "USDT", "minNotional": 0.0, "maxNotional": 5000.0, @@ -11678,6 +13894,7 @@ }, { "tier": 2.0, + "symbol": "CHZ/USDT:USDT", "currency": "USDT", "minNotional": 5000.0, "maxNotional": 16000.0, @@ -11694,6 +13911,7 @@ }, { "tier": 3.0, + "symbol": "CHZ/USDT:USDT", "currency": "USDT", "minNotional": 16000.0, "maxNotional": 80000.0, @@ -11710,6 +13928,7 @@ }, { "tier": 4.0, + "symbol": "CHZ/USDT:USDT", "currency": "USDT", "minNotional": 80000.0, "maxNotional": 160000.0, @@ -11726,6 +13945,7 @@ }, { "tier": 5.0, + "symbol": "CHZ/USDT:USDT", "currency": "USDT", "minNotional": 160000.0, "maxNotional": 800000.0, @@ -11742,6 +13962,7 @@ }, { "tier": 6.0, + "symbol": "CHZ/USDT:USDT", "currency": "USDT", "minNotional": 800000.0, "maxNotional": 1600000.0, @@ -11758,6 +13979,7 @@ }, { "tier": 7.0, + "symbol": "CHZ/USDT:USDT", "currency": "USDT", "minNotional": 1600000.0, "maxNotional": 2000000.0, @@ -11774,6 +13996,7 @@ }, { "tier": 8.0, + "symbol": "CHZ/USDT:USDT", "currency": "USDT", "minNotional": 2000000.0, "maxNotional": 4000000.0, @@ -11790,6 +14013,7 @@ }, { "tier": 9.0, + "symbol": "CHZ/USDT:USDT", "currency": "USDT", "minNotional": 4000000.0, "maxNotional": 8000000.0, @@ -11808,6 +14032,7 @@ "CKB/USDT:USDT": [ { "tier": 1.0, + "symbol": "CKB/USDT:USDT", "currency": "USDT", "minNotional": 0.0, "maxNotional": 10000.0, @@ -11824,6 +14049,7 @@ }, { "tier": 2.0, + "symbol": "CKB/USDT:USDT", "currency": "USDT", "minNotional": 10000.0, "maxNotional": 20000.0, @@ -11840,6 +14066,7 @@ }, { "tier": 3.0, + "symbol": "CKB/USDT:USDT", "currency": "USDT", "minNotional": 20000.0, "maxNotional": 100000.0, @@ -11856,6 +14083,7 @@ }, { "tier": 4.0, + "symbol": "CKB/USDT:USDT", "currency": "USDT", "minNotional": 100000.0, "maxNotional": 200000.0, @@ -11872,6 +14100,7 @@ }, { "tier": 5.0, + "symbol": "CKB/USDT:USDT", "currency": "USDT", "minNotional": 200000.0, "maxNotional": 1000000.0, @@ -11888,6 +14117,7 @@ }, { "tier": 6.0, + "symbol": "CKB/USDT:USDT", "currency": "USDT", "minNotional": 1000000.0, "maxNotional": 2000000.0, @@ -11904,6 +14134,7 @@ }, { "tier": 7.0, + "symbol": "CKB/USDT:USDT", "currency": "USDT", "minNotional": 2000000.0, "maxNotional": 2500000.0, @@ -11920,6 +14151,7 @@ }, { "tier": 8.0, + "symbol": "CKB/USDT:USDT", "currency": "USDT", "minNotional": 2500000.0, "maxNotional": 5000000.0, @@ -11936,6 +14168,7 @@ }, { "tier": 9.0, + "symbol": "CKB/USDT:USDT", "currency": "USDT", "minNotional": 5000000.0, "maxNotional": 10000000.0, @@ -11954,6 +14187,7 @@ "COMBO/USDT:USDT": [ { "tier": 1.0, + "symbol": "COMBO/USDT:USDT", "currency": "USDT", "minNotional": 0.0, "maxNotional": 5000.0, @@ -11970,6 +14204,7 @@ }, { "tier": 2.0, + "symbol": "COMBO/USDT:USDT", "currency": "USDT", "minNotional": 5000.0, "maxNotional": 25000.0, @@ -11986,6 +14221,7 @@ }, { "tier": 3.0, + "symbol": "COMBO/USDT:USDT", "currency": "USDT", "minNotional": 25000.0, "maxNotional": 200000.0, @@ -12002,6 +14238,7 @@ }, { "tier": 4.0, + "symbol": "COMBO/USDT:USDT", "currency": "USDT", "minNotional": 200000.0, "maxNotional": 500000.0, @@ -12018,6 +14255,7 @@ }, { "tier": 5.0, + "symbol": "COMBO/USDT:USDT", "currency": "USDT", "minNotional": 500000.0, "maxNotional": 1000000.0, @@ -12034,6 +14272,7 @@ }, { "tier": 6.0, + "symbol": "COMBO/USDT:USDT", "currency": "USDT", "minNotional": 1000000.0, "maxNotional": 3000000.0, @@ -12050,6 +14289,7 @@ }, { "tier": 7.0, + "symbol": "COMBO/USDT:USDT", "currency": "USDT", "minNotional": 3000000.0, "maxNotional": 5000000.0, @@ -12068,120 +14308,7 @@ "COMP/USDT:USDT": [ { "tier": 1.0, - "currency": "USDT", - "minNotional": 0.0, - "maxNotional": 5000.0, - "maintenanceMarginRate": 0.01, - "maxLeverage": 25.0, - "info": { - "bracket": "1", - "initialLeverage": "25", - "notionalCap": "5000", - "notionalFloor": "0", - "maintMarginRatio": "0.01", - "cum": "0.0" - } - }, - { - "tier": 2.0, - "currency": "USDT", - "minNotional": 5000.0, - "maxNotional": 50000.0, - "maintenanceMarginRate": 0.025, - "maxLeverage": 20.0, - "info": { - "bracket": "2", - "initialLeverage": "20", - "notionalCap": "50000", - "notionalFloor": "5000", - "maintMarginRatio": "0.025", - "cum": "75.0" - } - }, - { - "tier": 3.0, - "currency": "USDT", - "minNotional": 50000.0, - "maxNotional": 400000.0, - "maintenanceMarginRate": 0.05, - "maxLeverage": 10.0, - "info": { - "bracket": "3", - "initialLeverage": "10", - "notionalCap": "400000", - "notionalFloor": "50000", - "maintMarginRatio": "0.05", - "cum": "1325.0" - } - }, - { - "tier": 4.0, - "currency": "USDT", - "minNotional": 400000.0, - "maxNotional": 1000000.0, - "maintenanceMarginRate": 0.1, - "maxLeverage": 5.0, - "info": { - "bracket": "4", - "initialLeverage": "5", - "notionalCap": "1000000", - "notionalFloor": "400000", - "maintMarginRatio": "0.1", - "cum": "21325.0" - } - }, - { - "tier": 5.0, - "currency": "USDT", - "minNotional": 1000000.0, - "maxNotional": 1200000.0, - "maintenanceMarginRate": 0.125, - "maxLeverage": 4.0, - "info": { - "bracket": "5", - "initialLeverage": "4", - "notionalCap": "1200000", - "notionalFloor": "1000000", - "maintMarginRatio": "0.125", - "cum": "46325.0" - } - }, - { - "tier": 6.0, - "currency": "USDT", - "minNotional": 1200000.0, - "maxNotional": 2000000.0, - "maintenanceMarginRate": 0.25, - "maxLeverage": 2.0, - "info": { - "bracket": "6", - "initialLeverage": "2", - "notionalCap": "2000000", - "notionalFloor": "1200000", - "maintMarginRatio": "0.25", - "cum": "196325.0" - } - }, - { - "tier": 7.0, - "currency": "USDT", - "minNotional": 2000000.0, - "maxNotional": 5000000.0, - "maintenanceMarginRate": 0.5, - "maxLeverage": 1.0, - "info": { - "bracket": "7", - "initialLeverage": "1", - "notionalCap": "5000000", - "notionalFloor": "2000000", - "maintMarginRatio": "0.5", - "cum": "696325.0" - } - } - ], - "COS/USDT:USDT": [ - { - "tier": 1.0, + "symbol": "COMP/USDT:USDT", "currency": "USDT", "minNotional": 0.0, "maxNotional": 5000.0, @@ -12198,6 +14325,7 @@ }, { "tier": 2.0, + "symbol": "COMP/USDT:USDT", "currency": "USDT", "minNotional": 5000.0, "maxNotional": 10000.0, @@ -12214,6 +14342,162 @@ }, { "tier": 3.0, + "symbol": "COMP/USDT:USDT", + "currency": "USDT", + "minNotional": 10000.0, + "maxNotional": 50000.0, + "maintenanceMarginRate": 0.02, + "maxLeverage": 25.0, + "info": { + "bracket": "3", + "initialLeverage": "25", + "notionalCap": "50000", + "notionalFloor": "10000", + "maintMarginRatio": "0.02", + "cum": "75.0" + } + }, + { + "tier": 4.0, + "symbol": "COMP/USDT:USDT", + "currency": "USDT", + "minNotional": 50000.0, + "maxNotional": 100000.0, + "maintenanceMarginRate": 0.025, + "maxLeverage": 20.0, + "info": { + "bracket": "4", + "initialLeverage": "20", + "notionalCap": "100000", + "notionalFloor": "50000", + "maintMarginRatio": "0.025", + "cum": "325.0" + } + }, + { + "tier": 5.0, + "symbol": "COMP/USDT:USDT", + "currency": "USDT", + "minNotional": 100000.0, + "maxNotional": 500000.0, + "maintenanceMarginRate": 0.05, + "maxLeverage": 10.0, + "info": { + "bracket": "5", + "initialLeverage": "10", + "notionalCap": "500000", + "notionalFloor": "100000", + "maintMarginRatio": "0.05", + "cum": "2825.0" + } + }, + { + "tier": 6.0, + "symbol": "COMP/USDT:USDT", + "currency": "USDT", + "minNotional": 500000.0, + "maxNotional": 1000000.0, + "maintenanceMarginRate": 0.1, + "maxLeverage": 5.0, + "info": { + "bracket": "6", + "initialLeverage": "5", + "notionalCap": "1000000", + "notionalFloor": "500000", + "maintMarginRatio": "0.1", + "cum": "27825.0" + } + }, + { + "tier": 7.0, + "symbol": "COMP/USDT:USDT", + "currency": "USDT", + "minNotional": 1000000.0, + "maxNotional": 1250000.0, + "maintenanceMarginRate": 0.125, + "maxLeverage": 4.0, + "info": { + "bracket": "7", + "initialLeverage": "4", + "notionalCap": "1250000", + "notionalFloor": "1000000", + "maintMarginRatio": "0.125", + "cum": "52825.0" + } + }, + { + "tier": 8.0, + "symbol": "COMP/USDT:USDT", + "currency": "USDT", + "minNotional": 1250000.0, + "maxNotional": 2500000.0, + "maintenanceMarginRate": 0.25, + "maxLeverage": 2.0, + "info": { + "bracket": "8", + "initialLeverage": "2", + "notionalCap": "2500000", + "notionalFloor": "1250000", + "maintMarginRatio": "0.25", + "cum": "209075.0" + } + }, + { + "tier": 9.0, + "symbol": "COMP/USDT:USDT", + "currency": "USDT", + "minNotional": 2500000.0, + "maxNotional": 5000000.0, + "maintenanceMarginRate": 0.5, + "maxLeverage": 1.0, + "info": { + "bracket": "9", + "initialLeverage": "1", + "notionalCap": "5000000", + "notionalFloor": "2500000", + "maintMarginRatio": "0.5", + "cum": "834075.0" + } + } + ], + "COS/USDT:USDT": [ + { + "tier": 1.0, + "symbol": "COS/USDT:USDT", + "currency": "USDT", + "minNotional": 0.0, + "maxNotional": 5000.0, + "maintenanceMarginRate": 0.01, + "maxLeverage": 75.0, + "info": { + "bracket": "1", + "initialLeverage": "75", + "notionalCap": "5000", + "notionalFloor": "0", + "maintMarginRatio": "0.01", + "cum": "0.0" + } + }, + { + "tier": 2.0, + "symbol": "COS/USDT:USDT", + "currency": "USDT", + "minNotional": 5000.0, + "maxNotional": 10000.0, + "maintenanceMarginRate": 0.015, + "maxLeverage": 50.0, + "info": { + "bracket": "2", + "initialLeverage": "50", + "notionalCap": "10000", + "notionalFloor": "5000", + "maintMarginRatio": "0.015", + "cum": "25.0" + } + }, + { + "tier": 3.0, + "symbol": "COS/USDT:USDT", "currency": "USDT", "minNotional": 10000.0, "maxNotional": 20000.0, @@ -12230,6 +14514,7 @@ }, { "tier": 4.0, + "symbol": "COS/USDT:USDT", "currency": "USDT", "minNotional": 20000.0, "maxNotional": 40000.0, @@ -12246,6 +14531,7 @@ }, { "tier": 5.0, + "symbol": "COS/USDT:USDT", "currency": "USDT", "minNotional": 40000.0, "maxNotional": 200000.0, @@ -12262,6 +14548,7 @@ }, { "tier": 6.0, + "symbol": "COS/USDT:USDT", "currency": "USDT", "minNotional": 200000.0, "maxNotional": 400000.0, @@ -12278,6 +14565,7 @@ }, { "tier": 7.0, + "symbol": "COS/USDT:USDT", "currency": "USDT", "minNotional": 400000.0, "maxNotional": 500000.0, @@ -12294,6 +14582,7 @@ }, { "tier": 8.0, + "symbol": "COS/USDT:USDT", "currency": "USDT", "minNotional": 500000.0, "maxNotional": 1000000.0, @@ -12310,6 +14599,7 @@ }, { "tier": 9.0, + "symbol": "COS/USDT:USDT", "currency": "USDT", "minNotional": 1000000.0, "maxNotional": 2000000.0, @@ -12328,6 +14618,7 @@ "COTI/USDT:USDT": [ { "tier": 1.0, + "symbol": "COTI/USDT:USDT", "currency": "USDT", "minNotional": 0.0, "maxNotional": 5000.0, @@ -12344,6 +14635,7 @@ }, { "tier": 2.0, + "symbol": "COTI/USDT:USDT", "currency": "USDT", "minNotional": 5000.0, "maxNotional": 20000.0, @@ -12360,6 +14652,7 @@ }, { "tier": 3.0, + "symbol": "COTI/USDT:USDT", "currency": "USDT", "minNotional": 20000.0, "maxNotional": 25000.0, @@ -12376,6 +14669,7 @@ }, { "tier": 4.0, + "symbol": "COTI/USDT:USDT", "currency": "USDT", "minNotional": 25000.0, "maxNotional": 200000.0, @@ -12392,6 +14686,7 @@ }, { "tier": 5.0, + "symbol": "COTI/USDT:USDT", "currency": "USDT", "minNotional": 200000.0, "maxNotional": 400000.0, @@ -12408,6 +14703,7 @@ }, { "tier": 6.0, + "symbol": "COTI/USDT:USDT", "currency": "USDT", "minNotional": 400000.0, "maxNotional": 500000.0, @@ -12424,6 +14720,7 @@ }, { "tier": 7.0, + "symbol": "COTI/USDT:USDT", "currency": "USDT", "minNotional": 500000.0, "maxNotional": 1000000.0, @@ -12440,6 +14737,7 @@ }, { "tier": 8.0, + "symbol": "COTI/USDT:USDT", "currency": "USDT", "minNotional": 1000000.0, "maxNotional": 2000000.0, @@ -12455,9 +14753,165 @@ } } ], + "COW/USDT:USDT": [ + { + "tier": 1.0, + "symbol": "COW/USDT:USDT", + "currency": "USDT", + "minNotional": 0.0, + "maxNotional": 5000.0, + "maintenanceMarginRate": 0.01, + "maxLeverage": 75.0, + "info": { + "bracket": "1", + "initialLeverage": "75", + "notionalCap": "5000", + "notionalFloor": "0", + "maintMarginRatio": "0.01", + "cum": "0.0" + } + }, + { + "tier": 2.0, + "symbol": "COW/USDT:USDT", + "currency": "USDT", + "minNotional": 5000.0, + "maxNotional": 16000.0, + "maintenanceMarginRate": 0.015, + "maxLeverage": 50.0, + "info": { + "bracket": "2", + "initialLeverage": "50", + "notionalCap": "16000", + "notionalFloor": "5000", + "maintMarginRatio": "0.015", + "cum": "25.0" + } + }, + { + "tier": 3.0, + "symbol": "COW/USDT:USDT", + "currency": "USDT", + "minNotional": 16000.0, + "maxNotional": 80000.0, + "maintenanceMarginRate": 0.02, + "maxLeverage": 25.0, + "info": { + "bracket": "3", + "initialLeverage": "25", + "notionalCap": "80000", + "notionalFloor": "16000", + "maintMarginRatio": "0.02", + "cum": "105.0" + } + }, + { + "tier": 4.0, + "symbol": "COW/USDT:USDT", + "currency": "USDT", + "minNotional": 80000.0, + "maxNotional": 160000.0, + "maintenanceMarginRate": 0.025, + "maxLeverage": 20.0, + "info": { + "bracket": "4", + "initialLeverage": "20", + "notionalCap": "160000", + "notionalFloor": "80000", + "maintMarginRatio": "0.025", + "cum": "505.0" + } + }, + { + "tier": 5.0, + "symbol": "COW/USDT:USDT", + "currency": "USDT", + "minNotional": 160000.0, + "maxNotional": 800000.0, + "maintenanceMarginRate": 0.05, + "maxLeverage": 10.0, + "info": { + "bracket": "5", + "initialLeverage": "10", + "notionalCap": "800000", + "notionalFloor": "160000", + "maintMarginRatio": "0.05", + "cum": "4505.0" + } + }, + { + "tier": 6.0, + "symbol": "COW/USDT:USDT", + "currency": "USDT", + "minNotional": 800000.0, + "maxNotional": 1600000.0, + "maintenanceMarginRate": 0.1, + "maxLeverage": 5.0, + "info": { + "bracket": "6", + "initialLeverage": "5", + "notionalCap": "1600000", + "notionalFloor": "800000", + "maintMarginRatio": "0.1", + "cum": "44505.0" + } + }, + { + "tier": 7.0, + "symbol": "COW/USDT:USDT", + "currency": "USDT", + "minNotional": 1600000.0, + "maxNotional": 2000000.0, + "maintenanceMarginRate": 0.125, + "maxLeverage": 4.0, + "info": { + "bracket": "7", + "initialLeverage": "4", + "notionalCap": "2000000", + "notionalFloor": "1600000", + "maintMarginRatio": "0.125", + "cum": "84505.0" + } + }, + { + "tier": 8.0, + "symbol": "COW/USDT:USDT", + "currency": "USDT", + "minNotional": 2000000.0, + "maxNotional": 4000000.0, + "maintenanceMarginRate": 0.25, + "maxLeverage": 2.0, + "info": { + "bracket": "8", + "initialLeverage": "2", + "notionalCap": "4000000", + "notionalFloor": "2000000", + "maintMarginRatio": "0.25", + "cum": "334505.0" + } + }, + { + "tier": 9.0, + "symbol": "COW/USDT:USDT", + "currency": "USDT", + "minNotional": 4000000.0, + "maxNotional": 8000000.0, + "maintenanceMarginRate": 0.5, + "maxLeverage": 1.0, + "info": { + "bracket": "9", + "initialLeverage": "1", + "notionalCap": "8000000", + "notionalFloor": "4000000", + "maintMarginRatio": "0.5", + "cum": "1334505.0" + } + } + ], "CRV/USDC:USDC": [ { "tier": 1.0, + "symbol": "CRV/USDC:USDC", "currency": "USDC", "minNotional": 0.0, "maxNotional": 50000.0, @@ -12474,6 +14928,7 @@ }, { "tier": 2.0, + "symbol": "CRV/USDC:USDC", "currency": "USDC", "minNotional": 50000.0, "maxNotional": 150000.0, @@ -12490,6 +14945,7 @@ }, { "tier": 3.0, + "symbol": "CRV/USDC:USDC", "currency": "USDC", "minNotional": 150000.0, "maxNotional": 250000.0, @@ -12506,6 +14962,7 @@ }, { "tier": 4.0, + "symbol": "CRV/USDC:USDC", "currency": "USDC", "minNotional": 250000.0, "maxNotional": 500000.0, @@ -12522,6 +14979,7 @@ }, { "tier": 5.0, + "symbol": "CRV/USDC:USDC", "currency": "USDC", "minNotional": 500000.0, "maxNotional": 1000000.0, @@ -12538,6 +14996,7 @@ }, { "tier": 6.0, + "symbol": "CRV/USDC:USDC", "currency": "USDC", "minNotional": 1000000.0, "maxNotional": 3000000.0, @@ -12554,6 +15013,7 @@ }, { "tier": 7.0, + "symbol": "CRV/USDC:USDC", "currency": "USDC", "minNotional": 3000000.0, "maxNotional": 5000000.0, @@ -12572,6 +15032,7 @@ "CRV/USDT:USDT": [ { "tier": 1.0, + "symbol": "CRV/USDT:USDT", "currency": "USDT", "minNotional": 0.0, "maxNotional": 10000.0, @@ -12588,6 +15049,7 @@ }, { "tier": 2.0, + "symbol": "CRV/USDT:USDT", "currency": "USDT", "minNotional": 10000.0, "maxNotional": 50000.0, @@ -12604,6 +15066,7 @@ }, { "tier": 3.0, + "symbol": "CRV/USDT:USDT", "currency": "USDT", "minNotional": 50000.0, "maxNotional": 200000.0, @@ -12620,6 +15083,7 @@ }, { "tier": 4.0, + "symbol": "CRV/USDT:USDT", "currency": "USDT", "minNotional": 200000.0, "maxNotional": 400000.0, @@ -12636,6 +15100,7 @@ }, { "tier": 5.0, + "symbol": "CRV/USDT:USDT", "currency": "USDT", "minNotional": 400000.0, "maxNotional": 2000000.0, @@ -12652,6 +15117,7 @@ }, { "tier": 6.0, + "symbol": "CRV/USDT:USDT", "currency": "USDT", "minNotional": 2000000.0, "maxNotional": 4000000.0, @@ -12668,6 +15134,7 @@ }, { "tier": 7.0, + "symbol": "CRV/USDT:USDT", "currency": "USDT", "minNotional": 4000000.0, "maxNotional": 5000000.0, @@ -12684,6 +15151,7 @@ }, { "tier": 8.0, + "symbol": "CRV/USDT:USDT", "currency": "USDT", "minNotional": 5000000.0, "maxNotional": 10000000.0, @@ -12700,6 +15168,7 @@ }, { "tier": 9.0, + "symbol": "CRV/USDT:USDT", "currency": "USDT", "minNotional": 10000000.0, "maxNotional": 20000000.0, @@ -12718,6 +15187,7 @@ "CTK/USDT:USDT": [ { "tier": 1.0, + "symbol": "CTK/USDT:USDT", "currency": "USDT", "minNotional": 0.0, "maxNotional": 5000.0, @@ -12734,6 +15204,7 @@ }, { "tier": 2.0, + "symbol": "CTK/USDT:USDT", "currency": "USDT", "minNotional": 5000.0, "maxNotional": 25000.0, @@ -12750,6 +15221,7 @@ }, { "tier": 3.0, + "symbol": "CTK/USDT:USDT", "currency": "USDT", "minNotional": 25000.0, "maxNotional": 100000.0, @@ -12766,6 +15238,7 @@ }, { "tier": 4.0, + "symbol": "CTK/USDT:USDT", "currency": "USDT", "minNotional": 100000.0, "maxNotional": 250000.0, @@ -12782,6 +15255,7 @@ }, { "tier": 5.0, + "symbol": "CTK/USDT:USDT", "currency": "USDT", "minNotional": 250000.0, "maxNotional": 1000000.0, @@ -12798,6 +15272,7 @@ }, { "tier": 6.0, + "symbol": "CTK/USDT:USDT", "currency": "USDT", "minNotional": 1000000.0, "maxNotional": 1500000.0, @@ -12816,120 +15291,162 @@ "CTSI/USDT:USDT": [ { "tier": 1.0, + "symbol": "CTSI/USDT:USDT", "currency": "USDT", "minNotional": 0.0, "maxNotional": 5000.0, - "maintenanceMarginRate": 0.02, - "maxLeverage": 25.0, + "maintenanceMarginRate": 0.01, + "maxLeverage": 75.0, "info": { "bracket": "1", - "initialLeverage": "25", + "initialLeverage": "75", "notionalCap": "5000", "notionalFloor": "0", - "maintMarginRatio": "0.02", + "maintMarginRatio": "0.01", "cum": "0.0" } }, { "tier": 2.0, + "symbol": "CTSI/USDT:USDT", "currency": "USDT", "minNotional": 5000.0, - "maxNotional": 25000.0, - "maintenanceMarginRate": 0.025, - "maxLeverage": 20.0, + "maxNotional": 10000.0, + "maintenanceMarginRate": 0.015, + "maxLeverage": 50.0, "info": { "bracket": "2", - "initialLeverage": "20", - "notionalCap": "25000", + "initialLeverage": "50", + "notionalCap": "10000", "notionalFloor": "5000", - "maintMarginRatio": "0.025", + "maintMarginRatio": "0.015", "cum": "25.0" } }, { "tier": 3.0, + "symbol": "CTSI/USDT:USDT", "currency": "USDT", - "minNotional": 25000.0, - "maxNotional": 300000.0, - "maintenanceMarginRate": 0.05, - "maxLeverage": 10.0, + "minNotional": 10000.0, + "maxNotional": 50000.0, + "maintenanceMarginRate": 0.02, + "maxLeverage": 25.0, "info": { "bracket": "3", - "initialLeverage": "10", - "notionalCap": "300000", - "notionalFloor": "25000", - "maintMarginRatio": "0.05", - "cum": "650.0" + "initialLeverage": "25", + "notionalCap": "50000", + "notionalFloor": "10000", + "maintMarginRatio": "0.02", + "cum": "75.0" } }, { "tier": 4.0, + "symbol": "CTSI/USDT:USDT", "currency": "USDT", - "minNotional": 300000.0, - "maxNotional": 800000.0, - "maintenanceMarginRate": 0.1, - "maxLeverage": 5.0, + "minNotional": 50000.0, + "maxNotional": 100000.0, + "maintenanceMarginRate": 0.025, + "maxLeverage": 20.0, "info": { "bracket": "4", - "initialLeverage": "5", - "notionalCap": "800000", - "notionalFloor": "300000", - "maintMarginRatio": "0.1", - "cum": "15650.0" + "initialLeverage": "20", + "notionalCap": "100000", + "notionalFloor": "50000", + "maintMarginRatio": "0.025", + "cum": "325.0" } }, { "tier": 5.0, + "symbol": "CTSI/USDT:USDT", "currency": "USDT", - "minNotional": 800000.0, - "maxNotional": 1000000.0, - "maintenanceMarginRate": 0.125, - "maxLeverage": 4.0, + "minNotional": 100000.0, + "maxNotional": 500000.0, + "maintenanceMarginRate": 0.05, + "maxLeverage": 10.0, "info": { "bracket": "5", - "initialLeverage": "4", - "notionalCap": "1000000", - "notionalFloor": "800000", - "maintMarginRatio": "0.125", - "cum": "35650.0" + "initialLeverage": "10", + "notionalCap": "500000", + "notionalFloor": "100000", + "maintMarginRatio": "0.05", + "cum": "2825.0" } }, { "tier": 6.0, + "symbol": "CTSI/USDT:USDT", "currency": "USDT", - "minNotional": 1000000.0, - "maxNotional": 3000000.0, - "maintenanceMarginRate": 0.25, - "maxLeverage": 2.0, + "minNotional": 500000.0, + "maxNotional": 1000000.0, + "maintenanceMarginRate": 0.1, + "maxLeverage": 5.0, "info": { "bracket": "6", - "initialLeverage": "2", - "notionalCap": "3000000", - "notionalFloor": "1000000", - "maintMarginRatio": "0.25", - "cum": "160650.0" + "initialLeverage": "5", + "notionalCap": "1000000", + "notionalFloor": "500000", + "maintMarginRatio": "0.1", + "cum": "27825.0" } }, { "tier": 7.0, + "symbol": "CTSI/USDT:USDT", + "currency": "USDT", + "minNotional": 1000000.0, + "maxNotional": 1250000.0, + "maintenanceMarginRate": 0.125, + "maxLeverage": 4.0, + "info": { + "bracket": "7", + "initialLeverage": "4", + "notionalCap": "1250000", + "notionalFloor": "1000000", + "maintMarginRatio": "0.125", + "cum": "52825.0" + } + }, + { + "tier": 8.0, + "symbol": "CTSI/USDT:USDT", + "currency": "USDT", + "minNotional": 1250000.0, + "maxNotional": 3000000.0, + "maintenanceMarginRate": 0.25, + "maxLeverage": 2.0, + "info": { + "bracket": "8", + "initialLeverage": "2", + "notionalCap": "3000000", + "notionalFloor": "1250000", + "maintMarginRatio": "0.25", + "cum": "209075.0" + } + }, + { + "tier": 9.0, + "symbol": "CTSI/USDT:USDT", "currency": "USDT", "minNotional": 3000000.0, "maxNotional": 5000000.0, "maintenanceMarginRate": 0.5, "maxLeverage": 1.0, "info": { - "bracket": "7", + "bracket": "9", "initialLeverage": "1", "notionalCap": "5000000", "notionalFloor": "3000000", "maintMarginRatio": "0.5", - "cum": "910650.0" + "cum": "959075.0" } } ], "CVC/USDT:USDT": [ { "tier": 1.0, + "symbol": "CVC/USDT:USDT", "currency": "USDT", "minNotional": 0.0, "maxNotional": 25000.0, @@ -12946,6 +15463,7 @@ }, { "tier": 2.0, + "symbol": "CVC/USDT:USDT", "currency": "USDT", "minNotional": 25000.0, "maxNotional": 100000.0, @@ -12962,6 +15480,7 @@ }, { "tier": 3.0, + "symbol": "CVC/USDT:USDT", "currency": "USDT", "minNotional": 100000.0, "maxNotional": 250000.0, @@ -12978,6 +15497,7 @@ }, { "tier": 4.0, + "symbol": "CVC/USDT:USDT", "currency": "USDT", "minNotional": 250000.0, "maxNotional": 1000000.0, @@ -12994,6 +15514,7 @@ }, { "tier": 5.0, + "symbol": "CVC/USDT:USDT", "currency": "USDT", "minNotional": 1000000.0, "maxNotional": 2000000.0, @@ -13012,6 +15533,7 @@ "CVX/USDT:USDT": [ { "tier": 1.0, + "symbol": "CVX/USDT:USDT", "currency": "USDT", "minNotional": 0.0, "maxNotional": 25000.0, @@ -13028,6 +15550,7 @@ }, { "tier": 2.0, + "symbol": "CVX/USDT:USDT", "currency": "USDT", "minNotional": 25000.0, "maxNotional": 100000.0, @@ -13044,6 +15567,7 @@ }, { "tier": 3.0, + "symbol": "CVX/USDT:USDT", "currency": "USDT", "minNotional": 100000.0, "maxNotional": 250000.0, @@ -13060,6 +15584,7 @@ }, { "tier": 4.0, + "symbol": "CVX/USDT:USDT", "currency": "USDT", "minNotional": 250000.0, "maxNotional": 1000000.0, @@ -13076,6 +15601,7 @@ }, { "tier": 5.0, + "symbol": "CVX/USDT:USDT", "currency": "USDT", "minNotional": 1000000.0, "maxNotional": 2000000.0, @@ -13094,6 +15620,7 @@ "CYBER/USDT:USDT": [ { "tier": 1.0, + "symbol": "CYBER/USDT:USDT", "currency": "USDT", "minNotional": 0.0, "maxNotional": 5000.0, @@ -13110,6 +15637,7 @@ }, { "tier": 2.0, + "symbol": "CYBER/USDT:USDT", "currency": "USDT", "minNotional": 5000.0, "maxNotional": 25000.0, @@ -13126,6 +15654,7 @@ }, { "tier": 3.0, + "symbol": "CYBER/USDT:USDT", "currency": "USDT", "minNotional": 25000.0, "maxNotional": 200000.0, @@ -13142,6 +15671,7 @@ }, { "tier": 4.0, + "symbol": "CYBER/USDT:USDT", "currency": "USDT", "minNotional": 200000.0, "maxNotional": 500000.0, @@ -13158,6 +15688,7 @@ }, { "tier": 5.0, + "symbol": "CYBER/USDT:USDT", "currency": "USDT", "minNotional": 500000.0, "maxNotional": 1000000.0, @@ -13174,6 +15705,7 @@ }, { "tier": 6.0, + "symbol": "CYBER/USDT:USDT", "currency": "USDT", "minNotional": 1000000.0, "maxNotional": 3000000.0, @@ -13190,6 +15722,7 @@ }, { "tier": 7.0, + "symbol": "CYBER/USDT:USDT", "currency": "USDT", "minNotional": 3000000.0, "maxNotional": 5000000.0, @@ -13208,6 +15741,7 @@ "DAR/USDT:USDT": [ { "tier": 1.0, + "symbol": "DAR/USDT:USDT", "currency": "USDT", "minNotional": 0.0, "maxNotional": 10000.0, @@ -13224,6 +15758,7 @@ }, { "tier": 2.0, + "symbol": "DAR/USDT:USDT", "currency": "USDT", "minNotional": 10000.0, "maxNotional": 20000.0, @@ -13240,6 +15775,7 @@ }, { "tier": 3.0, + "symbol": "DAR/USDT:USDT", "currency": "USDT", "minNotional": 20000.0, "maxNotional": 100000.0, @@ -13256,6 +15792,7 @@ }, { "tier": 4.0, + "symbol": "DAR/USDT:USDT", "currency": "USDT", "minNotional": 100000.0, "maxNotional": 200000.0, @@ -13272,6 +15809,7 @@ }, { "tier": 5.0, + "symbol": "DAR/USDT:USDT", "currency": "USDT", "minNotional": 200000.0, "maxNotional": 1000000.0, @@ -13288,6 +15826,7 @@ }, { "tier": 6.0, + "symbol": "DAR/USDT:USDT", "currency": "USDT", "minNotional": 1000000.0, "maxNotional": 2000000.0, @@ -13304,6 +15843,7 @@ }, { "tier": 7.0, + "symbol": "DAR/USDT:USDT", "currency": "USDT", "minNotional": 2000000.0, "maxNotional": 2500000.0, @@ -13320,6 +15860,7 @@ }, { "tier": 8.0, + "symbol": "DAR/USDT:USDT", "currency": "USDT", "minNotional": 2500000.0, "maxNotional": 6000000.0, @@ -13336,6 +15877,7 @@ }, { "tier": 9.0, + "symbol": "DAR/USDT:USDT", "currency": "USDT", "minNotional": 6000000.0, "maxNotional": 10000000.0, @@ -13354,6 +15896,7 @@ "DASH/USDT:USDT": [ { "tier": 1.0, + "symbol": "DASH/USDT:USDT", "currency": "USDT", "minNotional": 0.0, "maxNotional": 5000.0, @@ -13370,6 +15913,7 @@ }, { "tier": 2.0, + "symbol": "DASH/USDT:USDT", "currency": "USDT", "minNotional": 5000.0, "maxNotional": 20000.0, @@ -13386,6 +15930,7 @@ }, { "tier": 3.0, + "symbol": "DASH/USDT:USDT", "currency": "USDT", "minNotional": 20000.0, "maxNotional": 25000.0, @@ -13402,6 +15947,7 @@ }, { "tier": 4.0, + "symbol": "DASH/USDT:USDT", "currency": "USDT", "minNotional": 25000.0, "maxNotional": 200000.0, @@ -13418,6 +15964,7 @@ }, { "tier": 5.0, + "symbol": "DASH/USDT:USDT", "currency": "USDT", "minNotional": 200000.0, "maxNotional": 400000.0, @@ -13434,6 +15981,7 @@ }, { "tier": 6.0, + "symbol": "DASH/USDT:USDT", "currency": "USDT", "minNotional": 400000.0, "maxNotional": 500000.0, @@ -13450,6 +15998,7 @@ }, { "tier": 7.0, + "symbol": "DASH/USDT:USDT", "currency": "USDT", "minNotional": 500000.0, "maxNotional": 1000000.0, @@ -13466,6 +16015,7 @@ }, { "tier": 8.0, + "symbol": "DASH/USDT:USDT", "currency": "USDT", "minNotional": 1000000.0, "maxNotional": 2000000.0, @@ -13484,6 +16034,7 @@ "DEFI/USDT:USDT": [ { "tier": 1.0, + "symbol": "DEFI/USDT:USDT", "currency": "USDT", "minNotional": 0.0, "maxNotional": 5000.0, @@ -13500,6 +16051,7 @@ }, { "tier": 2.0, + "symbol": "DEFI/USDT:USDT", "currency": "USDT", "minNotional": 5000.0, "maxNotional": 25000.0, @@ -13516,6 +16068,7 @@ }, { "tier": 3.0, + "symbol": "DEFI/USDT:USDT", "currency": "USDT", "minNotional": 25000.0, "maxNotional": 100000.0, @@ -13532,6 +16085,7 @@ }, { "tier": 4.0, + "symbol": "DEFI/USDT:USDT", "currency": "USDT", "minNotional": 100000.0, "maxNotional": 250000.0, @@ -13548,6 +16102,7 @@ }, { "tier": 5.0, + "symbol": "DEFI/USDT:USDT", "currency": "USDT", "minNotional": 250000.0, "maxNotional": 1000000.0, @@ -13564,6 +16119,7 @@ }, { "tier": 6.0, + "symbol": "DEFI/USDT:USDT", "currency": "USDT", "minNotional": 1000000.0, "maxNotional": 3000000.0, @@ -13579,9 +16135,165 @@ } } ], + "DEGEN/USDT:USDT": [ + { + "tier": 1.0, + "symbol": "DEGEN/USDT:USDT", + "currency": "USDT", + "minNotional": 0.0, + "maxNotional": 5000.0, + "maintenanceMarginRate": 0.01, + "maxLeverage": 75.0, + "info": { + "bracket": "1", + "initialLeverage": "75", + "notionalCap": "5000", + "notionalFloor": "0", + "maintMarginRatio": "0.01", + "cum": "0.0" + } + }, + { + "tier": 2.0, + "symbol": "DEGEN/USDT:USDT", + "currency": "USDT", + "minNotional": 5000.0, + "maxNotional": 10000.0, + "maintenanceMarginRate": 0.015, + "maxLeverage": 50.0, + "info": { + "bracket": "2", + "initialLeverage": "50", + "notionalCap": "10000", + "notionalFloor": "5000", + "maintMarginRatio": "0.015", + "cum": "25.0" + } + }, + { + "tier": 3.0, + "symbol": "DEGEN/USDT:USDT", + "currency": "USDT", + "minNotional": 10000.0, + "maxNotional": 30000.0, + "maintenanceMarginRate": 0.02, + "maxLeverage": 25.0, + "info": { + "bracket": "3", + "initialLeverage": "25", + "notionalCap": "30000", + "notionalFloor": "10000", + "maintMarginRatio": "0.02", + "cum": "75.0" + } + }, + { + "tier": 4.0, + "symbol": "DEGEN/USDT:USDT", + "currency": "USDT", + "minNotional": 30000.0, + "maxNotional": 60000.0, + "maintenanceMarginRate": 0.025, + "maxLeverage": 20.0, + "info": { + "bracket": "4", + "initialLeverage": "20", + "notionalCap": "60000", + "notionalFloor": "30000", + "maintMarginRatio": "0.025", + "cum": "225.0" + } + }, + { + "tier": 5.0, + "symbol": "DEGEN/USDT:USDT", + "currency": "USDT", + "minNotional": 60000.0, + "maxNotional": 300000.0, + "maintenanceMarginRate": 0.05, + "maxLeverage": 10.0, + "info": { + "bracket": "5", + "initialLeverage": "10", + "notionalCap": "300000", + "notionalFloor": "60000", + "maintMarginRatio": "0.05", + "cum": "1725.0" + } + }, + { + "tier": 6.0, + "symbol": "DEGEN/USDT:USDT", + "currency": "USDT", + "minNotional": 300000.0, + "maxNotional": 600000.0, + "maintenanceMarginRate": 0.1, + "maxLeverage": 5.0, + "info": { + "bracket": "6", + "initialLeverage": "5", + "notionalCap": "600000", + "notionalFloor": "300000", + "maintMarginRatio": "0.1", + "cum": "16725.0" + } + }, + { + "tier": 7.0, + "symbol": "DEGEN/USDT:USDT", + "currency": "USDT", + "minNotional": 600000.0, + "maxNotional": 750000.0, + "maintenanceMarginRate": 0.125, + "maxLeverage": 4.0, + "info": { + "bracket": "7", + "initialLeverage": "4", + "notionalCap": "750000", + "notionalFloor": "600000", + "maintMarginRatio": "0.125", + "cum": "31725.0" + } + }, + { + "tier": 8.0, + "symbol": "DEGEN/USDT:USDT", + "currency": "USDT", + "minNotional": 750000.0, + "maxNotional": 1500000.0, + "maintenanceMarginRate": 0.25, + "maxLeverage": 2.0, + "info": { + "bracket": "8", + "initialLeverage": "2", + "notionalCap": "1500000", + "notionalFloor": "750000", + "maintMarginRatio": "0.25", + "cum": "125475.0" + } + }, + { + "tier": 9.0, + "symbol": "DEGEN/USDT:USDT", + "currency": "USDT", + "minNotional": 1500000.0, + "maxNotional": 3000000.0, + "maintenanceMarginRate": 0.5, + "maxLeverage": 1.0, + "info": { + "bracket": "9", + "initialLeverage": "1", + "notionalCap": "3000000", + "notionalFloor": "1500000", + "maintMarginRatio": "0.5", + "cum": "500475.0" + } + } + ], "DENT/USDT:USDT": [ { "tier": 1.0, + "symbol": "DENT/USDT:USDT", "currency": "USDT", "minNotional": 0.0, "maxNotional": 5000.0, @@ -13598,6 +16310,7 @@ }, { "tier": 2.0, + "symbol": "DENT/USDT:USDT", "currency": "USDT", "minNotional": 5000.0, "maxNotional": 25000.0, @@ -13614,6 +16327,7 @@ }, { "tier": 3.0, + "symbol": "DENT/USDT:USDT", "currency": "USDT", "minNotional": 25000.0, "maxNotional": 300000.0, @@ -13630,6 +16344,7 @@ }, { "tier": 4.0, + "symbol": "DENT/USDT:USDT", "currency": "USDT", "minNotional": 300000.0, "maxNotional": 800000.0, @@ -13646,6 +16361,7 @@ }, { "tier": 5.0, + "symbol": "DENT/USDT:USDT", "currency": "USDT", "minNotional": 800000.0, "maxNotional": 1000000.0, @@ -13662,6 +16378,7 @@ }, { "tier": 6.0, + "symbol": "DENT/USDT:USDT", "currency": "USDT", "minNotional": 1000000.0, "maxNotional": 3000000.0, @@ -13678,6 +16395,7 @@ }, { "tier": 7.0, + "symbol": "DENT/USDT:USDT", "currency": "USDT", "minNotional": 3000000.0, "maxNotional": 5000000.0, @@ -13696,6 +16414,7 @@ "DGB/USDT:USDT": [ { "tier": 1.0, + "symbol": "DGB/USDT:USDT", "currency": "USDT", "minNotional": 0.0, "maxNotional": 5000.0, @@ -13712,6 +16431,7 @@ }, { "tier": 2.0, + "symbol": "DGB/USDT:USDT", "currency": "USDT", "minNotional": 5000.0, "maxNotional": 25000.0, @@ -13728,6 +16448,7 @@ }, { "tier": 3.0, + "symbol": "DGB/USDT:USDT", "currency": "USDT", "minNotional": 25000.0, "maxNotional": 100000.0, @@ -13744,6 +16465,7 @@ }, { "tier": 4.0, + "symbol": "DGB/USDT:USDT", "currency": "USDT", "minNotional": 100000.0, "maxNotional": 250000.0, @@ -13760,6 +16482,7 @@ }, { "tier": 5.0, + "symbol": "DGB/USDT:USDT", "currency": "USDT", "minNotional": 250000.0, "maxNotional": 1000000.0, @@ -13776,6 +16499,7 @@ }, { "tier": 6.0, + "symbol": "DGB/USDT:USDT", "currency": "USDT", "minNotional": 1000000.0, "maxNotional": 1500000.0, @@ -13794,6 +16518,7 @@ "DIA/USDT:USDT": [ { "tier": 1.0, + "symbol": "DIA/USDT:USDT", "currency": "USDT", "minNotional": 0.0, "maxNotional": 10000.0, @@ -13810,6 +16535,7 @@ }, { "tier": 2.0, + "symbol": "DIA/USDT:USDT", "currency": "USDT", "minNotional": 10000.0, "maxNotional": 20000.0, @@ -13826,6 +16552,7 @@ }, { "tier": 3.0, + "symbol": "DIA/USDT:USDT", "currency": "USDT", "minNotional": 20000.0, "maxNotional": 100000.0, @@ -13842,6 +16569,7 @@ }, { "tier": 4.0, + "symbol": "DIA/USDT:USDT", "currency": "USDT", "minNotional": 100000.0, "maxNotional": 200000.0, @@ -13858,6 +16586,7 @@ }, { "tier": 5.0, + "symbol": "DIA/USDT:USDT", "currency": "USDT", "minNotional": 200000.0, "maxNotional": 1000000.0, @@ -13874,6 +16603,7 @@ }, { "tier": 6.0, + "symbol": "DIA/USDT:USDT", "currency": "USDT", "minNotional": 1000000.0, "maxNotional": 2000000.0, @@ -13890,6 +16620,7 @@ }, { "tier": 7.0, + "symbol": "DIA/USDT:USDT", "currency": "USDT", "minNotional": 2000000.0, "maxNotional": 2500000.0, @@ -13906,6 +16637,7 @@ }, { "tier": 8.0, + "symbol": "DIA/USDT:USDT", "currency": "USDT", "minNotional": 2500000.0, "maxNotional": 5000000.0, @@ -13922,6 +16654,7 @@ }, { "tier": 9.0, + "symbol": "DIA/USDT:USDT", "currency": "USDT", "minNotional": 5000000.0, "maxNotional": 10000000.0, @@ -13940,6 +16673,7 @@ "DODOX/USDT:USDT": [ { "tier": 1.0, + "symbol": "DODOX/USDT:USDT", "currency": "USDT", "minNotional": 0.0, "maxNotional": 5000.0, @@ -13956,6 +16690,7 @@ }, { "tier": 2.0, + "symbol": "DODOX/USDT:USDT", "currency": "USDT", "minNotional": 5000.0, "maxNotional": 25000.0, @@ -13972,6 +16707,7 @@ }, { "tier": 3.0, + "symbol": "DODOX/USDT:USDT", "currency": "USDT", "minNotional": 25000.0, "maxNotional": 200000.0, @@ -13988,6 +16724,7 @@ }, { "tier": 4.0, + "symbol": "DODOX/USDT:USDT", "currency": "USDT", "minNotional": 200000.0, "maxNotional": 500000.0, @@ -14004,6 +16741,7 @@ }, { "tier": 5.0, + "symbol": "DODOX/USDT:USDT", "currency": "USDT", "minNotional": 500000.0, "maxNotional": 1000000.0, @@ -14020,6 +16758,7 @@ }, { "tier": 6.0, + "symbol": "DODOX/USDT:USDT", "currency": "USDT", "minNotional": 1000000.0, "maxNotional": 3000000.0, @@ -14036,6 +16775,7 @@ }, { "tier": 7.0, + "symbol": "DODOX/USDT:USDT", "currency": "USDT", "minNotional": 3000000.0, "maxNotional": 5000000.0, @@ -14054,6 +16794,7 @@ "DOGE/USDC:USDC": [ { "tier": 1.0, + "symbol": "DOGE/USDC:USDC", "currency": "USDC", "minNotional": 0.0, "maxNotional": 5000.0, @@ -14070,6 +16811,7 @@ }, { "tier": 2.0, + "symbol": "DOGE/USDC:USDC", "currency": "USDC", "minNotional": 5000.0, "maxNotional": 10000.0, @@ -14086,6 +16828,7 @@ }, { "tier": 3.0, + "symbol": "DOGE/USDC:USDC", "currency": "USDC", "minNotional": 10000.0, "maxNotional": 50000.0, @@ -14102,6 +16845,7 @@ }, { "tier": 4.0, + "symbol": "DOGE/USDC:USDC", "currency": "USDC", "minNotional": 50000.0, "maxNotional": 750000.0, @@ -14118,6 +16862,7 @@ }, { "tier": 5.0, + "symbol": "DOGE/USDC:USDC", "currency": "USDC", "minNotional": 750000.0, "maxNotional": 1100000.0, @@ -14134,6 +16879,7 @@ }, { "tier": 6.0, + "symbol": "DOGE/USDC:USDC", "currency": "USDC", "minNotional": 1100000.0, "maxNotional": 2200000.0, @@ -14150,6 +16896,7 @@ }, { "tier": 7.0, + "symbol": "DOGE/USDC:USDC", "currency": "USDC", "minNotional": 2200000.0, "maxNotional": 5600000.0, @@ -14166,6 +16913,7 @@ }, { "tier": 8.0, + "symbol": "DOGE/USDC:USDC", "currency": "USDC", "minNotional": 5600000.0, "maxNotional": 7000000.0, @@ -14182,6 +16930,7 @@ }, { "tier": 9.0, + "symbol": "DOGE/USDC:USDC", "currency": "USDC", "minNotional": 7000000.0, "maxNotional": 18000000.0, @@ -14198,6 +16947,7 @@ }, { "tier": 10.0, + "symbol": "DOGE/USDC:USDC", "currency": "USDC", "minNotional": 18000000.0, "maxNotional": 30000000.0, @@ -14216,6 +16966,7 @@ "DOGE/USDT:USDT": [ { "tier": 1.0, + "symbol": "DOGE/USDT:USDT", "currency": "USDT", "minNotional": 0.0, "maxNotional": 10000.0, @@ -14232,6 +16983,7 @@ }, { "tier": 2.0, + "symbol": "DOGE/USDT:USDT", "currency": "USDT", "minNotional": 10000.0, "maxNotional": 50000.0, @@ -14248,6 +17000,7 @@ }, { "tier": 3.0, + "symbol": "DOGE/USDT:USDT", "currency": "USDT", "minNotional": 50000.0, "maxNotional": 750000.0, @@ -14264,15 +17017,16 @@ }, { "tier": 4.0, + "symbol": "DOGE/USDT:USDT", "currency": "USDT", "minNotional": 750000.0, - "maxNotional": 1500000.0, + "maxNotional": 2000000.0, "maintenanceMarginRate": 0.02, "maxLeverage": 25.0, "info": { "bracket": "4", "initialLeverage": "25", - "notionalCap": "1500000", + "notionalCap": "2000000", "notionalFloor": "750000", "maintMarginRatio": "0.02", "cum": "7670.0" @@ -14280,104 +17034,111 @@ }, { "tier": 5.0, + "symbol": "DOGE/USDT:USDT", "currency": "USDT", - "minNotional": 1500000.0, - "maxNotional": 3000000.0, + "minNotional": 2000000.0, + "maxNotional": 4000000.0, "maintenanceMarginRate": 0.025, "maxLeverage": 20.0, "info": { "bracket": "5", "initialLeverage": "20", - "notionalCap": "3000000", - "notionalFloor": "1500000", + "notionalCap": "4000000", + "notionalFloor": "2000000", "maintMarginRatio": "0.025", - "cum": "15170.0" + "cum": "17670.0" } }, { "tier": 6.0, + "symbol": "DOGE/USDT:USDT", "currency": "USDT", - "minNotional": 3000000.0, - "maxNotional": 15000000.0, + "minNotional": 4000000.0, + "maxNotional": 20000000.0, "maintenanceMarginRate": 0.05, "maxLeverage": 10.0, "info": { "bracket": "6", "initialLeverage": "10", - "notionalCap": "15000000", - "notionalFloor": "3000000", + "notionalCap": "20000000", + "notionalFloor": "4000000", "maintMarginRatio": "0.05", - "cum": "90170.0" + "cum": "117670.0" } }, { "tier": 7.0, + "symbol": "DOGE/USDT:USDT", "currency": "USDT", - "minNotional": 15000000.0, - "maxNotional": 30000000.0, + "minNotional": 20000000.0, + "maxNotional": 40000000.0, "maintenanceMarginRate": 0.1, "maxLeverage": 5.0, "info": { "bracket": "7", "initialLeverage": "5", - "notionalCap": "30000000", - "notionalFloor": "15000000", + "notionalCap": "40000000", + "notionalFloor": "20000000", "maintMarginRatio": "0.1", - "cum": "840170.0" + "cum": "1117670.0" } }, { "tier": 8.0, + "symbol": "DOGE/USDT:USDT", "currency": "USDT", - "minNotional": 30000000.0, - "maxNotional": 37500000.0, + "minNotional": 40000000.0, + "maxNotional": 50000000.0, "maintenanceMarginRate": 0.125, "maxLeverage": 4.0, "info": { "bracket": "8", "initialLeverage": "4", - "notionalCap": "37500000", - "notionalFloor": "30000000", + "notionalCap": "50000000", + "notionalFloor": "40000000", "maintMarginRatio": "0.125", - "cum": "1590170.0" + "cum": "2117670.0" } }, { "tier": 9.0, + "symbol": "DOGE/USDT:USDT", "currency": "USDT", - "minNotional": 37500000.0, - "maxNotional": 75000000.0, + "minNotional": 50000000.0, + "maxNotional": 100000000.0, "maintenanceMarginRate": 0.25, "maxLeverage": 2.0, "info": { "bracket": "9", "initialLeverage": "2", - "notionalCap": "75000000", - "notionalFloor": "37500000", + "notionalCap": "100000000", + "notionalFloor": "50000000", "maintMarginRatio": "0.25", - "cum": "6277670.0" + "cum": "8367670.0" } }, { "tier": 10.0, + "symbol": "DOGE/USDT:USDT", "currency": "USDT", - "minNotional": 75000000.0, - "maxNotional": 150000000.0, + "minNotional": 100000000.0, + "maxNotional": 200000000.0, "maintenanceMarginRate": 0.5, "maxLeverage": 1.0, "info": { "bracket": "10", "initialLeverage": "1", - "notionalCap": "150000000", - "notionalFloor": "75000000", + "notionalCap": "200000000", + "notionalFloor": "100000000", "maintMarginRatio": "0.5", - "cum": "25027670.0" + "cum": "33367670.0" } } ], "DOGS/USDT:USDT": [ { "tier": 1.0, + "symbol": "DOGS/USDT:USDT", "currency": "USDT", "minNotional": 0.0, "maxNotional": 10000.0, @@ -14394,6 +17155,7 @@ }, { "tier": 2.0, + "symbol": "DOGS/USDT:USDT", "currency": "USDT", "minNotional": 10000.0, "maxNotional": 60000.0, @@ -14410,6 +17172,7 @@ }, { "tier": 3.0, + "symbol": "DOGS/USDT:USDT", "currency": "USDT", "minNotional": 60000.0, "maxNotional": 300000.0, @@ -14426,6 +17189,7 @@ }, { "tier": 4.0, + "symbol": "DOGS/USDT:USDT", "currency": "USDT", "minNotional": 300000.0, "maxNotional": 600000.0, @@ -14442,6 +17206,7 @@ }, { "tier": 5.0, + "symbol": "DOGS/USDT:USDT", "currency": "USDT", "minNotional": 600000.0, "maxNotional": 3000000.0, @@ -14458,6 +17223,7 @@ }, { "tier": 6.0, + "symbol": "DOGS/USDT:USDT", "currency": "USDT", "minNotional": 3000000.0, "maxNotional": 6000000.0, @@ -14474,6 +17240,7 @@ }, { "tier": 7.0, + "symbol": "DOGS/USDT:USDT", "currency": "USDT", "minNotional": 6000000.0, "maxNotional": 7500000.0, @@ -14490,6 +17257,7 @@ }, { "tier": 8.0, + "symbol": "DOGS/USDT:USDT", "currency": "USDT", "minNotional": 7500000.0, "maxNotional": 15000000.0, @@ -14506,6 +17274,7 @@ }, { "tier": 9.0, + "symbol": "DOGS/USDT:USDT", "currency": "USDT", "minNotional": 15000000.0, "maxNotional": 30000000.0, @@ -14524,6 +17293,7 @@ "DOT/USDT:USDT": [ { "tier": 1.0, + "symbol": "DOT/USDT:USDT", "currency": "USDT", "minNotional": 0.0, "maxNotional": 10000.0, @@ -14540,6 +17310,7 @@ }, { "tier": 2.0, + "symbol": "DOT/USDT:USDT", "currency": "USDT", "minNotional": 10000.0, "maxNotional": 50000.0, @@ -14556,6 +17327,7 @@ }, { "tier": 3.0, + "symbol": "DOT/USDT:USDT", "currency": "USDT", "minNotional": 50000.0, "maxNotional": 100000.0, @@ -14572,6 +17344,7 @@ }, { "tier": 4.0, + "symbol": "DOT/USDT:USDT", "currency": "USDT", "minNotional": 100000.0, "maxNotional": 500000.0, @@ -14588,6 +17361,7 @@ }, { "tier": 5.0, + "symbol": "DOT/USDT:USDT", "currency": "USDT", "minNotional": 500000.0, "maxNotional": 800000.0, @@ -14604,6 +17378,7 @@ }, { "tier": 6.0, + "symbol": "DOT/USDT:USDT", "currency": "USDT", "minNotional": 800000.0, "maxNotional": 4000000.0, @@ -14620,6 +17395,7 @@ }, { "tier": 7.0, + "symbol": "DOT/USDT:USDT", "currency": "USDT", "minNotional": 4000000.0, "maxNotional": 8000000.0, @@ -14636,6 +17412,7 @@ }, { "tier": 8.0, + "symbol": "DOT/USDT:USDT", "currency": "USDT", "minNotional": 8000000.0, "maxNotional": 10000000.0, @@ -14652,6 +17429,7 @@ }, { "tier": 9.0, + "symbol": "DOT/USDT:USDT", "currency": "USDT", "minNotional": 10000000.0, "maxNotional": 30000000.0, @@ -14668,6 +17446,7 @@ }, { "tier": 10.0, + "symbol": "DOT/USDT:USDT", "currency": "USDT", "minNotional": 30000000.0, "maxNotional": 50000000.0, @@ -14683,123 +17462,10 @@ } } ], - "DUSK/USDT:USDT": [ - { - "tier": 1.0, - "currency": "USDT", - "minNotional": 0.0, - "maxNotional": 5000.0, - "maintenanceMarginRate": 0.02, - "maxLeverage": 25.0, - "info": { - "bracket": "1", - "initialLeverage": "25", - "notionalCap": "5000", - "notionalFloor": "0", - "maintMarginRatio": "0.02", - "cum": "0.0" - } - }, - { - "tier": 2.0, - "currency": "USDT", - "minNotional": 5000.0, - "maxNotional": 25000.0, - "maintenanceMarginRate": 0.025, - "maxLeverage": 20.0, - "info": { - "bracket": "2", - "initialLeverage": "20", - "notionalCap": "25000", - "notionalFloor": "5000", - "maintMarginRatio": "0.025", - "cum": "25.0" - } - }, - { - "tier": 3.0, - "currency": "USDT", - "minNotional": 25000.0, - "maxNotional": 200000.0, - "maintenanceMarginRate": 0.05, - "maxLeverage": 10.0, - "info": { - "bracket": "3", - "initialLeverage": "10", - "notionalCap": "200000", - "notionalFloor": "25000", - "maintMarginRatio": "0.05", - "cum": "650.0" - } - }, - { - "tier": 4.0, - "currency": "USDT", - "minNotional": 200000.0, - "maxNotional": 500000.0, - "maintenanceMarginRate": 0.1, - "maxLeverage": 5.0, - "info": { - "bracket": "4", - "initialLeverage": "5", - "notionalCap": "500000", - "notionalFloor": "200000", - "maintMarginRatio": "0.1", - "cum": "10650.0" - } - }, - { - "tier": 5.0, - "currency": "USDT", - "minNotional": 500000.0, - "maxNotional": 1000000.0, - "maintenanceMarginRate": 0.125, - "maxLeverage": 4.0, - "info": { - "bracket": "5", - "initialLeverage": "4", - "notionalCap": "1000000", - "notionalFloor": "500000", - "maintMarginRatio": "0.125", - "cum": "23150.0" - } - }, - { - "tier": 6.0, - "currency": "USDT", - "minNotional": 1000000.0, - "maxNotional": 3000000.0, - "maintenanceMarginRate": 0.25, - "maxLeverage": 2.0, - "info": { - "bracket": "6", - "initialLeverage": "2", - "notionalCap": "3000000", - "notionalFloor": "1000000", - "maintMarginRatio": "0.25", - "cum": "148150.0" - } - }, - { - "tier": 7.0, - "currency": "USDT", - "minNotional": 3000000.0, - "maxNotional": 5000000.0, - "maintenanceMarginRate": 0.5, - "maxLeverage": 1.0, - "info": { - "bracket": "7", - "initialLeverage": "1", - "notionalCap": "5000000", - "notionalFloor": "3000000", - "maintMarginRatio": "0.5", - "cum": "898150.0" - } - } - ], - "DYDX/USDT:USDT": [ + "DRIFT/USDT:USDT": [ { "tier": 1.0, + "symbol": "DRIFT/USDT:USDT", "currency": "USDT", "minNotional": 0.0, "maxNotional": 10000.0, @@ -14816,6 +17482,317 @@ }, { "tier": 2.0, + "symbol": "DRIFT/USDT:USDT", + "currency": "USDT", + "minNotional": 10000.0, + "maxNotional": 20000.0, + "maintenanceMarginRate": 0.015, + "maxLeverage": 50.0, + "info": { + "bracket": "2", + "initialLeverage": "50", + "notionalCap": "20000", + "notionalFloor": "10000", + "maintMarginRatio": "0.015", + "cum": "50.0" + } + }, + { + "tier": 3.0, + "symbol": "DRIFT/USDT:USDT", + "currency": "USDT", + "minNotional": 20000.0, + "maxNotional": 100000.0, + "maintenanceMarginRate": 0.02, + "maxLeverage": 25.0, + "info": { + "bracket": "3", + "initialLeverage": "25", + "notionalCap": "100000", + "notionalFloor": "20000", + "maintMarginRatio": "0.02", + "cum": "150.0" + } + }, + { + "tier": 4.0, + "symbol": "DRIFT/USDT:USDT", + "currency": "USDT", + "minNotional": 100000.0, + "maxNotional": 200000.0, + "maintenanceMarginRate": 0.025, + "maxLeverage": 20.0, + "info": { + "bracket": "4", + "initialLeverage": "20", + "notionalCap": "200000", + "notionalFloor": "100000", + "maintMarginRatio": "0.025", + "cum": "650.0" + } + }, + { + "tier": 5.0, + "symbol": "DRIFT/USDT:USDT", + "currency": "USDT", + "minNotional": 200000.0, + "maxNotional": 1000000.0, + "maintenanceMarginRate": 0.05, + "maxLeverage": 10.0, + "info": { + "bracket": "5", + "initialLeverage": "10", + "notionalCap": "1000000", + "notionalFloor": "200000", + "maintMarginRatio": "0.05", + "cum": "5650.0" + } + }, + { + "tier": 6.0, + "symbol": "DRIFT/USDT:USDT", + "currency": "USDT", + "minNotional": 1000000.0, + "maxNotional": 2000000.0, + "maintenanceMarginRate": 0.1, + "maxLeverage": 5.0, + "info": { + "bracket": "6", + "initialLeverage": "5", + "notionalCap": "2000000", + "notionalFloor": "1000000", + "maintMarginRatio": "0.1", + "cum": "55650.0" + } + }, + { + "tier": 7.0, + "symbol": "DRIFT/USDT:USDT", + "currency": "USDT", + "minNotional": 2000000.0, + "maxNotional": 2500000.0, + "maintenanceMarginRate": 0.125, + "maxLeverage": 4.0, + "info": { + "bracket": "7", + "initialLeverage": "4", + "notionalCap": "2500000", + "notionalFloor": "2000000", + "maintMarginRatio": "0.125", + "cum": "105650.0" + } + }, + { + "tier": 8.0, + "symbol": "DRIFT/USDT:USDT", + "currency": "USDT", + "minNotional": 2500000.0, + "maxNotional": 5000000.0, + "maintenanceMarginRate": 0.25, + "maxLeverage": 2.0, + "info": { + "bracket": "8", + "initialLeverage": "2", + "notionalCap": "5000000", + "notionalFloor": "2500000", + "maintMarginRatio": "0.25", + "cum": "418150.0" + } + }, + { + "tier": 9.0, + "symbol": "DRIFT/USDT:USDT", + "currency": "USDT", + "minNotional": 5000000.0, + "maxNotional": 10000000.0, + "maintenanceMarginRate": 0.5, + "maxLeverage": 1.0, + "info": { + "bracket": "9", + "initialLeverage": "1", + "notionalCap": "10000000", + "notionalFloor": "5000000", + "maintMarginRatio": "0.5", + "cum": "1668150.0" + } + } + ], + "DUSK/USDT:USDT": [ + { + "tier": 1.0, + "symbol": "DUSK/USDT:USDT", + "currency": "USDT", + "minNotional": 0.0, + "maxNotional": 5000.0, + "maintenanceMarginRate": 0.01, + "maxLeverage": 75.0, + "info": { + "bracket": "1", + "initialLeverage": "75", + "notionalCap": "5000", + "notionalFloor": "0", + "maintMarginRatio": "0.01", + "cum": "0.0" + } + }, + { + "tier": 2.0, + "symbol": "DUSK/USDT:USDT", + "currency": "USDT", + "minNotional": 5000.0, + "maxNotional": 10000.0, + "maintenanceMarginRate": 0.015, + "maxLeverage": 50.0, + "info": { + "bracket": "2", + "initialLeverage": "50", + "notionalCap": "10000", + "notionalFloor": "5000", + "maintMarginRatio": "0.015", + "cum": "25.0" + } + }, + { + "tier": 3.0, + "symbol": "DUSK/USDT:USDT", + "currency": "USDT", + "minNotional": 10000.0, + "maxNotional": 50000.0, + "maintenanceMarginRate": 0.02, + "maxLeverage": 25.0, + "info": { + "bracket": "3", + "initialLeverage": "25", + "notionalCap": "50000", + "notionalFloor": "10000", + "maintMarginRatio": "0.02", + "cum": "75.0" + } + }, + { + "tier": 4.0, + "symbol": "DUSK/USDT:USDT", + "currency": "USDT", + "minNotional": 50000.0, + "maxNotional": 100000.0, + "maintenanceMarginRate": 0.025, + "maxLeverage": 20.0, + "info": { + "bracket": "4", + "initialLeverage": "20", + "notionalCap": "100000", + "notionalFloor": "50000", + "maintMarginRatio": "0.025", + "cum": "325.0" + } + }, + { + "tier": 5.0, + "symbol": "DUSK/USDT:USDT", + "currency": "USDT", + "minNotional": 100000.0, + "maxNotional": 500000.0, + "maintenanceMarginRate": 0.05, + "maxLeverage": 10.0, + "info": { + "bracket": "5", + "initialLeverage": "10", + "notionalCap": "500000", + "notionalFloor": "100000", + "maintMarginRatio": "0.05", + "cum": "2825.0" + } + }, + { + "tier": 6.0, + "symbol": "DUSK/USDT:USDT", + "currency": "USDT", + "minNotional": 500000.0, + "maxNotional": 1000000.0, + "maintenanceMarginRate": 0.1, + "maxLeverage": 5.0, + "info": { + "bracket": "6", + "initialLeverage": "5", + "notionalCap": "1000000", + "notionalFloor": "500000", + "maintMarginRatio": "0.1", + "cum": "27825.0" + } + }, + { + "tier": 7.0, + "symbol": "DUSK/USDT:USDT", + "currency": "USDT", + "minNotional": 1000000.0, + "maxNotional": 1250000.0, + "maintenanceMarginRate": 0.125, + "maxLeverage": 4.0, + "info": { + "bracket": "7", + "initialLeverage": "4", + "notionalCap": "1250000", + "notionalFloor": "1000000", + "maintMarginRatio": "0.125", + "cum": "52825.0" + } + }, + { + "tier": 8.0, + "symbol": "DUSK/USDT:USDT", + "currency": "USDT", + "minNotional": 1250000.0, + "maxNotional": 3000000.0, + "maintenanceMarginRate": 0.25, + "maxLeverage": 2.0, + "info": { + "bracket": "8", + "initialLeverage": "2", + "notionalCap": "3000000", + "notionalFloor": "1250000", + "maintMarginRatio": "0.25", + "cum": "209075.0" + } + }, + { + "tier": 9.0, + "symbol": "DUSK/USDT:USDT", + "currency": "USDT", + "minNotional": 3000000.0, + "maxNotional": 5000000.0, + "maintenanceMarginRate": 0.5, + "maxLeverage": 1.0, + "info": { + "bracket": "9", + "initialLeverage": "1", + "notionalCap": "5000000", + "notionalFloor": "3000000", + "maintMarginRatio": "0.5", + "cum": "959075.0" + } + } + ], + "DYDX/USDT:USDT": [ + { + "tier": 1.0, + "symbol": "DYDX/USDT:USDT", + "currency": "USDT", + "minNotional": 0.0, + "maxNotional": 10000.0, + "maintenanceMarginRate": 0.01, + "maxLeverage": 75.0, + "info": { + "bracket": "1", + "initialLeverage": "75", + "notionalCap": "10000", + "notionalFloor": "0", + "maintMarginRatio": "0.01", + "cum": "0.0" + } + }, + { + "tier": 2.0, + "symbol": "DYDX/USDT:USDT", "currency": "USDT", "minNotional": 10000.0, "maxNotional": 40000.0, @@ -14832,6 +17809,7 @@ }, { "tier": 3.0, + "symbol": "DYDX/USDT:USDT", "currency": "USDT", "minNotional": 40000.0, "maxNotional": 200000.0, @@ -14848,6 +17826,7 @@ }, { "tier": 4.0, + "symbol": "DYDX/USDT:USDT", "currency": "USDT", "minNotional": 200000.0, "maxNotional": 400000.0, @@ -14864,6 +17843,7 @@ }, { "tier": 5.0, + "symbol": "DYDX/USDT:USDT", "currency": "USDT", "minNotional": 400000.0, "maxNotional": 2000000.0, @@ -14880,6 +17860,7 @@ }, { "tier": 6.0, + "symbol": "DYDX/USDT:USDT", "currency": "USDT", "minNotional": 2000000.0, "maxNotional": 4000000.0, @@ -14896,6 +17877,7 @@ }, { "tier": 7.0, + "symbol": "DYDX/USDT:USDT", "currency": "USDT", "minNotional": 4000000.0, "maxNotional": 5000000.0, @@ -14912,6 +17894,7 @@ }, { "tier": 8.0, + "symbol": "DYDX/USDT:USDT", "currency": "USDT", "minNotional": 5000000.0, "maxNotional": 12000000.0, @@ -14928,6 +17911,7 @@ }, { "tier": 9.0, + "symbol": "DYDX/USDT:USDT", "currency": "USDT", "minNotional": 12000000.0, "maxNotional": 20000000.0, @@ -14946,6 +17930,7 @@ "DYM/USDT:USDT": [ { "tier": 1.0, + "symbol": "DYM/USDT:USDT", "currency": "USDT", "minNotional": 0.0, "maxNotional": 5000.0, @@ -14962,6 +17947,7 @@ }, { "tier": 2.0, + "symbol": "DYM/USDT:USDT", "currency": "USDT", "minNotional": 5000.0, "maxNotional": 25000.0, @@ -14978,6 +17964,7 @@ }, { "tier": 3.0, + "symbol": "DYM/USDT:USDT", "currency": "USDT", "minNotional": 25000.0, "maxNotional": 80000.0, @@ -14994,6 +17981,7 @@ }, { "tier": 4.0, + "symbol": "DYM/USDT:USDT", "currency": "USDT", "minNotional": 80000.0, "maxNotional": 800000.0, @@ -15010,6 +17998,7 @@ }, { "tier": 5.0, + "symbol": "DYM/USDT:USDT", "currency": "USDT", "minNotional": 800000.0, "maxNotional": 1600000.0, @@ -15026,6 +18015,7 @@ }, { "tier": 6.0, + "symbol": "DYM/USDT:USDT", "currency": "USDT", "minNotional": 1600000.0, "maxNotional": 2000000.0, @@ -15042,6 +18032,7 @@ }, { "tier": 7.0, + "symbol": "DYM/USDT:USDT", "currency": "USDT", "minNotional": 2000000.0, "maxNotional": 4000000.0, @@ -15058,6 +18049,7 @@ }, { "tier": 8.0, + "symbol": "DYM/USDT:USDT", "currency": "USDT", "minNotional": 4000000.0, "maxNotional": 8000000.0, @@ -15076,6 +18068,7 @@ "EDU/USDT:USDT": [ { "tier": 1.0, + "symbol": "EDU/USDT:USDT", "currency": "USDT", "minNotional": 0.0, "maxNotional": 5000.0, @@ -15092,6 +18085,7 @@ }, { "tier": 2.0, + "symbol": "EDU/USDT:USDT", "currency": "USDT", "minNotional": 5000.0, "maxNotional": 25000.0, @@ -15108,6 +18102,7 @@ }, { "tier": 3.0, + "symbol": "EDU/USDT:USDT", "currency": "USDT", "minNotional": 25000.0, "maxNotional": 200000.0, @@ -15124,6 +18119,7 @@ }, { "tier": 4.0, + "symbol": "EDU/USDT:USDT", "currency": "USDT", "minNotional": 200000.0, "maxNotional": 500000.0, @@ -15140,6 +18136,7 @@ }, { "tier": 5.0, + "symbol": "EDU/USDT:USDT", "currency": "USDT", "minNotional": 500000.0, "maxNotional": 1000000.0, @@ -15156,6 +18153,7 @@ }, { "tier": 6.0, + "symbol": "EDU/USDT:USDT", "currency": "USDT", "minNotional": 1000000.0, "maxNotional": 3000000.0, @@ -15172,6 +18170,7 @@ }, { "tier": 7.0, + "symbol": "EDU/USDT:USDT", "currency": "USDT", "minNotional": 3000000.0, "maxNotional": 5000000.0, @@ -15190,6 +18189,7 @@ "EGLD/USDT:USDT": [ { "tier": 1.0, + "symbol": "EGLD/USDT:USDT", "currency": "USDT", "minNotional": 0.0, "maxNotional": 10000.0, @@ -15206,6 +18206,7 @@ }, { "tier": 2.0, + "symbol": "EGLD/USDT:USDT", "currency": "USDT", "minNotional": 10000.0, "maxNotional": 20000.0, @@ -15222,6 +18223,7 @@ }, { "tier": 3.0, + "symbol": "EGLD/USDT:USDT", "currency": "USDT", "minNotional": 20000.0, "maxNotional": 100000.0, @@ -15238,6 +18240,7 @@ }, { "tier": 4.0, + "symbol": "EGLD/USDT:USDT", "currency": "USDT", "minNotional": 100000.0, "maxNotional": 200000.0, @@ -15254,6 +18257,7 @@ }, { "tier": 5.0, + "symbol": "EGLD/USDT:USDT", "currency": "USDT", "minNotional": 200000.0, "maxNotional": 1000000.0, @@ -15270,6 +18274,7 @@ }, { "tier": 6.0, + "symbol": "EGLD/USDT:USDT", "currency": "USDT", "minNotional": 1000000.0, "maxNotional": 2000000.0, @@ -15286,6 +18291,7 @@ }, { "tier": 7.0, + "symbol": "EGLD/USDT:USDT", "currency": "USDT", "minNotional": 2000000.0, "maxNotional": 2500000.0, @@ -15302,6 +18308,7 @@ }, { "tier": 8.0, + "symbol": "EGLD/USDT:USDT", "currency": "USDT", "minNotional": 2500000.0, "maxNotional": 6000000.0, @@ -15318,6 +18325,7 @@ }, { "tier": 9.0, + "symbol": "EGLD/USDT:USDT", "currency": "USDT", "minNotional": 6000000.0, "maxNotional": 10000000.0, @@ -15336,6 +18344,7 @@ "EIGEN/USDT:USDT": [ { "tier": 1.0, + "symbol": "EIGEN/USDT:USDT", "currency": "USDT", "minNotional": 0.0, "maxNotional": 10000.0, @@ -15352,6 +18361,7 @@ }, { "tier": 2.0, + "symbol": "EIGEN/USDT:USDT", "currency": "USDT", "minNotional": 10000.0, "maxNotional": 60000.0, @@ -15368,6 +18378,7 @@ }, { "tier": 3.0, + "symbol": "EIGEN/USDT:USDT", "currency": "USDT", "minNotional": 60000.0, "maxNotional": 300000.0, @@ -15384,6 +18395,7 @@ }, { "tier": 4.0, + "symbol": "EIGEN/USDT:USDT", "currency": "USDT", "minNotional": 300000.0, "maxNotional": 600000.0, @@ -15400,6 +18412,7 @@ }, { "tier": 5.0, + "symbol": "EIGEN/USDT:USDT", "currency": "USDT", "minNotional": 600000.0, "maxNotional": 3000000.0, @@ -15416,6 +18429,7 @@ }, { "tier": 6.0, + "symbol": "EIGEN/USDT:USDT", "currency": "USDT", "minNotional": 3000000.0, "maxNotional": 6000000.0, @@ -15432,6 +18446,7 @@ }, { "tier": 7.0, + "symbol": "EIGEN/USDT:USDT", "currency": "USDT", "minNotional": 6000000.0, "maxNotional": 7500000.0, @@ -15448,6 +18463,7 @@ }, { "tier": 8.0, + "symbol": "EIGEN/USDT:USDT", "currency": "USDT", "minNotional": 7500000.0, "maxNotional": 15000000.0, @@ -15464,6 +18480,7 @@ }, { "tier": 9.0, + "symbol": "EIGEN/USDT:USDT", "currency": "USDT", "minNotional": 15000000.0, "maxNotional": 30000000.0, @@ -15482,6 +18499,7 @@ "ENA/USDC:USDC": [ { "tier": 1.0, + "symbol": "ENA/USDC:USDC", "currency": "USDC", "minNotional": 0.0, "maxNotional": 5000.0, @@ -15498,6 +18516,7 @@ }, { "tier": 2.0, + "symbol": "ENA/USDC:USDC", "currency": "USDC", "minNotional": 5000.0, "maxNotional": 50000.0, @@ -15514,6 +18533,7 @@ }, { "tier": 3.0, + "symbol": "ENA/USDC:USDC", "currency": "USDC", "minNotional": 50000.0, "maxNotional": 600000.0, @@ -15530,6 +18550,7 @@ }, { "tier": 4.0, + "symbol": "ENA/USDC:USDC", "currency": "USDC", "minNotional": 600000.0, "maxNotional": 1200000.0, @@ -15546,6 +18567,7 @@ }, { "tier": 5.0, + "symbol": "ENA/USDC:USDC", "currency": "USDC", "minNotional": 1200000.0, "maxNotional": 3000000.0, @@ -15562,6 +18584,7 @@ }, { "tier": 6.0, + "symbol": "ENA/USDC:USDC", "currency": "USDC", "minNotional": 3000000.0, "maxNotional": 4000000.0, @@ -15578,6 +18601,7 @@ }, { "tier": 7.0, + "symbol": "ENA/USDC:USDC", "currency": "USDC", "minNotional": 4000000.0, "maxNotional": 6000000.0, @@ -15594,6 +18618,7 @@ }, { "tier": 8.0, + "symbol": "ENA/USDC:USDC", "currency": "USDC", "minNotional": 6000000.0, "maxNotional": 10000000.0, @@ -15612,15 +18637,16 @@ "ENA/USDT:USDT": [ { "tier": 1.0, + "symbol": "ENA/USDT:USDT", "currency": "USDT", "minNotional": 0.0, - "maxNotional": 10000.0, + "maxNotional": 20000.0, "maintenanceMarginRate": 0.01, "maxLeverage": 75.0, "info": { "bracket": "1", "initialLeverage": "75", - "notionalCap": "10000", + "notionalCap": "20000", "notionalFloor": "0", "maintMarginRatio": "0.01", "cum": "0.0" @@ -15628,136 +18654,145 @@ }, { "tier": 2.0, + "symbol": "ENA/USDT:USDT", "currency": "USDT", - "minNotional": 10000.0, - "maxNotional": 80000.0, + "minNotional": 20000.0, + "maxNotional": 160000.0, "maintenanceMarginRate": 0.015, "maxLeverage": 50.0, "info": { "bracket": "2", "initialLeverage": "50", - "notionalCap": "80000", - "notionalFloor": "10000", + "notionalCap": "160000", + "notionalFloor": "20000", "maintMarginRatio": "0.015", - "cum": "50.0" + "cum": "100.0" } }, { "tier": 3.0, + "symbol": "ENA/USDT:USDT", "currency": "USDT", - "minNotional": 80000.0, - "maxNotional": 400000.0, + "minNotional": 160000.0, + "maxNotional": 800000.0, "maintenanceMarginRate": 0.02, "maxLeverage": 25.0, "info": { "bracket": "3", "initialLeverage": "25", - "notionalCap": "400000", - "notionalFloor": "80000", + "notionalCap": "800000", + "notionalFloor": "160000", "maintMarginRatio": "0.02", - "cum": "450.0" + "cum": "900.0" } }, { "tier": 4.0, + "symbol": "ENA/USDT:USDT", "currency": "USDT", - "minNotional": 400000.0, - "maxNotional": 800000.0, + "minNotional": 800000.0, + "maxNotional": 1600000.0, "maintenanceMarginRate": 0.025, "maxLeverage": 20.0, "info": { "bracket": "4", "initialLeverage": "20", - "notionalCap": "800000", - "notionalFloor": "400000", + "notionalCap": "1600000", + "notionalFloor": "800000", "maintMarginRatio": "0.025", - "cum": "2450.0" + "cum": "4900.0" } }, { "tier": 5.0, + "symbol": "ENA/USDT:USDT", "currency": "USDT", - "minNotional": 800000.0, - "maxNotional": 4000000.0, + "minNotional": 1600000.0, + "maxNotional": 8000000.0, "maintenanceMarginRate": 0.05, "maxLeverage": 10.0, "info": { "bracket": "5", "initialLeverage": "10", - "notionalCap": "4000000", - "notionalFloor": "800000", + "notionalCap": "8000000", + "notionalFloor": "1600000", "maintMarginRatio": "0.05", - "cum": "22450.0" + "cum": "44900.0" } }, { "tier": 6.0, + "symbol": "ENA/USDT:USDT", "currency": "USDT", - "minNotional": 4000000.0, - "maxNotional": 8000000.0, + "minNotional": 8000000.0, + "maxNotional": 16000000.0, "maintenanceMarginRate": 0.1, "maxLeverage": 5.0, "info": { "bracket": "6", "initialLeverage": "5", - "notionalCap": "8000000", - "notionalFloor": "4000000", + "notionalCap": "16000000", + "notionalFloor": "8000000", "maintMarginRatio": "0.1", - "cum": "222450.0" + "cum": "444900.0" } }, { "tier": 7.0, + "symbol": "ENA/USDT:USDT", "currency": "USDT", - "minNotional": 8000000.0, - "maxNotional": 10000000.0, + "minNotional": 16000000.0, + "maxNotional": 20000000.0, "maintenanceMarginRate": 0.125, "maxLeverage": 4.0, "info": { "bracket": "7", "initialLeverage": "4", - "notionalCap": "10000000", - "notionalFloor": "8000000", + "notionalCap": "20000000", + "notionalFloor": "16000000", "maintMarginRatio": "0.125", - "cum": "422450.0" + "cum": "844900.0" } }, { "tier": 8.0, + "symbol": "ENA/USDT:USDT", "currency": "USDT", - "minNotional": 10000000.0, - "maxNotional": 20000000.0, + "minNotional": 20000000.0, + "maxNotional": 40000000.0, "maintenanceMarginRate": 0.25, "maxLeverage": 2.0, "info": { "bracket": "8", "initialLeverage": "2", - "notionalCap": "20000000", - "notionalFloor": "10000000", + "notionalCap": "40000000", + "notionalFloor": "20000000", "maintMarginRatio": "0.25", - "cum": "1672450.0" + "cum": "3344900.0" } }, { "tier": 9.0, + "symbol": "ENA/USDT:USDT", "currency": "USDT", - "minNotional": 20000000.0, - "maxNotional": 40000000.0, + "minNotional": 40000000.0, + "maxNotional": 80000000.0, "maintenanceMarginRate": 0.5, "maxLeverage": 1.0, "info": { "bracket": "9", "initialLeverage": "1", - "notionalCap": "40000000", - "notionalFloor": "20000000", + "notionalCap": "80000000", + "notionalFloor": "40000000", "maintMarginRatio": "0.5", - "cum": "6672450.0" + "cum": "13344900.0" } } ], "ENJ/USDT:USDT": [ { "tier": 1.0, + "symbol": "ENJ/USDT:USDT", "currency": "USDT", "minNotional": 0.0, "maxNotional": 50000.0, @@ -15774,6 +18809,7 @@ }, { "tier": 2.0, + "symbol": "ENJ/USDT:USDT", "currency": "USDT", "minNotional": 50000.0, "maxNotional": 100000.0, @@ -15790,6 +18826,7 @@ }, { "tier": 3.0, + "symbol": "ENJ/USDT:USDT", "currency": "USDT", "minNotional": 100000.0, "maxNotional": 150000.0, @@ -15806,6 +18843,7 @@ }, { "tier": 4.0, + "symbol": "ENJ/USDT:USDT", "currency": "USDT", "minNotional": 150000.0, "maxNotional": 250000.0, @@ -15822,6 +18860,7 @@ }, { "tier": 5.0, + "symbol": "ENJ/USDT:USDT", "currency": "USDT", "minNotional": 250000.0, "maxNotional": 500000.0, @@ -15838,6 +18877,7 @@ }, { "tier": 6.0, + "symbol": "ENJ/USDT:USDT", "currency": "USDT", "minNotional": 500000.0, "maxNotional": 1000000.0, @@ -15854,6 +18894,7 @@ }, { "tier": 7.0, + "symbol": "ENJ/USDT:USDT", "currency": "USDT", "minNotional": 1000000.0, "maxNotional": 5000000.0, @@ -15870,6 +18911,7 @@ }, { "tier": 8.0, + "symbol": "ENJ/USDT:USDT", "currency": "USDT", "minNotional": 5000000.0, "maxNotional": 10000000.0, @@ -15888,104 +18930,162 @@ "ENS/USDT:USDT": [ { "tier": 1.0, + "symbol": "ENS/USDT:USDT", "currency": "USDT", "minNotional": 0.0, "maxNotional": 5000.0, - "maintenanceMarginRate": 0.015, - "maxLeverage": 50.0, + "maintenanceMarginRate": 0.01, + "maxLeverage": 75.0, "info": { "bracket": "1", - "initialLeverage": "50", + "initialLeverage": "75", "notionalCap": "5000", "notionalFloor": "0", - "maintMarginRatio": "0.015", + "maintMarginRatio": "0.01", "cum": "0.0" } }, { "tier": 2.0, + "symbol": "ENS/USDT:USDT", "currency": "USDT", "minNotional": 5000.0, - "maxNotional": 25000.0, - "maintenanceMarginRate": 0.025, - "maxLeverage": 20.0, + "maxNotional": 16000.0, + "maintenanceMarginRate": 0.015, + "maxLeverage": 50.0, "info": { "bracket": "2", - "initialLeverage": "20", - "notionalCap": "25000", + "initialLeverage": "50", + "notionalCap": "16000", "notionalFloor": "5000", - "maintMarginRatio": "0.025", - "cum": "50.0" + "maintMarginRatio": "0.015", + "cum": "25.0" } }, { "tier": 3.0, + "symbol": "ENS/USDT:USDT", "currency": "USDT", - "minNotional": 25000.0, - "maxNotional": 100000.0, - "maintenanceMarginRate": 0.05, - "maxLeverage": 10.0, + "minNotional": 16000.0, + "maxNotional": 80000.0, + "maintenanceMarginRate": 0.02, + "maxLeverage": 25.0, "info": { "bracket": "3", - "initialLeverage": "10", - "notionalCap": "100000", - "notionalFloor": "25000", - "maintMarginRatio": "0.05", - "cum": "675.0" + "initialLeverage": "25", + "notionalCap": "80000", + "notionalFloor": "16000", + "maintMarginRatio": "0.02", + "cum": "105.0" } }, { "tier": 4.0, + "symbol": "ENS/USDT:USDT", "currency": "USDT", - "minNotional": 100000.0, - "maxNotional": 250000.0, - "maintenanceMarginRate": 0.1, - "maxLeverage": 5.0, + "minNotional": 80000.0, + "maxNotional": 160000.0, + "maintenanceMarginRate": 0.025, + "maxLeverage": 20.0, "info": { "bracket": "4", - "initialLeverage": "5", - "notionalCap": "250000", - "notionalFloor": "100000", - "maintMarginRatio": "0.1", - "cum": "5675.0" + "initialLeverage": "20", + "notionalCap": "160000", + "notionalFloor": "80000", + "maintMarginRatio": "0.025", + "cum": "505.0" } }, { "tier": 5.0, + "symbol": "ENS/USDT:USDT", "currency": "USDT", - "minNotional": 250000.0, - "maxNotional": 1000000.0, - "maintenanceMarginRate": 0.125, - "maxLeverage": 2.0, + "minNotional": 160000.0, + "maxNotional": 800000.0, + "maintenanceMarginRate": 0.05, + "maxLeverage": 10.0, "info": { "bracket": "5", - "initialLeverage": "2", - "notionalCap": "1000000", - "notionalFloor": "250000", - "maintMarginRatio": "0.125", - "cum": "11925.0" + "initialLeverage": "10", + "notionalCap": "800000", + "notionalFloor": "160000", + "maintMarginRatio": "0.05", + "cum": "4505.0" } }, { "tier": 6.0, + "symbol": "ENS/USDT:USDT", "currency": "USDT", - "minNotional": 1000000.0, + "minNotional": 800000.0, + "maxNotional": 1600000.0, + "maintenanceMarginRate": 0.1, + "maxLeverage": 5.0, + "info": { + "bracket": "6", + "initialLeverage": "5", + "notionalCap": "1600000", + "notionalFloor": "800000", + "maintMarginRatio": "0.1", + "cum": "44505.0" + } + }, + { + "tier": 7.0, + "symbol": "ENS/USDT:USDT", + "currency": "USDT", + "minNotional": 1600000.0, + "maxNotional": 2000000.0, + "maintenanceMarginRate": 0.125, + "maxLeverage": 4.0, + "info": { + "bracket": "7", + "initialLeverage": "4", + "notionalCap": "2000000", + "notionalFloor": "1600000", + "maintMarginRatio": "0.125", + "cum": "84505.0" + } + }, + { + "tier": 8.0, + "symbol": "ENS/USDT:USDT", + "currency": "USDT", + "minNotional": 2000000.0, + "maxNotional": 4000000.0, + "maintenanceMarginRate": 0.25, + "maxLeverage": 2.0, + "info": { + "bracket": "8", + "initialLeverage": "2", + "notionalCap": "4000000", + "notionalFloor": "2000000", + "maintMarginRatio": "0.25", + "cum": "334505.0" + } + }, + { + "tier": 9.0, + "symbol": "ENS/USDT:USDT", + "currency": "USDT", + "minNotional": 4000000.0, "maxNotional": 8000000.0, "maintenanceMarginRate": 0.5, "maxLeverage": 1.0, "info": { - "bracket": "6", + "bracket": "9", "initialLeverage": "1", "notionalCap": "8000000", - "notionalFloor": "1000000", + "notionalFloor": "4000000", "maintMarginRatio": "0.5", - "cum": "386925.0" + "cum": "1334505.0" } } ], "EOS/USDT:USDT": [ { "tier": 1.0, + "symbol": "EOS/USDT:USDT", "currency": "USDT", "minNotional": 0.0, "maxNotional": 10000.0, @@ -16002,6 +19102,7 @@ }, { "tier": 2.0, + "symbol": "EOS/USDT:USDT", "currency": "USDT", "minNotional": 10000.0, "maxNotional": 50000.0, @@ -16018,6 +19119,7 @@ }, { "tier": 3.0, + "symbol": "EOS/USDT:USDT", "currency": "USDT", "minNotional": 50000.0, "maxNotional": 80000.0, @@ -16034,6 +19136,7 @@ }, { "tier": 4.0, + "symbol": "EOS/USDT:USDT", "currency": "USDT", "minNotional": 80000.0, "maxNotional": 250000.0, @@ -16050,6 +19153,7 @@ }, { "tier": 5.0, + "symbol": "EOS/USDT:USDT", "currency": "USDT", "minNotional": 250000.0, "maxNotional": 500000.0, @@ -16066,6 +19170,7 @@ }, { "tier": 6.0, + "symbol": "EOS/USDT:USDT", "currency": "USDT", "minNotional": 500000.0, "maxNotional": 2000000.0, @@ -16082,6 +19187,7 @@ }, { "tier": 7.0, + "symbol": "EOS/USDT:USDT", "currency": "USDT", "minNotional": 2000000.0, "maxNotional": 5000000.0, @@ -16098,6 +19204,7 @@ }, { "tier": 8.0, + "symbol": "EOS/USDT:USDT", "currency": "USDT", "minNotional": 5000000.0, "maxNotional": 20000000.0, @@ -16114,6 +19221,7 @@ }, { "tier": 9.0, + "symbol": "EOS/USDT:USDT", "currency": "USDT", "minNotional": 20000000.0, "maxNotional": 30000000.0, @@ -16130,6 +19238,7 @@ }, { "tier": 10.0, + "symbol": "EOS/USDT:USDT", "currency": "USDT", "minNotional": 30000000.0, "maxNotional": 50000000.0, @@ -16148,6 +19257,7 @@ "ETC/USDT:USDT": [ { "tier": 1.0, + "symbol": "ETC/USDT:USDT", "currency": "USDT", "minNotional": 0.0, "maxNotional": 10000.0, @@ -16164,6 +19274,7 @@ }, { "tier": 2.0, + "symbol": "ETC/USDT:USDT", "currency": "USDT", "minNotional": 10000.0, "maxNotional": 50000.0, @@ -16180,6 +19291,7 @@ }, { "tier": 3.0, + "symbol": "ETC/USDT:USDT", "currency": "USDT", "minNotional": 50000.0, "maxNotional": 80000.0, @@ -16196,6 +19308,7 @@ }, { "tier": 4.0, + "symbol": "ETC/USDT:USDT", "currency": "USDT", "minNotional": 80000.0, "maxNotional": 400000.0, @@ -16212,6 +19325,7 @@ }, { "tier": 5.0, + "symbol": "ETC/USDT:USDT", "currency": "USDT", "minNotional": 400000.0, "maxNotional": 800000.0, @@ -16228,6 +19342,7 @@ }, { "tier": 6.0, + "symbol": "ETC/USDT:USDT", "currency": "USDT", "minNotional": 800000.0, "maxNotional": 4000000.0, @@ -16244,6 +19359,7 @@ }, { "tier": 7.0, + "symbol": "ETC/USDT:USDT", "currency": "USDT", "minNotional": 4000000.0, "maxNotional": 8000000.0, @@ -16260,6 +19376,7 @@ }, { "tier": 8.0, + "symbol": "ETC/USDT:USDT", "currency": "USDT", "minNotional": 8000000.0, "maxNotional": 20000000.0, @@ -16276,6 +19393,7 @@ }, { "tier": 9.0, + "symbol": "ETC/USDT:USDT", "currency": "USDT", "minNotional": 20000000.0, "maxNotional": 30000000.0, @@ -16292,6 +19410,7 @@ }, { "tier": 10.0, + "symbol": "ETC/USDT:USDT", "currency": "USDT", "minNotional": 30000000.0, "maxNotional": 50000000.0, @@ -16310,6 +19429,7 @@ "ETH/BTC:BTC": [ { "tier": 1.0, + "symbol": "ETH/BTC:BTC", "currency": "BTC", "minNotional": 0.0, "maxNotional": 5.0, @@ -16326,6 +19446,7 @@ }, { "tier": 2.0, + "symbol": "ETH/BTC:BTC", "currency": "BTC", "minNotional": 5.0, "maxNotional": 10.0, @@ -16342,6 +19463,7 @@ }, { "tier": 3.0, + "symbol": "ETH/BTC:BTC", "currency": "BTC", "minNotional": 10.0, "maxNotional": 100.0, @@ -16358,6 +19480,7 @@ }, { "tier": 4.0, + "symbol": "ETH/BTC:BTC", "currency": "BTC", "minNotional": 100.0, "maxNotional": 400.0, @@ -16374,6 +19497,7 @@ }, { "tier": 5.0, + "symbol": "ETH/BTC:BTC", "currency": "BTC", "minNotional": 400.0, "maxNotional": 800.0, @@ -16390,6 +19514,7 @@ }, { "tier": 6.0, + "symbol": "ETH/BTC:BTC", "currency": "BTC", "minNotional": 800.0, "maxNotional": 1500.0, @@ -16406,6 +19531,7 @@ }, { "tier": 7.0, + "symbol": "ETH/BTC:BTC", "currency": "BTC", "minNotional": 1500.0, "maxNotional": 2000.0, @@ -16422,6 +19548,7 @@ }, { "tier": 8.0, + "symbol": "ETH/BTC:BTC", "currency": "BTC", "minNotional": 2000.0, "maxNotional": 3000.0, @@ -16438,6 +19565,7 @@ }, { "tier": 9.0, + "symbol": "ETH/BTC:BTC", "currency": "BTC", "minNotional": 3000.0, "maxNotional": 5000.0, @@ -16454,6 +19582,7 @@ }, { "tier": 10.0, + "symbol": "ETH/BTC:BTC", "currency": "BTC", "minNotional": 5000.0, "maxNotional": 10000.0, @@ -16472,6 +19601,7 @@ "ETH/USDC:USDC": [ { "tier": 1.0, + "symbol": "ETH/USDC:USDC", "currency": "USDC", "minNotional": 0.0, "maxNotional": 50000.0, @@ -16488,6 +19618,7 @@ }, { "tier": 2.0, + "symbol": "ETH/USDC:USDC", "currency": "USDC", "minNotional": 50000.0, "maxNotional": 500000.0, @@ -16504,6 +19635,7 @@ }, { "tier": 3.0, + "symbol": "ETH/USDC:USDC", "currency": "USDC", "minNotional": 500000.0, "maxNotional": 1000000.0, @@ -16520,6 +19652,7 @@ }, { "tier": 4.0, + "symbol": "ETH/USDC:USDC", "currency": "USDC", "minNotional": 1000000.0, "maxNotional": 5000000.0, @@ -16536,6 +19669,7 @@ }, { "tier": 5.0, + "symbol": "ETH/USDC:USDC", "currency": "USDC", "minNotional": 5000000.0, "maxNotional": 50000000.0, @@ -16552,6 +19686,7 @@ }, { "tier": 6.0, + "symbol": "ETH/USDC:USDC", "currency": "USDC", "minNotional": 50000000.0, "maxNotional": 100000000.0, @@ -16568,6 +19703,7 @@ }, { "tier": 7.0, + "symbol": "ETH/USDC:USDC", "currency": "USDC", "minNotional": 100000000.0, "maxNotional": 150000000.0, @@ -16584,6 +19720,7 @@ }, { "tier": 8.0, + "symbol": "ETH/USDC:USDC", "currency": "USDC", "minNotional": 150000000.0, "maxNotional": 300000000.0, @@ -16600,6 +19737,7 @@ }, { "tier": 9.0, + "symbol": "ETH/USDC:USDC", "currency": "USDC", "minNotional": 300000000.0, "maxNotional": 400000000.0, @@ -16616,6 +19754,7 @@ }, { "tier": 10.0, + "symbol": "ETH/USDC:USDC", "currency": "USDC", "minNotional": 400000000.0, "maxNotional": 500000000.0, @@ -16632,6 +19771,7 @@ }, { "tier": 11.0, + "symbol": "ETH/USDC:USDC", "currency": "USDC", "minNotional": 500000000.0, "maxNotional": 800000000.0, @@ -16650,6 +19790,7 @@ "ETH/USDT:USDT": [ { "tier": 1.0, + "symbol": "ETH/USDT:USDT", "currency": "USDT", "minNotional": 0.0, "maxNotional": 50000.0, @@ -16666,6 +19807,7 @@ }, { "tier": 2.0, + "symbol": "ETH/USDT:USDT", "currency": "USDT", "minNotional": 50000.0, "maxNotional": 600000.0, @@ -16682,6 +19824,7 @@ }, { "tier": 3.0, + "symbol": "ETH/USDT:USDT", "currency": "USDT", "minNotional": 600000.0, "maxNotional": 3000000.0, @@ -16698,6 +19841,7 @@ }, { "tier": 4.0, + "symbol": "ETH/USDT:USDT", "currency": "USDT", "minNotional": 3000000.0, "maxNotional": 12000000.0, @@ -16714,6 +19858,7 @@ }, { "tier": 5.0, + "symbol": "ETH/USDT:USDT", "currency": "USDT", "minNotional": 12000000.0, "maxNotional": 50000000.0, @@ -16730,6 +19875,7 @@ }, { "tier": 6.0, + "symbol": "ETH/USDT:USDT", "currency": "USDT", "minNotional": 50000000.0, "maxNotional": 65000000.0, @@ -16746,6 +19892,7 @@ }, { "tier": 7.0, + "symbol": "ETH/USDT:USDT", "currency": "USDT", "minNotional": 65000000.0, "maxNotional": 150000000.0, @@ -16762,6 +19909,7 @@ }, { "tier": 8.0, + "symbol": "ETH/USDT:USDT", "currency": "USDT", "minNotional": 150000000.0, "maxNotional": 320000000.0, @@ -16778,6 +19926,7 @@ }, { "tier": 9.0, + "symbol": "ETH/USDT:USDT", "currency": "USDT", "minNotional": 320000000.0, "maxNotional": 400000000.0, @@ -16794,6 +19943,7 @@ }, { "tier": 10.0, + "symbol": "ETH/USDT:USDT", "currency": "USDT", "minNotional": 400000000.0, "maxNotional": 530000000.0, @@ -16810,6 +19960,7 @@ }, { "tier": 11.0, + "symbol": "ETH/USDT:USDT", "currency": "USDT", "minNotional": 530000000.0, "maxNotional": 800000000.0, @@ -16826,6 +19977,7 @@ }, { "tier": 12.0, + "symbol": "ETH/USDT:USDT", "currency": "USDT", "minNotional": 800000000.0, "maxNotional": 1200000000.0, @@ -16844,6 +19996,7 @@ "ETH/USDT:USDT-241227": [ { "tier": 1.0, + "symbol": "ETH/USDT:USDT-241227", "currency": "USDT", "minNotional": 0.0, "maxNotional": 50000.0, @@ -16860,6 +20013,7 @@ }, { "tier": 2.0, + "symbol": "ETH/USDT:USDT-241227", "currency": "USDT", "minNotional": 50000.0, "maxNotional": 375000.0, @@ -16876,6 +20030,7 @@ }, { "tier": 3.0, + "symbol": "ETH/USDT:USDT-241227", "currency": "USDT", "minNotional": 375000.0, "maxNotional": 2000000.0, @@ -16892,6 +20047,7 @@ }, { "tier": 4.0, + "symbol": "ETH/USDT:USDT-241227", "currency": "USDT", "minNotional": 2000000.0, "maxNotional": 4000000.0, @@ -16908,6 +20064,7 @@ }, { "tier": 5.0, + "symbol": "ETH/USDT:USDT-241227", "currency": "USDT", "minNotional": 4000000.0, "maxNotional": 10000000.0, @@ -16924,6 +20081,7 @@ }, { "tier": 6.0, + "symbol": "ETH/USDT:USDT-241227", "currency": "USDT", "minNotional": 10000000.0, "maxNotional": 20000000.0, @@ -16940,6 +20098,7 @@ }, { "tier": 7.0, + "symbol": "ETH/USDT:USDT-241227", "currency": "USDT", "minNotional": 20000000.0, "maxNotional": 40000000.0, @@ -16956,6 +20115,7 @@ }, { "tier": 8.0, + "symbol": "ETH/USDT:USDT-241227", "currency": "USDT", "minNotional": 40000000.0, "maxNotional": 120000000.0, @@ -16974,6 +20134,7 @@ "ETH/USDT:USDT-250328": [ { "tier": 1.0, + "symbol": "ETH/USDT:USDT-250328", "currency": "USDT", "minNotional": 0.0, "maxNotional": 50000.0, @@ -16990,6 +20151,7 @@ }, { "tier": 2.0, + "symbol": "ETH/USDT:USDT-250328", "currency": "USDT", "minNotional": 50000.0, "maxNotional": 375000.0, @@ -17006,6 +20168,7 @@ }, { "tier": 3.0, + "symbol": "ETH/USDT:USDT-250328", "currency": "USDT", "minNotional": 375000.0, "maxNotional": 2000000.0, @@ -17022,6 +20185,7 @@ }, { "tier": 4.0, + "symbol": "ETH/USDT:USDT-250328", "currency": "USDT", "minNotional": 2000000.0, "maxNotional": 4000000.0, @@ -17038,6 +20202,7 @@ }, { "tier": 5.0, + "symbol": "ETH/USDT:USDT-250328", "currency": "USDT", "minNotional": 4000000.0, "maxNotional": 10000000.0, @@ -17054,6 +20219,7 @@ }, { "tier": 6.0, + "symbol": "ETH/USDT:USDT-250328", "currency": "USDT", "minNotional": 10000000.0, "maxNotional": 20000000.0, @@ -17070,6 +20236,7 @@ }, { "tier": 7.0, + "symbol": "ETH/USDT:USDT-250328", "currency": "USDT", "minNotional": 20000000.0, "maxNotional": 40000000.0, @@ -17086,6 +20253,7 @@ }, { "tier": 8.0, + "symbol": "ETH/USDT:USDT-250328", "currency": "USDT", "minNotional": 40000000.0, "maxNotional": 120000000.0, @@ -17104,6 +20272,7 @@ "ETHFI/USDC:USDC": [ { "tier": 1.0, + "symbol": "ETHFI/USDC:USDC", "currency": "USDC", "minNotional": 0.0, "maxNotional": 5000.0, @@ -17120,6 +20289,7 @@ }, { "tier": 2.0, + "symbol": "ETHFI/USDC:USDC", "currency": "USDC", "minNotional": 5000.0, "maxNotional": 50000.0, @@ -17136,6 +20306,7 @@ }, { "tier": 3.0, + "symbol": "ETHFI/USDC:USDC", "currency": "USDC", "minNotional": 50000.0, "maxNotional": 600000.0, @@ -17152,6 +20323,7 @@ }, { "tier": 4.0, + "symbol": "ETHFI/USDC:USDC", "currency": "USDC", "minNotional": 600000.0, "maxNotional": 1200000.0, @@ -17168,6 +20340,7 @@ }, { "tier": 5.0, + "symbol": "ETHFI/USDC:USDC", "currency": "USDC", "minNotional": 1200000.0, "maxNotional": 3000000.0, @@ -17184,6 +20357,7 @@ }, { "tier": 6.0, + "symbol": "ETHFI/USDC:USDC", "currency": "USDC", "minNotional": 3000000.0, "maxNotional": 4000000.0, @@ -17200,6 +20374,7 @@ }, { "tier": 7.0, + "symbol": "ETHFI/USDC:USDC", "currency": "USDC", "minNotional": 4000000.0, "maxNotional": 6000000.0, @@ -17216,6 +20391,7 @@ }, { "tier": 8.0, + "symbol": "ETHFI/USDC:USDC", "currency": "USDC", "minNotional": 6000000.0, "maxNotional": 10000000.0, @@ -17234,6 +20410,7 @@ "ETHFI/USDT:USDT": [ { "tier": 1.0, + "symbol": "ETHFI/USDT:USDT", "currency": "USDT", "minNotional": 0.0, "maxNotional": 10000.0, @@ -17250,6 +20427,7 @@ }, { "tier": 2.0, + "symbol": "ETHFI/USDT:USDT", "currency": "USDT", "minNotional": 10000.0, "maxNotional": 20000.0, @@ -17266,6 +20444,7 @@ }, { "tier": 3.0, + "symbol": "ETHFI/USDT:USDT", "currency": "USDT", "minNotional": 20000.0, "maxNotional": 100000.0, @@ -17282,6 +20461,7 @@ }, { "tier": 4.0, + "symbol": "ETHFI/USDT:USDT", "currency": "USDT", "minNotional": 100000.0, "maxNotional": 200000.0, @@ -17298,6 +20478,7 @@ }, { "tier": 5.0, + "symbol": "ETHFI/USDT:USDT", "currency": "USDT", "minNotional": 200000.0, "maxNotional": 1000000.0, @@ -17314,6 +20495,7 @@ }, { "tier": 6.0, + "symbol": "ETHFI/USDT:USDT", "currency": "USDT", "minNotional": 1000000.0, "maxNotional": 2000000.0, @@ -17330,6 +20512,7 @@ }, { "tier": 7.0, + "symbol": "ETHFI/USDT:USDT", "currency": "USDT", "minNotional": 2000000.0, "maxNotional": 2500000.0, @@ -17346,6 +20529,7 @@ }, { "tier": 8.0, + "symbol": "ETHFI/USDT:USDT", "currency": "USDT", "minNotional": 2500000.0, "maxNotional": 5000000.0, @@ -17362,6 +20546,7 @@ }, { "tier": 9.0, + "symbol": "ETHFI/USDT:USDT", "currency": "USDT", "minNotional": 5000000.0, "maxNotional": 10000000.0, @@ -17380,6 +20565,7 @@ "ETHW/USDT:USDT": [ { "tier": 1.0, + "symbol": "ETHW/USDT:USDT", "currency": "USDT", "minNotional": 0.0, "maxNotional": 5000.0, @@ -17396,6 +20582,7 @@ }, { "tier": 2.0, + "symbol": "ETHW/USDT:USDT", "currency": "USDT", "minNotional": 5000.0, "maxNotional": 10000.0, @@ -17412,6 +20599,7 @@ }, { "tier": 3.0, + "symbol": "ETHW/USDT:USDT", "currency": "USDT", "minNotional": 10000.0, "maxNotional": 30000.0, @@ -17428,6 +20616,7 @@ }, { "tier": 4.0, + "symbol": "ETHW/USDT:USDT", "currency": "USDT", "minNotional": 30000.0, "maxNotional": 60000.0, @@ -17444,6 +20633,7 @@ }, { "tier": 5.0, + "symbol": "ETHW/USDT:USDT", "currency": "USDT", "minNotional": 60000.0, "maxNotional": 300000.0, @@ -17460,6 +20650,7 @@ }, { "tier": 6.0, + "symbol": "ETHW/USDT:USDT", "currency": "USDT", "minNotional": 300000.0, "maxNotional": 600000.0, @@ -17476,6 +20667,7 @@ }, { "tier": 7.0, + "symbol": "ETHW/USDT:USDT", "currency": "USDT", "minNotional": 600000.0, "maxNotional": 750000.0, @@ -17492,6 +20684,7 @@ }, { "tier": 8.0, + "symbol": "ETHW/USDT:USDT", "currency": "USDT", "minNotional": 750000.0, "maxNotional": 1500000.0, @@ -17508,6 +20701,7 @@ }, { "tier": 9.0, + "symbol": "ETHW/USDT:USDT", "currency": "USDT", "minNotional": 1500000.0, "maxNotional": 3000000.0, @@ -17526,6 +20720,7 @@ "FET/USDT:USDT": [ { "tier": 1.0, + "symbol": "FET/USDT:USDT", "currency": "USDT", "minNotional": 0.0, "maxNotional": 10000.0, @@ -17542,6 +20737,7 @@ }, { "tier": 2.0, + "symbol": "FET/USDT:USDT", "currency": "USDT", "minNotional": 10000.0, "maxNotional": 60000.0, @@ -17558,6 +20754,7 @@ }, { "tier": 3.0, + "symbol": "FET/USDT:USDT", "currency": "USDT", "minNotional": 60000.0, "maxNotional": 300000.0, @@ -17574,6 +20771,7 @@ }, { "tier": 4.0, + "symbol": "FET/USDT:USDT", "currency": "USDT", "minNotional": 300000.0, "maxNotional": 600000.0, @@ -17590,6 +20788,7 @@ }, { "tier": 5.0, + "symbol": "FET/USDT:USDT", "currency": "USDT", "minNotional": 600000.0, "maxNotional": 3000000.0, @@ -17606,6 +20805,7 @@ }, { "tier": 6.0, + "symbol": "FET/USDT:USDT", "currency": "USDT", "minNotional": 3000000.0, "maxNotional": 6000000.0, @@ -17622,6 +20822,7 @@ }, { "tier": 7.0, + "symbol": "FET/USDT:USDT", "currency": "USDT", "minNotional": 6000000.0, "maxNotional": 7500000.0, @@ -17638,6 +20839,7 @@ }, { "tier": 8.0, + "symbol": "FET/USDT:USDT", "currency": "USDT", "minNotional": 7500000.0, "maxNotional": 15000000.0, @@ -17654,6 +20856,7 @@ }, { "tier": 9.0, + "symbol": "FET/USDT:USDT", "currency": "USDT", "minNotional": 15000000.0, "maxNotional": 30000000.0, @@ -17672,6 +20875,7 @@ "FIDA/USDT:USDT": [ { "tier": 1.0, + "symbol": "FIDA/USDT:USDT", "currency": "USDT", "minNotional": 0.0, "maxNotional": 5000.0, @@ -17688,6 +20892,7 @@ }, { "tier": 2.0, + "symbol": "FIDA/USDT:USDT", "currency": "USDT", "minNotional": 5000.0, "maxNotional": 10000.0, @@ -17704,6 +20909,7 @@ }, { "tier": 3.0, + "symbol": "FIDA/USDT:USDT", "currency": "USDT", "minNotional": 10000.0, "maxNotional": 50000.0, @@ -17720,6 +20926,7 @@ }, { "tier": 4.0, + "symbol": "FIDA/USDT:USDT", "currency": "USDT", "minNotional": 50000.0, "maxNotional": 100000.0, @@ -17736,6 +20943,7 @@ }, { "tier": 5.0, + "symbol": "FIDA/USDT:USDT", "currency": "USDT", "minNotional": 100000.0, "maxNotional": 500000.0, @@ -17752,6 +20960,7 @@ }, { "tier": 6.0, + "symbol": "FIDA/USDT:USDT", "currency": "USDT", "minNotional": 500000.0, "maxNotional": 1000000.0, @@ -17768,6 +20977,7 @@ }, { "tier": 7.0, + "symbol": "FIDA/USDT:USDT", "currency": "USDT", "minNotional": 1000000.0, "maxNotional": 1250000.0, @@ -17784,6 +20994,7 @@ }, { "tier": 8.0, + "symbol": "FIDA/USDT:USDT", "currency": "USDT", "minNotional": 1250000.0, "maxNotional": 2500000.0, @@ -17800,6 +21011,7 @@ }, { "tier": 9.0, + "symbol": "FIDA/USDT:USDT", "currency": "USDT", "minNotional": 2500000.0, "maxNotional": 5000000.0, @@ -17818,6 +21030,7 @@ "FIL/USDC:USDC": [ { "tier": 1.0, + "symbol": "FIL/USDC:USDC", "currency": "USDC", "minNotional": 0.0, "maxNotional": 50000.0, @@ -17834,6 +21047,7 @@ }, { "tier": 2.0, + "symbol": "FIL/USDC:USDC", "currency": "USDC", "minNotional": 50000.0, "maxNotional": 250000.0, @@ -17850,6 +21064,7 @@ }, { "tier": 3.0, + "symbol": "FIL/USDC:USDC", "currency": "USDC", "minNotional": 250000.0, "maxNotional": 600000.0, @@ -17866,6 +21081,7 @@ }, { "tier": 4.0, + "symbol": "FIL/USDC:USDC", "currency": "USDC", "minNotional": 600000.0, "maxNotional": 1200000.0, @@ -17882,6 +21098,7 @@ }, { "tier": 5.0, + "symbol": "FIL/USDC:USDC", "currency": "USDC", "minNotional": 1200000.0, "maxNotional": 3000000.0, @@ -17898,6 +21115,7 @@ }, { "tier": 6.0, + "symbol": "FIL/USDC:USDC", "currency": "USDC", "minNotional": 3000000.0, "maxNotional": 6000000.0, @@ -17914,6 +21132,7 @@ }, { "tier": 7.0, + "symbol": "FIL/USDC:USDC", "currency": "USDC", "minNotional": 6000000.0, "maxNotional": 10000000.0, @@ -17930,6 +21149,7 @@ }, { "tier": 8.0, + "symbol": "FIL/USDC:USDC", "currency": "USDC", "minNotional": 10000000.0, "maxNotional": 20000000.0, @@ -17946,6 +21166,7 @@ }, { "tier": 9.0, + "symbol": "FIL/USDC:USDC", "currency": "USDC", "minNotional": 20000000.0, "maxNotional": 30000000.0, @@ -17964,6 +21185,7 @@ "FIL/USDT:USDT": [ { "tier": 1.0, + "symbol": "FIL/USDT:USDT", "currency": "USDT", "minNotional": 0.0, "maxNotional": 50000.0, @@ -17980,6 +21202,7 @@ }, { "tier": 2.0, + "symbol": "FIL/USDT:USDT", "currency": "USDT", "minNotional": 50000.0, "maxNotional": 250000.0, @@ -17996,6 +21219,7 @@ }, { "tier": 3.0, + "symbol": "FIL/USDT:USDT", "currency": "USDT", "minNotional": 250000.0, "maxNotional": 350000.0, @@ -18012,6 +21236,7 @@ }, { "tier": 4.0, + "symbol": "FIL/USDT:USDT", "currency": "USDT", "minNotional": 350000.0, "maxNotional": 600000.0, @@ -18028,6 +21253,7 @@ }, { "tier": 5.0, + "symbol": "FIL/USDT:USDT", "currency": "USDT", "minNotional": 600000.0, "maxNotional": 800000.0, @@ -18044,6 +21270,7 @@ }, { "tier": 6.0, + "symbol": "FIL/USDT:USDT", "currency": "USDT", "minNotional": 800000.0, "maxNotional": 3000000.0, @@ -18060,6 +21287,7 @@ }, { "tier": 7.0, + "symbol": "FIL/USDT:USDT", "currency": "USDT", "minNotional": 3000000.0, "maxNotional": 6000000.0, @@ -18076,6 +21304,7 @@ }, { "tier": 8.0, + "symbol": "FIL/USDT:USDT", "currency": "USDT", "minNotional": 6000000.0, "maxNotional": 10000000.0, @@ -18092,6 +21321,7 @@ }, { "tier": 9.0, + "symbol": "FIL/USDT:USDT", "currency": "USDT", "minNotional": 10000000.0, "maxNotional": 20000000.0, @@ -18108,6 +21338,7 @@ }, { "tier": 10.0, + "symbol": "FIL/USDT:USDT", "currency": "USDT", "minNotional": 20000000.0, "maxNotional": 30000000.0, @@ -18126,6 +21357,7 @@ "FIO/USDT:USDT": [ { "tier": 1.0, + "symbol": "FIO/USDT:USDT", "currency": "USDT", "minNotional": 0.0, "maxNotional": 5000.0, @@ -18142,6 +21374,7 @@ }, { "tier": 2.0, + "symbol": "FIO/USDT:USDT", "currency": "USDT", "minNotional": 5000.0, "maxNotional": 10000.0, @@ -18158,6 +21391,7 @@ }, { "tier": 3.0, + "symbol": "FIO/USDT:USDT", "currency": "USDT", "minNotional": 10000.0, "maxNotional": 30000.0, @@ -18174,6 +21408,7 @@ }, { "tier": 4.0, + "symbol": "FIO/USDT:USDT", "currency": "USDT", "minNotional": 30000.0, "maxNotional": 60000.0, @@ -18190,6 +21425,7 @@ }, { "tier": 5.0, + "symbol": "FIO/USDT:USDT", "currency": "USDT", "minNotional": 60000.0, "maxNotional": 300000.0, @@ -18206,6 +21442,7 @@ }, { "tier": 6.0, + "symbol": "FIO/USDT:USDT", "currency": "USDT", "minNotional": 300000.0, "maxNotional": 600000.0, @@ -18222,6 +21459,7 @@ }, { "tier": 7.0, + "symbol": "FIO/USDT:USDT", "currency": "USDT", "minNotional": 600000.0, "maxNotional": 750000.0, @@ -18238,6 +21476,7 @@ }, { "tier": 8.0, + "symbol": "FIO/USDT:USDT", "currency": "USDT", "minNotional": 750000.0, "maxNotional": 1500000.0, @@ -18254,6 +21493,7 @@ }, { "tier": 9.0, + "symbol": "FIO/USDT:USDT", "currency": "USDT", "minNotional": 1500000.0, "maxNotional": 3000000.0, @@ -18272,6 +21512,7 @@ "FLM/USDT:USDT": [ { "tier": 1.0, + "symbol": "FLM/USDT:USDT", "currency": "USDT", "minNotional": 0.0, "maxNotional": 5000.0, @@ -18288,6 +21529,7 @@ }, { "tier": 2.0, + "symbol": "FLM/USDT:USDT", "currency": "USDT", "minNotional": 5000.0, "maxNotional": 20000.0, @@ -18304,6 +21546,7 @@ }, { "tier": 3.0, + "symbol": "FLM/USDT:USDT", "currency": "USDT", "minNotional": 20000.0, "maxNotional": 25000.0, @@ -18320,6 +21563,7 @@ }, { "tier": 4.0, + "symbol": "FLM/USDT:USDT", "currency": "USDT", "minNotional": 25000.0, "maxNotional": 200000.0, @@ -18336,6 +21580,7 @@ }, { "tier": 5.0, + "symbol": "FLM/USDT:USDT", "currency": "USDT", "minNotional": 200000.0, "maxNotional": 400000.0, @@ -18352,6 +21597,7 @@ }, { "tier": 6.0, + "symbol": "FLM/USDT:USDT", "currency": "USDT", "minNotional": 400000.0, "maxNotional": 500000.0, @@ -18368,6 +21614,7 @@ }, { "tier": 7.0, + "symbol": "FLM/USDT:USDT", "currency": "USDT", "minNotional": 500000.0, "maxNotional": 1000000.0, @@ -18384,6 +21631,7 @@ }, { "tier": 8.0, + "symbol": "FLM/USDT:USDT", "currency": "USDT", "minNotional": 1000000.0, "maxNotional": 2000000.0, @@ -18402,104 +21650,7 @@ "FLOW/USDT:USDT": [ { "tier": 1.0, - "currency": "USDT", - "minNotional": 0.0, - "maxNotional": 5000.0, - "maintenanceMarginRate": 0.01, - "maxLeverage": 20.0, - "info": { - "bracket": "1", - "initialLeverage": "20", - "notionalCap": "5000", - "notionalFloor": "0", - "maintMarginRatio": "0.01", - "cum": "0.0" - } - }, - { - "tier": 2.0, - "currency": "USDT", - "minNotional": 5000.0, - "maxNotional": 25000.0, - "maintenanceMarginRate": 0.025, - "maxLeverage": 10.0, - "info": { - "bracket": "2", - "initialLeverage": "10", - "notionalCap": "25000", - "notionalFloor": "5000", - "maintMarginRatio": "0.025", - "cum": "75.0" - } - }, - { - "tier": 3.0, - "currency": "USDT", - "minNotional": 25000.0, - "maxNotional": 100000.0, - "maintenanceMarginRate": 0.05, - "maxLeverage": 8.0, - "info": { - "bracket": "3", - "initialLeverage": "8", - "notionalCap": "100000", - "notionalFloor": "25000", - "maintMarginRatio": "0.05", - "cum": "700.0" - } - }, - { - "tier": 4.0, - "currency": "USDT", - "minNotional": 100000.0, - "maxNotional": 250000.0, - "maintenanceMarginRate": 0.1, - "maxLeverage": 5.0, - "info": { - "bracket": "4", - "initialLeverage": "5", - "notionalCap": "250000", - "notionalFloor": "100000", - "maintMarginRatio": "0.1", - "cum": "5700.0" - } - }, - { - "tier": 5.0, - "currency": "USDT", - "minNotional": 250000.0, - "maxNotional": 1000000.0, - "maintenanceMarginRate": 0.125, - "maxLeverage": 2.0, - "info": { - "bracket": "5", - "initialLeverage": "2", - "notionalCap": "1000000", - "notionalFloor": "250000", - "maintMarginRatio": "0.125", - "cum": "11950.0" - } - }, - { - "tier": 6.0, - "currency": "USDT", - "minNotional": 1000000.0, - "maxNotional": 5000000.0, - "maintenanceMarginRate": 0.5, - "maxLeverage": 1.0, - "info": { - "bracket": "6", - "initialLeverage": "1", - "notionalCap": "5000000", - "notionalFloor": "1000000", - "maintMarginRatio": "0.5", - "cum": "386950.0" - } - } - ], - "FLUX/USDT:USDT": [ - { - "tier": 1.0, + "symbol": "FLOW/USDT:USDT", "currency": "USDT", "minNotional": 0.0, "maxNotional": 5000.0, @@ -18516,6 +21667,7 @@ }, { "tier": 2.0, + "symbol": "FLOW/USDT:USDT", "currency": "USDT", "minNotional": 5000.0, "maxNotional": 10000.0, @@ -18532,6 +21684,162 @@ }, { "tier": 3.0, + "symbol": "FLOW/USDT:USDT", + "currency": "USDT", + "minNotional": 10000.0, + "maxNotional": 50000.0, + "maintenanceMarginRate": 0.02, + "maxLeverage": 25.0, + "info": { + "bracket": "3", + "initialLeverage": "25", + "notionalCap": "50000", + "notionalFloor": "10000", + "maintMarginRatio": "0.02", + "cum": "75.0" + } + }, + { + "tier": 4.0, + "symbol": "FLOW/USDT:USDT", + "currency": "USDT", + "minNotional": 50000.0, + "maxNotional": 100000.0, + "maintenanceMarginRate": 0.025, + "maxLeverage": 20.0, + "info": { + "bracket": "4", + "initialLeverage": "20", + "notionalCap": "100000", + "notionalFloor": "50000", + "maintMarginRatio": "0.025", + "cum": "325.0" + } + }, + { + "tier": 5.0, + "symbol": "FLOW/USDT:USDT", + "currency": "USDT", + "minNotional": 100000.0, + "maxNotional": 500000.0, + "maintenanceMarginRate": 0.05, + "maxLeverage": 10.0, + "info": { + "bracket": "5", + "initialLeverage": "10", + "notionalCap": "500000", + "notionalFloor": "100000", + "maintMarginRatio": "0.05", + "cum": "2825.0" + } + }, + { + "tier": 6.0, + "symbol": "FLOW/USDT:USDT", + "currency": "USDT", + "minNotional": 500000.0, + "maxNotional": 1000000.0, + "maintenanceMarginRate": 0.1, + "maxLeverage": 5.0, + "info": { + "bracket": "6", + "initialLeverage": "5", + "notionalCap": "1000000", + "notionalFloor": "500000", + "maintMarginRatio": "0.1", + "cum": "27825.0" + } + }, + { + "tier": 7.0, + "symbol": "FLOW/USDT:USDT", + "currency": "USDT", + "minNotional": 1000000.0, + "maxNotional": 1250000.0, + "maintenanceMarginRate": 0.125, + "maxLeverage": 4.0, + "info": { + "bracket": "7", + "initialLeverage": "4", + "notionalCap": "1250000", + "notionalFloor": "1000000", + "maintMarginRatio": "0.125", + "cum": "52825.0" + } + }, + { + "tier": 8.0, + "symbol": "FLOW/USDT:USDT", + "currency": "USDT", + "minNotional": 1250000.0, + "maxNotional": 2500000.0, + "maintenanceMarginRate": 0.25, + "maxLeverage": 2.0, + "info": { + "bracket": "8", + "initialLeverage": "2", + "notionalCap": "2500000", + "notionalFloor": "1250000", + "maintMarginRatio": "0.25", + "cum": "209075.0" + } + }, + { + "tier": 9.0, + "symbol": "FLOW/USDT:USDT", + "currency": "USDT", + "minNotional": 2500000.0, + "maxNotional": 5000000.0, + "maintenanceMarginRate": 0.5, + "maxLeverage": 1.0, + "info": { + "bracket": "9", + "initialLeverage": "1", + "notionalCap": "5000000", + "notionalFloor": "2500000", + "maintMarginRatio": "0.5", + "cum": "834075.0" + } + } + ], + "FLUX/USDT:USDT": [ + { + "tier": 1.0, + "symbol": "FLUX/USDT:USDT", + "currency": "USDT", + "minNotional": 0.0, + "maxNotional": 5000.0, + "maintenanceMarginRate": 0.01, + "maxLeverage": 75.0, + "info": { + "bracket": "1", + "initialLeverage": "75", + "notionalCap": "5000", + "notionalFloor": "0", + "maintMarginRatio": "0.01", + "cum": "0.0" + } + }, + { + "tier": 2.0, + "symbol": "FLUX/USDT:USDT", + "currency": "USDT", + "minNotional": 5000.0, + "maxNotional": 10000.0, + "maintenanceMarginRate": 0.015, + "maxLeverage": 50.0, + "info": { + "bracket": "2", + "initialLeverage": "50", + "notionalCap": "10000", + "notionalFloor": "5000", + "maintMarginRatio": "0.015", + "cum": "25.0" + } + }, + { + "tier": 3.0, + "symbol": "FLUX/USDT:USDT", "currency": "USDT", "minNotional": 10000.0, "maxNotional": 20000.0, @@ -18548,6 +21856,7 @@ }, { "tier": 4.0, + "symbol": "FLUX/USDT:USDT", "currency": "USDT", "minNotional": 20000.0, "maxNotional": 40000.0, @@ -18564,6 +21873,7 @@ }, { "tier": 5.0, + "symbol": "FLUX/USDT:USDT", "currency": "USDT", "minNotional": 40000.0, "maxNotional": 200000.0, @@ -18580,6 +21890,7 @@ }, { "tier": 6.0, + "symbol": "FLUX/USDT:USDT", "currency": "USDT", "minNotional": 200000.0, "maxNotional": 400000.0, @@ -18596,6 +21907,7 @@ }, { "tier": 7.0, + "symbol": "FLUX/USDT:USDT", "currency": "USDT", "minNotional": 400000.0, "maxNotional": 500000.0, @@ -18612,6 +21924,7 @@ }, { "tier": 8.0, + "symbol": "FLUX/USDT:USDT", "currency": "USDT", "minNotional": 500000.0, "maxNotional": 1000000.0, @@ -18628,6 +21941,7 @@ }, { "tier": 9.0, + "symbol": "FLUX/USDT:USDT", "currency": "USDT", "minNotional": 1000000.0, "maxNotional": 2000000.0, @@ -18646,6 +21960,7 @@ "FTM/USDT:USDT": [ { "tier": 1.0, + "symbol": "FTM/USDT:USDT", "currency": "USDT", "minNotional": 0.0, "maxNotional": 5000.0, @@ -18662,6 +21977,7 @@ }, { "tier": 2.0, + "symbol": "FTM/USDT:USDT", "currency": "USDT", "minNotional": 5000.0, "maxNotional": 50000.0, @@ -18678,6 +21994,7 @@ }, { "tier": 3.0, + "symbol": "FTM/USDT:USDT", "currency": "USDT", "minNotional": 50000.0, "maxNotional": 80000.0, @@ -18694,6 +22011,7 @@ }, { "tier": 4.0, + "symbol": "FTM/USDT:USDT", "currency": "USDT", "minNotional": 80000.0, "maxNotional": 300000.0, @@ -18710,6 +22028,7 @@ }, { "tier": 5.0, + "symbol": "FTM/USDT:USDT", "currency": "USDT", "minNotional": 300000.0, "maxNotional": 600000.0, @@ -18726,6 +22045,7 @@ }, { "tier": 6.0, + "symbol": "FTM/USDT:USDT", "currency": "USDT", "minNotional": 600000.0, "maxNotional": 3000000.0, @@ -18742,6 +22062,7 @@ }, { "tier": 7.0, + "symbol": "FTM/USDT:USDT", "currency": "USDT", "minNotional": 3000000.0, "maxNotional": 6000000.0, @@ -18758,6 +22079,7 @@ }, { "tier": 8.0, + "symbol": "FTM/USDT:USDT", "currency": "USDT", "minNotional": 6000000.0, "maxNotional": 7500000.0, @@ -18774,6 +22096,7 @@ }, { "tier": 9.0, + "symbol": "FTM/USDT:USDT", "currency": "USDT", "minNotional": 7500000.0, "maxNotional": 15000000.0, @@ -18790,6 +22113,7 @@ }, { "tier": 10.0, + "symbol": "FTM/USDT:USDT", "currency": "USDT", "minNotional": 15000000.0, "maxNotional": 30000000.0, @@ -18808,6 +22132,7 @@ "FTT/USDT:USDT": [ { "tier": 1.0, + "symbol": "FTT/USDT:USDT", "currency": "USDT", "minNotional": 0.0, "maxNotional": 15000.0, @@ -18824,6 +22149,7 @@ }, { "tier": 2.0, + "symbol": "FTT/USDT:USDT", "currency": "USDT", "minNotional": 15000.0, "maxNotional": 50000.0, @@ -18840,6 +22166,7 @@ }, { "tier": 3.0, + "symbol": "FTT/USDT:USDT", "currency": "USDT", "minNotional": 50000.0, "maxNotional": 200000.0, @@ -18856,6 +22183,7 @@ }, { "tier": 4.0, + "symbol": "FTT/USDT:USDT", "currency": "USDT", "minNotional": 200000.0, "maxNotional": 800000.0, @@ -18872,6 +22200,7 @@ }, { "tier": 5.0, + "symbol": "FTT/USDT:USDT", "currency": "USDT", "minNotional": 800000.0, "maxNotional": 1500000.0, @@ -18890,6 +22219,7 @@ "FXS/USDT:USDT": [ { "tier": 1.0, + "symbol": "FXS/USDT:USDT", "currency": "USDT", "minNotional": 0.0, "maxNotional": 5000.0, @@ -18906,6 +22236,7 @@ }, { "tier": 2.0, + "symbol": "FXS/USDT:USDT", "currency": "USDT", "minNotional": 5000.0, "maxNotional": 25000.0, @@ -18922,6 +22253,7 @@ }, { "tier": 3.0, + "symbol": "FXS/USDT:USDT", "currency": "USDT", "minNotional": 25000.0, "maxNotional": 100000.0, @@ -18938,6 +22270,7 @@ }, { "tier": 4.0, + "symbol": "FXS/USDT:USDT", "currency": "USDT", "minNotional": 100000.0, "maxNotional": 250000.0, @@ -18954,6 +22287,7 @@ }, { "tier": 5.0, + "symbol": "FXS/USDT:USDT", "currency": "USDT", "minNotional": 250000.0, "maxNotional": 1000000.0, @@ -18970,6 +22304,7 @@ }, { "tier": 6.0, + "symbol": "FXS/USDT:USDT", "currency": "USDT", "minNotional": 1000000.0, "maxNotional": 5000000.0, @@ -18988,6 +22323,7 @@ "G/USDT:USDT": [ { "tier": 1.0, + "symbol": "G/USDT:USDT", "currency": "USDT", "minNotional": 0.0, "maxNotional": 5000.0, @@ -19004,6 +22340,7 @@ }, { "tier": 2.0, + "symbol": "G/USDT:USDT", "currency": "USDT", "minNotional": 5000.0, "maxNotional": 20000.0, @@ -19020,6 +22357,7 @@ }, { "tier": 3.0, + "symbol": "G/USDT:USDT", "currency": "USDT", "minNotional": 20000.0, "maxNotional": 25000.0, @@ -19036,6 +22374,7 @@ }, { "tier": 4.0, + "symbol": "G/USDT:USDT", "currency": "USDT", "minNotional": 25000.0, "maxNotional": 200000.0, @@ -19052,6 +22391,7 @@ }, { "tier": 5.0, + "symbol": "G/USDT:USDT", "currency": "USDT", "minNotional": 200000.0, "maxNotional": 400000.0, @@ -19068,6 +22408,7 @@ }, { "tier": 6.0, + "symbol": "G/USDT:USDT", "currency": "USDT", "minNotional": 400000.0, "maxNotional": 500000.0, @@ -19084,6 +22425,7 @@ }, { "tier": 7.0, + "symbol": "G/USDT:USDT", "currency": "USDT", "minNotional": 500000.0, "maxNotional": 1000000.0, @@ -19100,6 +22442,7 @@ }, { "tier": 8.0, + "symbol": "G/USDT:USDT", "currency": "USDT", "minNotional": 1000000.0, "maxNotional": 2000000.0, @@ -19118,6 +22461,7 @@ "GALA/USDT:USDT": [ { "tier": 1.0, + "symbol": "GALA/USDT:USDT", "currency": "USDT", "minNotional": 0.0, "maxNotional": 10000.0, @@ -19134,6 +22478,7 @@ }, { "tier": 2.0, + "symbol": "GALA/USDT:USDT", "currency": "USDT", "minNotional": 10000.0, "maxNotional": 50000.0, @@ -19150,6 +22495,7 @@ }, { "tier": 3.0, + "symbol": "GALA/USDT:USDT", "currency": "USDT", "minNotional": 50000.0, "maxNotional": 80000.0, @@ -19166,6 +22512,7 @@ }, { "tier": 4.0, + "symbol": "GALA/USDT:USDT", "currency": "USDT", "minNotional": 80000.0, "maxNotional": 200000.0, @@ -19182,6 +22529,7 @@ }, { "tier": 5.0, + "symbol": "GALA/USDT:USDT", "currency": "USDT", "minNotional": 200000.0, "maxNotional": 900000.0, @@ -19198,6 +22546,7 @@ }, { "tier": 6.0, + "symbol": "GALA/USDT:USDT", "currency": "USDT", "minNotional": 900000.0, "maxNotional": 2000000.0, @@ -19214,6 +22563,7 @@ }, { "tier": 7.0, + "symbol": "GALA/USDT:USDT", "currency": "USDT", "minNotional": 2000000.0, "maxNotional": 5000000.0, @@ -19230,6 +22580,7 @@ }, { "tier": 8.0, + "symbol": "GALA/USDT:USDT", "currency": "USDT", "minNotional": 5000000.0, "maxNotional": 6000000.0, @@ -19246,6 +22597,7 @@ }, { "tier": 9.0, + "symbol": "GALA/USDT:USDT", "currency": "USDT", "minNotional": 6000000.0, "maxNotional": 18000000.0, @@ -19262,6 +22614,7 @@ }, { "tier": 10.0, + "symbol": "GALA/USDT:USDT", "currency": "USDT", "minNotional": 18000000.0, "maxNotional": 30000000.0, @@ -19280,6 +22633,7 @@ "GAS/USDT:USDT": [ { "tier": 1.0, + "symbol": "GAS/USDT:USDT", "currency": "USDT", "minNotional": 0.0, "maxNotional": 5000.0, @@ -19296,6 +22650,7 @@ }, { "tier": 2.0, + "symbol": "GAS/USDT:USDT", "currency": "USDT", "minNotional": 5000.0, "maxNotional": 10000.0, @@ -19312,6 +22667,7 @@ }, { "tier": 3.0, + "symbol": "GAS/USDT:USDT", "currency": "USDT", "minNotional": 10000.0, "maxNotional": 30000.0, @@ -19328,6 +22684,7 @@ }, { "tier": 4.0, + "symbol": "GAS/USDT:USDT", "currency": "USDT", "minNotional": 30000.0, "maxNotional": 60000.0, @@ -19344,6 +22701,7 @@ }, { "tier": 5.0, + "symbol": "GAS/USDT:USDT", "currency": "USDT", "minNotional": 60000.0, "maxNotional": 300000.0, @@ -19360,6 +22718,7 @@ }, { "tier": 6.0, + "symbol": "GAS/USDT:USDT", "currency": "USDT", "minNotional": 300000.0, "maxNotional": 600000.0, @@ -19376,6 +22735,7 @@ }, { "tier": 7.0, + "symbol": "GAS/USDT:USDT", "currency": "USDT", "minNotional": 600000.0, "maxNotional": 750000.0, @@ -19392,6 +22752,7 @@ }, { "tier": 8.0, + "symbol": "GAS/USDT:USDT", "currency": "USDT", "minNotional": 750000.0, "maxNotional": 1500000.0, @@ -19408,6 +22769,7 @@ }, { "tier": 9.0, + "symbol": "GAS/USDT:USDT", "currency": "USDT", "minNotional": 1500000.0, "maxNotional": 3000000.0, @@ -19426,6 +22788,7 @@ "GHST/USDT:USDT": [ { "tier": 1.0, + "symbol": "GHST/USDT:USDT", "currency": "USDT", "minNotional": 0.0, "maxNotional": 5000.0, @@ -19442,6 +22805,7 @@ }, { "tier": 2.0, + "symbol": "GHST/USDT:USDT", "currency": "USDT", "minNotional": 5000.0, "maxNotional": 10000.0, @@ -19458,6 +22822,7 @@ }, { "tier": 3.0, + "symbol": "GHST/USDT:USDT", "currency": "USDT", "minNotional": 10000.0, "maxNotional": 20000.0, @@ -19474,6 +22839,7 @@ }, { "tier": 4.0, + "symbol": "GHST/USDT:USDT", "currency": "USDT", "minNotional": 20000.0, "maxNotional": 40000.0, @@ -19490,6 +22856,7 @@ }, { "tier": 5.0, + "symbol": "GHST/USDT:USDT", "currency": "USDT", "minNotional": 40000.0, "maxNotional": 200000.0, @@ -19506,6 +22873,7 @@ }, { "tier": 6.0, + "symbol": "GHST/USDT:USDT", "currency": "USDT", "minNotional": 200000.0, "maxNotional": 400000.0, @@ -19522,6 +22890,7 @@ }, { "tier": 7.0, + "symbol": "GHST/USDT:USDT", "currency": "USDT", "minNotional": 400000.0, "maxNotional": 500000.0, @@ -19538,6 +22907,7 @@ }, { "tier": 8.0, + "symbol": "GHST/USDT:USDT", "currency": "USDT", "minNotional": 500000.0, "maxNotional": 1000000.0, @@ -19554,6 +22924,7 @@ }, { "tier": 9.0, + "symbol": "GHST/USDT:USDT", "currency": "USDT", "minNotional": 1000000.0, "maxNotional": 2000000.0, @@ -19572,6 +22943,7 @@ "GLM/USDT:USDT": [ { "tier": 1.0, + "symbol": "GLM/USDT:USDT", "currency": "USDT", "minNotional": 0.0, "maxNotional": 5000.0, @@ -19588,6 +22960,7 @@ }, { "tier": 2.0, + "symbol": "GLM/USDT:USDT", "currency": "USDT", "minNotional": 5000.0, "maxNotional": 20000.0, @@ -19604,6 +22977,7 @@ }, { "tier": 3.0, + "symbol": "GLM/USDT:USDT", "currency": "USDT", "minNotional": 20000.0, "maxNotional": 30000.0, @@ -19620,6 +22994,7 @@ }, { "tier": 4.0, + "symbol": "GLM/USDT:USDT", "currency": "USDT", "minNotional": 30000.0, "maxNotional": 300000.0, @@ -19636,6 +23011,7 @@ }, { "tier": 5.0, + "symbol": "GLM/USDT:USDT", "currency": "USDT", "minNotional": 300000.0, "maxNotional": 600000.0, @@ -19652,6 +23028,7 @@ }, { "tier": 6.0, + "symbol": "GLM/USDT:USDT", "currency": "USDT", "minNotional": 600000.0, "maxNotional": 750000.0, @@ -19668,6 +23045,7 @@ }, { "tier": 7.0, + "symbol": "GLM/USDT:USDT", "currency": "USDT", "minNotional": 750000.0, "maxNotional": 1500000.0, @@ -19684,6 +23062,7 @@ }, { "tier": 8.0, + "symbol": "GLM/USDT:USDT", "currency": "USDT", "minNotional": 1500000.0, "maxNotional": 3000000.0, @@ -19702,6 +23081,7 @@ "GLMR/USDT:USDT": [ { "tier": 1.0, + "symbol": "GLMR/USDT:USDT", "currency": "USDT", "minNotional": 0.0, "maxNotional": 10000.0, @@ -19718,6 +23098,7 @@ }, { "tier": 2.0, + "symbol": "GLMR/USDT:USDT", "currency": "USDT", "minNotional": 10000.0, "maxNotional": 200000.0, @@ -19734,6 +23115,7 @@ }, { "tier": 3.0, + "symbol": "GLMR/USDT:USDT", "currency": "USDT", "minNotional": 200000.0, "maxNotional": 500000.0, @@ -19750,6 +23132,7 @@ }, { "tier": 4.0, + "symbol": "GLMR/USDT:USDT", "currency": "USDT", "minNotional": 500000.0, "maxNotional": 1000000.0, @@ -19766,6 +23149,7 @@ }, { "tier": 5.0, + "symbol": "GLMR/USDT:USDT", "currency": "USDT", "minNotional": 1000000.0, "maxNotional": 3000000.0, @@ -19782,6 +23166,7 @@ }, { "tier": 6.0, + "symbol": "GLMR/USDT:USDT", "currency": "USDT", "minNotional": 3000000.0, "maxNotional": 3500000.0, @@ -19800,6 +23185,7 @@ "GMT/USDT:USDT": [ { "tier": 1.0, + "symbol": "GMT/USDT:USDT", "currency": "USDT", "minNotional": 0.0, "maxNotional": 50000.0, @@ -19816,6 +23202,7 @@ }, { "tier": 2.0, + "symbol": "GMT/USDT:USDT", "currency": "USDT", "minNotional": 50000.0, "maxNotional": 150000.0, @@ -19832,6 +23219,7 @@ }, { "tier": 3.0, + "symbol": "GMT/USDT:USDT", "currency": "USDT", "minNotional": 150000.0, "maxNotional": 600000.0, @@ -19848,6 +23236,7 @@ }, { "tier": 4.0, + "symbol": "GMT/USDT:USDT", "currency": "USDT", "minNotional": 600000.0, "maxNotional": 1600000.0, @@ -19864,6 +23253,7 @@ }, { "tier": 5.0, + "symbol": "GMT/USDT:USDT", "currency": "USDT", "minNotional": 1600000.0, "maxNotional": 2000000.0, @@ -19880,6 +23270,7 @@ }, { "tier": 6.0, + "symbol": "GMT/USDT:USDT", "currency": "USDT", "minNotional": 2000000.0, "maxNotional": 4000000.0, @@ -19896,6 +23287,7 @@ }, { "tier": 7.0, + "symbol": "GMT/USDT:USDT", "currency": "USDT", "minNotional": 4000000.0, "maxNotional": 5000000.0, @@ -19914,6 +23306,7 @@ "GMX/USDT:USDT": [ { "tier": 1.0, + "symbol": "GMX/USDT:USDT", "currency": "USDT", "minNotional": 0.0, "maxNotional": 5000.0, @@ -19930,6 +23323,7 @@ }, { "tier": 2.0, + "symbol": "GMX/USDT:USDT", "currency": "USDT", "minNotional": 5000.0, "maxNotional": 25000.0, @@ -19946,6 +23340,7 @@ }, { "tier": 3.0, + "symbol": "GMX/USDT:USDT", "currency": "USDT", "minNotional": 25000.0, "maxNotional": 480000.0, @@ -19962,6 +23357,7 @@ }, { "tier": 4.0, + "symbol": "GMX/USDT:USDT", "currency": "USDT", "minNotional": 480000.0, "maxNotional": 1280000.0, @@ -19978,6 +23374,7 @@ }, { "tier": 5.0, + "symbol": "GMX/USDT:USDT", "currency": "USDT", "minNotional": 1280000.0, "maxNotional": 1600000.0, @@ -19994,6 +23391,7 @@ }, { "tier": 6.0, + "symbol": "GMX/USDT:USDT", "currency": "USDT", "minNotional": 1600000.0, "maxNotional": 4800000.0, @@ -20010,6 +23408,7 @@ }, { "tier": 7.0, + "symbol": "GMX/USDT:USDT", "currency": "USDT", "minNotional": 4800000.0, "maxNotional": 8000000.0, @@ -20028,6 +23427,162 @@ "GOAT/USDT:USDT": [ { "tier": 1.0, + "symbol": "GOAT/USDT:USDT", + "currency": "USDT", + "minNotional": 0.0, + "maxNotional": 10000.0, + "maintenanceMarginRate": 0.01, + "maxLeverage": 75.0, + "info": { + "bracket": "1", + "initialLeverage": "75", + "notionalCap": "10000", + "notionalFloor": "0", + "maintMarginRatio": "0.01", + "cum": "0.0" + } + }, + { + "tier": 2.0, + "symbol": "GOAT/USDT:USDT", + "currency": "USDT", + "minNotional": 10000.0, + "maxNotional": 80000.0, + "maintenanceMarginRate": 0.015, + "maxLeverage": 50.0, + "info": { + "bracket": "2", + "initialLeverage": "50", + "notionalCap": "80000", + "notionalFloor": "10000", + "maintMarginRatio": "0.015", + "cum": "50.0" + } + }, + { + "tier": 3.0, + "symbol": "GOAT/USDT:USDT", + "currency": "USDT", + "minNotional": 80000.0, + "maxNotional": 400000.0, + "maintenanceMarginRate": 0.02, + "maxLeverage": 25.0, + "info": { + "bracket": "3", + "initialLeverage": "25", + "notionalCap": "400000", + "notionalFloor": "80000", + "maintMarginRatio": "0.02", + "cum": "450.0" + } + }, + { + "tier": 4.0, + "symbol": "GOAT/USDT:USDT", + "currency": "USDT", + "minNotional": 400000.0, + "maxNotional": 800000.0, + "maintenanceMarginRate": 0.025, + "maxLeverage": 20.0, + "info": { + "bracket": "4", + "initialLeverage": "20", + "notionalCap": "800000", + "notionalFloor": "400000", + "maintMarginRatio": "0.025", + "cum": "2450.0" + } + }, + { + "tier": 5.0, + "symbol": "GOAT/USDT:USDT", + "currency": "USDT", + "minNotional": 800000.0, + "maxNotional": 4000000.0, + "maintenanceMarginRate": 0.05, + "maxLeverage": 10.0, + "info": { + "bracket": "5", + "initialLeverage": "10", + "notionalCap": "4000000", + "notionalFloor": "800000", + "maintMarginRatio": "0.05", + "cum": "22450.0" + } + }, + { + "tier": 6.0, + "symbol": "GOAT/USDT:USDT", + "currency": "USDT", + "minNotional": 4000000.0, + "maxNotional": 8000000.0, + "maintenanceMarginRate": 0.1, + "maxLeverage": 5.0, + "info": { + "bracket": "6", + "initialLeverage": "5", + "notionalCap": "8000000", + "notionalFloor": "4000000", + "maintMarginRatio": "0.1", + "cum": "222450.0" + } + }, + { + "tier": 7.0, + "symbol": "GOAT/USDT:USDT", + "currency": "USDT", + "minNotional": 8000000.0, + "maxNotional": 10000000.0, + "maintenanceMarginRate": 0.125, + "maxLeverage": 4.0, + "info": { + "bracket": "7", + "initialLeverage": "4", + "notionalCap": "10000000", + "notionalFloor": "8000000", + "maintMarginRatio": "0.125", + "cum": "422450.0" + } + }, + { + "tier": 8.0, + "symbol": "GOAT/USDT:USDT", + "currency": "USDT", + "minNotional": 10000000.0, + "maxNotional": 20000000.0, + "maintenanceMarginRate": 0.25, + "maxLeverage": 2.0, + "info": { + "bracket": "8", + "initialLeverage": "2", + "notionalCap": "20000000", + "notionalFloor": "10000000", + "maintMarginRatio": "0.25", + "cum": "1672450.0" + } + }, + { + "tier": 9.0, + "symbol": "GOAT/USDT:USDT", + "currency": "USDT", + "minNotional": 20000000.0, + "maxNotional": 40000000.0, + "maintenanceMarginRate": 0.5, + "maxLeverage": 1.0, + "info": { + "bracket": "9", + "initialLeverage": "1", + "notionalCap": "40000000", + "notionalFloor": "20000000", + "maintMarginRatio": "0.5", + "cum": "6672450.0" + } + } + ], + "GRASS/USDT:USDT": [ + { + "tier": 1.0, + "symbol": "GRASS/USDT:USDT", "currency": "USDT", "minNotional": 0.0, "maxNotional": 5000.0, @@ -20044,15 +23599,16 @@ }, { "tier": 2.0, + "symbol": "GRASS/USDT:USDT", "currency": "USDT", "minNotional": 5000.0, - "maxNotional": 10000.0, + "maxNotional": 16000.0, "maintenanceMarginRate": 0.015, "maxLeverage": 50.0, "info": { "bracket": "2", "initialLeverage": "50", - "notionalCap": "10000", + "notionalCap": "16000", "notionalFloor": "5000", "maintMarginRatio": "0.015", "cum": "25.0" @@ -20060,120 +23616,128 @@ }, { "tier": 3.0, + "symbol": "GRASS/USDT:USDT", "currency": "USDT", - "minNotional": 10000.0, - "maxNotional": 30000.0, + "minNotional": 16000.0, + "maxNotional": 80000.0, "maintenanceMarginRate": 0.02, "maxLeverage": 25.0, "info": { "bracket": "3", "initialLeverage": "25", - "notionalCap": "30000", - "notionalFloor": "10000", + "notionalCap": "80000", + "notionalFloor": "16000", "maintMarginRatio": "0.02", - "cum": "75.0" + "cum": "105.0" } }, { "tier": 4.0, + "symbol": "GRASS/USDT:USDT", "currency": "USDT", - "minNotional": 30000.0, - "maxNotional": 60000.0, + "minNotional": 80000.0, + "maxNotional": 160000.0, "maintenanceMarginRate": 0.025, "maxLeverage": 20.0, "info": { "bracket": "4", "initialLeverage": "20", - "notionalCap": "60000", - "notionalFloor": "30000", + "notionalCap": "160000", + "notionalFloor": "80000", "maintMarginRatio": "0.025", - "cum": "225.0" + "cum": "505.0" } }, { "tier": 5.0, + "symbol": "GRASS/USDT:USDT", "currency": "USDT", - "minNotional": 60000.0, - "maxNotional": 300000.0, + "minNotional": 160000.0, + "maxNotional": 800000.0, "maintenanceMarginRate": 0.05, "maxLeverage": 10.0, "info": { "bracket": "5", "initialLeverage": "10", - "notionalCap": "300000", - "notionalFloor": "60000", + "notionalCap": "800000", + "notionalFloor": "160000", "maintMarginRatio": "0.05", - "cum": "1725.0" + "cum": "4505.0" } }, { "tier": 6.0, + "symbol": "GRASS/USDT:USDT", "currency": "USDT", - "minNotional": 300000.0, - "maxNotional": 600000.0, + "minNotional": 800000.0, + "maxNotional": 1600000.0, "maintenanceMarginRate": 0.1, "maxLeverage": 5.0, "info": { "bracket": "6", "initialLeverage": "5", - "notionalCap": "600000", - "notionalFloor": "300000", + "notionalCap": "1600000", + "notionalFloor": "800000", "maintMarginRatio": "0.1", - "cum": "16725.0" + "cum": "44505.0" } }, { "tier": 7.0, + "symbol": "GRASS/USDT:USDT", "currency": "USDT", - "minNotional": 600000.0, - "maxNotional": 750000.0, + "minNotional": 1600000.0, + "maxNotional": 2000000.0, "maintenanceMarginRate": 0.125, "maxLeverage": 4.0, "info": { "bracket": "7", "initialLeverage": "4", - "notionalCap": "750000", - "notionalFloor": "600000", + "notionalCap": "2000000", + "notionalFloor": "1600000", "maintMarginRatio": "0.125", - "cum": "31725.0" + "cum": "84505.0" } }, { "tier": 8.0, + "symbol": "GRASS/USDT:USDT", "currency": "USDT", - "minNotional": 750000.0, - "maxNotional": 1500000.0, + "minNotional": 2000000.0, + "maxNotional": 4000000.0, "maintenanceMarginRate": 0.25, "maxLeverage": 2.0, "info": { "bracket": "8", "initialLeverage": "2", - "notionalCap": "1500000", - "notionalFloor": "750000", + "notionalCap": "4000000", + "notionalFloor": "2000000", "maintMarginRatio": "0.25", - "cum": "125475.0" + "cum": "334505.0" } }, { "tier": 9.0, + "symbol": "GRASS/USDT:USDT", "currency": "USDT", - "minNotional": 1500000.0, - "maxNotional": 3000000.0, + "minNotional": 4000000.0, + "maxNotional": 8000000.0, "maintenanceMarginRate": 0.5, "maxLeverage": 1.0, "info": { "bracket": "9", "initialLeverage": "1", - "notionalCap": "3000000", - "notionalFloor": "1500000", + "notionalCap": "8000000", + "notionalFloor": "4000000", "maintMarginRatio": "0.5", - "cum": "500475.0" + "cum": "1334505.0" } } ], "GRT/USDT:USDT": [ { "tier": 1.0, + "symbol": "GRT/USDT:USDT", "currency": "USDT", "minNotional": 0.0, "maxNotional": 5000.0, @@ -20190,6 +23754,7 @@ }, { "tier": 2.0, + "symbol": "GRT/USDT:USDT", "currency": "USDT", "minNotional": 5000.0, "maxNotional": 50000.0, @@ -20206,6 +23771,7 @@ }, { "tier": 3.0, + "symbol": "GRT/USDT:USDT", "currency": "USDT", "minNotional": 50000.0, "maxNotional": 400000.0, @@ -20222,6 +23788,7 @@ }, { "tier": 4.0, + "symbol": "GRT/USDT:USDT", "currency": "USDT", "minNotional": 400000.0, "maxNotional": 1000000.0, @@ -20238,6 +23805,7 @@ }, { "tier": 5.0, + "symbol": "GRT/USDT:USDT", "currency": "USDT", "minNotional": 1000000.0, "maxNotional": 2000000.0, @@ -20254,6 +23822,7 @@ }, { "tier": 6.0, + "symbol": "GRT/USDT:USDT", "currency": "USDT", "minNotional": 2000000.0, "maxNotional": 6000000.0, @@ -20270,6 +23839,7 @@ }, { "tier": 7.0, + "symbol": "GRT/USDT:USDT", "currency": "USDT", "minNotional": 6000000.0, "maxNotional": 10000000.0, @@ -20288,6 +23858,7 @@ "GTC/USDT:USDT": [ { "tier": 1.0, + "symbol": "GTC/USDT:USDT", "currency": "USDT", "minNotional": 0.0, "maxNotional": 5000.0, @@ -20304,6 +23875,7 @@ }, { "tier": 2.0, + "symbol": "GTC/USDT:USDT", "currency": "USDT", "minNotional": 5000.0, "maxNotional": 10000.0, @@ -20320,6 +23892,7 @@ }, { "tier": 3.0, + "symbol": "GTC/USDT:USDT", "currency": "USDT", "minNotional": 10000.0, "maxNotional": 30000.0, @@ -20336,6 +23909,7 @@ }, { "tier": 4.0, + "symbol": "GTC/USDT:USDT", "currency": "USDT", "minNotional": 30000.0, "maxNotional": 60000.0, @@ -20352,6 +23926,7 @@ }, { "tier": 5.0, + "symbol": "GTC/USDT:USDT", "currency": "USDT", "minNotional": 60000.0, "maxNotional": 300000.0, @@ -20368,6 +23943,7 @@ }, { "tier": 6.0, + "symbol": "GTC/USDT:USDT", "currency": "USDT", "minNotional": 300000.0, "maxNotional": 600000.0, @@ -20384,6 +23960,7 @@ }, { "tier": 7.0, + "symbol": "GTC/USDT:USDT", "currency": "USDT", "minNotional": 600000.0, "maxNotional": 750000.0, @@ -20400,6 +23977,7 @@ }, { "tier": 8.0, + "symbol": "GTC/USDT:USDT", "currency": "USDT", "minNotional": 750000.0, "maxNotional": 1500000.0, @@ -20416,6 +23994,7 @@ }, { "tier": 9.0, + "symbol": "GTC/USDT:USDT", "currency": "USDT", "minNotional": 1500000.0, "maxNotional": 3000000.0, @@ -20434,120 +24013,162 @@ "HBAR/USDT:USDT": [ { "tier": 1.0, + "symbol": "HBAR/USDT:USDT", "currency": "USDT", "minNotional": 0.0, - "maxNotional": 5000.0, - "maintenanceMarginRate": 0.015, - "maxLeverage": 50.0, + "maxNotional": 10000.0, + "maintenanceMarginRate": 0.01, + "maxLeverage": 75.0, "info": { "bracket": "1", - "initialLeverage": "50", - "notionalCap": "5000", + "initialLeverage": "75", + "notionalCap": "10000", "notionalFloor": "0", - "maintMarginRatio": "0.015", + "maintMarginRatio": "0.01", "cum": "0.0" } }, { "tier": 2.0, + "symbol": "HBAR/USDT:USDT", "currency": "USDT", - "minNotional": 5000.0, - "maxNotional": 50000.0, - "maintenanceMarginRate": 0.025, - "maxLeverage": 20.0, + "minNotional": 10000.0, + "maxNotional": 20000.0, + "maintenanceMarginRate": 0.015, + "maxLeverage": 50.0, "info": { "bracket": "2", - "initialLeverage": "20", - "notionalCap": "50000", - "notionalFloor": "5000", - "maintMarginRatio": "0.025", + "initialLeverage": "50", + "notionalCap": "20000", + "notionalFloor": "10000", + "maintMarginRatio": "0.015", "cum": "50.0" } }, { "tier": 3.0, + "symbol": "HBAR/USDT:USDT", "currency": "USDT", - "minNotional": 50000.0, - "maxNotional": 200000.0, - "maintenanceMarginRate": 0.05, - "maxLeverage": 10.0, + "minNotional": 20000.0, + "maxNotional": 100000.0, + "maintenanceMarginRate": 0.02, + "maxLeverage": 25.0, "info": { "bracket": "3", - "initialLeverage": "10", - "notionalCap": "200000", - "notionalFloor": "50000", - "maintMarginRatio": "0.05", - "cum": "1300.0" + "initialLeverage": "25", + "notionalCap": "100000", + "notionalFloor": "20000", + "maintMarginRatio": "0.02", + "cum": "150.0" } }, { "tier": 4.0, + "symbol": "HBAR/USDT:USDT", "currency": "USDT", - "minNotional": 200000.0, - "maxNotional": 500000.0, - "maintenanceMarginRate": 0.1, - "maxLeverage": 5.0, + "minNotional": 100000.0, + "maxNotional": 200000.0, + "maintenanceMarginRate": 0.025, + "maxLeverage": 20.0, "info": { "bracket": "4", - "initialLeverage": "5", - "notionalCap": "500000", - "notionalFloor": "200000", - "maintMarginRatio": "0.1", - "cum": "11300.0" + "initialLeverage": "20", + "notionalCap": "200000", + "notionalFloor": "100000", + "maintMarginRatio": "0.025", + "cum": "650.0" } }, { "tier": 5.0, + "symbol": "HBAR/USDT:USDT", "currency": "USDT", - "minNotional": 500000.0, + "minNotional": 200000.0, "maxNotional": 1000000.0, - "maintenanceMarginRate": 0.125, - "maxLeverage": 4.0, + "maintenanceMarginRate": 0.05, + "maxLeverage": 10.0, "info": { "bracket": "5", - "initialLeverage": "4", + "initialLeverage": "10", "notionalCap": "1000000", - "notionalFloor": "500000", - "maintMarginRatio": "0.125", - "cum": "23800.0" + "notionalFloor": "200000", + "maintMarginRatio": "0.05", + "cum": "5650.0" } }, { "tier": 6.0, + "symbol": "HBAR/USDT:USDT", "currency": "USDT", "minNotional": 1000000.0, - "maxNotional": 3000000.0, - "maintenanceMarginRate": 0.25, - "maxLeverage": 2.0, + "maxNotional": 2000000.0, + "maintenanceMarginRate": 0.1, + "maxLeverage": 5.0, "info": { "bracket": "6", - "initialLeverage": "2", - "notionalCap": "3000000", + "initialLeverage": "5", + "notionalCap": "2000000", "notionalFloor": "1000000", - "maintMarginRatio": "0.25", - "cum": "148800.0" + "maintMarginRatio": "0.1", + "cum": "55650.0" } }, { "tier": 7.0, + "symbol": "HBAR/USDT:USDT", "currency": "USDT", - "minNotional": 3000000.0, + "minNotional": 2000000.0, + "maxNotional": 2500000.0, + "maintenanceMarginRate": 0.125, + "maxLeverage": 4.0, + "info": { + "bracket": "7", + "initialLeverage": "4", + "notionalCap": "2500000", + "notionalFloor": "2000000", + "maintMarginRatio": "0.125", + "cum": "105650.0" + } + }, + { + "tier": 8.0, + "symbol": "HBAR/USDT:USDT", + "currency": "USDT", + "minNotional": 2500000.0, "maxNotional": 5000000.0, + "maintenanceMarginRate": 0.25, + "maxLeverage": 2.0, + "info": { + "bracket": "8", + "initialLeverage": "2", + "notionalCap": "5000000", + "notionalFloor": "2500000", + "maintMarginRatio": "0.25", + "cum": "418150.0" + } + }, + { + "tier": 9.0, + "symbol": "HBAR/USDT:USDT", + "currency": "USDT", + "minNotional": 5000000.0, + "maxNotional": 10000000.0, "maintenanceMarginRate": 0.5, "maxLeverage": 1.0, "info": { - "bracket": "7", + "bracket": "9", "initialLeverage": "1", - "notionalCap": "5000000", - "notionalFloor": "3000000", + "notionalCap": "10000000", + "notionalFloor": "5000000", "maintMarginRatio": "0.5", - "cum": "898800.0" + "cum": "1668150.0" } } ], "HFT/USDT:USDT": [ { "tier": 1.0, + "symbol": "HFT/USDT:USDT", "currency": "USDT", "minNotional": 0.0, "maxNotional": 5000.0, @@ -20564,6 +24185,7 @@ }, { "tier": 2.0, + "symbol": "HFT/USDT:USDT", "currency": "USDT", "minNotional": 5000.0, "maxNotional": 25000.0, @@ -20580,6 +24202,7 @@ }, { "tier": 3.0, + "symbol": "HFT/USDT:USDT", "currency": "USDT", "minNotional": 25000.0, "maxNotional": 200000.0, @@ -20596,6 +24219,7 @@ }, { "tier": 4.0, + "symbol": "HFT/USDT:USDT", "currency": "USDT", "minNotional": 200000.0, "maxNotional": 500000.0, @@ -20612,6 +24236,7 @@ }, { "tier": 5.0, + "symbol": "HFT/USDT:USDT", "currency": "USDT", "minNotional": 500000.0, "maxNotional": 1000000.0, @@ -20628,6 +24253,7 @@ }, { "tier": 6.0, + "symbol": "HFT/USDT:USDT", "currency": "USDT", "minNotional": 1000000.0, "maxNotional": 3000000.0, @@ -20644,6 +24270,7 @@ }, { "tier": 7.0, + "symbol": "HFT/USDT:USDT", "currency": "USDT", "minNotional": 3000000.0, "maxNotional": 5000000.0, @@ -20662,6 +24289,7 @@ "HIFI/USDT:USDT": [ { "tier": 1.0, + "symbol": "HIFI/USDT:USDT", "currency": "USDT", "minNotional": 0.0, "maxNotional": 5000.0, @@ -20678,6 +24306,7 @@ }, { "tier": 2.0, + "symbol": "HIFI/USDT:USDT", "currency": "USDT", "minNotional": 5000.0, "maxNotional": 25000.0, @@ -20694,6 +24323,7 @@ }, { "tier": 3.0, + "symbol": "HIFI/USDT:USDT", "currency": "USDT", "minNotional": 25000.0, "maxNotional": 200000.0, @@ -20710,6 +24340,7 @@ }, { "tier": 4.0, + "symbol": "HIFI/USDT:USDT", "currency": "USDT", "minNotional": 200000.0, "maxNotional": 500000.0, @@ -20726,6 +24357,7 @@ }, { "tier": 5.0, + "symbol": "HIFI/USDT:USDT", "currency": "USDT", "minNotional": 500000.0, "maxNotional": 1000000.0, @@ -20742,6 +24374,7 @@ }, { "tier": 6.0, + "symbol": "HIFI/USDT:USDT", "currency": "USDT", "minNotional": 1000000.0, "maxNotional": 3000000.0, @@ -20758,6 +24391,7 @@ }, { "tier": 7.0, + "symbol": "HIFI/USDT:USDT", "currency": "USDT", "minNotional": 3000000.0, "maxNotional": 3500000.0, @@ -20776,6 +24410,7 @@ "HIGH/USDT:USDT": [ { "tier": 1.0, + "symbol": "HIGH/USDT:USDT", "currency": "USDT", "minNotional": 0.0, "maxNotional": 5000.0, @@ -20792,6 +24427,7 @@ }, { "tier": 2.0, + "symbol": "HIGH/USDT:USDT", "currency": "USDT", "minNotional": 5000.0, "maxNotional": 25000.0, @@ -20808,6 +24444,7 @@ }, { "tier": 3.0, + "symbol": "HIGH/USDT:USDT", "currency": "USDT", "minNotional": 25000.0, "maxNotional": 400000.0, @@ -20824,6 +24461,7 @@ }, { "tier": 4.0, + "symbol": "HIGH/USDT:USDT", "currency": "USDT", "minNotional": 400000.0, "maxNotional": 1000000.0, @@ -20840,6 +24478,7 @@ }, { "tier": 5.0, + "symbol": "HIGH/USDT:USDT", "currency": "USDT", "minNotional": 1000000.0, "maxNotional": 2000000.0, @@ -20856,6 +24495,7 @@ }, { "tier": 6.0, + "symbol": "HIGH/USDT:USDT", "currency": "USDT", "minNotional": 2000000.0, "maxNotional": 6000000.0, @@ -20872,6 +24512,7 @@ }, { "tier": 7.0, + "symbol": "HIGH/USDT:USDT", "currency": "USDT", "minNotional": 6000000.0, "maxNotional": 10000000.0, @@ -20887,9 +24528,165 @@ } } ], + "HIPPO/USDT:USDT": [ + { + "tier": 1.0, + "symbol": "HIPPO/USDT:USDT", + "currency": "USDT", + "minNotional": 0.0, + "maxNotional": 5000.0, + "maintenanceMarginRate": 0.01, + "maxLeverage": 75.0, + "info": { + "bracket": "1", + "initialLeverage": "75", + "notionalCap": "5000", + "notionalFloor": "0", + "maintMarginRatio": "0.01", + "cum": "0.0" + } + }, + { + "tier": 2.0, + "symbol": "HIPPO/USDT:USDT", + "currency": "USDT", + "minNotional": 5000.0, + "maxNotional": 16000.0, + "maintenanceMarginRate": 0.015, + "maxLeverage": 50.0, + "info": { + "bracket": "2", + "initialLeverage": "50", + "notionalCap": "16000", + "notionalFloor": "5000", + "maintMarginRatio": "0.015", + "cum": "25.0" + } + }, + { + "tier": 3.0, + "symbol": "HIPPO/USDT:USDT", + "currency": "USDT", + "minNotional": 16000.0, + "maxNotional": 80000.0, + "maintenanceMarginRate": 0.02, + "maxLeverage": 25.0, + "info": { + "bracket": "3", + "initialLeverage": "25", + "notionalCap": "80000", + "notionalFloor": "16000", + "maintMarginRatio": "0.02", + "cum": "105.0" + } + }, + { + "tier": 4.0, + "symbol": "HIPPO/USDT:USDT", + "currency": "USDT", + "minNotional": 80000.0, + "maxNotional": 160000.0, + "maintenanceMarginRate": 0.025, + "maxLeverage": 20.0, + "info": { + "bracket": "4", + "initialLeverage": "20", + "notionalCap": "160000", + "notionalFloor": "80000", + "maintMarginRatio": "0.025", + "cum": "505.0" + } + }, + { + "tier": 5.0, + "symbol": "HIPPO/USDT:USDT", + "currency": "USDT", + "minNotional": 160000.0, + "maxNotional": 800000.0, + "maintenanceMarginRate": 0.05, + "maxLeverage": 10.0, + "info": { + "bracket": "5", + "initialLeverage": "10", + "notionalCap": "800000", + "notionalFloor": "160000", + "maintMarginRatio": "0.05", + "cum": "4505.0" + } + }, + { + "tier": 6.0, + "symbol": "HIPPO/USDT:USDT", + "currency": "USDT", + "minNotional": 800000.0, + "maxNotional": 1600000.0, + "maintenanceMarginRate": 0.1, + "maxLeverage": 5.0, + "info": { + "bracket": "6", + "initialLeverage": "5", + "notionalCap": "1600000", + "notionalFloor": "800000", + "maintMarginRatio": "0.1", + "cum": "44505.0" + } + }, + { + "tier": 7.0, + "symbol": "HIPPO/USDT:USDT", + "currency": "USDT", + "minNotional": 1600000.0, + "maxNotional": 2000000.0, + "maintenanceMarginRate": 0.125, + "maxLeverage": 4.0, + "info": { + "bracket": "7", + "initialLeverage": "4", + "notionalCap": "2000000", + "notionalFloor": "1600000", + "maintMarginRatio": "0.125", + "cum": "84505.0" + } + }, + { + "tier": 8.0, + "symbol": "HIPPO/USDT:USDT", + "currency": "USDT", + "minNotional": 2000000.0, + "maxNotional": 4000000.0, + "maintenanceMarginRate": 0.25, + "maxLeverage": 2.0, + "info": { + "bracket": "8", + "initialLeverage": "2", + "notionalCap": "4000000", + "notionalFloor": "2000000", + "maintMarginRatio": "0.25", + "cum": "334505.0" + } + }, + { + "tier": 9.0, + "symbol": "HIPPO/USDT:USDT", + "currency": "USDT", + "minNotional": 4000000.0, + "maxNotional": 8000000.0, + "maintenanceMarginRate": 0.5, + "maxLeverage": 1.0, + "info": { + "bracket": "9", + "initialLeverage": "1", + "notionalCap": "8000000", + "notionalFloor": "4000000", + "maintMarginRatio": "0.5", + "cum": "1334505.0" + } + } + ], "HMSTR/USDT:USDT": [ { "tier": 1.0, + "symbol": "HMSTR/USDT:USDT", "currency": "USDT", "minNotional": 0.0, "maxNotional": 10000.0, @@ -20906,6 +24703,7 @@ }, { "tier": 2.0, + "symbol": "HMSTR/USDT:USDT", "currency": "USDT", "minNotional": 10000.0, "maxNotional": 20000.0, @@ -20922,6 +24720,7 @@ }, { "tier": 3.0, + "symbol": "HMSTR/USDT:USDT", "currency": "USDT", "minNotional": 20000.0, "maxNotional": 100000.0, @@ -20938,6 +24737,7 @@ }, { "tier": 4.0, + "symbol": "HMSTR/USDT:USDT", "currency": "USDT", "minNotional": 100000.0, "maxNotional": 200000.0, @@ -20954,6 +24754,7 @@ }, { "tier": 5.0, + "symbol": "HMSTR/USDT:USDT", "currency": "USDT", "minNotional": 200000.0, "maxNotional": 1000000.0, @@ -20970,6 +24771,7 @@ }, { "tier": 6.0, + "symbol": "HMSTR/USDT:USDT", "currency": "USDT", "minNotional": 1000000.0, "maxNotional": 2000000.0, @@ -20986,6 +24788,7 @@ }, { "tier": 7.0, + "symbol": "HMSTR/USDT:USDT", "currency": "USDT", "minNotional": 2000000.0, "maxNotional": 2500000.0, @@ -21002,6 +24805,7 @@ }, { "tier": 8.0, + "symbol": "HMSTR/USDT:USDT", "currency": "USDT", "minNotional": 2500000.0, "maxNotional": 5000000.0, @@ -21018,6 +24822,7 @@ }, { "tier": 9.0, + "symbol": "HMSTR/USDT:USDT", "currency": "USDT", "minNotional": 5000000.0, "maxNotional": 10000000.0, @@ -21036,6 +24841,7 @@ "HOOK/USDT:USDT": [ { "tier": 1.0, + "symbol": "HOOK/USDT:USDT", "currency": "USDT", "minNotional": 0.0, "maxNotional": 5000.0, @@ -21052,6 +24858,7 @@ }, { "tier": 2.0, + "symbol": "HOOK/USDT:USDT", "currency": "USDT", "minNotional": 5000.0, "maxNotional": 50000.0, @@ -21068,6 +24875,7 @@ }, { "tier": 3.0, + "symbol": "HOOK/USDT:USDT", "currency": "USDT", "minNotional": 50000.0, "maxNotional": 200000.0, @@ -21084,6 +24892,7 @@ }, { "tier": 4.0, + "symbol": "HOOK/USDT:USDT", "currency": "USDT", "minNotional": 200000.0, "maxNotional": 500000.0, @@ -21100,6 +24909,7 @@ }, { "tier": 5.0, + "symbol": "HOOK/USDT:USDT", "currency": "USDT", "minNotional": 500000.0, "maxNotional": 1000000.0, @@ -21116,6 +24926,7 @@ }, { "tier": 6.0, + "symbol": "HOOK/USDT:USDT", "currency": "USDT", "minNotional": 1000000.0, "maxNotional": 5000000.0, @@ -21134,104 +24945,162 @@ "HOT/USDT:USDT": [ { "tier": 1.0, + "symbol": "HOT/USDT:USDT", "currency": "USDT", "minNotional": 0.0, "maxNotional": 5000.0, - "maintenanceMarginRate": 0.02, - "maxLeverage": 25.0, + "maintenanceMarginRate": 0.01, + "maxLeverage": 75.0, "info": { "bracket": "1", - "initialLeverage": "25", + "initialLeverage": "75", "notionalCap": "5000", "notionalFloor": "0", - "maintMarginRatio": "0.02", + "maintMarginRatio": "0.01", "cum": "0.0" } }, { "tier": 2.0, + "symbol": "HOT/USDT:USDT", "currency": "USDT", "minNotional": 5000.0, - "maxNotional": 25000.0, - "maintenanceMarginRate": 0.025, - "maxLeverage": 20.0, + "maxNotional": 10000.0, + "maintenanceMarginRate": 0.015, + "maxLeverage": 50.0, "info": { "bracket": "2", - "initialLeverage": "20", - "notionalCap": "25000", + "initialLeverage": "50", + "notionalCap": "10000", "notionalFloor": "5000", - "maintMarginRatio": "0.025", + "maintMarginRatio": "0.015", "cum": "25.0" } }, { "tier": 3.0, + "symbol": "HOT/USDT:USDT", "currency": "USDT", - "minNotional": 25000.0, - "maxNotional": 100000.0, - "maintenanceMarginRate": 0.05, - "maxLeverage": 10.0, + "minNotional": 10000.0, + "maxNotional": 50000.0, + "maintenanceMarginRate": 0.02, + "maxLeverage": 25.0, "info": { "bracket": "3", - "initialLeverage": "10", - "notionalCap": "100000", - "notionalFloor": "25000", - "maintMarginRatio": "0.05", - "cum": "650.0" + "initialLeverage": "25", + "notionalCap": "50000", + "notionalFloor": "10000", + "maintMarginRatio": "0.02", + "cum": "75.0" } }, { "tier": 4.0, + "symbol": "HOT/USDT:USDT", "currency": "USDT", - "minNotional": 100000.0, - "maxNotional": 250000.0, - "maintenanceMarginRate": 0.1, - "maxLeverage": 5.0, + "minNotional": 50000.0, + "maxNotional": 100000.0, + "maintenanceMarginRate": 0.025, + "maxLeverage": 20.0, "info": { "bracket": "4", - "initialLeverage": "5", - "notionalCap": "250000", - "notionalFloor": "100000", - "maintMarginRatio": "0.1", - "cum": "5650.0" + "initialLeverage": "20", + "notionalCap": "100000", + "notionalFloor": "50000", + "maintMarginRatio": "0.025", + "cum": "325.0" } }, { "tier": 5.0, + "symbol": "HOT/USDT:USDT", "currency": "USDT", - "minNotional": 250000.0, - "maxNotional": 1000000.0, - "maintenanceMarginRate": 0.125, - "maxLeverage": 2.0, + "minNotional": 100000.0, + "maxNotional": 500000.0, + "maintenanceMarginRate": 0.05, + "maxLeverage": 10.0, "info": { "bracket": "5", - "initialLeverage": "2", - "notionalCap": "1000000", - "notionalFloor": "250000", - "maintMarginRatio": "0.125", - "cum": "11900.0" + "initialLeverage": "10", + "notionalCap": "500000", + "notionalFloor": "100000", + "maintMarginRatio": "0.05", + "cum": "2825.0" } }, { "tier": 6.0, + "symbol": "HOT/USDT:USDT", + "currency": "USDT", + "minNotional": 500000.0, + "maxNotional": 1000000.0, + "maintenanceMarginRate": 0.1, + "maxLeverage": 5.0, + "info": { + "bracket": "6", + "initialLeverage": "5", + "notionalCap": "1000000", + "notionalFloor": "500000", + "maintMarginRatio": "0.1", + "cum": "27825.0" + } + }, + { + "tier": 7.0, + "symbol": "HOT/USDT:USDT", "currency": "USDT", "minNotional": 1000000.0, + "maxNotional": 1250000.0, + "maintenanceMarginRate": 0.125, + "maxLeverage": 4.0, + "info": { + "bracket": "7", + "initialLeverage": "4", + "notionalCap": "1250000", + "notionalFloor": "1000000", + "maintMarginRatio": "0.125", + "cum": "52825.0" + } + }, + { + "tier": 8.0, + "symbol": "HOT/USDT:USDT", + "currency": "USDT", + "minNotional": 1250000.0, + "maxNotional": 2500000.0, + "maintenanceMarginRate": 0.25, + "maxLeverage": 2.0, + "info": { + "bracket": "8", + "initialLeverage": "2", + "notionalCap": "2500000", + "notionalFloor": "1250000", + "maintMarginRatio": "0.25", + "cum": "209075.0" + } + }, + { + "tier": 9.0, + "symbol": "HOT/USDT:USDT", + "currency": "USDT", + "minNotional": 2500000.0, "maxNotional": 5000000.0, "maintenanceMarginRate": 0.5, "maxLeverage": 1.0, "info": { - "bracket": "6", + "bracket": "9", "initialLeverage": "1", "notionalCap": "5000000", - "notionalFloor": "1000000", + "notionalFloor": "2500000", "maintMarginRatio": "0.5", - "cum": "386900.0" + "cum": "834075.0" } } ], "ICP/USDT:USDT": [ { "tier": 1.0, + "symbol": "ICP/USDT:USDT", "currency": "USDT", "minNotional": 0.0, "maxNotional": 10000.0, @@ -21248,6 +25117,7 @@ }, { "tier": 2.0, + "symbol": "ICP/USDT:USDT", "currency": "USDT", "minNotional": 10000.0, "maxNotional": 20000.0, @@ -21264,6 +25134,7 @@ }, { "tier": 3.0, + "symbol": "ICP/USDT:USDT", "currency": "USDT", "minNotional": 20000.0, "maxNotional": 100000.0, @@ -21280,6 +25151,7 @@ }, { "tier": 4.0, + "symbol": "ICP/USDT:USDT", "currency": "USDT", "minNotional": 100000.0, "maxNotional": 200000.0, @@ -21296,6 +25168,7 @@ }, { "tier": 5.0, + "symbol": "ICP/USDT:USDT", "currency": "USDT", "minNotional": 200000.0, "maxNotional": 1000000.0, @@ -21312,6 +25185,7 @@ }, { "tier": 6.0, + "symbol": "ICP/USDT:USDT", "currency": "USDT", "minNotional": 1000000.0, "maxNotional": 2000000.0, @@ -21328,6 +25202,7 @@ }, { "tier": 7.0, + "symbol": "ICP/USDT:USDT", "currency": "USDT", "minNotional": 2000000.0, "maxNotional": 2500000.0, @@ -21344,6 +25219,7 @@ }, { "tier": 8.0, + "symbol": "ICP/USDT:USDT", "currency": "USDT", "minNotional": 2500000.0, "maxNotional": 6000000.0, @@ -21360,6 +25236,7 @@ }, { "tier": 9.0, + "symbol": "ICP/USDT:USDT", "currency": "USDT", "minNotional": 6000000.0, "maxNotional": 10000000.0, @@ -21378,6 +25255,7 @@ "ICX/USDT:USDT": [ { "tier": 1.0, + "symbol": "ICX/USDT:USDT", "currency": "USDT", "minNotional": 0.0, "maxNotional": 5000.0, @@ -21394,6 +25272,7 @@ }, { "tier": 2.0, + "symbol": "ICX/USDT:USDT", "currency": "USDT", "minNotional": 5000.0, "maxNotional": 20000.0, @@ -21410,6 +25289,7 @@ }, { "tier": 3.0, + "symbol": "ICX/USDT:USDT", "currency": "USDT", "minNotional": 20000.0, "maxNotional": 25000.0, @@ -21426,6 +25306,7 @@ }, { "tier": 4.0, + "symbol": "ICX/USDT:USDT", "currency": "USDT", "minNotional": 25000.0, "maxNotional": 200000.0, @@ -21442,6 +25323,7 @@ }, { "tier": 5.0, + "symbol": "ICX/USDT:USDT", "currency": "USDT", "minNotional": 200000.0, "maxNotional": 400000.0, @@ -21458,6 +25340,7 @@ }, { "tier": 6.0, + "symbol": "ICX/USDT:USDT", "currency": "USDT", "minNotional": 400000.0, "maxNotional": 500000.0, @@ -21474,6 +25357,7 @@ }, { "tier": 7.0, + "symbol": "ICX/USDT:USDT", "currency": "USDT", "minNotional": 500000.0, "maxNotional": 1000000.0, @@ -21490,6 +25374,7 @@ }, { "tier": 8.0, + "symbol": "ICX/USDT:USDT", "currency": "USDT", "minNotional": 1000000.0, "maxNotional": 2000000.0, @@ -21508,120 +25393,162 @@ "ID/USDT:USDT": [ { "tier": 1.0, + "symbol": "ID/USDT:USDT", "currency": "USDT", "minNotional": 0.0, "maxNotional": 5000.0, - "maintenanceMarginRate": 0.02, - "maxLeverage": 20.0, + "maintenanceMarginRate": 0.01, + "maxLeverage": 75.0, "info": { "bracket": "1", - "initialLeverage": "20", + "initialLeverage": "75", "notionalCap": "5000", "notionalFloor": "0", - "maintMarginRatio": "0.02", + "maintMarginRatio": "0.01", "cum": "0.0" } }, { "tier": 2.0, + "symbol": "ID/USDT:USDT", "currency": "USDT", "minNotional": 5000.0, - "maxNotional": 25000.0, - "maintenanceMarginRate": 0.025, - "maxLeverage": 15.0, + "maxNotional": 10000.0, + "maintenanceMarginRate": 0.015, + "maxLeverage": 50.0, "info": { "bracket": "2", - "initialLeverage": "15", - "notionalCap": "25000", + "initialLeverage": "50", + "notionalCap": "10000", "notionalFloor": "5000", - "maintMarginRatio": "0.025", + "maintMarginRatio": "0.015", "cum": "25.0" } }, { "tier": 3.0, + "symbol": "ID/USDT:USDT", "currency": "USDT", - "minNotional": 25000.0, - "maxNotional": 200000.0, - "maintenanceMarginRate": 0.05, - "maxLeverage": 10.0, + "minNotional": 10000.0, + "maxNotional": 50000.0, + "maintenanceMarginRate": 0.02, + "maxLeverage": 25.0, "info": { "bracket": "3", - "initialLeverage": "10", - "notionalCap": "200000", - "notionalFloor": "25000", - "maintMarginRatio": "0.05", - "cum": "650.0" + "initialLeverage": "25", + "notionalCap": "50000", + "notionalFloor": "10000", + "maintMarginRatio": "0.02", + "cum": "75.0" } }, { "tier": 4.0, + "symbol": "ID/USDT:USDT", "currency": "USDT", - "minNotional": 200000.0, - "maxNotional": 500000.0, - "maintenanceMarginRate": 0.1, - "maxLeverage": 5.0, + "minNotional": 50000.0, + "maxNotional": 100000.0, + "maintenanceMarginRate": 0.025, + "maxLeverage": 20.0, "info": { "bracket": "4", - "initialLeverage": "5", - "notionalCap": "500000", - "notionalFloor": "200000", - "maintMarginRatio": "0.1", - "cum": "10650.0" + "initialLeverage": "20", + "notionalCap": "100000", + "notionalFloor": "50000", + "maintMarginRatio": "0.025", + "cum": "325.0" } }, { "tier": 5.0, + "symbol": "ID/USDT:USDT", "currency": "USDT", - "minNotional": 500000.0, - "maxNotional": 1000000.0, - "maintenanceMarginRate": 0.125, - "maxLeverage": 4.0, + "minNotional": 100000.0, + "maxNotional": 500000.0, + "maintenanceMarginRate": 0.05, + "maxLeverage": 10.0, "info": { "bracket": "5", - "initialLeverage": "4", - "notionalCap": "1000000", - "notionalFloor": "500000", - "maintMarginRatio": "0.125", - "cum": "23150.0" + "initialLeverage": "10", + "notionalCap": "500000", + "notionalFloor": "100000", + "maintMarginRatio": "0.05", + "cum": "2825.0" } }, { "tier": 6.0, + "symbol": "ID/USDT:USDT", "currency": "USDT", - "minNotional": 1000000.0, - "maxNotional": 3000000.0, - "maintenanceMarginRate": 0.25, - "maxLeverage": 2.0, + "minNotional": 500000.0, + "maxNotional": 1000000.0, + "maintenanceMarginRate": 0.1, + "maxLeverage": 5.0, "info": { "bracket": "6", - "initialLeverage": "2", - "notionalCap": "3000000", - "notionalFloor": "1000000", - "maintMarginRatio": "0.25", - "cum": "148150.0" + "initialLeverage": "5", + "notionalCap": "1000000", + "notionalFloor": "500000", + "maintMarginRatio": "0.1", + "cum": "27825.0" } }, { "tier": 7.0, + "symbol": "ID/USDT:USDT", + "currency": "USDT", + "minNotional": 1000000.0, + "maxNotional": 1250000.0, + "maintenanceMarginRate": 0.125, + "maxLeverage": 4.0, + "info": { + "bracket": "7", + "initialLeverage": "4", + "notionalCap": "1250000", + "notionalFloor": "1000000", + "maintMarginRatio": "0.125", + "cum": "52825.0" + } + }, + { + "tier": 8.0, + "symbol": "ID/USDT:USDT", + "currency": "USDT", + "minNotional": 1250000.0, + "maxNotional": 3000000.0, + "maintenanceMarginRate": 0.25, + "maxLeverage": 2.0, + "info": { + "bracket": "8", + "initialLeverage": "2", + "notionalCap": "3000000", + "notionalFloor": "1250000", + "maintMarginRatio": "0.25", + "cum": "209075.0" + } + }, + { + "tier": 9.0, + "symbol": "ID/USDT:USDT", "currency": "USDT", "minNotional": 3000000.0, "maxNotional": 5000000.0, "maintenanceMarginRate": 0.5, "maxLeverage": 1.0, "info": { - "bracket": "7", + "bracket": "9", "initialLeverage": "1", "notionalCap": "5000000", "notionalFloor": "3000000", "maintMarginRatio": "0.5", - "cum": "898150.0" + "cum": "959075.0" } } ], "IDEX/USDT:USDT": [ { "tier": 1.0, + "symbol": "IDEX/USDT:USDT", "currency": "USDT", "minNotional": 0.0, "maxNotional": 5000.0, @@ -21638,6 +25565,7 @@ }, { "tier": 2.0, + "symbol": "IDEX/USDT:USDT", "currency": "USDT", "minNotional": 5000.0, "maxNotional": 25000.0, @@ -21654,6 +25582,7 @@ }, { "tier": 3.0, + "symbol": "IDEX/USDT:USDT", "currency": "USDT", "minNotional": 25000.0, "maxNotional": 200000.0, @@ -21670,6 +25599,7 @@ }, { "tier": 4.0, + "symbol": "IDEX/USDT:USDT", "currency": "USDT", "minNotional": 200000.0, "maxNotional": 500000.0, @@ -21686,6 +25616,7 @@ }, { "tier": 5.0, + "symbol": "IDEX/USDT:USDT", "currency": "USDT", "minNotional": 500000.0, "maxNotional": 1000000.0, @@ -21702,6 +25633,7 @@ }, { "tier": 6.0, + "symbol": "IDEX/USDT:USDT", "currency": "USDT", "minNotional": 1000000.0, "maxNotional": 3000000.0, @@ -21718,6 +25650,7 @@ }, { "tier": 7.0, + "symbol": "IDEX/USDT:USDT", "currency": "USDT", "minNotional": 3000000.0, "maxNotional": 3500000.0, @@ -21736,6 +25669,7 @@ "ILV/USDT:USDT": [ { "tier": 1.0, + "symbol": "ILV/USDT:USDT", "currency": "USDT", "minNotional": 0.0, "maxNotional": 5000.0, @@ -21752,6 +25686,7 @@ }, { "tier": 2.0, + "symbol": "ILV/USDT:USDT", "currency": "USDT", "minNotional": 5000.0, "maxNotional": 25000.0, @@ -21768,6 +25703,7 @@ }, { "tier": 3.0, + "symbol": "ILV/USDT:USDT", "currency": "USDT", "minNotional": 25000.0, "maxNotional": 100000.0, @@ -21784,6 +25720,7 @@ }, { "tier": 4.0, + "symbol": "ILV/USDT:USDT", "currency": "USDT", "minNotional": 100000.0, "maxNotional": 200000.0, @@ -21800,6 +25737,7 @@ }, { "tier": 5.0, + "symbol": "ILV/USDT:USDT", "currency": "USDT", "minNotional": 200000.0, "maxNotional": 500000.0, @@ -21816,6 +25754,7 @@ }, { "tier": 6.0, + "symbol": "ILV/USDT:USDT", "currency": "USDT", "minNotional": 500000.0, "maxNotional": 1000000.0, @@ -21832,6 +25771,7 @@ }, { "tier": 7.0, + "symbol": "ILV/USDT:USDT", "currency": "USDT", "minNotional": 1000000.0, "maxNotional": 2000000.0, @@ -21850,6 +25790,7 @@ "IMX/USDT:USDT": [ { "tier": 1.0, + "symbol": "IMX/USDT:USDT", "currency": "USDT", "minNotional": 0.0, "maxNotional": 5000.0, @@ -21866,6 +25807,7 @@ }, { "tier": 2.0, + "symbol": "IMX/USDT:USDT", "currency": "USDT", "minNotional": 5000.0, "maxNotional": 50000.0, @@ -21882,6 +25824,7 @@ }, { "tier": 3.0, + "symbol": "IMX/USDT:USDT", "currency": "USDT", "minNotional": 50000.0, "maxNotional": 600000.0, @@ -21898,6 +25841,7 @@ }, { "tier": 4.0, + "symbol": "IMX/USDT:USDT", "currency": "USDT", "minNotional": 600000.0, "maxNotional": 1600000.0, @@ -21914,6 +25858,7 @@ }, { "tier": 5.0, + "symbol": "IMX/USDT:USDT", "currency": "USDT", "minNotional": 1600000.0, "maxNotional": 2000000.0, @@ -21930,6 +25875,7 @@ }, { "tier": 6.0, + "symbol": "IMX/USDT:USDT", "currency": "USDT", "minNotional": 2000000.0, "maxNotional": 4000000.0, @@ -21946,6 +25892,7 @@ }, { "tier": 7.0, + "symbol": "IMX/USDT:USDT", "currency": "USDT", "minNotional": 4000000.0, "maxNotional": 4500000.0, @@ -21964,6 +25911,7 @@ "INJ/USDT:USDT": [ { "tier": 1.0, + "symbol": "INJ/USDT:USDT", "currency": "USDT", "minNotional": 0.0, "maxNotional": 10000.0, @@ -21980,6 +25928,7 @@ }, { "tier": 2.0, + "symbol": "INJ/USDT:USDT", "currency": "USDT", "minNotional": 10000.0, "maxNotional": 40000.0, @@ -21996,6 +25945,7 @@ }, { "tier": 3.0, + "symbol": "INJ/USDT:USDT", "currency": "USDT", "minNotional": 40000.0, "maxNotional": 200000.0, @@ -22012,6 +25962,7 @@ }, { "tier": 4.0, + "symbol": "INJ/USDT:USDT", "currency": "USDT", "minNotional": 200000.0, "maxNotional": 400000.0, @@ -22028,6 +25979,7 @@ }, { "tier": 5.0, + "symbol": "INJ/USDT:USDT", "currency": "USDT", "minNotional": 400000.0, "maxNotional": 2000000.0, @@ -22044,6 +25996,7 @@ }, { "tier": 6.0, + "symbol": "INJ/USDT:USDT", "currency": "USDT", "minNotional": 2000000.0, "maxNotional": 4000000.0, @@ -22060,6 +26013,7 @@ }, { "tier": 7.0, + "symbol": "INJ/USDT:USDT", "currency": "USDT", "minNotional": 4000000.0, "maxNotional": 5000000.0, @@ -22076,6 +26030,7 @@ }, { "tier": 8.0, + "symbol": "INJ/USDT:USDT", "currency": "USDT", "minNotional": 5000000.0, "maxNotional": 12000000.0, @@ -22092,6 +26047,7 @@ }, { "tier": 9.0, + "symbol": "INJ/USDT:USDT", "currency": "USDT", "minNotional": 12000000.0, "maxNotional": 20000000.0, @@ -22110,6 +26066,7 @@ "IO/USDT:USDT": [ { "tier": 1.0, + "symbol": "IO/USDT:USDT", "currency": "USDT", "minNotional": 0.0, "maxNotional": 10000.0, @@ -22126,6 +26083,7 @@ }, { "tier": 2.0, + "symbol": "IO/USDT:USDT", "currency": "USDT", "minNotional": 10000.0, "maxNotional": 30000.0, @@ -22142,6 +26100,7 @@ }, { "tier": 3.0, + "symbol": "IO/USDT:USDT", "currency": "USDT", "minNotional": 30000.0, "maxNotional": 150000.0, @@ -22158,6 +26117,7 @@ }, { "tier": 4.0, + "symbol": "IO/USDT:USDT", "currency": "USDT", "minNotional": 150000.0, "maxNotional": 300000.0, @@ -22174,6 +26134,7 @@ }, { "tier": 5.0, + "symbol": "IO/USDT:USDT", "currency": "USDT", "minNotional": 300000.0, "maxNotional": 1500000.0, @@ -22190,6 +26151,7 @@ }, { "tier": 6.0, + "symbol": "IO/USDT:USDT", "currency": "USDT", "minNotional": 1500000.0, "maxNotional": 3000000.0, @@ -22206,6 +26168,7 @@ }, { "tier": 7.0, + "symbol": "IO/USDT:USDT", "currency": "USDT", "minNotional": 3000000.0, "maxNotional": 3750000.0, @@ -22222,6 +26185,7 @@ }, { "tier": 8.0, + "symbol": "IO/USDT:USDT", "currency": "USDT", "minNotional": 3750000.0, "maxNotional": 7500000.0, @@ -22238,6 +26202,7 @@ }, { "tier": 9.0, + "symbol": "IO/USDT:USDT", "currency": "USDT", "minNotional": 7500000.0, "maxNotional": 15000000.0, @@ -22256,6 +26221,7 @@ "IOST/USDT:USDT": [ { "tier": 1.0, + "symbol": "IOST/USDT:USDT", "currency": "USDT", "minNotional": 0.0, "maxNotional": 5000.0, @@ -22272,6 +26238,7 @@ }, { "tier": 2.0, + "symbol": "IOST/USDT:USDT", "currency": "USDT", "minNotional": 5000.0, "maxNotional": 25000.0, @@ -22288,6 +26255,7 @@ }, { "tier": 3.0, + "symbol": "IOST/USDT:USDT", "currency": "USDT", "minNotional": 25000.0, "maxNotional": 200000.0, @@ -22304,6 +26272,7 @@ }, { "tier": 4.0, + "symbol": "IOST/USDT:USDT", "currency": "USDT", "minNotional": 200000.0, "maxNotional": 500000.0, @@ -22320,6 +26289,7 @@ }, { "tier": 5.0, + "symbol": "IOST/USDT:USDT", "currency": "USDT", "minNotional": 500000.0, "maxNotional": 1000000.0, @@ -22336,6 +26306,7 @@ }, { "tier": 6.0, + "symbol": "IOST/USDT:USDT", "currency": "USDT", "minNotional": 1000000.0, "maxNotional": 3000000.0, @@ -22352,6 +26323,7 @@ }, { "tier": 7.0, + "symbol": "IOST/USDT:USDT", "currency": "USDT", "minNotional": 3000000.0, "maxNotional": 5000000.0, @@ -22370,6 +26342,7 @@ "IOTA/USDT:USDT": [ { "tier": 1.0, + "symbol": "IOTA/USDT:USDT", "currency": "USDT", "minNotional": 0.0, "maxNotional": 5000.0, @@ -22386,6 +26359,7 @@ }, { "tier": 2.0, + "symbol": "IOTA/USDT:USDT", "currency": "USDT", "minNotional": 5000.0, "maxNotional": 20000.0, @@ -22402,6 +26376,7 @@ }, { "tier": 3.0, + "symbol": "IOTA/USDT:USDT", "currency": "USDT", "minNotional": 20000.0, "maxNotional": 25000.0, @@ -22418,6 +26393,7 @@ }, { "tier": 4.0, + "symbol": "IOTA/USDT:USDT", "currency": "USDT", "minNotional": 25000.0, "maxNotional": 200000.0, @@ -22434,6 +26410,7 @@ }, { "tier": 5.0, + "symbol": "IOTA/USDT:USDT", "currency": "USDT", "minNotional": 200000.0, "maxNotional": 400000.0, @@ -22450,6 +26427,7 @@ }, { "tier": 6.0, + "symbol": "IOTA/USDT:USDT", "currency": "USDT", "minNotional": 400000.0, "maxNotional": 500000.0, @@ -22466,6 +26444,7 @@ }, { "tier": 7.0, + "symbol": "IOTA/USDT:USDT", "currency": "USDT", "minNotional": 500000.0, "maxNotional": 1000000.0, @@ -22482,6 +26461,7 @@ }, { "tier": 8.0, + "symbol": "IOTA/USDT:USDT", "currency": "USDT", "minNotional": 1000000.0, "maxNotional": 2000000.0, @@ -22500,6 +26480,7 @@ "IOTX/USDT:USDT": [ { "tier": 1.0, + "symbol": "IOTX/USDT:USDT", "currency": "USDT", "minNotional": 0.0, "maxNotional": 5000.0, @@ -22516,6 +26497,7 @@ }, { "tier": 2.0, + "symbol": "IOTX/USDT:USDT", "currency": "USDT", "minNotional": 5000.0, "maxNotional": 20000.0, @@ -22532,6 +26514,7 @@ }, { "tier": 3.0, + "symbol": "IOTX/USDT:USDT", "currency": "USDT", "minNotional": 20000.0, "maxNotional": 25000.0, @@ -22548,6 +26531,7 @@ }, { "tier": 4.0, + "symbol": "IOTX/USDT:USDT", "currency": "USDT", "minNotional": 25000.0, "maxNotional": 200000.0, @@ -22564,6 +26548,7 @@ }, { "tier": 5.0, + "symbol": "IOTX/USDT:USDT", "currency": "USDT", "minNotional": 200000.0, "maxNotional": 400000.0, @@ -22580,6 +26565,7 @@ }, { "tier": 6.0, + "symbol": "IOTX/USDT:USDT", "currency": "USDT", "minNotional": 400000.0, "maxNotional": 500000.0, @@ -22596,6 +26582,7 @@ }, { "tier": 7.0, + "symbol": "IOTX/USDT:USDT", "currency": "USDT", "minNotional": 500000.0, "maxNotional": 1000000.0, @@ -22612,6 +26599,7 @@ }, { "tier": 8.0, + "symbol": "IOTX/USDT:USDT", "currency": "USDT", "minNotional": 1000000.0, "maxNotional": 2000000.0, @@ -22630,6 +26618,7 @@ "JASMY/USDT:USDT": [ { "tier": 1.0, + "symbol": "JASMY/USDT:USDT", "currency": "USDT", "minNotional": 0.0, "maxNotional": 5000.0, @@ -22646,6 +26635,7 @@ }, { "tier": 2.0, + "symbol": "JASMY/USDT:USDT", "currency": "USDT", "minNotional": 5000.0, "maxNotional": 25000.0, @@ -22662,6 +26652,7 @@ }, { "tier": 3.0, + "symbol": "JASMY/USDT:USDT", "currency": "USDT", "minNotional": 25000.0, "maxNotional": 80000.0, @@ -22678,6 +26669,7 @@ }, { "tier": 4.0, + "symbol": "JASMY/USDT:USDT", "currency": "USDT", "minNotional": 80000.0, "maxNotional": 800000.0, @@ -22694,6 +26686,7 @@ }, { "tier": 5.0, + "symbol": "JASMY/USDT:USDT", "currency": "USDT", "minNotional": 800000.0, "maxNotional": 1600000.0, @@ -22710,6 +26703,7 @@ }, { "tier": 6.0, + "symbol": "JASMY/USDT:USDT", "currency": "USDT", "minNotional": 1600000.0, "maxNotional": 2000000.0, @@ -22726,6 +26720,7 @@ }, { "tier": 7.0, + "symbol": "JASMY/USDT:USDT", "currency": "USDT", "minNotional": 2000000.0, "maxNotional": 4000000.0, @@ -22742,6 +26737,7 @@ }, { "tier": 8.0, + "symbol": "JASMY/USDT:USDT", "currency": "USDT", "minNotional": 4000000.0, "maxNotional": 8000000.0, @@ -22760,6 +26756,7 @@ "JOE/USDT:USDT": [ { "tier": 1.0, + "symbol": "JOE/USDT:USDT", "currency": "USDT", "minNotional": 0.0, "maxNotional": 5000.0, @@ -22776,6 +26773,7 @@ }, { "tier": 2.0, + "symbol": "JOE/USDT:USDT", "currency": "USDT", "minNotional": 5000.0, "maxNotional": 25000.0, @@ -22792,6 +26790,7 @@ }, { "tier": 3.0, + "symbol": "JOE/USDT:USDT", "currency": "USDT", "minNotional": 25000.0, "maxNotional": 200000.0, @@ -22808,6 +26807,7 @@ }, { "tier": 4.0, + "symbol": "JOE/USDT:USDT", "currency": "USDT", "minNotional": 200000.0, "maxNotional": 500000.0, @@ -22824,6 +26824,7 @@ }, { "tier": 5.0, + "symbol": "JOE/USDT:USDT", "currency": "USDT", "minNotional": 500000.0, "maxNotional": 1000000.0, @@ -22840,6 +26841,7 @@ }, { "tier": 6.0, + "symbol": "JOE/USDT:USDT", "currency": "USDT", "minNotional": 1000000.0, "maxNotional": 3000000.0, @@ -22856,6 +26858,7 @@ }, { "tier": 7.0, + "symbol": "JOE/USDT:USDT", "currency": "USDT", "minNotional": 3000000.0, "maxNotional": 5000000.0, @@ -22874,136 +26877,7 @@ "JTO/USDT:USDT": [ { "tier": 1.0, - "currency": "USDT", - "minNotional": 0.0, - "maxNotional": 5000.0, - "maintenanceMarginRate": 0.015, - "maxLeverage": 50.0, - "info": { - "bracket": "1", - "initialLeverage": "50", - "notionalCap": "5000", - "notionalFloor": "0", - "maintMarginRatio": "0.015", - "cum": "0.0" - } - }, - { - "tier": 2.0, - "currency": "USDT", - "minNotional": 5000.0, - "maxNotional": 50000.0, - "maintenanceMarginRate": 0.02, - "maxLeverage": 25.0, - "info": { - "bracket": "2", - "initialLeverage": "25", - "notionalCap": "50000", - "notionalFloor": "5000", - "maintMarginRatio": "0.02", - "cum": "25.0" - } - }, - { - "tier": 3.0, - "currency": "USDT", - "minNotional": 50000.0, - "maxNotional": 100000.0, - "maintenanceMarginRate": 0.025, - "maxLeverage": 20.0, - "info": { - "bracket": "3", - "initialLeverage": "20", - "notionalCap": "100000", - "notionalFloor": "50000", - "maintMarginRatio": "0.025", - "cum": "275.0" - } - }, - { - "tier": 4.0, - "currency": "USDT", - "minNotional": 100000.0, - "maxNotional": 1000000.0, - "maintenanceMarginRate": 0.05, - "maxLeverage": 10.0, - "info": { - "bracket": "4", - "initialLeverage": "10", - "notionalCap": "1000000", - "notionalFloor": "100000", - "maintMarginRatio": "0.05", - "cum": "2775.0" - } - }, - { - "tier": 5.0, - "currency": "USDT", - "minNotional": 1000000.0, - "maxNotional": 2000000.0, - "maintenanceMarginRate": 0.1, - "maxLeverage": 5.0, - "info": { - "bracket": "5", - "initialLeverage": "5", - "notionalCap": "2000000", - "notionalFloor": "1000000", - "maintMarginRatio": "0.1", - "cum": "52775.0" - } - }, - { - "tier": 6.0, - "currency": "USDT", - "minNotional": 2000000.0, - "maxNotional": 2500000.0, - "maintenanceMarginRate": 0.125, - "maxLeverage": 4.0, - "info": { - "bracket": "6", - "initialLeverage": "4", - "notionalCap": "2500000", - "notionalFloor": "2000000", - "maintMarginRatio": "0.125", - "cum": "102775.0" - } - }, - { - "tier": 7.0, - "currency": "USDT", - "minNotional": 2500000.0, - "maxNotional": 5000000.0, - "maintenanceMarginRate": 0.25, - "maxLeverage": 2.0, - "info": { - "bracket": "7", - "initialLeverage": "2", - "notionalCap": "5000000", - "notionalFloor": "2500000", - "maintMarginRatio": "0.25", - "cum": "415275.0" - } - }, - { - "tier": 8.0, - "currency": "USDT", - "minNotional": 5000000.0, - "maxNotional": 10000000.0, - "maintenanceMarginRate": 0.5, - "maxLeverage": 1.0, - "info": { - "bracket": "8", - "initialLeverage": "1", - "notionalCap": "10000000", - "notionalFloor": "5000000", - "maintMarginRatio": "0.5", - "cum": "1665275.0" - } - } - ], - "JUP/USDT:USDT": [ - { - "tier": 1.0, + "symbol": "JTO/USDT:USDT", "currency": "USDT", "minNotional": 0.0, "maxNotional": 10000.0, @@ -23020,6 +26894,7 @@ }, { "tier": 2.0, + "symbol": "JTO/USDT:USDT", "currency": "USDT", "minNotional": 10000.0, "maxNotional": 30000.0, @@ -23036,6 +26911,7 @@ }, { "tier": 3.0, + "symbol": "JTO/USDT:USDT", "currency": "USDT", "minNotional": 30000.0, "maxNotional": 150000.0, @@ -23052,6 +26928,7 @@ }, { "tier": 4.0, + "symbol": "JTO/USDT:USDT", "currency": "USDT", "minNotional": 150000.0, "maxNotional": 300000.0, @@ -23068,6 +26945,7 @@ }, { "tier": 5.0, + "symbol": "JTO/USDT:USDT", "currency": "USDT", "minNotional": 300000.0, "maxNotional": 1500000.0, @@ -23084,6 +26962,7 @@ }, { "tier": 6.0, + "symbol": "JTO/USDT:USDT", "currency": "USDT", "minNotional": 1500000.0, "maxNotional": 3000000.0, @@ -23100,6 +26979,7 @@ }, { "tier": 7.0, + "symbol": "JTO/USDT:USDT", "currency": "USDT", "minNotional": 3000000.0, "maxNotional": 3750000.0, @@ -23116,6 +26996,7 @@ }, { "tier": 8.0, + "symbol": "JTO/USDT:USDT", "currency": "USDT", "minNotional": 3750000.0, "maxNotional": 7500000.0, @@ -23132,6 +27013,7 @@ }, { "tier": 9.0, + "symbol": "JTO/USDT:USDT", "currency": "USDT", "minNotional": 7500000.0, "maxNotional": 15000000.0, @@ -23147,9 +27029,165 @@ } } ], + "JUP/USDT:USDT": [ + { + "tier": 1.0, + "symbol": "JUP/USDT:USDT", + "currency": "USDT", + "minNotional": 0.0, + "maxNotional": 10000.0, + "maintenanceMarginRate": 0.01, + "maxLeverage": 75.0, + "info": { + "bracket": "1", + "initialLeverage": "75", + "notionalCap": "10000", + "notionalFloor": "0", + "maintMarginRatio": "0.01", + "cum": "0.0" + } + }, + { + "tier": 2.0, + "symbol": "JUP/USDT:USDT", + "currency": "USDT", + "minNotional": 10000.0, + "maxNotional": 60000.0, + "maintenanceMarginRate": 0.015, + "maxLeverage": 50.0, + "info": { + "bracket": "2", + "initialLeverage": "50", + "notionalCap": "60000", + "notionalFloor": "10000", + "maintMarginRatio": "0.015", + "cum": "50.0" + } + }, + { + "tier": 3.0, + "symbol": "JUP/USDT:USDT", + "currency": "USDT", + "minNotional": 60000.0, + "maxNotional": 300000.0, + "maintenanceMarginRate": 0.02, + "maxLeverage": 25.0, + "info": { + "bracket": "3", + "initialLeverage": "25", + "notionalCap": "300000", + "notionalFloor": "60000", + "maintMarginRatio": "0.02", + "cum": "350.0" + } + }, + { + "tier": 4.0, + "symbol": "JUP/USDT:USDT", + "currency": "USDT", + "minNotional": 300000.0, + "maxNotional": 600000.0, + "maintenanceMarginRate": 0.025, + "maxLeverage": 20.0, + "info": { + "bracket": "4", + "initialLeverage": "20", + "notionalCap": "600000", + "notionalFloor": "300000", + "maintMarginRatio": "0.025", + "cum": "1850.0" + } + }, + { + "tier": 5.0, + "symbol": "JUP/USDT:USDT", + "currency": "USDT", + "minNotional": 600000.0, + "maxNotional": 3000000.0, + "maintenanceMarginRate": 0.05, + "maxLeverage": 10.0, + "info": { + "bracket": "5", + "initialLeverage": "10", + "notionalCap": "3000000", + "notionalFloor": "600000", + "maintMarginRatio": "0.05", + "cum": "16850.0" + } + }, + { + "tier": 6.0, + "symbol": "JUP/USDT:USDT", + "currency": "USDT", + "minNotional": 3000000.0, + "maxNotional": 6000000.0, + "maintenanceMarginRate": 0.1, + "maxLeverage": 5.0, + "info": { + "bracket": "6", + "initialLeverage": "5", + "notionalCap": "6000000", + "notionalFloor": "3000000", + "maintMarginRatio": "0.1", + "cum": "166850.0" + } + }, + { + "tier": 7.0, + "symbol": "JUP/USDT:USDT", + "currency": "USDT", + "minNotional": 6000000.0, + "maxNotional": 7500000.0, + "maintenanceMarginRate": 0.125, + "maxLeverage": 4.0, + "info": { + "bracket": "7", + "initialLeverage": "4", + "notionalCap": "7500000", + "notionalFloor": "6000000", + "maintMarginRatio": "0.125", + "cum": "316850.0" + } + }, + { + "tier": 8.0, + "symbol": "JUP/USDT:USDT", + "currency": "USDT", + "minNotional": 7500000.0, + "maxNotional": 15000000.0, + "maintenanceMarginRate": 0.25, + "maxLeverage": 2.0, + "info": { + "bracket": "8", + "initialLeverage": "2", + "notionalCap": "15000000", + "notionalFloor": "7500000", + "maintMarginRatio": "0.25", + "cum": "1254350.0" + } + }, + { + "tier": 9.0, + "symbol": "JUP/USDT:USDT", + "currency": "USDT", + "minNotional": 15000000.0, + "maxNotional": 30000000.0, + "maintenanceMarginRate": 0.5, + "maxLeverage": 1.0, + "info": { + "bracket": "9", + "initialLeverage": "1", + "notionalCap": "30000000", + "notionalFloor": "15000000", + "maintMarginRatio": "0.5", + "cum": "5004350.0" + } + } + ], "KAS/USDT:USDT": [ { "tier": 1.0, + "symbol": "KAS/USDT:USDT", "currency": "USDT", "minNotional": 0.0, "maxNotional": 5000.0, @@ -23166,6 +27204,7 @@ }, { "tier": 2.0, + "symbol": "KAS/USDT:USDT", "currency": "USDT", "minNotional": 5000.0, "maxNotional": 10000.0, @@ -23182,6 +27221,7 @@ }, { "tier": 3.0, + "symbol": "KAS/USDT:USDT", "currency": "USDT", "minNotional": 10000.0, "maxNotional": 50000.0, @@ -23198,6 +27238,7 @@ }, { "tier": 4.0, + "symbol": "KAS/USDT:USDT", "currency": "USDT", "minNotional": 50000.0, "maxNotional": 100000.0, @@ -23214,6 +27255,7 @@ }, { "tier": 5.0, + "symbol": "KAS/USDT:USDT", "currency": "USDT", "minNotional": 100000.0, "maxNotional": 500000.0, @@ -23230,6 +27272,7 @@ }, { "tier": 6.0, + "symbol": "KAS/USDT:USDT", "currency": "USDT", "minNotional": 500000.0, "maxNotional": 1000000.0, @@ -23246,6 +27289,7 @@ }, { "tier": 7.0, + "symbol": "KAS/USDT:USDT", "currency": "USDT", "minNotional": 1000000.0, "maxNotional": 1250000.0, @@ -23262,6 +27306,7 @@ }, { "tier": 8.0, + "symbol": "KAS/USDT:USDT", "currency": "USDT", "minNotional": 1250000.0, "maxNotional": 2500000.0, @@ -23278,6 +27323,7 @@ }, { "tier": 9.0, + "symbol": "KAS/USDT:USDT", "currency": "USDT", "minNotional": 2500000.0, "maxNotional": 5000000.0, @@ -23296,6 +27342,7 @@ "KAVA/USDT:USDT": [ { "tier": 1.0, + "symbol": "KAVA/USDT:USDT", "currency": "USDT", "minNotional": 0.0, "maxNotional": 5000.0, @@ -23312,6 +27359,7 @@ }, { "tier": 2.0, + "symbol": "KAVA/USDT:USDT", "currency": "USDT", "minNotional": 5000.0, "maxNotional": 20000.0, @@ -23328,6 +27376,7 @@ }, { "tier": 3.0, + "symbol": "KAVA/USDT:USDT", "currency": "USDT", "minNotional": 20000.0, "maxNotional": 25000.0, @@ -23344,6 +27393,7 @@ }, { "tier": 4.0, + "symbol": "KAVA/USDT:USDT", "currency": "USDT", "minNotional": 25000.0, "maxNotional": 200000.0, @@ -23360,6 +27410,7 @@ }, { "tier": 5.0, + "symbol": "KAVA/USDT:USDT", "currency": "USDT", "minNotional": 200000.0, "maxNotional": 400000.0, @@ -23376,6 +27427,7 @@ }, { "tier": 6.0, + "symbol": "KAVA/USDT:USDT", "currency": "USDT", "minNotional": 400000.0, "maxNotional": 500000.0, @@ -23392,6 +27444,7 @@ }, { "tier": 7.0, + "symbol": "KAVA/USDT:USDT", "currency": "USDT", "minNotional": 500000.0, "maxNotional": 1000000.0, @@ -23408,6 +27461,7 @@ }, { "tier": 8.0, + "symbol": "KAVA/USDT:USDT", "currency": "USDT", "minNotional": 1000000.0, "maxNotional": 2000000.0, @@ -23426,6 +27480,7 @@ "KDA/USDT:USDT": [ { "tier": 1.0, + "symbol": "KDA/USDT:USDT", "currency": "USDT", "minNotional": 0.0, "maxNotional": 5000.0, @@ -23442,6 +27497,7 @@ }, { "tier": 2.0, + "symbol": "KDA/USDT:USDT", "currency": "USDT", "minNotional": 5000.0, "maxNotional": 10000.0, @@ -23458,6 +27514,7 @@ }, { "tier": 3.0, + "symbol": "KDA/USDT:USDT", "currency": "USDT", "minNotional": 10000.0, "maxNotional": 20000.0, @@ -23474,6 +27531,7 @@ }, { "tier": 4.0, + "symbol": "KDA/USDT:USDT", "currency": "USDT", "minNotional": 20000.0, "maxNotional": 40000.0, @@ -23490,6 +27548,7 @@ }, { "tier": 5.0, + "symbol": "KDA/USDT:USDT", "currency": "USDT", "minNotional": 40000.0, "maxNotional": 200000.0, @@ -23506,6 +27565,7 @@ }, { "tier": 6.0, + "symbol": "KDA/USDT:USDT", "currency": "USDT", "minNotional": 200000.0, "maxNotional": 400000.0, @@ -23522,6 +27582,7 @@ }, { "tier": 7.0, + "symbol": "KDA/USDT:USDT", "currency": "USDT", "minNotional": 400000.0, "maxNotional": 500000.0, @@ -23538,6 +27599,7 @@ }, { "tier": 8.0, + "symbol": "KDA/USDT:USDT", "currency": "USDT", "minNotional": 500000.0, "maxNotional": 1000000.0, @@ -23554,6 +27616,7 @@ }, { "tier": 9.0, + "symbol": "KDA/USDT:USDT", "currency": "USDT", "minNotional": 1000000.0, "maxNotional": 2000000.0, @@ -23572,14 +27635,15 @@ "KEY/USDT:USDT": [ { "tier": 1.0, + "symbol": "KEY/USDT:USDT", "currency": "USDT", "minNotional": 0.0, "maxNotional": 5000.0, "maintenanceMarginRate": 0.02, - "maxLeverage": 20.0, + "maxLeverage": 10.0, "info": { "bracket": "1", - "initialLeverage": "20", + "initialLeverage": "10", "notionalCap": "5000", "notionalFloor": "0", "maintMarginRatio": "0.02", @@ -23588,14 +27652,15 @@ }, { "tier": 2.0, + "symbol": "KEY/USDT:USDT", "currency": "USDT", "minNotional": 5000.0, "maxNotional": 25000.0, "maintenanceMarginRate": 0.025, - "maxLeverage": 15.0, + "maxLeverage": 8.0, "info": { "bracket": "2", - "initialLeverage": "15", + "initialLeverage": "8", "notionalCap": "25000", "notionalFloor": "5000", "maintMarginRatio": "0.025", @@ -23604,14 +27669,15 @@ }, { "tier": 3.0, + "symbol": "KEY/USDT:USDT", "currency": "USDT", "minNotional": 25000.0, "maxNotional": 200000.0, "maintenanceMarginRate": 0.05, - "maxLeverage": 10.0, + "maxLeverage": 6.0, "info": { "bracket": "3", - "initialLeverage": "10", + "initialLeverage": "6", "notionalCap": "200000", "notionalFloor": "25000", "maintMarginRatio": "0.05", @@ -23620,6 +27686,7 @@ }, { "tier": 4.0, + "symbol": "KEY/USDT:USDT", "currency": "USDT", "minNotional": 200000.0, "maxNotional": 500000.0, @@ -23636,6 +27703,7 @@ }, { "tier": 5.0, + "symbol": "KEY/USDT:USDT", "currency": "USDT", "minNotional": 500000.0, "maxNotional": 1000000.0, @@ -23652,15 +27720,16 @@ }, { "tier": 6.0, + "symbol": "KEY/USDT:USDT", "currency": "USDT", "minNotional": 1000000.0, - "maxNotional": 3000000.0, + "maxNotional": 2000000.0, "maintenanceMarginRate": 0.25, "maxLeverage": 2.0, "info": { "bracket": "6", "initialLeverage": "2", - "notionalCap": "3000000", + "notionalCap": "2000000", "notionalFloor": "1000000", "maintMarginRatio": "0.25", "cum": "148150.0" @@ -23668,24 +27737,26 @@ }, { "tier": 7.0, + "symbol": "KEY/USDT:USDT", "currency": "USDT", - "minNotional": 3000000.0, - "maxNotional": 5000000.0, + "minNotional": 2000000.0, + "maxNotional": 2500000.0, "maintenanceMarginRate": 0.5, "maxLeverage": 1.0, "info": { "bracket": "7", "initialLeverage": "1", - "notionalCap": "5000000", - "notionalFloor": "3000000", + "notionalCap": "2500000", + "notionalFloor": "2000000", "maintMarginRatio": "0.5", - "cum": "898150.0" + "cum": "648150.0" } } ], "KLAY/USDT:USDT": [ { "tier": 1.0, + "symbol": "KLAY/USDT:USDT", "currency": "USDT", "minNotional": 0.0, "maxNotional": 5000.0, @@ -23702,6 +27773,7 @@ }, { "tier": 2.0, + "symbol": "KLAY/USDT:USDT", "currency": "USDT", "minNotional": 5000.0, "maxNotional": 50000.0, @@ -23718,6 +27790,7 @@ }, { "tier": 3.0, + "symbol": "KLAY/USDT:USDT", "currency": "USDT", "minNotional": 50000.0, "maxNotional": 400000.0, @@ -23734,6 +27807,7 @@ }, { "tier": 4.0, + "symbol": "KLAY/USDT:USDT", "currency": "USDT", "minNotional": 400000.0, "maxNotional": 1000000.0, @@ -23750,6 +27824,7 @@ }, { "tier": 5.0, + "symbol": "KLAY/USDT:USDT", "currency": "USDT", "minNotional": 1000000.0, "maxNotional": 2000000.0, @@ -23766,6 +27841,7 @@ }, { "tier": 6.0, + "symbol": "KLAY/USDT:USDT", "currency": "USDT", "minNotional": 2000000.0, "maxNotional": 6000000.0, @@ -23782,6 +27858,7 @@ }, { "tier": 7.0, + "symbol": "KLAY/USDT:USDT", "currency": "USDT", "minNotional": 6000000.0, "maxNotional": 10000000.0, @@ -23800,6 +27877,7 @@ "KNC/USDT:USDT": [ { "tier": 1.0, + "symbol": "KNC/USDT:USDT", "currency": "USDT", "minNotional": 0.0, "maxNotional": 5000.0, @@ -23816,6 +27894,7 @@ }, { "tier": 2.0, + "symbol": "KNC/USDT:USDT", "currency": "USDT", "minNotional": 5000.0, "maxNotional": 20000.0, @@ -23832,6 +27911,7 @@ }, { "tier": 3.0, + "symbol": "KNC/USDT:USDT", "currency": "USDT", "minNotional": 20000.0, "maxNotional": 25000.0, @@ -23848,6 +27928,7 @@ }, { "tier": 4.0, + "symbol": "KNC/USDT:USDT", "currency": "USDT", "minNotional": 25000.0, "maxNotional": 200000.0, @@ -23864,6 +27945,7 @@ }, { "tier": 5.0, + "symbol": "KNC/USDT:USDT", "currency": "USDT", "minNotional": 200000.0, "maxNotional": 400000.0, @@ -23880,6 +27962,7 @@ }, { "tier": 6.0, + "symbol": "KNC/USDT:USDT", "currency": "USDT", "minNotional": 400000.0, "maxNotional": 500000.0, @@ -23896,6 +27979,7 @@ }, { "tier": 7.0, + "symbol": "KNC/USDT:USDT", "currency": "USDT", "minNotional": 500000.0, "maxNotional": 1000000.0, @@ -23912,6 +27996,7 @@ }, { "tier": 8.0, + "symbol": "KNC/USDT:USDT", "currency": "USDT", "minNotional": 1000000.0, "maxNotional": 2000000.0, @@ -23930,6 +28015,7 @@ "KSM/USDT:USDT": [ { "tier": 1.0, + "symbol": "KSM/USDT:USDT", "currency": "USDT", "minNotional": 0.0, "maxNotional": 5000.0, @@ -23946,6 +28032,7 @@ }, { "tier": 2.0, + "symbol": "KSM/USDT:USDT", "currency": "USDT", "minNotional": 5000.0, "maxNotional": 20000.0, @@ -23962,6 +28049,7 @@ }, { "tier": 3.0, + "symbol": "KSM/USDT:USDT", "currency": "USDT", "minNotional": 20000.0, "maxNotional": 25000.0, @@ -23978,6 +28066,7 @@ }, { "tier": 4.0, + "symbol": "KSM/USDT:USDT", "currency": "USDT", "minNotional": 25000.0, "maxNotional": 200000.0, @@ -23994,6 +28083,7 @@ }, { "tier": 5.0, + "symbol": "KSM/USDT:USDT", "currency": "USDT", "minNotional": 200000.0, "maxNotional": 400000.0, @@ -24010,6 +28100,7 @@ }, { "tier": 6.0, + "symbol": "KSM/USDT:USDT", "currency": "USDT", "minNotional": 400000.0, "maxNotional": 500000.0, @@ -24026,6 +28117,7 @@ }, { "tier": 7.0, + "symbol": "KSM/USDT:USDT", "currency": "USDT", "minNotional": 500000.0, "maxNotional": 1000000.0, @@ -24042,6 +28134,7 @@ }, { "tier": 8.0, + "symbol": "KSM/USDT:USDT", "currency": "USDT", "minNotional": 1000000.0, "maxNotional": 2000000.0, @@ -24060,6 +28153,7 @@ "LDO/USDT:USDT": [ { "tier": 1.0, + "symbol": "LDO/USDT:USDT", "currency": "USDT", "minNotional": 0.0, "maxNotional": 5000.0, @@ -24076,6 +28170,7 @@ }, { "tier": 2.0, + "symbol": "LDO/USDT:USDT", "currency": "USDT", "minNotional": 5000.0, "maxNotional": 50000.0, @@ -24092,6 +28187,7 @@ }, { "tier": 3.0, + "symbol": "LDO/USDT:USDT", "currency": "USDT", "minNotional": 50000.0, "maxNotional": 80000.0, @@ -24108,6 +28204,7 @@ }, { "tier": 4.0, + "symbol": "LDO/USDT:USDT", "currency": "USDT", "minNotional": 80000.0, "maxNotional": 200000.0, @@ -24124,6 +28221,7 @@ }, { "tier": 5.0, + "symbol": "LDO/USDT:USDT", "currency": "USDT", "minNotional": 200000.0, "maxNotional": 400000.0, @@ -24140,6 +28238,7 @@ }, { "tier": 6.0, + "symbol": "LDO/USDT:USDT", "currency": "USDT", "minNotional": 400000.0, "maxNotional": 2000000.0, @@ -24156,6 +28255,7 @@ }, { "tier": 7.0, + "symbol": "LDO/USDT:USDT", "currency": "USDT", "minNotional": 2000000.0, "maxNotional": 4000000.0, @@ -24172,6 +28272,7 @@ }, { "tier": 8.0, + "symbol": "LDO/USDT:USDT", "currency": "USDT", "minNotional": 4000000.0, "maxNotional": 5000000.0, @@ -24188,6 +28289,7 @@ }, { "tier": 9.0, + "symbol": "LDO/USDT:USDT", "currency": "USDT", "minNotional": 5000000.0, "maxNotional": 12000000.0, @@ -24204,6 +28306,7 @@ }, { "tier": 10.0, + "symbol": "LDO/USDT:USDT", "currency": "USDT", "minNotional": 12000000.0, "maxNotional": 20000000.0, @@ -24222,6 +28325,7 @@ "LEVER/USDT:USDT": [ { "tier": 1.0, + "symbol": "LEVER/USDT:USDT", "currency": "USDT", "minNotional": 0.0, "maxNotional": 5000.0, @@ -24238,6 +28342,7 @@ }, { "tier": 2.0, + "symbol": "LEVER/USDT:USDT", "currency": "USDT", "minNotional": 5000.0, "maxNotional": 25000.0, @@ -24254,6 +28359,7 @@ }, { "tier": 3.0, + "symbol": "LEVER/USDT:USDT", "currency": "USDT", "minNotional": 25000.0, "maxNotional": 200000.0, @@ -24270,6 +28376,7 @@ }, { "tier": 4.0, + "symbol": "LEVER/USDT:USDT", "currency": "USDT", "minNotional": 200000.0, "maxNotional": 500000.0, @@ -24286,6 +28393,7 @@ }, { "tier": 5.0, + "symbol": "LEVER/USDT:USDT", "currency": "USDT", "minNotional": 500000.0, "maxNotional": 1000000.0, @@ -24302,6 +28410,7 @@ }, { "tier": 6.0, + "symbol": "LEVER/USDT:USDT", "currency": "USDT", "minNotional": 1000000.0, "maxNotional": 3000000.0, @@ -24318,6 +28427,7 @@ }, { "tier": 7.0, + "symbol": "LEVER/USDT:USDT", "currency": "USDT", "minNotional": 3000000.0, "maxNotional": 5000000.0, @@ -24336,6 +28446,7 @@ "LINA/USDT:USDT": [ { "tier": 1.0, + "symbol": "LINA/USDT:USDT", "currency": "USDT", "minNotional": 0.0, "maxNotional": 5000.0, @@ -24352,6 +28463,7 @@ }, { "tier": 2.0, + "symbol": "LINA/USDT:USDT", "currency": "USDT", "minNotional": 5000.0, "maxNotional": 25000.0, @@ -24368,6 +28480,7 @@ }, { "tier": 3.0, + "symbol": "LINA/USDT:USDT", "currency": "USDT", "minNotional": 25000.0, "maxNotional": 900000.0, @@ -24384,6 +28497,7 @@ }, { "tier": 4.0, + "symbol": "LINA/USDT:USDT", "currency": "USDT", "minNotional": 900000.0, "maxNotional": 2400000.0, @@ -24400,6 +28514,7 @@ }, { "tier": 5.0, + "symbol": "LINA/USDT:USDT", "currency": "USDT", "minNotional": 2400000.0, "maxNotional": 3000000.0, @@ -24416,6 +28531,7 @@ }, { "tier": 6.0, + "symbol": "LINA/USDT:USDT", "currency": "USDT", "minNotional": 3000000.0, "maxNotional": 5000000.0, @@ -24432,6 +28548,7 @@ }, { "tier": 7.0, + "symbol": "LINA/USDT:USDT", "currency": "USDT", "minNotional": 5000000.0, "maxNotional": 7000000.0, @@ -24450,6 +28567,7 @@ "LINK/USDC:USDC": [ { "tier": 1.0, + "symbol": "LINK/USDC:USDC", "currency": "USDC", "minNotional": 0.0, "maxNotional": 5000.0, @@ -24466,6 +28584,7 @@ }, { "tier": 2.0, + "symbol": "LINK/USDC:USDC", "currency": "USDC", "minNotional": 5000.0, "maxNotional": 10000.0, @@ -24482,6 +28601,7 @@ }, { "tier": 3.0, + "symbol": "LINK/USDC:USDC", "currency": "USDC", "minNotional": 10000.0, "maxNotional": 50000.0, @@ -24498,6 +28618,7 @@ }, { "tier": 4.0, + "symbol": "LINK/USDC:USDC", "currency": "USDC", "minNotional": 50000.0, "maxNotional": 250000.0, @@ -24514,6 +28635,7 @@ }, { "tier": 5.0, + "symbol": "LINK/USDC:USDC", "currency": "USDC", "minNotional": 250000.0, "maxNotional": 1000000.0, @@ -24530,6 +28652,7 @@ }, { "tier": 6.0, + "symbol": "LINK/USDC:USDC", "currency": "USDC", "minNotional": 1000000.0, "maxNotional": 5000000.0, @@ -24546,6 +28669,7 @@ }, { "tier": 7.0, + "symbol": "LINK/USDC:USDC", "currency": "USDC", "minNotional": 5000000.0, "maxNotional": 10000000.0, @@ -24562,6 +28686,7 @@ }, { "tier": 8.0, + "symbol": "LINK/USDC:USDC", "currency": "USDC", "minNotional": 10000000.0, "maxNotional": 20000000.0, @@ -24578,6 +28703,7 @@ }, { "tier": 9.0, + "symbol": "LINK/USDC:USDC", "currency": "USDC", "minNotional": 20000000.0, "maxNotional": 30000000.0, @@ -24594,6 +28720,7 @@ }, { "tier": 10.0, + "symbol": "LINK/USDC:USDC", "currency": "USDC", "minNotional": 30000000.0, "maxNotional": 50000000.0, @@ -24612,6 +28739,7 @@ "LINK/USDT:USDT": [ { "tier": 1.0, + "symbol": "LINK/USDT:USDT", "currency": "USDT", "minNotional": 0.0, "maxNotional": 10000.0, @@ -24628,6 +28756,7 @@ }, { "tier": 2.0, + "symbol": "LINK/USDT:USDT", "currency": "USDT", "minNotional": 10000.0, "maxNotional": 50000.0, @@ -24644,6 +28773,7 @@ }, { "tier": 3.0, + "symbol": "LINK/USDT:USDT", "currency": "USDT", "minNotional": 50000.0, "maxNotional": 80000.0, @@ -24660,6 +28790,7 @@ }, { "tier": 4.0, + "symbol": "LINK/USDT:USDT", "currency": "USDT", "minNotional": 80000.0, "maxNotional": 400000.0, @@ -24676,6 +28807,7 @@ }, { "tier": 5.0, + "symbol": "LINK/USDT:USDT", "currency": "USDT", "minNotional": 400000.0, "maxNotional": 800000.0, @@ -24692,6 +28824,7 @@ }, { "tier": 6.0, + "symbol": "LINK/USDT:USDT", "currency": "USDT", "minNotional": 800000.0, "maxNotional": 4000000.0, @@ -24708,6 +28841,7 @@ }, { "tier": 7.0, + "symbol": "LINK/USDT:USDT", "currency": "USDT", "minNotional": 4000000.0, "maxNotional": 8000000.0, @@ -24724,6 +28858,7 @@ }, { "tier": 8.0, + "symbol": "LINK/USDT:USDT", "currency": "USDT", "minNotional": 8000000.0, "maxNotional": 20000000.0, @@ -24740,6 +28875,7 @@ }, { "tier": 9.0, + "symbol": "LINK/USDT:USDT", "currency": "USDT", "minNotional": 20000000.0, "maxNotional": 30000000.0, @@ -24756,6 +28892,7 @@ }, { "tier": 10.0, + "symbol": "LINK/USDT:USDT", "currency": "USDT", "minNotional": 30000000.0, "maxNotional": 50000000.0, @@ -24774,6 +28911,7 @@ "LISTA/USDT:USDT": [ { "tier": 1.0, + "symbol": "LISTA/USDT:USDT", "currency": "USDT", "minNotional": 0.0, "maxNotional": 5000.0, @@ -24790,6 +28928,7 @@ }, { "tier": 2.0, + "symbol": "LISTA/USDT:USDT", "currency": "USDT", "minNotional": 5000.0, "maxNotional": 25000.0, @@ -24806,6 +28945,7 @@ }, { "tier": 3.0, + "symbol": "LISTA/USDT:USDT", "currency": "USDT", "minNotional": 25000.0, "maxNotional": 50000.0, @@ -24822,6 +28962,7 @@ }, { "tier": 4.0, + "symbol": "LISTA/USDT:USDT", "currency": "USDT", "minNotional": 50000.0, "maxNotional": 500000.0, @@ -24838,6 +28979,7 @@ }, { "tier": 5.0, + "symbol": "LISTA/USDT:USDT", "currency": "USDT", "minNotional": 500000.0, "maxNotional": 1000000.0, @@ -24854,6 +28996,7 @@ }, { "tier": 6.0, + "symbol": "LISTA/USDT:USDT", "currency": "USDT", "minNotional": 1000000.0, "maxNotional": 1250000.0, @@ -24870,6 +29013,7 @@ }, { "tier": 7.0, + "symbol": "LISTA/USDT:USDT", "currency": "USDT", "minNotional": 1250000.0, "maxNotional": 2500000.0, @@ -24886,6 +29030,7 @@ }, { "tier": 8.0, + "symbol": "LISTA/USDT:USDT", "currency": "USDT", "minNotional": 2500000.0, "maxNotional": 5000000.0, @@ -24904,6 +29049,7 @@ "LIT/USDT:USDT": [ { "tier": 1.0, + "symbol": "LIT/USDT:USDT", "currency": "USDT", "minNotional": 0.0, "maxNotional": 5000.0, @@ -24920,6 +29066,7 @@ }, { "tier": 2.0, + "symbol": "LIT/USDT:USDT", "currency": "USDT", "minNotional": 5000.0, "maxNotional": 20000.0, @@ -24936,6 +29083,7 @@ }, { "tier": 3.0, + "symbol": "LIT/USDT:USDT", "currency": "USDT", "minNotional": 20000.0, "maxNotional": 25000.0, @@ -24952,6 +29100,7 @@ }, { "tier": 4.0, + "symbol": "LIT/USDT:USDT", "currency": "USDT", "minNotional": 25000.0, "maxNotional": 200000.0, @@ -24968,6 +29117,7 @@ }, { "tier": 5.0, + "symbol": "LIT/USDT:USDT", "currency": "USDT", "minNotional": 200000.0, "maxNotional": 400000.0, @@ -24984,6 +29134,7 @@ }, { "tier": 6.0, + "symbol": "LIT/USDT:USDT", "currency": "USDT", "minNotional": 400000.0, "maxNotional": 500000.0, @@ -25000,6 +29151,7 @@ }, { "tier": 7.0, + "symbol": "LIT/USDT:USDT", "currency": "USDT", "minNotional": 500000.0, "maxNotional": 1000000.0, @@ -25016,6 +29168,7 @@ }, { "tier": 8.0, + "symbol": "LIT/USDT:USDT", "currency": "USDT", "minNotional": 1000000.0, "maxNotional": 2000000.0, @@ -25034,6 +29187,7 @@ "LOKA/USDT:USDT": [ { "tier": 1.0, + "symbol": "LOKA/USDT:USDT", "currency": "USDT", "minNotional": 0.0, "maxNotional": 5000.0, @@ -25050,6 +29204,7 @@ }, { "tier": 2.0, + "symbol": "LOKA/USDT:USDT", "currency": "USDT", "minNotional": 5000.0, "maxNotional": 10000.0, @@ -25066,6 +29221,7 @@ }, { "tier": 3.0, + "symbol": "LOKA/USDT:USDT", "currency": "USDT", "minNotional": 10000.0, "maxNotional": 20000.0, @@ -25082,6 +29238,7 @@ }, { "tier": 4.0, + "symbol": "LOKA/USDT:USDT", "currency": "USDT", "minNotional": 20000.0, "maxNotional": 40000.0, @@ -25098,6 +29255,7 @@ }, { "tier": 5.0, + "symbol": "LOKA/USDT:USDT", "currency": "USDT", "minNotional": 40000.0, "maxNotional": 200000.0, @@ -25114,6 +29272,7 @@ }, { "tier": 6.0, + "symbol": "LOKA/USDT:USDT", "currency": "USDT", "minNotional": 200000.0, "maxNotional": 400000.0, @@ -25130,6 +29289,7 @@ }, { "tier": 7.0, + "symbol": "LOKA/USDT:USDT", "currency": "USDT", "minNotional": 400000.0, "maxNotional": 500000.0, @@ -25146,6 +29306,7 @@ }, { "tier": 8.0, + "symbol": "LOKA/USDT:USDT", "currency": "USDT", "minNotional": 500000.0, "maxNotional": 1000000.0, @@ -25162,6 +29323,7 @@ }, { "tier": 9.0, + "symbol": "LOKA/USDT:USDT", "currency": "USDT", "minNotional": 1000000.0, "maxNotional": 2000000.0, @@ -25180,6 +29342,7 @@ "LOOM/USDT:USDT": [ { "tier": 1.0, + "symbol": "LOOM/USDT:USDT", "currency": "USDT", "minNotional": 0.0, "maxNotional": 25000.0, @@ -25196,6 +29359,7 @@ }, { "tier": 2.0, + "symbol": "LOOM/USDT:USDT", "currency": "USDT", "minNotional": 25000.0, "maxNotional": 200000.0, @@ -25212,6 +29376,7 @@ }, { "tier": 3.0, + "symbol": "LOOM/USDT:USDT", "currency": "USDT", "minNotional": 200000.0, "maxNotional": 500000.0, @@ -25228,6 +29393,7 @@ }, { "tier": 4.0, + "symbol": "LOOM/USDT:USDT", "currency": "USDT", "minNotional": 500000.0, "maxNotional": 1000000.0, @@ -25244,6 +29410,7 @@ }, { "tier": 5.0, + "symbol": "LOOM/USDT:USDT", "currency": "USDT", "minNotional": 1000000.0, "maxNotional": 3000000.0, @@ -25260,6 +29427,7 @@ }, { "tier": 6.0, + "symbol": "LOOM/USDT:USDT", "currency": "USDT", "minNotional": 3000000.0, "maxNotional": 3500000.0, @@ -25278,6 +29446,7 @@ "LPT/USDT:USDT": [ { "tier": 1.0, + "symbol": "LPT/USDT:USDT", "currency": "USDT", "minNotional": 0.0, "maxNotional": 5000.0, @@ -25294,6 +29463,7 @@ }, { "tier": 2.0, + "symbol": "LPT/USDT:USDT", "currency": "USDT", "minNotional": 5000.0, "maxNotional": 25000.0, @@ -25310,6 +29480,7 @@ }, { "tier": 3.0, + "symbol": "LPT/USDT:USDT", "currency": "USDT", "minNotional": 25000.0, "maxNotional": 100000.0, @@ -25326,6 +29497,7 @@ }, { "tier": 4.0, + "symbol": "LPT/USDT:USDT", "currency": "USDT", "minNotional": 100000.0, "maxNotional": 250000.0, @@ -25342,6 +29514,7 @@ }, { "tier": 5.0, + "symbol": "LPT/USDT:USDT", "currency": "USDT", "minNotional": 250000.0, "maxNotional": 1000000.0, @@ -25358,6 +29531,7 @@ }, { "tier": 6.0, + "symbol": "LPT/USDT:USDT", "currency": "USDT", "minNotional": 1000000.0, "maxNotional": 3000000.0, @@ -25376,6 +29550,7 @@ "LQTY/USDT:USDT": [ { "tier": 1.0, + "symbol": "LQTY/USDT:USDT", "currency": "USDT", "minNotional": 0.0, "maxNotional": 5000.0, @@ -25392,6 +29567,7 @@ }, { "tier": 2.0, + "symbol": "LQTY/USDT:USDT", "currency": "USDT", "minNotional": 5000.0, "maxNotional": 25000.0, @@ -25408,6 +29584,7 @@ }, { "tier": 3.0, + "symbol": "LQTY/USDT:USDT", "currency": "USDT", "minNotional": 25000.0, "maxNotional": 600000.0, @@ -25424,6 +29601,7 @@ }, { "tier": 4.0, + "symbol": "LQTY/USDT:USDT", "currency": "USDT", "minNotional": 600000.0, "maxNotional": 1600000.0, @@ -25440,6 +29618,7 @@ }, { "tier": 5.0, + "symbol": "LQTY/USDT:USDT", "currency": "USDT", "minNotional": 1600000.0, "maxNotional": 2000000.0, @@ -25456,6 +29635,7 @@ }, { "tier": 6.0, + "symbol": "LQTY/USDT:USDT", "currency": "USDT", "minNotional": 2000000.0, "maxNotional": 6000000.0, @@ -25472,6 +29652,7 @@ }, { "tier": 7.0, + "symbol": "LQTY/USDT:USDT", "currency": "USDT", "minNotional": 6000000.0, "maxNotional": 10000000.0, @@ -25490,6 +29671,7 @@ "LRC/USDT:USDT": [ { "tier": 1.0, + "symbol": "LRC/USDT:USDT", "currency": "USDT", "minNotional": 0.0, "maxNotional": 5000.0, @@ -25506,6 +29688,7 @@ }, { "tier": 2.0, + "symbol": "LRC/USDT:USDT", "currency": "USDT", "minNotional": 5000.0, "maxNotional": 25000.0, @@ -25522,6 +29705,7 @@ }, { "tier": 3.0, + "symbol": "LRC/USDT:USDT", "currency": "USDT", "minNotional": 25000.0, "maxNotional": 100000.0, @@ -25538,6 +29722,7 @@ }, { "tier": 4.0, + "symbol": "LRC/USDT:USDT", "currency": "USDT", "minNotional": 100000.0, "maxNotional": 250000.0, @@ -25554,6 +29739,7 @@ }, { "tier": 5.0, + "symbol": "LRC/USDT:USDT", "currency": "USDT", "minNotional": 250000.0, "maxNotional": 1000000.0, @@ -25570,6 +29756,7 @@ }, { "tier": 6.0, + "symbol": "LRC/USDT:USDT", "currency": "USDT", "minNotional": 1000000.0, "maxNotional": 5000000.0, @@ -25588,6 +29775,7 @@ "LSK/USDT:USDT": [ { "tier": 1.0, + "symbol": "LSK/USDT:USDT", "currency": "USDT", "minNotional": 0.0, "maxNotional": 5000.0, @@ -25604,6 +29792,7 @@ }, { "tier": 2.0, + "symbol": "LSK/USDT:USDT", "currency": "USDT", "minNotional": 5000.0, "maxNotional": 25000.0, @@ -25620,6 +29809,7 @@ }, { "tier": 3.0, + "symbol": "LSK/USDT:USDT", "currency": "USDT", "minNotional": 25000.0, "maxNotional": 100000.0, @@ -25636,6 +29826,7 @@ }, { "tier": 4.0, + "symbol": "LSK/USDT:USDT", "currency": "USDT", "minNotional": 100000.0, "maxNotional": 200000.0, @@ -25652,6 +29843,7 @@ }, { "tier": 5.0, + "symbol": "LSK/USDT:USDT", "currency": "USDT", "minNotional": 200000.0, "maxNotional": 500000.0, @@ -25668,6 +29860,7 @@ }, { "tier": 6.0, + "symbol": "LSK/USDT:USDT", "currency": "USDT", "minNotional": 500000.0, "maxNotional": 1000000.0, @@ -25684,6 +29877,7 @@ }, { "tier": 7.0, + "symbol": "LSK/USDT:USDT", "currency": "USDT", "minNotional": 1000000.0, "maxNotional": 2000000.0, @@ -25702,6 +29896,7 @@ "LTC/USDC:USDC": [ { "tier": 1.0, + "symbol": "LTC/USDC:USDC", "currency": "USDC", "minNotional": 0.0, "maxNotional": 5000.0, @@ -25718,6 +29913,7 @@ }, { "tier": 2.0, + "symbol": "LTC/USDC:USDC", "currency": "USDC", "minNotional": 5000.0, "maxNotional": 10000.0, @@ -25734,6 +29930,7 @@ }, { "tier": 3.0, + "symbol": "LTC/USDC:USDC", "currency": "USDC", "minNotional": 10000.0, "maxNotional": 50000.0, @@ -25750,6 +29947,7 @@ }, { "tier": 4.0, + "symbol": "LTC/USDC:USDC", "currency": "USDC", "minNotional": 50000.0, "maxNotional": 750000.0, @@ -25766,6 +29964,7 @@ }, { "tier": 5.0, + "symbol": "LTC/USDC:USDC", "currency": "USDC", "minNotional": 750000.0, "maxNotional": 3000000.0, @@ -25782,6 +29981,7 @@ }, { "tier": 6.0, + "symbol": "LTC/USDC:USDC", "currency": "USDC", "minNotional": 3000000.0, "maxNotional": 10000000.0, @@ -25798,6 +29998,7 @@ }, { "tier": 7.0, + "symbol": "LTC/USDC:USDC", "currency": "USDC", "minNotional": 10000000.0, "maxNotional": 12000000.0, @@ -25814,6 +30015,7 @@ }, { "tier": 8.0, + "symbol": "LTC/USDC:USDC", "currency": "USDC", "minNotional": 12000000.0, "maxNotional": 20000000.0, @@ -25830,6 +30032,7 @@ }, { "tier": 9.0, + "symbol": "LTC/USDC:USDC", "currency": "USDC", "minNotional": 20000000.0, "maxNotional": 30000000.0, @@ -25846,6 +30049,7 @@ }, { "tier": 10.0, + "symbol": "LTC/USDC:USDC", "currency": "USDC", "minNotional": 30000000.0, "maxNotional": 50000000.0, @@ -25864,6 +30068,7 @@ "LTC/USDT:USDT": [ { "tier": 1.0, + "symbol": "LTC/USDT:USDT", "currency": "USDT", "minNotional": 0.0, "maxNotional": 10000.0, @@ -25880,6 +30085,7 @@ }, { "tier": 2.0, + "symbol": "LTC/USDT:USDT", "currency": "USDT", "minNotional": 10000.0, "maxNotional": 50000.0, @@ -25896,6 +30102,7 @@ }, { "tier": 3.0, + "symbol": "LTC/USDT:USDT", "currency": "USDT", "minNotional": 50000.0, "maxNotional": 100000.0, @@ -25912,6 +30119,7 @@ }, { "tier": 4.0, + "symbol": "LTC/USDT:USDT", "currency": "USDT", "minNotional": 100000.0, "maxNotional": 750000.0, @@ -25928,6 +30136,7 @@ }, { "tier": 5.0, + "symbol": "LTC/USDT:USDT", "currency": "USDT", "minNotional": 750000.0, "maxNotional": 1000000.0, @@ -25944,6 +30153,7 @@ }, { "tier": 6.0, + "symbol": "LTC/USDT:USDT", "currency": "USDT", "minNotional": 1000000.0, "maxNotional": 5000000.0, @@ -25960,6 +30170,7 @@ }, { "tier": 7.0, + "symbol": "LTC/USDT:USDT", "currency": "USDT", "minNotional": 5000000.0, "maxNotional": 10000000.0, @@ -25976,6 +30187,7 @@ }, { "tier": 8.0, + "symbol": "LTC/USDT:USDT", "currency": "USDT", "minNotional": 10000000.0, "maxNotional": 20000000.0, @@ -25992,6 +30204,7 @@ }, { "tier": 9.0, + "symbol": "LTC/USDT:USDT", "currency": "USDT", "minNotional": 20000000.0, "maxNotional": 30000000.0, @@ -26008,6 +30221,7 @@ }, { "tier": 10.0, + "symbol": "LTC/USDT:USDT", "currency": "USDT", "minNotional": 30000000.0, "maxNotional": 50000000.0, @@ -26026,6 +30240,7 @@ "LUNA2/USDT:USDT": [ { "tier": 1.0, + "symbol": "LUNA2/USDT:USDT", "currency": "USDT", "minNotional": 0.0, "maxNotional": 5000.0, @@ -26042,6 +30257,7 @@ }, { "tier": 2.0, + "symbol": "LUNA2/USDT:USDT", "currency": "USDT", "minNotional": 5000.0, "maxNotional": 25000.0, @@ -26058,6 +30274,7 @@ }, { "tier": 3.0, + "symbol": "LUNA2/USDT:USDT", "currency": "USDT", "minNotional": 25000.0, "maxNotional": 100000.0, @@ -26074,6 +30291,7 @@ }, { "tier": 4.0, + "symbol": "LUNA2/USDT:USDT", "currency": "USDT", "minNotional": 100000.0, "maxNotional": 250000.0, @@ -26090,6 +30308,7 @@ }, { "tier": 5.0, + "symbol": "LUNA2/USDT:USDT", "currency": "USDT", "minNotional": 250000.0, "maxNotional": 1000000.0, @@ -26106,6 +30325,7 @@ }, { "tier": 6.0, + "symbol": "LUNA2/USDT:USDT", "currency": "USDT", "minNotional": 1000000.0, "maxNotional": 5000000.0, @@ -26124,104 +30344,162 @@ "MAGIC/USDT:USDT": [ { "tier": 1.0, + "symbol": "MAGIC/USDT:USDT", "currency": "USDT", "minNotional": 0.0, "maxNotional": 5000.0, - "maintenanceMarginRate": 0.02, - "maxLeverage": 20.0, + "maintenanceMarginRate": 0.01, + "maxLeverage": 75.0, "info": { "bracket": "1", - "initialLeverage": "20", + "initialLeverage": "75", "notionalCap": "5000", "notionalFloor": "0", - "maintMarginRatio": "0.02", + "maintMarginRatio": "0.01", "cum": "0.0" } }, { "tier": 2.0, + "symbol": "MAGIC/USDT:USDT", "currency": "USDT", "minNotional": 5000.0, - "maxNotional": 25000.0, - "maintenanceMarginRate": 0.025, - "maxLeverage": 15.0, + "maxNotional": 10000.0, + "maintenanceMarginRate": 0.015, + "maxLeverage": 50.0, "info": { "bracket": "2", - "initialLeverage": "15", - "notionalCap": "25000", + "initialLeverage": "50", + "notionalCap": "10000", "notionalFloor": "5000", - "maintMarginRatio": "0.025", + "maintMarginRatio": "0.015", "cum": "25.0" } }, { "tier": 3.0, + "symbol": "MAGIC/USDT:USDT", "currency": "USDT", - "minNotional": 25000.0, - "maxNotional": 100000.0, - "maintenanceMarginRate": 0.05, - "maxLeverage": 10.0, + "minNotional": 10000.0, + "maxNotional": 50000.0, + "maintenanceMarginRate": 0.02, + "maxLeverage": 25.0, "info": { "bracket": "3", - "initialLeverage": "10", - "notionalCap": "100000", - "notionalFloor": "25000", - "maintMarginRatio": "0.05", - "cum": "650.0" + "initialLeverage": "25", + "notionalCap": "50000", + "notionalFloor": "10000", + "maintMarginRatio": "0.02", + "cum": "75.0" } }, { "tier": 4.0, + "symbol": "MAGIC/USDT:USDT", "currency": "USDT", - "minNotional": 100000.0, - "maxNotional": 250000.0, - "maintenanceMarginRate": 0.1, - "maxLeverage": 5.0, + "minNotional": 50000.0, + "maxNotional": 100000.0, + "maintenanceMarginRate": 0.025, + "maxLeverage": 20.0, "info": { "bracket": "4", - "initialLeverage": "5", - "notionalCap": "250000", - "notionalFloor": "100000", - "maintMarginRatio": "0.1", - "cum": "5650.0" + "initialLeverage": "20", + "notionalCap": "100000", + "notionalFloor": "50000", + "maintMarginRatio": "0.025", + "cum": "325.0" } }, { "tier": 5.0, + "symbol": "MAGIC/USDT:USDT", "currency": "USDT", - "minNotional": 250000.0, - "maxNotional": 1000000.0, - "maintenanceMarginRate": 0.125, - "maxLeverage": 2.0, + "minNotional": 100000.0, + "maxNotional": 500000.0, + "maintenanceMarginRate": 0.05, + "maxLeverage": 10.0, "info": { "bracket": "5", - "initialLeverage": "2", - "notionalCap": "1000000", - "notionalFloor": "250000", - "maintMarginRatio": "0.125", - "cum": "11900.0" + "initialLeverage": "10", + "notionalCap": "500000", + "notionalFloor": "100000", + "maintMarginRatio": "0.05", + "cum": "2825.0" } }, { "tier": 6.0, + "symbol": "MAGIC/USDT:USDT", + "currency": "USDT", + "minNotional": 500000.0, + "maxNotional": 1000000.0, + "maintenanceMarginRate": 0.1, + "maxLeverage": 5.0, + "info": { + "bracket": "6", + "initialLeverage": "5", + "notionalCap": "1000000", + "notionalFloor": "500000", + "maintMarginRatio": "0.1", + "cum": "27825.0" + } + }, + { + "tier": 7.0, + "symbol": "MAGIC/USDT:USDT", "currency": "USDT", "minNotional": 1000000.0, + "maxNotional": 1250000.0, + "maintenanceMarginRate": 0.125, + "maxLeverage": 4.0, + "info": { + "bracket": "7", + "initialLeverage": "4", + "notionalCap": "1250000", + "notionalFloor": "1000000", + "maintMarginRatio": "0.125", + "cum": "52825.0" + } + }, + { + "tier": 8.0, + "symbol": "MAGIC/USDT:USDT", + "currency": "USDT", + "minNotional": 1250000.0, + "maxNotional": 2500000.0, + "maintenanceMarginRate": 0.25, + "maxLeverage": 2.0, + "info": { + "bracket": "8", + "initialLeverage": "2", + "notionalCap": "2500000", + "notionalFloor": "1250000", + "maintMarginRatio": "0.25", + "cum": "209075.0" + } + }, + { + "tier": 9.0, + "symbol": "MAGIC/USDT:USDT", + "currency": "USDT", + "minNotional": 2500000.0, "maxNotional": 5000000.0, "maintenanceMarginRate": 0.5, "maxLeverage": 1.0, "info": { - "bracket": "6", + "bracket": "9", "initialLeverage": "1", "notionalCap": "5000000", - "notionalFloor": "1000000", + "notionalFloor": "2500000", "maintMarginRatio": "0.5", - "cum": "386900.0" + "cum": "834075.0" } } ], "MANA/USDT:USDT": [ { "tier": 1.0, + "symbol": "MANA/USDT:USDT", "currency": "USDT", "minNotional": 0.0, "maxNotional": 5000.0, @@ -26238,6 +30516,7 @@ }, { "tier": 2.0, + "symbol": "MANA/USDT:USDT", "currency": "USDT", "minNotional": 5000.0, "maxNotional": 25000.0, @@ -26254,6 +30533,7 @@ }, { "tier": 3.0, + "symbol": "MANA/USDT:USDT", "currency": "USDT", "minNotional": 25000.0, "maxNotional": 50000.0, @@ -26270,6 +30550,7 @@ }, { "tier": 4.0, + "symbol": "MANA/USDT:USDT", "currency": "USDT", "minNotional": 50000.0, "maxNotional": 150000.0, @@ -26286,6 +30567,7 @@ }, { "tier": 5.0, + "symbol": "MANA/USDT:USDT", "currency": "USDT", "minNotional": 150000.0, "maxNotional": 250000.0, @@ -26302,6 +30584,7 @@ }, { "tier": 6.0, + "symbol": "MANA/USDT:USDT", "currency": "USDT", "minNotional": 250000.0, "maxNotional": 500000.0, @@ -26318,6 +30601,7 @@ }, { "tier": 7.0, + "symbol": "MANA/USDT:USDT", "currency": "USDT", "minNotional": 500000.0, "maxNotional": 1000000.0, @@ -26334,6 +30618,7 @@ }, { "tier": 8.0, + "symbol": "MANA/USDT:USDT", "currency": "USDT", "minNotional": 1000000.0, "maxNotional": 5000000.0, @@ -26350,6 +30635,7 @@ }, { "tier": 9.0, + "symbol": "MANA/USDT:USDT", "currency": "USDT", "minNotional": 5000000.0, "maxNotional": 10000000.0, @@ -26368,6 +30654,7 @@ "MANTA/USDT:USDT": [ { "tier": 1.0, + "symbol": "MANTA/USDT:USDT", "currency": "USDT", "minNotional": 0.0, "maxNotional": 5000.0, @@ -26384,6 +30671,7 @@ }, { "tier": 2.0, + "symbol": "MANTA/USDT:USDT", "currency": "USDT", "minNotional": 5000.0, "maxNotional": 50000.0, @@ -26400,6 +30688,7 @@ }, { "tier": 3.0, + "symbol": "MANTA/USDT:USDT", "currency": "USDT", "minNotional": 50000.0, "maxNotional": 100000.0, @@ -26416,6 +30705,7 @@ }, { "tier": 4.0, + "symbol": "MANTA/USDT:USDT", "currency": "USDT", "minNotional": 100000.0, "maxNotional": 1000000.0, @@ -26432,6 +30722,7 @@ }, { "tier": 5.0, + "symbol": "MANTA/USDT:USDT", "currency": "USDT", "minNotional": 1000000.0, "maxNotional": 2000000.0, @@ -26448,6 +30739,7 @@ }, { "tier": 6.0, + "symbol": "MANTA/USDT:USDT", "currency": "USDT", "minNotional": 2000000.0, "maxNotional": 2500000.0, @@ -26464,6 +30756,7 @@ }, { "tier": 7.0, + "symbol": "MANTA/USDT:USDT", "currency": "USDT", "minNotional": 2500000.0, "maxNotional": 5000000.0, @@ -26480,6 +30773,7 @@ }, { "tier": 8.0, + "symbol": "MANTA/USDT:USDT", "currency": "USDT", "minNotional": 5000000.0, "maxNotional": 10000000.0, @@ -26498,6 +30792,7 @@ "MASK/USDT:USDT": [ { "tier": 1.0, + "symbol": "MASK/USDT:USDT", "currency": "USDT", "minNotional": 0.0, "maxNotional": 5000.0, @@ -26514,6 +30809,7 @@ }, { "tier": 2.0, + "symbol": "MASK/USDT:USDT", "currency": "USDT", "minNotional": 5000.0, "maxNotional": 25000.0, @@ -26530,6 +30826,7 @@ }, { "tier": 3.0, + "symbol": "MASK/USDT:USDT", "currency": "USDT", "minNotional": 25000.0, "maxNotional": 900000.0, @@ -26546,6 +30843,7 @@ }, { "tier": 4.0, + "symbol": "MASK/USDT:USDT", "currency": "USDT", "minNotional": 900000.0, "maxNotional": 1800000.0, @@ -26562,6 +30860,7 @@ }, { "tier": 5.0, + "symbol": "MASK/USDT:USDT", "currency": "USDT", "minNotional": 1800000.0, "maxNotional": 4800000.0, @@ -26578,6 +30877,7 @@ }, { "tier": 6.0, + "symbol": "MASK/USDT:USDT", "currency": "USDT", "minNotional": 4800000.0, "maxNotional": 6000000.0, @@ -26594,6 +30894,7 @@ }, { "tier": 7.0, + "symbol": "MASK/USDT:USDT", "currency": "USDT", "minNotional": 6000000.0, "maxNotional": 18000000.0, @@ -26610,6 +30911,7 @@ }, { "tier": 8.0, + "symbol": "MASK/USDT:USDT", "currency": "USDT", "minNotional": 18000000.0, "maxNotional": 30000000.0, @@ -26628,120 +30930,162 @@ "MAV/USDT:USDT": [ { "tier": 1.0, + "symbol": "MAV/USDT:USDT", "currency": "USDT", "minNotional": 0.0, "maxNotional": 5000.0, - "maintenanceMarginRate": 0.02, - "maxLeverage": 20.0, + "maintenanceMarginRate": 0.01, + "maxLeverage": 75.0, "info": { "bracket": "1", - "initialLeverage": "20", + "initialLeverage": "75", "notionalCap": "5000", "notionalFloor": "0", - "maintMarginRatio": "0.02", + "maintMarginRatio": "0.01", "cum": "0.0" } }, { "tier": 2.0, + "symbol": "MAV/USDT:USDT", "currency": "USDT", "minNotional": 5000.0, - "maxNotional": 25000.0, - "maintenanceMarginRate": 0.025, - "maxLeverage": 15.0, + "maxNotional": 10000.0, + "maintenanceMarginRate": 0.015, + "maxLeverage": 50.0, "info": { "bracket": "2", - "initialLeverage": "15", - "notionalCap": "25000", + "initialLeverage": "50", + "notionalCap": "10000", "notionalFloor": "5000", - "maintMarginRatio": "0.025", + "maintMarginRatio": "0.015", "cum": "25.0" } }, { "tier": 3.0, + "symbol": "MAV/USDT:USDT", "currency": "USDT", - "minNotional": 25000.0, - "maxNotional": 200000.0, - "maintenanceMarginRate": 0.05, - "maxLeverage": 10.0, + "minNotional": 10000.0, + "maxNotional": 50000.0, + "maintenanceMarginRate": 0.02, + "maxLeverage": 25.0, "info": { "bracket": "3", - "initialLeverage": "10", - "notionalCap": "200000", - "notionalFloor": "25000", - "maintMarginRatio": "0.05", - "cum": "650.0" + "initialLeverage": "25", + "notionalCap": "50000", + "notionalFloor": "10000", + "maintMarginRatio": "0.02", + "cum": "75.0" } }, { "tier": 4.0, + "symbol": "MAV/USDT:USDT", "currency": "USDT", - "minNotional": 200000.0, - "maxNotional": 500000.0, - "maintenanceMarginRate": 0.1, - "maxLeverage": 5.0, + "minNotional": 50000.0, + "maxNotional": 100000.0, + "maintenanceMarginRate": 0.025, + "maxLeverage": 20.0, "info": { "bracket": "4", - "initialLeverage": "5", - "notionalCap": "500000", - "notionalFloor": "200000", - "maintMarginRatio": "0.1", - "cum": "10650.0" + "initialLeverage": "20", + "notionalCap": "100000", + "notionalFloor": "50000", + "maintMarginRatio": "0.025", + "cum": "325.0" } }, { "tier": 5.0, + "symbol": "MAV/USDT:USDT", "currency": "USDT", - "minNotional": 500000.0, - "maxNotional": 1000000.0, - "maintenanceMarginRate": 0.125, - "maxLeverage": 4.0, + "minNotional": 100000.0, + "maxNotional": 500000.0, + "maintenanceMarginRate": 0.05, + "maxLeverage": 10.0, "info": { "bracket": "5", - "initialLeverage": "4", - "notionalCap": "1000000", - "notionalFloor": "500000", - "maintMarginRatio": "0.125", - "cum": "23150.0" + "initialLeverage": "10", + "notionalCap": "500000", + "notionalFloor": "100000", + "maintMarginRatio": "0.05", + "cum": "2825.0" } }, { "tier": 6.0, + "symbol": "MAV/USDT:USDT", "currency": "USDT", - "minNotional": 1000000.0, - "maxNotional": 3000000.0, - "maintenanceMarginRate": 0.25, - "maxLeverage": 2.0, + "minNotional": 500000.0, + "maxNotional": 1000000.0, + "maintenanceMarginRate": 0.1, + "maxLeverage": 5.0, "info": { "bracket": "6", - "initialLeverage": "2", - "notionalCap": "3000000", - "notionalFloor": "1000000", - "maintMarginRatio": "0.25", - "cum": "148150.0" + "initialLeverage": "5", + "notionalCap": "1000000", + "notionalFloor": "500000", + "maintMarginRatio": "0.1", + "cum": "27825.0" } }, { "tier": 7.0, + "symbol": "MAV/USDT:USDT", + "currency": "USDT", + "minNotional": 1000000.0, + "maxNotional": 1250000.0, + "maintenanceMarginRate": 0.125, + "maxLeverage": 4.0, + "info": { + "bracket": "7", + "initialLeverage": "4", + "notionalCap": "1250000", + "notionalFloor": "1000000", + "maintMarginRatio": "0.125", + "cum": "52825.0" + } + }, + { + "tier": 8.0, + "symbol": "MAV/USDT:USDT", + "currency": "USDT", + "minNotional": 1250000.0, + "maxNotional": 3000000.0, + "maintenanceMarginRate": 0.25, + "maxLeverage": 2.0, + "info": { + "bracket": "8", + "initialLeverage": "2", + "notionalCap": "3000000", + "notionalFloor": "1250000", + "maintMarginRatio": "0.25", + "cum": "209075.0" + } + }, + { + "tier": 9.0, + "symbol": "MAV/USDT:USDT", "currency": "USDT", "minNotional": 3000000.0, "maxNotional": 5000000.0, "maintenanceMarginRate": 0.5, "maxLeverage": 1.0, "info": { - "bracket": "7", + "bracket": "9", "initialLeverage": "1", "notionalCap": "5000000", "notionalFloor": "3000000", "maintMarginRatio": "0.5", - "cum": "898150.0" + "cum": "959075.0" } } ], "MAVIA/USDT:USDT": [ { "tier": 1.0, + "symbol": "MAVIA/USDT:USDT", "currency": "USDT", "minNotional": 0.0, "maxNotional": 5000.0, @@ -26758,6 +31102,7 @@ }, { "tier": 2.0, + "symbol": "MAVIA/USDT:USDT", "currency": "USDT", "minNotional": 5000.0, "maxNotional": 25000.0, @@ -26774,6 +31119,7 @@ }, { "tier": 3.0, + "symbol": "MAVIA/USDT:USDT", "currency": "USDT", "minNotional": 25000.0, "maxNotional": 100000.0, @@ -26790,6 +31136,7 @@ }, { "tier": 4.0, + "symbol": "MAVIA/USDT:USDT", "currency": "USDT", "minNotional": 100000.0, "maxNotional": 200000.0, @@ -26806,6 +31153,7 @@ }, { "tier": 5.0, + "symbol": "MAVIA/USDT:USDT", "currency": "USDT", "minNotional": 200000.0, "maxNotional": 500000.0, @@ -26822,6 +31170,7 @@ }, { "tier": 6.0, + "symbol": "MAVIA/USDT:USDT", "currency": "USDT", "minNotional": 500000.0, "maxNotional": 1000000.0, @@ -26838,6 +31187,7 @@ }, { "tier": 7.0, + "symbol": "MAVIA/USDT:USDT", "currency": "USDT", "minNotional": 1000000.0, "maxNotional": 2000000.0, @@ -26856,6 +31206,7 @@ "MBOX/USDT:USDT": [ { "tier": 1.0, + "symbol": "MBOX/USDT:USDT", "currency": "USDT", "minNotional": 0.0, "maxNotional": 5000.0, @@ -26872,6 +31223,7 @@ }, { "tier": 2.0, + "symbol": "MBOX/USDT:USDT", "currency": "USDT", "minNotional": 5000.0, "maxNotional": 10000.0, @@ -26888,6 +31240,7 @@ }, { "tier": 3.0, + "symbol": "MBOX/USDT:USDT", "currency": "USDT", "minNotional": 10000.0, "maxNotional": 20000.0, @@ -26904,6 +31257,7 @@ }, { "tier": 4.0, + "symbol": "MBOX/USDT:USDT", "currency": "USDT", "minNotional": 20000.0, "maxNotional": 40000.0, @@ -26920,6 +31274,7 @@ }, { "tier": 5.0, + "symbol": "MBOX/USDT:USDT", "currency": "USDT", "minNotional": 40000.0, "maxNotional": 200000.0, @@ -26936,6 +31291,7 @@ }, { "tier": 6.0, + "symbol": "MBOX/USDT:USDT", "currency": "USDT", "minNotional": 200000.0, "maxNotional": 400000.0, @@ -26952,6 +31308,7 @@ }, { "tier": 7.0, + "symbol": "MBOX/USDT:USDT", "currency": "USDT", "minNotional": 400000.0, "maxNotional": 500000.0, @@ -26968,6 +31325,7 @@ }, { "tier": 8.0, + "symbol": "MBOX/USDT:USDT", "currency": "USDT", "minNotional": 500000.0, "maxNotional": 1000000.0, @@ -26984,6 +31342,7 @@ }, { "tier": 9.0, + "symbol": "MBOX/USDT:USDT", "currency": "USDT", "minNotional": 1000000.0, "maxNotional": 2000000.0, @@ -27002,6 +31361,7 @@ "MDT/USDT:USDT": [ { "tier": 1.0, + "symbol": "MDT/USDT:USDT", "currency": "USDT", "minNotional": 0.0, "maxNotional": 5000.0, @@ -27018,6 +31378,7 @@ }, { "tier": 2.0, + "symbol": "MDT/USDT:USDT", "currency": "USDT", "minNotional": 5000.0, "maxNotional": 25000.0, @@ -27034,6 +31395,7 @@ }, { "tier": 3.0, + "symbol": "MDT/USDT:USDT", "currency": "USDT", "minNotional": 25000.0, "maxNotional": 200000.0, @@ -27050,6 +31412,7 @@ }, { "tier": 4.0, + "symbol": "MDT/USDT:USDT", "currency": "USDT", "minNotional": 200000.0, "maxNotional": 500000.0, @@ -27066,6 +31429,7 @@ }, { "tier": 5.0, + "symbol": "MDT/USDT:USDT", "currency": "USDT", "minNotional": 500000.0, "maxNotional": 1000000.0, @@ -27082,6 +31446,7 @@ }, { "tier": 6.0, + "symbol": "MDT/USDT:USDT", "currency": "USDT", "minNotional": 1000000.0, "maxNotional": 3000000.0, @@ -27098,6 +31463,7 @@ }, { "tier": 7.0, + "symbol": "MDT/USDT:USDT", "currency": "USDT", "minNotional": 3000000.0, "maxNotional": 3500000.0, @@ -27116,6 +31482,7 @@ "MEME/USDT:USDT": [ { "tier": 1.0, + "symbol": "MEME/USDT:USDT", "currency": "USDT", "minNotional": 0.0, "maxNotional": 5000.0, @@ -27132,6 +31499,7 @@ }, { "tier": 2.0, + "symbol": "MEME/USDT:USDT", "currency": "USDT", "minNotional": 5000.0, "maxNotional": 16000.0, @@ -27148,6 +31516,7 @@ }, { "tier": 3.0, + "symbol": "MEME/USDT:USDT", "currency": "USDT", "minNotional": 16000.0, "maxNotional": 80000.0, @@ -27164,6 +31533,7 @@ }, { "tier": 4.0, + "symbol": "MEME/USDT:USDT", "currency": "USDT", "minNotional": 80000.0, "maxNotional": 160000.0, @@ -27180,6 +31550,7 @@ }, { "tier": 5.0, + "symbol": "MEME/USDT:USDT", "currency": "USDT", "minNotional": 160000.0, "maxNotional": 800000.0, @@ -27196,6 +31567,7 @@ }, { "tier": 6.0, + "symbol": "MEME/USDT:USDT", "currency": "USDT", "minNotional": 800000.0, "maxNotional": 1600000.0, @@ -27212,6 +31584,7 @@ }, { "tier": 7.0, + "symbol": "MEME/USDT:USDT", "currency": "USDT", "minNotional": 1600000.0, "maxNotional": 2000000.0, @@ -27228,6 +31601,7 @@ }, { "tier": 8.0, + "symbol": "MEME/USDT:USDT", "currency": "USDT", "minNotional": 2000000.0, "maxNotional": 4000000.0, @@ -27244,6 +31618,7 @@ }, { "tier": 9.0, + "symbol": "MEME/USDT:USDT", "currency": "USDT", "minNotional": 4000000.0, "maxNotional": 8000000.0, @@ -27262,6 +31637,7 @@ "METIS/USDT:USDT": [ { "tier": 1.0, + "symbol": "METIS/USDT:USDT", "currency": "USDT", "minNotional": 0.0, "maxNotional": 5000.0, @@ -27278,6 +31654,7 @@ }, { "tier": 2.0, + "symbol": "METIS/USDT:USDT", "currency": "USDT", "minNotional": 5000.0, "maxNotional": 25000.0, @@ -27294,6 +31671,7 @@ }, { "tier": 3.0, + "symbol": "METIS/USDT:USDT", "currency": "USDT", "minNotional": 25000.0, "maxNotional": 100000.0, @@ -27310,6 +31688,7 @@ }, { "tier": 4.0, + "symbol": "METIS/USDT:USDT", "currency": "USDT", "minNotional": 100000.0, "maxNotional": 200000.0, @@ -27326,6 +31705,7 @@ }, { "tier": 5.0, + "symbol": "METIS/USDT:USDT", "currency": "USDT", "minNotional": 200000.0, "maxNotional": 500000.0, @@ -27342,6 +31722,7 @@ }, { "tier": 6.0, + "symbol": "METIS/USDT:USDT", "currency": "USDT", "minNotional": 500000.0, "maxNotional": 1000000.0, @@ -27358,6 +31739,7 @@ }, { "tier": 7.0, + "symbol": "METIS/USDT:USDT", "currency": "USDT", "minNotional": 1000000.0, "maxNotional": 2000000.0, @@ -27376,6 +31758,7 @@ "MEW/USDT:USDT": [ { "tier": 1.0, + "symbol": "MEW/USDT:USDT", "currency": "USDT", "minNotional": 0.0, "maxNotional": 10000.0, @@ -27392,6 +31775,7 @@ }, { "tier": 2.0, + "symbol": "MEW/USDT:USDT", "currency": "USDT", "minNotional": 10000.0, "maxNotional": 60000.0, @@ -27408,6 +31792,7 @@ }, { "tier": 3.0, + "symbol": "MEW/USDT:USDT", "currency": "USDT", "minNotional": 60000.0, "maxNotional": 300000.0, @@ -27424,6 +31809,7 @@ }, { "tier": 4.0, + "symbol": "MEW/USDT:USDT", "currency": "USDT", "minNotional": 300000.0, "maxNotional": 600000.0, @@ -27440,6 +31826,7 @@ }, { "tier": 5.0, + "symbol": "MEW/USDT:USDT", "currency": "USDT", "minNotional": 600000.0, "maxNotional": 3000000.0, @@ -27456,6 +31843,7 @@ }, { "tier": 6.0, + "symbol": "MEW/USDT:USDT", "currency": "USDT", "minNotional": 3000000.0, "maxNotional": 6000000.0, @@ -27472,6 +31860,7 @@ }, { "tier": 7.0, + "symbol": "MEW/USDT:USDT", "currency": "USDT", "minNotional": 6000000.0, "maxNotional": 7500000.0, @@ -27488,6 +31877,7 @@ }, { "tier": 8.0, + "symbol": "MEW/USDT:USDT", "currency": "USDT", "minNotional": 7500000.0, "maxNotional": 15000000.0, @@ -27504,6 +31894,7 @@ }, { "tier": 9.0, + "symbol": "MEW/USDT:USDT", "currency": "USDT", "minNotional": 15000000.0, "maxNotional": 30000000.0, @@ -27522,6 +31913,7 @@ "MINA/USDT:USDT": [ { "tier": 1.0, + "symbol": "MINA/USDT:USDT", "currency": "USDT", "minNotional": 0.0, "maxNotional": 5000.0, @@ -27538,6 +31930,7 @@ }, { "tier": 2.0, + "symbol": "MINA/USDT:USDT", "currency": "USDT", "minNotional": 5000.0, "maxNotional": 50000.0, @@ -27554,6 +31947,7 @@ }, { "tier": 3.0, + "symbol": "MINA/USDT:USDT", "currency": "USDT", "minNotional": 50000.0, "maxNotional": 400000.0, @@ -27570,6 +31964,7 @@ }, { "tier": 4.0, + "symbol": "MINA/USDT:USDT", "currency": "USDT", "minNotional": 400000.0, "maxNotional": 1000000.0, @@ -27586,6 +31981,7 @@ }, { "tier": 5.0, + "symbol": "MINA/USDT:USDT", "currency": "USDT", "minNotional": 1000000.0, "maxNotional": 2000000.0, @@ -27602,6 +31998,7 @@ }, { "tier": 6.0, + "symbol": "MINA/USDT:USDT", "currency": "USDT", "minNotional": 2000000.0, "maxNotional": 6000000.0, @@ -27618,6 +32015,7 @@ }, { "tier": 7.0, + "symbol": "MINA/USDT:USDT", "currency": "USDT", "minNotional": 6000000.0, "maxNotional": 10000000.0, @@ -27636,6 +32034,7 @@ "MKR/USDT:USDT": [ { "tier": 1.0, + "symbol": "MKR/USDT:USDT", "currency": "USDT", "minNotional": 0.0, "maxNotional": 5000.0, @@ -27652,6 +32051,7 @@ }, { "tier": 2.0, + "symbol": "MKR/USDT:USDT", "currency": "USDT", "minNotional": 5000.0, "maxNotional": 25000.0, @@ -27668,15 +32068,16 @@ }, { "tier": 3.0, + "symbol": "MKR/USDT:USDT", "currency": "USDT", "minNotional": 25000.0, - "maxNotional": 40000.0, + "maxNotional": 80000.0, "maintenanceMarginRate": 0.015, "maxLeverage": 40.0, "info": { "bracket": "3", "initialLeverage": "40", - "notionalCap": "40000", + "notionalCap": "80000", "notionalFloor": "25000", "maintMarginRatio": "0.015", "cum": "145.0" @@ -27684,120 +32085,283 @@ }, { "tier": 4.0, + "symbol": "MKR/USDT:USDT", "currency": "USDT", - "minNotional": 40000.0, - "maxNotional": 200000.0, + "minNotional": 80000.0, + "maxNotional": 400000.0, "maintenanceMarginRate": 0.02, "maxLeverage": 25.0, "info": { "bracket": "4", "initialLeverage": "25", - "notionalCap": "200000", - "notionalFloor": "40000", + "notionalCap": "400000", + "notionalFloor": "80000", "maintMarginRatio": "0.02", - "cum": "345.0" + "cum": "545.0" } }, { "tier": 5.0, + "symbol": "MKR/USDT:USDT", "currency": "USDT", - "minNotional": 200000.0, - "maxNotional": 450000.0, + "minNotional": 400000.0, + "maxNotional": 800000.0, "maintenanceMarginRate": 0.025, "maxLeverage": 20.0, "info": { "bracket": "5", "initialLeverage": "20", - "notionalCap": "450000", - "notionalFloor": "200000", + "notionalCap": "800000", + "notionalFloor": "400000", "maintMarginRatio": "0.025", - "cum": "1345.0" + "cum": "2545.0" } }, { "tier": 6.0, + "symbol": "MKR/USDT:USDT", "currency": "USDT", - "minNotional": 450000.0, - "maxNotional": 2000000.0, + "minNotional": 800000.0, + "maxNotional": 4000000.0, "maintenanceMarginRate": 0.05, "maxLeverage": 10.0, "info": { "bracket": "6", "initialLeverage": "10", - "notionalCap": "2000000", - "notionalFloor": "450000", + "notionalCap": "4000000", + "notionalFloor": "800000", "maintMarginRatio": "0.05", - "cum": "12595.0" + "cum": "22545.0" } }, { "tier": 7.0, + "symbol": "MKR/USDT:USDT", "currency": "USDT", - "minNotional": 2000000.0, - "maxNotional": 4000000.0, + "minNotional": 4000000.0, + "maxNotional": 8000000.0, "maintenanceMarginRate": 0.1, "maxLeverage": 5.0, "info": { "bracket": "7", "initialLeverage": "5", - "notionalCap": "4000000", - "notionalFloor": "2000000", + "notionalCap": "8000000", + "notionalFloor": "4000000", "maintMarginRatio": "0.1", - "cum": "112595.0" + "cum": "222545.0" } }, { "tier": 8.0, + "symbol": "MKR/USDT:USDT", "currency": "USDT", - "minNotional": 4000000.0, - "maxNotional": 5000000.0, + "minNotional": 8000000.0, + "maxNotional": 10000000.0, "maintenanceMarginRate": 0.125, "maxLeverage": 4.0, "info": { "bracket": "8", "initialLeverage": "4", - "notionalCap": "5000000", - "notionalFloor": "4000000", + "notionalCap": "10000000", + "notionalFloor": "8000000", "maintMarginRatio": "0.125", - "cum": "212595.0" + "cum": "422545.0" } }, { "tier": 9.0, + "symbol": "MKR/USDT:USDT", "currency": "USDT", - "minNotional": 5000000.0, - "maxNotional": 10000000.0, + "minNotional": 10000000.0, + "maxNotional": 20000000.0, "maintenanceMarginRate": 0.25, "maxLeverage": 2.0, "info": { "bracket": "9", "initialLeverage": "2", - "notionalCap": "10000000", - "notionalFloor": "5000000", + "notionalCap": "20000000", + "notionalFloor": "10000000", "maintMarginRatio": "0.25", - "cum": "837595.0" + "cum": "1672545.0" } }, { "tier": 10.0, + "symbol": "MKR/USDT:USDT", "currency": "USDT", - "minNotional": 10000000.0, - "maxNotional": 20000000.0, + "minNotional": 20000000.0, + "maxNotional": 40000000.0, "maintenanceMarginRate": 0.5, "maxLeverage": 1.0, "info": { "bracket": "10", "initialLeverage": "1", - "notionalCap": "20000000", - "notionalFloor": "10000000", + "notionalCap": "40000000", + "notionalFloor": "20000000", "maintMarginRatio": "0.5", - "cum": "3337595.0" + "cum": "6672545.0" } } ], "MOODENG/USDT:USDT": [ { "tier": 1.0, + "symbol": "MOODENG/USDT:USDT", + "currency": "USDT", + "minNotional": 0.0, + "maxNotional": 10000.0, + "maintenanceMarginRate": 0.01, + "maxLeverage": 75.0, + "info": { + "bracket": "1", + "initialLeverage": "75", + "notionalCap": "10000", + "notionalFloor": "0", + "maintMarginRatio": "0.01", + "cum": "0.0" + } + }, + { + "tier": 2.0, + "symbol": "MOODENG/USDT:USDT", + "currency": "USDT", + "minNotional": 10000.0, + "maxNotional": 80000.0, + "maintenanceMarginRate": 0.015, + "maxLeverage": 50.0, + "info": { + "bracket": "2", + "initialLeverage": "50", + "notionalCap": "80000", + "notionalFloor": "10000", + "maintMarginRatio": "0.015", + "cum": "50.0" + } + }, + { + "tier": 3.0, + "symbol": "MOODENG/USDT:USDT", + "currency": "USDT", + "minNotional": 80000.0, + "maxNotional": 400000.0, + "maintenanceMarginRate": 0.02, + "maxLeverage": 25.0, + "info": { + "bracket": "3", + "initialLeverage": "25", + "notionalCap": "400000", + "notionalFloor": "80000", + "maintMarginRatio": "0.02", + "cum": "450.0" + } + }, + { + "tier": 4.0, + "symbol": "MOODENG/USDT:USDT", + "currency": "USDT", + "minNotional": 400000.0, + "maxNotional": 800000.0, + "maintenanceMarginRate": 0.025, + "maxLeverage": 20.0, + "info": { + "bracket": "4", + "initialLeverage": "20", + "notionalCap": "800000", + "notionalFloor": "400000", + "maintMarginRatio": "0.025", + "cum": "2450.0" + } + }, + { + "tier": 5.0, + "symbol": "MOODENG/USDT:USDT", + "currency": "USDT", + "minNotional": 800000.0, + "maxNotional": 4000000.0, + "maintenanceMarginRate": 0.05, + "maxLeverage": 10.0, + "info": { + "bracket": "5", + "initialLeverage": "10", + "notionalCap": "4000000", + "notionalFloor": "800000", + "maintMarginRatio": "0.05", + "cum": "22450.0" + } + }, + { + "tier": 6.0, + "symbol": "MOODENG/USDT:USDT", + "currency": "USDT", + "minNotional": 4000000.0, + "maxNotional": 8000000.0, + "maintenanceMarginRate": 0.1, + "maxLeverage": 5.0, + "info": { + "bracket": "6", + "initialLeverage": "5", + "notionalCap": "8000000", + "notionalFloor": "4000000", + "maintMarginRatio": "0.1", + "cum": "222450.0" + } + }, + { + "tier": 7.0, + "symbol": "MOODENG/USDT:USDT", + "currency": "USDT", + "minNotional": 8000000.0, + "maxNotional": 10000000.0, + "maintenanceMarginRate": 0.125, + "maxLeverage": 4.0, + "info": { + "bracket": "7", + "initialLeverage": "4", + "notionalCap": "10000000", + "notionalFloor": "8000000", + "maintMarginRatio": "0.125", + "cum": "422450.0" + } + }, + { + "tier": 8.0, + "symbol": "MOODENG/USDT:USDT", + "currency": "USDT", + "minNotional": 10000000.0, + "maxNotional": 20000000.0, + "maintenanceMarginRate": 0.25, + "maxLeverage": 2.0, + "info": { + "bracket": "8", + "initialLeverage": "2", + "notionalCap": "20000000", + "notionalFloor": "10000000", + "maintMarginRatio": "0.25", + "cum": "1672450.0" + } + }, + { + "tier": 9.0, + "symbol": "MOODENG/USDT:USDT", + "currency": "USDT", + "minNotional": 20000000.0, + "maxNotional": 40000000.0, + "maintenanceMarginRate": 0.5, + "maxLeverage": 1.0, + "info": { + "bracket": "9", + "initialLeverage": "1", + "notionalCap": "40000000", + "notionalFloor": "20000000", + "maintMarginRatio": "0.5", + "cum": "6672450.0" + } + } + ], + "MORPHO/USDT:USDT": [ + { + "tier": 1.0, + "symbol": "MORPHO/USDT:USDT", "currency": "USDT", "minNotional": 0.0, "maxNotional": 5000.0, @@ -27814,6 +32378,7 @@ }, { "tier": 2.0, + "symbol": "MORPHO/USDT:USDT", "currency": "USDT", "minNotional": 5000.0, "maxNotional": 10000.0, @@ -27830,6 +32395,7 @@ }, { "tier": 3.0, + "symbol": "MORPHO/USDT:USDT", "currency": "USDT", "minNotional": 10000.0, "maxNotional": 30000.0, @@ -27846,6 +32412,7 @@ }, { "tier": 4.0, + "symbol": "MORPHO/USDT:USDT", "currency": "USDT", "minNotional": 30000.0, "maxNotional": 60000.0, @@ -27862,6 +32429,7 @@ }, { "tier": 5.0, + "symbol": "MORPHO/USDT:USDT", "currency": "USDT", "minNotional": 60000.0, "maxNotional": 300000.0, @@ -27878,6 +32446,7 @@ }, { "tier": 6.0, + "symbol": "MORPHO/USDT:USDT", "currency": "USDT", "minNotional": 300000.0, "maxNotional": 600000.0, @@ -27894,6 +32463,7 @@ }, { "tier": 7.0, + "symbol": "MORPHO/USDT:USDT", "currency": "USDT", "minNotional": 600000.0, "maxNotional": 750000.0, @@ -27910,6 +32480,7 @@ }, { "tier": 8.0, + "symbol": "MORPHO/USDT:USDT", "currency": "USDT", "minNotional": 750000.0, "maxNotional": 1500000.0, @@ -27926,6 +32497,7 @@ }, { "tier": 9.0, + "symbol": "MORPHO/USDT:USDT", "currency": "USDT", "minNotional": 1500000.0, "maxNotional": 3000000.0, @@ -27944,6 +32516,7 @@ "MOVR/USDT:USDT": [ { "tier": 1.0, + "symbol": "MOVR/USDT:USDT", "currency": "USDT", "minNotional": 0.0, "maxNotional": 5000.0, @@ -27960,6 +32533,7 @@ }, { "tier": 2.0, + "symbol": "MOVR/USDT:USDT", "currency": "USDT", "minNotional": 5000.0, "maxNotional": 25000.0, @@ -27976,6 +32550,7 @@ }, { "tier": 3.0, + "symbol": "MOVR/USDT:USDT", "currency": "USDT", "minNotional": 25000.0, "maxNotional": 100000.0, @@ -27992,6 +32567,7 @@ }, { "tier": 4.0, + "symbol": "MOVR/USDT:USDT", "currency": "USDT", "minNotional": 100000.0, "maxNotional": 200000.0, @@ -28008,6 +32584,7 @@ }, { "tier": 5.0, + "symbol": "MOVR/USDT:USDT", "currency": "USDT", "minNotional": 200000.0, "maxNotional": 500000.0, @@ -28024,6 +32601,7 @@ }, { "tier": 6.0, + "symbol": "MOVR/USDT:USDT", "currency": "USDT", "minNotional": 500000.0, "maxNotional": 1000000.0, @@ -28040,6 +32618,7 @@ }, { "tier": 7.0, + "symbol": "MOVR/USDT:USDT", "currency": "USDT", "minNotional": 1000000.0, "maxNotional": 2000000.0, @@ -28058,6 +32637,7 @@ "MTL/USDT:USDT": [ { "tier": 1.0, + "symbol": "MTL/USDT:USDT", "currency": "USDT", "minNotional": 0.0, "maxNotional": 5000.0, @@ -28074,6 +32654,7 @@ }, { "tier": 2.0, + "symbol": "MTL/USDT:USDT", "currency": "USDT", "minNotional": 5000.0, "maxNotional": 25000.0, @@ -28090,6 +32671,7 @@ }, { "tier": 3.0, + "symbol": "MTL/USDT:USDT", "currency": "USDT", "minNotional": 25000.0, "maxNotional": 600000.0, @@ -28106,6 +32688,7 @@ }, { "tier": 4.0, + "symbol": "MTL/USDT:USDT", "currency": "USDT", "minNotional": 600000.0, "maxNotional": 1600000.0, @@ -28122,6 +32705,7 @@ }, { "tier": 5.0, + "symbol": "MTL/USDT:USDT", "currency": "USDT", "minNotional": 1600000.0, "maxNotional": 2000000.0, @@ -28138,6 +32722,7 @@ }, { "tier": 6.0, + "symbol": "MTL/USDT:USDT", "currency": "USDT", "minNotional": 2000000.0, "maxNotional": 6000000.0, @@ -28154,6 +32739,7 @@ }, { "tier": 7.0, + "symbol": "MTL/USDT:USDT", "currency": "USDT", "minNotional": 6000000.0, "maxNotional": 10000000.0, @@ -28172,6 +32758,7 @@ "MYRO/USDT:USDT": [ { "tier": 1.0, + "symbol": "MYRO/USDT:USDT", "currency": "USDT", "minNotional": 0.0, "maxNotional": 5000.0, @@ -28188,6 +32775,7 @@ }, { "tier": 2.0, + "symbol": "MYRO/USDT:USDT", "currency": "USDT", "minNotional": 5000.0, "maxNotional": 10000.0, @@ -28204,6 +32792,7 @@ }, { "tier": 3.0, + "symbol": "MYRO/USDT:USDT", "currency": "USDT", "minNotional": 10000.0, "maxNotional": 50000.0, @@ -28220,6 +32809,7 @@ }, { "tier": 4.0, + "symbol": "MYRO/USDT:USDT", "currency": "USDT", "minNotional": 50000.0, "maxNotional": 100000.0, @@ -28236,6 +32826,7 @@ }, { "tier": 5.0, + "symbol": "MYRO/USDT:USDT", "currency": "USDT", "minNotional": 100000.0, "maxNotional": 500000.0, @@ -28252,6 +32843,7 @@ }, { "tier": 6.0, + "symbol": "MYRO/USDT:USDT", "currency": "USDT", "minNotional": 500000.0, "maxNotional": 1000000.0, @@ -28268,6 +32860,7 @@ }, { "tier": 7.0, + "symbol": "MYRO/USDT:USDT", "currency": "USDT", "minNotional": 1000000.0, "maxNotional": 1250000.0, @@ -28284,6 +32877,7 @@ }, { "tier": 8.0, + "symbol": "MYRO/USDT:USDT", "currency": "USDT", "minNotional": 1250000.0, "maxNotional": 2500000.0, @@ -28300,6 +32894,7 @@ }, { "tier": 9.0, + "symbol": "MYRO/USDT:USDT", "currency": "USDT", "minNotional": 2500000.0, "maxNotional": 5000000.0, @@ -28318,6 +32913,7 @@ "NEAR/USDC:USDC": [ { "tier": 1.0, + "symbol": "NEAR/USDC:USDC", "currency": "USDC", "minNotional": 0.0, "maxNotional": 10000.0, @@ -28334,6 +32930,7 @@ }, { "tier": 2.0, + "symbol": "NEAR/USDC:USDC", "currency": "USDC", "minNotional": 10000.0, "maxNotional": 250000.0, @@ -28350,6 +32947,7 @@ }, { "tier": 3.0, + "symbol": "NEAR/USDC:USDC", "currency": "USDC", "minNotional": 250000.0, "maxNotional": 750000.0, @@ -28366,6 +32964,7 @@ }, { "tier": 4.0, + "symbol": "NEAR/USDC:USDC", "currency": "USDC", "minNotional": 750000.0, "maxNotional": 1500000.0, @@ -28382,6 +32981,7 @@ }, { "tier": 5.0, + "symbol": "NEAR/USDC:USDC", "currency": "USDC", "minNotional": 1500000.0, "maxNotional": 4000000.0, @@ -28398,6 +32998,7 @@ }, { "tier": 6.0, + "symbol": "NEAR/USDC:USDC", "currency": "USDC", "minNotional": 4000000.0, "maxNotional": 5000000.0, @@ -28414,6 +33015,7 @@ }, { "tier": 7.0, + "symbol": "NEAR/USDC:USDC", "currency": "USDC", "minNotional": 5000000.0, "maxNotional": 12000000.0, @@ -28430,6 +33032,7 @@ }, { "tier": 8.0, + "symbol": "NEAR/USDC:USDC", "currency": "USDC", "minNotional": 12000000.0, "maxNotional": 20000000.0, @@ -28448,6 +33051,7 @@ "NEAR/USDT:USDT": [ { "tier": 1.0, + "symbol": "NEAR/USDT:USDT", "currency": "USDT", "minNotional": 0.0, "maxNotional": 10000.0, @@ -28464,6 +33068,7 @@ }, { "tier": 2.0, + "symbol": "NEAR/USDT:USDT", "currency": "USDT", "minNotional": 10000.0, "maxNotional": 100000.0, @@ -28480,6 +33085,7 @@ }, { "tier": 3.0, + "symbol": "NEAR/USDT:USDT", "currency": "USDT", "minNotional": 100000.0, "maxNotional": 500000.0, @@ -28496,6 +33102,7 @@ }, { "tier": 4.0, + "symbol": "NEAR/USDT:USDT", "currency": "USDT", "minNotional": 500000.0, "maxNotional": 1000000.0, @@ -28512,6 +33119,7 @@ }, { "tier": 5.0, + "symbol": "NEAR/USDT:USDT", "currency": "USDT", "minNotional": 1000000.0, "maxNotional": 5000000.0, @@ -28528,6 +33136,7 @@ }, { "tier": 6.0, + "symbol": "NEAR/USDT:USDT", "currency": "USDT", "minNotional": 5000000.0, "maxNotional": 10000000.0, @@ -28544,6 +33153,7 @@ }, { "tier": 7.0, + "symbol": "NEAR/USDT:USDT", "currency": "USDT", "minNotional": 10000000.0, "maxNotional": 12500000.0, @@ -28560,6 +33170,7 @@ }, { "tier": 8.0, + "symbol": "NEAR/USDT:USDT", "currency": "USDT", "minNotional": 12500000.0, "maxNotional": 25000000.0, @@ -28576,6 +33187,7 @@ }, { "tier": 9.0, + "symbol": "NEAR/USDT:USDT", "currency": "USDT", "minNotional": 25000000.0, "maxNotional": 50000000.0, @@ -28594,6 +33206,7 @@ "NEIRO/USDT:USDT": [ { "tier": 1.0, + "symbol": "NEIRO/USDT:USDT", "currency": "USDT", "minNotional": 0.0, "maxNotional": 20000.0, @@ -28610,6 +33223,7 @@ }, { "tier": 2.0, + "symbol": "NEIRO/USDT:USDT", "currency": "USDT", "minNotional": 20000.0, "maxNotional": 160000.0, @@ -28626,6 +33240,7 @@ }, { "tier": 3.0, + "symbol": "NEIRO/USDT:USDT", "currency": "USDT", "minNotional": 160000.0, "maxNotional": 800000.0, @@ -28642,6 +33257,7 @@ }, { "tier": 4.0, + "symbol": "NEIRO/USDT:USDT", "currency": "USDT", "minNotional": 800000.0, "maxNotional": 1600000.0, @@ -28658,6 +33274,7 @@ }, { "tier": 5.0, + "symbol": "NEIRO/USDT:USDT", "currency": "USDT", "minNotional": 1600000.0, "maxNotional": 8000000.0, @@ -28674,6 +33291,7 @@ }, { "tier": 6.0, + "symbol": "NEIRO/USDT:USDT", "currency": "USDT", "minNotional": 8000000.0, "maxNotional": 16000000.0, @@ -28690,6 +33308,7 @@ }, { "tier": 7.0, + "symbol": "NEIRO/USDT:USDT", "currency": "USDT", "minNotional": 16000000.0, "maxNotional": 20000000.0, @@ -28706,6 +33325,7 @@ }, { "tier": 8.0, + "symbol": "NEIRO/USDT:USDT", "currency": "USDT", "minNotional": 20000000.0, "maxNotional": 40000000.0, @@ -28722,6 +33342,7 @@ }, { "tier": 9.0, + "symbol": "NEIRO/USDT:USDT", "currency": "USDT", "minNotional": 40000000.0, "maxNotional": 80000000.0, @@ -28740,6 +33361,7 @@ "NEIROETH/USDT:USDT": [ { "tier": 1.0, + "symbol": "NEIROETH/USDT:USDT", "currency": "USDT", "minNotional": 0.0, "maxNotional": 5000.0, @@ -28756,6 +33378,7 @@ }, { "tier": 2.0, + "symbol": "NEIROETH/USDT:USDT", "currency": "USDT", "minNotional": 5000.0, "maxNotional": 10000.0, @@ -28772,6 +33395,7 @@ }, { "tier": 3.0, + "symbol": "NEIROETH/USDT:USDT", "currency": "USDT", "minNotional": 10000.0, "maxNotional": 20000.0, @@ -28788,6 +33412,7 @@ }, { "tier": 4.0, + "symbol": "NEIROETH/USDT:USDT", "currency": "USDT", "minNotional": 20000.0, "maxNotional": 40000.0, @@ -28804,6 +33429,7 @@ }, { "tier": 5.0, + "symbol": "NEIROETH/USDT:USDT", "currency": "USDT", "minNotional": 40000.0, "maxNotional": 200000.0, @@ -28820,6 +33446,7 @@ }, { "tier": 6.0, + "symbol": "NEIROETH/USDT:USDT", "currency": "USDT", "minNotional": 200000.0, "maxNotional": 400000.0, @@ -28836,6 +33463,7 @@ }, { "tier": 7.0, + "symbol": "NEIROETH/USDT:USDT", "currency": "USDT", "minNotional": 400000.0, "maxNotional": 500000.0, @@ -28852,6 +33480,7 @@ }, { "tier": 8.0, + "symbol": "NEIROETH/USDT:USDT", "currency": "USDT", "minNotional": 500000.0, "maxNotional": 1000000.0, @@ -28868,6 +33497,7 @@ }, { "tier": 9.0, + "symbol": "NEIROETH/USDT:USDT", "currency": "USDT", "minNotional": 1000000.0, "maxNotional": 2000000.0, @@ -28886,6 +33516,7 @@ "NEO/USDC:USDC": [ { "tier": 1.0, + "symbol": "NEO/USDC:USDC", "currency": "USDC", "minNotional": 0.0, "maxNotional": 5000.0, @@ -28902,6 +33533,7 @@ }, { "tier": 2.0, + "symbol": "NEO/USDC:USDC", "currency": "USDC", "minNotional": 5000.0, "maxNotional": 50000.0, @@ -28918,6 +33550,7 @@ }, { "tier": 3.0, + "symbol": "NEO/USDC:USDC", "currency": "USDC", "minNotional": 50000.0, "maxNotional": 400000.0, @@ -28934,6 +33567,7 @@ }, { "tier": 4.0, + "symbol": "NEO/USDC:USDC", "currency": "USDC", "minNotional": 400000.0, "maxNotional": 800000.0, @@ -28950,6 +33584,7 @@ }, { "tier": 5.0, + "symbol": "NEO/USDC:USDC", "currency": "USDC", "minNotional": 800000.0, "maxNotional": 2000000.0, @@ -28966,6 +33601,7 @@ }, { "tier": 6.0, + "symbol": "NEO/USDC:USDC", "currency": "USDC", "minNotional": 2000000.0, "maxNotional": 5000000.0, @@ -28982,6 +33618,7 @@ }, { "tier": 7.0, + "symbol": "NEO/USDC:USDC", "currency": "USDC", "minNotional": 5000000.0, "maxNotional": 12000000.0, @@ -28998,6 +33635,7 @@ }, { "tier": 8.0, + "symbol": "NEO/USDC:USDC", "currency": "USDC", "minNotional": 12000000.0, "maxNotional": 20000000.0, @@ -29016,6 +33654,7 @@ "NEO/USDT:USDT": [ { "tier": 1.0, + "symbol": "NEO/USDT:USDT", "currency": "USDT", "minNotional": 0.0, "maxNotional": 5000.0, @@ -29032,6 +33671,7 @@ }, { "tier": 2.0, + "symbol": "NEO/USDT:USDT", "currency": "USDT", "minNotional": 5000.0, "maxNotional": 50000.0, @@ -29048,6 +33688,7 @@ }, { "tier": 3.0, + "symbol": "NEO/USDT:USDT", "currency": "USDT", "minNotional": 50000.0, "maxNotional": 400000.0, @@ -29064,6 +33705,7 @@ }, { "tier": 4.0, + "symbol": "NEO/USDT:USDT", "currency": "USDT", "minNotional": 400000.0, "maxNotional": 800000.0, @@ -29080,6 +33722,7 @@ }, { "tier": 5.0, + "symbol": "NEO/USDT:USDT", "currency": "USDT", "minNotional": 800000.0, "maxNotional": 2000000.0, @@ -29096,6 +33739,7 @@ }, { "tier": 6.0, + "symbol": "NEO/USDT:USDT", "currency": "USDT", "minNotional": 2000000.0, "maxNotional": 5000000.0, @@ -29112,6 +33756,7 @@ }, { "tier": 7.0, + "symbol": "NEO/USDT:USDT", "currency": "USDT", "minNotional": 5000000.0, "maxNotional": 12000000.0, @@ -29128,6 +33773,7 @@ }, { "tier": 8.0, + "symbol": "NEO/USDT:USDT", "currency": "USDT", "minNotional": 12000000.0, "maxNotional": 20000000.0, @@ -29146,6 +33792,7 @@ "NFP/USDT:USDT": [ { "tier": 1.0, + "symbol": "NFP/USDT:USDT", "currency": "USDT", "minNotional": 0.0, "maxNotional": 5000.0, @@ -29162,6 +33809,7 @@ }, { "tier": 2.0, + "symbol": "NFP/USDT:USDT", "currency": "USDT", "minNotional": 5000.0, "maxNotional": 25000.0, @@ -29178,6 +33826,7 @@ }, { "tier": 3.0, + "symbol": "NFP/USDT:USDT", "currency": "USDT", "minNotional": 25000.0, "maxNotional": 50000.0, @@ -29194,6 +33843,7 @@ }, { "tier": 4.0, + "symbol": "NFP/USDT:USDT", "currency": "USDT", "minNotional": 50000.0, "maxNotional": 500000.0, @@ -29210,6 +33860,7 @@ }, { "tier": 5.0, + "symbol": "NFP/USDT:USDT", "currency": "USDT", "minNotional": 500000.0, "maxNotional": 1000000.0, @@ -29226,6 +33877,7 @@ }, { "tier": 6.0, + "symbol": "NFP/USDT:USDT", "currency": "USDT", "minNotional": 1000000.0, "maxNotional": 1250000.0, @@ -29242,6 +33894,7 @@ }, { "tier": 7.0, + "symbol": "NFP/USDT:USDT", "currency": "USDT", "minNotional": 1250000.0, "maxNotional": 2500000.0, @@ -29258,6 +33911,7 @@ }, { "tier": 8.0, + "symbol": "NFP/USDT:USDT", "currency": "USDT", "minNotional": 2500000.0, "maxNotional": 5000000.0, @@ -29276,6 +33930,7 @@ "NKN/USDT:USDT": [ { "tier": 1.0, + "symbol": "NKN/USDT:USDT", "currency": "USDT", "minNotional": 0.0, "maxNotional": 5000.0, @@ -29292,6 +33947,7 @@ }, { "tier": 2.0, + "symbol": "NKN/USDT:USDT", "currency": "USDT", "minNotional": 5000.0, "maxNotional": 50000.0, @@ -29308,6 +33964,7 @@ }, { "tier": 3.0, + "symbol": "NKN/USDT:USDT", "currency": "USDT", "minNotional": 50000.0, "maxNotional": 200000.0, @@ -29324,6 +33981,7 @@ }, { "tier": 4.0, + "symbol": "NKN/USDT:USDT", "currency": "USDT", "minNotional": 200000.0, "maxNotional": 500000.0, @@ -29340,6 +33998,7 @@ }, { "tier": 5.0, + "symbol": "NKN/USDT:USDT", "currency": "USDT", "minNotional": 500000.0, "maxNotional": 1000000.0, @@ -29356,6 +34015,7 @@ }, { "tier": 6.0, + "symbol": "NKN/USDT:USDT", "currency": "USDT", "minNotional": 1000000.0, "maxNotional": 3000000.0, @@ -29374,6 +34034,7 @@ "NMR/USDT:USDT": [ { "tier": 1.0, + "symbol": "NMR/USDT:USDT", "currency": "USDT", "minNotional": 0.0, "maxNotional": 5000.0, @@ -29390,6 +34051,7 @@ }, { "tier": 2.0, + "symbol": "NMR/USDT:USDT", "currency": "USDT", "minNotional": 5000.0, "maxNotional": 25000.0, @@ -29406,6 +34068,7 @@ }, { "tier": 3.0, + "symbol": "NMR/USDT:USDT", "currency": "USDT", "minNotional": 25000.0, "maxNotional": 200000.0, @@ -29422,6 +34085,7 @@ }, { "tier": 4.0, + "symbol": "NMR/USDT:USDT", "currency": "USDT", "minNotional": 200000.0, "maxNotional": 500000.0, @@ -29438,6 +34102,7 @@ }, { "tier": 5.0, + "symbol": "NMR/USDT:USDT", "currency": "USDT", "minNotional": 500000.0, "maxNotional": 1000000.0, @@ -29454,6 +34119,7 @@ }, { "tier": 6.0, + "symbol": "NMR/USDT:USDT", "currency": "USDT", "minNotional": 1000000.0, "maxNotional": 3000000.0, @@ -29470,6 +34136,7 @@ }, { "tier": 7.0, + "symbol": "NMR/USDT:USDT", "currency": "USDT", "minNotional": 3000000.0, "maxNotional": 5000000.0, @@ -29488,6 +34155,7 @@ "NOT/USDT:USDT": [ { "tier": 1.0, + "symbol": "NOT/USDT:USDT", "currency": "USDT", "minNotional": 0.0, "maxNotional": 10000.0, @@ -29504,6 +34172,7 @@ }, { "tier": 2.0, + "symbol": "NOT/USDT:USDT", "currency": "USDT", "minNotional": 10000.0, "maxNotional": 60000.0, @@ -29520,6 +34189,7 @@ }, { "tier": 3.0, + "symbol": "NOT/USDT:USDT", "currency": "USDT", "minNotional": 60000.0, "maxNotional": 300000.0, @@ -29536,6 +34206,7 @@ }, { "tier": 4.0, + "symbol": "NOT/USDT:USDT", "currency": "USDT", "minNotional": 300000.0, "maxNotional": 600000.0, @@ -29552,6 +34223,7 @@ }, { "tier": 5.0, + "symbol": "NOT/USDT:USDT", "currency": "USDT", "minNotional": 600000.0, "maxNotional": 3000000.0, @@ -29568,6 +34240,7 @@ }, { "tier": 6.0, + "symbol": "NOT/USDT:USDT", "currency": "USDT", "minNotional": 3000000.0, "maxNotional": 6000000.0, @@ -29584,6 +34257,7 @@ }, { "tier": 7.0, + "symbol": "NOT/USDT:USDT", "currency": "USDT", "minNotional": 6000000.0, "maxNotional": 7500000.0, @@ -29600,6 +34274,7 @@ }, { "tier": 8.0, + "symbol": "NOT/USDT:USDT", "currency": "USDT", "minNotional": 7500000.0, "maxNotional": 15000000.0, @@ -29616,6 +34291,7 @@ }, { "tier": 9.0, + "symbol": "NOT/USDT:USDT", "currency": "USDT", "minNotional": 15000000.0, "maxNotional": 30000000.0, @@ -29634,6 +34310,7 @@ "NTRN/USDT:USDT": [ { "tier": 1.0, + "symbol": "NTRN/USDT:USDT", "currency": "USDT", "minNotional": 0.0, "maxNotional": 5000.0, @@ -29650,6 +34327,7 @@ }, { "tier": 2.0, + "symbol": "NTRN/USDT:USDT", "currency": "USDT", "minNotional": 5000.0, "maxNotional": 25000.0, @@ -29666,6 +34344,7 @@ }, { "tier": 3.0, + "symbol": "NTRN/USDT:USDT", "currency": "USDT", "minNotional": 25000.0, "maxNotional": 100000.0, @@ -29682,6 +34361,7 @@ }, { "tier": 4.0, + "symbol": "NTRN/USDT:USDT", "currency": "USDT", "minNotional": 100000.0, "maxNotional": 200000.0, @@ -29698,6 +34378,7 @@ }, { "tier": 5.0, + "symbol": "NTRN/USDT:USDT", "currency": "USDT", "minNotional": 200000.0, "maxNotional": 500000.0, @@ -29714,6 +34395,7 @@ }, { "tier": 6.0, + "symbol": "NTRN/USDT:USDT", "currency": "USDT", "minNotional": 500000.0, "maxNotional": 1000000.0, @@ -29730,6 +34412,7 @@ }, { "tier": 7.0, + "symbol": "NTRN/USDT:USDT", "currency": "USDT", "minNotional": 1000000.0, "maxNotional": 2000000.0, @@ -29748,6 +34431,7 @@ "NULS/USDT:USDT": [ { "tier": 1.0, + "symbol": "NULS/USDT:USDT", "currency": "USDT", "minNotional": 0.0, "maxNotional": 5000.0, @@ -29764,6 +34448,7 @@ }, { "tier": 2.0, + "symbol": "NULS/USDT:USDT", "currency": "USDT", "minNotional": 5000.0, "maxNotional": 10000.0, @@ -29780,6 +34465,7 @@ }, { "tier": 3.0, + "symbol": "NULS/USDT:USDT", "currency": "USDT", "minNotional": 10000.0, "maxNotional": 20000.0, @@ -29796,6 +34482,7 @@ }, { "tier": 4.0, + "symbol": "NULS/USDT:USDT", "currency": "USDT", "minNotional": 20000.0, "maxNotional": 40000.0, @@ -29812,6 +34499,7 @@ }, { "tier": 5.0, + "symbol": "NULS/USDT:USDT", "currency": "USDT", "minNotional": 40000.0, "maxNotional": 200000.0, @@ -29828,6 +34516,7 @@ }, { "tier": 6.0, + "symbol": "NULS/USDT:USDT", "currency": "USDT", "minNotional": 200000.0, "maxNotional": 400000.0, @@ -29844,6 +34533,7 @@ }, { "tier": 7.0, + "symbol": "NULS/USDT:USDT", "currency": "USDT", "minNotional": 400000.0, "maxNotional": 500000.0, @@ -29860,6 +34550,7 @@ }, { "tier": 8.0, + "symbol": "NULS/USDT:USDT", "currency": "USDT", "minNotional": 500000.0, "maxNotional": 1000000.0, @@ -29876,6 +34567,7 @@ }, { "tier": 9.0, + "symbol": "NULS/USDT:USDT", "currency": "USDT", "minNotional": 1000000.0, "maxNotional": 2000000.0, @@ -29894,6 +34586,7 @@ "OCEAN/USDT:USDT": [ { "tier": 1.0, + "symbol": "OCEAN/USDT:USDT", "currency": "USDT", "minNotional": 0.0, "maxNotional": 5000.0, @@ -29910,6 +34603,7 @@ }, { "tier": 2.0, + "symbol": "OCEAN/USDT:USDT", "currency": "USDT", "minNotional": 5000.0, "maxNotional": 25000.0, @@ -29926,6 +34620,7 @@ }, { "tier": 3.0, + "symbol": "OCEAN/USDT:USDT", "currency": "USDT", "minNotional": 25000.0, "maxNotional": 200000.0, @@ -29942,6 +34637,7 @@ }, { "tier": 4.0, + "symbol": "OCEAN/USDT:USDT", "currency": "USDT", "minNotional": 200000.0, "maxNotional": 500000.0, @@ -29958,6 +34654,7 @@ }, { "tier": 5.0, + "symbol": "OCEAN/USDT:USDT", "currency": "USDT", "minNotional": 500000.0, "maxNotional": 1000000.0, @@ -29974,6 +34671,7 @@ }, { "tier": 6.0, + "symbol": "OCEAN/USDT:USDT", "currency": "USDT", "minNotional": 1000000.0, "maxNotional": 2000000.0, @@ -29992,6 +34690,7 @@ "OGN/USDT:USDT": [ { "tier": 1.0, + "symbol": "OGN/USDT:USDT", "currency": "USDT", "minNotional": 0.0, "maxNotional": 5000.0, @@ -30008,6 +34707,7 @@ }, { "tier": 2.0, + "symbol": "OGN/USDT:USDT", "currency": "USDT", "minNotional": 5000.0, "maxNotional": 20000.0, @@ -30024,6 +34724,7 @@ }, { "tier": 3.0, + "symbol": "OGN/USDT:USDT", "currency": "USDT", "minNotional": 20000.0, "maxNotional": 25000.0, @@ -30040,6 +34741,7 @@ }, { "tier": 4.0, + "symbol": "OGN/USDT:USDT", "currency": "USDT", "minNotional": 25000.0, "maxNotional": 200000.0, @@ -30056,6 +34758,7 @@ }, { "tier": 5.0, + "symbol": "OGN/USDT:USDT", "currency": "USDT", "minNotional": 200000.0, "maxNotional": 400000.0, @@ -30072,6 +34775,7 @@ }, { "tier": 6.0, + "symbol": "OGN/USDT:USDT", "currency": "USDT", "minNotional": 400000.0, "maxNotional": 500000.0, @@ -30088,6 +34792,7 @@ }, { "tier": 7.0, + "symbol": "OGN/USDT:USDT", "currency": "USDT", "minNotional": 500000.0, "maxNotional": 1000000.0, @@ -30104,6 +34809,7 @@ }, { "tier": 8.0, + "symbol": "OGN/USDT:USDT", "currency": "USDT", "minNotional": 1000000.0, "maxNotional": 2000000.0, @@ -30122,6 +34828,7 @@ "OM/USDT:USDT": [ { "tier": 1.0, + "symbol": "OM/USDT:USDT", "currency": "USDT", "minNotional": 0.0, "maxNotional": 10000.0, @@ -30138,6 +34845,7 @@ }, { "tier": 2.0, + "symbol": "OM/USDT:USDT", "currency": "USDT", "minNotional": 10000.0, "maxNotional": 20000.0, @@ -30154,6 +34862,7 @@ }, { "tier": 3.0, + "symbol": "OM/USDT:USDT", "currency": "USDT", "minNotional": 20000.0, "maxNotional": 100000.0, @@ -30170,6 +34879,7 @@ }, { "tier": 4.0, + "symbol": "OM/USDT:USDT", "currency": "USDT", "minNotional": 100000.0, "maxNotional": 200000.0, @@ -30186,6 +34896,7 @@ }, { "tier": 5.0, + "symbol": "OM/USDT:USDT", "currency": "USDT", "minNotional": 200000.0, "maxNotional": 1000000.0, @@ -30202,6 +34913,7 @@ }, { "tier": 6.0, + "symbol": "OM/USDT:USDT", "currency": "USDT", "minNotional": 1000000.0, "maxNotional": 2000000.0, @@ -30218,6 +34930,7 @@ }, { "tier": 7.0, + "symbol": "OM/USDT:USDT", "currency": "USDT", "minNotional": 2000000.0, "maxNotional": 2500000.0, @@ -30234,6 +34947,7 @@ }, { "tier": 8.0, + "symbol": "OM/USDT:USDT", "currency": "USDT", "minNotional": 2500000.0, "maxNotional": 5000000.0, @@ -30250,6 +34964,7 @@ }, { "tier": 9.0, + "symbol": "OM/USDT:USDT", "currency": "USDT", "minNotional": 5000000.0, "maxNotional": 10000000.0, @@ -30268,6 +34983,7 @@ "OMG/USDT:USDT": [ { "tier": 1.0, + "symbol": "OMG/USDT:USDT", "currency": "USDT", "minNotional": 0.0, "maxNotional": 5000.0, @@ -30284,6 +35000,7 @@ }, { "tier": 2.0, + "symbol": "OMG/USDT:USDT", "currency": "USDT", "minNotional": 5000.0, "maxNotional": 50000.0, @@ -30300,6 +35017,7 @@ }, { "tier": 3.0, + "symbol": "OMG/USDT:USDT", "currency": "USDT", "minNotional": 50000.0, "maxNotional": 900000.0, @@ -30316,6 +35034,7 @@ }, { "tier": 4.0, + "symbol": "OMG/USDT:USDT", "currency": "USDT", "minNotional": 900000.0, "maxNotional": 2400000.0, @@ -30332,6 +35051,7 @@ }, { "tier": 5.0, + "symbol": "OMG/USDT:USDT", "currency": "USDT", "minNotional": 2400000.0, "maxNotional": 3000000.0, @@ -30348,6 +35068,7 @@ }, { "tier": 6.0, + "symbol": "OMG/USDT:USDT", "currency": "USDT", "minNotional": 3000000.0, "maxNotional": 9000000.0, @@ -30364,6 +35085,7 @@ }, { "tier": 7.0, + "symbol": "OMG/USDT:USDT", "currency": "USDT", "minNotional": 9000000.0, "maxNotional": 15000000.0, @@ -30382,6 +35104,7 @@ "OMNI/USDT:USDT": [ { "tier": 1.0, + "symbol": "OMNI/USDT:USDT", "currency": "USDT", "minNotional": 0.0, "maxNotional": 5000.0, @@ -30398,6 +35121,7 @@ }, { "tier": 2.0, + "symbol": "OMNI/USDT:USDT", "currency": "USDT", "minNotional": 5000.0, "maxNotional": 20000.0, @@ -30414,6 +35138,7 @@ }, { "tier": 3.0, + "symbol": "OMNI/USDT:USDT", "currency": "USDT", "minNotional": 20000.0, "maxNotional": 30000.0, @@ -30430,6 +35155,7 @@ }, { "tier": 4.0, + "symbol": "OMNI/USDT:USDT", "currency": "USDT", "minNotional": 30000.0, "maxNotional": 300000.0, @@ -30446,6 +35172,7 @@ }, { "tier": 5.0, + "symbol": "OMNI/USDT:USDT", "currency": "USDT", "minNotional": 300000.0, "maxNotional": 600000.0, @@ -30462,6 +35189,7 @@ }, { "tier": 6.0, + "symbol": "OMNI/USDT:USDT", "currency": "USDT", "minNotional": 600000.0, "maxNotional": 750000.0, @@ -30478,6 +35206,7 @@ }, { "tier": 7.0, + "symbol": "OMNI/USDT:USDT", "currency": "USDT", "minNotional": 750000.0, "maxNotional": 1500000.0, @@ -30494,6 +35223,7 @@ }, { "tier": 8.0, + "symbol": "OMNI/USDT:USDT", "currency": "USDT", "minNotional": 1500000.0, "maxNotional": 3000000.0, @@ -30512,6 +35242,7 @@ "ONDO/USDT:USDT": [ { "tier": 1.0, + "symbol": "ONDO/USDT:USDT", "currency": "USDT", "minNotional": 0.0, "maxNotional": 10000.0, @@ -30528,6 +35259,7 @@ }, { "tier": 2.0, + "symbol": "ONDO/USDT:USDT", "currency": "USDT", "minNotional": 10000.0, "maxNotional": 40000.0, @@ -30544,6 +35276,7 @@ }, { "tier": 3.0, + "symbol": "ONDO/USDT:USDT", "currency": "USDT", "minNotional": 40000.0, "maxNotional": 200000.0, @@ -30560,6 +35293,7 @@ }, { "tier": 4.0, + "symbol": "ONDO/USDT:USDT", "currency": "USDT", "minNotional": 200000.0, "maxNotional": 400000.0, @@ -30576,6 +35310,7 @@ }, { "tier": 5.0, + "symbol": "ONDO/USDT:USDT", "currency": "USDT", "minNotional": 400000.0, "maxNotional": 2000000.0, @@ -30592,6 +35327,7 @@ }, { "tier": 6.0, + "symbol": "ONDO/USDT:USDT", "currency": "USDT", "minNotional": 2000000.0, "maxNotional": 4000000.0, @@ -30608,6 +35344,7 @@ }, { "tier": 7.0, + "symbol": "ONDO/USDT:USDT", "currency": "USDT", "minNotional": 4000000.0, "maxNotional": 5000000.0, @@ -30624,6 +35361,7 @@ }, { "tier": 8.0, + "symbol": "ONDO/USDT:USDT", "currency": "USDT", "minNotional": 5000000.0, "maxNotional": 10000000.0, @@ -30640,6 +35378,7 @@ }, { "tier": 9.0, + "symbol": "ONDO/USDT:USDT", "currency": "USDT", "minNotional": 10000000.0, "maxNotional": 20000000.0, @@ -30658,6 +35397,7 @@ "ONE/USDT:USDT": [ { "tier": 1.0, + "symbol": "ONE/USDT:USDT", "currency": "USDT", "minNotional": 0.0, "maxNotional": 5000.0, @@ -30674,6 +35414,7 @@ }, { "tier": 2.0, + "symbol": "ONE/USDT:USDT", "currency": "USDT", "minNotional": 5000.0, "maxNotional": 20000.0, @@ -30690,6 +35431,7 @@ }, { "tier": 3.0, + "symbol": "ONE/USDT:USDT", "currency": "USDT", "minNotional": 20000.0, "maxNotional": 25000.0, @@ -30706,6 +35448,7 @@ }, { "tier": 4.0, + "symbol": "ONE/USDT:USDT", "currency": "USDT", "minNotional": 25000.0, "maxNotional": 200000.0, @@ -30722,6 +35465,7 @@ }, { "tier": 5.0, + "symbol": "ONE/USDT:USDT", "currency": "USDT", "minNotional": 200000.0, "maxNotional": 400000.0, @@ -30738,6 +35482,7 @@ }, { "tier": 6.0, + "symbol": "ONE/USDT:USDT", "currency": "USDT", "minNotional": 400000.0, "maxNotional": 500000.0, @@ -30754,6 +35499,7 @@ }, { "tier": 7.0, + "symbol": "ONE/USDT:USDT", "currency": "USDT", "minNotional": 500000.0, "maxNotional": 1000000.0, @@ -30770,6 +35516,7 @@ }, { "tier": 8.0, + "symbol": "ONE/USDT:USDT", "currency": "USDT", "minNotional": 1000000.0, "maxNotional": 2000000.0, @@ -30788,6 +35535,7 @@ "ONG/USDT:USDT": [ { "tier": 1.0, + "symbol": "ONG/USDT:USDT", "currency": "USDT", "minNotional": 0.0, "maxNotional": 5000.0, @@ -30804,6 +35552,7 @@ }, { "tier": 2.0, + "symbol": "ONG/USDT:USDT", "currency": "USDT", "minNotional": 5000.0, "maxNotional": 25000.0, @@ -30820,6 +35569,7 @@ }, { "tier": 3.0, + "symbol": "ONG/USDT:USDT", "currency": "USDT", "minNotional": 25000.0, "maxNotional": 100000.0, @@ -30836,6 +35586,7 @@ }, { "tier": 4.0, + "symbol": "ONG/USDT:USDT", "currency": "USDT", "minNotional": 100000.0, "maxNotional": 200000.0, @@ -30852,6 +35603,7 @@ }, { "tier": 5.0, + "symbol": "ONG/USDT:USDT", "currency": "USDT", "minNotional": 200000.0, "maxNotional": 500000.0, @@ -30868,6 +35620,7 @@ }, { "tier": 6.0, + "symbol": "ONG/USDT:USDT", "currency": "USDT", "minNotional": 500000.0, "maxNotional": 1000000.0, @@ -30884,6 +35637,7 @@ }, { "tier": 7.0, + "symbol": "ONG/USDT:USDT", "currency": "USDT", "minNotional": 1000000.0, "maxNotional": 2000000.0, @@ -30902,6 +35656,7 @@ "ONT/USDT:USDT": [ { "tier": 1.0, + "symbol": "ONT/USDT:USDT", "currency": "USDT", "minNotional": 0.0, "maxNotional": 5000.0, @@ -30918,6 +35673,7 @@ }, { "tier": 2.0, + "symbol": "ONT/USDT:USDT", "currency": "USDT", "minNotional": 5000.0, "maxNotional": 50000.0, @@ -30934,6 +35690,7 @@ }, { "tier": 3.0, + "symbol": "ONT/USDT:USDT", "currency": "USDT", "minNotional": 50000.0, "maxNotional": 600000.0, @@ -30950,6 +35707,7 @@ }, { "tier": 4.0, + "symbol": "ONT/USDT:USDT", "currency": "USDT", "minNotional": 600000.0, "maxNotional": 1600000.0, @@ -30966,6 +35724,7 @@ }, { "tier": 5.0, + "symbol": "ONT/USDT:USDT", "currency": "USDT", "minNotional": 1600000.0, "maxNotional": 2000000.0, @@ -30982,6 +35741,7 @@ }, { "tier": 6.0, + "symbol": "ONT/USDT:USDT", "currency": "USDT", "minNotional": 2000000.0, "maxNotional": 6000000.0, @@ -30998,6 +35758,7 @@ }, { "tier": 7.0, + "symbol": "ONT/USDT:USDT", "currency": "USDT", "minNotional": 6000000.0, "maxNotional": 10000000.0, @@ -31016,6 +35777,7 @@ "OP/USDT:USDT": [ { "tier": 1.0, + "symbol": "OP/USDT:USDT", "currency": "USDT", "minNotional": 0.0, "maxNotional": 10000.0, @@ -31032,6 +35794,7 @@ }, { "tier": 2.0, + "symbol": "OP/USDT:USDT", "currency": "USDT", "minNotional": 10000.0, "maxNotional": 50000.0, @@ -31048,6 +35811,7 @@ }, { "tier": 3.0, + "symbol": "OP/USDT:USDT", "currency": "USDT", "minNotional": 50000.0, "maxNotional": 80000.0, @@ -31064,6 +35828,7 @@ }, { "tier": 4.0, + "symbol": "OP/USDT:USDT", "currency": "USDT", "minNotional": 80000.0, "maxNotional": 300000.0, @@ -31080,6 +35845,7 @@ }, { "tier": 5.0, + "symbol": "OP/USDT:USDT", "currency": "USDT", "minNotional": 300000.0, "maxNotional": 600000.0, @@ -31096,6 +35862,7 @@ }, { "tier": 6.0, + "symbol": "OP/USDT:USDT", "currency": "USDT", "minNotional": 600000.0, "maxNotional": 3000000.0, @@ -31112,6 +35879,7 @@ }, { "tier": 7.0, + "symbol": "OP/USDT:USDT", "currency": "USDT", "minNotional": 3000000.0, "maxNotional": 6000000.0, @@ -31128,6 +35896,7 @@ }, { "tier": 8.0, + "symbol": "OP/USDT:USDT", "currency": "USDT", "minNotional": 6000000.0, "maxNotional": 7500000.0, @@ -31144,6 +35913,7 @@ }, { "tier": 9.0, + "symbol": "OP/USDT:USDT", "currency": "USDT", "minNotional": 7500000.0, "maxNotional": 18000000.0, @@ -31160,6 +35930,7 @@ }, { "tier": 10.0, + "symbol": "OP/USDT:USDT", "currency": "USDT", "minNotional": 18000000.0, "maxNotional": 30000000.0, @@ -31178,6 +35949,7 @@ "ORBS/USDT:USDT": [ { "tier": 1.0, + "symbol": "ORBS/USDT:USDT", "currency": "USDT", "minNotional": 0.0, "maxNotional": 5000.0, @@ -31194,6 +35966,7 @@ }, { "tier": 2.0, + "symbol": "ORBS/USDT:USDT", "currency": "USDT", "minNotional": 5000.0, "maxNotional": 10000.0, @@ -31210,6 +35983,7 @@ }, { "tier": 3.0, + "symbol": "ORBS/USDT:USDT", "currency": "USDT", "minNotional": 10000.0, "maxNotional": 30000.0, @@ -31226,6 +36000,7 @@ }, { "tier": 4.0, + "symbol": "ORBS/USDT:USDT", "currency": "USDT", "minNotional": 30000.0, "maxNotional": 60000.0, @@ -31242,6 +36017,7 @@ }, { "tier": 5.0, + "symbol": "ORBS/USDT:USDT", "currency": "USDT", "minNotional": 60000.0, "maxNotional": 300000.0, @@ -31258,6 +36034,7 @@ }, { "tier": 6.0, + "symbol": "ORBS/USDT:USDT", "currency": "USDT", "minNotional": 300000.0, "maxNotional": 600000.0, @@ -31274,6 +36051,7 @@ }, { "tier": 7.0, + "symbol": "ORBS/USDT:USDT", "currency": "USDT", "minNotional": 600000.0, "maxNotional": 750000.0, @@ -31290,6 +36068,7 @@ }, { "tier": 8.0, + "symbol": "ORBS/USDT:USDT", "currency": "USDT", "minNotional": 750000.0, "maxNotional": 1500000.0, @@ -31306,6 +36085,7 @@ }, { "tier": 9.0, + "symbol": "ORBS/USDT:USDT", "currency": "USDT", "minNotional": 1500000.0, "maxNotional": 3000000.0, @@ -31324,6 +36104,7 @@ "ORDI/USDC:USDC": [ { "tier": 1.0, + "symbol": "ORDI/USDC:USDC", "currency": "USDC", "minNotional": 0.0, "maxNotional": 5000.0, @@ -31340,6 +36121,7 @@ }, { "tier": 2.0, + "symbol": "ORDI/USDC:USDC", "currency": "USDC", "minNotional": 5000.0, "maxNotional": 75000.0, @@ -31356,6 +36138,7 @@ }, { "tier": 3.0, + "symbol": "ORDI/USDC:USDC", "currency": "USDC", "minNotional": 75000.0, "maxNotional": 150000.0, @@ -31372,6 +36155,7 @@ }, { "tier": 4.0, + "symbol": "ORDI/USDC:USDC", "currency": "USDC", "minNotional": 150000.0, "maxNotional": 300000.0, @@ -31388,6 +36172,7 @@ }, { "tier": 5.0, + "symbol": "ORDI/USDC:USDC", "currency": "USDC", "minNotional": 300000.0, "maxNotional": 1000000.0, @@ -31404,6 +36189,7 @@ }, { "tier": 6.0, + "symbol": "ORDI/USDC:USDC", "currency": "USDC", "minNotional": 1000000.0, "maxNotional": 3000000.0, @@ -31420,6 +36206,7 @@ }, { "tier": 7.0, + "symbol": "ORDI/USDC:USDC", "currency": "USDC", "minNotional": 3000000.0, "maxNotional": 6000000.0, @@ -31436,6 +36223,7 @@ }, { "tier": 8.0, + "symbol": "ORDI/USDC:USDC", "currency": "USDC", "minNotional": 6000000.0, "maxNotional": 10000000.0, @@ -31452,6 +36240,7 @@ }, { "tier": 9.0, + "symbol": "ORDI/USDC:USDC", "currency": "USDC", "minNotional": 10000000.0, "maxNotional": 20000000.0, @@ -31468,6 +36257,7 @@ }, { "tier": 10.0, + "symbol": "ORDI/USDC:USDC", "currency": "USDC", "minNotional": 20000000.0, "maxNotional": 30000000.0, @@ -31486,6 +36276,7 @@ "ORDI/USDT:USDT": [ { "tier": 1.0, + "symbol": "ORDI/USDT:USDT", "currency": "USDT", "minNotional": 0.0, "maxNotional": 10000.0, @@ -31502,6 +36293,7 @@ }, { "tier": 2.0, + "symbol": "ORDI/USDT:USDT", "currency": "USDT", "minNotional": 10000.0, "maxNotional": 80000.0, @@ -31518,6 +36310,7 @@ }, { "tier": 3.0, + "symbol": "ORDI/USDT:USDT", "currency": "USDT", "minNotional": 80000.0, "maxNotional": 150000.0, @@ -31534,6 +36327,7 @@ }, { "tier": 4.0, + "symbol": "ORDI/USDT:USDT", "currency": "USDT", "minNotional": 150000.0, "maxNotional": 400000.0, @@ -31550,6 +36344,7 @@ }, { "tier": 5.0, + "symbol": "ORDI/USDT:USDT", "currency": "USDT", "minNotional": 400000.0, "maxNotional": 1000000.0, @@ -31566,6 +36361,7 @@ }, { "tier": 6.0, + "symbol": "ORDI/USDT:USDT", "currency": "USDT", "minNotional": 1000000.0, "maxNotional": 4000000.0, @@ -31582,6 +36378,7 @@ }, { "tier": 7.0, + "symbol": "ORDI/USDT:USDT", "currency": "USDT", "minNotional": 4000000.0, "maxNotional": 8000000.0, @@ -31598,6 +36395,7 @@ }, { "tier": 8.0, + "symbol": "ORDI/USDT:USDT", "currency": "USDT", "minNotional": 8000000.0, "maxNotional": 10000000.0, @@ -31614,6 +36412,7 @@ }, { "tier": 9.0, + "symbol": "ORDI/USDT:USDT", "currency": "USDT", "minNotional": 10000000.0, "maxNotional": 20000000.0, @@ -31630,6 +36429,7 @@ }, { "tier": 10.0, + "symbol": "ORDI/USDT:USDT", "currency": "USDT", "minNotional": 20000000.0, "maxNotional": 40000000.0, @@ -31648,6 +36448,7 @@ "OXT/USDT:USDT": [ { "tier": 1.0, + "symbol": "OXT/USDT:USDT", "currency": "USDT", "minNotional": 0.0, "maxNotional": 5000.0, @@ -31664,6 +36465,7 @@ }, { "tier": 2.0, + "symbol": "OXT/USDT:USDT", "currency": "USDT", "minNotional": 5000.0, "maxNotional": 25000.0, @@ -31680,6 +36482,7 @@ }, { "tier": 3.0, + "symbol": "OXT/USDT:USDT", "currency": "USDT", "minNotional": 25000.0, "maxNotional": 200000.0, @@ -31696,6 +36499,7 @@ }, { "tier": 4.0, + "symbol": "OXT/USDT:USDT", "currency": "USDT", "minNotional": 200000.0, "maxNotional": 500000.0, @@ -31712,6 +36516,7 @@ }, { "tier": 5.0, + "symbol": "OXT/USDT:USDT", "currency": "USDT", "minNotional": 500000.0, "maxNotional": 1000000.0, @@ -31728,6 +36533,7 @@ }, { "tier": 6.0, + "symbol": "OXT/USDT:USDT", "currency": "USDT", "minNotional": 1000000.0, "maxNotional": 3000000.0, @@ -31744,6 +36550,7 @@ }, { "tier": 7.0, + "symbol": "OXT/USDT:USDT", "currency": "USDT", "minNotional": 3000000.0, "maxNotional": 5000000.0, @@ -31762,6 +36569,7 @@ "PENDLE/USDT:USDT": [ { "tier": 1.0, + "symbol": "PENDLE/USDT:USDT", "currency": "USDT", "minNotional": 0.0, "maxNotional": 10000.0, @@ -31778,6 +36586,7 @@ }, { "tier": 2.0, + "symbol": "PENDLE/USDT:USDT", "currency": "USDT", "minNotional": 10000.0, "maxNotional": 20000.0, @@ -31794,6 +36603,7 @@ }, { "tier": 3.0, + "symbol": "PENDLE/USDT:USDT", "currency": "USDT", "minNotional": 20000.0, "maxNotional": 100000.0, @@ -31810,6 +36620,7 @@ }, { "tier": 4.0, + "symbol": "PENDLE/USDT:USDT", "currency": "USDT", "minNotional": 100000.0, "maxNotional": 200000.0, @@ -31826,6 +36637,7 @@ }, { "tier": 5.0, + "symbol": "PENDLE/USDT:USDT", "currency": "USDT", "minNotional": 200000.0, "maxNotional": 1000000.0, @@ -31842,6 +36654,7 @@ }, { "tier": 6.0, + "symbol": "PENDLE/USDT:USDT", "currency": "USDT", "minNotional": 1000000.0, "maxNotional": 2000000.0, @@ -31858,6 +36671,7 @@ }, { "tier": 7.0, + "symbol": "PENDLE/USDT:USDT", "currency": "USDT", "minNotional": 2000000.0, "maxNotional": 2500000.0, @@ -31874,6 +36688,7 @@ }, { "tier": 8.0, + "symbol": "PENDLE/USDT:USDT", "currency": "USDT", "minNotional": 2500000.0, "maxNotional": 5000000.0, @@ -31890,6 +36705,7 @@ }, { "tier": 9.0, + "symbol": "PENDLE/USDT:USDT", "currency": "USDT", "minNotional": 5000000.0, "maxNotional": 10000000.0, @@ -31908,6 +36724,7 @@ "PEOPLE/USDT:USDT": [ { "tier": 1.0, + "symbol": "PEOPLE/USDT:USDT", "currency": "USDT", "minNotional": 0.0, "maxNotional": 10000.0, @@ -31924,15 +36741,16 @@ }, { "tier": 2.0, + "symbol": "PEOPLE/USDT:USDT", "currency": "USDT", "minNotional": 10000.0, - "maxNotional": 30000.0, + "maxNotional": 40000.0, "maintenanceMarginRate": 0.015, "maxLeverage": 50.0, "info": { "bracket": "2", "initialLeverage": "50", - "notionalCap": "30000", + "notionalCap": "40000", "notionalFloor": "10000", "maintMarginRatio": "0.015", "cum": "50.0" @@ -31940,120 +36758,128 @@ }, { "tier": 3.0, + "symbol": "PEOPLE/USDT:USDT", "currency": "USDT", - "minNotional": 30000.0, - "maxNotional": 150000.0, + "minNotional": 40000.0, + "maxNotional": 200000.0, "maintenanceMarginRate": 0.02, "maxLeverage": 25.0, "info": { "bracket": "3", "initialLeverage": "25", - "notionalCap": "150000", - "notionalFloor": "30000", + "notionalCap": "200000", + "notionalFloor": "40000", "maintMarginRatio": "0.02", - "cum": "200.0" + "cum": "250.0" } }, { "tier": 4.0, + "symbol": "PEOPLE/USDT:USDT", "currency": "USDT", - "minNotional": 150000.0, - "maxNotional": 300000.0, + "minNotional": 200000.0, + "maxNotional": 400000.0, "maintenanceMarginRate": 0.025, "maxLeverage": 20.0, "info": { "bracket": "4", "initialLeverage": "20", - "notionalCap": "300000", - "notionalFloor": "150000", + "notionalCap": "400000", + "notionalFloor": "200000", "maintMarginRatio": "0.025", - "cum": "950.0" + "cum": "1250.0" } }, { "tier": 5.0, + "symbol": "PEOPLE/USDT:USDT", "currency": "USDT", - "minNotional": 300000.0, - "maxNotional": 1500000.0, + "minNotional": 400000.0, + "maxNotional": 2000000.0, "maintenanceMarginRate": 0.05, "maxLeverage": 10.0, "info": { "bracket": "5", "initialLeverage": "10", - "notionalCap": "1500000", - "notionalFloor": "300000", + "notionalCap": "2000000", + "notionalFloor": "400000", "maintMarginRatio": "0.05", - "cum": "8450.0" + "cum": "11250.0" } }, { "tier": 6.0, + "symbol": "PEOPLE/USDT:USDT", "currency": "USDT", - "minNotional": 1500000.0, - "maxNotional": 3000000.0, + "minNotional": 2000000.0, + "maxNotional": 4000000.0, "maintenanceMarginRate": 0.1, "maxLeverage": 5.0, "info": { "bracket": "6", "initialLeverage": "5", - "notionalCap": "3000000", - "notionalFloor": "1500000", + "notionalCap": "4000000", + "notionalFloor": "2000000", "maintMarginRatio": "0.1", - "cum": "83450.0" + "cum": "111250.0" } }, { "tier": 7.0, + "symbol": "PEOPLE/USDT:USDT", "currency": "USDT", - "minNotional": 3000000.0, - "maxNotional": 3750000.0, + "minNotional": 4000000.0, + "maxNotional": 5000000.0, "maintenanceMarginRate": 0.125, "maxLeverage": 4.0, "info": { "bracket": "7", "initialLeverage": "4", - "notionalCap": "3750000", - "notionalFloor": "3000000", + "notionalCap": "5000000", + "notionalFloor": "4000000", "maintMarginRatio": "0.125", - "cum": "158450.0" + "cum": "211250.0" } }, { "tier": 8.0, + "symbol": "PEOPLE/USDT:USDT", "currency": "USDT", - "minNotional": 3750000.0, - "maxNotional": 7500000.0, + "minNotional": 5000000.0, + "maxNotional": 10000000.0, "maintenanceMarginRate": 0.25, "maxLeverage": 2.0, "info": { "bracket": "8", "initialLeverage": "2", - "notionalCap": "7500000", - "notionalFloor": "3750000", + "notionalCap": "10000000", + "notionalFloor": "5000000", "maintMarginRatio": "0.25", - "cum": "627200.0" + "cum": "836250.0" } }, { "tier": 9.0, + "symbol": "PEOPLE/USDT:USDT", "currency": "USDT", - "minNotional": 7500000.0, - "maxNotional": 15000000.0, + "minNotional": 10000000.0, + "maxNotional": 20000000.0, "maintenanceMarginRate": 0.5, "maxLeverage": 1.0, "info": { "bracket": "9", "initialLeverage": "1", - "notionalCap": "15000000", - "notionalFloor": "7500000", + "notionalCap": "20000000", + "notionalFloor": "10000000", "maintMarginRatio": "0.5", - "cum": "2502200.0" + "cum": "3336250.0" } } ], "PERP/USDT:USDT": [ { "tier": 1.0, + "symbol": "PERP/USDT:USDT", "currency": "USDT", "minNotional": 0.0, "maxNotional": 5000.0, @@ -32070,6 +36896,7 @@ }, { "tier": 2.0, + "symbol": "PERP/USDT:USDT", "currency": "USDT", "minNotional": 5000.0, "maxNotional": 25000.0, @@ -32086,6 +36913,7 @@ }, { "tier": 3.0, + "symbol": "PERP/USDT:USDT", "currency": "USDT", "minNotional": 25000.0, "maxNotional": 200000.0, @@ -32102,6 +36930,7 @@ }, { "tier": 4.0, + "symbol": "PERP/USDT:USDT", "currency": "USDT", "minNotional": 200000.0, "maxNotional": 500000.0, @@ -32118,6 +36947,7 @@ }, { "tier": 5.0, + "symbol": "PERP/USDT:USDT", "currency": "USDT", "minNotional": 500000.0, "maxNotional": 1000000.0, @@ -32134,6 +36964,7 @@ }, { "tier": 6.0, + "symbol": "PERP/USDT:USDT", "currency": "USDT", "minNotional": 1000000.0, "maxNotional": 3000000.0, @@ -32150,6 +36981,7 @@ }, { "tier": 7.0, + "symbol": "PERP/USDT:USDT", "currency": "USDT", "minNotional": 3000000.0, "maxNotional": 3005000.0, @@ -32168,6 +37000,7 @@ "PHB/USDT:USDT": [ { "tier": 1.0, + "symbol": "PHB/USDT:USDT", "currency": "USDT", "minNotional": 0.0, "maxNotional": 5000.0, @@ -32184,6 +37017,7 @@ }, { "tier": 2.0, + "symbol": "PHB/USDT:USDT", "currency": "USDT", "minNotional": 5000.0, "maxNotional": 25000.0, @@ -32200,6 +37034,7 @@ }, { "tier": 3.0, + "symbol": "PHB/USDT:USDT", "currency": "USDT", "minNotional": 25000.0, "maxNotional": 100000.0, @@ -32216,6 +37051,7 @@ }, { "tier": 4.0, + "symbol": "PHB/USDT:USDT", "currency": "USDT", "minNotional": 100000.0, "maxNotional": 250000.0, @@ -32232,6 +37068,7 @@ }, { "tier": 5.0, + "symbol": "PHB/USDT:USDT", "currency": "USDT", "minNotional": 250000.0, "maxNotional": 1000000.0, @@ -32248,6 +37085,7 @@ }, { "tier": 6.0, + "symbol": "PHB/USDT:USDT", "currency": "USDT", "minNotional": 1000000.0, "maxNotional": 5000000.0, @@ -32266,6 +37104,7 @@ "PIXEL/USDT:USDT": [ { "tier": 1.0, + "symbol": "PIXEL/USDT:USDT", "currency": "USDT", "minNotional": 0.0, "maxNotional": 5000.0, @@ -32282,6 +37121,7 @@ }, { "tier": 2.0, + "symbol": "PIXEL/USDT:USDT", "currency": "USDT", "minNotional": 5000.0, "maxNotional": 16000.0, @@ -32298,6 +37138,7 @@ }, { "tier": 3.0, + "symbol": "PIXEL/USDT:USDT", "currency": "USDT", "minNotional": 16000.0, "maxNotional": 80000.0, @@ -32314,6 +37155,7 @@ }, { "tier": 4.0, + "symbol": "PIXEL/USDT:USDT", "currency": "USDT", "minNotional": 80000.0, "maxNotional": 160000.0, @@ -32330,6 +37172,7 @@ }, { "tier": 5.0, + "symbol": "PIXEL/USDT:USDT", "currency": "USDT", "minNotional": 160000.0, "maxNotional": 800000.0, @@ -32346,6 +37189,7 @@ }, { "tier": 6.0, + "symbol": "PIXEL/USDT:USDT", "currency": "USDT", "minNotional": 800000.0, "maxNotional": 1600000.0, @@ -32362,6 +37206,7 @@ }, { "tier": 7.0, + "symbol": "PIXEL/USDT:USDT", "currency": "USDT", "minNotional": 1600000.0, "maxNotional": 2000000.0, @@ -32378,6 +37223,7 @@ }, { "tier": 8.0, + "symbol": "PIXEL/USDT:USDT", "currency": "USDT", "minNotional": 2000000.0, "maxNotional": 4000000.0, @@ -32394,6 +37240,7 @@ }, { "tier": 9.0, + "symbol": "PIXEL/USDT:USDT", "currency": "USDT", "minNotional": 4000000.0, "maxNotional": 8000000.0, @@ -32409,9 +37256,10 @@ } } ], - "POL/USDT:USDT": [ + "PNUT/USDT:USDT": [ { "tier": 1.0, + "symbol": "PNUT/USDT:USDT", "currency": "USDT", "minNotional": 0.0, "maxNotional": 10000.0, @@ -32428,6 +37276,162 @@ }, { "tier": 2.0, + "symbol": "PNUT/USDT:USDT", + "currency": "USDT", + "minNotional": 10000.0, + "maxNotional": 40000.0, + "maintenanceMarginRate": 0.015, + "maxLeverage": 50.0, + "info": { + "bracket": "2", + "initialLeverage": "50", + "notionalCap": "40000", + "notionalFloor": "10000", + "maintMarginRatio": "0.015", + "cum": "50.0" + } + }, + { + "tier": 3.0, + "symbol": "PNUT/USDT:USDT", + "currency": "USDT", + "minNotional": 40000.0, + "maxNotional": 200000.0, + "maintenanceMarginRate": 0.02, + "maxLeverage": 25.0, + "info": { + "bracket": "3", + "initialLeverage": "25", + "notionalCap": "200000", + "notionalFloor": "40000", + "maintMarginRatio": "0.02", + "cum": "250.0" + } + }, + { + "tier": 4.0, + "symbol": "PNUT/USDT:USDT", + "currency": "USDT", + "minNotional": 200000.0, + "maxNotional": 400000.0, + "maintenanceMarginRate": 0.025, + "maxLeverage": 20.0, + "info": { + "bracket": "4", + "initialLeverage": "20", + "notionalCap": "400000", + "notionalFloor": "200000", + "maintMarginRatio": "0.025", + "cum": "1250.0" + } + }, + { + "tier": 5.0, + "symbol": "PNUT/USDT:USDT", + "currency": "USDT", + "minNotional": 400000.0, + "maxNotional": 2000000.0, + "maintenanceMarginRate": 0.05, + "maxLeverage": 10.0, + "info": { + "bracket": "5", + "initialLeverage": "10", + "notionalCap": "2000000", + "notionalFloor": "400000", + "maintMarginRatio": "0.05", + "cum": "11250.0" + } + }, + { + "tier": 6.0, + "symbol": "PNUT/USDT:USDT", + "currency": "USDT", + "minNotional": 2000000.0, + "maxNotional": 4000000.0, + "maintenanceMarginRate": 0.1, + "maxLeverage": 5.0, + "info": { + "bracket": "6", + "initialLeverage": "5", + "notionalCap": "4000000", + "notionalFloor": "2000000", + "maintMarginRatio": "0.1", + "cum": "111250.0" + } + }, + { + "tier": 7.0, + "symbol": "PNUT/USDT:USDT", + "currency": "USDT", + "minNotional": 4000000.0, + "maxNotional": 5000000.0, + "maintenanceMarginRate": 0.125, + "maxLeverage": 4.0, + "info": { + "bracket": "7", + "initialLeverage": "4", + "notionalCap": "5000000", + "notionalFloor": "4000000", + "maintMarginRatio": "0.125", + "cum": "211250.0" + } + }, + { + "tier": 8.0, + "symbol": "PNUT/USDT:USDT", + "currency": "USDT", + "minNotional": 5000000.0, + "maxNotional": 10000000.0, + "maintenanceMarginRate": 0.25, + "maxLeverage": 2.0, + "info": { + "bracket": "8", + "initialLeverage": "2", + "notionalCap": "10000000", + "notionalFloor": "5000000", + "maintMarginRatio": "0.25", + "cum": "836250.0" + } + }, + { + "tier": 9.0, + "symbol": "PNUT/USDT:USDT", + "currency": "USDT", + "minNotional": 10000000.0, + "maxNotional": 20000000.0, + "maintenanceMarginRate": 0.5, + "maxLeverage": 1.0, + "info": { + "bracket": "9", + "initialLeverage": "1", + "notionalCap": "20000000", + "notionalFloor": "10000000", + "maintMarginRatio": "0.5", + "cum": "3336250.0" + } + } + ], + "POL/USDT:USDT": [ + { + "tier": 1.0, + "symbol": "POL/USDT:USDT", + "currency": "USDT", + "minNotional": 0.0, + "maxNotional": 10000.0, + "maintenanceMarginRate": 0.01, + "maxLeverage": 75.0, + "info": { + "bracket": "1", + "initialLeverage": "75", + "notionalCap": "10000", + "notionalFloor": "0", + "maintMarginRatio": "0.01", + "cum": "0.0" + } + }, + { + "tier": 2.0, + "symbol": "POL/USDT:USDT", "currency": "USDT", "minNotional": 10000.0, "maxNotional": 60000.0, @@ -32444,6 +37448,7 @@ }, { "tier": 3.0, + "symbol": "POL/USDT:USDT", "currency": "USDT", "minNotional": 60000.0, "maxNotional": 300000.0, @@ -32460,6 +37465,7 @@ }, { "tier": 4.0, + "symbol": "POL/USDT:USDT", "currency": "USDT", "minNotional": 300000.0, "maxNotional": 600000.0, @@ -32476,6 +37482,7 @@ }, { "tier": 5.0, + "symbol": "POL/USDT:USDT", "currency": "USDT", "minNotional": 600000.0, "maxNotional": 3000000.0, @@ -32492,6 +37499,7 @@ }, { "tier": 6.0, + "symbol": "POL/USDT:USDT", "currency": "USDT", "minNotional": 3000000.0, "maxNotional": 6000000.0, @@ -32508,6 +37516,7 @@ }, { "tier": 7.0, + "symbol": "POL/USDT:USDT", "currency": "USDT", "minNotional": 6000000.0, "maxNotional": 7500000.0, @@ -32524,6 +37533,7 @@ }, { "tier": 8.0, + "symbol": "POL/USDT:USDT", "currency": "USDT", "minNotional": 7500000.0, "maxNotional": 15000000.0, @@ -32540,6 +37550,7 @@ }, { "tier": 9.0, + "symbol": "POL/USDT:USDT", "currency": "USDT", "minNotional": 15000000.0, "maxNotional": 30000000.0, @@ -32558,6 +37569,7 @@ "POLYX/USDT:USDT": [ { "tier": 1.0, + "symbol": "POLYX/USDT:USDT", "currency": "USDT", "minNotional": 0.0, "maxNotional": 5000.0, @@ -32574,6 +37586,7 @@ }, { "tier": 2.0, + "symbol": "POLYX/USDT:USDT", "currency": "USDT", "minNotional": 5000.0, "maxNotional": 25000.0, @@ -32590,6 +37603,7 @@ }, { "tier": 3.0, + "symbol": "POLYX/USDT:USDT", "currency": "USDT", "minNotional": 25000.0, "maxNotional": 80000.0, @@ -32606,6 +37620,7 @@ }, { "tier": 4.0, + "symbol": "POLYX/USDT:USDT", "currency": "USDT", "minNotional": 80000.0, "maxNotional": 800000.0, @@ -32622,6 +37637,7 @@ }, { "tier": 5.0, + "symbol": "POLYX/USDT:USDT", "currency": "USDT", "minNotional": 800000.0, "maxNotional": 1600000.0, @@ -32638,6 +37654,7 @@ }, { "tier": 6.0, + "symbol": "POLYX/USDT:USDT", "currency": "USDT", "minNotional": 1600000.0, "maxNotional": 2000000.0, @@ -32654,6 +37671,7 @@ }, { "tier": 7.0, + "symbol": "POLYX/USDT:USDT", "currency": "USDT", "minNotional": 2000000.0, "maxNotional": 4000000.0, @@ -32670,6 +37688,7 @@ }, { "tier": 8.0, + "symbol": "POLYX/USDT:USDT", "currency": "USDT", "minNotional": 4000000.0, "maxNotional": 8000000.0, @@ -32685,9 +37704,165 @@ } } ], + "PONKE/USDT:USDT": [ + { + "tier": 1.0, + "symbol": "PONKE/USDT:USDT", + "currency": "USDT", + "minNotional": 0.0, + "maxNotional": 5000.0, + "maintenanceMarginRate": 0.01, + "maxLeverage": 75.0, + "info": { + "bracket": "1", + "initialLeverage": "75", + "notionalCap": "5000", + "notionalFloor": "0", + "maintMarginRatio": "0.01", + "cum": "0.0" + } + }, + { + "tier": 2.0, + "symbol": "PONKE/USDT:USDT", + "currency": "USDT", + "minNotional": 5000.0, + "maxNotional": 10000.0, + "maintenanceMarginRate": 0.015, + "maxLeverage": 50.0, + "info": { + "bracket": "2", + "initialLeverage": "50", + "notionalCap": "10000", + "notionalFloor": "5000", + "maintMarginRatio": "0.015", + "cum": "25.0" + } + }, + { + "tier": 3.0, + "symbol": "PONKE/USDT:USDT", + "currency": "USDT", + "minNotional": 10000.0, + "maxNotional": 30000.0, + "maintenanceMarginRate": 0.02, + "maxLeverage": 25.0, + "info": { + "bracket": "3", + "initialLeverage": "25", + "notionalCap": "30000", + "notionalFloor": "10000", + "maintMarginRatio": "0.02", + "cum": "75.0" + } + }, + { + "tier": 4.0, + "symbol": "PONKE/USDT:USDT", + "currency": "USDT", + "minNotional": 30000.0, + "maxNotional": 60000.0, + "maintenanceMarginRate": 0.025, + "maxLeverage": 20.0, + "info": { + "bracket": "4", + "initialLeverage": "20", + "notionalCap": "60000", + "notionalFloor": "30000", + "maintMarginRatio": "0.025", + "cum": "225.0" + } + }, + { + "tier": 5.0, + "symbol": "PONKE/USDT:USDT", + "currency": "USDT", + "minNotional": 60000.0, + "maxNotional": 300000.0, + "maintenanceMarginRate": 0.05, + "maxLeverage": 10.0, + "info": { + "bracket": "5", + "initialLeverage": "10", + "notionalCap": "300000", + "notionalFloor": "60000", + "maintMarginRatio": "0.05", + "cum": "1725.0" + } + }, + { + "tier": 6.0, + "symbol": "PONKE/USDT:USDT", + "currency": "USDT", + "minNotional": 300000.0, + "maxNotional": 600000.0, + "maintenanceMarginRate": 0.1, + "maxLeverage": 5.0, + "info": { + "bracket": "6", + "initialLeverage": "5", + "notionalCap": "600000", + "notionalFloor": "300000", + "maintMarginRatio": "0.1", + "cum": "16725.0" + } + }, + { + "tier": 7.0, + "symbol": "PONKE/USDT:USDT", + "currency": "USDT", + "minNotional": 600000.0, + "maxNotional": 750000.0, + "maintenanceMarginRate": 0.125, + "maxLeverage": 4.0, + "info": { + "bracket": "7", + "initialLeverage": "4", + "notionalCap": "750000", + "notionalFloor": "600000", + "maintMarginRatio": "0.125", + "cum": "31725.0" + } + }, + { + "tier": 8.0, + "symbol": "PONKE/USDT:USDT", + "currency": "USDT", + "minNotional": 750000.0, + "maxNotional": 1500000.0, + "maintenanceMarginRate": 0.25, + "maxLeverage": 2.0, + "info": { + "bracket": "8", + "initialLeverage": "2", + "notionalCap": "1500000", + "notionalFloor": "750000", + "maintMarginRatio": "0.25", + "cum": "125475.0" + } + }, + { + "tier": 9.0, + "symbol": "PONKE/USDT:USDT", + "currency": "USDT", + "minNotional": 1500000.0, + "maxNotional": 3000000.0, + "maintenanceMarginRate": 0.5, + "maxLeverage": 1.0, + "info": { + "bracket": "9", + "initialLeverage": "1", + "notionalCap": "3000000", + "notionalFloor": "1500000", + "maintMarginRatio": "0.5", + "cum": "500475.0" + } + } + ], "POPCAT/USDT:USDT": [ { "tier": 1.0, + "symbol": "POPCAT/USDT:USDT", "currency": "USDT", "minNotional": 0.0, "maxNotional": 10000.0, @@ -32704,15 +37879,16 @@ }, { "tier": 2.0, + "symbol": "POPCAT/USDT:USDT", "currency": "USDT", "minNotional": 10000.0, - "maxNotional": 60000.0, + "maxNotional": 100000.0, "maintenanceMarginRate": 0.015, "maxLeverage": 50.0, "info": { "bracket": "2", "initialLeverage": "50", - "notionalCap": "60000", + "notionalCap": "100000", "notionalFloor": "10000", "maintMarginRatio": "0.015", "cum": "50.0" @@ -32720,120 +37896,128 @@ }, { "tier": 3.0, + "symbol": "POPCAT/USDT:USDT", "currency": "USDT", - "minNotional": 60000.0, - "maxNotional": 300000.0, + "minNotional": 100000.0, + "maxNotional": 500000.0, "maintenanceMarginRate": 0.02, "maxLeverage": 25.0, "info": { "bracket": "3", "initialLeverage": "25", - "notionalCap": "300000", - "notionalFloor": "60000", + "notionalCap": "500000", + "notionalFloor": "100000", "maintMarginRatio": "0.02", - "cum": "350.0" + "cum": "550.0" } }, { "tier": 4.0, + "symbol": "POPCAT/USDT:USDT", "currency": "USDT", - "minNotional": 300000.0, - "maxNotional": 600000.0, + "minNotional": 500000.0, + "maxNotional": 1000000.0, "maintenanceMarginRate": 0.025, "maxLeverage": 20.0, "info": { "bracket": "4", "initialLeverage": "20", - "notionalCap": "600000", - "notionalFloor": "300000", + "notionalCap": "1000000", + "notionalFloor": "500000", "maintMarginRatio": "0.025", - "cum": "1850.0" + "cum": "3050.0" } }, { "tier": 5.0, + "symbol": "POPCAT/USDT:USDT", "currency": "USDT", - "minNotional": 600000.0, - "maxNotional": 3000000.0, + "minNotional": 1000000.0, + "maxNotional": 5000000.0, "maintenanceMarginRate": 0.05, "maxLeverage": 10.0, "info": { "bracket": "5", "initialLeverage": "10", - "notionalCap": "3000000", - "notionalFloor": "600000", + "notionalCap": "5000000", + "notionalFloor": "1000000", "maintMarginRatio": "0.05", - "cum": "16850.0" + "cum": "28050.0" } }, { "tier": 6.0, + "symbol": "POPCAT/USDT:USDT", "currency": "USDT", - "minNotional": 3000000.0, - "maxNotional": 6000000.0, + "minNotional": 5000000.0, + "maxNotional": 10000000.0, "maintenanceMarginRate": 0.1, "maxLeverage": 5.0, "info": { "bracket": "6", "initialLeverage": "5", - "notionalCap": "6000000", - "notionalFloor": "3000000", + "notionalCap": "10000000", + "notionalFloor": "5000000", "maintMarginRatio": "0.1", - "cum": "166850.0" + "cum": "278050.0" } }, { "tier": 7.0, + "symbol": "POPCAT/USDT:USDT", "currency": "USDT", - "minNotional": 6000000.0, - "maxNotional": 7500000.0, + "minNotional": 10000000.0, + "maxNotional": 12500000.0, "maintenanceMarginRate": 0.125, "maxLeverage": 4.0, "info": { "bracket": "7", "initialLeverage": "4", - "notionalCap": "7500000", - "notionalFloor": "6000000", + "notionalCap": "12500000", + "notionalFloor": "10000000", "maintMarginRatio": "0.125", - "cum": "316850.0" + "cum": "528050.0" } }, { "tier": 8.0, + "symbol": "POPCAT/USDT:USDT", "currency": "USDT", - "minNotional": 7500000.0, - "maxNotional": 15000000.0, + "minNotional": 12500000.0, + "maxNotional": 25000000.0, "maintenanceMarginRate": 0.25, "maxLeverage": 2.0, "info": { "bracket": "8", "initialLeverage": "2", - "notionalCap": "15000000", - "notionalFloor": "7500000", + "notionalCap": "25000000", + "notionalFloor": "12500000", "maintMarginRatio": "0.25", - "cum": "1254350.0" + "cum": "2090550.0" } }, { "tier": 9.0, + "symbol": "POPCAT/USDT:USDT", "currency": "USDT", - "minNotional": 15000000.0, - "maxNotional": 30000000.0, + "minNotional": 25000000.0, + "maxNotional": 50000000.0, "maintenanceMarginRate": 0.5, "maxLeverage": 1.0, "info": { "bracket": "9", "initialLeverage": "1", - "notionalCap": "30000000", - "notionalFloor": "15000000", + "notionalCap": "50000000", + "notionalFloor": "25000000", "maintMarginRatio": "0.5", - "cum": "5004350.0" + "cum": "8340550.0" } } ], "PORTAL/USDT:USDT": [ { "tier": 1.0, + "symbol": "PORTAL/USDT:USDT", "currency": "USDT", "minNotional": 0.0, "maxNotional": 5000.0, @@ -32850,6 +38034,7 @@ }, { "tier": 2.0, + "symbol": "PORTAL/USDT:USDT", "currency": "USDT", "minNotional": 5000.0, "maxNotional": 25000.0, @@ -32866,6 +38051,7 @@ }, { "tier": 3.0, + "symbol": "PORTAL/USDT:USDT", "currency": "USDT", "minNotional": 25000.0, "maxNotional": 100000.0, @@ -32882,6 +38068,7 @@ }, { "tier": 4.0, + "symbol": "PORTAL/USDT:USDT", "currency": "USDT", "minNotional": 100000.0, "maxNotional": 200000.0, @@ -32898,6 +38085,7 @@ }, { "tier": 5.0, + "symbol": "PORTAL/USDT:USDT", "currency": "USDT", "minNotional": 200000.0, "maxNotional": 500000.0, @@ -32914,6 +38102,7 @@ }, { "tier": 6.0, + "symbol": "PORTAL/USDT:USDT", "currency": "USDT", "minNotional": 500000.0, "maxNotional": 1000000.0, @@ -32930,6 +38119,7 @@ }, { "tier": 7.0, + "symbol": "PORTAL/USDT:USDT", "currency": "USDT", "minNotional": 1000000.0, "maxNotional": 2000000.0, @@ -32948,6 +38138,7 @@ "POWR/USDT:USDT": [ { "tier": 1.0, + "symbol": "POWR/USDT:USDT", "currency": "USDT", "minNotional": 0.0, "maxNotional": 5000.0, @@ -32964,6 +38155,7 @@ }, { "tier": 2.0, + "symbol": "POWR/USDT:USDT", "currency": "USDT", "minNotional": 5000.0, "maxNotional": 25000.0, @@ -32980,6 +38172,7 @@ }, { "tier": 3.0, + "symbol": "POWR/USDT:USDT", "currency": "USDT", "minNotional": 25000.0, "maxNotional": 100000.0, @@ -32996,6 +38189,7 @@ }, { "tier": 4.0, + "symbol": "POWR/USDT:USDT", "currency": "USDT", "minNotional": 100000.0, "maxNotional": 200000.0, @@ -33012,6 +38206,7 @@ }, { "tier": 5.0, + "symbol": "POWR/USDT:USDT", "currency": "USDT", "minNotional": 200000.0, "maxNotional": 500000.0, @@ -33028,6 +38223,7 @@ }, { "tier": 6.0, + "symbol": "POWR/USDT:USDT", "currency": "USDT", "minNotional": 500000.0, "maxNotional": 1000000.0, @@ -33044,6 +38240,7 @@ }, { "tier": 7.0, + "symbol": "POWR/USDT:USDT", "currency": "USDT", "minNotional": 1000000.0, "maxNotional": 2000000.0, @@ -33062,136 +38259,162 @@ "PYTH/USDT:USDT": [ { "tier": 1.0, + "symbol": "PYTH/USDT:USDT", "currency": "USDT", "minNotional": 0.0, - "maxNotional": 5000.0, - "maintenanceMarginRate": 0.015, - "maxLeverage": 50.0, + "maxNotional": 10000.0, + "maintenanceMarginRate": 0.01, + "maxLeverage": 75.0, "info": { "bracket": "1", - "initialLeverage": "50", - "notionalCap": "5000", + "initialLeverage": "75", + "notionalCap": "10000", "notionalFloor": "0", - "maintMarginRatio": "0.015", + "maintMarginRatio": "0.01", "cum": "0.0" } }, { "tier": 2.0, + "symbol": "PYTH/USDT:USDT", "currency": "USDT", - "minNotional": 5000.0, - "maxNotional": 25000.0, - "maintenanceMarginRate": 0.02, - "maxLeverage": 25.0, + "minNotional": 10000.0, + "maxNotional": 30000.0, + "maintenanceMarginRate": 0.015, + "maxLeverage": 50.0, "info": { "bracket": "2", - "initialLeverage": "25", - "notionalCap": "25000", - "notionalFloor": "5000", - "maintMarginRatio": "0.02", - "cum": "25.0" + "initialLeverage": "50", + "notionalCap": "30000", + "notionalFloor": "10000", + "maintMarginRatio": "0.015", + "cum": "50.0" } }, { "tier": 3.0, + "symbol": "PYTH/USDT:USDT", "currency": "USDT", - "minNotional": 25000.0, - "maxNotional": 80000.0, - "maintenanceMarginRate": 0.025, - "maxLeverage": 20.0, + "minNotional": 30000.0, + "maxNotional": 150000.0, + "maintenanceMarginRate": 0.02, + "maxLeverage": 25.0, "info": { "bracket": "3", - "initialLeverage": "20", - "notionalCap": "80000", - "notionalFloor": "25000", - "maintMarginRatio": "0.025", - "cum": "150.0" + "initialLeverage": "25", + "notionalCap": "150000", + "notionalFloor": "30000", + "maintMarginRatio": "0.02", + "cum": "200.0" } }, { "tier": 4.0, + "symbol": "PYTH/USDT:USDT", "currency": "USDT", - "minNotional": 80000.0, - "maxNotional": 800000.0, - "maintenanceMarginRate": 0.05, - "maxLeverage": 10.0, + "minNotional": 150000.0, + "maxNotional": 300000.0, + "maintenanceMarginRate": 0.025, + "maxLeverage": 20.0, "info": { "bracket": "4", - "initialLeverage": "10", - "notionalCap": "800000", - "notionalFloor": "80000", - "maintMarginRatio": "0.05", - "cum": "2150.0" + "initialLeverage": "20", + "notionalCap": "300000", + "notionalFloor": "150000", + "maintMarginRatio": "0.025", + "cum": "950.0" } }, { "tier": 5.0, + "symbol": "PYTH/USDT:USDT", "currency": "USDT", - "minNotional": 800000.0, - "maxNotional": 1600000.0, - "maintenanceMarginRate": 0.1, - "maxLeverage": 5.0, + "minNotional": 300000.0, + "maxNotional": 1500000.0, + "maintenanceMarginRate": 0.05, + "maxLeverage": 10.0, "info": { "bracket": "5", - "initialLeverage": "5", - "notionalCap": "1600000", - "notionalFloor": "800000", - "maintMarginRatio": "0.1", - "cum": "42150.0" + "initialLeverage": "10", + "notionalCap": "1500000", + "notionalFloor": "300000", + "maintMarginRatio": "0.05", + "cum": "8450.0" } }, { "tier": 6.0, + "symbol": "PYTH/USDT:USDT", "currency": "USDT", - "minNotional": 1600000.0, - "maxNotional": 2000000.0, - "maintenanceMarginRate": 0.125, - "maxLeverage": 4.0, + "minNotional": 1500000.0, + "maxNotional": 3000000.0, + "maintenanceMarginRate": 0.1, + "maxLeverage": 5.0, "info": { "bracket": "6", - "initialLeverage": "4", - "notionalCap": "2000000", - "notionalFloor": "1600000", - "maintMarginRatio": "0.125", - "cum": "82150.0" + "initialLeverage": "5", + "notionalCap": "3000000", + "notionalFloor": "1500000", + "maintMarginRatio": "0.1", + "cum": "83450.0" } }, { "tier": 7.0, + "symbol": "PYTH/USDT:USDT", "currency": "USDT", - "minNotional": 2000000.0, - "maxNotional": 4000000.0, - "maintenanceMarginRate": 0.25, - "maxLeverage": 2.0, + "minNotional": 3000000.0, + "maxNotional": 3750000.0, + "maintenanceMarginRate": 0.125, + "maxLeverage": 4.0, "info": { "bracket": "7", - "initialLeverage": "2", - "notionalCap": "4000000", - "notionalFloor": "2000000", - "maintMarginRatio": "0.25", - "cum": "332150.0" + "initialLeverage": "4", + "notionalCap": "3750000", + "notionalFloor": "3000000", + "maintMarginRatio": "0.125", + "cum": "158450.0" } }, { "tier": 8.0, + "symbol": "PYTH/USDT:USDT", "currency": "USDT", - "minNotional": 4000000.0, - "maxNotional": 8000000.0, + "minNotional": 3750000.0, + "maxNotional": 7500000.0, + "maintenanceMarginRate": 0.25, + "maxLeverage": 2.0, + "info": { + "bracket": "8", + "initialLeverage": "2", + "notionalCap": "7500000", + "notionalFloor": "3750000", + "maintMarginRatio": "0.25", + "cum": "627200.0" + } + }, + { + "tier": 9.0, + "symbol": "PYTH/USDT:USDT", + "currency": "USDT", + "minNotional": 7500000.0, + "maxNotional": 15000000.0, "maintenanceMarginRate": 0.5, "maxLeverage": 1.0, "info": { - "bracket": "8", + "bracket": "9", "initialLeverage": "1", - "notionalCap": "8000000", - "notionalFloor": "4000000", + "notionalCap": "15000000", + "notionalFloor": "7500000", "maintMarginRatio": "0.5", - "cum": "1332150.0" + "cum": "2502200.0" } } ], "QNT/USDT:USDT": [ { "tier": 1.0, + "symbol": "QNT/USDT:USDT", "currency": "USDT", "minNotional": 0.0, "maxNotional": 5000.0, @@ -33208,6 +38431,7 @@ }, { "tier": 2.0, + "symbol": "QNT/USDT:USDT", "currency": "USDT", "minNotional": 5000.0, "maxNotional": 25000.0, @@ -33224,6 +38448,7 @@ }, { "tier": 3.0, + "symbol": "QNT/USDT:USDT", "currency": "USDT", "minNotional": 25000.0, "maxNotional": 100000.0, @@ -33240,6 +38465,7 @@ }, { "tier": 4.0, + "symbol": "QNT/USDT:USDT", "currency": "USDT", "minNotional": 100000.0, "maxNotional": 250000.0, @@ -33256,6 +38482,7 @@ }, { "tier": 5.0, + "symbol": "QNT/USDT:USDT", "currency": "USDT", "minNotional": 250000.0, "maxNotional": 1000000.0, @@ -33272,6 +38499,7 @@ }, { "tier": 6.0, + "symbol": "QNT/USDT:USDT", "currency": "USDT", "minNotional": 1000000.0, "maxNotional": 5000000.0, @@ -33290,6 +38518,7 @@ "QTUM/USDT:USDT": [ { "tier": 1.0, + "symbol": "QTUM/USDT:USDT", "currency": "USDT", "minNotional": 0.0, "maxNotional": 5000.0, @@ -33306,6 +38535,7 @@ }, { "tier": 2.0, + "symbol": "QTUM/USDT:USDT", "currency": "USDT", "minNotional": 5000.0, "maxNotional": 25000.0, @@ -33322,6 +38552,7 @@ }, { "tier": 3.0, + "symbol": "QTUM/USDT:USDT", "currency": "USDT", "minNotional": 25000.0, "maxNotional": 200000.0, @@ -33338,6 +38569,7 @@ }, { "tier": 4.0, + "symbol": "QTUM/USDT:USDT", "currency": "USDT", "minNotional": 200000.0, "maxNotional": 500000.0, @@ -33354,6 +38586,7 @@ }, { "tier": 5.0, + "symbol": "QTUM/USDT:USDT", "currency": "USDT", "minNotional": 500000.0, "maxNotional": 1000000.0, @@ -33370,6 +38603,7 @@ }, { "tier": 6.0, + "symbol": "QTUM/USDT:USDT", "currency": "USDT", "minNotional": 1000000.0, "maxNotional": 3000000.0, @@ -33386,6 +38620,7 @@ }, { "tier": 7.0, + "symbol": "QTUM/USDT:USDT", "currency": "USDT", "minNotional": 3000000.0, "maxNotional": 5000000.0, @@ -33404,6 +38639,7 @@ "QUICK/USDT:USDT": [ { "tier": 1.0, + "symbol": "QUICK/USDT:USDT", "currency": "USDT", "minNotional": 0.0, "maxNotional": 5000.0, @@ -33420,6 +38656,7 @@ }, { "tier": 2.0, + "symbol": "QUICK/USDT:USDT", "currency": "USDT", "minNotional": 5000.0, "maxNotional": 10000.0, @@ -33436,6 +38673,7 @@ }, { "tier": 3.0, + "symbol": "QUICK/USDT:USDT", "currency": "USDT", "minNotional": 10000.0, "maxNotional": 20000.0, @@ -33452,6 +38690,7 @@ }, { "tier": 4.0, + "symbol": "QUICK/USDT:USDT", "currency": "USDT", "minNotional": 20000.0, "maxNotional": 40000.0, @@ -33468,6 +38707,7 @@ }, { "tier": 5.0, + "symbol": "QUICK/USDT:USDT", "currency": "USDT", "minNotional": 40000.0, "maxNotional": 200000.0, @@ -33484,6 +38724,7 @@ }, { "tier": 6.0, + "symbol": "QUICK/USDT:USDT", "currency": "USDT", "minNotional": 200000.0, "maxNotional": 400000.0, @@ -33500,6 +38741,7 @@ }, { "tier": 7.0, + "symbol": "QUICK/USDT:USDT", "currency": "USDT", "minNotional": 400000.0, "maxNotional": 500000.0, @@ -33516,6 +38758,7 @@ }, { "tier": 8.0, + "symbol": "QUICK/USDT:USDT", "currency": "USDT", "minNotional": 500000.0, "maxNotional": 1000000.0, @@ -33532,6 +38775,7 @@ }, { "tier": 9.0, + "symbol": "QUICK/USDT:USDT", "currency": "USDT", "minNotional": 1000000.0, "maxNotional": 2000000.0, @@ -33550,6 +38794,7 @@ "RAD/USDT:USDT": [ { "tier": 1.0, + "symbol": "RAD/USDT:USDT", "currency": "USDT", "minNotional": 0.0, "maxNotional": 5000.0, @@ -33566,6 +38811,7 @@ }, { "tier": 2.0, + "symbol": "RAD/USDT:USDT", "currency": "USDT", "minNotional": 5000.0, "maxNotional": 25000.0, @@ -33582,6 +38828,7 @@ }, { "tier": 3.0, + "symbol": "RAD/USDT:USDT", "currency": "USDT", "minNotional": 25000.0, "maxNotional": 200000.0, @@ -33598,6 +38845,7 @@ }, { "tier": 4.0, + "symbol": "RAD/USDT:USDT", "currency": "USDT", "minNotional": 200000.0, "maxNotional": 500000.0, @@ -33614,6 +38862,7 @@ }, { "tier": 5.0, + "symbol": "RAD/USDT:USDT", "currency": "USDT", "minNotional": 500000.0, "maxNotional": 1000000.0, @@ -33630,6 +38879,7 @@ }, { "tier": 6.0, + "symbol": "RAD/USDT:USDT", "currency": "USDT", "minNotional": 1000000.0, "maxNotional": 3000000.0, @@ -33646,6 +38896,7 @@ }, { "tier": 7.0, + "symbol": "RAD/USDT:USDT", "currency": "USDT", "minNotional": 3000000.0, "maxNotional": 3500000.0, @@ -33664,6 +38915,7 @@ "RARE/USDT:USDT": [ { "tier": 1.0, + "symbol": "RARE/USDT:USDT", "currency": "USDT", "minNotional": 0.0, "maxNotional": 10000.0, @@ -33680,6 +38932,7 @@ }, { "tier": 2.0, + "symbol": "RARE/USDT:USDT", "currency": "USDT", "minNotional": 10000.0, "maxNotional": 30000.0, @@ -33696,6 +38949,7 @@ }, { "tier": 3.0, + "symbol": "RARE/USDT:USDT", "currency": "USDT", "minNotional": 30000.0, "maxNotional": 150000.0, @@ -33712,6 +38966,7 @@ }, { "tier": 4.0, + "symbol": "RARE/USDT:USDT", "currency": "USDT", "minNotional": 150000.0, "maxNotional": 300000.0, @@ -33728,6 +38983,7 @@ }, { "tier": 5.0, + "symbol": "RARE/USDT:USDT", "currency": "USDT", "minNotional": 300000.0, "maxNotional": 1500000.0, @@ -33744,6 +39000,7 @@ }, { "tier": 6.0, + "symbol": "RARE/USDT:USDT", "currency": "USDT", "minNotional": 1500000.0, "maxNotional": 3000000.0, @@ -33760,6 +39017,7 @@ }, { "tier": 7.0, + "symbol": "RARE/USDT:USDT", "currency": "USDT", "minNotional": 3000000.0, "maxNotional": 3750000.0, @@ -33776,6 +39034,7 @@ }, { "tier": 8.0, + "symbol": "RARE/USDT:USDT", "currency": "USDT", "minNotional": 3750000.0, "maxNotional": 7500000.0, @@ -33792,6 +39051,7 @@ }, { "tier": 9.0, + "symbol": "RARE/USDT:USDT", "currency": "USDT", "minNotional": 7500000.0, "maxNotional": 15000000.0, @@ -33810,6 +39070,7 @@ "RAY/USDT:USDT": [ { "tier": 1.0, + "symbol": "RAY/USDT:USDT", "currency": "USDT", "minNotional": 0.0, "maxNotional": 5000.0, @@ -33826,6 +39087,7 @@ }, { "tier": 2.0, + "symbol": "RAY/USDT:USDT", "currency": "USDT", "minNotional": 5000.0, "maxNotional": 25000.0, @@ -33842,6 +39104,7 @@ }, { "tier": 3.0, + "symbol": "RAY/USDT:USDT", "currency": "USDT", "minNotional": 25000.0, "maxNotional": 100000.0, @@ -33858,6 +39121,7 @@ }, { "tier": 4.0, + "symbol": "RAY/USDT:USDT", "currency": "USDT", "minNotional": 100000.0, "maxNotional": 250000.0, @@ -33874,6 +39138,7 @@ }, { "tier": 5.0, + "symbol": "RAY/USDT:USDT", "currency": "USDT", "minNotional": 250000.0, "maxNotional": 1000000.0, @@ -33890,6 +39155,7 @@ }, { "tier": 6.0, + "symbol": "RAY/USDT:USDT", "currency": "USDT", "minNotional": 1000000.0, "maxNotional": 5000000.0, @@ -33908,6 +39174,7 @@ "RDNT/USDT:USDT": [ { "tier": 1.0, + "symbol": "RDNT/USDT:USDT", "currency": "USDT", "minNotional": 0.0, "maxNotional": 10000.0, @@ -33924,6 +39191,7 @@ }, { "tier": 2.0, + "symbol": "RDNT/USDT:USDT", "currency": "USDT", "minNotional": 10000.0, "maxNotional": 20000.0, @@ -33940,6 +39208,7 @@ }, { "tier": 3.0, + "symbol": "RDNT/USDT:USDT", "currency": "USDT", "minNotional": 20000.0, "maxNotional": 100000.0, @@ -33956,6 +39225,7 @@ }, { "tier": 4.0, + "symbol": "RDNT/USDT:USDT", "currency": "USDT", "minNotional": 100000.0, "maxNotional": 200000.0, @@ -33972,6 +39242,7 @@ }, { "tier": 5.0, + "symbol": "RDNT/USDT:USDT", "currency": "USDT", "minNotional": 200000.0, "maxNotional": 1000000.0, @@ -33988,6 +39259,7 @@ }, { "tier": 6.0, + "symbol": "RDNT/USDT:USDT", "currency": "USDT", "minNotional": 1000000.0, "maxNotional": 2000000.0, @@ -34004,6 +39276,7 @@ }, { "tier": 7.0, + "symbol": "RDNT/USDT:USDT", "currency": "USDT", "minNotional": 2000000.0, "maxNotional": 2500000.0, @@ -34020,6 +39293,7 @@ }, { "tier": 8.0, + "symbol": "RDNT/USDT:USDT", "currency": "USDT", "minNotional": 2500000.0, "maxNotional": 6000000.0, @@ -34036,6 +39310,7 @@ }, { "tier": 9.0, + "symbol": "RDNT/USDT:USDT", "currency": "USDT", "minNotional": 6000000.0, "maxNotional": 10000000.0, @@ -34054,6 +39329,7 @@ "REEF/USDT:USDT": [ { "tier": 1.0, + "symbol": "REEF/USDT:USDT", "currency": "USDT", "minNotional": 0.0, "maxNotional": 20000.0, @@ -34070,6 +39346,7 @@ }, { "tier": 2.0, + "symbol": "REEF/USDT:USDT", "currency": "USDT", "minNotional": 20000.0, "maxNotional": 25000.0, @@ -34086,6 +39363,7 @@ }, { "tier": 3.0, + "symbol": "REEF/USDT:USDT", "currency": "USDT", "minNotional": 25000.0, "maxNotional": 200000.0, @@ -34102,6 +39380,7 @@ }, { "tier": 4.0, + "symbol": "REEF/USDT:USDT", "currency": "USDT", "minNotional": 200000.0, "maxNotional": 400000.0, @@ -34118,6 +39397,7 @@ }, { "tier": 5.0, + "symbol": "REEF/USDT:USDT", "currency": "USDT", "minNotional": 400000.0, "maxNotional": 500000.0, @@ -34134,6 +39414,7 @@ }, { "tier": 6.0, + "symbol": "REEF/USDT:USDT", "currency": "USDT", "minNotional": 500000.0, "maxNotional": 1000000.0, @@ -34150,6 +39431,7 @@ }, { "tier": 7.0, + "symbol": "REEF/USDT:USDT", "currency": "USDT", "minNotional": 1000000.0, "maxNotional": 1500000.0, @@ -34168,6 +39450,7 @@ "REI/USDT:USDT": [ { "tier": 1.0, + "symbol": "REI/USDT:USDT", "currency": "USDT", "minNotional": 0.0, "maxNotional": 5000.0, @@ -34184,6 +39467,7 @@ }, { "tier": 2.0, + "symbol": "REI/USDT:USDT", "currency": "USDT", "minNotional": 5000.0, "maxNotional": 10000.0, @@ -34200,6 +39484,7 @@ }, { "tier": 3.0, + "symbol": "REI/USDT:USDT", "currency": "USDT", "minNotional": 10000.0, "maxNotional": 20000.0, @@ -34216,6 +39501,7 @@ }, { "tier": 4.0, + "symbol": "REI/USDT:USDT", "currency": "USDT", "minNotional": 20000.0, "maxNotional": 40000.0, @@ -34232,6 +39518,7 @@ }, { "tier": 5.0, + "symbol": "REI/USDT:USDT", "currency": "USDT", "minNotional": 40000.0, "maxNotional": 200000.0, @@ -34248,6 +39535,7 @@ }, { "tier": 6.0, + "symbol": "REI/USDT:USDT", "currency": "USDT", "minNotional": 200000.0, "maxNotional": 400000.0, @@ -34264,6 +39552,7 @@ }, { "tier": 7.0, + "symbol": "REI/USDT:USDT", "currency": "USDT", "minNotional": 400000.0, "maxNotional": 500000.0, @@ -34280,6 +39569,7 @@ }, { "tier": 8.0, + "symbol": "REI/USDT:USDT", "currency": "USDT", "minNotional": 500000.0, "maxNotional": 1000000.0, @@ -34296,6 +39586,7 @@ }, { "tier": 9.0, + "symbol": "REI/USDT:USDT", "currency": "USDT", "minNotional": 1000000.0, "maxNotional": 2000000.0, @@ -34314,14 +39605,15 @@ "REN/USDT:USDT": [ { "tier": 1.0, + "symbol": "REN/USDT:USDT", "currency": "USDT", "minNotional": 0.0, "maxNotional": 5000.0, "maintenanceMarginRate": 0.015, - "maxLeverage": 50.0, + "maxLeverage": 16.0, "info": { "bracket": "1", - "initialLeverage": "50", + "initialLeverage": "16", "notionalCap": "5000", "notionalFloor": "0", "maintMarginRatio": "0.015", @@ -34330,14 +39622,15 @@ }, { "tier": 2.0, + "symbol": "REN/USDT:USDT", "currency": "USDT", "minNotional": 5000.0, "maxNotional": 50000.0, "maintenanceMarginRate": 0.025, - "maxLeverage": 20.0, + "maxLeverage": 15.0, "info": { "bracket": "2", - "initialLeverage": "20", + "initialLeverage": "15", "notionalCap": "50000", "notionalFloor": "5000", "maintMarginRatio": "0.025", @@ -34346,6 +39639,7 @@ }, { "tier": 3.0, + "symbol": "REN/USDT:USDT", "currency": "USDT", "minNotional": 50000.0, "maxNotional": 600000.0, @@ -34362,15 +39656,16 @@ }, { "tier": 4.0, + "symbol": "REN/USDT:USDT", "currency": "USDT", "minNotional": 600000.0, - "maxNotional": 1600000.0, + "maxNotional": 1000000.0, "maintenanceMarginRate": 0.1, "maxLeverage": 5.0, "info": { "bracket": "4", "initialLeverage": "5", - "notionalCap": "1600000", + "notionalCap": "1000000", "notionalFloor": "600000", "maintMarginRatio": "0.1", "cum": "31300.0" @@ -34378,65 +39673,69 @@ }, { "tier": 5.0, + "symbol": "REN/USDT:USDT", "currency": "USDT", - "minNotional": 1600000.0, - "maxNotional": 2000000.0, + "minNotional": 1000000.0, + "maxNotional": 1500000.0, "maintenanceMarginRate": 0.125, "maxLeverage": 4.0, "info": { "bracket": "5", "initialLeverage": "4", - "notionalCap": "2000000", - "notionalFloor": "1600000", + "notionalCap": "1500000", + "notionalFloor": "1000000", "maintMarginRatio": "0.125", - "cum": "71300.0" + "cum": "56300.0" } }, { "tier": 6.0, + "symbol": "REN/USDT:USDT", "currency": "USDT", - "minNotional": 2000000.0, - "maxNotional": 6000000.0, + "minNotional": 1500000.0, + "maxNotional": 2000000.0, "maintenanceMarginRate": 0.25, "maxLeverage": 2.0, "info": { "bracket": "6", "initialLeverage": "2", - "notionalCap": "6000000", - "notionalFloor": "2000000", + "notionalCap": "2000000", + "notionalFloor": "1500000", "maintMarginRatio": "0.25", - "cum": "321300.0" + "cum": "243800.0" } }, { "tier": 7.0, + "symbol": "REN/USDT:USDT", "currency": "USDT", - "minNotional": 6000000.0, - "maxNotional": 10000000.0, + "minNotional": 2000000.0, + "maxNotional": 2100000.0, "maintenanceMarginRate": 0.5, "maxLeverage": 1.0, "info": { "bracket": "7", "initialLeverage": "1", - "notionalCap": "10000000", - "notionalFloor": "6000000", + "notionalCap": "2100000", + "notionalFloor": "2000000", "maintMarginRatio": "0.5", - "cum": "1821300.0" + "cum": "743800.0" } } ], "RENDER/USDT:USDT": [ { "tier": 1.0, + "symbol": "RENDER/USDT:USDT", "currency": "USDT", "minNotional": 0.0, - "maxNotional": 5000.0, + "maxNotional": 10000.0, "maintenanceMarginRate": 0.01, "maxLeverage": 75.0, "info": { "bracket": "1", "initialLeverage": "75", - "notionalCap": "5000", + "notionalCap": "10000", "notionalFloor": "0", "maintMarginRatio": "0.01", "cum": "0.0" @@ -34444,136 +39743,145 @@ }, { "tier": 2.0, + "symbol": "RENDER/USDT:USDT", "currency": "USDT", - "minNotional": 5000.0, - "maxNotional": 16000.0, + "minNotional": 10000.0, + "maxNotional": 40000.0, "maintenanceMarginRate": 0.015, "maxLeverage": 50.0, "info": { "bracket": "2", "initialLeverage": "50", - "notionalCap": "16000", - "notionalFloor": "5000", + "notionalCap": "40000", + "notionalFloor": "10000", "maintMarginRatio": "0.015", - "cum": "25.0" + "cum": "50.0" } }, { "tier": 3.0, + "symbol": "RENDER/USDT:USDT", "currency": "USDT", - "minNotional": 16000.0, - "maxNotional": 80000.0, + "minNotional": 40000.0, + "maxNotional": 200000.0, "maintenanceMarginRate": 0.02, "maxLeverage": 25.0, "info": { "bracket": "3", "initialLeverage": "25", - "notionalCap": "80000", - "notionalFloor": "16000", + "notionalCap": "200000", + "notionalFloor": "40000", "maintMarginRatio": "0.02", - "cum": "105.0" + "cum": "250.0" } }, { "tier": 4.0, + "symbol": "RENDER/USDT:USDT", "currency": "USDT", - "minNotional": 80000.0, - "maxNotional": 160000.0, + "minNotional": 200000.0, + "maxNotional": 400000.0, "maintenanceMarginRate": 0.025, "maxLeverage": 20.0, "info": { "bracket": "4", "initialLeverage": "20", - "notionalCap": "160000", - "notionalFloor": "80000", + "notionalCap": "400000", + "notionalFloor": "200000", "maintMarginRatio": "0.025", - "cum": "505.0" + "cum": "1250.0" } }, { "tier": 5.0, + "symbol": "RENDER/USDT:USDT", "currency": "USDT", - "minNotional": 160000.0, - "maxNotional": 800000.0, + "minNotional": 400000.0, + "maxNotional": 2000000.0, "maintenanceMarginRate": 0.05, "maxLeverage": 10.0, "info": { "bracket": "5", "initialLeverage": "10", - "notionalCap": "800000", - "notionalFloor": "160000", + "notionalCap": "2000000", + "notionalFloor": "400000", "maintMarginRatio": "0.05", - "cum": "4505.0" + "cum": "11250.0" } }, { "tier": 6.0, + "symbol": "RENDER/USDT:USDT", "currency": "USDT", - "minNotional": 800000.0, - "maxNotional": 1600000.0, + "minNotional": 2000000.0, + "maxNotional": 4000000.0, "maintenanceMarginRate": 0.1, "maxLeverage": 5.0, "info": { "bracket": "6", "initialLeverage": "5", - "notionalCap": "1600000", - "notionalFloor": "800000", + "notionalCap": "4000000", + "notionalFloor": "2000000", "maintMarginRatio": "0.1", - "cum": "44505.0" + "cum": "111250.0" } }, { "tier": 7.0, + "symbol": "RENDER/USDT:USDT", "currency": "USDT", - "minNotional": 1600000.0, - "maxNotional": 2000000.0, + "minNotional": 4000000.0, + "maxNotional": 5000000.0, "maintenanceMarginRate": 0.125, "maxLeverage": 4.0, "info": { "bracket": "7", "initialLeverage": "4", - "notionalCap": "2000000", - "notionalFloor": "1600000", + "notionalCap": "5000000", + "notionalFloor": "4000000", "maintMarginRatio": "0.125", - "cum": "84505.0" + "cum": "211250.0" } }, { "tier": 8.0, + "symbol": "RENDER/USDT:USDT", "currency": "USDT", - "minNotional": 2000000.0, - "maxNotional": 4000000.0, + "minNotional": 5000000.0, + "maxNotional": 10000000.0, "maintenanceMarginRate": 0.25, "maxLeverage": 2.0, "info": { "bracket": "8", "initialLeverage": "2", - "notionalCap": "4000000", - "notionalFloor": "2000000", + "notionalCap": "10000000", + "notionalFloor": "5000000", "maintMarginRatio": "0.25", - "cum": "334505.0" + "cum": "836250.0" } }, { "tier": 9.0, + "symbol": "RENDER/USDT:USDT", "currency": "USDT", - "minNotional": 4000000.0, - "maxNotional": 8000000.0, + "minNotional": 10000000.0, + "maxNotional": 20000000.0, "maintenanceMarginRate": 0.5, "maxLeverage": 1.0, "info": { "bracket": "9", "initialLeverage": "1", - "notionalCap": "8000000", - "notionalFloor": "4000000", + "notionalCap": "20000000", + "notionalFloor": "10000000", "maintMarginRatio": "0.5", - "cum": "1334505.0" + "cum": "3336250.0" } } ], "REZ/USDT:USDT": [ { "tier": 1.0, + "symbol": "REZ/USDT:USDT", "currency": "USDT", "minNotional": 0.0, "maxNotional": 5000.0, @@ -34590,6 +39898,7 @@ }, { "tier": 2.0, + "symbol": "REZ/USDT:USDT", "currency": "USDT", "minNotional": 5000.0, "maxNotional": 20000.0, @@ -34606,6 +39915,7 @@ }, { "tier": 3.0, + "symbol": "REZ/USDT:USDT", "currency": "USDT", "minNotional": 20000.0, "maxNotional": 30000.0, @@ -34622,6 +39932,7 @@ }, { "tier": 4.0, + "symbol": "REZ/USDT:USDT", "currency": "USDT", "minNotional": 30000.0, "maxNotional": 300000.0, @@ -34638,6 +39949,7 @@ }, { "tier": 5.0, + "symbol": "REZ/USDT:USDT", "currency": "USDT", "minNotional": 300000.0, "maxNotional": 600000.0, @@ -34654,6 +39966,7 @@ }, { "tier": 6.0, + "symbol": "REZ/USDT:USDT", "currency": "USDT", "minNotional": 600000.0, "maxNotional": 750000.0, @@ -34670,6 +39983,7 @@ }, { "tier": 7.0, + "symbol": "REZ/USDT:USDT", "currency": "USDT", "minNotional": 750000.0, "maxNotional": 1500000.0, @@ -34686,6 +40000,7 @@ }, { "tier": 8.0, + "symbol": "REZ/USDT:USDT", "currency": "USDT", "minNotional": 1500000.0, "maxNotional": 3000000.0, @@ -34704,6 +40019,7 @@ "RIF/USDT:USDT": [ { "tier": 1.0, + "symbol": "RIF/USDT:USDT", "currency": "USDT", "minNotional": 0.0, "maxNotional": 5000.0, @@ -34720,6 +40036,7 @@ }, { "tier": 2.0, + "symbol": "RIF/USDT:USDT", "currency": "USDT", "minNotional": 5000.0, "maxNotional": 25000.0, @@ -34736,6 +40053,7 @@ }, { "tier": 3.0, + "symbol": "RIF/USDT:USDT", "currency": "USDT", "minNotional": 25000.0, "maxNotional": 100000.0, @@ -34752,6 +40070,7 @@ }, { "tier": 4.0, + "symbol": "RIF/USDT:USDT", "currency": "USDT", "minNotional": 100000.0, "maxNotional": 200000.0, @@ -34768,6 +40087,7 @@ }, { "tier": 5.0, + "symbol": "RIF/USDT:USDT", "currency": "USDT", "minNotional": 200000.0, "maxNotional": 500000.0, @@ -34784,6 +40104,7 @@ }, { "tier": 6.0, + "symbol": "RIF/USDT:USDT", "currency": "USDT", "minNotional": 500000.0, "maxNotional": 1000000.0, @@ -34800,6 +40121,7 @@ }, { "tier": 7.0, + "symbol": "RIF/USDT:USDT", "currency": "USDT", "minNotional": 1000000.0, "maxNotional": 2000000.0, @@ -34818,6 +40140,7 @@ "RLC/USDT:USDT": [ { "tier": 1.0, + "symbol": "RLC/USDT:USDT", "currency": "USDT", "minNotional": 0.0, "maxNotional": 5000.0, @@ -34834,6 +40157,7 @@ }, { "tier": 2.0, + "symbol": "RLC/USDT:USDT", "currency": "USDT", "minNotional": 5000.0, "maxNotional": 25000.0, @@ -34850,6 +40174,7 @@ }, { "tier": 3.0, + "symbol": "RLC/USDT:USDT", "currency": "USDT", "minNotional": 25000.0, "maxNotional": 600000.0, @@ -34866,6 +40191,7 @@ }, { "tier": 4.0, + "symbol": "RLC/USDT:USDT", "currency": "USDT", "minNotional": 600000.0, "maxNotional": 1600000.0, @@ -34882,6 +40208,7 @@ }, { "tier": 5.0, + "symbol": "RLC/USDT:USDT", "currency": "USDT", "minNotional": 1600000.0, "maxNotional": 2000000.0, @@ -34898,6 +40225,7 @@ }, { "tier": 6.0, + "symbol": "RLC/USDT:USDT", "currency": "USDT", "minNotional": 2000000.0, "maxNotional": 6000000.0, @@ -34914,6 +40242,7 @@ }, { "tier": 7.0, + "symbol": "RLC/USDT:USDT", "currency": "USDT", "minNotional": 6000000.0, "maxNotional": 10000000.0, @@ -34932,6 +40261,7 @@ "RONIN/USDT:USDT": [ { "tier": 1.0, + "symbol": "RONIN/USDT:USDT", "currency": "USDT", "minNotional": 0.0, "maxNotional": 5000.0, @@ -34948,6 +40278,7 @@ }, { "tier": 2.0, + "symbol": "RONIN/USDT:USDT", "currency": "USDT", "minNotional": 5000.0, "maxNotional": 25000.0, @@ -34964,6 +40295,7 @@ }, { "tier": 3.0, + "symbol": "RONIN/USDT:USDT", "currency": "USDT", "minNotional": 25000.0, "maxNotional": 100000.0, @@ -34980,6 +40312,7 @@ }, { "tier": 4.0, + "symbol": "RONIN/USDT:USDT", "currency": "USDT", "minNotional": 100000.0, "maxNotional": 200000.0, @@ -34996,6 +40329,7 @@ }, { "tier": 5.0, + "symbol": "RONIN/USDT:USDT", "currency": "USDT", "minNotional": 200000.0, "maxNotional": 500000.0, @@ -35012,6 +40346,7 @@ }, { "tier": 6.0, + "symbol": "RONIN/USDT:USDT", "currency": "USDT", "minNotional": 500000.0, "maxNotional": 1000000.0, @@ -35028,6 +40363,7 @@ }, { "tier": 7.0, + "symbol": "RONIN/USDT:USDT", "currency": "USDT", "minNotional": 1000000.0, "maxNotional": 2000000.0, @@ -35046,6 +40382,7 @@ "ROSE/USDT:USDT": [ { "tier": 1.0, + "symbol": "ROSE/USDT:USDT", "currency": "USDT", "minNotional": 0.0, "maxNotional": 5000.0, @@ -35062,6 +40399,7 @@ }, { "tier": 2.0, + "symbol": "ROSE/USDT:USDT", "currency": "USDT", "minNotional": 5000.0, "maxNotional": 10000.0, @@ -35078,6 +40416,7 @@ }, { "tier": 3.0, + "symbol": "ROSE/USDT:USDT", "currency": "USDT", "minNotional": 10000.0, "maxNotional": 50000.0, @@ -35094,6 +40433,7 @@ }, { "tier": 4.0, + "symbol": "ROSE/USDT:USDT", "currency": "USDT", "minNotional": 50000.0, "maxNotional": 100000.0, @@ -35110,6 +40450,7 @@ }, { "tier": 5.0, + "symbol": "ROSE/USDT:USDT", "currency": "USDT", "minNotional": 100000.0, "maxNotional": 500000.0, @@ -35126,6 +40467,7 @@ }, { "tier": 6.0, + "symbol": "ROSE/USDT:USDT", "currency": "USDT", "minNotional": 500000.0, "maxNotional": 1000000.0, @@ -35142,6 +40484,7 @@ }, { "tier": 7.0, + "symbol": "ROSE/USDT:USDT", "currency": "USDT", "minNotional": 1000000.0, "maxNotional": 1250000.0, @@ -35158,6 +40501,7 @@ }, { "tier": 8.0, + "symbol": "ROSE/USDT:USDT", "currency": "USDT", "minNotional": 1250000.0, "maxNotional": 3000000.0, @@ -35174,6 +40518,7 @@ }, { "tier": 9.0, + "symbol": "ROSE/USDT:USDT", "currency": "USDT", "minNotional": 3000000.0, "maxNotional": 5000000.0, @@ -35192,6 +40537,7 @@ "RPL/USDT:USDT": [ { "tier": 1.0, + "symbol": "RPL/USDT:USDT", "currency": "USDT", "minNotional": 0.0, "maxNotional": 5000.0, @@ -35208,6 +40554,7 @@ }, { "tier": 2.0, + "symbol": "RPL/USDT:USDT", "currency": "USDT", "minNotional": 5000.0, "maxNotional": 10000.0, @@ -35224,6 +40571,7 @@ }, { "tier": 3.0, + "symbol": "RPL/USDT:USDT", "currency": "USDT", "minNotional": 10000.0, "maxNotional": 20000.0, @@ -35240,6 +40588,7 @@ }, { "tier": 4.0, + "symbol": "RPL/USDT:USDT", "currency": "USDT", "minNotional": 20000.0, "maxNotional": 40000.0, @@ -35256,6 +40605,7 @@ }, { "tier": 5.0, + "symbol": "RPL/USDT:USDT", "currency": "USDT", "minNotional": 40000.0, "maxNotional": 200000.0, @@ -35272,6 +40622,7 @@ }, { "tier": 6.0, + "symbol": "RPL/USDT:USDT", "currency": "USDT", "minNotional": 200000.0, "maxNotional": 400000.0, @@ -35288,6 +40639,7 @@ }, { "tier": 7.0, + "symbol": "RPL/USDT:USDT", "currency": "USDT", "minNotional": 400000.0, "maxNotional": 500000.0, @@ -35304,6 +40656,7 @@ }, { "tier": 8.0, + "symbol": "RPL/USDT:USDT", "currency": "USDT", "minNotional": 500000.0, "maxNotional": 1000000.0, @@ -35320,6 +40673,7 @@ }, { "tier": 9.0, + "symbol": "RPL/USDT:USDT", "currency": "USDT", "minNotional": 1000000.0, "maxNotional": 2000000.0, @@ -35338,6 +40692,7 @@ "RSR/USDT:USDT": [ { "tier": 1.0, + "symbol": "RSR/USDT:USDT", "currency": "USDT", "minNotional": 0.0, "maxNotional": 5000.0, @@ -35354,6 +40709,7 @@ }, { "tier": 2.0, + "symbol": "RSR/USDT:USDT", "currency": "USDT", "minNotional": 5000.0, "maxNotional": 10000.0, @@ -35370,6 +40726,7 @@ }, { "tier": 3.0, + "symbol": "RSR/USDT:USDT", "currency": "USDT", "minNotional": 10000.0, "maxNotional": 50000.0, @@ -35386,6 +40743,7 @@ }, { "tier": 4.0, + "symbol": "RSR/USDT:USDT", "currency": "USDT", "minNotional": 50000.0, "maxNotional": 100000.0, @@ -35402,6 +40760,7 @@ }, { "tier": 5.0, + "symbol": "RSR/USDT:USDT", "currency": "USDT", "minNotional": 100000.0, "maxNotional": 500000.0, @@ -35418,6 +40777,7 @@ }, { "tier": 6.0, + "symbol": "RSR/USDT:USDT", "currency": "USDT", "minNotional": 500000.0, "maxNotional": 1000000.0, @@ -35434,6 +40794,7 @@ }, { "tier": 7.0, + "symbol": "RSR/USDT:USDT", "currency": "USDT", "minNotional": 1000000.0, "maxNotional": 1250000.0, @@ -35450,6 +40811,7 @@ }, { "tier": 8.0, + "symbol": "RSR/USDT:USDT", "currency": "USDT", "minNotional": 1250000.0, "maxNotional": 3000000.0, @@ -35466,6 +40828,7 @@ }, { "tier": 9.0, + "symbol": "RSR/USDT:USDT", "currency": "USDT", "minNotional": 3000000.0, "maxNotional": 5000000.0, @@ -35484,6 +40847,7 @@ "RUNE/USDT:USDT": [ { "tier": 1.0, + "symbol": "RUNE/USDT:USDT", "currency": "USDT", "minNotional": 0.0, "maxNotional": 10000.0, @@ -35500,6 +40864,7 @@ }, { "tier": 2.0, + "symbol": "RUNE/USDT:USDT", "currency": "USDT", "minNotional": 10000.0, "maxNotional": 30000.0, @@ -35516,6 +40881,7 @@ }, { "tier": 3.0, + "symbol": "RUNE/USDT:USDT", "currency": "USDT", "minNotional": 30000.0, "maxNotional": 150000.0, @@ -35532,6 +40898,7 @@ }, { "tier": 4.0, + "symbol": "RUNE/USDT:USDT", "currency": "USDT", "minNotional": 150000.0, "maxNotional": 300000.0, @@ -35548,6 +40915,7 @@ }, { "tier": 5.0, + "symbol": "RUNE/USDT:USDT", "currency": "USDT", "minNotional": 300000.0, "maxNotional": 1500000.0, @@ -35564,6 +40932,7 @@ }, { "tier": 6.0, + "symbol": "RUNE/USDT:USDT", "currency": "USDT", "minNotional": 1500000.0, "maxNotional": 3000000.0, @@ -35580,6 +40949,7 @@ }, { "tier": 7.0, + "symbol": "RUNE/USDT:USDT", "currency": "USDT", "minNotional": 3000000.0, "maxNotional": 3750000.0, @@ -35596,6 +40966,7 @@ }, { "tier": 8.0, + "symbol": "RUNE/USDT:USDT", "currency": "USDT", "minNotional": 3750000.0, "maxNotional": 7500000.0, @@ -35612,6 +40983,7 @@ }, { "tier": 9.0, + "symbol": "RUNE/USDT:USDT", "currency": "USDT", "minNotional": 7500000.0, "maxNotional": 15000000.0, @@ -35630,6 +41002,7 @@ "RVN/USDT:USDT": [ { "tier": 1.0, + "symbol": "RVN/USDT:USDT", "currency": "USDT", "minNotional": 0.0, "maxNotional": 5000.0, @@ -35646,6 +41019,7 @@ }, { "tier": 2.0, + "symbol": "RVN/USDT:USDT", "currency": "USDT", "minNotional": 5000.0, "maxNotional": 20000.0, @@ -35662,6 +41036,7 @@ }, { "tier": 3.0, + "symbol": "RVN/USDT:USDT", "currency": "USDT", "minNotional": 20000.0, "maxNotional": 25000.0, @@ -35678,6 +41053,7 @@ }, { "tier": 4.0, + "symbol": "RVN/USDT:USDT", "currency": "USDT", "minNotional": 25000.0, "maxNotional": 200000.0, @@ -35694,6 +41070,7 @@ }, { "tier": 5.0, + "symbol": "RVN/USDT:USDT", "currency": "USDT", "minNotional": 200000.0, "maxNotional": 400000.0, @@ -35710,6 +41087,7 @@ }, { "tier": 6.0, + "symbol": "RVN/USDT:USDT", "currency": "USDT", "minNotional": 400000.0, "maxNotional": 500000.0, @@ -35726,6 +41104,7 @@ }, { "tier": 7.0, + "symbol": "RVN/USDT:USDT", "currency": "USDT", "minNotional": 500000.0, "maxNotional": 1000000.0, @@ -35742,6 +41121,7 @@ }, { "tier": 8.0, + "symbol": "RVN/USDT:USDT", "currency": "USDT", "minNotional": 1000000.0, "maxNotional": 2000000.0, @@ -35760,6 +41140,7 @@ "SAFE/USDT:USDT": [ { "tier": 1.0, + "symbol": "SAFE/USDT:USDT", "currency": "USDT", "minNotional": 0.0, "maxNotional": 5000.0, @@ -35776,6 +41157,7 @@ }, { "tier": 2.0, + "symbol": "SAFE/USDT:USDT", "currency": "USDT", "minNotional": 5000.0, "maxNotional": 10000.0, @@ -35792,6 +41174,7 @@ }, { "tier": 3.0, + "symbol": "SAFE/USDT:USDT", "currency": "USDT", "minNotional": 10000.0, "maxNotional": 30000.0, @@ -35808,6 +41191,7 @@ }, { "tier": 4.0, + "symbol": "SAFE/USDT:USDT", "currency": "USDT", "minNotional": 30000.0, "maxNotional": 60000.0, @@ -35824,6 +41208,7 @@ }, { "tier": 5.0, + "symbol": "SAFE/USDT:USDT", "currency": "USDT", "minNotional": 60000.0, "maxNotional": 300000.0, @@ -35840,6 +41225,7 @@ }, { "tier": 6.0, + "symbol": "SAFE/USDT:USDT", "currency": "USDT", "minNotional": 300000.0, "maxNotional": 600000.0, @@ -35856,6 +41242,7 @@ }, { "tier": 7.0, + "symbol": "SAFE/USDT:USDT", "currency": "USDT", "minNotional": 600000.0, "maxNotional": 750000.0, @@ -35872,6 +41259,7 @@ }, { "tier": 8.0, + "symbol": "SAFE/USDT:USDT", "currency": "USDT", "minNotional": 750000.0, "maxNotional": 1500000.0, @@ -35888,6 +41276,7 @@ }, { "tier": 9.0, + "symbol": "SAFE/USDT:USDT", "currency": "USDT", "minNotional": 1500000.0, "maxNotional": 3000000.0, @@ -35906,6 +41295,7 @@ "SAGA/USDT:USDT": [ { "tier": 1.0, + "symbol": "SAGA/USDT:USDT", "currency": "USDT", "minNotional": 0.0, "maxNotional": 10000.0, @@ -35922,6 +41312,7 @@ }, { "tier": 2.0, + "symbol": "SAGA/USDT:USDT", "currency": "USDT", "minNotional": 10000.0, "maxNotional": 30000.0, @@ -35938,6 +41329,7 @@ }, { "tier": 3.0, + "symbol": "SAGA/USDT:USDT", "currency": "USDT", "minNotional": 30000.0, "maxNotional": 150000.0, @@ -35954,6 +41346,7 @@ }, { "tier": 4.0, + "symbol": "SAGA/USDT:USDT", "currency": "USDT", "minNotional": 150000.0, "maxNotional": 300000.0, @@ -35970,6 +41363,7 @@ }, { "tier": 5.0, + "symbol": "SAGA/USDT:USDT", "currency": "USDT", "minNotional": 300000.0, "maxNotional": 1500000.0, @@ -35986,6 +41380,7 @@ }, { "tier": 6.0, + "symbol": "SAGA/USDT:USDT", "currency": "USDT", "minNotional": 1500000.0, "maxNotional": 3000000.0, @@ -36002,6 +41397,7 @@ }, { "tier": 7.0, + "symbol": "SAGA/USDT:USDT", "currency": "USDT", "minNotional": 3000000.0, "maxNotional": 3750000.0, @@ -36018,6 +41414,7 @@ }, { "tier": 8.0, + "symbol": "SAGA/USDT:USDT", "currency": "USDT", "minNotional": 3750000.0, "maxNotional": 7500000.0, @@ -36034,6 +41431,7 @@ }, { "tier": 9.0, + "symbol": "SAGA/USDT:USDT", "currency": "USDT", "minNotional": 7500000.0, "maxNotional": 15000000.0, @@ -36052,6 +41450,7 @@ "SAND/USDT:USDT": [ { "tier": 1.0, + "symbol": "SAND/USDT:USDT", "currency": "USDT", "minNotional": 0.0, "maxNotional": 5000.0, @@ -36068,6 +41467,7 @@ }, { "tier": 2.0, + "symbol": "SAND/USDT:USDT", "currency": "USDT", "minNotional": 5000.0, "maxNotional": 25000.0, @@ -36084,6 +41484,7 @@ }, { "tier": 3.0, + "symbol": "SAND/USDT:USDT", "currency": "USDT", "minNotional": 25000.0, "maxNotional": 50000.0, @@ -36100,6 +41501,7 @@ }, { "tier": 4.0, + "symbol": "SAND/USDT:USDT", "currency": "USDT", "minNotional": 50000.0, "maxNotional": 400000.0, @@ -36116,6 +41518,7 @@ }, { "tier": 5.0, + "symbol": "SAND/USDT:USDT", "currency": "USDT", "minNotional": 400000.0, "maxNotional": 800000.0, @@ -36132,6 +41535,7 @@ }, { "tier": 6.0, + "symbol": "SAND/USDT:USDT", "currency": "USDT", "minNotional": 800000.0, "maxNotional": 2000000.0, @@ -36148,6 +41552,7 @@ }, { "tier": 7.0, + "symbol": "SAND/USDT:USDT", "currency": "USDT", "minNotional": 2000000.0, "maxNotional": 5000000.0, @@ -36164,6 +41569,7 @@ }, { "tier": 8.0, + "symbol": "SAND/USDT:USDT", "currency": "USDT", "minNotional": 5000000.0, "maxNotional": 12000000.0, @@ -36180,6 +41586,7 @@ }, { "tier": 9.0, + "symbol": "SAND/USDT:USDT", "currency": "USDT", "minNotional": 12000000.0, "maxNotional": 20000000.0, @@ -36198,6 +41605,7 @@ "SANTOS/USDT:USDT": [ { "tier": 1.0, + "symbol": "SANTOS/USDT:USDT", "currency": "USDT", "minNotional": 0.0, "maxNotional": 5000.0, @@ -36214,6 +41622,7 @@ }, { "tier": 2.0, + "symbol": "SANTOS/USDT:USDT", "currency": "USDT", "minNotional": 5000.0, "maxNotional": 10000.0, @@ -36230,6 +41639,7 @@ }, { "tier": 3.0, + "symbol": "SANTOS/USDT:USDT", "currency": "USDT", "minNotional": 10000.0, "maxNotional": 30000.0, @@ -36246,6 +41656,7 @@ }, { "tier": 4.0, + "symbol": "SANTOS/USDT:USDT", "currency": "USDT", "minNotional": 30000.0, "maxNotional": 60000.0, @@ -36262,6 +41673,7 @@ }, { "tier": 5.0, + "symbol": "SANTOS/USDT:USDT", "currency": "USDT", "minNotional": 60000.0, "maxNotional": 300000.0, @@ -36278,6 +41690,7 @@ }, { "tier": 6.0, + "symbol": "SANTOS/USDT:USDT", "currency": "USDT", "minNotional": 300000.0, "maxNotional": 600000.0, @@ -36294,6 +41707,7 @@ }, { "tier": 7.0, + "symbol": "SANTOS/USDT:USDT", "currency": "USDT", "minNotional": 600000.0, "maxNotional": 750000.0, @@ -36310,6 +41724,7 @@ }, { "tier": 8.0, + "symbol": "SANTOS/USDT:USDT", "currency": "USDT", "minNotional": 750000.0, "maxNotional": 1500000.0, @@ -36326,6 +41741,7 @@ }, { "tier": 9.0, + "symbol": "SANTOS/USDT:USDT", "currency": "USDT", "minNotional": 1500000.0, "maxNotional": 3000000.0, @@ -36344,6 +41760,7 @@ "SC/USDT:USDT": [ { "tier": 1.0, + "symbol": "SC/USDT:USDT", "currency": "USDT", "minNotional": 0.0, "maxNotional": 5000.0, @@ -36360,6 +41777,7 @@ }, { "tier": 2.0, + "symbol": "SC/USDT:USDT", "currency": "USDT", "minNotional": 5000.0, "maxNotional": 25000.0, @@ -36376,6 +41794,7 @@ }, { "tier": 3.0, + "symbol": "SC/USDT:USDT", "currency": "USDT", "minNotional": 25000.0, "maxNotional": 100000.0, @@ -36392,6 +41811,7 @@ }, { "tier": 4.0, + "symbol": "SC/USDT:USDT", "currency": "USDT", "minNotional": 100000.0, "maxNotional": 250000.0, @@ -36408,6 +41828,7 @@ }, { "tier": 5.0, + "symbol": "SC/USDT:USDT", "currency": "USDT", "minNotional": 250000.0, "maxNotional": 1000000.0, @@ -36424,6 +41845,7 @@ }, { "tier": 6.0, + "symbol": "SC/USDT:USDT", "currency": "USDT", "minNotional": 1000000.0, "maxNotional": 5000000.0, @@ -36442,6 +41864,7 @@ "SCR/USDT:USDT": [ { "tier": 1.0, + "symbol": "SCR/USDT:USDT", "currency": "USDT", "minNotional": 0.0, "maxNotional": 5000.0, @@ -36458,6 +41881,162 @@ }, { "tier": 2.0, + "symbol": "SCR/USDT:USDT", + "currency": "USDT", + "minNotional": 5000.0, + "maxNotional": 16000.0, + "maintenanceMarginRate": 0.015, + "maxLeverage": 50.0, + "info": { + "bracket": "2", + "initialLeverage": "50", + "notionalCap": "16000", + "notionalFloor": "5000", + "maintMarginRatio": "0.015", + "cum": "25.0" + } + }, + { + "tier": 3.0, + "symbol": "SCR/USDT:USDT", + "currency": "USDT", + "minNotional": 16000.0, + "maxNotional": 80000.0, + "maintenanceMarginRate": 0.02, + "maxLeverage": 25.0, + "info": { + "bracket": "3", + "initialLeverage": "25", + "notionalCap": "80000", + "notionalFloor": "16000", + "maintMarginRatio": "0.02", + "cum": "105.0" + } + }, + { + "tier": 4.0, + "symbol": "SCR/USDT:USDT", + "currency": "USDT", + "minNotional": 80000.0, + "maxNotional": 160000.0, + "maintenanceMarginRate": 0.025, + "maxLeverage": 20.0, + "info": { + "bracket": "4", + "initialLeverage": "20", + "notionalCap": "160000", + "notionalFloor": "80000", + "maintMarginRatio": "0.025", + "cum": "505.0" + } + }, + { + "tier": 5.0, + "symbol": "SCR/USDT:USDT", + "currency": "USDT", + "minNotional": 160000.0, + "maxNotional": 800000.0, + "maintenanceMarginRate": 0.05, + "maxLeverage": 10.0, + "info": { + "bracket": "5", + "initialLeverage": "10", + "notionalCap": "800000", + "notionalFloor": "160000", + "maintMarginRatio": "0.05", + "cum": "4505.0" + } + }, + { + "tier": 6.0, + "symbol": "SCR/USDT:USDT", + "currency": "USDT", + "minNotional": 800000.0, + "maxNotional": 1600000.0, + "maintenanceMarginRate": 0.1, + "maxLeverage": 5.0, + "info": { + "bracket": "6", + "initialLeverage": "5", + "notionalCap": "1600000", + "notionalFloor": "800000", + "maintMarginRatio": "0.1", + "cum": "44505.0" + } + }, + { + "tier": 7.0, + "symbol": "SCR/USDT:USDT", + "currency": "USDT", + "minNotional": 1600000.0, + "maxNotional": 2000000.0, + "maintenanceMarginRate": 0.125, + "maxLeverage": 4.0, + "info": { + "bracket": "7", + "initialLeverage": "4", + "notionalCap": "2000000", + "notionalFloor": "1600000", + "maintMarginRatio": "0.125", + "cum": "84505.0" + } + }, + { + "tier": 8.0, + "symbol": "SCR/USDT:USDT", + "currency": "USDT", + "minNotional": 2000000.0, + "maxNotional": 4000000.0, + "maintenanceMarginRate": 0.25, + "maxLeverage": 2.0, + "info": { + "bracket": "8", + "initialLeverage": "2", + "notionalCap": "4000000", + "notionalFloor": "2000000", + "maintMarginRatio": "0.25", + "cum": "334505.0" + } + }, + { + "tier": 9.0, + "symbol": "SCR/USDT:USDT", + "currency": "USDT", + "minNotional": 4000000.0, + "maxNotional": 8000000.0, + "maintenanceMarginRate": 0.5, + "maxLeverage": 1.0, + "info": { + "bracket": "9", + "initialLeverage": "1", + "notionalCap": "8000000", + "notionalFloor": "4000000", + "maintMarginRatio": "0.5", + "cum": "1334505.0" + } + } + ], + "SCRT/USDT:USDT": [ + { + "tier": 1.0, + "symbol": "SCRT/USDT:USDT", + "currency": "USDT", + "minNotional": 0.0, + "maxNotional": 5000.0, + "maintenanceMarginRate": 0.01, + "maxLeverage": 75.0, + "info": { + "bracket": "1", + "initialLeverage": "75", + "notionalCap": "5000", + "notionalFloor": "0", + "maintMarginRatio": "0.01", + "cum": "0.0" + } + }, + { + "tier": 2.0, + "symbol": "SCRT/USDT:USDT", "currency": "USDT", "minNotional": 5000.0, "maxNotional": 10000.0, @@ -36474,6 +42053,7 @@ }, { "tier": 3.0, + "symbol": "SCRT/USDT:USDT", "currency": "USDT", "minNotional": 10000.0, "maxNotional": 30000.0, @@ -36490,6 +42070,7 @@ }, { "tier": 4.0, + "symbol": "SCRT/USDT:USDT", "currency": "USDT", "minNotional": 30000.0, "maxNotional": 60000.0, @@ -36506,6 +42087,7 @@ }, { "tier": 5.0, + "symbol": "SCRT/USDT:USDT", "currency": "USDT", "minNotional": 60000.0, "maxNotional": 300000.0, @@ -36522,6 +42104,7 @@ }, { "tier": 6.0, + "symbol": "SCRT/USDT:USDT", "currency": "USDT", "minNotional": 300000.0, "maxNotional": 600000.0, @@ -36538,6 +42121,7 @@ }, { "tier": 7.0, + "symbol": "SCRT/USDT:USDT", "currency": "USDT", "minNotional": 600000.0, "maxNotional": 750000.0, @@ -36554,6 +42138,7 @@ }, { "tier": 8.0, + "symbol": "SCRT/USDT:USDT", "currency": "USDT", "minNotional": 750000.0, "maxNotional": 1500000.0, @@ -36570,6 +42155,7 @@ }, { "tier": 9.0, + "symbol": "SCRT/USDT:USDT", "currency": "USDT", "minNotional": 1500000.0, "maxNotional": 3000000.0, @@ -36588,6 +42174,7 @@ "SEI/USDT:USDT": [ { "tier": 1.0, + "symbol": "SEI/USDT:USDT", "currency": "USDT", "minNotional": 0.0, "maxNotional": 10000.0, @@ -36604,6 +42191,7 @@ }, { "tier": 2.0, + "symbol": "SEI/USDT:USDT", "currency": "USDT", "minNotional": 10000.0, "maxNotional": 60000.0, @@ -36620,6 +42208,7 @@ }, { "tier": 3.0, + "symbol": "SEI/USDT:USDT", "currency": "USDT", "minNotional": 60000.0, "maxNotional": 300000.0, @@ -36636,6 +42225,7 @@ }, { "tier": 4.0, + "symbol": "SEI/USDT:USDT", "currency": "USDT", "minNotional": 300000.0, "maxNotional": 600000.0, @@ -36652,6 +42242,7 @@ }, { "tier": 5.0, + "symbol": "SEI/USDT:USDT", "currency": "USDT", "minNotional": 600000.0, "maxNotional": 3000000.0, @@ -36668,6 +42259,7 @@ }, { "tier": 6.0, + "symbol": "SEI/USDT:USDT", "currency": "USDT", "minNotional": 3000000.0, "maxNotional": 6000000.0, @@ -36684,6 +42276,7 @@ }, { "tier": 7.0, + "symbol": "SEI/USDT:USDT", "currency": "USDT", "minNotional": 6000000.0, "maxNotional": 7500000.0, @@ -36700,6 +42293,7 @@ }, { "tier": 8.0, + "symbol": "SEI/USDT:USDT", "currency": "USDT", "minNotional": 7500000.0, "maxNotional": 15000000.0, @@ -36716,6 +42310,7 @@ }, { "tier": 9.0, + "symbol": "SEI/USDT:USDT", "currency": "USDT", "minNotional": 15000000.0, "maxNotional": 30000000.0, @@ -36734,6 +42329,7 @@ "SFP/USDT:USDT": [ { "tier": 1.0, + "symbol": "SFP/USDT:USDT", "currency": "USDT", "minNotional": 0.0, "maxNotional": 5000.0, @@ -36750,6 +42346,7 @@ }, { "tier": 2.0, + "symbol": "SFP/USDT:USDT", "currency": "USDT", "minNotional": 5000.0, "maxNotional": 15000.0, @@ -36766,6 +42363,7 @@ }, { "tier": 3.0, + "symbol": "SFP/USDT:USDT", "currency": "USDT", "minNotional": 15000.0, "maxNotional": 100000.0, @@ -36782,6 +42380,7 @@ }, { "tier": 4.0, + "symbol": "SFP/USDT:USDT", "currency": "USDT", "minNotional": 100000.0, "maxNotional": 250000.0, @@ -36798,6 +42397,7 @@ }, { "tier": 5.0, + "symbol": "SFP/USDT:USDT", "currency": "USDT", "minNotional": 250000.0, "maxNotional": 3000000.0, @@ -36814,6 +42414,7 @@ }, { "tier": 6.0, + "symbol": "SFP/USDT:USDT", "currency": "USDT", "minNotional": 3000000.0, "maxNotional": 8000000.0, @@ -36832,104 +42433,317 @@ "SKL/USDT:USDT": [ { "tier": 1.0, + "symbol": "SKL/USDT:USDT", "currency": "USDT", "minNotional": 0.0, "maxNotional": 5000.0, - "maintenanceMarginRate": 0.02, - "maxLeverage": 20.0, + "maintenanceMarginRate": 0.01, + "maxLeverage": 75.0, "info": { "bracket": "1", - "initialLeverage": "20", + "initialLeverage": "75", "notionalCap": "5000", "notionalFloor": "0", - "maintMarginRatio": "0.02", + "maintMarginRatio": "0.01", "cum": "0.0" } }, { "tier": 2.0, + "symbol": "SKL/USDT:USDT", "currency": "USDT", "minNotional": 5000.0, - "maxNotional": 25000.0, - "maintenanceMarginRate": 0.025, - "maxLeverage": 10.0, + "maxNotional": 10000.0, + "maintenanceMarginRate": 0.015, + "maxLeverage": 50.0, "info": { "bracket": "2", - "initialLeverage": "10", - "notionalCap": "25000", + "initialLeverage": "50", + "notionalCap": "10000", "notionalFloor": "5000", - "maintMarginRatio": "0.025", + "maintMarginRatio": "0.015", "cum": "25.0" } }, { "tier": 3.0, + "symbol": "SKL/USDT:USDT", "currency": "USDT", - "minNotional": 25000.0, - "maxNotional": 100000.0, - "maintenanceMarginRate": 0.05, - "maxLeverage": 8.0, + "minNotional": 10000.0, + "maxNotional": 30000.0, + "maintenanceMarginRate": 0.02, + "maxLeverage": 25.0, "info": { "bracket": "3", - "initialLeverage": "8", - "notionalCap": "100000", - "notionalFloor": "25000", - "maintMarginRatio": "0.05", - "cum": "650.0" + "initialLeverage": "25", + "notionalCap": "30000", + "notionalFloor": "10000", + "maintMarginRatio": "0.02", + "cum": "75.0" } }, { "tier": 4.0, + "symbol": "SKL/USDT:USDT", "currency": "USDT", - "minNotional": 100000.0, - "maxNotional": 250000.0, - "maintenanceMarginRate": 0.1, - "maxLeverage": 5.0, + "minNotional": 30000.0, + "maxNotional": 60000.0, + "maintenanceMarginRate": 0.025, + "maxLeverage": 20.0, "info": { "bracket": "4", - "initialLeverage": "5", - "notionalCap": "250000", - "notionalFloor": "100000", - "maintMarginRatio": "0.1", - "cum": "5650.0" + "initialLeverage": "20", + "notionalCap": "60000", + "notionalFloor": "30000", + "maintMarginRatio": "0.025", + "cum": "225.0" } }, { "tier": 5.0, + "symbol": "SKL/USDT:USDT", "currency": "USDT", - "minNotional": 250000.0, - "maxNotional": 1000000.0, - "maintenanceMarginRate": 0.125, - "maxLeverage": 2.0, + "minNotional": 60000.0, + "maxNotional": 300000.0, + "maintenanceMarginRate": 0.05, + "maxLeverage": 10.0, "info": { "bracket": "5", - "initialLeverage": "2", - "notionalCap": "1000000", - "notionalFloor": "250000", - "maintMarginRatio": "0.125", - "cum": "11900.0" + "initialLeverage": "10", + "notionalCap": "300000", + "notionalFloor": "60000", + "maintMarginRatio": "0.05", + "cum": "1725.0" } }, { "tier": 6.0, + "symbol": "SKL/USDT:USDT", + "currency": "USDT", + "minNotional": 300000.0, + "maxNotional": 600000.0, + "maintenanceMarginRate": 0.1, + "maxLeverage": 5.0, + "info": { + "bracket": "6", + "initialLeverage": "5", + "notionalCap": "600000", + "notionalFloor": "300000", + "maintMarginRatio": "0.1", + "cum": "16725.0" + } + }, + { + "tier": 7.0, + "symbol": "SKL/USDT:USDT", + "currency": "USDT", + "minNotional": 600000.0, + "maxNotional": 1000000.0, + "maintenanceMarginRate": 0.125, + "maxLeverage": 4.0, + "info": { + "bracket": "7", + "initialLeverage": "4", + "notionalCap": "1000000", + "notionalFloor": "600000", + "maintMarginRatio": "0.125", + "cum": "31725.0" + } + }, + { + "tier": 8.0, + "symbol": "SKL/USDT:USDT", "currency": "USDT", "minNotional": 1000000.0, + "maxNotional": 1500000.0, + "maintenanceMarginRate": 0.25, + "maxLeverage": 2.0, + "info": { + "bracket": "8", + "initialLeverage": "2", + "notionalCap": "1500000", + "notionalFloor": "1000000", + "maintMarginRatio": "0.25", + "cum": "156725.0" + } + }, + { + "tier": 9.0, + "symbol": "SKL/USDT:USDT", + "currency": "USDT", + "minNotional": 1500000.0, "maxNotional": 3000000.0, "maintenanceMarginRate": 0.5, "maxLeverage": 1.0, "info": { - "bracket": "6", + "bracket": "9", "initialLeverage": "1", "notionalCap": "3000000", - "notionalFloor": "1000000", + "notionalFloor": "1500000", "maintMarginRatio": "0.5", - "cum": "386900.0" + "cum": "531725.0" + } + } + ], + "SLERF/USDT:USDT": [ + { + "tier": 1.0, + "symbol": "SLERF/USDT:USDT", + "currency": "USDT", + "minNotional": 0.0, + "maxNotional": 5000.0, + "maintenanceMarginRate": 0.01, + "maxLeverage": 75.0, + "info": { + "bracket": "1", + "initialLeverage": "75", + "notionalCap": "5000", + "notionalFloor": "0", + "maintMarginRatio": "0.01", + "cum": "0.0" + } + }, + { + "tier": 2.0, + "symbol": "SLERF/USDT:USDT", + "currency": "USDT", + "minNotional": 5000.0, + "maxNotional": 10000.0, + "maintenanceMarginRate": 0.015, + "maxLeverage": 50.0, + "info": { + "bracket": "2", + "initialLeverage": "50", + "notionalCap": "10000", + "notionalFloor": "5000", + "maintMarginRatio": "0.015", + "cum": "25.0" + } + }, + { + "tier": 3.0, + "symbol": "SLERF/USDT:USDT", + "currency": "USDT", + "minNotional": 10000.0, + "maxNotional": 30000.0, + "maintenanceMarginRate": 0.02, + "maxLeverage": 25.0, + "info": { + "bracket": "3", + "initialLeverage": "25", + "notionalCap": "30000", + "notionalFloor": "10000", + "maintMarginRatio": "0.02", + "cum": "75.0" + } + }, + { + "tier": 4.0, + "symbol": "SLERF/USDT:USDT", + "currency": "USDT", + "minNotional": 30000.0, + "maxNotional": 60000.0, + "maintenanceMarginRate": 0.025, + "maxLeverage": 20.0, + "info": { + "bracket": "4", + "initialLeverage": "20", + "notionalCap": "60000", + "notionalFloor": "30000", + "maintMarginRatio": "0.025", + "cum": "225.0" + } + }, + { + "tier": 5.0, + "symbol": "SLERF/USDT:USDT", + "currency": "USDT", + "minNotional": 60000.0, + "maxNotional": 300000.0, + "maintenanceMarginRate": 0.05, + "maxLeverage": 10.0, + "info": { + "bracket": "5", + "initialLeverage": "10", + "notionalCap": "300000", + "notionalFloor": "60000", + "maintMarginRatio": "0.05", + "cum": "1725.0" + } + }, + { + "tier": 6.0, + "symbol": "SLERF/USDT:USDT", + "currency": "USDT", + "minNotional": 300000.0, + "maxNotional": 600000.0, + "maintenanceMarginRate": 0.1, + "maxLeverage": 5.0, + "info": { + "bracket": "6", + "initialLeverage": "5", + "notionalCap": "600000", + "notionalFloor": "300000", + "maintMarginRatio": "0.1", + "cum": "16725.0" + } + }, + { + "tier": 7.0, + "symbol": "SLERF/USDT:USDT", + "currency": "USDT", + "minNotional": 600000.0, + "maxNotional": 750000.0, + "maintenanceMarginRate": 0.125, + "maxLeverage": 4.0, + "info": { + "bracket": "7", + "initialLeverage": "4", + "notionalCap": "750000", + "notionalFloor": "600000", + "maintMarginRatio": "0.125", + "cum": "31725.0" + } + }, + { + "tier": 8.0, + "symbol": "SLERF/USDT:USDT", + "currency": "USDT", + "minNotional": 750000.0, + "maxNotional": 1500000.0, + "maintenanceMarginRate": 0.25, + "maxLeverage": 2.0, + "info": { + "bracket": "8", + "initialLeverage": "2", + "notionalCap": "1500000", + "notionalFloor": "750000", + "maintMarginRatio": "0.25", + "cum": "125475.0" + } + }, + { + "tier": 9.0, + "symbol": "SLERF/USDT:USDT", + "currency": "USDT", + "minNotional": 1500000.0, + "maxNotional": 3000000.0, + "maintenanceMarginRate": 0.5, + "maxLeverage": 1.0, + "info": { + "bracket": "9", + "initialLeverage": "1", + "notionalCap": "3000000", + "notionalFloor": "1500000", + "maintMarginRatio": "0.5", + "cum": "500475.0" } } ], "SLP/USDT:USDT": [ { "tier": 1.0, + "symbol": "SLP/USDT:USDT", "currency": "USDT", "minNotional": 0.0, "maxNotional": 5000.0, @@ -36946,6 +42760,7 @@ }, { "tier": 2.0, + "symbol": "SLP/USDT:USDT", "currency": "USDT", "minNotional": 5000.0, "maxNotional": 25000.0, @@ -36962,6 +42777,7 @@ }, { "tier": 3.0, + "symbol": "SLP/USDT:USDT", "currency": "USDT", "minNotional": 25000.0, "maxNotional": 100000.0, @@ -36978,6 +42794,7 @@ }, { "tier": 4.0, + "symbol": "SLP/USDT:USDT", "currency": "USDT", "minNotional": 100000.0, "maxNotional": 200000.0, @@ -36994,6 +42811,7 @@ }, { "tier": 5.0, + "symbol": "SLP/USDT:USDT", "currency": "USDT", "minNotional": 200000.0, "maxNotional": 500000.0, @@ -37010,6 +42828,7 @@ }, { "tier": 6.0, + "symbol": "SLP/USDT:USDT", "currency": "USDT", "minNotional": 500000.0, "maxNotional": 1000000.0, @@ -37026,6 +42845,7 @@ }, { "tier": 7.0, + "symbol": "SLP/USDT:USDT", "currency": "USDT", "minNotional": 1000000.0, "maxNotional": 1500000.0, @@ -37044,6 +42864,7 @@ "SNT/USDT:USDT": [ { "tier": 1.0, + "symbol": "SNT/USDT:USDT", "currency": "USDT", "minNotional": 0.0, "maxNotional": 5000.0, @@ -37060,6 +42881,7 @@ }, { "tier": 2.0, + "symbol": "SNT/USDT:USDT", "currency": "USDT", "minNotional": 5000.0, "maxNotional": 25000.0, @@ -37076,6 +42898,7 @@ }, { "tier": 3.0, + "symbol": "SNT/USDT:USDT", "currency": "USDT", "minNotional": 25000.0, "maxNotional": 100000.0, @@ -37092,6 +42915,7 @@ }, { "tier": 4.0, + "symbol": "SNT/USDT:USDT", "currency": "USDT", "minNotional": 100000.0, "maxNotional": 200000.0, @@ -37108,6 +42932,7 @@ }, { "tier": 5.0, + "symbol": "SNT/USDT:USDT", "currency": "USDT", "minNotional": 200000.0, "maxNotional": 500000.0, @@ -37124,6 +42949,7 @@ }, { "tier": 6.0, + "symbol": "SNT/USDT:USDT", "currency": "USDT", "minNotional": 500000.0, "maxNotional": 1000000.0, @@ -37140,6 +42966,7 @@ }, { "tier": 7.0, + "symbol": "SNT/USDT:USDT", "currency": "USDT", "minNotional": 1000000.0, "maxNotional": 2000000.0, @@ -37158,6 +42985,7 @@ "SNX/USDT:USDT": [ { "tier": 1.0, + "symbol": "SNX/USDT:USDT", "currency": "USDT", "minNotional": 0.0, "maxNotional": 5000.0, @@ -37174,6 +43002,7 @@ }, { "tier": 2.0, + "symbol": "SNX/USDT:USDT", "currency": "USDT", "minNotional": 5000.0, "maxNotional": 50000.0, @@ -37190,6 +43019,7 @@ }, { "tier": 3.0, + "symbol": "SNX/USDT:USDT", "currency": "USDT", "minNotional": 50000.0, "maxNotional": 400000.0, @@ -37206,6 +43036,7 @@ }, { "tier": 4.0, + "symbol": "SNX/USDT:USDT", "currency": "USDT", "minNotional": 400000.0, "maxNotional": 1000000.0, @@ -37222,6 +43053,7 @@ }, { "tier": 5.0, + "symbol": "SNX/USDT:USDT", "currency": "USDT", "minNotional": 1000000.0, "maxNotional": 2000000.0, @@ -37238,6 +43070,7 @@ }, { "tier": 6.0, + "symbol": "SNX/USDT:USDT", "currency": "USDT", "minNotional": 2000000.0, "maxNotional": 6000000.0, @@ -37254,6 +43087,7 @@ }, { "tier": 7.0, + "symbol": "SNX/USDT:USDT", "currency": "USDT", "minNotional": 6000000.0, "maxNotional": 10000000.0, @@ -37272,6 +43106,7 @@ "SOL/USDC:USDC": [ { "tier": 1.0, + "symbol": "SOL/USDC:USDC", "currency": "USDC", "minNotional": 0.0, "maxNotional": 10000.0, @@ -37288,6 +43123,7 @@ }, { "tier": 2.0, + "symbol": "SOL/USDC:USDC", "currency": "USDC", "minNotional": 10000.0, "maxNotional": 50000.0, @@ -37304,6 +43140,7 @@ }, { "tier": 3.0, + "symbol": "SOL/USDC:USDC", "currency": "USDC", "minNotional": 50000.0, "maxNotional": 200000.0, @@ -37320,6 +43157,7 @@ }, { "tier": 4.0, + "symbol": "SOL/USDC:USDC", "currency": "USDC", "minNotional": 200000.0, "maxNotional": 500000.0, @@ -37336,6 +43174,7 @@ }, { "tier": 5.0, + "symbol": "SOL/USDC:USDC", "currency": "USDC", "minNotional": 500000.0, "maxNotional": 1000000.0, @@ -37352,6 +43191,7 @@ }, { "tier": 6.0, + "symbol": "SOL/USDC:USDC", "currency": "USDC", "minNotional": 1000000.0, "maxNotional": 2000000.0, @@ -37368,6 +43208,7 @@ }, { "tier": 7.0, + "symbol": "SOL/USDC:USDC", "currency": "USDC", "minNotional": 2000000.0, "maxNotional": 5000000.0, @@ -37384,6 +43225,7 @@ }, { "tier": 8.0, + "symbol": "SOL/USDC:USDC", "currency": "USDC", "minNotional": 5000000.0, "maxNotional": 15000000.0, @@ -37400,6 +43242,7 @@ }, { "tier": 9.0, + "symbol": "SOL/USDC:USDC", "currency": "USDC", "minNotional": 15000000.0, "maxNotional": 20000000.0, @@ -37416,6 +43259,7 @@ }, { "tier": 10.0, + "symbol": "SOL/USDC:USDC", "currency": "USDC", "minNotional": 20000000.0, "maxNotional": 50000000.0, @@ -37432,6 +43276,7 @@ }, { "tier": 11.0, + "symbol": "SOL/USDC:USDC", "currency": "USDC", "minNotional": 50000000.0, "maxNotional": 100000000.0, @@ -37450,6 +43295,7 @@ "SOL/USDT:USDT": [ { "tier": 1.0, + "symbol": "SOL/USDT:USDT", "currency": "USDT", "minNotional": 0.0, "maxNotional": 20000.0, @@ -37466,6 +43312,7 @@ }, { "tier": 2.0, + "symbol": "SOL/USDT:USDT", "currency": "USDT", "minNotional": 20000.0, "maxNotional": 100000.0, @@ -37482,6 +43329,7 @@ }, { "tier": 3.0, + "symbol": "SOL/USDT:USDT", "currency": "USDT", "minNotional": 100000.0, "maxNotional": 800000.0, @@ -37498,6 +43346,7 @@ }, { "tier": 4.0, + "symbol": "SOL/USDT:USDT", "currency": "USDT", "minNotional": 800000.0, "maxNotional": 4000000.0, @@ -37514,6 +43363,7 @@ }, { "tier": 5.0, + "symbol": "SOL/USDT:USDT", "currency": "USDT", "minNotional": 4000000.0, "maxNotional": 8000000.0, @@ -37530,6 +43380,7 @@ }, { "tier": 6.0, + "symbol": "SOL/USDT:USDT", "currency": "USDT", "minNotional": 8000000.0, "maxNotional": 40000000.0, @@ -37546,6 +43397,7 @@ }, { "tier": 7.0, + "symbol": "SOL/USDT:USDT", "currency": "USDT", "minNotional": 40000000.0, "maxNotional": 80000000.0, @@ -37562,6 +43414,7 @@ }, { "tier": 8.0, + "symbol": "SOL/USDT:USDT", "currency": "USDT", "minNotional": 80000000.0, "maxNotional": 100000000.0, @@ -37578,6 +43431,7 @@ }, { "tier": 9.0, + "symbol": "SOL/USDT:USDT", "currency": "USDT", "minNotional": 100000000.0, "maxNotional": 200000000.0, @@ -37594,6 +43448,7 @@ }, { "tier": 10.0, + "symbol": "SOL/USDT:USDT", "currency": "USDT", "minNotional": 200000000.0, "maxNotional": 400000000.0, @@ -37612,6 +43467,7 @@ "SPELL/USDT:USDT": [ { "tier": 1.0, + "symbol": "SPELL/USDT:USDT", "currency": "USDT", "minNotional": 0.0, "maxNotional": 5000.0, @@ -37628,6 +43484,7 @@ }, { "tier": 2.0, + "symbol": "SPELL/USDT:USDT", "currency": "USDT", "minNotional": 5000.0, "maxNotional": 20000.0, @@ -37644,6 +43501,7 @@ }, { "tier": 3.0, + "symbol": "SPELL/USDT:USDT", "currency": "USDT", "minNotional": 20000.0, "maxNotional": 25000.0, @@ -37660,6 +43518,7 @@ }, { "tier": 4.0, + "symbol": "SPELL/USDT:USDT", "currency": "USDT", "minNotional": 25000.0, "maxNotional": 200000.0, @@ -37676,6 +43535,7 @@ }, { "tier": 5.0, + "symbol": "SPELL/USDT:USDT", "currency": "USDT", "minNotional": 200000.0, "maxNotional": 400000.0, @@ -37692,6 +43552,7 @@ }, { "tier": 6.0, + "symbol": "SPELL/USDT:USDT", "currency": "USDT", "minNotional": 400000.0, "maxNotional": 500000.0, @@ -37708,6 +43569,7 @@ }, { "tier": 7.0, + "symbol": "SPELL/USDT:USDT", "currency": "USDT", "minNotional": 500000.0, "maxNotional": 1000000.0, @@ -37724,6 +43586,7 @@ }, { "tier": 8.0, + "symbol": "SPELL/USDT:USDT", "currency": "USDT", "minNotional": 1000000.0, "maxNotional": 2000000.0, @@ -37742,6 +43605,7 @@ "SSV/USDT:USDT": [ { "tier": 1.0, + "symbol": "SSV/USDT:USDT", "currency": "USDT", "minNotional": 0.0, "maxNotional": 5000.0, @@ -37758,6 +43622,7 @@ }, { "tier": 2.0, + "symbol": "SSV/USDT:USDT", "currency": "USDT", "minNotional": 5000.0, "maxNotional": 10000.0, @@ -37774,6 +43639,7 @@ }, { "tier": 3.0, + "symbol": "SSV/USDT:USDT", "currency": "USDT", "minNotional": 10000.0, "maxNotional": 50000.0, @@ -37790,6 +43656,7 @@ }, { "tier": 4.0, + "symbol": "SSV/USDT:USDT", "currency": "USDT", "minNotional": 50000.0, "maxNotional": 100000.0, @@ -37806,6 +43673,7 @@ }, { "tier": 5.0, + "symbol": "SSV/USDT:USDT", "currency": "USDT", "minNotional": 100000.0, "maxNotional": 500000.0, @@ -37822,6 +43690,7 @@ }, { "tier": 6.0, + "symbol": "SSV/USDT:USDT", "currency": "USDT", "minNotional": 500000.0, "maxNotional": 1000000.0, @@ -37838,6 +43707,7 @@ }, { "tier": 7.0, + "symbol": "SSV/USDT:USDT", "currency": "USDT", "minNotional": 1000000.0, "maxNotional": 1250000.0, @@ -37854,6 +43724,7 @@ }, { "tier": 8.0, + "symbol": "SSV/USDT:USDT", "currency": "USDT", "minNotional": 1250000.0, "maxNotional": 3000000.0, @@ -37870,6 +43741,7 @@ }, { "tier": 9.0, + "symbol": "SSV/USDT:USDT", "currency": "USDT", "minNotional": 3000000.0, "maxNotional": 5000000.0, @@ -37888,6 +43760,7 @@ "STEEM/USDT:USDT": [ { "tier": 1.0, + "symbol": "STEEM/USDT:USDT", "currency": "USDT", "minNotional": 0.0, "maxNotional": 5000.0, @@ -37904,6 +43777,7 @@ }, { "tier": 2.0, + "symbol": "STEEM/USDT:USDT", "currency": "USDT", "minNotional": 5000.0, "maxNotional": 25000.0, @@ -37920,6 +43794,7 @@ }, { "tier": 3.0, + "symbol": "STEEM/USDT:USDT", "currency": "USDT", "minNotional": 25000.0, "maxNotional": 100000.0, @@ -37936,6 +43811,7 @@ }, { "tier": 4.0, + "symbol": "STEEM/USDT:USDT", "currency": "USDT", "minNotional": 100000.0, "maxNotional": 200000.0, @@ -37952,6 +43828,7 @@ }, { "tier": 5.0, + "symbol": "STEEM/USDT:USDT", "currency": "USDT", "minNotional": 200000.0, "maxNotional": 500000.0, @@ -37968,6 +43845,7 @@ }, { "tier": 6.0, + "symbol": "STEEM/USDT:USDT", "currency": "USDT", "minNotional": 500000.0, "maxNotional": 1000000.0, @@ -37984,6 +43862,7 @@ }, { "tier": 7.0, + "symbol": "STEEM/USDT:USDT", "currency": "USDT", "minNotional": 1000000.0, "maxNotional": 2000000.0, @@ -38002,6 +43881,7 @@ "STG/USDT:USDT": [ { "tier": 1.0, + "symbol": "STG/USDT:USDT", "currency": "USDT", "minNotional": 0.0, "maxNotional": 5000.0, @@ -38018,6 +43898,7 @@ }, { "tier": 2.0, + "symbol": "STG/USDT:USDT", "currency": "USDT", "minNotional": 5000.0, "maxNotional": 25000.0, @@ -38034,6 +43915,7 @@ }, { "tier": 3.0, + "symbol": "STG/USDT:USDT", "currency": "USDT", "minNotional": 25000.0, "maxNotional": 200000.0, @@ -38050,6 +43932,7 @@ }, { "tier": 4.0, + "symbol": "STG/USDT:USDT", "currency": "USDT", "minNotional": 200000.0, "maxNotional": 500000.0, @@ -38066,6 +43949,7 @@ }, { "tier": 5.0, + "symbol": "STG/USDT:USDT", "currency": "USDT", "minNotional": 500000.0, "maxNotional": 1000000.0, @@ -38082,6 +43966,7 @@ }, { "tier": 6.0, + "symbol": "STG/USDT:USDT", "currency": "USDT", "minNotional": 1000000.0, "maxNotional": 3000000.0, @@ -38098,6 +43983,7 @@ }, { "tier": 7.0, + "symbol": "STG/USDT:USDT", "currency": "USDT", "minNotional": 3000000.0, "maxNotional": 5000000.0, @@ -38116,6 +44002,7 @@ "STMX/USDT:USDT": [ { "tier": 1.0, + "symbol": "STMX/USDT:USDT", "currency": "USDT", "minNotional": 0.0, "maxNotional": 5000.0, @@ -38132,6 +44019,7 @@ }, { "tier": 2.0, + "symbol": "STMX/USDT:USDT", "currency": "USDT", "minNotional": 5000.0, "maxNotional": 25000.0, @@ -38148,6 +44036,7 @@ }, { "tier": 3.0, + "symbol": "STMX/USDT:USDT", "currency": "USDT", "minNotional": 25000.0, "maxNotional": 100000.0, @@ -38164,6 +44053,7 @@ }, { "tier": 4.0, + "symbol": "STMX/USDT:USDT", "currency": "USDT", "minNotional": 100000.0, "maxNotional": 250000.0, @@ -38180,6 +44070,7 @@ }, { "tier": 5.0, + "symbol": "STMX/USDT:USDT", "currency": "USDT", "minNotional": 250000.0, "maxNotional": 1000000.0, @@ -38196,6 +44087,7 @@ }, { "tier": 6.0, + "symbol": "STMX/USDT:USDT", "currency": "USDT", "minNotional": 1000000.0, "maxNotional": 3000000.0, @@ -38214,6 +44106,7 @@ "STORJ/USDT:USDT": [ { "tier": 1.0, + "symbol": "STORJ/USDT:USDT", "currency": "USDT", "minNotional": 0.0, "maxNotional": 5000.0, @@ -38230,6 +44123,7 @@ }, { "tier": 2.0, + "symbol": "STORJ/USDT:USDT", "currency": "USDT", "minNotional": 5000.0, "maxNotional": 25000.0, @@ -38246,6 +44140,7 @@ }, { "tier": 3.0, + "symbol": "STORJ/USDT:USDT", "currency": "USDT", "minNotional": 25000.0, "maxNotional": 300000.0, @@ -38262,6 +44157,7 @@ }, { "tier": 4.0, + "symbol": "STORJ/USDT:USDT", "currency": "USDT", "minNotional": 300000.0, "maxNotional": 800000.0, @@ -38278,6 +44174,7 @@ }, { "tier": 5.0, + "symbol": "STORJ/USDT:USDT", "currency": "USDT", "minNotional": 800000.0, "maxNotional": 1000000.0, @@ -38294,6 +44191,7 @@ }, { "tier": 6.0, + "symbol": "STORJ/USDT:USDT", "currency": "USDT", "minNotional": 1000000.0, "maxNotional": 3000000.0, @@ -38310,6 +44208,7 @@ }, { "tier": 7.0, + "symbol": "STORJ/USDT:USDT", "currency": "USDT", "minNotional": 3000000.0, "maxNotional": 3500000.0, @@ -38328,6 +44227,7 @@ "STPT/USDT:USDT": [ { "tier": 1.0, + "symbol": "STPT/USDT:USDT", "currency": "USDT", "minNotional": 0.0, "maxNotional": 5000.0, @@ -38344,6 +44244,7 @@ }, { "tier": 2.0, + "symbol": "STPT/USDT:USDT", "currency": "USDT", "minNotional": 5000.0, "maxNotional": 25000.0, @@ -38360,6 +44261,7 @@ }, { "tier": 3.0, + "symbol": "STPT/USDT:USDT", "currency": "USDT", "minNotional": 25000.0, "maxNotional": 150000.0, @@ -38376,6 +44278,7 @@ }, { "tier": 4.0, + "symbol": "STPT/USDT:USDT", "currency": "USDT", "minNotional": 150000.0, "maxNotional": 300000.0, @@ -38392,6 +44295,7 @@ }, { "tier": 5.0, + "symbol": "STPT/USDT:USDT", "currency": "USDT", "minNotional": 300000.0, "maxNotional": 750000.0, @@ -38408,6 +44312,7 @@ }, { "tier": 6.0, + "symbol": "STPT/USDT:USDT", "currency": "USDT", "minNotional": 750000.0, "maxNotional": 1500000.0, @@ -38424,6 +44329,7 @@ }, { "tier": 7.0, + "symbol": "STPT/USDT:USDT", "currency": "USDT", "minNotional": 1500000.0, "maxNotional": 2000000.0, @@ -38442,6 +44348,7 @@ "STRAX/USDT:USDT": [ { "tier": 1.0, + "symbol": "STRAX/USDT:USDT", "currency": "USDT", "minNotional": 0.0, "maxNotional": 25000.0, @@ -38458,6 +44365,7 @@ }, { "tier": 2.0, + "symbol": "STRAX/USDT:USDT", "currency": "USDT", "minNotional": 25000.0, "maxNotional": 200000.0, @@ -38474,6 +44382,7 @@ }, { "tier": 3.0, + "symbol": "STRAX/USDT:USDT", "currency": "USDT", "minNotional": 200000.0, "maxNotional": 500000.0, @@ -38490,6 +44399,7 @@ }, { "tier": 4.0, + "symbol": "STRAX/USDT:USDT", "currency": "USDT", "minNotional": 500000.0, "maxNotional": 1000000.0, @@ -38506,6 +44416,7 @@ }, { "tier": 5.0, + "symbol": "STRAX/USDT:USDT", "currency": "USDT", "minNotional": 1000000.0, "maxNotional": 3000000.0, @@ -38522,6 +44433,7 @@ }, { "tier": 6.0, + "symbol": "STRAX/USDT:USDT", "currency": "USDT", "minNotional": 3000000.0, "maxNotional": 3500000.0, @@ -38540,6 +44452,7 @@ "STRK/USDT:USDT": [ { "tier": 1.0, + "symbol": "STRK/USDT:USDT", "currency": "USDT", "minNotional": 0.0, "maxNotional": 10000.0, @@ -38556,6 +44469,7 @@ }, { "tier": 2.0, + "symbol": "STRK/USDT:USDT", "currency": "USDT", "minNotional": 10000.0, "maxNotional": 20000.0, @@ -38572,6 +44486,7 @@ }, { "tier": 3.0, + "symbol": "STRK/USDT:USDT", "currency": "USDT", "minNotional": 20000.0, "maxNotional": 100000.0, @@ -38588,6 +44503,7 @@ }, { "tier": 4.0, + "symbol": "STRK/USDT:USDT", "currency": "USDT", "minNotional": 100000.0, "maxNotional": 200000.0, @@ -38604,6 +44520,7 @@ }, { "tier": 5.0, + "symbol": "STRK/USDT:USDT", "currency": "USDT", "minNotional": 200000.0, "maxNotional": 1000000.0, @@ -38620,6 +44537,7 @@ }, { "tier": 6.0, + "symbol": "STRK/USDT:USDT", "currency": "USDT", "minNotional": 1000000.0, "maxNotional": 2000000.0, @@ -38636,6 +44554,7 @@ }, { "tier": 7.0, + "symbol": "STRK/USDT:USDT", "currency": "USDT", "minNotional": 2000000.0, "maxNotional": 2500000.0, @@ -38652,6 +44571,7 @@ }, { "tier": 8.0, + "symbol": "STRK/USDT:USDT", "currency": "USDT", "minNotional": 2500000.0, "maxNotional": 5000000.0, @@ -38668,6 +44588,7 @@ }, { "tier": 9.0, + "symbol": "STRK/USDT:USDT", "currency": "USDT", "minNotional": 5000000.0, "maxNotional": 10000000.0, @@ -38686,6 +44607,7 @@ "STX/USDT:USDT": [ { "tier": 1.0, + "symbol": "STX/USDT:USDT", "currency": "USDT", "minNotional": 0.0, "maxNotional": 10000.0, @@ -38702,6 +44624,7 @@ }, { "tier": 2.0, + "symbol": "STX/USDT:USDT", "currency": "USDT", "minNotional": 10000.0, "maxNotional": 30000.0, @@ -38718,6 +44641,7 @@ }, { "tier": 3.0, + "symbol": "STX/USDT:USDT", "currency": "USDT", "minNotional": 30000.0, "maxNotional": 150000.0, @@ -38734,6 +44658,7 @@ }, { "tier": 4.0, + "symbol": "STX/USDT:USDT", "currency": "USDT", "minNotional": 150000.0, "maxNotional": 300000.0, @@ -38750,6 +44675,7 @@ }, { "tier": 5.0, + "symbol": "STX/USDT:USDT", "currency": "USDT", "minNotional": 300000.0, "maxNotional": 1500000.0, @@ -38766,6 +44692,7 @@ }, { "tier": 6.0, + "symbol": "STX/USDT:USDT", "currency": "USDT", "minNotional": 1500000.0, "maxNotional": 3000000.0, @@ -38782,6 +44709,7 @@ }, { "tier": 7.0, + "symbol": "STX/USDT:USDT", "currency": "USDT", "minNotional": 3000000.0, "maxNotional": 3750000.0, @@ -38798,6 +44726,7 @@ }, { "tier": 8.0, + "symbol": "STX/USDT:USDT", "currency": "USDT", "minNotional": 3750000.0, "maxNotional": 7500000.0, @@ -38814,6 +44743,7 @@ }, { "tier": 9.0, + "symbol": "STX/USDT:USDT", "currency": "USDT", "minNotional": 7500000.0, "maxNotional": 15000000.0, @@ -38832,6 +44762,7 @@ "SUI/USDC:USDC": [ { "tier": 1.0, + "symbol": "SUI/USDC:USDC", "currency": "USDC", "minNotional": 0.0, "maxNotional": 5000.0, @@ -38848,6 +44779,7 @@ }, { "tier": 2.0, + "symbol": "SUI/USDC:USDC", "currency": "USDC", "minNotional": 5000.0, "maxNotional": 50000.0, @@ -38864,6 +44796,7 @@ }, { "tier": 3.0, + "symbol": "SUI/USDC:USDC", "currency": "USDC", "minNotional": 50000.0, "maxNotional": 600000.0, @@ -38880,6 +44813,7 @@ }, { "tier": 4.0, + "symbol": "SUI/USDC:USDC", "currency": "USDC", "minNotional": 600000.0, "maxNotional": 1200000.0, @@ -38896,6 +44830,7 @@ }, { "tier": 5.0, + "symbol": "SUI/USDC:USDC", "currency": "USDC", "minNotional": 1200000.0, "maxNotional": 3000000.0, @@ -38912,6 +44847,7 @@ }, { "tier": 6.0, + "symbol": "SUI/USDC:USDC", "currency": "USDC", "minNotional": 3000000.0, "maxNotional": 4000000.0, @@ -38928,6 +44864,7 @@ }, { "tier": 7.0, + "symbol": "SUI/USDC:USDC", "currency": "USDC", "minNotional": 4000000.0, "maxNotional": 6000000.0, @@ -38944,6 +44881,7 @@ }, { "tier": 8.0, + "symbol": "SUI/USDC:USDC", "currency": "USDC", "minNotional": 6000000.0, "maxNotional": 10000000.0, @@ -38962,6 +44900,7 @@ "SUI/USDT:USDT": [ { "tier": 1.0, + "symbol": "SUI/USDT:USDT", "currency": "USDT", "minNotional": 0.0, "maxNotional": 20000.0, @@ -38978,6 +44917,7 @@ }, { "tier": 2.0, + "symbol": "SUI/USDT:USDT", "currency": "USDT", "minNotional": 20000.0, "maxNotional": 200000.0, @@ -38994,6 +44934,7 @@ }, { "tier": 3.0, + "symbol": "SUI/USDT:USDT", "currency": "USDT", "minNotional": 200000.0, "maxNotional": 1000000.0, @@ -39010,6 +44951,7 @@ }, { "tier": 4.0, + "symbol": "SUI/USDT:USDT", "currency": "USDT", "minNotional": 1000000.0, "maxNotional": 2000000.0, @@ -39026,6 +44968,7 @@ }, { "tier": 5.0, + "symbol": "SUI/USDT:USDT", "currency": "USDT", "minNotional": 2000000.0, "maxNotional": 10000000.0, @@ -39042,6 +44985,7 @@ }, { "tier": 6.0, + "symbol": "SUI/USDT:USDT", "currency": "USDT", "minNotional": 10000000.0, "maxNotional": 20000000.0, @@ -39058,6 +45002,7 @@ }, { "tier": 7.0, + "symbol": "SUI/USDT:USDT", "currency": "USDT", "minNotional": 20000000.0, "maxNotional": 25000000.0, @@ -39074,6 +45019,7 @@ }, { "tier": 8.0, + "symbol": "SUI/USDT:USDT", "currency": "USDT", "minNotional": 25000000.0, "maxNotional": 50000000.0, @@ -39090,6 +45036,7 @@ }, { "tier": 9.0, + "symbol": "SUI/USDT:USDT", "currency": "USDT", "minNotional": 50000000.0, "maxNotional": 100000000.0, @@ -39108,6 +45055,7 @@ "SUN/USDT:USDT": [ { "tier": 1.0, + "symbol": "SUN/USDT:USDT", "currency": "USDT", "minNotional": 0.0, "maxNotional": 5000.0, @@ -39124,6 +45072,7 @@ }, { "tier": 2.0, + "symbol": "SUN/USDT:USDT", "currency": "USDT", "minNotional": 5000.0, "maxNotional": 16000.0, @@ -39140,6 +45089,7 @@ }, { "tier": 3.0, + "symbol": "SUN/USDT:USDT", "currency": "USDT", "minNotional": 16000.0, "maxNotional": 80000.0, @@ -39156,6 +45106,7 @@ }, { "tier": 4.0, + "symbol": "SUN/USDT:USDT", "currency": "USDT", "minNotional": 80000.0, "maxNotional": 160000.0, @@ -39172,6 +45123,7 @@ }, { "tier": 5.0, + "symbol": "SUN/USDT:USDT", "currency": "USDT", "minNotional": 160000.0, "maxNotional": 800000.0, @@ -39188,6 +45140,7 @@ }, { "tier": 6.0, + "symbol": "SUN/USDT:USDT", "currency": "USDT", "minNotional": 800000.0, "maxNotional": 1600000.0, @@ -39204,6 +45157,7 @@ }, { "tier": 7.0, + "symbol": "SUN/USDT:USDT", "currency": "USDT", "minNotional": 1600000.0, "maxNotional": 2000000.0, @@ -39220,6 +45174,7 @@ }, { "tier": 8.0, + "symbol": "SUN/USDT:USDT", "currency": "USDT", "minNotional": 2000000.0, "maxNotional": 4000000.0, @@ -39236,6 +45191,7 @@ }, { "tier": 9.0, + "symbol": "SUN/USDT:USDT", "currency": "USDT", "minNotional": 4000000.0, "maxNotional": 8000000.0, @@ -39254,6 +45210,7 @@ "SUPER/USDT:USDT": [ { "tier": 1.0, + "symbol": "SUPER/USDT:USDT", "currency": "USDT", "minNotional": 0.0, "maxNotional": 5000.0, @@ -39270,6 +45227,7 @@ }, { "tier": 2.0, + "symbol": "SUPER/USDT:USDT", "currency": "USDT", "minNotional": 5000.0, "maxNotional": 10000.0, @@ -39286,6 +45244,7 @@ }, { "tier": 3.0, + "symbol": "SUPER/USDT:USDT", "currency": "USDT", "minNotional": 10000.0, "maxNotional": 30000.0, @@ -39302,6 +45261,7 @@ }, { "tier": 4.0, + "symbol": "SUPER/USDT:USDT", "currency": "USDT", "minNotional": 30000.0, "maxNotional": 60000.0, @@ -39318,6 +45278,7 @@ }, { "tier": 5.0, + "symbol": "SUPER/USDT:USDT", "currency": "USDT", "minNotional": 60000.0, "maxNotional": 300000.0, @@ -39334,6 +45295,7 @@ }, { "tier": 6.0, + "symbol": "SUPER/USDT:USDT", "currency": "USDT", "minNotional": 300000.0, "maxNotional": 600000.0, @@ -39350,6 +45312,7 @@ }, { "tier": 7.0, + "symbol": "SUPER/USDT:USDT", "currency": "USDT", "minNotional": 600000.0, "maxNotional": 750000.0, @@ -39366,6 +45329,7 @@ }, { "tier": 8.0, + "symbol": "SUPER/USDT:USDT", "currency": "USDT", "minNotional": 750000.0, "maxNotional": 1500000.0, @@ -39382,6 +45346,7 @@ }, { "tier": 9.0, + "symbol": "SUPER/USDT:USDT", "currency": "USDT", "minNotional": 1500000.0, "maxNotional": 3000000.0, @@ -39400,6 +45365,7 @@ "SUSHI/USDT:USDT": [ { "tier": 1.0, + "symbol": "SUSHI/USDT:USDT", "currency": "USDT", "minNotional": 0.0, "maxNotional": 5000.0, @@ -39416,6 +45382,7 @@ }, { "tier": 2.0, + "symbol": "SUSHI/USDT:USDT", "currency": "USDT", "minNotional": 5000.0, "maxNotional": 50000.0, @@ -39432,6 +45399,7 @@ }, { "tier": 3.0, + "symbol": "SUSHI/USDT:USDT", "currency": "USDT", "minNotional": 50000.0, "maxNotional": 600000.0, @@ -39448,6 +45416,7 @@ }, { "tier": 4.0, + "symbol": "SUSHI/USDT:USDT", "currency": "USDT", "minNotional": 600000.0, "maxNotional": 1600000.0, @@ -39464,6 +45433,7 @@ }, { "tier": 5.0, + "symbol": "SUSHI/USDT:USDT", "currency": "USDT", "minNotional": 1600000.0, "maxNotional": 2000000.0, @@ -39480,6 +45450,7 @@ }, { "tier": 6.0, + "symbol": "SUSHI/USDT:USDT", "currency": "USDT", "minNotional": 2000000.0, "maxNotional": 6000000.0, @@ -39496,6 +45467,7 @@ }, { "tier": 7.0, + "symbol": "SUSHI/USDT:USDT", "currency": "USDT", "minNotional": 6000000.0, "maxNotional": 10000000.0, @@ -39511,9 +45483,165 @@ } } ], + "SWELL/USDT:USDT": [ + { + "tier": 1.0, + "symbol": "SWELL/USDT:USDT", + "currency": "USDT", + "minNotional": 0.0, + "maxNotional": 5000.0, + "maintenanceMarginRate": 0.01, + "maxLeverage": 75.0, + "info": { + "bracket": "1", + "initialLeverage": "75", + "notionalCap": "5000", + "notionalFloor": "0", + "maintMarginRatio": "0.01", + "cum": "0.0" + } + }, + { + "tier": 2.0, + "symbol": "SWELL/USDT:USDT", + "currency": "USDT", + "minNotional": 5000.0, + "maxNotional": 10000.0, + "maintenanceMarginRate": 0.015, + "maxLeverage": 50.0, + "info": { + "bracket": "2", + "initialLeverage": "50", + "notionalCap": "10000", + "notionalFloor": "5000", + "maintMarginRatio": "0.015", + "cum": "25.0" + } + }, + { + "tier": 3.0, + "symbol": "SWELL/USDT:USDT", + "currency": "USDT", + "minNotional": 10000.0, + "maxNotional": 30000.0, + "maintenanceMarginRate": 0.02, + "maxLeverage": 25.0, + "info": { + "bracket": "3", + "initialLeverage": "25", + "notionalCap": "30000", + "notionalFloor": "10000", + "maintMarginRatio": "0.02", + "cum": "75.0" + } + }, + { + "tier": 4.0, + "symbol": "SWELL/USDT:USDT", + "currency": "USDT", + "minNotional": 30000.0, + "maxNotional": 60000.0, + "maintenanceMarginRate": 0.025, + "maxLeverage": 20.0, + "info": { + "bracket": "4", + "initialLeverage": "20", + "notionalCap": "60000", + "notionalFloor": "30000", + "maintMarginRatio": "0.025", + "cum": "225.0" + } + }, + { + "tier": 5.0, + "symbol": "SWELL/USDT:USDT", + "currency": "USDT", + "minNotional": 60000.0, + "maxNotional": 300000.0, + "maintenanceMarginRate": 0.05, + "maxLeverage": 10.0, + "info": { + "bracket": "5", + "initialLeverage": "10", + "notionalCap": "300000", + "notionalFloor": "60000", + "maintMarginRatio": "0.05", + "cum": "1725.0" + } + }, + { + "tier": 6.0, + "symbol": "SWELL/USDT:USDT", + "currency": "USDT", + "minNotional": 300000.0, + "maxNotional": 600000.0, + "maintenanceMarginRate": 0.1, + "maxLeverage": 5.0, + "info": { + "bracket": "6", + "initialLeverage": "5", + "notionalCap": "600000", + "notionalFloor": "300000", + "maintMarginRatio": "0.1", + "cum": "16725.0" + } + }, + { + "tier": 7.0, + "symbol": "SWELL/USDT:USDT", + "currency": "USDT", + "minNotional": 600000.0, + "maxNotional": 750000.0, + "maintenanceMarginRate": 0.125, + "maxLeverage": 4.0, + "info": { + "bracket": "7", + "initialLeverage": "4", + "notionalCap": "750000", + "notionalFloor": "600000", + "maintMarginRatio": "0.125", + "cum": "31725.0" + } + }, + { + "tier": 8.0, + "symbol": "SWELL/USDT:USDT", + "currency": "USDT", + "minNotional": 750000.0, + "maxNotional": 1500000.0, + "maintenanceMarginRate": 0.25, + "maxLeverage": 2.0, + "info": { + "bracket": "8", + "initialLeverage": "2", + "notionalCap": "1500000", + "notionalFloor": "750000", + "maintMarginRatio": "0.25", + "cum": "125475.0" + } + }, + { + "tier": 9.0, + "symbol": "SWELL/USDT:USDT", + "currency": "USDT", + "minNotional": 1500000.0, + "maxNotional": 3000000.0, + "maintenanceMarginRate": 0.5, + "maxLeverage": 1.0, + "info": { + "bracket": "9", + "initialLeverage": "1", + "notionalCap": "3000000", + "notionalFloor": "1500000", + "maintMarginRatio": "0.5", + "cum": "500475.0" + } + } + ], "SXP/USDT:USDT": [ { "tier": 1.0, + "symbol": "SXP/USDT:USDT", "currency": "USDT", "minNotional": 0.0, "maxNotional": 10000.0, @@ -39530,6 +45658,7 @@ }, { "tier": 2.0, + "symbol": "SXP/USDT:USDT", "currency": "USDT", "minNotional": 10000.0, "maxNotional": 20000.0, @@ -39546,6 +45675,7 @@ }, { "tier": 3.0, + "symbol": "SXP/USDT:USDT", "currency": "USDT", "minNotional": 20000.0, "maxNotional": 100000.0, @@ -39562,6 +45692,7 @@ }, { "tier": 4.0, + "symbol": "SXP/USDT:USDT", "currency": "USDT", "minNotional": 100000.0, "maxNotional": 200000.0, @@ -39578,6 +45709,7 @@ }, { "tier": 5.0, + "symbol": "SXP/USDT:USDT", "currency": "USDT", "minNotional": 200000.0, "maxNotional": 1000000.0, @@ -39594,6 +45726,7 @@ }, { "tier": 6.0, + "symbol": "SXP/USDT:USDT", "currency": "USDT", "minNotional": 1000000.0, "maxNotional": 2000000.0, @@ -39610,6 +45743,7 @@ }, { "tier": 7.0, + "symbol": "SXP/USDT:USDT", "currency": "USDT", "minNotional": 2000000.0, "maxNotional": 2500000.0, @@ -39626,6 +45760,7 @@ }, { "tier": 8.0, + "symbol": "SXP/USDT:USDT", "currency": "USDT", "minNotional": 2500000.0, "maxNotional": 6000000.0, @@ -39642,6 +45777,7 @@ }, { "tier": 9.0, + "symbol": "SXP/USDT:USDT", "currency": "USDT", "minNotional": 6000000.0, "maxNotional": 10000000.0, @@ -39660,6 +45796,7 @@ "SYN/USDT:USDT": [ { "tier": 1.0, + "symbol": "SYN/USDT:USDT", "currency": "USDT", "minNotional": 0.0, "maxNotional": 5000.0, @@ -39676,6 +45813,7 @@ }, { "tier": 2.0, + "symbol": "SYN/USDT:USDT", "currency": "USDT", "minNotional": 5000.0, "maxNotional": 20000.0, @@ -39692,6 +45830,7 @@ }, { "tier": 3.0, + "symbol": "SYN/USDT:USDT", "currency": "USDT", "minNotional": 20000.0, "maxNotional": 25000.0, @@ -39708,6 +45847,7 @@ }, { "tier": 4.0, + "symbol": "SYN/USDT:USDT", "currency": "USDT", "minNotional": 25000.0, "maxNotional": 200000.0, @@ -39724,6 +45864,7 @@ }, { "tier": 5.0, + "symbol": "SYN/USDT:USDT", "currency": "USDT", "minNotional": 200000.0, "maxNotional": 400000.0, @@ -39740,6 +45881,7 @@ }, { "tier": 6.0, + "symbol": "SYN/USDT:USDT", "currency": "USDT", "minNotional": 400000.0, "maxNotional": 500000.0, @@ -39756,6 +45898,7 @@ }, { "tier": 7.0, + "symbol": "SYN/USDT:USDT", "currency": "USDT", "minNotional": 500000.0, "maxNotional": 1000000.0, @@ -39772,6 +45915,7 @@ }, { "tier": 8.0, + "symbol": "SYN/USDT:USDT", "currency": "USDT", "minNotional": 1000000.0, "maxNotional": 2000000.0, @@ -39790,6 +45934,7 @@ "SYS/USDT:USDT": [ { "tier": 1.0, + "symbol": "SYS/USDT:USDT", "currency": "USDT", "minNotional": 0.0, "maxNotional": 5000.0, @@ -39806,6 +45951,7 @@ }, { "tier": 2.0, + "symbol": "SYS/USDT:USDT", "currency": "USDT", "minNotional": 5000.0, "maxNotional": 20000.0, @@ -39822,6 +45968,7 @@ }, { "tier": 3.0, + "symbol": "SYS/USDT:USDT", "currency": "USDT", "minNotional": 20000.0, "maxNotional": 25000.0, @@ -39838,6 +45985,7 @@ }, { "tier": 4.0, + "symbol": "SYS/USDT:USDT", "currency": "USDT", "minNotional": 25000.0, "maxNotional": 200000.0, @@ -39854,6 +46002,7 @@ }, { "tier": 5.0, + "symbol": "SYS/USDT:USDT", "currency": "USDT", "minNotional": 200000.0, "maxNotional": 400000.0, @@ -39870,6 +46019,7 @@ }, { "tier": 6.0, + "symbol": "SYS/USDT:USDT", "currency": "USDT", "minNotional": 400000.0, "maxNotional": 500000.0, @@ -39886,6 +46036,7 @@ }, { "tier": 7.0, + "symbol": "SYS/USDT:USDT", "currency": "USDT", "minNotional": 500000.0, "maxNotional": 1000000.0, @@ -39902,6 +46053,7 @@ }, { "tier": 8.0, + "symbol": "SYS/USDT:USDT", "currency": "USDT", "minNotional": 1000000.0, "maxNotional": 2000000.0, @@ -39920,6 +46072,7 @@ "T/USDT:USDT": [ { "tier": 1.0, + "symbol": "T/USDT:USDT", "currency": "USDT", "minNotional": 0.0, "maxNotional": 5000.0, @@ -39936,6 +46089,7 @@ }, { "tier": 2.0, + "symbol": "T/USDT:USDT", "currency": "USDT", "minNotional": 5000.0, "maxNotional": 20000.0, @@ -39952,6 +46106,7 @@ }, { "tier": 3.0, + "symbol": "T/USDT:USDT", "currency": "USDT", "minNotional": 20000.0, "maxNotional": 25000.0, @@ -39968,6 +46123,7 @@ }, { "tier": 4.0, + "symbol": "T/USDT:USDT", "currency": "USDT", "minNotional": 25000.0, "maxNotional": 200000.0, @@ -39984,6 +46140,7 @@ }, { "tier": 5.0, + "symbol": "T/USDT:USDT", "currency": "USDT", "minNotional": 200000.0, "maxNotional": 400000.0, @@ -40000,6 +46157,7 @@ }, { "tier": 6.0, + "symbol": "T/USDT:USDT", "currency": "USDT", "minNotional": 400000.0, "maxNotional": 500000.0, @@ -40016,6 +46174,7 @@ }, { "tier": 7.0, + "symbol": "T/USDT:USDT", "currency": "USDT", "minNotional": 500000.0, "maxNotional": 1000000.0, @@ -40032,6 +46191,7 @@ }, { "tier": 8.0, + "symbol": "T/USDT:USDT", "currency": "USDT", "minNotional": 1000000.0, "maxNotional": 2000000.0, @@ -40050,6 +46210,7 @@ "TAO/USDT:USDT": [ { "tier": 1.0, + "symbol": "TAO/USDT:USDT", "currency": "USDT", "minNotional": 0.0, "maxNotional": 10000.0, @@ -40066,6 +46227,7 @@ }, { "tier": 2.0, + "symbol": "TAO/USDT:USDT", "currency": "USDT", "minNotional": 10000.0, "maxNotional": 100000.0, @@ -40082,6 +46244,7 @@ }, { "tier": 3.0, + "symbol": "TAO/USDT:USDT", "currency": "USDT", "minNotional": 100000.0, "maxNotional": 500000.0, @@ -40098,6 +46261,7 @@ }, { "tier": 4.0, + "symbol": "TAO/USDT:USDT", "currency": "USDT", "minNotional": 500000.0, "maxNotional": 1000000.0, @@ -40114,6 +46278,7 @@ }, { "tier": 5.0, + "symbol": "TAO/USDT:USDT", "currency": "USDT", "minNotional": 1000000.0, "maxNotional": 5000000.0, @@ -40130,6 +46295,7 @@ }, { "tier": 6.0, + "symbol": "TAO/USDT:USDT", "currency": "USDT", "minNotional": 5000000.0, "maxNotional": 10000000.0, @@ -40146,6 +46312,7 @@ }, { "tier": 7.0, + "symbol": "TAO/USDT:USDT", "currency": "USDT", "minNotional": 10000000.0, "maxNotional": 12500000.0, @@ -40162,6 +46329,7 @@ }, { "tier": 8.0, + "symbol": "TAO/USDT:USDT", "currency": "USDT", "minNotional": 12500000.0, "maxNotional": 25000000.0, @@ -40178,6 +46346,7 @@ }, { "tier": 9.0, + "symbol": "TAO/USDT:USDT", "currency": "USDT", "minNotional": 25000000.0, "maxNotional": 50000000.0, @@ -40193,9 +46362,165 @@ } } ], + "THE/USDT:USDT": [ + { + "tier": 1.0, + "symbol": "THE/USDT:USDT", + "currency": "USDT", + "minNotional": 0.0, + "maxNotional": 5000.0, + "maintenanceMarginRate": 0.01, + "maxLeverage": 75.0, + "info": { + "bracket": "1", + "initialLeverage": "75", + "notionalCap": "5000", + "notionalFloor": "0", + "maintMarginRatio": "0.01", + "cum": "0.0" + } + }, + { + "tier": 2.0, + "symbol": "THE/USDT:USDT", + "currency": "USDT", + "minNotional": 5000.0, + "maxNotional": 10000.0, + "maintenanceMarginRate": 0.015, + "maxLeverage": 50.0, + "info": { + "bracket": "2", + "initialLeverage": "50", + "notionalCap": "10000", + "notionalFloor": "5000", + "maintMarginRatio": "0.015", + "cum": "25.0" + } + }, + { + "tier": 3.0, + "symbol": "THE/USDT:USDT", + "currency": "USDT", + "minNotional": 10000.0, + "maxNotional": 30000.0, + "maintenanceMarginRate": 0.02, + "maxLeverage": 25.0, + "info": { + "bracket": "3", + "initialLeverage": "25", + "notionalCap": "30000", + "notionalFloor": "10000", + "maintMarginRatio": "0.02", + "cum": "75.0" + } + }, + { + "tier": 4.0, + "symbol": "THE/USDT:USDT", + "currency": "USDT", + "minNotional": 30000.0, + "maxNotional": 60000.0, + "maintenanceMarginRate": 0.025, + "maxLeverage": 20.0, + "info": { + "bracket": "4", + "initialLeverage": "20", + "notionalCap": "60000", + "notionalFloor": "30000", + "maintMarginRatio": "0.025", + "cum": "225.0" + } + }, + { + "tier": 5.0, + "symbol": "THE/USDT:USDT", + "currency": "USDT", + "minNotional": 60000.0, + "maxNotional": 300000.0, + "maintenanceMarginRate": 0.05, + "maxLeverage": 10.0, + "info": { + "bracket": "5", + "initialLeverage": "10", + "notionalCap": "300000", + "notionalFloor": "60000", + "maintMarginRatio": "0.05", + "cum": "1725.0" + } + }, + { + "tier": 6.0, + "symbol": "THE/USDT:USDT", + "currency": "USDT", + "minNotional": 300000.0, + "maxNotional": 600000.0, + "maintenanceMarginRate": 0.1, + "maxLeverage": 5.0, + "info": { + "bracket": "6", + "initialLeverage": "5", + "notionalCap": "600000", + "notionalFloor": "300000", + "maintMarginRatio": "0.1", + "cum": "16725.0" + } + }, + { + "tier": 7.0, + "symbol": "THE/USDT:USDT", + "currency": "USDT", + "minNotional": 600000.0, + "maxNotional": 750000.0, + "maintenanceMarginRate": 0.125, + "maxLeverage": 4.0, + "info": { + "bracket": "7", + "initialLeverage": "4", + "notionalCap": "750000", + "notionalFloor": "600000", + "maintMarginRatio": "0.125", + "cum": "31725.0" + } + }, + { + "tier": 8.0, + "symbol": "THE/USDT:USDT", + "currency": "USDT", + "minNotional": 750000.0, + "maxNotional": 1500000.0, + "maintenanceMarginRate": 0.25, + "maxLeverage": 2.0, + "info": { + "bracket": "8", + "initialLeverage": "2", + "notionalCap": "1500000", + "notionalFloor": "750000", + "maintMarginRatio": "0.25", + "cum": "125475.0" + } + }, + { + "tier": 9.0, + "symbol": "THE/USDT:USDT", + "currency": "USDT", + "minNotional": 1500000.0, + "maxNotional": 3000000.0, + "maintenanceMarginRate": 0.5, + "maxLeverage": 1.0, + "info": { + "bracket": "9", + "initialLeverage": "1", + "notionalCap": "3000000", + "notionalFloor": "1500000", + "maintMarginRatio": "0.5", + "cum": "500475.0" + } + } + ], "THETA/USDT:USDT": [ { "tier": 1.0, + "symbol": "THETA/USDT:USDT", "currency": "USDT", "minNotional": 0.0, "maxNotional": 50000.0, @@ -40212,6 +46537,7 @@ }, { "tier": 2.0, + "symbol": "THETA/USDT:USDT", "currency": "USDT", "minNotional": 50000.0, "maxNotional": 250000.0, @@ -40228,6 +46554,7 @@ }, { "tier": 3.0, + "symbol": "THETA/USDT:USDT", "currency": "USDT", "minNotional": 250000.0, "maxNotional": 1000000.0, @@ -40244,6 +46571,7 @@ }, { "tier": 4.0, + "symbol": "THETA/USDT:USDT", "currency": "USDT", "minNotional": 1000000.0, "maxNotional": 2000000.0, @@ -40260,6 +46588,7 @@ }, { "tier": 5.0, + "symbol": "THETA/USDT:USDT", "currency": "USDT", "minNotional": 2000000.0, "maxNotional": 5000000.0, @@ -40276,6 +46605,7 @@ }, { "tier": 6.0, + "symbol": "THETA/USDT:USDT", "currency": "USDT", "minNotional": 5000000.0, "maxNotional": 10000000.0, @@ -40292,6 +46622,7 @@ }, { "tier": 7.0, + "symbol": "THETA/USDT:USDT", "currency": "USDT", "minNotional": 10000000.0, "maxNotional": 20000000.0, @@ -40308,6 +46639,7 @@ }, { "tier": 8.0, + "symbol": "THETA/USDT:USDT", "currency": "USDT", "minNotional": 20000000.0, "maxNotional": 30000000.0, @@ -40326,6 +46658,7 @@ "TIA/USDC:USDC": [ { "tier": 1.0, + "symbol": "TIA/USDC:USDC", "currency": "USDC", "minNotional": 0.0, "maxNotional": 5000.0, @@ -40342,6 +46675,7 @@ }, { "tier": 2.0, + "symbol": "TIA/USDC:USDC", "currency": "USDC", "minNotional": 5000.0, "maxNotional": 50000.0, @@ -40358,6 +46692,7 @@ }, { "tier": 3.0, + "symbol": "TIA/USDC:USDC", "currency": "USDC", "minNotional": 50000.0, "maxNotional": 600000.0, @@ -40374,6 +46709,7 @@ }, { "tier": 4.0, + "symbol": "TIA/USDC:USDC", "currency": "USDC", "minNotional": 600000.0, "maxNotional": 1200000.0, @@ -40390,6 +46726,7 @@ }, { "tier": 5.0, + "symbol": "TIA/USDC:USDC", "currency": "USDC", "minNotional": 1200000.0, "maxNotional": 3000000.0, @@ -40406,6 +46743,7 @@ }, { "tier": 6.0, + "symbol": "TIA/USDC:USDC", "currency": "USDC", "minNotional": 3000000.0, "maxNotional": 4000000.0, @@ -40422,6 +46760,7 @@ }, { "tier": 7.0, + "symbol": "TIA/USDC:USDC", "currency": "USDC", "minNotional": 4000000.0, "maxNotional": 6000000.0, @@ -40438,6 +46777,7 @@ }, { "tier": 8.0, + "symbol": "TIA/USDC:USDC", "currency": "USDC", "minNotional": 6000000.0, "maxNotional": 10000000.0, @@ -40456,6 +46796,7 @@ "TIA/USDT:USDT": [ { "tier": 1.0, + "symbol": "TIA/USDT:USDT", "currency": "USDT", "minNotional": 0.0, "maxNotional": 10000.0, @@ -40472,15 +46813,16 @@ }, { "tier": 2.0, + "symbol": "TIA/USDT:USDT", "currency": "USDT", "minNotional": 10000.0, - "maxNotional": 80000.0, + "maxNotional": 100000.0, "maintenanceMarginRate": 0.015, "maxLeverage": 50.0, "info": { "bracket": "2", "initialLeverage": "50", - "notionalCap": "80000", + "notionalCap": "100000", "notionalFloor": "10000", "maintMarginRatio": "0.015", "cum": "50.0" @@ -40488,120 +46830,128 @@ }, { "tier": 3.0, + "symbol": "TIA/USDT:USDT", "currency": "USDT", - "minNotional": 80000.0, - "maxNotional": 400000.0, + "minNotional": 100000.0, + "maxNotional": 500000.0, "maintenanceMarginRate": 0.02, "maxLeverage": 25.0, "info": { "bracket": "3", "initialLeverage": "25", - "notionalCap": "400000", - "notionalFloor": "80000", + "notionalCap": "500000", + "notionalFloor": "100000", "maintMarginRatio": "0.02", - "cum": "450.0" + "cum": "550.0" } }, { "tier": 4.0, + "symbol": "TIA/USDT:USDT", "currency": "USDT", - "minNotional": 400000.0, - "maxNotional": 800000.0, + "minNotional": 500000.0, + "maxNotional": 1000000.0, "maintenanceMarginRate": 0.025, "maxLeverage": 20.0, "info": { "bracket": "4", "initialLeverage": "20", - "notionalCap": "800000", - "notionalFloor": "400000", + "notionalCap": "1000000", + "notionalFloor": "500000", "maintMarginRatio": "0.025", - "cum": "2450.0" + "cum": "3050.0" } }, { "tier": 5.0, + "symbol": "TIA/USDT:USDT", "currency": "USDT", - "minNotional": 800000.0, - "maxNotional": 4000000.0, + "minNotional": 1000000.0, + "maxNotional": 5000000.0, "maintenanceMarginRate": 0.05, "maxLeverage": 10.0, "info": { "bracket": "5", "initialLeverage": "10", - "notionalCap": "4000000", - "notionalFloor": "800000", + "notionalCap": "5000000", + "notionalFloor": "1000000", "maintMarginRatio": "0.05", - "cum": "22450.0" + "cum": "28050.0" } }, { "tier": 6.0, + "symbol": "TIA/USDT:USDT", "currency": "USDT", - "minNotional": 4000000.0, - "maxNotional": 8000000.0, + "minNotional": 5000000.0, + "maxNotional": 10000000.0, "maintenanceMarginRate": 0.1, "maxLeverage": 5.0, "info": { "bracket": "6", "initialLeverage": "5", - "notionalCap": "8000000", - "notionalFloor": "4000000", + "notionalCap": "10000000", + "notionalFloor": "5000000", "maintMarginRatio": "0.1", - "cum": "222450.0" + "cum": "278050.0" } }, { "tier": 7.0, + "symbol": "TIA/USDT:USDT", "currency": "USDT", - "minNotional": 8000000.0, - "maxNotional": 10000000.0, + "minNotional": 10000000.0, + "maxNotional": 12500000.0, "maintenanceMarginRate": 0.125, "maxLeverage": 4.0, "info": { "bracket": "7", "initialLeverage": "4", - "notionalCap": "10000000", - "notionalFloor": "8000000", + "notionalCap": "12500000", + "notionalFloor": "10000000", "maintMarginRatio": "0.125", - "cum": "422450.0" + "cum": "528050.0" } }, { "tier": 8.0, + "symbol": "TIA/USDT:USDT", "currency": "USDT", - "minNotional": 10000000.0, - "maxNotional": 20000000.0, + "minNotional": 12500000.0, + "maxNotional": 25000000.0, "maintenanceMarginRate": 0.25, "maxLeverage": 2.0, "info": { "bracket": "8", "initialLeverage": "2", - "notionalCap": "20000000", - "notionalFloor": "10000000", + "notionalCap": "25000000", + "notionalFloor": "12500000", "maintMarginRatio": "0.25", - "cum": "1672450.0" + "cum": "2090550.0" } }, { "tier": 9.0, + "symbol": "TIA/USDT:USDT", "currency": "USDT", - "minNotional": 20000000.0, - "maxNotional": 40000000.0, + "minNotional": 25000000.0, + "maxNotional": 50000000.0, "maintenanceMarginRate": 0.5, "maxLeverage": 1.0, "info": { "bracket": "9", "initialLeverage": "1", - "notionalCap": "40000000", - "notionalFloor": "20000000", + "notionalCap": "50000000", + "notionalFloor": "25000000", "maintMarginRatio": "0.5", - "cum": "6672450.0" + "cum": "8340550.0" } } ], "TLM/USDT:USDT": [ { "tier": 1.0, + "symbol": "TLM/USDT:USDT", "currency": "USDT", "minNotional": 0.0, "maxNotional": 5000.0, @@ -40618,6 +46968,7 @@ }, { "tier": 2.0, + "symbol": "TLM/USDT:USDT", "currency": "USDT", "minNotional": 5000.0, "maxNotional": 25000.0, @@ -40634,6 +46985,7 @@ }, { "tier": 3.0, + "symbol": "TLM/USDT:USDT", "currency": "USDT", "minNotional": 25000.0, "maxNotional": 200000.0, @@ -40650,6 +47002,7 @@ }, { "tier": 4.0, + "symbol": "TLM/USDT:USDT", "currency": "USDT", "minNotional": 200000.0, "maxNotional": 500000.0, @@ -40666,6 +47019,7 @@ }, { "tier": 5.0, + "symbol": "TLM/USDT:USDT", "currency": "USDT", "minNotional": 500000.0, "maxNotional": 1000000.0, @@ -40682,6 +47036,7 @@ }, { "tier": 6.0, + "symbol": "TLM/USDT:USDT", "currency": "USDT", "minNotional": 1000000.0, "maxNotional": 3000000.0, @@ -40698,6 +47053,7 @@ }, { "tier": 7.0, + "symbol": "TLM/USDT:USDT", "currency": "USDT", "minNotional": 3000000.0, "maxNotional": 5000000.0, @@ -40716,136 +47072,162 @@ "TNSR/USDT:USDT": [ { "tier": 1.0, + "symbol": "TNSR/USDT:USDT", "currency": "USDT", "minNotional": 0.0, "maxNotional": 5000.0, - "maintenanceMarginRate": 0.015, - "maxLeverage": 50.0, + "maintenanceMarginRate": 0.01, + "maxLeverage": 75.0, "info": { "bracket": "1", - "initialLeverage": "50", + "initialLeverage": "75", "notionalCap": "5000", "notionalFloor": "0", - "maintMarginRatio": "0.015", + "maintMarginRatio": "0.01", "cum": "0.0" } }, { "tier": 2.0, + "symbol": "TNSR/USDT:USDT", "currency": "USDT", "minNotional": 5000.0, - "maxNotional": 20000.0, - "maintenanceMarginRate": 0.02, - "maxLeverage": 25.0, + "maxNotional": 10000.0, + "maintenanceMarginRate": 0.015, + "maxLeverage": 50.0, "info": { "bracket": "2", - "initialLeverage": "25", - "notionalCap": "20000", + "initialLeverage": "50", + "notionalCap": "10000", "notionalFloor": "5000", - "maintMarginRatio": "0.02", + "maintMarginRatio": "0.015", "cum": "25.0" } }, { "tier": 3.0, + "symbol": "TNSR/USDT:USDT", "currency": "USDT", - "minNotional": 20000.0, - "maxNotional": 30000.0, - "maintenanceMarginRate": 0.025, - "maxLeverage": 20.0, + "minNotional": 10000.0, + "maxNotional": 50000.0, + "maintenanceMarginRate": 0.02, + "maxLeverage": 25.0, "info": { "bracket": "3", - "initialLeverage": "20", - "notionalCap": "30000", - "notionalFloor": "20000", - "maintMarginRatio": "0.025", - "cum": "125.0" + "initialLeverage": "25", + "notionalCap": "50000", + "notionalFloor": "10000", + "maintMarginRatio": "0.02", + "cum": "75.0" } }, { "tier": 4.0, + "symbol": "TNSR/USDT:USDT", "currency": "USDT", - "minNotional": 30000.0, - "maxNotional": 300000.0, - "maintenanceMarginRate": 0.05, - "maxLeverage": 10.0, + "minNotional": 50000.0, + "maxNotional": 100000.0, + "maintenanceMarginRate": 0.025, + "maxLeverage": 20.0, "info": { "bracket": "4", - "initialLeverage": "10", - "notionalCap": "300000", - "notionalFloor": "30000", - "maintMarginRatio": "0.05", - "cum": "875.0" + "initialLeverage": "20", + "notionalCap": "100000", + "notionalFloor": "50000", + "maintMarginRatio": "0.025", + "cum": "325.0" } }, { "tier": 5.0, + "symbol": "TNSR/USDT:USDT", "currency": "USDT", - "minNotional": 300000.0, - "maxNotional": 600000.0, - "maintenanceMarginRate": 0.1, - "maxLeverage": 5.0, + "minNotional": 100000.0, + "maxNotional": 500000.0, + "maintenanceMarginRate": 0.05, + "maxLeverage": 10.0, "info": { "bracket": "5", - "initialLeverage": "5", - "notionalCap": "600000", - "notionalFloor": "300000", - "maintMarginRatio": "0.1", - "cum": "15875.0" + "initialLeverage": "10", + "notionalCap": "500000", + "notionalFloor": "100000", + "maintMarginRatio": "0.05", + "cum": "2825.0" } }, { "tier": 6.0, + "symbol": "TNSR/USDT:USDT", "currency": "USDT", - "minNotional": 600000.0, - "maxNotional": 750000.0, - "maintenanceMarginRate": 0.125, - "maxLeverage": 4.0, + "minNotional": 500000.0, + "maxNotional": 1000000.0, + "maintenanceMarginRate": 0.1, + "maxLeverage": 5.0, "info": { "bracket": "6", - "initialLeverage": "4", - "notionalCap": "750000", - "notionalFloor": "600000", - "maintMarginRatio": "0.125", - "cum": "30875.0" + "initialLeverage": "5", + "notionalCap": "1000000", + "notionalFloor": "500000", + "maintMarginRatio": "0.1", + "cum": "27825.0" } }, { "tier": 7.0, + "symbol": "TNSR/USDT:USDT", "currency": "USDT", - "minNotional": 750000.0, - "maxNotional": 1500000.0, - "maintenanceMarginRate": 0.25, - "maxLeverage": 2.0, + "minNotional": 1000000.0, + "maxNotional": 1250000.0, + "maintenanceMarginRate": 0.125, + "maxLeverage": 4.0, "info": { "bracket": "7", - "initialLeverage": "2", - "notionalCap": "1500000", - "notionalFloor": "750000", - "maintMarginRatio": "0.25", - "cum": "124625.0" + "initialLeverage": "4", + "notionalCap": "1250000", + "notionalFloor": "1000000", + "maintMarginRatio": "0.125", + "cum": "52825.0" } }, { "tier": 8.0, + "symbol": "TNSR/USDT:USDT", "currency": "USDT", - "minNotional": 1500000.0, - "maxNotional": 3000000.0, + "minNotional": 1250000.0, + "maxNotional": 2500000.0, + "maintenanceMarginRate": 0.25, + "maxLeverage": 2.0, + "info": { + "bracket": "8", + "initialLeverage": "2", + "notionalCap": "2500000", + "notionalFloor": "1250000", + "maintMarginRatio": "0.25", + "cum": "209075.0" + } + }, + { + "tier": 9.0, + "symbol": "TNSR/USDT:USDT", + "currency": "USDT", + "minNotional": 2500000.0, + "maxNotional": 5000000.0, "maintenanceMarginRate": 0.5, "maxLeverage": 1.0, "info": { - "bracket": "8", + "bracket": "9", "initialLeverage": "1", - "notionalCap": "3000000", - "notionalFloor": "1500000", + "notionalCap": "5000000", + "notionalFloor": "2500000", "maintMarginRatio": "0.5", - "cum": "499625.0" + "cum": "834075.0" } } ], "TOKEN/USDT:USDT": [ { "tier": 1.0, + "symbol": "TOKEN/USDT:USDT", "currency": "USDT", "minNotional": 0.0, "maxNotional": 5000.0, @@ -40862,6 +47244,7 @@ }, { "tier": 2.0, + "symbol": "TOKEN/USDT:USDT", "currency": "USDT", "minNotional": 5000.0, "maxNotional": 25000.0, @@ -40878,6 +47261,7 @@ }, { "tier": 3.0, + "symbol": "TOKEN/USDT:USDT", "currency": "USDT", "minNotional": 25000.0, "maxNotional": 100000.0, @@ -40894,6 +47278,7 @@ }, { "tier": 4.0, + "symbol": "TOKEN/USDT:USDT", "currency": "USDT", "minNotional": 100000.0, "maxNotional": 200000.0, @@ -40910,6 +47295,7 @@ }, { "tier": 5.0, + "symbol": "TOKEN/USDT:USDT", "currency": "USDT", "minNotional": 200000.0, "maxNotional": 500000.0, @@ -40926,6 +47312,7 @@ }, { "tier": 6.0, + "symbol": "TOKEN/USDT:USDT", "currency": "USDT", "minNotional": 500000.0, "maxNotional": 1000000.0, @@ -40942,6 +47329,7 @@ }, { "tier": 7.0, + "symbol": "TOKEN/USDT:USDT", "currency": "USDT", "minNotional": 1000000.0, "maxNotional": 2000000.0, @@ -40960,6 +47348,7 @@ "TON/USDT:USDT": [ { "tier": 1.0, + "symbol": "TON/USDT:USDT", "currency": "USDT", "minNotional": 0.0, "maxNotional": 10000.0, @@ -40976,6 +47365,7 @@ }, { "tier": 2.0, + "symbol": "TON/USDT:USDT", "currency": "USDT", "minNotional": 10000.0, "maxNotional": 80000.0, @@ -40992,6 +47382,7 @@ }, { "tier": 3.0, + "symbol": "TON/USDT:USDT", "currency": "USDT", "minNotional": 80000.0, "maxNotional": 400000.0, @@ -41008,6 +47399,7 @@ }, { "tier": 4.0, + "symbol": "TON/USDT:USDT", "currency": "USDT", "minNotional": 400000.0, "maxNotional": 800000.0, @@ -41024,6 +47416,7 @@ }, { "tier": 5.0, + "symbol": "TON/USDT:USDT", "currency": "USDT", "minNotional": 800000.0, "maxNotional": 4000000.0, @@ -41040,6 +47433,7 @@ }, { "tier": 6.0, + "symbol": "TON/USDT:USDT", "currency": "USDT", "minNotional": 4000000.0, "maxNotional": 8000000.0, @@ -41056,6 +47450,7 @@ }, { "tier": 7.0, + "symbol": "TON/USDT:USDT", "currency": "USDT", "minNotional": 8000000.0, "maxNotional": 10000000.0, @@ -41072,6 +47467,7 @@ }, { "tier": 8.0, + "symbol": "TON/USDT:USDT", "currency": "USDT", "minNotional": 10000000.0, "maxNotional": 20000000.0, @@ -41088,6 +47484,7 @@ }, { "tier": 9.0, + "symbol": "TON/USDT:USDT", "currency": "USDT", "minNotional": 20000000.0, "maxNotional": 40000000.0, @@ -41106,6 +47503,7 @@ "TRB/USDT:USDT": [ { "tier": 1.0, + "symbol": "TRB/USDT:USDT", "currency": "USDT", "minNotional": 0.0, "maxNotional": 5000.0, @@ -41122,6 +47520,7 @@ }, { "tier": 2.0, + "symbol": "TRB/USDT:USDT", "currency": "USDT", "minNotional": 5000.0, "maxNotional": 50000.0, @@ -41138,6 +47537,7 @@ }, { "tier": 3.0, + "symbol": "TRB/USDT:USDT", "currency": "USDT", "minNotional": 50000.0, "maxNotional": 100000.0, @@ -41154,6 +47554,7 @@ }, { "tier": 4.0, + "symbol": "TRB/USDT:USDT", "currency": "USDT", "minNotional": 100000.0, "maxNotional": 400000.0, @@ -41170,6 +47571,7 @@ }, { "tier": 5.0, + "symbol": "TRB/USDT:USDT", "currency": "USDT", "minNotional": 400000.0, "maxNotional": 1000000.0, @@ -41186,6 +47588,7 @@ }, { "tier": 6.0, + "symbol": "TRB/USDT:USDT", "currency": "USDT", "minNotional": 1000000.0, "maxNotional": 2000000.0, @@ -41202,6 +47605,7 @@ }, { "tier": 7.0, + "symbol": "TRB/USDT:USDT", "currency": "USDT", "minNotional": 2000000.0, "maxNotional": 4000000.0, @@ -41218,6 +47622,7 @@ }, { "tier": 8.0, + "symbol": "TRB/USDT:USDT", "currency": "USDT", "minNotional": 4000000.0, "maxNotional": 4500000.0, @@ -41233,123 +47638,320 @@ } } ], - "TRU/USDT:USDT": [ + "TROY/USDT:USDT": [ { "tier": 1.0, + "symbol": "TROY/USDT:USDT", "currency": "USDT", "minNotional": 0.0, - "maxNotional": 5000.0, - "maintenanceMarginRate": 0.02, - "maxLeverage": 20.0, + "maxNotional": 10000.0, + "maintenanceMarginRate": 0.01, + "maxLeverage": 75.0, "info": { "bracket": "1", - "initialLeverage": "20", - "notionalCap": "5000", + "initialLeverage": "75", + "notionalCap": "10000", "notionalFloor": "0", - "maintMarginRatio": "0.02", + "maintMarginRatio": "0.01", "cum": "0.0" } }, { "tier": 2.0, + "symbol": "TROY/USDT:USDT", "currency": "USDT", - "minNotional": 5000.0, - "maxNotional": 25000.0, - "maintenanceMarginRate": 0.025, - "maxLeverage": 15.0, + "minNotional": 10000.0, + "maxNotional": 20000.0, + "maintenanceMarginRate": 0.015, + "maxLeverage": 50.0, "info": { "bracket": "2", - "initialLeverage": "15", - "notionalCap": "25000", - "notionalFloor": "5000", + "initialLeverage": "50", + "notionalCap": "20000", + "notionalFloor": "10000", + "maintMarginRatio": "0.015", + "cum": "50.0" + } + }, + { + "tier": 3.0, + "symbol": "TROY/USDT:USDT", + "currency": "USDT", + "minNotional": 20000.0, + "maxNotional": 100000.0, + "maintenanceMarginRate": 0.02, + "maxLeverage": 25.0, + "info": { + "bracket": "3", + "initialLeverage": "25", + "notionalCap": "100000", + "notionalFloor": "20000", + "maintMarginRatio": "0.02", + "cum": "150.0" + } + }, + { + "tier": 4.0, + "symbol": "TROY/USDT:USDT", + "currency": "USDT", + "minNotional": 100000.0, + "maxNotional": 200000.0, + "maintenanceMarginRate": 0.025, + "maxLeverage": 20.0, + "info": { + "bracket": "4", + "initialLeverage": "20", + "notionalCap": "200000", + "notionalFloor": "100000", "maintMarginRatio": "0.025", + "cum": "650.0" + } + }, + { + "tier": 5.0, + "symbol": "TROY/USDT:USDT", + "currency": "USDT", + "minNotional": 200000.0, + "maxNotional": 1000000.0, + "maintenanceMarginRate": 0.05, + "maxLeverage": 10.0, + "info": { + "bracket": "5", + "initialLeverage": "10", + "notionalCap": "1000000", + "notionalFloor": "200000", + "maintMarginRatio": "0.05", + "cum": "5650.0" + } + }, + { + "tier": 6.0, + "symbol": "TROY/USDT:USDT", + "currency": "USDT", + "minNotional": 1000000.0, + "maxNotional": 2000000.0, + "maintenanceMarginRate": 0.1, + "maxLeverage": 5.0, + "info": { + "bracket": "6", + "initialLeverage": "5", + "notionalCap": "2000000", + "notionalFloor": "1000000", + "maintMarginRatio": "0.1", + "cum": "55650.0" + } + }, + { + "tier": 7.0, + "symbol": "TROY/USDT:USDT", + "currency": "USDT", + "minNotional": 2000000.0, + "maxNotional": 2500000.0, + "maintenanceMarginRate": 0.125, + "maxLeverage": 4.0, + "info": { + "bracket": "7", + "initialLeverage": "4", + "notionalCap": "2500000", + "notionalFloor": "2000000", + "maintMarginRatio": "0.125", + "cum": "105650.0" + } + }, + { + "tier": 8.0, + "symbol": "TROY/USDT:USDT", + "currency": "USDT", + "minNotional": 2500000.0, + "maxNotional": 5000000.0, + "maintenanceMarginRate": 0.25, + "maxLeverage": 2.0, + "info": { + "bracket": "8", + "initialLeverage": "2", + "notionalCap": "5000000", + "notionalFloor": "2500000", + "maintMarginRatio": "0.25", + "cum": "418150.0" + } + }, + { + "tier": 9.0, + "symbol": "TROY/USDT:USDT", + "currency": "USDT", + "minNotional": 5000000.0, + "maxNotional": 10000000.0, + "maintenanceMarginRate": 0.5, + "maxLeverage": 1.0, + "info": { + "bracket": "9", + "initialLeverage": "1", + "notionalCap": "10000000", + "notionalFloor": "5000000", + "maintMarginRatio": "0.5", + "cum": "1668150.0" + } + } + ], + "TRU/USDT:USDT": [ + { + "tier": 1.0, + "symbol": "TRU/USDT:USDT", + "currency": "USDT", + "minNotional": 0.0, + "maxNotional": 5000.0, + "maintenanceMarginRate": 0.01, + "maxLeverage": 75.0, + "info": { + "bracket": "1", + "initialLeverage": "75", + "notionalCap": "5000", + "notionalFloor": "0", + "maintMarginRatio": "0.01", + "cum": "0.0" + } + }, + { + "tier": 2.0, + "symbol": "TRU/USDT:USDT", + "currency": "USDT", + "minNotional": 5000.0, + "maxNotional": 10000.0, + "maintenanceMarginRate": 0.015, + "maxLeverage": 50.0, + "info": { + "bracket": "2", + "initialLeverage": "50", + "notionalCap": "10000", + "notionalFloor": "5000", + "maintMarginRatio": "0.015", "cum": "25.0" } }, { "tier": 3.0, + "symbol": "TRU/USDT:USDT", "currency": "USDT", - "minNotional": 25000.0, - "maxNotional": 200000.0, - "maintenanceMarginRate": 0.05, - "maxLeverage": 10.0, + "minNotional": 10000.0, + "maxNotional": 50000.0, + "maintenanceMarginRate": 0.02, + "maxLeverage": 25.0, "info": { "bracket": "3", - "initialLeverage": "10", - "notionalCap": "200000", - "notionalFloor": "25000", - "maintMarginRatio": "0.05", - "cum": "650.0" + "initialLeverage": "25", + "notionalCap": "50000", + "notionalFloor": "10000", + "maintMarginRatio": "0.02", + "cum": "75.0" } }, { "tier": 4.0, + "symbol": "TRU/USDT:USDT", "currency": "USDT", - "minNotional": 200000.0, - "maxNotional": 500000.0, - "maintenanceMarginRate": 0.1, - "maxLeverage": 5.0, + "minNotional": 50000.0, + "maxNotional": 100000.0, + "maintenanceMarginRate": 0.025, + "maxLeverage": 20.0, "info": { "bracket": "4", - "initialLeverage": "5", - "notionalCap": "500000", - "notionalFloor": "200000", - "maintMarginRatio": "0.1", - "cum": "10650.0" + "initialLeverage": "20", + "notionalCap": "100000", + "notionalFloor": "50000", + "maintMarginRatio": "0.025", + "cum": "325.0" } }, { "tier": 5.0, + "symbol": "TRU/USDT:USDT", "currency": "USDT", - "minNotional": 500000.0, - "maxNotional": 1000000.0, - "maintenanceMarginRate": 0.125, - "maxLeverage": 4.0, + "minNotional": 100000.0, + "maxNotional": 500000.0, + "maintenanceMarginRate": 0.05, + "maxLeverage": 10.0, "info": { "bracket": "5", - "initialLeverage": "4", - "notionalCap": "1000000", - "notionalFloor": "500000", - "maintMarginRatio": "0.125", - "cum": "23150.0" + "initialLeverage": "10", + "notionalCap": "500000", + "notionalFloor": "100000", + "maintMarginRatio": "0.05", + "cum": "2825.0" } }, { "tier": 6.0, + "symbol": "TRU/USDT:USDT", "currency": "USDT", - "minNotional": 1000000.0, - "maxNotional": 3000000.0, - "maintenanceMarginRate": 0.25, - "maxLeverage": 2.0, + "minNotional": 500000.0, + "maxNotional": 1000000.0, + "maintenanceMarginRate": 0.1, + "maxLeverage": 5.0, "info": { "bracket": "6", - "initialLeverage": "2", - "notionalCap": "3000000", - "notionalFloor": "1000000", - "maintMarginRatio": "0.25", - "cum": "148150.0" + "initialLeverage": "5", + "notionalCap": "1000000", + "notionalFloor": "500000", + "maintMarginRatio": "0.1", + "cum": "27825.0" } }, { "tier": 7.0, + "symbol": "TRU/USDT:USDT", + "currency": "USDT", + "minNotional": 1000000.0, + "maxNotional": 1250000.0, + "maintenanceMarginRate": 0.125, + "maxLeverage": 4.0, + "info": { + "bracket": "7", + "initialLeverage": "4", + "notionalCap": "1250000", + "notionalFloor": "1000000", + "maintMarginRatio": "0.125", + "cum": "52825.0" + } + }, + { + "tier": 8.0, + "symbol": "TRU/USDT:USDT", + "currency": "USDT", + "minNotional": 1250000.0, + "maxNotional": 3000000.0, + "maintenanceMarginRate": 0.25, + "maxLeverage": 2.0, + "info": { + "bracket": "8", + "initialLeverage": "2", + "notionalCap": "3000000", + "notionalFloor": "1250000", + "maintMarginRatio": "0.25", + "cum": "209075.0" + } + }, + { + "tier": 9.0, + "symbol": "TRU/USDT:USDT", "currency": "USDT", "minNotional": 3000000.0, "maxNotional": 5000000.0, "maintenanceMarginRate": 0.5, "maxLeverage": 1.0, "info": { - "bracket": "7", + "bracket": "9", "initialLeverage": "1", "notionalCap": "5000000", "notionalFloor": "3000000", "maintMarginRatio": "0.5", - "cum": "898150.0" + "cum": "959075.0" } } ], "TRX/USDT:USDT": [ { "tier": 1.0, + "symbol": "TRX/USDT:USDT", "currency": "USDT", "minNotional": 0.0, "maxNotional": 10000.0, @@ -41366,6 +47968,7 @@ }, { "tier": 2.0, + "symbol": "TRX/USDT:USDT", "currency": "USDT", "minNotional": 10000.0, "maxNotional": 90000.0, @@ -41382,6 +47985,7 @@ }, { "tier": 3.0, + "symbol": "TRX/USDT:USDT", "currency": "USDT", "minNotional": 90000.0, "maxNotional": 120000.0, @@ -41398,6 +48002,7 @@ }, { "tier": 4.0, + "symbol": "TRX/USDT:USDT", "currency": "USDT", "minNotional": 120000.0, "maxNotional": 650000.0, @@ -41414,6 +48019,7 @@ }, { "tier": 5.0, + "symbol": "TRX/USDT:USDT", "currency": "USDT", "minNotional": 650000.0, "maxNotional": 800000.0, @@ -41430,6 +48036,7 @@ }, { "tier": 6.0, + "symbol": "TRX/USDT:USDT", "currency": "USDT", "minNotional": 800000.0, "maxNotional": 3000000.0, @@ -41446,6 +48053,7 @@ }, { "tier": 7.0, + "symbol": "TRX/USDT:USDT", "currency": "USDT", "minNotional": 3000000.0, "maxNotional": 6000000.0, @@ -41462,6 +48070,7 @@ }, { "tier": 8.0, + "symbol": "TRX/USDT:USDT", "currency": "USDT", "minNotional": 6000000.0, "maxNotional": 12000000.0, @@ -41478,6 +48087,7 @@ }, { "tier": 9.0, + "symbol": "TRX/USDT:USDT", "currency": "USDT", "minNotional": 12000000.0, "maxNotional": 20000000.0, @@ -41494,6 +48104,7 @@ }, { "tier": 10.0, + "symbol": "TRX/USDT:USDT", "currency": "USDT", "minNotional": 20000000.0, "maxNotional": 30000000.0, @@ -41512,6 +48123,7 @@ "TURBO/USDT:USDT": [ { "tier": 1.0, + "symbol": "TURBO/USDT:USDT", "currency": "USDT", "minNotional": 0.0, "maxNotional": 10000.0, @@ -41528,6 +48140,7 @@ }, { "tier": 2.0, + "symbol": "TURBO/USDT:USDT", "currency": "USDT", "minNotional": 10000.0, "maxNotional": 60000.0, @@ -41544,6 +48157,7 @@ }, { "tier": 3.0, + "symbol": "TURBO/USDT:USDT", "currency": "USDT", "minNotional": 60000.0, "maxNotional": 300000.0, @@ -41560,6 +48174,7 @@ }, { "tier": 4.0, + "symbol": "TURBO/USDT:USDT", "currency": "USDT", "minNotional": 300000.0, "maxNotional": 600000.0, @@ -41576,6 +48191,7 @@ }, { "tier": 5.0, + "symbol": "TURBO/USDT:USDT", "currency": "USDT", "minNotional": 600000.0, "maxNotional": 3000000.0, @@ -41592,6 +48208,7 @@ }, { "tier": 6.0, + "symbol": "TURBO/USDT:USDT", "currency": "USDT", "minNotional": 3000000.0, "maxNotional": 6000000.0, @@ -41608,6 +48225,7 @@ }, { "tier": 7.0, + "symbol": "TURBO/USDT:USDT", "currency": "USDT", "minNotional": 6000000.0, "maxNotional": 7500000.0, @@ -41624,6 +48242,7 @@ }, { "tier": 8.0, + "symbol": "TURBO/USDT:USDT", "currency": "USDT", "minNotional": 7500000.0, "maxNotional": 15000000.0, @@ -41640,6 +48259,7 @@ }, { "tier": 9.0, + "symbol": "TURBO/USDT:USDT", "currency": "USDT", "minNotional": 15000000.0, "maxNotional": 30000000.0, @@ -41658,6 +48278,7 @@ "TWT/USDT:USDT": [ { "tier": 1.0, + "symbol": "TWT/USDT:USDT", "currency": "USDT", "minNotional": 0.0, "maxNotional": 5000.0, @@ -41674,6 +48295,7 @@ }, { "tier": 2.0, + "symbol": "TWT/USDT:USDT", "currency": "USDT", "minNotional": 5000.0, "maxNotional": 25000.0, @@ -41690,6 +48312,7 @@ }, { "tier": 3.0, + "symbol": "TWT/USDT:USDT", "currency": "USDT", "minNotional": 25000.0, "maxNotional": 100000.0, @@ -41706,6 +48329,7 @@ }, { "tier": 4.0, + "symbol": "TWT/USDT:USDT", "currency": "USDT", "minNotional": 100000.0, "maxNotional": 200000.0, @@ -41722,6 +48346,7 @@ }, { "tier": 5.0, + "symbol": "TWT/USDT:USDT", "currency": "USDT", "minNotional": 200000.0, "maxNotional": 500000.0, @@ -41738,6 +48363,7 @@ }, { "tier": 6.0, + "symbol": "TWT/USDT:USDT", "currency": "USDT", "minNotional": 500000.0, "maxNotional": 1000000.0, @@ -41754,6 +48380,7 @@ }, { "tier": 7.0, + "symbol": "TWT/USDT:USDT", "currency": "USDT", "minNotional": 1000000.0, "maxNotional": 2000000.0, @@ -41772,6 +48399,7 @@ "UMA/USDT:USDT": [ { "tier": 1.0, + "symbol": "UMA/USDT:USDT", "currency": "USDT", "minNotional": 0.0, "maxNotional": 5000.0, @@ -41788,6 +48416,7 @@ }, { "tier": 2.0, + "symbol": "UMA/USDT:USDT", "currency": "USDT", "minNotional": 5000.0, "maxNotional": 10000.0, @@ -41804,6 +48433,7 @@ }, { "tier": 3.0, + "symbol": "UMA/USDT:USDT", "currency": "USDT", "minNotional": 10000.0, "maxNotional": 50000.0, @@ -41820,6 +48450,7 @@ }, { "tier": 4.0, + "symbol": "UMA/USDT:USDT", "currency": "USDT", "minNotional": 50000.0, "maxNotional": 100000.0, @@ -41836,6 +48467,7 @@ }, { "tier": 5.0, + "symbol": "UMA/USDT:USDT", "currency": "USDT", "minNotional": 100000.0, "maxNotional": 500000.0, @@ -41852,6 +48484,7 @@ }, { "tier": 6.0, + "symbol": "UMA/USDT:USDT", "currency": "USDT", "minNotional": 500000.0, "maxNotional": 1000000.0, @@ -41868,6 +48501,7 @@ }, { "tier": 7.0, + "symbol": "UMA/USDT:USDT", "currency": "USDT", "minNotional": 1000000.0, "maxNotional": 1250000.0, @@ -41884,6 +48518,7 @@ }, { "tier": 8.0, + "symbol": "UMA/USDT:USDT", "currency": "USDT", "minNotional": 1250000.0, "maxNotional": 3000000.0, @@ -41900,6 +48535,7 @@ }, { "tier": 9.0, + "symbol": "UMA/USDT:USDT", "currency": "USDT", "minNotional": 3000000.0, "maxNotional": 5000000.0, @@ -41918,6 +48554,7 @@ "UNFI/USDT:USDT": [ { "tier": 1.0, + "symbol": "UNFI/USDT:USDT", "currency": "USDT", "minNotional": 0.0, "maxNotional": 25000.0, @@ -41934,6 +48571,7 @@ }, { "tier": 2.0, + "symbol": "UNFI/USDT:USDT", "currency": "USDT", "minNotional": 25000.0, "maxNotional": 100000.0, @@ -41950,6 +48588,7 @@ }, { "tier": 3.0, + "symbol": "UNFI/USDT:USDT", "currency": "USDT", "minNotional": 100000.0, "maxNotional": 250000.0, @@ -41966,6 +48605,7 @@ }, { "tier": 4.0, + "symbol": "UNFI/USDT:USDT", "currency": "USDT", "minNotional": 250000.0, "maxNotional": 1000000.0, @@ -41982,6 +48622,7 @@ }, { "tier": 5.0, + "symbol": "UNFI/USDT:USDT", "currency": "USDT", "minNotional": 1000000.0, "maxNotional": 1500000.0, @@ -41998,6 +48639,7 @@ }, { "tier": 6.0, + "symbol": "UNFI/USDT:USDT", "currency": "USDT", "minNotional": 1500000.0, "maxNotional": 3000000.0, @@ -42016,6 +48658,7 @@ "UNI/USDT:USDT": [ { "tier": 1.0, + "symbol": "UNI/USDT:USDT", "currency": "USDT", "minNotional": 0.0, "maxNotional": 10000.0, @@ -42032,6 +48675,7 @@ }, { "tier": 2.0, + "symbol": "UNI/USDT:USDT", "currency": "USDT", "minNotional": 10000.0, "maxNotional": 50000.0, @@ -42048,6 +48692,7 @@ }, { "tier": 3.0, + "symbol": "UNI/USDT:USDT", "currency": "USDT", "minNotional": 50000.0, "maxNotional": 80000.0, @@ -42064,6 +48709,7 @@ }, { "tier": 4.0, + "symbol": "UNI/USDT:USDT", "currency": "USDT", "minNotional": 80000.0, "maxNotional": 300000.0, @@ -42080,6 +48726,7 @@ }, { "tier": 5.0, + "symbol": "UNI/USDT:USDT", "currency": "USDT", "minNotional": 300000.0, "maxNotional": 900000.0, @@ -42096,6 +48743,7 @@ }, { "tier": 6.0, + "symbol": "UNI/USDT:USDT", "currency": "USDT", "minNotional": 900000.0, "maxNotional": 3000000.0, @@ -42112,6 +48760,7 @@ }, { "tier": 7.0, + "symbol": "UNI/USDT:USDT", "currency": "USDT", "minNotional": 3000000.0, "maxNotional": 6000000.0, @@ -42128,6 +48777,7 @@ }, { "tier": 8.0, + "symbol": "UNI/USDT:USDT", "currency": "USDT", "minNotional": 6000000.0, "maxNotional": 7500000.0, @@ -42144,6 +48794,7 @@ }, { "tier": 9.0, + "symbol": "UNI/USDT:USDT", "currency": "USDT", "minNotional": 7500000.0, "maxNotional": 18000000.0, @@ -42160,6 +48811,7 @@ }, { "tier": 10.0, + "symbol": "UNI/USDT:USDT", "currency": "USDT", "minNotional": 18000000.0, "maxNotional": 30000000.0, @@ -42178,6 +48830,7 @@ "USDC/USDT:USDT": [ { "tier": 1.0, + "symbol": "USDC/USDT:USDT", "currency": "USDT", "minNotional": 0.0, "maxNotional": 5000.0, @@ -42194,6 +48847,7 @@ }, { "tier": 2.0, + "symbol": "USDC/USDT:USDT", "currency": "USDT", "minNotional": 5000.0, "maxNotional": 50000.0, @@ -42210,6 +48864,7 @@ }, { "tier": 3.0, + "symbol": "USDC/USDT:USDT", "currency": "USDT", "minNotional": 50000.0, "maxNotional": 900000.0, @@ -42226,6 +48881,7 @@ }, { "tier": 4.0, + "symbol": "USDC/USDT:USDT", "currency": "USDT", "minNotional": 900000.0, "maxNotional": 1800000.0, @@ -42242,6 +48898,7 @@ }, { "tier": 5.0, + "symbol": "USDC/USDT:USDT", "currency": "USDT", "minNotional": 1800000.0, "maxNotional": 4800000.0, @@ -42258,6 +48915,7 @@ }, { "tier": 6.0, + "symbol": "USDC/USDT:USDT", "currency": "USDT", "minNotional": 4800000.0, "maxNotional": 6000000.0, @@ -42274,6 +48932,7 @@ }, { "tier": 7.0, + "symbol": "USDC/USDT:USDT", "currency": "USDT", "minNotional": 6000000.0, "maxNotional": 18000000.0, @@ -42290,6 +48949,7 @@ }, { "tier": 8.0, + "symbol": "USDC/USDT:USDT", "currency": "USDT", "minNotional": 18000000.0, "maxNotional": 30000000.0, @@ -42308,6 +48968,7 @@ "USTC/USDT:USDT": [ { "tier": 1.0, + "symbol": "USTC/USDT:USDT", "currency": "USDT", "minNotional": 0.0, "maxNotional": 5000.0, @@ -42324,6 +48985,7 @@ }, { "tier": 2.0, + "symbol": "USTC/USDT:USDT", "currency": "USDT", "minNotional": 5000.0, "maxNotional": 25000.0, @@ -42340,6 +49002,7 @@ }, { "tier": 3.0, + "symbol": "USTC/USDT:USDT", "currency": "USDT", "minNotional": 25000.0, "maxNotional": 100000.0, @@ -42356,6 +49019,7 @@ }, { "tier": 4.0, + "symbol": "USTC/USDT:USDT", "currency": "USDT", "minNotional": 100000.0, "maxNotional": 200000.0, @@ -42372,6 +49036,7 @@ }, { "tier": 5.0, + "symbol": "USTC/USDT:USDT", "currency": "USDT", "minNotional": 200000.0, "maxNotional": 500000.0, @@ -42388,6 +49053,7 @@ }, { "tier": 6.0, + "symbol": "USTC/USDT:USDT", "currency": "USDT", "minNotional": 500000.0, "maxNotional": 1000000.0, @@ -42404,6 +49070,7 @@ }, { "tier": 7.0, + "symbol": "USTC/USDT:USDT", "currency": "USDT", "minNotional": 1000000.0, "maxNotional": 2000000.0, @@ -42422,6 +49089,7 @@ "UXLINK/USDT:USDT": [ { "tier": 1.0, + "symbol": "UXLINK/USDT:USDT", "currency": "USDT", "minNotional": 0.0, "maxNotional": 5000.0, @@ -42438,6 +49106,7 @@ }, { "tier": 2.0, + "symbol": "UXLINK/USDT:USDT", "currency": "USDT", "minNotional": 5000.0, "maxNotional": 16000.0, @@ -42454,6 +49123,7 @@ }, { "tier": 3.0, + "symbol": "UXLINK/USDT:USDT", "currency": "USDT", "minNotional": 16000.0, "maxNotional": 80000.0, @@ -42470,6 +49140,7 @@ }, { "tier": 4.0, + "symbol": "UXLINK/USDT:USDT", "currency": "USDT", "minNotional": 80000.0, "maxNotional": 160000.0, @@ -42486,6 +49157,7 @@ }, { "tier": 5.0, + "symbol": "UXLINK/USDT:USDT", "currency": "USDT", "minNotional": 160000.0, "maxNotional": 800000.0, @@ -42502,6 +49174,7 @@ }, { "tier": 6.0, + "symbol": "UXLINK/USDT:USDT", "currency": "USDT", "minNotional": 800000.0, "maxNotional": 1600000.0, @@ -42518,6 +49191,7 @@ }, { "tier": 7.0, + "symbol": "UXLINK/USDT:USDT", "currency": "USDT", "minNotional": 1600000.0, "maxNotional": 2000000.0, @@ -42534,6 +49208,7 @@ }, { "tier": 8.0, + "symbol": "UXLINK/USDT:USDT", "currency": "USDT", "minNotional": 2000000.0, "maxNotional": 4000000.0, @@ -42550,6 +49225,7 @@ }, { "tier": 9.0, + "symbol": "UXLINK/USDT:USDT", "currency": "USDT", "minNotional": 4000000.0, "maxNotional": 8000000.0, @@ -42568,6 +49244,7 @@ "VANRY/USDT:USDT": [ { "tier": 1.0, + "symbol": "VANRY/USDT:USDT", "currency": "USDT", "minNotional": 0.0, "maxNotional": 5000.0, @@ -42584,6 +49261,7 @@ }, { "tier": 2.0, + "symbol": "VANRY/USDT:USDT", "currency": "USDT", "minNotional": 5000.0, "maxNotional": 25000.0, @@ -42600,6 +49278,7 @@ }, { "tier": 3.0, + "symbol": "VANRY/USDT:USDT", "currency": "USDT", "minNotional": 25000.0, "maxNotional": 100000.0, @@ -42616,6 +49295,7 @@ }, { "tier": 4.0, + "symbol": "VANRY/USDT:USDT", "currency": "USDT", "minNotional": 100000.0, "maxNotional": 200000.0, @@ -42632,6 +49312,7 @@ }, { "tier": 5.0, + "symbol": "VANRY/USDT:USDT", "currency": "USDT", "minNotional": 200000.0, "maxNotional": 500000.0, @@ -42648,6 +49329,7 @@ }, { "tier": 6.0, + "symbol": "VANRY/USDT:USDT", "currency": "USDT", "minNotional": 500000.0, "maxNotional": 1000000.0, @@ -42664,6 +49346,7 @@ }, { "tier": 7.0, + "symbol": "VANRY/USDT:USDT", "currency": "USDT", "minNotional": 1000000.0, "maxNotional": 2000000.0, @@ -42682,6 +49365,7 @@ "VET/USDT:USDT": [ { "tier": 1.0, + "symbol": "VET/USDT:USDT", "currency": "USDT", "minNotional": 0.0, "maxNotional": 5000.0, @@ -42698,6 +49382,7 @@ }, { "tier": 2.0, + "symbol": "VET/USDT:USDT", "currency": "USDT", "minNotional": 5000.0, "maxNotional": 25000.0, @@ -42714,6 +49399,7 @@ }, { "tier": 3.0, + "symbol": "VET/USDT:USDT", "currency": "USDT", "minNotional": 25000.0, "maxNotional": 200000.0, @@ -42730,6 +49416,7 @@ }, { "tier": 4.0, + "symbol": "VET/USDT:USDT", "currency": "USDT", "minNotional": 200000.0, "maxNotional": 400000.0, @@ -42746,6 +49433,7 @@ }, { "tier": 5.0, + "symbol": "VET/USDT:USDT", "currency": "USDT", "minNotional": 400000.0, "maxNotional": 1000000.0, @@ -42762,6 +49450,7 @@ }, { "tier": 6.0, + "symbol": "VET/USDT:USDT", "currency": "USDT", "minNotional": 1000000.0, "maxNotional": 5000000.0, @@ -42778,6 +49467,7 @@ }, { "tier": 7.0, + "symbol": "VET/USDT:USDT", "currency": "USDT", "minNotional": 5000000.0, "maxNotional": 6000000.0, @@ -42794,6 +49484,7 @@ }, { "tier": 8.0, + "symbol": "VET/USDT:USDT", "currency": "USDT", "minNotional": 6000000.0, "maxNotional": 10000000.0, @@ -42812,6 +49503,7 @@ "VIDT/USDT:USDT": [ { "tier": 1.0, + "symbol": "VIDT/USDT:USDT", "currency": "USDT", "minNotional": 0.0, "maxNotional": 5000.0, @@ -42828,6 +49520,7 @@ }, { "tier": 2.0, + "symbol": "VIDT/USDT:USDT", "currency": "USDT", "minNotional": 5000.0, "maxNotional": 16000.0, @@ -42844,6 +49537,7 @@ }, { "tier": 3.0, + "symbol": "VIDT/USDT:USDT", "currency": "USDT", "minNotional": 16000.0, "maxNotional": 80000.0, @@ -42860,6 +49554,7 @@ }, { "tier": 4.0, + "symbol": "VIDT/USDT:USDT", "currency": "USDT", "minNotional": 80000.0, "maxNotional": 160000.0, @@ -42876,6 +49571,7 @@ }, { "tier": 5.0, + "symbol": "VIDT/USDT:USDT", "currency": "USDT", "minNotional": 160000.0, "maxNotional": 800000.0, @@ -42892,6 +49588,7 @@ }, { "tier": 6.0, + "symbol": "VIDT/USDT:USDT", "currency": "USDT", "minNotional": 800000.0, "maxNotional": 1600000.0, @@ -42908,6 +49605,7 @@ }, { "tier": 7.0, + "symbol": "VIDT/USDT:USDT", "currency": "USDT", "minNotional": 1600000.0, "maxNotional": 2000000.0, @@ -42924,6 +49622,7 @@ }, { "tier": 8.0, + "symbol": "VIDT/USDT:USDT", "currency": "USDT", "minNotional": 2000000.0, "maxNotional": 4000000.0, @@ -42940,6 +49639,7 @@ }, { "tier": 9.0, + "symbol": "VIDT/USDT:USDT", "currency": "USDT", "minNotional": 4000000.0, "maxNotional": 8000000.0, @@ -42958,6 +49658,7 @@ "VOXEL/USDT:USDT": [ { "tier": 1.0, + "symbol": "VOXEL/USDT:USDT", "currency": "USDT", "minNotional": 0.0, "maxNotional": 5000.0, @@ -42974,6 +49675,7 @@ }, { "tier": 2.0, + "symbol": "VOXEL/USDT:USDT", "currency": "USDT", "minNotional": 5000.0, "maxNotional": 20000.0, @@ -42990,6 +49692,7 @@ }, { "tier": 3.0, + "symbol": "VOXEL/USDT:USDT", "currency": "USDT", "minNotional": 20000.0, "maxNotional": 25000.0, @@ -43006,6 +49709,7 @@ }, { "tier": 4.0, + "symbol": "VOXEL/USDT:USDT", "currency": "USDT", "minNotional": 25000.0, "maxNotional": 200000.0, @@ -43022,6 +49726,7 @@ }, { "tier": 5.0, + "symbol": "VOXEL/USDT:USDT", "currency": "USDT", "minNotional": 200000.0, "maxNotional": 400000.0, @@ -43038,6 +49743,7 @@ }, { "tier": 6.0, + "symbol": "VOXEL/USDT:USDT", "currency": "USDT", "minNotional": 400000.0, "maxNotional": 500000.0, @@ -43054,6 +49760,7 @@ }, { "tier": 7.0, + "symbol": "VOXEL/USDT:USDT", "currency": "USDT", "minNotional": 500000.0, "maxNotional": 1000000.0, @@ -43070,6 +49777,7 @@ }, { "tier": 8.0, + "symbol": "VOXEL/USDT:USDT", "currency": "USDT", "minNotional": 1000000.0, "maxNotional": 2000000.0, @@ -43088,6 +49796,7 @@ "W/USDT:USDT": [ { "tier": 1.0, + "symbol": "W/USDT:USDT", "currency": "USDT", "minNotional": 0.0, "maxNotional": 10000.0, @@ -43104,6 +49813,7 @@ }, { "tier": 2.0, + "symbol": "W/USDT:USDT", "currency": "USDT", "minNotional": 10000.0, "maxNotional": 20000.0, @@ -43120,6 +49830,7 @@ }, { "tier": 3.0, + "symbol": "W/USDT:USDT", "currency": "USDT", "minNotional": 20000.0, "maxNotional": 100000.0, @@ -43136,6 +49847,7 @@ }, { "tier": 4.0, + "symbol": "W/USDT:USDT", "currency": "USDT", "minNotional": 100000.0, "maxNotional": 200000.0, @@ -43152,6 +49864,7 @@ }, { "tier": 5.0, + "symbol": "W/USDT:USDT", "currency": "USDT", "minNotional": 200000.0, "maxNotional": 1000000.0, @@ -43168,6 +49881,7 @@ }, { "tier": 6.0, + "symbol": "W/USDT:USDT", "currency": "USDT", "minNotional": 1000000.0, "maxNotional": 2000000.0, @@ -43184,6 +49898,7 @@ }, { "tier": 7.0, + "symbol": "W/USDT:USDT", "currency": "USDT", "minNotional": 2000000.0, "maxNotional": 2500000.0, @@ -43200,6 +49915,7 @@ }, { "tier": 8.0, + "symbol": "W/USDT:USDT", "currency": "USDT", "minNotional": 2500000.0, "maxNotional": 5000000.0, @@ -43216,6 +49932,7 @@ }, { "tier": 9.0, + "symbol": "W/USDT:USDT", "currency": "USDT", "minNotional": 5000000.0, "maxNotional": 10000000.0, @@ -43234,6 +49951,7 @@ "WAVES/USDT:USDT": [ { "tier": 1.0, + "symbol": "WAVES/USDT:USDT", "currency": "USDT", "minNotional": 0.0, "maxNotional": 5000.0, @@ -43250,6 +49968,7 @@ }, { "tier": 2.0, + "symbol": "WAVES/USDT:USDT", "currency": "USDT", "minNotional": 5000.0, "maxNotional": 50000.0, @@ -43266,6 +49985,7 @@ }, { "tier": 3.0, + "symbol": "WAVES/USDT:USDT", "currency": "USDT", "minNotional": 50000.0, "maxNotional": 450000.0, @@ -43282,6 +50002,7 @@ }, { "tier": 4.0, + "symbol": "WAVES/USDT:USDT", "currency": "USDT", "minNotional": 450000.0, "maxNotional": 1200000.0, @@ -43298,6 +50019,7 @@ }, { "tier": 5.0, + "symbol": "WAVES/USDT:USDT", "currency": "USDT", "minNotional": 1200000.0, "maxNotional": 1500000.0, @@ -43314,6 +50036,7 @@ }, { "tier": 6.0, + "symbol": "WAVES/USDT:USDT", "currency": "USDT", "minNotional": 1500000.0, "maxNotional": 3000000.0, @@ -43330,6 +50053,7 @@ }, { "tier": 7.0, + "symbol": "WAVES/USDT:USDT", "currency": "USDT", "minNotional": 3000000.0, "maxNotional": 3500000.0, @@ -43348,6 +50072,7 @@ "WAXP/USDT:USDT": [ { "tier": 1.0, + "symbol": "WAXP/USDT:USDT", "currency": "USDT", "minNotional": 0.0, "maxNotional": 5000.0, @@ -43364,6 +50089,7 @@ }, { "tier": 2.0, + "symbol": "WAXP/USDT:USDT", "currency": "USDT", "minNotional": 5000.0, "maxNotional": 25000.0, @@ -43380,6 +50106,7 @@ }, { "tier": 3.0, + "symbol": "WAXP/USDT:USDT", "currency": "USDT", "minNotional": 25000.0, "maxNotional": 150000.0, @@ -43396,6 +50123,7 @@ }, { "tier": 4.0, + "symbol": "WAXP/USDT:USDT", "currency": "USDT", "minNotional": 150000.0, "maxNotional": 300000.0, @@ -43412,6 +50140,7 @@ }, { "tier": 5.0, + "symbol": "WAXP/USDT:USDT", "currency": "USDT", "minNotional": 300000.0, "maxNotional": 750000.0, @@ -43428,6 +50157,7 @@ }, { "tier": 6.0, + "symbol": "WAXP/USDT:USDT", "currency": "USDT", "minNotional": 750000.0, "maxNotional": 1500000.0, @@ -43444,6 +50174,7 @@ }, { "tier": 7.0, + "symbol": "WAXP/USDT:USDT", "currency": "USDT", "minNotional": 1500000.0, "maxNotional": 3000000.0, @@ -43462,6 +50193,7 @@ "WIF/USDC:USDC": [ { "tier": 1.0, + "symbol": "WIF/USDC:USDC", "currency": "USDC", "minNotional": 0.0, "maxNotional": 5000.0, @@ -43478,6 +50210,7 @@ }, { "tier": 2.0, + "symbol": "WIF/USDC:USDC", "currency": "USDC", "minNotional": 5000.0, "maxNotional": 25000.0, @@ -43494,6 +50227,7 @@ }, { "tier": 3.0, + "symbol": "WIF/USDC:USDC", "currency": "USDC", "minNotional": 25000.0, "maxNotional": 80000.0, @@ -43510,6 +50244,7 @@ }, { "tier": 4.0, + "symbol": "WIF/USDC:USDC", "currency": "USDC", "minNotional": 80000.0, "maxNotional": 800000.0, @@ -43526,6 +50261,7 @@ }, { "tier": 5.0, + "symbol": "WIF/USDC:USDC", "currency": "USDC", "minNotional": 800000.0, "maxNotional": 1600000.0, @@ -43542,6 +50278,7 @@ }, { "tier": 6.0, + "symbol": "WIF/USDC:USDC", "currency": "USDC", "minNotional": 1600000.0, "maxNotional": 2000000.0, @@ -43558,6 +50295,7 @@ }, { "tier": 7.0, + "symbol": "WIF/USDC:USDC", "currency": "USDC", "minNotional": 2000000.0, "maxNotional": 4000000.0, @@ -43574,6 +50312,7 @@ }, { "tier": 8.0, + "symbol": "WIF/USDC:USDC", "currency": "USDC", "minNotional": 4000000.0, "maxNotional": 8000000.0, @@ -43592,6 +50331,7 @@ "WIF/USDT:USDT": [ { "tier": 1.0, + "symbol": "WIF/USDT:USDT", "currency": "USDT", "minNotional": 0.0, "maxNotional": 20000.0, @@ -43608,6 +50348,7 @@ }, { "tier": 2.0, + "symbol": "WIF/USDT:USDT", "currency": "USDT", "minNotional": 20000.0, "maxNotional": 200000.0, @@ -43624,6 +50365,7 @@ }, { "tier": 3.0, + "symbol": "WIF/USDT:USDT", "currency": "USDT", "minNotional": 200000.0, "maxNotional": 1000000.0, @@ -43640,6 +50382,7 @@ }, { "tier": 4.0, + "symbol": "WIF/USDT:USDT", "currency": "USDT", "minNotional": 1000000.0, "maxNotional": 2000000.0, @@ -43656,6 +50399,7 @@ }, { "tier": 5.0, + "symbol": "WIF/USDT:USDT", "currency": "USDT", "minNotional": 2000000.0, "maxNotional": 10000000.0, @@ -43672,6 +50416,7 @@ }, { "tier": 6.0, + "symbol": "WIF/USDT:USDT", "currency": "USDT", "minNotional": 10000000.0, "maxNotional": 20000000.0, @@ -43688,6 +50433,7 @@ }, { "tier": 7.0, + "symbol": "WIF/USDT:USDT", "currency": "USDT", "minNotional": 20000000.0, "maxNotional": 25000000.0, @@ -43704,6 +50450,7 @@ }, { "tier": 8.0, + "symbol": "WIF/USDT:USDT", "currency": "USDT", "minNotional": 25000000.0, "maxNotional": 50000000.0, @@ -43720,6 +50467,7 @@ }, { "tier": 9.0, + "symbol": "WIF/USDT:USDT", "currency": "USDT", "minNotional": 50000000.0, "maxNotional": 100000000.0, @@ -43738,6 +50486,7 @@ "WLD/USDC:USDC": [ { "tier": 1.0, + "symbol": "WLD/USDC:USDC", "currency": "USDC", "minNotional": 0.0, "maxNotional": 5000.0, @@ -43754,6 +50503,7 @@ }, { "tier": 2.0, + "symbol": "WLD/USDC:USDC", "currency": "USDC", "minNotional": 5000.0, "maxNotional": 25000.0, @@ -43770,6 +50520,7 @@ }, { "tier": 3.0, + "symbol": "WLD/USDC:USDC", "currency": "USDC", "minNotional": 25000.0, "maxNotional": 150000.0, @@ -43786,6 +50537,7 @@ }, { "tier": 4.0, + "symbol": "WLD/USDC:USDC", "currency": "USDC", "minNotional": 150000.0, "maxNotional": 300000.0, @@ -43802,6 +50554,7 @@ }, { "tier": 5.0, + "symbol": "WLD/USDC:USDC", "currency": "USDC", "minNotional": 300000.0, "maxNotional": 3000000.0, @@ -43818,6 +50571,7 @@ }, { "tier": 6.0, + "symbol": "WLD/USDC:USDC", "currency": "USDC", "minNotional": 3000000.0, "maxNotional": 6000000.0, @@ -43834,6 +50588,7 @@ }, { "tier": 7.0, + "symbol": "WLD/USDC:USDC", "currency": "USDC", "minNotional": 6000000.0, "maxNotional": 7500000.0, @@ -43850,6 +50605,7 @@ }, { "tier": 8.0, + "symbol": "WLD/USDC:USDC", "currency": "USDC", "minNotional": 7500000.0, "maxNotional": 15000000.0, @@ -43866,6 +50622,7 @@ }, { "tier": 9.0, + "symbol": "WLD/USDC:USDC", "currency": "USDC", "minNotional": 15000000.0, "maxNotional": 30000000.0, @@ -43884,6 +50641,7 @@ "WLD/USDT:USDT": [ { "tier": 1.0, + "symbol": "WLD/USDT:USDT", "currency": "USDT", "minNotional": 0.0, "maxNotional": 5000.0, @@ -43900,6 +50658,7 @@ }, { "tier": 2.0, + "symbol": "WLD/USDT:USDT", "currency": "USDT", "minNotional": 5000.0, "maxNotional": 60000.0, @@ -43916,6 +50675,7 @@ }, { "tier": 3.0, + "symbol": "WLD/USDT:USDT", "currency": "USDT", "minNotional": 60000.0, "maxNotional": 100000.0, @@ -43932,6 +50692,7 @@ }, { "tier": 4.0, + "symbol": "WLD/USDT:USDT", "currency": "USDT", "minNotional": 100000.0, "maxNotional": 500000.0, @@ -43948,6 +50709,7 @@ }, { "tier": 5.0, + "symbol": "WLD/USDT:USDT", "currency": "USDT", "minNotional": 500000.0, "maxNotional": 1000000.0, @@ -43964,6 +50726,7 @@ }, { "tier": 6.0, + "symbol": "WLD/USDT:USDT", "currency": "USDT", "minNotional": 1000000.0, "maxNotional": 5000000.0, @@ -43980,6 +50743,7 @@ }, { "tier": 7.0, + "symbol": "WLD/USDT:USDT", "currency": "USDT", "minNotional": 5000000.0, "maxNotional": 10000000.0, @@ -43996,6 +50760,7 @@ }, { "tier": 8.0, + "symbol": "WLD/USDT:USDT", "currency": "USDT", "minNotional": 10000000.0, "maxNotional": 12500000.0, @@ -44012,6 +50777,7 @@ }, { "tier": 9.0, + "symbol": "WLD/USDT:USDT", "currency": "USDT", "minNotional": 12500000.0, "maxNotional": 25000000.0, @@ -44028,6 +50794,7 @@ }, { "tier": 10.0, + "symbol": "WLD/USDT:USDT", "currency": "USDT", "minNotional": 25000000.0, "maxNotional": 50000000.0, @@ -44046,6 +50813,7 @@ "WOO/USDT:USDT": [ { "tier": 1.0, + "symbol": "WOO/USDT:USDT", "currency": "USDT", "minNotional": 0.0, "maxNotional": 5000.0, @@ -44062,6 +50830,7 @@ }, { "tier": 2.0, + "symbol": "WOO/USDT:USDT", "currency": "USDT", "minNotional": 5000.0, "maxNotional": 25000.0, @@ -44078,6 +50847,7 @@ }, { "tier": 3.0, + "symbol": "WOO/USDT:USDT", "currency": "USDT", "minNotional": 25000.0, "maxNotional": 100000.0, @@ -44094,6 +50864,7 @@ }, { "tier": 4.0, + "symbol": "WOO/USDT:USDT", "currency": "USDT", "minNotional": 100000.0, "maxNotional": 250000.0, @@ -44110,6 +50881,7 @@ }, { "tier": 5.0, + "symbol": "WOO/USDT:USDT", "currency": "USDT", "minNotional": 250000.0, "maxNotional": 1000000.0, @@ -44126,6 +50898,7 @@ }, { "tier": 6.0, + "symbol": "WOO/USDT:USDT", "currency": "USDT", "minNotional": 1000000.0, "maxNotional": 5000000.0, @@ -44144,6 +50917,7 @@ "XAI/USDT:USDT": [ { "tier": 1.0, + "symbol": "XAI/USDT:USDT", "currency": "USDT", "minNotional": 0.0, "maxNotional": 5000.0, @@ -44160,6 +50934,7 @@ }, { "tier": 2.0, + "symbol": "XAI/USDT:USDT", "currency": "USDT", "minNotional": 5000.0, "maxNotional": 25000.0, @@ -44176,6 +50951,7 @@ }, { "tier": 3.0, + "symbol": "XAI/USDT:USDT", "currency": "USDT", "minNotional": 25000.0, "maxNotional": 80000.0, @@ -44192,6 +50968,7 @@ }, { "tier": 4.0, + "symbol": "XAI/USDT:USDT", "currency": "USDT", "minNotional": 80000.0, "maxNotional": 800000.0, @@ -44208,6 +50985,7 @@ }, { "tier": 5.0, + "symbol": "XAI/USDT:USDT", "currency": "USDT", "minNotional": 800000.0, "maxNotional": 1600000.0, @@ -44224,6 +51002,7 @@ }, { "tier": 6.0, + "symbol": "XAI/USDT:USDT", "currency": "USDT", "minNotional": 1600000.0, "maxNotional": 2000000.0, @@ -44240,6 +51019,7 @@ }, { "tier": 7.0, + "symbol": "XAI/USDT:USDT", "currency": "USDT", "minNotional": 2000000.0, "maxNotional": 4000000.0, @@ -44256,6 +51036,7 @@ }, { "tier": 8.0, + "symbol": "XAI/USDT:USDT", "currency": "USDT", "minNotional": 4000000.0, "maxNotional": 8000000.0, @@ -44274,6 +51055,7 @@ "XEM/USDT:USDT": [ { "tier": 1.0, + "symbol": "XEM/USDT:USDT", "currency": "USDT", "minNotional": 0.0, "maxNotional": 5000.0, @@ -44290,6 +51072,7 @@ }, { "tier": 2.0, + "symbol": "XEM/USDT:USDT", "currency": "USDT", "minNotional": 5000.0, "maxNotional": 25000.0, @@ -44306,6 +51089,7 @@ }, { "tier": 3.0, + "symbol": "XEM/USDT:USDT", "currency": "USDT", "minNotional": 25000.0, "maxNotional": 400000.0, @@ -44322,6 +51106,7 @@ }, { "tier": 4.0, + "symbol": "XEM/USDT:USDT", "currency": "USDT", "minNotional": 400000.0, "maxNotional": 1000000.0, @@ -44338,6 +51123,7 @@ }, { "tier": 5.0, + "symbol": "XEM/USDT:USDT", "currency": "USDT", "minNotional": 1000000.0, "maxNotional": 2000000.0, @@ -44354,6 +51140,7 @@ }, { "tier": 6.0, + "symbol": "XEM/USDT:USDT", "currency": "USDT", "minNotional": 2000000.0, "maxNotional": 6000000.0, @@ -44370,6 +51157,7 @@ }, { "tier": 7.0, + "symbol": "XEM/USDT:USDT", "currency": "USDT", "minNotional": 6000000.0, "maxNotional": 10000000.0, @@ -44388,6 +51176,7 @@ "XLM/USDT:USDT": [ { "tier": 1.0, + "symbol": "XLM/USDT:USDT", "currency": "USDT", "minNotional": 0.0, "maxNotional": 10000.0, @@ -44404,6 +51193,7 @@ }, { "tier": 2.0, + "symbol": "XLM/USDT:USDT", "currency": "USDT", "minNotional": 10000.0, "maxNotional": 150000.0, @@ -44420,6 +51210,7 @@ }, { "tier": 3.0, + "symbol": "XLM/USDT:USDT", "currency": "USDT", "minNotional": 150000.0, "maxNotional": 250000.0, @@ -44436,6 +51227,7 @@ }, { "tier": 4.0, + "symbol": "XLM/USDT:USDT", "currency": "USDT", "minNotional": 250000.0, "maxNotional": 1000000.0, @@ -44452,6 +51244,7 @@ }, { "tier": 5.0, + "symbol": "XLM/USDT:USDT", "currency": "USDT", "minNotional": 1000000.0, "maxNotional": 2000000.0, @@ -44468,6 +51261,7 @@ }, { "tier": 6.0, + "symbol": "XLM/USDT:USDT", "currency": "USDT", "minNotional": 2000000.0, "maxNotional": 5000000.0, @@ -44484,6 +51278,7 @@ }, { "tier": 7.0, + "symbol": "XLM/USDT:USDT", "currency": "USDT", "minNotional": 5000000.0, "maxNotional": 10000000.0, @@ -44500,6 +51295,7 @@ }, { "tier": 8.0, + "symbol": "XLM/USDT:USDT", "currency": "USDT", "minNotional": 10000000.0, "maxNotional": 20000000.0, @@ -44518,6 +51314,7 @@ "XMR/USDT:USDT": [ { "tier": 1.0, + "symbol": "XMR/USDT:USDT", "currency": "USDT", "minNotional": 0.0, "maxNotional": 10000.0, @@ -44534,6 +51331,7 @@ }, { "tier": 2.0, + "symbol": "XMR/USDT:USDT", "currency": "USDT", "minNotional": 10000.0, "maxNotional": 150000.0, @@ -44550,6 +51348,7 @@ }, { "tier": 3.0, + "symbol": "XMR/USDT:USDT", "currency": "USDT", "minNotional": 150000.0, "maxNotional": 250000.0, @@ -44566,6 +51365,7 @@ }, { "tier": 4.0, + "symbol": "XMR/USDT:USDT", "currency": "USDT", "minNotional": 250000.0, "maxNotional": 1000000.0, @@ -44582,6 +51382,7 @@ }, { "tier": 5.0, + "symbol": "XMR/USDT:USDT", "currency": "USDT", "minNotional": 1000000.0, "maxNotional": 2000000.0, @@ -44598,6 +51399,7 @@ }, { "tier": 6.0, + "symbol": "XMR/USDT:USDT", "currency": "USDT", "minNotional": 2000000.0, "maxNotional": 5000000.0, @@ -44614,6 +51416,7 @@ }, { "tier": 7.0, + "symbol": "XMR/USDT:USDT", "currency": "USDT", "minNotional": 5000000.0, "maxNotional": 10000000.0, @@ -44630,6 +51433,7 @@ }, { "tier": 8.0, + "symbol": "XMR/USDT:USDT", "currency": "USDT", "minNotional": 10000000.0, "maxNotional": 20000000.0, @@ -44648,6 +51452,7 @@ "XRP/USDC:USDC": [ { "tier": 1.0, + "symbol": "XRP/USDC:USDC", "currency": "USDC", "minNotional": 0.0, "maxNotional": 5000.0, @@ -44664,6 +51469,7 @@ }, { "tier": 2.0, + "symbol": "XRP/USDC:USDC", "currency": "USDC", "minNotional": 5000.0, "maxNotional": 10000.0, @@ -44680,6 +51486,7 @@ }, { "tier": 3.0, + "symbol": "XRP/USDC:USDC", "currency": "USDC", "minNotional": 10000.0, "maxNotional": 50000.0, @@ -44696,6 +51503,7 @@ }, { "tier": 4.0, + "symbol": "XRP/USDC:USDC", "currency": "USDC", "minNotional": 50000.0, "maxNotional": 750000.0, @@ -44712,6 +51520,7 @@ }, { "tier": 5.0, + "symbol": "XRP/USDC:USDC", "currency": "USDC", "minNotional": 750000.0, "maxNotional": 3000000.0, @@ -44728,6 +51537,7 @@ }, { "tier": 6.0, + "symbol": "XRP/USDC:USDC", "currency": "USDC", "minNotional": 3000000.0, "maxNotional": 10000000.0, @@ -44744,6 +51554,7 @@ }, { "tier": 7.0, + "symbol": "XRP/USDC:USDC", "currency": "USDC", "minNotional": 10000000.0, "maxNotional": 12000000.0, @@ -44760,6 +51571,7 @@ }, { "tier": 8.0, + "symbol": "XRP/USDC:USDC", "currency": "USDC", "minNotional": 12000000.0, "maxNotional": 20000000.0, @@ -44776,6 +51588,7 @@ }, { "tier": 9.0, + "symbol": "XRP/USDC:USDC", "currency": "USDC", "minNotional": 20000000.0, "maxNotional": 30000000.0, @@ -44792,6 +51605,7 @@ }, { "tier": 10.0, + "symbol": "XRP/USDC:USDC", "currency": "USDC", "minNotional": 30000000.0, "maxNotional": 50000000.0, @@ -44810,6 +51624,7 @@ "XRP/USDT:USDT": [ { "tier": 1.0, + "symbol": "XRP/USDT:USDT", "currency": "USDT", "minNotional": 0.0, "maxNotional": 10000.0, @@ -44826,6 +51641,7 @@ }, { "tier": 2.0, + "symbol": "XRP/USDT:USDT", "currency": "USDT", "minNotional": 10000.0, "maxNotional": 20000.0, @@ -44842,6 +51658,7 @@ }, { "tier": 3.0, + "symbol": "XRP/USDT:USDT", "currency": "USDT", "minNotional": 20000.0, "maxNotional": 160000.0, @@ -44858,15 +51675,16 @@ }, { "tier": 4.0, + "symbol": "XRP/USDT:USDT", "currency": "USDT", "minNotional": 160000.0, - "maxNotional": 800000.0, + "maxNotional": 1000000.0, "maintenanceMarginRate": 0.02, "maxLeverage": 25.0, "info": { "bracket": "4", "initialLeverage": "25", - "notionalCap": "800000", + "notionalCap": "1000000", "notionalFloor": "160000", "maintMarginRatio": "0.02", "cum": "1685.0" @@ -44874,104 +51692,111 @@ }, { "tier": 5.0, + "symbol": "XRP/USDT:USDT", "currency": "USDT", - "minNotional": 800000.0, - "maxNotional": 1600000.0, + "minNotional": 1000000.0, + "maxNotional": 2000000.0, "maintenanceMarginRate": 0.025, "maxLeverage": 20.0, "info": { "bracket": "5", "initialLeverage": "20", - "notionalCap": "1600000", - "notionalFloor": "800000", + "notionalCap": "2000000", + "notionalFloor": "1000000", "maintMarginRatio": "0.025", - "cum": "5685.0" + "cum": "6685.0" } }, { "tier": 6.0, + "symbol": "XRP/USDT:USDT", "currency": "USDT", - "minNotional": 1600000.0, - "maxNotional": 8000000.0, + "minNotional": 2000000.0, + "maxNotional": 10000000.0, "maintenanceMarginRate": 0.05, "maxLeverage": 10.0, "info": { "bracket": "6", "initialLeverage": "10", - "notionalCap": "8000000", - "notionalFloor": "1600000", + "notionalCap": "10000000", + "notionalFloor": "2000000", "maintMarginRatio": "0.05", - "cum": "45685.0" + "cum": "56685.0" } }, { "tier": 7.0, + "symbol": "XRP/USDT:USDT", "currency": "USDT", - "minNotional": 8000000.0, - "maxNotional": 16000000.0, + "minNotional": 10000000.0, + "maxNotional": 20000000.0, "maintenanceMarginRate": 0.1, "maxLeverage": 5.0, "info": { "bracket": "7", "initialLeverage": "5", - "notionalCap": "16000000", - "notionalFloor": "8000000", + "notionalCap": "20000000", + "notionalFloor": "10000000", "maintMarginRatio": "0.1", - "cum": "445685.0" + "cum": "556685.0" } }, { "tier": 8.0, + "symbol": "XRP/USDT:USDT", "currency": "USDT", - "minNotional": 16000000.0, - "maxNotional": 20000000.0, + "minNotional": 20000000.0, + "maxNotional": 25000000.0, "maintenanceMarginRate": 0.125, "maxLeverage": 4.0, "info": { "bracket": "8", "initialLeverage": "4", - "notionalCap": "20000000", - "notionalFloor": "16000000", + "notionalCap": "25000000", + "notionalFloor": "20000000", "maintMarginRatio": "0.125", - "cum": "845685.0" + "cum": "1056685.0" } }, { "tier": 9.0, + "symbol": "XRP/USDT:USDT", "currency": "USDT", - "minNotional": 20000000.0, - "maxNotional": 40000000.0, + "minNotional": 25000000.0, + "maxNotional": 50000000.0, "maintenanceMarginRate": 0.25, "maxLeverage": 2.0, "info": { "bracket": "9", "initialLeverage": "2", - "notionalCap": "40000000", - "notionalFloor": "20000000", + "notionalCap": "50000000", + "notionalFloor": "25000000", "maintMarginRatio": "0.25", - "cum": "3345685.0" + "cum": "4181685.0" } }, { "tier": 10.0, + "symbol": "XRP/USDT:USDT", "currency": "USDT", - "minNotional": 40000000.0, - "maxNotional": 80000000.0, + "minNotional": 50000000.0, + "maxNotional": 100000000.0, "maintenanceMarginRate": 0.5, "maxLeverage": 1.0, "info": { "bracket": "10", "initialLeverage": "1", - "notionalCap": "80000000", - "notionalFloor": "40000000", + "notionalCap": "100000000", + "notionalFloor": "50000000", "maintMarginRatio": "0.5", - "cum": "13345685.0" + "cum": "16681685.0" } } ], "XTZ/USDT:USDT": [ { "tier": 1.0, + "symbol": "XTZ/USDT:USDT", "currency": "USDT", "minNotional": 0.0, "maxNotional": 10000.0, @@ -44988,6 +51813,7 @@ }, { "tier": 2.0, + "symbol": "XTZ/USDT:USDT", "currency": "USDT", "minNotional": 10000.0, "maxNotional": 150000.0, @@ -45004,6 +51830,7 @@ }, { "tier": 3.0, + "symbol": "XTZ/USDT:USDT", "currency": "USDT", "minNotional": 150000.0, "maxNotional": 250000.0, @@ -45020,6 +51847,7 @@ }, { "tier": 4.0, + "symbol": "XTZ/USDT:USDT", "currency": "USDT", "minNotional": 250000.0, "maxNotional": 1000000.0, @@ -45036,6 +51864,7 @@ }, { "tier": 5.0, + "symbol": "XTZ/USDT:USDT", "currency": "USDT", "minNotional": 1000000.0, "maxNotional": 2000000.0, @@ -45052,6 +51881,7 @@ }, { "tier": 6.0, + "symbol": "XTZ/USDT:USDT", "currency": "USDT", "minNotional": 2000000.0, "maxNotional": 5000000.0, @@ -45068,6 +51898,7 @@ }, { "tier": 7.0, + "symbol": "XTZ/USDT:USDT", "currency": "USDT", "minNotional": 5000000.0, "maxNotional": 10000000.0, @@ -45084,6 +51915,7 @@ }, { "tier": 8.0, + "symbol": "XTZ/USDT:USDT", "currency": "USDT", "minNotional": 10000000.0, "maxNotional": 15000000.0, @@ -45102,6 +51934,7 @@ "XVG/USDT:USDT": [ { "tier": 1.0, + "symbol": "XVG/USDT:USDT", "currency": "USDT", "minNotional": 0.0, "maxNotional": 25000.0, @@ -45118,6 +51951,7 @@ }, { "tier": 2.0, + "symbol": "XVG/USDT:USDT", "currency": "USDT", "minNotional": 25000.0, "maxNotional": 200000.0, @@ -45134,6 +51968,7 @@ }, { "tier": 3.0, + "symbol": "XVG/USDT:USDT", "currency": "USDT", "minNotional": 200000.0, "maxNotional": 500000.0, @@ -45150,6 +51985,7 @@ }, { "tier": 4.0, + "symbol": "XVG/USDT:USDT", "currency": "USDT", "minNotional": 500000.0, "maxNotional": 1000000.0, @@ -45166,6 +52002,7 @@ }, { "tier": 5.0, + "symbol": "XVG/USDT:USDT", "currency": "USDT", "minNotional": 1000000.0, "maxNotional": 3000000.0, @@ -45182,6 +52019,7 @@ }, { "tier": 6.0, + "symbol": "XVG/USDT:USDT", "currency": "USDT", "minNotional": 3000000.0, "maxNotional": 5000000.0, @@ -45200,120 +52038,162 @@ "XVS/USDT:USDT": [ { "tier": 1.0, + "symbol": "XVS/USDT:USDT", "currency": "USDT", "minNotional": 0.0, "maxNotional": 5000.0, - "maintenanceMarginRate": 0.02, - "maxLeverage": 20.0, + "maintenanceMarginRate": 0.01, + "maxLeverage": 75.0, "info": { "bracket": "1", - "initialLeverage": "20", + "initialLeverage": "75", "notionalCap": "5000", "notionalFloor": "0", - "maintMarginRatio": "0.02", + "maintMarginRatio": "0.01", "cum": "0.0" } }, { "tier": 2.0, + "symbol": "XVS/USDT:USDT", "currency": "USDT", "minNotional": 5000.0, - "maxNotional": 25000.0, - "maintenanceMarginRate": 0.025, - "maxLeverage": 15.0, + "maxNotional": 10000.0, + "maintenanceMarginRate": 0.015, + "maxLeverage": 50.0, "info": { "bracket": "2", - "initialLeverage": "15", - "notionalCap": "25000", + "initialLeverage": "50", + "notionalCap": "10000", "notionalFloor": "5000", - "maintMarginRatio": "0.025", + "maintMarginRatio": "0.015", "cum": "25.0" } }, { "tier": 3.0, + "symbol": "XVS/USDT:USDT", "currency": "USDT", - "minNotional": 25000.0, - "maxNotional": 200000.0, - "maintenanceMarginRate": 0.05, - "maxLeverage": 10.0, + "minNotional": 10000.0, + "maxNotional": 50000.0, + "maintenanceMarginRate": 0.02, + "maxLeverage": 25.0, "info": { "bracket": "3", - "initialLeverage": "10", - "notionalCap": "200000", - "notionalFloor": "25000", - "maintMarginRatio": "0.05", - "cum": "650.0" + "initialLeverage": "25", + "notionalCap": "50000", + "notionalFloor": "10000", + "maintMarginRatio": "0.02", + "cum": "75.0" } }, { "tier": 4.0, + "symbol": "XVS/USDT:USDT", "currency": "USDT", - "minNotional": 200000.0, - "maxNotional": 500000.0, - "maintenanceMarginRate": 0.1, - "maxLeverage": 5.0, + "minNotional": 50000.0, + "maxNotional": 100000.0, + "maintenanceMarginRate": 0.025, + "maxLeverage": 20.0, "info": { "bracket": "4", - "initialLeverage": "5", - "notionalCap": "500000", - "notionalFloor": "200000", - "maintMarginRatio": "0.1", - "cum": "10650.0" + "initialLeverage": "20", + "notionalCap": "100000", + "notionalFloor": "50000", + "maintMarginRatio": "0.025", + "cum": "325.0" } }, { "tier": 5.0, + "symbol": "XVS/USDT:USDT", "currency": "USDT", - "minNotional": 500000.0, - "maxNotional": 1000000.0, - "maintenanceMarginRate": 0.125, - "maxLeverage": 4.0, + "minNotional": 100000.0, + "maxNotional": 500000.0, + "maintenanceMarginRate": 0.05, + "maxLeverage": 10.0, "info": { "bracket": "5", - "initialLeverage": "4", - "notionalCap": "1000000", - "notionalFloor": "500000", - "maintMarginRatio": "0.125", - "cum": "23150.0" + "initialLeverage": "10", + "notionalCap": "500000", + "notionalFloor": "100000", + "maintMarginRatio": "0.05", + "cum": "2825.0" } }, { "tier": 6.0, + "symbol": "XVS/USDT:USDT", "currency": "USDT", - "minNotional": 1000000.0, - "maxNotional": 3000000.0, - "maintenanceMarginRate": 0.25, - "maxLeverage": 2.0, + "minNotional": 500000.0, + "maxNotional": 1000000.0, + "maintenanceMarginRate": 0.1, + "maxLeverage": 5.0, "info": { "bracket": "6", - "initialLeverage": "2", - "notionalCap": "3000000", - "notionalFloor": "1000000", - "maintMarginRatio": "0.25", - "cum": "148150.0" + "initialLeverage": "5", + "notionalCap": "1000000", + "notionalFloor": "500000", + "maintMarginRatio": "0.1", + "cum": "27825.0" } }, { "tier": 7.0, + "symbol": "XVS/USDT:USDT", + "currency": "USDT", + "minNotional": 1000000.0, + "maxNotional": 1250000.0, + "maintenanceMarginRate": 0.125, + "maxLeverage": 4.0, + "info": { + "bracket": "7", + "initialLeverage": "4", + "notionalCap": "1250000", + "notionalFloor": "1000000", + "maintMarginRatio": "0.125", + "cum": "52825.0" + } + }, + { + "tier": 8.0, + "symbol": "XVS/USDT:USDT", + "currency": "USDT", + "minNotional": 1250000.0, + "maxNotional": 3000000.0, + "maintenanceMarginRate": 0.25, + "maxLeverage": 2.0, + "info": { + "bracket": "8", + "initialLeverage": "2", + "notionalCap": "3000000", + "notionalFloor": "1250000", + "maintMarginRatio": "0.25", + "cum": "209075.0" + } + }, + { + "tier": 9.0, + "symbol": "XVS/USDT:USDT", "currency": "USDT", "minNotional": 3000000.0, "maxNotional": 5000000.0, "maintenanceMarginRate": 0.5, "maxLeverage": 1.0, "info": { - "bracket": "7", + "bracket": "9", "initialLeverage": "1", "notionalCap": "5000000", "notionalFloor": "3000000", "maintMarginRatio": "0.5", - "cum": "898150.0" + "cum": "959075.0" } } ], "YFI/USDT:USDT": [ { "tier": 1.0, + "symbol": "YFI/USDT:USDT", "currency": "USDT", "minNotional": 0.0, "maxNotional": 5000.0, @@ -45330,6 +52210,7 @@ }, { "tier": 2.0, + "symbol": "YFI/USDT:USDT", "currency": "USDT", "minNotional": 5000.0, "maxNotional": 50000.0, @@ -45346,6 +52227,7 @@ }, { "tier": 3.0, + "symbol": "YFI/USDT:USDT", "currency": "USDT", "minNotional": 50000.0, "maxNotional": 400000.0, @@ -45362,6 +52244,7 @@ }, { "tier": 4.0, + "symbol": "YFI/USDT:USDT", "currency": "USDT", "minNotional": 400000.0, "maxNotional": 1000000.0, @@ -45378,6 +52261,7 @@ }, { "tier": 5.0, + "symbol": "YFI/USDT:USDT", "currency": "USDT", "minNotional": 1000000.0, "maxNotional": 2000000.0, @@ -45394,6 +52278,7 @@ }, { "tier": 6.0, + "symbol": "YFI/USDT:USDT", "currency": "USDT", "minNotional": 2000000.0, "maxNotional": 6000000.0, @@ -45410,6 +52295,7 @@ }, { "tier": 7.0, + "symbol": "YFI/USDT:USDT", "currency": "USDT", "minNotional": 6000000.0, "maxNotional": 10000000.0, @@ -45428,6 +52314,7 @@ "YGG/USDT:USDT": [ { "tier": 1.0, + "symbol": "YGG/USDT:USDT", "currency": "USDT", "minNotional": 0.0, "maxNotional": 5000.0, @@ -45444,6 +52331,7 @@ }, { "tier": 2.0, + "symbol": "YGG/USDT:USDT", "currency": "USDT", "minNotional": 5000.0, "maxNotional": 25000.0, @@ -45460,6 +52348,7 @@ }, { "tier": 3.0, + "symbol": "YGG/USDT:USDT", "currency": "USDT", "minNotional": 25000.0, "maxNotional": 200000.0, @@ -45476,6 +52365,7 @@ }, { "tier": 4.0, + "symbol": "YGG/USDT:USDT", "currency": "USDT", "minNotional": 200000.0, "maxNotional": 500000.0, @@ -45492,6 +52382,7 @@ }, { "tier": 5.0, + "symbol": "YGG/USDT:USDT", "currency": "USDT", "minNotional": 500000.0, "maxNotional": 1000000.0, @@ -45508,6 +52399,7 @@ }, { "tier": 6.0, + "symbol": "YGG/USDT:USDT", "currency": "USDT", "minNotional": 1000000.0, "maxNotional": 3000000.0, @@ -45524,6 +52416,7 @@ }, { "tier": 7.0, + "symbol": "YGG/USDT:USDT", "currency": "USDT", "minNotional": 3000000.0, "maxNotional": 5000000.0, @@ -45542,6 +52435,7 @@ "ZEC/USDT:USDT": [ { "tier": 1.0, + "symbol": "ZEC/USDT:USDT", "currency": "USDT", "minNotional": 0.0, "maxNotional": 50000.0, @@ -45558,6 +52452,7 @@ }, { "tier": 2.0, + "symbol": "ZEC/USDT:USDT", "currency": "USDT", "minNotional": 50000.0, "maxNotional": 150000.0, @@ -45574,6 +52469,7 @@ }, { "tier": 3.0, + "symbol": "ZEC/USDT:USDT", "currency": "USDT", "minNotional": 150000.0, "maxNotional": 250000.0, @@ -45590,6 +52486,7 @@ }, { "tier": 4.0, + "symbol": "ZEC/USDT:USDT", "currency": "USDT", "minNotional": 250000.0, "maxNotional": 500000.0, @@ -45606,6 +52503,7 @@ }, { "tier": 5.0, + "symbol": "ZEC/USDT:USDT", "currency": "USDT", "minNotional": 500000.0, "maxNotional": 1000000.0, @@ -45622,6 +52520,7 @@ }, { "tier": 6.0, + "symbol": "ZEC/USDT:USDT", "currency": "USDT", "minNotional": 1000000.0, "maxNotional": 2000000.0, @@ -45638,6 +52537,7 @@ }, { "tier": 7.0, + "symbol": "ZEC/USDT:USDT", "currency": "USDT", "minNotional": 2000000.0, "maxNotional": 5000000.0, @@ -45656,6 +52556,7 @@ "ZEN/USDT:USDT": [ { "tier": 1.0, + "symbol": "ZEN/USDT:USDT", "currency": "USDT", "minNotional": 0.0, "maxNotional": 5000.0, @@ -45672,6 +52573,7 @@ }, { "tier": 2.0, + "symbol": "ZEN/USDT:USDT", "currency": "USDT", "minNotional": 5000.0, "maxNotional": 20000.0, @@ -45688,6 +52590,7 @@ }, { "tier": 3.0, + "symbol": "ZEN/USDT:USDT", "currency": "USDT", "minNotional": 20000.0, "maxNotional": 25000.0, @@ -45704,6 +52607,7 @@ }, { "tier": 4.0, + "symbol": "ZEN/USDT:USDT", "currency": "USDT", "minNotional": 25000.0, "maxNotional": 200000.0, @@ -45720,6 +52624,7 @@ }, { "tier": 5.0, + "symbol": "ZEN/USDT:USDT", "currency": "USDT", "minNotional": 200000.0, "maxNotional": 400000.0, @@ -45736,6 +52641,7 @@ }, { "tier": 6.0, + "symbol": "ZEN/USDT:USDT", "currency": "USDT", "minNotional": 400000.0, "maxNotional": 500000.0, @@ -45752,6 +52658,7 @@ }, { "tier": 7.0, + "symbol": "ZEN/USDT:USDT", "currency": "USDT", "minNotional": 500000.0, "maxNotional": 1000000.0, @@ -45768,6 +52675,7 @@ }, { "tier": 8.0, + "symbol": "ZEN/USDT:USDT", "currency": "USDT", "minNotional": 1000000.0, "maxNotional": 2000000.0, @@ -45786,6 +52694,7 @@ "ZETA/USDT:USDT": [ { "tier": 1.0, + "symbol": "ZETA/USDT:USDT", "currency": "USDT", "minNotional": 0.0, "maxNotional": 5000.0, @@ -45802,6 +52711,7 @@ }, { "tier": 2.0, + "symbol": "ZETA/USDT:USDT", "currency": "USDT", "minNotional": 5000.0, "maxNotional": 16000.0, @@ -45818,6 +52728,7 @@ }, { "tier": 3.0, + "symbol": "ZETA/USDT:USDT", "currency": "USDT", "minNotional": 16000.0, "maxNotional": 80000.0, @@ -45834,6 +52745,7 @@ }, { "tier": 4.0, + "symbol": "ZETA/USDT:USDT", "currency": "USDT", "minNotional": 80000.0, "maxNotional": 160000.0, @@ -45850,6 +52762,7 @@ }, { "tier": 5.0, + "symbol": "ZETA/USDT:USDT", "currency": "USDT", "minNotional": 160000.0, "maxNotional": 800000.0, @@ -45866,6 +52779,7 @@ }, { "tier": 6.0, + "symbol": "ZETA/USDT:USDT", "currency": "USDT", "minNotional": 800000.0, "maxNotional": 1600000.0, @@ -45882,6 +52796,7 @@ }, { "tier": 7.0, + "symbol": "ZETA/USDT:USDT", "currency": "USDT", "minNotional": 1600000.0, "maxNotional": 2000000.0, @@ -45898,6 +52813,7 @@ }, { "tier": 8.0, + "symbol": "ZETA/USDT:USDT", "currency": "USDT", "minNotional": 2000000.0, "maxNotional": 4000000.0, @@ -45914,6 +52830,7 @@ }, { "tier": 9.0, + "symbol": "ZETA/USDT:USDT", "currency": "USDT", "minNotional": 4000000.0, "maxNotional": 8000000.0, @@ -45932,6 +52849,7 @@ "ZIL/USDT:USDT": [ { "tier": 1.0, + "symbol": "ZIL/USDT:USDT", "currency": "USDT", "minNotional": 0.0, "maxNotional": 5000.0, @@ -45948,6 +52866,7 @@ }, { "tier": 2.0, + "symbol": "ZIL/USDT:USDT", "currency": "USDT", "minNotional": 5000.0, "maxNotional": 50000.0, @@ -45964,6 +52883,7 @@ }, { "tier": 3.0, + "symbol": "ZIL/USDT:USDT", "currency": "USDT", "minNotional": 50000.0, "maxNotional": 600000.0, @@ -45980,6 +52900,7 @@ }, { "tier": 4.0, + "symbol": "ZIL/USDT:USDT", "currency": "USDT", "minNotional": 600000.0, "maxNotional": 1600000.0, @@ -45996,6 +52917,7 @@ }, { "tier": 5.0, + "symbol": "ZIL/USDT:USDT", "currency": "USDT", "minNotional": 1600000.0, "maxNotional": 2000000.0, @@ -46012,6 +52934,7 @@ }, { "tier": 6.0, + "symbol": "ZIL/USDT:USDT", "currency": "USDT", "minNotional": 2000000.0, "maxNotional": 6000000.0, @@ -46028,6 +52951,7 @@ }, { "tier": 7.0, + "symbol": "ZIL/USDT:USDT", "currency": "USDT", "minNotional": 6000000.0, "maxNotional": 10000000.0, @@ -46046,6 +52970,7 @@ "ZK/USDT:USDT": [ { "tier": 1.0, + "symbol": "ZK/USDT:USDT", "currency": "USDT", "minNotional": 0.0, "maxNotional": 10000.0, @@ -46062,6 +52987,7 @@ }, { "tier": 2.0, + "symbol": "ZK/USDT:USDT", "currency": "USDT", "minNotional": 10000.0, "maxNotional": 20000.0, @@ -46078,6 +53004,7 @@ }, { "tier": 3.0, + "symbol": "ZK/USDT:USDT", "currency": "USDT", "minNotional": 20000.0, "maxNotional": 100000.0, @@ -46094,6 +53021,7 @@ }, { "tier": 4.0, + "symbol": "ZK/USDT:USDT", "currency": "USDT", "minNotional": 100000.0, "maxNotional": 200000.0, @@ -46110,6 +53038,7 @@ }, { "tier": 5.0, + "symbol": "ZK/USDT:USDT", "currency": "USDT", "minNotional": 200000.0, "maxNotional": 1000000.0, @@ -46126,6 +53055,7 @@ }, { "tier": 6.0, + "symbol": "ZK/USDT:USDT", "currency": "USDT", "minNotional": 1000000.0, "maxNotional": 2000000.0, @@ -46142,6 +53072,7 @@ }, { "tier": 7.0, + "symbol": "ZK/USDT:USDT", "currency": "USDT", "minNotional": 2000000.0, "maxNotional": 2500000.0, @@ -46158,6 +53089,7 @@ }, { "tier": 8.0, + "symbol": "ZK/USDT:USDT", "currency": "USDT", "minNotional": 2500000.0, "maxNotional": 5000000.0, @@ -46174,6 +53106,7 @@ }, { "tier": 9.0, + "symbol": "ZK/USDT:USDT", "currency": "USDT", "minNotional": 5000000.0, "maxNotional": 10000000.0, @@ -46192,6 +53125,7 @@ "ZRO/USDT:USDT": [ { "tier": 1.0, + "symbol": "ZRO/USDT:USDT", "currency": "USDT", "minNotional": 0.0, "maxNotional": 10000.0, @@ -46208,6 +53142,7 @@ }, { "tier": 2.0, + "symbol": "ZRO/USDT:USDT", "currency": "USDT", "minNotional": 10000.0, "maxNotional": 30000.0, @@ -46224,6 +53159,7 @@ }, { "tier": 3.0, + "symbol": "ZRO/USDT:USDT", "currency": "USDT", "minNotional": 30000.0, "maxNotional": 150000.0, @@ -46240,6 +53176,7 @@ }, { "tier": 4.0, + "symbol": "ZRO/USDT:USDT", "currency": "USDT", "minNotional": 150000.0, "maxNotional": 300000.0, @@ -46256,6 +53193,7 @@ }, { "tier": 5.0, + "symbol": "ZRO/USDT:USDT", "currency": "USDT", "minNotional": 300000.0, "maxNotional": 1500000.0, @@ -46272,6 +53210,7 @@ }, { "tier": 6.0, + "symbol": "ZRO/USDT:USDT", "currency": "USDT", "minNotional": 1500000.0, "maxNotional": 3000000.0, @@ -46288,6 +53227,7 @@ }, { "tier": 7.0, + "symbol": "ZRO/USDT:USDT", "currency": "USDT", "minNotional": 3000000.0, "maxNotional": 3750000.0, @@ -46304,6 +53244,7 @@ }, { "tier": 8.0, + "symbol": "ZRO/USDT:USDT", "currency": "USDT", "minNotional": 3750000.0, "maxNotional": 7500000.0, @@ -46320,6 +53261,7 @@ }, { "tier": 9.0, + "symbol": "ZRO/USDT:USDT", "currency": "USDT", "minNotional": 7500000.0, "maxNotional": 15000000.0, @@ -46338,6 +53280,7 @@ "ZRX/USDT:USDT": [ { "tier": 1.0, + "symbol": "ZRX/USDT:USDT", "currency": "USDT", "minNotional": 0.0, "maxNotional": 5000.0, @@ -46354,6 +53297,7 @@ }, { "tier": 2.0, + "symbol": "ZRX/USDT:USDT", "currency": "USDT", "minNotional": 5000.0, "maxNotional": 20000.0, @@ -46370,6 +53314,7 @@ }, { "tier": 3.0, + "symbol": "ZRX/USDT:USDT", "currency": "USDT", "minNotional": 20000.0, "maxNotional": 25000.0, @@ -46386,6 +53331,7 @@ }, { "tier": 4.0, + "symbol": "ZRX/USDT:USDT", "currency": "USDT", "minNotional": 25000.0, "maxNotional": 200000.0, @@ -46402,6 +53348,7 @@ }, { "tier": 5.0, + "symbol": "ZRX/USDT:USDT", "currency": "USDT", "minNotional": 200000.0, "maxNotional": 400000.0, @@ -46418,6 +53365,7 @@ }, { "tier": 6.0, + "symbol": "ZRX/USDT:USDT", "currency": "USDT", "minNotional": 400000.0, "maxNotional": 500000.0, @@ -46434,6 +53382,7 @@ }, { "tier": 7.0, + "symbol": "ZRX/USDT:USDT", "currency": "USDT", "minNotional": 500000.0, "maxNotional": 1000000.0, @@ -46450,6 +53399,7 @@ }, { "tier": 8.0, + "symbol": "ZRX/USDT:USDT", "currency": "USDT", "minNotional": 1000000.0, "maxNotional": 2000000.0, diff --git a/freqtrade/exchange/bitpanda.py b/freqtrade/exchange/bitpanda.py index cca961cb7..05c5af6ac 100644 --- a/freqtrade/exchange/bitpanda.py +++ b/freqtrade/exchange/bitpanda.py @@ -2,7 +2,6 @@ import logging from datetime import datetime, timezone -from typing import Optional from freqtrade.exchange import Exchange @@ -17,7 +16,7 @@ class Bitpanda(Exchange): """ def get_trades_for_order( - self, order_id: str, pair: str, since: datetime, params: Optional[dict] = None + self, order_id: str, pair: str, since: datetime, params: dict | None = None ) -> list: """ Fetch Orders using the "fetch_my_trades" endpoint and filter them by order-id. diff --git a/freqtrade/exchange/bybit.py b/freqtrade/exchange/bybit.py index 4face01c9..72cfe52c0 100644 --- a/freqtrade/exchange/bybit.py +++ b/freqtrade/exchange/bybit.py @@ -2,16 +2,16 @@ import logging from datetime import datetime, timedelta -from typing import Any, Optional +from typing import Any import ccxt from freqtrade.constants import BuySell -from freqtrade.enums import CandleType, MarginMode, PriceType, TradingMode +from freqtrade.enums import MarginMode, PriceType, TradingMode from freqtrade.exceptions import DDosProtection, ExchangeError, OperationalException, TemporaryError from freqtrade.exchange import Exchange from freqtrade.exchange.common import retrier -from freqtrade.exchange.exchange_types import FtHas +from freqtrade.exchange.exchange_types import CcxtOrder, FtHas from freqtrade.util.datetime_helpers import dt_now, dt_ts @@ -47,6 +47,7 @@ class Bybit(Exchange): "ohlcv_has_history": True, "mark_ohlcv_timeframe": "4h", "funding_fee_timeframe": "8h", + "funding_fee_candle_limit": 200, "stoploss_on_exchange": True, "stoploss_order_types": {"limit": "limit", "market": "market"}, # bybit response parsing fails to populate stopLossPrice @@ -114,14 +115,6 @@ class Bybit(Exchange): except ccxt.BaseError as e: raise OperationalException(e) from e - def ohlcv_candle_limit( - self, timeframe: str, candle_type: CandleType, since_ms: Optional[int] = None - ) -> int: - if candle_type == CandleType.FUNDING_RATE: - return 200 - - return super().ohlcv_candle_limit(timeframe, candle_type, since_ms) - def _lev_prep(self, pair: str, leverage: float, side: BuySell, accept_fail: bool = False): if self.trading_mode != TradingMode.SPOT: params = {"leverage": leverage} @@ -147,6 +140,17 @@ class Bybit(Exchange): params["position_idx"] = 0 return params + def _order_needs_price(self, side: BuySell, ordertype: str) -> bool: + # Bybit requires price for market orders - but only for classic accounts, + # and only in spot mode + return ( + ordertype != "market" + or ( + side == "buy" and not self.unified_account and self.trading_mode == TradingMode.SPOT + ) + or self._ft_has.get("marketOrderRequiresPrice", False) + ) + def dry_run_liquidation_price( self, pair: str, @@ -157,7 +161,7 @@ class Bybit(Exchange): leverage: float, wallet_balance: float, # Or margin balance open_trades: list, - ) -> Optional[float]: + ) -> float | None: """ Important: Must be fetching data from cached values as this is used by backtesting! PERPETUAL: @@ -229,7 +233,9 @@ class Bybit(Exchange): logger.warning(f"Could not update funding fees for {pair}.") return 0.0 - def fetch_orders(self, pair: str, since: datetime, params: Optional[dict] = None) -> list[dict]: + def fetch_orders( + self, pair: str, since: datetime, params: dict | None = None + ) -> list[CcxtOrder]: """ Fetch all orders for a pair "since" :param pair: Pair for the query @@ -246,7 +252,7 @@ class Bybit(Exchange): return orders - def fetch_order(self, order_id: str, pair: str, params: Optional[dict] = None) -> dict: + def fetch_order(self, order_id: str, pair: str, params: dict | None = None) -> CcxtOrder: if self.exchange_has("fetchOrder"): # Set acknowledged to True to avoid ccxt exception params = {"acknowledged": True} diff --git a/freqtrade/exchange/common.py b/freqtrade/exchange/common.py index b32216b05..4fd9cea63 100644 --- a/freqtrade/exchange/common.py +++ b/freqtrade/exchange/common.py @@ -1,8 +1,9 @@ import asyncio import logging import time +from collections.abc import Callable from functools import wraps -from typing import Any, Callable, Optional, TypeVar, cast, overload +from typing import Any, TypeVar, cast, overload from freqtrade.constants import ExchangeConfig from freqtrade.exceptions import DDosProtection, RetryableOrderError, TemporaryError @@ -57,6 +58,7 @@ SUPPORTED_EXCHANGES = [ "bybit", "gate", "htx", + "hyperliquid", "kraken", "okx", ] @@ -172,7 +174,7 @@ def retrier(_func: F, *, retries=API_RETRY_COUNT) -> F: ... def retrier(*, retries=API_RETRY_COUNT) -> Callable[[F], F]: ... -def retrier(_func: Optional[F] = None, *, retries=API_RETRY_COUNT): +def retrier(_func: F | None = None, *, retries=API_RETRY_COUNT): def decorator(f: F) -> F: @wraps(f) def wrapper(*args, **kwargs): @@ -185,7 +187,7 @@ def retrier(_func: Optional[F] = None, *, retries=API_RETRY_COUNT): logger.warning(msg + f"Retrying still for {count} times.") count -= 1 kwargs.update({"count": count}) - if isinstance(ex, (DDosProtection, RetryableOrderError)): + if isinstance(ex, DDosProtection | RetryableOrderError): # increasing backoff backoff_delay = calculate_backoff(count + 1, retries) logger.info(f"Applying DDosProtection backoff delay: {backoff_delay}") diff --git a/freqtrade/exchange/exchange.py b/freqtrade/exchange/exchange.py index 48bb84369..a3006c99b 100644 --- a/freqtrade/exchange/exchange.py +++ b/freqtrade/exchange/exchange.py @@ -12,7 +12,7 @@ from copy import deepcopy from datetime import datetime, timedelta, timezone from math import floor, isnan from threading import Lock -from typing import Any, Literal, Optional, Union +from typing import Any, Literal, TypeGuard import ccxt import ccxt.pro as ccxt_pro @@ -70,6 +70,7 @@ from freqtrade.exchange.common import ( ) from freqtrade.exchange.exchange_types import ( CcxtBalances, + CcxtOrder, CcxtPosition, FtHas, OHLCVResponse, @@ -169,7 +170,7 @@ class Exchange: self, config: Config, *, - exchange_config: Optional[ExchangeConfig] = None, + exchange_config: ExchangeConfig | None = None, validate: bool = True, load_leverage_tiers: bool = False, ) -> None: @@ -181,7 +182,7 @@ class Exchange: self._api: ccxt.Exchange self._api_async: ccxt_pro.Exchange self._ws_async: ccxt_pro.Exchange = None - self._exchange_ws: Optional[ExchangeWS] = None + self._exchange_ws: ExchangeWS | None = None self._markets: dict = {} self._trading_fees: dict[str, Any] = {} self._leverage_tiers: dict[str, list[dict]] = {} @@ -198,8 +199,8 @@ class Exchange: # Timestamp of last markets refresh self._last_markets_refresh: int = 0 - # Cache for 10 minutes ... self._cache_lock = Lock() + # Cache for 10 minutes ... self._fetch_tickers_cache: TTLCache = TTLCache(maxsize=2, ttl=60 * 10) # Cache values for 300 to avoid frequent polling of the exchange for prices # Caching only applies to RPC methods, so prices for open trades are still @@ -378,7 +379,7 @@ class Exchange: logger.info("Applying additional ccxt config: %s", ccxt_kwargs) if self._ccxt_params: # Inject static options after the above output to not confuse users. - ccxt_kwargs = deep_merge_dicts(self._ccxt_params, ccxt_kwargs) + ccxt_kwargs = deep_merge_dicts(self._ccxt_params, deepcopy(ccxt_kwargs)) if ccxt_kwargs: ex_config.update(ccxt_kwargs) try: @@ -452,28 +453,31 @@ class Exchange: logger.info(f"API {endpoint}: {add_info_str}{response}") def ohlcv_candle_limit( - self, timeframe: str, candle_type: CandleType, since_ms: Optional[int] = None + self, timeframe: str, candle_type: CandleType, since_ms: int | None = None ) -> int: """ Exchange ohlcv candle limit Uses ohlcv_candle_limit_per_timeframe if the exchange has different limits per timeframe (e.g. bittrex), otherwise falls back to ohlcv_candle_limit - TODO: this is most likely no longer needed since only bittrex needed this. :param timeframe: Timeframe to check :param candle_type: Candle-type :param since_ms: Starting timestamp :return: Candle limit as integer """ + + fallback_val = self._ft_has.get("ohlcv_candle_limit") + if candle_type == CandleType.FUNDING_RATE: + fallback_val = self._ft_has.get("funding_fee_candle_limit", fallback_val) return int( self._ft_has.get("ohlcv_candle_limit_per_timeframe", {}).get( - timeframe, str(self._ft_has.get("ohlcv_candle_limit")) + timeframe, str(fallback_val) ) ) def get_markets( self, - base_currencies: Optional[list[str]] = None, - quote_currencies: Optional[list[str]] = None, + base_currencies: list[str] | None = None, + quote_currencies: list[str] | None = None, spot_only: bool = False, margin_only: bool = False, futures_only: bool = False, @@ -522,6 +526,7 @@ class Exchange: def market_is_future(self, market: dict[str, Any]) -> bool: return ( market.get(self._ft_has["ccxt_futures_name"], False) is True + and market.get("type", False) == "swap" and market.get("linear", False) is True ) @@ -566,7 +571,7 @@ class Exchange: else: return DataFrame(columns=DEFAULT_TRADES_COLUMNS) - def get_contract_size(self, pair: str) -> Optional[float]: + def get_contract_size(self, pair: str) -> float | None: if self.trading_mode == TradingMode.FUTURES: market = self.markets.get(pair, {}) contract_size: float = 1.0 @@ -587,7 +592,7 @@ class Exchange: trade["amount"] = trade["amount"] * contract_size return trades - def _order_contracts_to_amount(self, order: dict) -> dict: + def _order_contracts_to_amount(self, order: CcxtOrder) -> CcxtOrder: if "symbol" in order and order["symbol"] is not None: contract_size = self.get_contract_size(order["symbol"]) if contract_size != 1: @@ -709,7 +714,7 @@ class Exchange: return pair raise ValueError(f"Could not combine {curr_1} and {curr_2} to get a valid pair.") - def validate_timeframes(self, timeframe: Optional[str]) -> None: + def validate_timeframes(self, timeframe: str | None) -> None: """ Check if timeframe from config is a supported timeframe on the exchange """ @@ -839,7 +844,7 @@ class Exchange: def validate_trading_mode_and_margin_mode( self, trading_mode: TradingMode, - margin_mode: Optional[MarginMode], # Only None when trading_mode = TradingMode.SPOT + margin_mode: MarginMode | None, # Only None when trading_mode = TradingMode.SPOT ): """ Checks if freqtrade can perform trades using the configured @@ -855,7 +860,7 @@ class Exchange: f"Freqtrade does not support {mm_value} {trading_mode} on {self.name}" ) - def get_option(self, param: str, default: Optional[Any] = None) -> Any: + def get_option(self, param: str, default: Any | None = None) -> Any: """ Get parameter value from _ft_has """ @@ -872,7 +877,7 @@ class Exchange: return self._ft_has["exchange_has_overrides"][endpoint] return endpoint in self._api_async.has and self._api_async.has[endpoint] - def get_precision_amount(self, pair: str) -> Optional[float]: + def get_precision_amount(self, pair: str) -> float | None: """ Returns the amount precision of the exchange. :param pair: Pair to get precision for @@ -880,7 +885,7 @@ class Exchange: """ return self.markets.get(pair, {}).get("precision", {}).get("amount", None) - def get_precision_price(self, pair: str) -> Optional[float]: + def get_precision_price(self, pair: str) -> float | None: """ Returns the price precision of the exchange. :param pair: Pair to get precision for @@ -920,8 +925,8 @@ class Exchange: return 1 / pow(10, precision) def get_min_pair_stake_amount( - self, pair: str, price: float, stoploss: float, leverage: Optional[float] = 1.0 - ) -> Optional[float]: + self, pair: str, price: float, stoploss: float, leverage: float | None = 1.0 + ) -> float | None: return self._get_stake_amount_limit(pair, price, stoploss, "min", leverage) def get_max_pair_stake_amount(self, pair: str, price: float, leverage: float = 1.0) -> float: @@ -939,8 +944,8 @@ class Exchange: price: float, stoploss: float, limit: Literal["min", "max"], - leverage: Optional[float] = 1.0, - ) -> Optional[float]: + leverage: float | None = 1.0, + ) -> float | None: isMin = limit == "min" try: @@ -997,20 +1002,20 @@ class Exchange: self, pair: str, ordertype: str, - side: str, + side: BuySell, amount: float, rate: float, leverage: float, - params: Optional[dict] = None, + params: dict | None = None, stop_loss: bool = False, - ) -> dict[str, Any]: + ) -> CcxtOrder: now = dt_now() order_id = f"dry_run_{side}_{pair}_{now.timestamp()}" # Rounding here must respect to contract sizes _amount = self._contracts_to_amount( pair, self.amount_to_precision(pair, self._amount_to_contracts(pair, amount)) ) - dry_order: dict[str, Any] = { + dry_order: CcxtOrder = { "id": order_id, "symbol": pair, "price": rate, @@ -1026,14 +1031,13 @@ class Exchange: "status": "open", "fee": None, "info": {}, - "leverage": leverage, } if stop_loss: dry_order["info"] = {"stopPrice": dry_order["price"]} dry_order[self._ft_has["stop_price_prop"]] = dry_order["price"] # Workaround to avoid filling stoploss orders immediately dry_order["ft_order_type"] = "stoploss" - orderbook: Optional[OrderBook] = None + orderbook: OrderBook | None = None if self.exchange_has("fetchL2OrderBook"): orderbook = self.fetch_l2_order_book(pair, 20) if ordertype == "limit" and orderbook: @@ -1055,7 +1059,7 @@ class Exchange: "filled": _amount, "remaining": 0.0, "status": "closed", - "cost": (dry_order["amount"] * average), + "cost": (_amount * average), } ) # market orders will always incurr taker fees @@ -1072,9 +1076,9 @@ class Exchange: def add_dry_order_fee( self, pair: str, - dry_order: dict[str, Any], + dry_order: CcxtOrder, taker_or_maker: MakerTaker, - ) -> dict[str, Any]: + ) -> CcxtOrder: fee = self.get_fee(pair, taker_or_maker=taker_or_maker) dry_order.update( { @@ -1088,7 +1092,7 @@ class Exchange: return dry_order def get_dry_market_fill_price( - self, pair: str, side: str, amount: float, rate: float, orderbook: Optional[OrderBook] + self, pair: str, side: str, amount: float, rate: float, orderbook: OrderBook | None ) -> float: """ Get the market order fill price based on orderbook interpolation @@ -1136,7 +1140,7 @@ class Exchange: pair: str, side: str, limit: float, - orderbook: Optional[OrderBook] = None, + orderbook: OrderBook | None = None, offset: float = 0.0, ) -> bool: if not self.exchange_has("fetchL2OrderBook"): @@ -1158,8 +1162,8 @@ class Exchange: return False def check_dry_limit_order_filled( - self, order: dict[str, Any], immediate: bool = False, orderbook: Optional[OrderBook] = None - ) -> dict[str, Any]: + self, order: CcxtOrder, immediate: bool = False, orderbook: OrderBook | None = None + ) -> CcxtOrder: """ Check dry-run limit order fill and update fee (if it filled). """ @@ -1186,7 +1190,7 @@ class Exchange: return order - def fetch_dry_run_order(self, order_id) -> dict[str, Any]: + def fetch_dry_run_order(self, order_id) -> CcxtOrder: """ Return dry-run order Only call if running in dry-run mode. @@ -1248,7 +1252,7 @@ class Exchange: leverage: float, reduceOnly: bool = False, time_in_force: str = "GTC", - ) -> dict: + ) -> CcxtOrder: if self._config["dry_run"]: dry_order = self.create_dry_run_order( pair, ordertype, side, amount, self.price_to_precision(pair, rate), leverage @@ -1306,7 +1310,7 @@ class Exchange: except ccxt.BaseError as e: raise OperationalException(e) from e - def stoploss_adjust(self, stop_loss: float, order: dict, side: str) -> bool: + def stoploss_adjust(self, stop_loss: float, order: CcxtOrder, side: str) -> bool: """ Verify stop_loss against stoploss-order value (limit or price) Returns True if adjustment is necessary. @@ -1367,7 +1371,7 @@ class Exchange: order_types: dict, side: BuySell, leverage: float, - ) -> dict: + ) -> CcxtOrder: """ creates a stoploss order. requires `_ft_has['stoploss_order_types']` to be set as a dict mapping limit and market @@ -1460,7 +1464,7 @@ class Exchange: except ccxt.BaseError as e: raise OperationalException(e) from e - def fetch_order_emulated(self, order_id: str, pair: str, params: dict) -> dict: + def fetch_order_emulated(self, order_id: str, pair: str, params: dict) -> CcxtOrder: """ Emulated fetch_order if the exchange doesn't support fetch_order, but requires separate calls for open and closed orders. @@ -1494,7 +1498,7 @@ class Exchange: raise OperationalException(e) from e @retrier(retries=API_FETCH_ORDER_RETRY_COUNT) - def fetch_order(self, order_id: str, pair: str, params: Optional[dict] = None) -> dict: + def fetch_order(self, order_id: str, pair: str, params: dict | None = None) -> CcxtOrder: if self._config["dry_run"]: return self.fetch_dry_run_order(order_id) if params is None: @@ -1523,12 +1527,14 @@ class Exchange: except ccxt.BaseError as e: raise OperationalException(e) from e - def fetch_stoploss_order(self, order_id: str, pair: str, params: Optional[dict] = None) -> dict: + def fetch_stoploss_order( + self, order_id: str, pair: str, params: dict | None = None + ) -> CcxtOrder: return self.fetch_order(order_id, pair, params) def fetch_order_or_stoploss_order( self, order_id: str, pair: str, stoploss_order: bool = False - ) -> dict: + ) -> CcxtOrder: """ Simple wrapper calling either fetch_order or fetch_stoploss_order depending on the stoploss_order parameter @@ -1540,7 +1546,7 @@ class Exchange: return self.fetch_stoploss_order(order_id, pair) return self.fetch_order(order_id, pair) - def check_order_canceled_empty(self, order: dict) -> bool: + def check_order_canceled_empty(self, order: CcxtOrder) -> bool: """ Verify if an order has been cancelled without being partially filled :param order: Order dict as returned from fetch_order() @@ -1549,7 +1555,7 @@ class Exchange: return order.get("status") in NON_OPEN_EXCHANGE_STATES and order.get("filled") == 0.0 @retrier - def cancel_order(self, order_id: str, pair: str, params: Optional[dict] = None) -> dict: + def cancel_order(self, order_id: str, pair: str, params: dict | None = None) -> dict[str, Any]: if self._config["dry_run"]: try: order = self.fetch_dry_run_order(order_id) @@ -1577,19 +1583,17 @@ class Exchange: except ccxt.BaseError as e: raise OperationalException(e) from e - def cancel_stoploss_order( - self, order_id: str, pair: str, params: Optional[dict] = None - ) -> dict: + def cancel_stoploss_order(self, order_id: str, pair: str, params: dict | None = None) -> dict: return self.cancel_order(order_id, pair, params) - def is_cancel_order_result_suitable(self, corder) -> bool: + def is_cancel_order_result_suitable(self, corder) -> TypeGuard[CcxtOrder]: if not isinstance(corder, dict): return False required = ("fee", "status", "amount") return all(corder.get(k, None) is not None for k in required) - def cancel_order_with_result(self, order_id: str, pair: str, amount: float) -> dict: + def cancel_order_with_result(self, order_id: str, pair: str, amount: float) -> CcxtOrder: """ Cancel order returning a result. Creates a fake result if cancel order returns a non-usable result @@ -1620,7 +1624,9 @@ class Exchange: return order - def cancel_stoploss_order_with_result(self, order_id: str, pair: str, amount: float) -> dict: + def cancel_stoploss_order_with_result( + self, order_id: str, pair: str, amount: float + ) -> CcxtOrder: """ Cancel stoploss order returning a result. Creates a fake result if cancel order returns a non-usable result @@ -1651,6 +1657,7 @@ class Exchange: balances.pop("total", None) balances.pop("used", None) + self._log_exchange_response("fetch_balances", balances) return balances except ccxt.DDoSProtection as e: raise DDosProtection(e) from e @@ -1662,7 +1669,7 @@ class Exchange: raise OperationalException(e) from e @retrier - def fetch_positions(self, pair: Optional[str] = None) -> list[CcxtPosition]: + def fetch_positions(self, pair: str | None = None) -> list[CcxtPosition]: """ Fetch positions from the exchange. If no pair is given, all positions are returned. @@ -1686,7 +1693,7 @@ class Exchange: except ccxt.BaseError as e: raise OperationalException(e) from e - def _fetch_orders_emulate(self, pair: str, since_ms: int) -> list[dict]: + def _fetch_orders_emulate(self, pair: str, since_ms: int) -> list[CcxtOrder]: orders = [] if self.exchange_has("fetchClosedOrders"): orders = self._api.fetch_closed_orders(pair, since=since_ms) @@ -1696,7 +1703,9 @@ class Exchange: return orders @retrier(retries=0) - def fetch_orders(self, pair: str, since: datetime, params: Optional[dict] = None) -> list[dict]: + def fetch_orders( + self, pair: str, since: datetime, params: dict | None = None + ) -> list[CcxtOrder]: """ Fetch all orders for a pair "since" :param pair: Pair for the query @@ -1712,7 +1721,9 @@ class Exchange: if not params: params = {} try: - orders: list[dict] = self._api.fetch_orders(pair, since=since_ms, params=params) + orders: list[CcxtOrder] = self._api.fetch_orders( + pair, since=since_ms, params=params + ) except ccxt.NotSupported: # Some exchanges don't support fetchOrders # attempt to fetch open and closed orders separately @@ -1757,7 +1768,7 @@ class Exchange: raise OperationalException(e) from e @retrier - def fetch_bids_asks(self, symbols: Optional[list[str]] = None, cached: bool = False) -> dict: + def fetch_bids_asks(self, symbols: list[str] | None = None, *, cached: bool = False) -> dict: """ :param symbols: List of symbols to fetch :param cached: Allow cached result @@ -1790,8 +1801,9 @@ class Exchange: raise OperationalException(e) from e @retrier - def get_tickers(self, symbols: Optional[list[str]] = None, cached: bool = False) -> Tickers: + def get_tickers(self, symbols: list[str] | None = None, *, cached: bool = False) -> Tickers: """ + :param symbols: List of symbols to fetch :param cached: Allow cached result :return: fetch_tickers result """ @@ -1850,7 +1862,7 @@ class Exchange: @staticmethod def get_next_limit_in_list( - limit: int, limit_range: Optional[list[int]], range_required: bool = True + limit: int, limit_range: list[int] | None, range_required: bool = True ): """ Get next greater value in the list. @@ -1914,8 +1926,8 @@ class Exchange: refresh: bool, side: EntryExit, is_short: bool, - order_book: Optional[OrderBook] = None, - ticker: Optional[Ticker] = None, + order_book: OrderBook | None = None, + ticker: Ticker | None = None, ) -> float: """ Calculates bid/ask target @@ -1964,7 +1976,7 @@ class Exchange: def _get_rate_from_ticker( self, side: EntryExit, ticker: Ticker, conf_strategy: dict[str, Any], price_side: BidAsk - ) -> Optional[float]: + ) -> float | None: """ Get rate from ticker. """ @@ -2043,7 +2055,7 @@ class Exchange: @retrier def get_trades_for_order( - self, order_id: str, pair: str, since: datetime, params: Optional[dict] = None + self, order_id: str, pair: str, since: datetime, params: dict | None = None ) -> list: """ Fetch Orders using the "fetch_my_trades" endpoint and filter them by order-id. @@ -2090,7 +2102,7 @@ class Exchange: except ccxt.BaseError as e: raise OperationalException(e) from e - def get_order_id_conditional(self, order: dict[str, Any]) -> str: + def get_order_id_conditional(self, order: CcxtOrder) -> str: return order["id"] @retrier @@ -2139,7 +2151,7 @@ class Exchange: raise OperationalException(e) from e @staticmethod - def order_has_fee(order: dict) -> bool: + def order_has_fee(order: CcxtOrder) -> bool: """ Verifies if the passed in order dict has the needed keys to extract fees, and that these keys (currency, cost) are not empty. @@ -2158,7 +2170,7 @@ class Exchange: def calculate_fee_rate( self, fee: dict, symbol: str, cost: float, amount: float - ) -> Optional[float]: + ) -> float | None: """ Calculate fee rate if it's not given by the exchange. :param fee: ccxt Fee dict - must contain cost / currency / rate @@ -2197,8 +2209,8 @@ class Exchange: return round((fee_cost * fee_to_quote_rate) / cost, 8) def extract_cost_curr_rate( - self, fee: dict, symbol: str, cost: float, amount: float - ) -> tuple[float, str, Optional[float]]: + self, fee: dict[str, Any], symbol: str, cost: float, amount: float + ) -> tuple[float, str, float | None]: """ Extract tuple of cost, currency, rate. Requires order_has_fee to run first! @@ -2223,7 +2235,7 @@ class Exchange: since_ms: int, candle_type: CandleType, is_new_pair: bool = False, - until_ms: Optional[int] = None, + until_ms: int | None = None, ) -> DataFrame: """ Get candle history using asyncio and returns the list of candles. @@ -2257,7 +2269,7 @@ class Exchange: candle_type: CandleType, is_new_pair: bool = False, raise_: bool = False, - until_ms: Optional[int] = None, + until_ms: int | None = None, ) -> OHLCVResponse: """ Download historic ohlcv @@ -2302,7 +2314,7 @@ class Exchange: pair: str, timeframe: str, candle_type: CandleType, - since_ms: Optional[int], + since_ms: int | None, cache: bool, ) -> Coroutine[Any, Any, OHLCVResponse]: not_all_data = cache and self.required_candle_call_count > 1 @@ -2371,7 +2383,7 @@ class Exchange: ) def _build_ohlcv_dl_jobs( - self, pair_list: ListPairsWithTimeframes, since_ms: Optional[int], cache: bool + self, pair_list: ListPairsWithTimeframes, since_ms: int | None, cache: bool ) -> tuple[list[Coroutine], list[PairWithTimeframe]]: """ Build Coroutines to execute as part of refresh_latest_ohlcv @@ -2448,9 +2460,9 @@ class Exchange: self, pair_list: ListPairsWithTimeframes, *, - since_ms: Optional[int] = None, + since_ms: int | None = None, cache: bool = True, - drop_incomplete: Optional[bool] = None, + drop_incomplete: bool | None = None, ) -> dict[PairWithTimeframe, DataFrame]: """ Refresh in-memory OHLCV asynchronously and set `_klines` with the result @@ -2544,7 +2556,7 @@ class Exchange: pair: str, timeframe: str, candle_type: CandleType, - since_ms: Optional[int] = None, + since_ms: int | None = None, ) -> OHLCVResponse: """ Asynchronously get candle history data using fetch_ohlcv @@ -2618,7 +2630,7 @@ class Exchange: pair: str, timeframe: str, limit: int, - since_ms: Optional[int] = None, + since_ms: int | None = None, ) -> list[list]: """ Fetch funding rate history - used to selectively override this by subclasses. @@ -2677,7 +2689,7 @@ class Exchange: async def _build_trades_dl_jobs( self, pairwt: PairWithTimeframe, data_handler, cache: bool - ) -> tuple[PairWithTimeframe, Optional[DataFrame]]: + ) -> tuple[PairWithTimeframe, DataFrame | None]: """ Build coroutines to refresh trades for (they're then called through async.gather) """ @@ -2821,7 +2833,7 @@ class Exchange: @retrier_async async def _async_fetch_trades( - self, pair: str, since: Optional[int] = None, params: Optional[dict] = None + self, pair: str, since: int | None = None, params: dict | None = None ) -> tuple[list[list], Any]: """ Asynchronously gets trade history using fetch_trades. @@ -2880,8 +2892,16 @@ class Exchange: else: return trades[-1].get("timestamp") + async def _async_get_trade_history_id_startup( + self, pair: str, since: int | None + ) -> tuple[list[list], str]: + """ + override for initial trade_history_id call + """ + return await self._async_fetch_trades(pair, since=since) + async def _async_get_trade_history_id( - self, pair: str, until: int, since: Optional[int] = None, from_id: Optional[str] = None + self, pair: str, until: int, since: int | None = None, from_id: str | None = None ) -> tuple[str, list[list]]: """ Asynchronously gets trade history using fetch_trades @@ -2906,7 +2926,7 @@ class Exchange: # of up to an hour. # e.g. Binance returns the "last 1000" candles within a 1h time interval # - so we will miss the first trades. - t, from_id = await self._async_fetch_trades(pair, since=since) + t, from_id = await self._async_get_trade_history_id_startup(pair, since=since) trades.extend(t[x]) while True: try: @@ -2936,7 +2956,7 @@ class Exchange: return (pair, trades) async def _async_get_trade_history_time( - self, pair: str, until: int, since: Optional[int] = None + self, pair: str, until: int, since: int | None = None ) -> tuple[str, list[list]]: """ Asynchronously gets trade history using fetch_trades, @@ -2977,9 +2997,9 @@ class Exchange: async def _async_get_trade_history( self, pair: str, - since: Optional[int] = None, - until: Optional[int] = None, - from_id: Optional[str] = None, + since: int | None = None, + until: int | None = None, + from_id: str | None = None, ) -> tuple[str, list[list]]: """ Async wrapper handling downloading trades using either time or id based methods. @@ -3008,9 +3028,9 @@ class Exchange: def get_historic_trades( self, pair: str, - since: Optional[int] = None, - until: Optional[int] = None, - from_id: Optional[str] = None, + since: int | None = None, + until: int | None = None, + from_id: str | None = None, ) -> tuple[str, list]: """ Get trade history data using asyncio. @@ -3039,7 +3059,7 @@ class Exchange: return self.loop.run_until_complete(task) @retrier - def _get_funding_fees_from_exchange(self, pair: str, since: Union[datetime, int]) -> float: + def _get_funding_fees_from_exchange(self, pair: str, since: datetime | int) -> float: """ Returns the sum of all funding fees that were exchanged for a pair within a timeframe Dry-run handling happens as part of _calculate_funding_fees. @@ -3170,8 +3190,8 @@ class Exchange: file_dump_json(filename, data) def load_cached_leverage_tiers( - self, stake_currency: str, cache_time: Optional[timedelta] = None - ) -> Optional[dict[str, list[dict]]]: + self, stake_currency: str, cache_time: timedelta | None = None + ) -> dict[str, list[dict]] | None: """ Load cached leverage tiers from disk :param cache_time: The maximum age of the cache before it is considered outdated @@ -3216,7 +3236,7 @@ class Exchange: "maintAmt": float(info["cum"]) if "cum" in info else None, } - def get_max_leverage(self, pair: str, stake_amount: Optional[float]) -> float: + def get_max_leverage(self, pair: str, stake_amount: float | None) -> float: """ Returns the maximum leverage that a pair can be traded at :param pair: The base/quote currency pair being traded @@ -3294,7 +3314,7 @@ class Exchange: def _set_leverage( self, leverage: float, - pair: Optional[str] = None, + pair: str | None = None, accept_fail: bool = False, ): """ @@ -3346,7 +3366,7 @@ class Exchange: pair: str, margin_mode: MarginMode, accept_fail: bool = False, - params: Optional[dict] = None, + params: dict | None = None, ): """ Set's the margin mode on the exchange to cross or isolated for a specific pair @@ -3381,7 +3401,7 @@ class Exchange: amount: float, is_short: bool, open_date: datetime, - close_date: Optional[datetime] = None, + close_date: datetime | None = None, ) -> float: """ Fetches and calculates the sum of all funding fees that occurred for a pair @@ -3434,7 +3454,7 @@ class Exchange: @staticmethod def combine_funding_and_mark( - funding_rates: DataFrame, mark_rates: DataFrame, futures_funding_rate: Optional[int] = None + funding_rates: DataFrame, mark_rates: DataFrame, futures_funding_rate: int | None = None ) -> DataFrame: """ Combine funding-rates and mark-rates dataframes @@ -3475,7 +3495,7 @@ class Exchange: is_short: bool, open_date: datetime, close_date: datetime, - time_in_ratio: Optional[float] = None, + time_in_ratio: float | None = None, ) -> float: """ calculates the sum of all funding fees that occurred for a pair during a futures trade @@ -3533,8 +3553,8 @@ class Exchange: stake_amount: float, leverage: float, wallet_balance: float, - open_trades: Optional[list] = None, - ) -> Optional[float]: + open_trades: list | None = None, + ) -> float | None: """ Set's the margin mode on the exchange to cross or isolated for a specific pair """ @@ -3582,7 +3602,7 @@ class Exchange: leverage: float, wallet_balance: float, # Or margin balance open_trades: list, - ) -> Optional[float]: + ) -> float | None: """ Important: Must be fetching data from cached values as this is used by backtesting! PERPETUAL: @@ -3633,7 +3653,7 @@ class Exchange: self, pair: str, notional_value: float, - ) -> tuple[float, Optional[float]]: + ) -> tuple[float, float | None]: """ Important: Must be fetching data from cached values as this is used by backtesting! :param pair: Market symbol diff --git a/freqtrade/exchange/exchange_types.py b/freqtrade/exchange/exchange_types.py index e9c58ec38..69741dc65 100644 --- a/freqtrade/exchange/exchange_types.py +++ b/freqtrade/exchange/exchange_types.py @@ -1,4 +1,4 @@ -from typing import Optional, TypedDict +from typing import Any, Literal, TypedDict from freqtrade.enums import CandleType @@ -11,7 +11,7 @@ class FtHas(TypedDict, total=False): # Stoploss on exchange stoploss_on_exchange: bool stop_price_param: str - stop_price_prop: str + stop_price_prop: Literal["stopPrice", "stopLossPrice"] stop_price_type_field: str stop_price_type_value_mapping: dict stoploss_order_types: dict[str, str] @@ -35,16 +35,17 @@ class FtHas(TypedDict, total=False): trades_has_history: bool trades_pagination_overlap: bool # Orderbook - l2_limit_range: Optional[list[int]] + l2_limit_range: list[int] | None l2_limit_range_required: bool # Futures ccxt_futures_name: str # usually swap mark_ohlcv_price: str mark_ohlcv_timeframe: str funding_fee_timeframe: str + funding_fee_candle_limit: int floor_leverage: bool needs_trading_fees: bool - order_props_in_contracts: list[str] + order_props_in_contracts: list[Literal["amount", "cost", "filled", "remaining"]] # Websocket control ws_enabled: bool @@ -52,14 +53,14 @@ class FtHas(TypedDict, total=False): class Ticker(TypedDict): symbol: str - ask: Optional[float] - askVolume: Optional[float] - bid: Optional[float] - bidVolume: Optional[float] - last: Optional[float] - quoteVolume: Optional[float] - baseVolume: Optional[float] - percentage: Optional[float] + ask: float | None + askVolume: float | None + bid: float | None + bidVolume: float | None + last: float | None + quoteVolume: float | None + baseVolume: float | None + percentage: float | None # Several more - only listing required. @@ -70,9 +71,9 @@ class OrderBook(TypedDict): symbol: str bids: list[tuple[float, float]] asks: list[tuple[float, float]] - timestamp: Optional[int] - datetime: Optional[str] - nonce: Optional[int] + timestamp: int | None + datetime: str | None + nonce: int | None class CcxtBalance(TypedDict): @@ -89,10 +90,12 @@ class CcxtPosition(TypedDict): side: str contracts: float leverage: float - collateral: Optional[float] - initialMargin: Optional[float] - liquidationPrice: Optional[float] + collateral: float | None + initialMargin: float | None + liquidationPrice: float | None +CcxtOrder = dict[str, Any] + # pair, timeframe, candleType, OHLCV, drop last?, OHLCVResponse = tuple[str, str, CandleType, list, bool] diff --git a/freqtrade/exchange/exchange_utils.py b/freqtrade/exchange/exchange_utils.py index f7b53a836..1c8a30001 100644 --- a/freqtrade/exchange/exchange_utils.py +++ b/freqtrade/exchange/exchange_utils.py @@ -5,7 +5,7 @@ Exchange support utils import inspect from datetime import datetime, timedelta, timezone from math import ceil, floor -from typing import Any, Optional +from typing import Any import ccxt from ccxt import ( @@ -33,20 +33,18 @@ from freqtrade.util import FtPrecise CcxtModuleType = Any -def is_exchange_known_ccxt( - exchange_name: str, ccxt_module: Optional[CcxtModuleType] = None -) -> bool: +def is_exchange_known_ccxt(exchange_name: str, ccxt_module: CcxtModuleType | None = None) -> bool: return exchange_name in ccxt_exchanges(ccxt_module) -def ccxt_exchanges(ccxt_module: Optional[CcxtModuleType] = None) -> list[str]: +def ccxt_exchanges(ccxt_module: CcxtModuleType | None = None) -> list[str]: """ Return the list of all exchanges known to ccxt """ return ccxt_module.exchanges if ccxt_module is not None else ccxt.exchanges -def available_exchanges(ccxt_module: Optional[CcxtModuleType] = None) -> list[str]: +def available_exchanges(ccxt_module: CcxtModuleType | None = None) -> list[str]: """ Return exchanges available to the bot, i.e. non-bad exchanges in the ccxt list """ @@ -54,7 +52,7 @@ def available_exchanges(ccxt_module: Optional[CcxtModuleType] = None) -> list[st return [x for x in exchanges if validate_exchange(x)[0]] -def validate_exchange(exchange: str) -> tuple[bool, str, Optional[ccxt.Exchange]]: +def validate_exchange(exchange: str) -> tuple[bool, str, ccxt.Exchange | None]: """ returns: can_use, reason, exchange_object with Reason including both missing and missing_opt @@ -137,9 +135,7 @@ def list_available_exchanges(all_exchanges: bool) -> list[ValidExchangesType]: return exchanges_valid -def date_minus_candles( - timeframe: str, candle_count: int, date: Optional[datetime] = None -) -> datetime: +def date_minus_candles(timeframe: str, candle_count: int, date: datetime | None = None) -> datetime: """ subtract X candles from a date. :param timeframe: timeframe in string format (e.g. "5m") @@ -166,7 +162,7 @@ def market_is_active(market: dict) -> bool: return market.get("active", True) is not False -def amount_to_contracts(amount: float, contract_size: Optional[float]) -> float: +def amount_to_contracts(amount: float, contract_size: float | None) -> float: """ Convert amount to contracts. :param amount: amount to convert @@ -179,7 +175,7 @@ def amount_to_contracts(amount: float, contract_size: Optional[float]) -> float: return amount -def contracts_to_amount(num_contracts: float, contract_size: Optional[float]) -> float: +def contracts_to_amount(num_contracts: float, contract_size: float | None) -> float: """ Takes num-contracts and converts it to contract size :param num_contracts: number of contracts @@ -194,7 +190,7 @@ def contracts_to_amount(num_contracts: float, contract_size: Optional[float]) -> def amount_to_precision( - amount: float, amount_precision: Optional[float], precisionMode: Optional[int] + amount: float, amount_precision: float | None, precisionMode: int | None ) -> float: """ Returns the amount to buy or sell to a precision the Exchange accepts @@ -224,9 +220,9 @@ def amount_to_precision( def amount_to_contract_precision( amount, - amount_precision: Optional[float], - precisionMode: Optional[int], - contract_size: Optional[float], + amount_precision: float | None, + precisionMode: int | None, + contract_size: float | None, ) -> float: """ Returns the amount to buy or sell to a precision the Exchange accepts @@ -285,8 +281,8 @@ def __price_to_precision_significant_digits( def price_to_precision( price: float, - price_precision: Optional[float], - precisionMode: Optional[int], + price_precision: float | None, + precisionMode: int | None, *, rounding_mode: int = ROUND, ) -> float: diff --git a/freqtrade/exchange/exchange_utils_timeframe.py b/freqtrade/exchange/exchange_utils_timeframe.py index 67cf1b5d6..494df58f2 100644 --- a/freqtrade/exchange/exchange_utils_timeframe.py +++ b/freqtrade/exchange/exchange_utils_timeframe.py @@ -1,5 +1,4 @@ from datetime import datetime, timezone -from typing import Optional import ccxt from ccxt import ROUND_DOWN, ROUND_UP @@ -51,7 +50,7 @@ def timeframe_to_resample_freq(timeframe: str) -> str: return resample_interval -def timeframe_to_prev_date(timeframe: str, date: Optional[datetime] = None) -> datetime: +def timeframe_to_prev_date(timeframe: str, date: datetime | None = None) -> datetime: """ Use Timeframe and determine the candle start date for this date. Does not round when given a candle start date. @@ -66,7 +65,7 @@ def timeframe_to_prev_date(timeframe: str, date: Optional[datetime] = None) -> d return dt_from_ts(new_timestamp) -def timeframe_to_next_date(timeframe: str, date: Optional[datetime] = None) -> datetime: +def timeframe_to_next_date(timeframe: str, date: datetime | None = None) -> datetime: """ Use Timeframe and determine next candle. :param timeframe: timeframe in string format (e.g. "5m") diff --git a/freqtrade/exchange/gate.py b/freqtrade/exchange/gate.py index 70f877210..d9473043f 100644 --- a/freqtrade/exchange/gate.py +++ b/freqtrade/exchange/gate.py @@ -2,12 +2,15 @@ import logging from datetime import datetime -from typing import Any, Optional + +import ccxt from freqtrade.constants import BuySell from freqtrade.enums import MarginMode, PriceType, TradingMode +from freqtrade.exceptions import DDosProtection, OperationalException, TemporaryError from freqtrade.exchange import Exchange -from freqtrade.exchange.exchange_types import FtHas +from freqtrade.exchange.common import retrier +from freqtrade.exchange.exchange_types import CcxtOrder, FtHas from freqtrade.misc import safe_value_fallback2 @@ -24,6 +27,8 @@ class Gate(Exchange): may still not work as expected. """ + unified_account = False + _ft_has: FtHas = { "ohlcv_candle_limit": 1000, "order_time_in_force": ["GTC", "IOC"], @@ -38,6 +43,7 @@ class Gate(Exchange): _ft_has_futures: FtHas = { "needs_trading_fees": True, "marketOrderRequiresPrice": False, + "funding_fee_candle_limit": 90, "stop_price_type_field": "price_type", "stop_price_type_value_mapping": { PriceType.LAST: 0, @@ -53,6 +59,35 @@ class Gate(Exchange): (TradingMode.FUTURES, MarginMode.ISOLATED) ] + @retrier + def additional_exchange_init(self) -> None: + """ + Additional exchange initialization logic. + .api will be available at this point. + Must be overridden in child methods if required. + """ + try: + if not self._config["dry_run"]: + # TODO: This should work with 4.4.34 and later. + self._api.load_unified_status() + is_unified = self._api.options.get("unifiedAccount") + + # Returns a tuple of bools, first for margin, second for Account + if is_unified: + self.unified_account = True + logger.info("Gate: Unified account.") + else: + self.unified_account = False + logger.info("Gate: Classic account.") + except ccxt.DDoSProtection as e: + raise DDosProtection(e) from e + except (ccxt.OperationFailed, ccxt.ExchangeError) as e: + raise TemporaryError( + f"Error in additional_exchange_init due to {e.__class__.__name__}. Message: {e}" + ) from e + except ccxt.BaseError as e: + raise OperationalException(e) from e + def _get_params( self, side: BuySell, @@ -74,7 +109,7 @@ class Gate(Exchange): return params def get_trades_for_order( - self, order_id: str, pair: str, since: datetime, params: Optional[dict] = None + self, order_id: str, pair: str, since: datetime, params: dict | None = None ) -> list: trades = super().get_trades_for_order(order_id, pair, since, params) @@ -99,10 +134,12 @@ class Gate(Exchange): } return trades - def get_order_id_conditional(self, order: dict[str, Any]) -> str: + def get_order_id_conditional(self, order: CcxtOrder) -> str: return safe_value_fallback2(order, order, "id_stop", "id") - def fetch_stoploss_order(self, order_id: str, pair: str, params: Optional[dict] = None) -> dict: + def fetch_stoploss_order( + self, order_id: str, pair: str, params: dict | None = None + ) -> CcxtOrder: order = self.fetch_order(order_id=order_id, pair=pair, params={"stop": True}) if order.get("status", "open") == "closed": # Places a real order - which we need to fetch explicitly. @@ -119,7 +156,5 @@ class Gate(Exchange): return order1 return order - def cancel_stoploss_order( - self, order_id: str, pair: str, params: Optional[dict] = None - ) -> dict: + def cancel_stoploss_order(self, order_id: str, pair: str, params: dict | None = None) -> dict: return self.cancel_order(order_id=order_id, pair=pair, params={"stop": True}) diff --git a/freqtrade/exchange/hyperliquid.py b/freqtrade/exchange/hyperliquid.py index 144edbf3a..6588af0da 100644 --- a/freqtrade/exchange/hyperliquid.py +++ b/freqtrade/exchange/hyperliquid.py @@ -1,10 +1,14 @@ """Hyperliquid exchange subclass""" import logging +from datetime import datetime -from freqtrade.enums import TradingMode +from freqtrade.constants import BuySell +from freqtrade.enums import MarginMode, TradingMode +from freqtrade.exceptions import ExchangeError, OperationalException from freqtrade.exchange import Exchange -from freqtrade.exchange.exchange_types import FtHas +from freqtrade.exchange.exchange_types import CcxtOrder, FtHas +from freqtrade.util.datetime_helpers import dt_from_ts logger = logging.getLogger(__name__) @@ -16,20 +20,162 @@ class Hyperliquid(Exchange): """ _ft_has: FtHas = { - # Only the most recent 5000 candles are available according to the - # exchange's API documentation. "ohlcv_has_history": False, "ohlcv_candle_limit": 5000, - "trades_has_history": False, # Trades endpoint doesn't seem available. + "l2_limit_range": [20], + "trades_has_history": False, + "tickers_have_bid_ask": False, + "stoploss_on_exchange": False, "exchange_has_overrides": {"fetchTrades": False}, + "marketOrderRequiresPrice": True, } + _ft_has_futures: FtHas = { + "stoploss_on_exchange": True, + "stoploss_order_types": {"limit": "limit"}, + "stop_price_prop": "stopPrice", + "funding_fee_timeframe": "1h", + "funding_fee_candle_limit": 500, + } + + _supported_trading_mode_margin_pairs: list[tuple[TradingMode, MarginMode]] = [ + (TradingMode.FUTURES, MarginMode.ISOLATED) + ] @property def _ccxt_config(self) -> dict: - # Parameters to add directly to ccxt sync/async initialization. - # ccxt defaults to swap mode. + # ccxt Hyperliquid defaults to swap config = {} if self.trading_mode == TradingMode.SPOT: config.update({"options": {"defaultType": "spot"}}) config.update(super()._ccxt_config) return config + + def get_max_leverage(self, pair: str, stake_amount: float | None) -> float: + # There are no leverage tiers + if self.trading_mode == TradingMode.FUTURES: + return self.markets[pair]["limits"]["leverage"]["max"] + else: + return 1.0 + + def _lev_prep(self, pair: str, leverage: float, side: BuySell, accept_fail: bool = False): + if self.trading_mode != TradingMode.SPOT: + # Hyperliquid expects leverage to be an int + leverage = int(leverage) + # Hyperliquid needs the parameter leverage. + # Don't use _set_leverage(), as this sets margin back to cross + self.set_margin_mode(pair, self.margin_mode, params={"leverage": leverage}) + + def dry_run_liquidation_price( + self, + pair: str, + open_rate: float, # Entry price of position + is_short: bool, + amount: float, + stake_amount: float, + leverage: float, + wallet_balance: float, # Or margin balance + open_trades: list, + ) -> float | None: + """ + Optimized + Docs: https://hyperliquid.gitbook.io/hyperliquid-docs/trading/liquidations + Below can be done in fewer lines of code, but like this it matches the documentation. + + Tested with 196 unique ccxt fetch_positions() position outputs + - Only first output per position where pnl=0.0 + - Compare against returned liquidation price + Positions: 197 Average deviation: 0.00028980% Max deviation: 0.01309453% + Positions info: + {'leverage': {1.0: 23, 2.0: 155, 3.0: 8, 4.0: 7, 5.0: 4}, + 'side': {'long': 133, 'short': 64}, + 'symbol': {'BTC/USDC:USDC': 81, + 'DOGE/USDC:USDC': 20, + 'ETH/USDC:USDC': 53, + 'SOL/USDC:USDC': 43}} + """ + # Defining/renaming variables to match the documentation + isolated_margin = wallet_balance + position_size = amount + price = open_rate + position_value = price * position_size + max_leverage = self.markets[pair]["limits"]["leverage"]["max"] + + # Docs: The maintenance margin is half of the initial margin at max leverage, + # which varies from 3-50x. In other words, the maintenance margin is between 1% + # (for 50x max leverage assets) and 16.7% (for 3x max leverage assets) + # depending on the asset + # The key thing here is 'Half of the initial margin at max leverage'. + # A bit ambiguous, but this interpretation leads to accurate results: + # 1. Start from the position value + # 2. Assume max leverage, calculate the initial margin by dividing the position value + # by the max leverage + # 3. Divide this by 2 + maintenance_margin_required = position_value / max_leverage / 2 + + # Docs: margin_available (isolated) = isolated_margin - maintenance_margin_required + margin_available = isolated_margin - maintenance_margin_required + + # Docs: The maintenance margin is half of the initial margin at max leverage + # The docs don't explicitly specify maintenance leverage, but this works. + # Double because of the statement 'half of the initial margin at max leverage' + maintenance_leverage = max_leverage * 2 + + # Docs: l = 1 / MAINTENANCE_LEVERAGE (Using 'll' to comply with PEP8: E741) + ll = 1 / maintenance_leverage + + # Docs: side = 1 for long and -1 for short + side = -1 if is_short else 1 + + # Docs: liq_price = price - side * margin_available / position_size / (1 - l * side) + liq_price = price - side * margin_available / position_size / (1 - ll * side) + + if self.trading_mode == TradingMode.FUTURES: + return liq_price + else: + raise OperationalException( + "Freqtrade only supports isolated futures for leverage trading" + ) + + def get_funding_fees( + self, pair: str, amount: float, is_short: bool, open_date: datetime + ) -> float: + """ + Fetch funding fees, either from the exchange (live) or calculates them + based on funding rate/mark price history + :param pair: The quote/base pair of the trade + :param is_short: trade direction + :param amount: Trade amount + :param open_date: Open date of the trade + :return: funding fee since open_date + :raises: ExchangeError if something goes wrong. + """ + # Hyperliquid does not have fetchFundingHistory + if self.trading_mode == TradingMode.FUTURES: + try: + return self._fetch_and_calculate_funding_fees(pair, amount, is_short, open_date) + except ExchangeError: + logger.warning(f"Could not update funding fees for {pair}.") + return 0.0 + + def fetch_order(self, order_id: str, pair: str, params: dict | None = None) -> CcxtOrder: + order = super().fetch_order(order_id, pair, params) + + if ( + order["average"] is None + and order["status"] in ("canceled", "closed") + and order["filled"] > 0 + ): + # Hyperliquid does not fill the average price in the order response + # Fetch trades to calculate the average price to have the actual price + # the order was executed at + trades = self.get_trades_for_order(order_id, pair, since=dt_from_ts(order["timestamp"])) + + if trades: + total_amount = sum(t["amount"] for t in trades) + order["average"] = ( + sum(t["price"] * t["amount"] for t in trades) / total_amount + if total_amount + else None + ) + + return order diff --git a/freqtrade/exchange/kraken.py b/freqtrade/exchange/kraken.py index 7dea0e435..75e2bcbd3 100644 --- a/freqtrade/exchange/kraken.py +++ b/freqtrade/exchange/kraken.py @@ -2,7 +2,7 @@ import logging from datetime import datetime -from typing import Any, Optional +from typing import Any import ccxt from pandas import DataFrame @@ -50,12 +50,28 @@ class Kraken(Exchange): return parent_check and market.get("darkpool", False) is False - def get_tickers(self, symbols: Optional[list[str]] = None, cached: bool = False) -> Tickers: + def get_tickers(self, symbols: list[str] | None = None, *, cached: bool = False) -> Tickers: # Only fetch tickers for current stake currency # Otherwise the request for kraken becomes too large. symbols = list(self.get_markets(quote_currencies=[self._config["stake_currency"]])) return super().get_tickers(symbols=symbols, cached=cached) + def consolidate_balances(self, balances: CcxtBalances) -> CcxtBalances: + """ + Consolidate balances for the same currency. + Kraken returns ".F" balances if rewards is enabled. + """ + consolidated: CcxtBalances = {} + for currency, balance in balances.items(): + base_currency = currency[:-2] if currency.endswith(".F") else currency + if base_currency in consolidated: + consolidated[base_currency]["free"] += balance["free"] + consolidated[base_currency]["used"] += balance["used"] + consolidated[base_currency]["total"] += balance["total"] + else: + consolidated[base_currency] = balance + return consolidated + @retrier def get_balances(self) -> CcxtBalances: if self._config["dry_run"]: @@ -68,6 +84,10 @@ class Kraken(Exchange): balances.pop("free", None) balances.pop("total", None) balances.pop("used", None) + self._log_exchange_response("fetch_balances", balances) + + # Consolidate balances + balances = self.consolidate_balances(balances) orders = self._api.fetch_open_orders() order_list = [ @@ -86,6 +106,7 @@ class Kraken(Exchange): balances[bal]["used"] = sum(order[1] for order in order_list if order[0] == bal) balances[bal]["free"] = balances[bal]["total"] - balances[bal]["used"] + self._log_exchange_response("fetch_balances2", balances) return balances except ccxt.DDoSProtection as e: raise DDosProtection(e) from e @@ -99,7 +120,7 @@ class Kraken(Exchange): def _set_leverage( self, leverage: float, - pair: Optional[str] = None, + pair: str | None = None, accept_fail: bool = False, ): """ @@ -137,7 +158,7 @@ class Kraken(Exchange): is_short: bool, open_date: datetime, close_date: datetime, - time_in_ratio: Optional[float] = None, + time_in_ratio: float | None = None, ) -> float: """ # ! This method will always error when run by Freqtrade because time_in_ratio is never diff --git a/freqtrade/exchange/kucoin.py b/freqtrade/exchange/kucoin.py index fc4433f0b..de033dcc0 100644 --- a/freqtrade/exchange/kucoin.py +++ b/freqtrade/exchange/kucoin.py @@ -4,7 +4,7 @@ import logging from freqtrade.constants import BuySell from freqtrade.exchange import Exchange -from freqtrade.exchange.exchange_types import FtHas +from freqtrade.exchange.exchange_types import CcxtOrder, FtHas logger = logging.getLogger(__name__) @@ -47,7 +47,7 @@ class Kucoin(Exchange): leverage: float, reduceOnly: bool = False, time_in_force: str = "GTC", - ) -> dict: + ) -> CcxtOrder: res = super().create_order( pair=pair, ordertype=ordertype, diff --git a/freqtrade/exchange/okx.py b/freqtrade/exchange/okx.py index fbbf21757..e9784f12e 100644 --- a/freqtrade/exchange/okx.py +++ b/freqtrade/exchange/okx.py @@ -1,6 +1,5 @@ import logging from datetime import timedelta -from typing import Any, Optional import ccxt @@ -14,7 +13,7 @@ from freqtrade.exceptions import ( ) from freqtrade.exchange import Exchange, date_minus_candles from freqtrade.exchange.common import API_RETRY_COUNT, retrier -from freqtrade.exchange.exchange_types import FtHas +from freqtrade.exchange.exchange_types import CcxtOrder, FtHas from freqtrade.misc import safe_value_fallback2 from freqtrade.util import dt_now, dt_ts @@ -60,7 +59,7 @@ class Okx(Exchange): _ccxt_params: dict = {"options": {"brokerId": "ffb5405ad327SUDE"}} def ohlcv_candle_limit( - self, timeframe: str, candle_type: CandleType, since_ms: Optional[int] = None + self, timeframe: str, candle_type: CandleType, since_ms: int | None = None ) -> int: """ Exchange ohlcv candle limit @@ -191,7 +190,7 @@ class Okx(Exchange): params["posSide"] = self._get_posSide(side, True) return params - def _convert_stop_order(self, pair: str, order_id: str, order: dict) -> dict: + def _convert_stop_order(self, pair: str, order_id: str, order: CcxtOrder) -> CcxtOrder: if ( order.get("status", "open") == "closed" and (real_order_id := order.get("info", {}).get("ordId")) is not None @@ -209,7 +208,9 @@ class Okx(Exchange): return order @retrier(retries=API_RETRY_COUNT) - def fetch_stoploss_order(self, order_id: str, pair: str, params: Optional[dict] = None) -> dict: + def fetch_stoploss_order( + self, order_id: str, pair: str, params: dict | None = None + ) -> CcxtOrder: if self._config["dry_run"]: return self.fetch_dry_run_order(order_id) @@ -231,7 +232,7 @@ class Okx(Exchange): return self._fetch_stop_order_fallback(order_id, pair) - def _fetch_stop_order_fallback(self, order_id: str, pair: str) -> dict: + def _fetch_stop_order_fallback(self, order_id: str, pair: str) -> CcxtOrder: params2 = {"stop": True, "ordType": "conditional"} for method in ( self._api.fetch_open_orders, @@ -256,14 +257,12 @@ class Okx(Exchange): raise OperationalException(e) from e raise RetryableOrderError(f"StoplossOrder not found (pair: {pair} id: {order_id}).") - def get_order_id_conditional(self, order: dict[str, Any]) -> str: + def get_order_id_conditional(self, order: CcxtOrder) -> str: if order.get("type", "") == "stop": return safe_value_fallback2(order, order, "id_stop", "id") return order["id"] - def cancel_stoploss_order( - self, order_id: str, pair: str, params: Optional[dict] = None - ) -> dict: + def cancel_stoploss_order(self, order_id: str, pair: str, params: dict | None = None) -> dict: params1 = {"stop": True} # 'ordType': 'conditional' # @@ -273,7 +272,7 @@ class Okx(Exchange): params=params1, ) - def _fetch_orders_emulate(self, pair: str, since_ms: int) -> list[dict]: + def _fetch_orders_emulate(self, pair: str, since_ms: int) -> list[CcxtOrder]: orders = [] orders = self._api.fetch_closed_orders(pair, since=since_ms) diff --git a/freqtrade/freqai/RL/BaseEnvironment.py b/freqtrade/freqai/RL/BaseEnvironment.py index 021a2fc58..d9142046c 100644 --- a/freqtrade/freqai/RL/BaseEnvironment.py +++ b/freqtrade/freqai/RL/BaseEnvironment.py @@ -2,7 +2,6 @@ import logging import random from abc import abstractmethod from enum import Enum -from typing import Optional, Union import gymnasium as gym import numpy as np @@ -140,7 +139,7 @@ class BaseEnvironment(gym.Env): self._end_tick: int = len(self.prices) - 1 self._done: bool = False self._current_tick: int = self._start_tick - self._last_trade_tick: Optional[int] = None + self._last_trade_tick: int | None = None self._position = Positions.Neutral self._position_history: list = [None] self.total_reward: float = 0 @@ -173,8 +172,8 @@ class BaseEnvironment(gym.Env): def tensorboard_log( self, metric: str, - value: Optional[Union[int, float]] = None, - inc: Optional[bool] = None, + value: int | float | None = None, + inc: bool | None = None, category: str = "custom", ): """ diff --git a/freqtrade/freqai/RL/BaseReinforcementLearningModel.py b/freqtrade/freqai/RL/BaseReinforcementLearningModel.py index 5da88adb6..3c3c84804 100644 --- a/freqtrade/freqai/RL/BaseReinforcementLearningModel.py +++ b/freqtrade/freqai/RL/BaseReinforcementLearningModel.py @@ -2,9 +2,10 @@ import copy import importlib import logging from abc import abstractmethod +from collections.abc import Callable from datetime import datetime, timezone from pathlib import Path -from typing import Any, Callable, Optional, Union +from typing import Any import gymnasium as gym import numpy as np @@ -49,9 +50,9 @@ class BaseReinforcementLearningModel(IFreqaiModel): ) th.set_num_threads(self.max_threads) self.reward_params = self.freqai_info["rl_config"]["model_reward_parameters"] - self.train_env: Union[VecMonitor, SubprocVecEnv, gym.Env] = gym.Env() - self.eval_env: Union[VecMonitor, SubprocVecEnv, gym.Env] = gym.Env() - self.eval_callback: Optional[MaskableEvalCallback] = None + self.train_env: VecMonitor | SubprocVecEnv | gym.Env = gym.Env() + self.eval_env: VecMonitor | SubprocVecEnv | gym.Env = gym.Env() + self.eval_callback: MaskableEvalCallback | None = None self.model_type = self.freqai_info["rl_config"]["model_type"] self.rl_config = self.freqai_info["rl_config"] self.df_raw: DataFrame = DataFrame() diff --git a/freqtrade/freqai/data_kitchen.py b/freqtrade/freqai/data_kitchen.py index 4663c41b0..5292dc0af 100644 --- a/freqtrade/freqai/data_kitchen.py +++ b/freqtrade/freqai/data_kitchen.py @@ -5,7 +5,7 @@ import random import shutil from datetime import datetime, timezone from pathlib import Path -from typing import Any, Optional +from typing import Any import numpy as np import numpy.typing as npt @@ -111,7 +111,7 @@ class FreqaiDataKitchen: def set_paths( self, pair: str, - trained_timestamp: Optional[int] = None, + trained_timestamp: int | None = None, ) -> None: """ Set the paths to the data for the present coin/botloop diff --git a/freqtrade/freqai/freqai_interface.py b/freqtrade/freqai/freqai_interface.py index b0c376272..7d7d605d7 100644 --- a/freqtrade/freqai/freqai_interface.py +++ b/freqtrade/freqai/freqai_interface.py @@ -5,7 +5,7 @@ from abc import ABC, abstractmethod from collections import deque from datetime import datetime, timezone from pathlib import Path -from typing import Any, Literal, Optional +from typing import Any, Literal import datasieve.transforms as ds import numpy as np @@ -106,7 +106,7 @@ class IFreqaiModel(ABC): self._threads: list[threading.Thread] = [] self._stop_event = threading.Event() self.metadata: dict[str, Any] = self.dd.load_global_metadata_from_disk() - self.data_provider: Optional[DataProvider] = None + self.data_provider: DataProvider | None = None self.max_system_threads = max(int(psutil.cpu_count() * 2 - 2), 1) self.can_short = True # overridden in start() with strategy.can_short self.model: Any = None @@ -294,7 +294,9 @@ class IFreqaiModel(ABC): # tr_backtest is the backtesting time range e.g. the week directly # following tr_train. Both of these windows slide through the # entire backtest - for tr_train, tr_backtest in zip(dk.training_timeranges, dk.backtesting_timeranges): + for tr_train, tr_backtest in zip( + dk.training_timeranges, dk.backtesting_timeranges, strict=False + ): (_, _) = self.dd.get_pair_dict_info(pair) train_it += 1 total_trains = len(dk.backtesting_timeranges) diff --git a/freqtrade/freqai/prediction_models/ReinforcementLearner.py b/freqtrade/freqai/prediction_models/ReinforcementLearner.py index 5bd119fbe..87c3450dc 100644 --- a/freqtrade/freqai/prediction_models/ReinforcementLearner.py +++ b/freqtrade/freqai/prediction_models/ReinforcementLearner.py @@ -1,6 +1,6 @@ import logging from pathlib import Path -from typing import Any, Optional +from typing import Any import torch as th from stable_baselines3.common.callbacks import ProgressBarCallback @@ -78,7 +78,7 @@ class ReinforcementLearner(BaseReinforcementLearningModel): model = self.dd.model_dictionary[dk.pair] model.set_env(self.train_env) callbacks: list[Any] = [self.eval_callback, self.tensorboard_callback] - progressbar_callback: Optional[ProgressBarCallback] = None + progressbar_callback: ProgressBarCallback | None = None if self.rl_config.get("progress_bar", False): progressbar_callback = ProgressBarCallback() callbacks.insert(0, progressbar_callback) diff --git a/freqtrade/freqai/tensorboard/TensorboardCallback.py b/freqtrade/freqai/tensorboard/TensorboardCallback.py index 2b2b532f3..0ffbb5838 100644 --- a/freqtrade/freqai/tensorboard/TensorboardCallback.py +++ b/freqtrade/freqai/tensorboard/TensorboardCallback.py @@ -1,5 +1,5 @@ from enum import Enum -from typing import Any, Union +from typing import Any from stable_baselines3.common.callbacks import BaseCallback from stable_baselines3.common.logger import HParam @@ -27,7 +27,7 @@ class TensorboardCallback(BaseCallback): # "batch_size": self.model.batch_size, # "n_steps": self.model.n_steps, } - metric_dict: dict[str, Union[float, int]] = { + metric_dict: dict[str, float | int] = { "eval/mean_reward": 0, "rollout/ep_rew_mean": 0, "rollout/ep_len_mean": 0, diff --git a/freqtrade/freqai/tensorboard/tensorboard.py b/freqtrade/freqai/tensorboard/tensorboard.py index 81f48047e..76bd5c2f8 100644 --- a/freqtrade/freqai/tensorboard/tensorboard.py +++ b/freqtrade/freqai/tensorboard/tensorboard.py @@ -45,7 +45,7 @@ class TensorBoardCallback(BaseTensorBoardCallback): return False evals = ["validation", "train"] - for metric, eval_ in zip(evals_log.items(), evals): + for metric, eval_ in zip(evals_log.items(), evals, strict=False): for metric_name, log in metric[1].items(): score = log[-1][0] if isinstance(log[-1], tuple) else log[-1] self.writer.add_scalar(f"{eval_}-{metric_name}", score, epoch) diff --git a/freqtrade/freqai/torch/PyTorchModelTrainer.py b/freqtrade/freqai/torch/PyTorchModelTrainer.py index 02aa712d5..8682cff69 100644 --- a/freqtrade/freqai/torch/PyTorchModelTrainer.py +++ b/freqtrade/freqai/torch/PyTorchModelTrainer.py @@ -1,6 +1,6 @@ import logging from pathlib import Path -from typing import Any, Optional +from typing import Any import pandas as pd import torch @@ -50,8 +50,8 @@ class PyTorchModelTrainer(PyTorchTrainerInterface): self.criterion = criterion self.model_meta_data = model_meta_data self.device = device - self.n_epochs: Optional[int] = kwargs.get("n_epochs", 10) - self.n_steps: Optional[int] = kwargs.get("n_steps", None) + self.n_epochs: int | None = kwargs.get("n_epochs", 10) + self.n_steps: int | None = kwargs.get("n_steps", None) if self.n_steps is None and not self.n_epochs: raise Exception("Either `n_steps` or `n_epochs` should be set.") diff --git a/freqtrade/freqai/utils.py b/freqtrade/freqai/utils.py index 9e14fa930..d2a15046d 100644 --- a/freqtrade/freqai/utils.py +++ b/freqtrade/freqai/utils.py @@ -107,7 +107,7 @@ def plot_feature_importance( # Extract feature importance from model models = {} if "FreqaiMultiOutputRegressor" in str(model.__class__): - for estimator, label in zip(model.estimators_, dk.label_list): + for estimator, label in zip(model.estimators_, dk.label_list, strict=False): models[label] = estimator else: models[dk.label_list[0]] = model diff --git a/freqtrade/freqtradebot.py b/freqtrade/freqtradebot.py index 0ca107b17..d29f56914 100644 --- a/freqtrade/freqtradebot.py +++ b/freqtrade/freqtradebot.py @@ -9,7 +9,7 @@ from datetime import datetime, time, timedelta, timezone from math import isclose from threading import Lock from time import sleep -from typing import Any, Optional +from typing import Any from schedule import Scheduler @@ -43,6 +43,7 @@ from freqtrade.exchange import ( timeframe_to_next_date, timeframe_to_seconds, ) +from freqtrade.exchange.exchange_types import CcxtOrder from freqtrade.leverage.liquidation_price import update_liquidation_prices from freqtrade.misc import safe_value_fallback, safe_value_fallback2 from freqtrade.mixins import LoggingMixin @@ -111,7 +112,7 @@ class FreqtradeBot(LoggingMixin): self.trading_mode: TradingMode = self.config.get("trading_mode", TradingMode.SPOT) self.margin_mode: MarginMode = self.config.get("margin_mode", MarginMode.NONE) - self.last_process: Optional[datetime] = None + self.last_process: datetime | None = None # RPC runs in separate threads, can start handling external commands just after # initialization, even before Freqtradebot has a chance to start its throttling, @@ -325,7 +326,7 @@ class FreqtradeBot(LoggingMixin): } self.rpc.send_msg(msg) - def _refresh_active_whitelist(self, trades: Optional[list[Trade]] = None) -> list[str]: + def _refresh_active_whitelist(self, trades: list[Trade] | None = None) -> list[str]: """ Refresh active whitelist from pairlist or edge and extend it with pairs that have open trades. @@ -579,7 +580,7 @@ class FreqtradeBot(LoggingMixin): logger.warning( f"{trade} has a total of {trade.amount} {trade.base_currency}, " f"but the Wallet shows a total of {total} {trade.base_currency}. " - f"Adjusting trade amount to {total}." + f"Adjusting trade amount to {total}. " "This may however lead to further issues." ) trade.amount = total @@ -587,7 +588,7 @@ class FreqtradeBot(LoggingMixin): logger.warning( f"{trade} has a total of {trade.amount} {trade.base_currency}, " f"but the Wallet shows a total of {total} {trade.base_currency}. " - "Refusing to adjust as the difference is too large." + "Refusing to adjust as the difference is too large. " "This may however lead to further issues." ) if prev_trade_amount != trade.amount: @@ -862,14 +863,14 @@ class FreqtradeBot(LoggingMixin): self, pair: str, stake_amount: float, - price: Optional[float] = None, + price: float | None = None, *, is_short: bool = False, - ordertype: Optional[str] = None, - enter_tag: Optional[str] = None, - trade: Optional[Trade] = None, + ordertype: str | None = None, + enter_tag: str | None = None, + trade: Trade | None = None, mode: EntryExecuteMode = "initial", - leverage_: Optional[float] = None, + leverage_: float | None = None, ) -> bool: """ Executes an entry for the given pair @@ -1078,13 +1079,13 @@ class FreqtradeBot(LoggingMixin): def get_valid_enter_price_and_stake( self, pair: str, - price: Optional[float], + price: float | None, stake_amount: float, trade_side: LongShort, - entry_tag: Optional[str], - trade: Optional[Trade], + entry_tag: str | None, + trade: Trade | None, mode: EntryExecuteMode, - leverage_: Optional[float], + leverage_: float | None, ) -> tuple[float, float, float]: """ Validate and eventually adjust (within limits) limit, amount and leverage @@ -1180,7 +1181,7 @@ class FreqtradeBot(LoggingMixin): self, trade: Trade, order: Order, - order_type: Optional[str], + order_type: str | None, fill: bool = False, sub_trade: bool = False, ) -> None: @@ -1195,6 +1196,13 @@ class FreqtradeBot(LoggingMixin): current_rate = self.exchange.get_rate( trade.pair, side="entry", is_short=trade.is_short, refresh=False ) + stake_amount = trade.stake_amount + if not fill: + # If we have open orders, we need to add the stake amount of the open orders + # as it's not yet included in the trade.stake_amount + stake_amount += sum( + o.stake_amount for o in trade.open_orders if o.ft_order_side == trade.entry_side + ) msg: RPCEntryMsg = { "trade_id": trade.id, @@ -1208,12 +1216,12 @@ class FreqtradeBot(LoggingMixin): "limit": open_rate, # Deprecated (?) "open_rate": open_rate, "order_type": order_type or "unknown", - "stake_amount": trade.stake_amount, + "stake_amount": stake_amount, "stake_currency": self.config["stake_currency"], "base_currency": self.exchange.get_pair_base_currency(trade.pair), "quote_currency": self.exchange.get_pair_quote_currency(trade.pair), "fiat_currency": self.config.get("fiat_display_currency", None), - "amount": order.safe_amount_after_fee if fill else (order.amount or trade.amount), + "amount": order.safe_amount_after_fee if fill else (order.safe_amount or trade.amount), "open_date": trade.open_date_utc or datetime.now(timezone.utc), "current_rate": current_rate, "sub_trade": sub_trade, @@ -1344,7 +1352,7 @@ class FreqtradeBot(LoggingMixin): return False def _check_and_execute_exit( - self, trade: Trade, exit_rate: float, enter: bool, exit_: bool, exit_tag: Optional[str] + self, trade: Trade, exit_rate: float, enter: bool, exit_: bool, exit_tag: str | None ) -> bool: """ Check and execute trade exit @@ -1466,7 +1474,7 @@ class FreqtradeBot(LoggingMixin): return False - def handle_trailing_stoploss_on_exchange(self, trade: Trade, order: dict) -> None: + def handle_trailing_stoploss_on_exchange(self, trade: Trade, order: CcxtOrder) -> None: """ Check to see if stoploss on exchange should be updated in case of trailing stoploss on exchange @@ -1504,7 +1512,7 @@ class FreqtradeBot(LoggingMixin): f"Could not create trailing stoploss order for pair {trade.pair}." ) - def manage_trade_stoploss_orders(self, trade: Trade, stoploss_orders: list[dict]): + def manage_trade_stoploss_orders(self, trade: Trade, stoploss_orders: list[CcxtOrder]): """ Perform required actions according to existing stoploss orders of trade :param trade: Corresponding Trade @@ -1580,7 +1588,9 @@ class FreqtradeBot(LoggingMixin): else: self.replace_order(order, open_order, trade) - def handle_cancel_order(self, order: dict, order_obj: Order, trade: Trade, reason: str) -> None: + def handle_cancel_order( + self, order: CcxtOrder, order_obj: Order, trade: Trade, reason: str + ) -> None: """ Check if current analyzed order timed out and cancel if necessary. :param order: Order dict grabbed with exchange.fetch_order() @@ -1602,7 +1612,7 @@ class FreqtradeBot(LoggingMixin): self.emergency_exit(trade, order["price"], order["amount"]) def emergency_exit( - self, trade: Trade, price: float, sub_trade_amt: Optional[float] = None + self, trade: Trade, price: float, sub_trade_amt: float | None = None ) -> None: try: self.execute_trade_exit( @@ -1632,7 +1642,7 @@ class FreqtradeBot(LoggingMixin): ) trade.delete() - def replace_order(self, order: dict, order_obj: Optional[Order], trade: Trade) -> None: + def replace_order(self, order: CcxtOrder, order_obj: Order | None, trade: Trade) -> None: """ Check if current analyzed entry order should be replaced or simply cancelled. To simply cancel the existing order(no replacement) adjust_entry_price() should return None @@ -1736,10 +1746,10 @@ class FreqtradeBot(LoggingMixin): def handle_cancel_enter( self, trade: Trade, - order: dict, + order: CcxtOrder, order_obj: Order, reason: str, - replacing: Optional[bool] = False, + replacing: bool | None = False, ) -> bool: """ entry cancel - cancel order @@ -1820,7 +1830,9 @@ class FreqtradeBot(LoggingMixin): ) return was_trade_fully_canceled - def handle_cancel_exit(self, trade: Trade, order: dict, order_obj: Order, reason: str) -> bool: + def handle_cancel_exit( + self, trade: Trade, order: CcxtOrder, order_obj: Order, reason: str + ) -> bool: """ exit order cancel - cancel order and update trade :return: True if exit order was cancelled, false otherwise @@ -1931,9 +1943,9 @@ class FreqtradeBot(LoggingMixin): limit: float, exit_check: ExitCheckTuple, *, - exit_tag: Optional[str] = None, - ordertype: Optional[str] = None, - sub_trade_amt: Optional[float] = None, + exit_tag: str | None = None, + ordertype: str | None = None, + sub_trade_amt: float | None = None, ) -> bool: """ Executes a trade exit for the given trade and limit @@ -2042,10 +2054,10 @@ class FreqtradeBot(LoggingMixin): def _notify_exit( self, trade: Trade, - order_type: Optional[str], + order_type: str | None, fill: bool = False, sub_trade: bool = False, - order: Optional[Order] = None, + order: Order | None = None, ) -> None: """ Sends rpc notification when a sell occurred. @@ -2158,7 +2170,7 @@ class FreqtradeBot(LoggingMixin): # Send the message self.rpc.send_msg(msg) - def order_obj_or_raise(self, order_id: str, order_obj: Optional[Order]) -> Order: + def order_obj_or_raise(self, order_id: str, order_obj: Order | None) -> Order: if not order_obj: raise DependencyException( f"Order_obj not found for {order_id}. This should not have happened." @@ -2172,8 +2184,8 @@ class FreqtradeBot(LoggingMixin): def update_trade_state( self, trade: Trade, - order_id: Optional[str], - action_order: Optional[dict[str, Any]] = None, + order_id: str | None, + action_order: CcxtOrder | None = None, *, stoploss_order: bool = False, send_msg: bool = True, @@ -2284,7 +2296,7 @@ class FreqtradeBot(LoggingMixin): def handle_protections(self, pair: str, side: LongShort) -> None: # Lock pair for one candle to prevent immediate re-entries - self.strategy.lock_pair(pair, datetime.now(timezone.utc), reason="Auto lock") + self.strategy.lock_pair(pair, datetime.now(timezone.utc), reason="Auto lock", side=side) prot_trig = self.protections.stop_per_pair(pair, side=side) if prot_trig: msg: RPCProtectionMsg = { @@ -2310,7 +2322,7 @@ class FreqtradeBot(LoggingMixin): amount: float, fee_abs: float, order_obj: Order, - ) -> Optional[float]: + ) -> float | None: """ Applies the fee to amount (either from Order or from Trades). Can eat into dust if more than the required asset is available. @@ -2338,7 +2350,7 @@ class FreqtradeBot(LoggingMixin): return fee_abs return None - def handle_order_fee(self, trade: Trade, order_obj: Order, order: dict[str, Any]) -> None: + def handle_order_fee(self, trade: Trade, order_obj: Order, order: CcxtOrder) -> None: # Try update amount (binance-fix) try: fee_abs = self.get_real_amount(trade, order, order_obj) @@ -2347,7 +2359,7 @@ class FreqtradeBot(LoggingMixin): except DependencyException as exception: logger.warning("Could not update trade amount: %s", exception) - def get_real_amount(self, trade: Trade, order: dict, order_obj: Order) -> Optional[float]: + def get_real_amount(self, trade: Trade, order: CcxtOrder, order_obj: Order) -> float | None: """ Detect and update trade fee. Calls trade.update_fee() upon correct detection. @@ -2407,8 +2419,8 @@ class FreqtradeBot(LoggingMixin): return True def fee_detection_from_trades( - self, trade: Trade, order: dict, order_obj: Order, order_amount: float, trades: list - ) -> Optional[float]: + self, trade: Trade, order: CcxtOrder, order_obj: Order, order_amount: float, trades: list + ) -> float | None: """ fee-detection fallback to Trades. Either uses provided trades list or the result of fetch_my_trades to get correct fee. @@ -2419,7 +2431,7 @@ class FreqtradeBot(LoggingMixin): ) if len(trades) == 0: - logger.info("Applying fee on amount for %s failed: myTrade-Dict empty found", trade) + logger.info("Applying fee on amount for %s failed: myTrade-dict empty found", trade) return None fee_currency = None amount = 0 diff --git a/freqtrade/ft_types/backtest_result_type.py b/freqtrade/ft_types/backtest_result_type.py index 25a890349..27cdb6126 100644 --- a/freqtrade/ft_types/backtest_result_type.py +++ b/freqtrade/ft_types/backtest_result_type.py @@ -1,4 +1,4 @@ -from typing import Any, Optional +from typing import Any from typing_extensions import TypedDict @@ -26,7 +26,7 @@ class BacktestHistoryEntryType(BacktestMetadataType): filename: str strategy: str notes: str - backtest_start_ts: Optional[int] - backtest_end_ts: Optional[int] - timeframe: Optional[str] - timeframe_detail: Optional[str] + backtest_start_ts: int | None + backtest_end_ts: int | None + timeframe: str | None + timeframe_detail: str | None diff --git a/freqtrade/ft_types/valid_exchanges_type.py b/freqtrade/ft_types/valid_exchanges_type.py index 89a06ba40..d6b93f4b2 100644 --- a/freqtrade/ft_types/valid_exchanges_type.py +++ b/freqtrade/ft_types/valid_exchanges_type.py @@ -1,5 +1,4 @@ # Used for list-exchanges -from typing import Optional from typing_extensions import TypedDict @@ -17,5 +16,5 @@ class ValidExchangesType(TypedDict): comment: str dex: bool is_alias: bool - alias_for: Optional[str] + alias_for: str | None trade_modes: list[TradeModeType] diff --git a/freqtrade/leverage/liquidation_price.py b/freqtrade/leverage/liquidation_price.py index af6ef0d44..aed8c9160 100644 --- a/freqtrade/leverage/liquidation_price.py +++ b/freqtrade/leverage/liquidation_price.py @@ -1,5 +1,4 @@ import logging -from typing import Optional from freqtrade.enums import MarginMode from freqtrade.exceptions import DependencyException @@ -12,7 +11,7 @@ logger = logging.getLogger(__name__) def update_liquidation_prices( - trade: Optional[LocalTrade] = None, + trade: LocalTrade | None = None, *, exchange: Exchange, wallets: Wallets, diff --git a/freqtrade/main.py b/freqtrade/main.py index 712cc49cf..bd815b746 100755 --- a/freqtrade/main.py +++ b/freqtrade/main.py @@ -6,11 +6,11 @@ Read the documentation to know what cli arguments you need. import logging import sys -from typing import Any, Optional +from typing import Any # check min. python version -if sys.version_info < (3, 10): # pragma: no cover +if sys.version_info < (3, 10): # pragma: no cover # noqa: UP036 sys.exit("Freqtrade requires Python version >= 3.10") from freqtrade import __version__ @@ -24,7 +24,7 @@ from freqtrade.system import asyncio_setup, gc_set_threshold logger = logging.getLogger("freqtrade") -def main(sysargv: Optional[list[str]] = None) -> None: +def main(sysargv: list[str] | None = None) -> None: """ This function will initiate the bot and start the trading loop. :return: None diff --git a/freqtrade/misc.py b/freqtrade/misc.py index 629bd10dd..5ea227984 100644 --- a/freqtrade/misc.py +++ b/freqtrade/misc.py @@ -7,7 +7,7 @@ import logging from collections.abc import Iterator, Mapping from io import StringIO from pathlib import Path -from typing import Any, Optional, TextIO, Union +from typing import Any, TextIO from urllib.parse import urlparse import pandas as pd @@ -129,10 +129,10 @@ def round_dict(d, n): return {k: (round(v, n) if isinstance(v, float) else v) for k, v in d.items()} -DictMap = Union[dict[str, Any], Mapping[str, Any]] +DictMap = dict[str, Any] | Mapping[str, Any] -def safe_value_fallback(obj: DictMap, key1: str, key2: Optional[str] = None, default_value=None): +def safe_value_fallback(obj: DictMap, key1: str, key2: str | None = None, default_value=None): """ Search a value in obj, return this if it's not None. Then search key2 in obj - return that if it's not none - then use default_value. @@ -161,7 +161,7 @@ def safe_value_fallback2(dict1: DictMap, dict2: DictMap, key1: str, key2: str, d return default_value -def plural(num: float, singular: str, plural: Optional[str] = None) -> str: +def plural(num: float, singular: str, plural: str | None = None) -> str: return singular if (num == 1 or num == -1) else plural or singular + "s" diff --git a/freqtrade/mixins/logging_mixin.py b/freqtrade/mixins/logging_mixin.py index 44fb4f63a..58399e738 100644 --- a/freqtrade/mixins/logging_mixin.py +++ b/freqtrade/mixins/logging_mixin.py @@ -1,4 +1,4 @@ -from typing import Callable +from collections.abc import Callable from cachetools import TTLCache, cached diff --git a/freqtrade/optimize/analysis/lookahead_helpers.py b/freqtrade/optimize/analysis/lookahead_helpers.py index dccf2cb73..d664f9635 100644 --- a/freqtrade/optimize/analysis/lookahead_helpers.py +++ b/freqtrade/optimize/analysis/lookahead_helpers.py @@ -1,7 +1,7 @@ import logging import time from pathlib import Path -from typing import Any, Union +from typing import Any import pandas as pd from rich.text import Text @@ -21,7 +21,7 @@ class LookaheadAnalysisSubFunctions: def text_table_lookahead_analysis_instances( config: dict[str, Any], lookahead_instances: list[LookaheadAnalysis], - caption: Union[str, None] = None, + caption: str | None = None, ): headers = [ "filename", @@ -243,7 +243,7 @@ class LookaheadAnalysisSubFunctions: # report the results if lookaheadAnalysis_instances: - caption: Union[str, None] = None + caption: str | None = None if any( [ any( diff --git a/freqtrade/optimize/backtest_caching.py b/freqtrade/optimize/backtest_caching.py index 766c77ddc..7143da006 100644 --- a/freqtrade/optimize/backtest_caching.py +++ b/freqtrade/optimize/backtest_caching.py @@ -1,7 +1,6 @@ import hashlib from copy import deepcopy from pathlib import Path -from typing import Union import rapidjson @@ -38,7 +37,7 @@ def get_strategy_run_id(strategy) -> str: return digest.hexdigest().lower() -def get_backtest_metadata_filename(filename: Union[Path, str]) -> Path: +def get_backtest_metadata_filename(filename: Path | str) -> Path: """Return metadata filename for specified backtest results file.""" filename = Path(filename) return filename.parent / Path(f"{filename.stem}.meta{filename.suffix}") diff --git a/freqtrade/optimize/backtesting.py b/freqtrade/optimize/backtesting.py index fd4c98b4d..47f920e01 100644 --- a/freqtrade/optimize/backtesting.py +++ b/freqtrade/optimize/backtesting.py @@ -8,7 +8,7 @@ import logging from collections import defaultdict from copy import deepcopy from datetime import datetime, timedelta, timezone -from typing import Any, Optional +from typing import Any from numpy import nan from pandas import DataFrame @@ -110,7 +110,7 @@ class Backtesting: backtesting.start() """ - def __init__(self, config: Config, exchange: Optional[Exchange] = None) -> None: + def __init__(self, config: Config, exchange: Exchange | None = None) -> None: LoggingMixin.show_output = False self.config = config self.results: BacktestResultType = get_BacktestResultType_default() @@ -685,7 +685,7 @@ class Backtesting: ) def _try_close_open_order( - self, order: Optional[Order], trade: LocalTrade, current_date: datetime, row: tuple + self, order: Order | None, trade: LocalTrade, current_date: datetime, row: tuple ) -> bool: """ Check if an order is open and if it should've filled. @@ -742,8 +742,8 @@ class Backtesting: row: tuple, exit_: ExitCheckTuple, current_time: datetime, - amount: Optional[float] = None, - ) -> Optional[LocalTrade]: + amount: float | None = None, + ) -> LocalTrade | None: if exit_.exit_flag: trade.close_date = current_time exit_reason = exit_.exit_reason @@ -822,8 +822,8 @@ class Backtesting: sell_row: tuple, close_rate: float, amount: float, - exit_reason: Optional[str], - ) -> Optional[LocalTrade]: + exit_reason: str | None, + ) -> LocalTrade | None: self.order_id_counter += 1 exit_candle_time = sell_row[DATE_IDX].to_pydatetime() order_type = self.strategy.order_types["exit"] @@ -859,7 +859,7 @@ class Backtesting: def _check_trade_exit( self, trade: LocalTrade, row: tuple, current_time: datetime - ) -> Optional[LocalTrade]: + ) -> LocalTrade | None: self._run_funding_fees(trade, current_time) # Check if we need to adjust our current positions @@ -909,10 +909,10 @@ class Backtesting: stake_amount: float, direction: LongShort, current_time: datetime, - entry_tag: Optional[str], - trade: Optional[LocalTrade], + entry_tag: str | None, + trade: LocalTrade | None, order_type: str, - price_precision: Optional[float], + price_precision: float | None, ) -> tuple[float, float, float, float]: if order_type == "limit": new_rate = strategy_safe_wrapper( @@ -1004,12 +1004,12 @@ class Backtesting: pair: str, row: tuple, direction: LongShort, - stake_amount: Optional[float] = None, - trade: Optional[LocalTrade] = None, - requested_rate: Optional[float] = None, - requested_stake: Optional[float] = None, - entry_tag1: Optional[str] = None, - ) -> Optional[LocalTrade]: + stake_amount: float | None = None, + trade: LocalTrade | None = None, + requested_rate: float | None = None, + requested_stake: float | None = None, + entry_tag1: str | None = None, + ) -> LocalTrade | None: """ :param trade: Trade to adjust - initial entry if None :param requested_rate: Adjusted entry rate @@ -1139,7 +1139,7 @@ class Backtesting: amount=amount, filled=0, remaining=amount, - cost=amount * propose_rate + trade.fee_open, + cost=amount * propose_rate * (1 + self.fee), ft_order_tag=entry_tag, ) order._trade_bt = trade @@ -1178,7 +1178,7 @@ class Backtesting: self.rejected_trades += 1 return False - def check_for_trade_entry(self, row) -> Optional[LongShort]: + def check_for_trade_entry(self, row) -> LongShort | None: enter_long = row[LONG_IDX] == 1 exit_long = row[ELONG_IDX] == 1 enter_short = self._can_short and row[SHORT_IDX] == 1 @@ -1216,7 +1216,7 @@ class Backtesting: def check_order_cancel( self, trade: LocalTrade, order: Order, current_time: datetime - ) -> Optional[bool]: + ) -> bool | None: """ Check if current analyzed order has to be canceled. Returns True if the trade should be Deleted (initial order was canceled), @@ -1298,7 +1298,7 @@ class Backtesting: def validate_row( self, data: dict, pair: str, row_index: int, current_time: datetime - ) -> Optional[tuple]: + ) -> tuple | None: try: # Row is treated as "current incomplete candle". # entry / exit signals are shifted by 1 to compensate for this. @@ -1332,14 +1332,41 @@ class Backtesting: row: tuple, pair: str, current_time: datetime, - trade_dir: Optional[LongShort], + trade_dir: LongShort | None, can_enter: bool, ) -> None: + """ + Conditionally call backtest_loop_inner a 2nd time if shorting is enabled, + a position closed and a new signal in the other direction is available. + """ + if not self._can_short or trade_dir is None: + # No need to reverse position if shorting is disabled or there's no new signal + self.backtest_loop_inner(row, pair, current_time, trade_dir, can_enter) + else: + for _ in (0, 1): + a = self.backtest_loop_inner(row, pair, current_time, trade_dir, can_enter) + if not a or a == trade_dir: + # the trade didn't close or position change is in the same direction + break + + def backtest_loop_inner( + self, + row: tuple, + pair: str, + current_time: datetime, + trade_dir: LongShort | None, + can_enter: bool, + ) -> LongShort | None: """ NOTE: This method is used by Hyperopt at each iteration. Please keep it optimized. Backtesting processing for one candle/pair. """ + exiting_dir: LongShort | None = None + if not self._position_stacking and len(LocalTrade.bt_trades_open_pp[pair]) > 0: + # position_stacking not supported for now. + exiting_dir = "short" if LocalTrade.bt_trades_open_pp[pair][0].is_short else "long" + for t in list(LocalTrade.bt_trades_open_pp[pair]): # 1. Manage currently open orders of active trades if self.manage_open_orders(t, current_time, row): @@ -1380,6 +1407,10 @@ class Backtesting: if order: self._process_exit_order(order, trade, current_time, row, pair) + if exiting_dir and len(LocalTrade.bt_trades_open_pp[pair]) == 0: + return exiting_dir + return None + def time_pair_generator( self, start_date: datetime, end_date: datetime, increment: timedelta, pairs: list[str] ): @@ -1450,7 +1481,7 @@ class Backtesting: self.dataprovider._set_dataframe_max_index(self.required_startup + row_index) self.dataprovider._set_dataframe_max_date(current_time) current_detail_time: datetime = row[DATE_IDX].to_pydatetime() - trade_dir: Optional[LongShort] = self.check_for_trade_entry(row) + trade_dir: LongShort | None = self.check_for_trade_entry(row) if ( (trade_dir is not None or len(LocalTrade.bt_trades_open_pp[pair]) > 0) @@ -1521,12 +1552,6 @@ class Backtesting: backtest_start_time = datetime.now(timezone.utc) self._set_strategy(strat) - # Use max_open_trades in backtesting, except --disable-max-market-positions is set - if not self.config.get("use_max_market_positions", True): - logger.info("Ignoring max_open_trades (--disable-max-market-positions was used) ...") - self.strategy.max_open_trades = float("inf") - self.config.update({"max_open_trades": self.strategy.max_open_trades}) - # need to reprocess data every time to populate signals preprocessed = self.strategy.advise_all_indicators(data) diff --git a/freqtrade/optimize/base_analysis.py b/freqtrade/optimize/base_analysis.py index e3e475742..a2fe53867 100644 --- a/freqtrade/optimize/base_analysis.py +++ b/freqtrade/optimize/base_analysis.py @@ -1,7 +1,7 @@ import logging from copy import deepcopy from datetime import datetime, timezone -from typing import Any, Optional +from typing import Any from pandas import DataFrame @@ -28,7 +28,7 @@ class BaseAnalysis: def __init__(self, config: dict[str, Any], strategy_obj: dict): self.failed_bias_check = True self.full_varHolder = VarHolder() - self.exchange: Optional[Any] = None + self.exchange: Any | None = None self._fee = None # pull variables the scope of the lookahead_analysis-instance diff --git a/freqtrade/optimize/hyperopt/__init__.py b/freqtrade/optimize/hyperopt/__init__.py new file mode 100644 index 000000000..7dea075ea --- /dev/null +++ b/freqtrade/optimize/hyperopt/__init__.py @@ -0,0 +1,5 @@ +from freqtrade.optimize.hyperopt.hyperopt import Hyperopt +from freqtrade.optimize.hyperopt_loss.hyperopt_loss_interface import IHyperOptLoss + + +__all__ = ["Hyperopt", "IHyperOptLoss"] diff --git a/freqtrade/optimize/hyperopt/hyperopt.py b/freqtrade/optimize/hyperopt/hyperopt.py new file mode 100644 index 000000000..253691d4a --- /dev/null +++ b/freqtrade/optimize/hyperopt/hyperopt.py @@ -0,0 +1,352 @@ +# pragma pylint: disable=too-many-instance-attributes, pointless-string-statement + +""" +This module contains the hyperopt logic +""" + +import logging +import random +import sys +from datetime import datetime +from math import ceil +from multiprocessing import Manager +from pathlib import Path +from typing import Any + +import rapidjson +from joblib import Parallel, cpu_count, delayed, wrap_non_picklable_objects +from joblib.externals import cloudpickle +from rich.console import Console + +from freqtrade.constants import FTHYPT_FILEVERSION, LAST_BT_RESULT_FN, Config +from freqtrade.enums import HyperoptState +from freqtrade.exceptions import OperationalException +from freqtrade.misc import file_dump_json, plural +from freqtrade.optimize.hyperopt.hyperopt_logger import logging_mp_handle, logging_mp_setup +from freqtrade.optimize.hyperopt.hyperopt_optimizer import HyperOptimizer +from freqtrade.optimize.hyperopt.hyperopt_output import HyperoptOutput +from freqtrade.optimize.hyperopt_tools import ( + HyperoptStateContainer, + HyperoptTools, + hyperopt_serializer, +) +from freqtrade.util import get_progress_tracker + + +logger = logging.getLogger(__name__) + + +INITIAL_POINTS = 30 + +# Keep no more than SKOPT_MODEL_QUEUE_SIZE models +# in the skopt model queue, to optimize memory consumption +SKOPT_MODEL_QUEUE_SIZE = 10 + +log_queue: Any + + +class Hyperopt: + """ + Hyperopt class, this class contains all the logic to run a hyperopt simulation + + To start a hyperopt run: + hyperopt = Hyperopt(config) + hyperopt.start() + """ + + def __init__(self, config: Config) -> None: + self._hyper_out: HyperoptOutput = HyperoptOutput(streaming=True) + + self.config = config + + self.analyze_per_epoch = self.config.get("analyze_per_epoch", False) + HyperoptStateContainer.set_state(HyperoptState.STARTUP) + + if self.config.get("hyperopt"): + raise OperationalException( + "Using separate Hyperopt files has been removed in 2021.9. Please convert " + "your existing Hyperopt file to the new Hyperoptable strategy interface" + ) + + time_now = datetime.now().strftime("%Y-%m-%d_%H-%M-%S") + strategy = str(self.config["strategy"]) + self.results_file: Path = ( + self.config["user_data_dir"] + / "hyperopt_results" + / f"strategy_{strategy}_{time_now}.fthypt" + ) + self.data_pickle_file = ( + self.config["user_data_dir"] / "hyperopt_results" / "hyperopt_tickerdata.pkl" + ) + self.total_epochs = config.get("epochs", 0) + + self.current_best_loss = 100 + + self.clean_hyperopt() + + self.num_epochs_saved = 0 + self.current_best_epoch: dict[str, Any] | None = None + + if HyperoptTools.has_space(self.config, "sell"): + # Make sure use_exit_signal is enabled + self.config["use_exit_signal"] = True + + self.print_all = self.config.get("print_all", False) + self.hyperopt_table_header = 0 + self.print_colorized = self.config.get("print_colorized", False) + self.print_json = self.config.get("print_json", False) + + self.hyperopter = HyperOptimizer(self.config) + + @staticmethod + def get_lock_filename(config: Config) -> str: + return str(config["user_data_dir"] / "hyperopt.lock") + + def clean_hyperopt(self) -> None: + """ + Remove hyperopt pickle files to restart hyperopt. + """ + for f in [self.data_pickle_file, self.results_file]: + p = Path(f) + if p.is_file(): + logger.info(f"Removing `{p}`.") + p.unlink() + + def hyperopt_pickle_magic(self, bases) -> None: + """ + Hyperopt magic to allow strategy inheritance across files. + For this to properly work, we need to register the module of the imported class + to pickle as value. + """ + for modules in bases: + if modules.__name__ != "IStrategy": + cloudpickle.register_pickle_by_value(sys.modules[modules.__module__]) + self.hyperopt_pickle_magic(modules.__bases__) + + def _save_result(self, epoch: dict) -> None: + """ + Save hyperopt results to file + Store one line per epoch. + While not a valid json object - this allows appending easily. + :param epoch: result dictionary for this epoch. + """ + epoch[FTHYPT_FILEVERSION] = 2 + with self.results_file.open("a") as f: + rapidjson.dump( + epoch, + f, + default=hyperopt_serializer, + number_mode=rapidjson.NM_NATIVE | rapidjson.NM_NAN, + ) + f.write("\n") + + self.num_epochs_saved += 1 + logger.debug( + f"{self.num_epochs_saved} {plural(self.num_epochs_saved, 'epoch')} " + f"saved to '{self.results_file}'." + ) + # Store hyperopt filename + latest_filename = Path.joinpath(self.results_file.parent, LAST_BT_RESULT_FN) + file_dump_json(latest_filename, {"latest_hyperopt": str(self.results_file.name)}, log=False) + + def print_results(self, results: dict[str, Any]) -> None: + """ + Log results if it is better than any previous evaluation + TODO: this should be moved to HyperoptTools too + """ + is_best = results["is_best"] + + if self.print_all or is_best: + self._hyper_out.add_data( + self.config, + [results], + self.total_epochs, + self.print_all, + ) + + def run_optimizer_parallel(self, parallel: Parallel, asked: list[list]) -> list[dict[str, Any]]: + """Start optimizer in a parallel way""" + + def optimizer_wrapper(*args, **kwargs): + # global log queue. This must happen in the file that initializes Parallel + logging_mp_setup( + log_queue, logging.INFO if self.config["verbosity"] < 1 else logging.DEBUG + ) + + return self.hyperopter.generate_optimizer(*args, **kwargs) + + return parallel(delayed(wrap_non_picklable_objects(optimizer_wrapper))(v) for v in asked) + + def _set_random_state(self, random_state: int | None) -> int: + return random_state or random.randint(1, 2**16 - 1) # noqa: S311 + + def get_asked_points(self, n_points: int) -> tuple[list[list[Any]], list[bool]]: + """ + Enforce points returned from `self.opt.ask` have not been already evaluated + + Steps: + 1. Try to get points using `self.opt.ask` first + 2. Discard the points that have already been evaluated + 3. Retry using `self.opt.ask` up to 3 times + 4. If still some points are missing in respect to `n_points`, random sample some points + 5. Repeat until at least `n_points` points in the `asked_non_tried` list + 6. Return a list with length truncated at `n_points` + """ + + def unique_list(a_list): + new_list = [] + for item in a_list: + if item not in new_list: + new_list.append(item) + return new_list + + i = 0 + asked_non_tried: list[list[Any]] = [] + is_random_non_tried: list[bool] = [] + while i < 5 and len(asked_non_tried) < n_points: + if i < 3: + self.opt.cache_ = {} + asked = unique_list(self.opt.ask(n_points=n_points * 5 if i > 0 else n_points)) + is_random = [False for _ in range(len(asked))] + else: + asked = unique_list(self.opt.space.rvs(n_samples=n_points * 5)) + is_random = [True for _ in range(len(asked))] + is_random_non_tried += [ + rand + for x, rand in zip(asked, is_random, strict=False) + if x not in self.opt.Xi and x not in asked_non_tried + ] + asked_non_tried += [ + x for x in asked if x not in self.opt.Xi and x not in asked_non_tried + ] + i += 1 + + if asked_non_tried: + return ( + asked_non_tried[: min(len(asked_non_tried), n_points)], + is_random_non_tried[: min(len(asked_non_tried), n_points)], + ) + else: + return self.opt.ask(n_points=n_points), [False for _ in range(n_points)] + + def evaluate_result(self, val: dict[str, Any], current: int, is_random: bool): + """ + Evaluate results returned from generate_optimizer + """ + val["current_epoch"] = current + val["is_initial_point"] = current <= INITIAL_POINTS + + logger.debug("Optimizer epoch evaluated: %s", val) + + is_best = HyperoptTools.is_best_loss(val, self.current_best_loss) + # This value is assigned here and not in the optimization method + # to keep proper order in the list of results. That's because + # evaluations can take different time. Here they are aligned in the + # order they will be shown to the user. + val["is_best"] = is_best + val["is_random"] = is_random + self.print_results(val) + + if is_best: + self.current_best_loss = val["loss"] + self.current_best_epoch = val + + self._save_result(val) + + def _setup_logging_mp_workaround(self) -> None: + """ + Workaround for logging in child processes. + local_queue must be a global in the file that initializes Parallel. + """ + global log_queue + m = Manager() + log_queue = m.Queue() + + def start(self) -> None: + self.random_state = self._set_random_state(self.config.get("hyperopt_random_state")) + logger.info(f"Using optimizer random state: {self.random_state}") + self.hyperopt_table_header = -1 + self.hyperopter.prepare_hyperopt() + + cpus = cpu_count() + logger.info(f"Found {cpus} CPU cores. Let's make them scream!") + config_jobs = self.config.get("hyperopt_jobs", -1) + logger.info(f"Number of parallel jobs set as: {config_jobs}") + + self.opt = self.hyperopter.get_optimizer( + config_jobs, self.random_state, INITIAL_POINTS, SKOPT_MODEL_QUEUE_SIZE + ) + self._setup_logging_mp_workaround() + try: + with Parallel(n_jobs=config_jobs) as parallel: + jobs = parallel._effective_n_jobs() + logger.info(f"Effective number of parallel workers used: {jobs}") + console = Console( + color_system="auto" if self.print_colorized else None, + ) + + # Define progressbar + with get_progress_tracker( + console=console, + cust_callables=[self._hyper_out], + ) as pbar: + task = pbar.add_task("Epochs", total=self.total_epochs) + + start = 0 + + if self.analyze_per_epoch: + # First analysis not in parallel mode when using --analyze-per-epoch. + # This allows dataprovider to load it's informative cache. + asked, is_random = self.get_asked_points(n_points=1) + f_val0 = self.hyperopter.generate_optimizer(asked[0]) + self.opt.tell(asked, [f_val0["loss"]]) + self.evaluate_result(f_val0, 1, is_random[0]) + pbar.update(task, advance=1) + start += 1 + + evals = ceil((self.total_epochs - start) / jobs) + for i in range(evals): + # Correct the number of epochs to be processed for the last + # iteration (should not exceed self.total_epochs in total) + n_rest = (i + 1) * jobs - (self.total_epochs - start) + current_jobs = jobs - n_rest if n_rest > 0 else jobs + + asked, is_random = self.get_asked_points(n_points=current_jobs) + f_val = self.run_optimizer_parallel(parallel, asked) + self.opt.tell(asked, [v["loss"] for v in f_val]) + + for j, val in enumerate(f_val): + # Use human-friendly indexes here (starting from 1) + current = i * jobs + j + 1 + start + + self.evaluate_result(val, current, is_random[j]) + pbar.update(task, advance=1) + logging_mp_handle(log_queue) + + except KeyboardInterrupt: + print("User interrupted..") + + logger.info( + f"{self.num_epochs_saved} {plural(self.num_epochs_saved, 'epoch')} " + f"saved to '{self.results_file}'." + ) + + if self.current_best_epoch: + HyperoptTools.try_export_params( + self.config, + self.hyperopter.get_strategy_name(), + self.current_best_epoch, + ) + + HyperoptTools.show_epoch_details( + self.current_best_epoch, self.total_epochs, self.print_json + ) + elif self.num_epochs_saved > 0: + print( + f"No good result found for given optimization function in {self.num_epochs_saved} " + f"{plural(self.num_epochs_saved, 'epoch')}." + ) + else: + # This is printed when Ctrl+C is pressed quickly, before first epochs have + # a chance to be evaluated. + print("No epochs evaluated yet, no best result.") diff --git a/freqtrade/optimize/hyperopt_auto.py b/freqtrade/optimize/hyperopt/hyperopt_auto.py similarity index 96% rename from freqtrade/optimize/hyperopt_auto.py rename to freqtrade/optimize/hyperopt/hyperopt_auto.py index 9d2f89dc7..1da80ec02 100644 --- a/freqtrade/optimize/hyperopt_auto.py +++ b/freqtrade/optimize/hyperopt/hyperopt_auto.py @@ -5,8 +5,8 @@ This module implements a convenience auto-hyperopt class, which can be used toge """ import logging +from collections.abc import Callable from contextlib import suppress -from typing import Callable from freqtrade.exceptions import OperationalException @@ -14,7 +14,7 @@ from freqtrade.exceptions import OperationalException with suppress(ImportError): from skopt.space import Dimension -from freqtrade.optimize.hyperopt_interface import EstimatorType, IHyperOpt +from freqtrade.optimize.hyperopt.hyperopt_interface import EstimatorType, IHyperOpt logger = logging.getLogger(__name__) diff --git a/freqtrade/optimize/hyperopt_interface.py b/freqtrade/optimize/hyperopt/hyperopt_interface.py similarity index 99% rename from freqtrade/optimize/hyperopt_interface.py rename to freqtrade/optimize/hyperopt/hyperopt_interface.py index 2c0983b52..6382d7f8d 100644 --- a/freqtrade/optimize/hyperopt_interface.py +++ b/freqtrade/optimize/hyperopt/hyperopt_interface.py @@ -6,7 +6,7 @@ This module defines the interface to apply for hyperopt import logging import math from abc import ABC -from typing import Union +from typing import TypeAlias from sklearn.base import RegressorMixin from skopt.space import Categorical, Dimension, Integer @@ -20,7 +20,7 @@ from freqtrade.strategy import IStrategy logger = logging.getLogger(__name__) -EstimatorType = Union[RegressorMixin, str] +EstimatorType: TypeAlias = RegressorMixin | str class IHyperOpt(ABC): diff --git a/freqtrade/optimize/hyperopt/hyperopt_logger.py b/freqtrade/optimize/hyperopt/hyperopt_logger.py new file mode 100644 index 000000000..d6940ee3a --- /dev/null +++ b/freqtrade/optimize/hyperopt/hyperopt_logger.py @@ -0,0 +1,40 @@ +import logging +from logging.handlers import QueueHandler +from multiprocessing import Queue, current_process +from queue import Empty + + +logger = logging.getLogger(__name__) + + +def logging_mp_setup(log_queue: Queue, verbosity: int): + """ + Setup logging in a child process. + Must be called in the child process before logging. + log_queue MUST be passed to the child process via inheritance + Which essentially means that the log_queue must be a global, created in the same + file as Parallel is initialized. + """ + current_proc = current_process().name + if current_proc != "MainProcess": + h = QueueHandler(log_queue) + root = logging.getLogger() + root.setLevel(verbosity) + root.addHandler(h) + + +def logging_mp_handle(q: Queue): + """ + Handle logging from a child process. + Must be called in the parent process to handle log messages from the child process. + """ + + try: + while True: + record = q.get(block=False) + if record is None: + break + logger.handle(record) + + except Empty: + pass diff --git a/freqtrade/optimize/hyperopt.py b/freqtrade/optimize/hyperopt/hyperopt_optimizer.py similarity index 58% rename from freqtrade/optimize/hyperopt.py rename to freqtrade/optimize/hyperopt/hyperopt_optimizer.py index daa4661ad..bd234aa57 100644 --- a/freqtrade/optimize/hyperopt.py +++ b/freqtrade/optimize/hyperopt/hyperopt_optimizer.py @@ -1,45 +1,33 @@ -# pragma pylint: disable=too-many-instance-attributes, pointless-string-statement - """ -This module contains the hyperopt logic +This module contains the hyperopt optimizer class, which needs to be pickled +and will be sent to the hyperopt worker processes. """ import logging -import random import sys import warnings from datetime import datetime, timezone -from math import ceil -from pathlib import Path -from typing import Any, Optional +from typing import Any -import rapidjson -from joblib import Parallel, cpu_count, delayed, dump, load, wrap_non_picklable_objects +from joblib import dump, load from joblib.externals import cloudpickle from pandas import DataFrame -from rich.console import Console -from freqtrade.constants import DATETIME_PRINT_FORMAT, FTHYPT_FILEVERSION, LAST_BT_RESULT_FN, Config +from freqtrade.constants import DATETIME_PRINT_FORMAT, Config from freqtrade.data.converter import trim_dataframes from freqtrade.data.history import get_timerange from freqtrade.data.metrics import calculate_market_change from freqtrade.enums import HyperoptState from freqtrade.exceptions import OperationalException -from freqtrade.misc import deep_merge_dicts, file_dump_json, plural +from freqtrade.misc import deep_merge_dicts from freqtrade.optimize.backtesting import Backtesting -# Import IHyperOpt and IHyperOptLoss to allow unpickling classes from these modules -from freqtrade.optimize.hyperopt_auto import HyperOptAuto -from freqtrade.optimize.hyperopt_loss_interface import IHyperOptLoss -from freqtrade.optimize.hyperopt_output import HyperoptOutput -from freqtrade.optimize.hyperopt_tools import ( - HyperoptStateContainer, - HyperoptTools, - hyperopt_serializer, -) +# Import IHyperOptLoss to allow unpickling classes from these modules +from freqtrade.optimize.hyperopt.hyperopt_auto import HyperOptAuto +from freqtrade.optimize.hyperopt_loss.hyperopt_loss_interface import IHyperOptLoss +from freqtrade.optimize.hyperopt_tools import HyperoptStateContainer, HyperoptTools from freqtrade.optimize.optimize_reports import generate_strategy_stats from freqtrade.resolvers.hyperopt_resolver import HyperOptLossResolver -from freqtrade.util import get_progress_tracker # Suppress scikit-learn FutureWarnings from skopt @@ -51,22 +39,13 @@ with warnings.catch_warnings(): logger = logging.getLogger(__name__) -INITIAL_POINTS = 30 - -# Keep no more than SKOPT_MODEL_QUEUE_SIZE models -# in the skopt model queue, to optimize memory consumption -SKOPT_MODEL_QUEUE_SIZE = 10 - MAX_LOSS = 100000 # just a big enough number to be bad result in loss optimization -class Hyperopt: +class HyperOptimizer: """ - Hyperopt class, this class contains all the logic to run a hyperopt simulation - - To start a hyperopt run: - hyperopt = Hyperopt(config) - hyperopt.start() + HyperoptOptimizer class + This class is sent to the hyperopt worker processes. """ def __init__(self, config: Config) -> None: @@ -79,8 +58,6 @@ class Hyperopt: self.max_open_trades_space: list[Dimension] = [] self.dimensions: list[Dimension] = [] - self._hyper_out: HyperoptOutput = HyperoptOutput(streaming=True) - self.config = config self.min_date: datetime self.max_date: datetime @@ -89,7 +66,6 @@ class Hyperopt: self.pairlist = self.backtesting.pairlists.whitelist self.custom_hyperopt: HyperOptAuto self.analyze_per_epoch = self.config.get("analyze_per_epoch", False) - HyperoptStateContainer.set_state(HyperoptState.STARTUP) if not self.config.get("hyperopt"): self.custom_hyperopt = HyperOptAuto(self.config) @@ -107,54 +83,35 @@ class Hyperopt: self.config ) self.calculate_loss = self.custom_hyperoptloss.hyperopt_loss_function - time_now = datetime.now().strftime("%Y-%m-%d_%H-%M-%S") - strategy = str(self.config["strategy"]) - self.results_file: Path = ( - self.config["user_data_dir"] - / "hyperopt_results" - / f"strategy_{strategy}_{time_now}.fthypt" - ) + self.data_pickle_file = ( self.config["user_data_dir"] / "hyperopt_results" / "hyperopt_tickerdata.pkl" ) - self.total_epochs = config.get("epochs", 0) - - self.current_best_loss = 100 - - self.clean_hyperopt() self.market_change = 0.0 - self.num_epochs_saved = 0 - self.current_best_epoch: Optional[dict[str, Any]] = None - - # Use max_open_trades for hyperopt as well, except --disable-max-market-positions is set - if not self.config.get("use_max_market_positions", True): - logger.debug("Ignoring max_open_trades (--disable-max-market-positions was used) ...") - self.backtesting.strategy.max_open_trades = float("inf") - config.update({"max_open_trades": self.backtesting.strategy.max_open_trades}) if HyperoptTools.has_space(self.config, "sell"): # Make sure use_exit_signal is enabled self.config["use_exit_signal"] = True - self.print_all = self.config.get("print_all", False) - self.hyperopt_table_header = 0 - self.print_colorized = self.config.get("print_colorized", False) - self.print_json = self.config.get("print_json", False) + def prepare_hyperopt(self) -> None: + # Initialize spaces ... + self.init_spaces() - @staticmethod - def get_lock_filename(config: Config) -> str: - return str(config["user_data_dir"] / "hyperopt.lock") + self.prepare_hyperopt_data() - def clean_hyperopt(self) -> None: - """ - Remove hyperopt pickle files to restart hyperopt. - """ - for f in [self.data_pickle_file, self.results_file]: - p = Path(f) - if p.is_file(): - logger.info(f"Removing `{p}`.") - p.unlink() + # We don't need exchange instance anymore while running hyperopt + self.backtesting.exchange.close() + self.backtesting.exchange._api = None + self.backtesting.exchange._api_async = None + self.backtesting.exchange.loop = None # type: ignore + self.backtesting.exchange._loop_lock = None # type: ignore + self.backtesting.exchange._cache_lock = None # type: ignore + # self.backtesting.exchange = None # type: ignore + self.backtesting.pairlists = None # type: ignore + + def get_strategy_name(self) -> str: + return self.backtesting.strategy.get_strategy_name() def hyperopt_pickle_magic(self, bases) -> None: """ @@ -177,33 +134,7 @@ class Hyperopt: # Return a dict where the keys are the names of the dimensions # and the values are taken from the list of parameters. - return {d.name: v for d, v in zip(dimensions, raw_params)} - - def _save_result(self, epoch: dict) -> None: - """ - Save hyperopt results to file - Store one line per epoch. - While not a valid json object - this allows appending easily. - :param epoch: result dictionary for this epoch. - """ - epoch[FTHYPT_FILEVERSION] = 2 - with self.results_file.open("a") as f: - rapidjson.dump( - epoch, - f, - default=hyperopt_serializer, - number_mode=rapidjson.NM_NATIVE | rapidjson.NM_NAN, - ) - f.write("\n") - - self.num_epochs_saved += 1 - logger.debug( - f"{self.num_epochs_saved} {plural(self.num_epochs_saved, 'epoch')} " - f"saved to '{self.results_file}'." - ) - # Store hyperopt filename - latest_filename = Path.joinpath(self.results_file.parent, LAST_BT_RESULT_FN) - file_dump_json(latest_filename, {"latest_hyperopt": str(self.results_file.name)}, log=False) + return {d.name: v for d, v in zip(dimensions, raw_params, strict=False)} def _get_params_details(self, params: dict) -> dict: """ @@ -257,21 +188,6 @@ class Hyperopt: result["max_open_trades"] = {"max_open_trades": strategy.max_open_trades} return result - def print_results(self, results: dict[str, Any]) -> None: - """ - Log results if it is better than any previous evaluation - TODO: this should be moved to HyperoptTools too - """ - is_best = results["is_best"] - - if self.print_all or is_best: - self._hyper_out.add_data( - self.config, - [results], - self.total_epochs, - self.print_all, - ) - def init_spaces(self): """ Assign the dimensions in the hyperoptimization space. @@ -458,7 +374,14 @@ class Hyperopt: "total_profit": total_profit, } - def get_optimizer(self, dimensions: list[Dimension], cpu_count) -> Optimizer: + def get_optimizer( + self, + cpu_count: int, + random_state: int, + initial_points: int, + model_queue_size: int, + ) -> Optimizer: + dimensions = self.dimensions estimator = self.custom_hyperopt.generate_estimator(dimensions=dimensions) acq_optimizer = "sampling" @@ -473,21 +396,12 @@ class Hyperopt: dimensions, base_estimator=estimator, acq_optimizer=acq_optimizer, - n_initial_points=INITIAL_POINTS, + n_initial_points=initial_points, acq_optimizer_kwargs={"n_jobs": cpu_count}, - random_state=self.random_state, - model_queue_size=SKOPT_MODEL_QUEUE_SIZE, + random_state=random_state, + model_queue_size=model_queue_size, ) - def run_optimizer_parallel(self, parallel: Parallel, asked: list[list]) -> list[dict[str, Any]]: - """Start optimizer in a parallel way""" - return parallel( - delayed(wrap_non_picklable_objects(self.generate_optimizer))(v) for v in asked - ) - - def _set_random_state(self, random_state: Optional[int]) -> int: - return random_state or random.randint(1, 2**16 - 1) # noqa: S311 - def advise_and_trim(self, data: dict[str, DataFrame]) -> dict[str, DataFrame]: preprocessed = self.backtesting.strategy.advise_all_indicators(data) @@ -523,173 +437,3 @@ class Hyperopt: dump(preprocessed, self.data_pickle_file) else: dump(data, self.data_pickle_file) - - def get_asked_points(self, n_points: int) -> tuple[list[list[Any]], list[bool]]: - """ - Enforce points returned from `self.opt.ask` have not been already evaluated - - Steps: - 1. Try to get points using `self.opt.ask` first - 2. Discard the points that have already been evaluated - 3. Retry using `self.opt.ask` up to 3 times - 4. If still some points are missing in respect to `n_points`, random sample some points - 5. Repeat until at least `n_points` points in the `asked_non_tried` list - 6. Return a list with length truncated at `n_points` - """ - - def unique_list(a_list): - new_list = [] - for item in a_list: - if item not in new_list: - new_list.append(item) - return new_list - - i = 0 - asked_non_tried: list[list[Any]] = [] - is_random_non_tried: list[bool] = [] - while i < 5 and len(asked_non_tried) < n_points: - if i < 3: - self.opt.cache_ = {} - asked = unique_list(self.opt.ask(n_points=n_points * 5 if i > 0 else n_points)) - is_random = [False for _ in range(len(asked))] - else: - asked = unique_list(self.opt.space.rvs(n_samples=n_points * 5)) - is_random = [True for _ in range(len(asked))] - is_random_non_tried += [ - rand - for x, rand in zip(asked, is_random) - if x not in self.opt.Xi and x not in asked_non_tried - ] - asked_non_tried += [ - x for x in asked if x not in self.opt.Xi and x not in asked_non_tried - ] - i += 1 - - if asked_non_tried: - return ( - asked_non_tried[: min(len(asked_non_tried), n_points)], - is_random_non_tried[: min(len(asked_non_tried), n_points)], - ) - else: - return self.opt.ask(n_points=n_points), [False for _ in range(n_points)] - - def evaluate_result(self, val: dict[str, Any], current: int, is_random: bool): - """ - Evaluate results returned from generate_optimizer - """ - val["current_epoch"] = current - val["is_initial_point"] = current <= INITIAL_POINTS - - logger.debug("Optimizer epoch evaluated: %s", val) - - is_best = HyperoptTools.is_best_loss(val, self.current_best_loss) - # This value is assigned here and not in the optimization method - # to keep proper order in the list of results. That's because - # evaluations can take different time. Here they are aligned in the - # order they will be shown to the user. - val["is_best"] = is_best - val["is_random"] = is_random - self.print_results(val) - - if is_best: - self.current_best_loss = val["loss"] - self.current_best_epoch = val - - self._save_result(val) - - def start(self) -> None: - self.random_state = self._set_random_state(self.config.get("hyperopt_random_state")) - logger.info(f"Using optimizer random state: {self.random_state}") - self.hyperopt_table_header = -1 - # Initialize spaces ... - self.init_spaces() - - self.prepare_hyperopt_data() - - # We don't need exchange instance anymore while running hyperopt - self.backtesting.exchange.close() - self.backtesting.exchange._api = None - self.backtesting.exchange._api_async = None - self.backtesting.exchange.loop = None # type: ignore - self.backtesting.exchange._loop_lock = None # type: ignore - self.backtesting.exchange._cache_lock = None # type: ignore - # self.backtesting.exchange = None # type: ignore - self.backtesting.pairlists = None # type: ignore - - cpus = cpu_count() - logger.info(f"Found {cpus} CPU cores. Let's make them scream!") - config_jobs = self.config.get("hyperopt_jobs", -1) - logger.info(f"Number of parallel jobs set as: {config_jobs}") - - self.opt = self.get_optimizer(self.dimensions, config_jobs) - - try: - with Parallel(n_jobs=config_jobs) as parallel: - jobs = parallel._effective_n_jobs() - logger.info(f"Effective number of parallel workers used: {jobs}") - console = Console( - color_system="auto" if self.print_colorized else None, - ) - - # Define progressbar - with get_progress_tracker( - console=console, - cust_callables=[self._hyper_out], - ) as pbar: - task = pbar.add_task("Epochs", total=self.total_epochs) - - start = 0 - - if self.analyze_per_epoch: - # First analysis not in parallel mode when using --analyze-per-epoch. - # This allows dataprovider to load it's informative cache. - asked, is_random = self.get_asked_points(n_points=1) - f_val0 = self.generate_optimizer(asked[0]) - self.opt.tell(asked, [f_val0["loss"]]) - self.evaluate_result(f_val0, 1, is_random[0]) - pbar.update(task, advance=1) - start += 1 - - evals = ceil((self.total_epochs - start) / jobs) - for i in range(evals): - # Correct the number of epochs to be processed for the last - # iteration (should not exceed self.total_epochs in total) - n_rest = (i + 1) * jobs - (self.total_epochs - start) - current_jobs = jobs - n_rest if n_rest > 0 else jobs - - asked, is_random = self.get_asked_points(n_points=current_jobs) - f_val = self.run_optimizer_parallel(parallel, asked) - self.opt.tell(asked, [v["loss"] for v in f_val]) - - for j, val in enumerate(f_val): - # Use human-friendly indexes here (starting from 1) - current = i * jobs + j + 1 + start - - self.evaluate_result(val, current, is_random[j]) - pbar.update(task, advance=1) - - except KeyboardInterrupt: - print("User interrupted..") - - logger.info( - f"{self.num_epochs_saved} {plural(self.num_epochs_saved, 'epoch')} " - f"saved to '{self.results_file}'." - ) - - if self.current_best_epoch: - HyperoptTools.try_export_params( - self.config, self.backtesting.strategy.get_strategy_name(), self.current_best_epoch - ) - - HyperoptTools.show_epoch_details( - self.current_best_epoch, self.total_epochs, self.print_json - ) - elif self.num_epochs_saved > 0: - print( - f"No good result found for given optimization function in {self.num_epochs_saved} " - f"{plural(self.num_epochs_saved, 'epoch')}." - ) - else: - # This is printed when Ctrl+C is pressed quickly, before first epochs have - # a chance to be evaluated. - print("No epochs evaluated yet, no best result.") diff --git a/freqtrade/optimize/hyperopt_output.py b/freqtrade/optimize/hyperopt/hyperopt_output.py similarity index 97% rename from freqtrade/optimize/hyperopt_output.py rename to freqtrade/optimize/hyperopt/hyperopt_output.py index c30715046..5327bffc1 100644 --- a/freqtrade/optimize/hyperopt_output.py +++ b/freqtrade/optimize/hyperopt/hyperopt_output.py @@ -1,6 +1,6 @@ import sys from os import get_terminal_size -from typing import Any, Optional +from typing import Any from rich.align import Align from rich.console import Console @@ -37,7 +37,7 @@ class HyperoptOutput: self.table.add_column("Objective", justify="right") self.table.add_column("Max Drawdown (Acct)", justify="right") - def print(self, console: Optional[Console] = None, *, print_colorized=True): + def print(self, console: Console | None = None, *, print_colorized=True): if not console: console = Console( color_system="auto" if print_colorized else None, @@ -57,7 +57,7 @@ class HyperoptOutput: stake_currency = config["stake_currency"] self._results.extend(results) - max_rows: Optional[int] = None + max_rows: int | None = None if self._streaming: try: diff --git a/freqtrade/optimize/hyperopt_loss_interface.py b/freqtrade/optimize/hyperopt_loss/hyperopt_loss_interface.py similarity index 100% rename from freqtrade/optimize/hyperopt_loss_interface.py rename to freqtrade/optimize/hyperopt_loss/hyperopt_loss_interface.py diff --git a/freqtrade/optimize/hyperopt_tools.py b/freqtrade/optimize/hyperopt_tools.py index 66e194510..964afc2ab 100644 --- a/freqtrade/optimize/hyperopt_tools.py +++ b/freqtrade/optimize/hyperopt_tools.py @@ -3,7 +3,7 @@ from collections.abc import Iterator from copy import deepcopy from datetime import datetime, timezone from pathlib import Path -from typing import Any, Optional +from typing import Any import numpy as np import rapidjson @@ -44,7 +44,7 @@ class HyperoptStateContainer: class HyperoptTools: @staticmethod - def get_strategy_filename(config: Config, strategy_name: str) -> Optional[Path]: + def get_strategy_filename(config: Config, strategy_name: str) -> Path | None: """ Get Strategy-location (filename) from strategy_name """ @@ -188,7 +188,7 @@ class HyperoptTools: total_epochs: int, print_json: bool, no_header: bool = False, - header_str: Optional[str] = None, + header_str: str | None = None, ) -> None: """ Display details of the hyperopt result @@ -257,7 +257,7 @@ class HyperoptTools: @staticmethod def _params_pretty_print( - params, space: str, header: str, non_optimized: Optional[dict] = None + params, space: str, header: str, non_optimized: dict | None = None ) -> None: if space in params or (non_optimized and space in non_optimized): space_params = HyperoptTools._space_params(params, space, 5) @@ -299,7 +299,7 @@ class HyperoptTools: print(result) @staticmethod - def _space_params(params, space: str, r: Optional[int] = None) -> dict: + def _space_params(params, space: str, r: int | None = None) -> dict: d = params.get(space) if d: # Round floats to `r` digits after the decimal point if requested diff --git a/freqtrade/optimize/optimize_reports/bt_output.py b/freqtrade/optimize/optimize_reports/bt_output.py index a1dd73358..4fdc03d7b 100644 --- a/freqtrade/optimize/optimize_reports/bt_output.py +++ b/freqtrade/optimize/optimize_reports/bt_output.py @@ -1,5 +1,5 @@ import logging -from typing import Any, Literal, Union +from typing import Any, Literal from freqtrade.constants import UNLIMITED_STAKE_AMOUNT, Config from freqtrade.ft_types import BacktestResultType @@ -18,7 +18,7 @@ def _get_line_floatfmt(stake_currency: str) -> list[str]: def _get_line_header( - first_column: Union[str, list[str]], stake_currency: str, direction: str = "Trades" + first_column: str | list[str], stake_currency: str, direction: str = "Trades" ) -> list[str]: """ Generate header lines (goes in line with _generate_result_line()) @@ -172,7 +172,7 @@ def text_table_strategy(strategy_results, stake_currency: str, title: str): dd_pad_per = max([len(dd) for dd in drawdown]) drawdown = [ f'{t["max_drawdown_abs"]:>{dd_pad_abs}} {stake_currency} {dd:>{dd_pad_per}}%' - for t, dd in zip(strategy_results, drawdown) + for t, dd in zip(strategy_results, drawdown, strict=False) ] output = [ @@ -186,7 +186,7 @@ def text_table_strategy(strategy_results, stake_currency: str, title: str): generate_wins_draws_losses(t["wins"], t["draws"], t["losses"]), drawdown, ] - for t, drawdown in zip(strategy_results, drawdown) + for t, drawdown in zip(strategy_results, drawdown, strict=False) ] print_rich_table(output, headers, summary=title) diff --git a/freqtrade/optimize/optimize_reports/bt_storage.py b/freqtrade/optimize/optimize_reports/bt_storage.py index 9633d9c18..21532d4d2 100644 --- a/freqtrade/optimize/optimize_reports/bt_storage.py +++ b/freqtrade/optimize/optimize_reports/bt_storage.py @@ -1,6 +1,5 @@ import logging from pathlib import Path -from typing import Optional from pandas import DataFrame @@ -35,7 +34,7 @@ def store_backtest_stats( stats: BacktestResultType, dtappendix: str, *, - market_change_data: Optional[DataFrame] = None, + market_change_data: DataFrame | None = None, ) -> Path: """ Stores backtest results diff --git a/freqtrade/optimize/optimize_reports/optimize_reports.py b/freqtrade/optimize/optimize_reports/optimize_reports.py index 9650bdde6..8f1f0140a 100644 --- a/freqtrade/optimize/optimize_reports/optimize_reports.py +++ b/freqtrade/optimize/optimize_reports/optimize_reports.py @@ -1,7 +1,7 @@ import logging from copy import deepcopy from datetime import datetime, timedelta, timezone -from typing import Any, Literal, Union +from typing import Any, Literal import numpy as np from pandas import DataFrame, Series, concat, to_datetime @@ -69,7 +69,7 @@ def generate_rejected_signals( def _generate_result_line( - result: DataFrame, starting_balance: int, first_column: Union[str, list[str]] + result: DataFrame, starting_balance: int, first_column: str | list[str] ) -> dict: """ Generate one result dict, with "first_column" as key. @@ -143,7 +143,7 @@ def generate_pair_metrics( def generate_tag_metrics( - tag_type: Union[Literal["enter_tag", "exit_reason"], list[Literal["enter_tag", "exit_reason"]]], + tag_type: Literal["enter_tag", "exit_reason"] | list[Literal["enter_tag", "exit_reason"]], starting_balance: int, results: DataFrame, skip_nan: bool = False, @@ -208,7 +208,7 @@ def _get_resample_from_period(period: str) -> str: def generate_periodic_breakdown_stats( - trade_list: Union[list, DataFrame], period: str + trade_list: list | DataFrame, period: str ) -> list[dict[str, Any]]: results = trade_list if not isinstance(trade_list, list) else DataFrame.from_records(trade_list) if len(results) == 0: @@ -559,7 +559,7 @@ def generate_strategy_stats( def generate_backtest_stats( btdata: dict[str, DataFrame], - all_results: dict[str, dict[str, Union[DataFrame, dict]]], + all_results: dict[str, dict[str, DataFrame | dict]], min_date: datetime, max_date: datetime, ) -> BacktestResultType: diff --git a/freqtrade/persistence/custom_data.py b/freqtrade/persistence/custom_data.py index 3a2e700fb..17c0cbf0a 100644 --- a/freqtrade/persistence/custom_data.py +++ b/freqtrade/persistence/custom_data.py @@ -2,7 +2,7 @@ import json import logging from collections.abc import Sequence from datetime import datetime -from typing import Any, ClassVar, Optional +from typing import Any, ClassVar from sqlalchemy import DateTime, ForeignKey, Integer, String, Text, UniqueConstraint, select from sqlalchemy.orm import Mapped, mapped_column, relationship @@ -42,7 +42,7 @@ class _CustomData(ModelBase): cd_type: Mapped[str] = mapped_column(String(25), nullable=False) cd_value: Mapped[str] = mapped_column(Text, nullable=False) created_at: Mapped[datetime] = mapped_column(DateTime, nullable=False, default=dt_now) - updated_at: Mapped[Optional[datetime]] = mapped_column(DateTime, nullable=True) + updated_at: Mapped[datetime | None] = mapped_column(DateTime, nullable=True) # Empty container value - not persisted, but filled with cd_value on query value: Any = None @@ -62,7 +62,7 @@ class _CustomData(ModelBase): @classmethod def query_cd( - cls, key: Optional[str] = None, trade_id: Optional[int] = None + cls, key: str | None = None, trade_id: int | None = None ) -> Sequence["_CustomData"]: """ Get all CustomData, if trade_id is not specified @@ -117,7 +117,7 @@ class CustomDataWrapper: _CustomData.session.commit() @staticmethod - def get_custom_data(*, trade_id: int, key: Optional[str] = None) -> list[_CustomData]: + def get_custom_data(*, trade_id: int, key: str | None = None) -> list[_CustomData]: if CustomDataWrapper.use_db: filters = [ _CustomData.ft_trade_id == trade_id, diff --git a/freqtrade/persistence/key_value_store.py b/freqtrade/persistence/key_value_store.py index 93960a102..e7b782ac4 100644 --- a/freqtrade/persistence/key_value_store.py +++ b/freqtrade/persistence/key_value_store.py @@ -1,6 +1,6 @@ from datetime import datetime, timezone from enum import Enum -from typing import ClassVar, Optional, Union +from typing import ClassVar from sqlalchemy import String from sqlalchemy.orm import Mapped, mapped_column @@ -8,7 +8,7 @@ from sqlalchemy.orm import Mapped, mapped_column from freqtrade.persistence.base import ModelBase, SessionType -ValueTypes = Union[str, datetime, float, int] +ValueTypes = str | datetime | float | int class ValueTypesEnum(str, Enum): @@ -37,10 +37,10 @@ class _KeyValueStoreModel(ModelBase): value_type: Mapped[ValueTypesEnum] = mapped_column(String(20), nullable=False) - string_value: Mapped[Optional[str]] = mapped_column(String(255), nullable=True) - datetime_value: Mapped[Optional[datetime]] - float_value: Mapped[Optional[float]] - int_value: Mapped[Optional[int]] + string_value: Mapped[str | None] = mapped_column(String(255), nullable=True) + datetime_value: Mapped[datetime | None] + float_value: Mapped[float | None] + int_value: Mapped[int | None] class KeyValueStore: @@ -97,7 +97,7 @@ class KeyValueStore: _KeyValueStoreModel.session.commit() @staticmethod - def get_value(key: KeyStoreKeys) -> Optional[ValueTypes]: + def get_value(key: KeyStoreKeys) -> ValueTypes | None: """ Get the value for the given key. :param key: Key to get the value for @@ -121,7 +121,7 @@ class KeyValueStore: raise ValueError(f"Unknown value type {kv.value_type}") # pragma: no cover @staticmethod - def get_string_value(key: KeyStoreKeys) -> Optional[str]: + def get_string_value(key: KeyStoreKeys) -> str | None: """ Get the value for the given key. :param key: Key to get the value for @@ -139,7 +139,7 @@ class KeyValueStore: return kv.string_value @staticmethod - def get_datetime_value(key: KeyStoreKeys) -> Optional[datetime]: + def get_datetime_value(key: KeyStoreKeys) -> datetime | None: """ Get the value for the given key. :param key: Key to get the value for @@ -157,7 +157,7 @@ class KeyValueStore: return kv.datetime_value.replace(tzinfo=timezone.utc) @staticmethod - def get_float_value(key: KeyStoreKeys) -> Optional[float]: + def get_float_value(key: KeyStoreKeys) -> float | None: """ Get the value for the given key. :param key: Key to get the value for @@ -175,7 +175,7 @@ class KeyValueStore: return kv.float_value @staticmethod - def get_int_value(key: KeyStoreKeys) -> Optional[int]: + def get_int_value(key: KeyStoreKeys) -> int | None: """ Get the value for the given key. :param key: Key to get the value for diff --git a/freqtrade/persistence/migrations.py b/freqtrade/persistence/migrations.py index 1dd69493f..7a88c61c0 100644 --- a/freqtrade/persistence/migrations.py +++ b/freqtrade/persistence/migrations.py @@ -1,5 +1,4 @@ import logging -from typing import Optional from sqlalchemy import inspect, select, text, update @@ -32,8 +31,8 @@ def get_backup_name(tabs: list[str], backup_prefix: str): def get_last_sequence_ids(engine, trade_back_name: str, order_back_name: str): - order_id: Optional[int] = None - trade_id: Optional[int] = None + order_id: int | None = None + trade_id: int | None = None if engine.name == "postgresql": with engine.begin() as connection: diff --git a/freqtrade/persistence/models.py b/freqtrade/persistence/models.py index 87ba3a2d2..bfcf83457 100644 --- a/freqtrade/persistence/models.py +++ b/freqtrade/persistence/models.py @@ -5,7 +5,7 @@ This module contains the class to persist trades into SQLite import logging import threading from contextvars import ContextVar -from typing import Any, Final, Optional +from typing import Any, Final from sqlalchemy import create_engine, inspect from sqlalchemy.exc import NoSuchModuleError @@ -25,10 +25,10 @@ logger = logging.getLogger(__name__) REQUEST_ID_CTX_KEY: Final[str] = "request_id" -_request_id_ctx_var: ContextVar[Optional[str]] = ContextVar(REQUEST_ID_CTX_KEY, default=None) +_request_id_ctx_var: ContextVar[str | None] = ContextVar(REQUEST_ID_CTX_KEY, default=None) -def get_request_or_thread_id() -> Optional[str]: +def get_request_or_thread_id() -> str | None: """ Helper method to get either async context (for fastapi requests), or thread id """ diff --git a/freqtrade/persistence/pairlock.py b/freqtrade/persistence/pairlock.py index caec2c78a..01549fb63 100644 --- a/freqtrade/persistence/pairlock.py +++ b/freqtrade/persistence/pairlock.py @@ -1,5 +1,5 @@ from datetime import datetime, timezone -from typing import Any, ClassVar, Optional +from typing import Any, ClassVar from sqlalchemy import ScalarResult, String, or_, select from sqlalchemy.orm import Mapped, mapped_column @@ -21,7 +21,7 @@ class PairLock(ModelBase): pair: Mapped[str] = mapped_column(String(25), nullable=False, index=True) # lock direction - long, short or * (for both) side: Mapped[str] = mapped_column(String(25), nullable=False, default="*") - reason: Mapped[Optional[str]] = mapped_column(String(255), nullable=True) + reason: Mapped[str | None] = mapped_column(String(255), nullable=True) # Time the pair was locked (start time) lock_time: Mapped[datetime] = mapped_column(nullable=False) # Time until the pair is locked (end time) @@ -39,7 +39,7 @@ class PairLock(ModelBase): @staticmethod def query_pair_locks( - pair: Optional[str], now: datetime, side: str = "*" + pair: str | None, now: datetime, side: str = "*" ) -> ScalarResult["PairLock"]: """ Get all currently active locks for this pair diff --git a/freqtrade/persistence/pairlock_middleware.py b/freqtrade/persistence/pairlock_middleware.py index a30592421..c182cf534 100644 --- a/freqtrade/persistence/pairlock_middleware.py +++ b/freqtrade/persistence/pairlock_middleware.py @@ -1,7 +1,6 @@ import logging from collections.abc import Sequence from datetime import datetime, timezone -from typing import Optional from sqlalchemy import select @@ -36,9 +35,9 @@ class PairLocks: def lock_pair( pair: str, until: datetime, - reason: Optional[str] = None, + reason: str | None = None, *, - now: Optional[datetime] = None, + now: datetime | None = None, side: str = "*", ) -> PairLock: """ @@ -68,7 +67,7 @@ class PairLocks: @staticmethod def get_pair_locks( - pair: Optional[str], now: Optional[datetime] = None, side: str = "*" + pair: str | None, now: datetime | None = None, side: str = "*" ) -> Sequence[PairLock]: """ Get all currently active locks for this pair @@ -96,8 +95,8 @@ class PairLocks: @staticmethod def get_pair_longest_lock( - pair: str, now: Optional[datetime] = None, side: str = "*" - ) -> Optional[PairLock]: + pair: str, now: datetime | None = None, side: str = "*" + ) -> PairLock | None: """ Get the lock that expires the latest for the pair given. """ @@ -106,7 +105,7 @@ class PairLocks: return locks[0] if locks else None @staticmethod - def unlock_pair(pair: str, now: Optional[datetime] = None, side: str = "*") -> None: + def unlock_pair(pair: str, now: datetime | None = None, side: str = "*") -> None: """ Release all locks for this pair. :param pair: Pair to unlock @@ -124,7 +123,7 @@ class PairLocks: PairLock.session.commit() @staticmethod - def unlock_reason(reason: str, now: Optional[datetime] = None) -> None: + def unlock_reason(reason: str, now: datetime | None = None) -> None: """ Release all locks for this reason. :param reason: Which reason to unlock @@ -155,7 +154,7 @@ class PairLocks: lock.active = False @staticmethod - def is_global_lock(now: Optional[datetime] = None, side: str = "*") -> bool: + def is_global_lock(now: datetime | None = None, side: str = "*") -> bool: """ :param now: Datetime object (generated via datetime.now(timezone.utc)). defaults to datetime.now(timezone.utc) @@ -166,7 +165,7 @@ class PairLocks: return len(PairLocks.get_pair_locks("*", now, side)) > 0 @staticmethod - def is_pair_locked(pair: str, now: Optional[datetime] = None, side: str = "*") -> bool: + def is_pair_locked(pair: str, now: datetime | None = None, side: str = "*") -> bool: """ :param pair: Pair to check for :param now: Datetime object (generated via datetime.now(timezone.utc)). diff --git a/freqtrade/persistence/trade_model.py b/freqtrade/persistence/trade_model.py index f765b9865..e4979b438 100644 --- a/freqtrade/persistence/trade_model.py +++ b/freqtrade/persistence/trade_model.py @@ -43,6 +43,7 @@ from freqtrade.exchange import ( amount_to_contract_precision, price_to_precision, ) +from freqtrade.exchange.exchange_types import CcxtOrder from freqtrade.leverage import interest from freqtrade.misc import safe_value_fallback from freqtrade.persistence.base import ModelBase, SessionType @@ -96,26 +97,24 @@ class Order(ModelBase): ft_cancel_reason: Mapped[str] = mapped_column(String(CUSTOM_TAG_MAX_LENGTH), nullable=True) order_id: Mapped[str] = mapped_column(String(255), nullable=False, index=True) - status: Mapped[Optional[str]] = mapped_column(String(255), nullable=True) - symbol: Mapped[Optional[str]] = mapped_column(String(25), nullable=True) - order_type: Mapped[Optional[str]] = mapped_column(String(50), nullable=True) + status: Mapped[str | None] = mapped_column(String(255), nullable=True) + symbol: Mapped[str | None] = mapped_column(String(25), nullable=True) + order_type: Mapped[str | None] = mapped_column(String(50), nullable=True) side: Mapped[str] = mapped_column(String(25), nullable=True) - price: Mapped[Optional[float]] = mapped_column(Float(), nullable=True) - average: Mapped[Optional[float]] = mapped_column(Float(), nullable=True) - amount: Mapped[Optional[float]] = mapped_column(Float(), nullable=True) - filled: Mapped[Optional[float]] = mapped_column(Float(), nullable=True) - remaining: Mapped[Optional[float]] = mapped_column(Float(), nullable=True) - cost: Mapped[Optional[float]] = mapped_column(Float(), nullable=True) - stop_price: Mapped[Optional[float]] = mapped_column(Float(), nullable=True) + price: Mapped[float | None] = mapped_column(Float(), nullable=True) + average: Mapped[float | None] = mapped_column(Float(), nullable=True) + amount: Mapped[float | None] = mapped_column(Float(), nullable=True) + filled: Mapped[float | None] = mapped_column(Float(), nullable=True) + remaining: Mapped[float | None] = mapped_column(Float(), nullable=True) + cost: Mapped[float | None] = mapped_column(Float(), nullable=True) + stop_price: Mapped[float | None] = mapped_column(Float(), nullable=True) order_date: Mapped[datetime] = mapped_column(nullable=True, default=dt_now) - order_filled_date: Mapped[Optional[datetime]] = mapped_column(nullable=True) - order_update_date: Mapped[Optional[datetime]] = mapped_column(nullable=True) - funding_fee: Mapped[Optional[float]] = mapped_column(Float(), nullable=True) + order_filled_date: Mapped[datetime | None] = mapped_column(nullable=True) + order_update_date: Mapped[datetime | None] = mapped_column(nullable=True) + funding_fee: Mapped[float | None] = mapped_column(Float(), nullable=True) - ft_fee_base: Mapped[Optional[float]] = mapped_column(Float(), nullable=True) - ft_order_tag: Mapped[Optional[str]] = mapped_column( - String(CUSTOM_TAG_MAX_LENGTH), nullable=True - ) + ft_fee_base: Mapped[float | None] = mapped_column(Float(), nullable=True) + ft_order_tag: Mapped[str | None] = mapped_column(String(CUSTOM_TAG_MAX_LENGTH), nullable=True) @property def order_date_utc(self) -> datetime: @@ -123,7 +122,7 @@ class Order(ModelBase): return self.order_date.replace(tzinfo=timezone.utc) @property - def order_filled_utc(self) -> Optional[datetime]: + def order_filled_utc(self) -> datetime | None: """last order-date with UTC timezoneinfo""" return ( self.order_filled_date.replace(tzinfo=timezone.utc) if self.order_filled_date else None @@ -175,6 +174,11 @@ class Order(ModelBase): """Amount in stake currency used for this order""" return self.safe_amount * self.safe_price / self.trade.leverage + @property + def stake_amount_filled(self) -> float: + """Filled Amount in stake currency used for this order""" + return self.safe_filled * self.safe_price / self.trade.leverage + def __repr__(self): return ( f"Order(id={self.id}, trade={self.ft_trade_id}, order_id={self.order_id}, " @@ -309,7 +313,7 @@ class Order(ModelBase): trade.adjust_stop_loss(trade.open_rate, trade.stop_loss_pct) @staticmethod - def update_orders(orders: list["Order"], order: dict[str, Any]): + def update_orders(orders: list["Order"], order: CcxtOrder): """ Get all non-closed orders - useful when trying to batch-update orders """ @@ -328,11 +332,11 @@ class Order(ModelBase): @classmethod def parse_from_ccxt_object( cls, - order: dict[str, Any], + order: CcxtOrder, pair: str, side: str, - amount: Optional[float] = None, - price: Optional[float] = None, + amount: float | None = None, + price: float | None = None, ) -> Self: """ Parse an order from a ccxt object and return a new order Object. @@ -389,57 +393,57 @@ class LocalTrade: exchange: str = "" pair: str = "" - base_currency: Optional[str] = "" - stake_currency: Optional[str] = "" + base_currency: str | None = "" + stake_currency: str | None = "" is_open: bool = True fee_open: float = 0.0 - fee_open_cost: Optional[float] = None - fee_open_currency: Optional[str] = "" - fee_close: Optional[float] = 0.0 - fee_close_cost: Optional[float] = None - fee_close_currency: Optional[str] = "" + fee_open_cost: float | None = None + fee_open_currency: str | None = "" + fee_close: float | None = 0.0 + fee_close_cost: float | None = None + fee_close_currency: str | None = "" open_rate: float = 0.0 - open_rate_requested: Optional[float] = None + open_rate_requested: float | None = None # open_trade_value - calculated via _calc_open_trade_value open_trade_value: float = 0.0 - close_rate: Optional[float] = None - close_rate_requested: Optional[float] = None - close_profit: Optional[float] = None - close_profit_abs: Optional[float] = None + close_rate: float | None = None + close_rate_requested: float | None = None + close_profit: float | None = None + close_profit_abs: float | None = None stake_amount: float = 0.0 - max_stake_amount: Optional[float] = 0.0 + max_stake_amount: float | None = 0.0 amount: float = 0.0 - amount_requested: Optional[float] = None + amount_requested: float | None = None open_date: datetime - close_date: Optional[datetime] = None + close_date: datetime | None = None # absolute value of the stop loss stop_loss: float = 0.0 # percentage value of the stop loss - stop_loss_pct: Optional[float] = 0.0 + stop_loss_pct: float | None = 0.0 # absolute value of the initial stop loss - initial_stop_loss: Optional[float] = 0.0 + initial_stop_loss: float | None = 0.0 # percentage value of the initial stop loss - initial_stop_loss_pct: Optional[float] = None + initial_stop_loss_pct: float | None = None is_stop_loss_trailing: bool = False # absolute value of the highest reached price - max_rate: Optional[float] = None + max_rate: float | None = None # Lowest price reached - min_rate: Optional[float] = None - exit_reason: Optional[str] = "" - exit_order_status: Optional[str] = "" - strategy: Optional[str] = "" - enter_tag: Optional[str] = None - timeframe: Optional[int] = None + min_rate: float | None = None + exit_reason: str | None = "" + exit_order_status: str | None = "" + strategy: str | None = "" + enter_tag: str | None = None + timeframe: int | None = None trading_mode: TradingMode = TradingMode.SPOT - amount_precision: Optional[float] = None - price_precision: Optional[float] = None - precision_mode: Optional[int] = None - precision_mode_price: Optional[int] = None - contract_size: Optional[float] = None + amount_precision: float | None = None + price_precision: float | None = None + precision_mode: int | None = None + precision_mode_price: int | None = None + contract_size: float | None = None # Leverage trading properties - liquidation_price: Optional[float] = None + liquidation_price: float | None = None is_short: bool = False leverage: float = 1.0 @@ -447,10 +451,10 @@ class LocalTrade: interest_rate: float = 0.0 # Futures properties - funding_fees: Optional[float] = None + funding_fees: float | None = None # Used to keep running funding fees - between the last filled order and now # Shall not be used for calculations! - funding_fee_running: Optional[float] = None + funding_fee_running: float | None = None @property def stoploss_or_liquidation(self) -> float: @@ -463,7 +467,7 @@ class LocalTrade: return self.stop_loss @property - def buy_tag(self) -> Optional[str]: + def buy_tag(self) -> str | None: """ Compatibility between buy_tag (old) and enter_tag (new) Consider buy_tag deprecated @@ -490,7 +494,7 @@ class LocalTrade: return self.amount @property - def _date_last_filled_utc(self) -> Optional[datetime]: + def _date_last_filled_utc(self) -> datetime | None: """Date of the last filled order""" orders = self.select_filled_orders() if orders: @@ -506,7 +510,7 @@ class LocalTrade: return max([self.open_date_utc, dt_last_filled]) @property - def date_entry_fill_utc(self) -> Optional[datetime]: + def date_entry_fill_utc(self) -> datetime | None: """Date of the first filled order""" orders = self.select_filled_orders(self.entry_side) if orders and len( @@ -758,7 +762,7 @@ class LocalTrade: self.max_rate = max(current_price, self.max_rate or self.open_rate) self.min_rate = min(current_price_low, self.min_rate or self.open_rate) - def set_liquidation_price(self, liquidation_price: Optional[float]): + def set_liquidation_price(self, liquidation_price: float | None): """ Method you should use to set self.liquidation price. Assures stop_loss is not passed the liquidation price @@ -790,7 +794,7 @@ class LocalTrade: def adjust_stop_loss( self, current_price: float, - stoploss: Optional[float], + stoploss: float | None, initial: bool = False, allow_refresh: bool = False, ) -> None: @@ -930,7 +934,7 @@ class LocalTrade: ) def update_fee( - self, fee_cost: float, fee_currency: Optional[str], fee_rate: Optional[float], side: str + self, fee_cost: float, fee_currency: str | None, fee_rate: float | None, side: str ) -> None: """ Update Fee parameters. Only acts once per side @@ -959,7 +963,7 @@ class LocalTrade: else: return False - def update_order(self, order: dict) -> None: + def update_order(self, order: CcxtOrder) -> None: Order.update_orders(self.orders, order) @property @@ -1038,7 +1042,7 @@ class LocalTrade: return interest(exchange_name=self.exchange, borrowed=borrowed, rate=rate, hours=hours) - def _calc_base_close(self, amount: FtPrecise, rate: float, fee: Optional[float]) -> FtPrecise: + def _calc_base_close(self, amount: FtPrecise, rate: float, fee: float | None) -> FtPrecise: close_trade = amount * FtPrecise(rate) fees = close_trade * FtPrecise(fee or 0.0) @@ -1047,7 +1051,7 @@ class LocalTrade: else: return close_trade - fees - def calc_close_trade_value(self, rate: float, amount: Optional[float] = None) -> float: + def calc_close_trade_value(self, rate: float, amount: float | None = None) -> float: """ Calculate the Trade's close value including fees :param rate: rate to compare with. @@ -1086,7 +1090,7 @@ class LocalTrade: ) def calc_profit( - self, rate: float, amount: Optional[float] = None, open_rate: Optional[float] = None + self, rate: float, amount: float | None = None, open_rate: float | None = None ) -> float: """ Calculate the absolute profit in stake currency between Close and Open trade @@ -1100,7 +1104,7 @@ class LocalTrade: return prof.profit_abs def calculate_profit( - self, rate: float, amount: Optional[float] = None, open_rate: Optional[float] = None + self, rate: float, amount: float | None = None, open_rate: float | None = None ) -> ProfitStruct: """ Calculate profit metrics (absolute, ratio, total, total ratio). @@ -1148,7 +1152,7 @@ class LocalTrade: ) def calc_profit_ratio( - self, rate: float, amount: Optional[float] = None, open_rate: Optional[float] = None + self, rate: float, amount: float | None = None, open_rate: float | None = None ) -> float: """ Calculates the profit as ratio (including fee). @@ -1248,7 +1252,7 @@ class LocalTrade: self.close_profit = (close_profit_abs / total_stake) * self.leverage self.close_profit_abs = close_profit_abs - def select_order_by_order_id(self, order_id: str) -> Optional[Order]: + def select_order_by_order_id(self, order_id: str) -> Order | None: """ Finds order object by Order id. :param order_id: Exchange order id @@ -1260,10 +1264,10 @@ class LocalTrade: def select_order( self, - order_side: Optional[str] = None, - is_open: Optional[bool] = None, + order_side: str | None = None, + is_open: bool | None = None, only_filled: bool = False, - ) -> Optional[Order]: + ) -> Order | None: """ Finds latest order for this orderside and status :param order_side: ft_order_side of the order (either 'buy', 'sell' or 'stoploss') @@ -1283,7 +1287,7 @@ class LocalTrade: else: return None - def select_filled_orders(self, order_side: Optional[str] = None) -> list["Order"]: + def select_filled_orders(self, order_side: str | None = None) -> list["Order"]: """ Finds filled orders for this order side. Will not return open orders which already partially filled. @@ -1334,7 +1338,7 @@ class LocalTrade: return data[0].value return default - def get_custom_data_entry(self, key: str) -> Optional[_CustomData]: + def get_custom_data_entry(self, key: str) -> _CustomData | None: """ Get custom data for this trade :param key: key of the custom data @@ -1387,7 +1391,7 @@ class LocalTrade: return len(self.select_filled_orders("sell")) @property - def sell_reason(self) -> Optional[str]: + def sell_reason(self) -> str | None: """DEPRECATED! Please use exit_reason instead.""" return self.exit_reason @@ -1398,10 +1402,10 @@ class LocalTrade: @staticmethod def get_trades_proxy( *, - pair: Optional[str] = None, - is_open: Optional[bool] = None, - open_date: Optional[datetime] = None, - close_date: Optional[datetime] = None, + pair: str | None = None, + is_open: bool | None = None, + open_date: datetime | None = None, + close_date: datetime | None = None, ) -> list["LocalTrade"]: """ Helper function to query Trades. @@ -1630,92 +1634,92 @@ class Trade(ModelBase, LocalTrade): exchange: Mapped[str] = mapped_column(String(25), nullable=False) # type: ignore pair: Mapped[str] = mapped_column(String(25), nullable=False, index=True) # type: ignore - base_currency: Mapped[Optional[str]] = mapped_column(String(25), nullable=True) # type: ignore - stake_currency: Mapped[Optional[str]] = mapped_column(String(25), nullable=True) # type: ignore + base_currency: Mapped[str | None] = mapped_column(String(25), nullable=True) # type: ignore + stake_currency: Mapped[str | None] = mapped_column(String(25), nullable=True) # type: ignore is_open: Mapped[bool] = mapped_column(nullable=False, default=True, index=True) # type: ignore fee_open: Mapped[float] = mapped_column(Float(), nullable=False, default=0.0) # type: ignore - fee_open_cost: Mapped[Optional[float]] = mapped_column(Float(), nullable=True) # type: ignore - fee_open_currency: Mapped[Optional[str]] = mapped_column( # type: ignore + fee_open_cost: Mapped[float | None] = mapped_column(Float(), nullable=True) # type: ignore + fee_open_currency: Mapped[str | None] = mapped_column( # type: ignore String(25), nullable=True ) - fee_close: Mapped[Optional[float]] = mapped_column( # type: ignore + fee_close: Mapped[float | None] = mapped_column( # type: ignore Float(), nullable=False, default=0.0 ) - fee_close_cost: Mapped[Optional[float]] = mapped_column(Float(), nullable=True) # type: ignore - fee_close_currency: Mapped[Optional[str]] = mapped_column( # type: ignore + fee_close_cost: Mapped[float | None] = mapped_column(Float(), nullable=True) # type: ignore + fee_close_currency: Mapped[str | None] = mapped_column( # type: ignore String(25), nullable=True ) open_rate: Mapped[float] = mapped_column(Float()) # type: ignore - open_rate_requested: Mapped[Optional[float]] = mapped_column( # type: ignore + open_rate_requested: Mapped[float | None] = mapped_column( # type: ignore Float(), nullable=True ) # open_trade_value - calculated via _calc_open_trade_value open_trade_value: Mapped[float] = mapped_column(Float(), nullable=True) # type: ignore - close_rate: Mapped[Optional[float]] = mapped_column(Float()) # type: ignore - close_rate_requested: Mapped[Optional[float]] = mapped_column(Float()) # type: ignore + close_rate: Mapped[float | None] = mapped_column(Float()) # type: ignore + close_rate_requested: Mapped[float | None] = mapped_column(Float()) # type: ignore realized_profit: Mapped[float] = mapped_column( # type: ignore Float(), default=0.0, nullable=True ) - close_profit: Mapped[Optional[float]] = mapped_column(Float()) # type: ignore - close_profit_abs: Mapped[Optional[float]] = mapped_column(Float()) # type: ignore + close_profit: Mapped[float | None] = mapped_column(Float()) # type: ignore + close_profit_abs: Mapped[float | None] = mapped_column(Float()) # type: ignore stake_amount: Mapped[float] = mapped_column(Float(), nullable=False) # type: ignore - max_stake_amount: Mapped[Optional[float]] = mapped_column(Float()) # type: ignore + max_stake_amount: Mapped[float | None] = mapped_column(Float()) # type: ignore amount: Mapped[float] = mapped_column(Float()) # type: ignore - amount_requested: Mapped[Optional[float]] = mapped_column(Float()) # type: ignore + amount_requested: Mapped[float | None] = mapped_column(Float()) # type: ignore open_date: Mapped[datetime] = mapped_column( # type: ignore nullable=False, default=datetime.now ) - close_date: Mapped[Optional[datetime]] = mapped_column() # type: ignore + close_date: Mapped[datetime | None] = mapped_column() # type: ignore # absolute value of the stop loss stop_loss: Mapped[float] = mapped_column(Float(), nullable=True, default=0.0) # type: ignore # percentage value of the stop loss - stop_loss_pct: Mapped[Optional[float]] = mapped_column(Float(), nullable=True) # type: ignore + stop_loss_pct: Mapped[float | None] = mapped_column(Float(), nullable=True) # type: ignore # absolute value of the initial stop loss - initial_stop_loss: Mapped[Optional[float]] = mapped_column( # type: ignore + initial_stop_loss: Mapped[float | None] = mapped_column( # type: ignore Float(), nullable=True, default=0.0 ) # percentage value of the initial stop loss - initial_stop_loss_pct: Mapped[Optional[float]] = mapped_column( # type: ignore + initial_stop_loss_pct: Mapped[float | None] = mapped_column( # type: ignore Float(), nullable=True ) is_stop_loss_trailing: Mapped[bool] = mapped_column( # type: ignore nullable=False, default=False ) # absolute value of the highest reached price - max_rate: Mapped[Optional[float]] = mapped_column( # type: ignore + max_rate: Mapped[float | None] = mapped_column( # type: ignore Float(), nullable=True, default=0.0 ) # Lowest price reached - min_rate: Mapped[Optional[float]] = mapped_column(Float(), nullable=True) # type: ignore - exit_reason: Mapped[Optional[str]] = mapped_column( # type: ignore + min_rate: Mapped[float | None] = mapped_column(Float(), nullable=True) # type: ignore + exit_reason: Mapped[str | None] = mapped_column( # type: ignore String(CUSTOM_TAG_MAX_LENGTH), nullable=True ) - exit_order_status: Mapped[Optional[str]] = mapped_column( # type: ignore + exit_order_status: Mapped[str | None] = mapped_column( # type: ignore String(100), nullable=True ) - strategy: Mapped[Optional[str]] = mapped_column(String(100), nullable=True) # type: ignore - enter_tag: Mapped[Optional[str]] = mapped_column( # type: ignore + strategy: Mapped[str | None] = mapped_column(String(100), nullable=True) # type: ignore + enter_tag: Mapped[str | None] = mapped_column( # type: ignore String(CUSTOM_TAG_MAX_LENGTH), nullable=True ) - timeframe: Mapped[Optional[int]] = mapped_column(Integer, nullable=True) # type: ignore + timeframe: Mapped[int | None] = mapped_column(Integer, nullable=True) # type: ignore trading_mode: Mapped[TradingMode] = mapped_column( # type: ignore Enum(TradingMode), nullable=True ) - amount_precision: Mapped[Optional[float]] = mapped_column( # type: ignore + amount_precision: Mapped[float | None] = mapped_column( # type: ignore Float(), nullable=True ) - price_precision: Mapped[Optional[float]] = mapped_column(Float(), nullable=True) # type: ignore - precision_mode: Mapped[Optional[int]] = mapped_column(Integer, nullable=True) # type: ignore - precision_mode_price: Mapped[Optional[int]] = mapped_column( # type: ignore + price_precision: Mapped[float | None] = mapped_column(Float(), nullable=True) # type: ignore + precision_mode: Mapped[int | None] = mapped_column(Integer, nullable=True) # type: ignore + precision_mode_price: Mapped[int | None] = mapped_column( # type: ignore Integer, nullable=True ) - contract_size: Mapped[Optional[float]] = mapped_column(Float(), nullable=True) # type: ignore + contract_size: Mapped[float | None] = mapped_column(Float(), nullable=True) # type: ignore # Leverage trading properties leverage: Mapped[float] = mapped_column(Float(), nullable=True, default=1.0) # type: ignore is_short: Mapped[bool] = mapped_column(nullable=False, default=False) # type: ignore - liquidation_price: Mapped[Optional[float]] = mapped_column( # type: ignore + liquidation_price: Mapped[float | None] = mapped_column( # type: ignore Float(), nullable=True ) @@ -1725,10 +1729,10 @@ class Trade(ModelBase, LocalTrade): ) # Futures properties - funding_fees: Mapped[Optional[float]] = mapped_column( # type: ignore + funding_fees: Mapped[float | None] = mapped_column( # type: ignore Float(), nullable=True, default=None ) - funding_fee_running: Mapped[Optional[float]] = mapped_column( # type: ignore + funding_fee_running: Mapped[float | None] = mapped_column( # type: ignore Float(), nullable=True, default=None ) @@ -1767,10 +1771,10 @@ class Trade(ModelBase, LocalTrade): @staticmethod def get_trades_proxy( *, - pair: Optional[str] = None, - is_open: Optional[bool] = None, - open_date: Optional[datetime] = None, - close_date: Optional[datetime] = None, + pair: str | None = None, + is_open: bool | None = None, + open_date: datetime | None = None, + close_date: datetime | None = None, ) -> list["LocalTrade"]: """ Helper function to query Trades.j @@ -1933,7 +1937,7 @@ class Trade(ModelBase, LocalTrade): ] @staticmethod - def get_enter_tag_performance(pair: Optional[str]) -> list[dict[str, Any]]: + def get_enter_tag_performance(pair: str | None) -> list[dict[str, Any]]: """ Returns List of dicts containing all Trades, based on buy tag performance Can either be average for all pairs or a specific pair provided @@ -1968,7 +1972,7 @@ class Trade(ModelBase, LocalTrade): ] @staticmethod - def get_exit_reason_performance(pair: Optional[str]) -> list[dict[str, Any]]: + def get_exit_reason_performance(pair: str | None) -> list[dict[str, Any]]: """ Returns List of dicts containing all Trades, based on exit reason performance Can either be average for all pairs or a specific pair provided @@ -2002,7 +2006,7 @@ class Trade(ModelBase, LocalTrade): ] @staticmethod - def get_mix_tag_performance(pair: Optional[str]) -> list[dict[str, Any]]: + def get_mix_tag_performance(pair: str | None) -> list[dict[str, Any]]: """ Returns List of dicts containing all Trades, based on entry_tag + exit_reason performance Can either be average for all pairs or a specific pair provided @@ -2059,7 +2063,7 @@ class Trade(ModelBase, LocalTrade): return resp @staticmethod - def get_best_pair(start_date: Optional[datetime] = None): + def get_best_pair(start_date: datetime | None = None): """ Get best pair with closed trade. NOTE: Not supported in Backtesting. @@ -2079,7 +2083,7 @@ class Trade(ModelBase, LocalTrade): return best_pair @staticmethod - def get_trading_volume(start_date: Optional[datetime] = None) -> float: + def get_trading_volume(start_date: datetime | None = None) -> float: """ Get Trade volume based on Orders NOTE: Not supported in Backtesting. diff --git a/freqtrade/plot/plotting.py b/freqtrade/plot/plotting.py index 8ce851476..cf86f070d 100644 --- a/freqtrade/plot/plotting.py +++ b/freqtrade/plot/plotting.py @@ -1,7 +1,6 @@ import logging from datetime import datetime, timezone from pathlib import Path -from typing import Optional import pandas as pd @@ -406,7 +405,7 @@ def add_areas(fig, row: int, data: pd.DataFrame, indicators) -> make_subplots: return fig -def create_scatter(data, column_name, color, direction) -> Optional[go.Scatter]: +def create_scatter(data, column_name, color, direction) -> go.Scatter | None: if column_name in data.columns: df_short = data[data[column_name] == 1] if len(df_short) > 0: @@ -432,11 +431,11 @@ def create_scatter(data, column_name, color, direction) -> Optional[go.Scatter]: def generate_candlestick_graph( pair: str, data: pd.DataFrame, - trades: Optional[pd.DataFrame] = None, + trades: pd.DataFrame | None = None, *, - indicators1: Optional[list[str]] = None, - indicators2: Optional[list[str]] = None, - plot_config: Optional[dict[str, dict]] = None, + indicators1: list[str] | None = None, + indicators2: list[str] | None = None, + plot_config: dict[str, dict] | None = None, ) -> go.Figure: """ Generate the graph from the data generated by Backtesting or from DB diff --git a/freqtrade/plugins/pairlist/AgeFilter.py b/freqtrade/plugins/pairlist/AgeFilter.py index cc89e3421..03ba12770 100644 --- a/freqtrade/plugins/pairlist/AgeFilter.py +++ b/freqtrade/plugins/pairlist/AgeFilter.py @@ -5,7 +5,6 @@ Minimum age (days listed) pair list filter import logging from copy import deepcopy from datetime import timedelta -from typing import Optional from pandas import DataFrame @@ -126,7 +125,7 @@ class AgeFilter(IPairList): self.log_once(f"Validated {len(pairlist)} pairs.", logger.info) return pairlist - def _validate_pair_loc(self, pair: str, daily_candles: Optional[DataFrame]) -> bool: + def _validate_pair_loc(self, pair: str, daily_candles: DataFrame | None) -> bool: """ Validate age for the ticker :param pair: Pair that's currently validated diff --git a/freqtrade/plugins/pairlist/IPairList.py b/freqtrade/plugins/pairlist/IPairList.py index a1ce4dc36..89a9e68cd 100644 --- a/freqtrade/plugins/pairlist/IPairList.py +++ b/freqtrade/plugins/pairlist/IPairList.py @@ -6,7 +6,7 @@ import logging from abc import ABC, abstractmethod from copy import deepcopy from enum import Enum -from typing import Any, Literal, Optional, TypedDict, Union +from typing import Any, Literal, TypedDict from freqtrade.constants import Config from freqtrade.exceptions import OperationalException @@ -25,37 +25,37 @@ class __PairlistParameterBase(TypedDict): class __NumberPairlistParameter(__PairlistParameterBase): type: Literal["number"] - default: Union[int, float, None] + default: int | float | None class __StringPairlistParameter(__PairlistParameterBase): type: Literal["string"] - default: Union[str, None] + default: str | None class __OptionPairlistParameter(__PairlistParameterBase): type: Literal["option"] - default: Union[str, None] + default: str | None options: list[str] class __ListPairListParamenter(__PairlistParameterBase): type: Literal["list"] - default: Union[list[str], None] + default: list[str] | None class __BoolPairlistParameter(__PairlistParameterBase): type: Literal["boolean"] - default: Union[bool, None] + default: bool | None -PairlistParameter = Union[ - __NumberPairlistParameter, - __StringPairlistParameter, - __OptionPairlistParameter, - __BoolPairlistParameter, - __ListPairListParamenter, -] +PairlistParameter = ( + __NumberPairlistParameter + | __StringPairlistParameter + | __OptionPairlistParameter + | __BoolPairlistParameter + | __ListPairListParamenter +) class SupportsBacktesting(str, Enum): @@ -153,7 +153,7 @@ class IPairList(LoggingMixin, ABC): -> Please overwrite in subclasses """ - def _validate_pair(self, pair: str, ticker: Optional[Ticker]) -> bool: + def _validate_pair(self, pair: str, ticker: Ticker | None) -> bool: """ Check one pair against Pairlist Handler's specific conditions. diff --git a/freqtrade/plugins/pairlist/MarketCapPairList.py b/freqtrade/plugins/pairlist/MarketCapPairList.py index 2394e910e..b95cec50f 100644 --- a/freqtrade/plugins/pairlist/MarketCapPairList.py +++ b/freqtrade/plugins/pairlist/MarketCapPairList.py @@ -5,6 +5,7 @@ Provides dynamic pair list based on Market Cap """ import logging +import math from cachetools import TTLCache @@ -57,7 +58,11 @@ class MarketCapPairList(IPairList): ) if self._max_rank > 250: - raise OperationalException("This filter only support marketcap rank up to 250.") + self.logger.warning( + f"The max rank you have set ({self._max_rank}) is quite high. " + "This may lead to coingecko API rate limit issues. " + "Please ensure this value is necessary for your use case.", + ) @property def needstickers(self) -> bool: @@ -165,7 +170,11 @@ class MarketCapPairList(IPairList): data = [] if not self._categories: - data = self._coingecko.get_coins_markets(**default_kwargs) + pages_required = math.ceil(self._max_rank / 250) + for page in range(1, pages_required + 1): + default_kwargs["page"] = str(page) + page_data = self._coingecko.get_coins_markets(**default_kwargs) + data.extend(page_data) else: for category in self._categories: category_data = self._coingecko.get_coins_markets( diff --git a/freqtrade/plugins/pairlist/PercentChangePairList.py b/freqtrade/plugins/pairlist/PercentChangePairList.py index b428da75a..cbc86f259 100644 --- a/freqtrade/plugins/pairlist/PercentChangePairList.py +++ b/freqtrade/plugins/pairlist/PercentChangePairList.py @@ -8,7 +8,7 @@ defined period or as coming from ticker import logging from datetime import timedelta -from typing import Any, Optional +from typing import Any from cachetools import TTLCache from pandas import DataFrame @@ -46,7 +46,7 @@ class PercentChangePairList(IPairList): self._lookback_days = self._pairlistconfig.get("lookback_days", 0) self._lookback_timeframe = self._pairlistconfig.get("lookback_timeframe", "1d") self._lookback_period = self._pairlistconfig.get("lookback_period", 0) - self._sort_direction: Optional[str] = self._pairlistconfig.get("sort_direction", "desc") + self._sort_direction: str | None = self._pairlistconfig.get("sort_direction", "desc") self._def_candletype = self._config["candle_type_def"] if (self._lookback_days > 0) & (self._lookback_period > 0): @@ -293,7 +293,9 @@ class PercentChangePairList(IPairList): current_close = pair_candles["close"].iloc[-1] previous_close = pair_candles["close"].shift(self._lookback_period).iloc[-1] pct_change = ( - ((current_close - previous_close) / previous_close) if previous_close > 0 else 0 + ((current_close - previous_close) / previous_close) * 100 + if previous_close > 0 + else 0 ) # replace change with a range change sum calculated above @@ -311,7 +313,7 @@ class PercentChangePairList(IPairList): else: filtered_tickers[i]["percentage"] = tickers[p["symbol"]]["percentage"] - def _validate_pair(self, pair: str, ticker: Optional[Ticker]) -> bool: + def _validate_pair(self, pair: str, ticker: Ticker | None) -> bool: """ Check if one price-step (pip) is > than a certain barrier. :param pair: Pair that's currently validated diff --git a/freqtrade/plugins/pairlist/PrecisionFilter.py b/freqtrade/plugins/pairlist/PrecisionFilter.py index 43072a26a..d0af200cd 100644 --- a/freqtrade/plugins/pairlist/PrecisionFilter.py +++ b/freqtrade/plugins/pairlist/PrecisionFilter.py @@ -3,7 +3,6 @@ Precision pair list filter """ import logging -from typing import Optional from freqtrade.exceptions import OperationalException from freqtrade.exchange import ROUND_UP @@ -50,7 +49,7 @@ class PrecisionFilter(IPairList): def description() -> str: return "Filters low-value coins which would not allow setting stoplosses." - def _validate_pair(self, pair: str, ticker: Optional[Ticker]) -> bool: + def _validate_pair(self, pair: str, ticker: Ticker | None) -> bool: """ Check if pair has enough room to add a stoploss to avoid "unsellable" buys of very low value pairs. diff --git a/freqtrade/plugins/pairlist/PriceFilter.py b/freqtrade/plugins/pairlist/PriceFilter.py index f963b1247..ea5ef27a2 100644 --- a/freqtrade/plugins/pairlist/PriceFilter.py +++ b/freqtrade/plugins/pairlist/PriceFilter.py @@ -3,7 +3,6 @@ Price pair list filter """ import logging -from typing import Optional from freqtrade.exceptions import OperationalException from freqtrade.exchange.exchange_types import Ticker @@ -101,7 +100,7 @@ class PriceFilter(IPairList): }, } - def _validate_pair(self, pair: str, ticker: Optional[Ticker]) -> bool: + def _validate_pair(self, pair: str, ticker: Ticker | None) -> bool: """ Check if one price-step (pip) is > than a certain barrier. :param pair: Pair that's currently validated diff --git a/freqtrade/plugins/pairlist/ProducerPairList.py b/freqtrade/plugins/pairlist/ProducerPairList.py index e286b3560..89e4a0869 100644 --- a/freqtrade/plugins/pairlist/ProducerPairList.py +++ b/freqtrade/plugins/pairlist/ProducerPairList.py @@ -5,7 +5,6 @@ Provides pair list from Leader data """ import logging -from typing import Optional from freqtrade.exceptions import OperationalException from freqtrade.exchange.exchange_types import Tickers @@ -83,7 +82,7 @@ class ProducerPairList(IPairList): }, } - def _filter_pairlist(self, pairlist: Optional[list[str]]): + def _filter_pairlist(self, pairlist: list[str] | None): upstream_pairlist = self._pairlistmanager._dataprovider.get_producer_pairs( self._producer_name ) diff --git a/freqtrade/plugins/pairlist/SpreadFilter.py b/freqtrade/plugins/pairlist/SpreadFilter.py index 0ecd1909d..51e8e802b 100644 --- a/freqtrade/plugins/pairlist/SpreadFilter.py +++ b/freqtrade/plugins/pairlist/SpreadFilter.py @@ -3,7 +3,6 @@ Spread pair list filter """ import logging -from typing import Optional from freqtrade.exceptions import OperationalException from freqtrade.exchange.exchange_types import Ticker @@ -61,7 +60,7 @@ class SpreadFilter(IPairList): }, } - def _validate_pair(self, pair: str, ticker: Optional[Ticker]) -> bool: + def _validate_pair(self, pair: str, ticker: Ticker | None) -> bool: """ Validate spread for the ticker :param pair: Pair that's currently validated diff --git a/freqtrade/plugins/pairlist/VolatilityFilter.py b/freqtrade/plugins/pairlist/VolatilityFilter.py index 76e93a1f3..87ca488c1 100644 --- a/freqtrade/plugins/pairlist/VolatilityFilter.py +++ b/freqtrade/plugins/pairlist/VolatilityFilter.py @@ -5,7 +5,6 @@ Volatility pairlist filter import logging import sys from datetime import timedelta -from typing import Optional import numpy as np from cachetools import TTLCache @@ -37,7 +36,7 @@ class VolatilityFilter(IPairList): self._max_volatility = self._pairlistconfig.get("max_volatility", sys.maxsize) self._refresh_period = self._pairlistconfig.get("refresh_period", 1440) self._def_candletype = self._config["candle_type_def"] - self._sort_direction: Optional[str] = self._pairlistconfig.get("sort_direction", None) + self._sort_direction: str | None = self._pairlistconfig.get("sort_direction", None) self._pair_cache: TTLCache = TTLCache(maxsize=1000, ttl=self._refresh_period) @@ -147,7 +146,7 @@ class VolatilityFilter(IPairList): ) return resulting_pairlist - def _calculate_volatility(self, pair: str, daily_candles: DataFrame) -> Optional[float]: + def _calculate_volatility(self, pair: str, daily_candles: DataFrame) -> float | None: # Check symbol in cache if (volatility_avg := self._pair_cache.get(pair, None)) is not None: return volatility_avg diff --git a/freqtrade/plugins/pairlist/rangestabilityfilter.py b/freqtrade/plugins/pairlist/rangestabilityfilter.py index cff958865..ca5543bb0 100644 --- a/freqtrade/plugins/pairlist/rangestabilityfilter.py +++ b/freqtrade/plugins/pairlist/rangestabilityfilter.py @@ -4,7 +4,6 @@ Rate of change pairlist filter import logging from datetime import timedelta -from typing import Optional from cachetools import TTLCache from pandas import DataFrame @@ -31,7 +30,7 @@ class RangeStabilityFilter(IPairList): self._max_rate_of_change = self._pairlistconfig.get("max_rate_of_change") self._refresh_period = self._pairlistconfig.get("refresh_period", 86400) self._def_candletype = self._config["candle_type_def"] - self._sort_direction: Optional[str] = self._pairlistconfig.get("sort_direction", None) + self._sort_direction: str | None = self._pairlistconfig.get("sort_direction", None) self._pair_cache: TTLCache = TTLCache(maxsize=1000, ttl=self._refresh_period) @@ -143,7 +142,7 @@ class RangeStabilityFilter(IPairList): ) return resulting_pairlist - def _calculate_rate_of_change(self, pair: str, daily_candles: DataFrame) -> Optional[float]: + def _calculate_rate_of_change(self, pair: str, daily_candles: DataFrame) -> float | None: # Check symbol in cache if (pct_change := self._pair_cache.get(pair, None)) is not None: return pct_change diff --git a/freqtrade/plugins/pairlistmanager.py b/freqtrade/plugins/pairlistmanager.py index 2171629d3..73786cba6 100644 --- a/freqtrade/plugins/pairlistmanager.py +++ b/freqtrade/plugins/pairlistmanager.py @@ -4,7 +4,6 @@ PairList manager class import logging from functools import partial -from typing import Optional from cachetools import TTLCache, cached @@ -24,16 +23,14 @@ logger = logging.getLogger(__name__) class PairListManager(LoggingMixin): - def __init__( - self, exchange, config: Config, dataprovider: Optional[DataProvider] = None - ) -> None: + def __init__(self, exchange, config: Config, dataprovider: DataProvider | None = None) -> None: self._exchange = exchange self._config = config self._whitelist = self._config["exchange"].get("pair_whitelist") self._blacklist = self._config["exchange"].get("pair_blacklist", []) self._pairlist_handlers: list[IPairList] = [] self._tickers_needed = False - self._dataprovider: Optional[DataProvider] = dataprovider + self._dataprovider: DataProvider | None = dataprovider for pairlist_handler_config in self._config.get("pairlists", []): pairlist_handler = PairListResolver.load_pairlist( pairlist_handler_config["method"], @@ -193,7 +190,7 @@ class PairListManager(LoggingMixin): return whitelist def create_pair_list( - self, pairs: list[str], timeframe: Optional[str] = None + self, pairs: list[str], timeframe: str | None = None ) -> ListPairsWithTimeframes: """ Create list of pair tuples with (pair, timeframe) diff --git a/freqtrade/plugins/protectionmanager.py b/freqtrade/plugins/protectionmanager.py index 648cd6bbb..187b9ee63 100644 --- a/freqtrade/plugins/protectionmanager.py +++ b/freqtrade/plugins/protectionmanager.py @@ -4,7 +4,7 @@ Protection manager class import logging from datetime import datetime, timezone -from typing import Any, Optional +from typing import Any from freqtrade.constants import Config, LongShort from freqtrade.exceptions import ConfigurationError @@ -47,9 +47,7 @@ class ProtectionManager: """ return [{p.name: p.short_desc()} for p in self._protection_handlers] - def global_stop( - self, now: Optional[datetime] = None, side: LongShort = "long" - ) -> Optional[PairLock]: + def global_stop(self, now: datetime | None = None, side: LongShort = "long") -> PairLock | None: if not now: now = datetime.now(timezone.utc) result = None @@ -64,8 +62,8 @@ class ProtectionManager: return result def stop_per_pair( - self, pair, now: Optional[datetime] = None, side: LongShort = "long" - ) -> Optional[PairLock]: + self, pair, now: datetime | None = None, side: LongShort = "long" + ) -> PairLock | None: if not now: now = datetime.now(timezone.utc) result = None diff --git a/freqtrade/plugins/protections/cooldown_period.py b/freqtrade/plugins/protections/cooldown_period.py index d30bd87e5..0f6aaa79a 100644 --- a/freqtrade/plugins/protections/cooldown_period.py +++ b/freqtrade/plugins/protections/cooldown_period.py @@ -1,6 +1,5 @@ import logging from datetime import datetime, timedelta -from typing import Optional from freqtrade.constants import LongShort from freqtrade.persistence import Trade @@ -26,7 +25,7 @@ class CooldownPeriod(IProtection): """ return f"{self.name} - Cooldown period {self.unlock_reason_time_element}." - def _cooldown_period(self, pair: str, date_now: datetime) -> Optional[ProtectionReturn]: + def _cooldown_period(self, pair: str, date_now: datetime) -> ProtectionReturn | None: """ Get last trade for this pair """ @@ -53,7 +52,7 @@ class CooldownPeriod(IProtection): return None - def global_stop(self, date_now: datetime, side: LongShort) -> Optional[ProtectionReturn]: + def global_stop(self, date_now: datetime, side: LongShort) -> ProtectionReturn | None: """ Stops trading (position entering) for all pairs This must evaluate to true for the whole period of the "cooldown period". @@ -65,7 +64,7 @@ class CooldownPeriod(IProtection): def stop_per_pair( self, pair: str, date_now: datetime, side: LongShort - ) -> Optional[ProtectionReturn]: + ) -> ProtectionReturn | None: """ Stops trading (position entering) for this pair This must evaluate to true for the whole period of the "cooldown period". diff --git a/freqtrade/plugins/protections/iprotection.py b/freqtrade/plugins/protections/iprotection.py index a2264675e..38a726dcc 100644 --- a/freqtrade/plugins/protections/iprotection.py +++ b/freqtrade/plugins/protections/iprotection.py @@ -2,7 +2,7 @@ import logging from abc import ABC, abstractmethod from dataclasses import dataclass from datetime import datetime, timedelta, timezone -from typing import Any, Optional +from typing import Any from freqtrade.constants import Config, LongShort from freqtrade.exchange import timeframe_to_minutes @@ -18,7 +18,7 @@ logger = logging.getLogger(__name__) class ProtectionReturn: lock: bool until: datetime - reason: Optional[str] + reason: str | None lock_side: str = "*" @@ -31,10 +31,10 @@ class IProtection(LoggingMixin, ABC): def __init__(self, config: Config, protection_config: dict[str, Any]) -> None: self._config = config self._protection_config = protection_config - self._stop_duration_candles: Optional[int] = None + self._stop_duration_candles: int | None = None self._stop_duration: int = 0 - self._lookback_period_candles: Optional[int] = None - self._unlock_at: Optional[str] = None + self._lookback_period_candles: int | None = None + self._unlock_at: str | None = None tf_in_min = timeframe_to_minutes(config["timeframe"]) if "stop_duration_candles" in protection_config: @@ -102,7 +102,7 @@ class IProtection(LoggingMixin, ABC): """ @abstractmethod - def global_stop(self, date_now: datetime, side: LongShort) -> Optional[ProtectionReturn]: + def global_stop(self, date_now: datetime, side: LongShort) -> ProtectionReturn | None: """ Stops trading (position entering) for all pairs This must evaluate to true for the whole period of the "cooldown period". @@ -111,7 +111,7 @@ class IProtection(LoggingMixin, ABC): @abstractmethod def stop_per_pair( self, pair: str, date_now: datetime, side: LongShort - ) -> Optional[ProtectionReturn]: + ) -> ProtectionReturn | None: """ Stops trading (position entering) for this pair This must evaluate to true for the whole period of the "cooldown period". diff --git a/freqtrade/plugins/protections/low_profit_pairs.py b/freqtrade/plugins/protections/low_profit_pairs.py index e6ee0db64..84934f394 100644 --- a/freqtrade/plugins/protections/low_profit_pairs.py +++ b/freqtrade/plugins/protections/low_profit_pairs.py @@ -1,6 +1,6 @@ import logging from datetime import datetime, timedelta -from typing import Any, Optional +from typing import Any from freqtrade.constants import Config, LongShort from freqtrade.persistence import Trade @@ -41,7 +41,7 @@ class LowProfitPairs(IProtection): def _low_profit( self, date_now: datetime, pair: str, side: LongShort - ) -> Optional[ProtectionReturn]: + ) -> ProtectionReturn | None: """ Evaluate recent trades for pair """ @@ -81,7 +81,7 @@ class LowProfitPairs(IProtection): return None - def global_stop(self, date_now: datetime, side: LongShort) -> Optional[ProtectionReturn]: + def global_stop(self, date_now: datetime, side: LongShort) -> ProtectionReturn | None: """ Stops trading (position entering) for all pairs This must evaluate to true for the whole period of the "cooldown period". @@ -92,7 +92,7 @@ class LowProfitPairs(IProtection): def stop_per_pair( self, pair: str, date_now: datetime, side: LongShort - ) -> Optional[ProtectionReturn]: + ) -> ProtectionReturn | None: """ Stops trading (position entering) for this pair This must evaluate to true for the whole period of the "cooldown period". diff --git a/freqtrade/plugins/protections/max_drawdown_protection.py b/freqtrade/plugins/protections/max_drawdown_protection.py index 903f9fbbf..e8996d3a8 100644 --- a/freqtrade/plugins/protections/max_drawdown_protection.py +++ b/freqtrade/plugins/protections/max_drawdown_protection.py @@ -1,6 +1,6 @@ import logging from datetime import datetime, timedelta -from typing import Any, Optional +from typing import Any import pandas as pd @@ -42,7 +42,7 @@ class MaxDrawdown(IProtection): f"locking {self.unlock_reason_time_element}." ) - def _max_drawdown(self, date_now: datetime) -> Optional[ProtectionReturn]: + def _max_drawdown(self, date_now: datetime) -> ProtectionReturn | None: """ Evaluate recent trades for drawdown ... """ @@ -81,7 +81,7 @@ class MaxDrawdown(IProtection): return None - def global_stop(self, date_now: datetime, side: LongShort) -> Optional[ProtectionReturn]: + def global_stop(self, date_now: datetime, side: LongShort) -> ProtectionReturn | None: """ Stops trading (position entering) for all pairs This must evaluate to true for the whole period of the "cooldown period". @@ -92,7 +92,7 @@ class MaxDrawdown(IProtection): def stop_per_pair( self, pair: str, date_now: datetime, side: LongShort - ) -> Optional[ProtectionReturn]: + ) -> ProtectionReturn | None: """ Stops trading (position entering) for this pair This must evaluate to true for the whole period of the "cooldown period". diff --git a/freqtrade/plugins/protections/stoploss_guard.py b/freqtrade/plugins/protections/stoploss_guard.py index 47ebc3696..a429a2f80 100644 --- a/freqtrade/plugins/protections/stoploss_guard.py +++ b/freqtrade/plugins/protections/stoploss_guard.py @@ -1,6 +1,6 @@ import logging from datetime import datetime, timedelta -from typing import Any, Optional +from typing import Any from freqtrade.constants import Config, LongShort from freqtrade.enums import ExitType @@ -42,8 +42,8 @@ class StoplossGuard(IProtection): ) def _stoploss_guard( - self, date_now: datetime, pair: Optional[str], side: LongShort - ) -> Optional[ProtectionReturn]: + self, date_now: datetime, pair: str | None, side: LongShort + ) -> ProtectionReturn | None: """ Evaluate recent trades """ @@ -86,7 +86,7 @@ class StoplossGuard(IProtection): lock_side=(side if self._only_per_side else "*"), ) - def global_stop(self, date_now: datetime, side: LongShort) -> Optional[ProtectionReturn]: + def global_stop(self, date_now: datetime, side: LongShort) -> ProtectionReturn | None: """ Stops trading (position entering) for all pairs This must evaluate to true for the whole period of the "cooldown period". @@ -99,7 +99,7 @@ class StoplossGuard(IProtection): def stop_per_pair( self, pair: str, date_now: datetime, side: LongShort - ) -> Optional[ProtectionReturn]: + ) -> ProtectionReturn | None: """ Stops trading (position entering) for this pair This must evaluate to true for the whole period of the "cooldown period". diff --git a/freqtrade/resolvers/exchange_resolver.py b/freqtrade/resolvers/exchange_resolver.py index 9d5a0d557..835c3c0af 100644 --- a/freqtrade/resolvers/exchange_resolver.py +++ b/freqtrade/resolvers/exchange_resolver.py @@ -4,7 +4,7 @@ This module loads custom exchanges import logging from inspect import isclass -from typing import Any, Optional +from typing import Any import freqtrade.exchange as exchanges from freqtrade.constants import Config, ExchangeConfig @@ -26,7 +26,7 @@ class ExchangeResolver(IResolver): def load_exchange( config: Config, *, - exchange_config: Optional[ExchangeConfig] = None, + exchange_config: ExchangeConfig | None = None, validate: bool = True, load_leverage_tiers: bool = False, ) -> Exchange: diff --git a/freqtrade/resolvers/hyperopt_resolver.py b/freqtrade/resolvers/hyperopt_resolver.py index 72bbfa886..80c2e7890 100644 --- a/freqtrade/resolvers/hyperopt_resolver.py +++ b/freqtrade/resolvers/hyperopt_resolver.py @@ -9,7 +9,7 @@ from pathlib import Path from freqtrade.constants import HYPEROPT_LOSS_BUILTIN, USERPATH_HYPEROPTS, Config from freqtrade.exceptions import OperationalException -from freqtrade.optimize.hyperopt_loss_interface import IHyperOptLoss +from freqtrade.optimize.hyperopt_loss.hyperopt_loss_interface import IHyperOptLoss from freqtrade.resolvers import IResolver diff --git a/freqtrade/resolvers/iresolver.py b/freqtrade/resolvers/iresolver.py index 9aa103a7e..cb0c3de33 100644 --- a/freqtrade/resolvers/iresolver.py +++ b/freqtrade/resolvers/iresolver.py @@ -10,7 +10,7 @@ import logging import sys from collections.abc import Iterator from pathlib import Path -from typing import Any, Optional, Union +from typing import Any from freqtrade.constants import Config from freqtrade.exceptions import OperationalException @@ -43,17 +43,17 @@ class IResolver: # Childclasses need to override this object_type: type[Any] object_type_str: str - user_subdir: Optional[str] = None - initial_search_path: Optional[Path] = None + user_subdir: str | None = None + initial_search_path: Path | None = None # Optional config setting containing a path (strategy_path, freqaimodel_path) - extra_path: Optional[str] = None + extra_path: str | None = None @classmethod def build_search_paths( cls, config: Config, - user_subdir: Optional[str] = None, - extra_dirs: Optional[list[str]] = None, + user_subdir: str | None = None, + extra_dirs: list[str] | None = None, ) -> list[Path]: abs_paths: list[Path] = [] if cls.initial_search_path: @@ -74,7 +74,7 @@ class IResolver: @classmethod def _get_valid_object( - cls, module_path: Path, object_name: Optional[str], enum_failed: bool = False + cls, module_path: Path, object_name: str | None, enum_failed: bool = False ) -> Iterator[Any]: """ Generator returning objects with matching object_type and object_name in the path given. @@ -131,7 +131,7 @@ class IResolver: @classmethod def _search_object( cls, directory: Path, *, object_name: str, add_source: bool = False - ) -> Union[tuple[Any, Path], tuple[None, None]]: + ) -> tuple[Any, Path] | tuple[None, None]: """ Search for the objectname in the given directory :param directory: relative or absolute directory path @@ -161,7 +161,7 @@ class IResolver: @classmethod def _load_object( cls, paths: list[Path], *, object_name: str, add_source: bool = False, kwargs: dict - ) -> Optional[Any]: + ) -> Any | None: """ Try to load object from path list. """ @@ -184,7 +184,7 @@ class IResolver: @classmethod def load_object( - cls, object_name: str, config: Config, *, kwargs: dict, extra_dir: Optional[str] = None + cls, object_name: str, config: Config, *, kwargs: dict, extra_dir: str | None = None ) -> Any: """ Search and loads the specified object as configured in the child class. @@ -245,7 +245,7 @@ class IResolver: directory: Path, enum_failed: bool, recursive: bool = False, - basedir: Optional[Path] = None, + basedir: Path | None = None, ) -> list[dict[str, Any]]: """ Searches a directory for valid objects diff --git a/freqtrade/resolvers/strategy_resolver.py b/freqtrade/resolvers/strategy_resolver.py index 5ac1cb6f9..67751b5ae 100644 --- a/freqtrade/resolvers/strategy_resolver.py +++ b/freqtrade/resolvers/strategy_resolver.py @@ -10,7 +10,7 @@ from base64 import urlsafe_b64decode from inspect import getfullargspec from os import walk from pathlib import Path -from typing import Any, Optional +from typing import Any from freqtrade.configuration.config_validation import validate_migrated_strategy_settings from freqtrade.constants import REQUIRED_ORDERTIF, REQUIRED_ORDERTYPES, USERPATH_STRATEGIES, Config @@ -35,7 +35,7 @@ class StrategyResolver(IResolver): extra_path = "strategy_path" @staticmethod - def load_strategy(config: Optional[Config] = None) -> IStrategy: + def load_strategy(config: Config | None = None) -> IStrategy: """ Load the custom class from config parameter :param config: configuration dictionary or None @@ -246,7 +246,7 @@ class StrategyResolver(IResolver): @staticmethod def _load_strategy( - strategy_name: str, config: Config, extra_dir: Optional[str] = None + strategy_name: str, config: Config, extra_dir: str | None = None ) -> IStrategy: """ Search and loads the specified strategy. diff --git a/freqtrade/rpc/api_server/api_auth.py b/freqtrade/rpc/api_server/api_auth.py index d9b04ab81..5f63c0aa5 100644 --- a/freqtrade/rpc/api_server/api_auth.py +++ b/freqtrade/rpc/api_server/api_auth.py @@ -1,7 +1,7 @@ import logging import secrets from datetime import datetime, timedelta, timezone -from typing import Any, Union +from typing import Any import jwt from fastapi import APIRouter, Depends, HTTPException, Query, WebSocket, status @@ -55,7 +55,7 @@ def get_user_from_token(token, secret_key: str, token_type: str = "access") -> s # https://github.com/tiangolo/fastapi/blob/master/fastapi/security/api_key.py async def validate_ws_token( ws: WebSocket, - ws_token: Union[str, None] = Query(default=None, alias="token"), + ws_token: str | None = Query(default=None, alias="token"), api_config: dict[str, Any] = Depends(get_api_config), ): secret_ws_token = api_config.get("ws_token", None) diff --git a/freqtrade/rpc/api_server/api_background_tasks.py b/freqtrade/rpc/api_server/api_background_tasks.py index 3ca1d7311..b41828d6f 100644 --- a/freqtrade/rpc/api_server/api_background_tasks.py +++ b/freqtrade/rpc/api_server/api_background_tasks.py @@ -22,6 +22,7 @@ def background_job_list(): "status": job["status"], "running": job["is_running"], "progress": job.get("progress"), + "progress_tasks": job.get("progress_tasks"), "error": job.get("error", None), } for jobid, job in ApiBG.jobs.items() @@ -39,5 +40,6 @@ def background_job(jobid: str): "status": job["status"], "running": job["is_running"], "progress": job.get("progress"), + "progress_tasks": job.get("progress_tasks"), "error": job.get("error", None), } diff --git a/freqtrade/rpc/api_server/api_download_data.py b/freqtrade/rpc/api_server/api_download_data.py new file mode 100644 index 000000000..161655725 --- /dev/null +++ b/freqtrade/rpc/api_server/api_download_data.py @@ -0,0 +1,85 @@ +import logging +from copy import deepcopy + +from fastapi import APIRouter, BackgroundTasks, Depends +from fastapi.exceptions import HTTPException + +from freqtrade.constants import Config +from freqtrade.exceptions import OperationalException +from freqtrade.persistence import FtNoDBContext +from freqtrade.rpc.api_server.api_pairlists import handleExchangePayload +from freqtrade.rpc.api_server.api_schemas import BgJobStarted, DownloadDataPayload +from freqtrade.rpc.api_server.deps import get_config, get_exchange +from freqtrade.rpc.api_server.webserver_bgwork import ApiBG +from freqtrade.util.progress_tracker import get_progress_tracker + + +logger = logging.getLogger(__name__) + +# Private API, protected by authentication and webserver_mode dependency +router = APIRouter(tags=["download-data", "webserver"]) + + +def __run_download(job_id: str, config_loc: Config): + try: + ApiBG.jobs[job_id]["is_running"] = True + from freqtrade.data.history.history_utils import download_data + + with FtNoDBContext(): + exchange = get_exchange(config_loc) + + def ft_callback(task) -> None: + ApiBG.jobs[job_id]["progress_tasks"][str(task.id)] = { + "progress": task.completed, + "total": task.total, + "description": task.description, + } + + pt = get_progress_tracker(ft_callback=ft_callback) + + download_data(config_loc, exchange, progress_tracker=pt) + ApiBG.jobs[job_id]["status"] = "success" + except (OperationalException, Exception) as e: + logger.exception(e) + ApiBG.jobs[job_id]["error"] = str(e) + ApiBG.jobs[job_id]["status"] = "failed" + finally: + ApiBG.jobs[job_id]["is_running"] = False + ApiBG.download_data_running = False + + +@router.post("/download_data", response_model=BgJobStarted) +def pairlists_evaluate( + payload: DownloadDataPayload, background_tasks: BackgroundTasks, config=Depends(get_config) +): + if ApiBG.download_data_running: + raise HTTPException(status_code=400, detail="Data Download is already running.") + config_loc = deepcopy(config) + config_loc["stake_currency"] = "" + config_loc["pairs"] = payload.pairs + config_loc["timeframe"] = payload.timeframes + config_loc["days"] = payload.days + config_loc["timeframes"] = payload.timeframes + config_loc["erase"] = payload.erase + config_loc["download_trades"] = payload.download_trades + + handleExchangePayload(payload, config_loc) + + job_id = ApiBG.get_job_id() + + ApiBG.jobs[job_id] = { + "category": "download_data", + "status": "pending", + "progress": None, + "progress_tasks": {}, + "is_running": False, + "result": {}, + "error": None, + } + background_tasks.add_task(__run_download, job_id, config_loc) + ApiBG.download_data_running = True + + return { + "status": "Data Download started in background.", + "job_id": job_id, + } diff --git a/freqtrade/rpc/api_server/api_schemas.py b/freqtrade/rpc/api_server/api_schemas.py index 3c0fd70b7..97770ba13 100644 --- a/freqtrade/rpc/api_server/api_schemas.py +++ b/freqtrade/rpc/api_server/api_schemas.py @@ -1,17 +1,18 @@ from datetime import date, datetime -from typing import Any, Optional, Union +from typing import Any -from pydantic import AwareDatetime, BaseModel, RootModel, SerializeAsAny +from pydantic import AwareDatetime, BaseModel, RootModel, SerializeAsAny, model_validator -from freqtrade.constants import IntOrInf +from freqtrade.constants import DL_DATA_TIMEFRAMES, IntOrInf from freqtrade.enums import MarginMode, OrderTypeValues, SignalDirection, TradingMode from freqtrade.ft_types import ValidExchangesType +from freqtrade.rpc.api_server.webserver_bgwork import ProgressTask class ExchangeModePayloadMixin(BaseModel): - trading_mode: Optional[TradingMode] = None - margin_mode: Optional[MarginMode] = None - exchange: Optional[str] = None + trading_mode: TradingMode | None = None + margin_mode: MarginMode | None = None + exchange: str | None = None class Ping(BaseModel): @@ -43,12 +44,13 @@ class BackgroundTaskStatus(BaseModel): job_category: str status: str running: bool - progress: Optional[float] = None - error: Optional[str] = None + progress: float | None = None + progress_tasks: dict[str, ProgressTask] | None = None + error: str | None = None class BackgroundTaskResult(BaseModel): - error: Optional[str] = None + error: str | None = None status: str @@ -61,9 +63,9 @@ class Balance(BaseModel): free: float balance: float used: float - bot_owned: Optional[float] = None + bot_owned: float | None = None est_stake: float - est_stake_bot: Optional[float] = None + est_stake_bot: float | None = None stake: str # Starting with 2.x side: str @@ -160,7 +162,7 @@ class Profit(BaseModel): max_drawdown_start_timestamp: int max_drawdown_end: str max_drawdown_end_timestamp: int - trading_volume: Optional[float] = None + trading_volume: float | None = None bot_start_timestamp: int bot_start_date: str @@ -173,7 +175,7 @@ class SellReason(BaseModel): class Stats(BaseModel): exit_reasons: dict[str, SellReason] - durations: dict[str, Optional[float]] + durations: dict[str, float | None] class DailyWeeklyMonthlyRecord(BaseModel): @@ -192,50 +194,50 @@ class DailyWeeklyMonthly(BaseModel): class UnfilledTimeout(BaseModel): - entry: Optional[int] = None - exit: Optional[int] = None - unit: Optional[str] = None - exit_timeout_count: Optional[int] = None + entry: int | None = None + exit: int | None = None + unit: str | None = None + exit_timeout_count: int | None = None class OrderTypes(BaseModel): entry: OrderTypeValues exit: OrderTypeValues - emergency_exit: Optional[OrderTypeValues] = None - force_exit: Optional[OrderTypeValues] = None - force_entry: Optional[OrderTypeValues] = None + emergency_exit: OrderTypeValues | None = None + force_exit: OrderTypeValues | None = None + force_entry: OrderTypeValues | None = None stoploss: OrderTypeValues stoploss_on_exchange: bool - stoploss_on_exchange_interval: Optional[int] = None + stoploss_on_exchange_interval: int | None = None class ShowConfig(BaseModel): version: str - strategy_version: Optional[str] = None + strategy_version: str | None = None api_version: float dry_run: bool trading_mode: str short_allowed: bool stake_currency: str stake_amount: str - available_capital: Optional[float] = None + available_capital: float | None = None stake_currency_decimals: int max_open_trades: IntOrInf minimal_roi: dict[str, Any] - stoploss: Optional[float] = None + stoploss: float | None = None stoploss_on_exchange: bool - trailing_stop: Optional[bool] = None - trailing_stop_positive: Optional[float] = None - trailing_stop_positive_offset: Optional[float] = None - trailing_only_offset_is_reached: Optional[bool] = None - unfilledtimeout: Optional[UnfilledTimeout] = None # Empty in webserver mode - order_types: Optional[OrderTypes] = None - use_custom_stoploss: Optional[bool] = None - timeframe: Optional[str] = None + trailing_stop: bool | None = None + trailing_stop_positive: float | None = None + trailing_stop_positive_offset: float | None = None + trailing_only_offset_is_reached: bool | None = None + unfilledtimeout: UnfilledTimeout | None = None # Empty in webserver mode + order_types: OrderTypes | None = None + use_custom_stoploss: bool | None = None + timeframe: str | None = None timeframe_ms: int timeframe_min: int exchange: str - strategy: Optional[str] = None + strategy: str | None = None force_entry_enable: bool exit_pricing: dict[str, Any] entry_pricing: dict[str, Any] @@ -250,18 +252,18 @@ class OrderSchema(BaseModel): pair: str order_id: str status: str - remaining: Optional[float] = None + remaining: float | None = None amount: float safe_price: float cost: float - filled: Optional[float] = None + filled: float | None = None ft_order_side: str order_type: str is_open: bool - order_timestamp: Optional[int] = None - order_filled_timestamp: Optional[int] = None - ft_fee_base: Optional[float] = None - ft_order_tag: Optional[str] = None + order_timestamp: int | None = None + order_filled_timestamp: int | None = None + ft_fee_base: float | None = None + ft_order_tag: str | None = None class TradeSchema(BaseModel): @@ -275,80 +277,80 @@ class TradeSchema(BaseModel): amount: float amount_requested: float stake_amount: float - max_stake_amount: Optional[float] = None + max_stake_amount: float | None = None strategy: str - enter_tag: Optional[str] = None + enter_tag: str | None = None timeframe: int - fee_open: Optional[float] = None - fee_open_cost: Optional[float] = None - fee_open_currency: Optional[str] = None - fee_close: Optional[float] = None - fee_close_cost: Optional[float] = None - fee_close_currency: Optional[str] = None + fee_open: float | None = None + fee_open_cost: float | None = None + fee_open_currency: str | None = None + fee_close: float | None = None + fee_close_cost: float | None = None + fee_close_currency: str | None = None open_date: str open_timestamp: int - open_fill_date: Optional[str] - open_fill_timestamp: Optional[int] + open_fill_date: str | None + open_fill_timestamp: int | None open_rate: float - open_rate_requested: Optional[float] = None + open_rate_requested: float | None = None open_trade_value: float - close_date: Optional[str] = None - close_timestamp: Optional[int] = None - close_rate: Optional[float] = None - close_rate_requested: Optional[float] = None + close_date: str | None = None + close_timestamp: int | None = None + close_rate: float | None = None + close_rate_requested: float | None = None - close_profit: Optional[float] = None - close_profit_pct: Optional[float] = None - close_profit_abs: Optional[float] = None + close_profit: float | None = None + close_profit_pct: float | None = None + close_profit_abs: float | None = None - profit_ratio: Optional[float] = None - profit_pct: Optional[float] = None - profit_abs: Optional[float] = None - profit_fiat: Optional[float] = None + profit_ratio: float | None = None + profit_pct: float | None = None + profit_abs: float | None = None + profit_fiat: float | None = None realized_profit: float - realized_profit_ratio: Optional[float] = None + realized_profit_ratio: float | None = None - exit_reason: Optional[str] = None - exit_order_status: Optional[str] = None + exit_reason: str | None = None + exit_order_status: str | None = None - stop_loss_abs: Optional[float] = None - stop_loss_ratio: Optional[float] = None - stop_loss_pct: Optional[float] = None - stoploss_last_update: Optional[str] = None - stoploss_last_update_timestamp: Optional[int] = None - initial_stop_loss_abs: Optional[float] = None - initial_stop_loss_ratio: Optional[float] = None - initial_stop_loss_pct: Optional[float] = None + stop_loss_abs: float | None = None + stop_loss_ratio: float | None = None + stop_loss_pct: float | None = None + stoploss_last_update: str | None = None + stoploss_last_update_timestamp: int | None = None + initial_stop_loss_abs: float | None = None + initial_stop_loss_ratio: float | None = None + initial_stop_loss_pct: float | None = None - min_rate: Optional[float] = None - max_rate: Optional[float] = None + min_rate: float | None = None + max_rate: float | None = None has_open_orders: bool orders: list[OrderSchema] - leverage: Optional[float] = None - interest_rate: Optional[float] = None - liquidation_price: Optional[float] = None - funding_fees: Optional[float] = None - trading_mode: Optional[TradingMode] = None + leverage: float | None = None + interest_rate: float | None = None + liquidation_price: float | None = None + funding_fees: float | None = None + trading_mode: TradingMode | None = None - amount_precision: Optional[float] = None - price_precision: Optional[float] = None - precision_mode: Optional[int] = None + amount_precision: float | None = None + price_precision: float | None = None + precision_mode: int | None = None class OpenTradeSchema(TradeSchema): - stoploss_current_dist: Optional[float] = None - stoploss_current_dist_pct: Optional[float] = None - stoploss_current_dist_ratio: Optional[float] = None - stoploss_entry_dist: Optional[float] = None - stoploss_entry_dist_ratio: Optional[float] = None + stoploss_current_dist: float | None = None + stoploss_current_dist_pct: float | None = None + stoploss_current_dist_ratio: float | None = None + stoploss_entry_dist: float | None = None + stoploss_entry_dist_ratio: float | None = None current_rate: float total_profit_abs: float - total_profit_fiat: Optional[float] = None - total_profit_ratio: Optional[float] = None + total_profit_fiat: float | None = None + total_profit_ratio: float | None = None class TradeResponse(BaseModel): @@ -358,7 +360,7 @@ class TradeResponse(BaseModel): total_trades: int -ForceEnterResponse = RootModel[Union[TradeSchema, StatusMsg]] +ForceEnterResponse = RootModel[TradeSchema | StatusMsg] class LockModel(BaseModel): @@ -370,7 +372,7 @@ class LockModel(BaseModel): lock_timestamp: int pair: str side: str - reason: Optional[str] = None + reason: str | None = None class Locks(BaseModel): @@ -382,12 +384,12 @@ class LocksPayload(BaseModel): pair: str side: str = "*" # Default to both sides until: AwareDatetime - reason: Optional[str] = None + reason: str | None = None class DeleteLockRequest(BaseModel): - pair: Optional[str] = None - lockid: Optional[int] = None + pair: str | None = None + lockid: int | None = None class Logs(BaseModel): @@ -398,17 +400,17 @@ class Logs(BaseModel): class ForceEnterPayload(BaseModel): pair: str side: SignalDirection = SignalDirection.LONG - price: Optional[float] = None - ordertype: Optional[OrderTypeValues] = None - stakeamount: Optional[float] = None - entry_tag: Optional[str] = None - leverage: Optional[float] = None + price: float | None = None + ordertype: OrderTypeValues | None = None + stakeamount: float | None = None + entry_tag: str | None = None + leverage: float | None = None class ForceExitPayload(BaseModel): - tradeid: Union[str, int] - ordertype: Optional[OrderTypeValues] = None - amount: Optional[float] = None + tradeid: str | int + ordertype: OrderTypeValues | None = None + amount: float | None = None class BlacklistPayload(BaseModel): @@ -430,7 +432,7 @@ class WhitelistResponse(BaseModel): class WhitelistEvaluateResponse(BackgroundTaskResult): - result: Optional[WhitelistResponse] = None + result: WhitelistResponse | None = None class DeleteTrade(BaseModel): @@ -445,7 +447,7 @@ class PlotConfig_(BaseModel): subplots: dict[str, Any] -PlotConfig = RootModel[Union[PlotConfig_, dict]] +PlotConfig = RootModel[PlotConfig_ | dict] class StrategyListResponse(BaseModel): @@ -482,6 +484,22 @@ class PairListsPayload(ExchangeModePayloadMixin, BaseModel): stake_currency: str +class DownloadDataPayload(ExchangeModePayloadMixin, BaseModel): + pairs: list[str] + timeframes: list[str] | None = DL_DATA_TIMEFRAMES + days: int | None = None + timerange: str | None = None + erase: bool = False + download_trades: bool = False + + @model_validator(mode="before") + def check_mutually_exclusive(cls, values): + timeframes, days = values.get("timerange"), values.get("days") + if timeframes and days: + raise ValueError("Only one of timeframes or days can be provided, not both.") + return values + + class FreqAIModelListResponse(BaseModel): freqaimodels: list[str] @@ -489,7 +507,7 @@ class FreqAIModelListResponse(BaseModel): class StrategyResponse(BaseModel): strategy: str code: str - timeframe: Optional[str] + timeframe: str | None class AvailablePairs(BaseModel): @@ -501,14 +519,14 @@ class AvailablePairs(BaseModel): class PairCandlesRequest(BaseModel): pair: str timeframe: str - limit: Optional[int] = None - columns: Optional[list[str]] = None + limit: int | None = None + columns: list[str] | None = None class PairHistoryRequest(PairCandlesRequest): timerange: str strategy: str - freqaimodel: Optional[str] = None + freqaimodel: str | None = None class PairHistory(BaseModel): @@ -540,16 +558,16 @@ class BacktestFreqAIInputs(BaseModel): class BacktestRequest(BaseModel): strategy: str - timeframe: Optional[str] = None - timeframe_detail: Optional[str] = None - timerange: Optional[str] = None - max_open_trades: Optional[IntOrInf] = None - stake_amount: Optional[Union[str, float]] = None + timeframe: str | None = None + timeframe_detail: str | None = None + timerange: str | None = None + max_open_trades: IntOrInf | None = None + stake_amount: str | float | None = None enable_protections: bool - dry_run_wallet: Optional[float] = None - backtest_cache: Optional[str] = None - freqaimodel: Optional[str] = None - freqai: Optional[BacktestFreqAIInputs] = None + dry_run_wallet: float | None = None + backtest_cache: str | None = None + freqaimodel: str | None = None + freqai: BacktestFreqAIInputs | None = None class BacktestResponse(BaseModel): @@ -558,9 +576,9 @@ class BacktestResponse(BaseModel): status_msg: str step: str progress: float - trade_count: Optional[float] = None + trade_count: float | None = None # TODO: Properly type backtestresult... - backtest_result: Optional[dict[str, Any]] = None + backtest_result: dict[str, Any] | None = None # TODO: This is a copy of BacktestHistoryEntryType @@ -569,11 +587,11 @@ class BacktestHistoryEntry(BaseModel): strategy: str run_id: str backtest_start_time: int - notes: Optional[str] = "" - backtest_start_ts: Optional[int] = None - backtest_end_ts: Optional[int] = None - timeframe: Optional[str] = None - timeframe_detail: Optional[str] = None + notes: str | None = "" + backtest_start_ts: int | None = None + backtest_end_ts: int | None = None + timeframe: str | None = None + timeframe_detail: str | None = None class BacktestMetadataUpdate(BaseModel): @@ -593,9 +611,9 @@ class SysInfo(BaseModel): class Health(BaseModel): - last_process: Optional[datetime] = None - last_process_ts: Optional[int] = None - bot_start: Optional[datetime] = None - bot_start_ts: Optional[int] = None - bot_startup: Optional[datetime] = None - bot_startup_ts: Optional[int] = None + last_process: datetime | None = None + last_process_ts: int | None = None + bot_start: datetime | None = None + bot_start_ts: int | None = None + bot_startup: datetime | None = None + bot_startup_ts: int | None = None diff --git a/freqtrade/rpc/api_server/api_v1.py b/freqtrade/rpc/api_server/api_v1.py index 936022109..5722ad157 100644 --- a/freqtrade/rpc/api_server/api_v1.py +++ b/freqtrade/rpc/api_server/api_v1.py @@ -1,6 +1,5 @@ import logging from copy import deepcopy -from typing import Optional from fastapi import APIRouter, Depends, Query from fastapi.exceptions import HTTPException @@ -84,7 +83,8 @@ logger = logging.getLogger(__name__) # 2.34: new entries/exits/mix_tags endpoints # 2.35: pair_candles and pair_history endpoints as Post variant # 2.40: Add hyperopt-loss endpoint -API_VERSION = 2.40 +# 2.41: Add download-data endpoint +API_VERSION = 2.41 # Public API, requires no auth. router_public = APIRouter() @@ -119,17 +119,17 @@ def count(rpc: RPC = Depends(get_rpc)): @router.get("/entries", response_model=list[Entry], tags=["info"]) -def entries(pair: Optional[str] = None, rpc: RPC = Depends(get_rpc)): +def entries(pair: str | None = None, rpc: RPC = Depends(get_rpc)): return rpc._rpc_enter_tag_performance(pair) @router.get("/exits", response_model=list[Exit], tags=["info"]) -def exits(pair: Optional[str] = None, rpc: RPC = Depends(get_rpc)): +def exits(pair: str | None = None, rpc: RPC = Depends(get_rpc)): return rpc._rpc_exit_reason_performance(pair) @router.get("/mix_tags", response_model=list[MixTag], tags=["info"]) -def mix_tags(pair: Optional[str] = None, rpc: RPC = Depends(get_rpc)): +def mix_tags(pair: str | None = None, rpc: RPC = Depends(get_rpc)): return rpc._rpc_mix_tag_performance(pair) @@ -216,7 +216,7 @@ def edge(rpc: RPC = Depends(get_rpc)): @router.get("/show_config", response_model=ShowConfig, tags=["info"]) -def show_config(rpc: Optional[RPC] = Depends(get_rpc_optional), config=Depends(get_config)): +def show_config(rpc: RPC | None = Depends(get_rpc_optional), config=Depends(get_config)): state = "" strategy_version = None if rpc: @@ -304,7 +304,7 @@ def add_locks(payload: list[LocksPayload], rpc: RPC = Depends(get_rpc)): @router.get("/logs", response_model=Logs, tags=["info"]) -def logs(limit: Optional[int] = None): +def logs(limit: int | None = None): return RPC._rpc_get_logs(limit) @@ -330,9 +330,7 @@ def reload_config(rpc: RPC = Depends(get_rpc)): @router.get("/pair_candles", response_model=PairHistory, tags=["candle data"]) -def pair_candles( - pair: str, timeframe: str, limit: Optional[int] = None, rpc: RPC = Depends(get_rpc) -): +def pair_candles(pair: str, timeframe: str, limit: int | None = None, rpc: RPC = Depends(get_rpc)): return rpc._rpc_analysed_dataframe(pair, timeframe, limit, None) @@ -350,7 +348,7 @@ def pair_history( timeframe: str, timerange: str, strategy: str, - freqaimodel: Optional[str] = None, + freqaimodel: str | None = None, config=Depends(get_config), exchange=Depends(get_exchange), ): @@ -396,9 +394,9 @@ def pair_history_filtered( @router.get("/plot_config", response_model=PlotConfig, tags=["candle data"]) def plot_config( - strategy: Optional[str] = None, + strategy: str | None = None, config=Depends(get_config), - rpc: Optional[RPC] = Depends(get_rpc_optional), + rpc: RPC | None = Depends(get_rpc_optional), ): if not strategy: if not rpc: @@ -494,9 +492,9 @@ def list_freqaimodels(config=Depends(get_config)): @router.get("/available_pairs", response_model=AvailablePairs, tags=["candle data"]) def list_available_pairs( - timeframe: Optional[str] = None, - stake_currency: Optional[str] = None, - candletype: Optional[CandleType] = None, + timeframe: str | None = None, + stake_currency: str | None = None, + candletype: CandleType | None = None, config=Depends(get_config), ): dh = get_datahandler(config["datadir"], config.get("dataformat_ohlcv")) diff --git a/freqtrade/rpc/api_server/deps.py b/freqtrade/rpc/api_server/deps.py index 997e8487b..74ee82a8c 100644 --- a/freqtrade/rpc/api_server/deps.py +++ b/freqtrade/rpc/api_server/deps.py @@ -1,5 +1,5 @@ from collections.abc import AsyncIterator -from typing import Any, Optional +from typing import Any from uuid import uuid4 from fastapi import Depends, HTTPException @@ -14,13 +14,13 @@ from freqtrade.rpc.rpc import RPC, RPCException from .webserver import ApiServer -def get_rpc_optional() -> Optional[RPC]: +def get_rpc_optional() -> RPC | None: if ApiServer._has_rpc: return ApiServer._rpc return None -async def get_rpc() -> Optional[AsyncIterator[RPC]]: +async def get_rpc() -> AsyncIterator[RPC] | None: _rpc = get_rpc_optional() if _rpc: request_id = str(uuid4()) diff --git a/freqtrade/rpc/api_server/web_ui.py b/freqtrade/rpc/api_server/web_ui.py index bf37c6fa7..0a8a73011 100644 --- a/freqtrade/rpc/api_server/web_ui.py +++ b/freqtrade/rpc/api_server/web_ui.py @@ -1,5 +1,4 @@ from pathlib import Path -from typing import Optional from fastapi import APIRouter from fastapi.exceptions import HTTPException @@ -42,7 +41,7 @@ async def index_html(rest_of_path: str): filename = uibase / rest_of_path # It's security relevant to check "relative_to". # Without this, Directory-traversal is possible. - media_type: Optional[str] = None + media_type: str | None = None if filename.suffix == ".js": # Force text/javascript for .js files - Circumvent faulty system configuration media_type = "application/javascript" diff --git a/freqtrade/rpc/api_server/webserver.py b/freqtrade/rpc/api_server/webserver.py index c96db9981..e06e77e1e 100644 --- a/freqtrade/rpc/api_server/webserver.py +++ b/freqtrade/rpc/api_server/webserver.py @@ -1,6 +1,6 @@ import logging from ipaddress import ip_address -from typing import Any, Optional +from typing import Any import orjson import uvicorn @@ -12,6 +12,7 @@ from freqtrade.configuration import running_in_docker from freqtrade.constants import Config from freqtrade.exceptions import OperationalException from freqtrade.rpc.api_server.uvicorn_threaded import UvicornServer +from freqtrade.rpc.api_server.webserver_bgwork import ApiBG from freqtrade.rpc.api_server.ws.message_stream import MessageStream from freqtrade.rpc.rpc import RPC, RPCException, RPCHandler from freqtrade.rpc.rpc_types import RPCSendMsg @@ -39,7 +40,7 @@ class ApiServer(RPCHandler): _has_rpc: bool = False _config: Config = {} # websocket message stuff - _message_stream: Optional[MessageStream] = None + _message_stream: MessageStream | None = None def __new__(cls, *args, **kwargs): """ @@ -86,6 +87,8 @@ class ApiServer(RPCHandler): """Cleanup pending module resources""" ApiServer._has_rpc = False del ApiServer._rpc + ApiBG.exchanges = {} + ApiBG.jobs = {} if self._server and not self._standalone: logger.info("Stopping API Server") # self._server.force_exit, self._server.should_exit = True, True @@ -116,6 +119,7 @@ class ApiServer(RPCHandler): from freqtrade.rpc.api_server.api_auth import http_basic_or_jwt_token, router_login from freqtrade.rpc.api_server.api_background_tasks import router as api_bg_tasks from freqtrade.rpc.api_server.api_backtest import router as api_backtest + from freqtrade.rpc.api_server.api_download_data import router as api_download_data from freqtrade.rpc.api_server.api_pairlists import router as api_pairlists from freqtrade.rpc.api_server.api_v1 import router as api_v1 from freqtrade.rpc.api_server.api_v1 import router_public as api_v1_public @@ -146,6 +150,11 @@ class ApiServer(RPCHandler): prefix="/api/v1", dependencies=[Depends(http_basic_or_jwt_token), Depends(is_webserver_mode)], ) + app.include_router( + api_download_data, + prefix="/api/v1", + dependencies=[Depends(http_basic_or_jwt_token), Depends(is_webserver_mode)], + ) app.include_router(ws_router, prefix="/api/v1") # UI Router MUST be last! app.include_router(router_ui, prefix="") diff --git a/freqtrade/rpc/api_server/webserver_bgwork.py b/freqtrade/rpc/api_server/webserver_bgwork.py index dc8222490..4c335a2f2 100644 --- a/freqtrade/rpc/api_server/webserver_bgwork.py +++ b/freqtrade/rpc/api_server/webserver_bgwork.py @@ -1,16 +1,25 @@ -from typing import Any, Literal, Optional, TypedDict +from typing import Any, Literal from uuid import uuid4 +from typing_extensions import NotRequired, TypedDict + from freqtrade.exchange.exchange import Exchange +class ProgressTask(TypedDict): + progress: float + total: float + description: str + + class JobsContainer(TypedDict): - category: Literal["pairlist"] + category: Literal["pairlist", "download_data"] is_running: bool status: str - progress: Optional[float] + progress: float | None + progress_tasks: NotRequired[dict[str, ProgressTask]] result: Any - error: Optional[str] + error: str | None class ApiBG: @@ -32,6 +41,7 @@ class ApiBG: jobs: dict[str, JobsContainer] = {} # Pairlist evaluate things pairlist_running: bool = False + download_data_running: bool = False @staticmethod def get_job_id() -> str: diff --git a/freqtrade/rpc/api_server/ws/channel.py b/freqtrade/rpc/api_server/ws/channel.py index 5acbebe9f..d05a1c1f7 100644 --- a/freqtrade/rpc/api_server/ws/channel.py +++ b/freqtrade/rpc/api_server/ws/channel.py @@ -4,7 +4,7 @@ import time from collections import deque from collections.abc import AsyncIterator from contextlib import asynccontextmanager -from typing import Any, Optional, Union +from typing import Any from uuid import uuid4 from fastapi import WebSocketDisconnect @@ -30,7 +30,7 @@ class WebSocketChannel: def __init__( self, websocket: WebSocketType, - channel_id: Optional[str] = None, + channel_id: str | None = None, serializer_cls: type[WebSocketSerializer] = HybridJSONWebSocketSerializer, send_throttle: float = 0.01, ): @@ -80,9 +80,7 @@ class WebSocketChannel: # maximum of 3 seconds per message self._send_high_limit = min(max(self.avg_send_time * 2, 1), 3) - async def send( - self, message: Union[WSMessageSchemaType, dict[str, Any]], use_timeout: bool = False - ): + async def send(self, message: WSMessageSchemaType | dict[str, Any], use_timeout: bool = False): """ Send a message on the wrapped websocket. If the sending takes too long, it will raise a TimeoutError and diff --git a/freqtrade/rpc/api_server/ws/proxy.py b/freqtrade/rpc/api_server/ws/proxy.py index a2c2cbafc..c32494176 100644 --- a/freqtrade/rpc/api_server/ws/proxy.py +++ b/freqtrade/rpc/api_server/ws/proxy.py @@ -1,7 +1,7 @@ -from typing import Any, Union +from typing import Any from fastapi import WebSocket as FastAPIWebSocket -from websockets.client import WebSocketClientProtocol as WebSocket +from websockets.asyncio.client import ClientConnection as WebSocket from freqtrade.rpc.api_server.ws.types import WebSocketType @@ -13,7 +13,7 @@ class WebSocketProxy: """ def __init__(self, websocket: WebSocketType): - self._websocket: Union[FastAPIWebSocket, WebSocket] = websocket + self._websocket: FastAPIWebSocket | WebSocket = websocket @property def raw_websocket(self): diff --git a/freqtrade/rpc/api_server/ws/serializer.py b/freqtrade/rpc/api_server/ws/serializer.py index a93a776cc..cee7da124 100644 --- a/freqtrade/rpc/api_server/ws/serializer.py +++ b/freqtrade/rpc/api_server/ws/serializer.py @@ -1,6 +1,6 @@ import logging from abc import ABC, abstractmethod -from typing import Any, Union +from typing import Any import orjson import rapidjson @@ -26,7 +26,7 @@ class WebSocketSerializer(ABC): def _deserialize(self, data): raise NotImplementedError() - async def send(self, data: Union[WSMessageSchemaType, dict[str, Any]]): + async def send(self, data: WSMessageSchemaType | dict[str, Any]): await self._websocket.send(self._serialize(data)) async def recv(self) -> bytes: diff --git a/freqtrade/rpc/api_server/ws/types.py b/freqtrade/rpc/api_server/ws/types.py index 8f7dad33b..7ce2eb4bf 100644 --- a/freqtrade/rpc/api_server/ws/types.py +++ b/freqtrade/rpc/api_server/ws/types.py @@ -1,7 +1,7 @@ from typing import Any, TypeVar from fastapi import WebSocket as FastAPIWebSocket -from websockets.client import WebSocketClientProtocol as WebSocket +from websockets.asyncio.client import ClientConnection as WebSocket WebSocketType = TypeVar("WebSocketType", FastAPIWebSocket, WebSocket) diff --git a/freqtrade/rpc/api_server/ws_schemas.py b/freqtrade/rpc/api_server/ws_schemas.py index 5eb8f1812..3f9e80eea 100644 --- a/freqtrade/rpc/api_server/ws_schemas.py +++ b/freqtrade/rpc/api_server/ws_schemas.py @@ -1,5 +1,5 @@ from datetime import datetime -from typing import Any, Optional, TypedDict +from typing import Any, TypedDict from pandas import DataFrame from pydantic import BaseModel, ConfigDict @@ -14,18 +14,18 @@ class BaseArbitraryModel(BaseModel): class WSRequestSchema(BaseArbitraryModel): type: RPCRequestType - data: Optional[Any] = None + data: Any | None = None class WSMessageSchemaType(TypedDict): # Type for typing to avoid doing pydantic typechecks. type: RPCMessageType - data: Optional[dict[str, Any]] + data: dict[str, Any] | None class WSMessageSchema(BaseArbitraryModel): type: RPCMessageType - data: Optional[Any] = None + data: Any | None = None model_config = ConfigDict(extra="allow") diff --git a/freqtrade/rpc/external_message_consumer.py b/freqtrade/rpc/external_message_consumer.py index e08553fab..fe22613bd 100644 --- a/freqtrade/rpc/external_message_consumer.py +++ b/freqtrade/rpc/external_message_consumer.py @@ -8,8 +8,9 @@ from it import asyncio import logging import socket +from collections.abc import Callable from threading import Thread -from typing import Any, Callable, TypedDict, Union +from typing import Any, TypedDict import websockets from pydantic import ValidationError @@ -42,7 +43,7 @@ class Producer(TypedDict): logger = logging.getLogger(__name__) -def schema_to_dict(schema: Union[WSMessageSchema, WSRequestSchema]): +def schema_to_dict(schema: WSMessageSchema | WSRequestSchema): return schema.model_dump(exclude_none=True) @@ -212,8 +213,7 @@ class ExternalMessageConsumer: except ( socket.gaierror, ConnectionRefusedError, - websockets.exceptions.InvalidStatusCode, - websockets.exceptions.InvalidMessage, + websockets.exceptions.InvalidHandshake, ) as e: logger.error(f"Connection Refused - {e} retrying in {self.sleep_time}s") await asyncio.sleep(self.sleep_time) @@ -282,9 +282,7 @@ class ExternalMessageConsumer: logger.debug(e, exc_info=e) raise - def send_producer_request( - self, producer_name: str, request: Union[WSRequestSchema, dict[str, Any]] - ): + def send_producer_request(self, producer_name: str, request: WSRequestSchema | dict[str, Any]): """ Publish a message to the producer's message stream to be sent by the channel task. diff --git a/freqtrade/rpc/rpc.py b/freqtrade/rpc/rpc.py index c3bcfd9f1..afa8baea2 100644 --- a/freqtrade/rpc/rpc.py +++ b/freqtrade/rpc/rpc.py @@ -7,7 +7,7 @@ from abc import abstractmethod from collections.abc import Generator, Sequence from datetime import date, datetime, timedelta, timezone from math import isnan -from typing import Any, Optional, Union +from typing import Any, cast import psutil from dateutil.relativedelta import relativedelta @@ -32,7 +32,7 @@ from freqtrade.enums import ( ) from freqtrade.exceptions import ExchangeError, PricingError from freqtrade.exchange import timeframe_to_minutes, timeframe_to_msecs -from freqtrade.exchange.exchange_types import Tickers +from freqtrade.exchange.exchange_types import Ticker, Tickers from freqtrade.loggers import bufferHandler from freqtrade.persistence import KeyStoreKeys, KeyValueStore, PairLocks, Trade from freqtrade.persistence.models import PairLock @@ -97,7 +97,7 @@ class RPC: """ # Bind _fiat_converter if needed - _fiat_converter: Optional[CryptoToFiatConverter] = None + _fiat_converter: CryptoToFiatConverter | None = None def __init__(self, freqtrade) -> None: """ @@ -112,7 +112,7 @@ class RPC: @staticmethod def _rpc_show_config( - config, botstate: Union[State, str], strategy_version: Optional[str] = None + config, botstate: State | str, strategy_version: str | None = None ) -> dict[str, Any]: """ Return a dict of config options. @@ -168,7 +168,7 @@ class RPC: } return val - def _rpc_trade_status(self, trade_ids: Optional[list[int]] = None) -> list[dict[str, Any]]: + def _rpc_trade_status(self, trade_ids: list[int] | None = None) -> list[dict[str, Any]]: """ Below follows the RPC backend it is prefixed with rpc_ to raise awareness that it is a remotely exposed function @@ -184,11 +184,11 @@ class RPC: else: results = [] for trade in trades: - current_profit_fiat: Optional[float] = None - total_profit_fiat: Optional[float] = None + current_profit_fiat: float | None = None + total_profit_fiat: float | None = None # prepare open orders details - oo_details: Optional[str] = "" + oo_details: str | None = "" oo_details_lst = [ f"({oo.order_type} {oo.side} rem={oo.safe_remaining:.8f})" for oo in trade.open_orders @@ -197,7 +197,7 @@ class RPC: oo_details = ", ".join(oo_details_lst) total_profit_abs = 0.0 - total_profit_ratio: Optional[float] = None + total_profit_ratio: float | None = None # calculate profit and send message to user if trade.is_open: try: @@ -487,7 +487,7 @@ class RPC: return {"exit_reasons": exit_reasons, "durations": durations} def _rpc_trade_statistics( - self, stake_currency: str, fiat_display_currency: str, start_date: Optional[datetime] = None + self, stake_currency: str, fiat_display_currency: str, start_date: datetime | None = None ) -> dict[str, Any]: """Returns cumulative profit statistics""" @@ -670,7 +670,7 @@ class RPC: } def __balance_get_est_stake( - self, coin: str, stake_currency: str, amount: float, balance: Wallet, tickers + self, coin: str, stake_currency: str, amount: float, balance: Wallet, tickers: Tickers ) -> tuple[float, float]: est_stake = 0.0 est_bot_stake = 0.0 @@ -682,7 +682,7 @@ class RPC: est_bot_stake = amount else: pair = self._freqtrade.exchange.get_valid_pair_combination(coin, stake_currency) - rate: Optional[float] = tickers.get(pair, {}).get("last", None) + rate: float | None = cast(Ticker, tickers.get(pair, {})).get("last", None) if rate: if pair.startswith(stake_currency) and not pair.endswith(stake_currency): rate = 1.0 / rate @@ -851,7 +851,7 @@ class RPC: return {"status": "Reloaded from orders from exchange"} def __exec_force_exit( - self, trade: Trade, ordertype: Optional[str], amount: Optional[float] = None + self, trade: Trade, ordertype: str | None, amount: float | None = None ) -> bool: # Check if there is there are open orders trade_entry_cancelation_registry = [] @@ -882,7 +882,7 @@ class RPC: order_type = ordertype or self._freqtrade.strategy.order_types.get( "force_exit", self._freqtrade.strategy.order_types["exit"] ) - sub_amount: Optional[float] = None + sub_amount: float | None = None if amount and amount < trade.amount: # Partial exit ... min_exit_stake = self._freqtrade.exchange.get_min_pair_stake_amount( @@ -901,7 +901,7 @@ class RPC: return False def _rpc_force_exit( - self, trade_id: str, ordertype: Optional[str] = None, *, amount: Optional[float] = None + self, trade_id: str, ordertype: str | None = None, *, amount: float | None = None ) -> dict[str, str]: """ Handler for forceexit . @@ -960,14 +960,14 @@ class RPC: def _rpc_force_entry( self, pair: str, - price: Optional[float], + price: float | None, *, - order_type: Optional[str] = None, + order_type: str | None = None, order_side: SignalDirection = SignalDirection.LONG, - stake_amount: Optional[float] = None, - enter_tag: Optional[str] = "force_entry", - leverage: Optional[float] = None, - ) -> Optional[Trade]: + stake_amount: float | None = None, + enter_tag: str | None = "force_entry", + leverage: float | None = None, + ) -> Trade | None: """ Handler for forcebuy Buys a pair trade at the given or current price @@ -977,7 +977,7 @@ class RPC: # check if valid pair # check if pair already has an open pair - trade: Optional[Trade] = Trade.get_trades( + trade: Trade | None = Trade.get_trades( [Trade.is_open.is_(True), Trade.pair == pair] ).first() is_short = order_side == SignalDirection.SHORT @@ -1052,7 +1052,7 @@ class RPC: ) Trade.commit() - def _rpc_delete(self, trade_id: int) -> dict[str, Union[str, int]]: + def _rpc_delete(self, trade_id: int) -> dict[str, str | int]: """ Handler for delete . Delete the given trade and close eventually existing open orders. @@ -1093,7 +1093,7 @@ class RPC: "cancel_order_count": c_count, } - def _rpc_list_custom_data(self, trade_id: int, key: Optional[str]) -> list[dict[str, Any]]: + def _rpc_list_custom_data(self, trade_id: int, key: str | None) -> list[dict[str, Any]]: # Query for trade trade = Trade.get_trades(trade_filter=[Trade.id == trade_id]).first() if trade is None: @@ -1128,21 +1128,21 @@ class RPC: return pair_rates - def _rpc_enter_tag_performance(self, pair: Optional[str]) -> list[dict[str, Any]]: + def _rpc_enter_tag_performance(self, pair: str | None) -> list[dict[str, Any]]: """ Handler for buy tag performance. Shows a performance statistic from finished trades """ return Trade.get_enter_tag_performance(pair) - def _rpc_exit_reason_performance(self, pair: Optional[str]) -> list[dict[str, Any]]: + def _rpc_exit_reason_performance(self, pair: str | None) -> list[dict[str, Any]]: """ Handler for exit reason performance. Shows a performance statistic from finished trades """ return Trade.get_exit_reason_performance(pair) - def _rpc_mix_tag_performance(self, pair: Optional[str]) -> list[dict[str, Any]]: + def _rpc_mix_tag_performance(self, pair: str | None) -> list[dict[str, Any]]: """ Handler for mix tag (enter_tag + exit_reason) performance. Shows a performance statistic from finished trades @@ -1174,7 +1174,7 @@ class RPC: return {"lock_count": len(locks), "locks": [lock.to_json() for lock in locks]} def _rpc_delete_lock( - self, lockid: Optional[int] = None, pair: Optional[str] = None + self, lockid: int | None = None, pair: str | None = None ) -> dict[str, Any]: """Delete specific lock(s)""" locks: Sequence[PairLock] = [] @@ -1192,9 +1192,7 @@ class RPC: return self._rpc_locks() - def _rpc_add_lock( - self, pair: str, until: datetime, reason: Optional[str], side: str - ) -> PairLock: + def _rpc_add_lock(self, pair: str, until: datetime, reason: str | None, side: str) -> PairLock: lock = PairLocks.lock_pair( pair=pair, until=until, @@ -1224,7 +1222,7 @@ class RPC: resp["errors"] = errors return resp - def _rpc_blacklist(self, add: Optional[list[str]] = None) -> dict: + def _rpc_blacklist(self, add: list[str] | None = None) -> dict: """Returns the currently active blacklist""" errors = {} if add: @@ -1249,7 +1247,7 @@ class RPC: return res @staticmethod - def _rpc_get_logs(limit: Optional[int]) -> dict[str, Any]: + def _rpc_get_logs(limit: int | None) -> dict[str, Any]: """Returns the last X logs""" if limit: buffer = bufferHandler.buffer[-limit:] @@ -1286,7 +1284,7 @@ class RPC: timeframe: str, dataframe: DataFrame, last_analyzed: datetime, - selected_cols: Optional[list[str]], + selected_cols: list[str] | None, ) -> dict[str, Any]: has_content = len(dataframe) != 0 dataframe_columns = list(dataframe.columns) @@ -1355,7 +1353,7 @@ class RPC: return res def _rpc_analysed_dataframe( - self, pair: str, timeframe: str, limit: Optional[int], selected_cols: Optional[list[str]] + self, pair: str, timeframe: str, limit: int | None, selected_cols: list[str] | None ) -> dict[str, Any]: """Analyzed dataframe in Dict form""" @@ -1365,7 +1363,7 @@ class RPC: ) def __rpc_analysed_dataframe_raw( - self, pair: str, timeframe: str, limit: Optional[int] + self, pair: str, timeframe: str, limit: int | None ) -> tuple[DataFrame, datetime]: """ Get the dataframe and last analyze from the dataprovider @@ -1383,7 +1381,7 @@ class RPC: return _data, last_analyzed def _ws_all_analysed_dataframes( - self, pairlist: list[str], limit: Optional[int] + self, pairlist: list[str], limit: int | None ) -> Generator[dict[str, Any], None, None]: """ Get the analysed dataframes of each pair in the pairlist. @@ -1403,7 +1401,7 @@ class RPC: yield {"key": (pair, timeframe, candle_type), "df": dataframe, "la": last_analyzed} - def _ws_request_analyzed_df(self, limit: Optional[int] = None, pair: Optional[str] = None): + def _ws_request_analyzed_df(self, limit: int | None = None, pair: str | None = None): """Historical Analyzed Dataframes for WebSocket""" pairlist = [pair] if pair else self._freqtrade.active_pair_whitelist @@ -1415,7 +1413,7 @@ class RPC: @staticmethod def _rpc_analysed_history_full( - config: Config, pair: str, timeframe: str, exchange, selected_cols: Optional[list[str]] + config: Config, pair: str, timeframe: str, exchange, selected_cols: list[str] | None ) -> dict[str, Any]: timerange_parsed = TimeRange.parse_timerange(config.get("timerange")) @@ -1482,9 +1480,9 @@ class RPC: "ram_pct": psutil.virtual_memory().percent, } - def health(self) -> dict[str, Optional[Union[str, int]]]: + def health(self) -> dict[str, str | int | None]: last_p = self._freqtrade.last_process - res: dict[str, Union[None, str, int]] = { + res: dict[str, None | str | int] = { "last_process": None, "last_process_loc": None, "last_process_ts": None, diff --git a/freqtrade/rpc/rpc_types.py b/freqtrade/rpc/rpc_types.py index 0fa4cea75..ad6138a91 100644 --- a/freqtrade/rpc/rpc_types.py +++ b/freqtrade/rpc/rpc_types.py @@ -1,5 +1,5 @@ from datetime import datetime -from typing import Any, Literal, Optional, TypedDict, Union +from typing import Any, Literal, TypedDict from freqtrade.constants import PairWithTimeframe from freqtrade.enums import RPCMessageType @@ -31,7 +31,7 @@ class RPCProtectionMsg(RPCSendMsgBase): type: Literal[RPCMessageType.PROTECTION_TRIGGER, RPCMessageType.PROTECTION_TRIGGER_GLOBAL] id: int pair: str - base_currency: Optional[str] + base_currency: str | None lock_time: str lock_timestamp: int lock_end_time: str @@ -48,23 +48,23 @@ class RPCWhitelistMsg(RPCSendMsgBase): class __RPCEntryExitMsgBase(RPCSendMsgBase): trade_id: int - buy_tag: Optional[str] - enter_tag: Optional[str] + buy_tag: str | None + enter_tag: str | None exchange: str pair: str base_currency: str quote_currency: str - leverage: Optional[float] + leverage: float | None direction: str limit: float open_rate: float order_type: str stake_amount: float stake_currency: str - fiat_currency: Optional[str] + fiat_currency: str | None amount: float open_date: datetime - current_rate: Optional[float] + current_rate: float | None sub_trade: bool @@ -84,11 +84,11 @@ class RPCExitMsg(__RPCEntryExitMsgBase): close_rate: float profit_amount: float profit_ratio: float - exit_reason: Optional[str] + exit_reason: str | None close_date: datetime - # current_rate: Optional[float] - order_rate: Optional[float] - final_profit_ratio: Optional[float] + # current_rate: float | None + order_rate: float | None + final_profit_ratio: float | None is_final_exit: bool @@ -98,7 +98,7 @@ class RPCExitCancelMsg(__RPCEntryExitMsgBase): gain: ProfitLossStr profit_amount: float profit_ratio: float - exit_reason: Optional[str] + exit_reason: str | None close_date: datetime @@ -122,18 +122,18 @@ class RPCNewCandleMsg(RPCSendMsgBase): data: PairWithTimeframe -RPCOrderMsg = Union[RPCEntryMsg, RPCExitMsg, RPCExitCancelMsg, RPCCancelMsg] +RPCOrderMsg = RPCEntryMsg | RPCExitMsg | RPCExitCancelMsg | RPCCancelMsg -RPCSendMsg = Union[ - RPCStatusMsg, - RPCStrategyMsg, - RPCProtectionMsg, - RPCWhitelistMsg, - RPCEntryMsg, - RPCCancelMsg, - RPCExitMsg, - RPCExitCancelMsg, - RPCAnalyzedDFMsg, - RPCNewCandleMsg, -] +RPCSendMsg = ( + RPCStatusMsg + | RPCStrategyMsg + | RPCProtectionMsg + | RPCWhitelistMsg + | RPCEntryMsg + | RPCCancelMsg + | RPCExitMsg + | RPCExitCancelMsg + | RPCAnalyzedDFMsg + | RPCNewCandleMsg +) diff --git a/freqtrade/rpc/telegram.py b/freqtrade/rpc/telegram.py index 2de4499f1..1b5653b1d 100644 --- a/freqtrade/rpc/telegram.py +++ b/freqtrade/rpc/telegram.py @@ -8,7 +8,7 @@ import asyncio import json import logging import re -from collections.abc import Coroutine +from collections.abc import Callable, Coroutine from copy import deepcopy from dataclasses import dataclass from datetime import date, datetime, timedelta @@ -17,7 +17,7 @@ from html import escape from itertools import chain from math import isnan from threading import Thread -from typing import Any, Callable, Literal, Optional, Union +from typing import Any, Literal from tabulate import tabulate from telegram import ( @@ -41,7 +41,14 @@ from freqtrade.misc import chunks, plural from freqtrade.persistence import Trade from freqtrade.rpc import RPC, RPCException, RPCHandler from freqtrade.rpc.rpc_types import RPCEntryMsg, RPCExitMsg, RPCOrderMsg, RPCSendMsg -from freqtrade.util import dt_from_ts, dt_humanize_delta, fmt_coin, format_date, round_value +from freqtrade.util import ( + dt_from_ts, + dt_humanize_delta, + fmt_coin, + fmt_coin2, + format_date, + round_value, +) MAX_MESSAGE_LENGTH = MessageLimit.MAX_TEXT_LENGTH @@ -146,7 +153,7 @@ class Telegram(RPCHandler): Validates the keyboard configuration from telegram config section. """ - self._keyboard: list[list[Union[str, KeyboardButton]]] = [ + self._keyboard: list[list[str | KeyboardButton]] = [ ["/daily", "/profit", "/balance"], ["/status", "/status table", "/performance"], ["/count", "/start", "/stop", "/help"], @@ -399,10 +406,10 @@ class Telegram(RPCHandler): if msg.get("leverage") and msg.get("leverage", 1.0) != 1.0: message += f" ({msg['leverage']:.3g}x)" message += "`\n" - message += f"*Open Rate:* `{round_value(msg['open_rate'], 8)} {msg['quote_currency']}`\n" + message += f"*Open Rate:* `{fmt_coin2(msg['open_rate'], msg['quote_currency'])}`\n" if msg["type"] == RPCMessageType.ENTRY and msg["current_rate"]: message += ( - f"*Current Rate:* `{round_value(msg['current_rate'], 8)} {msg['quote_currency']}`\n" + f"*Current Rate:* `{fmt_coin2(msg['current_rate'], msg['quote_currency'])}`\n" ) profit_fiat_extra = self.__format_profit_fiat(msg, "stake_amount") # type: ignore @@ -467,14 +474,16 @@ class Telegram(RPCHandler): f"*Direction:* `{msg['direction']}" f"{leverage_text}`\n" f"*Amount:* `{round_value(msg['amount'], 8)}`\n" - f"*Open Rate:* `{fmt_coin(msg['open_rate'], msg['quote_currency'])}`\n" + f"*Open Rate:* `{fmt_coin2(msg['open_rate'], msg['quote_currency'])}`\n" ) if msg["type"] == RPCMessageType.EXIT and msg["current_rate"]: - message += f"*Current Rate:* `{fmt_coin(msg['current_rate'], msg['quote_currency'])}`\n" + message += ( + f"*Current Rate:* `{fmt_coin2(msg['current_rate'], msg['quote_currency'])}`\n" + ) if msg["order_rate"]: - message += f"*Exit Rate:* `{fmt_coin(msg['order_rate'], msg['quote_currency'])}`" + message += f"*Exit Rate:* `{fmt_coin2(msg['order_rate'], msg['quote_currency'])}`" elif msg["type"] == RPCMessageType.EXIT_FILL: - message += f"*Exit Rate:* `{fmt_coin(msg['close_rate'], msg['quote_currency'])}`" + message += f"*Exit Rate:* `{fmt_coin2(msg['close_rate'], msg['quote_currency'])}`" if is_sub_trade: stake_amount_fiat = self.__format_profit_fiat(msg, "stake_amount") @@ -499,7 +508,7 @@ class Telegram(RPCHandler): profit_fiat_extra = f" / {profit_fiat:.3f} {fiat_currency}" return profit_fiat_extra - def compose_message(self, msg: RPCSendMsg) -> Optional[str]: + def compose_message(self, msg: RPCSendMsg) -> str | None: if msg["type"] == RPCMessageType.ENTRY or msg["type"] == RPCMessageType.ENTRY_FILL: message = self._format_entry_msg(msg) @@ -547,21 +556,22 @@ class Telegram(RPCHandler): return None return message - def send_msg(self, msg: RPCSendMsg) -> None: - """Send a message to telegram channel""" - + def _message_loudness(self, msg: RPCSendMsg) -> str: + """Determine the loudness of the message - on, off or silent""" default_noti = "on" msg_type = msg["type"] noti = "" - if msg["type"] == RPCMessageType.EXIT: + if msg["type"] == RPCMessageType.EXIT or msg["type"] == RPCMessageType.EXIT_FILL: sell_noti = ( self._config["telegram"].get("notification_settings", {}).get(str(msg_type), {}) ) + # For backward compatibility sell still can be string if isinstance(sell_noti, str): noti = sell_noti else: + default_noti = sell_noti.get("*", default_noti) noti = sell_noti.get(str(msg["exit_reason"]), default_noti) else: noti = ( @@ -570,8 +580,14 @@ class Telegram(RPCHandler): .get(str(msg_type), default_noti) ) + return noti + + def send_msg(self, msg: RPCSendMsg) -> None: + """Send a message to telegram channel""" + noti = self._message_loudness(msg) + if noti == "off": - logger.info(f"Notification '{msg_type}' not sent.") + logger.info(f"Notification '{msg['type']}' not sent.") # Notification disabled return @@ -1301,7 +1317,7 @@ class Telegram(RPCHandler): await query.answer() await query.edit_message_text(text="Force exit canceled.") return - trade: Optional[Trade] = Trade.get_trades(trade_filter=Trade.id == trade_id).first() + trade: Trade | None = Trade.get_trades(trade_filter=Trade.id == trade_id).first() await query.answer() if trade: await query.edit_message_text( @@ -1311,7 +1327,7 @@ class Telegram(RPCHandler): else: await query.edit_message_text(text=f"Trade {trade_id} not found.") - async def _force_enter_action(self, pair, price: Optional[float], order_side: SignalDirection): + async def _force_enter_action(self, pair, price: float | None, order_side: SignalDirection): if pair != "cancel": try: @@ -1999,10 +2015,10 @@ class Telegram(RPCHandler): msg: str, parse_mode: str = ParseMode.MARKDOWN, disable_notification: bool = False, - keyboard: Optional[list[list[InlineKeyboardButton]]] = None, + keyboard: list[list[InlineKeyboardButton]] | None = None, callback_path: str = "", reload_able: bool = False, - query: Optional[CallbackQuery] = None, + query: CallbackQuery | None = None, ) -> None: """ Send given markdown message @@ -2011,7 +2027,7 @@ class Telegram(RPCHandler): :param parse_mode: telegram parse mode :return: None """ - reply_markup: Union[InlineKeyboardMarkup, ReplyKeyboardMarkup] + reply_markup: InlineKeyboardMarkup | ReplyKeyboardMarkup if query: await self._update_msg( query=query, diff --git a/freqtrade/rpc/webhook.py b/freqtrade/rpc/webhook.py index 640d5ea63..b1a96a872 100644 --- a/freqtrade/rpc/webhook.py +++ b/freqtrade/rpc/webhook.py @@ -4,7 +4,7 @@ This module manages webhook communication import logging import time -from typing import Any, Optional +from typing import Any from requests import RequestException, post @@ -44,7 +44,7 @@ class Webhook(RPCHandler): """ pass - def _get_value_dict(self, msg: RPCSendMsg) -> Optional[dict[str, Any]]: + def _get_value_dict(self, msg: RPCSendMsg) -> dict[str, Any] | None: whconfig = self._config["webhook"] if msg["type"].value in whconfig: # Explicit types should have priority diff --git a/freqtrade/strategy/hyper.py b/freqtrade/strategy/hyper.py index ffc4abb50..6281ab754 100644 --- a/freqtrade/strategy/hyper.py +++ b/freqtrade/strategy/hyper.py @@ -6,7 +6,7 @@ This module defines a base class for auto-hyperoptable strategies. import logging from collections.abc import Iterator from pathlib import Path -from typing import Any, Optional, Union +from typing import Any from freqtrade.constants import Config from freqtrade.exceptions import OperationalException @@ -39,7 +39,7 @@ class HyperStrategyMixin: # Init/loading of parameters is done as part of ft_bot_start(). def enumerate_parameters( - self, category: Optional[str] = None + self, category: str | None = None ) -> Iterator[tuple[str, BaseParameter]]: """ Find all optimizable parameters and return (name, attr) iterator. @@ -190,7 +190,7 @@ class HyperStrategyMixin: def detect_parameters( - obj: Union[HyperStrategyMixin, type[HyperStrategyMixin]], category: str + obj: HyperStrategyMixin | type[HyperStrategyMixin], category: str ) -> Iterator[tuple[str, BaseParameter]]: """ Detect all parameters for 'category' for "obj" diff --git a/freqtrade/strategy/informative_decorator.py b/freqtrade/strategy/informative_decorator.py index cdb840512..69cf6f0ce 100644 --- a/freqtrade/strategy/informative_decorator.py +++ b/freqtrade/strategy/informative_decorator.py @@ -1,5 +1,6 @@ +from collections.abc import Callable from dataclasses import dataclass -from typing import Any, Callable, Optional, Union +from typing import Any from pandas import DataFrame @@ -13,19 +14,19 @@ PopulateIndicators = Callable[[Any, DataFrame, dict], DataFrame] @dataclass class InformativeData: - asset: Optional[str] + asset: str | None timeframe: str - fmt: Union[str, Callable[[Any], str], None] + fmt: str | Callable[[Any], str] | None ffill: bool - candle_type: Optional[CandleType] + candle_type: CandleType | None def informative( timeframe: str, asset: str = "", - fmt: Optional[Union[str, Callable[[Any], str]]] = None, + fmt: str | Callable[[Any], str] | None = None, *, - candle_type: Optional[Union[CandleType, str]] = None, + candle_type: CandleType | str | None = None, ffill: bool = True, ) -> Callable[[PopulateIndicators], PopulateIndicators]: """ @@ -73,7 +74,7 @@ def informative( return decorator -def __get_pair_formats(market: Optional[dict[str, Any]]) -> dict[str, str]: +def __get_pair_formats(market: dict[str, Any] | None) -> dict[str, str]: if not market: return {} base = market["base"] @@ -86,7 +87,7 @@ def __get_pair_formats(market: Optional[dict[str, Any]]) -> dict[str, str]: } -def _format_pair_name(config, pair: str, market: Optional[dict[str, Any]] = None) -> str: +def _format_pair_name(config, pair: str, market: dict[str, Any] | None = None) -> str: return pair.format( stake_currency=config["stake_currency"], stake=config["stake_currency"], diff --git a/freqtrade/strategy/interface.py b/freqtrade/strategy/interface.py index a4bb007f1..1e415e9fc 100644 --- a/freqtrade/strategy/interface.py +++ b/freqtrade/strategy/interface.py @@ -8,7 +8,6 @@ from abc import ABC, abstractmethod from collections import OrderedDict from datetime import datetime, timedelta, timezone from math import isinf, isnan -from typing import Optional, Union from pandas import DataFrame @@ -75,7 +74,7 @@ class IStrategy(ABC, HyperStrategyMixin): # trailing stoploss trailing_stop: bool = False - trailing_stop_positive: Optional[float] = None + trailing_stop_positive: float | None = None trailing_stop_positive_offset: float = 0.0 trailing_only_offset_is_reached = False use_custom_stoploss: bool = False @@ -129,7 +128,7 @@ class IStrategy(ABC, HyperStrategyMixin): # the dataprovider (dp) (access to other candles, historic data, ...) # and wallets - access to the current balance. dp: DataProvider - wallets: Optional[Wallets] = None + wallets: Wallets | None = None # Filled from configuration stake_currency: str # container variable for strategy source code @@ -355,7 +354,7 @@ class IStrategy(ABC, HyperStrategyMixin): rate: float, time_in_force: str, current_time: datetime, - entry_tag: Optional[str], + entry_tag: str | None, side: str, **kwargs, ) -> bool: @@ -444,7 +443,7 @@ class IStrategy(ABC, HyperStrategyMixin): current_profit: float, after_fill: bool, **kwargs, - ) -> Optional[float]: + ) -> float | None: """ Custom stoploss logic, returning the new distance relative to current_rate (as ratio). e.g. returning -0.05 would create a stoploss 5% below current_rate. @@ -469,10 +468,10 @@ class IStrategy(ABC, HyperStrategyMixin): def custom_entry_price( self, pair: str, - trade: Optional[Trade], + trade: Trade | None, current_time: datetime, proposed_rate: float, - entry_tag: Optional[str], + entry_tag: str | None, side: str, **kwargs, ) -> float: @@ -501,7 +500,7 @@ class IStrategy(ABC, HyperStrategyMixin): current_time: datetime, proposed_rate: float, current_profit: float, - exit_tag: Optional[str], + exit_tag: str | None, **kwargs, ) -> float: """ @@ -530,7 +529,7 @@ class IStrategy(ABC, HyperStrategyMixin): current_rate: float, current_profit: float, **kwargs, - ) -> Optional[Union[str, bool]]: + ) -> str | bool | None: """ DEPRECATED - please use custom_exit instead. Custom exit signal logic indicating that specified position should be sold. Returning a @@ -562,7 +561,7 @@ class IStrategy(ABC, HyperStrategyMixin): current_rate: float, current_profit: float, **kwargs, - ) -> Optional[Union[str, bool]]: + ) -> str | bool | None: """ Custom exit signal logic indicating that specified position should be sold. Returning a string or True from this method is equal to setting exit signal on a candle at specified @@ -591,10 +590,10 @@ class IStrategy(ABC, HyperStrategyMixin): current_time: datetime, current_rate: float, proposed_stake: float, - min_stake: Optional[float], + min_stake: float | None, max_stake: float, leverage: float, - entry_tag: Optional[str], + entry_tag: str | None, side: str, **kwargs, ) -> float: @@ -620,14 +619,14 @@ class IStrategy(ABC, HyperStrategyMixin): current_time: datetime, current_rate: float, current_profit: float, - min_stake: Optional[float], + min_stake: float | None, max_stake: float, current_entry_rate: float, current_exit_rate: float, current_entry_profit: float, current_exit_profit: float, **kwargs, - ) -> Union[Optional[float], tuple[Optional[float], Optional[str]]]: + ) -> float | None | tuple[float | None, str | None]: """ Custom trade adjustment logic, returning the stake amount that a trade should be increased or decreased. @@ -660,12 +659,12 @@ class IStrategy(ABC, HyperStrategyMixin): def adjust_entry_price( self, trade: Trade, - order: Optional[Order], + order: Order | None, pair: str, current_time: datetime, proposed_rate: float, current_order_rate: float, - entry_tag: Optional[str], + entry_tag: str | None, side: str, **kwargs, ) -> float: @@ -701,7 +700,7 @@ class IStrategy(ABC, HyperStrategyMixin): current_rate: float, proposed_leverage: float, max_leverage: float, - entry_tag: Optional[str], + entry_tag: str | None, side: str, **kwargs, ) -> float: @@ -732,7 +731,7 @@ class IStrategy(ABC, HyperStrategyMixin): """ return [] - def version(self) -> Optional[str]: + def version(self) -> str | None: """ Returns version of the strategy. """ @@ -743,7 +742,7 @@ class IStrategy(ABC, HyperStrategyMixin): pair: str, df: DataFrame, tf: str, - informative: Optional[DataFrame] = None, + informative: DataFrame | None = None, set_generalized_indicators: bool = False, ) -> DataFrame: """ @@ -873,14 +872,14 @@ class IStrategy(ABC, HyperStrategyMixin): current_time: datetime, current_rate: float, current_profit: float, - min_stake: Optional[float], + min_stake: float | None, max_stake: float, current_entry_rate: float, current_exit_rate: float, current_entry_profit: float, current_exit_profit: float, **kwargs, - ) -> tuple[Optional[float], str]: + ) -> tuple[float | None, str]: """ wrapper around adjust_trade_position to handle the return value """ @@ -980,7 +979,7 @@ class IStrategy(ABC, HyperStrategyMixin): return self.__class__.__name__ def lock_pair( - self, pair: str, until: datetime, reason: Optional[str] = None, side: str = "*" + self, pair: str, until: datetime, reason: str | None = None, side: str = "*" ) -> None: """ Locks pair until a given timestamp happens. @@ -1014,7 +1013,7 @@ class IStrategy(ABC, HyperStrategyMixin): PairLocks.unlock_reason(reason, datetime.now(timezone.utc)) def is_pair_locked( - self, pair: str, *, candle_date: Optional[datetime] = None, side: str = "*" + self, pair: str, *, candle_date: datetime | None = None, side: str = "*" ) -> bool: """ Checks if a pair is currently locked @@ -1150,7 +1149,7 @@ class IStrategy(ABC, HyperStrategyMixin): pair: str, timeframe: str, dataframe: DataFrame, - ) -> tuple[Optional[DataFrame], Optional[datetime]]: + ) -> tuple[DataFrame | None, datetime | None]: """ Calculates current signal based based on the entry order or exit order columns of the dataframe. @@ -1182,8 +1181,8 @@ class IStrategy(ABC, HyperStrategyMixin): return latest, latest_date def get_exit_signal( - self, pair: str, timeframe: str, dataframe: DataFrame, is_short: Optional[bool] = None - ) -> tuple[bool, bool, Optional[str]]: + self, pair: str, timeframe: str, dataframe: DataFrame, is_short: bool | None = None + ) -> tuple[bool, bool, str | None]: """ Calculates current exit signal based based on the dataframe columns of the dataframe. @@ -1219,7 +1218,7 @@ class IStrategy(ABC, HyperStrategyMixin): pair: str, timeframe: str, dataframe: DataFrame, - ) -> tuple[Optional[SignalDirection], Optional[str]]: + ) -> tuple[SignalDirection | None, str | None]: """ Calculates current entry signal based based on the dataframe signals columns of the dataframe. @@ -1238,8 +1237,8 @@ class IStrategy(ABC, HyperStrategyMixin): enter_short = latest.get(SignalType.ENTER_SHORT.value, 0) == 1 exit_short = latest.get(SignalType.EXIT_SHORT.value, 0) == 1 - enter_signal: Optional[SignalDirection] = None - enter_tag: Optional[str] = None + enter_signal: SignalDirection | None = None + enter_tag: str | None = None if enter_long == 1 and not any([exit_long, enter_short]): enter_signal = SignalDirection.LONG enter_tag = latest.get(SignalTagType.ENTER_TAG.value, None) @@ -1287,8 +1286,8 @@ class IStrategy(ABC, HyperStrategyMixin): *, enter: bool, exit_: bool, - low: Optional[float] = None, - high: Optional[float] = None, + low: float | None = None, + high: float | None = None, force_stoploss: float = 0, ) -> list[ExitCheckTuple]: """ @@ -1390,8 +1389,8 @@ class IStrategy(ABC, HyperStrategyMixin): current_time: datetime, current_profit: float, force_stoploss: float, - low: Optional[float] = None, - high: Optional[float] = None, + low: float | None = None, + high: float | None = None, after_fill: bool = False, ) -> None: """ @@ -1464,8 +1463,8 @@ class IStrategy(ABC, HyperStrategyMixin): current_time: datetime, current_profit: float, force_stoploss: float, - low: Optional[float] = None, - high: Optional[float] = None, + low: float | None = None, + high: float | None = None, ) -> ExitCheckTuple: """ Based on current profit of the trade and configured (trailing) stoploss, @@ -1518,7 +1517,7 @@ class IStrategy(ABC, HyperStrategyMixin): return ExitCheckTuple(exit_type=ExitType.NONE) - def min_roi_reached_entry(self, trade_dur: int) -> tuple[Optional[int], Optional[float]]: + def min_roi_reached_entry(self, trade_dur: int) -> tuple[int | None, float | None]: """ Based on trade duration defines the ROI entry that may have been reached. :param trade_dur: trade duration in minutes diff --git a/freqtrade/strategy/parameters.py b/freqtrade/strategy/parameters.py index 82e930667..282e630d0 100644 --- a/freqtrade/strategy/parameters.py +++ b/freqtrade/strategy/parameters.py @@ -7,7 +7,7 @@ import logging from abc import ABC, abstractmethod from collections.abc import Sequence from contextlib import suppress -from typing import Any, Optional, Union +from typing import Any, Union from freqtrade.enums import HyperoptState from freqtrade.optimize.hyperopt_tools import HyperoptStateContainer @@ -29,7 +29,7 @@ class BaseParameter(ABC): Defines a parameter that can be optimized by hyperopt. """ - category: Optional[str] + category: str | None default: Any value: Any in_space: bool = False @@ -39,7 +39,7 @@ class BaseParameter(ABC): self, *, default: Any, - space: Optional[str] = None, + space: str | None = None, optimize: bool = True, load: bool = True, **kwargs, @@ -83,17 +83,17 @@ class BaseParameter(ABC): class NumericParameter(BaseParameter): """Internal parameter used for Numeric purposes""" - float_or_int = Union[int, float] + float_or_int = int | float default: float_or_int value: float_or_int def __init__( self, - low: Union[float_or_int, Sequence[float_or_int]], - high: Optional[float_or_int] = None, + low: float_or_int | Sequence[float_or_int], + high: float_or_int | None = None, *, default: float_or_int, - space: Optional[str] = None, + space: str | None = None, optimize: bool = True, load: bool = True, **kwargs, @@ -132,11 +132,11 @@ class IntParameter(NumericParameter): def __init__( self, - low: Union[int, Sequence[int]], - high: Optional[int] = None, + low: int | Sequence[int], + high: int | None = None, *, default: int, - space: Optional[str] = None, + space: str | None = None, optimize: bool = True, load: bool = True, **kwargs, @@ -186,11 +186,11 @@ class RealParameter(NumericParameter): def __init__( self, - low: Union[float, Sequence[float]], - high: Optional[float] = None, + low: float | Sequence[float], + high: float | None = None, *, default: float, - space: Optional[str] = None, + space: str | None = None, optimize: bool = True, load: bool = True, **kwargs, @@ -225,12 +225,12 @@ class DecimalParameter(NumericParameter): def __init__( self, - low: Union[float, Sequence[float]], - high: Optional[float] = None, + low: float | Sequence[float], + high: float | None = None, *, default: float, decimals: int = 3, - space: Optional[str] = None, + space: str | None = None, optimize: bool = True, load: bool = True, **kwargs, @@ -289,8 +289,8 @@ class CategoricalParameter(BaseParameter): self, categories: Sequence[Any], *, - default: Optional[Any] = None, - space: Optional[str] = None, + default: Any | None = None, + space: str | None = None, optimize: bool = True, load: bool = True, **kwargs, @@ -339,8 +339,8 @@ class BooleanParameter(CategoricalParameter): def __init__( self, *, - default: Optional[Any] = None, - space: Optional[str] = None, + default: Any | None = None, + space: str | None = None, optimize: bool = True, load: bool = True, **kwargs, diff --git a/freqtrade/strategy/strategy_helper.py b/freqtrade/strategy/strategy_helper.py index 1a91629d9..71dcc3cbf 100644 --- a/freqtrade/strategy/strategy_helper.py +++ b/freqtrade/strategy/strategy_helper.py @@ -1,5 +1,3 @@ -from typing import Optional - import pandas as pd from freqtrade.exchange import timeframe_to_minutes @@ -13,7 +11,7 @@ def merge_informative_pair( ffill: bool = True, append_timeframe: bool = True, date_column: str = "date", - suffix: Optional[str] = None, + suffix: str | None = None, ) -> pd.DataFrame: """ Correctly merge informative samples to the original dataframe, avoiding lookahead bias. diff --git a/freqtrade/strategy/strategy_wrapper.py b/freqtrade/strategy/strategy_wrapper.py index a6f74f1c0..9250f54cd 100644 --- a/freqtrade/strategy/strategy_wrapper.py +++ b/freqtrade/strategy/strategy_wrapper.py @@ -1,7 +1,8 @@ import logging +from collections.abc import Callable from copy import deepcopy from functools import wraps -from typing import Any, Callable, TypeVar, cast +from typing import Any, TypeVar, cast from freqtrade.exceptions import StrategyError diff --git a/freqtrade/templates/strategy_analysis_example.ipynb b/freqtrade/templates/strategy_analysis_example.ipynb index e81ff72ca..2510b38b9 100644 --- a/freqtrade/templates/strategy_analysis_example.ipynb +++ b/freqtrade/templates/strategy_analysis_example.ipynb @@ -305,7 +305,7 @@ "metadata": {}, "source": [ "## Analyze the loaded trades for trade parallelism\n", - "This can be useful to find the best `max_open_trades` parameter, when used with backtesting in conjunction with `--disable-max-market-positions`.\n", + "This can be useful to find the best `max_open_trades` parameter, when used with backtesting in conjunction with a very high `max_open_trades` setting.\n", "\n", "`analyze_trade_parallelism()` returns a timeseries dataframe with an \"open_trades\" column, specifying the number of open trades for each candle." ] diff --git a/freqtrade/templates/strategy_subtemplates/strategy_methods_advanced.j2 b/freqtrade/templates/strategy_subtemplates/strategy_methods_advanced.j2 index 07b72610a..84d7f40c8 100644 --- a/freqtrade/templates/strategy_subtemplates/strategy_methods_advanced.j2 +++ b/freqtrade/templates/strategy_subtemplates/strategy_methods_advanced.j2 @@ -13,9 +13,16 @@ def bot_loop_start(self, current_time: datetime, **kwargs) -> None: """ pass -def custom_entry_price(self, pair: str, trade: Optional[Trade], - current_time: datetime, proposed_rate: float, - entry_tag: Optional[str], side: str, **kwargs) -> float: +def custom_entry_price( + self, + pair: str, + trade: Trade | None, + current_time: datetime, + proposed_rate: float, + entry_tag: str | None, + side: str, + **kwargs, +) -> float: """ Custom entry price logic, returning the new entry price. @@ -33,9 +40,18 @@ def custom_entry_price(self, pair: str, trade: Optional[Trade], """ return proposed_rate -def adjust_entry_price(self, trade: Trade, order: Optional[Order], pair: str, - current_time: datetime, proposed_rate: float, current_order_rate: float, - entry_tag: Optional[str], side: str, **kwargs) -> float: +def adjust_entry_price( + self, + trade: Trade, + order: Order | None, + pair: str, + current_time: datetime, + proposed_rate: float, + current_order_rate: float, + entry_tag: str | None, + side: str, + **kwargs, +) -> float: """ Entry price re-adjustment logic, returning the user desired limit price. This only executes when a order was already placed, still open (unfilled fully or partially) @@ -61,9 +77,16 @@ def adjust_entry_price(self, trade: Trade, order: Optional[Order], pair: str, """ return current_order_rate -def custom_exit_price(self, pair: str, trade: Trade, - current_time: datetime, proposed_rate: float, - current_profit: float, exit_tag: Optional[str], **kwargs) -> float: +def custom_exit_price( + self, + pair: str, + trade: Trade, + current_time: datetime, + proposed_rate: float, + current_profit: float, + exit_tag: str | None, + **kwargs, +) -> float: """ Custom exit price logic, returning the new exit price. @@ -82,10 +105,19 @@ def custom_exit_price(self, pair: str, trade: Trade, """ return proposed_rate -def custom_stake_amount(self, pair: str, current_time: datetime, current_rate: float, - proposed_stake: float, min_stake: Optional[float], max_stake: float, - leverage: float, entry_tag: Optional[str], side: str, - **kwargs) -> float: +def custom_stake_amount( + self, + pair: str, + current_time: datetime, + current_rate: float, + proposed_stake: float, + min_stake: float | None, + max_stake: float, + leverage: float, + entry_tag: str | None, + side: str, + **kwargs, +) -> float: """ Customize stake size for each new trade. @@ -104,8 +136,16 @@ def custom_stake_amount(self, pair: str, current_time: datetime, current_rate: f use_custom_stoploss = True -def custom_stoploss(self, pair: str, trade: Trade, current_time: datetime, current_rate: float, - current_profit: float, after_fill: bool, **kwargs) -> float: +def custom_stoploss( + self, + pair: str, + trade: Trade, + current_time: datetime, + current_rate: float, + current_profit: float, + after_fill: bool, + **kwargs, +) -> float | None: """ Custom stoploss logic, returning the new distance relative to current_rate (as ratio). e.g. returning -0.05 would create a stoploss 5% below current_rate. @@ -126,8 +166,15 @@ def custom_stoploss(self, pair: str, trade: Trade, current_time: datetime, curre :return float: New stoploss value, relative to the current_rate """ -def custom_exit(self, pair: str, trade: Trade, current_time: datetime, current_rate: float, - current_profit: float, **kwargs) -> Optional[Union[str, bool]]: +def custom_exit( + self, + pair: str, + trade: Trade, + current_time: datetime, + current_rate: float, + current_profit: float, + **kwargs, +) -> str | bool | None: """ Custom exit signal logic indicating that specified position should be sold. Returning a string or True from this method is equal to setting sell signal on a candle at specified @@ -150,9 +197,18 @@ def custom_exit(self, pair: str, trade: Trade, current_time: datetime, current_r """ return None -def confirm_trade_entry(self, pair: str, order_type: str, amount: float, rate: float, - time_in_force: str, current_time: datetime, entry_tag: Optional[str], - side: str, **kwargs) -> bool: +def confirm_trade_entry( + self, + pair: str, + order_type: str, + amount: float, + rate: float, + time_in_force: str, + current_time: datetime, + entry_tag: str | None, + side: str, + **kwargs, +) -> bool: """ Called right before placing a entry order. Timing for this function is critical, so avoid doing heavy computations or @@ -177,9 +233,18 @@ def confirm_trade_entry(self, pair: str, order_type: str, amount: float, rate: f """ return True -def confirm_trade_exit(self, pair: str, trade: Trade, order_type: str, amount: float, - rate: float, time_in_force: str, exit_reason: str, - current_time: datetime, **kwargs) -> bool: +def confirm_trade_exit( + self, + pair: str, + trade: Trade, + order_type: str, + amount: float, + rate: float, + time_in_force: str, + exit_reason: str, + current_time: datetime, + **kwargs, +) -> bool: """ Called right before placing a regular exit order. Timing for this function is critical, so avoid doing heavy computations or @@ -206,8 +271,9 @@ def confirm_trade_exit(self, pair: str, trade: Trade, order_type: str, amount: f """ return True -def check_entry_timeout(self, pair: str, trade: Trade, order: Order, - current_time: datetime, **kwargs) -> bool: +def check_entry_timeout( + self, pair: str, trade: Trade, order: Order, current_time: datetime, **kwargs +) -> bool: """ Check entry timeout function callback. This method can be used to override the entry-timeout. @@ -228,8 +294,9 @@ def check_entry_timeout(self, pair: str, trade: Trade, order: Order, """ return False -def check_exit_timeout(self, pair: str, trade: Trade, order: Order, - current_time: datetime, **kwargs) -> bool: +def check_exit_timeout( + self, pair: str, trade: Trade, order: Order, current_time: datetime, **kwargs +) -> bool: """ Check exit timeout function callback. This method can be used to override the exit-timeout. @@ -250,12 +317,20 @@ def check_exit_timeout(self, pair: str, trade: Trade, order: Order, """ return False -def adjust_trade_position(self, trade: Trade, current_time: datetime, - current_rate: float, current_profit: float, - min_stake: Optional[float], max_stake: float, - current_entry_rate: float, current_exit_rate: float, - current_entry_profit: float, current_exit_profit: float, - **kwargs) -> Optional[float]: +def adjust_trade_position( + self, + trade: Trade, + current_time: datetime, + current_rate: float, + current_profit: float, + min_stake: float | None, + max_stake: float, + current_entry_rate: float, + current_exit_rate: float, + current_entry_profit: float, + current_exit_profit: float, + **kwargs, +) -> float | None | tuple[float | None, str | None]: """ Custom trade adjustment logic, returning the stake amount that a trade should be increased or decreased. @@ -284,9 +359,17 @@ def adjust_trade_position(self, trade: Trade, current_time: datetime, """ return None -def leverage(self, pair: str, current_time: datetime, current_rate: float, - proposed_leverage: float, max_leverage: float, entry_tag: Optional[str], - side: str, **kwargs) -> float: +def leverage( + self, + pair: str, + current_time: datetime, + current_rate: float, + proposed_leverage: float, + max_leverage: float, + entry_tag: str | None, + side: str, + **kwargs, +) -> float: """ Customize leverage for each new trade. This method is only called in futures mode. @@ -302,8 +385,9 @@ def leverage(self, pair: str, current_time: datetime, current_rate: float, return 1.0 -def order_filled(self, pair: str, trade: Trade, order: Order, - current_time: datetime, **kwargs) -> None: +def order_filled( + self, pair: str, trade: Trade, order: Order, current_time: datetime, **kwargs +) -> None: """ Called right after an order fills. Will be called for all order types (entry, exit, stoploss, position adjustment). diff --git a/freqtrade/util/__init__.py b/freqtrade/util/__init__.py index 8343790a0..7a4d4d119 100644 --- a/freqtrade/util/__init__.py +++ b/freqtrade/util/__init__.py @@ -11,11 +11,14 @@ from freqtrade.util.datetime_helpers import ( format_ms_time, shorten_date, ) -from freqtrade.util.formatters import decimals_per_coin, fmt_coin, round_value +from freqtrade.util.formatters import decimals_per_coin, fmt_coin, fmt_coin2, round_value from freqtrade.util.ft_precise import FtPrecise from freqtrade.util.measure_time import MeasureTime from freqtrade.util.periodic_cache import PeriodicCache -from freqtrade.util.progress_tracker import get_progress_tracker # noqa F401 +from freqtrade.util.progress_tracker import ( # noqa F401 + get_progress_tracker, + retrieve_progress_tracker, +) from freqtrade.util.rich_progress import CustomProgress from freqtrade.util.rich_tables import print_df_rich_table, print_rich_table from freqtrade.util.template_renderer import render_template, render_template_with_fallback # noqa @@ -38,6 +41,7 @@ __all__ = [ "decimals_per_coin", "round_value", "fmt_coin", + "fmt_coin2", "MeasureTime", "print_rich_table", "print_df_rich_table", diff --git a/freqtrade/util/coin_gecko.py b/freqtrade/util/coin_gecko.py index 47b80875b..515e9654f 100644 --- a/freqtrade/util/coin_gecko.py +++ b/freqtrade/util/coin_gecko.py @@ -4,23 +4,10 @@ from pycoingecko import CoinGeckoAPI class FtCoinGeckoApi(CoinGeckoAPI): """ Simple wrapper around pycoingecko's api to support Demo API keys. - """ - __API_URL_BASE = "https://api.coingecko.com/api/v3/" - __PRO_API_URL_BASE = "https://pro-api.coingecko.com/api/v3/" - _api_key: str = "" - def __init__(self, api_key: str = "", *, is_demo=True, retries=5): - super().__init__(retries=retries) - # Doint' pass api_key to parent, instead set the header on the session directly - self._api_key = api_key - - if api_key and not is_demo: - self.api_base_url = self.__PRO_API_URL_BASE - self.session.params.update({"x_cg_pro_api_key": api_key}) + if api_key and is_demo: + super().__init__(retries=retries, demo_api_key=api_key) else: - # Use demo api key - self.api_base_url = self.__API_URL_BASE - if api_key: - self.session.params.update({"x_cg_demo_api_key": api_key}) + super().__init__(api_key=api_key, retries=retries) diff --git a/freqtrade/util/datetime_helpers.py b/freqtrade/util/datetime_helpers.py index 3ab20efb7..255779849 100644 --- a/freqtrade/util/datetime_helpers.py +++ b/freqtrade/util/datetime_helpers.py @@ -1,7 +1,6 @@ import re from datetime import datetime, timezone from time import time -from typing import Optional, Union import humanize @@ -26,7 +25,7 @@ def dt_utc( return datetime(year, month, day, hour, minute, second, microsecond, tzinfo=timezone.utc) -def dt_ts(dt: Optional[datetime] = None) -> int: +def dt_ts(dt: datetime | None = None) -> int: """ Return dt in ms as a timestamp in UTC. If dt is None, return the current datetime in UTC. @@ -36,7 +35,7 @@ def dt_ts(dt: Optional[datetime] = None) -> int: return int(time() * 1000) -def dt_ts_def(dt: Optional[datetime], default: int = 0) -> int: +def dt_ts_def(dt: datetime | None, default: int = 0) -> int: """ Return dt in ms as a timestamp in UTC. If dt is None, return the given default. @@ -46,7 +45,7 @@ def dt_ts_def(dt: Optional[datetime], default: int = 0) -> int: return default -def dt_ts_none(dt: Optional[datetime]) -> Optional[int]: +def dt_ts_none(dt: datetime | None) -> int | None: """ Return dt in ms as a timestamp in UTC. If dt is None, return the given default. @@ -91,7 +90,7 @@ def dt_humanize_delta(dt: datetime): return humanize.naturaltime(dt) -def format_date(date: Optional[datetime]) -> str: +def format_date(date: datetime | None) -> str: """ Return a formatted date string. Returns an empty string if date is None. @@ -102,7 +101,7 @@ def format_date(date: Optional[datetime]) -> str: return "" -def format_ms_time(date: Union[int, float]) -> str: +def format_ms_time(date: int | float) -> str: """ convert MS date to readable format. : epoch-string in ms diff --git a/freqtrade/util/formatters.py b/freqtrade/util/formatters.py index a649b671e..82ac1cf66 100644 --- a/freqtrade/util/formatters.py +++ b/freqtrade/util/formatters.py @@ -47,3 +47,22 @@ def fmt_coin(value: float, coin: str, show_coin_name=True, keep_trailing_zeros=F val = f"{val} {coin}" return val + + +def fmt_coin2( + value: float, coin: str, decimals: int = 8, *, show_coin_name=True, keep_trailing_zeros=False +) -> str: + """ + Format price value for this coin. Should be preferred for rate formatting + :param value: Value to be printed + :param coin: Which coin are we printing the price / value for + :param decimals: Number of decimals to round to + :param show_coin_name: Return string in format: "222.22 USDT" or "222.22" + :param keep_trailing_zeros: Keep trailing zeros "222.200" vs. "222.2" + :return: Formatted / rounded value (with or without coin name) + """ + val = round_value(value, decimals, keep_trailing_zeros) + if show_coin_name: + val = f"{val} {coin}" + + return val diff --git a/freqtrade/util/measure_time.py b/freqtrade/util/measure_time.py index 9ce8dba16..baa94f062 100644 --- a/freqtrade/util/measure_time.py +++ b/freqtrade/util/measure_time.py @@ -1,6 +1,6 @@ import logging import time -from typing import Callable +from collections.abc import Callable from cachetools import TTLCache diff --git a/freqtrade/util/migrations/__init__.py b/freqtrade/util/migrations/__init__.py index d8c7dfad3..4e81b1c57 100644 --- a/freqtrade/util/migrations/__init__.py +++ b/freqtrade/util/migrations/__init__.py @@ -1,11 +1,9 @@ -from typing import Optional - from freqtrade.exchange import Exchange from freqtrade.util.migrations.binance_mig import migrate_binance_futures_data from freqtrade.util.migrations.funding_rate_mig import migrate_funding_fee_timeframe -def migrate_data(config, exchange: Optional[Exchange] = None): +def migrate_data(config, exchange: Exchange | None = None): migrate_binance_futures_data(config) migrate_funding_fee_timeframe(config, exchange) diff --git a/freqtrade/util/migrations/funding_rate_mig.py b/freqtrade/util/migrations/funding_rate_mig.py index e53ec339e..060a5a1b6 100644 --- a/freqtrade/util/migrations/funding_rate_mig.py +++ b/freqtrade/util/migrations/funding_rate_mig.py @@ -1,5 +1,4 @@ import logging -from typing import Optional from freqtrade.constants import Config from freqtrade.enums import TradingMode @@ -9,7 +8,7 @@ from freqtrade.exchange import Exchange logger = logging.getLogger(__name__) -def migrate_funding_fee_timeframe(config: Config, exchange: Optional[Exchange]): +def migrate_funding_fee_timeframe(config: Config, exchange: Exchange | None): from freqtrade.data.history import get_datahandler if config.get("trading_mode", TradingMode.SPOT) != TradingMode.FUTURES: diff --git a/freqtrade/util/progress_tracker.py b/freqtrade/util/progress_tracker.py index ca8f5d3e9..3f46e0b82 100644 --- a/freqtrade/util/progress_tracker.py +++ b/freqtrade/util/progress_tracker.py @@ -10,7 +10,13 @@ from rich.progress import ( from freqtrade.util.rich_progress import CustomProgress -def get_progress_tracker(**kwargs): +def retrieve_progress_tracker(pt: CustomProgress | None) -> CustomProgress: + if pt is None: + return get_progress_tracker() + return pt + + +def get_progress_tracker(**kwargs) -> CustomProgress: """ Get progress Bar with custom columns. """ diff --git a/freqtrade/util/rich_progress.py b/freqtrade/util/rich_progress.py index ef06e7f46..96d629819 100644 --- a/freqtrade/util/rich_progress.py +++ b/freqtrade/util/rich_progress.py @@ -1,23 +1,56 @@ -from typing import Callable, Optional, Union +from collections.abc import Callable +from typing import Any from rich.console import ConsoleRenderable, Group, RichCast -from rich.progress import Progress +from rich.progress import Progress, Task, TaskID class CustomProgress(Progress): def __init__( self, *args, - cust_objs: Optional[list[ConsoleRenderable]] = None, - cust_callables: Optional[list[Callable[[], ConsoleRenderable]]] = None, + cust_objs: list[ConsoleRenderable] | None = None, + cust_callables: list[Callable[[], ConsoleRenderable]] | None = None, + ft_callback: Callable[[Task], None] | None = None, **kwargs, ) -> None: self._cust_objs = cust_objs or [] self._cust_callables = cust_callables or [] + self._ft_callback = ft_callback + if self._ft_callback: + kwargs["disable"] = True super().__init__(*args, **kwargs) - def get_renderable(self) -> Union[ConsoleRenderable, RichCast, str]: + def update( + self, + task_id: TaskID, + *, + total: float | None = None, + completed: float | None = None, + advance: float | None = None, + description: str | None = None, + visible: bool | None = None, + refresh: bool = False, + **fields: Any, + ) -> None: + t = super().update( + task_id, + total=total, + completed=completed, + advance=advance, + description=description, + visible=visible, + refresh=refresh, + **fields, + ) + if self._ft_callback: + self._ft_callback( + self.tasks[task_id], + ) + return t + + def get_renderable(self) -> ConsoleRenderable | RichCast | str: objs = [obj for obj in self._cust_objs] for cust_call in self._cust_callables: objs.append(cust_call()) diff --git a/freqtrade/util/rich_tables.py b/freqtrade/util/rich_tables.py index 54f941c58..ba232ed75 100644 --- a/freqtrade/util/rich_tables.py +++ b/freqtrade/util/rich_tables.py @@ -1,6 +1,6 @@ import sys from collections.abc import Sequence -from typing import Any, Optional, Union +from typing import Any, TypeAlias from pandas import DataFrame from rich.console import Console @@ -8,16 +8,16 @@ from rich.table import Column, Table from rich.text import Text -TextOrString = Union[str, Text] +TextOrString: TypeAlias = str | Text def print_rich_table( - tabular_data: Sequence[Union[dict[str, Any], Sequence[TextOrString]]], + tabular_data: Sequence[dict[str, Any] | Sequence[TextOrString]], headers: Sequence[str], - summary: Optional[str] = None, + summary: str | None = None, *, justify="right", - table_kwargs: Optional[dict[str, Any]] = None, + table_kwargs: dict[str, Any] | None = None, ) -> None: table = Table( *[c if isinstance(c, Column) else Column(c, justify=justify) for c in headers], @@ -35,7 +35,7 @@ def print_rich_table( ) else: - row_to_add: list[Union[str, Text]] = [r if isinstance(r, Text) else str(r) for r in row] + row_to_add: list[str | Text] = [r if isinstance(r, Text) else str(r) for r in row] table.add_row(*row_to_add) width = None @@ -55,11 +55,11 @@ def _format_value(value: Any, *, floatfmt: str) -> str: def print_df_rich_table( tabular_data: DataFrame, headers: Sequence[str], - summary: Optional[str] = None, + summary: str | None = None, *, show_index=False, - index_name: Optional[str] = None, - table_kwargs: Optional[dict[str, Any]] = None, + index_name: str | None = None, + table_kwargs: dict[str, Any] | None = None, ) -> None: table = Table(title=summary, **(table_kwargs or {})) diff --git a/freqtrade/util/template_renderer.py b/freqtrade/util/template_renderer.py index b2c96fdc5..c9dcfce52 100644 --- a/freqtrade/util/template_renderer.py +++ b/freqtrade/util/template_renderer.py @@ -2,8 +2,6 @@ Jinja2 rendering utils, used to generate new strategy and configurations. """ -from typing import Optional - def render_template(templatefile: str, arguments: dict) -> str: from jinja2 import Environment, PackageLoader, select_autoescape @@ -17,7 +15,7 @@ def render_template(templatefile: str, arguments: dict) -> str: def render_template_with_fallback( - templatefile: str, templatefallbackfile: str, arguments: Optional[dict] = None + templatefile: str, templatefallbackfile: str, arguments: dict | None = None ) -> str: """ Use templatefile if possible, otherwise fall back to templatefallbackfile diff --git a/freqtrade/vendor/qtpylib/indicators.py b/freqtrade/vendor/qtpylib/indicators.py index 9c92b2f8e..5b56b2aa6 100644 --- a/freqtrade/vendor/qtpylib/indicators.py +++ b/freqtrade/vendor/qtpylib/indicators.py @@ -227,7 +227,7 @@ def crossed(series1, series2, direction=None): if isinstance(series1, np.ndarray): series1 = pd.Series(series1) - if isinstance(series2, (float, int, np.ndarray, np.integer, np.floating)): + if isinstance(series2, float | int | np.ndarray | np.integer | np.floating): series2 = pd.Series(index=series1.index, data=series2) if direction is None or direction == "above": diff --git a/freqtrade/wallets.py b/freqtrade/wallets.py index e688b307a..2b26fb8b6 100644 --- a/freqtrade/wallets.py +++ b/freqtrade/wallets.py @@ -4,7 +4,7 @@ import logging from copy import deepcopy from datetime import datetime, timedelta -from typing import NamedTuple, Optional +from typing import NamedTuple from freqtrade.constants import UNLIMITED_STAKE_AMOUNT, Config, IntOrInf from freqtrade.enums import RunMode, TradingMode @@ -29,7 +29,7 @@ class Wallet(NamedTuple): class PositionWallet(NamedTuple): symbol: str position: float = 0 - leverage: Optional[float] = 0 # Don't use this - it's not guaranteed to be set + leverage: float | None = 0 # Don't use this - it's not guaranteed to be set collateral: float = 0 side: str = "long" @@ -41,8 +41,8 @@ class Wallets: self._exchange = exchange self._wallets: dict[str, Wallet] = {} self._positions: dict[str, PositionWallet] = {} - self.start_cap = config["dry_run_wallet"] - self._last_wallet_refresh: Optional[datetime] = None + self._start_cap = config["dry_run_wallet"] + self._last_wallet_refresh: datetime | None = None self.update() def get_free(self, currency: str) -> float: @@ -112,7 +112,7 @@ class Wallets: _wallets[curr] = Wallet(curr, trade.amount - pending, pending, trade.amount) - current_stake = self.start_cap + tot_profit - tot_in_trades + current_stake = self._start_cap + tot_profit - tot_in_trades total_stake = current_stake + used_stake else: tot_in_trades = 0 @@ -129,7 +129,7 @@ class Wallets: collateral=collateral, side=position.trade_direction, ) - current_stake = self.start_cap + tot_profit - tot_in_trades + current_stake = self._start_cap + tot_profit - tot_in_trades used_stake = tot_in_trades total_stake = current_stake + tot_in_trades @@ -352,10 +352,10 @@ class Wallets: def validate_stake_amount( self, pair: str, - stake_amount: Optional[float], - min_stake_amount: Optional[float], + stake_amount: float | None, + min_stake_amount: float | None, max_stake_amount: float, - trade_amount: Optional[float], + trade_amount: float | None, ): if not stake_amount: logger.debug(f"Stake amount is {stake_amount}, ignoring possible trade for {pair}.") diff --git a/freqtrade/worker.py b/freqtrade/worker.py index d618b3dec..61d5d9a64 100644 --- a/freqtrade/worker.py +++ b/freqtrade/worker.py @@ -5,8 +5,9 @@ Main Freqtrade worker class. import logging import time import traceback +from collections.abc import Callable from os import getpid -from typing import Any, Callable, Optional +from typing import Any import sdnotify @@ -27,7 +28,7 @@ class Worker: Freqtradebot worker class """ - def __init__(self, args: dict[str, Any], config: Optional[Config] = None) -> None: + def __init__(self, args: dict[str, Any], config: Config | None = None) -> None: """ Init all variables and objects the bot needs to work """ @@ -79,7 +80,7 @@ class Worker: if state == State.RELOAD_CONFIG: self._reconfigure() - def _worker(self, old_state: Optional[State]) -> State: + def _worker(self, old_state: State | None) -> State: """ The main routine that runs each throttling iteration and handles the states. :param old_state: the previous service state from the previous call @@ -141,7 +142,7 @@ class Worker: self, func: Callable[..., Any], throttle_secs: float, - timeframe: Optional[str] = None, + timeframe: str | None = None, timeframe_offset: float = 1.0, *args, **kwargs, diff --git a/ft_client/freqtrade_client/__init__.py b/ft_client/freqtrade_client/__init__.py index 935689b2d..7a04abe44 100644 --- a/ft_client/freqtrade_client/__init__.py +++ b/ft_client/freqtrade_client/__init__.py @@ -1,7 +1,7 @@ from freqtrade_client.ft_rest_client import FtRestClient -__version__ = "2024.10" +__version__ = "2024.11" if "dev" in __version__: from pathlib import Path diff --git a/ft_client/freqtrade_client/ft_rest_client.py b/ft_client/freqtrade_client/ft_rest_client.py index 577001836..851583ee0 100755 --- a/ft_client/freqtrade_client/ft_rest_client.py +++ b/ft_client/freqtrade_client/ft_rest_client.py @@ -7,18 +7,18 @@ so it can be used as a standalone script, and can be installed independently. import json import logging -from typing import Any, Optional, Union +from typing import Any from urllib.parse import urlencode, urlparse, urlunparse import requests from requests.adapters import HTTPAdapter -from requests.exceptions import ConnectionError +from requests.exceptions import ConnectionError as RequestConnectionError logger = logging.getLogger("ft_rest_client") -ParamsT = Optional[dict[str, Any]] -PostDataT = Optional[Union[dict[str, Any], list[dict[str, Any]]]] +ParamsT = dict[str, Any] | None +PostDataT = dict[str, Any] | list[dict[str, Any]] | None class FtRestClient: @@ -35,7 +35,7 @@ class FtRestClient: if username and password: self._session.auth = (username, password) - def _call(self, method, apipath, params: Optional[dict] = None, data=None, files=None): + def _call(self, method, apipath, params: dict | None = None, data=None, files=None): if str(method).upper() not in ("GET", "POST", "PUT", "DELETE"): raise ValueError(f"invalid method <{method}>") basepath = f"{self._serverurl}/api/v1/{apipath}" @@ -53,7 +53,7 @@ class FtRestClient: resp = self._session.request(method, url, headers=hd, data=json.dumps(data)) # return resp.text return resp.json() - except ConnectionError: + except RequestConnectionError: logger.warning(f"Connection error - could not connect to {netloc}.") def _get(self, apipath, params: ParamsT = None): diff --git a/ft_client/test_client/test_rest_client.py b/ft_client/test_client/test_rest_client.py index 1a709b9c5..c1af6ded2 100644 --- a/ft_client/test_client/test_rest_client.py +++ b/ft_client/test_client/test_rest_client.py @@ -2,7 +2,7 @@ import re from unittest.mock import ANY, MagicMock import pytest -from requests.exceptions import ConnectionError +from requests.exceptions import ConnectionError as RequestsConnectionError from freqtrade_client import FtRestClient from freqtrade_client.ft_client import add_arguments, main_exec @@ -45,7 +45,7 @@ def test_FtRestClient_call_invalid(caplog): with pytest.raises(ValueError): client._call("PUTTY", "/dummytest") - client._session.request = MagicMock(side_effect=ConnectionError()) + client._session.request = MagicMock(side_effect=RequestsConnectionError()) client._call("GET", "/dummytest") assert log_has_re("Connection error", caplog) diff --git a/pyproject.toml b/pyproject.toml index 1db932cdc..bb4575553 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -44,7 +44,7 @@ dependencies = [ "pandas-ta", "technical", "tabulate", - "pycoingecko", + "pycoingecko>=3.2.0", "py_find_1st", "python-rapidjson", "orjson", @@ -246,7 +246,6 @@ reportTypedDictNotRequiredAccess = false # 27 [tool.ruff] line-length = 100 extend-exclude = [".env", ".venv"] -target-version = "py39" [tool.ruff.lint] extend-select = [ diff --git a/requirements-dev.txt b/requirements-dev.txt index 13fc77c39..5cdea9ba1 100644 --- a/requirements-dev.txt +++ b/requirements-dev.txt @@ -7,12 +7,12 @@ -r docs/requirements-docs.txt coveralls==4.0.1 -ruff==0.7.1 +ruff==0.8.0 mypy==1.13.0 pre-commit==4.0.1 pytest==8.3.3 pytest-asyncio==0.24.0 -pytest-cov==5.0.0 +pytest-cov==6.0.0 pytest-mock==3.14.0 pytest-random-order==1.1.1 pytest-timeout==2.3.1 diff --git a/requirements-freqai-rl.txt b/requirements-freqai-rl.txt index 14388df86..ca5c58943 100644 --- a/requirements-freqai-rl.txt +++ b/requirements-freqai-rl.txt @@ -3,9 +3,9 @@ # Required for freqai-rl torch==2.2.2; sys_platform == 'darwin' and platform_machine == 'x86_64' -torch==2.5.0; sys_platform != 'darwin' or platform_machine != 'x86_64' +torch==2.5.1; sys_platform != 'darwin' or platform_machine != 'x86_64' gymnasium==0.29.1 -stable_baselines3==2.3.2 +stable_baselines3==2.4.0 sb3_contrib>=2.2.1 # Progress bar for stable-baselines3 and sb3-contrib -tqdm==4.66.5 +tqdm==4.67.1 diff --git a/requirements.txt b/requirements.txt index a77cad1d9..5691b42d1 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,15 +1,15 @@ numpy==1.26.4 pandas==2.2.3 bottleneck==1.4.2 -numexpr==2.10.1 +numexpr==2.10.2 pandas-ta==0.3.14b -ccxt==4.4.24 +ccxt==4.4.35 cryptography==42.0.8; platform_machine == 'armv7l' cryptography==43.0.3; platform_machine != 'armv7l' -aiohttp==3.10.10 +aiohttp==3.10.11 SQLAlchemy==2.0.36 -python-telegram-bot==21.6 +python-telegram-bot==21.7 # can't be hard-pinned due to telegram-bot pinning httpx with ~ httpx>=0.24.1 humanize==4.11.0 @@ -20,12 +20,12 @@ jsonschema==4.23.0 TA-Lib==0.4.32 technical==1.4.4 tabulate==0.9.0 -pycoingecko==3.1.0 +pycoingecko==3.2.0 jinja2==3.1.4 tables==3.10.1 joblib==1.4.2 -rich==13.9.3 -pyarrow==17.0.0; platform_machine != 'armv7l' +rich==13.9.4 +pyarrow==18.0.0; platform_machine != 'armv7l' # find first, C search in arrays py_find_1st==1.1.6 @@ -33,16 +33,16 @@ py_find_1st==1.1.6 # Load ticker files 30% faster python-rapidjson==1.20 # Properly format api responses -orjson==3.10.10 +orjson==3.10.12 # Notify systemd sdnotify==0.3.2 # API Server -fastapi==0.115.4 -pydantic==2.9.2 -uvicorn==0.32.0 -pyjwt==2.9.0 +fastapi==0.115.5 +pydantic==2.10.1 +uvicorn==0.32.1 +pyjwt==2.10.0 aiofiles==24.1.0 psutil==6.1.0 @@ -57,8 +57,8 @@ pytz==2024.2 schedule==1.2.2 #WS Messages -websockets==13.1 -janus==1.0.0 +websockets==14.1 +janus==1.1.0 ast-comments==1.2.2 -packaging==24.1 +packaging==24.2 diff --git a/scripts/ws_client.py b/scripts/ws_client.py index 81e539e26..46dd2da10 100755 --- a/scripts/ws_client.py +++ b/scripts/ws_client.py @@ -253,8 +253,7 @@ async def create_client( except ( socket.gaierror, ConnectionRefusedError, - websockets.exceptions.InvalidStatusCode, - websockets.exceptions.InvalidMessage, + websockets.exceptions.InvalidHandshake, ) as e: logger.error(f"Connection Refused - {e} retrying in {sleep_time}s") await asyncio.sleep(sleep_time) diff --git a/tests/commands/test_commands.py b/tests/commands/test_commands.py index 28baffd5a..355b7e20d 100644 --- a/tests/commands/test_commands.py +++ b/tests/commands/test_commands.py @@ -1,5 +1,6 @@ import json import re +import shutil from datetime import datetime, timedelta from io import BytesIO from pathlib import Path @@ -44,7 +45,7 @@ from freqtrade.enums import RunMode from freqtrade.exceptions import OperationalException from freqtrade.persistence.models import init_db from freqtrade.persistence.pairlock_middleware import PairLocks -from freqtrade.util import dt_floor_day, dt_now, dt_utc +from freqtrade.util import dt_utc from tests.conftest import ( CURRENT_TEST_STRATEGY, EXMS, @@ -571,7 +572,7 @@ def test_create_datadir_failed(caplog): assert log_has("`create-userdir` requires --userdir to be set.", caplog) -def test_create_datadir(caplog, mocker): +def test_create_datadir(mocker): cud = mocker.patch( "freqtrade.configuration.directory_operations.create_userdata_dir", MagicMock() ) @@ -585,26 +586,46 @@ def test_create_datadir(caplog, mocker): assert csf.call_count == 1 -def test_start_new_strategy(mocker, caplog): - wt_mock = mocker.patch.object(Path, "write_text", MagicMock()) - mocker.patch.object(Path, "exists", MagicMock(return_value=False)) +def test_start_new_strategy(caplog, user_dir): + strategy_dir = user_dir / "strategies" + strategy_dir.mkdir(parents=True, exist_ok=True) + assert strategy_dir.is_dir() args = ["new-strategy", "--strategy", "CoolNewStrategy"] start_new_strategy(get_args(args)) + assert strategy_dir.exists() + assert (strategy_dir / "CoolNewStrategy.py").exists() - assert wt_mock.call_count == 1 - assert "CoolNewStrategy" in wt_mock.call_args_list[0][0][0] assert log_has_re("Writing strategy to .*", caplog) - mocker.patch("freqtrade.configuration.setup_utils_configuration") - mocker.patch.object(Path, "exists", MagicMock(return_value=True)) with pytest.raises( OperationalException, match=r".* already exists. Please choose another Strategy Name\." ): start_new_strategy(get_args(args)) + args = ["new-strategy", "--strategy", "CoolNewStrategy", "--strategy-path", str(user_dir)] + start_new_strategy(get_args(args)) + assert (user_dir / "CoolNewStrategy.py").exists() -def test_start_new_strategy_no_arg(mocker, caplog): + # strategy-path that doesn't exist + args = [ + "new-strategy", + "--strategy", + "CoolNewStrategy", + "--strategy-path", + str(user_dir / "nonexistent"), + ] + start_new_strategy(get_args(args)) + assert (user_dir / "CoolNewStrategy.py").exists() + + assert log_has_re("Creating strategy directory .*", caplog) + assert (user_dir / "nonexistent").is_dir() + assert (user_dir / "nonexistent" / "CoolNewStrategy.py").exists() + + shutil.rmtree(str(user_dir)) + + +def test_start_new_strategy_no_arg(): args = [ "new-strategy", ] @@ -757,7 +778,13 @@ def test_download_data_keyboardInterrupt(mocker, markets): assert dl_mock.call_count == 1 -def test_download_data_timerange(mocker, markets): +@pytest.mark.parametrize("time", ["00:00", "00:03", "00:30", "23:56"]) +@pytest.mark.parametrize( + "tzoffset", + ["00:00", "+01:00", "-01:00", "+05:00", "-05:00"], +) +def test_download_data_timerange(mocker, markets, time_machine, time, tzoffset): + time_machine.move_to(f"2024-11-01 {time}:00 {tzoffset}") dl_mock = mocker.patch( "freqtrade.data.history.history_utils.refresh_backtest_ohlcv_data", MagicMock(return_value=["ETH/BTC", "XRP/BTC"]), @@ -797,8 +824,9 @@ def test_download_data_timerange(mocker, markets): start_download_data(pargs) assert dl_mock.call_count == 1 # 20days ago - days_ago = dt_floor_day(dt_now() - timedelta(days=20)).timestamp() - assert dl_mock.call_args_list[0][1]["timerange"].startts == days_ago + days_ago = datetime.now() - timedelta(days=20) + days_ago = dt_utc(days_ago.year, days_ago.month, days_ago.day) + assert dl_mock.call_args_list[0][1]["timerange"].startts == days_ago.timestamp() dl_mock.reset_mock() args = [ @@ -819,28 +847,6 @@ def test_download_data_timerange(mocker, markets): assert dl_mock.call_args_list[0][1]["timerange"].startts == int(dt_utc(2020, 1, 1).timestamp()) -def test_download_data_no_markets(mocker, caplog): - dl_mock = mocker.patch( - "freqtrade.data.history.history_utils.refresh_backtest_ohlcv_data", - MagicMock(return_value=["ETH/BTC", "XRP/BTC"]), - ) - patch_exchange(mocker, exchange="binance") - mocker.patch(f"{EXMS}.get_markets", return_value={}) - args = [ - "download-data", - "--exchange", - "binance", - "--pairs", - "ETH/BTC", - "XRP/BTC", - "--days", - "20", - ] - start_download_data(get_args(args)) - assert dl_mock.call_args[1]["timerange"].starttype == "date" - assert log_has("Pairs [ETH/BTC,XRP/BTC] not available on exchange Binance.", caplog) - - def test_download_data_no_exchange(mocker): mocker.patch( "freqtrade.data.history.history_utils.refresh_backtest_ohlcv_data", @@ -919,7 +925,7 @@ def test_download_data_trades(mocker): "freqtrade.data.history.history_utils.convert_trades_to_ohlcv", MagicMock(return_value=[]) ) patch_exchange(mocker) - mocker.patch(f"{EXMS}.get_markets", return_value={}) + mocker.patch(f"{EXMS}.get_markets", return_value={"ETH/BTC": {}, "XRP/BTC": {}}) args = [ "download-data", "--exchange", @@ -954,7 +960,7 @@ def test_download_data_trades(mocker): def test_download_data_data_invalid(mocker): patch_exchange(mocker, exchange="kraken") - mocker.patch(f"{EXMS}.get_markets", return_value={}) + mocker.patch(f"{EXMS}.get_markets", return_value={"ETH/BTC": {}, "XRP/BTC": {}}) args = [ "download-data", "--exchange", diff --git a/tests/conftest.py b/tests/conftest.py index 99c42de5f..517170860 100644 --- a/tests/conftest.py +++ b/tests/conftest.py @@ -5,7 +5,6 @@ import re from copy import deepcopy from datetime import datetime, timedelta, timezone from pathlib import Path -from typing import Optional from unittest.mock import MagicMock, Mock, PropertyMock import numpy as np @@ -124,7 +123,7 @@ def get_args(args): return Arguments(args).get_parsed_arg() -def generate_trades_history(n_rows, start_date: Optional[datetime] = None, days=5): +def generate_trades_history(n_rows, start_date: datetime | None = None, days=5): np.random.seed(42) if not start_date: start_date = datetime(2020, 1, 1, tzinfo=timezone.utc) @@ -206,7 +205,7 @@ def generate_test_data_raw(timeframe: str, size: int, start: str = "2020-07-05", """Generates data in the ohlcv format used by ccxt""" df = generate_test_data(timeframe, size, start, random_seed) df["date"] = df.loc[:, "date"].astype(np.int64) // 1000 // 1000 - return list(list(x) for x in zip(*(df[x].values.tolist() for x in df.columns))) + return list(list(x) for x in zip(*(df[x].values.tolist() for x in df.columns), strict=False)) # Source: https://stackoverflow.com/questions/29881236/how-to-mock-asyncio-coroutines @@ -363,8 +362,8 @@ def patch_get_signal( exit_long=False, enter_short=False, exit_short=False, - enter_tag: Optional[str] = None, - exit_tag: Optional[str] = None, + enter_tag: str | None = None, + exit_tag: str | None = None, ) -> None: """ :param mocker: mocker to patch IStrategy class @@ -395,7 +394,7 @@ def patch_get_signal( freqtrade.exchange.refresh_latest_ohlcv = lambda p: None -def create_mock_trades(fee, is_short: Optional[bool] = False, use_db: bool = True): +def create_mock_trades(fee, is_short: bool | None = False, use_db: bool = True): """ Create some fake trades ... :param is_short: Optional bool, None creates a mix of long and short trades. @@ -474,7 +473,7 @@ def create_mock_trades_with_leverage(fee, use_db: bool = True): Trade.session.flush() -def create_mock_trades_usdt(fee, is_short: Optional[bool] = False, use_db: bool = True): +def create_mock_trades_usdt(fee, is_short: bool | None = False, use_db: bool = True): """ Create some fake trades ... """ diff --git a/tests/data/test_btanalysis.py b/tests/data/test_btanalysis.py index b9dee6d59..9b79983af 100644 --- a/tests/data/test_btanalysis.py +++ b/tests/data/test_btanalysis.py @@ -503,7 +503,7 @@ def test_calculate_max_drawdown2(): ] dates = [dt_utc(2020, 1, 1) + timedelta(days=i) for i in range(len(values))] - df = DataFrame(zip(values, dates), columns=["profit", "open_date"]) + df = DataFrame(zip(values, dates, strict=False), columns=["profit", "open_date"]) # sort by profit and reset index df = df.sort_values("profit").reset_index(drop=True) df1 = df.copy() @@ -522,11 +522,11 @@ def test_calculate_max_drawdown2(): assert drawdown.drawdown_abs == 0.091755 assert pytest.approx(drawdown.relative_account_drawdown) == 0.32129575 - df = DataFrame(zip(values[:5], dates[:5]), columns=["profit", "open_date"]) + df = DataFrame(zip(values[:5], dates[:5], strict=False), columns=["profit", "open_date"]) with pytest.raises(ValueError, match="No losing trade, therefore no drawdown."): calculate_max_drawdown(df, date_col="open_date", value_col="profit") - df1 = DataFrame(zip(values[:5], dates[:5]), columns=["profit", "open_date"]) + df1 = DataFrame(zip(values[:5], dates[:5], strict=False), columns=["profit", "open_date"]) df1.loc[:, "profit"] = df1["profit"] * -1 # No winning trade ... drawdown = calculate_max_drawdown(df1, date_col="open_date", value_col="profit") @@ -548,7 +548,7 @@ def test_calculate_max_drawdown_abs(profits, relative, highd, lowdays, result, r """ init_date = datetime(2020, 1, 1, tzinfo=timezone.utc) dates = [init_date + timedelta(days=i) for i in range(len(profits))] - df = DataFrame(zip(profits, dates), columns=["profit_abs", "open_date"]) + df = DataFrame(zip(profits, dates, strict=False), columns=["profit_abs", "open_date"]) # sort by profit and reset index df = df.sort_values("profit_abs").reset_index(drop=True) df1 = df.copy() diff --git a/tests/data/test_datahandler.py b/tests/data/test_datahandler.py index 99af63eca..e9ffcc7a1 100644 --- a/tests/data/test_datahandler.py +++ b/tests/data/test_datahandler.py @@ -416,7 +416,17 @@ def test_hdf5datahandler_ohlcv_load_and_resave( ) @pytest.mark.parametrize("datahandler", ["hdf5", "feather", "parquet"]) def test_generic_datahandler_ohlcv_load_and_resave( - datahandler, testdatadir, tmp_path, pair, timeframe, candle_type, candle_append, startdt, enddt + datahandler, + mocker, + testdatadir, + tmp_path, + pair, + timeframe, + candle_type, + candle_append, + startdt, + enddt, + caplog, ): tmpdir2 = tmp_path if candle_type not in ("", "spot"): @@ -458,9 +468,26 @@ def test_generic_datahandler_ohlcv_load_and_resave( assert ohlcv[ohlcv["date"] > enddt].empty # Try loading inexisting file - ohlcv = dh.ohlcv_load("UNITTEST/NONEXIST", timeframe, candle_type=candle_type) + ohlcv = dh1.ohlcv_load("UNITTEST/NONEXIST", timeframe, candle_type=candle_type) assert ohlcv.empty + # Try loading a file that exists but errors + mocker.patch( + "freqtrade.data.history.datahandlers.featherdatahandler.read_feather", + side_effect=Exception("Test"), + ) + mocker.patch( + "freqtrade.data.history.datahandlers.parquetdatahandler.read_parquet", + side_effect=Exception("Test"), + ) + mocker.patch( + "freqtrade.data.history.datahandlers.hdf5datahandler.pd.read_hdf", + side_effect=Exception("Test"), + ) + ohlcv_e = dh1.ohlcv_load("UNITTEST/NEW", timeframe, candle_type=candle_type) + assert ohlcv_e.empty + assert log_has_re("Error loading data from", caplog) + def test_hdf5datahandler_ohlcv_purge(mocker, testdatadir): mocker.patch.object(Path, "exists", MagicMock(return_value=False)) diff --git a/tests/data/test_download_data.py b/tests/data/test_download_data.py index f26a30ce1..ef1d938d3 100644 --- a/tests/data/test_download_data.py +++ b/tests/data/test_download_data.py @@ -6,7 +6,7 @@ from freqtrade.configuration.config_setup import setup_utils_configuration from freqtrade.data.history.history_utils import download_data_main from freqtrade.enums import RunMode from freqtrade.exceptions import OperationalException -from tests.conftest import EXMS, log_has, patch_exchange +from tests.conftest import EXMS, log_has_re, patch_exchange def test_download_data_main_no_markets(mocker, caplog): @@ -19,8 +19,8 @@ def test_download_data_main_no_markets(mocker, caplog): config = setup_utils_configuration({"exchange": "binance"}, RunMode.UTIL_EXCHANGE) config.update({"days": 20, "pairs": ["ETH/BTC", "XRP/BTC"], "timeframes": ["5m", "1h"]}) download_data_main(config) - assert dl_mock.call_args[1]["timerange"].starttype == "date" - assert log_has("Pairs [ETH/BTC,XRP/BTC] not available on exchange Binance.", caplog) + assert dl_mock.call_count == 0 + assert log_has_re("No pairs available for download..*", caplog) def test_download_data_main_all_pairs(mocker, markets): @@ -55,7 +55,7 @@ def test_download_data_main_trades(mocker): "freqtrade.data.history.history_utils.convert_trades_to_ohlcv", MagicMock(return_value=[]) ) patch_exchange(mocker) - mocker.patch(f"{EXMS}.get_markets", return_value={}) + mocker.patch(f"{EXMS}.get_markets", return_value={"ETH/BTC": {}, "XRP/BTC": {}}) config = setup_utils_configuration({"exchange": "binance"}, RunMode.UTIL_EXCHANGE) config.update( { @@ -91,7 +91,7 @@ def test_download_data_main_trades(mocker): def test_download_data_main_data_invalid(mocker): patch_exchange(mocker, exchange="kraken") - mocker.patch(f"{EXMS}.get_markets", return_value={}) + mocker.patch(f"{EXMS}.get_markets", return_value={"ETH/BTC": {}}) config = setup_utils_configuration({"exchange": "kraken"}, RunMode.UTIL_EXCHANGE) config.update( { diff --git a/tests/data/test_history.py b/tests/data/test_history.py index b505c4fe3..2549ff65d 100644 --- a/tests/data/test_history.py +++ b/tests/data/test_history.py @@ -210,7 +210,7 @@ def test_json_pair_trades_filename(pair, trading_mode, expected_result): assert fn == Path(expected_result + ".gz") -def test_load_cached_data_for_updating(mocker, testdatadir) -> None: +def test_load_cached_data_for_updating(testdatadir) -> None: data_handler = get_datahandler(testdatadir, "json") test_data = None @@ -225,13 +225,14 @@ def test_load_cached_data_for_updating(mocker, testdatadir) -> None: now_ts = test_data[-1][0] / 1000 + 60 * 60 # timeframe starts earlier than the cached data - # should fully update data + # Update timestamp to candle end date timerange = TimeRange("date", None, test_data[0][0] / 1000 - 1, 0) data, start_ts, end_ts = _load_cached_data_for_updating( "UNITTEST/BTC", "1m", timerange, data_handler, CandleType.SPOT ) - assert data.empty - assert start_ts == test_data[0][0] - 1000 + assert not data.empty + # Last candle was removed - so 1 candle overlap + assert start_ts == test_data[-1][0] - 60 * 1000 assert end_ts is None # timeframe starts earlier than the cached data - prepending @@ -589,8 +590,8 @@ def test_download_data_no_markets(mocker, default_conf, caplog, testdatadir): ) assert dl_mock.call_count == 0 - assert "BTT/BTC" in unav_pairs - assert "LTC/USDT" in unav_pairs + assert "BTT/BTC: Pair not available on exchange." in unav_pairs + assert "LTC/USDT: Pair not available on exchange." in unav_pairs assert log_has("Skipping pair BTT/BTC...", caplog) @@ -617,7 +618,7 @@ def test_refresh_backtest_trades_data(mocker, default_conf, markets, caplog, tes assert dl_mock.call_args[1]["timerange"].starttype == "date" assert log_has("Downloading trades for pair ETH/BTC.", caplog) - assert unavailable_pairs == ["XRP/ETH"] + assert [p for p in unavailable_pairs if "XRP/ETH" in p] assert log_has("Skipping pair XRP/ETH...", caplog) @@ -665,13 +666,16 @@ def test_download_trades_history( file1.unlink() - mocker.patch(f"{EXMS}.get_historic_trades", MagicMock(side_effect=ValueError)) + mocker.patch(f"{EXMS}.get_historic_trades", MagicMock(side_effect=ValueError("he ho!"))) caplog.clear() - assert not _download_trades_history( - data_handler=data_handler, exchange=exchange, pair="ETH/BTC", trading_mode=TradingMode.SPOT - ) - assert log_has_re('Failed to download and store historic trades for pair: "ETH/BTC".*', caplog) + with pytest.raises(ValueError, match="he ho!"): + _download_trades_history( + data_handler=data_handler, + exchange=exchange, + pair="ETH/BTC", + trading_mode=TradingMode.SPOT, + ) file2 = tmp_path / "XRP_ETH-trades.json.gz" copyfile(testdatadir / file2.name, file2) @@ -682,17 +686,15 @@ def test_download_trades_history( since_time = int(trades_history[0][0] // 1000) - 500 timerange = TimeRange("date", None, since_time, 0) - assert _download_trades_history( - data_handler=data_handler, - exchange=exchange, - pair="XRP/ETH", - timerange=timerange, - trading_mode=TradingMode.SPOT, - ) + with pytest.raises(ValueError, match=r"Start .* earlier than available data"): + _download_trades_history( + data_handler=data_handler, + exchange=exchange, + pair="XRP/ETH", + timerange=timerange, + trading_mode=TradingMode.SPOT, + ) - assert ght_mock.call_count == 1 + assert ght_mock.call_count == 0 - assert int(ght_mock.call_args_list[0][1]["since"] // 1000) == since_time - assert ght_mock.call_args_list[0][1]["from_id"] is None - assert log_has_re(r"Start .* earlier than available data. Redownloading trades for.*", caplog) _clean_test_file(file2) diff --git a/tests/exchange/test_binance.py b/tests/exchange/test_binance.py index 623a9f17a..1da5b2bda 100644 --- a/tests/exchange/test_binance.py +++ b/tests/exchange/test_binance.py @@ -794,3 +794,57 @@ def test_get_maintenance_ratio_and_amt_binance( exchange._leverage_tiers = leverage_tiers (result_ratio, result_amt) = exchange.get_maintenance_ratio_and_amt(pair, notional_value) assert (round(result_ratio, 8), round(result_amt, 8)) == (mm_ratio, amt) + + +async def test__async_get_trade_history_id_binance(default_conf_usdt, mocker, fetch_trades_result): + exchange = get_patched_exchange(mocker, default_conf_usdt, exchange="binance") + + async def mock_get_trade_hist(pair, *args, **kwargs): + if "since" in kwargs: + # older than initial call + if kwargs["since"] < 1565798399752: + return [] + else: + # Don't expect to get here + raise ValueError("Unexpected call") + # return fetch_trades_result[:-2] + elif kwargs.get("params", {}).get(exchange._trades_pagination_arg) == "0": + # Return first 3 + return fetch_trades_result[:-2] + elif kwargs.get("params", {}).get(exchange._trades_pagination_arg) in ( + fetch_trades_result[-3]["id"], + 1565798399752, + ): + # Return 2 + return fetch_trades_result[-3:-1] + else: + # Return last 2 + return fetch_trades_result[-2:] + + exchange._api_async.fetch_trades = MagicMock(side_effect=mock_get_trade_hist) + + pair = "ETH/BTC" + ret = await exchange._async_get_trade_history_id( + pair, + since=fetch_trades_result[0]["timestamp"], + until=fetch_trades_result[-1]["timestamp"] - 1, + ) + assert ret[0] == pair + assert isinstance(ret[1], list) + assert exchange._api_async.fetch_trades.call_count == 4 + + fetch_trades_cal = exchange._api_async.fetch_trades.call_args_list + # first call (using since, not fromId) + assert fetch_trades_cal[0][0][0] == pair + assert fetch_trades_cal[0][1]["since"] == fetch_trades_result[0]["timestamp"] + + # 2nd call + assert fetch_trades_cal[1][0][0] == pair + assert "params" in fetch_trades_cal[1][1] + pagination_arg = exchange._ft_has["trades_pagination_arg"] + assert pagination_arg in fetch_trades_cal[1][1]["params"] + # Initial call was with from_id = "0" + assert fetch_trades_cal[1][1]["params"][pagination_arg] == "0" + + assert fetch_trades_cal[2][1]["params"][pagination_arg] != "0" + assert fetch_trades_cal[3][1]["params"][pagination_arg] != "0" diff --git a/tests/exchange/test_bybit.py b/tests/exchange/test_bybit.py index f4b8a8ea1..4448f49de 100644 --- a/tests/exchange/test_bybit.py +++ b/tests/exchange/test_bybit.py @@ -1,6 +1,8 @@ from datetime import datetime, timedelta, timezone from unittest.mock import MagicMock +import pytest + from freqtrade.enums.marginmode import MarginMode from freqtrade.enums.tradingmode import TradingMode from tests.conftest import EXMS, get_mock_coro, get_patched_exchange, log_has @@ -172,3 +174,26 @@ def test_bybit_fetch_order_canceled_empty(default_conf_usdt, mocker): assert res2["filled"] == 0.0 assert res2["amount"] == 20.0 assert res2["status"] == "open" + + +@pytest.mark.parametrize( + "side,order_type,uta,tradingmode,expected", + [ + ("buy", "limit", False, "spot", True), + ("buy", "limit", False, "futures", True), + ("sell", "limit", False, "spot", True), + ("sell", "limit", False, "futures", True), + ("buy", "market", False, "spot", True), + ("buy", "market", False, "futures", False), + ("buy", "market", True, "spot", False), + ("buy", "market", True, "futures", False), + ], +) +def test_bybit__order_needs_price( + default_conf, mocker, side, order_type, uta, tradingmode, expected +): + exchange = get_patched_exchange(mocker, default_conf, exchange="bybit") + exchange.trading_mode = tradingmode + exchange.unified_account = uta + + assert exchange._order_needs_price(side, order_type) == expected diff --git a/tests/exchange/test_exchange.py b/tests/exchange/test_exchange.py index 07d5927c2..0d0a5eca9 100644 --- a/tests/exchange/test_exchange.py +++ b/tests/exchange/test_exchange.py @@ -1069,7 +1069,6 @@ def test_create_dry_run_order(default_conf, mocker, side, exchange_name, leverag assert order["type"] == "limit" assert order["symbol"] == "ETH/BTC" assert order["amount"] == 1 - assert order["leverage"] == leverage assert order["cost"] == 1 * 200 @@ -4451,6 +4450,7 @@ def test_market_is_tradable( ex = get_patched_exchange(mocker, default_conf, exchange=exchange) market = { "symbol": market_symbol, + "type": "swap", "base": base, "quote": quote, "spot": spot, diff --git a/tests/exchange/test_hyperliquid.py b/tests/exchange/test_hyperliquid.py new file mode 100644 index 000000000..808bef802 --- /dev/null +++ b/tests/exchange/test_hyperliquid.py @@ -0,0 +1,417 @@ +from datetime import datetime, timezone +from unittest.mock import MagicMock, PropertyMock + +import pytest + +from tests.conftest import EXMS, get_mock_coro, get_patched_exchange + + +def test_hyperliquid_dry_run_liquidation_price(default_conf, mocker): + # test if liq price calculated by dry_run_liquidation_price() is close to ccxt liq price + # testing different pairs with large/small prices, different leverages, long, short + markets = { + "BTC/USDC:USDC": {"limits": {"leverage": {"max": 50}}}, + "ETH/USDC:USDC": {"limits": {"leverage": {"max": 50}}}, + "SOL/USDC:USDC": {"limits": {"leverage": {"max": 20}}}, + "DOGE/USDC:USDC": {"limits": {"leverage": {"max": 20}}}, + } + positions = [ + { + "symbol": "ETH/USDC:USDC", + "entryPrice": 2458.5, + "side": "long", + "contracts": 0.015, + "collateral": 36.864593, + "leverage": 1.0, + "liquidationPrice": 0.86915825, + }, + { + "symbol": "BTC/USDC:USDC", + "entryPrice": 63287.0, + "side": "long", + "contracts": 0.00039, + "collateral": 24.673292, + "leverage": 1.0, + "liquidationPrice": 22.37166537, + }, + { + "symbol": "SOL/USDC:USDC", + "entryPrice": 146.82, + "side": "long", + "contracts": 0.16, + "collateral": 23.482979, + "leverage": 1.0, + "liquidationPrice": 0.05269872, + }, + { + "symbol": "SOL/USDC:USDC", + "entryPrice": 145.83, + "side": "long", + "contracts": 0.33, + "collateral": 24.045107, + "leverage": 2.0, + "liquidationPrice": 74.83696193, + }, + { + "symbol": "ETH/USDC:USDC", + "entryPrice": 2459.5, + "side": "long", + "contracts": 0.0199, + "collateral": 24.454895, + "leverage": 2.0, + "liquidationPrice": 1243.0411908, + }, + { + "symbol": "BTC/USDC:USDC", + "entryPrice": 62739.0, + "side": "long", + "contracts": 0.00077, + "collateral": 24.137992, + "leverage": 2.0, + "liquidationPrice": 31708.03843631, + }, + { + "symbol": "DOGE/USDC:USDC", + "entryPrice": 0.11586, + "side": "long", + "contracts": 437.0, + "collateral": 25.29769, + "leverage": 2.0, + "liquidationPrice": 0.05945697, + }, + { + "symbol": "ETH/USDC:USDC", + "entryPrice": 2642.8, + "side": "short", + "contracts": 0.019, + "collateral": 25.091876, + "leverage": 2.0, + "liquidationPrice": 3924.18322043, + }, + { + "symbol": "SOL/USDC:USDC", + "entryPrice": 155.89, + "side": "short", + "contracts": 0.32, + "collateral": 24.924941, + "leverage": 2.0, + "liquidationPrice": 228.07847866, + }, + { + "symbol": "DOGE/USDC:USDC", + "entryPrice": 0.14333, + "side": "short", + "contracts": 351.0, + "collateral": 25.136807, + "leverage": 2.0, + "liquidationPrice": 0.20970228, + }, + { + "symbol": "BTC/USDC:USDC", + "entryPrice": 68595.0, + "side": "short", + "contracts": 0.00069, + "collateral": 23.64871, + "leverage": 2.0, + "liquidationPrice": 101849.99354283, + }, + { + "symbol": "BTC/USDC:USDC", + "entryPrice": 65536.0, + "side": "short", + "contracts": 0.00099, + "collateral": 21.604172, + "leverage": 3.0, + "liquidationPrice": 86493.46174617, + }, + { + "symbol": "SOL/USDC:USDC", + "entryPrice": 173.06, + "side": "long", + "contracts": 0.6, + "collateral": 20.735658, + "leverage": 5.0, + "liquidationPrice": 142.05186667, + }, + { + "symbol": "ETH/USDC:USDC", + "entryPrice": 2545.5, + "side": "long", + "contracts": 0.0329, + "collateral": 20.909894, + "leverage": 4.0, + "liquidationPrice": 1929.23322895, + }, + { + "symbol": "BTC/USDC:USDC", + "entryPrice": 67400.0, + "side": "short", + "contracts": 0.00031, + "collateral": 20.887308, + "leverage": 1.0, + "liquidationPrice": 133443.97317151, + }, + { + "symbol": "ETH/USDC:USDC", + "entryPrice": 2552.0, + "side": "short", + "contracts": 0.0327, + "collateral": 20.833393, + "leverage": 4.0, + "liquidationPrice": 3157.53150453, + }, + { + "symbol": "BTC/USDC:USDC", + "entryPrice": 66930.0, + "side": "long", + "contracts": 0.0015, + "collateral": 20.043862, + "leverage": 5.0, + "liquidationPrice": 54108.51043771, + }, + { + "symbol": "BTC/USDC:USDC", + "entryPrice": 67033.0, + "side": "long", + "contracts": 0.00121, + "collateral": 20.251817, + "leverage": 4.0, + "liquidationPrice": 50804.00091827, + }, + { + "symbol": "ETH/USDC:USDC", + "entryPrice": 2521.9, + "side": "long", + "contracts": 0.0237, + "collateral": 19.902091, + "leverage": 3.0, + "liquidationPrice": 1699.14071943, + }, + { + "symbol": "BTC/USDC:USDC", + "entryPrice": 68139.0, + "side": "short", + "contracts": 0.00145, + "collateral": 19.72573, + "leverage": 5.0, + "liquidationPrice": 80933.61590987, + }, + { + "symbol": "SOL/USDC:USDC", + "entryPrice": 178.29, + "side": "short", + "contracts": 0.11, + "collateral": 19.605036, + "leverage": 1.0, + "liquidationPrice": 347.82205322, + }, + { + "symbol": "SOL/USDC:USDC", + "entryPrice": 176.23, + "side": "long", + "contracts": 0.33, + "collateral": 19.364946, + "leverage": 3.0, + "liquidationPrice": 120.56240404, + }, + { + "symbol": "SOL/USDC:USDC", + "entryPrice": 173.08, + "side": "short", + "contracts": 0.33, + "collateral": 19.01881, + "leverage": 3.0, + "liquidationPrice": 225.08561715, + }, + { + "symbol": "BTC/USDC:USDC", + "entryPrice": 68240.0, + "side": "short", + "contracts": 0.00105, + "collateral": 17.887922, + "leverage": 4.0, + "liquidationPrice": 84431.79820839, + }, + { + "symbol": "ETH/USDC:USDC", + "entryPrice": 2518.4, + "side": "short", + "contracts": 0.007, + "collateral": 17.62263, + "leverage": 1.0, + "liquidationPrice": 4986.05799151, + }, + { + "symbol": "ETH/USDC:USDC", + "entryPrice": 2533.2, + "side": "long", + "contracts": 0.0347, + "collateral": 17.555195, + "leverage": 5.0, + "liquidationPrice": 2047.7642302, + }, + { + "symbol": "DOGE/USDC:USDC", + "entryPrice": 0.13284, + "side": "long", + "contracts": 360.0, + "collateral": 15.943218, + "leverage": 3.0, + "liquidationPrice": 0.09082388, + }, + { + "symbol": "SOL/USDC:USDC", + "entryPrice": 163.11, + "side": "short", + "contracts": 0.48, + "collateral": 15.650731, + "leverage": 5.0, + "liquidationPrice": 190.94213618, + }, + { + "symbol": "BTC/USDC:USDC", + "entryPrice": 67141.0, + "side": "long", + "contracts": 0.00067, + "collateral": 14.979079, + "leverage": 3.0, + "liquidationPrice": 45236.52992613, + }, + ] + + api_mock = MagicMock() + default_conf["trading_mode"] = "futures" + default_conf["margin_mode"] = "isolated" + default_conf["stake_currency"] = "USDC" + api_mock.load_markets = get_mock_coro(return_value=markets) + exchange = get_patched_exchange( + mocker, default_conf, api_mock, exchange="hyperliquid", mock_markets=False + ) + + for position in positions: + is_short = True if position["side"] == "short" else False + liq_price_returned = position["liquidationPrice"] + liq_price_calculated = exchange.dry_run_liquidation_price( + position["symbol"], + position["entryPrice"], + is_short, + position["contracts"], + position["collateral"], + position["leverage"], + position["collateral"], + [], + ) + assert pytest.approx(liq_price_returned, rel=0.0001) == liq_price_calculated + + +def test_hyperliquid_get_funding_fees(default_conf, mocker): + now = datetime.now(timezone.utc) + exchange = get_patched_exchange(mocker, default_conf, exchange="hyperliquid") + exchange._fetch_and_calculate_funding_fees = MagicMock() + exchange.get_funding_fees("BTC/USDC:USDC", 1, False, now) + assert exchange._fetch_and_calculate_funding_fees.call_count == 0 + + default_conf["trading_mode"] = "futures" + default_conf["margin_mode"] = "isolated" + exchange = get_patched_exchange(mocker, default_conf, exchange="hyperliquid") + exchange._fetch_and_calculate_funding_fees = MagicMock() + exchange.get_funding_fees("BTC/USDC:USDC", 1, False, now) + + assert exchange._fetch_and_calculate_funding_fees.call_count == 1 + + +def test_hyperliquid_get_max_leverage(default_conf, mocker): + markets = { + "BTC/USDC:USDC": {"limits": {"leverage": {"max": 50}}}, + "ETH/USDC:USDC": {"limits": {"leverage": {"max": 50}}}, + "SOL/USDC:USDC": {"limits": {"leverage": {"max": 20}}}, + "DOGE/USDC:USDC": {"limits": {"leverage": {"max": 20}}}, + } + exchange = get_patched_exchange(mocker, default_conf, exchange="hyperliquid") + assert exchange.get_max_leverage("BTC/USDC:USDC", 1) == 1.0 + + default_conf["trading_mode"] = "futures" + default_conf["margin_mode"] = "isolated" + exchange = get_patched_exchange(mocker, default_conf, exchange="hyperliquid") + mocker.patch.multiple( + EXMS, + markets=PropertyMock(return_value=markets), + ) + + assert exchange.get_max_leverage("BTC/USDC:USDC", 1) == 50 + assert exchange.get_max_leverage("ETH/USDC:USDC", 20) == 50 + assert exchange.get_max_leverage("SOL/USDC:USDC", 50) == 20 + assert exchange.get_max_leverage("DOGE/USDC:USDC", 3) == 20 + + +def test_hyperliquid__lev_prep(default_conf, mocker): + api_mock = MagicMock() + api_mock.set_margin_mode = MagicMock() + type(api_mock).has = PropertyMock(return_value={"setMarginMode": True}) + exchange = get_patched_exchange(mocker, default_conf, api_mock, exchange="hyperliquid") + exchange._lev_prep("BTC/USDC:USDC", 3.2, "buy") + + assert api_mock.set_margin_mode.call_count == 0 + + # test in futures mode + api_mock.set_margin_mode.reset_mock() + default_conf["dry_run"] = False + + default_conf["trading_mode"] = "futures" + default_conf["margin_mode"] = "isolated" + + exchange = get_patched_exchange(mocker, default_conf, api_mock, exchange="hyperliquid") + exchange._lev_prep("BTC/USDC:USDC", 3.2, "buy") + + assert api_mock.set_margin_mode.call_count == 1 + api_mock.set_margin_mode.assert_called_with("isolated", "BTC/USDC:USDC", {"leverage": 3}) + + api_mock.reset_mock() + + exchange._lev_prep("BTC/USDC:USDC", 19.99, "sell") + + assert api_mock.set_margin_mode.call_count == 1 + api_mock.set_margin_mode.assert_called_with("isolated", "BTC/USDC:USDC", {"leverage": 19}) + + +def test_hyperliquid_fetch_order(default_conf_usdt, mocker): + default_conf_usdt["dry_run"] = False + + api_mock = MagicMock() + api_mock.fetch_order = MagicMock( + return_value={ + "id": "12345", + "symbol": "ETH/USDC:USDC", + "status": "closed", + "filled": 0.1, + "average": None, + "timestamp": 1630000000, + } + ) + + mocker.patch(f"{EXMS}.exchange_has", return_value=True) + gtfo_mock = mocker.patch( + f"{EXMS}.get_trades_for_order", + return_value=[ + { + "order_id": "12345", + "price": 1000, + "amount": 3, + "filled": 3, + "remaining": 0, + }, + { + "order_id": "12345", + "price": 3000, + "amount": 1, + "filled": 1, + "remaining": 0, + }, + ], + ) + exchange = get_patched_exchange(mocker, default_conf_usdt, api_mock, exchange="hyperliquid") + o = exchange.fetch_order("12345", "ETH/USDC:USDC") + # Uses weighted average + assert o["average"] == 1500 + + assert gtfo_mock.call_count == 1 diff --git a/tests/exchange/test_kraken.py b/tests/exchange/test_kraken.py index 5715c9cc0..c3a3b1b93 100644 --- a/tests/exchange/test_kraken.py +++ b/tests/exchange/test_kraken.py @@ -56,13 +56,14 @@ def test_kraken_trading_agreement(default_conf, mocker, order_type, time_in_forc assert api_mock.create_order.call_args[0][5] == expected_params -def test_get_balances_prod(default_conf, mocker): - balance_item = {"free": None, "total": 10.0, "used": 0.0} +def test_get_balances_prod_kraken(default_conf, mocker): + balance_item = {"free": 0.0, "total": 10.0, "used": 0.0} api_mock = MagicMock() api_mock.fetch_balance = MagicMock( return_value={ - "1ST": balance_item.copy(), + "1ST": {"free": 0.0, "total": 0.0, "used": 0.0}, + "1ST.F": balance_item.copy(), # When "rewards" is enabled, the balance is in ".F" "2ND": balance_item.copy(), "3RD": balance_item.copy(), "4TH": balance_item.copy(), diff --git a/tests/exchange_online/conftest.py b/tests/exchange_online/conftest.py index e9c594299..867ef1501 100644 --- a/tests/exchange_online/conftest.py +++ b/tests/exchange_online/conftest.py @@ -30,40 +30,64 @@ EXCHANGES = { "private_methods": ["fapiPrivateGetPositionSideDual", "fapiPrivateGetMultiAssetsMargin"], "sample_order": [ { - "symbol": "SOLUSDT", - "orderId": 3551312894, - "orderListId": -1, - "clientOrderId": "x-R4DD3S8297c73a11ccb9dc8f2811ba", - "transactTime": 1674493798550, - "price": "15.50000000", - "origQty": "1.10000000", - "executedQty": "0.00000000", - "cummulativeQuoteQty": "0.00000000", - "status": "NEW", - "timeInForce": "GTC", - "type": "LIMIT", - "side": "BUY", - "workingTime": 1674493798550, - "fills": [], - "selfTradePreventionMode": "NONE", + "exchange_response": { + "symbol": "SOLUSDT", + "orderId": 3551312894, + "orderListId": -1, + "clientOrderId": "x-R4DD3S8297c73a11ccb9dc8f2811ba", + "transactTime": 1674493798550, + "price": "15.50000000", + "origQty": "1.10000000", + "executedQty": "0.00000000", + "cummulativeQuoteQty": "0.00000000", + "status": "NEW", + "timeInForce": "GTC", + "type": "LIMIT", + "side": "BUY", + "workingTime": 1674493798550, + "fills": [], + "selfTradePreventionMode": "NONE", + }, + "pair": "SOL/USDT", + "expected": { + "symbol": "SOL/USDT", + "orderId": "3551312894", + "timestamp": 1674493798550, + "datetime": "2023-03-25T15:49:58.550Z", + "price": 15.5, + "status": "open", + "amount": 1.1, + }, }, { - "symbol": "SOLUSDT", - "orderId": 3551312894, - "orderListId": -1, - "clientOrderId": "x-R4DD3S8297c73a11ccb9dc8f2811ba", - "transactTime": 1674493798550, - "price": "15.50000000", - "origQty": "1.10000000", - "executedQty": "1.10000000", - "cummulativeQuoteQty": "17.05", - "status": "FILLED", - "timeInForce": "GTC", - "type": "LIMIT", - "side": "BUY", - "workingTime": 1674493798550, - "fills": [], - "selfTradePreventionMode": "NONE", + "exchange_response": { + "symbol": "SOLUSDT", + "orderId": 3551312894, + "orderListId": -1, + "clientOrderId": "x-R4DD3S8297c73a11ccb9dc8f2811ba", + "transactTime": 1674493798550, + "price": "15.50000000", + "origQty": "1.10000000", + "executedQty": "1.10000000", + "cummulativeQuoteQty": "17.05", + "status": "FILLED", + "timeInForce": "GTC", + "type": "LIMIT", + "side": "BUY", + "workingTime": 1674493798550, + "fills": [], + "selfTradePreventionMode": "NONE", + }, + "pair": "SOL/USDT", + "expected": { + "symbol": "SOL/USDT", + "orderId": "3551312894", + "timestamp": 1674493798550, + "datetime": "2023-03-25T15:49:58.550Z", + "price": 15.5, + "status": "open", + "amount": 1.1, + }, }, ], }, @@ -76,22 +100,34 @@ EXCHANGES = { "skip_ws_tests": True, "sample_order": [ { - "symbol": "SOLUSDT", - "orderId": 3551312894, - "orderListId": -1, - "clientOrderId": "x-R4DD3S8297c73a11ccb9dc8f2811ba", - "transactTime": 1674493798550, - "price": "15.50000000", - "origQty": "1.10000000", - "executedQty": "0.00000000", - "cummulativeQuoteQty": "0.00000000", - "status": "NEW", - "timeInForce": "GTC", - "type": "LIMIT", - "side": "BUY", - "workingTime": 1674493798550, - "fills": [], - "selfTradePreventionMode": "NONE", + "exchange_response": { + "symbol": "SOLUSDT", + "orderId": 3551312894, + "orderListId": -1, + "clientOrderId": "x-R4DD3S8297c73a11ccb9dc8f2811ba", + "transactTime": 1674493798550, + "price": "15.50000000", + "origQty": "1.10000000", + "executedQty": "0.00000000", + "cummulativeQuoteQty": "0.00000000", + "status": "NEW", + "timeInForce": "GTC", + "type": "LIMIT", + "side": "BUY", + "workingTime": 1674493798550, + "fills": [], + "selfTradePreventionMode": "NONE", + }, + "pair": "SOL/USDT", + "expected": { + "symbol": "SOL/USDT", + "orderId": "3551312894", + "timestamp": 1674493798550, + "datetime": "2023-03-25T15:49:58.550Z", + "price": 15.5, + "status": "open", + "amount": 1.1, + }, } ], }, @@ -112,38 +148,62 @@ EXCHANGES = { "leverage_tiers_public": False, "leverage_in_spot_market": True, "sample_order": [ - {"id": "63d6742d0adc5570001d2bbf7"}, # create order { - "id": "63d6742d0adc5570001d2bbf7", - "symbol": "SOL-USDT", - "opType": "DEAL", - "type": "limit", - "side": "buy", - "price": "15.5", - "size": "1.1", - "funds": "0", - "dealFunds": "17.05", - "dealSize": "1.1", - "fee": "0.000065252", - "feeCurrency": "USDT", - "stp": "", - "stop": "", - "stopTriggered": False, - "stopPrice": "0", - "timeInForce": "GTC", - "postOnly": False, - "hidden": False, - "iceberg": False, - "visibleSize": "0", - "cancelAfter": 0, - "channel": "API", - "clientOid": "0a053870-11bf-41e5-be61-b272a4cb62e1", - "remark": None, - "tags": "partner:ccxt", - "isActive": False, - "cancelExist": False, - "createdAt": 1674493798550, - "tradeType": "TRADE", + "exchange_response": {"id": "63d6742d0adc5570001d2bbf7"}, + "pair": "SOL/USDT", + "expected": { + "symbol": "SOL/USDT", + "orderId": "3551312894", + "timestamp": 1674493798550, + "datetime": "2023-03-25T15:49:58.550Z", + "price": 15.5, + "status": "open", + "amount": 1.1, + }, + }, # create order + { + "exchange_response": { + "id": "63d6742d0adc5570001d2bbf7", + "symbol": "SOL-USDT", + "opType": "DEAL", + "type": "limit", + "side": "buy", + "price": "15.5", + "size": "1.1", + "funds": "0", + "dealFunds": "17.05", + "dealSize": "1.1", + "fee": "0.000065252", + "feeCurrency": "USDT", + "stp": "", + "stop": "", + "stopTriggered": False, + "stopPrice": "0", + "timeInForce": "GTC", + "postOnly": False, + "hidden": False, + "iceberg": False, + "visibleSize": "0", + "cancelAfter": 0, + "channel": "API", + "clientOid": "0a053870-11bf-41e5-be61-b272a4cb62e1", + "remark": None, + "tags": "partner:ccxt", + "isActive": False, + "cancelExist": False, + "createdAt": 1674493798550, + "tradeType": "TRADE", + }, + "pair": "SOL/USDT", + "expected": { + "symbol": "SOL/USDT", + "orderId": "3551312894", + "timestamp": 1674493798550, + "datetime": "2023-03-25T15:49:58.550Z", + "price": 15.5, + "status": "open", + "amount": 1.1, + }, }, ], }, @@ -159,65 +219,89 @@ EXCHANGES = { "leverage_in_spot_market": True, "sample_order": [ { - "id": "276266139423", - "text": "apiv4", - "create_time": "1674493798", - "update_time": "1674493798", - "create_time_ms": "1674493798550", - "update_time_ms": "1674493798550", - "status": "closed", - "currency_pair": "SOL_USDT", - "type": "limit", - "account": "spot", - "side": "buy", - "amount": "1.1", - "price": "15.5", - "time_in_force": "gtc", - "iceberg": "0", - "left": "0", - "fill_price": "17.05", - "filled_total": "17.05", - "avg_deal_price": "15.5", - "fee": "0.0000018", - "fee_currency": "SOL", - "point_fee": "0", - "gt_fee": "0", - "gt_maker_fee": "0", - "gt_taker_fee": "0.0015", - "gt_discount": True, - "rebated_fee": "0", - "rebated_fee_currency": "USDT", + "exchange_response": { + "id": "276266139423", + "text": "apiv4", + "create_time": "1674493798", + "update_time": "1674493798", + "create_time_ms": "1674493798550", + "update_time_ms": "1674493798550", + "status": "closed", + "currency_pair": "SOL_USDT", + "type": "limit", + "account": "spot", + "side": "buy", + "amount": "1.1", + "price": "15.5", + "time_in_force": "gtc", + "iceberg": "0", + "left": "0", + "fill_price": "17.05", + "filled_total": "17.05", + "avg_deal_price": "15.5", + "fee": "0.0000018", + "fee_currency": "SOL", + "point_fee": "0", + "gt_fee": "0", + "gt_maker_fee": "0", + "gt_taker_fee": "0.0015", + "gt_discount": True, + "rebated_fee": "0", + "rebated_fee_currency": "USDT", + }, + "pair": "SOL/USDT", + "expected": { + "symbol": "SOL/USDT", + "orderId": "3551312894", + "timestamp": 1674493798550, + "datetime": "2023-03-25T15:49:58.550Z", + "price": 15.5, + "status": "open", + "amount": 1.1, + }, }, { - # market order - "id": "276401180529", - "text": "apiv4", - "create_time": "1674493798", - "update_time": "1674493798", - "create_time_ms": "1674493798550", - "update_time_ms": "1674493798550", - "status": "cancelled", - "currency_pair": "SOL_USDT", - "type": "market", - "account": "spot", - "side": "buy", - "amount": "17.05", - "price": "0", - "time_in_force": "ioc", - "iceberg": "0", - "left": "0.0000000016228", - "fill_price": "17.05", - "filled_total": "17.05", - "avg_deal_price": "15.5", - "fee": "0", - "fee_currency": "SOL", - "point_fee": "0.0199999999967544", - "gt_fee": "0", - "gt_maker_fee": "0", - "gt_taker_fee": "0", - "gt_discount": False, - "rebated_fee": "0", - "rebated_fee_currency": "USDT", + "exchange_response": { + # market order + "id": "276401180529", + "text": "apiv4", + "create_time": "1674493798", + "update_time": "1674493798", + "create_time_ms": "1674493798550", + "update_time_ms": "1674493798550", + "status": "cancelled", + "currency_pair": "SOL_USDT", + "type": "market", + "account": "spot", + "side": "buy", + "amount": "17.05", + "price": "0", + "time_in_force": "ioc", + "iceberg": "0", + "left": "0.0000000016228", + "fill_price": "17.05", + "filled_total": "17.05", + "avg_deal_price": "15.5", + "fee": "0", + "fee_currency": "SOL", + "point_fee": "0.0199999999967544", + "gt_fee": "0", + "gt_maker_fee": "0", + "gt_taker_fee": "0", + "gt_discount": False, + "rebated_fee": "0", + "rebated_fee_currency": "USDT", + }, + "pair": "SOL/USDT", + "expected": { + "symbol": "SOL/USDT", + "orderId": "3551312894", + "timestamp": 1674493798550, + "datetime": "2023-03-25T15:49:58.550Z", + "price": 15.5, + "status": "open", + "amount": 1.1, + }, }, ], "sample_my_trades": [ @@ -264,19 +348,31 @@ EXCHANGES = { "leverage_in_spot_market": True, "sample_order": [ { - "orderId": "1274754916287346280", - "orderLinkId": "1666798627015730", - "symbol": "SOLUSDT", - "createdTime": "1674493798550", - "price": "15.5", - "qty": "1.1", - "orderType": "Limit", - "side": "Buy", - "orderStatus": "New", - "timeInForce": "GTC", - "accountId": "5555555", - "execQty": "0", - "orderCategory": "0", + "exchange_response": { + "orderId": "1274754916287346280", + "orderLinkId": "1666798627015730", + "symbol": "SOLUSDT", + "createdTime": "1674493798550", + "price": "15.5", + "qty": "1.1", + "orderType": "Limit", + "side": "Buy", + "orderStatus": "New", + "timeInForce": "GTC", + "accountId": "5555555", + "execQty": "0", + "orderCategory": "0", + }, + "pair": "SOL/USDT", + "expected": { + "symbol": "SOL/USDT", + "orderId": "3551312894", + "timestamp": 1674493798550, + "datetime": "2023-03-25T15:49:58.550Z", + "price": 15.5, + "status": "open", + "amount": 1.1, + }, } ], }, @@ -310,35 +406,71 @@ EXCHANGES = { "futures": False, "sample_order": [ { - "symbol": "SOL-USDT", - "orderId": "1762393630149869568", - "transactTime": "1674493798550", - "price": "15.5", - "stopPrice": "0", - "origQty": "1.1", - "executedQty": "1.1", - "cummulativeQuoteQty": "17.05", - "status": "FILLED", - "type": "LIMIT", - "side": "BUY", - "clientOrderID": "", + "exchange_response": { + "symbol": "SOL-USDT", + "orderId": "1762393630149869568", + "transactTime": "1674493798550", + "price": "15.5", + "stopPrice": "0", + "origQty": "1.1", + "executedQty": "1.1", + "cummulativeQuoteQty": "17.05", + "status": "FILLED", + "type": "LIMIT", + "side": "BUY", + "clientOrderID": "", + }, + "pair": "SOL/USDT", + "expected": { + "symbol": "SOL/USDT", + "orderId": "3551312894", + "timestamp": 1674493798550, + "datetime": "2023-03-25T15:49:58.550Z", + "price": 15.5, + "status": "open", + "amount": 1.1, + }, }, { - "symbol": "SOL-USDT", - "orderId": "1762393630149869568", - "transactTime": "1674493798550", - "price": "15.5", - "stopPrice": "0", - "origQty": "1.1", - "executedQty": "1.1", - "cummulativeQuoteQty": "17.05", - "status": "FILLED", - "type": "MARKET", - "side": "BUY", - "clientOrderID": "", + "exchange_response": { + "symbol": "SOL-USDT", + "orderId": "1762393630149869568", + "transactTime": "1674493798550", + "price": "15.5", + "stopPrice": "0", + "origQty": "1.1", + "executedQty": "1.1", + "cummulativeQuoteQty": "17.05", + "status": "FILLED", + "type": "MARKET", + "side": "BUY", + "clientOrderID": "", + }, + "pair": "SOL/USDT", + "expected": { + "symbol": "SOL/USDT", + "orderId": "3551312894", + "timestamp": 1674493798550, + "datetime": "2023-03-25T15:49:58.550Z", + "price": 15.5, + "status": "open", + "amount": 1.1, + }, }, ], }, + "hyperliquid": { + "pair": "PURR/USDC", + "stake_currency": "USDC", + "hasQuoteVolume": False, + "timeframe": "1h", + "futures": True, + "orderbook_max_entries": 20, + "futures_pair": "BTC/USDC:USDC", + "hasQuoteVolumeFutures": True, + "leverage_tiers_public": False, + "leverage_in_spot_market": False, + }, } @@ -398,6 +530,7 @@ def get_futures_exchange(exchange_name, exchange_conf, class_mocker): class_mocker.patch("freqtrade.exchange.okx.Okx.additional_exchange_init") class_mocker.patch("freqtrade.exchange.binance.Binance.additional_exchange_init") class_mocker.patch("freqtrade.exchange.bybit.Bybit.additional_exchange_init") + class_mocker.patch("freqtrade.exchange.gate.Gate.additional_exchange_init") class_mocker.patch(f"{EXMS}.load_cached_leverage_tiers", return_value=None) class_mocker.patch(f"{EXMS}.cache_leverage_tiers") diff --git a/tests/exchange_online/test_ccxt_compat.py b/tests/exchange_online/test_ccxt_compat.py index 32133d8e5..6ef0bc108 100644 --- a/tests/exchange_online/test_ccxt_compat.py +++ b/tests/exchange_online/test_ccxt_compat.py @@ -61,28 +61,31 @@ class TestCCXTExchange: def test_ccxt_order_parse(self, exchange: EXCHANGE_FIXTURE_TYPE): exch, exchange_name = exchange if orders := EXCHANGES[exchange_name].get("sample_order"): - pair = "SOL/USDT" for order in orders: + pair = order["pair"] + exchange_response: dict = order["exchange_response"] + market = exch._api.markets[pair] - po = exch._api.parse_order(order, market) + po = exch._api.parse_order(exchange_response, market) + expected = order["expected"] assert isinstance(po["id"], str) assert po["id"] is not None - if len(order.keys()) < 5: + if len(exchange_response.keys()) < 5: # Kucoin case assert po["status"] is None continue - assert po["timestamp"] == 1674493798550 + assert po["timestamp"] == expected["timestamp"] assert isinstance(po["datetime"], str) assert isinstance(po["timestamp"], int) assert isinstance(po["price"], float) - assert po["price"] == 15.5 + assert po["price"] == expected["price"] if po["status"] == "closed": # Filled orders should have average assigned. assert isinstance(po["average"], float) assert po["average"] == 15.5 assert po["symbol"] == pair assert isinstance(po["amount"], float) - assert po["amount"] == 1.1 + assert po["amount"] == expected["amount"] assert isinstance(po["status"], str) else: pytest.skip(f"No sample order available for exchange {exchange_name}") @@ -118,9 +121,10 @@ class TestCCXTExchange: tickers = exch.get_tickers() assert pair in tickers assert "ask" in tickers[pair] - assert tickers[pair]["ask"] is not None assert "bid" in tickers[pair] - assert tickers[pair]["bid"] is not None + if EXCHANGES[exchangename].get("tickers_have_bid_ask"): + assert tickers[pair]["bid"] is not None + assert tickers[pair]["ask"] is not None assert "quoteVolume" in tickers[pair] if EXCHANGES[exchangename].get("hasQuoteVolume"): assert tickers[pair]["quoteVolume"] is not None @@ -150,9 +154,10 @@ class TestCCXTExchange: ticker = exch.fetch_ticker(pair) assert "ask" in ticker - assert ticker["ask"] is not None assert "bid" in ticker - assert ticker["bid"] is not None + if EXCHANGES[exchangename].get("tickers_have_bid_ask"): + assert ticker["ask"] is not None + assert ticker["bid"] is not None assert "quoteVolume" in ticker if EXCHANGES[exchangename].get("hasQuoteVolume"): assert ticker["quoteVolume"] is not None diff --git a/tests/freqtradebot/test_freqtradebot.py b/tests/freqtradebot/test_freqtradebot.py index 836f84580..21e5394a4 100644 --- a/tests/freqtradebot/test_freqtradebot.py +++ b/tests/freqtradebot/test_freqtradebot.py @@ -3483,16 +3483,17 @@ def test_locked_pairs( exit_check=ExitCheckTuple(exit_type=ExitType.STOP_LOSS), ) trade.close(ticker_usdt_sell_down()["bid"]) - assert freqtrade.strategy.is_pair_locked(trade.pair, side="*") + assert not freqtrade.strategy.is_pair_locked(trade.pair, side="*") # Both sides are locked - assert freqtrade.strategy.is_pair_locked(trade.pair, side="long") - assert freqtrade.strategy.is_pair_locked(trade.pair, side="short") + assert freqtrade.strategy.is_pair_locked(trade.pair, side="long") != is_short + assert freqtrade.strategy.is_pair_locked(trade.pair, side="short") == is_short # reinit - should buy other pair. caplog.clear() freqtrade.enter_positions() + direction = "short" if is_short else "long" - assert log_has_re(rf"Pair {trade.pair} \* is locked.*", caplog) + assert log_has_re(rf"Pair {trade.pair} {direction} is locked.*", caplog) @pytest.mark.parametrize("is_short", [False, True]) @@ -3844,7 +3845,7 @@ def test_get_real_amount_no_trade(default_conf_usdt, buy_order_fee, caplog, mock assert log_has( "Applying fee on amount for Trade(id=None, pair=LTC/ETH, amount=8.00000000, " "is_short=False, leverage=1.0, open_rate=0.24544100, open_since=closed) failed: " - "myTrade-Dict empty found", + "myTrade-dict empty found", caplog, ) diff --git a/tests/optimize/__init__.py b/tests/optimize/__init__.py index 15e19cd75..dfce6d8c5 100644 --- a/tests/optimize/__init__.py +++ b/tests/optimize/__init__.py @@ -1,5 +1,5 @@ from datetime import timedelta -from typing import NamedTuple, Optional +from typing import NamedTuple from pandas import DataFrame @@ -20,7 +20,7 @@ class BTrade(NamedTuple): exit_reason: ExitType open_tick: int close_tick: int - enter_tag: Optional[str] = None + enter_tag: str | None = None is_short: bool = False @@ -36,15 +36,15 @@ class BTContainer(NamedTuple): profit_perc: float trailing_stop: bool = False trailing_only_offset_is_reached: bool = False - trailing_stop_positive: Optional[float] = None + trailing_stop_positive: float | None = None trailing_stop_positive_offset: float = 0.0 use_exit_signal: bool = False use_custom_stoploss: bool = False - custom_entry_price: Optional[float] = None - custom_exit_price: Optional[float] = None + custom_entry_price: float | None = None + custom_exit_price: float | None = None leverage: float = 1.0 - timeout: Optional[int] = None - adjust_entry_price: Optional[float] = None + timeout: int | None = None + adjust_entry_price: float | None = None def _get_frame_time_from_offset(offset): diff --git a/tests/optimize/test_backtest_detail.py b/tests/optimize/test_backtest_detail.py index e0a9e4480..63fa1bd96 100644 --- a/tests/optimize/test_backtest_detail.py +++ b/tests/optimize/test_backtest_detail.py @@ -1121,6 +1121,70 @@ tc53 = BTContainer( trades=[BTrade(exit_reason=ExitType.STOP_LOSS, open_tick=1, close_tick=2, is_short=True)], ) +# Test 54: Switch position from long to short +tc54 = BTContainer( + data=[ + # D O H L C V EL XL ES Xs BT + [0, 5000, 5050, 4950, 5000, 6172, 1, 0, 0, 0], + [1, 5000, 5000, 4951, 5000, 6172, 0, 0, 0, 0], + [2, 4910, 5150, 4910, 5100, 6172, 0, 0, 1, 0], # Enter short signal being ignored + [3, 5100, 5100, 4950, 4950, 6172, 0, 1, 1, 0], # exit - re-enter short + [4, 5000, 5100, 4950, 4950, 6172, 0, 0, 0, 1], + [5, 5000, 5100, 4950, 4950, 6172, 0, 0, 0, 0], + ], + stop_loss=-0.10, + roi={"0": 0.10}, + profit_perc=0.00, + use_exit_signal=True, + trades=[ + BTrade(exit_reason=ExitType.EXIT_SIGNAL, open_tick=1, close_tick=4, is_short=False), + BTrade(exit_reason=ExitType.EXIT_SIGNAL, open_tick=4, close_tick=5, is_short=True), + ], +) + +# Test 55: Switch position from short to long +tc55 = BTContainer( + data=[ + # D O H L C V EL XL ES Xs BT + [0, 5000, 5050, 4950, 5000, 6172, 0, 0, 1, 0], + [1, 5000, 5000, 4951, 5000, 6172, 1, 0, 0, 0], # Enter long signal being ignored + [2, 4910, 5150, 4910, 5100, 6172, 1, 0, 0, 1], # Exit - reenter long + [3, 5100, 5100, 4950, 4950, 6172, 0, 0, 0, 0], + [4, 5000, 5100, 4950, 4950, 6172, 0, 1, 0, 0], + [5, 5000, 5100, 4950, 4950, 6172, 0, 0, 0, 0], + ], + stop_loss=-0.10, + roi={"0": 0.10}, + profit_perc=-0.04, + use_exit_signal=True, + trades=[ + BTrade(exit_reason=ExitType.EXIT_SIGNAL, open_tick=1, close_tick=3, is_short=True), + BTrade(exit_reason=ExitType.EXIT_SIGNAL, open_tick=3, close_tick=5, is_short=False), + ], +) + +# Test 56: Switch position from long to short +tc56 = BTContainer( + data=[ + # D O H L C V EL XL ES Xs BT + [0, 5000, 5050, 4950, 5000, 6172, 1, 0, 0, 0], + [1, 5000, 5000, 4951, 5000, 6172, 0, 0, 0, 0], + [2, 4910, 5150, 4910, 5100, 6172, 0, 0, 1, 0], # exit on stoploss - re-enter short + [3, 5100, 5100, 4888, 4950, 6172, 0, 0, 0, 0], + [4, 5000, 5100, 4950, 4950, 6172, 0, 0, 0, 1], + [5, 5000, 5100, 4950, 4950, 6172, 0, 0, 0, 0], + ], + stop_loss=-0.02, + roi={"0": 0.10}, + profit_perc=-0.0, + use_exit_signal=True, + trades=[ + BTrade(exit_reason=ExitType.STOP_LOSS, open_tick=1, close_tick=3, is_short=False), + BTrade(exit_reason=ExitType.EXIT_SIGNAL, open_tick=3, close_tick=5, is_short=True), + ], +) + + TESTS = [ tc0, tc1, @@ -1176,6 +1240,9 @@ TESTS = [ tc51, tc52, tc53, + tc54, + tc55, + tc56, ] diff --git a/tests/optimize/test_backtesting.py b/tests/optimize/test_backtesting.py index 416ffa262..05ebf2298 100644 --- a/tests/optimize/test_backtesting.py +++ b/tests/optimize/test_backtesting.py @@ -189,7 +189,6 @@ def test_setup_bt_configuration_with_arguments(mocker, default_conf, caplog) -> "--timeframe", "1m", "--enable-position-stacking", - "--disable-max-market-positions", "--timerange", ":100", "--export-filename", @@ -214,10 +213,6 @@ def test_setup_bt_configuration_with_arguments(mocker, default_conf, caplog) -> assert "position_stacking" in config assert log_has("Parameter --enable-position-stacking detected ...", caplog) - assert "use_max_market_positions" in config - assert log_has("Parameter --disable-max-market-positions detected ...", caplog) - assert log_has("max_open_trades set to unlimited ...", caplog) - assert "timerange" in config assert log_has("Parameter --timerange detected: {} ...".format(config["timerange"]), caplog) @@ -637,7 +632,7 @@ def test_backtest__enter_trade_futures(default_conf_usdt, fee, mocker) -> None: trade = backtesting._enter_trade(pair, row=row, direction="short") assert pytest.approx(trade.liquidation_price) == 0.11787191 assert pytest.approx(trade.orders[0].cost) == ( - trade.stake_amount * trade.leverage + trade.fee_open + trade.stake_amount * trade.leverage * (1 + fee.return_value) ) assert pytest.approx(trade.orders[-1].stake_amount) == trade.stake_amount @@ -1899,7 +1894,7 @@ def test_backtest_multi_pair_long_short_switch( if use_detail: # Backtest loop is called once per candle per pair - assert bl_spy.call_count == 1071 + assert bl_spy.call_count == 1523 else: assert bl_spy.call_count == 479 @@ -1909,7 +1904,7 @@ def test_backtest_multi_pair_long_short_switch( assert len(evaluate_result_multi(results["results"], "5m", 1)) == 0 # Expect 26 results initially - assert len(results["results"]) == 30 + assert len(results["results"]) == 53 def test_backtest_start_timerange(default_conf, mocker, caplog, testdatadir): @@ -1936,14 +1931,12 @@ def test_backtest_start_timerange(default_conf, mocker, caplog, testdatadir): "--timerange", "1510694220-1510700340", "--enable-position-stacking", - "--disable-max-market-positions", ] args = get_args(args) start_backtesting(args) # check the logs, that will contain the backtest result exists = [ "Parameter -i/--timeframe detected ... Using timeframe: 1m ...", - "Ignoring max_open_trades (--disable-max-market-positions was used) ...", "Parameter --timerange detected: 1510694220-1510700340 ...", f"Using data directory: {testdatadir} ...", "Loading data from 2017-11-14 20:57:00 up to 2017-11-14 22:59:00 (0 days).", @@ -2017,7 +2010,6 @@ def test_backtest_start_multi_strat(default_conf, mocker, caplog, testdatadir): "--timerange", "1510694220-1510700340", "--enable-position-stacking", - "--disable-max-market-positions", "--strategy-list", CURRENT_TEST_STRATEGY, "StrategyTestV2", @@ -2034,7 +2026,6 @@ def test_backtest_start_multi_strat(default_conf, mocker, caplog, testdatadir): # check the logs, that will contain the backtest result exists = [ "Parameter -i/--timeframe detected ... Using timeframe: 1m ...", - "Ignoring max_open_trades (--disable-max-market-positions was used) ...", "Parameter --timerange detected: 1510694220-1510700340 ...", f"Using data directory: {testdatadir} ...", "Loading data from 2017-11-14 20:57:00 up to 2017-11-14 22:59:00 (0 days).", @@ -2155,7 +2146,6 @@ def test_backtest_start_multi_strat_nomock(default_conf, mocker, caplog, testdat "--timerange", "1510694220-1510700340", "--enable-position-stacking", - "--disable-max-market-positions", "--breakdown", "day", "--strategy-list", @@ -2168,7 +2158,6 @@ def test_backtest_start_multi_strat_nomock(default_conf, mocker, caplog, testdat # check the logs, that will contain the backtest result exists = [ "Parameter -i/--timeframe detected ... Using timeframe: 1m ...", - "Ignoring max_open_trades (--disable-max-market-positions was used) ...", "Parameter --timerange detected: 1510694220-1510700340 ...", f"Using data directory: {testdatadir} ...", "Loading data from 2017-11-14 20:57:00 up to 2017-11-14 22:59:00 (0 days).", @@ -2593,7 +2582,6 @@ def test_backtest_start_multi_strat_caching( "--timerange", "1510694220-1510700340", "--enable-position-stacking", - "--disable-max-market-positions", "--cache", cache, "--strategy-list", @@ -2620,7 +2608,6 @@ def test_backtest_start_multi_strat_caching( exists = [ "Running backtesting for Strategy StrategyTestV2", "Running backtesting for Strategy StrategyTestV3", - "Ignoring max_open_trades (--disable-max-market-positions was used) ...", "Backtesting with data from 2017-11-14 21:17:00 up to 2017-11-14 22:59:00 (0 days).", ] elif run_id == "2" and min_backtest_date < start_time: @@ -2633,7 +2620,6 @@ def test_backtest_start_multi_strat_caching( exists = [ "Reusing result of previous backtest for StrategyTestV2", "Running backtesting for Strategy StrategyTestV3", - "Ignoring max_open_trades (--disable-max-market-positions was used) ...", "Backtesting with data from 2017-11-14 21:17:00 up to 2017-11-14 22:59:00 (0 days).", ] assert backtestmock.call_count == 1 diff --git a/tests/optimize/test_hyperopt.py b/tests/optimize/test_hyperopt.py index a9f697629..a0cc4eb73 100644 --- a/tests/optimize/test_hyperopt.py +++ b/tests/optimize/test_hyperopt.py @@ -14,7 +14,7 @@ from freqtrade.data.history import load_data from freqtrade.enums import ExitType, RunMode from freqtrade.exceptions import OperationalException from freqtrade.optimize.hyperopt import Hyperopt -from freqtrade.optimize.hyperopt_auto import HyperOptAuto +from freqtrade.optimize.hyperopt.hyperopt_auto import HyperOptAuto from freqtrade.optimize.hyperopt_tools import HyperoptTools from freqtrade.optimize.optimize_reports import generate_strategy_stats from freqtrade.optimize.space import SKDecimal @@ -102,7 +102,6 @@ def test_setup_hyperopt_configuration_with_arguments(mocker, default_conf, caplo "--timerange", ":100", "--enable-position-stacking", - "--disable-max-market-positions", "--epochs", "1000", "--spaces", @@ -126,10 +125,6 @@ def test_setup_hyperopt_configuration_with_arguments(mocker, default_conf, caplo assert "position_stacking" in config assert log_has("Parameter --enable-position-stacking detected ...", caplog) - assert "use_max_market_positions" in config - assert log_has("Parameter --disable-max-market-positions detected ...", caplog) - assert log_has("max_open_trades set to unlimited ...", caplog) - assert "timerange" in config assert log_has("Parameter --timerange detected: {} ...".format(config["timerange"]), caplog) @@ -227,7 +222,7 @@ def test_start_no_data(mocker, hyperopt_conf, tmp_path) -> None: patched_configuration_load_config_file(mocker, hyperopt_conf) mocker.patch("freqtrade.data.history.load_pair_history", MagicMock(return_value=pd.DataFrame)) mocker.patch( - "freqtrade.optimize.hyperopt.get_timerange", + "freqtrade.optimize.hyperopt.hyperopt_optimizer.get_timerange", MagicMock(return_value=(datetime(2017, 12, 10), datetime(2017, 12, 13))), ) @@ -320,12 +315,17 @@ def test_roi_table_generation(hyperopt) -> None: "roi_p3": 3, } - assert hyperopt.custom_hyperopt.generate_roi_table(params) == {0: 6, 15: 3, 25: 1, 30: 0} + assert hyperopt.hyperopter.custom_hyperopt.generate_roi_table(params) == { + 0: 6, + 15: 3, + 25: 1, + 30: 0, + } def test_params_no_optimize_details(hyperopt) -> None: - hyperopt.config["spaces"] = ["buy"] - res = hyperopt._get_no_optimize_details() + hyperopt.hyperopter.config["spaces"] = ["buy"] + res = hyperopt.hyperopter._get_no_optimize_details() assert isinstance(res, dict) assert "trailing" in res assert res["trailing"]["trailing_stop"] is False @@ -338,21 +338,23 @@ def test_params_no_optimize_details(hyperopt) -> None: def test_start_calls_optimizer(mocker, hyperopt_conf, capsys) -> None: - dumper = mocker.patch("freqtrade.optimize.hyperopt.dump") + dumper = mocker.patch("freqtrade.optimize.hyperopt.hyperopt_optimizer.dump") dumper2 = mocker.patch("freqtrade.optimize.hyperopt.Hyperopt._save_result") - mocker.patch("freqtrade.optimize.hyperopt.calculate_market_change", return_value=1.5) - mocker.patch("freqtrade.optimize.hyperopt.file_dump_json") + mocker.patch( + "freqtrade.optimize.hyperopt.hyperopt_optimizer.calculate_market_change", return_value=1.5 + ) + mocker.patch("freqtrade.optimize.hyperopt.hyperopt.file_dump_json") mocker.patch( "freqtrade.optimize.backtesting.Backtesting.load_bt_data", MagicMock(return_value=(MagicMock(), None)), ) mocker.patch( - "freqtrade.optimize.hyperopt.get_timerange", + "freqtrade.optimize.hyperopt.hyperopt_optimizer.get_timerange", MagicMock(return_value=(datetime(2017, 12, 10), datetime(2017, 12, 13))), ) # Dummy-reduce points to ensure scikit-learn is forced to generate new values - mocker.patch("freqtrade.optimize.hyperopt.INITIAL_POINTS", 2) + mocker.patch("freqtrade.optimize.hyperopt.hyperopt.INITIAL_POINTS", 2) parallel = mocker.patch( "freqtrade.optimize.hyperopt.Hyperopt.run_optimizer_parallel", @@ -372,8 +374,8 @@ def test_start_calls_optimizer(mocker, hyperopt_conf, capsys) -> None: del hyperopt_conf["timeframe"] hyperopt = Hyperopt(hyperopt_conf) - hyperopt.backtesting.strategy.advise_all_indicators = MagicMock() - hyperopt.custom_hyperopt.generate_roi_table = MagicMock(return_value={}) + hyperopt.hyperopter.backtesting.strategy.advise_all_indicators = MagicMock() + hyperopt.hyperopter.custom_hyperopt.generate_roi_table = MagicMock(return_value={}) hyperopt.start() @@ -384,10 +386,12 @@ def test_start_calls_optimizer(mocker, hyperopt_conf, capsys) -> None: # Should be called for historical candle data assert dumper.call_count == 1 assert dumper2.call_count == 1 - assert hasattr(hyperopt.backtesting.strategy, "advise_exit") - assert hasattr(hyperopt.backtesting.strategy, "advise_entry") - assert hyperopt.backtesting.strategy.max_open_trades == hyperopt_conf["max_open_trades"] - assert hasattr(hyperopt.backtesting, "_position_stacking") + assert hasattr(hyperopt.hyperopter.backtesting.strategy, "advise_exit") + assert hasattr(hyperopt.hyperopter.backtesting.strategy, "advise_entry") + assert ( + hyperopt.hyperopter.backtesting.strategy.max_open_trades == hyperopt_conf["max_open_trades"] + ) + assert hasattr(hyperopt.hyperopter.backtesting, "_position_stacking") def test_hyperopt_format_results(hyperopt): @@ -466,7 +470,7 @@ def test_hyperopt_format_results(hyperopt): def test_populate_indicators(hyperopt, testdatadir) -> None: data = load_data(testdatadir, "1m", ["UNITTEST/BTC"], fill_up_missing=True) - dataframes = hyperopt.backtesting.strategy.advise_all_indicators(data) + dataframes = hyperopt.hyperopter.backtesting.strategy.advise_all_indicators(data) dataframe = dataframes["UNITTEST/BTC"] # Check if some indicators are generated. We will not test all of them @@ -526,15 +530,20 @@ def test_generate_optimizer(mocker, hyperopt_conf) -> None: "final_balance": 1000, } - mocker.patch("freqtrade.optimize.hyperopt.Backtesting.backtest", return_value=backtest_result) mocker.patch( - "freqtrade.optimize.hyperopt.get_timerange", + "freqtrade.optimize.hyperopt.hyperopt_optimizer.Backtesting.backtest", + return_value=backtest_result, + ) + mocker.patch( + "freqtrade.optimize.hyperopt.hyperopt_optimizer.get_timerange", return_value=(dt_utc(2017, 12, 10), dt_utc(2017, 12, 13)), ) patch_exchange(mocker) mocker.patch.object(Path, "open") mocker.patch("freqtrade.configuration.config_validation.validate_config_schema") - mocker.patch("freqtrade.optimize.hyperopt.load", return_value={"XRP/BTC": None}) + mocker.patch( + "freqtrade.optimize.hyperopt.hyperopt_optimizer.load", return_value={"XRP/BTC": None} + ) optimizer_param = { "buy_plusdi": 0.02, @@ -594,10 +603,12 @@ def test_generate_optimizer(mocker, hyperopt_conf) -> None: } hyperopt = Hyperopt(hyperopt_conf) - hyperopt.min_date = dt_utc(2017, 12, 10) - hyperopt.max_date = dt_utc(2017, 12, 13) - hyperopt.init_spaces() - generate_optimizer_value = hyperopt.generate_optimizer(list(optimizer_param.values())) + hyperopt.hyperopter.min_date = dt_utc(2017, 12, 10) + hyperopt.hyperopter.max_date = dt_utc(2017, 12, 13) + hyperopt.hyperopter.init_spaces() + generate_optimizer_value = hyperopt.hyperopter.generate_optimizer( + list(optimizer_param.values()) + ) assert generate_optimizer_value == response_expected @@ -608,8 +619,8 @@ def test_clean_hyperopt(mocker, hyperopt_conf, caplog): "freqtrade.strategy.hyper.HyperStrategyMixin.load_params_from_file", MagicMock(return_value={}), ) - mocker.patch("freqtrade.optimize.hyperopt.Path.is_file", MagicMock(return_value=True)) - unlinkmock = mocker.patch("freqtrade.optimize.hyperopt.Path.unlink", MagicMock()) + mocker.patch("freqtrade.optimize.hyperopt.hyperopt.Path.is_file", MagicMock(return_value=True)) + unlinkmock = mocker.patch("freqtrade.optimize.hyperopt.hyperopt.Path.unlink", MagicMock()) h = Hyperopt(hyperopt_conf) assert unlinkmock.call_count == 2 @@ -617,17 +628,19 @@ def test_clean_hyperopt(mocker, hyperopt_conf, caplog): def test_print_json_spaces_all(mocker, hyperopt_conf, capsys) -> None: - dumper = mocker.patch("freqtrade.optimize.hyperopt.dump") + dumper = mocker.patch("freqtrade.optimize.hyperopt.hyperopt_optimizer.dump") dumper2 = mocker.patch("freqtrade.optimize.hyperopt.Hyperopt._save_result") - mocker.patch("freqtrade.optimize.hyperopt.file_dump_json") - mocker.patch("freqtrade.optimize.hyperopt.calculate_market_change", return_value=1.5) + mocker.patch("freqtrade.optimize.hyperopt.hyperopt.file_dump_json") + mocker.patch( + "freqtrade.optimize.hyperopt.hyperopt_optimizer.calculate_market_change", return_value=1.5 + ) mocker.patch( "freqtrade.optimize.backtesting.Backtesting.load_bt_data", MagicMock(return_value=(MagicMock(), None)), ) mocker.patch( - "freqtrade.optimize.hyperopt.get_timerange", + "freqtrade.optimize.hyperopt.hyperopt_optimizer.get_timerange", MagicMock(return_value=(datetime(2017, 12, 10), datetime(2017, 12, 13))), ) @@ -663,8 +676,8 @@ def test_print_json_spaces_all(mocker, hyperopt_conf, capsys) -> None: ) hyperopt = Hyperopt(hyperopt_conf) - hyperopt.backtesting.strategy.advise_all_indicators = MagicMock() - hyperopt.custom_hyperopt.generate_roi_table = MagicMock(return_value={}) + hyperopt.hyperopter.backtesting.strategy.advise_all_indicators = MagicMock() + hyperopt.hyperopter.custom_hyperopt.generate_roi_table = MagicMock(return_value={}) hyperopt.start() @@ -682,16 +695,18 @@ def test_print_json_spaces_all(mocker, hyperopt_conf, capsys) -> None: def test_print_json_spaces_default(mocker, hyperopt_conf, capsys) -> None: - dumper = mocker.patch("freqtrade.optimize.hyperopt.dump") + dumper = mocker.patch("freqtrade.optimize.hyperopt.hyperopt_optimizer.dump") dumper2 = mocker.patch("freqtrade.optimize.hyperopt.Hyperopt._save_result") - mocker.patch("freqtrade.optimize.hyperopt.file_dump_json") - mocker.patch("freqtrade.optimize.hyperopt.calculate_market_change", return_value=1.5) + mocker.patch("freqtrade.optimize.hyperopt.hyperopt.file_dump_json") + mocker.patch( + "freqtrade.optimize.hyperopt.hyperopt_optimizer.calculate_market_change", return_value=1.5 + ) mocker.patch( "freqtrade.optimize.backtesting.Backtesting.load_bt_data", MagicMock(return_value=(MagicMock(), None)), ) mocker.patch( - "freqtrade.optimize.hyperopt.get_timerange", + "freqtrade.optimize.hyperopt.hyperopt_optimizer.get_timerange", MagicMock(return_value=(datetime(2017, 12, 10), datetime(2017, 12, 13))), ) @@ -719,8 +734,8 @@ def test_print_json_spaces_default(mocker, hyperopt_conf, capsys) -> None: hyperopt_conf.update({"print_json": True}) hyperopt = Hyperopt(hyperopt_conf) - hyperopt.backtesting.strategy.advise_all_indicators = MagicMock() - hyperopt.custom_hyperopt.generate_roi_table = MagicMock(return_value={}) + hyperopt.hyperopter.backtesting.strategy.advise_all_indicators = MagicMock() + hyperopt.hyperopter.custom_hyperopt.generate_roi_table = MagicMock(return_value={}) hyperopt.start() @@ -737,16 +752,18 @@ def test_print_json_spaces_default(mocker, hyperopt_conf, capsys) -> None: def test_print_json_spaces_roi_stoploss(mocker, hyperopt_conf, capsys) -> None: - dumper = mocker.patch("freqtrade.optimize.hyperopt.dump") + dumper = mocker.patch("freqtrade.optimize.hyperopt.hyperopt_optimizer.dump") dumper2 = mocker.patch("freqtrade.optimize.hyperopt.Hyperopt._save_result") - mocker.patch("freqtrade.optimize.hyperopt.calculate_market_change", return_value=1.5) - mocker.patch("freqtrade.optimize.hyperopt.file_dump_json") + mocker.patch( + "freqtrade.optimize.hyperopt.hyperopt_optimizer.calculate_market_change", return_value=1.5 + ) + mocker.patch("freqtrade.optimize.hyperopt.hyperopt.file_dump_json") mocker.patch( "freqtrade.optimize.backtesting.Backtesting.load_bt_data", MagicMock(return_value=(MagicMock(), None)), ) mocker.patch( - "freqtrade.optimize.hyperopt.get_timerange", + "freqtrade.optimize.hyperopt.hyperopt_optimizer.get_timerange", MagicMock(return_value=(datetime(2017, 12, 10), datetime(2017, 12, 13))), ) @@ -775,8 +792,8 @@ def test_print_json_spaces_roi_stoploss(mocker, hyperopt_conf, capsys) -> None: ) hyperopt = Hyperopt(hyperopt_conf) - hyperopt.backtesting.strategy.advise_all_indicators = MagicMock() - hyperopt.custom_hyperopt.generate_roi_table = MagicMock(return_value={}) + hyperopt.hyperopter.backtesting.strategy.advise_all_indicators = MagicMock() + hyperopt.hyperopter.custom_hyperopt.generate_roi_table = MagicMock(return_value={}) hyperopt.start() @@ -790,16 +807,18 @@ def test_print_json_spaces_roi_stoploss(mocker, hyperopt_conf, capsys) -> None: def test_simplified_interface_roi_stoploss(mocker, hyperopt_conf, capsys) -> None: - dumper = mocker.patch("freqtrade.optimize.hyperopt.dump") + dumper = mocker.patch("freqtrade.optimize.hyperopt.hyperopt_optimizer.dump") dumper2 = mocker.patch("freqtrade.optimize.hyperopt.Hyperopt._save_result") - mocker.patch("freqtrade.optimize.hyperopt.calculate_market_change", return_value=1.5) - mocker.patch("freqtrade.optimize.hyperopt.file_dump_json") + mocker.patch( + "freqtrade.optimize.hyperopt.hyperopt_optimizer.calculate_market_change", return_value=1.5 + ) + mocker.patch("freqtrade.optimize.hyperopt.hyperopt.file_dump_json") mocker.patch( "freqtrade.optimize.backtesting.Backtesting.load_bt_data", MagicMock(return_value=(MagicMock(), None)), ) mocker.patch( - "freqtrade.optimize.hyperopt.get_timerange", + "freqtrade.optimize.hyperopt.hyperopt_optimizer.get_timerange", MagicMock(return_value=(datetime(2017, 12, 10), datetime(2017, 12, 13))), ) @@ -821,8 +840,8 @@ def test_simplified_interface_roi_stoploss(mocker, hyperopt_conf, capsys) -> Non hyperopt_conf.update({"spaces": "roi stoploss"}) hyperopt = Hyperopt(hyperopt_conf) - hyperopt.backtesting.strategy.advise_all_indicators = MagicMock() - hyperopt.custom_hyperopt.generate_roi_table = MagicMock(return_value={}) + hyperopt.hyperopter.backtesting.strategy.advise_all_indicators = MagicMock() + hyperopt.hyperopter.custom_hyperopt.generate_roi_table = MagicMock(return_value={}) hyperopt.start() @@ -833,21 +852,23 @@ def test_simplified_interface_roi_stoploss(mocker, hyperopt_conf, capsys) -> Non assert dumper.call_count == 1 assert dumper2.call_count == 1 - assert hasattr(hyperopt.backtesting.strategy, "advise_exit") - assert hasattr(hyperopt.backtesting.strategy, "advise_entry") - assert hyperopt.backtesting.strategy.max_open_trades == hyperopt_conf["max_open_trades"] - assert hasattr(hyperopt.backtesting, "_position_stacking") + assert hasattr(hyperopt.hyperopter.backtesting.strategy, "advise_exit") + assert hasattr(hyperopt.hyperopter.backtesting.strategy, "advise_entry") + assert ( + hyperopt.hyperopter.backtesting.strategy.max_open_trades == hyperopt_conf["max_open_trades"] + ) + assert hasattr(hyperopt.hyperopter.backtesting, "_position_stacking") def test_simplified_interface_all_failed(mocker, hyperopt_conf, caplog) -> None: - mocker.patch("freqtrade.optimize.hyperopt.dump", MagicMock()) - mocker.patch("freqtrade.optimize.hyperopt.file_dump_json") + mocker.patch("freqtrade.optimize.hyperopt.hyperopt_optimizer.dump", MagicMock()) + mocker.patch("freqtrade.optimize.hyperopt.hyperopt.file_dump_json") mocker.patch( "freqtrade.optimize.backtesting.Backtesting.load_bt_data", MagicMock(return_value=(MagicMock(), None)), ) mocker.patch( - "freqtrade.optimize.hyperopt.get_timerange", + "freqtrade.optimize.hyperopt.hyperopt_optimizer.get_timerange", MagicMock(return_value=(datetime(2017, 12, 10), datetime(2017, 12, 13))), ) @@ -860,34 +881,37 @@ def test_simplified_interface_all_failed(mocker, hyperopt_conf, caplog) -> None: ) mocker.patch( - "freqtrade.optimize.hyperopt_auto.HyperOptAuto._generate_indicator_space", return_value=[] + "freqtrade.optimize.hyperopt.hyperopt_auto.HyperOptAuto._generate_indicator_space", + return_value=[], ) hyperopt = Hyperopt(hyperopt_conf) - hyperopt.backtesting.strategy.advise_all_indicators = MagicMock() - hyperopt.custom_hyperopt.generate_roi_table = MagicMock(return_value={}) + hyperopt.hyperopter.backtesting.strategy.advise_all_indicators = MagicMock() + hyperopt.hyperopter.custom_hyperopt.generate_roi_table = MagicMock(return_value={}) with pytest.raises(OperationalException, match=r"The 'protection' space is included into *"): - hyperopt.init_spaces() + hyperopt.hyperopter.init_spaces() hyperopt.config["hyperopt_ignore_missing_space"] = True caplog.clear() - hyperopt.init_spaces() + hyperopt.hyperopter.init_spaces() assert log_has_re(r"The 'protection' space is included into *", caplog) - assert hyperopt.protection_space == [] + assert hyperopt.hyperopter.protection_space == [] def test_simplified_interface_buy(mocker, hyperopt_conf, capsys) -> None: - dumper = mocker.patch("freqtrade.optimize.hyperopt.dump") + dumper = mocker.patch("freqtrade.optimize.hyperopt.hyperopt_optimizer.dump") dumper2 = mocker.patch("freqtrade.optimize.hyperopt.Hyperopt._save_result") - mocker.patch("freqtrade.optimize.hyperopt.calculate_market_change", return_value=1.5) - mocker.patch("freqtrade.optimize.hyperopt.file_dump_json") + mocker.patch( + "freqtrade.optimize.hyperopt.hyperopt_optimizer.calculate_market_change", return_value=1.5 + ) + mocker.patch("freqtrade.optimize.hyperopt.hyperopt.file_dump_json") mocker.patch( "freqtrade.optimize.backtesting.Backtesting.load_bt_data", MagicMock(return_value=(MagicMock(), None)), ) mocker.patch( - "freqtrade.optimize.hyperopt.get_timerange", + "freqtrade.optimize.hyperopt.hyperopt_optimizer.get_timerange", MagicMock(return_value=(datetime(2017, 12, 10), datetime(2017, 12, 13))), ) @@ -909,8 +933,8 @@ def test_simplified_interface_buy(mocker, hyperopt_conf, capsys) -> None: hyperopt_conf.update({"spaces": "buy"}) hyperopt = Hyperopt(hyperopt_conf) - hyperopt.backtesting.strategy.advise_all_indicators = MagicMock() - hyperopt.custom_hyperopt.generate_roi_table = MagicMock(return_value={}) + hyperopt.hyperopter.backtesting.strategy.advise_all_indicators = MagicMock() + hyperopt.hyperopter.custom_hyperopt.generate_roi_table = MagicMock(return_value={}) hyperopt.start() @@ -921,23 +945,27 @@ def test_simplified_interface_buy(mocker, hyperopt_conf, capsys) -> None: assert dumper.called assert dumper.call_count == 1 assert dumper2.call_count == 1 - assert hasattr(hyperopt.backtesting.strategy, "advise_exit") - assert hasattr(hyperopt.backtesting.strategy, "advise_entry") - assert hyperopt.backtesting.strategy.max_open_trades == hyperopt_conf["max_open_trades"] - assert hasattr(hyperopt.backtesting, "_position_stacking") + assert hasattr(hyperopt.hyperopter.backtesting.strategy, "advise_exit") + assert hasattr(hyperopt.hyperopter.backtesting.strategy, "advise_entry") + assert ( + hyperopt.hyperopter.backtesting.strategy.max_open_trades == hyperopt_conf["max_open_trades"] + ) + assert hasattr(hyperopt.hyperopter.backtesting, "_position_stacking") def test_simplified_interface_sell(mocker, hyperopt_conf, capsys) -> None: - dumper = mocker.patch("freqtrade.optimize.hyperopt.dump") + dumper = mocker.patch("freqtrade.optimize.hyperopt.hyperopt_optimizer.dump") dumper2 = mocker.patch("freqtrade.optimize.hyperopt.Hyperopt._save_result") - mocker.patch("freqtrade.optimize.hyperopt.calculate_market_change", return_value=1.5) - mocker.patch("freqtrade.optimize.hyperopt.file_dump_json") + mocker.patch( + "freqtrade.optimize.hyperopt.hyperopt_optimizer.calculate_market_change", return_value=1.5 + ) + mocker.patch("freqtrade.optimize.hyperopt.hyperopt.file_dump_json") mocker.patch( "freqtrade.optimize.backtesting.Backtesting.load_bt_data", MagicMock(return_value=(MagicMock(), None)), ) mocker.patch( - "freqtrade.optimize.hyperopt.get_timerange", + "freqtrade.optimize.hyperopt.hyperopt_optimizer.get_timerange", MagicMock(return_value=(datetime(2017, 12, 10), datetime(2017, 12, 13))), ) @@ -963,8 +991,8 @@ def test_simplified_interface_sell(mocker, hyperopt_conf, capsys) -> None: ) hyperopt = Hyperopt(hyperopt_conf) - hyperopt.backtesting.strategy.advise_all_indicators = MagicMock() - hyperopt.custom_hyperopt.generate_roi_table = MagicMock(return_value={}) + hyperopt.hyperopter.backtesting.strategy.advise_all_indicators = MagicMock() + hyperopt.hyperopter.custom_hyperopt.generate_roi_table = MagicMock(return_value={}) hyperopt.start() @@ -975,10 +1003,12 @@ def test_simplified_interface_sell(mocker, hyperopt_conf, capsys) -> None: assert dumper.called assert dumper.call_count == 1 assert dumper2.call_count == 1 - assert hasattr(hyperopt.backtesting.strategy, "advise_exit") - assert hasattr(hyperopt.backtesting.strategy, "advise_entry") - assert hyperopt.backtesting.strategy.max_open_trades == hyperopt_conf["max_open_trades"] - assert hasattr(hyperopt.backtesting, "_position_stacking") + assert hasattr(hyperopt.hyperopter.backtesting.strategy, "advise_exit") + assert hasattr(hyperopt.hyperopter.backtesting.strategy, "advise_entry") + assert ( + hyperopt.hyperopter.backtesting.strategy.max_open_trades == hyperopt_conf["max_open_trades"] + ) + assert hasattr(hyperopt.hyperopter.backtesting, "_position_stacking") @pytest.mark.parametrize( @@ -990,18 +1020,19 @@ def test_simplified_interface_sell(mocker, hyperopt_conf, capsys) -> None: ], ) def test_simplified_interface_failed(mocker, hyperopt_conf, space) -> None: - mocker.patch("freqtrade.optimize.hyperopt.dump", MagicMock()) - mocker.patch("freqtrade.optimize.hyperopt.file_dump_json") + mocker.patch("freqtrade.optimize.hyperopt.hyperopt_optimizer.dump", MagicMock()) + mocker.patch("freqtrade.optimize.hyperopt.hyperopt.file_dump_json") mocker.patch( "freqtrade.optimize.backtesting.Backtesting.load_bt_data", MagicMock(return_value=(MagicMock(), None)), ) mocker.patch( - "freqtrade.optimize.hyperopt.get_timerange", + "freqtrade.optimize.hyperopt.hyperopt_optimizer.get_timerange", MagicMock(return_value=(datetime(2017, 12, 10), datetime(2017, 12, 13))), ) mocker.patch( - "freqtrade.optimize.hyperopt_auto.HyperOptAuto._generate_indicator_space", return_value=[] + "freqtrade.optimize.hyperopt.hyperopt_auto.HyperOptAuto._generate_indicator_space", + return_value=[], ) patch_exchange(mocker) @@ -1009,8 +1040,8 @@ def test_simplified_interface_failed(mocker, hyperopt_conf, space) -> None: hyperopt_conf.update({"spaces": space}) hyperopt = Hyperopt(hyperopt_conf) - hyperopt.backtesting.strategy.advise_all_indicators = MagicMock() - hyperopt.custom_hyperopt.generate_roi_table = MagicMock(return_value={}) + hyperopt.hyperopter.backtesting.strategy.advise_all_indicators = MagicMock() + hyperopt.hyperopter.custom_hyperopt.generate_roi_table = MagicMock(return_value={}) with pytest.raises(OperationalException, match=f"The '{space}' space is included into *"): hyperopt.start() @@ -1020,7 +1051,7 @@ def test_in_strategy_auto_hyperopt(mocker, hyperopt_conf, tmp_path, fee) -> None patch_exchange(mocker) mocker.patch(f"{EXMS}.get_fee", fee) # Dummy-reduce points to ensure scikit-learn is forced to generate new values - mocker.patch("freqtrade.optimize.hyperopt.INITIAL_POINTS", 2) + mocker.patch("freqtrade.optimize.hyperopt.hyperopt.INITIAL_POINTS", 2) (tmp_path / "hyperopt_results").mkdir(parents=True) # No hyperopt needed hyperopt_conf.update( @@ -1032,32 +1063,33 @@ def test_in_strategy_auto_hyperopt(mocker, hyperopt_conf, tmp_path, fee) -> None } ) hyperopt = Hyperopt(hyperopt_conf) - hyperopt.backtesting.exchange.get_max_leverage = MagicMock(return_value=1.0) - assert isinstance(hyperopt.custom_hyperopt, HyperOptAuto) - assert isinstance(hyperopt.backtesting.strategy.buy_rsi, IntParameter) - assert hyperopt.backtesting.strategy.bot_started is True - assert hyperopt.backtesting.strategy.bot_loop_started is False + opt = hyperopt.hyperopter + opt.backtesting.exchange.get_max_leverage = MagicMock(return_value=1.0) + assert isinstance(opt.custom_hyperopt, HyperOptAuto) + assert isinstance(opt.backtesting.strategy.buy_rsi, IntParameter) + assert opt.backtesting.strategy.bot_started is True + assert opt.backtesting.strategy.bot_loop_started is False - assert hyperopt.backtesting.strategy.buy_rsi.in_space is True - assert hyperopt.backtesting.strategy.buy_rsi.value == 35 - assert hyperopt.backtesting.strategy.sell_rsi.value == 74 - assert hyperopt.backtesting.strategy.protection_cooldown_lookback.value == 30 - assert hyperopt.backtesting.strategy.max_open_trades == 1 - buy_rsi_range = hyperopt.backtesting.strategy.buy_rsi.range + assert opt.backtesting.strategy.buy_rsi.in_space is True + assert opt.backtesting.strategy.buy_rsi.value == 35 + assert opt.backtesting.strategy.sell_rsi.value == 74 + assert opt.backtesting.strategy.protection_cooldown_lookback.value == 30 + assert opt.backtesting.strategy.max_open_trades == 1 + buy_rsi_range = opt.backtesting.strategy.buy_rsi.range assert isinstance(buy_rsi_range, range) # Range from 0 - 50 (inclusive) assert len(list(buy_rsi_range)) == 51 hyperopt.start() # All values should've changed. - assert hyperopt.backtesting.strategy.protection_cooldown_lookback.value != 30 - assert hyperopt.backtesting.strategy.buy_rsi.value != 35 - assert hyperopt.backtesting.strategy.sell_rsi.value != 74 - assert hyperopt.backtesting.strategy.max_open_trades != 1 + assert opt.backtesting.strategy.protection_cooldown_lookback.value != 30 + assert opt.backtesting.strategy.buy_rsi.value != 35 + assert opt.backtesting.strategy.sell_rsi.value != 74 + assert opt.backtesting.strategy.max_open_trades != 1 - hyperopt.custom_hyperopt.generate_estimator = lambda *args, **kwargs: "ET1" + opt.custom_hyperopt.generate_estimator = lambda *args, **kwargs: "ET1" with pytest.raises(OperationalException, match="Estimator ET1 not supported."): - hyperopt.get_optimizer([], 2) + opt.get_optimizer(2, 42, 2, 2) @pytest.mark.filterwarnings("ignore::DeprecationWarning") @@ -1068,7 +1100,7 @@ def test_in_strategy_auto_hyperopt_with_parallel(mocker, hyperopt_conf, tmp_path mocker.patch(f"{EXMS}.markets", PropertyMock(return_value=get_markets())) (tmp_path / "hyperopt_results").mkdir(parents=True) # Dummy-reduce points to ensure scikit-learn is forced to generate new values - mocker.patch("freqtrade.optimize.hyperopt.INITIAL_POINTS", 2) + mocker.patch("freqtrade.optimize.hyperopt.hyperopt.INITIAL_POINTS", 2) # No hyperopt needed hyperopt_conf.update( { @@ -1083,21 +1115,22 @@ def test_in_strategy_auto_hyperopt_with_parallel(mocker, hyperopt_conf, tmp_path } ) hyperopt = Hyperopt(hyperopt_conf) - hyperopt.backtesting.exchange.get_max_leverage = lambda *x, **xx: 1.0 - hyperopt.backtesting.exchange.get_min_pair_stake_amount = lambda *x, **xx: 0.00001 - hyperopt.backtesting.exchange.get_max_pair_stake_amount = lambda *x, **xx: 100.0 - hyperopt.backtesting.exchange._markets = get_markets() + opt = hyperopt.hyperopter + opt.backtesting.exchange.get_max_leverage = lambda *x, **xx: 1.0 + opt.backtesting.exchange.get_min_pair_stake_amount = lambda *x, **xx: 0.00001 + opt.backtesting.exchange.get_max_pair_stake_amount = lambda *x, **xx: 100.0 + opt.backtesting.exchange._markets = get_markets() - assert isinstance(hyperopt.custom_hyperopt, HyperOptAuto) - assert isinstance(hyperopt.backtesting.strategy.buy_rsi, IntParameter) - assert hyperopt.backtesting.strategy.bot_started is True - assert hyperopt.backtesting.strategy.bot_loop_started is False + assert isinstance(opt.custom_hyperopt, HyperOptAuto) + assert isinstance(opt.backtesting.strategy.buy_rsi, IntParameter) + assert opt.backtesting.strategy.bot_started is True + assert opt.backtesting.strategy.bot_loop_started is False - assert hyperopt.backtesting.strategy.buy_rsi.in_space is True - assert hyperopt.backtesting.strategy.buy_rsi.value == 35 - assert hyperopt.backtesting.strategy.sell_rsi.value == 74 - assert hyperopt.backtesting.strategy.protection_cooldown_lookback.value == 30 - buy_rsi_range = hyperopt.backtesting.strategy.buy_rsi.range + assert opt.backtesting.strategy.buy_rsi.in_space is True + assert opt.backtesting.strategy.buy_rsi.value == 35 + assert opt.backtesting.strategy.sell_rsi.value == 74 + assert opt.backtesting.strategy.protection_cooldown_lookback.value == 30 + buy_rsi_range = opt.backtesting.strategy.buy_rsi.range assert isinstance(buy_rsi_range, range) # Range from 0 - 50 (inclusive) assert len(list(buy_rsi_range)) == 51 @@ -1121,7 +1154,7 @@ def test_in_strategy_auto_hyperopt_per_epoch(mocker, hyperopt_conf, tmp_path, fe } ) go = mocker.patch( - "freqtrade.optimize.hyperopt.Hyperopt.generate_optimizer", + "freqtrade.optimize.hyperopt.hyperopt_optimizer.HyperOptimizer.generate_optimizer", return_value={ "loss": 0.05, "results_explanation": "foo result", @@ -1130,17 +1163,18 @@ def test_in_strategy_auto_hyperopt_per_epoch(mocker, hyperopt_conf, tmp_path, fe }, ) hyperopt = Hyperopt(hyperopt_conf) - hyperopt.backtesting.exchange.get_max_leverage = MagicMock(return_value=1.0) - assert isinstance(hyperopt.custom_hyperopt, HyperOptAuto) - assert isinstance(hyperopt.backtesting.strategy.buy_rsi, IntParameter) - assert hyperopt.backtesting.strategy.bot_loop_started is False - assert hyperopt.backtesting.strategy.bot_started is True + opt = hyperopt.hyperopter + opt.backtesting.exchange.get_max_leverage = MagicMock(return_value=1.0) + assert isinstance(opt.custom_hyperopt, HyperOptAuto) + assert isinstance(opt.backtesting.strategy.buy_rsi, IntParameter) + assert opt.backtesting.strategy.bot_loop_started is False + assert opt.backtesting.strategy.bot_started is True - assert hyperopt.backtesting.strategy.buy_rsi.in_space is True - assert hyperopt.backtesting.strategy.buy_rsi.value == 35 - assert hyperopt.backtesting.strategy.sell_rsi.value == 74 - assert hyperopt.backtesting.strategy.protection_cooldown_lookback.value == 30 - buy_rsi_range = hyperopt.backtesting.strategy.buy_rsi.range + assert opt.backtesting.strategy.buy_rsi.in_space is True + assert opt.backtesting.strategy.buy_rsi.value == 35 + assert opt.backtesting.strategy.sell_rsi.value == 74 + assert opt.backtesting.strategy.protection_cooldown_lookback.value == 30 + buy_rsi_range = opt.backtesting.strategy.buy_rsi.range assert isinstance(buy_rsi_range, range) # Range from 0 - 50 (inclusive) assert len(list(buy_rsi_range)) == 51 @@ -1184,17 +1218,17 @@ def test_stake_amount_unlimited_max_open_trades(mocker, hyperopt_conf, tmp_path, ) hyperopt = Hyperopt(hyperopt_conf) mocker.patch( - "freqtrade.optimize.hyperopt.Hyperopt._get_params_dict", + "freqtrade.optimize.hyperopt.hyperopt_optimizer.HyperOptimizer._get_params_dict", return_value={"max_open_trades": -1}, ) - assert isinstance(hyperopt.custom_hyperopt, HyperOptAuto) + assert isinstance(hyperopt.hyperopter.custom_hyperopt, HyperOptAuto) - assert hyperopt.backtesting.strategy.max_open_trades == 1 + assert hyperopt.hyperopter.backtesting.strategy.max_open_trades == 1 hyperopt.start() - assert hyperopt.backtesting.strategy.max_open_trades == 1 + assert hyperopt.hyperopter.backtesting.strategy.max_open_trades == 1 def test_max_open_trades_dump(mocker, hyperopt_conf, tmp_path, fee, capsys) -> None: @@ -1213,11 +1247,11 @@ def test_max_open_trades_dump(mocker, hyperopt_conf, tmp_path, fee, capsys) -> N ) hyperopt = Hyperopt(hyperopt_conf) mocker.patch( - "freqtrade.optimize.hyperopt.Hyperopt._get_params_dict", + "freqtrade.optimize.hyperopt.hyperopt_optimizer.HyperOptimizer._get_params_dict", return_value={"max_open_trades": -1}, ) - assert isinstance(hyperopt.custom_hyperopt, HyperOptAuto) + assert isinstance(hyperopt.hyperopter.custom_hyperopt, HyperOptAuto) hyperopt.start() @@ -1232,11 +1266,11 @@ def test_max_open_trades_dump(mocker, hyperopt_conf, tmp_path, fee, capsys) -> N hyperopt = Hyperopt(hyperopt_conf) mocker.patch( - "freqtrade.optimize.hyperopt.Hyperopt._get_params_dict", + "freqtrade.optimize.hyperopt.hyperopt_optimizer.HyperOptimizer._get_params_dict", return_value={"max_open_trades": -1}, ) - assert isinstance(hyperopt.custom_hyperopt, HyperOptAuto) + assert isinstance(hyperopt.hyperopter.custom_hyperopt, HyperOptAuto) hyperopt.start() @@ -1267,9 +1301,9 @@ def test_max_open_trades_consistency(mocker, hyperopt_conf, tmp_path, fee) -> No ) hyperopt = Hyperopt(hyperopt_conf) - assert isinstance(hyperopt.custom_hyperopt, HyperOptAuto) + assert isinstance(hyperopt.hyperopter.custom_hyperopt, HyperOptAuto) - hyperopt.custom_hyperopt.max_open_trades_space = lambda: [ + hyperopt.hyperopter.custom_hyperopt.max_open_trades_space = lambda: [ Integer(1, 10, name="max_open_trades") ] @@ -1287,11 +1321,13 @@ def test_max_open_trades_consistency(mocker, hyperopt_conf, tmp_path, fee) -> No return wrapper - hyperopt.backtesting.wallets._calculate_unlimited_stake_amount = stake_amount_interceptor( - hyperopt.backtesting.wallets._calculate_unlimited_stake_amount + hyperopt.hyperopter.backtesting.wallets._calculate_unlimited_stake_amount = ( + stake_amount_interceptor( + hyperopt.hyperopter.backtesting.wallets._calculate_unlimited_stake_amount + ) ) hyperopt.start() - assert hyperopt.backtesting.strategy.max_open_trades == 8 + assert hyperopt.hyperopter.backtesting.strategy.max_open_trades == 8 assert hyperopt.config["max_open_trades"] == 8 diff --git a/tests/persistence/test_persistence.py b/tests/persistence/test_persistence.py index b92791ca5..a5e237a45 100644 --- a/tests/persistence/test_persistence.py +++ b/tests/persistence/test_persistence.py @@ -2683,6 +2683,36 @@ def test_select_filled_orders(fee): assert len(orders) == 0 +@pytest.mark.usefixtures("init_persistence") +def test_select_filled_orders_usdt(fee): + create_mock_trades_usdt(fee) + + trades = Trade.get_trades().all() + + # Closed buy order, no sell order + orders = trades[0].select_filled_orders("buy") + assert isinstance(orders, list) + assert len(orders) == 1 + assert orders[0].amount == 2.0 + assert orders[0].filled == 2.0 + assert orders[0].side == "buy" + assert orders[0].price == 10.0 + assert orders[0].stake_amount == 20 + assert orders[0].stake_amount_filled == 20 + + orders = trades[3].select_filled_orders("buy") + assert isinstance(orders, list) + assert len(orders) == 0 + orders = trades[3].select_filled_or_open_orders() + assert isinstance(orders, list) + assert len(orders) == 1 + assert orders[0].price == 2.0 + assert orders[0].amount == 10 + assert orders[0].filled == 0 + assert orders[0].stake_amount == 20 + assert orders[0].stake_amount_filled == 0 + + @pytest.mark.usefixtures("init_persistence") def test_order_to_ccxt(limit_buy_order_open, limit_sell_order_usdt_open): order = Order.parse_from_ccxt_object(limit_buy_order_open, "mocked", "buy") diff --git a/tests/plugins/test_pairlist.py b/tests/plugins/test_pairlist.py index 1c138cc55..a4f66a702 100644 --- a/tests/plugins/test_pairlist.py +++ b/tests/plugins/test_pairlist.py @@ -2450,7 +2450,7 @@ def test_MarketCapPairList_filter_special_no_pair_from_coingecko( assert pm.whitelist == [] -def test_MarketCapPairList_exceptions(mocker, default_conf_usdt): +def test_MarketCapPairList_exceptions(mocker, default_conf_usdt, caplog): exchange = get_patched_exchange(mocker, default_conf_usdt) default_conf_usdt["pairlists"] = [{"method": "MarketCapPairList"}] with pytest.raises(OperationalException, match=r"`number_assets` not specified.*"): @@ -2458,13 +2458,11 @@ def test_MarketCapPairList_exceptions(mocker, default_conf_usdt): PairListManager(exchange, default_conf_usdt) default_conf_usdt["pairlists"] = [ - {"method": "MarketCapPairList", "number_assets": 20, "max_rank": 260} + {"method": "MarketCapPairList", "number_assets": 20, "max_rank": 500} ] - with pytest.raises( - OperationalException, match="This filter only support marketcap rank up to 250." - ): + with caplog.at_level(logging.WARNING): PairListManager(exchange, default_conf_usdt) - + assert log_has_re("The max rank you have set \\(500\\) is quite high", caplog) # Test invalid coinmarkets list mocker.patch( "freqtrade.plugins.pairlist.MarketCapPairList.FtCoinGeckoApi.get_coins_categories_list", diff --git a/tests/rpc/test_fiat_convert.py b/tests/rpc/test_fiat_convert.py index 061df2e53..4ae7441c8 100644 --- a/tests/rpc/test_fiat_convert.py +++ b/tests/rpc/test_fiat_convert.py @@ -206,14 +206,16 @@ def test_convert_amount(mocker): def test_FtCoinGeckoApi(): ftc = FtCoinGeckoApi() - assert ftc._api_key == "" + assert ftc.extra_params is None assert ftc.api_base_url == "https://api.coingecko.com/api/v3/" # defaults to demo ftc = FtCoinGeckoApi(api_key="123456") - assert ftc._api_key == "123456" + assert ftc.extra_params is not None + assert ftc.extra_params["x_cg_demo_api_key"] == "123456" assert ftc.api_base_url == "https://api.coingecko.com/api/v3/" ftc = FtCoinGeckoApi(api_key="123456", is_demo=False) - assert ftc._api_key == "123456" + assert ftc.extra_params is not None + assert ftc.extra_params["x_cg_pro_api_key"] == "123456" assert ftc.api_base_url == "https://pro-api.coingecko.com/api/v3/" diff --git a/tests/rpc/test_rpc_apiserver.py b/tests/rpc/test_rpc_apiserver.py index 730a6b05e..ee28bcc6c 100644 --- a/tests/rpc/test_rpc_apiserver.py +++ b/tests/rpc/test_rpc_apiserver.py @@ -691,20 +691,22 @@ def test_api_show_config(botclient): def test_api_daily(botclient, mocker, ticker, fee, markets): ftbot, client = botclient - patch_get_signal(ftbot) - mocker.patch.multiple( - EXMS, - get_balances=MagicMock(return_value=ticker), - fetch_ticker=ticker, - get_fee=fee, - markets=PropertyMock(return_value=markets), - ) + + ftbot.config["dry_run"] = False + mocker.patch(f"{EXMS}.get_balances", return_value=ticker) + mocker.patch(f"{EXMS}.get_tickers", ticker) + mocker.patch(f"{EXMS}.get_fee", fee) + mocker.patch(f"{EXMS}.markets", PropertyMock(return_value=markets)) + ftbot.wallets.update() + rc = client_get(client, f"{BASE_URI}/daily") assert_response(rc) - assert len(rc.json()["data"]) == 7 - assert rc.json()["stake_currency"] == "BTC" - assert rc.json()["fiat_display_currency"] == "USD" - assert rc.json()["data"][0]["date"] == str(datetime.now(timezone.utc).date()) + response = rc.json() + assert "data" in response + assert len(response["data"]) == 7 + assert response["stake_currency"] == "BTC" + assert response["fiat_display_currency"] == "USD" + assert response["data"][0]["date"] == str(datetime.now(timezone.utc).date()) def test_api_weekly(botclient, mocker, ticker, fee, markets, time_machine): @@ -2861,3 +2863,74 @@ def test_api_ws_send_msg(default_conf, mocker, caplog): finally: ApiServer.shutdown() ApiServer.shutdown() + + +def test_api_download_data(botclient, mocker, tmp_path, caplog): + ftbot, client = botclient + + rc = client_post(client, f"{BASE_URI}/download_data", data={}) + assert_response(rc, 503) + assert rc.json()["detail"] == "Bot is not in the correct state." + + ftbot.config["runmode"] = RunMode.WEBSERVER + ftbot.config["user_data_dir"] = tmp_path + + body = { + "pairs": ["ETH/BTC", "XRP/BTC"], + "timeframes": ["5m"], + } + + # Fail, already running + ApiBG.download_data_running = True + rc = client_post(client, f"{BASE_URI}/download_data", body) + assert_response(rc, 400) + assert rc.json()["detail"] == "Data Download is already running." + + # Reset running state + ApiBG.download_data_running = False + + # Test successful download + mocker.patch( + "freqtrade.data.history.history_utils.download_data", + return_value=None, + ) + + rc = client_post(client, f"{BASE_URI}/download_data", body) + assert_response(rc) + assert rc.json()["status"] == "Data Download started in background." + job_id = rc.json()["job_id"] + + rc = client_get(client, f"{BASE_URI}/background/{job_id}") + assert_response(rc) + response = rc.json() + assert response["job_id"] == job_id + assert response["job_category"] == "download_data" + # Job finishes immediately due to mock. + assert response["status"] == "success" + + # Background list contains the job + rc = client_get(client, f"{BASE_URI}/background") + assert_response(rc) + response = rc.json() + assert isinstance(response, list) + assert len(response) == 1 + assert response[0]["job_id"] == job_id + + # Test error case + ApiBG.download_data_running = False + mocker.patch( + "freqtrade.data.history.history_utils.download_data", + side_effect=OperationalException("Download error"), + ) + rc = client_post(client, f"{BASE_URI}/download_data", body) + assert_response(rc) + assert rc.json()["status"] == "Data Download started in background." + job_id = rc.json()["job_id"] + + rc = client_get(client, f"{BASE_URI}/background/{job_id}") + assert_response(rc) + response = rc.json() + assert response["job_id"] == job_id + assert response["job_category"] == "download_data" + assert response["status"] == "failed" + assert response["error"] == "Download error" diff --git a/tests/rpc/test_rpc_telegram.py b/tests/rpc/test_rpc_telegram.py index 971e13846..bc7746aef 100644 --- a/tests/rpc/test_rpc_telegram.py +++ b/tests/rpc/test_rpc_telegram.py @@ -2355,8 +2355,8 @@ def test_send_msg_exit_notification(default_conf, mocker) -> None: "*Direction:* `Long`\n" "*Amount:* `1333.33333333`\n" "*Open Rate:* `0.00075 ETH`\n" - "*Current Rate:* `0.00032 ETH`\n" - "*Exit Rate:* `0.00032 ETH`\n" + "*Current Rate:* `0.0003201 ETH`\n" + "*Exit Rate:* `0.0003201 ETH`\n" "*Duration:* `1:00:00 (60.0 min)`" ) @@ -2398,8 +2398,8 @@ def test_send_msg_exit_notification(default_conf, mocker) -> None: "*Direction:* `Long`\n" "*Amount:* `1333.33333333`\n" "*Open Rate:* `0.00075 ETH`\n" - "*Current Rate:* `0.00032 ETH`\n" - "*Exit Rate:* `0.00032 ETH`\n" + "*Current Rate:* `0.0003201 ETH`\n" + "*Exit Rate:* `0.0003201 ETH`\n" "*Remaining:* `0.01 ETH / -24.812 USD`" ) @@ -2437,8 +2437,8 @@ def test_send_msg_exit_notification(default_conf, mocker) -> None: "*Direction:* `Long`\n" "*Amount:* `1333.33333333`\n" "*Open Rate:* `0.00075 ETH`\n" - "*Current Rate:* `0.00032 ETH`\n" - "*Exit Rate:* `0.00032 ETH`\n" + "*Current Rate:* `0.0003201 ETH`\n" + "*Exit Rate:* `0.0003201 ETH`\n" "*Duration:* `1 day, 2:30:00 (1590.0 min)`" ) # Reset singleton function to avoid random breaks @@ -2536,7 +2536,7 @@ def test_send_msg_exit_fill_notification( f"{leverage_text}" "*Amount:* `1333.33333333`\n" "*Open Rate:* `0.00075 ETH`\n" - "*Exit Rate:* `0.00032 ETH`\n" + "*Exit Rate:* `0.0003201 ETH`\n" "*Duration:* `1 day, 2:30:00 (1590.0 min)`" ) @@ -2686,8 +2686,8 @@ def test_send_msg_exit_notification_no_fiat( f"{leverage_text}`\n" "*Amount:* `1333.33333333`\n" "*Open Rate:* `0.00075 ETH`\n" - "*Current Rate:* `0.00032 ETH`\n" - "*Exit Rate:* `0.00032 ETH`\n" + "*Current Rate:* `0.0003201 ETH`\n" + "*Exit Rate:* `0.0003201 ETH`\n" "*Duration:* `2:35:03 (155.1 min)`" ) @@ -2885,3 +2885,85 @@ async def test_telegram_list_custom_data(default_conf_usdt, update, ticker, fee, ) in msg_mock.call_args_list[2][0][0] msg_mock.reset_mock() + + +def test_noficiation_settings(default_conf_usdt, mocker): + (telegram, _, _) = get_telegram_testobject(mocker, default_conf_usdt) + telegram._config["telegram"].update( + { + "notification_settings": { + "status": "silent", + "warning": "on", + "startup": "off", + "entry": "silent", + "entry_fill": "on", + "entry_cancel": "silent", + "exit": { + "roi": "silent", + "emergency_exit": "on", + "force_exit": "on", + "exit_signal": "silent", + "trailing_stop_loss": "on", + "stop_loss": "on", + "stoploss_on_exchange": "on", + "custom_exit": "silent", + "partial_exit": "off", + }, + "exit_fill": { + "roi": "silent", + "partial_exit": "off", + "*": "silent", # Default to silent + }, + "exit_cancel": "on", + "protection_trigger": "off", + "protection_trigger_global": "on", + "strategy_msg": "off", + "show_candle": "off", + } + } + ) + + loudness = telegram._message_loudness + + assert loudness({"type": RPCMessageType.ENTRY, "exit_reason": ""}) == "silent" + assert loudness({"type": RPCMessageType.ENTRY_FILL, "exit_reason": ""}) == "on" + assert loudness({"type": RPCMessageType.EXIT, "exit_reason": ""}) == "on" + # Default to silent due to "*" definition + assert loudness({"type": RPCMessageType.EXIT_FILL, "exit_reason": ""}) == "silent" + assert loudness({"type": RPCMessageType.PROTECTION_TRIGGER, "exit_reason": ""}) == "off" + assert loudness({"type": RPCMessageType.EXIT, "exit_reason": "roi"}) == "silent" + assert loudness({"type": RPCMessageType.EXIT, "exit_reason": "partial_exit"}) == "off" + # Not given key defaults to on + assert loudness({"type": RPCMessageType.EXIT, "exit_reason": "cust_exit112"}) == "on" + + assert loudness({"type": RPCMessageType.EXIT_FILL, "exit_reason": "roi"}) == "silent" + assert loudness({"type": RPCMessageType.EXIT_FILL, "exit_reason": "partial_exit"}) == "off" + # Default to silent due to "*" definition + assert loudness({"type": RPCMessageType.EXIT_FILL, "exit_reason": "cust_exit112"}) == "silent" + + # Simplified setup for exit + telegram._config["telegram"].update( + { + "notification_settings": { + "status": "silent", + "warning": "on", + "startup": "off", + "entry": "silent", + "entry_fill": "on", + "entry_cancel": "silent", + "exit": "off", + "exit_cancel": "on", + "exit_fill": "on", + "protection_trigger": "off", + "protection_trigger_global": "on", + "strategy_msg": "off", + "show_candle": "off", + } + } + ) + + assert loudness({"type": RPCMessageType.EXIT_FILL, "exit_reason": "roi"}) == "on" + # All regular exits are off + assert loudness({"type": RPCMessageType.EXIT, "exit_reason": "roi"}) == "off" + assert loudness({"type": RPCMessageType.EXIT, "exit_reason": "partial_exit"}) == "off" + assert loudness({"type": RPCMessageType.EXIT, "exit_reason": "cust_exit112"}) == "off" diff --git a/tests/strategy/strats/strategy_test_v3.py b/tests/strategy/strats/strategy_test_v3.py index 007c7655e..e87810111 100644 --- a/tests/strategy/strats/strategy_test_v3.py +++ b/tests/strategy/strats/strategy_test_v3.py @@ -1,7 +1,6 @@ # pragma pylint: disable=missing-docstring, invalid-name, pointless-string-statement from datetime import datetime -from typing import Optional import talib.abstract as ta from pandas import DataFrame @@ -175,7 +174,7 @@ class StrategyTestV3(IStrategy): current_rate: float, proposed_leverage: float, max_leverage: float, - entry_tag: Optional[str], + entry_tag: str | None, side: str, **kwargs, ) -> float: @@ -190,14 +189,14 @@ class StrategyTestV3(IStrategy): current_time: datetime, current_rate: float, current_profit: float, - min_stake: Optional[float], + min_stake: float | None, max_stake: float, current_entry_rate: float, current_exit_rate: float, current_entry_profit: float, current_exit_profit: float, **kwargs, - ) -> Optional[float]: + ) -> float | None: if current_profit < -0.0075: orders = trade.select_filled_orders(trade.entry_side) return round(orders[0].stake_amount, 0) diff --git a/tests/strategy/strats/strategy_test_v3_custom_entry_price.py b/tests/strategy/strats/strategy_test_v3_custom_entry_price.py index 956766d14..2689db27a 100644 --- a/tests/strategy/strats/strategy_test_v3_custom_entry_price.py +++ b/tests/strategy/strats/strategy_test_v3_custom_entry_price.py @@ -1,7 +1,6 @@ # pragma pylint: disable=missing-docstring, invalid-name, pointless-string-statement from datetime import datetime -from typing import Optional from pandas import DataFrame from strategy_test_v3 import StrategyTestV3 @@ -34,10 +33,10 @@ class StrategyTestV3CustomEntryPrice(StrategyTestV3): def custom_entry_price( self, pair: str, - trade: Optional[Trade], + trade: Trade | None, current_time: datetime, proposed_rate: float, - entry_tag: Optional[str], + entry_tag: str | None, side: str, **kwargs, ) -> float: diff --git a/tests/strategy/test_interface.py b/tests/strategy/test_interface.py index 441eb5673..647484535 100644 --- a/tests/strategy/test_interface.py +++ b/tests/strategy/test_interface.py @@ -27,15 +27,8 @@ from freqtrade.strategy.parameters import ( IntParameter, RealParameter, ) -from freqtrade.strategy.strategy_wrapper import strategy_safe_wrapper from freqtrade.util import dt_now -from tests.conftest import ( - CURRENT_TEST_STRATEGY, - TRADE_SIDES, - create_mock_trades, - log_has, - log_has_re, -) +from tests.conftest import CURRENT_TEST_STRATEGY, TRADE_SIDES, log_has, log_has_re from .strats.strategy_test_v3 import StrategyTestV3 @@ -900,68 +893,6 @@ def test_is_informative_pairs_callback(default_conf): assert [] == strategy.gather_informative_pairs() -@pytest.mark.parametrize( - "error", - [ - ValueError, - KeyError, - Exception, - ], -) -def test_strategy_safe_wrapper_error(caplog, error): - def failing_method(): - raise error("This is an error.") - - with pytest.raises(StrategyError, match=r"This is an error."): - strategy_safe_wrapper(failing_method, message="DeadBeef")() - - assert log_has_re(r"DeadBeef.*", caplog) - ret = strategy_safe_wrapper(failing_method, message="DeadBeef", default_retval=True)() - - assert isinstance(ret, bool) - assert ret - - caplog.clear() - # Test suppressing error - ret = strategy_safe_wrapper(failing_method, message="DeadBeef", supress_error=True)() - assert log_has_re(r"DeadBeef.*", caplog) - - -@pytest.mark.parametrize( - "value", [1, 22, 55, True, False, {"a": 1, "b": "112"}, [1, 2, 3, 4], (4, 2, 3, 6)] -) -def test_strategy_safe_wrapper(value): - def working_method(argumentpassedin): - return argumentpassedin - - ret = strategy_safe_wrapper(working_method, message="DeadBeef")(value) - - assert isinstance(ret, type(value)) - assert ret == value - - -@pytest.mark.usefixtures("init_persistence") -def test_strategy_safe_wrapper_trade_copy(fee): - create_mock_trades(fee) - - def working_method(trade): - assert len(trade.orders) > 0 - assert trade.orders - trade.orders = [] - assert len(trade.orders) == 0 - return trade - - trade = Trade.get_open_trades()[0] - # Don't assert anything before strategy_wrapper. - # This ensures that relationship loading works correctly. - ret = strategy_safe_wrapper(working_method, message="DeadBeef")(trade=trade) - assert isinstance(ret, Trade) - assert id(trade) != id(ret) - # Did not modify the original order - assert len(trade.orders) > 0 - assert len(ret.orders) == 0 - - def test_hyperopt_parameters(): HyperoptStateContainer.set_state(HyperoptState.INDICATORS) from skopt.space import Categorical, Integer, Real diff --git a/tests/strategy/test_strategy_safe_wrapper.py b/tests/strategy/test_strategy_safe_wrapper.py new file mode 100644 index 000000000..214f3c9e4 --- /dev/null +++ b/tests/strategy/test_strategy_safe_wrapper.py @@ -0,0 +1,69 @@ +import pytest + +from freqtrade.exceptions import StrategyError +from freqtrade.persistence import Trade +from freqtrade.strategy.strategy_wrapper import strategy_safe_wrapper +from tests.conftest import create_mock_trades, log_has_re + + +@pytest.mark.parametrize( + "error", + [ + ValueError, + KeyError, + Exception, + ], +) +def test_strategy_safe_wrapper_error(caplog, error): + def failing_method(): + raise error("This is an error.") + + with pytest.raises(StrategyError, match=r"This is an error."): + strategy_safe_wrapper(failing_method, message="DeadBeef")() + + assert log_has_re(r"DeadBeef.*", caplog) + ret = strategy_safe_wrapper(failing_method, message="DeadBeef", default_retval=True)() + + assert isinstance(ret, bool) + assert ret + + caplog.clear() + # Test suppressing error + ret = strategy_safe_wrapper(failing_method, message="DeadBeef", supress_error=True)() + assert log_has_re(r"DeadBeef.*", caplog) + + +@pytest.mark.parametrize( + "value", [1, 22, 55, True, False, {"a": 1, "b": "112"}, [1, 2, 3, 4], (4, 2, 3, 6)] +) +def test_strategy_safe_wrapper(value): + def working_method(argumentpassedin): + return argumentpassedin + + ret = strategy_safe_wrapper(working_method, message="DeadBeef")(value) + + assert isinstance(ret, type(value)) + assert ret == value + + +@pytest.mark.usefixtures("init_persistence") +def test_strategy_safe_wrapper_trade_copy(fee): + create_mock_trades(fee) + trade_ = Trade.get_open_trades()[0] + + def working_method(trade): + assert len(trade.orders) > 0 + assert trade.orders + trade.orders = [] + assert len(trade.orders) == 0 + assert id(trade_) != id(trade) + return trade + + # Don't assert anything before strategy_wrapper. + # This ensures that relationship loading works correctly. + ret = strategy_safe_wrapper(working_method, message="DeadBeef")(trade=trade_) + assert isinstance(ret, Trade) + assert id(trade_) != id(ret) + # Did not modify the original order + assert len(trade_.orders) > 0 + assert len(ret.orders) == 0 diff --git a/tests/test_configuration.py b/tests/test_configuration.py index 829bf699a..8011ded96 100644 --- a/tests/test_configuration.py +++ b/tests/test_configuration.py @@ -489,7 +489,6 @@ def test_setup_configuration_with_arguments(mocker, default_conf, caplog, tmp_pa "--timeframe", "1m", "--enable-position-stacking", - "--disable-max-market-positions", "--timerange", ":100", "--export", @@ -518,10 +517,6 @@ def test_setup_configuration_with_arguments(mocker, default_conf, caplog, tmp_pa assert "position_stacking" in config assert log_has("Parameter --enable-position-stacking detected ...", caplog) - assert "use_max_market_positions" in config - assert log_has("Parameter --disable-max-market-positions detected ...", caplog) - assert log_has("max_open_trades set to unlimited ...", caplog) - assert "timerange" in config assert log_has("Parameter --timerange detected: {} ...".format(config["timerange"]), caplog) @@ -570,8 +565,6 @@ def test_setup_configuration_with_stratlist(mocker, default_conf, caplog) -> Non assert "position_stacking" not in config - assert "use_max_market_positions" not in config - assert "timerange" not in config assert "export" in config diff --git a/tests/test_wallets.py b/tests/test_wallets.py index 545793151..2c12d27b5 100644 --- a/tests/test_wallets.py +++ b/tests/test_wallets.py @@ -168,7 +168,7 @@ def test_get_trade_stake_amount_unlimited_amount( assert result == 0 freqtrade.config["dry_run_wallet"] = 200 - freqtrade.wallets.start_cap = 200 + freqtrade.wallets._start_cap = 200 result = freqtrade.wallets.get_trade_stake_amount("XRP/USDT", 3) assert round(result, 4) == round(result2, 4) diff --git a/tests/util/test_formatters.py b/tests/util/test_formatters.py index ab86e224c..ba77eb9a6 100644 --- a/tests/util/test_formatters.py +++ b/tests/util/test_formatters.py @@ -1,4 +1,5 @@ from freqtrade.util import decimals_per_coin, fmt_coin, round_value +from freqtrade.util.formatters import fmt_coin2 def test_decimals_per_coin(): @@ -25,6 +26,16 @@ def test_fmt_coin(): assert fmt_coin(222.2, "USDT", False, True) == "222.200" +def test_fmt_coin2(): + assert fmt_coin2(222.222222, "USDT") == "222.222222 USDT" + assert fmt_coin2(222.2, "XRP", 3, keep_trailing_zeros=True) == "222.200 XRP" + assert fmt_coin2(222.2, "USDT") == "222.2 USDT" + assert fmt_coin2(222.12745, "EUR") == "222.12745 EUR" + assert fmt_coin2(0.1274512123, "BTC") == "0.12745121 BTC" + assert fmt_coin2(0.1274512123, "ETH") == "0.12745121 ETH" + assert fmt_coin2(0.00001245, "PEPE") == "0.00001245 PEPE" + + def test_round_value(): assert round_value(222.222222, 3) == "222.222" assert round_value(222.2, 3) == "222.2"