Skip to content

Commit

Permalink
v1.16: bank_send_loop: Get feature flag from root bank (backport of #…
Browse files Browse the repository at this point in the history
…31954) (#32113)

bank_send_loop: Get feature flag from root bank

(cherry picked from commit dd379bf)

# Conflicts:
#	core/src/cluster_info_vote_listener.rs

Co-authored-by: Ashwin Sekar <ashwin@solana.com>
  • Loading branch information
mergify[bot] and AshwinSekar committed Jun 13, 2023
1 parent a52c8e3 commit 8910379
Showing 1 changed file with 4 additions and 5 deletions.
9 changes: 4 additions & 5 deletions core/src/cluster_info_vote_listener.rs
Original file line number Diff line number Diff line change
Expand Up @@ -265,6 +265,7 @@ impl ClusterInfoVoteListener {
.unwrap()
};
let exit_ = exit.clone();
let bank_forks_clone = bank_forks.clone();
let bank_send_thread = Builder::new()
.name("solCiBankSend".to_string())
.spawn(move || {
Expand All @@ -273,6 +274,7 @@ impl ClusterInfoVoteListener {
verified_vote_label_packets_receiver,
poh_recorder,
&verified_packets_sender,
bank_forks_clone,
);
})
.unwrap();
Expand Down Expand Up @@ -377,6 +379,7 @@ impl ClusterInfoVoteListener {
verified_vote_label_packets_receiver: VerifiedLabelVotePacketsReceiver,
poh_recorder: Arc<RwLock<PohRecorder>>,
verified_packets_sender: &BankingPacketSender,
bank_forks: Arc<RwLock<BankForks>>,
) -> Result<()> {
let mut verified_vote_packets = VerifiedVotePackets::default();
let mut time_since_lock = Instant::now();
Expand All @@ -391,11 +394,7 @@ impl ClusterInfoVoteListener {
.read()
.unwrap()
.would_be_leader(3 * slot_hashes::MAX_ENTRIES as u64 * DEFAULT_TICKS_PER_SLOT);
let feature_set = poh_recorder
.read()
.unwrap()
.bank()
.map(|bank| bank.feature_set.clone());
let feature_set = Some(bank_forks.read().unwrap().root_bank().feature_set.clone());

if let Err(e) = verified_vote_packets.receive_and_process_vote_packets(
&verified_vote_label_packets_receiver,
Expand Down

0 comments on commit 8910379

Please sign in to comment.