AaronFiore/electrum
1
0
Fork 0
Code Activity

mnemonic: tighten seed_type check for old "2fa" type seeds

Browse Source 
Seeds in the set difference could already not be restored: they raised
an exception in the wizard; now these are not recognised as valid seeds
anymore (so e.g. OK button in wizard will be disabled).
Also see comments in code.
This commit is contained in:
SomberNight
2020-12-10 14:31:53 +01:00
parent 4bda6f5e61
commit d1302d3384
2 changed files with 22 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
electrum/mnemonic.py
View File

@@ -241,13 +241,17 @@ def is_old_seed(seed: str) -> bool:
def seed_type(x: str) -> str:
num_words = len(x.split())
if is_old_seed(x):
return 'old'
elif is_new_seed(x):
elif is_new_seed(x, version.SEED_PREFIX):
return 'standard'
elif is_new_seed(x, version.SEED_PREFIX_SW):
return 'segwit'
elif is_new_seed(x, version.SEED_PREFIX_2FA):
elif is_new_seed(x, version.SEED_PREFIX_2FA) and (num_words == 12 or num_words >= 20):
# Note: in Electrum 2.7, there was a breaking change in key derivation
# for this seed type. Unfortunately the seed version/prefix was reused,
# and now we can only distinguish them based on number of words. :(
return '2fa'
elif is_new_seed(x, version.SEED_PREFIX_2FA_SW):
return '2fa_segwit'