twallet: faster decrypt_message for Imported_Wallet - electrum - Electrum Bitcoin wallet
HTML git clone https://git.parazyd.org/electrum
DIR Log
DIR Files
DIR Refs
DIR Submodules
---
DIR commit ea62027599d6efaf6ac6fe3b963e04a833a9950b
DIR parent 869a72831781002546758e906da1c157d967186b
HTML Author: SomberNight <somber.night@protonmail.com>
Date: Tue, 10 Dec 2019 20:08:41 +0100
wallet: faster decrypt_message for Imported_Wallet
Diffstat:
M electrum/keystore.py | 16 +++++++++-------
M electrum/wallet.py | 12 ++++++++----
2 files changed, 17 insertions(+), 11 deletions(-)
---
DIR diff --git a/electrum/keystore.py b/electrum/keystore.py
t@@ -107,11 +107,11 @@ class KeyStore(Logger, ABC):
pass
@abstractmethod
- def sign_message(self, sequence, message, password) -> bytes:
+ def sign_message(self, sequence: 'AddressIndexGeneric', message, password) -> bytes:
pass
@abstractmethod
- def decrypt_message(self, sequence, message, password) -> bytes:
+ def decrypt_message(self, sequence: 'AddressIndexGeneric', message, password) -> bytes:
pass
@abstractmethod
t@@ -185,7 +185,8 @@ class Software_KeyStore(KeyStore):
pass
@abstractmethod
- def get_private_key(self, *args, **kwargs) -> Tuple[bytes, bool]:
+ def get_private_key(self, sequence: 'AddressIndexGeneric', password) -> Tuple[bytes, bool]:
+ """Returns (privkey, is_compressed)"""
pass
t@@ -196,7 +197,7 @@ class Imported_KeyStore(Software_KeyStore):
def __init__(self, d):
Software_KeyStore.__init__(self, d)
- self.keypairs = d.get('keypairs', {})
+ self.keypairs = d.get('keypairs', {}) # type: Dict[str, str]
def is_deterministic(self):
return False
t@@ -231,7 +232,7 @@ class Imported_KeyStore(Software_KeyStore):
def delete_imported_key(self, key):
self.keypairs.pop(key)
- def get_private_key(self, pubkey, password):
+ def get_private_key(self, pubkey: str, password):
sec = pw_decode(self.keypairs[pubkey], password, version=self.pw_hash_version)
txin_type, privkey, compressed = deserialize_privkey(sec)
# this checks the password
t@@ -541,7 +542,7 @@ class BIP32_KeyStore(Xpub, Deterministic_KeyStore):
self.add_xprv(node.to_xprv())
self.add_key_origin_from_root_node(derivation_prefix=derivation, root_node=rootnode)
- def get_private_key(self, sequence, password):
+ def get_private_key(self, sequence: Sequence[int], password):
xprv = self.get_master_private_key(password)
node = BIP32Node.from_xkey(xprv).subkey_at_private_derivation(sequence)
pk = node.eckey.get_secret_bytes()
t@@ -633,7 +634,7 @@ class Old_KeyStore(MasterPublicKeyMixin, Deterministic_KeyStore):
pk = number_to_string(secexp, ecc.CURVE_ORDER)
return pk
- def get_private_key(self, sequence, password):
+ def get_private_key(self, sequence: Sequence[int], password):
seed = self.get_hex_seed(password)
secexp = self.stretch_key(seed)
self._check_seed(seed, secexp=secexp)
t@@ -772,6 +773,7 @@ class Hardware_KeyStore(Xpub, KeyStore):
KeyStoreWithMPK = Union[KeyStore, MasterPublicKeyMixin] # intersection really...
+AddressIndexGeneric = Union[Sequence[int], str] # can be hex pubkey str
def bip39_normalize_passphrase(passphrase):
DIR diff --git a/electrum/wallet.py b/electrum/wallet.py
t@@ -57,7 +57,7 @@ from .bitcoin import (COIN, is_address, address_to_script,
is_minikey, relayfee, dust_threshold)
from .crypto import sha256d
from . import keystore
-from .keystore import load_keystore, Hardware_KeyStore, KeyStore, KeyStoreWithMPK
+from .keystore import load_keystore, Hardware_KeyStore, KeyStore, KeyStoreWithMPK, AddressIndexGeneric
from .util import multisig_type
from .storage import StorageEncryptionVersion, WalletStorage
from . import transaction, bitcoin, coinchooser, paymentrequest, ecc, bip32
t@@ -421,7 +421,7 @@ class Abstract_Wallet(AddressSynchronizer, ABC):
return self.get_address_index(address)[0] == 1
@abstractmethod
- def get_address_index(self, address):
+ def get_address_index(self, address: str) -> Optional[AddressIndexGeneric]:
pass
@abstractmethod
t@@ -1730,7 +1730,7 @@ class Abstract_Wallet(AddressSynchronizer, ABC):
index = self.get_address_index(address)
return self.keystore.sign_message(index, message, password)
- def decrypt_message(self, pubkey, message, password) -> bytes:
+ def decrypt_message(self, pubkey: str, message, password) -> bytes:
addr = self.pubkeys_to_address([pubkey])
index = self.get_address_index(addr)
return self.keystore.decrypt_message(index, message, password)
t@@ -2040,11 +2040,15 @@ class Imported_Wallet(Simple_Wallet):
def pubkeys_to_address(self, pubkeys):
pubkey = pubkeys[0]
- for addr in self.db.get_imported_addresses():
+ for addr in self.db.get_imported_addresses(): # FIXME slow...
if self.db.get_imported_address(addr)['pubkey'] == pubkey:
return addr
return None
+ def decrypt_message(self, pubkey: str, message, password) -> bytes:
+ # this is significantly faster than the implementation in the superclass
+ return self.keystore.decrypt_message(pubkey, message, password)
+
class Deterministic_Wallet(Abstract_Wallet):