AaronFiore/electrum
1
0
Fork 0
Code Activity

Added two cli commands: payfromto and paytoch.

Browse Source 
payfromto makes a payment from a keypair given as argument without saving the keypair in the wallet or using any other address in it.
paytoch is the same as payto but specifying a custom change address (useful for imported keys).
This commit is contained in:
DiThi
2012-02-08 04:22:18 +01:00
parent c0fea37f13
commit def4de8184
2 changed files with 57 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
client/wallet.py
View File

@@ -618,12 +618,14 @@ class Wallet:
inputs = []
return inputs, total, fee
def choose_tx_outputs( self, to_addr, amount, fee, total ):
def choose_tx_outputs( self, to_addr, amount, fee, total, change_addr=None ):
outputs = [ (to_addr, amount) ]
change_amount = total - ( amount + fee )
if change_amount != 0:
# normally, the update thread should ensure that the last change address is unused
outputs.append( ( self.change_addresses[-1], change_amount) )
if not change_addr:
change_addr = self.change_addresses[-1]
outputs.append( ( change_addr, change_amount) )
return outputs
def sign_inputs( self, inputs, outputs, password ):
@@ -702,13 +704,13 @@ class Wallet:
default_label = 'at: ' + o_addr
tx['default_label'] = default_label
def mktx(self, to_address, amount, label, password, fee=None):
def mktx(self, to_address, amount, label, password, fee=None, change_addr=None, save=True):
if not self.is_valid(to_address):
raise BaseException("Invalid address")
inputs, total, fee = self.choose_tx_inputs( amount, fee )
if not inputs:
raise BaseException("Not enough funds")
outputs = self.choose_tx_outputs( to_address, amount, fee, total )
outputs = self.choose_tx_outputs( to_address, amount, fee, total, change_addr )
s_inputs = self.sign_inputs( inputs, outputs, password )
tx = filter( raw_tx( s_inputs, outputs ) )
@@ -717,7 +719,8 @@ class Wallet:
if label:
tx_hash = Hash(tx.decode('hex') )[::-1].encode('hex')
self.labels[tx_hash] = label
self.save()
if save:
self.save()
return tx
def sendtx(self, tx):