ccxt 4.1.66__py2.py3-none-any.whl → 4.1.68__py2.py3-none-any.whl

ccxt/__init__.py

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

ccxt/async_support/__init__.py

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

ccxt/async_support/base/exchange.py

@@ -2,7 +2,7 @@
 
 # -----------------------------------------------------------------------------
 
-__version__ = '4.1.66'
+__version__ = '4.1.68'
 
 # -----------------------------------------------------------------------------
 
@@ -746,7 +746,7 @@ class Exchange(BaseExchange):
         raise NotSupported(self.id + ' watchPositions() is not supported yet')
 
     async def watch_position_for_symbols(self, symbols: List[str] = None, since: Int = None, limit: Int = None, params={}):
-        return self.watchPositions(symbols, since, limit, params)
+        return await self.watchPositions(symbols, since, limit, params)
 
     async def fetch_positions_for_symbol(self, symbol: str, params={}):
         """

ccxt/async_support/bingx.py

@@ -89,6 +89,7 @@ class bingx(Exchange, ImplicitAPI):
                     'user': 'https://open-api.{hostname}/openApi',
                     'subAccount': 'https://open-api.{hostname}/openApi',
                     'account': 'https://open-api.{hostname}/openApi',
+                    'copyTrading': 'https://open-api.{hostname}/openApi',
                 },
                 'www': 'https://bingx.com/',
                 'doc': 'https://bingx-api.github.io/docs/',

ccxt/async_support/bybit.py

@@ -2057,8 +2057,8 @@ class bybit(Exchange, ImplicitAPI):
                 parsedSymbols.append(market['symbol'])
         request = {
             # 'symbol': market['id'],
-            # 'baseCoin': '', Base coin. For option only
-            # 'expDate': '', Expiry date. e.g., 25DEC22. For option only
+            # 'baseCoin': '',  # Base coin. For option only
+            # 'expDate': '',  # Expiry date. e.g., 25DEC22. For option only
         }
         type = None
         type, params = self.handle_market_type_and_params('fetchTickers', market, params)

ccxt/async_support/coinbase.py

@@ -1541,7 +1541,7 @@ class coinbase(Exchange, ImplicitAPI):
         """
         await self.load_markets()
         request = {
-            'limit': 100,
+            'limit': 250,
         }
         response = None
         isV3 = self.safe_value(params, 'v3', False)

ccxt/async_support/gate.py

@@ -572,8 +572,6 @@ class gate(Exchange, ImplicitAPI):
                 'AXIS': 'Axis DeFi',
                 'BIFI': 'Bitcoin File',
                 'BOX': 'DefiBox',
-                'BTCBEAR': 'BEAR',
-                'BTCBULL': 'BULL',
                 'BYN': 'BeyondFi',
                 'EGG': 'Goose Finance',
                 'GTC': 'Game.com',  # conflict with Gitcoin and Gastrocoin
@@ -869,6 +867,7 @@ class gate(Exchange, ImplicitAPI):
                     'AUTO_TRIGGER_PRICE_LESS_LAST': InvalidOrder,  # {"label":"AUTO_TRIGGER_PRICE_LESS_LAST","message":"invalid argument: Trigger.Price must < last_price"}
                     'AUTO_TRIGGER_PRICE_GREATE_LAST': InvalidOrder,  # {"label":"AUTO_TRIGGER_PRICE_GREATE_LAST","message":"invalid argument: Trigger.Price must > last_price"}
                     'POSITION_HOLDING': BadRequest,
+                    'USER_LOAN_EXCEEDED': BadRequest,  # {"label":"USER_LOAN_EXCEEDED","message":"Max loan amount per user would be exceeded"}
                 },
                 'broad': {},
             },
@@ -5265,6 +5264,204 @@ class gate(Exchange, ImplicitAPI):
             floor = cap
         return tiers
 
+    async def repay_margin(self, code: str, amount, symbol: Str = None, params={}):
+        """
+        repay borrowed margin and interest
+        :see: https://www.gate.io/docs/apiv4/en/#repay-cross-margin-loan
+        :see: https://www.gate.io/docs/apiv4/en/#repay-a-loan
+        :param str code: unified currency code of the currency to repay
+        :param float amount: the amount to repay
+        :param str symbol: unified market symbol, required for isolated margin
+        :param dict [params]: extra parameters specific to the exchange API endpoint
+        :param str [params.mode]: 'all' or 'partial' payment mode, extra parameter required for isolated margin
+        :param str [params.id]: '34267567' loan id, extra parameter required for isolated margin
+        :returns dict: a `margin loan structure <https://docs.ccxt.com/#/?id=margin-loan-structure>`
+        """
+        marginMode = None
+        marginMode, params = self.handle_option_and_params(params, 'repayMargin', 'marginMode')
+        self.check_required_argument('repayMargin', marginMode, 'marginMode', ['cross', 'isolated'])
+        self.check_required_margin_argument('repayMargin', symbol, marginMode)
+        await self.load_markets()
+        currency = self.currency(code)
+        request = {
+            'currency': currency['id'].upper(),
+            'amount': self.currency_to_precision(code, amount),
+        }
+        response = None
+        if (marginMode == 'cross') and (symbol is None):
+            response = await self.privateMarginPostCrossRepayments(self.extend(request, params))
+        elif (marginMode == 'isolated') or (symbol is not None):
+            if symbol is None:
+                raise BadRequest(self.id + ' repayMargin() requires a symbol argument for isolated margin')
+            market = self.market(symbol)
+            request['currency_pair'] = market['id']
+            request['type'] = 'repay'
+            response = await self.privateMarginPostUniLoans(self.extend(request, params))
+        #
+        # Cross
+        #
+        #     [
+        #         {
+        #             "id": "17",
+        #             "create_time": 1620381696159,
+        #             "update_time": 1620381696159,
+        #             "currency": "EOS",
+        #             "amount": "110.553635",
+        #             "text": "web",
+        #             "status": 2,
+        #             "repaid": "110.506649705159",
+        #             "repaid_interest": "0.046985294841",
+        #             "unpaid_interest": "0.0000074393366667"
+        #         }
+        #     ]
+        #
+        # Isolated
+        #
+        #     {
+        #         "id": "34267567",
+        #         "create_time": "1656394778",
+        #         "expire_time": "1657258778",
+        #         "status": "finished",
+        #         "side": "borrow",
+        #         "currency": "USDT",
+        #         "rate": "0.0002",
+        #         "amount": "100",
+        #         "days": 10,
+        #         "auto_renew": False,
+        #         "currency_pair": "LTC_USDT",
+        #         "left": "0",
+        #         "repaid": "100",
+        #         "paid_interest": "0.003333333333",
+        #         "unpaid_interest": "0"
+        #     }
+        #
+        if marginMode == 'cross':
+            response = response[0]
+        return self.parse_margin_loan(response, currency)
+
+    async def borrow_margin(self, code: str, amount, symbol: Str = None, params={}):
+        """
+        create a loan to borrow margin
+        :see: https://www.gate.io/docs/apiv4/en/#create-a-cross-margin-borrow-loan
+        :see: https://www.gate.io/docs/developers/apiv4/en/#marginuni
+        :param str code: unified currency code of the currency to borrow
+        :param float amount: the amount to borrow
+        :param str symbol: unified market symbol, required for isolated margin
+        :param dict [params]: extra parameters specific to the exchange API endpoint
+        :param str [params.rate]: '0.0002' or '0.002' extra parameter required for isolated margin
+        :returns dict: a `margin loan structure <https://docs.ccxt.com/#/?id=margin-loan-structure>`
+        """
+        marginMode = None
+        marginMode, params = self.handle_option_and_params(params, 'borrowMargin', 'marginMode')
+        self.check_required_argument('borrowMargin', marginMode, 'marginMode', ['cross', 'isolated'])
+        self.check_required_margin_argument('borrowMargin', symbol, marginMode)
+        await self.load_markets()
+        currency = self.currency(code)
+        request = {
+            'currency': currency['id'].upper(),
+            'amount': self.currency_to_precision(code, amount),
+        }
+        response = None
+        if (marginMode == 'cross') and (symbol is None):
+            response = await self.privateMarginPostCrossLoans(self.extend(request, params))
+        elif (marginMode == 'isolated') or (symbol is not None):
+            if symbol is None:
+                raise BadRequest(self.id + ' borrowMargin() requires a symbol argument for isolated margin')
+            market = self.market(symbol)
+            request['currency_pair'] = market['id']
+            request['type'] = 'borrow'
+            response = await self.privateMarginPostUniLoans(self.extend(request, params))
+        #
+        # Cross
+        #
+        #     {
+        #         "id": "17",
+        #         "create_time": 1620381696159,
+        #         "update_time": 1620381696159,
+        #         "currency": "EOS",
+        #         "amount": "110.553635",
+        #         "text": "web",
+        #         "status": 2,
+        #         "repaid": "110.506649705159",
+        #         "repaid_interest": "0.046985294841",
+        #         "unpaid_interest": "0.0000074393366667"
+        #     }
+        #
+        # Isolated
+        #
+        #     {
+        #         "id": "34267567",
+        #         "create_time": "1656394778",
+        #         "expire_time": "1657258778",
+        #         "status": "loaned",
+        #         "side": "borrow",
+        #         "currency": "USDT",
+        #         "rate": "0.0002",
+        #         "amount": "100",
+        #         "days": 10,
+        #         "auto_renew": False,
+        #         "currency_pair": "LTC_USDT",
+        #         "left": "0",
+        #         "repaid": "0",
+        #         "paid_interest": "0",
+        #         "unpaid_interest": "0.003333333333"
+        #     }
+        #
+        return self.parse_margin_loan(response, currency)
+
+    def parse_margin_loan(self, info, currency: Currency = None):
+        #
+        # Cross
+        #
+        #     {
+        #         "id": "17",
+        #         "create_time": 1620381696159,
+        #         "update_time": 1620381696159,
+        #         "currency": "EOS",
+        #         "amount": "110.553635",
+        #         "text": "web",
+        #         "status": 2,
+        #         "repaid": "110.506649705159",
+        #         "repaid_interest": "0.046985294841",
+        #         "unpaid_interest": "0.0000074393366667"
+        #     }
+        #
+        # Isolated
+        #
+        #     {
+        #         "id": "34267567",
+        #         "create_time": "1656394778",
+        #         "expire_time": "1657258778",
+        #         "status": "loaned",
+        #         "side": "borrow",
+        #         "currency": "USDT",
+        #         "rate": "0.0002",
+        #         "amount": "100",
+        #         "days": 10,
+        #         "auto_renew": False,
+        #         "currency_pair": "LTC_USDT",
+        #         "left": "0",
+        #         "repaid": "0",
+        #         "paid_interest": "0",
+        #         "unpaid_interest": "0.003333333333"
+        #     }
+        #
+        marginMode = self.safe_string_2(self.options, 'defaultMarginMode', 'marginMode', 'cross')
+        timestamp = self.safe_integer(info, 'create_time')
+        if marginMode == 'isolated':
+            timestamp = self.safe_timestamp(info, 'create_time')
+        currencyId = self.safe_string(info, 'currency')
+        marketId = self.safe_string(info, 'currency_pair')
+        return {
+            'id': self.safe_integer(info, 'id'),
+            'currency': self.safe_currency_code(currencyId, currency),
+            'amount': self.safe_number(info, 'amount'),
+            'symbol': self.safe_symbol(marketId, None, '_', 'margin'),
+            'timestamp': timestamp,
+            'datetime': self.iso8601(timestamp),
+            'info': info,
+        }
+
     def sign(self, path, api=[], method='GET', params={}, headers=None, body=None):
         authentication = api[0]  # public, private
         type = api[1]  # spot, margin, future, delivery

ccxt/base/exchange.py

@@ -4,7 +4,7 @@
 
 # -----------------------------------------------------------------------------
 
-__version__ = '4.1.66'
+__version__ = '4.1.68'
 
 # -----------------------------------------------------------------------------
 
@@ -564,7 +564,7 @@ class Exchange(object):
             proxies['http'] = socksProxy
             proxies['https'] = socksProxy
         proxyAgentSet = proxies is not None
-        self.checkConflictingProxies(proxyAgentSet, proxyUrl)
+        self.check_conflicting_proxies(proxyAgentSet, proxyUrl)
         # specifically for async-python, there is ".proxies" property maintained
         if (self.proxies is not None):
             if (proxyAgentSet or proxyUrl):
@@ -1989,7 +1989,7 @@ class Exchange(object):
     def parse_markets(self, markets):
         result = []
         for i in range(0, len(markets)):
-            result.append(self.parseMarket(markets[i]))
+            result.append(self.parse_market(markets[i]))
         return result
 
     def parse_ticker(self, ticker: object, market: Market = None):
@@ -2192,6 +2192,7 @@ class Exchange(object):
             'contract': None,
             'linear': None,
             'inverse': None,
+            'subType': None,
             'taker': None,
             'maker': None,
             'contractSize': None,
@@ -2260,6 +2261,12 @@ class Exchange(object):
                 'precision': self.precision,
                 'limits': self.limits,
             }, self.fees['trading'], value)
+            if market['linear']:
+                market['subType'] = 'linear'
+            elif market['inverse']:
+                market['subType'] = 'inverse'
+            else:
+                market['subType'] = None
             values.append(market)
         self.markets = self.index_by(values, 'symbol')
         marketsSortedBySymbol = self.keysort(self.markets)
@@ -2825,7 +2832,7 @@ class Exchange(object):
             'bidVolume': self.safe_number(ticker, 'bidVolume'),
             'ask': self.parse_number(self.omit_zero(self.safe_number(ticker, 'ask'))),
             'askVolume': self.safe_number(ticker, 'askVolume'),
-            'high': self.parse_number(self.omit_zero(self.safe_string(ticker, 'high"'))),
+            'high': self.parse_number(self.omit_zero(self.safe_string(ticker, 'high'))),
             'low': self.parse_number(self.omit_zero(self.safe_number(ticker, 'low'))),
             'open': self.parse_number(self.omit_zero(self.parse_number(open))),
             'close': self.parse_number(self.omit_zero(self.parse_number(close))),
@@ -4331,7 +4338,7 @@ class Exchange(object):
                 message += ', one of ' + '(' + messageOptions + ')'
             raise ArgumentsRequired(message)
 
-    def check_required_margin_argument(self, methodName: str, symbol: str, marginMode: str):
+    def check_required_margin_argument(self, methodName: str, symbol: Str, marginMode: str):
         """
          * @ignore
         :param str symbol: unified symbol of the market

ccxt/base/types.py

@@ -267,6 +267,7 @@ class MarketInterface(TypedDict):
     quoteId: Str
     active: Bool
     type: Str
+    subType: Str
     spot: bool
     margin: bool
     swap: bool

ccxt/bingx.py

@@ -88,6 +88,7 @@ class bingx(Exchange, ImplicitAPI):
                     'user': 'https://open-api.{hostname}/openApi',
                     'subAccount': 'https://open-api.{hostname}/openApi',
                     'account': 'https://open-api.{hostname}/openApi',
+                    'copyTrading': 'https://open-api.{hostname}/openApi',
                 },
                 'www': 'https://bingx.com/',
                 'doc': 'https://bingx-api.github.io/docs/',

ccxt/bybit.py

@@ -2056,8 +2056,8 @@ class bybit(Exchange, ImplicitAPI):
                 parsedSymbols.append(market['symbol'])
         request = {
             # 'symbol': market['id'],
-            # 'baseCoin': '', Base coin. For option only
-            # 'expDate': '', Expiry date. e.g., 25DEC22. For option only
+            # 'baseCoin': '',  # Base coin. For option only
+            # 'expDate': '',  # Expiry date. e.g., 25DEC22. For option only
         }
         type = None
         type, params = self.handle_market_type_and_params('fetchTickers', market, params)

ccxt/coinbase.py

@@ -1541,7 +1541,7 @@ class coinbase(Exchange, ImplicitAPI):
         """
         self.load_markets()
         request = {
-            'limit': 100,
+            'limit': 250,
         }
         response = None
         isV3 = self.safe_value(params, 'v3', False)

ccxt/gate.py

@@ -571,8 +571,6 @@ class gate(Exchange, ImplicitAPI):
                 'AXIS': 'Axis DeFi',
                 'BIFI': 'Bitcoin File',
                 'BOX': 'DefiBox',
-                'BTCBEAR': 'BEAR',
-                'BTCBULL': 'BULL',
                 'BYN': 'BeyondFi',
                 'EGG': 'Goose Finance',
                 'GTC': 'Game.com',  # conflict with Gitcoin and Gastrocoin
@@ -868,6 +866,7 @@ class gate(Exchange, ImplicitAPI):
                     'AUTO_TRIGGER_PRICE_LESS_LAST': InvalidOrder,  # {"label":"AUTO_TRIGGER_PRICE_LESS_LAST","message":"invalid argument: Trigger.Price must < last_price"}
                     'AUTO_TRIGGER_PRICE_GREATE_LAST': InvalidOrder,  # {"label":"AUTO_TRIGGER_PRICE_GREATE_LAST","message":"invalid argument: Trigger.Price must > last_price"}
                     'POSITION_HOLDING': BadRequest,
+                    'USER_LOAN_EXCEEDED': BadRequest,  # {"label":"USER_LOAN_EXCEEDED","message":"Max loan amount per user would be exceeded"}
                 },
                 'broad': {},
             },
@@ -5264,6 +5263,204 @@ class gate(Exchange, ImplicitAPI):
             floor = cap
         return tiers
 
+    def repay_margin(self, code: str, amount, symbol: Str = None, params={}):
+        """
+        repay borrowed margin and interest
+        :see: https://www.gate.io/docs/apiv4/en/#repay-cross-margin-loan
+        :see: https://www.gate.io/docs/apiv4/en/#repay-a-loan
+        :param str code: unified currency code of the currency to repay
+        :param float amount: the amount to repay
+        :param str symbol: unified market symbol, required for isolated margin
+        :param dict [params]: extra parameters specific to the exchange API endpoint
+        :param str [params.mode]: 'all' or 'partial' payment mode, extra parameter required for isolated margin
+        :param str [params.id]: '34267567' loan id, extra parameter required for isolated margin
+        :returns dict: a `margin loan structure <https://docs.ccxt.com/#/?id=margin-loan-structure>`
+        """
+        marginMode = None
+        marginMode, params = self.handle_option_and_params(params, 'repayMargin', 'marginMode')
+        self.check_required_argument('repayMargin', marginMode, 'marginMode', ['cross', 'isolated'])
+        self.check_required_margin_argument('repayMargin', symbol, marginMode)
+        self.load_markets()
+        currency = self.currency(code)
+        request = {
+            'currency': currency['id'].upper(),
+            'amount': self.currency_to_precision(code, amount),
+        }
+        response = None
+        if (marginMode == 'cross') and (symbol is None):
+            response = self.privateMarginPostCrossRepayments(self.extend(request, params))
+        elif (marginMode == 'isolated') or (symbol is not None):
+            if symbol is None:
+                raise BadRequest(self.id + ' repayMargin() requires a symbol argument for isolated margin')
+            market = self.market(symbol)
+            request['currency_pair'] = market['id']
+            request['type'] = 'repay'
+            response = self.privateMarginPostUniLoans(self.extend(request, params))
+        #
+        # Cross
+        #
+        #     [
+        #         {
+        #             "id": "17",
+        #             "create_time": 1620381696159,
+        #             "update_time": 1620381696159,
+        #             "currency": "EOS",
+        #             "amount": "110.553635",
+        #             "text": "web",
+        #             "status": 2,
+        #             "repaid": "110.506649705159",
+        #             "repaid_interest": "0.046985294841",
+        #             "unpaid_interest": "0.0000074393366667"
+        #         }
+        #     ]
+        #
+        # Isolated
+        #
+        #     {
+        #         "id": "34267567",
+        #         "create_time": "1656394778",
+        #         "expire_time": "1657258778",
+        #         "status": "finished",
+        #         "side": "borrow",
+        #         "currency": "USDT",
+        #         "rate": "0.0002",
+        #         "amount": "100",
+        #         "days": 10,
+        #         "auto_renew": False,
+        #         "currency_pair": "LTC_USDT",
+        #         "left": "0",
+        #         "repaid": "100",
+        #         "paid_interest": "0.003333333333",
+        #         "unpaid_interest": "0"
+        #     }
+        #
+        if marginMode == 'cross':
+            response = response[0]
+        return self.parse_margin_loan(response, currency)
+
+    def borrow_margin(self, code: str, amount, symbol: Str = None, params={}):
+        """
+        create a loan to borrow margin
+        :see: https://www.gate.io/docs/apiv4/en/#create-a-cross-margin-borrow-loan
+        :see: https://www.gate.io/docs/developers/apiv4/en/#marginuni
+        :param str code: unified currency code of the currency to borrow
+        :param float amount: the amount to borrow
+        :param str symbol: unified market symbol, required for isolated margin
+        :param dict [params]: extra parameters specific to the exchange API endpoint
+        :param str [params.rate]: '0.0002' or '0.002' extra parameter required for isolated margin
+        :returns dict: a `margin loan structure <https://docs.ccxt.com/#/?id=margin-loan-structure>`
+        """
+        marginMode = None
+        marginMode, params = self.handle_option_and_params(params, 'borrowMargin', 'marginMode')
+        self.check_required_argument('borrowMargin', marginMode, 'marginMode', ['cross', 'isolated'])
+        self.check_required_margin_argument('borrowMargin', symbol, marginMode)
+        self.load_markets()
+        currency = self.currency(code)
+        request = {
+            'currency': currency['id'].upper(),
+            'amount': self.currency_to_precision(code, amount),
+        }
+        response = None
+        if (marginMode == 'cross') and (symbol is None):
+            response = self.privateMarginPostCrossLoans(self.extend(request, params))
+        elif (marginMode == 'isolated') or (symbol is not None):
+            if symbol is None:
+                raise BadRequest(self.id + ' borrowMargin() requires a symbol argument for isolated margin')
+            market = self.market(symbol)
+            request['currency_pair'] = market['id']
+            request['type'] = 'borrow'
+            response = self.privateMarginPostUniLoans(self.extend(request, params))
+        #
+        # Cross
+        #
+        #     {
+        #         "id": "17",
+        #         "create_time": 1620381696159,
+        #         "update_time": 1620381696159,
+        #         "currency": "EOS",
+        #         "amount": "110.553635",
+        #         "text": "web",
+        #         "status": 2,
+        #         "repaid": "110.506649705159",
+        #         "repaid_interest": "0.046985294841",
+        #         "unpaid_interest": "0.0000074393366667"
+        #     }
+        #
+        # Isolated
+        #
+        #     {
+        #         "id": "34267567",
+        #         "create_time": "1656394778",
+        #         "expire_time": "1657258778",
+        #         "status": "loaned",
+        #         "side": "borrow",
+        #         "currency": "USDT",
+        #         "rate": "0.0002",
+        #         "amount": "100",
+        #         "days": 10,
+        #         "auto_renew": False,
+        #         "currency_pair": "LTC_USDT",
+        #         "left": "0",
+        #         "repaid": "0",
+        #         "paid_interest": "0",
+        #         "unpaid_interest": "0.003333333333"
+        #     }
+        #
+        return self.parse_margin_loan(response, currency)
+
+    def parse_margin_loan(self, info, currency: Currency = None):
+        #
+        # Cross
+        #
+        #     {
+        #         "id": "17",
+        #         "create_time": 1620381696159,
+        #         "update_time": 1620381696159,
+        #         "currency": "EOS",
+        #         "amount": "110.553635",
+        #         "text": "web",
+        #         "status": 2,
+        #         "repaid": "110.506649705159",
+        #         "repaid_interest": "0.046985294841",
+        #         "unpaid_interest": "0.0000074393366667"
+        #     }
+        #
+        # Isolated
+        #
+        #     {
+        #         "id": "34267567",
+        #         "create_time": "1656394778",
+        #         "expire_time": "1657258778",
+        #         "status": "loaned",
+        #         "side": "borrow",
+        #         "currency": "USDT",
+        #         "rate": "0.0002",
+        #         "amount": "100",
+        #         "days": 10,
+        #         "auto_renew": False,
+        #         "currency_pair": "LTC_USDT",
+        #         "left": "0",
+        #         "repaid": "0",
+        #         "paid_interest": "0",
+        #         "unpaid_interest": "0.003333333333"
+        #     }
+        #
+        marginMode = self.safe_string_2(self.options, 'defaultMarginMode', 'marginMode', 'cross')
+        timestamp = self.safe_integer(info, 'create_time')
+        if marginMode == 'isolated':
+            timestamp = self.safe_timestamp(info, 'create_time')
+        currencyId = self.safe_string(info, 'currency')
+        marketId = self.safe_string(info, 'currency_pair')
+        return {
+            'id': self.safe_integer(info, 'id'),
+            'currency': self.safe_currency_code(currencyId, currency),
+            'amount': self.safe_number(info, 'amount'),
+            'symbol': self.safe_symbol(marketId, None, '_', 'margin'),
+            'timestamp': timestamp,
+            'datetime': self.iso8601(timestamp),
+            'info': info,
+        }
+
     def sign(self, path, api=[], method='GET', params={}, headers=None, body=None):
         authentication = api[0]  # public, private
         type = api[1]  # spot, margin, future, delivery

ccxt/pro/__init__.py

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

ccxt/pro/binance.py

@@ -682,7 +682,7 @@ class binance(ccxt.async_support.binance):
     def handle_trade(self, client: Client, message):
         # the trade streams push raw trade information in real-time
         # each trade has a unique buyer and seller
-        isSpot = ((client.url.find('/stream') > -1) or (client.url.find('/testnet.binance') > -1))
+        isSpot = ((client.url.find('wss://stream.binance.com') > -1) or (client.url.find('/testnet.binance') > -1))
         marketType = 'spot' if (isSpot) else 'contract'
         marketId = self.safe_string(message, 's')
         market = self.safe_market(marketId, None, None, marketType)

ccxt/pro/phemex.py

@@ -1213,7 +1213,7 @@ class phemex(ccxt.async_support.phemex):
         lastTradeTimestamp = self.safe_integer_product(order, 'transactTimeNs', 0.000001)
         if lastTradeTimestamp == 0:
             lastTradeTimestamp = None
-        timeInForce = self.parseTimeInForce(self.safe_string(order, 'timeInForce'))
+        timeInForce = self.parse_time_in_force(self.safe_string(order, 'timeInForce'))
         stopPrice = self.safe_string(order, 'stopPx')
         postOnly = (timeInForce == 'PO')
         return self.safe_order({

{ccxt-4.1.66.dist-info → ccxt-4.1.68.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: ccxt
-Version: 4.1.66
+Version: 4.1.68
 Summary: A JavaScript / TypeScript / Python / C# / PHP cryptocurrency trading library with support for 130+ exchanges
 Home-page: https://ccxt.com
 Author: Igor Kroitor
@@ -260,13 +260,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.1.66/dist/ccxt.browser.js
-* unpkg: https://unpkg.com/ccxt@4.1.66/dist/ccxt.browser.js
+* 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
 
 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.66/dist/ccxt.browser.js"></script>
+<script type="text/javascript" src="https://cdn.jsdelivr.net/npm/ccxt@4.1.68/dist/ccxt.browser.js"></script>
 ```
 
 Creates a global `ccxt` object:

{ccxt-4.1.66.dist-info → ccxt-4.1.68.dist-info}/RECORD

@@ -1,4 +1,4 @@
-ccxt/__init__.py,sha256=C55BX8xPelDUkqSGx64o8hjYvtD6Ni6K0g5NxfL4k1U,15177
+ccxt/__init__.py,sha256=7t2YN4CW07IyX13vZoIJ_HZUmOvPOiEsCXfgfs89kVI,15177
 ccxt/ace.py,sha256=BWWFoSfDar1k8SuqIuupgs8BLfZyu8w6BEdGZxWVR7M,41264
 ccxt/alpaca.py,sha256=4MSi6SDyes3lNvGKmWgXWEIB2CacwfbVdhLxchv3m7k,45944
 ccxt/ascendex.py,sha256=F6sRaTfCGzYMEm8Xq2jhsGLnmn8YLopoSc2_mq4fn44,142413
@@ -8,7 +8,7 @@ ccxt/binance.py,sha256=fT5SUUKUC-4qlQlnjYF_1kQE8z1me99pVbgCmJU6YRU,443977
 ccxt/binancecoinm.py,sha256=pncdw6Xw2X1Po-vEvAB4nL37scoS_axGAVxetPy1YQs,1645
 ccxt/binanceus.py,sha256=VxRnyDnU47bPSwFXih2n68vSpgyUrjZ4Ow1T11DQsfM,3470
 ccxt/binanceusdm.py,sha256=KPQGlCalQ0eGlPCs2tSanOxaP8O0zFRQjGntA16Yprw,2480
-ccxt/bingx.py,sha256=7PghGMV343rBYjPzyANxq-wKhM6_GWX67na5nLn5ocI,134424
+ccxt/bingx.py,sha256=EHz5BcfWvs7s-frSEPAif9URUtbwMS6eYI_WLCoNK94,134498
 ccxt/bit2c.py,sha256=mO2ZfxBYtmSpxwxtOZVYnKPDWBIiJ6UJkuE4DecRKRk,35984
 ccxt/bitbank.py,sha256=zQDq2fNe_YCW0bRU9baaW5wII2a5yTZBKqY_9bqrS3g,41520
 ccxt/bitbay.py,sha256=xAIjzGRDVGwoy-Gygd99H0YN4wiaz_0lR0Z14oxaaxc,478
@@ -35,9 +35,9 @@ ccxt/btcalpha.py,sha256=4mNS_yMwcDAz1kFQyCVfSSBITjEkv2UJp9iL_A9nAiM,35544
 ccxt/btcbox.py,sha256=vAexHxCRX7yJvugkxhXsrIoZZUYNYZVwg22CuN_bNdM,22765
 ccxt/btcmarkets.py,sha256=ltQTbUZ1VdeIDlmCgOEzqxKx69DK5cTxIAlGOLSOXNM,48498
 ccxt/btcturk.py,sha256=p9bwzFNEOvWdA6eNS8Be8MUE2tooj41qYr9WV0zcNig,35374
-ccxt/bybit.py,sha256=K9z5CNmETif8In7muOA-goLrkXu0C6YyylTsLVxh828,353285
+ccxt/bybit.py,sha256=lrVax6vqhDCCIN5QZvepyqlDS49DMfbI4YJRQC4Zr6w,353291
 ccxt/cex.py,sha256=mZGWOJAYS6o7bnxUFkykFSNMp0WBWu_ov8W9xgeBT8A,66222
-ccxt/coinbase.py,sha256=jZP_-FLx2253R4jn9hfbPf-rmrGRyn2MuZgAtojwwVk,143324
+ccxt/coinbase.py,sha256=yAJr50ql9Jg84dubNvHxdjRRXbTwFYIzwCvezeeDJzE,143324
 ccxt/coinbaseprime.py,sha256=Ygvljulxb2uKdei5yimCj1LMjLlUJNvP-G7ns1HpUFk,1219
 ccxt/coinbasepro.py,sha256=gpe6UVg4pDDpvzjVGE_fKeoDmkdIyzNucANptY9FeH8,80087
 ccxt/coincheck.py,sha256=91mcnxBYEpaEjqb-q_jvWSfient50_dLncnpXISNrdA,34543
@@ -55,7 +55,7 @@ ccxt/digifinex.py,sha256=5OeiNfFIM-w3AAPvMXE7SIWIrtfV4bUvyxiaeCSCEo4,165923
 ccxt/exmo.py,sha256=SrZt0OVTAkzn7XhNUdhI87Pe8fsa1cjvOfZGyISThWQ,111560
 ccxt/flowbtc.py,sha256=YPvm6tbsHJJUQBspFcHuVPQfVmiWzwnVvfzRqBdQX6U,1169
 ccxt/fmfwio.py,sha256=RbVLvzPwnqfDsE7Ea-N13ISCC82eJVPsXYjrleASmew,1236
-ccxt/gate.py,sha256=CvJNb1W9TTSeYr-dyhYD9MHIKFvOK2LcpoUipcbo4CA,280818
+ccxt/gate.py,sha256=6FQiRGktApiRCdqEkas2_E5Z0zEaA2M2PKsW72ZVhu0,289347
 ccxt/gateio.py,sha256=86AETJWODl_vA5VNeQRHZprmpNIY1HAxCddKZcnKSi8,445
 ccxt/gemini.py,sha256=JSzf7E3kX7EYkKvMidQeu2oqroY0GJID_EFpVuDRBlg,74433
 ccxt/hitbtc.py,sha256=4L--cDzLMh2ckUFJzm-lll1Jzg7lOrGUAfO1DHD6Kuc,140528
@@ -205,7 +205,7 @@ ccxt/abstract/woo.py,sha256=Z3ua45hKE0Tf9rtfSEYYgGEztaTO1Ri3mKl_hIo3OHs,8768
 ccxt/abstract/yobit.py,sha256=8ycfCO8ORFly9hc0Aa47sZyX4_ZKPXS9h9yJzI-uQ7Q,1339
 ccxt/abstract/zaif.py,sha256=m15WHdl3gYy0GOXNZ8NEH8eE7sVh8c0T_ITNuU8vXeU,3935
 ccxt/abstract/zonda.py,sha256=aSfewvRojzmuymX6QbOnDR8v9VFqWTULMHX9Y7kKD1M,5820
-ccxt/async_support/__init__.py,sha256=fuRQJrQGVyWY15TK0B6OIpsjI2IUZqNtPqbFBOAV-2M,14900
+ccxt/async_support/__init__.py,sha256=ca37P2gGCFm3xLOgJF4TnF9-pgfVVDb_BQVOicCH-Bs,14900
 ccxt/async_support/ace.py,sha256=H3BMrCEUPt86k1nFZnuTbcGPtgzzTii5V0OQeRK8x4U,41488
 ccxt/async_support/alpaca.py,sha256=q8s3omyklOv0grJ6kDJxmPkt9kqKHwes_fuYkP_Nhf8,46156
 ccxt/async_support/ascendex.py,sha256=t-OchFpnIgDF_Zu2Usg776cYjCwjIMGICighU7lwfFE,143111
@@ -215,7 +215,7 @@ ccxt/async_support/binance.py,sha256=2xdLK07rdyZNAz8mNBXOOoMN2YUYq94lkX-K9C0Nlhk
 ccxt/async_support/binancecoinm.py,sha256=IY3RLZptQA2nmZaUYRGfTa5ZY4VMWBpFYfwHc8zTHw0,1683
 ccxt/async_support/binanceus.py,sha256=kPX6NqdfR2OSMDb3ebNvBu4myiFsJ_i7BcQZC6vJIFg,3484
 ccxt/async_support/binanceusdm.py,sha256=-1r4A4tmV2pCiLGO80hzq7MIIj4MTzOD7buZGv6JauA,2518
-ccxt/async_support/bingx.py,sha256=V2U0kFmsEcp7iLsLhlrK64HZjrufoCVclRGUoWR3OnQ,135196
+ccxt/async_support/bingx.py,sha256=XqPoE8udgzPsCi3y6g3fdPl7LT1evS6m0YGreuSUeII,135270
 ccxt/async_support/bit2c.py,sha256=uaxgc8NS5vIHhZf1j_xpFIcv9VeOwT_iJCCHEbi1ofY,36190
 ccxt/async_support/bitbank.py,sha256=-o1uTNS73y_N2AfuBhWtaie1W1nHwplgtN-SI-tljOQ,41780
 ccxt/async_support/bitbay.py,sha256=jcaEXi2IhYTva8ezO_SfJhwxEZk7HST4J3NaxD16BQA,492
@@ -242,9 +242,9 @@ ccxt/async_support/btcalpha.py,sha256=Ey4I6vEpIQfpqsfpRfyD_yQ_sGnJBDOcQfaSHZaT2O
 ccxt/async_support/btcbox.py,sha256=nkyHZsopW7ysB467teuV3yjO1WINpOW1qeo-4mfvZBk,22959
 ccxt/async_support/btcmarkets.py,sha256=1uO9fzK0GkHZ7CkjZaMHpbzh_MrHfdFFWIzTGpouOW8,48848
 ccxt/async_support/btcturk.py,sha256=5hV7fywDOCXW0rHYB3YYxRkTYPk8K02-opfLnm7I3cg,35592
-ccxt/async_support/bybit.py,sha256=MOPSQQdAwu2uSC6DsxS1UKWotdZuAbHfHnEPmQsVHQw,354729
+ccxt/async_support/bybit.py,sha256=KvmTGSSC1DsPFTgA8yu-F7qqic6yEp62t8G8EffY--4,354735
 ccxt/async_support/cex.py,sha256=nroVKpc2_U09DYWqOhE3b1PtXr1tUPdifchIyu4f-w0,66548
-ccxt/async_support/coinbase.py,sha256=e0wbvk9LUV4OK3vZdQOfEnZrUZFjCEjFPEGHD2ZzESs,144088
+ccxt/async_support/coinbase.py,sha256=-GQCGYqy2YX36VTpIcBJZZEajnHBtSfnsTxp4EzysZ8,144088
 ccxt/async_support/coinbaseprime.py,sha256=M5Ez1DsFcW3-vJ-4QoZzwYBAKjAAtJnJpkfnV4sWAIc,1233
 ccxt/async_support/coinbasepro.py,sha256=yfHm6Hx0afMSogFlNLtKPc38YPip1l211285XYewRfk,80611
 ccxt/async_support/coincheck.py,sha256=tfdumxzqeQxLYtaEsYv1EtkVHySxF_6-79EftZvQcZQ,34749
@@ -262,7 +262,7 @@ ccxt/async_support/digifinex.py,sha256=tza4_wKbBQpDKyNXHUYtjA1aSVQC86yo41oV8NQ0W
 ccxt/async_support/exmo.py,sha256=gEI0BHmx5angmzZYO_anGCCVFSLU7buHApfWZVXMvTA,112168
 ccxt/async_support/flowbtc.py,sha256=bCnvtcNnPxxaxqVjI1GGXKhIpz_1r4GIFWqqPokvCR0,1183
 ccxt/async_support/fmfwio.py,sha256=lzfSnPrB2ARcC3EIqAuBM4vyg6LJ6n8RE71Zvt3ez1s,1250
-ccxt/async_support/gate.py,sha256=IFMT2fmFr0iUCQPWDKlAKDSFlHZjZR2dD2fmy0Fts7E,281950
+ccxt/async_support/gate.py,sha256=1aT-px9o_M70hH-Y3bvA5TGPyQTVqC3V6le2xK8c3X4,290527
 ccxt/async_support/gateio.py,sha256=6_t032F9p9x5KGTjtSuqGXITzFOx-XAQBYLpsuQjzxw,459
 ccxt/async_support/gemini.py,sha256=Wtgi4hdYQGtCmukUuFuWnFy2FrP2DXcTVsMdMqEUwW4,74935
 ccxt/async_support/hitbtc.py,sha256=03XsnK7JR4mQQZ9G7DhX2Zk7xvE4lb6rpm2jvzLWwqQ,141334
@@ -312,7 +312,7 @@ ccxt/async_support/yobit.py,sha256=Sr_o0G6zpBB2YHRClnD6FUzPBW74cukKl-cvjILW7YQ,5
 ccxt/async_support/zaif.py,sha256=-YCjZLw87m9m-JXxUCr6AEC8KfnNX8b7IVSv5caW3QQ,28158
 ccxt/async_support/zonda.py,sha256=DSrmvHZ4_uAwRzQQl_C6KGy3UK2kaTjJVohNg0SNbPQ,80592
 ccxt/async_support/base/__init__.py,sha256=aVYSsFi--b4InRs9zDN_wtCpj8odosAB726JdUHavrk,67
-ccxt/async_support/base/exchange.py,sha256=H-_Rtq5rFHPJvytihKhD-f2FhPAnEr9rpYq_q9vVVY0,67406
+ccxt/async_support/base/exchange.py,sha256=iL95YqyTtLXApU_MpvjK-ACEVQfA62iKOnaVpVi6u3o,67412
 ccxt/async_support/base/throttler.py,sha256=tvDVcdRUVYi8fZRlEcnqtgzcgB_KMUMRs5Pu8tuU-tU,1847
 ccxt/async_support/base/ws/__init__.py,sha256=uockzpLuwntKGZbs5EOWFe-Zg-k6Cj7GhNJLc_RX0so,1791
 ccxt/async_support/base/ws/aiohttp_client.py,sha256=_qjsl_x-rd88QmzQeGVWovMDK0XoD3f4m5GHqxZRajs,5203
@@ -326,14 +326,14 @@ ccxt/async_support/base/ws/order_book_side.py,sha256=Pxrq22nCODckJ6G1OXkYEmUunIu
 ccxt/base/__init__.py,sha256=eTx1OE3HJjspFUQjGm6LBhaQiMKJnXjkdP-JUXknyQ0,1320
 ccxt/base/decimal_to_precision.py,sha256=fgWRBzRTtsf3r2INyS4f7WHlzgjB5YM1ekiwqD21aac,6634
 ccxt/base/errors.py,sha256=1C38u76jlNGq06N_uwfw8b8FZHK8_3_90wM1rKfU_Rg,3878
-ccxt/base/exchange.py,sha256=iQItbFQWN0hmwOjTFtBhBOzItwBYGGpWmRvvvHj4qyI,213556
+ccxt/base/exchange.py,sha256=ITjQLlEEEuVGMc8pmTrmzUF_hUaYKKnu4fFAX-Txsfw,213806
 ccxt/base/precise.py,sha256=_xfu54sV0vWNnOfGTKRFykeuWP8mn4K1m9lk1tcllX4,8565
-ccxt/base/types.py,sha256=m3--UbZb7fe5LAk1koWbpa1WtZd5kwpk4mJEii6eQpw,5511
-ccxt/pro/__init__.py,sha256=YkOIb4ByH9u1Z0X9HeOFKUbE-pNa-NxB0u2apWxA4xk,6376
+ccxt/base/types.py,sha256=LN8MOE5oGr8ATL6VNuMAnE9f6o2fZ9zbeLLyXLndlEk,5528
+ccxt/pro/__init__.py,sha256=FYjyGIvGfr4RJ4yWV6-1qs8CWL8HRfreVMAMdiGgEkk,6376
 ccxt/pro/alpaca.py,sha256=fy1mLmw4yac7DKvGPpaqEBuA8briQqaRwPbvKsKUJwY,26974
 ccxt/pro/ascendex.py,sha256=GqH6QOPZfQtbAYhdB65zJ9iIMQDGsXugSyAPUsKXk40,34730
 ccxt/pro/bequant.py,sha256=3IeQ0vPg-eVqPiGMfX7yqH9qtXKm1ZqocQDeLwpA8EE,1093
-ccxt/pro/binance.py,sha256=UUUtWoLqysw8g7Fwvb0Zr1GmJciVC-meY4vk2LNNQw4,125628
+ccxt/pro/binance.py,sha256=A4ct4PIxsy7brzg55XRekdGAwQgrMx8QYTLSXoPj2jY,125645
 ccxt/pro/binancecoinm.py,sha256=vu5SUgP70T1Dax-Am3rch7ZldGrmUwxr_rI51Y38xjw,724
 ccxt/pro/binanceus.py,sha256=xKL-1cOHyqlLTwLGg-DPf6g3JMM1oU2Kv708FiGJwrY,2016
 ccxt/pro/binanceusdm.py,sha256=S0eT662O2ReplsihWk42nhJWqw1XsODpeDQa9eFVVt8,1357
@@ -383,7 +383,7 @@ ccxt/pro/ndax.py,sha256=kN4RT3g1KSV5R-jwxQEuSZPkm90ZBQxvnpb6rZXIEdA,22661
 ccxt/pro/okcoin.py,sha256=Og8uFEb7aHBqNseP4JNX64380EFXkfjlB17pSvQCjWo,30339
 ccxt/pro/okex.py,sha256=mKJJEfmOzmt31KyDIPVRuAqV_mL280pc2mbRz5h2oOg,382
 ccxt/pro/okx.py,sha256=p9EwmR61fCh_P-jJrq_b_VVACPmIRbG2lAq8bPCFidc,65115
-ccxt/pro/phemex.py,sha256=eskkPlDFNbgmjjAL7ErBwHbQaz7RtDCHXvyMNfdzubk,60398
+ccxt/pro/phemex.py,sha256=fI5I9rQ1Ale5GMeo18Kumk7ygrCUdfseAC7rVuHv5Z0,60401
 ccxt/pro/poloniex.py,sha256=EwLkLdCRTQ5_oZG6Z1v9LxWhwKPG4NZ95l2fyeHhC_k,50823
 ccxt/pro/poloniexfutures.py,sha256=hdRIBPriTQ7r7Gdvks0F5yynlNWgC019vJYawFtkijA,40897
 ccxt/pro/probit.py,sha256=tfzrftQAi_NLWm4lXIF7XhLeXlzN3rE7Ymw_ck9oY9c,22672
@@ -439,7 +439,7 @@ ccxt/test/base/test_ticker.py,sha256=5J8KHgFhJLgcWyFwt3bhJ-tldMho3K7LD5yJnnUyrT4
 ccxt/test/base/test_trade.py,sha256=AN3emAdEPhdFyunap43cKqZTS1cbaShZKTjYue67jEU,2297
 ccxt/test/base/test_trading_fee.py,sha256=2_WCp3qJ2UpraQQoGFlGJYwHD-T0Bm5W7KIw4zpFvSM,1068
 ccxt/test/base/test_transaction.py,sha256=BTbB4UHHXkrvYgwbrhh867nVRlevmIkIrz1W_odlQJI,1434
-ccxt-4.1.66.dist-info/METADATA,sha256=uKqSz775QrW2QEdbmR46VcVyFkLBThZvhS27NZLCGsI,106785
-ccxt-4.1.66.dist-info/WHEEL,sha256=P2T-6epvtXQ2cBOE_U1K4_noqlJFN3tj15djMgEu4NM,110
-ccxt-4.1.66.dist-info/top_level.txt,sha256=CkQDuCTDKNcImPV60t36G6MdYfxsAPNiSaEwifVoVMo,5
-ccxt-4.1.66.dist-info/RECORD,,
+ccxt-4.1.68.dist-info/METADATA,sha256=Z6qBBQf6MCb847KW9ZF5_g6YC-n1l8Tyek3Zab31eNA,106785
+ccxt-4.1.68.dist-info/WHEEL,sha256=P2T-6epvtXQ2cBOE_U1K4_noqlJFN3tj15djMgEu4NM,110
+ccxt-4.1.68.dist-info/top_level.txt,sha256=CkQDuCTDKNcImPV60t36G6MdYfxsAPNiSaEwifVoVMo,5
+ccxt-4.1.68.dist-info/RECORD,,