thelper function for mktx, payto - electrum - Electrum Bitcoin wallet HTML git clone https://git.parazyd.org/electrum DIR Log DIR Files DIR Refs DIR Submodules --- DIR commit 131654c1470a094c1f73e5ddbd69fb8a0d5bc667 DIR parent 28640f82f8200be0c95d065347a14c715284cb9f HTML Author: thomasv <thomasv@gitorious> Date: Tue, 26 Feb 2013 15:13:01 +0100 helper function for mktx, payto Diffstat: M lib/commands.py | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) --- DIR diff --git a/lib/commands.py b/lib/commands.py t@@ -192,7 +192,7 @@ class Commands: print_msg(False) - def mktx(self, to_address, amount, fee = None, change_addr = None, from_addr = None): + def _mktx(self, to_address, amount, fee = None, change_addr = None, from_addr = None): for k, v in self.wallet.labels.items(): if v == to_address: to_address = k t@@ -203,8 +203,11 @@ class Commands: amount = int(10000000*amount) if fee: fee = int(10000000*fee) - tx = self.wallet.mktx( [(to_address, amount)], self.password, fee , change_addr, from_addr) + return self.wallet.mktx( [(to_address, amount)], self.password, fee , change_addr, from_addr) + + def mktx(self, to_address, amount, fee = None, change_addr = None, from_addr = None): + tx = self._mktx(to_address, amount, fee = None, change_addr = None, from_addr = None) out = {"hex":str(tx), "complete":tx.is_complete} if not tx.is_complete: out['input_info'] = repr(tx.input_info).replace(' ','') t@@ -212,10 +215,7 @@ class Commands: def payto(self, to_address, amount, fee = None, change_addr = None, from_addr = None): - - amount = int(10000000*amount) - if fee: fee = int(10000000*fee) - tx = self.wallet.mktx( [(to_address, amount)], self.password, fee, change_addr, from_addr ) + tx = self._mktx(to_address, amount, fee = None, change_addr = None, from_addr = None) r, h = wallet.sendtx( tx ) print_msg(h)