[sdk] Add ZK Elgamal Proof program feature gate

runtime/Cargo.toml

@@ -71,6 +71,8 @@ solana-transaction-status = { workspace = true }
 solana-version = { workspace = true }
 solana-vote = { workspace = true }
 solana-vote-program = { workspace = true }
+solana-zk-elgamal-proof-program = { workspace = true }
+solana-zk-sdk = { workspace = true }
 solana-zk-token-proof-program = { workspace = true }
 solana-zk-token-sdk = { workspace = true }
 static_assertions = { workspace = true }

runtime/src/bank/builtins/core_bpf_migration/target_builtin.rs

@@ -120,6 +120,10 @@ mod tests {
         solana_zk_token_sdk::zk_token_proof_program::id(),
         Some(feature_set::zk_token_sdk_enabled::id())
     )]
+    #[test_case(
+        solana_zk_sdk::zk_elgamal_proof_program::id(),
+        Some(feature_set::zk_elgamal_proof_program_enabled::id())
+    )]
     fn test_target_program_builtin(program_address: Pubkey, activation_feature: Option<Pubkey>) {
         let migration_target = CoreBpfMigrationTargetType::Builtin;
         let mut bank = create_simple_test_bank(0);

runtime/src/bank/builtins/mod.rs

@@ -121,6 +121,13 @@ pub static BUILTINS: &[BuiltinPrototype] = &[
         program_id: solana_sdk::loader_v4::id(),
         entrypoint: solana_loader_v4_program::Entrypoint::vm,
     }),
+    testable_prototype!(BuiltinPrototype {
+        core_bpf_migration_config: None,
+        name: zk_elgamal_proof_program,
+        enable_feature_id: Some(feature_set::zk_elgamal_proof_program_enabled::id()),
+        program_id: solana_zk_sdk::zk_elgamal_proof_program::id(),
+        entrypoint: solana_zk_elgamal_proof_program::Entrypoint::vm,
+    }),
 ];
 
 pub static STATELESS_BUILTINS: &[StatelessBuiltinPrototype] = &[StatelessBuiltinPrototype {
@@ -328,6 +335,25 @@ mod test_only {
             datapoint_name: "migrate_builtin_to_core_bpf_loader_v4_program",
         };
     }
+
+    pub mod zk_elgamal_proof_program {
+        pub mod feature {
+            solana_sdk::declare_id!("EYtuxScWqGWmcPEDmeUsEt3iPkvWE26EWLfSxUvWP2WN");
+        }
+        pub mod source_buffer {
+            solana_sdk::declare_id!("AaVrLPurAUmjw6XRNGr6ezQfHaJWpBGHhcRSJmNjoVpQ");
+        }
+        pub mod upgrade_authority {
+            solana_sdk::declare_id!("EyGkQYHgynUdvdNPNiWbJQk9roFCexgdJQMNcWbuvp78");
+        }
+        pub const CONFIG: super::CoreBpfMigrationConfig = super::CoreBpfMigrationConfig {
+            source_buffer_address: source_buffer::id(),
+            upgrade_authority_address: Some(upgrade_authority::id()),
+            feature_id: feature::id(),
+            migration_target: super::CoreBpfMigrationTargetType::Builtin,
+            datapoint_name: "migrate_builtin_to_core_bpf_zk_elgamal_proof_program",
+        };
+    }
 }
 
 #[cfg(test)]
@@ -377,6 +403,10 @@ mod tests {
             &super::BUILTINS[10].core_bpf_migration_config,
             &Some(super::test_only::loader_v4::CONFIG)
         );
+        assert_eq!(
+            &super::BUILTINS[11].core_bpf_migration_config,
+            &Some(super::test_only::zk_elgamal_proof_program::CONFIG)
+        );
         // Feature Gate has a live migration config, so it has no test-only
         // configs to test here.
     }

runtime/src/bank/tests.rs

@@ -7985,7 +7985,7 @@ fn test_reserved_account_keys() {
 
     assert_eq!(
         bank.get_reserved_account_keys().len(),
-        29,
+        30,
         "after activating the new feature, bank should have new active reserved keys"
     );
 }

sdk/src/feature_set.rs

@@ -824,6 +824,10 @@ pub mod migrate_address_lookup_table_program_to_core_bpf {
     solana_sdk::declare_id!("C97eKZygrkU4JxJsZdjgbUY7iQR7rKTr4NyDWo2E5pRm");
 }
 
+pub mod zk_elgamal_proof_program_enabled {
+    solana_sdk::declare_id!("zkhiy5oLowR7HY4zogXjCjeMXyruLqBwSWH21qcFtnv");
+}
+
 lazy_static! {
     /// Map of feature identifiers to user-visible description
     pub static ref FEATURE_NAMES: HashMap<Pubkey, &'static str> = [
@@ -1025,6 +1029,7 @@ lazy_static! {
         (migrate_config_program_to_core_bpf::id(), "Migrate Config program to Core BPF #1378"),
         (enable_get_epoch_stake_syscall::id(), "Enable syscall: sol_get_epoch_stake #884"),
         (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"),
         /*************** ADD NEW FEATURES HERE ***************/
     ]
     .iter()

sdk/src/reserved_account_keys.rs

@@ -22,6 +22,11 @@ mod zk_token_proof_program {
     solana_sdk::declare_id!("ZkTokenProof1111111111111111111111111111111");
 }
 
+// Inline zk-elgamal-proof program id since it isn't available in the sdk
+mod zk_elgamal_proof_program {
+    solana_sdk::declare_id!("ZkE1Gama1Proof11111111111111111111111111111");
+}
+
 // ReservedAccountKeys is not serialized into or deserialized from bank
 // snapshots but the bank requires this trait to be implemented anyways.
 #[cfg(all(RUSTC_WITH_SPECIALIZATION, feature = "frozen-abi"))]
@@ -162,6 +167,7 @@ lazy_static! {
         ReservedAccount::new_active(stake::program::id()),
         ReservedAccount::new_active(system_program::id()),
         ReservedAccount::new_active(vote::program::id()),
+        ReservedAccount::new_pending(zk_elgamal_proof_program::id(), feature_set::add_new_reserved_account_keys::id()),
         ReservedAccount::new_pending(zk_token_proof_program::id(), feature_set::add_new_reserved_account_keys::id()),
 
         // sysvars