From 2b0d92e767396d12d7b69d2fe85477d8c38fb945 Mon Sep 17 00:00:00 2001 From: ThomasV Date: Sun, 29 Sep 2013 10:16:17 +0200 Subject: [PATCH] sign_tx hook --- gui/qt/main_window.py | 2 -- lib/wallet.py | 10 +++++++++- 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/gui/qt/main_window.py b/gui/qt/main_window.py index 4f59eccb7..fb66cda01 100644 --- a/gui/qt/main_window.py +++ b/gui/qt/main_window.py @@ -904,8 +904,6 @@ class ElectrumWindow(QMainWindow): QMessageBox.warning(self, _('Error'), _("This transaction requires a higher fee, or it will not be propagated by the network."), _('OK')) return - run_hook('send_tx', tx) - if label: self.set_label(tx.hash(), label) diff --git a/lib/wallet.py b/lib/wallet.py index 3f9b672c2..1b37bb5e6 100644 --- a/lib/wallet.py +++ b/lib/wallet.py @@ -34,6 +34,7 @@ from util import print_msg, print_error, format_satoshis from bitcoin import * from account import * from transaction import Transaction +from plugins import run_hook # AES encryption EncodeAES = lambda secret, s: base64.b64encode(aes.encryptData(secret,s)) @@ -652,7 +653,8 @@ class Wallet: print txin - tx.sign( keypairs ) + self.sign_tx(tx, keypairs) + def sign_message(self, address, message, password): keys = self.get_private_key(address, password) @@ -1217,7 +1219,13 @@ class Wallet: for sec in private_keys: pubkey = public_key_from_private_key(sec) keypairs[ pubkey ] = sec + + self.sign_tx(tx, keypairs) + + + def sign_tx(self, tx, keypairs): tx.sign(keypairs) + run_hook('sign_tx', tx) def sendtx(self, tx):