AaronFiore/electrum
1
0
Fork 0
Code Activity

wizard: add derivation passphrase and bip39 support

Browse Source
This commit is contained in:
ThomasV
2016-08-25 09:48:11 +02:00
parent 808703bacb
commit b907a668ec
4 changed files with 74 additions and 54 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
electrum
View File

@@ -88,7 +88,7 @@ from electrum.util import print_msg, print_stderr, json_encode, json_decode
from electrum.util import set_verbosity, InvalidPassword, check_www_dir
from electrum.commands import get_parser, known_commands, Commands, config_variables
from electrum import daemon
from electrum.keystore import from_text, is_private
from electrum import keystore
from electrum.mnemonic import Mnemonic
# get password routine
@@ -117,13 +117,18 @@ def run_non_RPC(config):
if cmdname == 'restore':
text = config.get('text')
password = password_dialog() if is_private(text) else None
try:
k = from_text(text, password)
except BaseException as e:
passphrase = config.get('passphrase', '')
password = password_dialog() if keystore.is_private(text) else None
if keystore.is_seed(text):
k = keystore.from_seed(text, passphrase, password)
elif keystore.is_any_key(text):
k = keystore.from_keys(text, password)
else:
sys.exit(str(e))
k.save(storage, 'x/')
storage.put('keystore', k.dump())
storage.put('wallet_type', 'standard')
storage.put('use_encryption', bool(password))
storage.write()
wallet = Wallet(storage)
if not config.get('offline'):
network = Network(config)
@@ -139,10 +144,13 @@ def run_non_RPC(config):
elif cmdname == 'create':
password = password_dialog()
passphrase = config.get('passphrase', '')
seed = Mnemonic('en').make_seed()
k = from_text(seed, password)
k.save(storage, 'x/')
k = keystore.from_seed(seed, passphrase, password)
storage.put('keystore', k.dump())
storage.put('wallet_type', 'standard')
storage.put('use_encryption', bool(password))
storage.write()
wallet = Wallet(storage)
wallet.synchronize()
print_msg("Your wallet generation seed is:\n\"%s\"" % seed)