ccxt 4.0.42__tar.gz → 4.0.43__tar.gz

{ccxt-4.0.42/ccxt.egg-info → ccxt-4.0.43}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: ccxt
-Version: 4.0.42
+Version: 4.0.43
 Summary: A JavaScript / TypeScript / Python / C# / PHP cryptocurrency trading library with support for 130+ exchanges
 Home-page: https://ccxt.com
 Author: Igor Kroitor
@@ -232,20 +232,20 @@ Description: # CCXT – CryptoCurrency eXchange Trading Library
         All-in-one browser bundle (dependencies included), served from a CDN of your choice:
         
         <<<<<<< HEAD
-        * jsDelivr: https://cdn.jsdelivr.net/npm/ccxt@4.0.42/dist/ccxt.browser.js
-        * unpkg: https://unpkg.com/ccxt@4.0.42/dist/ccxt.browser.js
+        * jsDelivr: https://cdn.jsdelivr.net/npm/ccxt@4.0.43/dist/ccxt.browser.js
+        * unpkg: https://unpkg.com/ccxt@4.0.43/dist/ccxt.browser.js
         =======
-        * jsDelivr: https://cdn.jsdelivr.net/npm/ccxt@4.0.42/dist/ccxt.browser.js
-        * unpkg: https://unpkg.com/ccxt@4.0.42/dist/ccxt.browser.js
+        * jsDelivr: https://cdn.jsdelivr.net/npm/ccxt@4.0.43/dist/ccxt.browser.js
+        * unpkg: https://unpkg.com/ccxt@4.0.43/dist/ccxt.browser.js
         >>>>>>> e74b18a3a8a8cbcfe45ce4c1d32b9c03d4fae41c
         
         CDNs are not updated in real-time and may have delays. Defaulting to the most recent version without specifying the version number is not recommended. Please, keep in mind that we are not responsible for the correct operation of those CDN servers.
         
         ```HTML
         <<<<<<< HEAD
-        <script type="text/javascript" src="https://cdn.jsdelivr.net/npm/ccxt@4.0.42/dist/ccxt.browser.js"></script>
+        <script type="text/javascript" src="https://cdn.jsdelivr.net/npm/ccxt@4.0.43/dist/ccxt.browser.js"></script>
         =======
-        <script type="text/javascript" src="https://cdn.jsdelivr.net/npm/ccxt@4.0.42/dist/ccxt.browser.js"></script>
+        <script type="text/javascript" src="https://cdn.jsdelivr.net/npm/ccxt@4.0.43/dist/ccxt.browser.js"></script>
         >>>>>>> e74b18a3a8a8cbcfe45ce4c1d32b9c03d4fae41c
         ```
         

{ccxt-4.0.42 → ccxt-4.0.43}/ccxt/__init__.py

@@ -22,7 +22,7 @@
 
 # ----------------------------------------------------------------------------
 
-__version__ = '4.0.42'
+__version__ = '4.0.43'
 
 # ----------------------------------------------------------------------------
 

{ccxt-4.0.42 → ccxt-4.0.43}/ccxt/async_support/__init__.py

@@ -4,7 +4,7 @@
 
 # -----------------------------------------------------------------------------
 
-__version__ = '4.0.42'
+__version__ = '4.0.43'
 
 # -----------------------------------------------------------------------------
 

{ccxt-4.0.42 → ccxt-4.0.43}/ccxt/async_support/base/exchange.py

@@ -2,7 +2,7 @@
 
 # -----------------------------------------------------------------------------
 
-__version__ = '4.0.42'
+__version__ = '4.0.43'
 
 # -----------------------------------------------------------------------------
 

{ccxt-4.0.42 → ccxt-4.0.43}/ccxt/async_support/bybit.py

@@ -3163,13 +3163,13 @@ class bybit(Exchange, ImplicitAPI):
             'PENDING_CANCEL': 'open',
             'PENDING_NEW': 'open',
             'REJECTED': 'rejected',
-            'PARTIALLY_FILLED_CANCELLED': 'canceled',
+            'PARTIALLY_FILLED_CANCELLED': 'closed',  # context: https://github.com/ccxt/ccxt/issues/18685
             # v3 contract / unified margin / unified account
             'Created': 'open',
             'New': 'open',
             'Rejected': 'rejected',  # order is triggered but failed upon being placed
             'PartiallyFilled': 'open',
-            'PartiallyFilledCanceled': 'canceled',
+            'PartiallyFilledCanceled': 'closed',  # context: https://github.com/ccxt/ccxt/issues/18685
             'Filled': 'closed',
             'PendingCancel': 'open',
             'Cancelled': 'canceled',

{ccxt-4.0.42 → ccxt-4.0.43}/ccxt/base/exchange.py

@@ -4,7 +4,7 @@
 
 # -----------------------------------------------------------------------------
 
-__version__ = '4.0.42'
+__version__ = '4.0.43'
 
 # -----------------------------------------------------------------------------
 

{ccxt-4.0.42 → ccxt-4.0.43}/ccxt/bybit.py

@@ -3162,13 +3162,13 @@ class bybit(Exchange, ImplicitAPI):
             'PENDING_CANCEL': 'open',
             'PENDING_NEW': 'open',
             'REJECTED': 'rejected',
-            'PARTIALLY_FILLED_CANCELLED': 'canceled',
+            'PARTIALLY_FILLED_CANCELLED': 'closed',  # context: https://github.com/ccxt/ccxt/issues/18685
             # v3 contract / unified margin / unified account
             'Created': 'open',
             'New': 'open',
             'Rejected': 'rejected',  # order is triggered but failed upon being placed
             'PartiallyFilled': 'open',
-            'PartiallyFilledCanceled': 'canceled',
+            'PartiallyFilledCanceled': 'closed',  # context: https://github.com/ccxt/ccxt/issues/18685
             'Filled': 'closed',
             'PendingCancel': 'open',
             'Cancelled': 'canceled',

{ccxt-4.0.42 → ccxt-4.0.43}/ccxt/pro/__init__.py

@@ -4,7 +4,7 @@
 
 # ----------------------------------------------------------------------------
 
-__version__ = '4.0.42'
+__version__ = '4.0.43'
 
 # ----------------------------------------------------------------------------
 

{ccxt-4.0.42 → ccxt-4.0.43}/ccxt/pro/binance.py

@@ -2085,6 +2085,7 @@ class binance(ccxt.async_support.binance):
             trade = self.parse_trade(message)
             orderId = self.safe_string(trade, 'order')
             tradeFee = self.safe_value(trade, 'fee')
+            tradeFee = self.extend({}, tradeFee)
             symbol = self.safe_string(trade, 'symbol')
             if orderId is not None and tradeFee is not None and symbol is not None:
                 cachedOrders = self.orders
@@ -2095,7 +2096,7 @@ class binance(ccxt.async_support.binance):
                         # accumulate order fees
                         fees = self.safe_value(order, 'fees')
                         fee = self.safe_value(order, 'fee')
-                        if fees is not None:
+                        if not self.is_empty(fees):
                             insertNewFeeCurrency = True
                             for i in range(0, len(fees)):
                                 orderFee = fees[i]

{ccxt-4.0.42 → ccxt-4.0.43}/ccxt/pro/bybit.py

@@ -868,19 +868,19 @@ class bybit(ccxt.async_support.bybit):
         #         ]
         #     }
         #
-        type = self.safe_string(message, 'type', '')
         if self.orders is None:
             limit = self.safe_integer(self.options, 'ordersLimit', 1000)
             self.orders = ArrayCacheBySymbolById(limit)
         orders = self.orders
-        rawOrders = []
+        rawOrders = self.safe_value(message, 'data', [])
+        first = self.safe_value(rawOrders, 0, {})
+        category = self.safe_string(first, 'category')
+        isSpot = category == 'spot'
         parser = None
-        if type == 'snapshot':
-            rawOrders = self.safe_value(message, 'data', [])
+        if isSpot:
             parser = 'parseWsSpotOrder'
         else:
             parser = 'parseContractOrder'
-            rawOrders = self.safe_value(message, 'data', [])
             rawOrders = self.safe_value(rawOrders, 'result', rawOrders)
         symbols = {}
         for i in range(0, len(rawOrders)):
@@ -925,31 +925,72 @@ class bybit(ccxt.async_support.bybit):
         #        v: '0',  # leverage
         #        d: 'NO_LIQ'
         #    }
+        # v5
+        #    {
+        #        "category":"spot",
+        #        "symbol":"LTCUSDT",
+        #        "orderId":"1474764674982492160",
+        #        "orderLinkId":"1690541649154749",
+        #        "blockTradeId":"",
+        #        "side":"Buy",
+        #        "positionIdx":0,
+        #        "orderStatus":"Cancelled",
+        #        "cancelType":"UNKNOWN",
+        #        "rejectReason":"EC_NoError",
+        #        "timeInForce":"GTC",
+        #        "isLeverage":"0",
+        #        "price":"0",
+        #        "qty":"5.00000",
+        #        "avgPrice":"0",
+        #        "leavesQty":"0.00000",
+        #        "leavesValue":"5.0000000",
+        #        "cumExecQty":"0.00000",
+        #        "cumExecValue":"0.0000000",
+        #        "cumExecFee":"",
+        #        "orderType":"Market",
+        #        "stopOrderType":"",
+        #        "orderIv":"",
+        #        "triggerPrice":"0.000",
+        #        "takeProfit":"",
+        #        "stopLoss":"",
+        #        "triggerBy":"",
+        #        "tpTriggerBy":"",
+        #        "slTriggerBy":"",
+        #        "triggerDirection":0,
+        #        "placeType":"",
+        #        "lastPriceOnCreated":"0.000",
+        #        "closeOnTrigger":false,
+        #        "reduceOnly":false,
+        #        "smpGroup":0,
+        #        "smpType":"None",
+        #        "smpOrderId":"",
+        #        "createdTime":"1690541649160",
+        #        "updatedTime":"1690541649168"
+        #     }
         #
-        id = self.safe_string(order, 'i')
-        marketId = self.safe_string(order, 's')
+        id = self.safe_string_2(order, 'i', 'orderId')
+        marketId = self.safe_string_2(order, 's', 'symbol')
         symbol = self.safe_symbol(marketId, market, None, 'spot')
-        timestamp = self.safe_integer(order, 'O')
-        price = self.safe_string(order, 'p')
+        timestamp = self.safe_integer_2(order, 'O', 'createdTime')
+        price = self.safe_string_2(order, 'p', 'price')
         if price == '0':
             price = None  # market orders
-        filled = self.safe_string(order, 'z')
-        status = self.parse_order_status(self.safe_string(order, 'X'))
-        side = self.safe_string_lower(order, 'S')
-        lastTradeTimestamp = self.safe_string(order, 'E')
-        timeInForce = self.safe_string(order, 'f')
+        filled = self.safe_string_2(order, 'z', 'cumExecQty')
+        status = self.parse_order_status(self.safe_string_2(order, 'X', 'orderStatus'))
+        side = self.safe_string_lower_2(order, 'S', 'side')
+        lastTradeTimestamp = self.safe_string_2(order, 'E', 'updatedTime')
+        timeInForce = self.safe_string_2(order, 'f', 'timeInForce')
         amount = None
-        cost = self.safe_string(order, 'Z')
-        q = self.safe_string(order, 'q')
-        type = self.safe_string_lower(order, 'o')
-        if type.find('quote') >= 0:
+        cost = self.safe_string_2(order, 'Z', 'cumExecValue')
+        type = self.safe_string_lower_2(order, 'o', 'orderType')
+        if (type is not None) and (type.find('market') >= 0):
+            type = 'market'
+        if type == 'market' and side == 'buy':
             amount = filled
         else:
-            amount = q
-        if type.find('market') >= 0:
-            type = 'market'
+            amount = self.safe_string_2(order, 'orderQty', 'qty')
         fee = None
-        feeCost = self.safe_string(order, 'n')
+        feeCost = self.safe_string_2(order, 'n', 'cumExecFee')
         if feeCost is not None and feeCost != '0':
             feeCurrencyId = self.safe_string(order, 'N')
             feeCurrencyCode = self.safe_currency_code(feeCurrencyId)
@@ -957,10 +998,11 @@ class bybit(ccxt.async_support.bybit):
                 'cost': feeCost,
                 'currency': feeCurrencyCode,
             }
+        triggerPrice = self.omit_zero(self.safe_string(order, 'triggerPrice'))
         return self.safe_order({
             'info': order,
             'id': id,
-            'clientOrderId': self.safe_string(order, 'c'),
+            'clientOrderId': self.safe_string_2(order, 'c', 'orderLinkId'),
             'timestamp': timestamp,
             'datetime': self.iso8601(timestamp),
             'lastTradeTimestamp': lastTradeTimestamp,
@@ -970,11 +1012,14 @@ class bybit(ccxt.async_support.bybit):
             'postOnly': None,
             'side': side,
             'price': price,
-            'stopPrice': None,
-            'triggerPrice': None,
+            'stopPrice': triggerPrice,
+            'triggerPrice': triggerPrice,
+            'takeProfitPrice': self.safe_string(order, 'takeProfit'),
+            'stopLossPrice': self.safe_string(order, 'stopLoss'),
+            'reduceOnly': self.safe_value(order, 'reduceOnly'),
             'amount': amount,
             'cost': cost,
-            'average': None,
+            'average': self.safe_string(order, 'avgPrice'),
             'filled': filled,
             'remaining': None,
             'status': status,

{ccxt-4.0.42 → ccxt-4.0.43}/ccxt/pro/cryptocom.py

@@ -10,6 +10,7 @@ from ccxt.base.types import OrderSide
 from ccxt.base.types import OrderType
 from ccxt.async_support.base.ws.client import Client
 from typing import Optional
+from ccxt.base.errors import NetworkError
 from ccxt.base.errors import AuthenticationError
 
 
@@ -55,7 +56,11 @@ class cryptocom(ccxt.async_support.cryptocom):
         #     "method": "public/heartbeat",
         #     "code": 0
         # }
-        await client.send({'id': self.safe_integer(message, 'id'), 'method': 'public/respond-heartbeat'})
+        try:
+            await client.send({'id': self.safe_integer(message, 'id'), 'method': 'public/respond-heartbeat'})
+        except Exception as e:
+            error = NetworkError(self.id + ' pong failed with error ' + self.json(e))
+            client.reset(error)
 
     async def watch_order_book(self, symbol: str, limit: Optional[int] = None, params={}):
         """

{ccxt-4.0.42 → ccxt-4.0.43/ccxt.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: ccxt
-Version: 4.0.42
+Version: 4.0.43
 Summary: A JavaScript / TypeScript / Python / C# / PHP cryptocurrency trading library with support for 130+ exchanges
 Home-page: https://ccxt.com
 Author: Igor Kroitor
@@ -232,20 +232,20 @@ Description: # CCXT – CryptoCurrency eXchange Trading Library
         All-in-one browser bundle (dependencies included), served from a CDN of your choice:
         
         <<<<<<< HEAD
-        * jsDelivr: https://cdn.jsdelivr.net/npm/ccxt@4.0.42/dist/ccxt.browser.js
-        * unpkg: https://unpkg.com/ccxt@4.0.42/dist/ccxt.browser.js
+        * jsDelivr: https://cdn.jsdelivr.net/npm/ccxt@4.0.43/dist/ccxt.browser.js
+        * unpkg: https://unpkg.com/ccxt@4.0.43/dist/ccxt.browser.js
         =======
-        * jsDelivr: https://cdn.jsdelivr.net/npm/ccxt@4.0.42/dist/ccxt.browser.js
-        * unpkg: https://unpkg.com/ccxt@4.0.42/dist/ccxt.browser.js
+        * jsDelivr: https://cdn.jsdelivr.net/npm/ccxt@4.0.43/dist/ccxt.browser.js
+        * unpkg: https://unpkg.com/ccxt@4.0.43/dist/ccxt.browser.js
         >>>>>>> e74b18a3a8a8cbcfe45ce4c1d32b9c03d4fae41c
         
         CDNs are not updated in real-time and may have delays. Defaulting to the most recent version without specifying the version number is not recommended. Please, keep in mind that we are not responsible for the correct operation of those CDN servers.
         
         ```HTML
         <<<<<<< HEAD
-        <script type="text/javascript" src="https://cdn.jsdelivr.net/npm/ccxt@4.0.42/dist/ccxt.browser.js"></script>
+        <script type="text/javascript" src="https://cdn.jsdelivr.net/npm/ccxt@4.0.43/dist/ccxt.browser.js"></script>
         =======
-        <script type="text/javascript" src="https://cdn.jsdelivr.net/npm/ccxt@4.0.42/dist/ccxt.browser.js"></script>
+        <script type="text/javascript" src="https://cdn.jsdelivr.net/npm/ccxt@4.0.43/dist/ccxt.browser.js"></script>
         >>>>>>> e74b18a3a8a8cbcfe45ce4c1d32b9c03d4fae41c
         ```
         

{ccxt-4.0.42 → ccxt-4.0.43}/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ccxt",
-  "version": "4.0.42",
+  "version": "4.0.43",
   "description": "A JavaScript / TypeScript / Python / C# / PHP cryptocurrency trading library with support for 130+ exchanges",
   "unpkg": "dist/ccxt.browser.js",
   "type": "module",