blockworks-foundation
/
solana
mirror of https://github.com/blockworks-foundation/solana.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Adjust solana-core for cleaner scheduler-pr diff (#33881)

This commit is contained in:
Ryo Onodera 2023-10-27 12:29:41 +09:00 committed by GitHub
parent 510b6b949f
commit 080285cb95
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 7 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
core/src/replay_stage.rs
View File

@ -2786,7 +2786,6 @@ impl ReplayStage {
match replay_result {
Ok(replay_tx_count) => tx_count += replay_tx_count,
Err(err) => {
// Error means the slot needs to be marked as dead
Self::mark_dead_slot(
blockstore,
bank,
@ -2802,8 +2801,7 @@ impl ReplayStage {
ancestor_hashes_replay_update_sender,
purge_repair_slot_counter,
);
// If the bank was corrupted, don't try to run the below logic to check if the
// bank is completed
// don't try to run the below logic to check if the bank is completed
continue;
}
}

11
core/src/validator.rs
View File

@ -812,6 +812,12 @@ impl Validator {
config.block_verification_method, config.block_production_method
);
let (replay_vote_sender, replay_vote_receiver) = unbounded();
// block min prioritization fee cache should be readable by RPC, and writable by validator
// (by both replay stage and banking stage)
let prioritization_fee_cache = Arc::new(PrioritizationFeeCache::default());
let leader_schedule_cache = Arc::new(leader_schedule_cache);
let entry_notification_sender = entry_notifier_service
.as_ref()
@ -939,10 +945,6 @@ impl Validator {
)),
};
// block min prioritization fee cache should be readable by RPC, and writable by validator
// (by both replay stage and banking stage)
let prioritization_fee_cache = Arc::new(PrioritizationFeeCache::default());
let rpc_override_health_check =
Arc::new(AtomicBool::new(config.rpc_config.disable_health_check));
let (
@ -1229,7 +1231,6 @@ impl Validator {
};
let last_vote = tower.last_vote();
let (replay_vote_sender, replay_vote_receiver) = unbounded();
let tvu = Tvu::new(
vote_account,
authorized_voter_keypairs,