Update builtins and spl_token_2022

Cargo.toml

@@ -72,7 +72,6 @@ solana-signature = "2.2"
 solana-signer = "2.2"
 solana-slot-hashes = "2.2"
 solana-slot-history = "2.2"
-solana-stake-history = "2.2"
 solana-stake-interface = "1.2.1"
 solana-stake-program = "2.2"
 solana-svm = "2.2"
@@ -86,9 +85,12 @@ solana-transaction = "2.2"
 solana-transaction-context = "2.2"
 solana-transaction-error = "2.2"
 solana-vote-program = "2.2"
+solana-zk-elgamal-proof-program = "2.2"
+solana-zk-token-proof-program = "2.2"
+solana-zk-token-sdk = "2.2"
 spl-associated-token-account-client = "2.0"
 spl-token = "7.0.0"
-spl-token-2022 = "6.0.0"
+spl-token-2022 = "7.0.0"
 test-log = "0.2"
 thiserror = "2.0"
 tokio = "1.35"

crates/litesvm/Cargo.toml

@@ -13,6 +13,7 @@ internal-test = []
 nodejs-internal = ["dep:qualifier_attr"]
 
 [dependencies]
+solana-epoch-rewards.workspace = true
 ansi_term.workspace = true
 bincode.workspace = true
 indexmap.workspace = true
@@ -29,7 +30,6 @@ solana-compute-budget.workspace = true
 solana-compute-budget-instruction.workspace = true
 solana-compute-budget-program.workspace = true
 solana-config-program.workspace = true
-solana-epoch-rewards.workspace = true
 solana-epoch-schedule.workspace = true
 solana-feature-set.workspace = true
 solana-fee.workspace = true
@@ -72,6 +72,9 @@ solana-transaction = { workspace = true, features = ["precompiles", "verify"] }
 solana-transaction-context.workspace = true
 solana-transaction-error.workspace = true
 solana-vote-program.workspace = true
+solana-zk-elgamal-proof-program.workspace = true
+solana-zk-token-proof-program.workspace = true
+solana-zk-token-sdk.workspace = true
 thiserror.workspace = true
 
 [dev-dependencies]

crates/litesvm/src/builtin.rs

@@ -1,6 +1,8 @@
+use solana_feature_set::{
+    enable_loader_v4, zk_elgamal_proof_program_enabled, zk_token_sdk_enabled,
+};
 use solana_program_runtime::invoke_context::BuiltinFunctionWithContext;
 use solana_pubkey::Pubkey;
-use solana_sdk_ids::{bpf_loader, bpf_loader_deprecated, bpf_loader_upgradeable};
 
 pub(crate) struct BuiltinPrototype {
     pub feature_id: Option<Pubkey>,
@@ -36,19 +38,19 @@ pub(crate) static BUILTINS: &[BuiltinPrototype] = &[
     },
     BuiltinPrototype {
         feature_id: None,
-        program_id: bpf_loader_deprecated::id(),
+        program_id: solana_sdk_ids::bpf_loader_deprecated::id(),
         name: "solana_bpf_loader_deprecated_program",
         entrypoint: solana_bpf_loader_program::Entrypoint::vm,
     },
     BuiltinPrototype {
         feature_id: None,
-        program_id: bpf_loader::id(),
+        program_id: solana_sdk_ids::bpf_loader::id(),
         name: "solana_bpf_loader_program",
         entrypoint: solana_bpf_loader_program::Entrypoint::vm,
     },
     BuiltinPrototype {
         feature_id: None,
-        program_id: bpf_loader_upgradeable::id(),
+        program_id: solana_sdk_ids::bpf_loader_upgradeable::id(),
         name: "solana_bpf_loader_upgradeable_program",
         entrypoint: solana_bpf_loader_program::Entrypoint::vm,
     },
@@ -64,16 +66,22 @@ pub(crate) static BUILTINS: &[BuiltinPrototype] = &[
         name: "address_lookup_table_program",
         entrypoint: solana_address_lookup_table_program::processor::Entrypoint::vm,
     },
-    // BuiltinPrototype {
-    //     feature_id: Some(feature_set::zk_token_sdk_enabled::id()),
-    //     program_id: solana_zk_token_sdk::zk_token_proof_program::id(),
-    //     name: "zk_token_proof_program",
-    //     entrypoint: solana_zk_token_proof_program::Entrypoint::vm,
-    // },
-    // BuiltinPrototype {
-    //     feature_id: Some(feature_set::enable_program_runtime_v2_and_loader_v4::id()),
-    //     program_id: solana_sdk_ids::loader_v4::id(),
-    //     name: "loader_v4",
-    //     entrypoint: solana_loader_v4_program::Entrypoint::vm,
-    // },
+    BuiltinPrototype {
+        feature_id: Some(zk_token_sdk_enabled::id()),
+        program_id: solana_sdk_ids::zk_token_proof_program::id(),
+        name: "zk_token_proof_program",
+        entrypoint: solana_zk_token_proof_program::Entrypoint::vm,
+    },
+    BuiltinPrototype {
+        feature_id: Some(enable_loader_v4::id()),
+        program_id: solana_sdk_ids::loader_v4::id(),
+        name: "loader_v4",
+        entrypoint: solana_loader_v4_program::Entrypoint::vm,
+    },
+    BuiltinPrototype {
+        feature_id: Some(zk_elgamal_proof_program_enabled::id()),
+        program_id: solana_sdk_ids::zk_elgamal_proof_program::id(),
+        name: "zk_elgamal_proof_program",
+        entrypoint: solana_zk_elgamal_proof_program::Entrypoint::vm,
+    },
 ];

crates/litesvm/src/spl/mod.rs

@@ -9,7 +9,7 @@ pub fn load_spl_programs(svm: &mut LiteSVM) {
     );
     svm.add_program(
         pubkey!("TokenzQdBNbLqP5VEhdkAS6EPFLC1PHnBqCXEpPxuEb"),
-        include_bytes!("programs/spl_token_2022-1.0.0.so"),
+        include_bytes!("programs/spl_token_2022-5.0.2.so"),
     );
     svm.add_program(
         pubkey!("Memo1UhkJRfHyvLMcVucJwxXeuD728EqVDDwQDxFMNo"),