Skip to content

Gather more inputs if the change is below the dust limit #1

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wdl1908 wants to merge 3 commits into
base: master
Choose a base branch
from
Open

Gather more inputs if the change is below the dust limit #1

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
0f150d1
Gather more inputs if the change is below the dust limit
wdl1908 May 13, 2015
105fb71
Make condition more readable
wdl1908 May 13, 2015
46a8826
Add a unit test for gathering more inputs to avoid the dust limit
wdl1908 May 13, 2015
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 7 additions & 4 deletions openassets/transactions.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -174,8 +174,7 @@ def asset_asset_swap(
return self.transfer(
[(asset1_id, asset1_transfer_spec), (asset2_id, asset2_transfer_spec)], btc_transfer_spec, fees)

@staticmethod
def _collect_uncolored_outputs(unspent_outputs, amount):
def _collect_uncolored_outputs(self, unspent_outputs, amount):
"""
Returns a list of uncolored outputs for the specified amount.

Expand All @@ -191,10 +190,14 @@ def _collect_uncolored_outputs(unspent_outputs, amount):
result.append(output)
total_amount += output.output.value

if total_amount >= amount:
# Make sure we don't create dust outputs
if total_amount == amount or (total_amount >= amount and (total_amount - amount) >= self._dust_amount):
return result, total_amount

raise InsufficientFundsError
if total_amount >= amount and (total_amount - amount) < self._dust_amount:
raise DustOutputError
else:
raise InsufficientFundsError

@staticmethod
def _collect_colored_outputs(unspent_outputs, asset_id, asset_quantity):
Expand Down
11 changes: 11 additions & 0 deletions tests/test_transactions.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -153,6 +153,17 @@ def test_transfer_bitcoin_dust_change(self):
openassets.transactions.DustOutputError,
self.target.transfer_bitcoin, spec, 10)

def test_transfer_bitcoin_dust_output_more_inputs(self):
outputs = self.generate_outputs([
(10, b'source', None, 0),
(11, b'source', None, 0),
(10, b'source', None, 0)
])

spec = openassets.transactions.TransferParameters(outputs, b'target', b'change', 10)
result = self.target.transfer_bitcoin(spec, 10)
self.assertEqual(3, len(result.vin))

def test_transfer_assets_with_change(self):
outputs = self.generate_outputs([
(10, b'source', b'a1', 50),
Expand Down