disable bip32
This commit is contained in:
parent
5cb1d6afda
commit
5a3b80cfb2
|
@ -75,7 +75,7 @@ class InstallWizard(QDialog):
|
||||||
if not r:
|
if not r:
|
||||||
return
|
return
|
||||||
|
|
||||||
if r != wallet.seed:
|
if r != wallet.get_mnemonic(None):
|
||||||
QMessageBox.warning(None, _('Error'), _('Incorrect seed'), _('OK'))
|
QMessageBox.warning(None, _('Error'), _('Incorrect seed'), _('OK'))
|
||||||
return False
|
return False
|
||||||
else:
|
else:
|
||||||
|
@ -232,7 +232,7 @@ class InstallWizard(QDialog):
|
||||||
def show_seed(self, wallet):
|
def show_seed(self, wallet):
|
||||||
from seed_dialog import make_seed_dialog
|
from seed_dialog import make_seed_dialog
|
||||||
|
|
||||||
vbox = make_seed_dialog(wallet.seed, wallet.imported_keys)
|
vbox = make_seed_dialog(wallet.get_mnemonic(None), wallet.imported_keys)
|
||||||
vbox.addLayout(ok_cancel_buttons(self, _("Next")))
|
vbox.addLayout(ok_cancel_buttons(self, _("Next")))
|
||||||
|
|
||||||
if self.layout(): QWidget().setLayout(self.layout())
|
if self.layout(): QWidget().setLayout(self.layout())
|
||||||
|
|
|
@ -293,10 +293,15 @@ class Wallet:
|
||||||
raise BaseException("a seed exists")
|
raise BaseException("a seed exists")
|
||||||
|
|
||||||
if not seed:
|
if not seed:
|
||||||
self.seed = self.make_seed()
|
self.seed = random_seed(128)
|
||||||
self.seed_version = SEED_VERSION
|
self.seed_version = 4
|
||||||
return
|
return
|
||||||
|
|
||||||
|
#if not seed:
|
||||||
|
# self.seed = self.make_seed()
|
||||||
|
# self.seed_version = SEED_VERSION
|
||||||
|
# return
|
||||||
|
|
||||||
# find out what kind of wallet we are
|
# find out what kind of wallet we are
|
||||||
try:
|
try:
|
||||||
seed.decode('hex')
|
seed.decode('hex')
|
||||||
|
@ -335,9 +340,12 @@ class Wallet:
|
||||||
|
|
||||||
|
|
||||||
def create_accounts(self):
|
def create_accounts(self):
|
||||||
# create default account
|
if self.seed_version == 4:
|
||||||
self.create_master_keys('1')
|
self.create_old_account()
|
||||||
self.create_account('1','Main account')
|
else:
|
||||||
|
# create default account
|
||||||
|
self.create_master_keys('1')
|
||||||
|
self.create_account('1','Main account')
|
||||||
|
|
||||||
|
|
||||||
def create_master_keys(self, account_type):
|
def create_master_keys(self, account_type):
|
||||||
|
@ -1546,10 +1554,7 @@ class Wallet:
|
||||||
wait_for_network()
|
wait_for_network()
|
||||||
|
|
||||||
|
|
||||||
if self.seed_version == 4:
|
self.create_accounts()
|
||||||
self.create_old_account()
|
|
||||||
else:
|
|
||||||
self.create_accounts()
|
|
||||||
wait_for_wallet()
|
wait_for_wallet()
|
||||||
|
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue