AaronFiore/electrum
1
0
Fork 0
Code Activity

python3 updates

Browse Source
This commit is contained in:
ThomasV
2017-08-18 07:21:53 +02:00
parent f3027fa574
commit 1a6e41cec8
2 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
lib/interface.py
View File

@@ -175,6 +175,9 @@ class TcpConnection(threading.Thread, util.PrintError):
cert_reqs=ssl.CERT_REQUIRED, cert_reqs=ssl.CERT_REQUIRED,
ca_certs=(temporary_path if is_new else cert_path), ca_certs=(temporary_path if is_new else cert_path),
do_handshake_on_connect=True) do_handshake_on_connect=True)
except socket.timeout:
self.print_error('timeout')
return
except ssl.SSLError as e: except ssl.SSLError as e:
self.print_error("SSL error:", e) self.print_error("SSL error:", e)
if e.errno != 1: if e.errno != 1:

5
lib/keystore.py
View File

@@ -356,7 +356,8 @@ class Old_KeyStore(Deterministic_KeyStore):
def add_seed(self, seedphrase): def add_seed(self, seedphrase):
Deterministic_KeyStore.add_seed(self, seedphrase) Deterministic_KeyStore.add_seed(self, seedphrase)
self.mpk = self.mpk_from_seed(self.seed) s = self.get_hex_seed(None)
self.mpk = self.mpk_from_seed(s)
def add_master_public_key(self, mpk): def add_master_public_key(self, mpk):
self.mpk = mpk self.mpk = mpk
@@ -477,7 +478,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_hex_seed(old_password) decoded = pw_decode(self.seed, old_password)
self.seed = pw_encode(decoded, new_password) self.seed = pw_encode(decoded, new_password)