apollo_gateway: thread native classes whitelist into instantiate validator (#13092)

Author: ArniStarkware

crates/apollo_gateway/src/gateway.rs

@@ -227,7 +227,7 @@ impl<
 
         let mut stateful_transaction_validator = self
             .stateful_tx_validator_factory
-            .instantiate_validator()
+            .instantiate_validator(self.config.dynamic_config.native_classes_whitelist.clone())
             .await
             .inspect_err(|e| metric_counters.record_add_tx_failure(e))?;
 

crates/apollo_gateway/src/gateway_test.rs

@@ -730,7 +730,7 @@ async fn add_tx_returns_error_when_extract_state_nonce_and_run_validations_fails
 
     mock_stateful_transaction_validator_factory
         .expect_instantiate_validator()
-        .return_once(|| Ok(Box::new(mock_stateful_transaction_validator)));
+        .return_once(|_| Ok(Box::new(mock_stateful_transaction_validator)));
 
     let tx_args = invoke_args();
     setup_transaction_converter_mock(&mut mock_dependencies.mock_transaction_converter, &tx_args);
@@ -787,7 +787,7 @@ async fn add_tx_returns_error_when_instantiating_validator_fails(
     };
     mock_stateful_transaction_validator_factory
         .expect_instantiate_validator()
-        .return_once(|| Err(expected_error));
+        .return_once(|_| Err(expected_error));
 
     let tx_args = invoke_args();
     setup_transaction_converter_mock(&mut mock_dependencies.mock_transaction_converter, &tx_args);

crates/apollo_gateway/src/stateful_transaction_validator.rs

@@ -11,6 +11,7 @@ use apollo_mempool_types::communication::SharedMempoolClient;
 use apollo_mempool_types::mempool_types::ValidationArgs;
 use apollo_proc_macros::sequencer_latency_histogram;
 use async_trait::async_trait;
+use blockifier::blockifier::config::NativeClassesWhitelist;
 use blockifier::blockifier::stateful_validator::{StatefulValidator, StatefulValidatorTrait};
 use blockifier::blockifier_versioned_constants::VersionedConstants;
 use blockifier::bouncer::BouncerConfig;
@@ -46,6 +47,7 @@ pub trait StatefulTransactionValidatorFactoryTrait: Send + Sync {
 
     async fn instantiate_validator(
         &self,
+        native_classes_whitelist: NativeClassesWhitelist,
     ) -> StatefulTransactionValidatorResult<Box<Self::Validator>>;
 }
 
@@ -59,6 +61,7 @@ mockall::mock! {
 
         async fn instantiate_validator(
             &self,
+            native_classes_whitelist: NativeClassesWhitelist,
         ) -> StatefulTransactionValidatorResult<Box<MockStatefulTransactionValidatorTrait>>;
     }
 }
@@ -82,6 +85,7 @@ impl<TStateReaderFactory: StateReaderFactory> StatefulTransactionValidatorFactor
 
     async fn instantiate_validator(
         &self,
+        native_classes_whitelist: NativeClassesWhitelist,
     ) -> StatefulTransactionValidatorResult<Box<Self::Validator>> {
         // TODO(yael 6/5/2024): consider storing the block_info as part of the
         // StatefulTransactionValidator and update it only once a new block is created.
@@ -98,11 +102,13 @@ impl<TStateReaderFactory: StateReaderFactory> StatefulTransactionValidatorFactor
                     e,
                 )
             })?;
-        let state_reader_and_contract_manager = StateReaderAndContractManager::new(
-            blockifier_state_reader,
-            self.contract_class_manager.clone(),
-            Some(GATEWAY_CLASS_CACHE_METRICS),
-        );
+        let state_reader_and_contract_manager =
+            StateReaderAndContractManager::new_with_native_classes_whitelist(
+                blockifier_state_reader,
+                self.contract_class_manager.clone(),
+                native_classes_whitelist,
+                Some(GATEWAY_CLASS_CACHE_METRICS),
+            );
 
         Ok(Box::new(StatefulTransactionValidator::new(
             self.config.clone(),

crates/apollo_gateway/src/stateful_transaction_validator_test.rs

@@ -7,7 +7,7 @@ use apollo_gateway_types::deprecated_gateway_error::{
     StarknetErrorCode,
 };
 use apollo_mempool_types::communication::MockMempoolClient;
-use blockifier::blockifier::config::ContractClassManagerConfig;
+use blockifier::blockifier::config::{ContractClassManagerConfig, NativeClassesWhitelist};
 use blockifier::context::ChainInfo;
 use blockifier::state::contract_class_manager::ContractClassManager;
 use blockifier::test_utils::contracts::FeatureContractTrait;
@@ -140,8 +140,11 @@ async fn test_instantiate_validator() {
         state_reader_factory: Arc::new(state_reader_factory),
         contract_class_manager: ContractClassManager::start(ContractClassManagerConfig::default()),
     };
+    // The whitelist is irrelevant for the test.
+    let native_classes_whitelist = NativeClassesWhitelist::All;
 
-    let validator = stateful_validator_factory.instantiate_validator().await;
+    let validator =
+        stateful_validator_factory.instantiate_validator(native_classes_whitelist).await;
     assert!(validator.is_ok());
 }