Merge branch 'master' of github.com:spesmilo/electrum
This commit is contained in:
commit
e65b99564d
|
@ -358,11 +358,6 @@ class WalletStorage(PrintError):
|
|||
if self.get('wallet_type') == 'standard':
|
||||
if self.get('keystore').get('type') == 'imported':
|
||||
pubkeys = self.get('keystore').get('keypairs').keys()
|
||||
if self.get('pubkeys'):
|
||||
pubkeys2 = set(self.get('pubkeys').get('receiving'))
|
||||
assert len(pubkeys) == len(pubkeys2)
|
||||
for pubkey in pubkeys:
|
||||
assert pubkey in pubkeys2
|
||||
d = {'change': []}
|
||||
receiving_addresses = []
|
||||
for pubkey in pubkeys:
|
||||
|
|
File diff suppressed because one or more lines are too long
|
@ -1455,6 +1455,8 @@ class Imported_Wallet(Simple_Wallet):
|
|||
return []
|
||||
|
||||
def import_address(self, address):
|
||||
if not bitcoin.is_address(address):
|
||||
return ''
|
||||
if address in self.addresses:
|
||||
return ''
|
||||
self.addresses[address] = {}
|
||||
|
|
Loading…
Reference in New Issue