apollo_gateway: insert optional versioned constant overrides to batcher

crates/apollo_batcher/src/block_builder.rs

@@ -712,9 +712,9 @@ impl BlockBuilderFactory {
         );
         let height = block_metadata.block_info.block_number;
         let block_builder_config = self.block_builder_config.clone();
-        let versioned_constants = VersionedConstants::get_versioned_constants(Some(
+        let versioned_constants = VersionedConstants::get_versioned_constants(
             block_builder_config.versioned_constants_overrides,
-        ));
+        );
         let block_context = BlockContext::new(
             block_metadata.block_info,
             block_builder_config.chain_info,

crates/apollo_batcher_config/src/config.rs

@@ -24,7 +24,7 @@ pub struct BlockBuilderConfig {
     #[serde(deserialize_with = "deserialize_milliseconds_to_duration")]
     // TODO(dan): add validation for this field. Probably should be bounded.
     pub proposer_idle_detection_delay_millis: Duration,
-    pub versioned_constants_overrides: VersionedConstantsOverrides,
+    pub versioned_constants_overrides: Option<VersionedConstantsOverrides>,
 }
 
 impl Default for BlockBuilderConfig {
@@ -37,7 +37,9 @@ impl Default for BlockBuilderConfig {
             n_concurrent_txs: 100,
             tx_polling_interval_millis: 10,
             proposer_idle_detection_delay_millis: Duration::from_millis(2000),
-            versioned_constants_overrides: VersionedConstantsOverrides::default(),
+            // TODO(Itamar): Change to None once the versioned constants overrides are optional in
+            // the config schema.
+            versioned_constants_overrides: Some(VersionedConstantsOverrides::default()),
         }
     }
 }
@@ -69,7 +71,7 @@ impl SerializeConfig for BlockBuilderConfig {
             ParamPrivacyInput::Public,
         )]));
         dump.append(&mut prepend_sub_config_name(
-            self.versioned_constants_overrides.dump(),
+            self.versioned_constants_overrides.clone().unwrap_or_default().dump(),
             "versioned_constants_overrides",
         ));
         dump

crates/apollo_gateway/src/stateful_transaction_validator.rs

@@ -89,9 +89,9 @@ impl StatefulTransactionValidatorFactoryTrait for StatefulTransactionValidatorFa
         );
 
         let state = CachedState::new(state_reader_and_contract_manager);
-        let mut versioned_constants = VersionedConstants::get_versioned_constants(Some(
+        let mut versioned_constants = VersionedConstants::get_versioned_constants(
             self.config.versioned_constants_overrides.clone(),
-        ));
+        );
         // The validation of a transaction is not affected by the casm hash migration.
         versioned_constants.enable_casm_hash_migration = false;
 

crates/apollo_gateway_config/src/config.rs

@@ -231,7 +231,7 @@ pub struct StatefulTransactionValidatorConfig {
     pub max_allowed_nonce_gap: u32,
     pub reject_future_declare_txs: bool,
     pub max_nonce_for_validation_skip: Nonce,
-    pub versioned_constants_overrides: VersionedConstantsOverrides,
+    pub versioned_constants_overrides: Option<VersionedConstantsOverrides>,
     // Minimum gas price as percentage of threshold to accept transactions.
     pub min_gas_price_percentage: u8, // E.g., 80 to require 80% of threshold.
 }
@@ -244,7 +244,9 @@ impl Default for StatefulTransactionValidatorConfig {
             reject_future_declare_txs: true,
             max_nonce_for_validation_skip: Nonce(Felt::ONE),
             min_gas_price_percentage: 100,
-            versioned_constants_overrides: VersionedConstantsOverrides::default(),
+            // TODO(Itamar): Change to None once the versioned constants overrides are optional in
+            // the config schema.
+            versioned_constants_overrides: Some(VersionedConstantsOverrides::default()),
         }
     }
 }
@@ -285,7 +287,7 @@ impl SerializeConfig for StatefulTransactionValidatorConfig {
             ),
         ]);
         dump.append(&mut prepend_sub_config_name(
-            self.versioned_constants_overrides.dump(),
+            self.versioned_constants_overrides.clone().unwrap_or_default().dump(),
             "versioned_constants_overrides",
         ));
         dump