Skip to content

apollo_deployment: add missing replacer configs #14005

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
ShahakShama wants to merge 1 commit into
base: main
Choose a base branch
from
+10 −4
Open

apollo_deployment: add missing replacer configs #14005

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions crates/apollo_deployments/resources/app_configs/replacer_batcher_config.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
"batcher_config.dynamic_config.n_concurrent_txs": "$$$_BATCHER_CONFIG-DYNAMIC_CONFIG-N_CONCURRENT_TXS_$$$",
"batcher_config.dynamic_config.proposer_idle_detection_delay_millis": "$$$_BATCHER_CONFIG-DYNAMIC_CONFIG-PROPOSER_IDLE_DETECTION_DELAY_MILLIS_$$$",
"batcher_config.dynamic_config.storage_reader_server_dynamic_config.enable": false,
"batcher_config.dynamic_config.tx_polling_interval_millis": 200,
"batcher_config.dynamic_config.tx_polling_interval_millis": "$$$_BATCHER_CONFIG-DYNAMIC_CONFIG-TX_POLLING_INTERVAL_MILLIS_$$$",
"batcher_config.static_config.block_builder_config.bouncer_config.block_max_capacity.l1_gas": 4400000,
"batcher_config.static_config.block_builder_config.bouncer_config.block_max_capacity.message_segment_length": 3700,
"batcher_config.static_config.block_builder_config.bouncer_config.block_max_capacity.n_events": "$$$_BATCHER_CONFIG-STATIC_CONFIG-BLOCK_BUILDER_CONFIG-BOUNCER_CONFIG-BLOCK_MAX_CAPACITY-N_EVENTS_$$$",
Expand All @@ -27,7 +27,7 @@
"batcher_config.static_config.commitment_manager_config.panic_if_task_channel_full": false,
"batcher_config.static_config.commitment_manager_config.results_channel_size": 1000,
"batcher_config.static_config.commitment_manager_config.tasks_channel_size": 1000,
"batcher_config.static_config.contract_class_manager_config.cairo_native_run_config.cairo_native_mode": "lazy_compilation",
"batcher_config.static_config.contract_class_manager_config.cairo_native_run_config.cairo_native_mode": "$$$_BATCHER_CONFIG-STATIC_CONFIG-CONTRACT_CLASS_MANAGER_CONFIG-CAIRO_NATIVE_RUN_CONFIG-CAIRO_NATIVE_MODE_$$$",
"batcher_config.static_config.contract_class_manager_config.cairo_native_run_config.channel_size": 2000,
"batcher_config.static_config.contract_class_manager_config.cairo_native_run_config.panic_on_compilation_failure": false,
"batcher_config.static_config.contract_class_manager_config.contract_cache_size": 2000,
Expand Down
4 changes: 2 additions & 2 deletions crates/apollo_deployments/resources/app_configs/replacer_gateway_config.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
"gateway_config.static_config.authorized_declarer_accounts": "$$$_GATEWAY_CONFIG-STATIC_CONFIG-AUTHORIZED_DECLARER_ACCOUNTS_$$$",
"gateway_config.static_config.authorized_declarer_accounts.#is_none": "$$$_GATEWAY_CONFIG-STATIC_CONFIG-AUTHORIZED_DECLARER_ACCOUNTS-IS_NONE_$$$",
"gateway_config.static_config.block_declare": false,
"gateway_config.static_config.contract_class_manager_config.cairo_native_run_config.cairo_native_mode": "lazy_compilation",
"gateway_config.static_config.contract_class_manager_config.cairo_native_run_config.cairo_native_mode": "$$$_GATEWAY_CONFIG-STATIC_CONFIG-CONTRACT_CLASS_MANAGER_CONFIG-CAIRO_NATIVE_RUN_CONFIG-CAIRO_NATIVE_MODE_$$$",
"gateway_config.static_config.contract_class_manager_config.cairo_native_run_config.channel_size": 2000,
"gateway_config.static_config.contract_class_manager_config.cairo_native_run_config.panic_on_compilation_failure": false,
"gateway_config.static_config.contract_class_manager_config.contract_cache_size": 300,
Expand All @@ -17,7 +17,7 @@
"gateway_config.static_config.stateful_tx_validator_config.max_nonce_for_validation_skip": "0x1",
"gateway_config.static_config.stateful_tx_validator_config.min_gas_price_percentage": 100,
"gateway_config.static_config.stateful_tx_validator_config.reject_future_declare_txs": true,
"gateway_config.static_config.stateless_tx_validator_config.allow_client_side_proving": true,
"gateway_config.static_config.stateless_tx_validator_config.allow_client_side_proving": "$$$_GATEWAY_CONFIG-STATIC_CONFIG-STATELESS_TX_VALIDATOR_CONFIG-ALLOW_CLIENT_SIDE_PROVING_$$$",
"gateway_config.static_config.stateless_tx_validator_config.max_calldata_length": 5000,
"gateway_config.static_config.stateless_tx_validator_config.max_contract_bytecode_size": "$$$_GATEWAY_CONFIG-STATIC_CONFIG-STATELESS_TX_VALIDATOR_CONFIG-MAX_CONTRACT_BYTECODE_SIZE_$$$",
"gateway_config.static_config.stateless_tx_validator_config.max_contract_class_object_size": 4089446,
Expand Down
6 changes: 6 additions & 0 deletions crates/apollo_deployments/src/service.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,17 +35,21 @@ const SERVICES_DIR_NAME: &str = "services/";
const REMOTE_SERVICE_URL_PLACEHOLDER: &str = "remote_service";

// TODO(Tsabary): remove ports and mempool ttl from this list.
// TODO(Shahak): unify the batcher and gateway `cairo_native_run_config.cairo_native_mode` values
// using the config pointer mechanism so both components always receive the same value.
pub static KEYS_TO_BE_REPLACED: phf::Set<&'static str> = phf_set! {
"base_layer_config.bpo1_start_block_number",
"base_layer_config.bpo2_start_block_number",
"base_layer_config.fusaka_no_bpo_start_block_number",
"base_layer_config.starknet_contract_address",
"batcher_config.dynamic_config.n_concurrent_txs",
"batcher_config.dynamic_config.proposer_idle_detection_delay_millis",
"batcher_config.dynamic_config.tx_polling_interval_millis",
"batcher_config.static_config.block_builder_config.bouncer_config.block_max_capacity.n_events",
"batcher_config.static_config.block_builder_config.bouncer_config.block_max_capacity.receipt_l2_gas",
"batcher_config.static_config.block_builder_config.bouncer_config.block_max_capacity.state_diff_size",
"batcher_config.static_config.block_builder_config.execute_config.n_workers",
"batcher_config.static_config.contract_class_manager_config.cairo_native_run_config.cairo_native_mode",
"batcher_config.static_config.first_block_with_partial_block_hash.#is_none",
"batcher_config.static_config.first_block_with_partial_block_hash.block_hash",
"batcher_config.static_config.first_block_with_partial_block_hash.block_number",
Expand Down Expand Up @@ -79,8 +83,10 @@ pub static KEYS_TO_BE_REPLACED: phf::Set<&'static str> = phf_set! {
"eth_fee_token_address",
"gateway_config.static_config.authorized_declarer_accounts.#is_none",
"gateway_config.static_config.authorized_declarer_accounts",
"gateway_config.static_config.contract_class_manager_config.cairo_native_run_config.cairo_native_mode",
"gateway_config.static_config.proof_archive_writer_config.bucket_name",
"gateway_config.static_config.stateful_tx_validator_config.max_allowed_nonce_gap",
"gateway_config.static_config.stateless_tx_validator_config.allow_client_side_proving",
"gateway_config.static_config.stateless_tx_validator_config.max_contract_bytecode_size",
"gateway_config.static_config.stateless_tx_validator_config.min_gas_price",
"http_server_config.static_config.port",
Expand Down
Loading