Skip to content

Upstream Alpenglow votor and votor-messages#9518

Merged
AshwinSekar merged 1 commit intoanza-xyz:masterfrom
carllin:upstreamvotor
Jan 14, 2026
Merged

Upstream Alpenglow votor and votor-messages#9518
AshwinSekar merged 1 commit intoanza-xyz:masterfrom
carllin:upstreamvotor

Conversation

@carllin
Copy link
Copy Markdown

@carllin carllin commented Dec 12, 2025

Problem

There is a two way divergence between the votor and votor-messages crates in Agave and Alpenglow repo

Summary of Changes

Fix the divergence by overwriting these crates from the latest from Alpenglow (- in progress features)

@carllin carllin changed the title Bring alpenglow votor in Upstream Alpenglow votor and votor-messages Dec 12, 2025
Comment thread votor-messages/Cargo.toml Outdated
Comment thread votor-messages/Cargo.toml Outdated
Comment thread votor/src/staked_validators_cache.rs Outdated
Copy link
Copy Markdown

@steviez steviez left a comment

Choose a reason for hiding this comment

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

Agreed with Wen - this PR will require some cleanup to "undo" stuff that has changed in Agave (crate renames, introduction of agave-unstable-api, etc)

@carllin carllin force-pushed the upstreamvotor branch 15 times, most recently from 7b36e7d to d7ecc6e Compare December 20, 2025 00:24
@carllin
Copy link
Copy Markdown
Author

carllin commented Dec 20, 2025

PR is best reviewed commit by commit starting with "Fixup dependencies"

  1. If the commit message names a commit hash from agave/master, it resolves an issue brought about by that commit
  2. Fixes some clippy error from updated rust
  3. Otherwise resolves a conflict because a change is in agave/master but was not backported to alpenglow

@wen-coding tagged the two commits in particular that brought in your changes that would be good to have your eyes on

@carllin carllin force-pushed the upstreamvotor branch 6 times, most recently from f5fcc44 to ee67016 Compare December 20, 2025 05:05
@codecov-commenter
Copy link
Copy Markdown

codecov-commenter commented Dec 20, 2025

Codecov Report

❌ Patch coverage is 78.83355% with 323 lines in your changes missing coverage. Please review.
✅ Project coverage is 82.6%. Comparing base (bba10d8) to head (437f3a4).
⚠️ Report is 4 commits behind head on master.

Additional details and impacted files
@@           Coverage Diff            @@
##           master    #9518    +/-   ##
========================================
  Coverage    82.5%    82.6%            
========================================
  Files         844      844            
  Lines      316757   316591   -166     
========================================
- Hits       261599   261572    -27     
+ Misses      55158    55019   -139     
🚀 New features to boost your workflow:
  • ❄️ Test Analytics: Detect flaky tests, report on failures, and find test suite problems.

@carllin carllin force-pushed the upstreamvotor branch 3 times, most recently from 0c4b8f9 to 19b17f9 Compare December 22, 2025 19:30
Comment thread votor-messages/src/consensus_message.rs Outdated
Comment thread votor-messages/Cargo.toml Outdated
Comment thread votor-messages/Cargo.toml Outdated
Comment thread core/src/replay_stage.rs
Comment thread votor-messages/src/migration.rs
Comment thread votor-messages/Cargo.toml
Comment thread votor/src/vote_history.rs
Comment thread votor/src/vote_history_storage.rs
Comment thread votor/src/voting_service.rs
Comment thread votor/src/voting_service.rs
Comment thread votor/src/voting_service.rs
Comment thread votor/src/votor.rs
Comment thread votor/src/votor.rs
Copy link
Copy Markdown

@steviez steviez left a comment

Choose a reason for hiding this comment

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

Couple misc comments

Comment thread votor/src/common.rs
Comment thread votor/src/common.rs
pub(crate) const fn certificate_limits_and_vote_types(
cert_type: &CertificateType,
) -> (f64, Vote, Option<Vote>) {
) -> (f64, &'static [VoteType]) {
Copy link
Copy Markdown

Choose a reason for hiding this comment

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

floats 😅

Copy link
Copy Markdown

Choose a reason for hiding this comment

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

a recent change in the votor repo changes these to a newly created Fraction type. We'll get that ported over in the next upstream

Comment thread votor/src/consensus_metrics.rs
Comment thread votor/src/consensus_metrics.rs Outdated
Comment thread votor/src/voting_utils.rs
Comment thread votor/src/staked_validators_cache.rs Outdated
Comment thread votor/src/consensus_pool/stats.rs
Comment thread votor/src/event_handler.rs Outdated
@AshwinSekar
Copy link
Copy Markdown

Thanks steve, addressed your comments here ae6d5ba

Will cherry-pick these fixes back to the alpenglow repo once we're done to keep things in sync

@bw-solana
Copy link
Copy Markdown

changes outside of votor/votor-messages are very innocuous. Given votor is not enabled in upstream, seems low risk even with the huge LOC changed.

I'm in favor of fixing anything offensive but not dragging on nits so we can get it in. There will be plenty of follow-ups and bug fixes once this gets fired up.

Copy link
Copy Markdown

@steviez steviez left a comment

Choose a reason for hiding this comment

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

I'm in favor of fixing anything offensive but not dragging on nits so we can get it in.

Whose dragging 😉

There will be plenty of follow-ups and bug fixes once this gets fired up.

Yup, we can keep kicking the can but we need to make sure we budget audit/review/cleanup/docs/etc into the time budget when we give answers to "wen Alpengow"

@bw-solana
Copy link
Copy Markdown

Whose dragging 😉

Haha morning coffee has me coming out guns blazing. Appreciate your review 🙏

Yup, we can keep kicking the can but we need to make sure we budget audit/review/cleanup/docs/etc into the time budget when we give answers to "wen Alpengow"

Definitely. Refuse to ship garbage

@AshwinSekar AshwinSekar added this pull request to the merge queue Jan 14, 2026
@AshwinSekar AshwinSekar removed this pull request from the merge queue due to a manual request Jan 14, 2026
@AshwinSekar AshwinSekar enabled auto-merge January 14, 2026 18:59
@AshwinSekar AshwinSekar added this pull request to the merge queue Jan 14, 2026
Merged via the queue into anza-xyz:master with commit 8fdea4c Jan 14, 2026
58 checks passed
@AshwinSekar AshwinSekar deleted the upstreamvotor branch January 14, 2026 20:54
AshwinSekar added a commit to anza-xyz/alpenglow that referenced this pull request Jan 14, 2026
)

#### Problem
latest upstream to agave had some pr feedback that was addressed
anza-xyz/agave#9518

#### Summary of Changes
cherry-pick the feedback changes here to eliminate 2 way divergence
AshwinSekar added a commit to AshwinSekar/alpenglow that referenced this pull request Feb 23, 2026
…nza-xyz#674)

latest upstream to agave had some pr feedback that was addressed
anza-xyz/agave#9518

cherry-pick the feedback changes here to eliminate 2 way divergence
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Projects

None yet

Development

Successfully merging this pull request may close these issues.

6 participants