ccxt 4.4.63__py2.py3-none-any.whl → 4.4.68__py2.py3-none-any.whl

ccxt/pro/gate.py

@@ -46,6 +46,7 @@ class gate(ccxt.async_support.gate):
                 'fetchOpenOrdersWs': True,
                 'fetchClosedOrdersWs': True,
                 'watchOrderBook': True,
+                'watchBidsAsks': True,
                 'watchTicker': True,
                 'watchTickers': True,
                 'watchTrades': True,
@@ -1128,7 +1129,9 @@ class gate(ccxt.async_support.gate):
         cache = self.positions[type]
         for i in range(0, len(positions)):
             position = positions[i]
-            cache.append(position)
+            contracts = self.safe_number(position, 'contracts', 0)
+            if contracts > 0:
+                cache.append(position)
         # don't remove the future from the .futures cache
         future = client.futures[messageHash]
         future.resolve(cache)
@@ -1892,6 +1895,10 @@ class gate(ccxt.async_support.gate):
             'signature': signature,
             'req_param': reqParams,
         }
+        if (channel == 'spot.order_place') or (channel == 'futures.order_place'):
+            payload['req_header'] = {
+                'X-Gate-Channel-Id': 'ccxt',
+            }
         request: dict = {
             'id': requestId,
             'time': time,

ccxt/pro/hyperliquid.py

@@ -101,7 +101,7 @@ class hyperliquid(ccxt.async_support.hyperliquid):
         :returns dict: an `order structure <https://docs.ccxt.com/#/?id=order-structure>`
         """
         await self.load_markets()
-        order, globalParams = self.parseCreateOrderArgs(symbol, type, side, amount, price, params)
+        order, globalParams = self.parseCreateEditOrderArgs(None, symbol, type, side, amount, price, params)
         orders = await self.create_orders_ws([order], globalParams)
         return orders[0]
 
@@ -109,7 +109,6 @@ class hyperliquid(ccxt.async_support.hyperliquid):
         """
         edit a trade order
 
-        https://hyperliquid.gitbook.io/hyperliquid-docs/for-developers/api/exchange-endpoint#modify-an-order
         https://hyperliquid.gitbook.io/hyperliquid-docs/for-developers/api/exchange-endpoint#modify-multiple-orders
 
         :param str id: cancel order id
@@ -130,7 +129,8 @@ class hyperliquid(ccxt.async_support.hyperliquid):
         await self.load_markets()
         market = self.market(symbol)
         url = self.urls['api']['ws']['public']
-        postRequest = self.edit_order_request(id, symbol, type, side, amount, price, params)
+        order, globalParams = self.parseCreateEditOrderArgs(id, symbol, type, side, amount, price, params)
+        postRequest = self.editOrdersRequest([order], globalParams)
         wrapped = self.wrap_as_post_action(postRequest)
         request = self.safe_dict(wrapped, 'request', {})
         requestId = self.safe_string(wrapped, 'requestId')

ccxt/pro/vertex.py

@@ -55,6 +55,11 @@ class vertex(ccxt.async_support.vertex):
                 },
                 'ws': {
                     'inflate': True,
+                    'options': {
+                        'headers': {
+                            'Sec-WebSocket-Extensions': 'permessage-deflate',  # requires permessage-deflate extension, maybe we can set self in client implementation when self.inflateis True
+                        },
+                    },
                 },
             },
             'streaming': {

ccxt/test/tests_async.py

@@ -1022,8 +1022,7 @@ class testMainClass:
                 skip_keys = exchange.safe_value(exchange_data, 'skipKeys', [])
                 await self.test_request_statically(exchange, method, result, type, skip_keys)
                 # reset options
-                # exchange.options = exchange.deepExtend (oldExchangeOptions, {});
-                exchange.extend_exchange_options(exchange.deep_extend(old_exchange_options, {}))
+                exchange.options = exchange.convert_to_safe_dictionary(exchange.deep_extend(old_exchange_options, {}))
         if not is_sync():
             await close(exchange)
         return True   # in c# methods that will be used with promiseAll need to return something
@@ -1147,7 +1146,7 @@ class testMainClass:
         #  -----------------------------------------------------------------------------
         #  --- Init of brokerId tests functions-----------------------------------------
         #  -----------------------------------------------------------------------------
-        promises = [self.test_binance(), self.test_okx(), self.test_cryptocom(), self.test_bybit(), self.test_kucoin(), self.test_kucoinfutures(), self.test_bitget(), self.test_mexc(), self.test_htx(), self.test_woo(), self.test_bitmart(), self.test_coinex(), self.test_bingx(), self.test_phemex(), self.test_blofin(), self.test_hyperliquid(), self.test_coinbaseinternational(), self.test_coinbase_advanced(), self.test_woofi_pro(), self.test_oxfun(), self.test_xt(), self.test_vertex(), self.test_paradex(), self.test_hashkey(), self.test_coincatch(), self.test_defx()]
+        promises = [self.test_binance(), self.test_okx(), self.test_cryptocom(), self.test_bybit(), self.test_kucoin(), self.test_kucoinfutures(), self.test_bitget(), self.test_mexc(), self.test_htx(), self.test_woo(), self.test_bitmart(), self.test_coinex(), self.test_bingx(), self.test_phemex(), self.test_blofin(), self.test_hyperliquid(), self.test_coinbaseinternational(), self.test_coinbase_advanced(), self.test_woofi_pro(), self.test_oxfun(), self.test_xt(), self.test_vertex(), self.test_paradex(), self.test_hashkey(), self.test_coincatch(), self.test_defx(), self.test_cryptomus(), self.test_derive()]
         await asyncio.gather(*promises)
         success_message = '[' + self.lang + '][TEST_SUCCESS] brokerId tests passed.'
         dump('[INFO]' + success_message)
@@ -1642,3 +1641,37 @@ class testMainClass:
         if not is_sync():
             await close(exchange)
         return True
+
+    async def test_cryptomus(self):
+        exchange = self.init_offline_exchange('cryptomus')
+        request = None
+        try:
+            await exchange.create_order('BTC/USDT', 'limit', 'sell', 1, 20000)
+        except Exception as e:
+            request = json_parse(exchange.last_request_body)
+        tag = 'ccxt'
+        assert request['tag'] == tag, 'cryptomus - tag: ' + tag + ' not in request.'
+        if not is_sync():
+            await close(exchange)
+        return True
+
+    async def test_derive(self):
+        exchange = self.init_offline_exchange('derive')
+        id = '0x0ad42b8e602c2d3d475ae52d678cf63d84ab2749'
+        assert exchange.options['id'] == id, 'derive - id: ' + id + ' not in options'
+        request = None
+        try:
+            params = {
+                'subaccount_id': 1234,
+                'max_fee': 10,
+                'deriveWalletAddress': '0x0ad42b8e602c2d3d475ae52d678cf63d84ab2749',
+            }
+            exchange.walletAddress = '0x0ad42b8e602c2d3d475ae52d678cf63d84ab2749'
+            exchange.privateKey = '0x7b77bb7b20e92bbb85f2a22b330b896959229a5790e35f2f290922de3fb22ad5'
+            await exchange.create_order('LBTC/USDC', 'limit', 'sell', 0.01, 3000, params)
+        except Exception as e:
+            request = json_parse(exchange.last_request_body)
+        assert request['referral_code'] == id, 'derive - referral_code: ' + id + ' not in request.'
+        if not is_sync():
+            await close(exchange)
+        return True

ccxt/test/tests_sync.py

@@ -1019,8 +1019,7 @@ class testMainClass:
                 skip_keys = exchange.safe_value(exchange_data, 'skipKeys', [])
                 self.test_request_statically(exchange, method, result, type, skip_keys)
                 # reset options
-                # exchange.options = exchange.deepExtend (oldExchangeOptions, {});
-                exchange.extend_exchange_options(exchange.deep_extend(old_exchange_options, {}))
+                exchange.options = exchange.convert_to_safe_dictionary(exchange.deep_extend(old_exchange_options, {}))
         if not is_sync():
             close(exchange)
         return True   # in c# methods that will be used with promiseAll need to return something
@@ -1144,7 +1143,7 @@ class testMainClass:
         #  -----------------------------------------------------------------------------
         #  --- Init of brokerId tests functions-----------------------------------------
         #  -----------------------------------------------------------------------------
-        promises = [self.test_binance(), self.test_okx(), self.test_cryptocom(), self.test_bybit(), self.test_kucoin(), self.test_kucoinfutures(), self.test_bitget(), self.test_mexc(), self.test_htx(), self.test_woo(), self.test_bitmart(), self.test_coinex(), self.test_bingx(), self.test_phemex(), self.test_blofin(), self.test_hyperliquid(), self.test_coinbaseinternational(), self.test_coinbase_advanced(), self.test_woofi_pro(), self.test_oxfun(), self.test_xt(), self.test_vertex(), self.test_paradex(), self.test_hashkey(), self.test_coincatch(), self.test_defx()]
+        promises = [self.test_binance(), self.test_okx(), self.test_cryptocom(), self.test_bybit(), self.test_kucoin(), self.test_kucoinfutures(), self.test_bitget(), self.test_mexc(), self.test_htx(), self.test_woo(), self.test_bitmart(), self.test_coinex(), self.test_bingx(), self.test_phemex(), self.test_blofin(), self.test_hyperliquid(), self.test_coinbaseinternational(), self.test_coinbase_advanced(), self.test_woofi_pro(), self.test_oxfun(), self.test_xt(), self.test_vertex(), self.test_paradex(), self.test_hashkey(), self.test_coincatch(), self.test_defx(), self.test_cryptomus(), self.test_derive()]
         (promises)
         success_message = '[' + self.lang + '][TEST_SUCCESS] brokerId tests passed.'
         dump('[INFO]' + success_message)
@@ -1639,3 +1638,37 @@ class testMainClass:
         if not is_sync():
             close(exchange)
         return True
+
+    def test_cryptomus(self):
+        exchange = self.init_offline_exchange('cryptomus')
+        request = None
+        try:
+            exchange.create_order('BTC/USDT', 'limit', 'sell', 1, 20000)
+        except Exception as e:
+            request = json_parse(exchange.last_request_body)
+        tag = 'ccxt'
+        assert request['tag'] == tag, 'cryptomus - tag: ' + tag + ' not in request.'
+        if not is_sync():
+            close(exchange)
+        return True
+
+    def test_derive(self):
+        exchange = self.init_offline_exchange('derive')
+        id = '0x0ad42b8e602c2d3d475ae52d678cf63d84ab2749'
+        assert exchange.options['id'] == id, 'derive - id: ' + id + ' not in options'
+        request = None
+        try:
+            params = {
+                'subaccount_id': 1234,
+                'max_fee': 10,
+                'deriveWalletAddress': '0x0ad42b8e602c2d3d475ae52d678cf63d84ab2749',
+            }
+            exchange.walletAddress = '0x0ad42b8e602c2d3d475ae52d678cf63d84ab2749'
+            exchange.privateKey = '0x7b77bb7b20e92bbb85f2a22b330b896959229a5790e35f2f290922de3fb22ad5'
+            exchange.create_order('LBTC/USDC', 'limit', 'sell', 0.01, 3000, params)
+        except Exception as e:
+            request = json_parse(exchange.last_request_body)
+        assert request['referral_code'] == id, 'derive - referral_code: ' + id + ' not in request.'
+        if not is_sync():
+            close(exchange)
+        return True

ccxt/tradeogre.py

@@ -5,7 +5,7 @@
 
 from ccxt.base.exchange import Exchange
 from ccxt.abstract.tradeogre import ImplicitAPI
-from ccxt.base.types import Any, IndexType, Int, Market, Num, Order, OrderSide, OrderType, Str, Ticker
+from ccxt.base.types import Any, IndexType, Int, Market, Num, Order, OrderSide, OrderType, Str, Strings, Ticker, Tickers
 from typing import List
 from ccxt.base.errors import ExchangeError
 from ccxt.base.errors import AuthenticationError
@@ -74,7 +74,7 @@ class tradeogre(Exchange, ImplicitAPI):
                 'fetchMarkets': True,
                 'fetchMarkOHLCV': False,
                 'fetchMyTrades': False,
-                'fetchOHLCV': False,
+                'fetchOHLCV': True,
                 'fetchOpenInterest': False,
                 'fetchOpenInterestHistory': False,
                 'fetchOpenOrders': True,
@@ -92,7 +92,7 @@ class tradeogre(Exchange, ImplicitAPI):
                 'fetchPositionsRisk': False,
                 'fetchPremiumIndexOHLCV': False,
                 'fetchTicker': True,
-                'fetchTickers': False,
+                'fetchTickers': True,
                 'fetchTrades': True,
                 'fetchTradingLimits': False,
                 'fetchTransactionFee': False,
@@ -134,6 +134,7 @@ class tradeogre(Exchange, ImplicitAPI):
                         'orders/{market}': 1,
                         'ticker/{market}': 1,
                         'history/{market}': 1,
+                        'chart/{interval}/{market}': 1,
                     },
                 },
                 'private': {
@@ -162,6 +163,14 @@ class tradeogre(Exchange, ImplicitAPI):
                     'Order not found': BadRequest,
                 },
             },
+            'timeframes': {
+                '1m': '1m',
+                '15m': '15m',
+                '1h': '1h',
+                '4h': '4h',
+                '1d': '1d',
+                '1w': '1w',
+            },
             'options': {
             },
             'features': {
@@ -335,18 +344,72 @@ class tradeogre(Exchange, ImplicitAPI):
         #
         return self.parse_ticker(response, market)
 
+    def fetch_tickers(self, symbols: Strings = None, params={}) -> Tickers:
+        """
+        fetches price tickers for multiple markets, statistical information calculated over the past 24 hours for each market
+        :param str[]|None symbols: unified symbols of the markets to fetch the ticker for, all market tickers are returned if not assigned
+        :param dict [params]: extra parameters specific to the exchange API endpoint
+        :returns dict: a dictionary of `ticker structures <https://docs.ccxt.com/#/?id=ticker-structure>`
+        """
+        self.load_markets()
+        symbols = self.market_symbols(symbols)
+        request: dict = {}
+        response = self.publicGetMarkets(self.extend(request, params))
+        #
+        #     [
+        #         {
+        #             "AAVE-USDT": {
+        #                 "initialprice": "177.20325711",
+        #                 "price": "177.20325711",
+        #                 "high": "177.20325711",
+        #                 "low": "177.20325711",
+        #                 "volume": "0.00000000",
+        #                 "bid": "160.72768581",
+        #                 "ask": "348.99999999",
+        #                 "basename": "Aave"
+        #             }
+        #         },
+        #         ...
+        #     ]
+        #
+        result: dict = {}
+        for i in range(0, len(response)):
+            entry = response[i]
+            marketIdArray = list(entry.keys())
+            marketId = self.safe_string(marketIdArray, 0)
+            market = self.safe_market(marketId)
+            data = entry[marketId]
+            ticker = self.parse_ticker(data, market)
+            symbol = ticker['symbol']
+            result[symbol] = ticker
+        return self.filter_by_array_tickers(result, 'symbol', symbols)
+
     def parse_ticker(self, ticker, market: Market = None):
         #
-        #  {
-        #       "success":true,
-        #       "initialprice":"0.02502002",
-        #       "price":"0.02500000",
-        #       "high":"0.03102001",
-        #       "low":"0.02500000",
-        #       "volume":"0.15549958",
-        #       "bid":"0.02420000",
-        #       "ask":"0.02625000"
-        #   }
+        #  fetchTicker:
+        #     {
+        #         "success":true,
+        #         "initialprice":"0.02502002",
+        #         "price":"0.02500000",
+        #         "high":"0.03102001",
+        #         "low":"0.02500000",
+        #         "volume":"0.15549958",
+        #         "bid":"0.02420000",
+        #         "ask":"0.02625000"
+        #     }
+        #
+        #  fetchTickers:
+        #     {
+        #         "initialprice": "177.20325711",
+        #         "price": "177.20325711",
+        #         "high": "177.20325711",
+        #         "low": "177.20325711",
+        #         "volume": "0.00000000",
+        #         "bid": "160.72768581",
+        #         "ask": "348.99999999",
+        #         "basename": "Aave"
+        #     },
+        #     ...
         #
         return self.safe_ticker({
             'symbol': self.safe_string(market, 'symbol'),
@@ -371,6 +434,62 @@ class tradeogre(Exchange, ImplicitAPI):
             'info': ticker,
         }, market)
 
+    def fetch_ohlcv(self, symbol: str, timeframe='1m', since: Int = None, limit: Int = None, params={}) -> List[list]:
+        """
+        fetches historical candlestick data containing the open, high, low, and close price, and the volume of a market
+        :param str symbol: unified symbol of the market to fetch OHLCV data for
+        :param str timeframe: the length of time each candle represents
+        :param int [since]: timestamp in ms of the earliest candle to fetch
+        :param int [limit]: the maximum amount of candles to fetch
+        :param dict [params]: extra parameters specific to the exchange API endpoint
+        :param int [params.until]: timestamp of the latest candle in ms
+        :returns int[][]: A list of candles ordered, open, high, low, close, volume
+        """
+        self.load_markets()
+        market = self.market(symbol)
+        request: dict = {
+            'market': market['id'],
+            'interval': self.safe_string(self.timeframes, timeframe, timeframe),
+        }
+        until = self.safe_integer(params, 'until')
+        if until is not None:
+            params = self.omit(params, 'until')
+            request['timestamp'] = until
+        response = self.publicGetChartIntervalMarket(self.extend(request, params))
+        #
+        #     [
+        #         [
+        #             1729130040,
+        #             67581.47235999,
+        #             67581.47235999,
+        #             67338.01,
+        #             67338.01,
+        #             6.72168016
+        #         ],
+        #     ]
+        #
+        return self.parse_ohlcvs(response, market, timeframe, since, limit)
+
+    def parse_ohlcv(self, ohlcv, market: Market = None) -> list:
+        #
+        #     [
+        #         1729130040,
+        #         67581.47235999,
+        #         67581.47235999,
+        #         67338.01,
+        #         67338.01,
+        #         6.72168016
+        #     ]
+        #
+        return [
+            self.safe_timestamp(ohlcv, 0),
+            self.safe_number(ohlcv, 1),
+            self.safe_number(ohlcv, 3),
+            self.safe_number(ohlcv, 4),
+            self.safe_number(ohlcv, 2),
+            self.safe_number(ohlcv, 5),
+        ]
+
     def fetch_order_book(self, symbol: str, limit: Int = None, params={}):
         """
         fetches information on open orders with bid(buy) and ask(sell) prices, volumes and other data