Skip to content

Notify rpc of new root and supermajority roots #70

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
Mar 6, 2025
Merged

Notify rpc of new root and supermajority roots #70

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
9d47c8d
Use root as supermajority root in alpenglow
carllin Mar 5, 2025
2280787
Notify rpc of new roots
carllin Mar 5, 2025
5fd9040
rename
carllin Mar 5, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
33 changes: 18 additions & 15 deletions core/src/replay_stage.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,7 @@ use {
accounts_background_service::AbsRequestSender,
bank::{bank_hash_details, Bank, NewBankOptions},
bank_forks::{BankForks, SetRootError, MAX_ROOT_DISTANCE_FOR_VOTE_ONLY},
commitment::BlockCommitmentCache,
commitment::{BlockCommitmentCache, CommitmentSlots},
installed_scheduler_pool::BankWithScheduler,
prioritization_fee_cache::PrioritizationFeeCache,
vote_sender_types::ReplayVoteSender,
Expand Down Expand Up @@ -1267,16 +1267,16 @@ impl ReplayStage {
.then_some(r_bank_forks.get(maybe_new_root).unwrap())
};
if let Some(new_root_bank) = maybe_new_root_bank {
let new_root_slot = new_root_bank.slot();
if let Err(e) = Self::alpenglow_handle_new_root(
&new_root_bank, // unnecessary here, just filling out a random bank
new_root_bank.slot(),
new_root_slot,
&bank_forks,
&mut progress,
&blockstore,
&leader_schedule_cache,
&accounts_background_request_sender,
&rpc_subscriptions,
&block_commitment_cache,
&mut heaviest_subtree_fork_choice,
&bank_notification_sender,
&mut duplicate_slots_tracker,
Expand All @@ -1295,6 +1295,12 @@ impl ReplayStage {
);
return;
}
rpc_subscriptions.notify_subscribers(CommitmentSlots {
slot: new_root_slot,
root: new_root_slot,
highest_confirmed_slot: new_root_slot,
highest_super_majority_root: new_root_slot,
});
}
}

Expand Down Expand Up @@ -2804,8 +2810,6 @@ impl ReplayStage {
saved_vote_history: SavedVoteHistoryVersions::from(saved_vote_history),
})
.unwrap_or_else(|err| warn!("Error: {:?}", err));

// TODO: update the commitmment cache
maybe_new_cert.and_then(|new_cert| new_cert.is_finalize().then_some(new_cert.slot()))
}

Expand Down Expand Up @@ -2860,6 +2864,12 @@ impl ReplayStage {
);
}
}
let highest_super_majority_root = Some(
block_commitment_cache
.read()
.unwrap()
.highest_super_majority_root(),
);
Self::check_and_handle_new_root(
bank,
new_root,
Expand All @@ -2869,7 +2879,7 @@ impl ReplayStage {
leader_schedule_cache,
accounts_background_request_sender,
rpc_subscriptions,
block_commitment_cache,
highest_super_majority_root,
heaviest_subtree_fork_choice,
bank_notification_sender,
duplicate_slots_tracker,
Expand Down Expand Up @@ -4694,7 +4704,6 @@ impl ReplayStage {
leader_schedule_cache: &Arc<LeaderScheduleCache>,
accounts_background_request_sender: &AbsRequestSender,
rpc_subscriptions: &Arc<RpcSubscriptions>,
block_commitment_cache: &Arc<RwLock<BlockCommitmentCache>>,
heaviest_subtree_fork_choice: &mut HeaviestSubtreeForkChoice,
bank_notification_sender: &Option<BankNotificationSenderConfig>,
duplicate_slots_tracker: &mut DuplicateSlotsTracker,
Expand All @@ -4718,7 +4727,7 @@ impl ReplayStage {
leader_schedule_cache,
accounts_background_request_sender,
rpc_subscriptions,
block_commitment_cache,
Some(new_root),
heaviest_subtree_fork_choice,
bank_notification_sender,
duplicate_slots_tracker,
Expand All @@ -4741,7 +4750,7 @@ impl ReplayStage {
leader_schedule_cache: &Arc<LeaderScheduleCache>,
accounts_background_request_sender: &AbsRequestSender,
rpc_subscriptions: &Arc<RpcSubscriptions>,
block_commitment_cache: &Arc<RwLock<BlockCommitmentCache>>,
highest_super_majority_root: Option<Slot>,
heaviest_subtree_fork_choice: &mut HeaviestSubtreeForkChoice,
bank_notification_sender: &Option<BankNotificationSenderConfig>,
duplicate_slots_tracker: &mut DuplicateSlotsTracker,
Expand Down Expand Up @@ -4780,12 +4789,6 @@ impl ReplayStage {
blockstore
.set_roots(rooted_slots.iter())
.expect("Ledger set roots failed");
let highest_super_majority_root = Some(
block_commitment_cache
.read()
.unwrap()
.highest_super_majority_root(),
);
Self::handle_new_root(
new_root,
bank_forks,
Expand Down