ccxt 4.3.29__py2.py3-none-any.whl → 4.3.30__py2.py3-none-any.whl

ccxt/__init__.py

@@ -22,7 +22,7 @@
 
 # ----------------------------------------------------------------------------
 
-__version__ = '4.3.29'
+__version__ = '4.3.30'
 
 # ----------------------------------------------------------------------------
 

ccxt/async_support/__init__.py

@@ -4,7 +4,7 @@
 
 # -----------------------------------------------------------------------------
 
-__version__ = '4.3.29'
+__version__ = '4.3.30'
 
 # -----------------------------------------------------------------------------
 

ccxt/async_support/base/exchange.py

@@ -2,7 +2,7 @@
 
 # -----------------------------------------------------------------------------
 
-__version__ = '4.3.29'
+__version__ = '4.3.30'
 
 # -----------------------------------------------------------------------------
 

ccxt/async_support/base/ws/aiohttp_client.py

@@ -101,6 +101,7 @@ class AiohttpClient(Client):
                 else:
                     future.reject(ExchangeClosedByUser('Connection closed by the user'))
 
+
     async def ping_loop(self):
         if self.verbose:
             self.log(iso8601(milliseconds()), 'ping loop')

ccxt/async_support/base/ws/future.py

@@ -1,7 +1,6 @@
 import asyncio
 from ccxt import ExchangeClosedByUser
 
-
 class Future(asyncio.Future):
 
     is_race_future = False
@@ -23,38 +22,37 @@ class Future(asyncio.Future):
         task = asyncio.create_task(coro)
 
         def callback(done):
-            exception = done.exception()
-            if exception is None:
-                complete, _ = done.result()
+            try:
+                complete, pending = done.result()
                 # check for exceptions
-                exceptions = []
-                for f in complete:
-                    if f._state == 'CANCELLED':
-                        continue  # was canceled internally
-                    err = f.exception()
-                    if err:
-                        exceptions.append(err)
-                # if any exceptions return with first exception
-                if len (exceptions) > 0:
-                    future.set_exception(exceptions[0])
-                    return
-                # else return first result
-                else:
-                    futures_list = list(complete)
-                    are_all_canceled = all(f._state == 'CANCELLED' for f in futures_list)
-                    if are_all_canceled and future._state == 'PENDING':
-                        future.set_exception(ExchangeClosedByUser('Connection closed by the user'))
+                for i, f in enumerate(complete):
+                    try:
+                        f.result()
+                    except ExchangeClosedByUser as e:
+                        if len(pending) == 0 and i == len(complete) - 1:
+                            future.reject(e)
+                        # wait for all the sub promises to be reject before rejecting future
+                        continue
+                    except asyncio.CancelledError as e:
+                        continue
+                    except Exception as e:
+                        future.reject(e)
                         return
+                # no exceptions return first result
+                futures_list = list(complete)
 
-                    # handle wait_for scenario
-                    if are_all_canceled and future._state == 'CANCELLED':
-                        return
+                are_all_canceled = all([f.cancelled() for f in futures_list])
+                if are_all_canceled:
+                    future.reject(ExchangeClosedByUser('Connection closed by the user'))
+                    return
 
-                    first = futures_list[0]
+                first = futures_list[0]
 
-                    first_result = first.result()
-                    future.set_result(first_result)
-            else:
-                future.set_exception(exception)
+                first_result = first.result()
+                future.resolve(first_result)
+            except asyncio.CancelledError as e:
+                future.reject(e)
+            except Exception as e:
+                future.reject(e)
         task.add_done_callback(callback)
         return future

ccxt/async_support/bingx.py

@@ -2390,7 +2390,7 @@ class bingx(Exchange, ImplicitAPI):
             'stopLossPrice': stopLossPrice,
             'takeProfitPrice': takeProfitPrice,
             'average': self.safe_string_2(order, 'avgPrice', 'ap'),
-            'cost': None,
+            'cost': self.safe_string(order, 'cummulativeQuoteQty'),
             'amount': self.safe_string_n(order, ['origQty', 'q', 'quantity']),
             'filled': self.safe_string_2(order, 'executedQty', 'z'),
             'remaining': None,