bitget 0.0.74__py3-none-any.whl → 0.0.76__py3-none-any.whl

bitget/ccxt/__init__.py

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

bitget/ccxt/async_support/__init__.py

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

bitget/ccxt/async_support/base/exchange.py

@@ -2,7 +2,7 @@
 
 # -----------------------------------------------------------------------------
 
-__version__ = '4.4.95'
+__version__ = '4.4.96'
 
 # -----------------------------------------------------------------------------
 
@@ -231,6 +231,8 @@ class Exchange(BaseExchange):
                     self.last_json_response = json_response
                 if self.verbose:
                     self.log("\nfetch Response:", self.id, method, url, http_status_code, "ResponseHeaders:", headers, "ResponseBody:", http_response)
+                if json_response and not isinstance(json_response, list) and self.returnResponseHeaders:
+                    json_response['responseHeaders'] = headers
                 self.logger.debug("%s %s, Response: %s %s %s", method, url, http_status_code, headers, http_response)
 
         except socket.gaierror as e:
@@ -668,6 +670,9 @@ class Exchange(BaseExchange):
     async def un_watch_order_book_for_symbols(self, symbols: List[str], params={}):
         raise NotSupported(self.id + ' unWatchOrderBookForSymbols() is not supported yet')
 
+    async def un_watch_positions(self, symbols: Strings = None, params={}):
+        raise NotSupported(self.id + ' unWatchPositions() is not supported yet')
+
     async def fetch_deposit_addresses(self, codes: Strings = None, params={}):
         raise NotSupported(self.id + ' fetchDepositAddresses() is not supported yet')
 
@@ -1596,10 +1601,10 @@ class Exchange(BaseExchange):
         """
         raise NotSupported(self.id + ' fetchDepositsWithdrawals() is not supported yet')
 
-    async def fetch_deposits(self, symbol: Str = None, since: Int = None, limit: Int = None, params={}):
+    async def fetch_deposits(self, code: Str = None, since: Int = None, limit: Int = None, params={}):
         raise NotSupported(self.id + ' fetchDeposits() is not supported yet')
 
-    async def fetch_withdrawals(self, symbol: Str = None, since: Int = None, limit: Int = None, params={}):
+    async def fetch_withdrawals(self, code: Str = None, since: Int = None, limit: Int = None, params={}):
         raise NotSupported(self.id + ' fetchWithdrawals() is not supported yet')
 
     async def fetch_deposits_ws(self, code: Str = None, since: Int = None, limit: Int = None, params={}):
@@ -1892,7 +1897,7 @@ class Exchange(BaseExchange):
         calls = 0
         result = []
         errors = 0
-        until = self.safe_integer_2(params, 'untill', 'till')  # do not omit it from params here
+        until = self.safe_integer_n(params, ['until', 'untill', 'till'])  # do not omit it from params here
         maxEntriesPerRequest, params = self.handle_max_entries_per_request_and_params(method, maxEntriesPerRequest, params)
         if (paginationDirection == 'forward'):
             if since is None:

bitget/ccxt/async_support/base/ws/future.py

@@ -1,6 +1,8 @@
 import asyncio
 
-
+# Test by running:
+# - python python/ccxt/pro/test/base/test_close.py
+# - python python/ccxt/pro/test/base/test_future.py
 class Future(asyncio.Future):
 
     def resolve(self, result=None):
@@ -30,14 +32,14 @@ class Future(asyncio.Future):
                     if err:
                         exceptions.append(err)
             # if any exceptions return with first exception
+            if future.cancelled():
+                return
             if len(exceptions) > 0:
                 future.set_exception(exceptions[0])
             # else return first result
             elif cancelled:
                 future.cancel()
             else:
-                if future.cancelled():
-                    return
                 first_result = list(complete)[0].result()
                 future.set_result(first_result)
         task.add_done_callback(callback)

bitget/ccxt/async_support/bitget.py

@@ -4112,82 +4112,35 @@ class bitget(Exchange, ImplicitAPI):
         #         "result": "success"
         #     }
         #
-        # spot: fetchOrder
-        #
-        #     {
-        #         "userId": "7264631750",
-        #         "symbol": "BTCUSDT",
-        #         "orderId": "1111461743123927040",
-        #         "clientOid": "63f95110-93b5-4309-8f77-46339f1bcf3c",
-        #         "price": "25000.0000000000000000",
-        #         "size": "0.0002000000000000",
-        #         "orderType": "limit",
-        #         "side": "buy",
-        #         "status": "live",
-        #         "priceAvg": "0",
-        #         "baseVolume": "0.0000000000000000",
-        #         "quoteVolume": "0.0000000000000000",
-        #         "enterPointSource": "API",
-        #         "feeDetail": "",
-        #         "orderSource": "normal",
-        #         "cTime": "1700719050198",
-        #         "uTime": "1700719050198"
-        #     }
-        #
-        # swap and future: fetchOrder
-        #
-        #     {
-        #         "symbol": "BTCUSDT",
-        #         "size": "0.001",
-        #         "orderId": "1111465253393825792",
-        #         "clientOid": "1111465253431574529",
-        #         "baseVolume": "0",
-        #         "fee": "0",
-        #         "price": "27000",
-        #         "priceAvg": "",
-        #         "state": "live",
-        #         "side": "buy",
-        #         "force": "gtc",
-        #         "totalProfits": "0",
-        #         "posSide": "long",
-        #         "marginCoin": "USDT",
-        #         "presetStopSurplusPrice": "",
-        #         "presetStopLossPrice": "",
-        #         "quoteVolume": "0",
-        #         "orderType": "limit",
-        #         "leverage": "20",
-        #         "marginMode": "crossed",
-        #         "reduceOnly": "NO",
-        #         "enterPointSource": "API",
-        #         "tradeSide": "open",
-        #         "posMode": "hedge_mode",
-        #         "orderSource": "normal",
-        #         "cTime": "1700719887120",
-        #         "uTime": "1700719887120"
-        #     }
-        #
-        # spot: fetchOpenOrders
+        # spot: fetchOrder, fetchOpenOrders, fetchCanceledAndClosedOrders
         #
         #     {
         #         "userId": "7264631750",
         #         "symbol": "BTCUSDT",
         #         "orderId": "1111499608327360513",
         #         "clientOid": "d0d4dad5-18d0-4869-a074-ec40bb47cba6",
-        #         "priceAvg": "25000.0000000000000000",
-        #         "size": "0.0002000000000000",
+        #         "size": "0.0002000000000000",  # COST for 'buy market' order! AMOUNT in all other cases
+        #         "price": "0",  # in fetchOrder: 0 for market order, otherwise limit price(field not present in fetchOpenOrders
         #         "orderType": "limit",
         #         "side": "buy",
         #         "status": "live",
         #         "basePrice": "0",
-        #         "baseVolume": "0.0000000000000000",
-        #         "quoteVolume": "0.0000000000000000",
+        #         "priceAvg": "25000.0000000000000000",   # 0 if nothing filled
+        #         "baseVolume": "0.0000000000000000",     # 0 if nothing filled
+        #         "quoteVolume": "0.0000000000000000",    # 0 if nothing filled
         #         "enterPointSource": "WEB",
         #         "orderSource": "normal",
         #         "cTime": "1700728077966",
         #         "uTime": "1700728077966"
+        #         "feeDetail": "{\\"newFees\\":{\\"c\\":0,\\"d\\":0,\\"deduction\\":false,\\"r\\":-0.0064699886,\\"t\\":-0.0064699886,\\"totalDeductionFee\\":0},\\"USDT\\":{\\"deduction\\":false,\\"feeCoinCode\\":\\"USDT\\",\\"totalDeductionFee\\":0,\\"totalFee\\":-0.0064699886000000}}",  # might not be present in fetchOpenOrders
+        #         "triggerPrice": null,
+        #         "tpslType": "normal",
+        #         "quoteCoin": "USDT",  # not present in fetchOpenOrders
+        #         "baseCoin": "DOT",    # not present in fetchOpenOrders
+        #         "cancelReason": "",   # not present in fetchOpenOrders
         #     }
         #
-        # spot stop: fetchOpenOrders, fetchCanceledAndClosedOrders
+        # spot trigger: fetchOpenOrders, fetchCanceledAndClosedOrders
         #
         #     {
         #         "orderId": "1111503385931620352",
@@ -4228,18 +4181,19 @@ class bitget(Exchange, ImplicitAPI):
         #         "uTime": "1700729691866"
         #     }
         #
-        # swap: fetchOpenOrders, fetchCanceledAndClosedOrders
+        # swap and future: fetchOrder, fetchOpenOrders, fetchCanceledAndClosedOrders
         #
         #     {
         #         "symbol": "BTCUSDT",
-        #         "size": "0.002",
-        #         "orderId": "1111488897767604224",
-        #         "clientOid": "1111488897805352960",
+        #         "size": "0.001",
+        #         "orderId": "1111465253393825792",
+        #         "clientOid": "1111465253431574529",
         #         "baseVolume": "0",
         #         "fee": "0",
-        #         "price": "25000",
+        #         "price": "27000",
         #         "priceAvg": "",
-        #         "status": "live",
+        #         "state": "live",
+        #         # "status": "live",  # key for fetchOpenOrders, fetchClosedOrders
         #         "side": "buy",
         #         "force": "gtc",
         #         "totalProfits": "0",
@@ -4248,7 +4202,7 @@ class bitget(Exchange, ImplicitAPI):
         #         "quoteVolume": "0",
         #         "leverage": "20",
         #         "marginMode": "crossed",
-        #         "enterPointSource": "web",
+        #         "enterPointSource": "API",
         #         "tradeSide": "open",
         #         "posMode": "hedge_mode",
         #         "orderType": "limit",
@@ -4256,94 +4210,22 @@ class bitget(Exchange, ImplicitAPI):
         #         "presetStopSurplusPrice": "",
         #         "presetStopLossPrice": "",
         #         "reduceOnly": "NO",
-        #         "cTime": "1700725524378",
-        #         "uTime": "1700725524378"
-        #     }
+        #         "cTime": "1700719887120",
+        #         "uTime": "1700719887120"
         #
-        # swap stop: fetchOpenOrders
+        #     for swap trigger order, the additional below fields are present:
         #
-        #     {
         #         "planType": "normal_plan",
-        #         "symbol": "BTCUSDT",
-        #         "size": "0.001",
-        #         "orderId": "1111491399869075457",
-        #         "clientOid": "1111491399869075456",
-        #         "price": "27000",
         #         "callbackRatio": "",
         #         "triggerPrice": "24000",
         #         "triggerType": "mark_price",
         #         "planStatus": "live",
-        #         "side": "buy",
-        #         "posSide": "long",
-        #         "marginCoin": "USDT",
-        #         "marginMode": "crossed",
-        #         "enterPointSource": "API",
-        #         "tradeSide": "open",
-        #         "posMode": "hedge_mode",
-        #         "orderType": "limit",
-        #         "stopSurplusTriggerPrice": "",
-        #         "stopSurplusExecutePrice": "",
-        #         "stopSurplusTriggerType": "fill_price",
-        #         "stopLossTriggerPrice": "",
-        #         "stopLossExecutePrice": "",
-        #         "stopLossTriggerType": "fill_price",
-        #         "cTime": "1700726120917",
-        #         "uTime": "1700726120917"
-        #     }
-        #
-        # spot: fetchCanceledAndClosedOrders
-        #
-        #     {
-        #         "userId": "7264631750",
-        #         "symbol": "BTCUSDT",
-        #         "orderId": "1111499608327360513",
-        #         "clientOid": "d0d4dad5-18d0-4869-a074-ec40bb47cba6",
-        #         "price": "25000.0000000000000000",
-        #         "size": "0.0002000000000000",
-        #         "orderType": "limit",
-        #         "side": "buy",
-        #         "status": "cancelled",
-        #         "priceAvg": "0",
-        #         "baseVolume": "0.0000000000000000",
-        #         "quoteVolume": "0.0000000000000000",
-        #         "enterPointSource": "WEB",
-        #         "feeDetail": "",
-        #         "orderSource": "normal",
-        #         "cTime": "1700728077966",
-        #         "uTime": "1700728911471"
-        #     }
-        #
-        # swap stop: fetchCanceledAndClosedOrders
-        #
-        #     {
-        #         "planType": "normal_plan",
-        #         "symbol": "BTCUSDT",
-        #         "size": "0.001",
-        #         "orderId": "1111491399869075457",
-        #         "clientOid": "1111491399869075456",
-        #         "planStatus": "cancelled",
-        #         "price": "27000",
-        #         "feeDetail": null,
-        #         "baseVolume": "0",
-        #         "callbackRatio": "",
-        #         "triggerPrice": "24000",
-        #         "triggerType": "mark_price",
-        #         "side": "buy",
-        #         "posSide": "long",
-        #         "marginCoin": "USDT",
-        #         "marginMode": "crossed",
-        #         "enterPointSource": "API",
-        #         "tradeSide": "open",
-        #         "posMode": "hedge_mode",
-        #         "orderType": "limit",
         #         "stopSurplusTriggerPrice": "",
         #         "stopSurplusExecutePrice": "",
         #         "stopSurplusTriggerType": "fill_price",
         #         "stopLossTriggerPrice": "",
         #         "stopLossExecutePrice": "",
         #         "stopLossTriggerType": "fill_price",
-        #         "cTime": "1700726120917",
-        #         "uTime": "1700727879652"
         #     }
         #
         errorMessage = self.safe_string(order, 'errorMsg')
@@ -4421,6 +4303,11 @@ class bitget(Exchange, ImplicitAPI):
             side = 'sell' if (side == 'buy') else 'buy'
             # on bitget hedge mode if the position is long the side is always buy, and if the position is short the side is always sell
             # so the side of the reduceOnly order is inversed
+        orderType = self.safe_string(order, 'orderType')
+        isBuyMarket = (side == 'buy') and (orderType == 'market')
+        if market['spot'] and isBuyMarket:
+            # in top comment, for 'buy market' the 'size' field is COST, not AMOUNT
+            size = self.safe_string(order, 'baseVolume')
         return self.safe_order({
             'info': order,
             'id': self.safe_string_2(order, 'orderId', 'data'),
@@ -4430,7 +4317,7 @@ class bitget(Exchange, ImplicitAPI):
             'lastTradeTimestamp': updateTimestamp,
             'lastUpdateTimestamp': updateTimestamp,
             'symbol': market['symbol'],
-            'type': self.safe_string(order, 'orderType'),
+            'type': orderType,
             'side': side,
             'price': price,
             'amount': size,

bitget/ccxt/base/decimal_to_precision.py

@@ -33,18 +33,24 @@ NO_PADDING = 5
 PAD_WITH_ZERO = 6
 
 
-def decimal_to_precision(n, rounding_mode=ROUND, precision=None, counting_mode=DECIMAL_PLACES, padding_mode=NO_PADDING):
-    assert precision is not None
+def decimal_to_precision(n, rounding_mode=ROUND, numPrecisionDigits=None, counting_mode=DECIMAL_PLACES, padding_mode=NO_PADDING):
+    assert numPrecisionDigits is not None, 'numPrecisionDigits should not be None'
+
+    if isinstance(numPrecisionDigits, str):
+        numPrecisionDigits = float(numPrecisionDigits)
+    assert isinstance(numPrecisionDigits, float) or isinstance(numPrecisionDigits, decimal.Decimal) or isinstance(numPrecisionDigits, numbers.Integral), 'numPrecisionDigits has an invalid number'
+
     if counting_mode == TICK_SIZE:
-        assert(isinstance(precision, float) or isinstance(precision, decimal.Decimal) or isinstance(precision, numbers.Integral) or isinstance(precision, str))
+        assert numPrecisionDigits > 0, 'negative or zero numPrecisionDigits can not be used with TICK_SIZE precisionMode'
     else:
-        assert(isinstance(precision, numbers.Integral))
+        assert isinstance(numPrecisionDigits, numbers.Integral)
+
     assert rounding_mode in [TRUNCATE, ROUND]
     assert counting_mode in [DECIMAL_PLACES, SIGNIFICANT_DIGITS, TICK_SIZE]
     assert padding_mode in [NO_PADDING, PAD_WITH_ZERO]
+    # end of checks
 
-    if isinstance(precision, str):
-        precision = float(precision)
+    precision = numPrecisionDigits  # "precision" variable name was in signature, but to make function signature similar to php/js, I had to change the argument name to "numPrecisionDigits". however, the below codes use "precision" variable name, so we have to assign that name here (you can change the usage of 'precision' variable name below everywhere, but i've refrained to do that to avoid many changes)
 
     context = decimal.getcontext()
 
@@ -78,12 +84,12 @@ def decimal_to_precision(n, rounding_mode=ROUND, precision=None, counting_mode=D
         if missing != 0:
             if rounding_mode == ROUND:
                 if dec > 0:
-                    if missing >= precision / 2:
+                    if missing >= precision_dec / 2:
                         dec = dec - missing + precision_dec
                     else:
                         dec = dec - missing
                 else:
-                    if missing >= precision / 2:
+                    if missing >= precision_dec / 2:
                         dec = dec + missing - precision_dec
                     else:
                         dec = dec + missing
@@ -117,7 +123,7 @@ def decimal_to_precision(n, rounding_mode=ROUND, precision=None, counting_mode=D
                 precise = '{:f}'.format(min((below, above), key=lambda x: abs(x - dec)))
             else:
                 precise = '{:f}'.format(dec.quantize(sigfig))
-        if precise == ('-0.' + len(precise) * '0')[:2] or precise == '-0':
+        if precise.startswith('-0') and all(c in '0.' for c in precise[1:]):
             precise = precise[1:]
 
     elif rounding_mode == TRUNCATE:
@@ -138,7 +144,7 @@ def decimal_to_precision(n, rounding_mode=ROUND, precision=None, counting_mode=D
                 precise = string
             else:
                 precise = string[:end].ljust(dot, '0')
-        if precise == ('-0.' + len(precise) * '0')[:3] or precise == '-0':
+        if precise.startswith('-0') and all(c in '0.' for c in precise[1:]):
             precise = precise[1:]
         precise = precise.rstrip('.')
 

bitget/ccxt/base/errors.py

@@ -1,3 +1,9 @@
+# ----------------------------------------------------------------------------
+
+# PLEASE DO NOT EDIT THIS FILE, IT IS GENERATED AND WILL BE OVERWRITTEN:
+# https://github.com/ccxt/ccxt/blob/master/CONTRIBUTING.md#how-to-contribute-code
+# EDIT THE CORRESPONDENT .ts FILE INSTEAD
+
 error_hierarchy = {
     'BaseError': {
         'ExchangeError': {

bitget/ccxt/base/exchange.py

@@ -4,7 +4,7 @@
 
 # -----------------------------------------------------------------------------
 
-__version__ = '4.4.95'
+__version__ = '4.4.96'
 
 # -----------------------------------------------------------------------------
 
@@ -229,6 +229,7 @@ class Exchange(object):
         'chrome100': 'Mozilla/5.0 (Macintosh; Intel Mac OS X 10_15_7) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/100.0.4896.75 Safari/537.36',
     }
     headers = None
+    returnResponseHeaders = False
     origin = '*'  # CORS origin
     MAX_VALUE = float('inf')
     #
@@ -579,6 +580,8 @@ class Exchange(object):
             if self.verbose:
                 self.log("\nfetch Response:", self.id, method, url, http_status_code, "ResponseHeaders:", headers, "ResponseBody:", http_response)
             self.logger.debug("%s %s, Response: %s %s %s", method, url, http_status_code, headers, http_response)
+            if json_response and not isinstance(json_response, list) and self.returnResponseHeaders:
+                json_response['responseHeaders'] = headers
             response.raise_for_status()
 
         except Timeout as e:
@@ -2130,6 +2133,17 @@ class Exchange(object):
                 'watchLiquidations': None,
                 'watchLiquidationsForSymbols': None,
                 'watchMyLiquidations': None,
+                'unWatchOrders': None,
+                'unWatchTrades': None,
+                'unWatchTradesForSymbols': None,
+                'unWatchOHLCVForSymbols': None,
+                'unWatchOrderBookForSymbols': None,
+                'unWatchPositions': None,
+                'unWatchOrderBook': None,
+                'unWatchTickers': None,
+                'unWatchMyTrades': None,
+                'unWatchTicker': None,
+                'unWatchOHLCV': None,
                 'watchMyLiquidationsForSymbols': None,
                 'withdraw': None,
                 'ws': None,
@@ -2616,6 +2630,9 @@ class Exchange(object):
     def un_watch_order_book_for_symbols(self, symbols: List[str], params={}):
         raise NotSupported(self.id + ' unWatchOrderBookForSymbols() is not supported yet')
 
+    def un_watch_positions(self, symbols: Strings = None, params={}):
+        raise NotSupported(self.id + ' unWatchPositions() is not supported yet')
+
     def fetch_deposit_addresses(self, codes: Strings = None, params={}):
         raise NotSupported(self.id + ' fetchDepositAddresses() is not supported yet')
 
@@ -3584,18 +3601,7 @@ class Exchange(object):
         symbol = market['symbol'] if (market is not None) else None
         return self.filter_by_symbol_since_limit(results, symbol, since, limit)
 
-    def calculate_fee(self, symbol: str, type: str, side: str, amount: float, price: float, takerOrMaker='taker', params={}):
-        """
-        calculates the presumptive fee that would be charged for an order
-        :param str symbol: unified market symbol
-        :param str type: 'market' or 'limit'
-        :param str side: 'buy' or 'sell'
-        :param float amount: how much you want to trade, in units of the base currency on most exchanges, or number of contracts
-        :param float price: the price for the order to be filled at, in units of the quote currency
-        :param str takerOrMaker: 'taker' or 'maker'
-        :param dict params:
-        :returns dict: contains the rate, the percentage multiplied to the order amount to obtain the fee amount, and cost, the total value of the fee in units of the quote currency, for the order
-        """
+    def calculate_fee_with_rate(self, symbol: str, type: str, side: str, amount: float, price: float, takerOrMaker='taker', feeRate: Num = None, params={}):
         if type == 'market' and takerOrMaker == 'maker':
             raise ArgumentsRequired(self.id + ' calculateFee() - you have provided incompatible arguments - "market" type order can not be "maker". Change either the "type" or the "takerOrMaker" argument to calculate the fee.')
         market = self.markets[symbol]
@@ -3624,7 +3630,7 @@ class Exchange(object):
         # even if `takerOrMaker` argument was set to 'maker', for 'market' orders we should forcefully override it to 'taker'
         if type == 'market':
             takerOrMaker = 'taker'
-        rate = self.safe_string(market, takerOrMaker)
+        rate = self.number_to_string(feeRate) if (feeRate is not None) else self.safe_string(market, takerOrMaker)
         cost = Precise.string_mul(cost, rate)
         return {
             'type': takerOrMaker,
@@ -3633,6 +3639,20 @@ class Exchange(object):
             'cost': self.parse_number(cost),
         }
 
+    def calculate_fee(self, symbol: str, type: str, side: str, amount: float, price: float, takerOrMaker='taker', params={}):
+        """
+        calculates the presumptive fee that would be charged for an order
+        :param str symbol: unified market symbol
+        :param str type: 'market' or 'limit'
+        :param str side: 'buy' or 'sell'
+        :param float amount: how much you want to trade, in units of the base currency on most exchanges, or number of contracts
+        :param float price: the price for the order to be filled at, in units of the quote currency
+        :param str takerOrMaker: 'taker' or 'maker'
+        :param dict params:
+        :returns dict: contains the rate, the percentage multiplied to the order amount to obtain the fee amount, and cost, the total value of the fee in units of the quote currency, for the order
+        """
+        return self.calculate_fee_with_rate(symbol, type, side, amount, price, takerOrMaker, None, params)
+
     def safe_liquidation(self, liquidation: dict, market: Market = None):
         contracts = self.safe_string(liquidation, 'contracts')
         contractSize = self.safe_string(market, 'contractSize')
@@ -3672,6 +3692,21 @@ class Exchange(object):
         trade['cost'] = self.parse_number(cost)
         return trade
 
+    def create_ccxt_trade_id(self, timestamp=None, side=None, amount=None, price=None, takerOrMaker=None):
+        # self approach is being used by multiple exchanges(mexc, woo, coinsbit, dydx, ...)
+        id = None
+        if timestamp is not None:
+            id = self.number_to_string(timestamp)
+            if side is not None:
+                id += '-' + side
+            if amount is not None:
+                id += '-' + self.number_to_string(amount)
+            if price is not None:
+                id += '-' + self.number_to_string(price)
+            if takerOrMaker is not None:
+                id += '-' + takerOrMaker
+        return id
+
     def parsed_fee_and_fees(self, container: Any):
         fee = self.safe_dict(container, 'fee')
         fees = self.safe_list(container, 'fees')
@@ -5495,10 +5530,10 @@ class Exchange(object):
         """
         raise NotSupported(self.id + ' fetchDepositsWithdrawals() is not supported yet')
 
-    def fetch_deposits(self, symbol: Str = None, since: Int = None, limit: Int = None, params={}):
+    def fetch_deposits(self, code: Str = None, since: Int = None, limit: Int = None, params={}):
         raise NotSupported(self.id + ' fetchDeposits() is not supported yet')
 
-    def fetch_withdrawals(self, symbol: Str = None, since: Int = None, limit: Int = None, params={}):
+    def fetch_withdrawals(self, code: Str = None, since: Int = None, limit: Int = None, params={}):
         raise NotSupported(self.id + ' fetchWithdrawals() is not supported yet')
 
     def fetch_deposits_ws(self, code: Str = None, since: Int = None, limit: Int = None, params={}):
@@ -6426,7 +6461,7 @@ class Exchange(object):
         calls = 0
         result = []
         errors = 0
-        until = self.safe_integer_2(params, 'untill', 'till')  # do not omit it from params here
+        until = self.safe_integer_n(params, ['until', 'untill', 'till'])  # do not omit it from params here
         maxEntriesPerRequest, params = self.handle_max_entries_per_request_and_params(method, maxEntriesPerRequest, params)
         if (paginationDirection == 'forward'):
             if since is None:
@@ -6988,6 +7023,14 @@ class Exchange(object):
                 self.myTrades = None
             elif topic == 'orders' and (self.orders is not None):
                 self.orders = None
+            elif topic == 'positions' and (self.positions is not None):
+                self.positions = None
+                clients = list(self.clients.values())
+                for i in range(0, len(clients)):
+                    client = clients[i]
+                    futures = self.safe_dict(client, 'futures')
+                    if (futures is not None) and ('fetchPositionsSnapshot' in futures):
+                        del futures['fetchPositionsSnapshot']
             elif topic == 'ticker' and (self.tickers is not None):
                 tickerSymbols = list(self.tickers.keys())
                 for i in range(0, len(tickerSymbols)):

bitget/ccxt/bitget.py

@@ -4111,82 +4111,35 @@ class bitget(Exchange, ImplicitAPI):
         #         "result": "success"
         #     }
         #
-        # spot: fetchOrder
-        #
-        #     {
-        #         "userId": "7264631750",
-        #         "symbol": "BTCUSDT",
-        #         "orderId": "1111461743123927040",
-        #         "clientOid": "63f95110-93b5-4309-8f77-46339f1bcf3c",
-        #         "price": "25000.0000000000000000",
-        #         "size": "0.0002000000000000",
-        #         "orderType": "limit",
-        #         "side": "buy",
-        #         "status": "live",
-        #         "priceAvg": "0",
-        #         "baseVolume": "0.0000000000000000",
-        #         "quoteVolume": "0.0000000000000000",
-        #         "enterPointSource": "API",
-        #         "feeDetail": "",
-        #         "orderSource": "normal",
-        #         "cTime": "1700719050198",
-        #         "uTime": "1700719050198"
-        #     }
-        #
-        # swap and future: fetchOrder
-        #
-        #     {
-        #         "symbol": "BTCUSDT",
-        #         "size": "0.001",
-        #         "orderId": "1111465253393825792",
-        #         "clientOid": "1111465253431574529",
-        #         "baseVolume": "0",
-        #         "fee": "0",
-        #         "price": "27000",
-        #         "priceAvg": "",
-        #         "state": "live",
-        #         "side": "buy",
-        #         "force": "gtc",
-        #         "totalProfits": "0",
-        #         "posSide": "long",
-        #         "marginCoin": "USDT",
-        #         "presetStopSurplusPrice": "",
-        #         "presetStopLossPrice": "",
-        #         "quoteVolume": "0",
-        #         "orderType": "limit",
-        #         "leverage": "20",
-        #         "marginMode": "crossed",
-        #         "reduceOnly": "NO",
-        #         "enterPointSource": "API",
-        #         "tradeSide": "open",
-        #         "posMode": "hedge_mode",
-        #         "orderSource": "normal",
-        #         "cTime": "1700719887120",
-        #         "uTime": "1700719887120"
-        #     }
-        #
-        # spot: fetchOpenOrders
+        # spot: fetchOrder, fetchOpenOrders, fetchCanceledAndClosedOrders
         #
         #     {
         #         "userId": "7264631750",
         #         "symbol": "BTCUSDT",
         #         "orderId": "1111499608327360513",
         #         "clientOid": "d0d4dad5-18d0-4869-a074-ec40bb47cba6",
-        #         "priceAvg": "25000.0000000000000000",
-        #         "size": "0.0002000000000000",
+        #         "size": "0.0002000000000000",  # COST for 'buy market' order! AMOUNT in all other cases
+        #         "price": "0",  # in fetchOrder: 0 for market order, otherwise limit price(field not present in fetchOpenOrders
         #         "orderType": "limit",
         #         "side": "buy",
         #         "status": "live",
         #         "basePrice": "0",
-        #         "baseVolume": "0.0000000000000000",
-        #         "quoteVolume": "0.0000000000000000",
+        #         "priceAvg": "25000.0000000000000000",   # 0 if nothing filled
+        #         "baseVolume": "0.0000000000000000",     # 0 if nothing filled
+        #         "quoteVolume": "0.0000000000000000",    # 0 if nothing filled
         #         "enterPointSource": "WEB",
         #         "orderSource": "normal",
         #         "cTime": "1700728077966",
         #         "uTime": "1700728077966"
+        #         "feeDetail": "{\\"newFees\\":{\\"c\\":0,\\"d\\":0,\\"deduction\\":false,\\"r\\":-0.0064699886,\\"t\\":-0.0064699886,\\"totalDeductionFee\\":0},\\"USDT\\":{\\"deduction\\":false,\\"feeCoinCode\\":\\"USDT\\",\\"totalDeductionFee\\":0,\\"totalFee\\":-0.0064699886000000}}",  # might not be present in fetchOpenOrders
+        #         "triggerPrice": null,
+        #         "tpslType": "normal",
+        #         "quoteCoin": "USDT",  # not present in fetchOpenOrders
+        #         "baseCoin": "DOT",    # not present in fetchOpenOrders
+        #         "cancelReason": "",   # not present in fetchOpenOrders
         #     }
         #
-        # spot stop: fetchOpenOrders, fetchCanceledAndClosedOrders
+        # spot trigger: fetchOpenOrders, fetchCanceledAndClosedOrders
         #
         #     {
         #         "orderId": "1111503385931620352",
@@ -4227,18 +4180,19 @@ class bitget(Exchange, ImplicitAPI):
         #         "uTime": "1700729691866"
         #     }
         #
-        # swap: fetchOpenOrders, fetchCanceledAndClosedOrders
+        # swap and future: fetchOrder, fetchOpenOrders, fetchCanceledAndClosedOrders
         #
         #     {
         #         "symbol": "BTCUSDT",
-        #         "size": "0.002",
-        #         "orderId": "1111488897767604224",
-        #         "clientOid": "1111488897805352960",
+        #         "size": "0.001",
+        #         "orderId": "1111465253393825792",
+        #         "clientOid": "1111465253431574529",
         #         "baseVolume": "0",
         #         "fee": "0",
-        #         "price": "25000",
+        #         "price": "27000",
         #         "priceAvg": "",
-        #         "status": "live",
+        #         "state": "live",
+        #         # "status": "live",  # key for fetchOpenOrders, fetchClosedOrders
         #         "side": "buy",
         #         "force": "gtc",
         #         "totalProfits": "0",
@@ -4247,7 +4201,7 @@ class bitget(Exchange, ImplicitAPI):
         #         "quoteVolume": "0",
         #         "leverage": "20",
         #         "marginMode": "crossed",
-        #         "enterPointSource": "web",
+        #         "enterPointSource": "API",
         #         "tradeSide": "open",
         #         "posMode": "hedge_mode",
         #         "orderType": "limit",
@@ -4255,94 +4209,22 @@ class bitget(Exchange, ImplicitAPI):
         #         "presetStopSurplusPrice": "",
         #         "presetStopLossPrice": "",
         #         "reduceOnly": "NO",
-        #         "cTime": "1700725524378",
-        #         "uTime": "1700725524378"
-        #     }
+        #         "cTime": "1700719887120",
+        #         "uTime": "1700719887120"
         #
-        # swap stop: fetchOpenOrders
+        #     for swap trigger order, the additional below fields are present:
         #
-        #     {
         #         "planType": "normal_plan",
-        #         "symbol": "BTCUSDT",
-        #         "size": "0.001",
-        #         "orderId": "1111491399869075457",
-        #         "clientOid": "1111491399869075456",
-        #         "price": "27000",
         #         "callbackRatio": "",
         #         "triggerPrice": "24000",
         #         "triggerType": "mark_price",
         #         "planStatus": "live",
-        #         "side": "buy",
-        #         "posSide": "long",
-        #         "marginCoin": "USDT",
-        #         "marginMode": "crossed",
-        #         "enterPointSource": "API",
-        #         "tradeSide": "open",
-        #         "posMode": "hedge_mode",
-        #         "orderType": "limit",
-        #         "stopSurplusTriggerPrice": "",
-        #         "stopSurplusExecutePrice": "",
-        #         "stopSurplusTriggerType": "fill_price",
-        #         "stopLossTriggerPrice": "",
-        #         "stopLossExecutePrice": "",
-        #         "stopLossTriggerType": "fill_price",
-        #         "cTime": "1700726120917",
-        #         "uTime": "1700726120917"
-        #     }
-        #
-        # spot: fetchCanceledAndClosedOrders
-        #
-        #     {
-        #         "userId": "7264631750",
-        #         "symbol": "BTCUSDT",
-        #         "orderId": "1111499608327360513",
-        #         "clientOid": "d0d4dad5-18d0-4869-a074-ec40bb47cba6",
-        #         "price": "25000.0000000000000000",
-        #         "size": "0.0002000000000000",
-        #         "orderType": "limit",
-        #         "side": "buy",
-        #         "status": "cancelled",
-        #         "priceAvg": "0",
-        #         "baseVolume": "0.0000000000000000",
-        #         "quoteVolume": "0.0000000000000000",
-        #         "enterPointSource": "WEB",
-        #         "feeDetail": "",
-        #         "orderSource": "normal",
-        #         "cTime": "1700728077966",
-        #         "uTime": "1700728911471"
-        #     }
-        #
-        # swap stop: fetchCanceledAndClosedOrders
-        #
-        #     {
-        #         "planType": "normal_plan",
-        #         "symbol": "BTCUSDT",
-        #         "size": "0.001",
-        #         "orderId": "1111491399869075457",
-        #         "clientOid": "1111491399869075456",
-        #         "planStatus": "cancelled",
-        #         "price": "27000",
-        #         "feeDetail": null,
-        #         "baseVolume": "0",
-        #         "callbackRatio": "",
-        #         "triggerPrice": "24000",
-        #         "triggerType": "mark_price",
-        #         "side": "buy",
-        #         "posSide": "long",
-        #         "marginCoin": "USDT",
-        #         "marginMode": "crossed",
-        #         "enterPointSource": "API",
-        #         "tradeSide": "open",
-        #         "posMode": "hedge_mode",
-        #         "orderType": "limit",
         #         "stopSurplusTriggerPrice": "",
         #         "stopSurplusExecutePrice": "",
         #         "stopSurplusTriggerType": "fill_price",
         #         "stopLossTriggerPrice": "",
         #         "stopLossExecutePrice": "",
         #         "stopLossTriggerType": "fill_price",
-        #         "cTime": "1700726120917",
-        #         "uTime": "1700727879652"
         #     }
         #
         errorMessage = self.safe_string(order, 'errorMsg')
@@ -4420,6 +4302,11 @@ class bitget(Exchange, ImplicitAPI):
             side = 'sell' if (side == 'buy') else 'buy'
             # on bitget hedge mode if the position is long the side is always buy, and if the position is short the side is always sell
             # so the side of the reduceOnly order is inversed
+        orderType = self.safe_string(order, 'orderType')
+        isBuyMarket = (side == 'buy') and (orderType == 'market')
+        if market['spot'] and isBuyMarket:
+            # in top comment, for 'buy market' the 'size' field is COST, not AMOUNT
+            size = self.safe_string(order, 'baseVolume')
         return self.safe_order({
             'info': order,
             'id': self.safe_string_2(order, 'orderId', 'data'),
@@ -4429,7 +4316,7 @@ class bitget(Exchange, ImplicitAPI):
             'lastTradeTimestamp': updateTimestamp,
             'lastUpdateTimestamp': updateTimestamp,
             'symbol': market['symbol'],
-            'type': self.safe_string(order, 'orderType'),
+            'type': orderType,
             'side': side,
             'price': price,
             'amount': size,

bitget/ccxt/pro/__init__.py

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

{bitget-0.0.74.dist-info → bitget-0.0.76.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: bitget
-Version: 0.0.74
+Version: 0.0.76
 Summary: bitget crypto exchange api client
 Project-URL: Homepage, https://github.com/ccxt/ccxt
 Project-URL: Issues, https://github.com/ccxt/ccxt

{bitget-0.0.74.dist-info → bitget-0.0.76.dist-info}/RECORD

@@ -1,26 +1,26 @@
 bitget/__init__.py,sha256=D5tG1_AjwXjMim3CPnCuWSheOXtq4vlSwVCS5ZG1bMQ,246
-bitget/ccxt/__init__.py,sha256=cJ6d-Gp7Hkus5Cs6jsmLES6PG7i5OWbaLeL5pNIEzx0,6048
-bitget/ccxt/bitget.py,sha256=5GcUpdUUgFuw1CSkR-JSKaN72GbKBxXgfL_OYWcd-vU,453849
+bitget/ccxt/__init__.py,sha256=ATBu0xXeUcJCjDjVN8p-SHX2Oi9tPd-pNYgI4O2D790,6048
+bitget/ccxt/bitget.py,sha256=7IHFajA2BNw1C349M04z6YybdEz4p7rjsUXssA9CuZU,450352
 bitget/ccxt/abstract/bitget.py,sha256=6q34nW4J1Vfvls4tExxZRJt0Ct28hCO0TQja_Mb_bmI,99978
-bitget/ccxt/async_support/__init__.py,sha256=PKkzko1aT3qVa2Fr5bKJ9BMrL0PmoW0rsqE7doO8bZQ,4781
-bitget/ccxt/async_support/bitget.py,sha256=nJtk1o0NiJLLppTAec5TBB4aHINTxEoDW-r-74kshYw,455592
+bitget/ccxt/async_support/__init__.py,sha256=gYqIM4mM0PYDcLMeIuNv8pJ3EkXfQ3KcXan_JpXJCx8,4781
+bitget/ccxt/async_support/bitget.py,sha256=bmm9xyMAZ9v9uJW5BR6Sg3QBAurwz7j004Ly-HGMqQM,452095
 bitget/ccxt/async_support/base/__init__.py,sha256=aVYSsFi--b4InRs9zDN_wtCpj8odosAB726JdUHavrk,67
-bitget/ccxt/async_support/base/exchange.py,sha256=rlXug7vYV2ke2rjNRzkakqbw4H7gzN3oUoeSldxBheY,119440
+bitget/ccxt/async_support/base/exchange.py,sha256=5YrTOaoiX9ws39WT_JWs_g3anZAMiPSc1eXiD56Sh0Q,119773
 bitget/ccxt/async_support/base/throttler.py,sha256=tvDVcdRUVYi8fZRlEcnqtgzcgB_KMUMRs5Pu8tuU-tU,1847
 bitget/ccxt/async_support/base/ws/__init__.py,sha256=uockzpLuwntKGZbs5EOWFe-Zg-k6Cj7GhNJLc_RX0so,1791
 bitget/ccxt/async_support/base/ws/cache.py,sha256=xf2VOtfUwloxSlIQ39M1RGZHWQzyS9IGhB5NX6cDcAc,8370
 bitget/ccxt/async_support/base/ws/client.py,sha256=ekIN5HNgeQgMG3tLZMsE889Aoxs960DLwQnwkTGhdi8,13624
 bitget/ccxt/async_support/base/ws/functions.py,sha256=qwvEnjtINWL5ZU-dbbeIunjyBxzFqbGWHfVhxqAcKug,1499
-bitget/ccxt/async_support/base/ws/future.py,sha256=2zrEB7Xinq14N05jaewNtbR_2ZiE5GQZNQV4CBW7qTA,1337
+bitget/ccxt/async_support/base/ws/future.py,sha256=hjdQ42zkfju5nar0GpTLJ4zXQBtgBU8DzYM5uPFcjsE,1450
 bitget/ccxt/async_support/base/ws/order_book.py,sha256=uBUaIHhzMRykpmo4BCsdJ-t_HozS6VxhEs8x-Kbj-NI,2894
 bitget/ccxt/async_support/base/ws/order_book_side.py,sha256=GhnGUt78pJ-AYL_Dq9produGjmBJLCI5FHIRdMz1O-g,6551
 bitget/ccxt/base/__init__.py,sha256=eTx1OE3HJjspFUQjGm6LBhaQiMKJnXjkdP-JUXknyQ0,1320
-bitget/ccxt/base/decimal_to_precision.py,sha256=fgWRBzRTtsf3r2INyS4f7WHlzgjB5YM1ekiwqD21aac,6634
-bitget/ccxt/base/errors.py,sha256=Pad-6ugvGUwhoYuKUliX-N7FTrcnKCQGFjsaq2tMn0I,4610
-bitget/ccxt/base/exchange.py,sha256=1Hb7swmJX38Qzt6t7TayO0U-jw0cQ5AbACLZoYoM-9I,331665
+bitget/ccxt/base/decimal_to_precision.py,sha256=XQNziSPUz4UqhIvNx0aDx6-3wSSgZBTsMX57rM7WGPM,7330
+bitget/ccxt/base/errors.py,sha256=MvCrL_sAM3de616T6RE0PSxiF2xV6Qqz5b1y1ghidbk,4888
+bitget/ccxt/base/exchange.py,sha256=3LI4McirkCUEz1090jMfedqTtOae-Gqcl94_oeNf23c,333932
 bitget/ccxt/base/precise.py,sha256=koce64Yrp6vFbGijJtUt-QQ6XhJgeGTCksZ871FPp_A,8886
 bitget/ccxt/base/types.py,sha256=vMQfFDVntED4YHrRJt0Q98YaM7OtGhK-DkbkqXFTYHc,11485
-bitget/ccxt/pro/__init__.py,sha256=lqHzNjDwZdl3ADUrOoBuzn7eEBzqMc-JfS8USMvm1GU,4095
+bitget/ccxt/pro/__init__.py,sha256=jn8mQixqcA5MpjDArx45_4HgnMHLIPhnZTHcNL7AC4M,4095
 bitget/ccxt/pro/bitget.py,sha256=g8SkdhTze-idsChWiGIBi1twpiDfRlJyvnG2NL9VsR0,90372
 bitget/ccxt/static_dependencies/README.md,sha256=3TCvhhn09_Cqf9BDDpao1V7EfKHDpQ6k9oWRsLFixpU,18
 bitget/ccxt/static_dependencies/__init__.py,sha256=tzFje8cloqmiIE6kola3EaYC0SnD1izWnri69hzHsSw,168
@@ -281,6 +281,6 @@ bitget/ccxt/static_dependencies/toolz/curried/exceptions.py,sha256=gKFOHDIayAWnX
 bitget/ccxt/static_dependencies/toolz/curried/operator.py,sha256=ML92mknkAwzBl2NCm-4werSUmJEtSHNY9NSzhseNM9s,525
 bitget/ccxt/static_dependencies/typing_inspect/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 bitget/ccxt/static_dependencies/typing_inspect/typing_inspect.py,sha256=5gIWomLPfuDpgd3gX1GlnX0MuXM3VorR4j2W2qXORiQ,28269
-bitget-0.0.74.dist-info/METADATA,sha256=1JzpjBuLvQluSXdSAOW5eaGzTG1A4QK7YvBLezoLCQ8,44111
-bitget-0.0.74.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
-bitget-0.0.74.dist-info/RECORD,,
+bitget-0.0.76.dist-info/METADATA,sha256=WAxJrncPtxEPJPwMeF29j3u9Gr_7_cq-0Idkhl7il_g,44111
+bitget-0.0.76.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
+bitget-0.0.76.dist-info/RECORD,,