Skip to content

Commit 311e22e

Browse files
Itay-Tsabary-StarkwareItay-Tsabary-Starkware
authored
apollo_deployments: add replacer keys (#10389)
1 parent b15ab0f commit 311e22e

File tree

15 files changed

+70
-20
lines changed

15 files changed

+70
-20
lines changed

‎Cargo.lock‎

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

‎crates/apollo_deployments/Cargo.toml‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@ apollo_monitoring_endpoint_config.workspace = true
1818
apollo_node_config.workspace = true
1919
apollo_rpc.workspace = true
2020
libp2p.workspace = true
21+
phf = { workspace = true, features = ["macros"] }
2122
serde.workspace = true
2223
serde_json.workspace = true
2324
serde_with.workspace = true

‎crates/apollo_deployments/resources/app_configs/replacer_batcher_config.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
"batcher_config.block_builder_config.bouncer_config.blake_weight": 6320,
33
"batcher_config.block_builder_config.bouncer_config.block_max_capacity.l1_gas": 4400000,
44
"batcher_config.block_builder_config.bouncer_config.block_max_capacity.message_segment_length": 3700,
5-
"batcher_config.block_builder_config.bouncer_config.block_max_capacity.n_events": 5000,
5+
"batcher_config.block_builder_config.bouncer_config.block_max_capacity.n_events": "$$$_BATCHER_CONFIG-BLOCK_BUILDER_CONFIG-BOUNCER_CONFIG-BLOCK_MAX_CAPACITY-N_EVENTS_$$$",
66
"batcher_config.block_builder_config.bouncer_config.block_max_capacity.n_txs": 500,
77
"batcher_config.block_builder_config.bouncer_config.block_max_capacity.proving_gas": 6000000000,
88
"batcher_config.block_builder_config.bouncer_config.block_max_capacity.sierra_gas": 6000000000,

‎crates/apollo_deployments/resources/app_configs/replacer_class_manager_config.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"class_manager_config.class_manager_config.cached_class_storage_config.class_cache_size": 128,
33
"class_manager_config.class_manager_config.cached_class_storage_config.deprecated_class_cache_size": 128,
4-
"class_manager_config.class_manager_config.max_compiled_contract_class_object_size": 4089446,
4+
"class_manager_config.class_manager_config.max_compiled_contract_class_object_size": "$$$_CLASS_MANAGER_CONFIG-CLASS_MANAGER_CONFIG-MAX_COMPILED_CONTRACT_CLASS_OBJECT_SIZE_$$$",
55
"class_manager_config.class_storage_config.class_hash_storage_config.class_hash_db_config.enforce_file_exists": false,
66
"class_manager_config.class_storage_config.class_hash_storage_config.class_hash_db_config.growth_step": 67108864,
77
"class_manager_config.class_storage_config.class_hash_storage_config.class_hash_db_config.max_readers": 8192,

‎crates/apollo_deployments/resources/app_configs/replacer_consensus_manager_config.json‎

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -16,9 +16,9 @@
1616
"consensus_manager_config.consensus_manager_config.dynamic_config.timeouts.prevote.base": 0.3,
1717
"consensus_manager_config.consensus_manager_config.dynamic_config.timeouts.prevote.delta": 0.1,
1818
"consensus_manager_config.consensus_manager_config.dynamic_config.timeouts.prevote.max": 1.0,
19-
"consensus_manager_config.consensus_manager_config.dynamic_config.timeouts.proposal.base": 9.1,
19+
"consensus_manager_config.consensus_manager_config.dynamic_config.timeouts.proposal.base": "$$$_CONSENSUS_MANAGER_CONFIG-CONSENSUS_MANAGER_CONFIG-DYNAMIC_CONFIG-TIMEOUTS-PROPOSAL-BASE_$$$",
2020
"consensus_manager_config.consensus_manager_config.dynamic_config.timeouts.proposal.delta": 0.0,
21-
"consensus_manager_config.consensus_manager_config.dynamic_config.timeouts.proposal.max": 15.0,
21+
"consensus_manager_config.consensus_manager_config.dynamic_config.timeouts.proposal.max": "$$$_CONSENSUS_MANAGER_CONFIG-CONSENSUS_MANAGER_CONFIG-DYNAMIC_CONFIG-TIMEOUTS-PROPOSAL-MAX_$$$",
2222
"consensus_manager_config.consensus_manager_config.static_config.startup_delay": 15,
2323
"consensus_manager_config.consensus_manager_config.static_config.storage_config.db_config.enforce_file_exists": false,
2424
"consensus_manager_config.consensus_manager_config.static_config.storage_config.db_config.growth_step": 67108864,
@@ -31,7 +31,7 @@
3131
"consensus_manager_config.consensus_manager_config.static_config.storage_config.mmap_file_config.max_size": 1099511627776,
3232
"consensus_manager_config.consensus_manager_config.static_config.storage_config.scope": "StateOnly",
3333
"consensus_manager_config.context_config.block_timestamp_window_seconds": 1,
34-
"consensus_manager_config.context_config.build_proposal_margin_millis": 1000,
34+
"consensus_manager_config.context_config.build_proposal_margin_millis": "$$$_CONSENSUS_MANAGER_CONFIG-CONTEXT_CONFIG-BUILD_PROPOSAL_MARGIN_MILLIS_$$$",
3535
"consensus_manager_config.context_config.build_proposal_time_ratio_for_retrospective_block_hash": 0.7,
3636
"consensus_manager_config.context_config.builder_address": "0x1176a1bd84444c89232ec27754698e5d2e7e1a7f1539f12027f28b23ec9f3d8",
3737
"consensus_manager_config.context_config.l1_da_mode": true,
@@ -41,14 +41,14 @@
4141
"consensus_manager_config.context_config.max_l1_gas_price_wei": 1000000000000,
4242
"consensus_manager_config.context_config.min_l1_data_gas_price_wei": 1,
4343
"consensus_manager_config.context_config.min_l1_gas_price_wei": 1000000000,
44-
"consensus_manager_config.context_config.override_eth_to_fri_rate": 0,
45-
"consensus_manager_config.context_config.override_eth_to_fri_rate.#is_none": true,
46-
"consensus_manager_config.context_config.override_l1_data_gas_price_wei": 0,
47-
"consensus_manager_config.context_config.override_l1_data_gas_price_wei.#is_none": true,
48-
"consensus_manager_config.context_config.override_l1_gas_price_wei": 0,
49-
"consensus_manager_config.context_config.override_l1_gas_price_wei.#is_none": true,
50-
"consensus_manager_config.context_config.override_l2_gas_price_fri": 0,
51-
"consensus_manager_config.context_config.override_l2_gas_price_fri.#is_none": true,
44+
"consensus_manager_config.context_config.override_eth_to_fri_rate": "$$$_CONSENSUS_MANAGER_CONFIG-CONTEXT_CONFIG-OVERRIDE_ETH_TO_FRI_RATE_$$$",
45+
"consensus_manager_config.context_config.override_eth_to_fri_rate.#is_none": "$$$_CONSENSUS_MANAGER_CONFIG-CONTEXT_CONFIG-OVERRIDE_ETH_TO_FRI_RATE-IS_NONE_$$$",
46+
"consensus_manager_config.context_config.override_l1_data_gas_price_wei": "$$$_CONSENSUS_MANAGER_CONFIG-CONTEXT_CONFIG-OVERRIDE_L1_DATA_GAS_PRICE_WEI_$$$",
47+
"consensus_manager_config.context_config.override_l1_data_gas_price_wei.#is_none": "$$$_CONSENSUS_MANAGER_CONFIG-CONTEXT_CONFIG-OVERRIDE_L1_DATA_GAS_PRICE_WEI-IS_NONE_$$$",
48+
"consensus_manager_config.context_config.override_l1_gas_price_wei": "$$$_CONSENSUS_MANAGER_CONFIG-CONTEXT_CONFIG-OVERRIDE_L1_GAS_PRICE_WEI_$$$",
49+
"consensus_manager_config.context_config.override_l1_gas_price_wei.#is_none": "$$$_CONSENSUS_MANAGER_CONFIG-CONTEXT_CONFIG-OVERRIDE_L1_GAS_PRICE_WEI-IS_NONE_$$$",
50+
"consensus_manager_config.context_config.override_l2_gas_price_fri": "$$$_CONSENSUS_MANAGER_CONFIG-CONTEXT_CONFIG-OVERRIDE_L2_GAS_PRICE_FRI_$$$",
51+
"consensus_manager_config.context_config.override_l2_gas_price_fri.#is_none": "$$$_CONSENSUS_MANAGER_CONFIG-CONTEXT_CONFIG-OVERRIDE_L2_GAS_PRICE_FRI-IS_NONE_$$$",
5252
"consensus_manager_config.context_config.proposal_buffer_size": 512,
5353
"consensus_manager_config.context_config.retrospective_block_hash_retry_interval_millis": 500,
5454
"consensus_manager_config.context_config.validate_proposal_margin_millis": 10000,

‎crates/apollo_deployments/resources/app_configs/replacer_gateway_config.json‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
2-
"gateway_config.authorized_declarer_accounts": "",
3-
"gateway_config.authorized_declarer_accounts.#is_none": true,
2+
"gateway_config.authorized_declarer_accounts": "$$$_GATEWAY_CONFIG-AUTHORIZED_DECLARER_ACCOUNTS_$$$",
3+
"gateway_config.authorized_declarer_accounts.#is_none": "$$$_GATEWAY_CONFIG-AUTHORIZED_DECLARER_ACCOUNTS-IS_NONE_$$$",
44
"gateway_config.block_declare": false,
55
"gateway_config.contract_class_manager_config.cairo_native_run_config.channel_size": 2000,
66
"gateway_config.contract_class_manager_config.cairo_native_run_config.native_classes_whitelist": "All",
@@ -17,7 +17,7 @@
1717
"gateway_config.contract_class_manager_config.native_compiler_config.max_memory_usage": 16106127360,
1818
"gateway_config.contract_class_manager_config.native_compiler_config.max_memory_usage.#is_none": false,
1919
"gateway_config.contract_class_manager_config.native_compiler_config.optimization_level": 2,
20-
"gateway_config.stateful_tx_validator_config.max_allowed_nonce_gap": 200,
20+
"gateway_config.stateful_tx_validator_config.max_allowed_nonce_gap": "$$$_GATEWAY_CONFIG-STATEFUL_TX_VALIDATOR_CONFIG-MAX_ALLOWED_NONCE_GAP_$$$",
2121
"gateway_config.stateful_tx_validator_config.max_nonce_for_validation_skip": "0x1",
2222
"gateway_config.stateful_tx_validator_config.min_gas_price_percentage": 100,
2323
"gateway_config.stateful_tx_validator_config.reject_future_declare_txs": true,
@@ -29,7 +29,7 @@
2929
"gateway_config.stateless_tx_validator_config.max_sierra_version.minor": 7,
3030
"gateway_config.stateless_tx_validator_config.max_sierra_version.patch": 0,
3131
"gateway_config.stateless_tx_validator_config.max_signature_length": 4000,
32-
"gateway_config.stateless_tx_validator_config.min_gas_price": 3000000000,
32+
"gateway_config.stateless_tx_validator_config.min_gas_price": "$$$_GATEWAY_CONFIG-STATELESS_TX_VALIDATOR_CONFIG-MIN_GAS_PRICE_$$$",
3333
"gateway_config.stateless_tx_validator_config.min_sierra_version.major": 1,
3434
"gateway_config.stateless_tx_validator_config.min_sierra_version.minor": 1,
3535
"gateway_config.stateless_tx_validator_config.min_sierra_version.patch": 0

‎crates/apollo_deployments/resources/app_configs/replacer_mempool_config.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
{
2-
"mempool_config.dynamic_config.transaction_ttl": 300,
2+
"mempool_config.dynamic_config.transaction_ttl": "$$$_MEMPOOL_CONFIG-DYNAMIC_CONFIG-TRANSACTION_TTL_$$$",
33
"mempool_config.static_config.capacity_in_bytes": 1073741824,
44
"mempool_config.static_config.committed_nonce_retention_block_count": 100,
55
"mempool_config.static_config.declare_delay": 20,

‎crates/apollo_deployments/resources/app_configs/replacer_sierra_compiler_config.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
{
2-
"sierra_compiler_config.max_bytecode_size": 81920,
2+
"sierra_compiler_config.max_bytecode_size": "$$$_SIERRA_COMPILER_CONFIG-MAX_BYTECODE_SIZE_$$$",
33
"sierra_compiler_config.max_memory_usage": 5368709120,
44
"sierra_compiler_config.max_memory_usage.#is_none": false
55
}

‎crates/apollo_deployments/resources/app_configs/replacer_versioned_constants_overrides_config.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"versioned_constants_overrides.invoke_tx_max_n_steps": 10000000,
3-
"versioned_constants_overrides.max_n_events": 1000,
3+
"versioned_constants_overrides.max_n_events": "$$$_VERSIONED_CONSTANTS_OVERRIDES-MAX_N_EVENTS_$$$",
44
"versioned_constants_overrides.max_recursion_depth": 50,
55
"versioned_constants_overrides.validate_max_n_steps": 1000000
66
}

‎crates/apollo_deployments/src/service.rs‎

Lines changed: 28 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@ use apollo_node_config::component_execution_config::{
1717
DEFAULT_URL,
1818
};
1919
use apollo_node_config::config_utils::{config_to_preset, prune_by_is_none};
20+
use phf::phf_set;
2021
use serde::ser::SerializeSeq;
2122
use serde::{Serialize, Serializer};
2223
use serde_json::{json, Map, Value};
@@ -53,6 +54,29 @@ use crate::update_strategy::UpdateStrategy;
5354

5455
const SERVICES_DIR_NAME: &str = "services/";
5556

57+
pub static KEYS_TO_BE_REPLACED: phf::Set<&'static str> = phf_set! {
58+
"batcher_config.block_builder_config.bouncer_config.block_max_capacity.n_events",
59+
"class_manager_config.class_manager_config.max_compiled_contract_class_object_size",
60+
"consensus_manager_config.consensus_manager_config.dynamic_config.timeouts.proposal.base",
61+
"consensus_manager_config.consensus_manager_config.dynamic_config.timeouts.proposal.max",
62+
"consensus_manager_config.context_config.build_proposal_margin_millis",
63+
"consensus_manager_config.context_config.override_eth_to_fri_rate",
64+
"consensus_manager_config.context_config.override_eth_to_fri_rate.#is_none",
65+
"consensus_manager_config.context_config.override_l1_data_gas_price_wei",
66+
"consensus_manager_config.context_config.override_l1_data_gas_price_wei.#is_none",
67+
"consensus_manager_config.context_config.override_l1_gas_price_wei",
68+
"consensus_manager_config.context_config.override_l1_gas_price_wei.#is_none",
69+
"consensus_manager_config.context_config.override_l2_gas_price_fri",
70+
"consensus_manager_config.context_config.override_l2_gas_price_fri.#is_none",
71+
"gateway_config.authorized_declarer_accounts",
72+
"gateway_config.authorized_declarer_accounts.#is_none",
73+
"gateway_config.stateful_tx_validator_config.max_allowed_nonce_gap",
74+
"gateway_config.stateless_tx_validator_config.min_gas_price",
75+
"mempool_config.dynamic_config.transaction_ttl",
76+
"sierra_compiler_config.max_bytecode_size",
77+
"versioned_constants_overrides.max_n_events",
78+
};
79+
5680
#[derive(Clone, Debug, PartialEq, Serialize)]
5781
pub struct Service {
5882
#[serde(rename = "name")]
@@ -536,6 +560,10 @@ impl NodeType {
536560
}
537561

538562
fn replace_pred(key: &str, value: &Value) -> bool {
563+
if KEYS_TO_BE_REPLACED.contains(key) {
564+
return true;
565+
}
566+
539567
// Condition 1: ports set by the infra: ".port" suffix and a non-zero integer value
540568
let port_cond = key.ends_with(".port") && value.as_u64().map(|n| n != 0).unwrap_or(false);
541569

0 commit comments

Comments
 (0)