apollo_l1_provider: add l1_block_time as a config parameter (#10505)

Author: guy-starkware

crates/apollo_deployments/resources/app_configs/l1_gas_price_scraper_config.json

@@ -5,5 +5,6 @@
   "l1_gas_price_scraper_config.starting_block": 0,
   "l1_gas_price_scraper_config.starting_block.#is_none": true,
   "l1_gas_price_scraper_config.startup_num_blocks_multiplier": 2,
-  "l1_scraper_config.set_provider_historic_height_to_l2_genesis": false
+  "l1_scraper_config.set_provider_historic_height_to_l2_genesis": false,
+  "l1_scraper_config.l1_block_time_seconds": 12.0
 }

crates/apollo_deployments/resources/app_configs/replacer_l1_gas_price_scraper_config.json

@@ -5,5 +5,6 @@
   "l1_gas_price_scraper_config.starting_block": 0,
   "l1_gas_price_scraper_config.starting_block.#is_none": true,
   "l1_gas_price_scraper_config.startup_num_blocks_multiplier": 2,
+  "l1_scraper_config.l1_block_time_seconds": 12.0,
   "l1_scraper_config.set_provider_historic_height_to_l2_genesis": false
 }

crates/apollo_l1_provider/src/l1_scraper.rs

@@ -34,10 +34,6 @@ pub mod l1_scraper_tests;
 
 type L1ScraperResult<T, B> = Result<T, L1ScraperError<B>>;
 
-// TODO(guyn): make this a config parameter
-// Sensible lower bound.
-const L1_BLOCK_TIME: u64 = 12;
-
 pub struct L1Scraper<BaseLayerType: BaseLayerContract + Send + Sync + Debug> {
     pub config: L1ScraperConfig,
     pub base_layer: BaseLayerType,
@@ -140,7 +136,8 @@ impl<BaseLayerType: BaseLayerContract + Send + Sync + Debug> L1Scraper<BaseLayer
         debug!("Latest L1 block number: {latest_l1_block_number:?}");
 
         // Estimate the number of blocks in the interval, to rewind from the latest block.
-        let blocks_in_interval = self.config.startup_rewind_time_seconds.as_secs() / L1_BLOCK_TIME;
+        let blocks_in_interval = self.config.startup_rewind_time_seconds.as_secs()
+            / self.config.l1_block_time_seconds.as_secs();
         debug!("Blocks in interval: {blocks_in_interval}");
 
         // Add 50% safety margin.

crates/apollo_l1_scraper_config/src/config.rs

@@ -19,6 +19,8 @@ pub struct L1ScraperConfig {
     #[serde(deserialize_with = "deserialize_float_seconds_to_duration")]
     pub polling_interval_seconds: Duration,
     pub set_provider_historic_height_to_l2_genesis: bool,
+    #[serde(deserialize_with = "deserialize_float_seconds_to_duration")]
+    pub l1_block_time_seconds: Duration,
 }
 
 impl Default for L1ScraperConfig {
@@ -29,6 +31,7 @@ impl Default for L1ScraperConfig {
             finality: 0,
             polling_interval_seconds: Duration::from_secs(30),
             set_provider_historic_height_to_l2_genesis: false,
+            l1_block_time_seconds: Duration::from_secs(12),
         }
     }
 }
@@ -67,6 +70,12 @@ impl SerializeConfig for L1ScraperConfig {
                              This is useful on new chains (or in tests) where there have not been any state updates to the Starknet contract.",
                 ParamPrivacyInput::Public,
             ),
+            ser_param(
+                "l1_block_time_seconds",
+                &self.l1_block_time_seconds.as_secs(),
+                "The time it takes for a new L1 block to be created.",
+                ParamPrivacyInput::Public,
+            ),
         ])
     }
 }

crates/apollo_node/resources/config_schema.json

@@ -2604,6 +2604,11 @@
     "privacy": "Public",
     "value": 0
   },
+  "l1_scraper_config.l1_block_time_seconds": {
+    "description": "The time it takes for a new L1 block to be created.",
+    "privacy": "Public",
+    "value": 12
+  },
   "l1_scraper_config.polling_interval_seconds": {
     "description": "Interval in Seconds between each scraping attempt of L1.",
     "privacy": "Public",