svm repo split: dedev: feature-set

Author: buffalojoec

Cargo.lock

@@ -18,6 +18,15 @@ pub fn process_compute_budget_instructions<'a>(
         .sanitize_and_convert_to_compute_budget_limits(feature_set)
 }
 
+// Call this in tests if you are not testing any builtin -> BPF migrations.
+#[cfg(feature = "dev-context-only-utils")]
+pub fn process_compute_budget_instructions_with_default_feature_set<'a>(
+    instructions: impl Iterator<Item = (&'a Pubkey, SVMInstruction<'a>)> + Clone,
+) -> Result<ComputeBudgetLimits, TransactionError> {
+    ComputeBudgetInstructionDetails::try_from(instructions)?
+        .sanitize_and_convert_to_compute_budget_limits(&FeatureSet::default())
+}
+
 #[cfg(test)]
 mod tests {
     use {

compute-budget-instruction/src/instructions_processor.rs

@@ -1,4 +1,4 @@
-#[derive(Clone, Copy, Default)]
+#[derive(Clone, Copy, Debug, Default)]
 pub struct SVMFeatureSet {
     pub move_precompile_verification_to_svm: bool,
     pub stricter_abi_and_runtime_constraints: bool,

svm-feature-set/src/lib.rs

@@ -81,7 +81,6 @@ spl-generic-token = { workspace = true }
 thiserror = { workspace = true }
 
 [dev-dependencies]
-agave-feature-set = { workspace = true }
 agave-reserved-account-keys = { workspace = true }
 agave-syscalls = { workspace = true }
 assert_matches = { workspace = true }
@@ -93,7 +92,7 @@ rand0-7 = { workspace = true }
 shuttle = { workspace = true }
 solana-bpf-loader-program = { workspace = true }
 solana-clock = { workspace = true }
-solana-compute-budget-instruction = { workspace = true }
+solana-compute-budget-instruction = { workspace = true, features = ["dev-context-only-utils"] }
 solana-compute-budget-interface = { workspace = true }
 solana-compute-budget-program = { workspace = true }
 solana-ed25519-program = { workspace = true }

svm/Cargo.toml

@@ -7,10 +7,9 @@ use {
         program_data_size, register_builtins, MockBankCallback, MockForkGraph, EXECUTION_EPOCH,
         EXECUTION_SLOT, WALLCLOCK_TIME,
     },
-    agave_feature_set::{self as feature_set, raise_cpi_nesting_limit_to_8, FeatureSet},
     solana_account::{AccountSharedData, ReadableAccount, WritableAccount, PROGRAM_OWNERS},
     solana_clock::Slot,
-    solana_compute_budget_instruction::instructions_processor::process_compute_budget_instructions,
+    solana_compute_budget_instruction::instructions_processor::process_compute_budget_instructions_with_default_feature_set,
     solana_compute_budget_interface::ComputeBudgetInstruction,
     solana_fee_structure::FeeDetails,
     solana_hash::Hash,
@@ -41,6 +40,7 @@ use {
             TransactionProcessingEnvironment,
         },
     },
+    solana_svm_feature_set::SVMFeatureSet,
     solana_svm_transaction::svm_message::SVMMessage,
     solana_svm_type_overrides::sync::{Arc, RwLock},
     solana_system_interface::{instruction as system_instruction, program as system_program},
@@ -114,10 +114,9 @@ impl SvmTestEnvironment<'_> {
             ..Default::default()
         };
 
-        let feature_set = test_entry.feature_set();
         let processing_environment = TransactionProcessingEnvironment {
             blockhash: LAST_BLOCKHASH,
-            feature_set: feature_set.runtime_features(),
+            feature_set: test_entry.feature_set,
             blockhash_lamports_per_signature: LAMPORTS_PER_SIGNATURE,
             ..TransactionProcessingEnvironment::default()
         };
@@ -298,8 +297,8 @@ impl SvmTestEnvironment<'_> {
 // container for a transaction batch and all data needed to run and verify it against svm
 #[derive(Clone, Default, Debug)]
 pub struct SvmTestEntry {
-    // features are enabled by default; these will be disabled
-    pub disabled_features: Vec<Pubkey>,
+    // SVM feature set for this test.
+    pub feature_set: SVMFeatureSet,
 
     // until LoaderV4 is live on mainnet, we default to omitting it, but can also test it
     pub with_loader_v4: bool,
@@ -448,10 +447,10 @@ impl SvmTestEntry {
             .map(|item| {
                 let message = SanitizedTransaction::from_transaction_for_tests(item.transaction);
                 let check_result = item.check_result.map(|tx_details| {
-                    let compute_budget_limits = process_compute_budget_instructions(
-                        SVMMessage::program_instructions_iter(&message),
-                        &self.feature_set(),
-                    );
+                    let compute_budget_limits =
+                        process_compute_budget_instructions_with_default_feature_set(
+                            SVMMessage::program_instructions_iter(&message),
+                        );
                     let signature_count = message
                         .num_transaction_signatures()
                         .saturating_add(message.num_ed25519_signatures())
@@ -465,8 +464,7 @@ impl SvmTestEntry {
                                 signature_count.saturating_mul(LAMPORTS_PER_SIGNATURE),
                                 v.get_prioritization_fee(),
                             ),
-                            self.feature_set()
-                                .is_active(&raise_cpi_nesting_limit_to_8::id()),
+                            self.feature_set.raise_cpi_nesting_limit_to_8,
                         )
                     });
                     CheckedTransactionDetails::new(tx_details.nonce, compute_budget)
@@ -485,16 +483,6 @@ impl SvmTestEntry {
             .map(|item| item.asserts)
             .collect()
     }
-
-    // internal helper to map our feature list to a FeatureSet
-    fn feature_set(&self) -> FeatureSet {
-        let mut feature_set = FeatureSet::all_enabled();
-        for feature_id in &self.disabled_features {
-            feature_set.deactivate(feature_id);
-        }
-
-        feature_set
-    }
 }
 
 // one transaction in a batch plus check results for svm and asserts for tests
@@ -2204,8 +2192,8 @@ fn simd83_account_reallocate(formalize_loaded_transaction_data_size: bool) -> Ve
     common_test_entry.add_initial_program(program_name);
     if !formalize_loaded_transaction_data_size {
         common_test_entry
-            .disabled_features
-            .push(feature_set::formalize_loaded_transaction_data_size::id());
+            .feature_set
+            .formalize_loaded_transaction_data_size = false;
     }
 
     let fee_payer_keypair = Keypair::new();
@@ -2910,8 +2898,8 @@ fn svm_inspect_nonce_load_failure(
 
     if !formalize_loaded_transaction_data_size {
         test_entry
-            .disabled_features
-            .push(feature_set::formalize_loaded_transaction_data_size::id());
+            .feature_set
+            .formalize_loaded_transaction_data_size = false;
     }
 
     let fee_payer_keypair = Keypair::new();