apollo_deployments: convert loaded config to dynamic loaded config (#9455)

Author: Itay-Tsabary-Starkware

crates/apollo_config_manager/src/config_manager_runner.rs

@@ -48,19 +48,7 @@ impl ConfigManagerRunner {
         &self,
     ) -> Result<NodeDynamicConfig, Box<dyn std::error::Error + Send + Sync>> {
         let config = load_and_validate_config(self.cli_args.clone())?;
-
-        // Extract consensus dynamic config from the loaded config
-        let consensus_manager_config = config
-            .consensus_manager_config
-            .as_ref()
-            .expect("consensus_manager_config must be present");
-
-        let node_dynamic_config = NodeDynamicConfig {
-            consensus_dynamic_config: Some(
-                consensus_manager_config.consensus_manager_config.dynamic_config.clone(),
-            ),
-        };
-
+        let node_dynamic_config = NodeDynamicConfig::from(&config);
         info!("Extracted NodeDynamicConfig: {:?}", node_dynamic_config);
 
         // TODO(Nadin/Tsabary): Store the last loaded config, compare for changes and only send the

crates/apollo_config_manager/src/config_manager_tests.rs

@@ -11,8 +11,10 @@ async fn test_config_manager_update_config() {
     let config = ConfigManagerConfig::default();
 
     let consensus_dynamic_config = ConsensusDynamicConfig::default();
-    let node_dynamic_config =
-        NodeDynamicConfig { consensus_dynamic_config: Some(consensus_dynamic_config) };
+    let node_dynamic_config = NodeDynamicConfig {
+        consensus_dynamic_config: Some(consensus_dynamic_config),
+        ..Default::default()
+    };
     let mut config_manager = ConfigManager::new(config, node_dynamic_config.clone());
 
     // Get the consensus dynamic config and assert it is the expected one.
@@ -38,6 +40,7 @@ async fn test_config_manager_update_config() {
     config_manager
         .set_node_dynamic_config(NodeDynamicConfig {
             consensus_dynamic_config: Some(new_consensus_dynamic_config.clone()),
+            ..Default::default()
         })
         .expect("Failed to set node dynamic config");
 

crates/apollo_node_config/src/node_config.rs

@@ -31,7 +31,7 @@ use apollo_l1_gas_price_provider_config::config::{
 };
 use apollo_l1_provider_config::config::L1ProviderConfig;
 use apollo_l1_scraper_config::config::L1ScraperConfig;
-use apollo_mempool_config::config::MempoolConfig;
+use apollo_mempool_config::config::{MempoolConfig, MempoolDynamicConfig};
 use apollo_mempool_p2p_config::config::MempoolP2pConfig;
 use apollo_monitoring_endpoint_config::config::MonitoringEndpointConfig;
 use apollo_reverts::RevertConfig;
@@ -290,6 +290,8 @@ impl Default for SequencerNodeConfig {
 pub struct NodeDynamicConfig {
     #[validate]
     pub consensus_dynamic_config: Option<ConsensusDynamicConfig>,
+    #[validate]
+    pub mempool_dynamic_config: Option<MempoolDynamicConfig>,
 }
 
 impl From<&SequencerNodeConfig> for NodeDynamicConfig {
@@ -300,7 +302,11 @@ impl From<&SequencerNodeConfig> for NodeDynamicConfig {
                 consensus_manager_config.consensus_manager_config.dynamic_config.clone()
             },
         );
-        Self { consensus_dynamic_config }
+        let mempool_dynamic_config = sequencer_node_config
+            .mempool_config
+            .as_ref()
+            .map(|mempool_config| mempool_config.dynamic_config.clone());
+        Self { consensus_dynamic_config, mempool_dynamic_config }
     }
 }