BTCPrivate
/
electrum-bitcoinprivate
mirror of https://github.com/BTCPrivate/electrum-bitcoinprivate.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

simplification (get rid of get_mnemonic)

This commit is contained in:
ThomasV 2016-10-14 12:09:43 +02:00
parent d950cd7323
commit bab15a245b
4 changed files with 9 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
gui/qt/main_window.py
View File

@ -1706,13 +1706,13 @@ class ElectrumWindow(QMainWindow, MessageBoxMixin, PrintError):
return return
keystore = self.wallet.get_keystore() keystore = self.wallet.get_keystore()
try: try:
mnemonic = keystore.get_mnemonic(password) seed = keystore.get_seed(password)
passphrase = keystore.get_passphrase(password) passphrase = keystore.get_passphrase(password)
except BaseException as e: except BaseException as e:
self.show_error(str(e)) self.show_error(str(e))
return return
from seed_dialog import SeedDialog from seed_dialog import SeedDialog
d = SeedDialog(self, mnemonic, passphrase) d = SeedDialog(self, seed, passphrase)
d.exec_() d.exec_()

2
lib/commands.py
View File

@ -346,7 +346,7 @@ class Commands:
@command('wp') @command('wp')
def getseed(self): def getseed(self):
"""Get seed phrase. Print the generation seed of your wallet.""" """Get seed phrase. Print the generation seed of your wallet."""
s = self.wallet.get_mnemonic(self._password) s = self.wallet.get_seed(self._password)
return s.encode('utf8') return s.encode('utf8')
@command('wp') @command('wp')

15
lib/keystore.py
View File

@ -318,9 +318,6 @@ class BIP32_KeyStore(Deterministic_KeyStore, Xpub):
def is_watching_only(self): def is_watching_only(self):
return self.xprv is None return self.xprv is None
def get_mnemonic(self, password):
return self.get_seed(password)
def add_xprv(self, xprv): def add_xprv(self, xprv):
self.xprv = xprv self.xprv = xprv
self.xpub = bitcoin.xpub_from_xprv(xprv) self.xpub = bitcoin.xpub_from_xprv(xprv)
@ -344,7 +341,7 @@ class Old_KeyStore(Deterministic_KeyStore):
Deterministic_KeyStore.__init__(self, d) Deterministic_KeyStore.__init__(self, d)
self.mpk = d.get('mpk') self.mpk = d.get('mpk')
def get_seed(self, password): def get_hex_seed(self, password):
return pw_decode(self.seed, password).encode('utf8') return pw_decode(self.seed, password).encode('utf8')
def dump(self): def dump(self):
@ -376,9 +373,9 @@ class Old_KeyStore(Deterministic_KeyStore):
raise Exception("Invalid seed") raise Exception("Invalid seed")
return seed return seed
def get_mnemonic(self, password): def get_seed(self, password):
import old_mnemonic import old_mnemonic
s = self.get_seed(password) s = self.get_hex_seed(password)
return ' '.join(old_mnemonic.mn_encode(s)) return ' '.join(old_mnemonic.mn_encode(s))
@classmethod @classmethod
@ -423,7 +420,7 @@ class Old_KeyStore(Deterministic_KeyStore):
return SecretToASecret(pk, compressed) return SecretToASecret(pk, compressed)
def get_private_key(self, sequence, password): def get_private_key(self, sequence, password):
seed = self.get_seed(password) seed = self.get_hex_seed(password)
self.check_seed(seed) self.check_seed(seed)
for_change, n = sequence for_change, n = sequence
secexp = self.stretch_key(seed) secexp = self.stretch_key(seed)
@ -439,7 +436,7 @@ class Old_KeyStore(Deterministic_KeyStore):
raise InvalidPassword() raise InvalidPassword()
def check_password(self, password): def check_password(self, password):
seed = self.get_seed(password) seed = self.get_hex_seed(password)
self.check_seed(seed) self.check_seed(seed)
def get_master_public_key(self): def get_master_public_key(self):
@ -476,7 +473,7 @@ class Old_KeyStore(Deterministic_KeyStore):
if new_password == '': if new_password == '':
new_password = None new_password = None
if self.has_seed(): if self.has_seed():
decoded = self.get_seed(old_password) decoded = self.get_hex_seed(old_password)
self.seed = pw_encode(decoded, new_password) self.seed = pw_encode(decoded, new_password)

3
lib/wallet.py
View File

@ -1415,9 +1415,6 @@ class Deterministic_Wallet(Abstract_Wallet):
def add_seed(self, seed, pw): def add_seed(self, seed, pw):
self.keystore.add_seed(seed, pw) self.keystore.add_seed(seed, pw)
def get_mnemonic(self, password):
return self.keystore.get_mnemonic(password)
def change_gap_limit(self, value): def change_gap_limit(self, value):
'''This method is not called in the code, it is kept for console use''' '''This method is not called in the code, it is kept for console use'''
if value >= self.gap_limit: if value >= self.gap_limit: