fix mnemonic decode

This commit is contained in:
thomasv 2013-10-31 15:40:10 +01:00
parent b9eb909554
commit 83b885c702
2 changed files with 20 additions and 13 deletions

View File

@ -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

View File

@ -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: self.seed_version = 4
mnemonic.mn_decode(words) self.seed = mnemonic.mn_decode(words)
uses_electrum_words = True
except:
uses_electrum_words = False
if uses_electrum_words and len(words) != 13: #try:
self.seed_version = 4 # mnemonic.mn_decode(words)
self.seed = mnemonic.mn_encode(seed) # uses_electrum_words = True
else: #except:
assert mnemonic_hash(seed).startswith(SEED_PREFIX) # uses_electrum_words = False
self.seed_version = SEED_VERSION #
self.seed = seed #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):