ccxt 4.3.74__tar.gz → 4.3.76__tar.gz

{ccxt-4.3.74/ccxt.egg-info → ccxt-4.3.76}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: ccxt
-Version: 4.3.74
+Version: 4.3.76
 Summary: A JavaScript / TypeScript / Python / C# / PHP cryptocurrency trading library with support for 100+ exchanges
 Home-page: https://ccxt.com
 Author: Igor Kroitor
@@ -259,13 +259,13 @@ console.log(version, Object.keys(exchanges));
 
 All-in-one browser bundle (dependencies included), served from a CDN of your choice:
 
-* jsDelivr: https://cdn.jsdelivr.net/npm/ccxt@4.3.74/dist/ccxt.browser.min.js
-* unpkg: https://unpkg.com/ccxt@4.3.74/dist/ccxt.browser.min.js
+* jsDelivr: https://cdn.jsdelivr.net/npm/ccxt@4.3.76/dist/ccxt.browser.min.js
+* unpkg: https://unpkg.com/ccxt@4.3.76/dist/ccxt.browser.min.js
 
 CDNs are not updated in real-time and may have delays. Defaulting to the most recent version without specifying the version number is not recommended. Please, keep in mind that we are not responsible for the correct operation of those CDN servers.
 
 ```HTML
-<script type="text/javascript" src="https://cdn.jsdelivr.net/npm/ccxt@4.3.74/dist/ccxt.browser.min.js"></script>
+<script type="text/javascript" src="https://cdn.jsdelivr.net/npm/ccxt@4.3.76/dist/ccxt.browser.min.js"></script>
 ```
 
 Creates a global `ccxt` object:

{ccxt-4.3.74 → ccxt-4.3.76}/ccxt/__init__.py

@@ -22,7 +22,7 @@
 
 # ----------------------------------------------------------------------------
 
-__version__ = '4.3.74'
+__version__ = '4.3.76'
 
 # ----------------------------------------------------------------------------
 

{ccxt-4.3.74 → ccxt-4.3.76}/ccxt/abstract/bitmart.py

@@ -62,6 +62,8 @@ class ImplicitAPI:
     private_get_contract_private_current_plan_order = privateGetContractPrivateCurrentPlanOrder = Entry('contract/private/current-plan-order', 'private', 'GET', {'cost': 1.2})
     private_get_contract_private_trades = privateGetContractPrivateTrades = Entry('contract/private/trades', 'private', 'GET', {'cost': 10})
     private_get_contract_private_position_risk = privateGetContractPrivatePositionRisk = Entry('contract/private/position-risk', 'private', 'GET', {'cost': 10})
+    private_get_contract_private_affilate_rebate_list = privateGetContractPrivateAffilateRebateList = Entry('contract/private/affilate/rebate-list', 'private', 'GET', {'cost': 10})
+    private_get_contract_private_affilate_trade_list = privateGetContractPrivateAffilateTradeList = Entry('contract/private/affilate/trade-list', 'private', 'GET', {'cost': 10})
     private_post_account_sub_account_main_v1_sub_to_main = privatePostAccountSubAccountMainV1SubToMain = Entry('account/sub-account/main/v1/sub-to-main', 'private', 'POST', {'cost': 30})
     private_post_account_sub_account_sub_v1_sub_to_main = privatePostAccountSubAccountSubV1SubToMain = Entry('account/sub-account/sub/v1/sub-to-main', 'private', 'POST', {'cost': 30})
     private_post_account_sub_account_main_v1_main_to_sub = privatePostAccountSubAccountMainV1MainToSub = Entry('account/sub-account/main/v1/main-to-sub', 'private', 'POST', {'cost': 30})

{ccxt-4.3.74 → ccxt-4.3.76}/ccxt/abstract/bybit.py

@@ -53,6 +53,7 @@ class ImplicitAPI:
     public_get_v5_spot_cross_margin_trade_borrow_token = publicGetV5SpotCrossMarginTradeBorrowToken = Entry('v5/spot-cross-margin-trade/borrow-token', 'public', 'GET', {'cost': 5})
     public_get_v5_ins_loan_product_infos = publicGetV5InsLoanProductInfos = Entry('v5/ins-loan/product-infos', 'public', 'GET', {'cost': 5})
     public_get_v5_ins_loan_ensure_tokens_convert = publicGetV5InsLoanEnsureTokensConvert = Entry('v5/ins-loan/ensure-tokens-convert', 'public', 'GET', {'cost': 5})
+    private_get_v5_market_instruments_info = privateGetV5MarketInstrumentsInfo = Entry('v5/market/instruments-info', 'private', 'GET', {'cost': 5})
     private_get_v2_private_wallet_fund_records = privateGetV2PrivateWalletFundRecords = Entry('v2/private/wallet/fund/records', 'private', 'GET', {'cost': 25})
     private_get_spot_v3_private_order = privateGetSpotV3PrivateOrder = Entry('spot/v3/private/order', 'private', 'GET', {'cost': 2.5})
     private_get_spot_v3_private_open_orders = privateGetSpotV3PrivateOpenOrders = Entry('spot/v3/private/open-orders', 'private', 'GET', {'cost': 2.5})

{ccxt-4.3.74 → ccxt-4.3.76}/ccxt/abstract/gemini.py

@@ -56,3 +56,4 @@ class ImplicitAPI:
     private_post_v1_account_create = privatePostV1AccountCreate = Entry('v1/account/create', 'private', 'POST', {'cost': 1})
     private_post_v1_account_list = privatePostV1AccountList = Entry('v1/account/list', 'private', 'POST', {'cost': 1})
     private_post_v1_heartbeat = privatePostV1Heartbeat = Entry('v1/heartbeat', 'private', 'POST', {'cost': 1})
+    private_post_v1_roles = privatePostV1Roles = Entry('v1/roles', 'private', 'POST', {'cost': 1})

{ccxt-4.3.74 → ccxt-4.3.76}/ccxt/async_support/__init__.py

@@ -4,7 +4,7 @@
 
 # -----------------------------------------------------------------------------
 
-__version__ = '4.3.74'
+__version__ = '4.3.76'
 
 # -----------------------------------------------------------------------------
 

{ccxt-4.3.74 → ccxt-4.3.76}/ccxt/async_support/base/exchange.py

@@ -2,7 +2,7 @@
 
 # -----------------------------------------------------------------------------
 
-__version__ = '4.3.74'
+__version__ = '4.3.76'
 
 # -----------------------------------------------------------------------------
 
@@ -570,7 +570,7 @@ class Exchange(BaseExchange):
 
     async def watch_liquidations(self, symbol: str, since: Int = None, limit: Int = None, params={}):
         if self.has['watchLiquidationsForSymbols']:
-            return self.watch_liquidations_for_symbols([symbol], since, limit, params)
+            return await self.watch_liquidations_for_symbols([symbol], since, limit, params)
         raise NotSupported(self.id + ' watchLiquidations() is not supported yet')
 
     async def watch_liquidations_for_symbols(self, symbols: List[str], since: Int = None, limit: Int = None, params={}):

{ccxt-4.3.74 → ccxt-4.3.76}/ccxt/async_support/binance.py

@@ -9123,7 +9123,7 @@ class binance(Exchange, ImplicitAPI):
         liquidationPrice = self.parse_number(liquidationPriceString)
         collateralString = None
         marginMode = self.safe_string(position, 'marginType')
-        if marginMode is None and isolatedMarginString:
+        if marginMode is None and isolatedMarginString is not None:
             marginMode = 'cross' if Precise.string_eq(isolatedMarginString, '0') else 'isolated'
         side = None
         if Precise.string_gt(notionalString, '0'):

{ccxt-4.3.74 → ccxt-4.3.76}/ccxt/async_support/bitmart.py

@@ -129,7 +129,8 @@ class bitmart(Exchange, ImplicitAPI):
             'urls': {
                 'logo': 'https://user-images.githubusercontent.com/1294454/129991357-8f47464b-d0f4-41d6-8a82-34122f0d1398.jpg',
                 'api': {
-                    'rest': 'https://api-cloud.{hostname}',  # bitmart.info for Hong Kong users
+                    'spot': 'https://api-cloud.{hostname}',
+                    'swap': 'https://api-cloud-v2.{hostname}',  # bitmart.info for Hong Kong users
                 },
                 'www': 'https://www.bitmart.com/',
                 'doc': 'https://developer-pro.bitmart.com/',
@@ -220,6 +221,8 @@ class bitmart(Exchange, ImplicitAPI):
                         'contract/private/current-plan-order': 1.2,
                         'contract/private/trades': 10,
                         'contract/private/position-risk': 10,
+                        'contract/private/affilate/rebate-list': 10,
+                        'contract/private/affilate/trade-list': 10,
                     },
                     'post': {
                         # sub-account endpoints
@@ -513,8 +516,8 @@ class bitmart(Exchange, ImplicitAPI):
                     '40045': InvalidOrder,  # 400, The order open type is invalid
                     '40046': PermissionDenied,  # 403, The account is not opened futures
                     '40047': PermissionDenied,  # 403, Services is not available in you countries and areas
-                    '40048': BadRequest,  # 403, ClientOrderId only allows a combination of numbers and letters
-                    '40049': BadRequest,  # 403, The maximum length of clientOrderId cannot exceed 32
+                    '40048': InvalidOrder,  # 403, ClientOrderId only allows a combination of numbers and letters
+                    '40049': InvalidOrder,  # 403, The maximum length of clientOrderId cannot exceed 32
                     '40050': InvalidOrder,  # 403, Client OrderId duplicated with existing orders
                 },
                 'broad': {},
@@ -877,36 +880,43 @@ class bitmart(Exchange, ImplicitAPI):
     async def fetch_contract_markets(self, params={}):
         response = await self.publicGetContractPublicDetails(params)
         #
-        #     {
-        #       "code": 1000,
-        #       "message": "Ok",
-        #       "trace": "9b92a999-9463-4c96-91a4-93ad1cad0d72",
-        #       "data": {
-        #       "symbols": [{
-        #             "symbol": "BTCUSDT",
-        #             "product_type": 1,
-        #             "open_timestamp": 1594080000,
-        #             "expire_timestamp": 0,
-        #             "settle_timestamp": 0,
-        #             "base_currency": "BTC",
-        #             "quote_currency": "USDT",
-        #             "last_price": "23920",
-        #             "volume_24h": "18969368",
-        #             "turnover_24h": "458933659.7858",
-        #             "index_price": "23945.25191635",
-        #             "index_name": "BTCUSDT",
-        #             "contract_size": "0.001",
-        #             "min_leverage": "1",
-        #             "max_leverage": "100",
-        #             "price_precision": "0.1",
-        #             "vol_precision": "1",
-        #             "max_volume": "500000",
-        #             "min_volume": "1"
-        #           },
-        #           ...
-        #         ]
-        #       }
+        # {
+        #     "code": 1000,
+        #     "message": "Ok",
+        #     "trace": "9b92a999-9463-4c96-91a4-93ad1cad0d72",
+        #     "data": {
+        #       "symbols": [
+        #         {
+        #           "symbol": "BTCUSDT",
+        #           "product_type": 1,
+        #           "open_timestamp": 1594080000,
+        #           "expire_timestamp": 0,
+        #           "settle_timestamp": 0,
+        #           "base_currency": "BTC",
+        #           "quote_currency": "USDT",
+        #           "last_price": "23920",
+        #           "volume_24h": "18969368",
+        #           "turnover_24h": "458933659.7858",
+        #           "index_price": "23945.25191635",
+        #           "index_name": "BTCUSDT",
+        #           "contract_size": "0.001",
+        #           "min_leverage": "1",
+        #           "max_leverage": "100",
+        #           "price_precision": "0.1",
+        #           "vol_precision": "1",
+        #           "max_volume": "500000",
+        #           "min_volume": "1",
+        #           "funding_rate": "0.0001",
+        #           "expected_funding_rate": "0.00011",
+        #           "open_interest": "4134180870",
+        #           "open_interest_value": "94100888927.0433258",
+        #           "high_24h": "23900",
+        #           "low_24h": "23100",
+        #           "change_24h": "0.004"
+        #         },
+        #       ]
         #     }
+        # }
         #
         data = self.safe_value(response, 'data', {})
         symbols = self.safe_value(data, 'symbols', [])
@@ -981,6 +991,7 @@ class bitmart(Exchange, ImplicitAPI):
 
     async def fetch_markets(self, params={}) -> List[Market]:
         """
+        :see: https://developer-pro.bitmart.com/en/futuresv2/#get-contract-details
         retrieves data on all markets for bitmart
         :param dict [params]: extra parameters specific to the exchange API endpoint
         :returns dict[]: an array of objects representing market data
@@ -1179,25 +1190,41 @@ class bitmart(Exchange, ImplicitAPI):
         #
         # swap
         #
-        #      {
-        #          "contract_symbol":"DOGEUSDT",
-        #          "last_price":"0.130340",
-        #          "index_price":"0.13048245",
-        #          "last_funding_rate":"0.00002287",
-        #          "price_change_percent_24h":"-2.074",
-        #          "volume_24h":"113705028.59482228",
-        #          "url":"https://futures.bitmart.com/en?symbol=DOGEUSDT",
-        #          "high_price":"0.134520",
-        #          "low_price":"0.128570",
-        #          "legal_coin_price":"0.1302699"
-        #      }
+        #     {
+        #       "symbol": "BTCUSDT",
+        #       "product_type": 1,
+        #       "open_timestamp": 1594080000,
+        #       "expire_timestamp": 0,
+        #       "settle_timestamp": 0,
+        #       "base_currency": "BTC",
+        #       "quote_currency": "USDT",
+        #       "last_price": "23920",
+        #       "volume_24h": "18969368",
+        #       "turnover_24h": "458933659.7858",
+        #       "index_price": "23945.25191635",
+        #       "index_name": "BTCUSDT",
+        #       "contract_size": "0.001",
+        #       "min_leverage": "1",
+        #       "max_leverage": "100",
+        #       "price_precision": "0.1",
+        #       "vol_precision": "1",
+        #       "max_volume": "500000",
+        #       "min_volume": "1",
+        #       "funding_rate": "0.0001",
+        #       "expected_funding_rate": "0.00011",
+        #       "open_interest": "4134180870",
+        #       "open_interest_value": "94100888927.0433258",
+        #       "high_24h": "23900",
+        #       "low_24h": "23100",
+        #       "change_24h": "0.004"
+        #  }
         #
         result = self.safe_list(ticker, 'result', [])
         average = self.safe_string_2(ticker, 'avg_price', 'index_price')
         marketId = self.safe_string_2(ticker, 'symbol', 'contract_symbol')
         timestamp = self.safe_integer_2(ticker, 'timestamp', 'ts')
         last = self.safe_string_2(ticker, 'last_price', 'last')
-        percentage = self.safe_string(ticker, 'price_change_percent_24h')
+        percentage = self.safe_string_2(ticker, 'price_change_percent_24h', 'change_24h')
         change = self.safe_string(ticker, 'fluctuation')
         high = self.safe_string_2(ticker, 'high_24h', 'high_price')
         low = self.safe_string_2(ticker, 'low_24h', 'low_price')
@@ -1206,8 +1233,8 @@ class bitmart(Exchange, ImplicitAPI):
         ask = self.safe_string_2(ticker, 'best_ask', 'ask_px')
         askVolume = self.safe_string_2(ticker, 'best_ask_size', 'ask_sz')
         open = self.safe_string(ticker, 'open_24h')
-        baseVolume = self.safe_string_2(ticker, 'base_volume_24h', 'v_24h')
-        quoteVolume = self.safe_string_lower_2(ticker, 'quote_volume_24h', 'qv_24h')
+        baseVolume = self.safe_string_n(ticker, ['base_volume_24h', 'v_24h', 'volume_24h'])
+        quoteVolume = self.safe_string_lower_n(ticker, ['quote_volume_24h', 'qv_24h', 'turnover_24h'])
         listMarketId = self.safe_string(result, 0)
         if listMarketId is not None:
             marketId = listMarketId
@@ -1266,6 +1293,7 @@ class bitmart(Exchange, ImplicitAPI):
         """
         fetches a price ticker, a statistical calculation with the information calculated over the past 24 hours for a specific market
         :see: https://developer-pro.bitmart.com/en/spot/#get-ticker-of-a-trading-pair-v3
+        :see: https://developer-pro.bitmart.com/en/futuresv2/#get-contract-details
         :param str symbol: unified symbol of the market to fetch the ticker for
         :param dict [params]: extra parameters specific to the exchange API endpoint
         :returns dict: a `ticker structure <https://docs.ccxt.com/#/?id=ticker-structure>`
@@ -1275,8 +1303,8 @@ class bitmart(Exchange, ImplicitAPI):
         request: dict = {}
         response = None
         if market['swap']:
-            request['contract_symbol'] = market['id']
-            response = await self.publicGetContractV1Tickers(self.extend(request, params))
+            request['symbol'] = market['id']
+            response = await self.publicGetContractPublicDetails(self.extend(request, params))
             #
             #      {
             #          "message":"OK",
@@ -1328,22 +1356,21 @@ class bitmart(Exchange, ImplicitAPI):
         else:
             raise NotSupported(self.id + ' fetchTicker() does not support ' + market['type'] + ' markets, only spot and swap markets are accepted')
         # fails in naming for contract tickers 'contract_symbol'
-        tickersById = None
         tickers = []
         ticker: dict = {}
         if market['spot']:
             ticker = self.safe_dict(response, 'data', {})
         else:
             data = self.safe_dict(response, 'data', {})
-            tickers = self.safe_list(data, 'tickers', [])
-            tickersById = self.index_by(tickers, 'contract_symbol')
-            ticker = self.safe_dict(tickersById, market['id'])
+            tickers = self.safe_list(data, 'symbols', [])
+            ticker = self.safe_value(tickers, 0, {})
         return self.parse_ticker(ticker, market)
 
     async def fetch_tickers(self, symbols: Strings = None, params={}) -> Tickers:
         """
         fetches price tickers for multiple markets, statistical information calculated over the past 24 hours for each market
         :see: https://developer-pro.bitmart.com/en/spot/#get-ticker-of-all-pairs-v3
+        :see: https://developer-pro.bitmart.com/en/futuresv2/#get-contract-details
         :param str[]|None symbols: unified symbols of the markets to fetch the ticker for, all market tickers are returned if not assigned
         :param dict [params]: extra parameters specific to the exchange API endpoint
         :returns dict: a dictionary of `ticker structures <https://docs.ccxt.com/#/?id=ticker-structure>`
@@ -1384,29 +1411,45 @@ class bitmart(Exchange, ImplicitAPI):
             #     }
             #
         elif type == 'swap':
-            response = await self.publicGetContractV1Tickers(params)
+            response = await self.publicGetContractPublicDetails(params)
             #
-            #     {
-            #         "message": "OK",
-            #         "code": 1000,
-            #         "trace": "c1dec681c24ea5d.105.171712565",
-            #         "data": {
-            #             "tickers": [
-            #                 {
-            #                     "contract_symbol": "SNTUSDT",
-            #                     "last_price": "0.0366600",
-            #                     "index_price": "0.03587373",
-            #                     "last_funding_rate": "0.00005000",
-            #                     "price_change_percent_24h": "-2.629",
-            #                     "volume_24h": "10102540.19909109848",
-            #                     "url": "https://futures.bitmart.com/en?symbol=SNTUSDT",
-            #                     "high_price": "0.0405600",
-            #                     "low_price": "0.0355000",
-            #                     "legal_coin_price": "0.03666697"
-            #                 },
-            #             ]
-            #         }
-            #     }
+            # {
+            #       "code": 1000,
+            #       "message": "Ok",
+            #       "trace": "9b92a999-9463-4c96-91a4-93ad1cad0d72",
+            #       "data": {
+            #         "symbols": [
+            #           {
+            #             "symbol": "BTCUSDT",
+            #             "product_type": 1,
+            #             "open_timestamp": 1594080000,
+            #             "expire_timestamp": 0,
+            #             "settle_timestamp": 0,
+            #             "base_currency": "BTC",
+            #             "quote_currency": "USDT",
+            #             "last_price": "23920",
+            #             "volume_24h": "18969368",
+            #             "turnover_24h": "458933659.7858",
+            #             "index_price": "23945.25191635",
+            #             "index_name": "BTCUSDT",
+            #             "contract_size": "0.001",
+            #             "min_leverage": "1",
+            #             "max_leverage": "100",
+            #             "price_precision": "0.1",
+            #             "vol_precision": "1",
+            #             "max_volume": "500000",
+            #             "min_volume": "1",
+            #             "funding_rate": "0.0001",
+            #             "expected_funding_rate": "0.00011",
+            #             "open_interest": "4134180870",
+            #             "open_interest_value": "94100888927.0433258",
+            #             "high_24h": "23900",
+            #             "low_24h": "23100",
+            #             "change_24h": "0.004"
+            #           },
+            #         ]
+            #       }
+            #   }
             #
         else:
             raise NotSupported(self.id + ' fetchTickers() does not support ' + type + ' markets, only spot and swap markets are accepted')
@@ -1415,7 +1458,7 @@ class bitmart(Exchange, ImplicitAPI):
             tickers = self.safe_list(response, 'data', [])
         else:
             data = self.safe_dict(response, 'data', {})
-            tickers = self.safe_list(data, 'tickers', [])
+            tickers = self.safe_list(data, 'symbols', [])
         result: dict = {}
         for i in range(0, len(tickers)):
             ticker: dict = {}
@@ -1432,6 +1475,7 @@ class bitmart(Exchange, ImplicitAPI):
         fetches information on open orders with bid(buy) and ask(sell) prices, volumes and other data
         :see: https://developer-pro.bitmart.com/en/spot/#get-depth-v3
         :see: https://developer-pro.bitmart.com/en/futures/#get-market-depth
+        :see: https://developer-pro.bitmart.com/en/futuresv2/#get-market-depth
         :param str symbol: unified symbol of the market to fetch the order book for
         :param int [limit]: the maximum amount of order book entries to return
         :param dict [params]: extra parameters specific to the exchange API endpoint
@@ -1707,7 +1751,7 @@ class bitmart(Exchange, ImplicitAPI):
         """
         fetches historical candlestick data containing the open, high, low, and close price, and the volume of a market
         :see: https://developer-pro.bitmart.com/en/spot/#get-history-k-line-v3
-        :see: https://developer-pro.bitmart.com/en/futures/#get-k-line
+        :see: https://developer-pro.bitmart.com/en/futuresv2/#get-k-line
         :param str symbol: unified symbol of the market to fetch OHLCV data for
         :param str timeframe: the length of time each candle represents
         :param int [since]: timestamp in ms of the earliest candle to fetch
@@ -1968,6 +2012,7 @@ class bitmart(Exchange, ImplicitAPI):
         query for balance and get the amount of funds available for trading or funds locked in orders
         :see: https://developer-pro.bitmart.com/en/spot/#get-spot-wallet-balance
         :see: https://developer-pro.bitmart.com/en/futures/#get-contract-assets-detail
+        :see: https://developer-pro.bitmart.com/en/futuresv2/#get-contract-assets-keyed
         :see: https://developer-pro.bitmart.com/en/spot/#get-account-balance
         :see: https://developer-pro.bitmart.com/en/spot/#get-margin-account-details-isolated
         :param dict [params]: extra parameters specific to the exchange API endpoint
@@ -2319,6 +2364,8 @@ class bitmart(Exchange, ImplicitAPI):
         :see: https://developer-pro.bitmart.com/en/spot/#place-margin-order
         :see: https://developer-pro.bitmart.com/en/futures/#submit-order-signed
         :see: https://developer-pro.bitmart.com/en/futures/#submit-plan-order-signed
+        :see: https://developer-pro.bitmart.com/en/futures/#submit-order-signed
+        :see: https://developer-pro.bitmart.com/en/futures/#submit-plan-order-signed
         :param str symbol: unified symbol of the market to create an order in
         :param str type: 'market', 'limit' or 'trailing' for swap markets only
         :param str side: 'buy' or 'sell'
@@ -2531,9 +2578,10 @@ class bitmart(Exchange, ImplicitAPI):
         if clientOrderId is not None:
             params = self.omit(params, 'clientOrderId')
             request['client_order_id'] = clientOrderId
-        leverage = self.safe_integer(params, 'leverage', 1)
+        leverage = self.safe_integer(params, 'leverage')
         params = self.omit(params, ['timeInForce', 'postOnly', 'reduceOnly', 'leverage', 'trailingTriggerPrice', 'trailingPercent', 'triggerPrice', 'stopPrice'])
-        request['leverage'] = self.number_to_string(leverage)
+        if leverage is not None:
+            request['leverage'] = self.number_to_string(leverage)
         return self.extend(request, params)
 
     def create_spot_order_request(self, symbol: str, type: OrderType, side: OrderSide, amount: float, price: Num = None, params={}):
@@ -2608,6 +2656,8 @@ class bitmart(Exchange, ImplicitAPI):
         :see: https://developer-pro.bitmart.com/en/spot/#cancel-order-v3-signed
         :see: https://developer-pro.bitmart.com/en/futures/#cancel-plan-order-signed
         :see: https://developer-pro.bitmart.com/en/futures/#cancel-plan-order-signed
+        :see: https://developer-pro.bitmart.com/en/futures/#cancel-order-signed
+        :see: https://developer-pro.bitmart.com/en/futures/#cancel-plan-order-signed
         :param str id: order id
         :param str symbol: unified symbol of the market the order was made in
         :param dict [params]: extra parameters specific to the exchange API endpoint
@@ -2737,6 +2787,7 @@ class bitmart(Exchange, ImplicitAPI):
         cancel all open orders in a market
         :see: https://developer-pro.bitmart.com/en/spot/#cancel-all-orders
         :see: https://developer-pro.bitmart.com/en/futures/#cancel-all-orders-signed
+        :see: https://developer-pro.bitmart.com/en/futuresv2/#cancel-all-orders-signed
         :param str symbol: unified market symbol of the market to cancel orders in
         :param dict [params]: extra parameters specific to the exchange API endpoint
         :param str [params.side]: *spot only* 'buy' or 'sell'
@@ -2949,6 +3000,7 @@ class bitmart(Exchange, ImplicitAPI):
         """
         :see: https://developer-pro.bitmart.com/en/spot/#account-orders-v4-signed
         :see: https://developer-pro.bitmart.com/en/futures/#get-order-history-keyed
+        :see: https://developer-pro.bitmart.com/en/futuresv2/#get-order-history-keyed
         fetches information on multiple closed orders made by the user
         :param str symbol: unified market symbol of the market orders were made in
         :param int [since]: the earliest time in ms to fetch orders for
@@ -3006,6 +3058,7 @@ class bitmart(Exchange, ImplicitAPI):
         :see: https://developer-pro.bitmart.com/en/spot/#query-order-by-id-v4-signed
         :see: https://developer-pro.bitmart.com/en/spot/#query-order-by-clientorderid-v4-signed
         :see: https://developer-pro.bitmart.com/en/futures/#get-order-detail-keyed
+        :see: https://developer-pro.bitmart.com/en/futuresv2/#get-order-detail-keyed
         :param str id: the id of the order
         :param str symbol: unified symbol of the market the order was made in
         :param dict [params]: extra parameters specific to the exchange API endpoint
@@ -3694,6 +3747,7 @@ class bitmart(Exchange, ImplicitAPI):
         transfer currency internally between wallets on the same account, currently only supports transfer between spot and margin
         :see: https://developer-pro.bitmart.com/en/spot/#margin-asset-transfer-signed
         :see: https://developer-pro.bitmart.com/en/futures/#transfer-signed
+        :see: https://developer-pro.bitmart.com/en/futuresv2/#transfer-signed
         :param str code: unified currency code
         :param float amount: amount to transfer
         :param str fromAccount: account to transfer from
@@ -3955,7 +4009,7 @@ class bitmart(Exchange, ImplicitAPI):
     async def fetch_open_interest(self, symbol: str, params={}):
         """
         Retrieves the open interest of a currency
-        :see: https://developer-pro.bitmart.com/en/futures/#get-futures-openinterest
+        :see: https://developer-pro.bitmart.com/en/futuresv2/#get-futures-openinterest
         :param str symbol: Unified CCXT market symbol
         :param dict [params]: exchange specific parameters
         :returns dict} an open interest structure{@link https://docs.ccxt.com/#/?id=open-interest-structure:
@@ -4008,6 +4062,7 @@ class bitmart(Exchange, ImplicitAPI):
         """
         set the level of leverage for a market
         :see: https://developer-pro.bitmart.com/en/futures/#submit-leverage-signed
+        :see: https://developer-pro.bitmart.com/en/futuresv2/#submit-leverage-signed
         :param float leverage: the rate of leverage
         :param str symbol: unified market symbol
         :param dict [params]: extra parameters specific to the exchange API endpoint
@@ -4033,7 +4088,7 @@ class bitmart(Exchange, ImplicitAPI):
     async def fetch_funding_rate(self, symbol: str, params={}):
         """
         fetch the current funding rate
-        :see: https://developer-pro.bitmart.com/en/futures/#get-current-funding-rate
+        :see: https://developer-pro.bitmart.com/en/futuresv2/#get-current-funding-rate
         :param str symbol: unified market symbol
         :param dict [params]: extra parameters specific to the exchange API endpoint
         :returns dict: a `funding rate structure <https://docs.ccxt.com/#/?id=funding-rate-structure>`
@@ -4097,6 +4152,7 @@ class bitmart(Exchange, ImplicitAPI):
         """
         fetch data on a single open contract trade position
         :see: https://developer-pro.bitmart.com/en/futures/#get-current-position-keyed
+        :see: https://developer-pro.bitmart.com/en/futuresv2/#get-current-position-risk-details-keyed
         :param str symbol: unified market symbol of the market the position is held in
         :param dict [params]: extra parameters specific to the exchange API endpoint
         :returns dict: a `position structure <https://docs.ccxt.com/#/?id=position-structure>`
@@ -4144,6 +4200,7 @@ class bitmart(Exchange, ImplicitAPI):
         """
         fetch all open contract positions
         :see: https://developer-pro.bitmart.com/en/futures/#get-current-position-keyed
+        :see: https://developer-pro.bitmart.com/en/futuresv2/#get-current-position-risk-details-keyed
         :param str[]|None symbols: list of unified market symbols
         :param dict [params]: extra parameters specific to the exchange API endpoint
         :returns dict[]: a list of `position structures <https://docs.ccxt.com/#/?id=position-structure>`
@@ -4360,7 +4417,11 @@ class bitmart(Exchange, ImplicitAPI):
         return self.milliseconds()
 
     def sign(self, path, api='public', method='GET', params={}, headers=None, body=None):
-        baseUrl = self.implode_hostname(self.urls['api']['rest'])
+        parts = path.split('/')
+        # to do: refactor api endpoints with spot/swap sections
+        category = self.safe_string(parts, 0, 'spot')
+        market = 'spot' if (category == 'spot' or category == 'account') else 'swap'
+        baseUrl = self.implode_hostname(self.urls['api'][market])
         url = baseUrl + '/' + self.implode_params(path, params)
         query = self.omit(params, self.extract_params(path))
         queryString = ''

{ccxt-4.3.74 → ccxt-4.3.76}/ccxt/async_support/bybit.py

@@ -255,6 +255,7 @@ class bybit(Exchange, ImplicitAPI):
                 },
                 'private': {
                     'get': {
+                        'v5/market/instruments-info': 5,
                         # Legacy inverse swap
                         'v2/private/wallet/fund/records': 25,  # 120 per minute = 2 per second => cost = 50 / 2 = 25
                         # spot
@@ -1000,6 +1001,7 @@ class bybit(Exchange, ImplicitAPI):
             },
             'precisionMode': TICK_SIZE,
             'options': {
+                'usePrivateInstrumentsInfo': False,
                 'sandboxMode': False,
                 'enableDemoTrading': False,
                 'fetchMarkets': ['spot', 'linear', 'inverse', 'option'],
@@ -1458,7 +1460,12 @@ class bybit(Exchange, ImplicitAPI):
         request: dict = {
             'category': 'spot',
         }
-        response = await self.publicGetV5MarketInstrumentsInfo(self.extend(request, params))
+        usePrivateInstrumentsInfo = self.safe_bool(self.options, 'usePrivateInstrumentsInfo', False)
+        response: dict = None
+        if usePrivateInstrumentsInfo:
+            response = await self.privateGetV5MarketInstrumentsInfo(self.extend(request, params))
+        else:
+            response = await self.publicGetV5MarketInstrumentsInfo(self.extend(request, params))
         #
         #     {
         #         "retCode": 0,
@@ -1567,14 +1574,23 @@ class bybit(Exchange, ImplicitAPI):
     async def fetch_future_markets(self, params):
         params = self.extend(params)
         params['limit'] = 1000  # minimize number of requests
-        response = await self.publicGetV5MarketInstrumentsInfo(params)
+        usePrivateInstrumentsInfo = self.safe_bool(self.options, 'usePrivateInstrumentsInfo', False)
+        response: dict = None
+        if usePrivateInstrumentsInfo:
+            response = await self.privateGetV5MarketInstrumentsInfo(params)
+        else:
+            response = await self.publicGetV5MarketInstrumentsInfo(params)
         data = self.safe_dict(response, 'result', {})
         markets = self.safe_list(data, 'list', [])
         paginationCursor = self.safe_string(data, 'nextPageCursor')
         if paginationCursor is not None:
             while(paginationCursor is not None):
                 params['cursor'] = paginationCursor
-                responseInner = await self.publicGetV5MarketInstrumentsInfo(params)
+                responseInner: dict = None
+                if usePrivateInstrumentsInfo:
+                    responseInner = await self.privateGetV5MarketInstrumentsInfo(params)
+                else:
+                    responseInner = await self.publicGetV5MarketInstrumentsInfo(params)
                 dataNew = self.safe_dict(responseInner, 'result', {})
                 rawMarkets = self.safe_list(dataNew, 'list', [])
                 rawMarketsLength = len(rawMarkets)
@@ -1731,7 +1747,12 @@ class bybit(Exchange, ImplicitAPI):
         request: dict = {
             'category': 'option',
         }
-        response = await self.publicGetV5MarketInstrumentsInfo(self.extend(request, params))
+        usePrivateInstrumentsInfo = self.safe_bool(self.options, 'usePrivateInstrumentsInfo', False)
+        response: dict = None
+        if usePrivateInstrumentsInfo:
+            response = await self.privateGetV5MarketInstrumentsInfo(self.extend(request, params))
+        else:
+            response = await self.publicGetV5MarketInstrumentsInfo(self.extend(request, params))
         data = self.safe_dict(response, 'result', {})
         markets = self.safe_list(data, 'list', [])
         if self.options['loadAllOptions']:
@@ -1740,7 +1761,11 @@ class bybit(Exchange, ImplicitAPI):
             if paginationCursor is not None:
                 while(paginationCursor is not None):
                     request['cursor'] = paginationCursor
-                    responseInner = await self.publicGetV5MarketInstrumentsInfo(self.extend(request, params))
+                    responseInner: dict = None
+                    if usePrivateInstrumentsInfo:
+                        responseInner = await self.privateGetV5MarketInstrumentsInfo(self.extend(request, params))
+                    else:
+                        responseInner = await self.publicGetV5MarketInstrumentsInfo(self.extend(request, params))
                     dataNew = self.safe_dict(responseInner, 'result', {})
                     rawMarkets = self.safe_list(dataNew, 'list', [])
                     rawMarketsLength = len(rawMarkets)