Skip to content

Validate confirmation target #3426

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
+14 −0
Open

Validate confirmation target #3426

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
5 changes: 5 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 @@ -35,6 +35,7 @@
from counterpartycore.lib.utils import helpers, multisig, script

MAX_INPUTS_SET = 100
MAX_CONFIRMATION_TARGET = 1008

logger = logging.getLogger(config.LOGGER_NAME)

Expand Down Expand Up @@ -928,6 +929,10 @@ def prepare_fee_parameters(construct_params):
sat_per_vbyte, confirmation_target, max_fee = None, None, None
elif sat_per_vbyte is None:
if confirmation_target is not None:
if confirmation_target < 1 or confirmation_target > MAX_CONFIRMATION_TARGET:
raise exceptions.ComposeError(
f"Invalid confirmation_target: must be between 1 and {MAX_CONFIRMATION_TARGET}"
)
sat_per_vbyte = backend.bitcoind.satoshis_per_vbyte(confirmation_target)
else:
sat_per_vbyte = backend.bitcoind.satoshis_per_vbyte()
Expand Down
9 changes: 9 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 @@ -987,6 +987,15 @@ def test_prepare_fee_parameters():
1000,
)

with pytest.raises(exceptions.ComposeError, match="Invalid confirmation_target"):
composer.prepare_fee_parameters({"confirmation_target": 0})

with pytest.raises(exceptions.ComposeError, match="Invalid confirmation_target"):
composer.prepare_fee_parameters({"confirmation_target": -1})

with pytest.raises(exceptions.ComposeError, match="Invalid confirmation_target"):
composer.prepare_fee_parameters({"confirmation_target": 1009})


def test_prepare_unspent_list(ledger_db, defaults, monkeypatch):
txs = {
Expand Down