ccxt 4.2.21__py2.py3-none-any.whl → 4.2.22__py2.py3-none-any.whl

ccxt/deribit.py

@@ -415,6 +415,151 @@ class deribit(Exchange, ImplicitAPI):
             },
         })
 
+    def convert_expire_date(self, date):
+        # parse YYMMDD to timestamp
+        year = date[0:2]
+        month = date[2:4]
+        day = date[4:6]
+        reconstructedDate = '20' + year + '-' + month + '-' + day + 'T00:00:00Z'
+        return reconstructedDate
+
+    def convert_market_id_expire_date(self, date):
+        # parse 19JAN24 to 240119
+        monthMappping = {
+            'JAN': '01',
+            'FEB': '02',
+            'MAR': '03',
+            'APR': '04',
+            'MAY': '05',
+            'JUN': '06',
+            'JUL': '07',
+            'AUG': '08',
+            'SEP': '09',
+            'OCT': '10',
+            'NOV': '11',
+            'DEC': '12',
+        }
+        year = date[0:2]
+        monthName = date[2:5]
+        month = self.safe_string(monthMappping, monthName)
+        day = date[5:7]
+        reconstructedDate = day + month + year
+        return reconstructedDate
+
+    def convert_expire_date_to_market_id_date(self, date):
+        # parse 240119 to 19JAN24
+        year = date[0:2]
+        monthRaw = date[2:4]
+        month = None
+        day = date[4:6]
+        if monthRaw == '01':
+            month = 'JAN'
+        elif monthRaw == '02':
+            month = 'FEB'
+        elif monthRaw == '03':
+            month = 'MAR'
+        elif monthRaw == '04':
+            month = 'APR'
+        elif monthRaw == '05':
+            month = 'MAY'
+        elif monthRaw == '06':
+            month = 'JUN'
+        elif monthRaw == '07':
+            month = 'JUL'
+        elif monthRaw == '08':
+            month = 'AUG'
+        elif monthRaw == '09':
+            month = 'SEP'
+        elif monthRaw == '10':
+            month = 'OCT'
+        elif monthRaw == '11':
+            month = 'NOV'
+        elif monthRaw == '12':
+            month = 'DEC'
+        reconstructedDate = day + month + year
+        return reconstructedDate
+
+    def create_expired_option_market(self, symbol):
+        # support expired option contracts
+        quote = 'USD'
+        settle = None
+        optionParts = symbol.split('-')
+        symbolBase = symbol.split('/')
+        base = None
+        expiry = None
+        if symbol.find('/') > -1:
+            base = self.safe_string(symbolBase, 0)
+            expiry = self.safe_string(optionParts, 1)
+            if symbol.find('USDC') > -1:
+                base = base + '_USDC'
+        else:
+            base = self.safe_string(optionParts, 0)
+            expiry = self.convert_market_id_expire_date(self.safe_string(optionParts, 1))
+        if symbol.find('USDC') > -1:
+            quote = 'USDC'
+            settle = 'USDC'
+        else:
+            settle = base
+        splitBase = base
+        if base.find('_') > -1:
+            splitSymbol = base.split('_')
+            splitBase = self.safe_string(splitSymbol, 0)
+        strike = self.safe_string(optionParts, 2)
+        optionType = self.safe_string(optionParts, 3)
+        datetime = self.convert_expire_date(expiry)
+        timestamp = self.parse8601(datetime)
+        return {
+            'id': base + '-' + self.convert_expire_date_to_market_id_date(expiry) + '-' + strike + '-' + optionType,
+            'symbol': splitBase + '/' + quote + ':' + settle + '-' + expiry + '-' + strike + '-' + optionType,
+            'base': base,
+            'quote': quote,
+            'settle': settle,
+            'baseId': base,
+            'quoteId': quote,
+            'settleId': settle,
+            'active': False,
+            'type': 'option',
+            'linear': None,
+            'inverse': None,
+            'spot': False,
+            'swap': False,
+            'future': False,
+            'option': True,
+            'margin': False,
+            'contract': True,
+            'contractSize': None,
+            'expiry': timestamp,
+            'expiryDatetime': datetime,
+            'optionType': 'call' if (optionType == 'C') else 'put',
+            'strike': self.parse_number(strike),
+            'precision': {
+                'amount': None,
+                'price': None,
+            },
+            'limits': {
+                'amount': {
+                    'min': None,
+                    'max': None,
+                },
+                'price': {
+                    'min': None,
+                    'max': None,
+                },
+                'cost': {
+                    'min': None,
+                    'max': None,
+                },
+            },
+            'info': None,
+        }
+
+    def safe_market(self, marketId=None, market=None, delimiter=None, marketType=None):
+        isOption = (marketId is not None) and ((marketId.endswith('-C')) or (marketId.endswith('-P')))
+        if isOption and not (marketId in self.markets_by_id):
+            # handle expired option contracts
+            return self.create_expired_option_market(marketId)
+        return super(deribit, self).safe_market(marketId, market, delimiter, marketType)
+
     def fetch_time(self, params={}):
         """
         fetches the current integer timestamp in milliseconds from the exchange server

ccxt/okcoin.py

@@ -67,6 +67,9 @@ class okcoin(Exchange, ImplicitAPI):
                 'fetchCurrencies': True,  # see below
                 'fetchDepositAddress': True,
                 'fetchDeposits': True,
+                'fetchFundingHistory': False,
+                'fetchFundingRate': False,
+                'fetchFundingRateHistory': False,
                 'fetchLedger': True,
                 'fetchMarkets': True,
                 'fetchMyTrades': True,

ccxt/phemex.py

@@ -1850,23 +1850,26 @@ class phemex(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://phemex-docs.github.io/#query-wallets
         :see: https://github.com/phemex/phemex-api-docs/blob/master/Public-Hedged-Perpetual-API.md#query-account-positions
+        :see: https://phemex-docs.github.io/#query-trading-account-and-positions
         :param dict [params]: extra parameters specific to the exchange API endpoint
         :param str [params.type]: spot or swap
+        :param str [params.code]: *swap only* currency code of the balance to query(USD, USDT, etc), default is USDT
         :returns dict: a `balance structure <https://docs.ccxt.com/#/?id=balance-structure>`
         """
         self.load_markets()
         type = None
         type, params = self.handle_market_type_and_params('fetchBalance', None, params)
         code = self.safe_string(params, 'code')
-        params = self.omit(params, ['type', 'code'])
+        params = self.omit(params, ['code'])
         response = None
         request = {}
         if (type != 'spot') and (type != 'swap'):
             raise BadRequest(self.id + ' does not support ' + type + ' markets, only spot and swap')
         if type == 'swap':
             settle = None
-            settle, params = self.handle_option_and_params(params, 'fetchBalance', 'settle')
+            settle, params = self.handle_option_and_params(params, 'fetchBalance', 'settle', 'USDT')
             if code is not None or settle is not None:
                 coin = None
                 if code is not None:

ccxt/poloniex.py

@@ -60,6 +60,7 @@ class poloniex(Exchange, ImplicitAPI):
                 'fetchDepositsWithdrawals': True,
                 'fetchDepositWithdrawFee': 'emulated',
                 'fetchDepositWithdrawFees': True,
+                'fetchFundingRate': False,
                 'fetchMarginMode': False,
                 'fetchMarkets': True,
                 'fetchMyTrades': True,

ccxt/pro/__init__.py

@@ -4,7 +4,7 @@
 
 # ----------------------------------------------------------------------------
 
-__version__ = '4.2.21'
+__version__ = '4.2.22'
 
 # ----------------------------------------------------------------------------
 

ccxt/pro/bequant.py

@@ -5,11 +5,17 @@
 
 from ccxt.pro.hitbtc import hitbtc
 
+import ccxt.async_support.bequant as bequantRest
+
 
 class bequant(hitbtc):
 
     def describe(self):
-        return self.deep_extend(super(bequant, self).describe(), {
+        # eslint-disable-next-line new-cap
+        restInstance = bequantRest()
+        restDescribe = restInstance.describe()
+        extended = self.deep_extend(super(bequant, self).describe(), restDescribe)
+        return self.deep_extend(extended, {
             'id': 'bequant',
             'name': 'Bequant',
             'countries': ['MT'],  # Malta

ccxt/pro/binance.py

@@ -49,7 +49,7 @@ class binance(ccxt.async_support.binance):
                     'ws': {
                         'spot': 'wss://testnet.binance.vision/ws',
                         'margin': 'wss://testnet.binance.vision/ws',
-                        'future': 'wss://stream.binancefuture.com/ws',
+                        'future': 'wss://fstream.binancefuture.com/ws',
                         'delivery': 'wss://dstream.binancefuture.com/ws',
                         'ws': 'wss://testnet.binance.vision/ws-api/v3',
                     },
@@ -1811,12 +1811,13 @@ class binance(ccxt.async_support.binance):
 
     async def watch_orders(self, symbol: Str = None, since: Int = None, limit: Int = None, params={}) -> List[Order]:
         """
-        :see: https://binance-docs.github.io/apidocs/spot/en/#payload-order-update
         watches information on multiple orders made by the user
-        :param str symbol: unified market symbol of the market orders were made in
+        :see: https://binance-docs.github.io/apidocs/spot/en/#payload-order-update
+        :param str symbol: unified market symbol of the market the orders were made in
         :param int [since]: the earliest time in ms to fetch orders for
         :param int [limit]: the maximum number of order structures to retrieve
         :param dict [params]: extra parameters specific to the exchange API endpoint
+        :param str|None [params.marginMode]: 'cross' or 'isolated', for spot margin
         :returns dict[]: a list of `order structures <https://docs.ccxt.com/#/?id=order-structure>`
         """
         await self.load_markets()
@@ -1836,8 +1837,10 @@ class binance(ccxt.async_support.binance):
             type = 'delivery'
         params = self.extend(params, {'type': type, 'symbol': symbol})  # needed inside authenticate for isolated margin
         await self.authenticate(params)
+        marginMode = None
+        marginMode, params = self.handle_margin_mode_and_params('watchOrders', params)
         urlType = type
-        if type == 'margin':
+        if (type == 'margin') or ((type == 'spot') and (marginMode is not None)):
             urlType = 'spot'  # spot-margin shares the same stream spot
         url = self.urls['api']['ws'][urlType] + '/' + self.options[type]['listenKey']
         client = self.client(url)

ccxt/pro/binancecoinm.py

@@ -5,11 +5,17 @@
 
 from ccxt.pro.binance import binance
 
+import ccxt.async_support.binancecoinm as binancecoinmRest
+
 
 class binancecoinm(binance):
 
     def describe(self):
-        return self.deep_extend(super(binancecoinm, self).describe(), {
+        # eslint-disable-next-line new-cap
+        restInstance = binancecoinmRest()
+        restDescribe = restInstance.describe()
+        extended = self.deep_extend(super(binancecoinm, self).describe(), restDescribe)
+        return self.deep_extend(extended, {
             'id': 'binancecoinm',
             'name': 'Binance COIN-M',
             'urls': {

ccxt/pro/binanceus.py

@@ -5,11 +5,17 @@
 
 from ccxt.pro.binance import binance
 
+import ccxt.async_support.binanceus as binanceusRest
+
 
 class binanceus(binance):
 
     def describe(self):
-        return self.deep_extend(super(binanceus, self).describe(), {
+        # eslint-disable-next-line new-cap
+        restInstance = binanceusRest()
+        restDescribe = restInstance.describe()
+        extended = self.deep_extend(super(binanceus, self).describe(), restDescribe)
+        return self.deep_extend(extended, {
             'id': 'binanceus',
             'name': 'Binance US',
             'countries': ['US'],  # US

ccxt/pro/bitcoincom.py

@@ -5,11 +5,17 @@
 
 from ccxt.pro.hitbtc import hitbtc
 
+import ccxt.async_support.bequant as bequantRest
+
 
 class bitcoincom(hitbtc):
 
     def describe(self):
-        return self.deep_extend(super(bitcoincom, self).describe(), {
+        # eslint-disable-next-line new-cap
+        restInstance = bequantRest()
+        restDescribe = restInstance.describe()
+        extended = self.deep_extend(super(bitcoincom, self).describe(), restDescribe)
+        return self.deep_extend(extended, {
             'id': 'bitcoincom',
             'name': 'bitcoin.com',
             'countries': ['KN'],

ccxt/pro/bitget.py

@@ -1184,7 +1184,7 @@ class bitget(ccxt.async_support.bitget):
             'price': self.safe_string(order, 'price'),
             'stopPrice': triggerPrice,
             'triggerPrice': triggerPrice,
-            'amount': self.safe_string_2(order, 'size', 'baseSize'),
+            'amount': self.safe_string(order, 'baseVolume'),
             'cost': self.safe_string_n(order, ['notional', 'notionalUsd', 'quoteSize']),
             'average': self.omit_zero(self.safe_string_2(order, 'priceAvg', 'fillPrice')),
             'filled': self.safe_string_2(order, 'accBaseVolume', 'baseVolume'),

ccxt/pro/bitrue.py

@@ -341,7 +341,11 @@ class bitrue(ccxt.async_support.bitrue):
         symbol = market['symbol']
         timestamp = self.safe_integer(message, 'ts')
         tick = self.safe_value(message, 'tick', {})
-        orderbook = self.parse_order_book(tick, symbol, timestamp, 'buys', 'asks')
+        orderbook = self.safe_value(self.orderbooks, symbol)
+        if orderbook is None:
+            orderbook = self.order_book()
+        snapshot = self.parse_order_book(tick, symbol, timestamp, 'buys', 'asks')
+        orderbook.reset(snapshot)
         self.orderbooks[symbol] = orderbook
         messageHash = 'orderbook:' + symbol
         client.resolve(orderbook, messageHash)

ccxt/pro/okx.py

@@ -949,17 +949,20 @@ class okx(ccxt.async_support.okx):
 
     async def watch_orders(self, symbol: Str = None, since: Int = None, limit: Int = None, params={}) -> List[Order]:
         """
-        :see: https://www.okx.com/docs-v5/en/#order-book-trading-trade-ws-order-channel
         watches information on multiple orders made by the user
-        :param str [symbol]: unified market symbol of the market orders were made in
+        :see: https://www.okx.com/docs-v5/en/#order-book-trading-trade-ws-order-channel
+        :param str [symbol]: unified market symbol of the market the orders were made in
         :param int [since]: the earliest time in ms to fetch orders for
         :param int [limit]: the maximum number of order structures to retrieve
         :param dict [params]: extra parameters specific to the exchange API endpoint
         :param bool [params.stop]: True if fetching trigger or conditional orders
+        :param str [params.type]: 'spot', 'swap', 'future', 'option', 'ANY', 'SPOT', 'MARGIN', 'SWAP', 'FUTURES' or 'OPTION'
+        :param str [params.marginMode]: 'cross' or 'isolated', for automatically setting the type to spot margin
         :returns dict[]: a list of `order structures <https://docs.ccxt.com/#/?id=order-structure>`
         """
         type = None
         # By default, receive order updates from any instrument type
+        type, params = self.handle_option_and_params(params, 'watchOrders', 'defaultType')
         type, params = self.handle_option_and_params(params, 'watchOrders', 'type', 'ANY')
         isStop = self.safe_value_2(params, 'stop', 'trigger', False)
         params = self.omit(params, ['stop', 'trigger'])
@@ -973,6 +976,11 @@ class okx(ccxt.async_support.okx):
         if type == 'future':
             type = 'futures'
         uppercaseType = type.upper()
+        marginMode = None
+        marginMode, params = self.handle_margin_mode_and_params('watchOrders', params)
+        if uppercaseType == 'SPOT':
+            if marginMode is not None:
+                uppercaseType = 'MARGIN'
         request = {
             'instType': uppercaseType,
         }

ccxt/test/test_async.py

@@ -274,6 +274,10 @@ class testMainClass(baseMainTestClass):
 
     async def init(self, exchange_id, symbol_argv):
         self.parse_cli_args()
+        if self.request_tests and self.response_tests:
+            await self.run_static_request_tests(exchange_id, symbol_argv)
+            await self.run_static_response_tests(exchange_id, symbol_argv)
+            return
         if self.response_tests:
             await self.run_static_response_tests(exchange_id, symbol_argv)
             return
@@ -1053,6 +1057,9 @@ class testMainClass(baseMainTestClass):
             results = methods[method]
             for j in range(0, len(results)):
                 result = results[j]
+                old_exchange_options = exchange.options  # snapshot options;
+                test_exchange_options = exchange.safe_value(result, 'options', {})
+                exchange.options = exchange.deep_extend(old_exchange_options, test_exchange_options)  # custom options to be used in the tests
                 description = exchange.safe_value(result, 'description')
                 if (test_name is not None) and (test_name != description):
                     continue
@@ -1062,6 +1069,8 @@ class testMainClass(baseMainTestClass):
                 type = exchange.safe_string(exchange_data, 'outputType')
                 skip_keys = exchange.safe_value(exchange_data, 'skipKeys', [])
                 await self.test_method_statically(exchange, method, result, type, skip_keys)
+                # reset options
+                exchange.options = old_exchange_options
         await close(exchange)
 
     async def test_exchange_response_statically(self, exchange_name, exchange_data, test_name=None):
@@ -1076,6 +1085,9 @@ class testMainClass(baseMainTestClass):
             for j in range(0, len(results)):
                 result = results[j]
                 description = exchange.safe_value(result, 'description')
+                old_exchange_options = exchange.options  # snapshot options;
+                test_exchange_options = exchange.safe_value(result, 'options', {})
+                exchange.options = exchange.deep_extend(old_exchange_options, test_exchange_options)  # custom options to be used in the tests
                 is_disabled = exchange.safe_value(result, 'disabled', False)
                 if is_disabled:
                     continue
@@ -1086,6 +1098,8 @@ class testMainClass(baseMainTestClass):
                     continue
                 skip_keys = exchange.safe_value(exchange_data, 'skipKeys', [])
                 await self.test_response_statically(exchange, method, skip_keys, result)
+                # reset options
+                exchange.options = old_exchange_options
         await close(exchange)
 
     def get_number_of_tests_from_exchange(self, exchange, exchange_data):
@@ -1130,7 +1144,6 @@ class testMainClass(baseMainTestClass):
         else:
             success_message = '[' + self.lang + '][TEST_SUCCESS] ' + str(sum) + ' static ' + type + ' tests passed.'
             dump('[INFO]' + success_message)
-            exit_script(0)
 
     async def run_static_response_tests(self, exchange_name=None, test=None):
         #  -----------------------------------------------------------------------------

ccxt/test/test_sync.py

@@ -273,6 +273,10 @@ class testMainClass(baseMainTestClass):
 
     def init(self, exchange_id, symbol_argv):
         self.parse_cli_args()
+        if self.request_tests and self.response_tests:
+            self.run_static_request_tests(exchange_id, symbol_argv)
+            self.run_static_response_tests(exchange_id, symbol_argv)
+            return
         if self.response_tests:
             self.run_static_response_tests(exchange_id, symbol_argv)
             return
@@ -1052,6 +1056,9 @@ class testMainClass(baseMainTestClass):
             results = methods[method]
             for j in range(0, len(results)):
                 result = results[j]
+                old_exchange_options = exchange.options  # snapshot options;
+                test_exchange_options = exchange.safe_value(result, 'options', {})
+                exchange.options = exchange.deep_extend(old_exchange_options, test_exchange_options)  # custom options to be used in the tests
                 description = exchange.safe_value(result, 'description')
                 if (test_name is not None) and (test_name != description):
                     continue
@@ -1061,6 +1068,8 @@ class testMainClass(baseMainTestClass):
                 type = exchange.safe_string(exchange_data, 'outputType')
                 skip_keys = exchange.safe_value(exchange_data, 'skipKeys', [])
                 self.test_method_statically(exchange, method, result, type, skip_keys)
+                # reset options
+                exchange.options = old_exchange_options
         close(exchange)
 
     def test_exchange_response_statically(self, exchange_name, exchange_data, test_name=None):
@@ -1075,6 +1084,9 @@ class testMainClass(baseMainTestClass):
             for j in range(0, len(results)):
                 result = results[j]
                 description = exchange.safe_value(result, 'description')
+                old_exchange_options = exchange.options  # snapshot options;
+                test_exchange_options = exchange.safe_value(result, 'options', {})
+                exchange.options = exchange.deep_extend(old_exchange_options, test_exchange_options)  # custom options to be used in the tests
                 is_disabled = exchange.safe_value(result, 'disabled', False)
                 if is_disabled:
                     continue
@@ -1085,6 +1097,8 @@ class testMainClass(baseMainTestClass):
                     continue
                 skip_keys = exchange.safe_value(exchange_data, 'skipKeys', [])
                 self.test_response_statically(exchange, method, skip_keys, result)
+                # reset options
+                exchange.options = old_exchange_options
         close(exchange)
 
     def get_number_of_tests_from_exchange(self, exchange, exchange_data):
@@ -1129,7 +1143,6 @@ class testMainClass(baseMainTestClass):
         else:
             success_message = '[' + self.lang + '][TEST_SUCCESS] ' + str(sum) + ' static ' + type + ' tests passed.'
             dump('[INFO]' + success_message)
-            exit_script(0)
 
     def run_static_response_tests(self, exchange_name=None, test=None):
         #  -----------------------------------------------------------------------------

ccxt/woo.py

@@ -66,7 +66,7 @@ class woo(Exchange, ImplicitAPI):
                 'fetchClosedOrder': False,
                 'fetchClosedOrders': False,
                 'fetchCurrencies': True,
-                'fetchDepositAddress': False,
+                'fetchDepositAddress': True,
                 'fetchDeposits': True,
                 'fetchDepositsWithdrawals': True,
                 'fetchFundingHistory': True,

{ccxt-4.2.21.dist-info → ccxt-4.2.22.dist-info}/METADATA

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