Skip to content

Commit

Permalink
Merge pull request #1342 from zweix123/renew_api_client
Browse files Browse the repository at this point in the history
renew 3 interface in client
  • Loading branch information
sammchardy committed Aug 9, 2023
2 parents d54b901 + df99532 commit 548e849
Showing 1 changed file with 13 additions and 12 deletions.
25 changes: 13 additions & 12 deletions binance/client.py
Original file line number Diff line number Diff line change
Expand Up @@ -217,11 +217,12 @@ def _create_margin_api_uri(self, path: str, version: int = 1) -> str:
def _create_website_uri(self, path: str) -> str:
return self.WEBSITE_URL + '/' + path

def _create_futures_api_uri(self, path: str) -> str:
def _create_futures_api_uri(self, path: str, version=1) -> str:
url = self.FUTURES_URL
if self.testnet:
url = self.FUTURES_TESTNET_URL
return url + '/' + self.FUTURES_API_VERSION + '/' + path
options = {1: self.FUTURES_API_VERSION, 2: self.FUTURES_API_VERSION2}
return url + '/' + options[version] + '/' + path

def _create_futures_data_api_uri(self, path: str) -> str:
url = self.FUTURES_DATA_URL
Expand Down Expand Up @@ -376,8 +377,8 @@ def _request_api(
uri = self._create_api_uri(path, signed, version)
return self._request(method, uri, signed, **kwargs)

def _request_futures_api(self, method, path, signed=False, **kwargs) -> Dict:
uri = self._create_futures_api_uri(path)
def _request_futures_api(self, method, path, signed=False, version=1, **kwargs) -> Dict:
uri = self._create_futures_api_uri(path, version)

return self._request(method, uri, signed, True, **kwargs)

Expand Down Expand Up @@ -6276,15 +6277,15 @@ def futures_account_balance(self, **params):
https://binance-docs.github.io/apidocs/futures/en/#future-account-balance-user_data
"""
return self._request_futures_api('get', 'balance', True, data=params)
return self._request_futures_api('get', 'balance', True, 2, data=params)

def futures_account(self, **params):
"""Get current account information.
https://binance-docs.github.io/apidocs/futures/en/#account-information-user_data
"""
return self._request_futures_api('get', 'account', True, data=params)
return self._request_futures_api('get', 'account', True, 2, data=params)

def futures_change_leverage(self, **params):
"""Change user's initial leverage of specific symbol market
Expand Down Expand Up @@ -6324,7 +6325,7 @@ def futures_position_information(self, **params):
https://binance-docs.github.io/apidocs/futures/en/#position-information-user_data
"""
return self._request_futures_api('get', 'positionRisk', True, data=params)
return self._request_futures_api('get', 'positionRisk', True, 2, data=params)

def futures_account_trades(self, **params):
"""Get trades for the authenticated account and symbol.
Expand Down Expand Up @@ -7620,8 +7621,8 @@ async def _request_api(self, method, path, signed=False, version=BaseClient.PUBL
uri = self._create_api_uri(path, signed, version)
return await self._request(method, uri, signed, **kwargs)

async def _request_futures_api(self, method, path, signed=False, **kwargs) -> Dict:
uri = self._create_futures_api_uri(path)
async def _request_futures_api(self, method, path, signed=False, version=1, **kwargs) -> Dict:
uri = self._create_futures_api_uri(path, version=version)

return await self._request(method, uri, signed, True, **kwargs)

Expand Down Expand Up @@ -8624,10 +8625,10 @@ async def futures_cancel_orders(self, **params):
return await self._request_futures_api('delete', 'batchOrders', True, data=params)

async def futures_account_balance(self, **params):
return await self._request_futures_api('get', 'balance', True, data=params)
return await self._request_futures_api('get', 'balance', True, version=2, data=params)

async def futures_account(self, **params):
return await self._request_futures_api('get', 'account', True, data=params)
return await self._request_futures_api('get', 'account', True, version=2, data=params)

async def futures_change_leverage(self, **params):
return await self._request_futures_api('post', 'leverage', True, data=params)
Expand All @@ -8642,7 +8643,7 @@ async def futures_position_margin_history(self, **params):
return await self._request_futures_api('get', 'positionMargin/history', True, data=params)

async def futures_position_information(self, **params):
return await self._request_futures_api('get', 'positionRisk', True, data=params)
return await self._request_futures_api('get', 'positionRisk', True, version=2, data=params)

async def futures_account_trades(self, **params):
return await self._request_futures_api('get', 'userTrades', True, data=params)
Expand Down

0 comments on commit 548e849

Please sign in to comment.