AaronFiore/electrum
1
0
Fork 0
Code Activity

clean up sending address input

Browse Source 
in particular fee calculation was off for send-from
This commit is contained in:
kazcw
2013-11-14 23:07:25 -05:00
committed by ThomasV
parent ce0a33cb67
commit 3628f6430e
2 changed files with 19 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
lib/wallet.py
View File

@@ -1138,12 +1138,6 @@ class Wallet:
return [x[1] for x in coins]
def choose_tx_inputs_from_account( self, amount, fixed_fee, account ):
domain = self.get_account_addresses(account) if account else None
return self.choose_tx_inputs( amount, fixed_fee, domain )
def choose_tx_inputs( self, amount, fixed_fee, domain = None ):
""" todo: minimize tx size """
total = 0
@@ -1357,17 +1351,6 @@ class Wallet:
return Transaction.from_io(inputs, outputs)
def mktx_from_account(self, outputs, password, fee=None, account=None,
pay_from=None):
if pay_from:
domain = pay_from
elif account:
domain = self.get_account_addresses(account)
else:
domain = None
return self.mktx(outputs, password, fee, change_addr=None, domain=domain)
def mktx(self, outputs, password, fee=None, change_addr=None, domain= None ):
tx = self.make_unsigned_transaction(outputs, fee, change_addr, domain)
keypairs = {}