ccxt 4.2.77__py2.py3-none-any.whl → 4.4.49__py2.py3-none-any.whl

ccxt/pro/myokx.py

@@ -0,0 +1,28 @@
+# -*- coding: utf-8 -*-
+
+# 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
+
+from ccxt.pro.okx import okx
+
+
+class myokx(okx):
+
+    def describe(self):
+        return self.deep_extend(super(myokx, self).describe(), {
+            'id': 'myokx',
+            'name': 'MyOKX',
+            'urls': {
+                'api': {
+                    'ws': 'wss://wseea.okx.com:8443/ws/v5',
+                },
+                'test': {
+                    'ws': 'wss://wseeapap.okx.com:8443/ws/v5',
+                },
+            },
+            'has': {
+                'swap': False,
+                'future': False,
+                'option': False,
+            },
+        })

ccxt/pro/ndax.py

@@ -19,6 +19,7 @@ class ndax(ccxt.async_support.ndax):
                 'ws': True,
                 'watchOrderBook': True,
                 'watchTrades': True,
+                'watchTradesForSymbols': False,
                 'watchTicker': True,
                 'watchOHLCV': True,
             },
@@ -45,6 +46,9 @@ class ndax(ccxt.async_support.ndax):
     async def watch_ticker(self, symbol: str, params={}) -> Ticker:
         """
         watches a price ticker, a statistical calculation with the information calculated over the past 24 hours for a specific market
+
+        https://apidoc.ndax.io/#subscribelevel1
+
         :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>`
@@ -56,12 +60,12 @@ class ndax(ccxt.async_support.ndax):
         messageHash = name + ':' + market['id']
         url = self.urls['api']['ws']
         requestId = self.request_id()
-        payload = {
+        payload: dict = {
             'OMSId': omsId,
             'InstrumentId': int(market['id']),  # conditionally optional
             # 'Symbol': market['info']['symbol'],  # conditionally optional
         }
-        request = {
+        request: dict = {
             'm': 0,  # message type, 0 request, 1 reply, 2 subscribe, 3 event, unsubscribe, 5 error
             'i': requestId,  # sequence number identifies an individual request or request-and-response pair, to your application
             'n': name,  # function name is the name of the function being called or that the server is responding to, the server echoes your call
@@ -108,6 +112,9 @@ class ndax(ccxt.async_support.ndax):
     async def watch_trades(self, symbol: str, since: Int = None, limit: Int = None, params={}) -> List[Trade]:
         """
         get the list of most recent trades for a particular symbol
+
+        https://apidoc.ndax.io/#subscribetrades
+
         :param str symbol: unified symbol of the market to fetch trades for
         :param int [since]: timestamp in ms of the earliest trade to fetch
         :param int [limit]: the maximum amount of trades to fetch
@@ -122,12 +129,12 @@ class ndax(ccxt.async_support.ndax):
         messageHash = name + ':' + market['id']
         url = self.urls['api']['ws']
         requestId = self.request_id()
-        payload = {
+        payload: dict = {
             'OMSId': omsId,
             'InstrumentId': int(market['id']),  # conditionally optional
             'IncludeLastCount': 100,  # the number of previous trades to retrieve in the immediate snapshot, 100 by default
         }
-        request = {
+        request: dict = {
             'm': 0,  # message type, 0 request, 1 reply, 2 subscribe, 3 event, unsubscribe, 5 error
             'i': requestId,  # sequence number identifies an individual request or request-and-response pair, to your application
             'n': name,  # function name is the name of the function being called or that the server is responding to, the server echoes your call
@@ -161,7 +168,7 @@ class ndax(ccxt.async_support.ndax):
         #     ]
         #
         name = 'SubscribeTrades'
-        updates = {}
+        updates: dict = {}
         for i in range(0, len(payload)):
             trade = self.parse_trade(payload[i])
             symbol = trade['symbol']
@@ -183,6 +190,9 @@ class ndax(ccxt.async_support.ndax):
     async def watch_ohlcv(self, symbol: str, timeframe='1m', since: Int = None, limit: Int = None, params={}) -> List[list]:
         """
         watches historical candlestick data containing the open, high, low, and close price, and the volume of a market
+
+        https://apidoc.ndax.io/#subscribeticker
+
         :param str symbol: unified symbol of the market to fetch OHLCV data for
         :param str timeframe: the length of time each candle represents
         :param int [since]: timestamp in ms of the earliest candle to fetch
@@ -198,13 +208,13 @@ class ndax(ccxt.async_support.ndax):
         messageHash = name + ':' + timeframe + ':' + market['id']
         url = self.urls['api']['ws']
         requestId = self.request_id()
-        payload = {
+        payload: dict = {
             'OMSId': omsId,
             'InstrumentId': int(market['id']),  # conditionally optional
             'Interval': int(self.safe_string(self.timeframes, timeframe, timeframe)),
             'IncludeLastCount': 100,  # the number of previous candles to retrieve in the immediate snapshot, 100 by default
         }
-        request = {
+        request: dict = {
             'm': 0,  # message type, 0 request, 1 reply, 2 subscribe, 3 event, unsubscribe, 5 error
             'i': requestId,  # sequence number identifies an individual request or request-and-response pair, to your application
             'n': name,  # function name is the name of the function being called or that the server is responding to, the server echoes your call
@@ -242,7 +252,7 @@ class ndax(ccxt.async_support.ndax):
         #         ]
         #     ]
         #
-        updates = {}
+        updates: dict = {}
         for i in range(0, len(payload)):
             ohlcv = payload[i]
             marketId = self.safe_string(ohlcv, 8)
@@ -303,6 +313,9 @@ class ndax(ccxt.async_support.ndax):
     async def watch_order_book(self, symbol: str, limit: Int = None, params={}) -> OrderBook:
         """
         watches information on open orders with bid(buy) and ask(sell) prices, volumes and other data
+
+        https://apidoc.ndax.io/#subscribelevel2
+
         :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
@@ -317,19 +330,19 @@ class ndax(ccxt.async_support.ndax):
         url = self.urls['api']['ws']
         requestId = self.request_id()
         limit = 100 if (limit is None) else limit
-        payload = {
+        payload: dict = {
             'OMSId': omsId,
             'InstrumentId': int(market['id']),  # conditionally optional
             # 'Symbol': market['info']['symbol'],  # conditionally optional
             'Depth': limit,  # default 100
         }
-        request = {
+        request: dict = {
             'm': 0,  # message type, 0 request, 1 reply, 2 subscribe, 3 event, unsubscribe, 5 error
             'i': requestId,  # sequence number identifies an individual request or request-and-response pair, to your application
             'n': name,  # function name is the name of the function being called or that the server is responding to, the server echoes your call
             'o': self.json(payload),  # JSON-formatted string containing the data being sent with the message
         }
-        subscription = {
+        subscription: dict = {
             'id': requestId,
             'messageHash': messageHash,
             'name': name,
@@ -490,7 +503,7 @@ class ndax(ccxt.async_support.ndax):
         if payload is None:
             return
         message['o'] = json.loads(payload)
-        methods = {
+        methods: dict = {
             'SubscribeLevel2': self.handle_subscription_status,
             'SubscribeLevel1': self.handle_ticker,
             'Level2UpdateEvent': self.handle_order_book,

ccxt/pro/okcoin.py

@@ -9,8 +9,8 @@ import hashlib
 from ccxt.base.types import Balances, Int, Order, OrderBook, Str, Ticker, Trade
 from ccxt.async_support.base.ws.client import Client
 from typing import List
-from ccxt.base.errors import ArgumentsRequired
 from ccxt.base.errors import AuthenticationError
+from ccxt.base.errors import ArgumentsRequired
 
 
 class okcoin(ccxt.async_support.okcoin):
@@ -24,6 +24,7 @@ class okcoin(ccxt.async_support.okcoin):
                 'watchOrderBook': True,
                 'watchOrders': True,
                 'watchTrades': True,
+                'watchTradesForSymbols': False,
                 'watchBalance': True,
                 'watchOHLCV': True,
             },
@@ -63,7 +64,7 @@ class okcoin(ccxt.async_support.okcoin):
         market = self.market(symbol)
         url = self.urls['api']['ws']
         messageHash = market['type'] + '/' + channel + ':' + market['id']
-        request = {
+        request: dict = {
             'op': 'subscribe',
             'args': [messageHash],
         }
@@ -72,6 +73,9 @@ class okcoin(ccxt.async_support.okcoin):
     async def watch_trades(self, symbol: str, since: Int = None, limit: Int = None, params={}) -> List[Trade]:
         """
         get the list of most recent trades for a particular symbol
+
+        https://www.okcoin.com/docs-v5/en/#websocket-api-public-channel-trades-channel
+
         :param str symbol: unified symbol of the market to fetch trades for
         :param int [since]: timestamp in ms of the earliest trade to fetch
         :param int [limit]: the maximum amount of trades to fetch
@@ -88,6 +92,9 @@ class okcoin(ccxt.async_support.okcoin):
     async def watch_orders(self, symbol: Str = None, since: Int = None, limit: Int = None, params={}) -> List[Order]:
         """
         watches information on multiple orders made by the user
+
+        https://www.okcoin.com/docs-v5/en/#websocket-api-private-channel-order-channel
+
         :param str symbol: unified market symbol of the market orders were made in
         :param int [since]: the earliest time in ms to fetch orders for
         :param int [limit]: the maximum number of order structures to retrieve
@@ -150,7 +157,7 @@ class okcoin(ccxt.async_support.okcoin):
             if self.orders is None:
                 self.orders = ArrayCacheBySymbolById(limit)
             stored = self.orders
-            marketIds = {}
+            marketIds: dict = {}
             parsed = self.parse_orders(orders)
             for i in range(0, len(parsed)):
                 order = parsed[i]
@@ -166,6 +173,9 @@ class okcoin(ccxt.async_support.okcoin):
     async def watch_ticker(self, symbol: str, params={}) -> Ticker:
         """
         watches a price ticker, a statistical calculation with the information calculated over the past 24 hours for a specific market
+
+        https://www.okcoin.com/docs-v5/en/#websocket-api-public-channel-tickers-channel
+
         :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>`
@@ -241,6 +251,9 @@ class okcoin(ccxt.async_support.okcoin):
     async def watch_ohlcv(self, symbol: str, timeframe='1m', since: Int = None, limit: Int = None, params={}) -> List[list]:
         """
         watches historical candlestick data containing the open, high, low, and close price, and the volume of a market
+
+        https://www.okcoin.com/docs-v5/en/#websocket-api-public-channel-candlesticks-channel
+
         :param str symbol: unified symbol of the market to fetch OHLCV data for
         :param str timeframe: the length of time each candle represents
         :param int [since]: timestamp in ms of the earliest candle to fetch
@@ -303,6 +316,9 @@ class okcoin(ccxt.async_support.okcoin):
     async def watch_order_book(self, symbol: str, limit: Int = None, params={}) -> OrderBook:
         """
         watches information on open orders with bid(buy) and ask(sell) prices, volumes and other data
+
+        https://www.okcoin.com/docs-v5/en/#websocket-api-public-channel-order-book-channel
+
         :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
@@ -442,7 +458,7 @@ class okcoin(ccxt.async_support.okcoin):
             path = '/users/self/verify'
             auth = timestamp + method + path
             signature = self.hmac(self.encode(auth), self.encode(self.secret), hashlib.sha256, 'base64')
-            request = {
+            request: dict = {
                 'op': messageHash,
                 'args': [
                     self.apiKey,
@@ -452,11 +468,14 @@ class okcoin(ccxt.async_support.okcoin):
                 ],
             }
             self.spawn(self.watch, url, messageHash, request, messageHash, future)
-        return future
+        return await future
 
     async def watch_balance(self, params={}) -> Balances:
         """
         watch balance and get the amount of funds available for trading or funds locked in orders
+
+        https://www.okcoin.com/docs-v5/en/#websocket-api-private-channel-account-channel
+
         :param dict [params]: extra parameters specific to the exchange API endpoint
         :returns dict: a `balance structure <https://docs.ccxt.com/#/?id=balance-structure>`
         """
@@ -502,7 +521,7 @@ class okcoin(ccxt.async_support.okcoin):
         messageHash = accountType + '/' + account
         subscriptionHash = messageHash + ':' + suffix
         url = self.urls['api']['ws']
-        request = {
+        request: dict = {
             'op': 'subscribe',
             'args': [subscriptionHash],
         }
@@ -573,7 +592,7 @@ class okcoin(ccxt.async_support.okcoin):
         client.resolve(message, 'authenticated')
         return message
 
-    def ping(self, client):
+    def ping(self, client: Client):
         # okex does not support built-in ws protocol-level ping-pong
         # instead it requires custom text-based ping-pong
         return 'ping'
@@ -668,7 +687,7 @@ class okcoin(ccxt.async_support.okcoin):
         if table is None:
             event = self.safe_string(message, 'event')
             if event is not None:
-                methods = {
+                methods: dict = {
                     # 'info': self.handleSystemStatus,
                     # 'book': 'handleOrderBook',
                     'login': self.handle_authenticate,
@@ -680,7 +699,7 @@ class okcoin(ccxt.async_support.okcoin):
         else:
             parts = table.split('/')
             name = self.safe_string(parts, 1)
-            methods = {
+            methods: dict = {
                 'depth': self.handle_order_book,
                 'depth5': self.handle_order_book,
                 'depth_l2_tbt': self.handle_order_book,