ccxt 4.3.52__py2.py3-none-any.whl → 4.3.53__py2.py3-none-any.whl

ccxt/base/exchange.py

@@ -4,7 +4,7 @@
 
 # -----------------------------------------------------------------------------
 
-__version__ = '4.3.52'
+__version__ = '4.3.53'
 
 # -----------------------------------------------------------------------------
 
@@ -2255,7 +2255,7 @@ class Exchange(object):
     def parse_borrow_interest(self, info: dict, market: Market = None):
         raise NotSupported(self.id + ' parseBorrowInterest() is not supported yet')
 
-    def parse_isolated_borrow_rate(self, info, market: Market = None):
+    def parse_isolated_borrow_rate(self, info: dict, market: Market = None):
         raise NotSupported(self.id + ' parseIsolatedBorrowRate() is not supported yet')
 
     def parse_ws_trade(self, trade, market: Market = None):

ccxt/base/precise.py

@@ -126,6 +126,10 @@ class Precise:
         result = numerator % denominator
         return Precise(result, rationizerDenominator + other.decimals)
 
+    def orn(self, other):
+        integer_result = self.integer | other.integer
+        return Precise(integer_result, self.decimals)
+
     def min(self, other):
         return self if self.lt(other) else other
 
@@ -238,6 +242,12 @@ class Precise:
             return None
         return str(Precise(string1).mod(Precise(string2)))
 
+    @staticmethod
+    def string_or(string1, string2):
+        if string1 is None or string2 is None:
+            return None
+        return str(Precise(string1).orn(Precise(string2)))
+
     @staticmethod
     def string_equals(string1, string2):
         if string1 is None or string2 is None:

ccxt/binance.py

@@ -10681,7 +10681,7 @@ class binance(Exchange, ImplicitAPI):
             'info': info,
         }
 
-    def parse_isolated_borrow_rate(self, info, market: Market = None):
+    def parse_isolated_borrow_rate(self, info: dict, market: Market = None) -> IsolatedBorrowRate:
         #
         #    {
         #        "vipLevel": 0,

ccxt/bitget.py

@@ -7450,7 +7450,7 @@ class bitget(Exchange, ImplicitAPI):
         first['timestamp'] = timestamp
         return self.parse_isolated_borrow_rate(first, market)
 
-    def parse_isolated_borrow_rate(self, info, market: Market = None) -> IsolatedBorrowRate:
+    def parse_isolated_borrow_rate(self, info: dict, market: Market = None) -> IsolatedBorrowRate:
         #
         #     {
         #         "symbol": "BTCUSDT",

ccxt/bitmart.py

@@ -3601,7 +3601,7 @@ class bitmart(Exchange, ImplicitAPI):
         borrowRate = self.safe_value(symbols, 0)
         return self.parse_isolated_borrow_rate(borrowRate, market)
 
-    def parse_isolated_borrow_rate(self, info, market: Market = None) -> IsolatedBorrowRate:
+    def parse_isolated_borrow_rate(self, info: dict, market: Market = None) -> IsolatedBorrowRate:
         #
         #     {
         #         "symbol": "BTC_USDT",

ccxt/coinex.py

@@ -4837,7 +4837,7 @@ class coinex(Exchange, ImplicitAPI):
         data = self.safe_list(response, 'data', [])
         return self.parse_transactions(data, currency, since, limit)
 
-    def parse_isolated_borrow_rate(self, info, market: Market = None) -> IsolatedBorrowRate:
+    def parse_isolated_borrow_rate(self, info: dict, market: Market = None) -> IsolatedBorrowRate:
         #
         #     {
         #         "market": "BTCUSDT",

ccxt/htx.py

@@ -6180,7 +6180,7 @@ class htx(Exchange, ImplicitAPI):
         data = self.safe_value(response, 'data', [])
         return self.parse_isolated_borrow_rates(data)
 
-    def parse_isolated_borrow_rate(self, info, market: Market = None) -> IsolatedBorrowRate:
+    def parse_isolated_borrow_rate(self, info: dict, market: Market = None) -> IsolatedBorrowRate:
         #
         #     {
         #         "symbol": "1inchusdt",

ccxt/hyperliquid.py

@@ -444,23 +444,26 @@ class hyperliquid(Exchange, ImplicitAPI):
         for i in range(0, len(meta)):
             market = self.safe_dict(meta, i, {})
             marketName = self.safe_string(market, 'name')
-            if marketName.find('/') < 0:
-                # there are some weird spot markets in testnet, eg @2
-                continue
-            marketParts = marketName.split('/')
-            baseName = self.safe_string(marketParts, 0)
-            quoteId = self.safe_string(marketParts, 1)
-            base = self.safe_currency_code(baseName)
-            quote = self.safe_currency_code(quoteId)
-            symbol = base + '/' + quote
+            # if marketName.find('/') < 0:
+            #     # there are some weird spot markets in testnet, eg @2
+            #     continue
+            # }
+            # marketParts = marketName.split('/')
+            # baseName = self.safe_string(marketParts, 0)
+            # quoteId = self.safe_string(marketParts, 1)
             fees = self.safe_dict(self.fees, 'spot', {})
             taker = self.safe_number(fees, 'taker')
             maker = self.safe_number(fees, 'maker')
             tokensPos = self.safe_list(market, 'tokens', [])
             baseTokenPos = self.safe_integer(tokensPos, 0)
-            # quoteTokenPos = self.safe_integer(tokensPos, 1)
+            quoteTokenPos = self.safe_integer(tokensPos, 1)
             baseTokenInfo = self.safe_dict(tokens, baseTokenPos, {})
-            # quoteTokenInfo = self.safe_dict(tokens, quoteTokenPos, {})
+            quoteTokenInfo = self.safe_dict(tokens, quoteTokenPos, {})
+            baseName = self.safe_string(baseTokenInfo, 'name')
+            quoteId = self.safe_string(quoteTokenInfo, 'name')
+            base = self.safe_currency_code(baseName)
+            quote = self.safe_currency_code(quoteId)
+            symbol = base + '/' + quote
             innerBaseTokenInfo = self.safe_dict(baseTokenInfo, 'spec', baseTokenInfo)
             # innerQuoteTokenInfo = self.safe_dict(quoteTokenInfo, 'spec', quoteTokenInfo)
             amountPrecision = self.parse_number(self.parse_precision(self.safe_string(innerBaseTokenInfo, 'szDecimals')))
@@ -1114,7 +1117,7 @@ class hyperliquid(Exchange, ImplicitAPI):
             }
             if clientOrderId is not None:
                 orderObj['c'] = clientOrderId
-            orderReq.append(self.extend(orderObj, orderParams))
+            orderReq.append(orderObj)
         vaultAddress = self.format_vault_address(self.safe_string(params, 'vaultAddress'))
         orderAction: dict = {
             'type': 'order',
@@ -1134,7 +1137,7 @@ class hyperliquid(Exchange, ImplicitAPI):
         if vaultAddress is not None:
             params = self.omit(params, 'vaultAddress')
             request['vaultAddress'] = vaultAddress
-        response = self.privatePostExchange(self.extend(request, params))
+        response = self.privatePostExchange(request)
         #
         #     {
         #         "status": "ok",
@@ -1226,7 +1229,7 @@ class hyperliquid(Exchange, ImplicitAPI):
         if vaultAddress is not None:
             params = self.omit(params, 'vaultAddress')
             request['vaultAddress'] = vaultAddress
-        response = self.privatePostExchange(self.extend(request, params))
+        response = self.privatePostExchange(request)
         #
         #     {
         #         "status":"ok",
@@ -1302,7 +1305,7 @@ class hyperliquid(Exchange, ImplicitAPI):
         if vaultAddress is not None:
             params = self.omit(params, 'vaultAddress')
             request['vaultAddress'] = vaultAddress
-        response = self.privatePostExchange(self.extend(request, params))
+        response = self.privatePostExchange(request)
         #
         #     {
         #         "status":"ok",
@@ -1345,7 +1348,7 @@ class hyperliquid(Exchange, ImplicitAPI):
         if vaultAddress is not None:
             params = self.omit(params, 'vaultAddress')
             request['vaultAddress'] = vaultAddress
-        response = self.privatePostExchange(self.extend(request, params))
+        response = self.privatePostExchange(request)
         #
         #     {
         #         "status":"err",
@@ -1454,7 +1457,7 @@ class hyperliquid(Exchange, ImplicitAPI):
         if vaultAddress is not None:
             params = self.omit(params, 'vaultAddress')
             request['vaultAddress'] = vaultAddress
-        response = self.privatePostExchange(self.extend(request, params))
+        response = self.privatePostExchange(request)
         #
         #     {
         #         "status": "ok",
@@ -2096,10 +2099,9 @@ class hyperliquid(Exchange, ImplicitAPI):
             params = self.omit(params, 'vaultAddress')
             if vaultAddress.startswith('0x'):
                 vaultAddress = vaultAddress.replace('0x', '')
-        extendedAction = self.extend(updateAction, params)
-        signature = self.sign_l1_action(extendedAction, nonce, vaultAddress)
+        signature = self.sign_l1_action(updateAction, nonce, vaultAddress)
         request: dict = {
-            'action': extendedAction,
+            'action': updateAction,
             'nonce': nonce,
             'signature': signature,
             # 'vaultAddress': vaultAddress,
@@ -2152,7 +2154,7 @@ class hyperliquid(Exchange, ImplicitAPI):
         if vaultAddress is not None:
             params = self.omit(params, 'vaultAddress')
             request['vaultAddress'] = vaultAddress
-        response = self.privatePostExchange(self.extend(request, params))
+        response = self.privatePostExchange(request)
         #
         #     {
         #         'response': {
@@ -2210,7 +2212,7 @@ class hyperliquid(Exchange, ImplicitAPI):
         if vaultAddress is not None:
             params = self.omit(params, 'vaultAddress')
             request['vaultAddress'] = vaultAddress
-        response = self.privatePostExchange(self.extend(request, params))
+        response = self.privatePostExchange(request)
         #
         #     {
         #         'response': {
@@ -2274,7 +2276,7 @@ class hyperliquid(Exchange, ImplicitAPI):
             }
             signature = self.sign_l1_action(action, nonce, vaultAddress)
             innerRequest: dict = {
-                'action': self.extend(action, params),
+                'action': action,
                 'nonce': nonce,
                 'signature': signature,
             }
@@ -2307,7 +2309,7 @@ class hyperliquid(Exchange, ImplicitAPI):
             'nonce': nonce,
             'signature': sig,
         }
-        response = self.privatePostExchange(self.extend(request, params))
+        response = self.privatePostExchange(request)
         return response
 
     def withdraw(self, code: str, amount: float, address: str, tag=None, params={}) -> Transaction:
@@ -2349,7 +2351,7 @@ class hyperliquid(Exchange, ImplicitAPI):
             'nonce': nonce,
             'signature': sig,
         }
-        response = self.privatePostExchange(self.extend(request, params))
+        response = self.privatePostExchange(request)
         return self.parse_transaction(response)
 
     def parse_transaction(self, transaction: dict, currency: Currency = None) -> Transaction:

ccxt/pro/__init__.py

@@ -4,7 +4,7 @@
 
 # ----------------------------------------------------------------------------
 
-__version__ = '4.3.52'
+__version__ = '4.3.53'
 
 # ----------------------------------------------------------------------------
 
@@ -74,6 +74,7 @@ from ccxt.pro.poloniex import poloniex                                    # noqa
 from ccxt.pro.poloniexfutures import poloniexfutures                      # noqa: F401
 from ccxt.pro.probit import probit                                        # noqa: F401
 from ccxt.pro.upbit import upbit                                          # noqa: F401
+from ccxt.pro.vertex import vertex                                        # noqa: F401
 from ccxt.pro.wazirx import wazirx                                        # noqa: F401
 from ccxt.pro.whitebit import whitebit                                    # noqa: F401
 from ccxt.pro.woo import woo                                              # noqa: F401
@@ -142,6 +143,7 @@ exchanges = [
     'poloniexfutures',
     'probit',
     'upbit',
+    'vertex',
     'wazirx',
     'whitebit',
     'woo',

ccxt/pro/probit.py

@@ -52,8 +52,6 @@ class probit(ccxt.async_support.probit):
             },
             'streaming': {
             },
-            'exceptions': {
-            },
         })
 
     async def watch_balance(self, params={}) -> Balances:
@@ -467,8 +465,12 @@ class probit(ccxt.async_support.probit):
         code = self.safe_string(message, 'errorCode')
         errMessage = self.safe_string(message, 'message', '')
         details = self.safe_value(message, 'details')
-        # todo - raise properly here
-        raise ExchangeError(self.id + ' ' + code + ' ' + errMessage + ' ' + self.json(details))
+        feedback = self.id + ' ' + code + ' ' + errMessage + ' ' + self.json(details)
+        if 'exact' in self.exceptions:
+            self.throw_exactly_matched_exception(self.exceptions['exact'], code, feedback)
+        if 'broad' in self.exceptions:
+            self.throw_broadly_matched_exception(self.exceptions['broad'], errMessage, feedback)
+        raise ExchangeError(feedback)
 
     def handle_authenticate(self, client: Client, message):
         #