apollo_consensus: use BlockNumber for Vote.height

[asmaastarkware]

No description provided.

[reviewable-StarkWare]

This change is 

[asmaastarkware]

• apollo_consensus: move caching decision logic to ConsensusCache #10620
• apollo_consensus: rename proposal cache and stream fields in manager #10619
• apollo_consensus: extract run_height_inner into focused helper funcs #10563
• apollo_consensus: use Round type alias instead of u32 #10541
• apollo_consensus: use BlockNumber for Vote.height #10507 👈 (View in Graphite)
• apollo_consensus: unify timeout scheduling requests into single enum variant #10482
• apollo_consensus: centralize future vote/proposal caching via ConsensusCache #10375
• apollo_consensus: refactor shc::handle_event into smaller helpers #10347
• apollo_consensus: make SHC synchronous; execute SMRequests in manager #10341
• apollo_consensus: add observer_does_not_record_self_votes test #10340
• apollo_consensus: SM now consumes events and emits requests; update SHC and tests #10339
• apollo_consensus: SM tracks last self votes not the SHC #10338
• apollo_consensus: move proposal storage to SM; dedupe in SHC #10337
• apollo_consensus: move vote storage to SM; dedupe in SHC #10336
• apollo_consensus: use Vote in Prevote/Precommit SMEvent #10335
• apollo_consensus: move height from SHC to SM #10356
• apollo_consensus: use SM.id in SHC; remove local id #10334
• main-v0.14.1

This stack of pull requests is managed by Graphite. Learn more about stacking.

[matanl-starkware]

@matanl-starkware reviewed 9 of 9 files at r1, all commit messages.
Reviewable status: all files reviewed, 4 unresolved discussions (waiting on @asmaastarkware and @dafnamatsry)

---

crates/apollo_consensus/src/manager_test.rs line 146 at r1 (raw file):

    )
    .await;
    send(&mut sender, prevote(Some(Felt::TWO), BlockNumber(2), 0, *PROPOSER_ID)).await;

Consider adding a utility function for easier conversion:

Code quote (i):

BlockNumber(2)

Code snippet (ii):

impl<T> From<T> for BlockNumber
where
    T: Into<u64>,
{
    fn from(value: T) -> Self {
        BlockNumber(value.into())
    }
}

---

crates/apollo_consensus/src/manager_test.rs line 146 at r1 (raw file):

    )
    .await;
    send(&mut sender, prevote(Some(Felt::TWO), BlockNumber(2), 0, *PROPOSER_ID)).await;

Consider using a shorter syntax using intermediate vars

Code quote (i):

BlockNumber(2)

Code snippet (ii):

let b1 = BlockNumber(1);
let b2 = BlockNumber(2);

---

crates/apollo_consensus/src/manager_test.rs line 272 at r1 (raw file):

    send_proposal(
        &mut proposal_receiver_sender,
        vec![TestProposalPart::Init(proposal_init(1, 0, *PROPOSER_ID))],

Fix this function to accept Height as well

Code quote:

proposal_init

---

crates/apollo_protobuf/src/consensus.rs line 51 at r1 (raw file):

    pub vote_type: VoteType,
    pub height: BlockNumber,
    pub round: u32,

And this is for the next PR...

Code quote:

u32,

---

crates/apollo_consensus/src/manager.rs line 833 at r1 (raw file):

    ) -> bool {
        let limits = &self.consensus_config.dynamic_config.future_msg_limit;
        let height_diff = msg_height.0.saturating_sub(current_height.0);

Add derive_more::Deref to BlockNumber derives, and make the ".0" syntax obsolete.

Suggestion:

msg_height.saturating_sub

[asmaastarkware]

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

---

crates/apollo_consensus/src/manager_test.rs line 272 at r1 (raw file):

Previously, matanl-starkware (Matan Lior) wrote…

Fix this function to accept Height as well

(The function already accepts Height)
This is a good example of why I’d prefer to keep BlockNumber as-is and avoid implementing From<T> for BlockNumber

[github-actions]

Artifacts upload workflows:

• Started at 2025-12-03T09:55:05Z
• Started at 2025-12-03T11:45:37Z
• Started at 2025-12-03T12:24:19Z
• Started at 2025-12-03T12:29:00Z
• Started at 2025-12-04T08:01:13Z
• Started at 2025-12-04T11:25:56Z
• Started at 2025-12-08T07:33:30Z
• Started at 2025-12-08T07:33:29Z
• Started at 2025-12-08T09:08:50Z
• Started at 2025-12-08T09:49:59Z
• Started at 2025-12-08T13:14:47Z
• Started at 2025-12-08T13:51:26Z
• Started at 2025-12-08T14:43:43Z
• Started at 2025-12-09T05:59:48Z

[matanl-starkware]

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

---

-- commits line 2 at r3:
I don't think this change effectively impacts the protobuf module.
Consider leaving only "apollo_consensus" here.

Code quote:

,apollo_protobuf

[matanl-starkware]

Reviewable status: complete! all files reviewed, all discussions resolved (waiting on @dafnamatsry)

---

crates/starknet_api/src/block.rs line 280 at r3 (raw file):

    Copy,
    derive_more::Display,
    derive_more::Deref,

Once you have this in place, there are many more places that can be cleaned. For next PR.
Such as:
STORAGE_HEIGHT.set_lossy(storage_height.0);
LAST_PROPOSED_BLOCK_HEIGHT.set_lossy(block_number.0);
let mut up_to = min(state_marker, BlockNumber(from.0 + u64::from(max_stream_size)));

Code quote:

derive_more::Deref,

[asmaastarkware]

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