diff --git a/bitex/interface/bittrex.py b/bitex/interface/bittrex.py index 17a9623..06036e4 100644 --- a/bitex/interface/bittrex.py +++ b/bitex/interface/bittrex.py @@ -26,8 +26,7 @@ def __init__(self, **api_kwargs): # pylint: disable=arguments-differ def request(self, endpoint, authenticate=False, **req_kwargs): """Generate a request to the API.""" - return super(Bittrex, self).request('GET', endpoint, authenticate=authenticate, - **req_kwargs) + return super(Bittrex, self).request('GET', endpoint, authenticate=authenticate, **req_kwargs) def _get_supported_pairs(self): """Return a list of supported pairs.""" @@ -103,13 +102,12 @@ def cancel_order(self, *order_ids, **kwargs): return results if len(results) > 1 else results[0] @format_with(BittrexFormattedResponse) - def wallet(self, *args, currency=None, **kwargs): # pylint: disable=arguments-differ + def wallet(self, currency=None, *args, **kwargs): # pylint: disable=arguments-differ """Return the account wallet.""" + payload = kwargs if currency: payload = {'currency': currency} payload.update(kwargs) - return self.request('account/getbalance', params=payload, authenticate=True) - payload = kwargs return self.request('account/getbalances', params=payload, authenticate=True) ########################### @@ -124,19 +122,31 @@ def deposit_address(self, currency, **kwargs): def withdraw(self, **kwargs): """Issue a withdrawal.""" - return self.request('account/withdraw', params=kwargs) + return self.request('account/withdraw', params=kwargs, authenticate=True) - def trade_history(self, *args, **kwargs): # pylint: disable=unused-argument + def trade_history(self, pair=None, **kwargs): """Return the account's trade history.""" - return self.request('account/getorderhistory', params=kwargs, authenticate=True) + payload = kwargs + if pair: + payload = {'market': pair} + payload.update(kwargs) + return self.request('account/getorderhistory', params=payload, authenticate=True) - def withdrawal_history(self, *args, **kwargs): # pylint: disable=unused-argument + def withdrawal_history(self, currency=None, **kwargs): """Return the account's withdrawal history.""" - return self.request('account/getwithdrawalhistory', params=kwargs) + payload = kwargs + if currency: + payload = {'currency': currency} + payload.update(kwargs) + return self.request('account/getwithdrawalhistory', params=payload, authenticate=True) - def deposit_history(self, *args, **kwargs): # pylint: disable=unused-argument + def deposit_history(self, currency=None, **kwargs): """Return the account's deposit history.""" - return self.request('account/getdeposithistory', params=kwargs) + payload = kwargs + if currency: + payload = {'currency': currency} + payload.update(kwargs) + return self.request('account/getdeposithistory', params=payload, authenticate=True) def pairs(self, **kwargs): """Return the available pairs."""