LBRYFoundation/LBRY-Vault
1
0
Fork 0
mirror of https://github.com/LBRYFoundation/LBRY-Vault.git synced 2025-09-02 18:25:21 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

wizard: fix imported address wallets

Browse source 
assertion added in 9350709f13 was failing
This commit is contained in:
SomberNight 2018-12-14 22:50:25 +01:00
parent 1e8b34e63e
commit 664b0c234e
No known key found for this signature in database
GPG key ID: B33B5F232C6271E9
3 changed files with 6 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
electrum/base_wizard.py
View file

@ -194,7 +194,7 @@ class BaseWizard(object):
if keystore.is_address_list(text): if keystore.is_address_list(text):
w = Imported_Wallet(self.storage) w = Imported_Wallet(self.storage)
addresses = text.split() addresses = text.split()
good_inputs, bad_inputs = w.import_addresses(addresses) good_inputs, bad_inputs = w.import_addresses(addresses, write_to_disk=False)
elif keystore.is_private_key_list(text): elif keystore.is_private_key_list(text):
k = keystore.Imported_KeyStore({}) k = keystore.Imported_KeyStore({})
self.storage.put('keystore', k.dump()) self.storage.put('keystore', k.dump())

2
electrum/commands.py
View file

@ -167,7 +167,7 @@ class Commands:
if keystore.is_address_list(text): if keystore.is_address_list(text):
wallet = Imported_Wallet(storage) wallet = Imported_Wallet(storage)
addresses = text.split() addresses = text.split()
good_inputs, bad_inputs = wallet.import_addresses(addresses) good_inputs, bad_inputs = wallet.import_addresses(addresses, write_to_disk=False)
# FIXME tell user about bad_inputs # FIXME tell user about bad_inputs
if not good_inputs: if not good_inputs:
raise Exception("None of the given addresses can be imported") raise Exception("None of the given addresses can be imported")

7
electrum/wallet.py
View file

@ -1329,7 +1329,8 @@ class Imported_Wallet(Simple_Wallet):
def get_change_addresses(self): def get_change_addresses(self):
return [] return []
def import_addresses(self, addresses: List[str]) -> Tuple[List[str], List[Tuple[str, str]]]: def import_addresses(self, addresses: List[str], *,
write_to_disk=True) -> Tuple[List[str], List[Tuple[str, str]]]:
good_addr = [] # type: List[str] good_addr = [] # type: List[str]
bad_addr = [] # type: List[Tuple[str, str]] bad_addr = [] # type: List[Tuple[str, str]]
for address in addresses: for address in addresses:
@ -1343,7 +1344,7 @@ class Imported_Wallet(Simple_Wallet):
self.addresses[address] = {} self.addresses[address] = {}
self.add_address(address) self.add_address(address)
self.save_addresses() self.save_addresses()
self.save_transactions(write=True) self.save_transactions(write=write_to_disk)
return good_addr, bad_addr return good_addr, bad_addr
def import_address(self, address: str) -> str: def import_address(self, address: str) -> str:
@ -1408,7 +1409,7 @@ class Imported_Wallet(Simple_Wallet):
def get_public_key(self, address): def get_public_key(self, address):
return self.addresses[address].get('pubkey') return self.addresses[address].get('pubkey')
def import_private_keys(self, keys: List[str], password: Optional[str], def import_private_keys(self, keys: List[str], password: Optional[str], *,
write_to_disk=True) -> Tuple[List[str], List[Tuple[str, str]]]: write_to_disk=True) -> Tuple[List[str], List[Tuple[str, str]]]:
good_addr = [] # type: List[str] good_addr = [] # type: List[str]
bad_keys = [] # type: List[Tuple[str, str]] bad_keys = [] # type: List[Tuple[str, str]]