LBRYCommunity/lbry-sdk
1
0
Fork 1
Code Issues Pull requests Projects Releases 282 Packages Wiki Activity

adapt content payment calls to new wallet

Browse source
This commit is contained in:
Victor Shyba 2018-09-14 02:59:04 -03:00 committed by Lex Berezhny
parent 03415415ed
commit cc7656faa4
2 changed files with 5 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
lbrynet/daemon/Downloader.py
View file

@ -11,6 +11,7 @@ from lbrynet.core.utils import safe_start_looping_call, safe_stop_looping_call
from lbrynet.core.StreamDescriptor import download_sd_blob from lbrynet.core.StreamDescriptor import download_sd_blob
from lbrynet.file_manager.EncryptedFileDownloader import ManagedEncryptedFileDownloaderFactory from lbrynet.file_manager.EncryptedFileDownloader import ManagedEncryptedFileDownloaderFactory
from lbrynet import conf from lbrynet import conf
from torba.constants import COIN
INITIALIZING_CODE = 'initializing' INITIALIZING_CODE = 'initializing'
DOWNLOAD_METADATA_CODE = 'downloading_metadata' DOWNLOAD_METADATA_CODE = 'downloading_metadata'
@ -96,11 +97,12 @@ class GetStream:
log.info("Download lbry://%s status changed to %s" % (name, status)) log.info("Download lbry://%s status changed to %s" % (name, status))
self.code = next(s for s in STREAM_STAGES if s[0] == status) self.code = next(s for s in STREAM_STAGES if s[0] == status)
@defer.inlineCallbacks
def check_fee_and_convert(self, fee): def check_fee_and_convert(self, fee):
max_key_fee_amount = self.convert_max_fee() max_key_fee_amount = self.convert_max_fee()
converted_fee_amount = self.exchange_rate_manager.convert_currency(fee.currency, "LBC", converted_fee_amount = self.exchange_rate_manager.convert_currency(fee.currency, "LBC",
fee.amount) fee.amount)
if converted_fee_amount > self.wallet.get_balance(): if converted_fee_amount > (yield self.wallet.default_account.get_balance()):
raise InsufficientFundsError('Unable to pay the key fee of %s' % converted_fee_amount) raise InsufficientFundsError('Unable to pay the key fee of %s' % converted_fee_amount)
if converted_fee_amount > max_key_fee_amount and not self.disable_max_key_fee: if converted_fee_amount > max_key_fee_amount and not self.disable_max_key_fee:
raise KeyFeeAboveMaxAllowed('Key fee %s above max allowed %s' % (converted_fee_amount, raise KeyFeeAboveMaxAllowed('Key fee %s above max allowed %s' % (converted_fee_amount,
@ -141,7 +143,7 @@ class GetStream:
@defer.inlineCallbacks @defer.inlineCallbacks
def pay_key_fee(self, fee, name): def pay_key_fee(self, fee, name):
if fee is not None: if fee is not None:
yield self._pay_key_fee(fee.address, fee.amount, name) yield self._pay_key_fee(fee.address.decode(), int(fee.amount * COIN), name)
else: else:
defer.returnValue(None) defer.returnValue(None)

2
lbrynet/wallet/manager.py
View file

@ -163,7 +163,7 @@ class LbryWalletManager(BaseWalletManager):
def list_addresses(self): def list_addresses(self):
return self.default_account.get_addresses() return self.default_account.get_addresses()
def reserve_points(self, address, amount): def reserve_points(self, address, amount: int):
# TODO: check if we have enough to cover amount # TODO: check if we have enough to cover amount
return ReservedPoints(address, amount) return ReservedPoints(address, amount)