apollo_node_config: make top level version_constant_overrides optional

Author: itamar-starkware

crates/apollo_batcher_config/src/config.rs

@@ -2,7 +2,12 @@ use std::collections::BTreeMap;
 use std::time::Duration;
 
 use apollo_config::converters::deserialize_milliseconds_to_duration;
-use apollo_config::dumping::{prepend_sub_config_name, ser_param, SerializeConfig};
+use apollo_config::dumping::{
+    prepend_sub_config_name,
+    ser_optional_sub_config,
+    ser_param,
+    SerializeConfig,
+};
 use apollo_config::secrets::Sensitive;
 use apollo_config::{ParamPath, ParamPrivacyInput, SerializedParam};
 use blockifier::blockifier::config::{ContractClassManagerConfig, WorkerPoolConfig};
@@ -37,9 +42,7 @@ impl Default for BlockBuilderConfig {
             n_concurrent_txs: 100,
             tx_polling_interval_millis: 10,
             proposer_idle_detection_delay_millis: Duration::from_millis(2000),
-            // TODO(Itamar): Change to None once the versioned constants overrides are optional in
-            // the config schema.
-            versioned_constants_overrides: Some(VersionedConstantsOverrides::default()),
+            versioned_constants_overrides: None,
         }
     }
 }
@@ -70,8 +73,8 @@ impl SerializeConfig for BlockBuilderConfig {
              being executed, the proposer will finish building the current block.",
             ParamPrivacyInput::Public,
         )]));
-        dump.append(&mut prepend_sub_config_name(
-            self.versioned_constants_overrides.clone().unwrap_or_default().dump(),
+        dump.append(&mut ser_optional_sub_config(
+            &self.versioned_constants_overrides,
             "versioned_constants_overrides",
         ));
         dump

crates/apollo_deployments/resources/app_configs/replacer_versioned_constants_overrides_config.json

@@ -1,4 +1,5 @@
 {
+  "versioned_constants_overrides.#is_none": true,
   "versioned_constants_overrides.invoke_tx_max_n_steps": 10000000,
   "versioned_constants_overrides.max_n_events": 1000,
   "versioned_constants_overrides.max_recursion_depth": 50,

crates/apollo_deployments/resources/app_configs/versioned_constants_overrides_config.json

@@ -1,4 +1,5 @@
 {
+  "versioned_constants_overrides.#is_none": true,
   "versioned_constants_overrides.invoke_tx_max_n_steps": 10000000,
   "versioned_constants_overrides.max_n_events": 1000,
   "versioned_constants_overrides.max_recursion_depth": 50,

crates/apollo_gateway_config/src/config.rs

@@ -7,6 +7,7 @@ use apollo_config::converters::{
 use apollo_config::dumping::{
     prepend_sub_config_name,
     ser_optional_param,
+    ser_optional_sub_config,
     ser_param,
     SerializeConfig,
 };
@@ -244,9 +245,7 @@ impl Default for StatefulTransactionValidatorConfig {
             reject_future_declare_txs: true,
             max_nonce_for_validation_skip: Nonce(Felt::ONE),
             min_gas_price_percentage: 100,
-            // TODO(Itamar): Change to None once the versioned constants overrides are optional in
-            // the config schema.
-            versioned_constants_overrides: Some(VersionedConstantsOverrides::default()),
+            versioned_constants_overrides: None,
         }
     }
 }
@@ -286,8 +285,8 @@ impl SerializeConfig for StatefulTransactionValidatorConfig {
                 ParamPrivacyInput::Public,
             ),
         ]);
-        dump.append(&mut prepend_sub_config_name(
-            self.versioned_constants_overrides.clone().unwrap_or_default().dump(),
+        dump.append(&mut ser_optional_sub_config(
+            &self.versioned_constants_overrides,
             "versioned_constants_overrides",
         ));
         dump

crates/apollo_node/resources/config_schema.json

@@ -154,6 +154,11 @@
     "privacy": "Public",
     "value": 10
   },
+  "batcher_config.block_builder_config.versioned_constants_overrides.#is_none": {
+    "description": "Flag for an optional field.",
+    "pointer_target": "versioned_constants_overrides.#is_none",
+    "privacy": "TemporaryValue"
+  },
   "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.",
     "pointer_target": "versioned_constants_overrides.invoke_tx_max_n_steps",
@@ -2054,6 +2059,11 @@
     "pointer_target": "validate_resource_bounds",
     "privacy": "Public"
   },
+  "gateway_config.stateful_tx_validator_config.versioned_constants_overrides.#is_none": {
+    "description": "Flag for an optional field.",
+    "pointer_target": "versioned_constants_overrides.#is_none",
+    "privacy": "TemporaryValue"
+  },
   "gateway_config.stateful_tx_validator_config.versioned_constants_overrides.invoke_tx_max_n_steps": {
     "description": "Maximum number of steps the invoke function is allowed to run.",
     "pointer_target": "versioned_constants_overrides.invoke_tx_max_n_steps",
@@ -2944,6 +2954,11 @@
     "privacy": "TemporaryValue",
     "value": "PointerTarget"
   },
+  "versioned_constants_overrides.#is_none": {
+    "description": "Flag to disable versioned_constants_overrides for all components.",
+    "privacy": "TemporaryValue",
+    "value": true
+  },
   "versioned_constants_overrides.invoke_tx_max_n_steps": {
     "description": "Maximum number of steps the invoke function is allowed to run.",
     "privacy": "TemporaryValue",

crates/apollo_node_config/src/node_config.rs

@@ -151,6 +151,17 @@ pub static CONFIG_POINTERS: LazyLock<ConfigPointers> = LazyLock::new(|| {
                 "mempool_config.static_config.validate_resource_bounds",
             ]),
         ),
+        (
+            ser_pointer_target_param(
+                "versioned_constants_overrides.#is_none",
+                &true,
+                "Flag to disable versioned_constants_overrides for all components.",
+            ),
+            set_pointing_param_paths(&[
+                "batcher_config.block_builder_config.versioned_constants_overrides.#is_none",
+                "gateway_config.stateful_tx_validator_config.versioned_constants_overrides.#is_none",
+            ]),
+        ),
     ];
     let mut common_execution_config = generate_struct_pointer(
         "versioned_constants_overrides".to_owned(),