diff --git a/CHANGELOG b/CHANGELOG index f88a0fe..35ca6cf 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -1,3 +1,6 @@ +1.1.13 +-) Adding balance_available to the Wallet. + 1.1.12 -) Applied clientside fix to get_public_trades() (in case of multiple trades at the same timestamp they should be ordered by id) -) Invalid orders are now removed from pending_orders diff --git a/bfxapi/models/wallet.py b/bfxapi/models/wallet.py index 028d5ac..7fa292a 100644 --- a/bfxapi/models/wallet.py +++ b/bfxapi/models/wallet.py @@ -9,10 +9,11 @@ class Wallet: currency """ - def __init__(self, wType, currency, balance, unsettled_interest): + def __init__(self, wType, currency, balance, unsettled_interest, balance_available): self.type = wType self.currency = currency self.balance = balance + self.balance_available = balance_available self.unsettled_interest = unsettled_interest self.key = "{}_{}".format(wType, currency) @@ -29,5 +30,5 @@ class Wallet: self.unsettled_interest = data def __str__(self): - return "Wallet <'{}_{}' balance='{}' unsettled='{}'>".format( - self.type, self.currency, self.balance, self.unsettled_interest) + return "Wallet <'{}_{}' balance='{}' balance_available='{}' unsettled='{}'>".format( + self.type, self.currency, self.balance, self.balance_available, self.unsettled_interest) diff --git a/bfxapi/rest/bfx_rest.py b/bfxapi/rest/bfx_rest.py index ab0bb03..e8d23f7 100644 --- a/bfxapi/rest/bfx_rest.py +++ b/bfxapi/rest/bfx_rest.py @@ -383,7 +383,7 @@ class BfxRest: """ endpoint = "auth/r/wallets" raw_wallets = await self.post(endpoint) - return [Wallet(*rw[:4]) for rw in raw_wallets] + return [Wallet(*rw[:5]) for rw in raw_wallets] async def get_active_orders(self, symbol): """ diff --git a/bfxapi/version.py b/bfxapi/version.py index 6c219fb..7e55b74 100644 --- a/bfxapi/version.py +++ b/bfxapi/version.py @@ -2,4 +2,4 @@ This module contains the current version of the bfxapi lib """ -__version__ = '1.1.12' +__version__ = '1.1.13' diff --git a/bfxapi/websockets/wallet_manager.py b/bfxapi/websockets/wallet_manager.py index 2c22c32..a91c66e 100644 --- a/bfxapi/websockets/wallet_manager.py +++ b/bfxapi/websockets/wallet_manager.py @@ -17,13 +17,13 @@ class WalletManager: wData = raw_ws_data[2] self.wallets = {} for wallet in wData: - new_wallet = Wallet(wallet[0], wallet[1], wallet[2], wallet[3]) + new_wallet = Wallet(wallet[0], wallet[1], wallet[2], wallet[3], wallet[4]) self.wallets[new_wallet.key] = new_wallet return self.get_wallets() def _update_from_event(self, raw_ws_data): wallet = raw_ws_data[2] - new_wallet = Wallet(wallet[0], wallet[1], wallet[2], wallet[3]) + new_wallet = Wallet(wallet[0], wallet[1], wallet[2], wallet[3], wallet[4]) self.wallets[new_wallet.key] = new_wallet return new_wallet