Browse Source
wallet: (sanity) is_mine now guaranteed to handle 'None' input
hard-fail-on-bad-server-string
SomberNight
5 years ago
No known key found for this signature in database
GPG Key ID: B33B5F232C6271E9
2 changed files with
6 additions and
3 deletions
-
electrum/address_synchronizer.py
-
electrum/wallet.py
|
@ -40,7 +40,7 @@ from .logging import Logger |
|
|
|
|
|
|
|
|
if TYPE_CHECKING: |
|
|
if TYPE_CHECKING: |
|
|
from .network import Network |
|
|
from .network import Network |
|
|
from .json_db import JsonDB |
|
|
from .wallet_db import WalletDB |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
TX_HEIGHT_FUTURE = -3 |
|
|
TX_HEIGHT_FUTURE = -3 |
|
@ -70,7 +70,7 @@ class AddressSynchronizer(Logger): |
|
|
inherited by wallet |
|
|
inherited by wallet |
|
|
""" |
|
|
""" |
|
|
|
|
|
|
|
|
def __init__(self, db: 'JsonDB'): |
|
|
def __init__(self, db: 'WalletDB'): |
|
|
self.db = db |
|
|
self.db = db |
|
|
self.network = None # type: Network |
|
|
self.network = None # type: Network |
|
|
Logger.__init__(self) |
|
|
Logger.__init__(self) |
|
@ -104,7 +104,8 @@ class AddressSynchronizer(Logger): |
|
|
self.load_unverified_transactions() |
|
|
self.load_unverified_transactions() |
|
|
self.remove_local_transactions_we_dont_have() |
|
|
self.remove_local_transactions_we_dont_have() |
|
|
|
|
|
|
|
|
def is_mine(self, address) -> bool: |
|
|
def is_mine(self, address: Optional[str]) -> bool: |
|
|
|
|
|
if not address: return False |
|
|
return self.db.is_addr_in_history(address) |
|
|
return self.db.is_addr_in_history(address) |
|
|
|
|
|
|
|
|
def get_addresses(self): |
|
|
def get_addresses(self): |
|
|
|
@ -407,6 +407,7 @@ class Abstract_Wallet(AddressSynchronizer, ABC): |
|
|
return |
|
|
return |
|
|
|
|
|
|
|
|
def is_mine(self, address) -> bool: |
|
|
def is_mine(self, address) -> bool: |
|
|
|
|
|
if not address: return False |
|
|
return bool(self.get_address_index(address)) |
|
|
return bool(self.get_address_index(address)) |
|
|
|
|
|
|
|
|
def is_change(self, address) -> bool: |
|
|
def is_change(self, address) -> bool: |
|
@ -1985,6 +1986,7 @@ class Imported_Wallet(Simple_Wallet): |
|
|
self.save_db() |
|
|
self.save_db() |
|
|
|
|
|
|
|
|
def is_mine(self, address) -> bool: |
|
|
def is_mine(self, address) -> bool: |
|
|
|
|
|
if not address: return False |
|
|
return self.db.has_imported_address(address) |
|
|
return self.db.has_imported_address(address) |
|
|
|
|
|
|
|
|
def get_address_index(self, address) -> Optional[str]: |
|
|
def get_address_index(self, address) -> Optional[str]: |
|
|