Cleanup - switch_to_new_elf_parser (#2057)

Bumps solana_rbpf to v0.8.2 and removes switch_to_new_elf_parser.
anza-xyz · Jul 9, 2024 · 8cb4e00 · 8cb4e00
1 parent e8750ba
commit 8cb4e00
Show file tree

Hide file tree

Showing 7 changed files with 6 additions and 74 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -421,7 +421,7 @@ solana-zk-keygen = { path = "zk-keygen", version = "=2.1.0" }
 solana-zk-sdk = { path = "zk-sdk", version = "=2.1.0" }
 solana-zk-token-proof-program = { path = "programs/zk-token-proof", version = "=2.1.0" }
 solana-zk-token-sdk = { path = "zk-token-sdk", version = "=2.1.0" }
-solana_rbpf = "=0.8.1"
+solana_rbpf = "=0.8.2"
 spl-associated-token-account = "=4.0.0"
 spl-instruction-padding = "0.2"
 spl-memo = "=5.0.0"

diff --git a/programs/bpf_loader/src/syscalls/mod.rs b/programs/bpf_loader/src/syscalls/mod.rs
@@ -42,7 +42,6 @@ use {
             enable_partitioned_epoch_reward, enable_poseidon_syscall,
             error_on_syscall_bpf_function_hash_collisions, get_sysvar_syscall_enabled,
             last_restart_slot_sysvar, reject_callx_r10, remaining_compute_units_syscall_enabled,
-            switch_to_new_elf_parser,
         },
         hash::{Hash, Hasher},
         instruction::{AccountMeta, InstructionError, ProcessedSiblingInstruction},
@@ -306,7 +305,6 @@ pub fn create_program_runtime_environment_v1<'a>(
         enable_sbpf_v1: true,
         enable_sbpf_v2: false,
         optimize_rodata: false,
-        new_elf_parser: feature_set.is_active(&switch_to_new_elf_parser::id()),
         aligned_memory_mapping: !feature_set.is_active(&bpf_account_data_direct_mapping::id()),
         // Warning, do not use `Config::default()` so that configuration here is explicit.
     };

diff --git a/programs/loader-v4/src/lib.rs b/programs/loader-v4/src/lib.rs
@@ -84,7 +84,6 @@ pub fn create_program_runtime_environment_v2<'a>(
         enable_sbpf_v1: false,
         enable_sbpf_v2: true,
         optimize_rodata: true,
-        new_elf_parser: true,
         aligned_memory_mapping: true,
         // Warning, do not use `Config::default()` so that configuration here is explicit.
     };

diff --git a/programs/sbf/Cargo.lock b/programs/sbf/Cargo.lock
diff --git a/programs/sbf/Cargo.toml b/programs/sbf/Cargo.toml
@@ -53,7 +53,7 @@ solana-transaction-status = { path = "../../transaction-status", version = "=2.1
 solana-type-overrides = { path = "../../type-overrides", version = "=2.1.0" }
 agave-validator = { path = "../../validator", version = "=2.1.0" }
 solana-zk-token-sdk = { path = "../../zk-token-sdk", version = "=2.1.0" }
-solana_rbpf = "=0.8.1"
+solana_rbpf = "=0.8.2"
 thiserror = "1.0"
 
 [package]

diff --git a/svm/tests/integration_test.rs b/svm/tests/integration_test.rs
@@ -94,7 +94,6 @@ fn create_custom_environment<'a>() -> BuiltinProgram<InvokeContext<'a>> {
         enable_sbpf_v1: true,
         enable_sbpf_v2: false,
         optimize_rodata: false,
-        new_elf_parser: false,
         aligned_memory_mapping: true,
     };