From 0e864f5df1a64fba7c02dce3f9193d300c2a8b79 Mon Sep 17 00:00:00 2001 From: Kay Kurokawa Date: Thu, 12 Jan 2017 12:51:44 -0500 Subject: [PATCH] Update interface for wallet balance --- lbrynet/core/Wallet.py | 41 ++++++++++++++++++---------- lbrynet/lbrynet_daemon/Daemon.py | 6 ++-- lbrynet/lbrynet_daemon/Downloader.py | 4 +-- 3 files changed, 31 insertions(+), 20 deletions(-) diff --git a/lbrynet/core/Wallet.py b/lbrynet/core/Wallet.py index 704db8367..77af430d2 100644 --- a/lbrynet/core/Wallet.py +++ b/lbrynet/core/Wallet.py @@ -19,7 +19,8 @@ from lbryum.commands import known_commands, Commands from lbrynet.core.sqlite_helpers import rerun_if_locked from lbrynet.interfaces import IRequestCreator, IQueryHandlerFactory, IQueryHandler, IWallet from lbrynet.core.client.ClientRequest import ClientRequest -from lbrynet.core.Error import UnknownNameError, InvalidStreamInfoError, RequestCanceledError +from lbrynet.core.Error import (UnknownNameError, InvalidStreamInfoError, RequestCanceledError, + InsufficientFundsError) from lbrynet.db_migrator.migrate1to2 import UNSET_NOUT from lbrynet.metadata.Metadata import Metadata @@ -285,19 +286,12 @@ class Wallet(object): else: d = defer.succeed(True) - d.addCallback(lambda _: self.get_balance()) - - def set_wallet_balance(balance): - if self.wallet_balance != balance: - log.debug("Got a new balance: %s", str(balance)) - self.wallet_balance = balance - def log_error(err): if isinstance(err, AttributeError): log.warning("Failed to get an updated balance") log.warning("Last balance update: %s", str(self.wallet_balance)) - d.addCallbacks(set_wallet_balance, log_error) + d.addCallbacks(lambda _: self.update_balance(), log_error) return d d.addCallback(lambda should_run: do_manage() if should_run else None) @@ -323,6 +317,15 @@ class Wallet(object): d.addBoth(set_manage_not_running) return d + @defer.inlineCallbacks + def update_balance(self): + """ obtain balance from lbryum wallet and set self.wallet_balance + """ + balance = yield self._update_balance() + if self.wallet_balance != balance: + log.debug("Got a new balance: %s", balance) + self.wallet_balance = balance + def get_info_exchanger(self): return LBRYcrdAddressRequester(self) @@ -341,7 +344,7 @@ class Wallet(object): once the service has been rendered """ rounded_amount = Decimal(str(round(amount, 8))) - if self.wallet_balance >= self.total_reserved_points + rounded_amount: + if self.get_balance() >= rounded_amount: self.total_reserved_points += rounded_amount return ReservedPoints(identifier, rounded_amount) return None @@ -432,7 +435,6 @@ class Wallet(object): log.debug("Should be sending %s points to %s", str(points), str(address)) payments_to_send[address] = points self.total_reserved_points -= points - self.wallet_balance -= points else: log.info("Skipping dust") @@ -443,6 +445,7 @@ class Wallet(object): d = self._do_send_many(payments_to_send) d.addCallback(lambda txid: log.debug("Sent transaction %s", txid)) return d + log.debug("There were no payments to send") return defer.succeed(True) @@ -628,6 +631,7 @@ class Wallet(object): """ def claim_name(self, name, bid, m): + def _save_metadata(claim_out, metadata): if not claim_out['success']: msg = 'Claim to name {} failed: {}'.format(name, claim_out['reason']) @@ -643,9 +647,13 @@ class Wallet(object): def _claim_or_update(claim, metadata, _bid): if not claim: log.debug("No own claim yet, making a new one") + if self.get_balance() < _bid: + raise InsufficientFundsError() return self._send_name_claim(name, metadata, _bid) else: log.debug("Updating over own claim") + if self.get_balance() < _bid - claim['amount']: + raise InsufficientFundsError() d = self.update_metadata(metadata, claim['value']) claim_outpoint = ClaimOutpoint(claim['txid'], claim['nOut']) d.addCallback( @@ -682,6 +690,9 @@ class Wallet(object): claim_out = self._process_claim_out(claim_out) return defer.succeed(claim_out) + if self.get_balance() < amount: + raise InsufficientFundsError() + d = self._support_claim(name, claim_id, amount) d.addCallback(lambda claim_out: _parse_support_claim_out(claim_out)) return d @@ -718,8 +729,8 @@ class Wallet(object): d.addCallback(lambda name_txid: _get_status_of_claim(name_txid, sd_hash)) return d - def get_available_balance(self): - return float(self.wallet_balance - self.total_reserved_points) + def get_balance(self): + return self.wallet_balance - self.total_reserved_points - sum(self.queued_payments.values()) def _get_status_of_claim(self, claim_outpoint, name, sd_hash): d = self.get_claims_from_tx(claim_outpoint['txid']) @@ -804,7 +815,7 @@ class Wallet(object): # ======== Must be overridden ======== # - def get_balance(self): + def _update_balance(self): return defer.fail(NotImplementedError()) def get_new_address(self): @@ -1038,7 +1049,7 @@ https://github.com/lbryio/lbry/issues/437 to reduce your wallet size") func = getattr(cmd_runner, cmd.name) return threads.deferToThread(func, *args) - def get_balance(self): + def _update_balance(self): accounts = None exclude_claimtrietx = True d = self._run_cmd_as_defer_succeed('getbalance', accounts, exclude_claimtrietx) diff --git a/lbrynet/lbrynet_daemon/Daemon.py b/lbrynet/lbrynet_daemon/Daemon.py index 5054b68ab..e353f6325 100644 --- a/lbrynet/lbrynet_daemon/Daemon.py +++ b/lbrynet/lbrynet_daemon/Daemon.py @@ -288,7 +288,7 @@ class Daemon(AuthJSONRPCServer): def _announce_startup(): def _wait_for_credits(): - if float(self.session.wallet.wallet_balance) == 0.0: + if float(self.session.wallet.get_balance()) == 0.0: self.startup_status = STARTUP_STAGES[6] return reactor.callLater(1, _wait_for_credits) else: @@ -332,7 +332,7 @@ class Daemon(AuthJSONRPCServer): yield self._setup_lbry_file_manager() yield self._setup_query_handlers() yield self._setup_server() - log.info("Starting balance: " + str(self.session.wallet.wallet_balance)) + log.info("Starting balance: " + str(self.session.wallet.get_balance())) yield _announce_startup() def _get_platform(self): @@ -1339,7 +1339,7 @@ class Daemon(AuthJSONRPCServer): Returns: balance, float """ - return self._render_response(float(self.session.wallet.wallet_balance)) + return self._render_response(float(self.session.wallet.get_balance())) def jsonrpc_stop(self): """ diff --git a/lbrynet/lbrynet_daemon/Downloader.py b/lbrynet/lbrynet_daemon/Downloader.py index c261db20d..17998c64a 100644 --- a/lbrynet/lbrynet_daemon/Downloader.py +++ b/lbrynet/lbrynet_daemon/Downloader.py @@ -118,9 +118,9 @@ class GetStream(object): self.fee = FeeValidator(self.stream_info['fee']) max_key_fee = self._convert_max_fee() converted_fee = self.exchange_rate_manager.to_lbc(self.fee).amount - if converted_fee > self.wallet.wallet_balance: + if converted_fee > self.wallet.get_balance(): msg = "Insufficient funds to download lbry://{}. Need {:0.2f}, have {:0.2f}".format( - self.resolved_name, converted_fee, self.wallet.wallet_balance) + self.resolved_name, converted_fee, self.wallet.get_balance()) raise InsufficientFundsError(msg) if converted_fee > max_key_fee: msg = "Key fee {:0.2f} above limit of {:0.2f} didn't download lbry://{}".format(