LBRYFoundation/LBRY-Vault
1
0
Fork 0
mirror of https://github.com/LBRYFoundation/LBRY-Vault.git synced 2025-08-28 07:51:27 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

trustedcoin: replace asserts

Browse source
This commit is contained in:
SomberNight 2018-06-27 19:03:34 +02:00
parent 357ff8e833
commit 486596b180
No known key found for this signature in database
GPG key ID: B33B5F232C6271E9
1 changed files with 19 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

33
plugins/trustedcoin/trustedcoin.py
View file

@ -257,7 +257,8 @@ class Wallet_2fa(Multisig_Wallet):
return 0 return 0
n = self.num_prepay(config) n = self.num_prepay(config)
price = int(self.price_per_tx[n]) price = int(self.price_per_tx[n])
assert price <= 100000 * n if price > 100000 * n:
raise Exception('too high trustedcoin fee ({} for {} txns)'.format(price, n))
return price return price
def make_unsigned_transaction(self, coins, outputs, config, fixed_fee=None, def make_unsigned_transaction(self, coins, outputs, config, fixed_fee=None,
@ -364,7 +365,8 @@ class TrustedCoinPlugin(BasePlugin):
if type(wallet) != Wallet_2fa: if type(wallet) != Wallet_2fa:
return return
if wallet.billing_info is None: if wallet.billing_info is None:
assert wallet.can_sign_without_server() if not wallet.can_sign_without_server():
raise Exception('missing trustedcoin billing info')
return None return None
address = wallet.billing_info['billing_address'] address = wallet.billing_info['billing_address']
for _type, addr, amount in tx.outputs(): for _type, addr, amount in tx.outputs():
@ -390,10 +392,12 @@ class TrustedCoinPlugin(BasePlugin):
self.print_error('cannot connect to TrustedCoin server: {}'.format(e)) self.print_error('cannot connect to TrustedCoin server: {}'.format(e))
return return
billing_address = make_billing_address(wallet, billing_info['billing_index']) billing_address = make_billing_address(wallet, billing_info['billing_index'])
assert billing_address == billing_info['billing_address'] if billing_address != billing_info['billing_address']:
raise Exception('unexpected trustedcoin billing address: expected {}, received {}'
.format(billing_address, billing_info['billing_address']))
wallet.billing_info = billing_info wallet.billing_info = billing_info
wallet.price_per_tx = dict(billing_info['price_per_tx']) wallet.price_per_tx = dict(billing_info['price_per_tx'])
wallet.price_per_tx.pop(1) wallet.price_per_tx.pop(1, None)
return True return True
def start_request_thread(self, wallet): def start_request_thread(self, wallet):
@ -449,7 +453,8 @@ class TrustedCoinPlugin(BasePlugin):
# note: pre-2.7 2fa seeds were typically 24-25 words, however they # note: pre-2.7 2fa seeds were typically 24-25 words, however they
# could probabilistically be arbitrarily shorter due to a bug. (see #3611) # could probabilistically be arbitrarily shorter due to a bug. (see #3611)
# the probability of it being < 20 words is about 2^(-(256+12-19*11)) = 2^(-59) # the probability of it being < 20 words is about 2^(-(256+12-19*11)) = 2^(-59)
assert passphrase == '' if passphrase != '':
raise Exception('old 2fa seed cannot have passphrase')
xprv1, xpub1 = self.get_xkeys(' '.join(words[0:12]), '', "m/") xprv1, xpub1 = self.get_xkeys(' '.join(words[0:12]), '', "m/")
xprv2, xpub2 = self.get_xkeys(' '.join(words[12:]), '', "m/") xprv2, xpub2 = self.get_xkeys(' '.join(words[12:]), '', "m/")
elif n==12: elif n==12:
@ -558,11 +563,13 @@ class TrustedCoinPlugin(BasePlugin):
return return
_xpub3 = r['xpubkey_cosigner'] _xpub3 = r['xpubkey_cosigner']
_id = r['id'] _id = r['id']
try: if short_id != _id:
assert _id == short_id, ("user id error", _id, short_id) wizard.show_message("unexpected trustedcoin short_id: expected {}, received {}"
assert xpub3 == _xpub3, ("xpub3 error", xpub3, _xpub3) .format(short_id, _id))
except Exception as e: return
wizard.show_message(str(e)) if xpub3 != _xpub3:
wizard.show_message("unexpected trustedcoin xpub3: expected {}, received {}"
.format(xpub3, _xpub3))
return return
self.request_otp_dialog(wizard, short_id, otp_secret, xpub3) self.request_otp_dialog(wizard, short_id, otp_secret, xpub3)
@ -603,10 +610,8 @@ class TrustedCoinPlugin(BasePlugin):
def on_reset_auth(self, wizard, short_id, seed, passphrase, xpub3): def on_reset_auth(self, wizard, short_id, seed, passphrase, xpub3):
xprv1, xpub1, xprv2, xpub2 = self.xkeys_from_seed(seed, passphrase) xprv1, xpub1, xprv2, xpub2 = self.xkeys_from_seed(seed, passphrase)
try: if (wizard.storage.get('x1/')['xpub'] != xpub1 or
assert xpub1 == wizard.storage.get('x1/')['xpub'] wizard.storage.get('x2/')['xpub'] != xpub2):
assert xpub2 == wizard.storage.get('x2/')['xpub']
except:
wizard.show_message(_('Incorrect seed')) wizard.show_message(_('Incorrect seed'))
return return
r = server.get_challenge(short_id) r = server.get_challenge(short_id)