Skip to content

Validate dust size parameters #3424

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
caydyan wants to merge 1 commit into
base: develop
Choose a base branch
from
+8 −0
Open

Validate dust size parameters #3424

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
4 changes: 4 additions & 0 deletions counterparty-core/counterpartycore/lib/api/composer.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -123,12 +123,16 @@ def create_tx_output(value, address_or_script, unspent_list, construct_params):

def regular_dust_size(construct_params):
if construct_params.get("regular_dust_size") is not None:
if construct_params["regular_dust_size"] < 0:
raise exceptions.ComposeError("Invalid regular_dust_size: must be non-negative")
return construct_params["regular_dust_size"]
return config.DEFAULT_REGULAR_DUST_SIZE


def multisig_dust_size(construct_params):
if construct_params.get("multisig_dust_size") is not None:
if construct_params["multisig_dust_size"] < 0:
raise exceptions.ComposeError("Invalid multisig_dust_size: must be non-negative")
return construct_params["multisig_dust_size"]
return config.DEFAULT_MULTISIG_DUST_SIZE

Expand Down
4 changes: 4 additions & 0 deletions counterparty-core/counterpartycore/test/units/api/composer_test.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -110,9 +110,13 @@ def test_dust_size(defaults):
assert composer.regular_dust_size({}) == 546
assert composer.regular_dust_size({"regular_dust_size": 666}) == 666
assert composer.regular_dust_size({"regular_dust_size": None}) == 546
with pytest.raises(exceptions.ComposeError, match="Invalid regular_dust_size"):
composer.regular_dust_size({"regular_dust_size": -1})
assert composer.multisig_dust_size({}) == 1000
assert composer.multisig_dust_size({"multisig_dust_size": 666}) == 666
assert composer.multisig_dust_size({"multisig_dust_size": None}) == 1000
with pytest.raises(exceptions.ComposeError, match="Invalid multisig_dust_size"):
composer.multisig_dust_size({"multisig_dust_size": -1})
assert composer.dust_size(defaults["addresses"][0], {}) == 546
assert composer.dust_size(defaults["addresses"][0], {"regular_dust_size": 666}) == 666
assert composer.dust_size(defaults["p2ms_addresses"][0], {}) == 1000
Expand Down