Fix conflicts manually

anza-xyz · Jan 9, 2025 · 5550a8c · 5550a8c
1 parent fd66b0f
commit 5550a8c
Show file tree

Hide file tree

Showing 6 changed files with 55 additions and 202 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/builtins-default-costs/Cargo.toml b/builtins-default-costs/Cargo.toml
@@ -17,6 +17,7 @@ solana-address-lookup-table-program = { workspace = true }
 solana-bpf-loader-program = { workspace = true }
 solana-compute-budget-program = { workspace = true }
 solana-config-program = { workspace = true }
+solana-feature-set = { workspace = true }
 solana-frozen-abi = { workspace = true, optional = true, features = [
     "frozen-abi",
 ] }

diff --git a/builtins-default-costs/src/lib.rs b/builtins-default-costs/src/lib.rs
@@ -3,6 +3,7 @@
 use {
     ahash::AHashMap,
     lazy_static::lazy_static,
+    solana_feature_set::{self as feature_set, FeatureSet},
     solana_sdk::{
         address_lookup_table, bpf_loader, bpf_loader_deprecated, bpf_loader_upgradeable,
         compute_budget, ed25519_program, loader_v4, pubkey::Pubkey, secp256k1_program,
@@ -108,23 +109,23 @@ static_assertions::const_assert_eq!(
 
 pub const MIGRATING_BUILTINS_COSTS: &[(Pubkey, BuiltinCost)] = &[
     (
-        stake::id(),
+        solana_stake_program::id(),
         BuiltinCost::Migrating(MigratingBuiltinCost {
             native_cost: solana_stake_program::stake_instruction::DEFAULT_COMPUTE_UNITS,
             core_bpf_migration_feature: feature_set::migrate_stake_program_to_core_bpf::id(),
             position: 0,
         }),
     ),
     (
-        config::id(),
+        solana_config_program::id(),
         BuiltinCost::Migrating(MigratingBuiltinCost {
             native_cost: solana_config_program::config_processor::DEFAULT_COMPUTE_UNITS,
             core_bpf_migration_feature: feature_set::migrate_config_program_to_core_bpf::id(),
             position: 1,
         }),
     ),
     (
-        address_lookup_table::id(),
+        address_lookup_table::program::id(),
         BuiltinCost::Migrating(MigratingBuiltinCost {
             native_cost: solana_address_lookup_table_program::processor::DEFAULT_COMPUTE_UNITS,
             core_bpf_migration_feature:
@@ -136,13 +137,13 @@ pub const MIGRATING_BUILTINS_COSTS: &[(Pubkey, BuiltinCost)] = &[
 
 pub const NON_MIGRATING_BUILTINS_COSTS: &[(Pubkey, BuiltinCost)] = &[
     (
-        vote::id(),
+        solana_vote_program::id(),
         BuiltinCost::NotMigrating(NotMigratingBuiltinCost {
             native_cost: solana_vote_program::vote_processor::DEFAULT_COMPUTE_UNITS,
         }),
     ),
     (
-        system_program::id(),
+        solana_system_program::id(),
         BuiltinCost::NotMigrating(NotMigratingBuiltinCost {
             native_cost: solana_system_program::system_processor::DEFAULT_COMPUTE_UNITS,
         }),

diff --git a/compute-budget-instruction/Cargo.toml b/compute-budget-instruction/Cargo.toml
diff --git a/compute-budget-instruction/src/builtin_programs_filter.rs b/compute-budget-instruction/src/builtin_programs_filter.rs
diff --git a/runtime-transaction/src/builtin_programs_filter.rs b/runtime-transaction/src/builtin_programs_filter.rs
@@ -1,13 +1,21 @@
 use {
     agave_transaction_view::static_account_keys_frame::MAX_STATIC_ACCOUNTS_PER_PACKET as FILTER_SIZE,
-    solana_builtins_default_costs::{is_builtin_program, MAYBE_BUILTIN_KEY},
+    solana_builtins_default_costs::{
+        get_builtin_migration_feature_index, BuiltinMigrationFeatureIndex, MAYBE_BUILTIN_KEY,
+    },
     solana_sdk::pubkey::Pubkey,
 };
 
 #[derive(Clone, Copy, Debug, PartialEq)]
 pub(crate) enum ProgramKind {
     NotBuiltin,
     Builtin,
+    // Builtin program maybe in process of being migrated to core bpf,
+    // if core_bpf_migration_feature is activated, then the migration has
+    // completed and it should no longer be considered as builtin
+    MigratingBuiltin {
+        core_bpf_migration_feature_index: usize,
+    },
 }
 
 pub(crate) struct BuiltinProgramsFilter {
@@ -38,17 +46,24 @@ impl BuiltinProgramsFilter {
             return ProgramKind::NotBuiltin;
         }
 
-        if is_builtin_program(program_id) {
-            ProgramKind::Builtin
-        } else {
-            ProgramKind::NotBuiltin
+        match get_builtin_migration_feature_index(program_id) {
+            BuiltinMigrationFeatureIndex::NotBuiltin => ProgramKind::NotBuiltin,
+            BuiltinMigrationFeatureIndex::BuiltinNoMigrationFeature => ProgramKind::Builtin,
+            BuiltinMigrationFeatureIndex::BuiltinWithMigrationFeature(
+                core_bpf_migration_feature_index,
+            ) => ProgramKind::MigratingBuiltin {
+                core_bpf_migration_feature_index,
+            },
         }
     }
 }
 
 #[cfg(test)]
 mod test {
-    use super::*;
+    use {
+        super::*, solana_builtins_default_costs::get_migration_feature_position,
+        solana_sdk::feature_set,
+    };
 
     const DUMMY_PROGRAM_ID: &str = "dummmy1111111111111111111111111111111111111";
 
@@ -90,6 +105,32 @@ mod test {
             test_store.get_program_kind(index, &solana_sdk::compute_budget::id()),
             ProgramKind::Builtin,
         );
+
+        // migrating builtins
+        for (migrating_builtin_pubkey, migration_feature_id) in [
+            (
+                solana_sdk::stake::program::id(),
+                feature_set::migrate_stake_program_to_core_bpf::id(),
+            ),
+            (
+                solana_sdk::config::program::id(),
+                feature_set::migrate_config_program_to_core_bpf::id(),
+            ),
+            (
+                solana_sdk::address_lookup_table::program::id(),
+                feature_set::migrate_address_lookup_table_program_to_core_bpf::id(),
+            ),
+        ] {
+            index += 1;
+            assert_eq!(
+                test_store.get_program_kind(index, &migrating_builtin_pubkey),
+                ProgramKind::MigratingBuiltin {
+                    core_bpf_migration_feature_index: get_migration_feature_position(
+                        &migration_feature_id
+                    ),
+                }
+            );
+        }
     }
 
     #[test]