AaronFiore/electrum
1
0
Fork 0
Code Activity

follow-up prev

Browse Source 
wallet.is_mine needs to tolerate None as input
This commit is contained in:
SomberNight
2019-06-12 18:27:13 +02:00
parent 9e21b76c91
commit 29ce50a305
1 changed files with 2 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
electrum/wallet.py
View File

@@ -347,6 +347,8 @@ class Abstract_Wallet(AddressSynchronizer):
def export_private_key(self, address, password): def export_private_key(self, address, password):
if self.is_watching_only(): if self.is_watching_only():
raise Exception(_("This is a watching-only wallet")) raise Exception(_("This is a watching-only wallet"))
if not is_address(address):
raise Exception(f"Invalid bitcoin address: {address}")
if not self.is_mine(address): if not self.is_mine(address):
raise Exception(_('Address not in wallet.') + f' {address}') raise Exception(_('Address not in wallet.') + f' {address}')
index = self.get_address_index(address) index = self.get_address_index(address)
@@ -1488,8 +1490,6 @@ class Imported_Wallet(Simple_Wallet):
def get_address_index(self, address): def get_address_index(self, address):
# returns None if address is not mine # returns None if address is not mine
if not is_address(address):
raise Exception(f"Invalid bitcoin address: {address}")
return self.get_public_key(address) return self.get_public_key(address)
def get_public_key(self, address): def get_public_key(self, address):
@@ -1681,8 +1681,6 @@ class Deterministic_Wallet(Abstract_Wallet):
return True return True
def get_address_index(self, address): def get_address_index(self, address):
if not is_address(address):
raise Exception(f"Invalid bitcoin address: {address}")
return self.db.get_address_index(address) return self.db.get_address_index(address)
def get_master_public_keys(self): def get_master_public_keys(self):