fix conflicts

core/src/replay_stage.rs

@@ -2934,18 +2934,18 @@ impl ReplayStage {
                 if bank.collector_id() != my_pubkey {
                     // If the block does not have at least DATA_SHREDS_PER_FEC_BLOCK shreds in the last FEC set,
                     // mark it dead. No reason to perform this check on our leader block.
-                    if !blockstore
+                    let is_last_fec_set_full = blockstore
                         .is_last_fec_set_full(bank.slot())
-                        .inspect_err(|e| {
+                        .unwrap_or_else(|e| {
                             warn!(
                                 "Unable to determine if last fec set is full for slot {} {},
                                 marking as dead: {e:?}",
                                 bank.slot(),
                                 bank.hash()
-                            )
-                        })
-                        .unwrap_or(false)
-                    {
+                            );
+                            false
+                        });
+                    if !is_last_fec_set_full {
                         // Update metric regardless of feature flag
                         datapoint_warn!(
                             "incomplete_final_fec_set",
@@ -3203,7 +3203,6 @@ impl ReplayStage {
                     .collect()
             };
 
-<<<<<<< HEAD
             Self::process_replay_results(
                 blockstore,
                 bank_forks,
@@ -3226,36 +3225,11 @@ impl ReplayStage {
                 block_metadata_notifier,
                 &replay_result_vec,
                 purge_repair_slot_counter,
+                my_pubkey,
             )
         } else {
             false
         }
-=======
-        Self::process_replay_results(
-            blockstore,
-            bank_forks,
-            progress,
-            transaction_status_sender,
-            cache_block_meta_sender,
-            heaviest_subtree_fork_choice,
-            bank_notification_sender,
-            rewards_recorder_sender,
-            rpc_subscriptions,
-            duplicate_slots_tracker,
-            duplicate_confirmed_slots,
-            epoch_slots_frozen_slots,
-            unfrozen_gossip_verified_vote_hashes,
-            latest_validator_votes_for_frozen_banks,
-            cluster_slots_update_sender,
-            cost_update_sender,
-            duplicate_slots_to_repair,
-            ancestor_hashes_replay_update_sender,
-            block_metadata_notifier,
-            &replay_result_vec,
-            purge_repair_slot_counter,
-            my_pubkey,
-        )
->>>>>>> 8c67696346 (replay: only vote on blocks with >= 32 data shreds in last fec set (#1002))
     }
 
     #[allow(clippy::too_many_arguments)]

ledger/src/blockstore.rs

@@ -28,6 +28,7 @@ use {
     bincode::{deserialize, serialize},
     crossbeam_channel::{bounded, Receiver, Sender, TrySendError},
     dashmap::DashSet,
+    itertools::Itertools,
     log::*,
     rand::Rng,
     rayon::{
@@ -3717,7 +3718,9 @@ impl Blockstore {
             warn!("Slot {slot} has only {} shreds, fewer than the {DATA_SHREDS_PER_FEC_BLOCK} required", last_shred_index + 1);
             return Ok(false);
         };
-        let keys = (start_index..=last_shred_index).map(|index| (slot, index));
+        let keys = (start_index..=last_shred_index)
+            .map(|index| (slot, index))
+            .collect();
 
         let last_merkle_roots: Vec<Hash> = self
             .data_shred_cf

ledger/src/blockstore_processor.rs

@@ -672,15 +672,9 @@ pub enum BlockstoreProcessorError {
 
     #[error("root bank with mismatched capitalization at {0}")]
     RootBankWithMismatchedCapitalization(Slot),
-<<<<<<< HEAD
-=======
-
-    #[error("set root error {0}")]
-    SetRootError(#[from] SetRootError),
 
     #[error("incomplete final fec set")]
     IncompleteFinalFecSet,
->>>>>>> 8c67696346 (replay: only vote on blocks with >= 32 data shreds in last fec set (#1002))
 }
 
 /// Callback for accessing bank state while processing the blockstore

sdk/src/feature_set.rs

@@ -789,29 +789,10 @@ pub mod deprecate_unused_legacy_vote_plumbing {
     solana_sdk::declare_id!("6Uf8S75PVh91MYgPQSHnjRAPQq6an5BDv9vomrCwDqLe");
 }
 
-<<<<<<< HEAD
-=======
-pub mod reward_full_priority_fee {
-    solana_sdk::declare_id!("3opE3EzAKnUftUDURkzMgwpNgimBAypW1mNDYH4x4Zg7");
-}
-
-pub mod get_sysvar_syscall_enabled {
-    solana_sdk::declare_id!("CLCoTADvV64PSrnR6QXty6Fwrt9Xc6EdxSJE4wLRePjq");
-}
-
-pub mod abort_on_invalid_curve {
-    solana_sdk::declare_id!("FuS3FPfJDKSNot99ECLXtp3rueq36hMNStJkPJwWodLh");
-}
-
-pub mod migrate_feature_gate_program_to_core_bpf {
-    solana_sdk::declare_id!("4eohviozzEeivk1y9UbrnekbAFMDQyJz5JjA9Y6gyvky");
-}
-
 pub mod vote_only_full_fec_sets {
     solana_sdk::declare_id!("ffecLRhhakKSGhMuc6Fz2Lnfq4uT9q3iu9ZsNaPLxPc");
 }
 
->>>>>>> 8c67696346 (replay: only vote on blocks with >= 32 data shreds in last fec set (#1002))
 lazy_static! {
     /// Map of feature identifiers to user-visible description
     pub static ref FEATURE_NAMES: HashMap<Pubkey, &'static str> = [
@@ -1004,14 +985,7 @@ lazy_static! {
         (enable_chained_merkle_shreds::id(), "Enable chained Merkle shreds #34916"),
         (deprecate_unused_legacy_vote_plumbing::id(), "Deprecate unused legacy vote tx plumbing"),
         (chained_merkle_conflict_duplicate_proofs::id(), "generate duplicate proofs for chained merkle root conflicts"),
-<<<<<<< HEAD
-=======
-        (reward_full_priority_fee::id(), "Reward full priority fee to validators #34731"),
-        (abort_on_invalid_curve::id(), "Abort when elliptic curve syscalls invoked on invalid curve id SIMD-0137"),
-        (get_sysvar_syscall_enabled::id(), "Enable syscall for fetching Sysvar bytes #615"),
-        (migrate_feature_gate_program_to_core_bpf::id(), "Migrate Feature Gate program to Core BPF (programify) #1003"),
         (vote_only_full_fec_sets::id(), "vote only full fec sets"),
->>>>>>> 8c67696346 (replay: only vote on blocks with >= 32 data shreds in last fec set (#1002))
         /*************** ADD NEW FEATURES HERE ***************/
     ]
     .iter()