AaronFiore/electrum
1
0
Fork 0
Code Activity

wizard: display seed type. restore 2fa if needed

Browse Source
This commit is contained in:
ThomasV
2016-09-28 06:30:00 +02:00
parent 1fe1fc3c08
commit c32f75a313
7 changed files with 88 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
lib/keystore.py
View File

@@ -33,7 +33,7 @@ from bitcoin import pw_encode, pw_decode, bip32_root, bip32_private_derivation,
from bitcoin import public_key_from_private_key, public_key_to_bc_address
from bitcoin import *
from bitcoin import is_old_seed, is_new_seed
from bitcoin import is_old_seed, is_new_seed, is_seed
from util import PrintError, InvalidPassword
from mnemonic import Mnemonic
@@ -665,7 +665,7 @@ def is_private_key_list(text):
parts = text.split()
return bool(parts) and all(bitcoin.is_private_key(x) for x in parts)
is_seed = lambda x: is_old_seed(x) or is_new_seed(x)
is_mpk = lambda x: is_old_mpk(x) or is_xpub(x)
is_private = lambda x: is_seed(x) or is_xprv(x) or is_private_key_list(x)
is_any_key = lambda x: is_old_mpk(x) or is_xprv(x) or is_xpub(x) or is_address_list(x) or is_private_key_list(x)