lukechilds
/
electrum
mirror of https://github.com/lukechilds/electrum.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity
Browse Source

kivy: fix wizard; remove multisig creation code

283
ThomasV 9 years ago
parent
3746050fe6
commit
084a352456
1 changed files with 17 additions and 140 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 157
      gui/kivy/uix/dialogs/installwizard.py

157
gui/kivy/uix/dialogs/installwizard.py
View File

@ -95,38 +95,10 @@ class InstallWizard(Widget):
action = dialog.action action = dialog.action
if button == dialog.ids.create: if button == dialog.ids.create:
# create wallet = Wallet(self.storage)
# TODO take from UI instead of hardcoding self.password_dialog(wallet=wallet, mode='create')
#t = dialog.wallet_type
t = 'standard'
if t == 'standard':
wallet = Wallet(self.storage)
action = 'create'
elif t == '2fa':
wallet = Wallet_2of3(self.storage)
run_hook('create_cold_seed', wallet, self)
self.create_cold_seed(wallet)
return
elif t == '2of2':
wallet = Wallet_2of2(self.storage)
action = 'create_2of2_1'
elif t == '2of3':
wallet = Wallet_2of3(self.storage)
action = 'create_2of3_1'
if action in ['create_2fa_2', 'create_2of3_2']:
wallet = Wallet_2of3(self.storage)
if action in ['create', 'create_2of2_1',
'create_2fa_2', 'create_2of3_1']:
self.password_dialog(wallet=wallet, mode=action)
elif button == dialog.ids.restore: elif button == dialog.ids.restore:
# restore
wallet = None wallet = None
self.restore_seed_dialog(wallet) self.restore_seed_dialog(wallet)
@ -134,72 +106,12 @@ class InstallWizard(Widget):
self.dispatch('on_wizard_complete', None) self.dispatch('on_wizard_complete', None)
def restore_seed_dialog(self, wallet): def restore_seed_dialog(self, wallet):
#TODO t currently hardcoded from electrum_gui.kivy.uix.dialogs.create_restore import\
t = 'standard' RestoreSeedDialog
if t == 'standard': RestoreSeedDialog(
from electrum_gui.kivy.uix.dialogs.create_restore import\ on_release=partial(self.on_verify_restore_ok, wallet),
RestoreSeedDialog wizard=weakref.proxy(self)).open()
RestoreSeedDialog(
on_release=partial(self.on_verify_restore_ok, wallet),
wizard=weakref.proxy(self)).open()
elif t in ['2fa', '2of2']:
r = self.multi_seed_dialog(1)
if not r:
return
text1, text2 = r
password = self.password_dialog(wallet=wallet)
if t == '2of2':
wallet = Wallet_2of2(self.storage)
elif t == '2of3':
wallet = Wallet_2of3(self.storage)
elif t == '2fa':
wallet = Wallet_2of3(self.storage)
if Wallet.is_seed(text1):
wallet.add_seed(text1, password)
if Wallet.is_seed(text2):
wallet.add_cold_seed(text2, password)
else:
wallet.add_master_public_key("cold/", text2)
elif Wallet.is_mpk(text1):
if Wallet.is_seed(text2):
wallet.add_seed(text2, password)
wallet.add_master_public_key("cold/", text1)
else:
wallet.add_master_public_key("m/", text1)
wallet.add_master_public_key("cold/", text2)
if t == '2fa':
run_hook('restore_third_key', wallet, self)
wallet.create_account()
elif t in ['2of3']:
r = self.multi_seed_dialog(2)
if not r:
return
text1, text2, text3 = r
password = self.password_dialog()
wallet = Wallet_2of3(self.storage)
if Wallet.is_seed(text1):
wallet.add_seed(text1, password)
if Wallet.is_seed(text2):
wallet.add_cold_seed(text2, password)
else:
wallet.add_master_public_key("cold/", text2)
elif Wallet.is_mpk(text1):
if Wallet.is_seed(text2):
wallet.add_seed(text2, password)
wallet.add_master_public_key("cold/", text1)
else:
wallet.add_master_public_key("m/", text1)
wallet.add_master_public_key("cold/", text2)
wallet.create_account()
def on_verify_restore_ok(self, wallet, _dlg, btn, restore=False): def on_verify_restore_ok(self, wallet, _dlg, btn, restore=False):
if btn in (_dlg.ids.back, _dlg.ids.but_close) : if btn in (_dlg.ids.back, _dlg.ids.but_close) :
@ -267,50 +179,16 @@ class InstallWizard(Widget):
if instance is None: if instance is None:
# in initial phase create mode # in initial phase create mode
# save seed with password # save seed with password
wallet.add_seed(seed, password)
sid = None if mode == 'create' else 'hot' def create(password):
wallet.add_seed(seed, password)
if mode == 'create': wallet.create_master_keys(password)
def create(password): wallet.create_main_account(password)
wallet.create_accounts(password) wallet.synchronize() # generate first addresses offline
wallet.synchronize() # generate first addresses offline
self.waiting_dialog(partial(create, password),
self.waiting_dialog(partial(create, password), on_complete=partial(self.load_network,
on_complete=partial(self.load_network, wallet, mode=mode))
wallet, mode=mode))
elif mode == 'create_2of2_1':
mode = 'create_2of2_2'
elif mode == 'create_2of3_1':
mode = 'create_2of3_2'
elif mode == 'create_2fa_2':
mode = 'create_2fa_3'
if mode == 'create_2of2_2':
xpub_hot = wallet.master_public_keys.get("m/")
xpub = self.multi_mpk_dialog(xpub_hot, 1)
if not xpub:
return
wallet.add_master_public_key("cold/", xpub)
wallet.create_account()
self.waiting_dialog(wallet.synchronize)
if mode == 'create_2of3_2':
xpub_hot = wallet.master_public_keys.get("m/")
r = self.multi_mpk_dialog(xpub_hot, 2)
if not r:
return
xpub1, xpub2 = r
wallet.add_master_public_key("cold/", xpub1)
wallet.add_master_public_key("remote/", xpub2)
wallet.create_account()
self.waiting_dialog(wallet.synchronize)
if mode == 'create_2fa_3':
run_hook('create_remote_key', wallet, self)
if not wallet.master_public_keys.get("remote/"):
return
wallet.create_account()
self.waiting_dialog(wallet.synchronize)
from electrum_gui.kivy.uix.dialogs.create_restore import InitSeedDialog from electrum_gui.kivy.uix.dialogs.create_restore import InitSeedDialog
@ -420,7 +298,6 @@ class InstallWizard(Widget):
pos=_btn.pos) pos=_btn.pos)
_dlg.close() _dlg.close()
if instance is None: # in initial phase if instance is None: # in initial phase
self.load_wallet() self.load_wallet()
self.app.update_wallet() self.app.update_wallet()

Write Preview
Loading…
Cancel
Save