bitget 0.0.73__tar.gz → 0.0.75__tar.gz

{bitget-0.0.73 → bitget-0.0.75}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: bitget
-Version: 0.0.73
+Version: 0.0.75
 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.73 → bitget-0.0.75}/pyproject.toml

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

{bitget-0.0.73 → bitget-0.0.75}/src/bitget/ccxt/__init__.py

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

{bitget-0.0.73 → bitget-0.0.75}/src/bitget/ccxt/async_support/__init__.py

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

{bitget-0.0.73 → bitget-0.0.75}/src/bitget/ccxt/async_support/base/exchange.py

@@ -2,7 +2,7 @@
 
 # -----------------------------------------------------------------------------
 
-__version__ = '4.4.94'
+__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:
@@ -1596,10 +1598,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={}):

{bitget-0.0.73 → bitget-0.0.75}/src/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,6 +32,8 @@ 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

{bitget-0.0.73 → bitget-0.0.75}/src/bitget/ccxt/async_support/bitget.py

@@ -1998,7 +1998,7 @@ class bitget(Exchange, ImplicitAPI):
                     'cross': hasCrossMargin,
                     'isolated': hasIsolatedMargin,
                 }
-                isMarginTradingAllowed = hasCrossMargin or hasCrossMargin
+                isMarginTradingAllowed = hasCrossMargin or hasIsolatedMargin
             else:
                 if symbolType == 'perpetual':
                     type = 'swap'
@@ -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-0.0.73 → bitget-0.0.75}/src/bitget/ccxt/base/exchange.py

@@ -4,7 +4,7 @@
 
 # -----------------------------------------------------------------------------
 
-__version__ = '4.4.94'
+__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:
@@ -2839,7 +2842,7 @@ class Exchange(object):
         # keep self in mind:
         # in JS: 1 == 1.0 is True;  1 == 1.0 is True
         # in Python: 1 == 1.0 is True
-        # in PHP 1 == 1.0 is True, but 1 == 1.0 is False
+        # in PHP 1 == 1.0 is True, but 1 == 1.0 is False.
         if stringVersion.find('.') >= 0:
             return float(stringVersion)
         return int(stringVersion)
@@ -3780,7 +3783,7 @@ class Exchange(object):
         for i in range(0, len(fees)):
             fee = fees[i]
             code = self.safe_string(fee, 'currency')
-            feeCurrencyCode = code is not code if None else str(i)
+            feeCurrencyCode = code if (code is not None) else str(i)
             if feeCurrencyCode is not None:
                 rate = self.safe_string(fee, 'rate')
                 cost = self.safe_string(fee, 'cost')
@@ -5495,10 +5498,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={}):