LBRYFoundation/LBRY-Vault
1
0
Fork 0
mirror of https://github.com/LBRYFoundation/LBRY-Vault.git synced 2025-08-28 07:51:27 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

don't change fee if it is fixed by user

Browse source
This commit is contained in:
ThomasV 2014-09-08 09:29:25 +02:00
parent bd6f21232d
commit 01ad103c37
1 changed files with 6 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
lib/wallet.py
View file

@ -759,12 +759,16 @@ class Abstract_Wallet(object):
# if change is above dust threshold, add a change output. # if change is above dust threshold, add a change output.
change_amount = total - ( amount + fee ) change_amount = total - ( amount + fee )
if change_amount > DUST_THRESHOLD: if fixed_fee is not None:
# Insert the change output at a random position in the outputs
posn = random.randint(0, len(tx.outputs))
tx.outputs[posn:posn] = [( 'address', change_addr, change_amount)]
elif change_amount > DUST_THRESHOLD:
# Insert the change output at a random position in the outputs # Insert the change output at a random position in the outputs
posn = random.randint(0, len(tx.outputs)) posn = random.randint(0, len(tx.outputs))
tx.outputs[posn:posn] = [( 'address', change_addr, change_amount)] tx.outputs[posn:posn] = [( 'address', change_addr, change_amount)]
# recompute fee including change output # recompute fee including change output
fee = fixed_fee if fixed_fee is not None else self.estimated_fee(tx) fee = self.estimated_fee(tx)
# remove change output # remove change output
tx.outputs.pop(posn) tx.outputs.pop(posn)
# if change is still above dust threshold, re-add change output. # if change is still above dust threshold, re-add change output.