chore(apollo_integration_tests): override lag_margin_seconds for gas price provider (#6071)

Author: guy-starkware

config/sequencer/presets/system_test_presets/single_node/node_0/executable_0/node_config.json

@@ -217,7 +217,7 @@
   "gateway_config.stateless_tx_validator_config.validate_non_zero_resource_bounds": true,
   "http_server_config.ip": "127.0.0.1",
   "http_server_config.port": 23000,
-  "l1_gas_price_provider_config.lag_margin_seconds": 60,
+  "l1_gas_price_provider_config.lag_margin_seconds": 0,
   "l1_gas_price_provider_config.number_of_blocks_for_mean": 300,
   "l1_gas_price_provider_config.storage_limit": 3000,
   "l1_gas_price_scraper_config.finality": 0,

crates/apollo_integration_tests/src/flow_test_setup.rs

@@ -261,7 +261,6 @@ impl FlowSequencerSetup {
         let num_l1_txs = u64::try_from(NUM_L1_TRANSACTIONS).unwrap();
         node_config.l1_gas_price_scraper_config.number_of_blocks_for_mean = num_l1_txs;
         node_config.l1_gas_price_provider_config.number_of_blocks_for_mean = num_l1_txs;
-        node_config.l1_gas_price_provider_config.lag_margin_seconds = 0;
 
         debug!("Sequencer config: {:#?}", node_config);
         let (clients, servers) = create_node_modules(&node_config).await;

crates/apollo_integration_tests/src/integration_test_manager.rs

@@ -259,7 +259,7 @@ impl IntegrationTestManager {
     ) -> Self {
         let tx_generator = create_integration_test_tx_generator();
 
-        let (mut sequencers_setup, node_indices) = get_sequencer_setup_configs(
+        let (sequencers_setup, node_indices) = get_sequencer_setup_configs(
             &tx_generator,
             num_of_consolidated_nodes,
             num_of_distributed_nodes,
@@ -283,17 +283,6 @@ impl IntegrationTestManager {
         make_block_history_on_anvil(&anvil, base_layer_config.clone(), num_blocks_needed_on_l1)
             .await;
 
-        for seq in sequencers_setup.iter_mut() {
-            for exec in seq.executables.iter_mut() {
-                // Set the L1 gas price scraper's lag time to zero, to be able to use the
-                // anvil transactions we send in make_block_history_on_anvil.
-                exec.base_app_config.modify_config(|config| {
-                    config.l1_gas_price_provider_config.lag_margin_seconds = 0
-                });
-                exec.base_app_config.dump_config_file(&exec.node_config_path);
-            }
-        }
-
         let idle_nodes = create_map(sequencers_setup, |node| node.get_node_index());
         let running_nodes = HashMap::new();
 

crates/apollo_integration_tests/src/utils.rs

@@ -23,6 +23,7 @@ use apollo_gateway::config::{
 use apollo_http_server::test_utils::create_http_server_config;
 use apollo_infra_utils::test_utils::AvailablePorts;
 use apollo_l1_gas_price::eth_to_strk_oracle::{EthToStrkOracleConfig, ETH_TO_STRK_QUANTIZATION};
+use apollo_l1_gas_price::l1_gas_price_provider::L1GasPriceProviderConfig;
 use apollo_l1_gas_price_types::DEFAULT_ETH_TO_FRI_RATE;
 use apollo_l1_provider::l1_scraper::L1ScraperConfig;
 use apollo_l1_provider::L1ProviderConfig;
@@ -195,6 +196,11 @@ pub fn create_node_config(
     };
     let override_gas_price_threshold_check = allow_bootstrap_txs;
     let mempool_config = create_mempool_config(override_gas_price_threshold_check);
+    let l1_gas_price_provider_config = L1GasPriceProviderConfig {
+        // Use newly minted blocks on Anvil to be used for gas price calculations.
+        lag_margin_seconds: 0,
+        ..Default::default()
+    };
     let http_server_config =
         create_http_server_config(available_ports.get_next_local_host_socket());
     let class_manager_config =
@@ -246,6 +252,7 @@ pub fn create_node_config(
             components: component_config,
             l1_scraper_config,
             l1_provider_config,
+            l1_gas_price_provider_config,
             ..Default::default()
         },
         config_pointers_map,