diff --git a/Cargo.lock b/Cargo.lock index fbe87e33aff..f96dd4b6caa 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1556,7 +1556,6 @@ dependencies = [ "serde_json", "static_assertions", "strum", - "tempfile", "url", ] diff --git a/crates/apollo_deployments/Cargo.toml b/crates/apollo_deployments/Cargo.toml index 5e8de4ce2e8..52c9446447d 100644 --- a/crates/apollo_deployments/Cargo.toml +++ b/crates/apollo_deployments/Cargo.toml @@ -26,9 +26,4 @@ apollo_infra_utils = { workspace = true, features = ["testing"] } apollo_node_config = { workspace = true, features = ["testing"] } jrsonnet-evaluator = { workspace = true } jrsonnet-stdlib = { workspace = true } -tempfile.workspace = true url = { workspace = true, features = ["serde"] } - -[[bin]] -name = "deployment_generator" -path = "src/bin/deployment_generator.rs" diff --git a/crates/apollo_deployments/resources/app_configs/replacer_base_layer_config.json b/crates/apollo_deployments/resources/app_configs/replacer_base_layer_config.json deleted file mode 100644 index f0bd1ccf0ce..00000000000 --- a/crates/apollo_deployments/resources/app_configs/replacer_base_layer_config.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "base_layer_config.bpo1_start_block_number": "$$$_BASE_LAYER_CONFIG-BPO1_START_BLOCK_NUMBER_$$$", - "base_layer_config.bpo2_start_block_number": "$$$_BASE_LAYER_CONFIG-BPO2_START_BLOCK_NUMBER_$$$", - "base_layer_config.fusaka_no_bpo_start_block_number": "$$$_BASE_LAYER_CONFIG-FUSAKA_NO_BPO_START_BLOCK_NUMBER_$$$", - "base_layer_config.retry_primary_interval_seconds": 60, - "base_layer_config.starknet_contract_address": "$$$_BASE_LAYER_CONFIG-STARKNET_CONTRACT_ADDRESS_$$$", - "base_layer_config.timeout_millis": 1000 -} diff --git a/crates/apollo_deployments/resources/app_configs/replacer_batcher_config.json b/crates/apollo_deployments/resources/app_configs/replacer_batcher_config.json deleted file mode 100644 index 6fda4251374..00000000000 --- a/crates/apollo_deployments/resources/app_configs/replacer_batcher_config.json +++ /dev/null @@ -1,62 +0,0 @@ -{ - "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.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_$$$", - "batcher_config.static_config.block_builder_config.bouncer_config.block_max_capacity.n_txs": 500, - "batcher_config.static_config.block_builder_config.bouncer_config.block_max_capacity.proving_gas": 5000000000, - "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-RECEIPT_L2_GAS_$$$", - "batcher_config.static_config.block_builder_config.bouncer_config.block_max_capacity.sierra_gas": 5000000000, - "batcher_config.static_config.block_builder_config.bouncer_config.block_max_capacity.state_diff_size": "$$$_BATCHER_CONFIG-STATIC_CONFIG-BLOCK_BUILDER_CONFIG-BOUNCER_CONFIG-BLOCK_MAX_CAPACITY-STATE_DIFF_SIZE_$$$", - "batcher_config.static_config.block_builder_config.bouncer_config.builtin_instance_limits.add_mod": 3000000, - "batcher_config.static_config.block_builder_config.bouncer_config.builtin_instance_limits.bitwise": 10500000, - "batcher_config.static_config.block_builder_config.bouncer_config.builtin_instance_limits.blake": 1800000, - "batcher_config.static_config.block_builder_config.bouncer_config.builtin_instance_limits.ecdsa": 3000, - "batcher_config.static_config.block_builder_config.bouncer_config.builtin_instance_limits.ecop": 130000, - "batcher_config.static_config.block_builder_config.bouncer_config.builtin_instance_limits.keccak": 10000, - "batcher_config.static_config.block_builder_config.bouncer_config.builtin_instance_limits.mul_mod": 3000000, - "batcher_config.static_config.block_builder_config.bouncer_config.builtin_instance_limits.pedersen": 2000000, - "batcher_config.static_config.block_builder_config.bouncer_config.builtin_instance_limits.poseidon": 600000, - "batcher_config.static_config.block_builder_config.bouncer_config.builtin_instance_limits.range_check": 66666666, - "batcher_config.static_config.block_builder_config.bouncer_config.builtin_instance_limits.range_check96": 33519553, - "batcher_config.static_config.block_builder_config.execute_config.n_workers": "$$$_BATCHER_CONFIG-STATIC_CONFIG-BLOCK_BUILDER_CONFIG-EXECUTE_CONFIG-N_WORKERS_$$$", - "batcher_config.static_config.block_builder_config.execute_config.stack_size": 62914560, - "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.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, - "batcher_config.static_config.contract_class_manager_config.native_compiler_config.compiler_binary_path": "", - "batcher_config.static_config.contract_class_manager_config.native_compiler_config.compiler_binary_path.#is_none": true, - "batcher_config.static_config.contract_class_manager_config.native_compiler_config.max_file_size": 52428800, - "batcher_config.static_config.contract_class_manager_config.native_compiler_config.max_file_size.#is_none": false, - "batcher_config.static_config.contract_class_manager_config.native_compiler_config.max_memory_usage": 16106127360, - "batcher_config.static_config.contract_class_manager_config.native_compiler_config.optimization_level": 2, - "batcher_config.static_config.first_block_with_partial_block_hash.#is_none": "$$$_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_HASH_$$$", - "batcher_config.static_config.first_block_with_partial_block_hash.block_number": "$$$_BATCHER_CONFIG-STATIC_CONFIG-FIRST_BLOCK_WITH_PARTIAL_BLOCK_HASH-BLOCK_NUMBER_$$$", - "batcher_config.static_config.first_block_with_partial_block_hash.parent_block_hash": "$$$_BATCHER_CONFIG-STATIC_CONFIG-FIRST_BLOCK_WITH_PARTIAL_BLOCK_HASH-PARENT_BLOCK_HASH_$$$", - "batcher_config.static_config.input_stream_content_buffer_size": 4000, - "batcher_config.static_config.max_l1_handler_txs_per_block_proposal": 200, - "batcher_config.static_config.outstream_content_buffer_size": 64, - "batcher_config.static_config.pre_confirmed_block_writer_config.channel_buffer_capacity": 1000, - "batcher_config.static_config.pre_confirmed_block_writer_config.write_block_interval_millis": 50, - "batcher_config.static_config.propose_l1_txs_every": 10, - "batcher_config.static_config.storage.db_config.enforce_file_exists": false, - "batcher_config.static_config.storage.db_config.growth_step": 67108864, - "batcher_config.static_config.storage.db_config.max_readers": 8192, - "batcher_config.static_config.storage.db_config.max_size": 1099511627776, - "batcher_config.static_config.storage.db_config.min_size": 1048576, - "batcher_config.static_config.storage.db_config.path_prefix": "/data/batcher", - "batcher_config.static_config.storage.mmap_file_config.growth_step": 2147483648, - "batcher_config.static_config.storage.mmap_file_config.max_object_size": 1073741824, - "batcher_config.static_config.storage.mmap_file_config.max_size": 1099511627776, - "batcher_config.static_config.storage.scope": "StateOnly", - "batcher_config.static_config.storage_reader_server_static_config.ip": "0.0.0.0", - "batcher_config.static_config.storage_reader_server_static_config.port": 55011 -} diff --git a/crates/apollo_deployments/resources/app_configs/replacer_class_manager_config.json b/crates/apollo_deployments/resources/app_configs/replacer_class_manager_config.json deleted file mode 100644 index 9f5646ec5e0..00000000000 --- a/crates/apollo_deployments/resources/app_configs/replacer_class_manager_config.json +++ /dev/null @@ -1,19 +0,0 @@ -{ - "class_manager_config.dynamic_config.storage_reader_server_dynamic_config.enable": false, - "class_manager_config.static_config.class_manager_config.cached_class_storage_config.class_cache_size": 128, - "class_manager_config.static_config.class_manager_config.cached_class_storage_config.deprecated_class_cache_size": 128, - "class_manager_config.static_config.class_manager_config.max_compiled_contract_class_object_size": "$$$_CLASS_MANAGER_CONFIG-STATIC_CONFIG-CLASS_MANAGER_CONFIG-MAX_COMPILED_CONTRACT_CLASS_OBJECT_SIZE_$$$", - "class_manager_config.static_config.class_storage_config.class_hash_storage_config.db_config.enforce_file_exists": false, - "class_manager_config.static_config.class_storage_config.class_hash_storage_config.db_config.growth_step": 67108864, - "class_manager_config.static_config.class_storage_config.class_hash_storage_config.db_config.max_readers": 8192, - "class_manager_config.static_config.class_storage_config.class_hash_storage_config.db_config.max_size": 1099511627776, - "class_manager_config.static_config.class_storage_config.class_hash_storage_config.db_config.min_size": 1048576, - "class_manager_config.static_config.class_storage_config.class_hash_storage_config.db_config.path_prefix": "/data/class_manager/class_hash_storage", - "class_manager_config.static_config.class_storage_config.class_hash_storage_config.mmap_file_config.growth_step": 2147483648, - "class_manager_config.static_config.class_storage_config.class_hash_storage_config.mmap_file_config.max_object_size": 1073741824, - "class_manager_config.static_config.class_storage_config.class_hash_storage_config.mmap_file_config.max_size": 1099511627776, - "class_manager_config.static_config.class_storage_config.class_hash_storage_config.scope": "StateOnly", - "class_manager_config.static_config.class_storage_config.persistent_root": "/data/class_manager/classes", - "class_manager_config.static_config.class_storage_config.storage_reader_server_static_config.ip": "0.0.0.0", - "class_manager_config.static_config.class_storage_config.storage_reader_server_static_config.port": 55210 -} diff --git a/crates/apollo_deployments/resources/app_configs/replacer_committer_config.json b/crates/apollo_deployments/resources/app_configs/replacer_committer_config.json deleted file mode 100644 index 55d414c72e6..00000000000 --- a/crates/apollo_deployments/resources/app_configs/replacer_committer_config.json +++ /dev/null @@ -1,19 +0,0 @@ -{ - "committer_config.db_path": "/data/committer", - "committer_config.reader_config.build_storage_tries_concurrently": true, - "committer_config.reader_config.warn_on_trivial_modifications": false, - "committer_config.storage_config.cache_size": "$$$_COMMITTER_CONFIG-STORAGE_CONFIG-CACHE_SIZE_$$$", - "committer_config.storage_config.include_inner_stats": true, - "committer_config.storage_config.inner_storage_config.bloom_filter_bits": 10, - "committer_config.storage_config.inner_storage_config.bytes_per_sync": 1048576, - "committer_config.storage_config.inner_storage_config.cache_size": "$$$_COMMITTER_CONFIG-STORAGE_CONFIG-INNER_STORAGE_CONFIG-CACHE_SIZE_$$$", - "committer_config.storage_config.inner_storage_config.enable_statistics": true, - "committer_config.storage_config.inner_storage_config.max_background_jobs": 8, - "committer_config.storage_config.inner_storage_config.max_subcompactions": 8, - "committer_config.storage_config.inner_storage_config.max_write_buffers": 4, - "committer_config.storage_config.inner_storage_config.num_threads": 8, - "committer_config.storage_config.inner_storage_config.spawn_blocking_reads": true, - "committer_config.storage_config.inner_storage_config.use_mmap_reads": false, - "committer_config.storage_config.inner_storage_config.write_buffer_size": 134217728, - "committer_config.verify_state_diff_hash": "$$$_COMMITTER_CONFIG-VERIFY_STATE_DIFF_HASH_$$$" -} diff --git a/crates/apollo_deployments/resources/app_configs/replacer_config_manager_config.json b/crates/apollo_deployments/resources/app_configs/replacer_config_manager_config.json deleted file mode 100644 index 29c25c995b3..00000000000 --- a/crates/apollo_deployments/resources/app_configs/replacer_config_manager_config.json +++ /dev/null @@ -1,4 +0,0 @@ -{ - "config_manager_config.config_update_interval_secs": 60.0, - "config_manager_config.enable_config_updates": true -} diff --git a/crates/apollo_deployments/resources/app_configs/replacer_consensus_manager_config.json b/crates/apollo_deployments/resources/app_configs/replacer_consensus_manager_config.json deleted file mode 100644 index 10e371e1759..00000000000 --- a/crates/apollo_deployments/resources/app_configs/replacer_consensus_manager_config.json +++ /dev/null @@ -1,89 +0,0 @@ -{ - "consensus_manager_config.assume_no_malicious_validators": true, - "consensus_manager_config.broadcast_buffer_size": 10000, - "consensus_manager_config.cende_config.max_retry_duration_secs": 3, - "consensus_manager_config.cende_config.max_retry_interval_ms": 1000, - "consensus_manager_config.cende_config.min_retry_interval_ms": 50, - "consensus_manager_config.consensus_manager_config.dynamic_config.future_msg_limit.future_height_limit": 20, - "consensus_manager_config.consensus_manager_config.dynamic_config.future_msg_limit.future_height_round_limit": 5, - "consensus_manager_config.consensus_manager_config.dynamic_config.future_msg_limit.future_round_limit": 20, - "consensus_manager_config.consensus_manager_config.dynamic_config.require_virtual_proposer_vote": "$$$_CONSENSUS_MANAGER_CONFIG-CONSENSUS_MANAGER_CONFIG-DYNAMIC_CONFIG-REQUIRE_VIRTUAL_PROPOSER_VOTE_$$$", - "consensus_manager_config.consensus_manager_config.dynamic_config.stop_at_height": 0, - "consensus_manager_config.consensus_manager_config.dynamic_config.stop_at_height.#is_none": true, - "consensus_manager_config.consensus_manager_config.dynamic_config.sync_retry_interval": 1.0, - "consensus_manager_config.consensus_manager_config.dynamic_config.timeouts.precommit.base": 1.0, - "consensus_manager_config.consensus_manager_config.dynamic_config.timeouts.precommit.delta": 0.5, - "consensus_manager_config.consensus_manager_config.dynamic_config.timeouts.precommit.max": 5.0, - "consensus_manager_config.consensus_manager_config.dynamic_config.timeouts.prevote.base": 0.3, - "consensus_manager_config.consensus_manager_config.dynamic_config.timeouts.prevote.delta": 0.1, - "consensus_manager_config.consensus_manager_config.dynamic_config.timeouts.prevote.max": 1.0, - "consensus_manager_config.consensus_manager_config.dynamic_config.timeouts.proposal.base": "$$$_CONSENSUS_MANAGER_CONFIG-CONSENSUS_MANAGER_CONFIG-DYNAMIC_CONFIG-TIMEOUTS-PROPOSAL-BASE_$$$", - "consensus_manager_config.consensus_manager_config.dynamic_config.timeouts.proposal.delta": 0.0, - "consensus_manager_config.consensus_manager_config.dynamic_config.timeouts.proposal.max": "$$$_CONSENSUS_MANAGER_CONFIG-CONSENSUS_MANAGER_CONFIG-DYNAMIC_CONFIG-TIMEOUTS-PROPOSAL-MAX_$$$", - "consensus_manager_config.consensus_manager_config.static_config.skip_last_voted_height_check": false, - "consensus_manager_config.consensus_manager_config.static_config.startup_delay": 15, - "consensus_manager_config.consensus_manager_config.static_config.storage_config.db_config.enforce_file_exists": false, - "consensus_manager_config.consensus_manager_config.static_config.storage_config.db_config.growth_step": 67108864, - "consensus_manager_config.consensus_manager_config.static_config.storage_config.db_config.max_readers": 8192, - "consensus_manager_config.consensus_manager_config.static_config.storage_config.db_config.max_size": 1099511627776, - "consensus_manager_config.consensus_manager_config.static_config.storage_config.db_config.min_size": 1048576, - "consensus_manager_config.consensus_manager_config.static_config.storage_config.db_config.path_prefix": "/data/consensus", - "consensus_manager_config.consensus_manager_config.static_config.storage_config.mmap_file_config.growth_step": 2147483648, - "consensus_manager_config.consensus_manager_config.static_config.storage_config.mmap_file_config.max_object_size": 1073741824, - "consensus_manager_config.consensus_manager_config.static_config.storage_config.mmap_file_config.max_size": 1099511627776, - "consensus_manager_config.consensus_manager_config.static_config.storage_config.scope": "StateOnly", - "consensus_manager_config.context_config.dynamic_config.build_proposal_margin_millis": "$$$_CONSENSUS_MANAGER_CONFIG-CONTEXT_CONFIG-DYNAMIC_CONFIG-BUILD_PROPOSAL_MARGIN_MILLIS_$$$", - "consensus_manager_config.context_config.dynamic_config.compare_retrospective_block_hash": "$$$_CONSENSUS_MANAGER_CONFIG-CONTEXT_CONFIG-DYNAMIC_CONFIG-COMPARE_RETROSPECTIVE_BLOCK_HASH_$$$", - "consensus_manager_config.context_config.dynamic_config.l1_data_gas_price_multiplier_ppt": 135, - "consensus_manager_config.context_config.dynamic_config.l1_gas_tip_wei": 1000000000, - "consensus_manager_config.context_config.dynamic_config.max_l1_data_gas_price_wei": 1000000000000, - "consensus_manager_config.context_config.dynamic_config.max_l1_gas_price_wei": 1000000000000, - "consensus_manager_config.context_config.dynamic_config.min_l1_data_gas_price_wei": 1, - "consensus_manager_config.context_config.dynamic_config.min_l1_gas_price_wei": 1000000000, - "consensus_manager_config.context_config.dynamic_config.min_l2_gas_price_per_height": "$$$_CONSENSUS_MANAGER_CONFIG-CONTEXT_CONFIG-DYNAMIC_CONFIG-MIN_L2_GAS_PRICE_PER_HEIGHT_$$$", - "consensus_manager_config.context_config.dynamic_config.override_eth_to_fri_rate": "$$$_CONSENSUS_MANAGER_CONFIG-CONTEXT_CONFIG-DYNAMIC_CONFIG-OVERRIDE_ETH_TO_FRI_RATE_$$$", - "consensus_manager_config.context_config.dynamic_config.override_eth_to_fri_rate.#is_none": "$$$_CONSENSUS_MANAGER_CONFIG-CONTEXT_CONFIG-DYNAMIC_CONFIG-OVERRIDE_ETH_TO_FRI_RATE-IS_NONE_$$$", - "consensus_manager_config.context_config.dynamic_config.override_l1_data_gas_price_fri": "$$$_CONSENSUS_MANAGER_CONFIG-CONTEXT_CONFIG-DYNAMIC_CONFIG-OVERRIDE_L1_DATA_GAS_PRICE_FRI_$$$", - "consensus_manager_config.context_config.dynamic_config.override_l1_data_gas_price_fri.#is_none": "$$$_CONSENSUS_MANAGER_CONFIG-CONTEXT_CONFIG-DYNAMIC_CONFIG-OVERRIDE_L1_DATA_GAS_PRICE_FRI-IS_NONE_$$$", - "consensus_manager_config.context_config.dynamic_config.override_l1_gas_price_fri": "$$$_CONSENSUS_MANAGER_CONFIG-CONTEXT_CONFIG-DYNAMIC_CONFIG-OVERRIDE_L1_GAS_PRICE_FRI_$$$", - "consensus_manager_config.context_config.dynamic_config.override_l1_gas_price_fri.#is_none": "$$$_CONSENSUS_MANAGER_CONFIG-CONTEXT_CONFIG-DYNAMIC_CONFIG-OVERRIDE_L1_GAS_PRICE_FRI-IS_NONE_$$$", - "consensus_manager_config.context_config.dynamic_config.override_l2_gas_price_fri": "$$$_CONSENSUS_MANAGER_CONFIG-CONTEXT_CONFIG-DYNAMIC_CONFIG-OVERRIDE_L2_GAS_PRICE_FRI_$$$", - "consensus_manager_config.context_config.dynamic_config.override_l2_gas_price_fri.#is_none": "$$$_CONSENSUS_MANAGER_CONFIG-CONTEXT_CONFIG-DYNAMIC_CONFIG-OVERRIDE_L2_GAS_PRICE_FRI-IS_NONE_$$$", - "consensus_manager_config.context_config.dynamic_config.snip35_target_atto_usd_per_l2_gas": 880000000, - "consensus_manager_config.context_config.static_config.block_timestamp_window_seconds": 1, - "consensus_manager_config.context_config.static_config.build_proposal_time_ratio_for_retrospective_block_hash": 0.7, - "consensus_manager_config.context_config.static_config.builder_address": "0x1176a1bd84444c89232ec27754698e5d2e7e1a7f1539f12027f28b23ec9f3d8", - "consensus_manager_config.context_config.static_config.l1_da_mode": true, - "consensus_manager_config.context_config.static_config.proposal_buffer_size": 512, - "consensus_manager_config.context_config.static_config.retrospective_block_hash_retry_interval_millis": 500, - "consensus_manager_config.context_config.static_config.validate_proposal_margin_millis": 10000, - "consensus_manager_config.network_config.advertised_multiaddr": "$$$_CONSENSUS_MANAGER_CONFIG-NETWORK_CONFIG-ADVERTISED_MULTIADDR_$$$", - "consensus_manager_config.network_config.advertised_multiaddr.#is_none": "$$$_CONSENSUS_MANAGER_CONFIG-NETWORK_CONFIG-ADVERTISED_MULTIADDR-IS_NONE_$$$", - "consensus_manager_config.network_config.bootstrap_peer_multiaddr": "$$$_CONSENSUS_MANAGER_CONFIG-NETWORK_CONFIG-BOOTSTRAP_PEER_MULTIADDR_$$$", - "consensus_manager_config.network_config.bootstrap_peer_multiaddr.#is_none": "$$$_CONSENSUS_MANAGER_CONFIG-NETWORK_CONFIG-BOOTSTRAP_PEER_MULTIADDR-IS_NONE_$$$", - "consensus_manager_config.network_config.broadcasted_message_metadata_buffer_size": 100000, - "consensus_manager_config.network_config.discovery_config.bootstrap_dial_retry_config.base_delay_millis": 2, - "consensus_manager_config.network_config.discovery_config.bootstrap_dial_retry_config.factor": 5, - "consensus_manager_config.network_config.discovery_config.bootstrap_dial_retry_config.max_delay_seconds": 5, - "consensus_manager_config.network_config.discovery_config.bootstrap_dial_retry_config.new_connection_stabilization_millis": 2000, - "consensus_manager_config.network_config.discovery_config.heartbeat_interval": 100, - "consensus_manager_config.network_config.idle_connection_timeout": 120, - "consensus_manager_config.network_config.peer_manager_config.malicious_timeout_seconds": 0, - "consensus_manager_config.network_config.peer_manager_config.unstable_timeout_millis": 0, - "consensus_manager_config.network_config.port": "$$$_CONSENSUS_MANAGER_CONFIG-NETWORK_CONFIG-PORT_$$$", - "consensus_manager_config.network_config.prune_dead_connections_ping_interval": 15, - "consensus_manager_config.network_config.prune_dead_connections_ping_timeout": 20, - "consensus_manager_config.network_config.reported_peer_ids_buffer_size": 100000, - "consensus_manager_config.network_config.session_timeout": 120, - "consensus_manager_config.proposals_topic": "consensus_proposals", - "consensus_manager_config.staking_manager_config.dynamic_config.default_committee": "$$$_CONSENSUS_MANAGER_CONFIG-STAKING_MANAGER_CONFIG-DYNAMIC_CONFIG-DEFAULT_COMMITTEE_$$$", - "consensus_manager_config.staking_manager_config.dynamic_config.override_committee": "$$$_CONSENSUS_MANAGER_CONFIG-STAKING_MANAGER_CONFIG-DYNAMIC_CONFIG-OVERRIDE_COMMITTEE_$$$", - "consensus_manager_config.staking_manager_config.dynamic_config.override_committee.#is_none": "$$$_CONSENSUS_MANAGER_CONFIG-STAKING_MANAGER_CONFIG-DYNAMIC_CONFIG-OVERRIDE_COMMITTEE-IS_NONE_$$$", - "consensus_manager_config.staking_manager_config.static_config.max_cached_epochs": 10, - "consensus_manager_config.staking_manager_config.static_config.use_only_actual_proposer_selection": true, - "consensus_manager_config.stream_handler_config.channel_buffer_capacity": 1000, - "consensus_manager_config.stream_handler_config.max_message_buffer_size": 1000, - "consensus_manager_config.stream_handler_config.max_peers": 100, - "consensus_manager_config.stream_handler_config.max_streams": 100, - "consensus_manager_config.votes_topic": "consensus_votes" -} diff --git a/crates/apollo_deployments/resources/app_configs/replacer_gateway_config.json b/crates/apollo_deployments/resources/app_configs/replacer_gateway_config.json deleted file mode 100644 index 48597db6b77..00000000000 --- a/crates/apollo_deployments/resources/app_configs/replacer_gateway_config.json +++ /dev/null @@ -1,35 +0,0 @@ -{ - "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.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, - "gateway_config.static_config.contract_class_manager_config.native_compiler_config.compiler_binary_path": "", - "gateway_config.static_config.contract_class_manager_config.native_compiler_config.compiler_binary_path.#is_none": true, - "gateway_config.static_config.contract_class_manager_config.native_compiler_config.max_file_size": 52428800, - "gateway_config.static_config.contract_class_manager_config.native_compiler_config.max_file_size.#is_none": false, - "gateway_config.static_config.contract_class_manager_config.native_compiler_config.max_memory_usage": 16106127360, - "gateway_config.static_config.contract_class_manager_config.native_compiler_config.optimization_level": 2, - "gateway_config.static_config.max_concurrent_declare_compilations": 40, - "gateway_config.static_config.proof_archive_writer_config.bucket_name": "$$$_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-STATEFUL_TX_VALIDATOR_CONFIG-MAX_ALLOWED_NONCE_GAP_$$$", - "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.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, - "gateway_config.static_config.stateless_tx_validator_config.max_l2_gas_amount": 1210000000, - "gateway_config.static_config.stateless_tx_validator_config.max_proof_size": 480000, - "gateway_config.static_config.stateless_tx_validator_config.max_sierra_version.major": 1, - "gateway_config.static_config.stateless_tx_validator_config.max_sierra_version.minor": 9, - "gateway_config.static_config.stateless_tx_validator_config.max_sierra_version.patch": 0, - "gateway_config.static_config.stateless_tx_validator_config.max_signature_length": 4000, - "gateway_config.static_config.stateless_tx_validator_config.min_gas_price": "$$$_GATEWAY_CONFIG-STATIC_CONFIG-STATELESS_TX_VALIDATOR_CONFIG-MIN_GAS_PRICE_$$$", - "gateway_config.static_config.stateless_tx_validator_config.min_sierra_version.major": 1, - "gateway_config.static_config.stateless_tx_validator_config.min_sierra_version.minor": 1, - "gateway_config.static_config.stateless_tx_validator_config.min_sierra_version.patch": 0 -} diff --git a/crates/apollo_deployments/resources/app_configs/replacer_general_config.json b/crates/apollo_deployments/resources/app_configs/replacer_general_config.json deleted file mode 100644 index ba41da42198..00000000000 --- a/crates/apollo_deployments/resources/app_configs/replacer_general_config.json +++ /dev/null @@ -1,20 +0,0 @@ -{ - "behavior_mode": "starknet", - "chain_id": "$$$_CHAIN_ID_$$$", - "eth_fee_token_address": "$$$_ETH_FEE_TOKEN_ADDRESS_$$$", - "max_cpu_time": 600, - "native_classes_whitelist": "$$$_NATIVE_CLASSES_WHITELIST_$$$", - "recorder_url": "$$$_RECORDER_URL_$$$", - "revert_config.revert_up_to_and_including": 18446744073709551615, - "revert_config.should_revert": false, - "starknet_url": "$$$_STARKNET_URL_$$$", - "strk_fee_token_address": "$$$_STRK_FEE_TOKEN_ADDRESS_$$$", - "validate_resource_bounds": true, - "validation_only": false, - "validator_id": "$$$_VALIDATOR_ID_$$$", - "versioned_constants_overrides.#is_none": "$$$_VERSIONED_CONSTANTS_OVERRIDES-IS_NONE_$$$", - "versioned_constants_overrides.invoke_tx_max_n_steps": 10000000, - "versioned_constants_overrides.max_n_events": "$$$_VERSIONED_CONSTANTS_OVERRIDES-MAX_N_EVENTS_$$$", - "versioned_constants_overrides.max_recursion_depth": 50, - "versioned_constants_overrides.validate_max_n_steps": 1000000 -} diff --git a/crates/apollo_deployments/resources/app_configs/replacer_http_server_config.json b/crates/apollo_deployments/resources/app_configs/replacer_http_server_config.json deleted file mode 100644 index 56dbcb5266d..00000000000 --- a/crates/apollo_deployments/resources/app_configs/replacer_http_server_config.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "http_server_config.dynamic_config.accept_new_txs": true, - "http_server_config.dynamic_config.max_sierra_program_size": 4194304, - "http_server_config.static_config.dynamic_config_poll_interval": 1000, - "http_server_config.static_config.ip": "0.0.0.0", - "http_server_config.static_config.max_request_body_size": 5242880, - "http_server_config.static_config.port": "$$$_HTTP_SERVER_CONFIG-STATIC_CONFIG-PORT_$$$" -} diff --git a/crates/apollo_deployments/resources/app_configs/replacer_l1_events_provider_config.json b/crates/apollo_deployments/resources/app_configs/replacer_l1_events_provider_config.json deleted file mode 100644 index 1a71ccf4159..00000000000 --- a/crates/apollo_deployments/resources/app_configs/replacer_l1_events_provider_config.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "l1_events_provider_config.dummy_mode": false, - "l1_events_provider_config.l1_handler_cancellation_timelock_seconds": 300, - "l1_events_provider_config.l1_handler_consumption_timelock_seconds": 300.0, - "l1_events_provider_config.l1_handler_proposal_cooldown_seconds": 70, - "l1_events_provider_config.startup_sync_sleep_retry_interval_seconds": 2 -} diff --git a/crates/apollo_deployments/resources/app_configs/replacer_l1_events_scraper_config.json b/crates/apollo_deployments/resources/app_configs/replacer_l1_events_scraper_config.json deleted file mode 100644 index d1af3c3d6af..00000000000 --- a/crates/apollo_deployments/resources/app_configs/replacer_l1_events_scraper_config.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "l1_events_scraper_config.finality": 10, - "l1_events_scraper_config.l1_block_time_seconds": 12, - "l1_events_scraper_config.polling_interval_seconds": 30, - "l1_events_scraper_config.set_provider_historic_height_to_l2_genesis": false, - "l1_events_scraper_config.startup_rewind_time_seconds": 21600 -} diff --git a/crates/apollo_deployments/resources/app_configs/replacer_l1_gas_price_provider_config.json b/crates/apollo_deployments/resources/app_configs/replacer_l1_gas_price_provider_config.json deleted file mode 100644 index 8f211be6ace..00000000000 --- a/crates/apollo_deployments/resources/app_configs/replacer_l1_gas_price_provider_config.json +++ /dev/null @@ -1,12 +0,0 @@ -{ - "l1_gas_price_provider_config.eth_to_strk_oracle_config.lag_interval_seconds": 900, - "l1_gas_price_provider_config.eth_to_strk_oracle_config.max_cache_size": 100, - "l1_gas_price_provider_config.eth_to_strk_oracle_config.query_timeout_sec": 10, - "l1_gas_price_provider_config.lag_margin_seconds": 600, - "l1_gas_price_provider_config.max_time_gap_seconds": 900, - "l1_gas_price_provider_config.number_of_blocks_for_mean": 300, - "l1_gas_price_provider_config.storage_limit": 3000, - "l1_gas_price_provider_config.strk_to_usd_oracle_config.lag_interval_seconds": 900, - "l1_gas_price_provider_config.strk_to_usd_oracle_config.max_cache_size": 100, - "l1_gas_price_provider_config.strk_to_usd_oracle_config.query_timeout_sec": 10 -} diff --git a/crates/apollo_deployments/resources/app_configs/replacer_l1_gas_price_scraper_config.json b/crates/apollo_deployments/resources/app_configs/replacer_l1_gas_price_scraper_config.json deleted file mode 100644 index 27f88164491..00000000000 --- a/crates/apollo_deployments/resources/app_configs/replacer_l1_gas_price_scraper_config.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "l1_gas_price_scraper_config.finality": 10, - "l1_gas_price_scraper_config.number_of_blocks_for_mean": 300, - "l1_gas_price_scraper_config.polling_interval": 120, - "l1_gas_price_scraper_config.starting_block": 0, - "l1_gas_price_scraper_config.starting_block.#is_none": true, - "l1_gas_price_scraper_config.startup_num_blocks_multiplier": 2 -} diff --git a/crates/apollo_deployments/resources/app_configs/replacer_mempool_config.json b/crates/apollo_deployments/resources/app_configs/replacer_mempool_config.json deleted file mode 100644 index c7a33468795..00000000000 --- a/crates/apollo_deployments/resources/app_configs/replacer_mempool_config.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "mempool_config.dynamic_config.transaction_ttl": "$$$_MEMPOOL_CONFIG-DYNAMIC_CONFIG-TRANSACTION_TTL_$$$", - "mempool_config.static_config.capacity_in_bytes": 1073741824, - "mempool_config.static_config.committed_nonce_retention_block_count": 100, - "mempool_config.static_config.declare_delay": 20, - "mempool_config.static_config.enable_fee_escalation": true, - "mempool_config.static_config.fee_escalation_percentage": 10 -} diff --git a/crates/apollo_deployments/resources/app_configs/replacer_mempool_p2p_config.json b/crates/apollo_deployments/resources/app_configs/replacer_mempool_p2p_config.json deleted file mode 100644 index d54d10a00d0..00000000000 --- a/crates/apollo_deployments/resources/app_configs/replacer_mempool_p2p_config.json +++ /dev/null @@ -1,24 +0,0 @@ -{ - "mempool_p2p_config.max_concurrent_gateway_requests": 10000, - "mempool_p2p_config.max_transaction_batch_size": 75, - "mempool_p2p_config.network_buffer_size": 10000, - "mempool_p2p_config.network_config.advertised_multiaddr": "$$$_MEMPOOL_P2P_CONFIG-NETWORK_CONFIG-ADVERTISED_MULTIADDR_$$$", - "mempool_p2p_config.network_config.advertised_multiaddr.#is_none": "$$$_MEMPOOL_P2P_CONFIG-NETWORK_CONFIG-ADVERTISED_MULTIADDR-IS_NONE_$$$", - "mempool_p2p_config.network_config.bootstrap_peer_multiaddr": "$$$_MEMPOOL_P2P_CONFIG-NETWORK_CONFIG-BOOTSTRAP_PEER_MULTIADDR_$$$", - "mempool_p2p_config.network_config.bootstrap_peer_multiaddr.#is_none": "$$$_MEMPOOL_P2P_CONFIG-NETWORK_CONFIG-BOOTSTRAP_PEER_MULTIADDR-IS_NONE_$$$", - "mempool_p2p_config.network_config.broadcasted_message_metadata_buffer_size": 100000, - "mempool_p2p_config.network_config.discovery_config.bootstrap_dial_retry_config.base_delay_millis": 2, - "mempool_p2p_config.network_config.discovery_config.bootstrap_dial_retry_config.factor": 5, - "mempool_p2p_config.network_config.discovery_config.bootstrap_dial_retry_config.max_delay_seconds": 5, - "mempool_p2p_config.network_config.discovery_config.bootstrap_dial_retry_config.new_connection_stabilization_millis": 2000, - "mempool_p2p_config.network_config.discovery_config.heartbeat_interval": 100, - "mempool_p2p_config.network_config.idle_connection_timeout": 120, - "mempool_p2p_config.network_config.peer_manager_config.malicious_timeout_seconds": 0, - "mempool_p2p_config.network_config.peer_manager_config.unstable_timeout_millis": 0, - "mempool_p2p_config.network_config.port": "$$$_MEMPOOL_P2P_CONFIG-NETWORK_CONFIG-PORT_$$$", - "mempool_p2p_config.network_config.prune_dead_connections_ping_interval": 15, - "mempool_p2p_config.network_config.prune_dead_connections_ping_timeout": 20, - "mempool_p2p_config.network_config.reported_peer_ids_buffer_size": 100000, - "mempool_p2p_config.network_config.session_timeout": 120, - "mempool_p2p_config.transaction_batch_rate_millis": 100 -} diff --git a/crates/apollo_deployments/resources/app_configs/replacer_monitoring_endpoint_config.json b/crates/apollo_deployments/resources/app_configs/replacer_monitoring_endpoint_config.json deleted file mode 100644 index ece0312b14e..00000000000 --- a/crates/apollo_deployments/resources/app_configs/replacer_monitoring_endpoint_config.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "monitoring_config.collect_metrics": true, - "monitoring_config.collect_profiling_metrics": true, - "monitoring_endpoint_config.ip": "0.0.0.0", - "monitoring_endpoint_config.port": "$$$_MONITORING_ENDPOINT_CONFIG-PORT_$$$", - "monitoring_endpoint_config.snapshot_timeout_millis": 5000 -} diff --git a/crates/apollo_deployments/resources/app_configs/replacer_proof_manager_config.json b/crates/apollo_deployments/resources/app_configs/replacer_proof_manager_config.json deleted file mode 100644 index f89a1825cd5..00000000000 --- a/crates/apollo_deployments/resources/app_configs/replacer_proof_manager_config.json +++ /dev/null @@ -1,4 +0,0 @@ -{ - "proof_manager_config.cache_size": 500, - "proof_manager_config.persistent_root": "/data/proofs" -} diff --git a/crates/apollo_deployments/resources/app_configs/replacer_sierra_compiler_config.json b/crates/apollo_deployments/resources/app_configs/replacer_sierra_compiler_config.json deleted file mode 100644 index f21d4fb52aa..00000000000 --- a/crates/apollo_deployments/resources/app_configs/replacer_sierra_compiler_config.json +++ /dev/null @@ -1,5 +0,0 @@ -{ - "sierra_compiler_config.audited_libfuncs_only": "$$$_SIERRA_COMPILER_CONFIG-AUDITED_LIBFUNCS_ONLY_$$$", - "sierra_compiler_config.max_bytecode_size": "$$$_SIERRA_COMPILER_CONFIG-MAX_BYTECODE_SIZE_$$$", - "sierra_compiler_config.max_memory_usage": 5368709120 -} diff --git a/crates/apollo_deployments/resources/app_configs/replacer_state_sync_config.json b/crates/apollo_deployments/resources/app_configs/replacer_state_sync_config.json deleted file mode 100644 index e67f8ed27a8..00000000000 --- a/crates/apollo_deployments/resources/app_configs/replacer_state_sync_config.json +++ /dev/null @@ -1,69 +0,0 @@ -{ - "state_sync_config.dynamic_config.storage_reader_server_dynamic_config.enable": false, - "state_sync_config.static_config.central_sync_client_config.#is_none": "$$$_STATE_SYNC_CONFIG-STATIC_CONFIG-CENTRAL_SYNC_CLIENT_CONFIG-IS_NONE_$$$", - "state_sync_config.static_config.central_sync_client_config.central_source_config.class_cache_size": 128, - "state_sync_config.static_config.central_sync_client_config.central_source_config.concurrent_requests": 20, - "state_sync_config.static_config.central_sync_client_config.central_source_config.max_classes_to_download": 20, - "state_sync_config.static_config.central_sync_client_config.central_source_config.max_state_updates_to_download": 20, - "state_sync_config.static_config.central_sync_client_config.central_source_config.max_state_updates_to_store_in_memory": 20, - "state_sync_config.static_config.central_sync_client_config.central_source_config.retry_config.max_retries": 10, - "state_sync_config.static_config.central_sync_client_config.central_source_config.retry_config.retry_base_millis": 30, - "state_sync_config.static_config.central_sync_client_config.central_source_config.retry_config.retry_max_delay_millis": 30000, - "state_sync_config.static_config.central_sync_client_config.sync_config.base_layer_propagation_sleep_duration": 10, - "state_sync_config.static_config.central_sync_client_config.sync_config.blocks_before_tip_to_disable_batching": 100, - "state_sync_config.static_config.central_sync_client_config.sync_config.blocks_max_stream_size": 1000, - "state_sync_config.static_config.central_sync_client_config.sync_config.collect_pending_data": false, - "state_sync_config.static_config.central_sync_client_config.sync_config.latest_block_poll_interval_millis": 500, - "state_sync_config.static_config.central_sync_client_config.sync_config.recoverable_error_sleep_duration": 3, - "state_sync_config.static_config.central_sync_client_config.sync_config.state_updates_max_stream_size": 1000, - "state_sync_config.static_config.central_sync_client_config.sync_config.store_sierras_and_casms_block_threshold": "$$$_STATE_SYNC_CONFIG-STATIC_CONFIG-CENTRAL_SYNC_CLIENT_CONFIG-SYNC_CONFIG-STORE_SIERRAS_AND_CASMS_BLOCK_THRESHOLD_$$$", - "state_sync_config.static_config.central_sync_client_config.sync_config.verify_blocks": false, - "state_sync_config.static_config.network_config.#is_none": "$$$_STATE_SYNC_CONFIG-STATIC_CONFIG-NETWORK_CONFIG-IS_NONE_$$$", - "state_sync_config.static_config.network_config.advertised_multiaddr": "", - "state_sync_config.static_config.network_config.advertised_multiaddr.#is_none": true, - "state_sync_config.static_config.network_config.bootstrap_peer_multiaddr": "", - "state_sync_config.static_config.network_config.bootstrap_peer_multiaddr.#is_none": true, - "state_sync_config.static_config.network_config.broadcasted_message_metadata_buffer_size": 100000, - "state_sync_config.static_config.network_config.discovery_config.bootstrap_dial_retry_config.base_delay_millis": 2, - "state_sync_config.static_config.network_config.discovery_config.bootstrap_dial_retry_config.factor": 5, - "state_sync_config.static_config.network_config.discovery_config.bootstrap_dial_retry_config.max_delay_seconds": 5, - "state_sync_config.static_config.network_config.discovery_config.bootstrap_dial_retry_config.new_connection_stabilization_millis": 2000, - "state_sync_config.static_config.network_config.discovery_config.heartbeat_interval": 100, - "state_sync_config.static_config.network_config.idle_connection_timeout": 120, - "state_sync_config.static_config.network_config.peer_manager_config.malicious_timeout_seconds": 1, - "state_sync_config.static_config.network_config.peer_manager_config.unstable_timeout_millis": 1000, - "state_sync_config.static_config.network_config.port": "$$$_STATE_SYNC_CONFIG-STATIC_CONFIG-NETWORK_CONFIG-PORT_$$$", - "state_sync_config.static_config.network_config.prune_dead_connections_ping_interval": 15, - "state_sync_config.static_config.network_config.prune_dead_connections_ping_timeout": 20, - "state_sync_config.static_config.network_config.reported_peer_ids_buffer_size": 100000, - "state_sync_config.static_config.network_config.session_timeout": 120, - "state_sync_config.static_config.p2p_sync_client_config.#is_none": "$$$_STATE_SYNC_CONFIG-STATIC_CONFIG-P2P_SYNC_CLIENT_CONFIG-IS_NONE_$$$", - "state_sync_config.static_config.p2p_sync_client_config.buffer_size": 100000, - "state_sync_config.static_config.p2p_sync_client_config.num_block_classes_per_query": 100, - "state_sync_config.static_config.p2p_sync_client_config.num_block_state_diffs_per_query": 100, - "state_sync_config.static_config.p2p_sync_client_config.num_block_transactions_per_query": 100, - "state_sync_config.static_config.p2p_sync_client_config.num_headers_per_query": 10000, - "state_sync_config.static_config.p2p_sync_client_config.wait_period_for_new_data": 50, - "state_sync_config.static_config.p2p_sync_client_config.wait_period_for_other_protocol": 50, - "state_sync_config.static_config.rpc_config.apollo_gateway_retry_config.max_retries": 10, - "state_sync_config.static_config.rpc_config.apollo_gateway_retry_config.retry_base_millis": 30, - "state_sync_config.static_config.rpc_config.apollo_gateway_retry_config.retry_max_delay_millis": 1000, - "state_sync_config.static_config.rpc_config.collect_metrics": false, - "state_sync_config.static_config.rpc_config.execution_config.default_initial_gas_cost": 10000000000, - "state_sync_config.static_config.rpc_config.ip": "0.0.0.0", - "state_sync_config.static_config.rpc_config.max_events_chunk_size": 1000, - "state_sync_config.static_config.rpc_config.max_events_keys": 100, - "state_sync_config.static_config.rpc_config.port": "$$$_STATE_SYNC_CONFIG-STATIC_CONFIG-RPC_CONFIG-PORT_$$$", - "state_sync_config.static_config.storage_config.db_config.enforce_file_exists": false, - "state_sync_config.static_config.storage_config.db_config.growth_step": 67108864, - "state_sync_config.static_config.storage_config.db_config.max_readers": 8192, - "state_sync_config.static_config.storage_config.db_config.max_size": 1099511627776, - "state_sync_config.static_config.storage_config.db_config.min_size": 1048576, - "state_sync_config.static_config.storage_config.db_config.path_prefix": "/data/state_sync", - "state_sync_config.static_config.storage_config.mmap_file_config.growth_step": 2147483648, - "state_sync_config.static_config.storage_config.mmap_file_config.max_object_size": 1073741824, - "state_sync_config.static_config.storage_config.mmap_file_config.max_size": 1099511627776, - "state_sync_config.static_config.storage_config.scope": "FullArchive", - "state_sync_config.static_config.storage_reader_server_static_config.ip": "0.0.0.0", - "state_sync_config.static_config.storage_reader_server_static_config.port": 55014 -} diff --git a/crates/apollo_deployments/src/bin/deployment_generator.rs b/crates/apollo_deployments/src/bin/deployment_generator.rs deleted file mode 100644 index aa01555c802..00000000000 --- a/crates/apollo_deployments/src/bin/deployment_generator.rs +++ /dev/null @@ -1,18 +0,0 @@ -use std::env; - -use apollo_deployments::service::NodeType; -use apollo_infra_utils::path::resolve_project_relative_path; -use strum::IntoEnumIterator; - -/// Creates the deployment json file. -fn main() { - env::set_current_dir(resolve_project_relative_path("").unwrap()) - .expect("Couldn't set working dir."); - - for node_type in NodeType::iter() { - node_type.dump_service_component_configs(None); - for node_service in node_type.all_service_names() { - node_service.dump_node_service_replacer_app_config_files(); - } - } -} diff --git a/crates/apollo_deployments/src/deployment_definitions.rs b/crates/apollo_deployments/src/deployment_definitions.rs index 6105bf548fb..61ef56f0df4 100644 --- a/crates/apollo_deployments/src/deployment_definitions.rs +++ b/crates/apollo_deployments/src/deployment_definitions.rs @@ -5,7 +5,6 @@ use strum::{AsRefStr, Display, EnumIter}; #[path = "deployment_definitions_test.rs"] mod deployment_definitions_test; -pub(crate) const CONFIG_BASE_DIR: &str = "crates/apollo_deployments/resources/"; pub(crate) const RETRIES_FOR_L1_SERVICES: usize = 0; pub(crate) const BASE_APP_CONFIGS_DIR_PATH: &str = @@ -60,11 +59,4 @@ impl ComponentConfigInService { .map(|name| format!("{BASE_APP_CONFIGS_DIR_PATH}/{name}.json")) .collect() } - - pub fn get_replacer_component_config_file_paths(&self) -> Vec { - self.get_component_config_names() - .into_iter() - .map(|name| format!("{BASE_APP_CONFIGS_DIR_PATH}/replacer_{name}.json")) - .collect() - } } diff --git a/crates/apollo_deployments/src/deployment_definitions_test.rs b/crates/apollo_deployments/src/deployment_definitions_test.rs index d05f1ba6c9b..bc43f553ade 100644 --- a/crates/apollo_deployments/src/deployment_definitions_test.rs +++ b/crates/apollo_deployments/src/deployment_definitions_test.rs @@ -1,13 +1,11 @@ -use std::collections::{BTreeMap, BTreeSet, HashSet}; +use std::collections::{BTreeSet, HashSet}; use std::env; use std::fs::File; -use apollo_infra_utils::dumping::serialize_to_file; use apollo_infra_utils::path::resolve_project_relative_path; use apollo_node_config::config_utils::private_parameters; -use serde_json::{to_value, Map, Value}; +use serde_json::{to_value, Map}; use strum::IntoEnumIterator; -use tempfile::NamedTempFile; use crate::deployment_definitions::ComponentConfigInService; use crate::deployments::consolidated::ConsolidatedNodeServiceName; @@ -91,89 +89,6 @@ fn build_distributed_deserializes_into_node_config() { assert_build_deserializes::(); } -/// Test that the deployment file is up to date. -#[test] -fn deployment_files_are_up_to_date() { - env::set_current_dir(resolve_project_relative_path("").unwrap()) - .expect("Couldn't set working dir."); - - for node_type in NodeType::iter() { - node_type.test_dump_service_component_configs(None); - for node_service in node_type.all_service_names() { - node_service.test_dump_node_service_replacer_app_config_files(); - } - } -} - -/// Test that the deployment file is up to date. -#[test] -fn replacer_config_entries_are_in_config() { - env::set_current_dir(resolve_project_relative_path("").unwrap()) - .expect("Couldn't set working dir."); - - for node_type in NodeType::iter() { - node_type.test_all_replacers_are_accounted_for(); - } -} - -// TODO(Tsabary): consider adding a test that loads a config and validates it; the challenge will be -// to replace the values in a meaningful manner. Consider using the system test yaml files for that. - -// Test that each there are no duplicate config entries. -#[test] -fn duplicate_config_entries() { - env::set_current_dir(resolve_project_relative_path("").unwrap()) - .expect("Couldn't set working dir."); - - // Create a dummy secrets value and dump it as a config file. - let secrets_file = NamedTempFile::new().unwrap(); - let secrets_file_path = secrets_file.path().to_str().unwrap(); - let secrets_config_override = SecretsConfigOverride::default(); - serialize_to_file(&to_value(&secrets_config_override).unwrap(), secrets_file_path); - - for node_type in NodeType::iter() { - for node_service in node_type.all_service_names() { - let deployment_file_path = node_service.replacer_deployment_file_path(); - let deployment_file = File::open(deployment_file_path).unwrap(); - - let mut application_config_files: Vec = - serde_json::from_reader(deployment_file) - .map_err(|e| std::io::Error::new(std::io::ErrorKind::InvalidData, e)) - .unwrap(); - - // Add the secrets config file path to the config load command. - application_config_files.push(secrets_file_path.to_string()); - - let mut key_to_files: BTreeMap> = BTreeMap::new(); - for application_config_file in &application_config_files { - let file = File::open(application_config_file).unwrap(); - let json_map: Map = serde_json::from_reader(file) - .map_err(|e| std::io::Error::new(std::io::ErrorKind::InvalidData, e)) - .unwrap(); - - for key in json_map.keys() { - key_to_files - .entry(key.clone()) - .or_default() - .insert(application_config_file.to_string()); - } - } - - // Report duplicated keys - let mut has_duplicates = false; - for (key, files) in &key_to_files { - if files.len() > 1 { - has_duplicates = true; - println!( - "For node type {node_type} the key '{key}' was found in files: {files:?}" - ); - } - } - assert!(!has_duplicates, "Found duplicate keys in service config files."); - } - } -} - /// Test that the private values in the apollo node config schema match the secrets config override /// schema. #[test] diff --git a/crates/apollo_deployments/src/lib.rs b/crates/apollo_deployments/src/lib.rs index bf0c0ed3a8d..182ede194d1 100644 --- a/crates/apollo_deployments/src/lib.rs +++ b/crates/apollo_deployments/src/lib.rs @@ -4,7 +4,6 @@ pub mod deployment_definitions; pub mod deployments; #[cfg(test)] pub mod jsonnet; -pub(crate) mod replacers; pub(crate) mod scale_policy; pub mod service; #[cfg(test)] diff --git a/crates/apollo_deployments/src/replacers.rs b/crates/apollo_deployments/src/replacers.rs deleted file mode 100644 index 140c6c19f09..00000000000 --- a/crates/apollo_deployments/src/replacers.rs +++ /dev/null @@ -1,30 +0,0 @@ -use apollo_infra_utils::template::Template; -use serde_json::Value; -const REPLACER_FORMAT: &str = "$$$_{}_$$$"; - -pub(crate) fn insert_replacer_annotations(mut json: Value, pred: F) -> Value -where - F: Fn(&str, &Value) -> bool, -{ - let map = json.as_object_mut().expect("Should be a JSON object"); - - // Collect keys to avoid mutable borrow issues while iterating. - let keys: Vec = map.keys().cloned().collect(); - for key in keys { - let should_replace = { - // Evaluate predicate on current value - let value = map.get(&key).expect("Key must exist"); - pred(&key, value) - }; - - if should_replace { - map.insert(key.clone(), Value::String(format_key(key.clone()))); - } - } - - json -} - -fn format_key(key: String) -> String { - Template::new(REPLACER_FORMAT).format(&[&key]).to_uppercase().replace('.', "-").replace('#', "") -} diff --git a/crates/apollo_deployments/src/service.rs b/crates/apollo_deployments/src/service.rs index 8f275204310..4d4629cf4d1 100644 --- a/crates/apollo_deployments/src/service.rs +++ b/crates/apollo_deployments/src/service.rs @@ -1,39 +1,23 @@ -use std::collections::{BTreeMap, BTreeSet, HashMap, HashSet}; +use std::collections::{BTreeSet, HashMap, HashSet}; use std::fmt::Display; -use std::fs::File; -use std::io::Read; -use std::iter::once; -use std::path::{Path, PathBuf}; -use apollo_config::dumping::{prepend_sub_config_name, ser_param, SerializeConfig}; -use apollo_config::{ParamPath, ParamPrivacyInput, SerializedParam, FIELD_SEPARATOR, IS_NONE_MARK}; -use apollo_infra_utils::dumping::serialize_to_file; -#[cfg(test)] -use apollo_infra_utils::dumping::serialize_to_file_test; use apollo_node_config::component_config::ComponentConfig; -use apollo_node_config::component_execution_config::{ - ReactiveComponentExecutionConfig, - DEFAULT_INVALID_PORT, - DEFAULT_URL, -}; -use apollo_node_config::config_utils::{config_to_preset, prune_by_is_none}; +use apollo_node_config::component_execution_config::ReactiveComponentExecutionConfig; use phf::phf_set; use serde::{Serialize, Serializer}; -use serde_json::{from_str, json, Map, Value}; use strum::{Display, EnumDiscriminants, EnumIter, IntoEnumIterator, IntoStaticStr, VariantNames}; -use crate::deployment_definitions::{ComponentConfigInService, CONFIG_BASE_DIR}; +use crate::deployment_definitions::ComponentConfigInService; use crate::deployments::consolidated::ConsolidatedNodeServiceName; use crate::deployments::distributed::DistributedNodeServiceName; use crate::deployments::hybrid::HybridNodeServiceName; -use crate::replacers::insert_replacer_annotations; use crate::scale_policy::ScalePolicy; -#[cfg(test)] -use crate::test_utils::FIX_BINARY_NAME; -const SERVICES_DIR_NAME: &str = "services/"; const REMOTE_SERVICE_URL_PLACEHOLDER: &str = "remote_service"; +// The non-overridable config keys that the applicative-vs-`app_configs` guard +// (`jsonnet::test_applicative_matches_app_configs`) excludes from its comparison: deploy-time +// overridable values that the jsonnet applicative layer does not bake in. // TODO(Tsabary): remove ports and mempool ttl from this list. pub static KEYS_TO_BE_REPLACED: phf::Set<&'static str> = phf_set! { "base_layer_config.bpo1_start_block_number", @@ -121,22 +105,7 @@ pub enum NodeService { Distributed(DistributedNodeServiceName), } -// TODO(Tsabary): move p2p ports from the application configs to the replacer format. - impl NodeService { - pub fn replacer_deployment_file_path(&self) -> String { - PathBuf::from(CONFIG_BASE_DIR) - .join(SERVICES_DIR_NAME) - .join(NodeType::from(self).get_folder_name()) - .join(format!("replacer_deployment_{}.json", self.as_inner())) - .to_string_lossy() - .to_string() - } - - fn get_replacer_config_file_path(&self) -> String { - format!("replacer_{}.json", self.as_inner()) - } - fn as_inner(&self) -> &dyn ServiceNameInner { match self { NodeService::Consolidated(inner) => inner, @@ -145,78 +114,9 @@ impl NodeService { } } - fn get_replacer_service_file_path(&self) -> String { - PathBuf::from(CONFIG_BASE_DIR) - .join(SERVICES_DIR_NAME) - .join(NodeType::from(self).get_folder_name()) - .join(self.get_replacer_config_file_path()) - .to_string_lossy() - .to_string() - } - pub fn get_components_in_service(&self) -> BTreeSet { self.as_inner().get_components_in_service() } - - fn replacer_app_config_files(&self) -> Vec<(Value, String)> { - let components_in_service = self - .get_components_in_service() - .into_iter() - .flat_map(|c| c.get_component_config_file_paths()) - .collect::>(); - - let replacer_components_in_service = self - .get_components_in_service() - .into_iter() - .flat_map(|c| c.get_replacer_component_config_file_paths()) - .collect::>(); - - let replacer_app_config_data: Vec = components_in_service - .iter() - .map(|src| { - let src_path = Path::new(src); - // Read the app config file - let mut contents = String::new(); - File::open(src_path).unwrap().read_to_string(&mut contents).unwrap(); - - // Parse it as a json - let map: Map = - from_str(&contents).expect("JSON should be an object"); - let original_app_config = Value::Object(map); - - // Perform replacement - insert_replacer_annotations(original_app_config, replace_pred) - }) - .collect(); - - let mut data_and_file_paths: Vec<(Value, String)> = replacer_app_config_data - .into_iter() - .zip(replacer_components_in_service.clone()) - .collect(); - - let replacer_config_paths: Vec = replacer_components_in_service - .into_iter() - .chain(once(self.get_replacer_service_file_path())) - .collect(); - let replacer_deployment_file_path = self.replacer_deployment_file_path(); - - data_and_file_paths.push((replacer_config_paths.into(), replacer_deployment_file_path)); - - data_and_file_paths - } - - pub fn dump_node_service_replacer_app_config_files(&self) { - for (data, file_path) in self.replacer_app_config_files().into_iter() { - serialize_to_file(&data, &file_path); - } - } - - #[cfg(test)] - pub fn test_dump_node_service_replacer_app_config_files(&self) { - for (data, file_path) in self.replacer_app_config_files().into_iter() { - serialize_to_file_test(&data, &file_path, FIX_BINARY_NAME); - } - } } pub(crate) trait ServiceNameInner: Display { @@ -228,10 +128,6 @@ pub(crate) trait ServiceNameInner: Display { } impl NodeType { - fn get_folder_name(&self) -> String { - self.to_string() - } - pub fn all_service_names(&self) -> Vec { match self { // TODO(Tsabary): find a way to avoid this code duplication. @@ -277,105 +173,6 @@ impl NodeType { Self::Distributed => DistributedNodeServiceName::get_component_configs(ports), } } - - fn dump_component_configs_with(&self, ports: Option>, writer: SerdeFn) - where - SerdeFn: Fn(&serde_json::Value, &str), - { - let component_configs = self.get_component_configs(ports); - for (node_service, component_config) in component_configs { - let components_in_service = node_service.get_components_in_service(); - let wrapper = - ComponentConfigsSerializationWrapper::new(component_config, components_in_service); - let flattened = config_to_preset(&json!(wrapper.dump())); - let pruned = prune_by_is_none(flattened); - - // Dumping in the replacer format. - let pruned_with_replacer_annotations = - insert_replacer_annotations(pruned, replace_pred); - let file_path = node_service.get_replacer_service_file_path(); - writer(&pruned_with_replacer_annotations, &file_path); - } - } - - pub fn dump_service_component_configs(&self, ports: Option>) { - self.dump_component_configs_with(ports, |map, path| { - serialize_to_file(map, path); - }); - } - - #[cfg(test)] - pub fn test_dump_service_component_configs(&self, ports: Option>) { - self.dump_component_configs_with(ports, |map, path| { - serialize_to_file_test(map, path, FIX_BINARY_NAME); - }); - } - - #[cfg(test)] - pub fn test_all_replacers_are_accounted_for(&self) { - // Obtain the application config keys of each service. - let application_config_keys: HashSet = self - .all_service_names() - .iter() - .flat_map(|node_service| { - // TODO(Tsabary): consider wrapping this logic with a fn; more relevant once we're - // done transitioning to the new deployment mechanism. - node_service - .get_components_in_service() - .into_iter() - .flat_map(|c| c.get_component_config_file_paths()) - .collect::>() - .iter() - .flat_map(|src| { - let src_path = Path::new(src); - // Read the app config file - let mut contents = String::new(); - File::open(src_path).unwrap().read_to_string(&mut contents).unwrap(); - - // Extract keys - from_str::>(&contents) - .expect("JSON should be an object") - .into_iter() - .map(|(k, _)| k) - .collect::>() - }) - .collect::>() - }) - .collect::>(); - - let replacer_keys: HashSet = - KEYS_TO_BE_REPLACED.iter().copied().map(|item| item.to_string()).collect(); - - let unreplaced_keys: HashSet = - replacer_keys.difference(&application_config_keys).cloned().collect(); - - assert!( - unreplaced_keys.is_empty(), - "Some replacer keys are not part of the config: {unreplaced_keys:#?} - \nPlease update 'KEYS_TO_BE_REPLACED'" - ); - } -} - -fn replace_pred(key: &str, value: &Value) -> bool { - if KEYS_TO_BE_REPLACED.contains(key) { - return true; - } - - // Consider only ports and urls of `components.*` as candidates. - if !key.starts_with("components.") { - return false; - } - - let invalid_port: u64 = DEFAULT_INVALID_PORT.into(); - - // Component port: ".port" suffix with a non-invalid integer value. - let port_cond = key.ends_with(".port") && value.as_u64().is_some_and(|n| n != invalid_port); - - // Component service URL: ".url" suffix with a non-localhost string value. - let url_cond = key.ends_with(".url") && value.as_str().is_some_and(|s| s != DEFAULT_URL); - - port_cond || url_cond } pub(crate) trait GetComponentConfigs: ServiceNameInner { @@ -438,45 +235,3 @@ impl Serialize for NodeService { } } } - -// A helper struct for serializing the components config in the same hierarchy as of its -// serialization as part of the entire config, i.e., by prepending "components.". -#[derive(Clone, Debug, Default, Serialize)] -struct ComponentConfigsSerializationWrapper { - component_config: ComponentConfig, - components_in_service: BTreeSet, -} - -impl ComponentConfigsSerializationWrapper { - fn new( - component_config: ComponentConfig, - components_in_service: BTreeSet, - ) -> Self { - ComponentConfigsSerializationWrapper { component_config, components_in_service } - } -} - -impl SerializeConfig for ComponentConfigsSerializationWrapper { - fn dump(&self) -> BTreeMap { - let mut map = prepend_sub_config_name(self.component_config.dump(), "components"); - for component_config_in_service in ComponentConfigInService::iter() { - if component_config_in_service == ComponentConfigInService::General { - // General configs are not toggle-able, i.e., no need to add their existence to the - // service config. - continue; - } - let component_config_names = component_config_in_service.get_component_config_names(); - let is_in_service = self.components_in_service.contains(&component_config_in_service); - for component_config_name in component_config_names { - let (param_path, serialized_param) = ser_param( - &format!("{component_config_name}{FIELD_SEPARATOR}{IS_NONE_MARK}"), - &!is_in_service, // Marking the config as None. - "Placeholder description", - ParamPrivacyInput::Public, - ); - map.insert(param_path, serialized_param); - } - } - map - } -} diff --git a/crates/apollo_deployments/src/test_utils.rs b/crates/apollo_deployments/src/test_utils.rs index dfb296fdf5a..7f267fef841 100644 --- a/crates/apollo_deployments/src/test_utils.rs +++ b/crates/apollo_deployments/src/test_utils.rs @@ -7,8 +7,6 @@ use apollo_config::converters::{ use serde::{Serialize, Serializer}; use url::Url; -pub(crate) const FIX_BINARY_NAME: &str = "deployment_generator"; - /// Returns `true` if `prefix` is a path-prefix of the dotted config key `path`: either the same key /// or a dot-bounded ancestor of it (so `range_check` does not match the sibling `range_check96`). pub(crate) fn is_path_prefix(prefix: &str, path: &str) -> bool {