apollo_node: remove eth/strk config from consensus_manager and make it top level

Author: guy-starkware

Cargo.lock

@@ -19,7 +19,6 @@ apollo_consensus.workspace = true
 apollo_consensus_orchestrator.workspace = true
 apollo_infra.workspace = true
 apollo_infra_utils.workspace = true
-apollo_l1_gas_price.workspace = true
 apollo_l1_gas_price_types.workspace = true
 apollo_metrics.workspace = true
 apollo_network.workspace = true

crates/apollo_consensus_manager/Cargo.toml

@@ -5,7 +5,6 @@ use apollo_config::{ParamPath, ParamPrivacyInput, SerializedParam};
 use apollo_consensus::config::{ConsensusConfig, StreamHandlerConfig};
 use apollo_consensus_orchestrator::cende::CendeConfig;
 use apollo_consensus_orchestrator::config::ContextConfig;
-use apollo_l1_gas_price::eth_to_strk_oracle::EthToStrkOracleConfig;
 use apollo_network::NetworkConfig;
 use apollo_reverts::RevertConfig;
 use serde::{Deserialize, Serialize};
@@ -17,7 +16,6 @@ use validator::Validate;
 pub struct ConsensusManagerConfig {
     pub consensus_manager_config: ConsensusConfig,
     pub context_config: ContextConfig,
-    pub eth_to_strk_oracle_config: EthToStrkOracleConfig,
     pub stream_handler_config: StreamHandlerConfig,
     #[validate]
     pub network_config: NetworkConfig,
@@ -71,10 +69,6 @@ impl SerializeConfig for ConsensusManagerConfig {
             "consensus_manager_config",
         ));
         config.extend(prepend_sub_config_name(self.context_config.dump(), "context_config"));
-        config.extend(prepend_sub_config_name(
-            self.eth_to_strk_oracle_config.dump(),
-            "eth_to_strk_oracle_config",
-        ));
         config.extend(prepend_sub_config_name(
             self.stream_handler_config.dump(),
             "stream_handler_config",
@@ -91,7 +85,6 @@ impl Default for ConsensusManagerConfig {
         ConsensusManagerConfig {
             consensus_manager_config: ConsensusConfig::default(),
             context_config: ContextConfig::default(),
-            eth_to_strk_oracle_config: EthToStrkOracleConfig::default(),
             stream_handler_config: StreamHandlerConfig::default(),
             cende_config: CendeConfig::default(),
             network_config: NetworkConfig::default(),

crates/apollo_consensus_manager/src/config.rs

@@ -1,13 +1,13 @@
-use std::collections::{BTreeMap, HashMap};
+use std::collections::HashMap;
 use std::net::SocketAddr;
 use std::sync::Arc;
 
 use alloy::node_bindings::AnvilInstance;
-use apollo_config::converters::UrlAndHeaders;
 use apollo_consensus_manager::config::ConsensusManagerConfig;
 use apollo_http_server::config::HttpServerConfig;
 use apollo_http_server::test_utils::HttpTestClient;
 use apollo_infra_utils::test_utils::AvailablePorts;
+use apollo_l1_gas_price::eth_to_strk_oracle::EthToStrkOracleConfig;
 use apollo_mempool_p2p::config::MempoolP2pConfig;
 use apollo_monitoring_endpoint::config::MonitoringEndpointConfig;
 use apollo_monitoring_endpoint::test_utils::MonitoringClient;
@@ -51,7 +51,6 @@ use starknet_api::transaction::{TransactionHash, TransactionHasher, TransactionV
 use starknet_types_core::felt::Felt;
 use tokio::sync::Mutex;
 use tracing::{debug, instrument, Instrument};
-use url::Url;
 
 use crate::state_reader::{StorageTestHandles, StorageTestSetup};
 use crate::utils::{
@@ -246,8 +245,10 @@ impl FlowSequencerSetup {
 
         let (eth_to_strk_oracle_url_headers, _join_handle) =
             spawn_local_eth_to_strk_oracle(available_ports.get_next_port());
-        consensus_manager_config.eth_to_strk_oracle_config.url_header_list =
-            Some(vec![eth_to_strk_oracle_url_headers]);
+        let eth_to_strk_oracle_config = EthToStrkOracleConfig {
+            url_header_list: Some(vec![eth_to_strk_oracle_url_headers]),
+            ..Default::default()
+        };
 
         let validator_id = set_validator_id(&mut consensus_manager_config, node_index);
 
@@ -269,6 +270,7 @@ impl FlowSequencerSetup {
             storage_config,
             state_sync_config,
             consensus_manager_config,
+            eth_to_strk_oracle_config,
             mempool_p2p_config,
             monitoring_endpoint_config,
             component_config,
@@ -337,10 +339,6 @@ pub fn create_consensus_manager_configs_and_channels(
     for (i, config) in consensus_manager_configs.iter_mut().enumerate() {
         config.context_config.builder_address =
             ContractAddress::try_from(BUILDER_BASE_ADDRESS + Felt::from(i)).unwrap();
-        config.eth_to_strk_oracle_config.url_header_list = Some(vec![UrlAndHeaders {
-            url: Url::parse("https://eth_to_strk_oracle_url").expect("Should be a valid URL"),
-            headers: BTreeMap::new(),
-        }]);
     }
 
     let broadcast_channels = network_config_into_broadcast_channels(

crates/apollo_integration_tests/src/flow_test_setup.rs

@@ -11,6 +11,7 @@ use apollo_http_server::test_utils::HttpTestClient;
 use apollo_infra_utils::dumping::serialize_to_file;
 use apollo_infra_utils::test_utils::{AvailablePortsGenerator, TestIdentifier};
 use apollo_infra_utils::tracing::{CustomLogger, TraceLevel};
+use apollo_l1_gas_price::eth_to_strk_oracle::EthToStrkOracleConfig;
 use apollo_l1_gas_price::l1_gas_price_scraper::L1GasPriceScraperConfig;
 use apollo_monitoring_endpoint::config::MonitoringEndpointConfig;
 use apollo_monitoring_endpoint::test_utils::MonitoringClient;
@@ -917,8 +918,11 @@ pub async fn get_sequencer_setup_configs(
         let state_sync_config = state_sync_configs.remove(0);
 
         consensus_manager_config.cende_config.recorder_url = recorder_url.clone();
-        consensus_manager_config.eth_to_strk_oracle_config.url_header_list =
-            Some(vec![eth_to_strk_oracle_url.clone()]);
+        let eth_to_strk_oracle_config = EthToStrkOracleConfig {
+            url_header_list: Some(vec![eth_to_strk_oracle_url.clone()]),
+            ..Default::default()
+        };
+
         let validator_id = set_validator_id(&mut consensus_manager_config, node_index);
         let chain_info = chain_info.clone();
 
@@ -940,6 +944,7 @@ pub async fn get_sequencer_setup_configs(
             storage_setup.storage_config.clone(),
             state_sync_config,
             consensus_manager_config,
+            eth_to_strk_oracle_config,
             mempool_p2p_config,
             MonitoringEndpointConfig::default(),
             ComponentConfig::default(),

crates/apollo_integration_tests/src/integration_test_manager.rs

@@ -168,6 +168,7 @@ pub fn create_node_config(
     storage_config: StorageTestConfig,
     mut state_sync_config: StateSyncConfig,
     consensus_manager_config: ConsensusManagerConfig,
+    eth_to_strk_oracle_config: EthToStrkOracleConfig,
     mempool_p2p_config: MempoolP2pConfig,
     monitoring_endpoint_config: MonitoringEndpointConfig,
     component_config: ComponentConfig,
@@ -265,6 +266,7 @@ pub fn create_node_config(
             l1_provider_config: Some(l1_provider_config),
             l1_endpoint_monitor_config: Some(l1_endpoint_monitor_config),
             l1_gas_price_provider_config: Some(l1_gas_price_provider_config),
+            eth_to_strk_oracle_config: Some(eth_to_strk_oracle_config),
             ..Default::default()
         },
         config_pointers_map,
@@ -306,15 +308,6 @@ pub(crate) fn create_consensus_manager_configs_from_network_configs(
                 skip_write_height: Some(BlockNumber(1)),
                 ..Default::default()
             },
-            eth_to_strk_oracle_config: EthToStrkOracleConfig {
-                url_header_list: Some(vec![
-                    UrlAndHeaders{
-                        url: Url::parse("https://eth_to_strk_oracle_url").expect("Should be a valid URL"),
-                        headers: Default::default(),
-                    }
-                ]),
-                ..Default::default()
-            },
             assume_no_malicious_validators: true,
             ..Default::default()
         })

crates/apollo_integration_tests/src/utils.rs

@@ -22,6 +22,7 @@ use serde_json;
 use tokio_util::task::AbortOnDropHandle;
 use tracing::{debug, info, instrument, warn};
 use url::Url;
+use validator::Validate;
 
 use crate::metrics::{
     register_eth_to_strk_metrics,
@@ -47,7 +48,7 @@ fn btreemap_to_headermap(hash_map: BTreeMap<String, String>) -> HeaderMap {
     header_map
 }
 
-#[derive(Clone, Debug, Deserialize, Serialize, PartialEq)]
+#[derive(Clone, Debug, Deserialize, Serialize, PartialEq, Validate)]
 pub struct EthToStrkOracleConfig {
     #[serde(deserialize_with = "deserialize_optional_list_with_url_and_headers")]
     pub url_header_list: Option<Vec<UrlAndHeaders>>,

crates/apollo_l1_gas_price/src/eth_to_strk_oracle.rs

@@ -1074,26 +1074,6 @@
     "privacy": "Public",
     "value": 10000
   },
-  "consensus_manager_config.eth_to_strk_oracle_config.lag_interval_seconds": {
-    "description": "The size of the interval (seconds) that the eth to strk rate is taken on. The lag refers to the fact that the interval `[T, T+k)` contains the conversion rate for queries in the interval `[T+k, T+2k)`. Should be configured in alignment with relevant query parameters in `url_header_list`, if required.",
-    "privacy": "Public",
-    "value": 1
-  },
-  "consensus_manager_config.eth_to_strk_oracle_config.max_cache_size": {
-    "description": "The maximum number of cached conversion rates.",
-    "privacy": "Public",
-    "value": 100
-  },
-  "consensus_manager_config.eth_to_strk_oracle_config.query_timeout_sec": {
-    "description": "The timeout (seconds) for the query to the eth to strk oracle.",
-    "privacy": "Public",
-    "value": 3
-  },
-  "consensus_manager_config.eth_to_strk_oracle_config.url_header_list": {
-    "description": "A list of Url+HTTP headers for the eth to strk oracle. The url is followed by a comma and then headers as key^value pairs, separated by commas. For example: `https://api.example.com/api,key1^value1,key2^value2`. Each URL+headers is separated by a pipe `|` character. The `timestamp` parameter is appended dynamically when making requests, in order to have a stable mapping from block timestamp to conversion rate. ",
-    "privacy": "Private",
-    "value": "https://api.example.com/api"
-  },
   "consensus_manager_config.immediate_active_height": {
     "description": "The height at which the node may actively participate in consensus.",
     "privacy": "Public",
@@ -1219,6 +1199,26 @@
     "privacy": "TemporaryValue",
     "value": "PointerTarget"
   },
+  "eth_to_strk_oracle_config.lag_interval_seconds": {
+    "description": "The size of the interval (seconds) that the eth to strk rate is taken on. The lag refers to the fact that the interval `[T, T+k)` contains the conversion rate for queries in the interval `[T+k, T+2k)`. Should be configured in alignment with relevant query parameters in `url_header_list`, if required.",
+    "privacy": "Public",
+    "value": 1
+  },
+  "eth_to_strk_oracle_config.max_cache_size": {
+    "description": "The maximum number of cached conversion rates.",
+    "privacy": "Public",
+    "value": 100
+  },
+  "eth_to_strk_oracle_config.query_timeout_sec": {
+    "description": "The timeout (seconds) for the query to the eth to strk oracle.",
+    "privacy": "Public",
+    "value": 3
+  },
+  "eth_to_strk_oracle_config.url_header_list": {
+    "description": "A list of Url+HTTP headers for the eth to strk oracle. The url is followed by a comma and then headers as key^value pairs, separated by commas. For example: `https://api.example.com/api,key1^value1,key2^value2`. Each URL+headers is separated by a pipe `|` character. The `timestamp` parameter is appended dynamically when making requests, in order to have a stable mapping from block timestamp to conversion rate. ",
+    "privacy": "Private",
+    "value": "https://api.example.com/api"
+  },
   "gateway_config.#is_none": {
     "description": "Flag for an optional field.",
     "privacy": "TemporaryValue",

crates/apollo_node/resources/config_schema.json

@@ -1,7 +1,7 @@
 [
   "base_layer_config.node_url",
-  "consensus_manager_config.eth_to_strk_oracle_config.url_header_list",
   "consensus_manager_config.network_config.secret_key",
+  "eth_to_strk_oracle_config.url_header_list",
   "l1_endpoint_monitor_config.ordered_l1_endpoint_urls",
   "mempool_p2p_config.network_config.secret_key",
   "recorder_url",

crates/apollo_node/resources/config_secrets_schema.json

@@ -441,12 +441,11 @@ pub async fn create_node_components(
                 .as_ref()
                 .expect("L1 Gas Price Provider config should be set");
             let eth_to_strk_oracle_config = config
-                .consensus_manager_config
-                .as_ref()
-                .expect("Consensus Manager config should be set")
                 .eth_to_strk_oracle_config
-                .clone();
-            let eth_to_strk_oracle_client = EthToStrkOracleClient::new(eth_to_strk_oracle_config);
+                .as_ref()
+                .expect("Eth to Strk oracle config should be set");
+            let eth_to_strk_oracle_client =
+                EthToStrkOracleClient::new(eth_to_strk_oracle_config.clone());
             Some(L1GasPriceProvider::new(
                 l1_gas_price_provider_config.clone(),
                 Arc::new(eth_to_strk_oracle_client),