AaronFiore/electrum
1
0
Fork 0
Code Activity

Merge pull request #10202 from SomberNight/202509_sweep_none

Browse Source 
keystore: get_private_keys should not return None
This commit is contained in:
ghost43
2025-09-05 17:31:41 +00:00
committed by GitHub
parent 8abe4a1dd4 75195b667a
commit 1e55ee8ea2
3 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
electrum/gui/qt/main_window.py
View File

@@ -2592,14 +2592,14 @@ class ElectrumWindow(QMainWindow, MessageBoxMixin, Logger, QtEventListener):
if bitcoin.is_address(addr): if bitcoin.is_address(addr):
return addr return addr
def get_pk(*, raise_on_error=False): def get_pk(*, raise_on_error=False) -> Sequence[str]:
text = str(keys_e.toPlainText()) text = str(keys_e.toPlainText())
return keystore.get_private_keys(text, raise_on_error=raise_on_error) return keystore.get_private_keys(text, raise_on_error=raise_on_error)
def on_edit(): def on_edit():
valid_privkeys = False valid_privkeys = False
try: try:
valid_privkeys = get_pk(raise_on_error=True) is not None valid_privkeys = bool(get_pk(raise_on_error=True))
except Exception as e: except Exception as e:
button.setToolTip(f'{_("Error")}: {repr(e)}') button.setToolTip(f'{_("Error")}: {repr(e)}')
else: else:

4
electrum/keystore.py
View File

@@ -1134,7 +1134,7 @@ def is_address_list(text: str) -> bool:
return bool(parts) and all(bitcoin.is_address(x) for x in parts) return bool(parts) and all(bitcoin.is_address(x) for x in parts)
def get_private_keys(text: str, *, allow_spaces_inside_key=True, raise_on_error=False) -> Optional[Sequence[str]]: def get_private_keys(text: str, *, allow_spaces_inside_key=True, raise_on_error=False) -> Sequence[str]:
if allow_spaces_inside_key: # see #1612 if allow_spaces_inside_key: # see #1612
parts = text.split('\n') parts = text.split('\n')
parts = map(lambda x: ''.join(x.split()), parts) parts = map(lambda x: ''.join(x.split()), parts)
@@ -1143,7 +1143,7 @@ def get_private_keys(text: str, *, allow_spaces_inside_key=True, raise_on_error=
parts = text.split() parts = text.split()
if bool(parts) and all(bitcoin.is_private_key(x, raise_on_error=raise_on_error) for x in parts): if bool(parts) and all(bitcoin.is_private_key(x, raise_on_error=raise_on_error) for x in parts):
return parts return parts
return None return []
def is_private_key_list(text: str, *, allow_spaces_inside_key: bool = True, raise_on_error: bool = False) -> bool: def is_private_key_list(text: str, *, allow_spaces_inside_key: bool = True, raise_on_error: bool = False) -> bool:

2
electrum/wallet.py
View File

@@ -3755,7 +3755,7 @@ class Imported_Wallet(Simple_Wallet):
x = self.db.get_imported_address(address) x = self.db.get_imported_address(address)
return x.get('pubkey') if x else None return x.get('pubkey') if x else None
def import_private_keys(self, keys: List[str], password: Optional[str], *, def import_private_keys(self, keys: Sequence[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]]