Merge remote-tracking branch 'upstream/master'

Author: pprados

Endpoints.md

@@ -617,7 +617,6 @@
     client.futures_liquidation_orders(symbol, startTime, endTime, limit)
     ``` 
   - **GET /fapi/v1/openInterest** (Get present open interest of a specific symbol.)
-    > :warning: Probably broken, python code below is implemented on v1/openInterest endpoint.
     ```python 
     client.futures_open_interest(symbol)
     ``` 

binance/client.py

@@ -648,7 +648,7 @@ def get_recent_trades(self, **params) -> Dict:
 
         :param symbol: required
         :type symbol: str
-        :param limit:  Default 500; max 500.
+        :param limit:  Default 500; max 1000.
         :type limit: int
 
         :returns: API response
@@ -678,7 +678,7 @@ def get_historical_trades(self, **params) -> Dict:
 
         :param symbol: required
         :type symbol: str
-        :param limit:  Default 500; max 500.
+        :param limit:  Default 500; max 1000.
         :type limit: int
         :param fromId:  TradeId to fetch from. Default gets most recent trades.
         :type fromId: str
@@ -717,7 +717,7 @@ def get_aggregate_trades(self, **params) -> Dict:
         :type startTime: int
         :param endTime: Timestamp in ms to get aggregate trades until INCLUSIVE.
         :type endTime: int
-        :param limit:  Default 500; max 500.
+        :param limit:  Default 500; max 1000.
         :type limit: int
 
         :returns: API response
@@ -834,7 +834,7 @@ def get_klines(self, **params) -> Dict:
         :type symbol: str
         :param interval: -
         :type interval: str
-        :param limit: - Default 500; max 500.
+        :param limit: - Default 500; max 1000.
         :type limit: int
         :param startTime:
         :type startTime: int
@@ -1816,7 +1816,7 @@ def get_all_orders(self, **params):
         :type startTime: int
         :param endTime: optional
         :type endTime: int
-        :param limit: Default 500; max 500.
+        :param limit: Default 500; max 1000.
         :type limit: int
         :param recvWindow: the number of milliseconds the request is valid for
         :type recvWindow: int
@@ -1997,7 +1997,7 @@ def get_my_trades(self, **params):
         :type startTime: int
         :param endTime: optional
         :type endTime: int
-        :param limit: Default 500; max 500.
+        :param limit: Default 500; max 1000.
         :type limit: int
         :param fromId: TradeId to fetch from. Default gets most recent trades.
         :type fromId: int
@@ -2139,6 +2139,35 @@ def get_account_api_trading_status(self, **params):
         """
         return self._request_margin_api('get', 'account/apiTradingStatus', True, data=params)
 
+    def get_account_api_permissions(self, **params):
+        """Fetch api key permissions.
+
+        https://binance-docs.github.io/apidocs/spot/en/#get-api-key-permission-user_data
+
+        :param recvWindow: the number of milliseconds the request is valid for
+        :type recvWindow: int
+
+        :returns: API response
+
+        .. code-block:: python
+
+            {
+               "ipRestrict": false,
+               "createTime": 1623840271000,   
+               "enableWithdrawals": false,   // This option allows you to withdraw via API. You must apply the IP Access Restriction filter in order to enable withdrawals
+               "enableInternalTransfer": true,  // This option authorizes this key to transfer funds between your master account and your sub account instantly
+               "permitsUniversalTransfer": true,  // Authorizes this key to be used for a dedicated universal transfer API to transfer multiple supported currencies. Each business's own transfer API rights are not affected by this authorization
+               "enableVanillaOptions": false,  //  Authorizes this key to Vanilla options trading
+               "enableReading": true,
+               "enableFutures": false,  //  API Key created before your futures account opened does not support futures API service
+               "enableMargin": false,   //  This option can be adjusted after the Cross Margin account transfer is completed
+               "enableSpotAndMarginTrading": false, // Spot and margin trading
+               "tradingAuthorityExpirationTime": 1628985600000  // Expiration time for spot and margin trading permission
+            }
+
+        """
+        return self._request_margin_api('get', 'account/apiRestrictions', True, data=params)
+
     def get_dust_log(self, **params):
         """Get log of small amounts exchanged for BNB.
 
@@ -2493,8 +2522,8 @@ def withdraw(self, **params):
 
         """
         # force a name for the withdrawal if one not set
-        if 'asset' in params and 'name' not in params:
-            params['name'] = params['asset']
+        if 'coin' in params and 'name' not in params:
+            params['name'] = params['coin']
         return self._request_margin_api('post', 'capital/withdraw/apply', True, data=params)
 
     def get_deposit_history(self, **params):
@@ -6452,6 +6481,13 @@ def options_user_trades(self, **params):
         """
         return self._request_options_api('get', 'userTrades', signed=True, data=params)
 
+    def close_connection(self):
+        if self.session:
+            self.session.close()
+
+    def __del__(self):
+        self.close_connection()
+
 
 class AsyncClient(BaseClient):
 
@@ -6964,6 +7000,10 @@ async def get_account_api_trading_status(self, **params):
         return await self._request_margin_api('get', 'account/apiTradingStatus', True, data=params)
     get_account_api_trading_status.__doc__ = Client.get_account_api_trading_status.__doc__
 
+    async def get_account_api_permissions(self, **params):
+        return await self._request_margin_api('get', 'account/apiRestrictions', True, data=params)
+    get_account_api_permissions.__doc__ = Client.get_account_api_permissions.__doc__
+
     async def get_dust_log(self, **params):
         return await self._request_margin_api('get', 'asset/dribblet', True, data=params)
     get_dust_log.__doc__ = Client.get_dust_log.__doc__
@@ -6996,8 +7036,8 @@ async def get_asset_details(self, **params):
 
     async def withdraw(self, **params):
         # force a name for the withdrawal if one not set
-        if 'asset' in params and 'name' not in params:
-            params['name'] = params['asset']
+        if 'coin' in params and 'name' not in params:
+            params['name'] = params['coin']
         return await self._request_margin_api('post', 'capital/withdraw/apply', True, data=params)
     withdraw.__doc__ = Client.withdraw.__doc__
 

docs/websockets.rst

@@ -7,7 +7,7 @@ with `ThreadedWebsocketManager <binance.html#binance.websockets.ThreadedWebsocke
 
 ThreadedWebsocketManager does not require asyncio programming, while BinanceSocketManager does.
 
-ThreadedWebsocketManager function begin with `start_`, e.g `start_ticker_socket` while BinanceSocketManager is simple `ticker_socket`
+ThreadedWebsocketManager function begin with `start_`, e.g `start_ticker_socket` while BinanceSocketManager is simply `ticker_socket`.
 
 Multiple socket connections can be made through either manager.
 
@@ -21,7 +21,7 @@ Websockets are setup to reconnect with a maximum of 5 retries with an exponentia
 ThreadedWebsocketManager Websocket Usage
 ----------------------------------------
 
-Starting sockets on the ThreadedWebsocketManager requires a callback parameter, similar to old implementations of websockets on python-binance
+Starting sockets on the ThreadedWebsocketManager requires a callback parameter, similar to the old implementations of websockets on python-binance.
 
 ThreadedWebsocketManager takes similar parameters to the `Client <binance.html#binance.client.Client>`_ class as it
 creates an AsyncClient internally.
@@ -30,7 +30,7 @@ For authenticated streams `api_key` and `api_stream` are required.
 
 As these use threads `start()` is required to be called before starting any sockets.
 
-To keep the ThreadedWebsocketManager running using `join()` to join it to the main thread.
+To keep the ThreadedWebsocketManager running, use `join()` to join it to the main thread.
 
 .. code:: python
 
@@ -71,7 +71,7 @@ To keep the ThreadedWebsocketManager running using `join()` to join it to the ma
 
 **Stop Individual Stream**
 
-When starting a stream, a name for that stream will be returned. This can be used to stop that individual stream
+When starting a stream, a name for that stream will be returned. This can be used to stop that individual stream.
 
 .. code:: python
 
@@ -195,7 +195,7 @@ can do this.
 Websocket Errors
 ----------------
 
-If the websocket is disconnected and is unable to reconnect a message is sent to the callback to indicate this. The format is
+If the websocket is disconnected and is unable to reconnect, a message is sent to the callback to indicate this. The format is
 
 .. code:: python