bitmart 0.0.93__tar.gz → 0.0.106__tar.gz

{bitmart-0.0.93 → bitmart-0.0.106}/.gitignore

@@ -173,5 +173,4 @@ cython_debug/
 .pypirc
 
 build/ccxt
-/meta.json
 /build/package-lock.json

{bitmart-0.0.93 → bitmart-0.0.106}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: bitmart
-Version: 0.0.93
+Version: 0.0.106
 Summary: bitmart crypto exchange api client
 Project-URL: Homepage, https://github.com/ccxt/ccxt
 Project-URL: Issues, https://github.com/ccxt/ccxt
@@ -150,7 +150,7 @@ You can also construct custom requests to available "implicit" endpoints
 - `fetch_markets(self, params={})`
 - `fetch_my_liquidations(self, symbol: Str = None, since: Int = None, limit: Int = None, params={})`
 - `fetch_my_trades(self, symbol: Str = None, since: Int = None, limit: Int = None, params={})`
-- `fetch_ohlcv(self, symbol: str, timeframe='1m', since: Int = None, limit: Int = None, params={})`
+- `fetch_ohlcv(self, symbol: str, timeframe: str = '1m', since: Int = None, limit: Int = None, params={})`
 - `fetch_open_interest(self, symbol: str, params={})`
 - `fetch_open_orders(self, symbol: Str = None, since: Int = None, limit: Int = None, params={})`
 - `fetch_order_book(self, symbol: str, limit: Int = None, params={})`
@@ -321,7 +321,7 @@ You can also construct custom requests to available "implicit" endpoints
 - `watch_bids_asks(self, symbols: Strings = None, params={})`
 - `watch_orders(self, symbol: Str = None, since: Int = None, limit: Int = None, params={})`
 - `watch_positions(self, symbols: Strings = None, since: Int = None, limit: Int = None, params={})`
-- `watch_ohlcv(self, symbol: str, timeframe='1m', since: Int = None, limit: Int = None, params={})`
+- `watch_ohlcv(self, symbol: str, timeframe: str = '1m', since: Int = None, limit: Int = None, params={})`
 - `watch_order_book(self, symbol: str, limit: Int = None, params={})`
 - `watch_order_book_for_symbols(self, symbols: List[str], limit: Int = None, params={})`
 - `authenticate(self, type, params={})`

{bitmart-0.0.93 → bitmart-0.0.106}/README.md

@@ -131,7 +131,7 @@ You can also construct custom requests to available "implicit" endpoints
 - `fetch_markets(self, params={})`
 - `fetch_my_liquidations(self, symbol: Str = None, since: Int = None, limit: Int = None, params={})`
 - `fetch_my_trades(self, symbol: Str = None, since: Int = None, limit: Int = None, params={})`
-- `fetch_ohlcv(self, symbol: str, timeframe='1m', since: Int = None, limit: Int = None, params={})`
+- `fetch_ohlcv(self, symbol: str, timeframe: str = '1m', since: Int = None, limit: Int = None, params={})`
 - `fetch_open_interest(self, symbol: str, params={})`
 - `fetch_open_orders(self, symbol: Str = None, since: Int = None, limit: Int = None, params={})`
 - `fetch_order_book(self, symbol: str, limit: Int = None, params={})`
@@ -302,7 +302,7 @@ You can also construct custom requests to available "implicit" endpoints
 - `watch_bids_asks(self, symbols: Strings = None, params={})`
 - `watch_orders(self, symbol: Str = None, since: Int = None, limit: Int = None, params={})`
 - `watch_positions(self, symbols: Strings = None, since: Int = None, limit: Int = None, params={})`
-- `watch_ohlcv(self, symbol: str, timeframe='1m', since: Int = None, limit: Int = None, params={})`
+- `watch_ohlcv(self, symbol: str, timeframe: str = '1m', since: Int = None, limit: Int = None, params={})`
 - `watch_order_book(self, symbol: str, limit: Int = None, params={})`
 - `watch_order_book_for_symbols(self, symbols: List[str], limit: Int = None, params={})`
 - `authenticate(self, type, params={})`

{bitmart-0.0.93 → bitmart-0.0.106}/pyproject.toml

@@ -11,7 +11,7 @@ only-include = ["src/bitmart"]
 
 [project]
 name = "bitmart"
-version = "0.0.93"
+version = "0.0.106"
 authors = [
     { name="CCXT", email="info@ccxt.trade" },
 ]

{bitmart-0.0.93 → bitmart-0.0.106}/src/bitmart/ccxt/__init__.py

@@ -26,7 +26,7 @@ sys.modules['ccxt'] = ccxt_module
 
 # ----------------------------------------------------------------------------
 
-__version__ = '4.5.8'
+__version__ = '4.5.20'
 
 # ----------------------------------------------------------------------------
 

{bitmart-0.0.93 → bitmart-0.0.106}/src/bitmart/ccxt/async_support/__init__.py

@@ -8,7 +8,7 @@ sys.modules['ccxt'] = ccxt_module
 
 # -----------------------------------------------------------------------------
 
-__version__ = '4.5.8'
+__version__ = '4.5.20'
 
 # -----------------------------------------------------------------------------
 

{bitmart-0.0.93 → bitmart-0.0.106}/src/bitmart/ccxt/async_support/base/exchange.py

@@ -2,7 +2,7 @@
 
 # -----------------------------------------------------------------------------
 
-__version__ = '4.5.8'
+__version__ = '4.5.20'
 
 # -----------------------------------------------------------------------------
 
@@ -25,7 +25,7 @@ from ccxt.async_support.base.throttler import Throttler
 # -----------------------------------------------------------------------------
 
 from ccxt.base.errors import BaseError, BadSymbol, BadRequest, BadResponse, ExchangeError, ExchangeNotAvailable, RequestTimeout, NotSupported, NullResponse, InvalidAddress, RateLimitExceeded, OperationFailed
-from ccxt.base.types import ConstructorArgs, OrderType, OrderSide, OrderRequest, CancellationRequest
+from ccxt.base.types import ConstructorArgs, OrderType, OrderSide, OrderRequest, CancellationRequest, Order
 
 # -----------------------------------------------------------------------------
 
@@ -42,9 +42,9 @@ from ccxt.async_support.base.ws.order_book import OrderBook, IndexedOrderBook, C
 # -----------------------------------------------------------------------------
 
 try:
-    from aiohttp_socks import ProxyConnector
+    from aiohttp_socks import ProxyConnector as SocksProxyConnector
 except ImportError:
-    ProxyConnector = None
+    SocksProxyConnector = None
 
 # -----------------------------------------------------------------------------
 
@@ -177,7 +177,7 @@ class Exchange(BaseExchange):
         elif httpsProxy:
             final_proxy = httpsProxy
         elif socksProxy:
-            if ProxyConnector is None:
+            if SocksProxyConnector is None:
                 raise NotSupported(self.id + ' - to use SOCKS proxy with ccxt, you need "aiohttp_socks" module that can be installed by "pip install aiohttp_socks"')
             # override session
             if (self.socks_proxy_sessions is None):
@@ -274,12 +274,15 @@ class Exchange(BaseExchange):
         if (self.socks_proxy_sessions is None):
             self.socks_proxy_sessions = {}
         if (socksProxy not in self.socks_proxy_sessions):
-            self.aiohttp_socks_connector = ProxyConnector.from_url(
-                socksProxy,
+            reverse_dns = socksProxy.startswith('socks5h://')
+            socks_proxy_selected = socksProxy if not reverse_dns else socksProxy.replace('socks5h://', 'socks5://')
+            self.aiohttp_socks_connector = SocksProxyConnector.from_url(
+                socks_proxy_selected,
                 # extra args copied from self.open()
                 ssl=self.ssl_context,
                 loop=self.asyncio_loop,
-                enable_cleanup_closed=True
+                enable_cleanup_closed=True,
+                rdns=reverse_dns if reverse_dns else None
             )
             self.socks_proxy_sessions[socksProxy] = aiohttp.ClientSession(loop=self.asyncio_loop, connector=self.aiohttp_socks_connector, trust_env=self.aiohttp_trust_env)
         return self.socks_proxy_sessions[socksProxy]
@@ -608,6 +611,9 @@ class Exchange(BaseExchange):
         # }
         return dict_msg
 
+    async def load_dydx_protos(self):
+        return
+
     # ########################################################################
     # ########################################################################
     # ########################################################################
@@ -711,6 +717,12 @@ class Exchange(BaseExchange):
     async def un_watch_ticker(self, symbol: str, params={}):
         raise NotSupported(self.id + ' unWatchTicker() is not supported yet')
 
+    async def un_watch_mark_price(self, symbol: str, params={}):
+        raise NotSupported(self.id + ' unWatchMarkPrice() is not supported yet')
+
+    async def un_watch_mark_prices(self, symbols: Strings = None, params={}):
+        raise NotSupported(self.id + ' unWatchMarkPrices() is not supported yet')
+
     async def fetch_deposit_addresses(self, codes: Strings = None, params={}):
         raise NotSupported(self.id + ' fetchDepositAddresses() is not supported yet')
 
@@ -1004,6 +1016,9 @@ class Exchange(BaseExchange):
         await self.cancel_order(id, symbol)
         return await self.create_order(symbol, type, side, amount, price, params)
 
+    async def edit_order_with_client_order_id(self, clientOrderId: str, symbol: str, type: OrderType, side: OrderSide, amount: Num = None, price: Num = None, params={}):
+        return await self.edit_order('', symbol, type, side, amount, price, self.extend({'clientOrderId': clientOrderId}, params))
+
     async def edit_order_ws(self, id: str, symbol: str, type: OrderType, side: OrderSide, amount: Num = None, price: Num = None, params={}):
         await self.cancel_order_ws(id, symbol)
         return await self.create_order_ws(symbol, type, side, amount, price, params)
@@ -1193,6 +1208,17 @@ class Exchange(BaseExchange):
     async def fetch_order(self, id: str, symbol: Str = None, params={}):
         raise NotSupported(self.id + ' fetchOrder() is not supported yet')
 
+    async def fetch_order_with_client_order_id(self, clientOrderId: str, symbol: Str = None, params={}):
+        """
+        create a market order by providing the symbol, side and cost
+        :param str clientOrderId: client order Id
+        :param str symbol: unified symbol of the market to create an order in
+        :param dict [params]: extra parameters specific to the exchange API endpoint
+        :returns dict: an `order structure <https://docs.ccxt.com/#/?id=order-structure>`
+        """
+        extendedParams = self.extend(params, {'clientOrderId': clientOrderId})
+        return await self.fetch_order('', symbol, extendedParams)
+
     async def fetch_order_ws(self, id: str, symbol: Str = None, params={}):
         raise NotSupported(self.id + ' fetchOrderWs() is not supported yet')
 
@@ -1536,9 +1562,34 @@ class Exchange(BaseExchange):
     async def cancel_order(self, id: str, symbol: Str = None, params={}):
         raise NotSupported(self.id + ' cancelOrder() is not supported yet')
 
+    async def cancel_order_with_client_order_id(self, clientOrderId: str, symbol: Str = None, params={}):
+        """
+        create a market order by providing the symbol, side and cost
+        :param str clientOrderId: client order Id
+        :param str symbol: unified symbol of the market to create an order in
+        :param dict [params]: extra parameters specific to the exchange API endpoint
+        :returns dict: an `order structure <https://docs.ccxt.com/#/?id=order-structure>`
+        """
+        extendedParams = self.extend(params, {'clientOrderId': clientOrderId})
+        return await self.cancel_order('', symbol, extendedParams)
+
     async def cancel_order_ws(self, id: str, symbol: Str = None, params={}):
         raise NotSupported(self.id + ' cancelOrderWs() is not supported yet')
 
+    async def cancel_orders(self, ids: List[str], symbol: Str = None, params={}):
+        raise NotSupported(self.id + ' cancelOrders() is not supported yet')
+
+    async def cancel_orders_with_client_order_ids(self, clientOrderIds: List[str], symbol: Str = None, params={}):
+        """
+        create a market order by providing the symbol, side and cost
+        :param str[] clientOrderIds: client order Ids
+        :param str symbol: unified symbol of the market to create an order in
+        :param dict [params]: extra parameters specific to the exchange API endpoint
+        :returns dict: an `order structure <https://docs.ccxt.com/#/?id=order-structure>`
+        """
+        extendedParams = self.extend(params, {'clientOrderIds': clientOrderIds})
+        return await self.cancel_orders([], symbol, extendedParams)
+
     async def cancel_orders_ws(self, ids: List[str], symbol: Str = None, params={}):
         raise NotSupported(self.id + ' cancelOrdersWs() is not supported yet')
 
@@ -1554,7 +1605,7 @@ class Exchange(BaseExchange):
     async def cancel_all_orders_ws(self, symbol: Str = None, params={}):
         raise NotSupported(self.id + ' cancelAllOrdersWs() is not supported yet')
 
-    async def cancel_unified_order(self, order, params={}):
+    async def cancel_unified_order(self, order: Order, params={}):
         return self.cancel_order(self.safe_string(order, 'id'), self.safe_string(order, 'symbol'), params)
 
     async def fetch_orders(self, symbol: Str = None, since: Int = None, limit: Int = None, params={}):
@@ -2181,3 +2232,80 @@ class Exchange(BaseExchange):
         :returns dict: a `transfer structure <https://docs.ccxt.com/#/?id=transfer-structure>`
         """
         raise NotSupported(self.id + ' fetchTransfers() is not supported yet')
+
+    async def un_watch_ohlcv(self, symbol: str, timeframe: str = '1m', params={}):
+        """
+        watches 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 dict [params]: extra parameters specific to the exchange API endpoint
+        :returns int[][]: A list of candles ordered, open, high, low, close, volume
+        """
+        raise NotSupported(self.id + ' unWatchOHLCV() is not supported yet')
+
+    async def watch_mark_price(self, symbol: str, params={}):
+        """
+        watches a mark price for a specific market
+        :param str symbol: unified symbol of the market to fetch the ticker for
+        :param dict [params]: extra parameters specific to the exchange API endpoint
+        :returns dict: a `ticker structure <https://docs.ccxt.com/#/?id=ticker-structure>`
+        """
+        raise NotSupported(self.id + ' watchMarkPrice() is not supported yet')
+
+    async def watch_mark_prices(self, symbols: Strings = None, params={}):
+        """
+        watches the mark price for all markets
+        :param str[] symbols: unified symbol of the market to fetch the ticker for
+        :param dict [params]: extra parameters specific to the exchange API endpoint
+        :returns dict: a `ticker structure <https://docs.ccxt.com/#/?id=ticker-structure>`
+        """
+        raise NotSupported(self.id + ' watchMarkPrices() is not supported yet')
+
+    async def withdraw_ws(self, code: str, amount: float, address: str, tag: Str = None, params={}):
+        """
+        make a withdrawal
+        :param str code: unified currency code
+        :param float amount: the amount to withdraw
+        :param str address: the address to withdraw to
+        :param str tag:
+        :param dict [params]: extra parameters specific to the bitvavo api endpoint
+        :returns dict: a `transaction structure <https://docs.ccxt.com/#/?id=transaction-structure>`
+        """
+        raise NotSupported(self.id + ' withdrawWs() is not supported yet')
+
+    async def un_watch_my_trades(self, symbol: Str = None, params={}):
+        """
+        unWatches information on multiple trades made by the user
+        :param str symbol: unified market symbol of the market orders were made in
+        :param dict [params]: extra parameters specific to the exchange API endpoint
+        :returns dict[]: a list of `order structures <https://docs.ccxt.com/#/?id=order-structure>`
+        """
+        raise NotSupported(self.id + ' unWatchMyTrades() is not supported yet')
+
+    async def create_orders_ws(self, orders: List[OrderRequest], params={}):
+        """
+        create a list of trade orders
+        :param Array orders: list of orders to create, each object should contain the parameters required by createOrder, namely symbol, type, side, amount, price and params
+        :param dict [params]: extra parameters specific to the exchange API endpoint
+        :returns dict: an `order structure <https://docs.ccxt.com/#/?id=order-structure>`
+        """
+        raise NotSupported(self.id + ' createOrdersWs() is not supported yet')
+
+    async def fetch_orders_by_status_ws(self, status: str, symbol: Str = None, since: Int = None, limit: Int = None, params={}):
+        """
+        watches information on open orders with bid(buy) and ask(sell) prices, volumes and other data
+        :param str symbol: unified symbol of the market to fetch the order book for
+        :param int [limit]: the maximum amount of order book entries to return
+        :param dict [params]: extra parameters specific to the exchange API endpoint
+        :returns dict: A dictionary of `order book structures <https://docs.ccxt.com/#/?id=order-book-structure>` indexed by market symbols
+        """
+        raise NotSupported(self.id + ' fetchOrdersByStatusWs() is not supported yet')
+
+    async def un_watch_bids_asks(self, symbols: Strings = None, params={}):
+        """
+        unWatches best bid & ask for symbols
+        :param str[] symbols: unified symbol of the market to fetch the ticker for
+        :param dict [params]: extra parameters specific to the exchange API endpoint
+        :returns dict: a `ticker structure <https://docs.ccxt.com/#/?id=ticker-structure>`
+        """
+        raise NotSupported(self.id + ' unWatchBidsAsks() is not supported yet')

{bitmart-0.0.93 → bitmart-0.0.106}/src/bitmart/ccxt/async_support/base/throttler.py

@@ -42,7 +42,7 @@ class Throttler:
     def __call__(self, cost=None):
         future = asyncio.Future()
         if len(self.queue) > self.config['maxCapacity']:
-            raise RuntimeError('throttle queue is over maxCapacity (' + str(int(self.config['maxCapacity'])) + '), see https://github.com/ccxt/ccxt/issues/11645#issuecomment-1195695526')
+            raise RuntimeError('throttle queue is over maxCapacity (' + str(int(self.config['maxCapacity'])) + '), see https://docs.ccxt.com/#/README?id=maximum-requests-capacity')
         self.queue.append((future, cost))
         if not self.running:
             self.running = True

{bitmart-0.0.93 → bitmart-0.0.106}/src/bitmart/ccxt/async_support/base/ws/client.py

@@ -83,6 +83,12 @@ class Client(object):
             del self.rejections[message_hash]
         return future
 
+    def reusable_future(self, message_hash):
+        return self.future(message_hash)  # only used in go
+
+    def reusableFuture(self, message_hash):
+        return self.future(message_hash)  # only used in go
+
     def resolve(self, result, message_hash):
         if self.verbose and message_hash is None:
             self.log(iso8601(milliseconds()), 'resolve received None messageHash')
@@ -111,7 +117,7 @@ class Client(object):
             self.log(iso8601(milliseconds()), 'receive loop')
         if not self.closed():
             # let's drain the aiohttp buffer to avoid latency
-            if len(self.buffer) > 1:
+            if self.buffer and len(self.buffer) > 1:
                 size_delta = 0
                 while len(self.buffer) > 1:
                     message, size = self.buffer.popleft()
@@ -180,6 +186,16 @@ class Client(object):
         # looks like they exposed it in C
         # this means we can bypass it
         # https://github.com/aio-libs/aiohttp/blob/master/aiohttp/_websocket/reader_c.pxd#L53C24-L53C31
+        # these checks are necessary to protect these errors: AttributeError: 'NoneType' object has no attribute '_buffer'
+        # upon getting an error message
+        if self.connection is None:
+            return None
+        if self.connection._conn is None:
+            return None
+        if self.connection._conn.protocol is None:
+            return None
+        if self.connection._conn.protocol._payload is None:
+            return None
         return self.connection._conn.protocol._payload._buffer
 
     def connect(self, session, backoff_delay=0):
@@ -288,6 +304,8 @@ class Client(object):
                 send_msg = json.dumps(message, separators=(',', ':'))
             else:
                 send_msg = orjson.dumps(message).decode('utf-8')
+        if self.closed():
+            raise ConnectionError('Cannot Send Message: Connection closed before send')
         return await self.connection.send_str(send_msg)
 
     async def close(self, code=1000):

{bitmart-0.0.93 → bitmart-0.0.106}/src/bitmart/ccxt/async_support/bitmart.py

@@ -1026,7 +1026,7 @@ class bitmart(Exchange, ImplicitAPI):
                 'swap': False,
                 'future': False,
                 'option': False,
-                'active': True,
+                'active': self.safe_string_lower_2(market, 'status', 'trade_status') == 'trading',
                 'contract': False,
                 'linear': None,
                 'inverse': None,
@@ -1141,7 +1141,7 @@ class bitmart(Exchange, ImplicitAPI):
                 'swap': isSwap,
                 'future': isFutures,
                 'option': False,
-                'active': True,
+                'active': self.safe_string_lower(market, 'status') == 'trading',
                 'contract': True,
                 'linear': True,
                 'inverse': False,
@@ -2048,7 +2048,7 @@ class bitmart(Exchange, ImplicitAPI):
                 self.safe_number_2(ohlcv, 'volume', 'v'),
             ]
 
-    async def fetch_ohlcv(self, symbol: str, timeframe='1m', since: Int = None, limit: Int = None, params={}) -> List[list]:
+    async def fetch_ohlcv(self, symbol: str, timeframe: str = '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
 
@@ -4517,12 +4517,15 @@ class bitmart(Exchange, ImplicitAPI):
         #         "code": 1000,
         #         "message": "Ok",
         #         "data": {
-        #             "timestamp": 1695184410697,
         #             "symbol": "BTCUSDT",
-        #             "rate_value": "-0.00002614",
-        #             "expected_rate": "-0.00002"
+        #             "expected_rate": "-0.0000238",
+        #             "rate_value": "0.000009601106",
+        #             "funding_time": 1761292800000,
+        #             "funding_upper_limit": "0.0375",
+        #             "funding_lower_limit": "-0.0375",
+        #             "timestamp": 1761291544336
         #         },
-        #         "trace": "4cad855074654097ac7ba5257c47305d.54.16951844206655589"
+        #         "trace": "64b7a589-e1e-4ac2-86b1-41058757421"
         #     }
         #
         data = self.safe_dict(response, 'data', {})
@@ -4587,14 +4590,18 @@ class bitmart(Exchange, ImplicitAPI):
     def parse_funding_rate(self, contract, market: Market = None) -> FundingRate:
         #
         #     {
-        #         "timestamp": 1695184410697,
         #         "symbol": "BTCUSDT",
-        #         "rate_value": "-0.00002614",
-        #         "expected_rate": "-0.00002"
+        #         "expected_rate": "-0.0000238",
+        #         "rate_value": "0.000009601106",
+        #         "funding_time": 1761292800000,
+        #         "funding_upper_limit": "0.0375",
+        #         "funding_lower_limit": "-0.0375",
+        #         "timestamp": 1761291544336
         #     }
         #
         marketId = self.safe_string(contract, 'symbol')
         timestamp = self.safe_integer(contract, 'timestamp')
+        fundingTimestamp = self.safe_integer(contract, 'funding_time')
         return {
             'info': contract,
             'symbol': self.safe_symbol(marketId, market),
@@ -4605,8 +4612,8 @@ class bitmart(Exchange, ImplicitAPI):
             'timestamp': timestamp,
             'datetime': self.iso8601(timestamp),
             'fundingRate': self.safe_number(contract, 'expected_rate'),
-            'fundingTimestamp': None,
-            'fundingDatetime': None,
+            'fundingTimestamp': fundingTimestamp,
+            'fundingDatetime': self.iso8601(fundingTimestamp),
             'nextFundingRate': None,
             'nextFundingTimestamp': None,
             'nextFundingDatetime': None,