fix mnemonic decode
This commit is contained in:
parent
b9eb909554
commit
83b885c702
|
@ -282,6 +282,8 @@ class InstallWizard(QDialog):
|
||||||
try:
|
try:
|
||||||
wallet.init_seed(seed)
|
wallet.init_seed(seed)
|
||||||
except:
|
except:
|
||||||
|
import traceback
|
||||||
|
traceback.print_exc(file=sys.stdout)
|
||||||
QMessageBox.warning(None, _('Error'), _('Incorrect seed'), _('OK'))
|
QMessageBox.warning(None, _('Error'), _('Incorrect seed'), _('OK'))
|
||||||
return
|
return
|
||||||
|
|
||||||
|
|
|
@ -289,6 +289,8 @@ class Wallet:
|
||||||
|
|
||||||
|
|
||||||
def init_seed(self, seed):
|
def init_seed(self, seed):
|
||||||
|
import mnemonic
|
||||||
|
|
||||||
if self.seed:
|
if self.seed:
|
||||||
raise BaseException("a seed exists")
|
raise BaseException("a seed exists")
|
||||||
|
|
||||||
|
@ -311,19 +313,22 @@ class Wallet:
|
||||||
pass
|
pass
|
||||||
|
|
||||||
words = seed.split()
|
words = seed.split()
|
||||||
try:
|
|
||||||
mnemonic.mn_decode(words)
|
|
||||||
uses_electrum_words = True
|
|
||||||
except:
|
|
||||||
uses_electrum_words = False
|
|
||||||
|
|
||||||
if uses_electrum_words and len(words) != 13:
|
|
||||||
self.seed_version = 4
|
self.seed_version = 4
|
||||||
self.seed = mnemonic.mn_encode(seed)
|
self.seed = mnemonic.mn_decode(words)
|
||||||
else:
|
|
||||||
assert mnemonic_hash(seed).startswith(SEED_PREFIX)
|
#try:
|
||||||
self.seed_version = SEED_VERSION
|
# mnemonic.mn_decode(words)
|
||||||
self.seed = seed
|
# uses_electrum_words = True
|
||||||
|
#except:
|
||||||
|
# uses_electrum_words = False
|
||||||
|
#
|
||||||
|
#if uses_electrum_words and len(words) != 13:
|
||||||
|
# self.seed_version = 4
|
||||||
|
# self.seed = mnemonic.mn_decode(words)
|
||||||
|
#else:
|
||||||
|
# assert mnemonic_hash(seed).startswith(SEED_PREFIX)
|
||||||
|
# self.seed_version = SEED_VERSION
|
||||||
|
# self.seed = seed
|
||||||
|
|
||||||
|
|
||||||
def save_seed(self):
|
def save_seed(self):
|
||||||
|
|
Loading…
Reference in New Issue