AaronFiore/electrum
1
0
Fork 0
Code Activity

Rewrite accounts and transactions: store pubkeys instead of addresses in order to avoid unnecessary derivations.

Browse Source
This commit is contained in:
ThomasV
2014-07-06 21:10:41 +02:00
parent cd4c8335b0
commit a89abee969
5 changed files with 175 additions and 130 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
gui/qt/main_window.py
View File

@@ -2063,7 +2063,7 @@ class ElectrumWindow(QMainWindow):
if is_hex:
try:
return Transaction(txt)
return Transaction.deserialize(txt)
except:
traceback.print_exc(file=sys.stdout)
QMessageBox.critical(None, _("Unable to parse transaction"), _("Electrum was unable to parse your transaction"))
@@ -2072,7 +2072,7 @@ class ElectrumWindow(QMainWindow):
try:
tx_dict = json.loads(str(txt))
assert "hex" in tx_dict.keys()
tx = Transaction(tx_dict["hex"])
tx = Transaction.deserialize(tx_dict["hex"])
#if tx_dict.has_key("input_info"):
# input_info = json.loads(tx_dict['input_info'])
# tx.add_input_info(input_info)
@@ -2123,7 +2123,7 @@ class ElectrumWindow(QMainWindow):
if ok and txid:
r = self.network.synchronous_get([ ('blockchain.transaction.get',[str(txid)]) ])[0]
if r:
tx = transaction.Transaction(r)
tx = transaction.Transaction.deserialize(r)
if tx:
self.show_transaction(tx)
else: