AaronFiore/electrum
1
0
Fork 0
Code Activity

clean-up wallet.get_address_index

Browse Source
This commit is contained in:
SomberNight
2018-01-30 00:59:12 +01:00
parent d92a6d46eb
commit ac69f628fe
1 changed files with 4 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
lib/wallet.py
View File

@@ -340,13 +340,7 @@ class Abstract_Wallet(PrintError):
return self.get_address_index(address)[0] return self.get_address_index(address)[0]
def get_address_index(self, address): def get_address_index(self, address):
if hasattr(self, '_addr_to_addr_index'): raise NotImplementedError()
return self._addr_to_addr_index[address]
if address in self.receiving_addresses:
return False, self.receiving_addresses.index(address)
if address in self.change_addresses:
return True, self.change_addresses.index(address)
raise Exception("Address not found", address)
def export_private_key(self, address, password): def export_private_key(self, address, password):
""" extended WIF format """ """ extended WIF format """
@@ -1714,6 +1708,9 @@ class Deterministic_Wallet(Abstract_Wallet):
def is_mine(self, address): def is_mine(self, address):
return address in self._addr_to_addr_index return address in self._addr_to_addr_index
def get_address_index(self, address):
return self._addr_to_addr_index[address]
def get_master_public_keys(self): def get_master_public_keys(self):
return [self.get_master_public_key()] return [self.get_master_public_key()]