Skip to content

apollo_batcher: use finish proposal api#12972

Open
itamar-starkware wants to merge 1 commit into03-02-apollo_batcher_add_finish_proposal_apifrom
03-02-apollo_batcher_use_finish_proposal_api
Open

apollo_batcher: use finish proposal api#12972
itamar-starkware wants to merge 1 commit into03-02-apollo_batcher_add_finish_proposal_apifrom
03-02-apollo_batcher_use_finish_proposal_api

Conversation

@itamar-starkware
Copy link
Contributor

@itamar-starkware itamar-starkware commented Mar 2, 2026

TL;DR

Removed deprecated SendProposalContent::Finish variant and migrated all callers to use the dedicated finish_proposal method.

What changed?

  • Removed the SendProposalContent::Finish variant from the enum, leaving only SendProposalContent::Txs
  • Removed the corresponding ProposalStatus::Finished variant from proposal status responses
  • Eliminated the deprecated code path in Batcher::send_proposal_content that handled finish requests
  • Updated all test cases and production code to use finish_proposal method with FinishProposalInput instead of sending finish content through send_proposal_content
  • Updated comment references from SendProposalContent::Finish/Abort to proposal finalization/abort

How to test?

Run the existing test suite to verify that:

  • All proposal validation flows work correctly with the new finish proposal method
  • Error handling for invalid proposals still functions properly
  • Concurrent proposal scenarios continue to work as expected

Why make this change?

This removes technical debt by eliminating a deprecated API pattern. The change consolidates proposal finishing into a dedicated method rather than overloading the content sending mechanism, resulting in cleaner separation of concerns and a more maintainable codebase.


Note

Medium Risk
Moderate risk because it changes a cross-crate API and response types between consensus and batcher; regressions would show up as proposals not finalizing or incorrect status handling, though changes are narrow and covered by updated tests.

Overview
Migrates proposal finalization off the overloaded send_proposal_content path by removing the deprecated SendProposalContent::Finish + ProposalStatus::Finished variants and routing all finish semantics through the dedicated finish_proposal(FinishProposalInput) -> FinishProposalStatus API.

Updates batcher logic, consensus-orchestrator validation flow (validate_proposal), and related mocks/tests to use finish_proposal, and adjusts docs/comments to refer to proposal finalization/abort rather than the old Finish/Abort stream semantics.

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

@reviewable-StarkWare
Copy link

This change is Reviewable

Copy link
Contributor Author

itamar-starkware commented Mar 2, 2026

@itamar-starkware itamar-starkware self-assigned this Mar 2, 2026
@itamar-starkware itamar-starkware marked this pull request as ready for review March 2, 2026 14:35
@itamar-starkware itamar-starkware force-pushed the 03-02-apollo_batcher_use_finish_proposal_api branch from f035373 to 5ada8e4 Compare March 2, 2026 16:00
@itamar-starkware itamar-starkware force-pushed the 03-02-apollo_batcher_add_finish_proposal_api branch from 589e327 to 49938c3 Compare March 2, 2026 16:00
@itamar-starkware itamar-starkware force-pushed the 03-02-apollo_batcher_use_finish_proposal_api branch from 5ada8e4 to 873a4df Compare March 2, 2026 17:46
@itamar-starkware itamar-starkware force-pushed the 03-02-apollo_batcher_add_finish_proposal_api branch from 49938c3 to 5c1e50a Compare March 2, 2026 17:46
@itamar-starkware itamar-starkware force-pushed the 03-02-apollo_batcher_use_finish_proposal_api branch from 873a4df to 9f4baa8 Compare March 2, 2026 18:52
@itamar-starkware itamar-starkware force-pushed the 03-02-apollo_batcher_add_finish_proposal_api branch from 5c1e50a to 9a37bca Compare March 2, 2026 18:52
Copy link
Contributor

@ArniStarkware ArniStarkware left a comment

Choose a reason for hiding this comment

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

@ArniStarkware reviewed 1 file.
Reviewable status: 1 of 7 files reviewed, all discussions resolved (waiting on TzahiTaub).

Copy link
Contributor

@ArniStarkware ArniStarkware left a comment

Choose a reason for hiding this comment

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

@ArniStarkware reviewed 6 files and all commit messages.
Reviewable status: :shipit: complete! all files reviewed, all discussions resolved (waiting on TzahiTaub).

@itamar-starkware itamar-starkware force-pushed the 03-02-apollo_batcher_use_finish_proposal_api branch 2 times, most recently from eabd9b9 to c0af453 Compare March 4, 2026 22:11
@itamar-starkware itamar-starkware force-pushed the 03-02-apollo_batcher_add_finish_proposal_api branch from 9a16d29 to 591851e Compare March 4, 2026 22:11
Copy link
Contributor

@ArniStarkware ArniStarkware left a comment

Choose a reason for hiding this comment

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

:lgtm:

@ArniStarkware reviewed 7 files and all commit messages, and made 1 comment.
Reviewable status: :shipit: complete! all files reviewed, all discussions resolved (waiting on TzahiTaub).

@itamar-starkware itamar-starkware changed the base branch from 03-02-apollo_batcher_add_finish_proposal_api to graphite-base/12972 March 9, 2026 09:22
@itamar-starkware itamar-starkware force-pushed the 03-02-apollo_batcher_use_finish_proposal_api branch from c0af453 to b1b94c2 Compare March 9, 2026 09:27
@itamar-starkware itamar-starkware changed the base branch from graphite-base/12972 to 03-02-apollo_batcher_add_finish_proposal_api March 9, 2026 09:28
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.

Bugbot Autofix is OFF. To automatically fix reported issues with cloud agents, have a team admin enable autofix in the Cursor dashboard.

@itamar-starkware itamar-starkware changed the base branch from 03-02-apollo_batcher_add_finish_proposal_api to graphite-base/12972 March 9, 2026 16:18
@itamar-starkware itamar-starkware force-pushed the 03-02-apollo_batcher_use_finish_proposal_api branch from b1b94c2 to 2775684 Compare March 9, 2026 23:00
@itamar-starkware itamar-starkware changed the base branch from graphite-base/12972 to 03-02-apollo_batcher_add_finish_proposal_api March 9, 2026 23:01
@itamar-starkware itamar-starkware force-pushed the 03-02-apollo_batcher_add_finish_proposal_api branch from 74f4238 to 699182b Compare March 9, 2026 23:22
@itamar-starkware itamar-starkware force-pushed the 03-02-apollo_batcher_use_finish_proposal_api branch from 2775684 to e3a313e Compare March 9, 2026 23:22
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