diff --git a/build/requirements_base.txt b/build/requirements_base.txt index c942e551b..b020601af 100644 --- a/build/requirements_base.txt +++ b/build/requirements_base.txt @@ -1 +1,29 @@ -THIS FILE GETS FILLED IN BY BUILD SCRIPT AND INCLUDED IN requirements.txt +Twisted==16.6.0 +appdirs==1.4.3 +argparse==1.2.1 +base58==0.2.2 +colorama==0.3.7 +dnspython==1.12.0 +ecdsa==0.13 +envparse==0.2.0 +gmpy==1.17 +jsonrpc==1.2 +jsonrpclib==0.1.7 +jsonschema==2.5.1 +git+https://github.com/lbryio/lbryschema.git@v0.0.3#egg=lbryschema +git+https://github.com/lbryio/lbryum.git@v2.7.20#egg=lbryum +miniupnpc==1.9 +pbkdf2==1.3 +protobuf==3.0.0 +pycrypto==2.6.1 +pyyaml==3.12 +qrcode==5.2.2 +requests==2.9.1 +txrequests==0.9.5 +seccure==0.3.1.3 +service_identity==16.0.0 +six>=1.9.0 +slowaes==0.1a1 +txJSON-RPC==0.5 +wsgiref==0.1.2 +zope.interface==4.3.3 diff --git a/lbrynet/core/Wallet.py b/lbrynet/core/Wallet.py index eda716816..2293720b0 100644 --- a/lbrynet/core/Wallet.py +++ b/lbrynet/core/Wallet.py @@ -738,9 +738,13 @@ class Wallet(object): def get_claim_metadata_for_sd_hash(self, sd_hash): return self._get_claim_metadata_for_sd_hash(sd_hash) - def get_balance(self): - return self.wallet_balance - self.total_reserved_points - sum(self.queued_payments.values()) - + def get_balance(self, address=None): + if address is None: + return self.wallet_balance - self.total_reserved_points - sum(self.queued_payments.values()) + else: + c, u, x = self.wallet.get_addr_balance(address) + return Decimal(float(c) / COIN) + def _check_expected_balances(self): now = datetime.datetime.now() balances_to_check = [] diff --git a/lbrynet/lbrynet_daemon/Daemon.py b/lbrynet/lbrynet_daemon/Daemon.py index e3c7a2f74..faea20655 100644 --- a/lbrynet/lbrynet_daemon/Daemon.py +++ b/lbrynet/lbrynet_daemon/Daemon.py @@ -1303,6 +1303,8 @@ class Daemon(AuthJSONRPCServer): """ Return a list of available commands + + Returns: (list) list of available commands """ @@ -1311,20 +1313,24 @@ class Daemon(AuthJSONRPCServer): if 'DEPRECATED' not in getattr(self, "jsonrpc_" + command).__doc__] )) - def jsonrpc_get_balance(self): + def jsonrpc_get_balance(self, address=None): """ DEPRECATED. Use `wallet_balance` instead. """ - return self.jsonrpc_wallet_balance() + return self.jsonrpc_wallet_balance(address) - def jsonrpc_wallet_balance(self): + def jsonrpc_wallet_balance(self, address=None): """ Return the balance of the wallet + Args: + 'address' (optional): (str) Address to get balance of + + Returns: (float) amount of lbry credits in wallet """ - return self._render_response(float(self.session.wallet.get_balance())) + return self._render_response(float(self.session.wallet.get_balance(address))) def jsonrpc_stop(self): """