Drop the Address Lookup Table builtin

Cargo.toml

@@ -87,8 +87,6 @@ members = [
     "precompiles",
     "program-runtime",
     "program-test",
-    "programs/address-lookup-table",
-    "programs/address-lookup-table-tests",
     "programs/bpf-loader-tests",
     "programs/bpf_loader",
     "programs/bpf_loader/gen-syscall-list",
@@ -383,7 +381,6 @@ solana-account-decoder-client-types = { path = "account-decoder-client-types", v
 solana-account-info = "2.2.1"
 solana-accounts-db = { path = "accounts-db", version = "=2.3.0" }
 solana-address-lookup-table-interface = "2.2.2"
-solana-address-lookup-table-program = { path = "programs/address-lookup-table", version = "=2.3.0" }
 solana-atomic-u64 = "2.2.1"
 solana-banks-client = { path = "banks-client", version = "=2.3.0" }
 solana-banks-interface = { path = "banks-interface", version = "=2.3.0" }

builtins-default-costs/Cargo.toml

@@ -14,7 +14,6 @@ agave-feature-set = { workspace = true }
 ahash = { workspace = true }
 lazy_static = { workspace = true }
 log = { workspace = true }
-solana-address-lookup-table-program = { workspace = true }
 solana-bpf-loader-program = { workspace = true }
 solana-compute-budget-program = { workspace = true }
 solana-frozen-abi = { workspace = true, optional = true, features = [

builtins-default-costs/src/lib.rs

@@ -6,8 +6,8 @@ use {
     lazy_static::lazy_static,
     solana_pubkey::Pubkey,
     solana_sdk_ids::{
-        address_lookup_table, bpf_loader, bpf_loader_deprecated, bpf_loader_upgradeable,
-        compute_budget, ed25519_program, loader_v4, secp256k1_program, stake, system_program, vote,
+        bpf_loader, bpf_loader_deprecated, bpf_loader_upgradeable, compute_budget, ed25519_program,
+        loader_v4, secp256k1_program, stake, system_program, vote,
     },
 };
 
@@ -101,32 +101,21 @@ lazy_static! {
 /// correctly furnishing `core_bpf_migration_feature`.
 ///
 #[allow(dead_code)]
-const TOTAL_COUNT_BUILTINS: usize = 11;
+const TOTAL_COUNT_BUILTINS: usize = 10;
 #[cfg(test)]
 static_assertions::const_assert_eq!(
     MIGRATING_BUILTINS_COSTS.len() + NON_MIGRATING_BUILTINS_COSTS.len(),
     TOTAL_COUNT_BUILTINS
 );
 
-pub const MIGRATING_BUILTINS_COSTS: &[(Pubkey, BuiltinCost)] = &[
-    (
-        stake::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,
-        }),
-    ),
-    (
-        address_lookup_table::id(),
-        BuiltinCost::Migrating(MigratingBuiltinCost {
-            native_cost: solana_address_lookup_table_program::processor::DEFAULT_COMPUTE_UNITS,
-            core_bpf_migration_feature:
-                feature_set::migrate_address_lookup_table_program_to_core_bpf::id(),
-            position: 1,
-        }),
-    ),
-];
+pub const MIGRATING_BUILTINS_COSTS: &[(Pubkey, BuiltinCost)] = &[(
+    stake::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,
+    }),
+)];
 
 const NON_MIGRATING_BUILTINS_COSTS: &[(Pubkey, BuiltinCost)] = &[
     (
@@ -331,20 +320,6 @@ mod test {
             get_migration_feature_id(feature_index),
             &feature_set::migrate_stake_program_to_core_bpf::id()
         );
-        let feature_index = get_builtin_migration_feature_index(&address_lookup_table::id());
-        assert!(matches!(
-            feature_index,
-            BuiltinMigrationFeatureIndex::BuiltinWithMigrationFeature(_)
-        ));
-        let BuiltinMigrationFeatureIndex::BuiltinWithMigrationFeature(feature_index) =
-            feature_index
-        else {
-            panic!("expect migrating builtin")
-        };
-        assert_eq!(
-            get_migration_feature_id(feature_index),
-            &feature_set::migrate_address_lookup_table_program_to_core_bpf::id()
-        );
     }
 
     #[test]

builtins/Cargo.toml

@@ -14,7 +14,6 @@ dev-context-only-utils = []
 
 [dependencies]
 agave-feature-set = { workspace = true }
-solana-address-lookup-table-program = { workspace = true }
 solana-bpf-loader-program = { workspace = true }
 solana-compute-budget-program = { workspace = true }
 solana-loader-v4-program = { workspace = true }

builtins/src/lib.rs

@@ -105,19 +105,6 @@ pub static BUILTINS: &[BuiltinPrototype] = &[
         program_id: solana_sdk_ids::compute_budget::id(),
         entrypoint: solana_compute_budget_program::Entrypoint::vm,
     }),
-    BuiltinPrototype {
-        core_bpf_migration_config: Some(CoreBpfMigrationConfig {
-            source_buffer_address: buffer_accounts::address_lookup_table_program::id(),
-            upgrade_authority_address: None,
-            feature_id: agave_feature_set::migrate_address_lookup_table_program_to_core_bpf::id(),
-            migration_target: CoreBpfMigrationTargetType::Builtin,
-            datapoint_name: "migrate_builtin_to_core_bpf_address_lookup_table_program",
-        }),
-        name: "address_lookup_table_program",
-        enable_feature_id: None,
-        program_id: solana_sdk_ids::address_lookup_table::id(),
-        entrypoint: solana_address_lookup_table_program::processor::Entrypoint::vm,
-    },
     testable_prototype!(BuiltinPrototype {
         core_bpf_migration_config: None,
         name: zk_token_proof_program,
@@ -145,9 +132,6 @@ pub static STATELESS_BUILTINS: &[StatelessBuiltinPrototype] = &[];
 
 /// Live source buffer accounts for builtin migrations.
 mod buffer_accounts {
-    pub mod address_lookup_table_program {
-        solana_pubkey::declare_id!("AhXWrD9BBUYcKjtpA3zuiiZG4ysbo6C6wjHo1QhERk6A");
-    }
     pub mod stake_program {
         solana_pubkey::declare_id!("8t3vv6v99tQA6Gp7fVdsBH66hQMaswH5qsJVqJqo8xvG");
     }
@@ -368,18 +352,16 @@ mod tests {
             &super::BUILTINS[6].core_bpf_migration_config,
             &Some(super::test_only::compute_budget_program::CONFIG)
         );
-        // Address Lookup Table has a live migration config, so it has no
-        // test-only configs to test here.
         assert_eq!(
-            &super::BUILTINS[8].core_bpf_migration_config,
+            &super::BUILTINS[7].core_bpf_migration_config,
             &Some(super::test_only::zk_token_proof_program::CONFIG)
         );
         assert_eq!(
-            &super::BUILTINS[9].core_bpf_migration_config,
+            &super::BUILTINS[8].core_bpf_migration_config,
             &Some(super::test_only::loader_v4::CONFIG)
         );
         assert_eq!(
-            &super::BUILTINS[10].core_bpf_migration_config,
+            &super::BUILTINS[9].core_bpf_migration_config,
             &Some(super::test_only::zk_elgamal_proof_program::CONFIG)
         );
     }

compute-budget-instruction/src/builtin_programs_filter.rs

@@ -110,26 +110,15 @@ mod test {
         );
 
         // migrating builtins
-        for (migrating_builtin_pubkey, migration_feature_id) in [
-            (
-                solana_sdk_ids::stake::id(),
-                feature_set::migrate_stake_program_to_core_bpf::id(),
-            ),
-            (
-                solana_sdk_ids::address_lookup_table::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
-                    ),
-                }
-            );
-        }
+        index += 1;
+        assert_eq!(
+            test_store.get_program_kind(index, &solana_sdk_ids::stake::id()),
+            ProgramKind::MigratingBuiltin {
+                core_bpf_migration_feature_index: get_migration_feature_position(
+                    &feature_set::migrate_stake_program_to_core_bpf::id()
+                ),
+            }
+        );
     }
 
     #[test]

program-test/src/programs.rs

@@ -1,12 +1,9 @@
-use {
-    agave_feature_set as feature_set,
-    solana_sdk::{
-        account::{Account, AccountSharedData},
-        bpf_loader,
-        bpf_loader_upgradeable::{self, get_program_data_address, UpgradeableLoaderState},
-        pubkey::Pubkey,
-        rent::Rent,
-    },
+use solana_sdk::{
+    account::{Account, AccountSharedData},
+    bpf_loader,
+    bpf_loader_upgradeable::{self, get_program_data_address, UpgradeableLoaderState},
+    pubkey::Pubkey,
+    rent::Rent,
 };
 
 mod spl_memo_1_0 {
@@ -51,7 +48,7 @@ static SPL_PROGRAMS: &[(Pubkey, Pubkey, &[u8])] = &[
 static CORE_BPF_PROGRAMS: &[(Pubkey, Option<Pubkey>, &[u8])] = &[
     (
         solana_sdk_ids::address_lookup_table::ID,
-        Some(feature_set::migrate_address_lookup_table_program_to_core_bpf::ID),
+        None,
         include_bytes!("programs/core_bpf_address_lookup_table-3.0.0.so"),
     ),
     (