Skip to content

Conversation

@asmaastarkware
Copy link
Contributor

No description provided.

@reviewable-StarkWare
Copy link

This change is Reviewable

Copy link
Contributor Author

asmaastarkware commented Nov 23, 2025

Copy link
Collaborator

@matanl-starkware matanl-starkware left a comment

Choose a reason for hiding this comment

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

@matanl-starkware reviewed 3 of 4 files at r1.
Reviewable status: 1 of 4 files reviewed, 2 unresolved discussions (waiting on @dafnamatsry)


crates/apollo_consensus/src/single_height_consensus.rs line 136 at r1 (raw file):

/// tasks). SHC does have side effects, such as sending messages to the network via the context.
pub(crate) struct SingleHeightConsensus {
    height: BlockNumber,

Can you split this into a PR "removing height from SHC"?

Code quote:

height: BlockNumber,

crates/apollo_consensus/src/single_height_consensus.rs line 415 at r1 (raw file):

                }
                StateMachineEvent::Precommit(vote) => {
                    ret_val.extend(self.handle_state_machine_vote(context, vote).await?);

Same behaviour as Prevote.
Consider using an unite arm

Code quote:

ret_val.extend

@asmaastarkware asmaastarkware changed the base branch from asmaa/refactor/use_sm_id_in_shc to graphite-base/10335 November 23, 2025 14:25
Copy link
Contributor Author

@asmaastarkware asmaastarkware left a comment

Choose a reason for hiding this comment

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

Reviewable status: 1 of 4 files reviewed, 2 unresolved discussions (waiting on @dafnamatsry and @matanl-starkware)


crates/apollo_consensus/src/single_height_consensus.rs line 136 at r1 (raw file):

Previously, matanl-starkware (Matan Lior) wrote…

Can you split this into a PR "removing height from SHC"?

Done


crates/apollo_consensus/src/single_height_consensus.rs line 415 at r1 (raw file):

Previously, matanl-starkware (Matan Lior) wrote…

Same behaviour as Prevote.
Consider using an unite arm

will be deleted in the upcoming PRs

@asmaastarkware asmaastarkware force-pushed the asmaa/refactor/use_vote_in_prevote_precommit_smevent branch from 9eb4696 to 5f08fb8 Compare November 23, 2025 14:30
@asmaastarkware asmaastarkware changed the base branch from graphite-base/10335 to asmaa/refactor/move_height_to_sm November 23, 2025 14:30
Copy link
Collaborator

@matanl-starkware matanl-starkware left a comment

Choose a reason for hiding this comment

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

Reviewable status: 0 of 4 files reviewed, 3 unresolved discussions (waiting on @dafnamatsry)


crates/apollo_consensus/src/single_height_consensus.rs line 256 at r3 (raw file):

                context.broadcast(last_vote.clone()).await?;
                Ok(ShcReturn::Tasks(vec![ShcTask::Prevote(
                    self.timeouts.get_prevote_timeout(0),

This seems like a mixture of other PRs?

Code quote:

self.timeouts.get_prevote_timeout(0),

Copy link
Collaborator

@matanl-starkware matanl-starkware left a comment

Choose a reason for hiding this comment

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

@matanl-starkware reviewed 1 of 2 files at r2, 3 of 3 files at r3, all commit messages.
Reviewable status: :shipit: complete! all files reviewed, all discussions resolved (waiting on @dafnamatsry)

Copy link
Collaborator

@dafnamatsry dafnamatsry left a comment

Choose a reason for hiding this comment

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

@dafnamatsry reviewed 1 of 2 files at r2, 3 of 3 files at r3, all commit messages.
Reviewable status: :shipit: complete! all files reviewed, all discussions resolved (waiting on @asmaastarkware)

@asmaastarkware asmaastarkware force-pushed the asmaa/refactor/move_height_to_sm branch from ac3b58a to e996574 Compare November 24, 2025 07:47
@asmaastarkware asmaastarkware force-pushed the asmaa/refactor/use_vote_in_prevote_precommit_smevent branch from 5f08fb8 to bef1c00 Compare November 24, 2025 07:47
Base automatically changed from asmaa/refactor/move_height_to_sm to main-v0.14.1 November 24, 2025 08:32
@asmaastarkware asmaastarkware force-pushed the asmaa/refactor/use_vote_in_prevote_precommit_smevent branch from bef1c00 to 25f8d76 Compare November 24, 2025 08:32
@asmaastarkware asmaastarkware added this pull request to the merge queue Nov 24, 2025
Merged via the queue into main-v0.14.1 with commit acaae5f Nov 24, 2025
21 checks passed
@asmaastarkware asmaastarkware deleted the asmaa/refactor/use_vote_in_prevote_precommit_smevent branch November 24, 2025 09:14
@github-actions github-actions bot locked and limited conversation to collaborators Nov 26, 2025
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

5 participants