fix for empty wallets

This commit is contained in:
ThomasV 2011-12-08 09:11:49 +01:00
parent 9f650e80a3
commit 7dad17bb62
1 changed files with 3 additions and 5 deletions

View File

@ -493,7 +493,8 @@ class Wallet:
def choose_tx_inputs( self, amount, fixed_fee ): def choose_tx_inputs( self, amount, fixed_fee ):
""" todo: minimize tx size """ """ todo: minimize tx size """
total = fee = 0 total = 0
fee = self.fee if fixed_fee is None else fixed_fee
inputs = [] inputs = []
for addr in self.addresses: for addr in self.addresses:
h = self.history.get(addr) h = self.history.get(addr)
@ -502,10 +503,7 @@ class Wallet:
v = item.get('value') v = item.get('value')
total += v total += v
inputs.append((addr, v, item['tx_hash'], item['pos'], item['raw_scriptPubKey'], None, None) ) inputs.append((addr, v, item['tx_hash'], item['pos'], item['raw_scriptPubKey'], None, None) )
if fixed_fee is not None: fee = self.fee*len(inputs) if fixed_fee is None else fixed_fee
fee = fixed_fee
else:
fee = self.fee * len(inputs)
if total >= amount + fee: break if total >= amount + fee: break
if total >= amount + fee: break if total >= amount + fee: break
else: else: