Fix conflicts manually

anza-xyz · Dec 13, 2024 · b869c2a · b869c2a
1 parent 0db3df0
commit b869c2a
Show file tree

Hide file tree

Showing 14 changed files with 45 additions and 1,094 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/builtins-default-costs/src/lib.rs b/builtins-default-costs/src/lib.rs
@@ -54,66 +54,8 @@ lazy_static! {
         temp_table
     };
 }
-<<<<<<< HEAD
-=======
-
-pub fn get_builtin_instruction_cost<'a>(
-    program_id: &'a Pubkey,
-    feature_set: &'a FeatureSet,
-) -> Option<u64> {
-    BUILTIN_INSTRUCTION_COSTS
-        .get(program_id)
-        .filter(
-            // Returns true if builtin program id has no core_bpf_migration_feature or feature is not activated;
-            // otherwise returns false because it's not considered as builtin
-            |builtin_cost| -> bool {
-                builtin_cost
-                    .core_bpf_migration_feature
-                    .map(|feature_id| !feature_set.is_active(&feature_id))
-                    .unwrap_or(true)
-            },
-        )
-        .map(|builtin_cost| builtin_cost.native_cost)
-}
 
 #[inline]
 pub fn is_builtin_program(program_id: &Pubkey) -> bool {
     BUILTIN_INSTRUCTION_COSTS.contains_key(program_id)
 }
-
-#[cfg(test)]
-mod test {
-    use super::*;
-
-    #[test]
-    fn test_get_builtin_instruction_cost() {
-        // use native cost if no migration planned
-        assert_eq!(
-            Some(solana_compute_budget_program::DEFAULT_COMPUTE_UNITS),
-            get_builtin_instruction_cost(&compute_budget::id(), &FeatureSet::all_enabled())
-        );
-
-        // use native cost if migration is planned but not activated
-        assert_eq!(
-            Some(solana_stake_program::stake_instruction::DEFAULT_COMPUTE_UNITS),
-            get_builtin_instruction_cost(&solana_stake_program::id(), &FeatureSet::default())
-        );
-
-        // None if migration is planned and activated, in which case, it's no longer builtin
-        assert!(get_builtin_instruction_cost(
-            &solana_stake_program::id(),
-            &FeatureSet::all_enabled()
-        )
-        .is_none());
-
-        // None if not builtin
-        assert!(
-            get_builtin_instruction_cost(&Pubkey::new_unique(), &FeatureSet::default()).is_none()
-        );
-        assert!(
-            get_builtin_instruction_cost(&Pubkey::new_unique(), &FeatureSet::all_enabled())
-                .is_none()
-        );
-    }
-}
->>>>>>> 3e9af14f3a (Fix reserve minimal compute units for builtins  (#3799))
diff --git a/core/src/banking_stage/consumer.rs b/core/src/banking_stage/consumer.rs
@@ -574,19 +574,12 @@ impl Consumer {
             .sanitized_transactions()
             .iter()
             .filter_map(|transaction| {
-<<<<<<< HEAD
-                process_compute_budget_instructions(SVMMessage::program_instructions_iter(
-                    transaction,
-                ))
+                process_compute_budget_instructions(
+                    SVMMessage::program_instructions_iter(transaction),
+                    &bank.feature_set,
+                )
                 .ok()
                 .map(|limits| limits.compute_unit_price)
-=======
-                transaction
-                    .compute_budget_instruction_details()
-                    .sanitize_and_convert_to_compute_budget_limits(&bank.feature_set)
-                    .ok()
-                    .map(|limits| limits.compute_unit_price)
->>>>>>> 3e9af14f3a (Fix reserve minimal compute units for builtins  (#3799))
             })
             .minmax();
         let (min_prioritization_fees, max_prioritization_fees) =
@@ -765,12 +758,8 @@ impl Consumer {
     ) -> Result<(), TransactionError> {
         let fee_payer = message.fee_payer();
         let fee_budget_limits = FeeBudgetLimits::from(process_compute_budget_instructions(
-<<<<<<< HEAD
             SVMMessage::program_instructions_iter(message),
-=======
-            message.program_instructions_iter(),
             &bank.feature_set,
->>>>>>> 3e9af14f3a (Fix reserve minimal compute units for builtins  (#3799))
         )?);
         let fee = solana_fee::calculate_fee(
             message,

diff --git a/core/src/banking_stage/immutable_deserialized_packet.rs b/core/src/banking_stage/immutable_deserialized_packet.rs
@@ -41,17 +41,13 @@ pub enum DeserializedPacketError {
     FailedFilter(#[from] PacketFilterFailure),
 }
 
-<<<<<<< HEAD
-#[derive(Debug, Eq)]
-=======
 lazy_static::lazy_static! {
     // Make a dummy feature_set with all features enabled to
     // fetch compute_unit_price and compute_unit_limit for legacy leader.
     static ref FEATURE_SET: FeatureSet = FeatureSet::all_enabled();
 }
 
-#[derive(Debug)]
->>>>>>> 3e9af14f3a (Fix reserve minimal compute units for builtins  (#3799))
+#[derive(Debug, Eq)]
 pub struct ImmutableDeserializedPacket {
     original_packet: Packet,
     transaction: SanitizedVersionedTransaction,