ccxt 4.1.68__tar.gz → 4.1.70__tar.gz

{ccxt-4.1.68/ccxt.egg-info → ccxt-4.1.70}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: ccxt
-Version: 4.1.68
+Version: 4.1.70
 Summary: A JavaScript / TypeScript / Python / C# / PHP cryptocurrency trading library with support for 130+ exchanges
 Home-page: https://ccxt.com
 Author: Igor Kroitor
@@ -224,13 +224,13 @@ Description: # CCXT – CryptoCurrency eXchange Trading Library
         
         All-in-one browser bundle (dependencies included), served from a CDN of your choice:
         
-        * jsDelivr: https://cdn.jsdelivr.net/npm/ccxt@4.1.68/dist/ccxt.browser.js
-        * unpkg: https://unpkg.com/ccxt@4.1.68/dist/ccxt.browser.js
+        * jsDelivr: https://cdn.jsdelivr.net/npm/ccxt@4.1.70/dist/ccxt.browser.js
+        * unpkg: https://unpkg.com/ccxt@4.1.70/dist/ccxt.browser.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.1.68/dist/ccxt.browser.js"></script>
+        <script type="text/javascript" src="https://cdn.jsdelivr.net/npm/ccxt@4.1.70/dist/ccxt.browser.js"></script>
         ```
         
         Creates a global `ccxt` object:

{ccxt-4.1.68 → ccxt-4.1.70}/ccxt/__init__.py

@@ -22,7 +22,7 @@
 
 # ----------------------------------------------------------------------------
 
-__version__ = '4.1.68'
+__version__ = '4.1.70'
 
 # ----------------------------------------------------------------------------
 

{ccxt-4.1.68 → ccxt-4.1.70}/ccxt/abstract/phemex.py

@@ -14,6 +14,7 @@ class ImplicitAPI:
     public_get_md_trade = publicGetMdTrade = Entry('md/trade', 'public', 'GET', {'cost': 5})
     public_get_md_spot_ticker_24hr = publicGetMdSpotTicker24hr = Entry('md/spot/ticker/24hr', 'public', 'GET', {'cost': 5})
     public_get_exchange_public_cfg_chain_settings = publicGetExchangePublicCfgChainSettings = Entry('exchange/public/cfg/chain-settings', 'public', 'GET', {'cost': 5})
+    v1_get_md_fullbook = v1GetMdFullbook = Entry('md/fullbook', 'v1', 'GET', {'cost': 5})
     v1_get_md_orderbook = v1GetMdOrderbook = Entry('md/orderbook', 'v1', 'GET', {'cost': 5})
     v1_get_md_trade = v1GetMdTrade = Entry('md/trade', 'v1', 'GET', {'cost': 5})
     v1_get_md_ticker_24hr = v1GetMdTicker24hr = Entry('md/ticker/24hr', 'v1', 'GET', {'cost': 5})
@@ -55,6 +56,11 @@ class ImplicitAPI:
     private_get_phemex_user_users_children = privateGetPhemexUserUsersChildren = Entry('phemex-user/users/children', 'private', 'GET', {'cost': 5})
     private_get_phemex_user_wallets_v2_depositaddress = privateGetPhemexUserWalletsV2DepositAddress = Entry('phemex-user/wallets/v2/depositAddress', 'private', 'GET', {'cost': 5})
     private_get_phemex_user_wallets_tradeaccountdetail = privateGetPhemexUserWalletsTradeAccountDetail = Entry('phemex-user/wallets/tradeAccountDetail', 'private', 'GET', {'cost': 5})
+    private_get_phemex_deposit_wallets_api_depositaddress = privateGetPhemexDepositWalletsApiDepositAddress = Entry('phemex-deposit/wallets/api/depositAddress', 'private', 'GET', {'cost': 5})
+    private_get_phemex_deposit_wallets_api_deposithist = privateGetPhemexDepositWalletsApiDepositHist = Entry('phemex-deposit/wallets/api/depositHist', 'private', 'GET', {'cost': 5})
+    private_get_phemex_deposit_wallets_api_chaincfg = privateGetPhemexDepositWalletsApiChainCfg = Entry('phemex-deposit/wallets/api/chainCfg', 'private', 'GET', {'cost': 5})
+    private_get_phemex_withdraw_wallets_api_withdrawhist = privateGetPhemexWithdrawWalletsApiWithdrawHist = Entry('phemex-withdraw/wallets/api/withdrawHist', 'private', 'GET', {'cost': 5})
+    private_get_phemex_withdraw_wallets_api_asset_info = privateGetPhemexWithdrawWalletsApiAssetInfo = Entry('phemex-withdraw/wallets/api/asset/info', 'private', 'GET', {'cost': 5})
     private_get_phemex_user_order_closedpositionlist = privateGetPhemexUserOrderClosedPositionList = Entry('phemex-user/order/closedPositionList', 'private', 'GET', {'cost': 5})
     private_get_exchange_margins_transfer = privateGetExchangeMarginsTransfer = Entry('exchange/margins/transfer', 'private', 'GET', {'cost': 5})
     private_get_exchange_wallets_confirm_withdraw = privateGetExchangeWalletsConfirmWithdraw = Entry('exchange/wallets/confirm/withdraw', 'private', 'GET', {'cost': 5})
@@ -87,6 +93,8 @@ class ImplicitAPI:
     private_post_assets_futures_sub_accounts_transfer = privatePostAssetsFuturesSubAccountsTransfer = Entry('assets/futures/sub-accounts/transfer', 'private', 'POST', {'cost': 5})
     private_post_assets_universal_transfer = privatePostAssetsUniversalTransfer = Entry('assets/universal-transfer', 'private', 'POST', {'cost': 5})
     private_post_assets_convert = privatePostAssetsConvert = Entry('assets/convert', 'private', 'POST', {'cost': 5})
+    private_post_phemex_withdraw_wallets_api_createwithdraw = privatePostPhemexWithdrawWalletsApiCreateWithdraw = Entry('phemex-withdraw/wallets/api/createWithdraw', 'private', 'POST', {'cost': 5})
+    private_post_phemex_withdraw_wallets_api_cancelwithdraw = privatePostPhemexWithdrawWalletsApiCancelWithdraw = Entry('phemex-withdraw/wallets/api/cancelWithdraw', 'private', 'POST', {'cost': 5})
     private_put_spot_orders_create = privatePutSpotOrdersCreate = Entry('spot/orders/create', 'private', 'PUT', {'cost': 1})
     private_put_spot_orders = privatePutSpotOrders = Entry('spot/orders', 'private', 'PUT', {'cost': 1})
     private_put_orders_replace = privatePutOrdersReplace = Entry('orders/replace', 'private', 'PUT', {'cost': 1})

{ccxt-4.1.68 → ccxt-4.1.70}/ccxt/ascendex.py

@@ -270,7 +270,7 @@ class ascendex(Exchange, ImplicitAPI):
                 'account-category': 'cash',  # 'cash', 'margin', 'futures'  # obsolete
                 'account-group': None,
                 'fetchClosedOrders': {
-                    'method': 'v2PrivateDataGetOrderHist',  # 'v1PrivateAccountGroupGetAccountCategoryOrderHistCurrent'
+                    'method': 'v2PrivateDataGetOrderHist',  # 'v1PrivateAccountCategoryGetOrderHistCurrent'
                 },
                 'defaultType': 'spot',  # 'spot', 'margin', 'swap'
                 'accountsByType': {
@@ -792,6 +792,9 @@ class ascendex(Exchange, ImplicitAPI):
     def fetch_balance(self, params={}) -> Balances:
         """
         query for balance and get the amount of funds available for trading or funds locked in orders
+        :see: https://ascendex.github.io/ascendex-pro-api/#cash-account-balance
+        :see: https://ascendex.github.io/ascendex-pro-api/#margin-account-balance
+        :see: https://ascendex.github.io/ascendex-futures-pro-api-v2/#position
         :param dict [params]: extra parameters specific to the exchange API endpoint
         :returns dict: a `balance structure <https://docs.ccxt.com/#/?id=balance-structure>`
         """
@@ -802,8 +805,7 @@ class ascendex(Exchange, ImplicitAPI):
         marketType, query = self.handle_market_type_and_params('fetchBalance', None, params)
         isMargin = self.safe_value(params, 'margin', False)
         marketType = 'margin' if isMargin else marketType
-        params = self.omit(params, 'margin')
-        options = self.safe_value(self.options, 'fetchBalance', {})
+        query = self.omit(query, 'margin')
         accountsByType = self.safe_value(self.options, 'accountsByType', {})
         accountCategory = self.safe_string(accountsByType, marketType, 'cash')
         account = self.safe_value(self.accounts, 0, {})
@@ -811,15 +813,15 @@ class ascendex(Exchange, ImplicitAPI):
         request = {
             'account-group': accountGroup,
         }
-        defaultMethod = self.safe_string(options, 'method', 'v1PrivateAccountCategoryGetBalance')
-        method = self.get_supported_mapping(marketType, {
-            'spot': defaultMethod,
-            'margin': defaultMethod,
-            'swap': 'v2PrivateAccountGroupGetFuturesPosition',
-        })
         if (accountCategory == 'cash') or (accountCategory == 'margin'):
             request['account-category'] = accountCategory
-        response = getattr(self, method)(self.extend(request, query))
+        response = None
+        if (marketType == 'spot') or (marketType == 'margin'):
+            response = self.v1PrivateAccountCategoryGetBalance(self.extend(request, query))
+        elif marketType == 'swap':
+            response = self.v2PrivateAccountGroupGetFuturesPosition(self.extend(request, query))
+        else:
+            raise NotSupported(self.id + ' fetchBalance() is not currently supported for ' + marketType + ' markets')
         #
         # cash
         #
@@ -1675,6 +1677,8 @@ class ascendex(Exchange, ImplicitAPI):
     def fetch_order(self, id: str, symbol: Str = None, params={}):
         """
         fetches information on an order made by the user
+        :see: https://ascendex.github.io/ascendex-pro-api/#query-order
+        :see: https://ascendex.github.io/ascendex-futures-pro-api-v2/#query-order-by-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
         :returns dict: An `order structure <https://docs.ccxt.com/#/?id=order-structure>`
@@ -1685,7 +1689,6 @@ class ascendex(Exchange, ImplicitAPI):
         if symbol is not None:
             market = self.market(symbol)
         type, query = self.handle_market_type_and_params('fetchOrder', market, params)
-        options = self.safe_value(self.options, 'fetchOrder', {})
         accountsByType = self.safe_value(self.options, 'accountsByType', {})
         accountCategory = self.safe_string(accountsByType, type, 'cash')
         account = self.safe_value(self.accounts, 0, {})
@@ -1695,18 +1698,14 @@ class ascendex(Exchange, ImplicitAPI):
             'account-category': accountCategory,
             'orderId': id,
         }
-        defaultMethod = self.safe_string(options, 'method', 'v1PrivateAccountCategoryGetOrderStatus')
-        method = self.get_supported_mapping(type, {
-            'spot': defaultMethod,
-            'margin': defaultMethod,
-            'swap': 'v2PrivateAccountGroupGetFuturesOrderStatus',
-        })
-        if method == 'v1PrivateAccountCategoryGetOrderStatus':
-            if accountCategory is not None:
-                request['category'] = accountCategory
-        else:
+        response = None
+        if (type == 'spot') or (type == 'margin'):
+            response = self.v1PrivateAccountCategoryGetOrderStatus(self.extend(request, query))
+        elif type == 'swap':
             request['account-category'] = accountCategory
-        response = getattr(self, method)(self.extend(request, query))
+            response = self.v2PrivateAccountGroupGetFuturesOrderStatus(self.extend(request, query))
+        else:
+            raise NotSupported(self.id + ' fetchOrder() is not currently supported for ' + type + ' markets')
         #
         # AccountCategoryGetOrderStatus
         #
@@ -1780,6 +1779,8 @@ class ascendex(Exchange, ImplicitAPI):
     def fetch_open_orders(self, symbol: Str = None, since: Int = None, limit: Int = None, params={}) -> List[Order]:
         """
         fetch all unfilled currently open orders
+        :see: https://ascendex.github.io/ascendex-pro-api/#list-open-orders
+        :see: https://ascendex.github.io/ascendex-futures-pro-api-v2/#list-open-orders
         :param str symbol: unified market symbol
         :param int [since]: the earliest time in ms to fetch open orders for
         :param int [limit]: the maximum number of  open orders structures to retrieve
@@ -1801,19 +1802,14 @@ class ascendex(Exchange, ImplicitAPI):
             'account-group': accountGroup,
             'account-category': accountCategory,
         }
-        options = self.safe_value(self.options, 'fetchOpenOrders', {})
-        defaultMethod = self.safe_string(options, 'method', 'v1PrivateAccountCategoryGetOrderOpen')
-        method = self.get_supported_mapping(type, {
-            'spot': defaultMethod,
-            'margin': defaultMethod,
-            'swap': 'v2PrivateAccountGroupGetFuturesOrderOpen',
-        })
-        if method == 'v1PrivateAccountCategoryGetOrderOpen':
-            if accountCategory is not None:
-                request['category'] = accountCategory
-        else:
+        response = None
+        if (type == 'spot') or (type == 'margin'):
+            response = self.v1PrivateAccountCategoryGetOrderOpen(self.extend(request, query))
+        elif type == 'swap':
             request['account-category'] = accountCategory
-        response = getattr(self, method)(self.extend(request, query))
+            response = self.v2PrivateAccountGroupGetFuturesOrderOpen(self.extend(request, query))
+        else:
+            raise NotSupported(self.id + ' fetchOpenOrders() is not currently supported for ' + type + ' markets')
         #
         # AccountCategoryGetOrderOpen
         #
@@ -1895,6 +1891,7 @@ class ascendex(Exchange, ImplicitAPI):
         """
         fetches information on multiple closed orders made by the user
         :see: https://ascendex.github.io/ascendex-pro-api/#list-history-orders-v2
+        :see: https://ascendex.github.io/ascendex-futures-pro-api-v2/#list-current-history-orders
         :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
         :param int [limit]: the maximum number of  orde structures to retrieve
@@ -1907,7 +1904,6 @@ class ascendex(Exchange, ImplicitAPI):
         account = self.safe_value(self.accounts, 0, {})
         accountGroup = self.safe_value(account, 'id')
         request = {
-            'account-group': accountGroup,
             # 'category': accountCategory,
             # 'symbol': market['id'],
             # 'orderType': 'market',  # optional, string
@@ -1930,22 +1926,33 @@ class ascendex(Exchange, ImplicitAPI):
             'margin': defaultMethod,
             'swap': 'v2PrivateAccountGroupGetFuturesOrderHistCurrent',
         })
+        if since is not None:
+            request['startTime'] = since
+        until = self.safe_string(params, 'until')
+        if until is not None:
+            request['endTime'] = until
         accountsByType = self.safe_value(self.options, 'accountsByType', {})
         accountCategory = self.safe_string(accountsByType, type, 'cash')  # margin, futures
-        if method == 'v2PrivateDataGetOrderHist':
+        response = None
+        if method == 'v1PrivateAccountCategoryGetOrderHistCurrent':
+            request['account-group'] = accountGroup
+            request['account-category'] = accountCategory
+            if limit is not None:
+                request['limit'] = limit
+            response = self.v1PrivateAccountCategoryGetOrderHistCurrent(self.extend(request, query))
+        elif method == 'v2PrivateDataGetOrderHist':
             request['account'] = accountCategory
             if limit is not None:
                 request['limit'] = limit
-        else:
+            response = self.v2PrivateDataGetOrderHist(self.extend(request, query))
+        elif method == 'v2PrivateAccountGroupGetFuturesOrderHistCurrent':
+            request['account-group'] = accountGroup
             request['account-category'] = accountCategory
             if limit is not None:
                 request['pageSize'] = limit
-        if since is not None:
-            request['startTime'] = since
-        until = self.safe_string(params, 'until')
-        if until is not None:
-            request['endTime'] = until
-        response = getattr(self, method)(self.extend(request, query))
+            response = self.v2PrivateAccountGroupGetFuturesOrderHistCurrent(self.extend(request, query))
+        else:
+            raise NotSupported(self.id + ' fetchClosedOrders() is not currently supported for ' + type + ' markets')
         #
         # accountCategoryGetOrderHistCurrent
         #
@@ -2046,6 +2053,8 @@ class ascendex(Exchange, ImplicitAPI):
     def cancel_order(self, id: str, symbol: Str = None, params={}):
         """
         cancels an open order
+        :see: https://ascendex.github.io/ascendex-pro-api/#cancel-order
+        :see: https://ascendex.github.io/ascendex-futures-pro-api-v2/#cancel-order
         :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
@@ -2057,7 +2066,6 @@ class ascendex(Exchange, ImplicitAPI):
         self.load_accounts()
         market = self.market(symbol)
         type, query = self.handle_market_type_and_params('cancelOrder', market, params)
-        options = self.safe_value(self.options, 'cancelOrder', {})
         accountsByType = self.safe_value(self.options, 'accountsByType', {})
         accountCategory = self.safe_string(accountsByType, type, 'cash')
         account = self.safe_value(self.accounts, 0, {})
@@ -2069,24 +2077,20 @@ class ascendex(Exchange, ImplicitAPI):
             'time': self.milliseconds(),
             'id': 'foobar',
         }
-        defaultMethod = self.safe_string(options, 'method', 'v1PrivateAccountCategoryDeleteOrder')
-        method = self.get_supported_mapping(type, {
-            'spot': defaultMethod,
-            'margin': defaultMethod,
-            'swap': 'v2PrivateAccountGroupDeleteFuturesOrder',
-        })
-        if method == 'v1PrivateAccountCategoryDeleteOrder':
-            if accountCategory is not None:
-                request['category'] = accountCategory
-        else:
-            request['account-category'] = accountCategory
         clientOrderId = self.safe_string_2(params, 'clientOrderId', 'id')
         if clientOrderId is None:
             request['orderId'] = id
         else:
             request['id'] = clientOrderId
             params = self.omit(params, ['clientOrderId', 'id'])
-        response = getattr(self, method)(self.extend(request, query))
+        response = None
+        if (type == 'spot') or (type == 'margin'):
+            response = self.v1PrivateAccountCategoryDeleteOrder(self.extend(request, query))
+        elif type == 'swap':
+            request['account-category'] = accountCategory
+            response = self.v2PrivateAccountGroupDeleteFuturesOrder(self.extend(request, query))
+        else:
+            raise NotSupported(self.id + ' cancelOrder() is not currently supported for ' + type + ' markets')
         #
         # AccountCategoryDeleteOrder
         #
@@ -2157,6 +2161,8 @@ class ascendex(Exchange, ImplicitAPI):
     def cancel_all_orders(self, symbol: Str = None, params={}):
         """
         cancel all open orders
+        :see: https://ascendex.github.io/ascendex-pro-api/#cancel-all-orders
+        :see: https://ascendex.github.io/ascendex-futures-pro-api-v2/#cancel-all-open-orders
         :param str symbol: unified market symbol, only orders in the market of self symbol are cancelled when symbol is not None
         :param dict [params]: extra parameters specific to the exchange API endpoint
         :returns dict[]: a list of `order structures <https://docs.ccxt.com/#/?id=order-structure>`
@@ -2167,7 +2173,6 @@ class ascendex(Exchange, ImplicitAPI):
         if symbol is not None:
             market = self.market(symbol)
         type, query = self.handle_market_type_and_params('cancelAllOrders', market, params)
-        options = self.safe_value(self.options, 'cancelAllOrders', {})
         accountsByType = self.safe_value(self.options, 'accountsByType', {})
         accountCategory = self.safe_string(accountsByType, type, 'cash')
         account = self.safe_value(self.accounts, 0, {})
@@ -2179,18 +2184,14 @@ class ascendex(Exchange, ImplicitAPI):
         }
         if symbol is not None:
             request['symbol'] = market['id']
-        defaultMethod = self.safe_string(options, 'method', 'v1PrivateAccountCategoryDeleteOrderAll')
-        method = self.get_supported_mapping(type, {
-            'spot': defaultMethod,
-            'margin': defaultMethod,
-            'swap': 'v2PrivateAccountGroupDeleteFuturesOrderAll',
-        })
-        if method == 'v1PrivateAccountCategoryDeleteOrderAll':
-            if accountCategory is not None:
-                request['category'] = accountCategory
-        else:
+        response = None
+        if (type == 'spot') or (type == 'margin'):
+            response = self.v1PrivateAccountCategoryDeleteOrderAll(self.extend(request, query))
+        elif type == 'swap':
             request['account-category'] = accountCategory
-        response = getattr(self, method)(self.extend(request, query))
+            response = self.v2PrivateAccountGroupDeleteFuturesOrderAll(self.extend(request, query))
+        else:
+            raise NotSupported(self.id + ' cancelAllOrders() is not currently supported for ' + type + ' markets')
         #
         # AccountCategoryDeleteOrderAll
         #

{ccxt-4.1.68 → ccxt-4.1.70}/ccxt/async_support/__init__.py

@@ -4,7 +4,7 @@
 
 # -----------------------------------------------------------------------------
 
-__version__ = '4.1.68'
+__version__ = '4.1.70'
 
 # -----------------------------------------------------------------------------
 

{ccxt-4.1.68 → ccxt-4.1.70}/ccxt/async_support/ascendex.py

@@ -270,7 +270,7 @@ class ascendex(Exchange, ImplicitAPI):
                 'account-category': 'cash',  # 'cash', 'margin', 'futures'  # obsolete
                 'account-group': None,
                 'fetchClosedOrders': {
-                    'method': 'v2PrivateDataGetOrderHist',  # 'v1PrivateAccountGroupGetAccountCategoryOrderHistCurrent'
+                    'method': 'v2PrivateDataGetOrderHist',  # 'v1PrivateAccountCategoryGetOrderHistCurrent'
                 },
                 'defaultType': 'spot',  # 'spot', 'margin', 'swap'
                 'accountsByType': {
@@ -792,6 +792,9 @@ class ascendex(Exchange, ImplicitAPI):
     async def fetch_balance(self, params={}) -> Balances:
         """
         query for balance and get the amount of funds available for trading or funds locked in orders
+        :see: https://ascendex.github.io/ascendex-pro-api/#cash-account-balance
+        :see: https://ascendex.github.io/ascendex-pro-api/#margin-account-balance
+        :see: https://ascendex.github.io/ascendex-futures-pro-api-v2/#position
         :param dict [params]: extra parameters specific to the exchange API endpoint
         :returns dict: a `balance structure <https://docs.ccxt.com/#/?id=balance-structure>`
         """
@@ -802,8 +805,7 @@ class ascendex(Exchange, ImplicitAPI):
         marketType, query = self.handle_market_type_and_params('fetchBalance', None, params)
         isMargin = self.safe_value(params, 'margin', False)
         marketType = 'margin' if isMargin else marketType
-        params = self.omit(params, 'margin')
-        options = self.safe_value(self.options, 'fetchBalance', {})
+        query = self.omit(query, 'margin')
         accountsByType = self.safe_value(self.options, 'accountsByType', {})
         accountCategory = self.safe_string(accountsByType, marketType, 'cash')
         account = self.safe_value(self.accounts, 0, {})
@@ -811,15 +813,15 @@ class ascendex(Exchange, ImplicitAPI):
         request = {
             'account-group': accountGroup,
         }
-        defaultMethod = self.safe_string(options, 'method', 'v1PrivateAccountCategoryGetBalance')
-        method = self.get_supported_mapping(marketType, {
-            'spot': defaultMethod,
-            'margin': defaultMethod,
-            'swap': 'v2PrivateAccountGroupGetFuturesPosition',
-        })
         if (accountCategory == 'cash') or (accountCategory == 'margin'):
             request['account-category'] = accountCategory
-        response = await getattr(self, method)(self.extend(request, query))
+        response = None
+        if (marketType == 'spot') or (marketType == 'margin'):
+            response = await self.v1PrivateAccountCategoryGetBalance(self.extend(request, query))
+        elif marketType == 'swap':
+            response = await self.v2PrivateAccountGroupGetFuturesPosition(self.extend(request, query))
+        else:
+            raise NotSupported(self.id + ' fetchBalance() is not currently supported for ' + marketType + ' markets')
         #
         # cash
         #
@@ -1675,6 +1677,8 @@ class ascendex(Exchange, ImplicitAPI):
     async def fetch_order(self, id: str, symbol: Str = None, params={}):
         """
         fetches information on an order made by the user
+        :see: https://ascendex.github.io/ascendex-pro-api/#query-order
+        :see: https://ascendex.github.io/ascendex-futures-pro-api-v2/#query-order-by-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
         :returns dict: An `order structure <https://docs.ccxt.com/#/?id=order-structure>`
@@ -1685,7 +1689,6 @@ class ascendex(Exchange, ImplicitAPI):
         if symbol is not None:
             market = self.market(symbol)
         type, query = self.handle_market_type_and_params('fetchOrder', market, params)
-        options = self.safe_value(self.options, 'fetchOrder', {})
         accountsByType = self.safe_value(self.options, 'accountsByType', {})
         accountCategory = self.safe_string(accountsByType, type, 'cash')
         account = self.safe_value(self.accounts, 0, {})
@@ -1695,18 +1698,14 @@ class ascendex(Exchange, ImplicitAPI):
             'account-category': accountCategory,
             'orderId': id,
         }
-        defaultMethod = self.safe_string(options, 'method', 'v1PrivateAccountCategoryGetOrderStatus')
-        method = self.get_supported_mapping(type, {
-            'spot': defaultMethod,
-            'margin': defaultMethod,
-            'swap': 'v2PrivateAccountGroupGetFuturesOrderStatus',
-        })
-        if method == 'v1PrivateAccountCategoryGetOrderStatus':
-            if accountCategory is not None:
-                request['category'] = accountCategory
-        else:
+        response = None
+        if (type == 'spot') or (type == 'margin'):
+            response = await self.v1PrivateAccountCategoryGetOrderStatus(self.extend(request, query))
+        elif type == 'swap':
             request['account-category'] = accountCategory
-        response = await getattr(self, method)(self.extend(request, query))
+            response = await self.v2PrivateAccountGroupGetFuturesOrderStatus(self.extend(request, query))
+        else:
+            raise NotSupported(self.id + ' fetchOrder() is not currently supported for ' + type + ' markets')
         #
         # AccountCategoryGetOrderStatus
         #
@@ -1780,6 +1779,8 @@ class ascendex(Exchange, ImplicitAPI):
     async def fetch_open_orders(self, symbol: Str = None, since: Int = None, limit: Int = None, params={}) -> List[Order]:
         """
         fetch all unfilled currently open orders
+        :see: https://ascendex.github.io/ascendex-pro-api/#list-open-orders
+        :see: https://ascendex.github.io/ascendex-futures-pro-api-v2/#list-open-orders
         :param str symbol: unified market symbol
         :param int [since]: the earliest time in ms to fetch open orders for
         :param int [limit]: the maximum number of  open orders structures to retrieve
@@ -1801,19 +1802,14 @@ class ascendex(Exchange, ImplicitAPI):
             'account-group': accountGroup,
             'account-category': accountCategory,
         }
-        options = self.safe_value(self.options, 'fetchOpenOrders', {})
-        defaultMethod = self.safe_string(options, 'method', 'v1PrivateAccountCategoryGetOrderOpen')
-        method = self.get_supported_mapping(type, {
-            'spot': defaultMethod,
-            'margin': defaultMethod,
-            'swap': 'v2PrivateAccountGroupGetFuturesOrderOpen',
-        })
-        if method == 'v1PrivateAccountCategoryGetOrderOpen':
-            if accountCategory is not None:
-                request['category'] = accountCategory
-        else:
+        response = None
+        if (type == 'spot') or (type == 'margin'):
+            response = await self.v1PrivateAccountCategoryGetOrderOpen(self.extend(request, query))
+        elif type == 'swap':
             request['account-category'] = accountCategory
-        response = await getattr(self, method)(self.extend(request, query))
+            response = await self.v2PrivateAccountGroupGetFuturesOrderOpen(self.extend(request, query))
+        else:
+            raise NotSupported(self.id + ' fetchOpenOrders() is not currently supported for ' + type + ' markets')
         #
         # AccountCategoryGetOrderOpen
         #
@@ -1895,6 +1891,7 @@ class ascendex(Exchange, ImplicitAPI):
         """
         fetches information on multiple closed orders made by the user
         :see: https://ascendex.github.io/ascendex-pro-api/#list-history-orders-v2
+        :see: https://ascendex.github.io/ascendex-futures-pro-api-v2/#list-current-history-orders
         :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
         :param int [limit]: the maximum number of  orde structures to retrieve
@@ -1907,7 +1904,6 @@ class ascendex(Exchange, ImplicitAPI):
         account = self.safe_value(self.accounts, 0, {})
         accountGroup = self.safe_value(account, 'id')
         request = {
-            'account-group': accountGroup,
             # 'category': accountCategory,
             # 'symbol': market['id'],
             # 'orderType': 'market',  # optional, string
@@ -1930,22 +1926,33 @@ class ascendex(Exchange, ImplicitAPI):
             'margin': defaultMethod,
             'swap': 'v2PrivateAccountGroupGetFuturesOrderHistCurrent',
         })
+        if since is not None:
+            request['startTime'] = since
+        until = self.safe_string(params, 'until')
+        if until is not None:
+            request['endTime'] = until
         accountsByType = self.safe_value(self.options, 'accountsByType', {})
         accountCategory = self.safe_string(accountsByType, type, 'cash')  # margin, futures
-        if method == 'v2PrivateDataGetOrderHist':
+        response = None
+        if method == 'v1PrivateAccountCategoryGetOrderHistCurrent':
+            request['account-group'] = accountGroup
+            request['account-category'] = accountCategory
+            if limit is not None:
+                request['limit'] = limit
+            response = await self.v1PrivateAccountCategoryGetOrderHistCurrent(self.extend(request, query))
+        elif method == 'v2PrivateDataGetOrderHist':
             request['account'] = accountCategory
             if limit is not None:
                 request['limit'] = limit
-        else:
+            response = await self.v2PrivateDataGetOrderHist(self.extend(request, query))
+        elif method == 'v2PrivateAccountGroupGetFuturesOrderHistCurrent':
+            request['account-group'] = accountGroup
             request['account-category'] = accountCategory
             if limit is not None:
                 request['pageSize'] = limit
-        if since is not None:
-            request['startTime'] = since
-        until = self.safe_string(params, 'until')
-        if until is not None:
-            request['endTime'] = until
-        response = await getattr(self, method)(self.extend(request, query))
+            response = await self.v2PrivateAccountGroupGetFuturesOrderHistCurrent(self.extend(request, query))
+        else:
+            raise NotSupported(self.id + ' fetchClosedOrders() is not currently supported for ' + type + ' markets')
         #
         # accountCategoryGetOrderHistCurrent
         #
@@ -2046,6 +2053,8 @@ class ascendex(Exchange, ImplicitAPI):
     async def cancel_order(self, id: str, symbol: Str = None, params={}):
         """
         cancels an open order
+        :see: https://ascendex.github.io/ascendex-pro-api/#cancel-order
+        :see: https://ascendex.github.io/ascendex-futures-pro-api-v2/#cancel-order
         :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
@@ -2057,7 +2066,6 @@ class ascendex(Exchange, ImplicitAPI):
         await self.load_accounts()
         market = self.market(symbol)
         type, query = self.handle_market_type_and_params('cancelOrder', market, params)
-        options = self.safe_value(self.options, 'cancelOrder', {})
         accountsByType = self.safe_value(self.options, 'accountsByType', {})
         accountCategory = self.safe_string(accountsByType, type, 'cash')
         account = self.safe_value(self.accounts, 0, {})
@@ -2069,24 +2077,20 @@ class ascendex(Exchange, ImplicitAPI):
             'time': self.milliseconds(),
             'id': 'foobar',
         }
-        defaultMethod = self.safe_string(options, 'method', 'v1PrivateAccountCategoryDeleteOrder')
-        method = self.get_supported_mapping(type, {
-            'spot': defaultMethod,
-            'margin': defaultMethod,
-            'swap': 'v2PrivateAccountGroupDeleteFuturesOrder',
-        })
-        if method == 'v1PrivateAccountCategoryDeleteOrder':
-            if accountCategory is not None:
-                request['category'] = accountCategory
-        else:
-            request['account-category'] = accountCategory
         clientOrderId = self.safe_string_2(params, 'clientOrderId', 'id')
         if clientOrderId is None:
             request['orderId'] = id
         else:
             request['id'] = clientOrderId
             params = self.omit(params, ['clientOrderId', 'id'])
-        response = await getattr(self, method)(self.extend(request, query))
+        response = None
+        if (type == 'spot') or (type == 'margin'):
+            response = await self.v1PrivateAccountCategoryDeleteOrder(self.extend(request, query))
+        elif type == 'swap':
+            request['account-category'] = accountCategory
+            response = await self.v2PrivateAccountGroupDeleteFuturesOrder(self.extend(request, query))
+        else:
+            raise NotSupported(self.id + ' cancelOrder() is not currently supported for ' + type + ' markets')
         #
         # AccountCategoryDeleteOrder
         #
@@ -2157,6 +2161,8 @@ class ascendex(Exchange, ImplicitAPI):
     async def cancel_all_orders(self, symbol: Str = None, params={}):
         """
         cancel all open orders
+        :see: https://ascendex.github.io/ascendex-pro-api/#cancel-all-orders
+        :see: https://ascendex.github.io/ascendex-futures-pro-api-v2/#cancel-all-open-orders
         :param str symbol: unified market symbol, only orders in the market of self symbol are cancelled when symbol is not None
         :param dict [params]: extra parameters specific to the exchange API endpoint
         :returns dict[]: a list of `order structures <https://docs.ccxt.com/#/?id=order-structure>`
@@ -2167,7 +2173,6 @@ class ascendex(Exchange, ImplicitAPI):
         if symbol is not None:
             market = self.market(symbol)
         type, query = self.handle_market_type_and_params('cancelAllOrders', market, params)
-        options = self.safe_value(self.options, 'cancelAllOrders', {})
         accountsByType = self.safe_value(self.options, 'accountsByType', {})
         accountCategory = self.safe_string(accountsByType, type, 'cash')
         account = self.safe_value(self.accounts, 0, {})
@@ -2179,18 +2184,14 @@ class ascendex(Exchange, ImplicitAPI):
         }
         if symbol is not None:
             request['symbol'] = market['id']
-        defaultMethod = self.safe_string(options, 'method', 'v1PrivateAccountCategoryDeleteOrderAll')
-        method = self.get_supported_mapping(type, {
-            'spot': defaultMethod,
-            'margin': defaultMethod,
-            'swap': 'v2PrivateAccountGroupDeleteFuturesOrderAll',
-        })
-        if method == 'v1PrivateAccountCategoryDeleteOrderAll':
-            if accountCategory is not None:
-                request['category'] = accountCategory
-        else:
+        response = None
+        if (type == 'spot') or (type == 'margin'):
+            response = await self.v1PrivateAccountCategoryDeleteOrderAll(self.extend(request, query))
+        elif type == 'swap':
             request['account-category'] = accountCategory
-        response = await getattr(self, method)(self.extend(request, query))
+            response = await self.v2PrivateAccountGroupDeleteFuturesOrderAll(self.extend(request, query))
+        else:
+            raise NotSupported(self.id + ' cancelAllOrders() is not currently supported for ' + type + ' markets')
         #
         # AccountCategoryDeleteOrderAll
         #

{ccxt-4.1.68 → ccxt-4.1.70}/ccxt/async_support/base/exchange.py

@@ -2,7 +2,7 @@
 
 # -----------------------------------------------------------------------------
 
-__version__ = '4.1.68'
+__version__ = '4.1.70'
 
 # -----------------------------------------------------------------------------