-
Notifications
You must be signed in to change notification settings - Fork 65
apollo_batcher: comment out code that triggers the new comitter #11960
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.
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
base: main-v0.14.2
Are you sure you want to change the base?
Conversation
This stack of pull requests is managed by Graphite. Learn more about stacking. |
dorimedini-starkware
left a comment
There was a problem hiding this 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?;a973831 to
43ffdf3
Compare
einat-starkware
left a comment
There was a problem hiding this 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
43ffdf3 to
2981765
Compare
2981765 to
7583da8
Compare
|
Artifacts upload workflows: |
7583da8 to
99415c4
Compare
There was a problem hiding this 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."); |
There was a problem hiding this comment.
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)
99415c4 to
e86928e
Compare



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_blockanddecision_reachedby commenting outcommitment_manager.add_commitment_task(...)calls and suppressing resulting unused-variable warnings.Prevents
CommitmentManager::create_commitment_managerfrom backfilling “missing” commitment tasks on startup (commented outadd_missing_commitment_tasks), and marks the corresponding missing-tasks test as ignored. Adds#[allow(dead_code)]on the batcher’scommitment_managerfield 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.