diff --git a/hathor/verification/transaction_verifier.py b/hathor/verification/transaction_verifier.py index dec5cad12..80e0ff4ad 100644 --- a/hathor/verification/transaction_verifier.py +++ b/hathor/verification/transaction_verifier.py @@ -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.