AaronFiore/electrum
1
0
Fork 0
Code Activity

wallet_db: put 'seed_type' into keystores (incl db upgrade)

Browse Source
This commit is contained in:
SomberNight
2021-03-30 21:16:14 +02:00
parent 2cebdc8c1c
commit 7b7bba2299
3 changed files with 39 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
electrum/keystore.py
View File

@@ -282,8 +282,9 @@ class Deterministic_KeyStore(Software_KeyStore):
def __init__(self, d):
Software_KeyStore.__init__(self, d)
self.seed = d.get('seed', '')
self.seed = d.get('seed', '') # only electrum seeds
self.passphrase = d.get('passphrase', '')
self._seed_type = d.get('seed_type', None) # only electrum seeds
def is_deterministic(self):
return True
@@ -297,11 +298,16 @@ class Deterministic_KeyStore(Software_KeyStore):
d['seed'] = self.seed
if self.passphrase:
d['passphrase'] = self.passphrase
if self._seed_type:
d['seed_type'] = self._seed_type
return d
def has_seed(self):
return bool(self.seed)
def get_seed_type(self) -> Optional[str]:
return self._seed_type
def is_watching_only(self):
return not self.has_seed()
@@ -313,6 +319,7 @@ class Deterministic_KeyStore(Software_KeyStore):
if self.seed:
raise Exception("a seed exists")
self.seed = self.format_seed(seed)
self._seed_type = seed_type(seed) or None
def get_seed(self, password):
if not self.has_seed():