Skip to content

Release-candidate v0.68.3-rc.3 #1527

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

Merged
jansegre merged 1 commit into from
Dec 20, 2025
Merged

Release-candidate v0.68.3-rc.3 #1527

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: 3 additions & 2 deletions hathor/verification/transaction_verifier.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -387,8 +387,9 @@ def verify_conflict(self, tx: Transaction, params: VerificationParams) -> None:
# Skip tx itself.
continue
conflict_tx = tx.storage.get_transaction(h)
if conflict_tx.get_metadata().first_block is not None:
# only mempool conflicts are allowed
conflict_meta = conflict_tx.get_metadata()
if conflict_meta.first_block is not None and not conflict_meta.voided_by:
# only mempool conflicts are allowed or failed nano executions
raise ConflictWithConfirmedTxError('transaction has a conflict with a confirmed transaction')
if within_counter == 0:
# Only increment once per input.
Expand Down
Loading