AaronFiore/electrum
1
0
Fork 0
Code Activity

helper function for mktx, payto

Browse Source
This commit is contained in:
thomasv
2013-02-26 15:13:01 +01:00
parent 28640f82f8
commit 131654c147
1 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
lib/commands.py
View File

@@ -192,7 +192,7 @@ class Commands:
print_msg(False) 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(): for k, v in self.wallet.labels.items():
if v == to_address: if v == to_address:
to_address = k to_address = k
@@ -203,8 +203,11 @@ class Commands:
amount = int(10000000*amount) amount = int(10000000*amount)
if fee: fee = int(10000000*fee) 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} out = {"hex":str(tx), "complete":tx.is_complete}
if not tx.is_complete: if not tx.is_complete:
out['input_info'] = repr(tx.input_info).replace(' ','') out['input_info'] = repr(tx.input_info).replace(' ','')
@@ -212,10 +215,7 @@ class Commands:
def payto(self, to_address, amount, fee = None, change_addr = None, from_addr = None): def payto(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)
amount = int(10000000*amount)
if fee: fee = int(10000000*fee)
tx = self.wallet.mktx( [(to_address, amount)], self.password, fee, change_addr, from_addr )
r, h = wallet.sendtx( tx ) r, h = wallet.sendtx( tx )
print_msg(h) print_msg(h)