Skip to content

Refactor handling of failed atomic batches #4877

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
merged 2 commits into from
Oct 1, 2025
Merged

Refactor handling of failed atomic batches #4877

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
46f5107
Removes unused handling of failed atomic batch
grarco Oct 1, 2025
2836176
Changelog #4450
grarco Oct 1, 2025
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
2 changes: 2 additions & 0 deletions .changelog/unreleased/improvements/4450-unused-batch-handling.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
- Removed handling of failed atomic batches from `handle_inner_tx_results` that
was never hit. ([\#4450](https://github.com/namada-net/namada/issues/4450))
39 changes: 11 additions & 28 deletions crates/node/src/shell/finalize_block.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -482,37 +482,20 @@ where
let mut temp_log = TempTxLogs::new_from_tx_logs(tx_logs);

let ValidityFlags {
commit_batch_hash,
is_any_tx_invalid,
commit_batch_hash, ..
} = temp_log.check_inner_results(&mut tx_result, tx_data.height);

if tx_data.is_atomic_batch && is_any_tx_invalid {
// Atomic batches need custom handling when even a single tx fails,
// since we need to drop everything
let unrun_txs = tx_data
.commitments_len
.checked_sub(
u64::try_from(tx_result.len())
.expect("Should be able to convert to u64"),
)
.expect("Shouldn't underflow");
temp_log.stats.set_failing_atomic_batch(unrun_txs);
temp_log.commit_stats_only(tx_logs);
self.state.write_log_mut().drop_batch();
tx_logs.tx_event.extend(Code(ResultCode::WasmRuntimeError));
} else {
self.state.write_log_mut().commit_batch_and_current_tx();
self.state
.in_mem_mut()
.block
.results
.accept(tx_data.tx_index);
temp_log.commit(tx_logs, response);
self.state.write_log_mut().commit_batch_and_current_tx();
self.state
.in_mem_mut()
.block
.results
.accept(tx_data.tx_index);
temp_log.commit(tx_logs, response);

// Atomic successful batches or non-atomic batches (even if the
// inner txs failed) are marked as Ok
tx_logs.tx_event.extend(Code(ResultCode::Ok));
}
// Atomic successful batches or non-atomic batches (even if the
// inner txs failed) are marked as Ok
tx_logs.tx_event.extend(Code(ResultCode::Ok));

if commit_batch_hash {
// If at least one of the inner txs of the batch requires its hash
Expand Down
Loading