LBRYFoundation/LBRY-Vault
1
0
Fork 0
mirror of https://github.com/LBRYFoundation/LBRY-Vault.git synced 2025-08-30 17:01:34 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

careful with exceptions..

Browse source
This commit is contained in:
SomberNight 2018-03-10 08:00:41 +01:00
parent d994d27704
commit 2c6cf7f80c
1 changed files with 4 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
lib/wallet.py
View file

@ -1939,14 +1939,15 @@ class Imported_Wallet(Simple_Wallet):
try: try:
txin_type, pubkey = self.keystore.import_privkey(sec, pw) txin_type, pubkey = self.keystore.import_privkey(sec, pw)
except Exception: except Exception:
raise BaseException('Invalid private key', sec) neutered_privkey = str(sec)[:3] + '..' + str(sec)[-2:]
raise BaseException('Invalid private key', neutered_privkey)
if txin_type in ['p2pkh', 'p2wpkh', 'p2wpkh-p2sh']: if txin_type in ['p2pkh', 'p2wpkh', 'p2wpkh-p2sh']:
if redeem_script is not None: if redeem_script is not None:
raise BaseException('Cannot use redeem script with', txin_type, sec) raise BaseException('Cannot use redeem script with', txin_type)
addr = bitcoin.pubkey_to_address(txin_type, pubkey) addr = bitcoin.pubkey_to_address(txin_type, pubkey)
elif txin_type in ['p2sh', 'p2wsh', 'p2wsh-p2sh']: elif txin_type in ['p2sh', 'p2wsh', 'p2wsh-p2sh']:
if redeem_script is None: if redeem_script is None:
raise BaseException('Redeem script required for', txin_type, sec) raise BaseException('Redeem script required for', txin_type)
addr = bitcoin.redeem_script_to_address(txin_type, redeem_script) addr = bitcoin.redeem_script_to_address(txin_type, redeem_script)
else: else:
raise NotImplementedError(txin_type) raise NotImplementedError(txin_type)