From ccb0a099560c72190a8fc134f218c9689d2164b3 Mon Sep 17 00:00:00 2001
From: Ashwin Sekar <ashwin@anza.xyz>
Date: Thu, 18 Jul 2024 16:41:02 -0400
Subject: [PATCH] fix conflicts

---
 Cargo.lock             |  2 +-
 ledger/src/shred.rs    | 30 +++++-------------------------
 sdk/src/feature_set.rs | 11 -----------
 3 files changed, 6 insertions(+), 37 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 99f0a393583dfd..f7ba771e1eb4ad 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -7371,7 +7371,7 @@ dependencies = [
 
 [[package]]
 name = "solana-stake-program-tests"
-version = "2.0.2"
+version = "2.0.3"
 dependencies = [
  "assert_matches",
  "bincode",
diff --git a/ledger/src/shred.rs b/ledger/src/shred.rs
index 820ab8990b636a..0cda4afdd47314 100644
--- a/ledger/src/shred.rs
+++ b/ledger/src/shred.rs
@@ -777,19 +777,12 @@ pub mod layout {
             } => {
                 merkle::ShredData::get_retransmitter_signature_offset(proof_size, chained, resigned)
             }
-<<<<<<< HEAD
         }?;
-=======
-        }
-    }
-
-    pub fn get_retransmitter_signature(shred: &[u8]) -> Result<Signature, Error> {
-        let offset = get_retransmitter_signature_offset(shred)?;
-        shred
-            .get(offset..offset + SIZE_OF_SIGNATURE)
-            .map(|bytes| <[u8; SIZE_OF_SIGNATURE]>::try_from(bytes).unwrap())
-            .map(Signature::from)
-            .ok_or(Error::InvalidPayloadSize(shred.len()))
+        let Some(buffer) = shred.get_mut(offset..offset + SIZE_OF_SIGNATURE) else {
+            return Err(Error::InvalidPayloadSize(shred.len()));
+        };
+        buffer.copy_from_slice(signature.as_ref());
+        Ok(())
     }
 
     pub fn is_retransmitter_signed_variant(shred: &[u8]) -> Result<bool, Error> {
@@ -808,19 +801,6 @@ pub mod layout {
         }
     }
 
-    pub(crate) fn set_retransmitter_signature(
-        shred: &mut [u8],
-        signature: &Signature,
-    ) -> Result<(), Error> {
-        let offset = get_retransmitter_signature_offset(shred)?;
->>>>>>> 93edb65f7d (replay: extend last fec set check for 32+ retransmitter signed shreds (#2101))
-        let Some(buffer) = shred.get_mut(offset..offset + SIZE_OF_SIGNATURE) else {
-            return Err(Error::InvalidPayloadSize(shred.len()));
-        };
-        buffer.copy_from_slice(signature.as_ref());
-        Ok(())
-    }
-
     /// Resigns the shred's Merkle root as the retransmitter node in the
     /// Turbine broadcast tree. This signature is in addition to leader's
     /// signature which is left intact.
diff --git a/sdk/src/feature_set.rs b/sdk/src/feature_set.rs
index a4069eae6d23ac..f8248a18812991 100644
--- a/sdk/src/feature_set.rs
+++ b/sdk/src/feature_set.rs
@@ -833,17 +833,10 @@ pub mod move_stake_and_move_lamports_ixs {
     solana_sdk::declare_id!("7bTK6Jis8Xpfrs8ZoUfiMDPazTcdPcTWheZFJTA5Z6X4");
 }
 
-<<<<<<< HEAD
-=======
-pub mod ed25519_precompile_verify_strict {
-    solana_sdk::declare_id!("ed9tNscbWLYBooxWA7FE2B5KHWs8A6sxfY8EzezEcoo");
-}
-
 pub mod vote_only_retransmitter_signed_fec_sets {
     solana_sdk::declare_id!("RfEcA95xnhuwooVAhUUksEJLZBF7xKCLuqrJoqk4Zph");
 }
 
->>>>>>> 93edb65f7d (replay: extend last fec set check for 32+ retransmitter signed shreds (#2101))
 lazy_static! {
     /// Map of feature identifiers to user-visible description
     pub static ref FEATURE_NAMES: HashMap<Pubkey, &'static str> = [
@@ -1047,11 +1040,7 @@ lazy_static! {
         (migrate_address_lookup_table_program_to_core_bpf::id(), "Migrate Address Lookup Table program to Core BPF #1651"),
         (zk_elgamal_proof_program_enabled::id(), "Enable ZkElGamalProof program SIMD-0153"),
         (move_stake_and_move_lamports_ixs::id(), "Enable MoveStake and MoveLamports stake program instructions #1610"),
-<<<<<<< HEAD
-=======
-        (ed25519_precompile_verify_strict::id(), "Use strict verification in ed25519 precompile SIMD-0152"),
         (vote_only_retransmitter_signed_fec_sets::id(), "vote only on retransmitter signed fec sets"),
->>>>>>> 93edb65f7d (replay: extend last fec set check for 32+ retransmitter signed shreds (#2101))
         /*************** ADD NEW FEATURES HERE ***************/
     ]
     .iter()