Skip to content

Conversation

@einat-starkware
Copy link
Contributor

@einat-starkware einat-starkware commented Jan 26, 2026

Note

Low Risk
Mostly commenting out code paths and adjusting lints/tests to temporarily disable committer integration; low functional risk beyond commitments no longer being computed/backfilled in these flows.

Overview
Stops the batcher from enqueuing new commitment computation tasks after add_sync_block and decision_reached by commenting out commitment_manager.add_commitment_task(...) calls and suppressing resulting unused-variable warnings.

Prevents CommitmentManager::create_commitment_manager from backfilling “missing” commitment tasks on startup (commented out add_missing_commitment_tasks), and marks the corresponding missing-tasks test as ignored. Adds #[allow(dead_code)] on the batcher’s commitment_manager field to keep builds clean while the committer is disabled.

Written by Cursor Bugbot for commit e86928e. This will update automatically on new commits. Configure here.

@reviewable-StarkWare
Copy link

This change is Reviewable

@einat-starkware einat-starkware marked this pull request as ready for review January 26, 2026 07:03
Copy link
Contributor Author

einat-starkware commented Jan 26, 2026

Copy link
Collaborator

@dorimedini-starkware dorimedini-starkware left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@dorimedini-starkware reviewed 3 files and all commit messages, and made 4 comments.
Reviewable status: all files reviewed, 3 unresolved discussions (waiting on @einat-starkware and @noaov1).


crates/apollo_batcher/src/batcher.rs line 693 at r1 (raw file):

        //         ..
        //     }) => Some(header_commitments.state_diff_commitment),
        // };

why do you need to remove this?

Code quote:

        // TODO(Einat): Uncomment when the committer should be enabled.
        // let optional_state_diff_commitment = match &storage_commitment_block_hash {
        //     StorageCommitmentBlockHash::ParentHash(_) => None,
        //     StorageCommitmentBlockHash::Partial(PartialBlockHashComponents {
        //         ref header_commitments,
        //         ..
        //     }) => Some(header_commitments.state_diff_commitment),
        // };

crates/apollo_batcher/src/batcher.rs line 711 at r1 (raw file):

        // // Write ready commitments to storage.
        // self.write_commitment_results_to_storage().await?;

why do you need to remove this?

Code quote:

        // // Write ready commitments to storage.
        // self.write_commitment_results_to_storage().await?;

crates/apollo_batcher/src/batcher.rs line 754 at r1 (raw file):

        // TODO(Einat): Uncomment when the committer should be enabled.
        // let state_diff_commitment =
        //     partial_block_hash_components.header_commitments.state_diff_commitment;

why do you need to remove this?

Code quote:

        // TODO(Einat): Uncomment when the committer should be enabled.
        // let state_diff_commitment =
        //     partial_block_hash_components.header_commitments.state_diff_commitment;

crates/apollo_batcher/src/batcher.rs line 778 at r1 (raw file):

        // // Write ready commitments to storage.
        // self.write_commitment_results_to_storage().await?;

why do you need to remove this?

Code quote:

        // // Write ready commitments to storage.
        // self.write_commitment_results_to_storage().await?;

@einat-starkware einat-starkware force-pushed the einat/batcher/disable_committer branch from a973831 to 43ffdf3 Compare January 26, 2026 11:19
Copy link
Contributor Author

@einat-starkware einat-starkware left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@einat-starkware made 3 comments.
Reviewable status: 1 of 3 files reviewed, 3 unresolved discussions (waiting on @dorimedini-starkware and @noaov1).


crates/apollo_batcher/src/batcher.rs line 693 at r1 (raw file):

Previously, dorimedini-starkware wrote…

why do you need to remove this?

For clippy (I added an #[allow(unused_variable)] to be clearer)


crates/apollo_batcher/src/batcher.rs line 754 at r1 (raw file):

Previously, dorimedini-starkware wrote…

why do you need to remove this?

also for clippy, same as above


crates/apollo_batcher/src/batcher.rs line 778 at r1 (raw file):

Previously, dorimedini-starkware wrote…

why do you need to remove this?

Added back in

@einat-starkware einat-starkware force-pushed the einat/batcher/disable_committer branch from 43ffdf3 to 2981765 Compare January 26, 2026 16:23
@einat-starkware einat-starkware changed the base branch from main to graphite-base/11960 February 1, 2026 08:38
@einat-starkware einat-starkware force-pushed the einat/batcher/disable_committer branch from 2981765 to 7583da8 Compare February 1, 2026 08:38
@einat-starkware einat-starkware changed the base branch from graphite-base/11960 to main-v0.14.2 February 1, 2026 08:38
@github-actions
Copy link

github-actions bot commented Feb 1, 2026

Artifacts upload workflows:

@einat-starkware einat-starkware force-pushed the einat/batcher/disable_committer branch from 7583da8 to 99415c4 Compare February 8, 2026 07:51
Copy link

@cursor cursor bot left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Cursor Bugbot has reviewed your changes and found 1 potential issue.

// Some(state_diff_commitment),
// )
// .await
// .expect("The commitment offset unexpectedly doesn't match the given block height.");
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Revert operations will panic due to stale offset

High Severity

The add_commitment_task calls are commented out but revert_commitment still uses add_revert_task, which validates that height == commitment_task_offset.prev(). Since commitment_task_offset is no longer incremented when blocks are committed (because add_commitment_task is disabled), any revert attempt will fail the height validation and panic with "Failed to add revert task to commitment manager."

Additional Locations (2)

Fix in Cursor Fix in Web

@meship-starkware meship-starkware force-pushed the einat/batcher/disable_committer branch from 99415c4 to e86928e Compare February 8, 2026 14:02
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants