Skip to content

Commit 6fcaae6

Browse files
Itay-Tsabary-StarkwareItay-Tsabary-Starkware
authored
apollo_deployments: break instance and deployment replacers (#10745)
1 parent 187f930 commit 6fcaae6

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

42 files changed

+144
-121
lines changed

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,5 +2,6 @@
22
"base_layer_config.bpo1_start_block_number": 9456501,
33
"base_layer_config.bpo2_start_block_number": 9504747,
44
"base_layer_config.fusaka_no_bpo_start_block_number": 9408577,
5+
"base_layer_config.starknet_contract_address": "",
56
"base_layer_config.timeout_millis": 1000
67
}

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

Lines changed: 31 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -1,21 +1,12 @@
11
{
2+
"consensus_manager_config.assume_no_malicious_validators": true,
23
"consensus_manager_config.broadcast_buffer_size": 10000,
34
"consensus_manager_config.cende_config.max_retry_duration_secs": 3,
4-
"consensus_manager_config.cende_config.min_retry_interval_ms": 50,
55
"consensus_manager_config.cende_config.max_retry_interval_ms": 1000,
6+
"consensus_manager_config.cende_config.min_retry_interval_ms": 50,
67
"consensus_manager_config.consensus_manager_config.dynamic_config.future_msg_limit.future_height_limit": 20,
78
"consensus_manager_config.consensus_manager_config.dynamic_config.future_msg_limit.future_height_round_limit": 5,
89
"consensus_manager_config.consensus_manager_config.dynamic_config.future_msg_limit.future_round_limit": 20,
9-
"consensus_manager_config.consensus_manager_config.static_config.storage_config.db_config.enforce_file_exists": false,
10-
"consensus_manager_config.consensus_manager_config.static_config.storage_config.db_config.growth_step": 67108864,
11-
"consensus_manager_config.consensus_manager_config.static_config.storage_config.db_config.max_readers": 8192,
12-
"consensus_manager_config.consensus_manager_config.static_config.storage_config.db_config.max_size": 1099511627776,
13-
"consensus_manager_config.consensus_manager_config.static_config.storage_config.db_config.min_size": 1048576,
14-
"consensus_manager_config.consensus_manager_config.static_config.storage_config.db_config.path_prefix": "/data/consensus",
15-
"consensus_manager_config.consensus_manager_config.static_config.storage_config.mmap_file_config.growth_step": 2147483648,
16-
"consensus_manager_config.consensus_manager_config.static_config.storage_config.mmap_file_config.max_object_size": 1073741824,
17-
"consensus_manager_config.consensus_manager_config.static_config.storage_config.mmap_file_config.max_size": 1099511627776,
18-
"consensus_manager_config.consensus_manager_config.static_config.storage_config.scope": "StateOnly",
1910
"consensus_manager_config.consensus_manager_config.dynamic_config.sync_retry_interval": 1.0,
2011
"consensus_manager_config.consensus_manager_config.dynamic_config.timeouts.precommit.base": 1.0,
2112
"consensus_manager_config.consensus_manager_config.dynamic_config.timeouts.precommit.delta": 0.5,
@@ -27,30 +18,44 @@
2718
"consensus_manager_config.consensus_manager_config.dynamic_config.timeouts.proposal.delta": 0.0,
2819
"consensus_manager_config.consensus_manager_config.dynamic_config.timeouts.proposal.max": 15.0,
2920
"consensus_manager_config.consensus_manager_config.static_config.startup_delay": 15,
21+
"consensus_manager_config.consensus_manager_config.static_config.storage_config.db_config.enforce_file_exists": false,
22+
"consensus_manager_config.consensus_manager_config.static_config.storage_config.db_config.growth_step": 67108864,
23+
"consensus_manager_config.consensus_manager_config.static_config.storage_config.db_config.max_readers": 8192,
24+
"consensus_manager_config.consensus_manager_config.static_config.storage_config.db_config.max_size": 1099511627776,
25+
"consensus_manager_config.consensus_manager_config.static_config.storage_config.db_config.min_size": 1048576,
26+
"consensus_manager_config.consensus_manager_config.static_config.storage_config.db_config.path_prefix": "/data/consensus",
27+
"consensus_manager_config.consensus_manager_config.static_config.storage_config.mmap_file_config.growth_step": 2147483648,
28+
"consensus_manager_config.consensus_manager_config.static_config.storage_config.mmap_file_config.max_object_size": 1073741824,
29+
"consensus_manager_config.consensus_manager_config.static_config.storage_config.mmap_file_config.max_size": 1099511627776,
30+
"consensus_manager_config.consensus_manager_config.static_config.storage_config.scope": "StateOnly",
3031
"consensus_manager_config.context_config.block_timestamp_window_seconds": 1,
3132
"consensus_manager_config.context_config.build_proposal_margin_millis": 1000,
33+
"consensus_manager_config.context_config.build_proposal_time_ratio_for_retrospective_block_hash": 0.7,
3234
"consensus_manager_config.context_config.builder_address": "0x1176a1bd84444c89232ec27754698e5d2e7e1a7f1539f12027f28b23ec9f3d8",
33-
"consensus_manager_config.context_config.override_eth_to_fri_rate": 0,
35+
"consensus_manager_config.context_config.l1_da_mode": true,
36+
"consensus_manager_config.context_config.l1_data_gas_price_multiplier_ppt": 135,
37+
"consensus_manager_config.context_config.l1_gas_tip_wei": 1000000000,
38+
"consensus_manager_config.context_config.max_l1_data_gas_price_wei": 1000000000000,
39+
"consensus_manager_config.context_config.max_l1_gas_price_wei": 1000000000000,
40+
"consensus_manager_config.context_config.min_l1_data_gas_price_wei": 1,
41+
"consensus_manager_config.context_config.min_l1_gas_price_wei": 1000000000,
42+
"consensus_manager_config.context_config.num_validators": "",
3443
"consensus_manager_config.context_config.override_eth_to_fri_rate.#is_none": true,
35-
"consensus_manager_config.context_config.override_l1_data_gas_price_wei": 0,
44+
"consensus_manager_config.context_config.override_eth_to_fri_rate": 0,
3645
"consensus_manager_config.context_config.override_l1_data_gas_price_wei.#is_none": true,
37-
"consensus_manager_config.context_config.override_l1_gas_price_wei": 0,
46+
"consensus_manager_config.context_config.override_l1_data_gas_price_wei": 0,
3847
"consensus_manager_config.context_config.override_l1_gas_price_wei.#is_none": true,
39-
"consensus_manager_config.context_config.override_l2_gas_price_fri": 0,
48+
"consensus_manager_config.context_config.override_l1_gas_price_wei": 0,
4049
"consensus_manager_config.context_config.override_l2_gas_price_fri.#is_none": true,
41-
"consensus_manager_config.context_config.l1_da_mode": true,
42-
"consensus_manager_config.context_config.l1_data_gas_price_multiplier_ppt": 135,
43-
"consensus_manager_config.context_config.l1_gas_tip_wei": 1000000000,
50+
"consensus_manager_config.context_config.override_l2_gas_price_fri": 0,
4451
"consensus_manager_config.context_config.proposal_buffer_size": 512,
52+
"consensus_manager_config.context_config.retrospective_block_hash_retry_interval_millis": 500,
4553
"consensus_manager_config.context_config.validate_proposal_margin_millis": 10000,
46-
"consensus_manager_config.context_config.min_l1_gas_price_wei": 1000000000,
47-
"consensus_manager_config.context_config.max_l1_gas_price_wei": 1000000000000,
48-
"consensus_manager_config.context_config.min_l1_data_gas_price_wei": 1,
49-
"consensus_manager_config.context_config.max_l1_data_gas_price_wei": 1000000000000,
5054
"consensus_manager_config.context_config.validator_ids.#is_none": true,
51-
"consensus_manager_config.context_config.build_proposal_time_ratio_for_retrospective_block_hash": 0.7,
52-
"consensus_manager_config.context_config.retrospective_block_hash_retry_interval_millis": 500,
53-
"consensus_manager_config.assume_no_malicious_validators": true,
55+
"consensus_manager_config.network_config.advertised_multiaddr.#is_none": "",
56+
"consensus_manager_config.network_config.advertised_multiaddr": "",
57+
"consensus_manager_config.network_config.bootstrap_peer_multiaddr.#is_none": "",
58+
"consensus_manager_config.network_config.bootstrap_peer_multiaddr": "",
5459
"consensus_manager_config.network_config.broadcasted_message_metadata_buffer_size": 100000,
5560
"consensus_manager_config.network_config.discovery_config.bootstrap_dial_retry_config.base_delay_millis": 2,
5661
"consensus_manager_config.network_config.discovery_config.bootstrap_dial_retry_config.factor": 5,
@@ -59,6 +64,7 @@
5964
"consensus_manager_config.network_config.idle_connection_timeout": 120,
6065
"consensus_manager_config.network_config.peer_manager_config.malicious_timeout_seconds": 0,
6166
"consensus_manager_config.network_config.peer_manager_config.unstable_timeout_millis": 0,
67+
"consensus_manager_config.network_config.port": "",
6268
"consensus_manager_config.network_config.prune_dead_connections_ping_interval": 15,
6369
"consensus_manager_config.network_config.prune_dead_connections_ping_timeout": 20,
6470
"consensus_manager_config.network_config.reported_peer_ids_buffer_size": 100000,

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

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,12 @@
11
{
2+
"chain_id": "",
3+
"eth_fee_token_address": "",
24
"revert_config.revert_up_to_and_including": 18446744073709551615,
35
"revert_config.should_revert": false,
6+
"starknet_url": "",
7+
"strk_fee_token_address": "",
48
"validate_resource_bounds": true,
9+
"validator_id": "",
510
"versioned_constants_overrides.invoke_tx_max_n_steps": 10000000,
611
"versioned_constants_overrides.max_n_events": 1000,
712
"versioned_constants_overrides.max_recursion_depth": 50,

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
{
22
"http_server_config.ip": "0.0.0.0",
3+
"http_server_config.port": "",
34
"http_server_config.max_sierra_program_size": 4194304
45
}

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

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,10 @@
22
"mempool_p2p_config.max_concurrent_gateway_requests": 10000,
33
"mempool_p2p_config.max_transaction_batch_size": 75,
44
"mempool_p2p_config.network_buffer_size": 10000,
5+
"mempool_p2p_config.network_config.advertised_multiaddr.#is_none": "",
6+
"mempool_p2p_config.network_config.advertised_multiaddr": "",
7+
"mempool_p2p_config.network_config.bootstrap_peer_multiaddr.#is_none": "",
8+
"mempool_p2p_config.network_config.bootstrap_peer_multiaddr": "",
59
"mempool_p2p_config.network_config.broadcasted_message_metadata_buffer_size": 100000,
610
"mempool_p2p_config.network_config.discovery_config.bootstrap_dial_retry_config.base_delay_millis": 2,
711
"mempool_p2p_config.network_config.discovery_config.bootstrap_dial_retry_config.factor": 5,
@@ -10,6 +14,7 @@
1014
"mempool_p2p_config.network_config.idle_connection_timeout": 120,
1115
"mempool_p2p_config.network_config.peer_manager_config.malicious_timeout_seconds": 0,
1216
"mempool_p2p_config.network_config.peer_manager_config.unstable_timeout_millis": 0,
17+
"mempool_p2p_config.network_config.port": "",
1318
"mempool_p2p_config.network_config.prune_dead_connections_ping_interval": 15,
1419
"mempool_p2p_config.network_config.prune_dead_connections_ping_timeout": 20,
1520
"mempool_p2p_config.network_config.reported_peer_ids_buffer_size": 100000,

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
{
22
"monitoring_endpoint_config.ip": "0.0.0.0",
3+
"monitoring_endpoint_config.port": "",
34
"monitoring_config.collect_metrics": true,
45
"monitoring_config.collect_profiling_metrics": true
56
}

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,5 +2,6 @@
22
"base_layer_config.bpo1_start_block_number": "$$$_BASE_LAYER_CONFIG-BPO1_START_BLOCK_NUMBER_$$$",
33
"base_layer_config.bpo2_start_block_number": "$$$_BASE_LAYER_CONFIG-BPO2_START_BLOCK_NUMBER_$$$",
44
"base_layer_config.fusaka_no_bpo_start_block_number": "$$$_BASE_LAYER_CONFIG-FUSAKA_NO_BPO_START_BLOCK_NUMBER_$$$",
5+
"base_layer_config.starknet_contract_address": "$$$_BASE_LAYER_CONFIG-STARKNET_CONTRACT_ADDRESS_$$$",
56
"base_layer_config.timeout_millis": 1000
67
}

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

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -39,6 +39,7 @@
3939
"consensus_manager_config.context_config.max_l1_gas_price_wei": 1000000000000,
4040
"consensus_manager_config.context_config.min_l1_data_gas_price_wei": 1,
4141
"consensus_manager_config.context_config.min_l1_gas_price_wei": 1000000000,
42+
"consensus_manager_config.context_config.num_validators": "$$$_CONSENSUS_MANAGER_CONFIG-CONTEXT_CONFIG-NUM_VALIDATORS_$$$",
4243
"consensus_manager_config.context_config.override_eth_to_fri_rate": "$$$_CONSENSUS_MANAGER_CONFIG-CONTEXT_CONFIG-OVERRIDE_ETH_TO_FRI_RATE_$$$",
4344
"consensus_manager_config.context_config.override_eth_to_fri_rate.#is_none": "$$$_CONSENSUS_MANAGER_CONFIG-CONTEXT_CONFIG-OVERRIDE_ETH_TO_FRI_RATE-IS_NONE_$$$",
4445
"consensus_manager_config.context_config.override_l1_data_gas_price_wei": "$$$_CONSENSUS_MANAGER_CONFIG-CONTEXT_CONFIG-OVERRIDE_L1_DATA_GAS_PRICE_WEI_$$$",
@@ -51,6 +52,10 @@
5152
"consensus_manager_config.context_config.retrospective_block_hash_retry_interval_millis": 500,
5253
"consensus_manager_config.context_config.validate_proposal_margin_millis": 10000,
5354
"consensus_manager_config.context_config.validator_ids.#is_none": true,
55+
"consensus_manager_config.network_config.advertised_multiaddr": "$$$_CONSENSUS_MANAGER_CONFIG-NETWORK_CONFIG-ADVERTISED_MULTIADDR_$$$",
56+
"consensus_manager_config.network_config.advertised_multiaddr.#is_none": "$$$_CONSENSUS_MANAGER_CONFIG-NETWORK_CONFIG-ADVERTISED_MULTIADDR-IS_NONE_$$$",
57+
"consensus_manager_config.network_config.bootstrap_peer_multiaddr": "$$$_CONSENSUS_MANAGER_CONFIG-NETWORK_CONFIG-BOOTSTRAP_PEER_MULTIADDR_$$$",
58+
"consensus_manager_config.network_config.bootstrap_peer_multiaddr.#is_none": "$$$_CONSENSUS_MANAGER_CONFIG-NETWORK_CONFIG-BOOTSTRAP_PEER_MULTIADDR-IS_NONE_$$$",
5459
"consensus_manager_config.network_config.broadcasted_message_metadata_buffer_size": 100000,
5560
"consensus_manager_config.network_config.discovery_config.bootstrap_dial_retry_config.base_delay_millis": 2,
5661
"consensus_manager_config.network_config.discovery_config.bootstrap_dial_retry_config.factor": 5,
@@ -59,6 +64,7 @@
5964
"consensus_manager_config.network_config.idle_connection_timeout": 120,
6065
"consensus_manager_config.network_config.peer_manager_config.malicious_timeout_seconds": 0,
6166
"consensus_manager_config.network_config.peer_manager_config.unstable_timeout_millis": 0,
67+
"consensus_manager_config.network_config.port": "$$$_CONSENSUS_MANAGER_CONFIG-NETWORK_CONFIG-PORT_$$$",
6268
"consensus_manager_config.network_config.prune_dead_connections_ping_interval": 15,
6369
"consensus_manager_config.network_config.prune_dead_connections_ping_timeout": 20,
6470
"consensus_manager_config.network_config.reported_peer_ids_buffer_size": 100000,

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

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,12 @@
11
{
2+
"chain_id": "$$$_CHAIN_ID_$$$",
3+
"eth_fee_token_address": "$$$_ETH_FEE_TOKEN_ADDRESS_$$$",
24
"revert_config.revert_up_to_and_including": 18446744073709551615,
35
"revert_config.should_revert": false,
6+
"starknet_url": "$$$_STARKNET_URL_$$$",
7+
"strk_fee_token_address": "$$$_STRK_FEE_TOKEN_ADDRESS_$$$",
48
"validate_resource_bounds": true,
9+
"validator_id": "$$$_VALIDATOR_ID_$$$",
510
"versioned_constants_overrides.invoke_tx_max_n_steps": 10000000,
611
"versioned_constants_overrides.max_n_events": "$$$_VERSIONED_CONSTANTS_OVERRIDES-MAX_N_EVENTS_$$$",
712
"versioned_constants_overrides.max_recursion_depth": 50,

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

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
{
22
"http_server_config.ip": "0.0.0.0",
3-
"http_server_config.max_sierra_program_size": 4194304
3+
"http_server_config.max_sierra_program_size": 4194304,
4+
"http_server_config.port": "$$$_HTTP_SERVER_CONFIG-PORT_$$$"
45
}

0 commit comments

Comments
 (0)