Skip to content

Commit d983e34

Browse files
committed
apollo_node: move eth/strk config from consensus_manager to l1_gas_price_provider_config
1 parent a6db0fd commit d983e34

File tree

17 files changed

+65
-73
lines changed

17 files changed

+65
-73
lines changed

Cargo.lock

Lines changed: 0 additions & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

crates/apollo_consensus_manager/Cargo.toml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,6 @@ apollo_consensus.workspace = true
1919
apollo_consensus_orchestrator.workspace = true
2020
apollo_infra.workspace = true
2121
apollo_infra_utils.workspace = true
22-
apollo_l1_gas_price.workspace = true
2322
apollo_l1_gas_price_types.workspace = true
2423
apollo_metrics.workspace = true
2524
apollo_network.workspace = true

crates/apollo_consensus_manager/src/config.rs

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,6 @@ use apollo_config::{ParamPath, ParamPrivacyInput, SerializedParam};
55
use apollo_consensus::config::{ConsensusConfig, StreamHandlerConfig};
66
use apollo_consensus_orchestrator::cende::CendeConfig;
77
use apollo_consensus_orchestrator::config::ContextConfig;
8-
use apollo_l1_gas_price::eth_to_strk_oracle::EthToStrkOracleConfig;
98
use apollo_network::NetworkConfig;
109
use apollo_reverts::RevertConfig;
1110
use serde::{Deserialize, Serialize};
@@ -17,7 +16,6 @@ use validator::Validate;
1716
pub struct ConsensusManagerConfig {
1817
pub consensus_manager_config: ConsensusConfig,
1918
pub context_config: ContextConfig,
20-
pub eth_to_strk_oracle_config: EthToStrkOracleConfig,
2119
pub stream_handler_config: StreamHandlerConfig,
2220
#[validate]
2321
pub network_config: NetworkConfig,
@@ -71,10 +69,6 @@ impl SerializeConfig for ConsensusManagerConfig {
7169
"consensus_manager_config",
7270
));
7371
config.extend(prepend_sub_config_name(self.context_config.dump(), "context_config"));
74-
config.extend(prepend_sub_config_name(
75-
self.eth_to_strk_oracle_config.dump(),
76-
"eth_to_strk_oracle_config",
77-
));
7872
config.extend(prepend_sub_config_name(
7973
self.stream_handler_config.dump(),
8074
"stream_handler_config",
@@ -91,7 +85,6 @@ impl Default for ConsensusManagerConfig {
9185
ConsensusManagerConfig {
9286
consensus_manager_config: ConsensusConfig::default(),
9387
context_config: ContextConfig::default(),
94-
eth_to_strk_oracle_config: EthToStrkOracleConfig::default(),
9588
stream_handler_config: StreamHandlerConfig::default(),
9689
cende_config: CendeConfig::default(),
9790
network_config: NetworkConfig::default(),

crates/apollo_deployments/resources/app_configs/consensus_manager_config.json

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -23,9 +23,6 @@
2323
"consensus_manager_config.context_config.max_l1_gas_price_wei": 1000000000000,
2424
"consensus_manager_config.context_config.min_l1_data_gas_price_wei": 1,
2525
"consensus_manager_config.context_config.max_l1_data_gas_price_wei": 1000000000000,
26-
"consensus_manager_config.eth_to_strk_oracle_config.lag_interval_seconds": 900,
27-
"consensus_manager_config.eth_to_strk_oracle_config.max_cache_size": 100,
28-
"consensus_manager_config.eth_to_strk_oracle_config.query_timeout_sec": 3,
2926
"consensus_manager_config.immediate_active_height": 1,
3027
"consensus_manager_config.assume_no_malicious_validators": true,
3128
"consensus_manager_config.network_config.broadcasted_message_metadata_buffer_size": 100000,

crates/apollo_deployments/resources/app_configs/l1_gas_price_provider_config.json

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,5 +2,8 @@
22
"l1_gas_price_provider_config.lag_margin_seconds": 300,
33
"l1_gas_price_provider_config.number_of_blocks_for_mean": 300,
44
"l1_gas_price_provider_config.storage_limit": 3000,
5-
"l1_gas_price_provider_config.max_time_gap_seconds": 900
5+
"l1_gas_price_provider_config.max_time_gap_seconds": 900,
6+
"l1_gas_price_provider_config.eth_to_strk_oracle_config.lag_interval_seconds": 900,
7+
"l1_gas_price_provider_config.eth_to_strk_oracle_config.max_cache_size": 100,
8+
"l1_gas_price_provider_config.eth_to_strk_oracle_config.query_timeout_sec": 3
69
}

crates/apollo_deployments/resources/testing_secrets.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"base_layer_config.node_url": "http://anvil-service.anvil.svc.cluster.local:8545",
3-
"consensus_manager_config.eth_to_strk_oracle_config.url_header_list": "http://dummy-eth2strk-oracle-service.dummy-eth2strk-oracle.svc.cluster.local/eth_to_strk_oracle?timestamp=:9000",
3+
"l1_gas_price_provider_config.eth_to_strk_oracle_config.url_header_list": "http://dummy-eth2strk-oracle-service.dummy-eth2strk-oracle.svc.cluster.local/eth_to_strk_oracle?timestamp=:9000",
44
"consensus_manager_config.network_config.secret_key": "0x0101010101010101010101010101010101010101010101010101010101010101",
55
"l1_endpoint_monitor_config.ordered_l1_endpoint_urls": "http://anvil-service.anvil.svc.cluster.local:8545",
66
"mempool_p2p_config.network_config.secret_key" : "0x0101010101010101010101010101010101010101010101010101010101010101",

crates/apollo_deployments/src/test_utils.rs

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -14,10 +14,11 @@ pub struct SecretsConfigOverride {
1414
#[serde(rename = "base_layer_config.node_url")]
1515
base_layer_config_node_url: Url,
1616
#[serde(
17-
rename = "consensus_manager_config.eth_to_strk_oracle_config.url_header_list",
17+
rename = "l1_gas_price_provider_config.eth_to_strk_oracle_config.url_header_list",
1818
serialize_with = "serialize_optional_list_with_url_and_headers_wrapper"
1919
)]
20-
consensus_manager_config_eth_to_strk_oracle_config_url_header_list: Option<Vec<UrlAndHeaders>>,
20+
l1_gas_price_provider_config_config_eth_to_strk_oracle_config_url_header_list:
21+
Option<Vec<UrlAndHeaders>>,
2122
#[serde(
2223
rename = "consensus_manager_config.network_config.secret_key",
2324
serialize_with = "serialize_optional_vec_u8_wrapper"
@@ -49,12 +50,12 @@ impl Default for SecretsConfigOverride {
4950
fn default() -> Self {
5051
Self {
5152
base_layer_config_node_url: Url::parse("https://arbitrary.url.com").unwrap(),
52-
consensus_manager_config_eth_to_strk_oracle_config_url_header_list: Some(vec![
53-
UrlAndHeaders {
53+
l1_gas_price_provider_config_config_eth_to_strk_oracle_config_url_header_list: Some(
54+
vec![UrlAndHeaders {
5455
url: Url::parse("https://arbitrary.eth_to_strk_oracle.url").unwrap(),
5556
headers: Default::default(),
56-
},
57-
]),
57+
}],
58+
),
5859
consensus_manager_config_network_config_secret_key: None,
5960
l1_endpoint_monitor_config_ordered_l1_endpoint_urls: vec![
6061
Url::parse("https://arbitrary.ordered_l1_endpoint_1.url").unwrap(),

crates/apollo_integration_tests/src/flow_test_setup.rs

Lines changed: 7 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
1-
use std::collections::{BTreeMap, HashMap};
1+
use std::collections::HashMap;
22
use std::net::SocketAddr;
33
use std::sync::Arc;
44

55
use alloy::node_bindings::AnvilInstance;
6-
use apollo_config::converters::UrlAndHeaders;
76
use apollo_consensus_manager::config::ConsensusManagerConfig;
87
use apollo_http_server::config::HttpServerConfig;
98
use apollo_http_server::test_utils::HttpTestClient;
109
use apollo_infra_utils::test_utils::AvailablePorts;
10+
use apollo_l1_gas_price::eth_to_strk_oracle::EthToStrkOracleConfig;
1111
use apollo_mempool_p2p::config::MempoolP2pConfig;
1212
use apollo_monitoring_endpoint::config::MonitoringEndpointConfig;
1313
use apollo_monitoring_endpoint::test_utils::MonitoringClient;
@@ -51,7 +51,6 @@ use starknet_api::transaction::{TransactionHash, TransactionHasher, TransactionV
5151
use starknet_types_core::felt::Felt;
5252
use tokio::sync::Mutex;
5353
use tracing::{debug, instrument, Instrument};
54-
use url::Url;
5554

5655
use crate::state_reader::{StorageTestHandles, StorageTestSetup};
5756
use crate::utils::{
@@ -246,8 +245,10 @@ impl FlowSequencerSetup {
246245

247246
let (eth_to_strk_oracle_url_headers, _join_handle) =
248247
spawn_local_eth_to_strk_oracle(available_ports.get_next_port());
249-
consensus_manager_config.eth_to_strk_oracle_config.url_header_list =
250-
Some(vec![eth_to_strk_oracle_url_headers]);
248+
let eth_to_strk_oracle_config = EthToStrkOracleConfig {
249+
url_header_list: Some(vec![eth_to_strk_oracle_url_headers]),
250+
..Default::default()
251+
};
251252

252253
let validator_id = set_validator_id(&mut consensus_manager_config, node_index);
253254

@@ -269,6 +270,7 @@ impl FlowSequencerSetup {
269270
storage_config,
270271
state_sync_config,
271272
consensus_manager_config,
273+
eth_to_strk_oracle_config,
272274
mempool_p2p_config,
273275
monitoring_endpoint_config,
274276
component_config,
@@ -337,10 +339,6 @@ pub fn create_consensus_manager_configs_and_channels(
337339
for (i, config) in consensus_manager_configs.iter_mut().enumerate() {
338340
config.context_config.builder_address =
339341
ContractAddress::try_from(BUILDER_BASE_ADDRESS + Felt::from(i)).unwrap();
340-
config.eth_to_strk_oracle_config.url_header_list = Some(vec![UrlAndHeaders {
341-
url: Url::parse("https://eth_to_strk_oracle_url").expect("Should be a valid URL"),
342-
headers: BTreeMap::new(),
343-
}]);
344342
}
345343

346344
let broadcast_channels = network_config_into_broadcast_channels(

crates/apollo_integration_tests/src/integration_test_manager.rs

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@ use apollo_http_server::test_utils::HttpTestClient;
1111
use apollo_infra_utils::dumping::serialize_to_file;
1212
use apollo_infra_utils::test_utils::{AvailablePortsGenerator, TestIdentifier};
1313
use apollo_infra_utils::tracing::{CustomLogger, TraceLevel};
14+
use apollo_l1_gas_price::eth_to_strk_oracle::EthToStrkOracleConfig;
1415
use apollo_l1_gas_price::l1_gas_price_scraper::L1GasPriceScraperConfig;
1516
use apollo_monitoring_endpoint::config::MonitoringEndpointConfig;
1617
use apollo_monitoring_endpoint::test_utils::MonitoringClient;
@@ -917,8 +918,11 @@ pub async fn get_sequencer_setup_configs(
917918
let state_sync_config = state_sync_configs.remove(0);
918919

919920
consensus_manager_config.cende_config.recorder_url = recorder_url.clone();
920-
consensus_manager_config.eth_to_strk_oracle_config.url_header_list =
921-
Some(vec![eth_to_strk_oracle_url.clone()]);
921+
let eth_to_strk_oracle_config = EthToStrkOracleConfig {
922+
url_header_list: Some(vec![eth_to_strk_oracle_url.clone()]),
923+
..Default::default()
924+
};
925+
922926
let validator_id = set_validator_id(&mut consensus_manager_config, node_index);
923927
let chain_info = chain_info.clone();
924928

@@ -940,6 +944,7 @@ pub async fn get_sequencer_setup_configs(
940944
storage_setup.storage_config.clone(),
941945
state_sync_config,
942946
consensus_manager_config,
947+
eth_to_strk_oracle_config,
943948
mempool_p2p_config,
944949
MonitoringEndpointConfig::default(),
945950
ComponentConfig::default(),

crates/apollo_integration_tests/src/utils.rs

Lines changed: 2 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -168,6 +168,7 @@ pub fn create_node_config(
168168
storage_config: StorageTestConfig,
169169
mut state_sync_config: StateSyncConfig,
170170
consensus_manager_config: ConsensusManagerConfig,
171+
eth_to_strk_oracle_config: EthToStrkOracleConfig,
171172
mempool_p2p_config: MempoolP2pConfig,
172173
monitoring_endpoint_config: MonitoringEndpointConfig,
173174
component_config: ComponentConfig,
@@ -210,6 +211,7 @@ pub fn create_node_config(
210211
let l1_gas_price_provider_config = L1GasPriceProviderConfig {
211212
// Use newly minted blocks on Anvil to be used for gas price calculations.
212213
lag_margin_seconds: 0,
214+
eth_to_strk_oracle_config,
213215
..Default::default()
214216
};
215217
let http_server_config =
@@ -306,15 +308,6 @@ pub(crate) fn create_consensus_manager_configs_from_network_configs(
306308
skip_write_height: Some(BlockNumber(1)),
307309
..Default::default()
308310
},
309-
eth_to_strk_oracle_config: EthToStrkOracleConfig {
310-
url_header_list: Some(vec![
311-
UrlAndHeaders{
312-
url: Url::parse("https://eth_to_strk_oracle_url").expect("Should be a valid URL"),
313-
headers: Default::default(),
314-
}
315-
]),
316-
..Default::default()
317-
},
318311
assume_no_malicious_validators: true,
319312
..Default::default()
320313
})

0 commit comments

Comments
 (0)