refactor(blockifier): revert change to VersionedConstantsOverrides (#…

…1572)

This reverts commit 451a444.

config/mempool/default_config.json

@@ -122,17 +122,17 @@
   "batcher_config.block_builder_config.versioned_constants_overrides.invoke_tx_max_n_steps": {
     "description": "Maximum number of steps the invoke function is allowed to run.",
     "privacy": "Public",
-    "value": null
+    "value": 10000000
   },
   "batcher_config.block_builder_config.versioned_constants_overrides.max_recursion_depth": {
     "description": "Maximum recursion depth for nested calls during blockifier validation.",
     "privacy": "Public",
-    "value": null
+    "value": 50
   },
   "batcher_config.block_builder_config.versioned_constants_overrides.validate_max_n_steps": {
     "description": "Maximum number of steps the validation function is allowed to run.",
     "privacy": "Public",
-    "value": null
+    "value": 1000000
   },
   "batcher_config.global_contract_cache_size": {
     "description": "Cache size for the global_class_hash_to_class. Initialized with this size on creation.",
@@ -699,4 +699,4 @@
     "privacy": "Public",
     "value": ""
   }
-}
+}

crates/blockifier/src/versioned_constants.rs

@@ -299,23 +299,28 @@ impl VersionedConstants {
         Self { vm_resource_fee_cost, archival_data_gas_costs, ..latest }
     }
 
+    pub fn latest_constants_with_overrides(
+        validate_max_n_steps: u32,
+        max_recursion_depth: usize,
+    ) -> Self {
+        Self { validate_max_n_steps, max_recursion_depth, ..Self::latest_constants().clone() }
+    }
+
     /// Returns the latest versioned constants after applying the given overrides.
     pub fn get_versioned_constants(
         versioned_constants_overrides: VersionedConstantsOverrides,
     ) -> Self {
-        let mut constants = Self::latest_constants().clone();
-
-        if let Some(validate_max_n_steps) = versioned_constants_overrides.validate_max_n_steps {
-            constants.validate_max_n_steps = validate_max_n_steps;
+        let VersionedConstantsOverrides {
+            validate_max_n_steps,
+            max_recursion_depth,
+            invoke_tx_max_n_steps,
+        } = versioned_constants_overrides;
+        Self {
+            validate_max_n_steps,
+            max_recursion_depth,
+            invoke_tx_max_n_steps,
+            ..Self::latest_constants().clone()
         }
-        if let Some(max_recursion_depth) = versioned_constants_overrides.max_recursion_depth {
-            constants.max_recursion_depth = max_recursion_depth;
-        }
-        if let Some(invoke_tx_max_n_steps) = versioned_constants_overrides.invoke_tx_max_n_steps {
-            constants.invoke_tx_max_n_steps = invoke_tx_max_n_steps;
-        }
-
-        constants
     }
 
     pub fn get_archival_data_gas_costs(
@@ -819,11 +824,22 @@ pub struct ResourcesByVersion {
     pub deprecated_resources: ResourcesParams,
 }
 
-#[derive(Clone, Debug, Default, Deserialize, PartialEq, Serialize)]
+#[derive(Clone, Debug, Deserialize, PartialEq, Serialize)]
 pub struct VersionedConstantsOverrides {
-    pub validate_max_n_steps: Option<u32>,
-    pub max_recursion_depth: Option<usize>,
-    pub invoke_tx_max_n_steps: Option<u32>,
+    pub validate_max_n_steps: u32,
+    pub max_recursion_depth: usize,
+    pub invoke_tx_max_n_steps: u32,
+}
+
+impl Default for VersionedConstantsOverrides {
+    // TODO: update the default values once the actual values are known.
+    fn default() -> Self {
+        Self {
+            validate_max_n_steps: 1000000,
+            max_recursion_depth: 50,
+            invoke_tx_max_n_steps: 10000000,
+        }
+    }
 }
 
 impl SerializeConfig for VersionedConstantsOverrides {

crates/blockifier/src/versioned_constants_test.rs

@@ -40,21 +40,21 @@ fn test_successful_gas_costs_parsing() {
 #[test]
 fn test_versioned_constants_overrides() {
     let versioned_constants = VersionedConstants::latest_constants().clone();
+    let updated_invoke_tx_max_n_steps = versioned_constants.invoke_tx_max_n_steps + 1;
     let updated_validate_max_n_steps = versioned_constants.validate_max_n_steps + 1;
     let updated_max_recursion_depth = versioned_constants.max_recursion_depth + 1;
 
-    // Create a versioned constants copy with overridden values.
+    // Create a versioned constants copy with overriden values.
     let result = VersionedConstants::get_versioned_constants(VersionedConstantsOverrides {
-        validate_max_n_steps: Some(updated_validate_max_n_steps),
-        max_recursion_depth: Some(updated_max_recursion_depth),
-        invoke_tx_max_n_steps: None,
+        validate_max_n_steps: updated_validate_max_n_steps,
+        max_recursion_depth: updated_max_recursion_depth,
+        invoke_tx_max_n_steps: updated_invoke_tx_max_n_steps,
     });
 
     // Assert the new values are used.
+    assert_eq!(result.invoke_tx_max_n_steps, updated_invoke_tx_max_n_steps);
     assert_eq!(result.validate_max_n_steps, updated_validate_max_n_steps);
     assert_eq!(result.max_recursion_depth, updated_max_recursion_depth);
-    // Assert this value is not overridden.
-    assert_eq!(result.invoke_tx_max_n_steps, versioned_constants.invoke_tx_max_n_steps);
 }
 
 #[test]

crates/gateway/src/stateful_transaction_validator.rs

@@ -7,7 +7,7 @@ use blockifier::bouncer::BouncerConfig;
 use blockifier::context::{BlockContext, ChainInfo};
 use blockifier::state::cached_state::CachedState;
 use blockifier::transaction::account_transaction::AccountTransaction;
-use blockifier::versioned_constants::{VersionedConstants, VersionedConstantsOverrides};
+use blockifier::versioned_constants::VersionedConstants;
 #[cfg(test)]
 use mockall::automock;
 use starknet_api::core::{ContractAddress, Nonce};
@@ -95,13 +95,10 @@ impl StatefulTransactionValidator {
         let latest_block_info = get_latest_block_info(state_reader_factory)?;
         let state_reader = state_reader_factory.get_state_reader(latest_block_info.block_number);
         let state = CachedState::new(state_reader);
-        let versioned_constants_overrides = VersionedConstantsOverrides {
-            validate_max_n_steps: Some(self.config.validate_max_n_steps),
-            max_recursion_depth: Some(self.config.max_recursion_depth),
-            invoke_tx_max_n_steps: None,
-        };
-        let versioned_constants =
-            VersionedConstants::get_versioned_constants(versioned_constants_overrides);
+        let versioned_constants = VersionedConstants::latest_constants_with_overrides(
+            self.config.validate_max_n_steps,
+            self.config.max_recursion_depth,
+        );
         let mut block_info = latest_block_info;
         block_info.block_number = block_info.block_number.unchecked_next();
         // TODO(yael 21/4/24): create the block context using pre_process_block once we will be

crates/native_blockifier/src/py_objects.rs

@@ -72,11 +72,7 @@ impl From<PyVersionedConstantsOverrides> for VersionedConstantsOverrides {
             max_recursion_depth,
             invoke_tx_max_n_steps,
         } = py_versioned_constants_overrides;
-        Self {
-            validate_max_n_steps: Some(validate_max_n_steps),
-            max_recursion_depth: Some(max_recursion_depth),
-            invoke_tx_max_n_steps: Some(invoke_tx_max_n_steps),
-        }
+        Self { validate_max_n_steps, max_recursion_depth, invoke_tx_max_n_steps }
     }
 }