Skip to content

apollo_consensus_orchestrator,apollo_consensus_manager: move SNIP-35 bootstrap to pre-consensus#14061

Merged
ShahakShama merged 1 commit into
mainfrom
05-17-apollo_consensus_orchestrator_rework_snip-35_fee_proposals_window_for_state_sync_resilience
May 24, 2026
Merged

apollo_consensus_orchestrator,apollo_consensus_manager: move SNIP-35 bootstrap to pre-consensus#14061
ShahakShama merged 1 commit into
mainfrom
05-17-apollo_consensus_orchestrator_rework_snip-35_fee_proposals_window_for_state_sync_resilience

Conversation

@sirandreww-starkware
Copy link
Copy Markdown
Contributor

No description provided.

@reviewable-StarkWare
Copy link
Copy Markdown

This change is Reviewable

@cursor
Copy link
Copy Markdown

cursor Bot commented May 18, 2026

PR Summary

Medium Risk
Changes consensus startup to block until state sync can supply the full SNIP-35 fee-proposals window, which could delay or stall node startup if state sync lags. It also alters error handling/retry behavior around state-sync reads that influence fee calculation consistency across nodes.

Overview
Moves SNIP-35 fee_proposals_window bootstrapping out of set_height_and_round and into ConsensusManager::run so the window is populated before run_consensus begins voting.

Replaces the one-pass bootstrap with SequencerConsensusContext::initialize_fee_proposals_window, which retries StateSyncError::BlockNotFound by re-queuing heights (avoiding partial-window startup divergence) and returns other state-sync errors; adds/updates unit tests and default mocks accordingly.

Reviewed by Cursor Bugbot for commit 60eedbb. Bugbot is set up for automated code reviews on this repo. Configure here.

@sirandreww-starkware sirandreww-starkware force-pushed the 05-17-apollo_consensus_orchestrator_rework_snip-35_fee_proposals_window_for_state_sync_resilience branch from 6049948 to d7efb61 Compare May 18, 2026 05:12
@sirandreww-starkware sirandreww-starkware force-pushed the 04-19-apollo_consensus_orchestrator_add_fee_actual_floor_to_eip-1559_gas_price_calculation branch from c7c7358 to 8b9dba2 Compare May 18, 2026 05:12
@sirandreww-starkware sirandreww-starkware force-pushed the 05-17-apollo_consensus_orchestrator_rework_snip-35_fee_proposals_window_for_state_sync_resilience branch from d7efb61 to 3f243cb Compare May 18, 2026 05:26
@sirandreww-starkware sirandreww-starkware changed the base branch from 04-19-apollo_consensus_orchestrator_add_fee_actual_floor_to_eip-1559_gas_price_calculation to graphite-base/14061 May 18, 2026 11:55
@sirandreww-starkware sirandreww-starkware force-pushed the 05-17-apollo_consensus_orchestrator_rework_snip-35_fee_proposals_window_for_state_sync_resilience branch from ac72d18 to 6d54d16 Compare May 20, 2026 09:08
@sirandreww-starkware sirandreww-starkware force-pushed the 05-17-apollo_consensus_orchestrator_rework_snip-35_fee_proposals_window_for_state_sync_resilience branch from 6d54d16 to 3cf7be7 Compare May 20, 2026 09:22
@sirandreww-starkware sirandreww-starkware changed the base branch from 05-19-apollo_consensus_orchestrator_rework_snip-35_fee_proposals_window_for_state_sync_resilience to graphite-base/14061 May 20, 2026 10:55
@sirandreww-starkware sirandreww-starkware force-pushed the 05-17-apollo_consensus_orchestrator_rework_snip-35_fee_proposals_window_for_state_sync_resilience branch from 3cf7be7 to 8286c4e Compare May 20, 2026 10:55
@sirandreww-starkware sirandreww-starkware changed the base branch from graphite-base/14061 to main May 20, 2026 10:55
Copy link
Copy Markdown
Collaborator

@ShahakShama ShahakShama left a comment

Choose a reason for hiding this comment

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

:lgtm:

@ShahakShama reviewed 4 files and all commit messages, made 1 comment, and resolved 3 discussions.
Reviewable status: :shipit: complete! all files reviewed, all discussions resolved (waiting on sirandreww-starkware).

@sirandreww-starkware sirandreww-starkware changed the base branch from main to graphite-base/14061 May 20, 2026 21:14
@sirandreww-starkware sirandreww-starkware force-pushed the 05-17-apollo_consensus_orchestrator_rework_snip-35_fee_proposals_window_for_state_sync_resilience branch from 8286c4e to fb7b242 Compare May 20, 2026 21:15
@sirandreww-starkware sirandreww-starkware changed the base branch from graphite-base/14061 to 05-20-apollo_node_config_made_validation_only_node_hold_full_state May 20, 2026 21:15
@sirandreww-starkware sirandreww-starkware force-pushed the 05-17-apollo_consensus_orchestrator_rework_snip-35_fee_proposals_window_for_state_sync_resilience branch from fb7b242 to 7c9ff0c Compare May 20, 2026 21:16
@sirandreww-starkware sirandreww-starkware force-pushed the 05-20-apollo_node_config_made_validation_only_node_hold_full_state branch from 0eeb5b1 to 3772cef Compare May 20, 2026 21:16
@sirandreww-starkware sirandreww-starkware changed the base branch from 05-20-apollo_node_config_made_validation_only_node_hold_full_state to main May 24, 2026 08:13
@graphite-app
Copy link
Copy Markdown

graphite-app Bot commented May 24, 2026

Merge activity

  • May 24, 8:13 AM UTC: This pull request can not be added to the Graphite merge queue. Please try rebasing and resubmitting to merge when ready.
  • May 24, 8:13 AM UTC: Graphite disabled "merge when ready" on this PR due to: a merge conflict with the target branch; resolve the conflict and try again..

@ShahakShama ShahakShama force-pushed the 05-17-apollo_consensus_orchestrator_rework_snip-35_fee_proposals_window_for_state_sync_resilience branch from 7c9ff0c to 60eedbb Compare May 24, 2026 08:27
Copy link
Copy Markdown
Collaborator

@ShahakShama ShahakShama left a comment

Choose a reason for hiding this comment

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

:lgtm:

@ShahakShama reviewed 3 files and all commit messages, and made 1 comment.
Reviewable status: :shipit: complete! all files reviewed, all discussions resolved (waiting on sirandreww-starkware).

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.

3 participants