electrum

commit 58c6518b30189ca7579cee951800071951d4928c
parent b58aae699ebea742fdac29dd5196945c0a3bd5e1
Author: ThomasV <thomasv@gitorious>
Date:   Tue, 26 Aug 2014 12:55:53 +0200

print more tracebacks

Diffstat:
M
gui/qt/main_window.py
 | 
2
++
M
plugins/trezor.py
 | 
9
+++------

2 files changed, 5 insertions(+), 6 deletions(-)
diff --git a/gui/qt/main_window.py b/gui/qt/main_window.py
@@ -1988,6 +1988,7 @@ class ElectrumWindow(QMainWindow):
             decrypted = self.wallet.decrypt_message(str(pubkey_e.text()), str(encrypted_e.toPlainText()), password)
             message_e.setText(decrypted)
         except Exception as e:
+            traceback.print_exc(file=sys.stdout)
             self.show_message(str(e))
 
 
@@ -1998,6 +1999,7 @@ class ElectrumWindow(QMainWindow):
             encrypted = bitcoin.encrypt_message(message, str(pubkey_e.text()))
             encrypted_e.setText(encrypted)
         except Exception as e:
+            traceback.print_exc(file=sys.stdout)
             self.show_message(str(e))
 
 
diff --git a/plugins/trezor.py b/plugins/trezor.py
@@ -206,12 +206,9 @@ class TrezorWallet(NewWallet):
         pass
 
     def decrypt_message(self, pubkey, message, password):
-        try:
-            address = public_key_to_bc_address(pubkey.decode('hex'))
-            address_path = self.address_id(address)
-            address_n = self.get_client().expand_path(address_path)
-        except Exception, e:
-            raise e
+        address = public_key_to_bc_address(pubkey.decode('hex'))
+        address_path = self.address_id(address)
+        address_n = self.get_client().expand_path(address_path)
         try:
             decrypted_msg = self.get_client().decrypt_message(address_n, b64decode(message))
         except Exception, e: