From f823794881b3f1a719fbdfa13170d717a0ea4ac1 Mon Sep 17 00:00:00 2001 From: Danil Date: Tue, 10 Sep 2024 14:50:21 +0200 Subject: [PATCH] Remove legacy Signed-off-by: Danil --- ZkStack.yaml | 5 +- chains/legacy/ZkStack.yaml | 15 - chains/legacy/configs/contracts.yaml | 28 -- chains/legacy/configs/external_node.yaml | 8 - chains/legacy/configs/general.yaml | 371 ----------------------- chains/legacy/configs/genesis.yaml | 14 - chains/legacy/configs/secrets.yaml | 8 - chains/legacy/configs/wallets.yaml | 18 -- contracts | 2 +- 9 files changed, 3 insertions(+), 466 deletions(-) delete mode 100644 chains/legacy/ZkStack.yaml delete mode 100644 chains/legacy/configs/contracts.yaml delete mode 100644 chains/legacy/configs/external_node.yaml delete mode 100644 chains/legacy/configs/general.yaml delete mode 100644 chains/legacy/configs/genesis.yaml delete mode 100644 chains/legacy/configs/secrets.yaml delete mode 100644 chains/legacy/configs/wallets.yaml diff --git a/ZkStack.yaml b/ZkStack.yaml index 7c0c4135b0db..33af09572190 100644 --- a/ZkStack.yaml +++ b/ZkStack.yaml @@ -1,10 +1,9 @@ name: zk l1_network: Localhost -link_to_code: /Users/danillugovskoy/matterlabs/zksync-era/. -bellman_cuda_dir: null +link_to_code: . chains: ./chains config: ./configs/ -default_chain: legacy +default_chain: era era_chain_id: 270 prover_version: NoProofs wallet_creation: Localhost diff --git a/chains/legacy/ZkStack.yaml b/chains/legacy/ZkStack.yaml deleted file mode 100644 index a6f583ac9b47..000000000000 --- a/chains/legacy/ZkStack.yaml +++ /dev/null @@ -1,15 +0,0 @@ -id: 2 -name: legacy -chain_id: 270 -prover_version: NoProofs -configs: /Users/danillugovskoy/matterlabs/zksync-era/./chains/legacy/configs/ -rocks_db_path: ./chains/legacy/db/ -external_node_config_path: null -artifacts_path: ./chains/legacy/artifacts/ -l1_batch_commit_data_generator_mode: Rollup -base_token: - address: '0x0000000000000000000000000000000000000001' - nominator: 1 - denominator: 1 -wallet_creation: Localhost -legacy_bridge: true diff --git a/chains/legacy/configs/contracts.yaml b/chains/legacy/configs/contracts.yaml deleted file mode 100644 index 784d54c6ea48..000000000000 --- a/chains/legacy/configs/contracts.yaml +++ /dev/null @@ -1,28 +0,0 @@ -create2_factory_addr: 0x2a55090d46e0c6a425686482d7ad2d0878100c74 -create2_factory_salt: 0x01ed16d75815c48dbbc0da97a9d5ade13360c4bfa2aa79be66ec45ad51acd9e6 -ecosystem_contracts: - bridgehub_proxy_addr: 0xb9b9960443d36185a9a8e344076739f18186c0a8 - state_transition_proxy_addr: 0xc92e48f7baaa75170653f814a2057820f8df2d91 - transparent_proxy_admin_addr: 0x6463933ee024bbd20f9530117c85447b20362e6d - validator_timelock_addr: 0xdd1a26a03bf75329e260198e8af14c628990f553 - diamond_cut_data: 0x00000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000060000000000000000000000000aa5c0e60d2cc72a7e8a2094fee23dc3922c7f6a80000000000000000000000000000000000000000000000000000000000000c400000000000000000000000000000000000000000000000000000000000000004000000000000000000000000000000000000000000000000000000000000008000000000000000000000000000000000000000000000000000000000000002c000000000000000000000000000000000000000000000000000000000000008800000000000000000000000000000000000000000000000000000000000000a200000000000000000000000005d7e587e0cbe35c9588138ece4b106c72180fc4b000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000080000000000000000000000000000000000000000000000000000000000000000d0e18b681000000000000000000000000000000000000000000000000000000001733894500000000000000000000000000000000000000000000000000000000fc57565f000000000000000000000000000000000000000000000000000000001cc5d1030000000000000000000000000000000000000000000000000000000021f603d700000000000000000000000000000000000000000000000000000000235d9eb50000000000000000000000000000000000000000000000000000000027ae4c16000000000000000000000000000000000000000000000000000000004623c91d000000000000000000000000000000000000000000000000000000004dd18bf50000000000000000000000000000000000000000000000000000000064bf8d6600000000000000000000000000000000000000000000000000000000a9f6d94100000000000000000000000000000000000000000000000000000000be6f11cf00000000000000000000000000000000000000000000000000000000e76db86500000000000000000000000000000000000000000000000000000000000000000000000000000000947742a26102ecf193fab586db080f3c00026220000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000080000000000000000000000000000000000000000000000000000000000000002906d49e5b00000000000000000000000000000000000000000000000000000000086a56f8000000000000000000000000000000000000000000000000000000000ec6b0b700000000000000000000000000000000000000000000000000000000fe26699e0000000000000000000000000000000000000000000000000000000018e3a941000000000000000000000000000000000000000000000000000000001de72e340000000000000000000000000000000000000000000000000000000029b98c670000000000000000000000000000000000000000000000000000000033ce93fe000000000000000000000000000000000000000000000000000000003591c1a000000000000000000000000000000000000000000000000000000000396073820000000000000000000000000000000000000000000000000000000046657fe90000000000000000000000000000000000000000000000000000000052ef6b2c000000000000000000000000000000000000000000000000000000005518c73b0000000000000000000000000000000000000000000000000000000056142d7a00000000000000000000000000000000000000000000000000000000631f4bac000000000000000000000000000000000000000000000000000000006e9960c30000000000000000000000000000000000000000000000000000000074f4d30d0000000000000000000000000000000000000000000000000000000079823c9a000000000000000000000000000000000000000000000000000000007a0ed627000000000000000000000000000000000000000000000000000000007b30c8da0000000000000000000000000000000000000000000000000000000098acd7a6000000000000000000000000000000000000000000000000000000009cd939e4000000000000000000000000000000000000000000000000000000009d1b5a8100000000000000000000000000000000000000000000000000000000a1954fc500000000000000000000000000000000000000000000000000000000adfca15e00000000000000000000000000000000000000000000000000000000af6a2dcd00000000000000000000000000000000000000000000000000000000b22dd78e00000000000000000000000000000000000000000000000000000000b8c2f66f00000000000000000000000000000000000000000000000000000000bd7c541200000000000000000000000000000000000000000000000000000000c3bbd2d700000000000000000000000000000000000000000000000000000000cdffacc600000000000000000000000000000000000000000000000000000000d046815600000000000000000000000000000000000000000000000000000000d86970d800000000000000000000000000000000000000000000000000000000db1f0bf900000000000000000000000000000000000000000000000000000000e5355c7500000000000000000000000000000000000000000000000000000000e81e0ba100000000000000000000000000000000000000000000000000000000ea6c029c00000000000000000000000000000000000000000000000000000000ef3f0bae00000000000000000000000000000000000000000000000000000000f5c1182c00000000000000000000000000000000000000000000000000000000facd743b00000000000000000000000000000000000000000000000000000000fd791f3c0000000000000000000000000000000000000000000000000000000000000000000000000000000076a290c691745a0a916c93d9ad7946d9efe6108f0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000800000000000000000000000000000000000000000000000000000000000000008042901c70000000000000000000000000000000000000000000000000000000012f43dab00000000000000000000000000000000000000000000000000000000eb67241900000000000000000000000000000000000000000000000000000000263b7f8e000000000000000000000000000000000000000000000000000000006c0960f900000000000000000000000000000000000000000000000000000000b473318e00000000000000000000000000000000000000000000000000000000c924de3500000000000000000000000000000000000000000000000000000000e4948f43000000000000000000000000000000000000000000000000000000000000000000000000000000008f823231e10f9ee91e5032fb6352c1153e22d13300000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000008000000000000000000000000000000000000000000000000000000000000000080f23da4300000000000000000000000000000000000000000000000000000000c3d93e7c000000000000000000000000000000000000000000000000000000006edd4f12000000000000000000000000000000000000000000000000000000006f497ac600000000000000000000000000000000000000000000000000000000701f58c5000000000000000000000000000000000000000000000000000000007f61885c0000000000000000000000000000000000000000000000000000000097c09d3400000000000000000000000000000000000000000000000000000000c37533bb0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001c00000000000000000000000007f697d731050b65e6a4aa85cf6021b39f5397ee5000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000010008e742608b21bf7eb23c1a9d0602047e3618b464c9b59c0fba3b3d7ab66e01000563374c277a2c1e34659a2a1e87371bb6d852ce142022d497bfb50b9e3200000000000000000000000000000000000000000000000000000000044aa200000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000f4240000000000000000000000000000000000000000000000000000000000001d4c00000000000000000000000000000000000000000000000000000000004c4b40000000000000000000000000000000000000000000000000000000000000182b8000000000000000000000000000000000000000000000000000000000ee6b280000000000000000000000000e6f00aca8499d5deb554b5b046af8f7f9155ee14 -bridges: - erc20: - l1_address: 0xa7a7021afa5f01ed52670774f86633e7d6c108d4 - l2_address: 0x54808b0474eed7df658e1f399ef4f1ebefef7821 - shared: - l1_address: 0xab67028647983a392d681251cb7b02b06b92d8e1 - l2_address: 0x54808b0474eed7df658e1f399ef4f1ebefef7821 -l1: - default_upgrade_addr: 0x79585b34d31d0f8c926fa347a0a4a4e7b473ff5b - diamond_proxy_addr: 0x79ac0f1a107c40e0efe3d3e246e61cdf68751aa4 - governance_addr: 0xbf0f4b2a2200324429906903b7a87bcd2890491e - chain_admin_addr: 0x3fdad288b64a075755520f31dcf191ecc2e3d08a - multicall3_addr: 0x6906587416503b399a1ef359d1450008a96e0947 - verifier_addr: 0x7f697d731050b65e6a4aa85cf6021b39f5397ee5 - validator_timelock_addr: 0xdd1a26a03bf75329e260198e8af14c628990f553 - base_token_addr: '0x0000000000000000000000000000000000000001' -l2: - testnet_paymaster_addr: '0x0000000000000000000000000000000000000000' - default_l2_upgrader: 0xb906e099af5089c46344b38416133659b56ef039 - consensus_registry: 0x50b03d08dfe689b0339ac757b769f30f86695330 diff --git a/chains/legacy/configs/external_node.yaml b/chains/legacy/configs/external_node.yaml deleted file mode 100644 index e97b04fb3900..000000000000 --- a/chains/legacy/configs/external_node.yaml +++ /dev/null @@ -1,8 +0,0 @@ -l1_chain_id: 9 -l2_chain_id: 270 -l1_batch_commit_data_generator_mode: Rollup - -main_node_url: http://localhost:3050 -main_node_rate_limit_rps: 1000 - -gateway_url: http://localhost:3052 diff --git a/chains/legacy/configs/general.yaml b/chains/legacy/configs/general.yaml deleted file mode 100644 index 0c4e144bf140..000000000000 --- a/chains/legacy/configs/general.yaml +++ /dev/null @@ -1,371 +0,0 @@ -postgres: - max_connections: 100 - statement_timeout_sec: 300 - test: - server_url: postgres://postgres:notsecurepassword@localhost:5433/zksync_local_test - prover_url: postgres://postgres:notsecurepassword@localhost:5433/prover_local_test -api: - web3_json_rpc: - http_port: 3150 - http_url: http://127.0.0.1:3150/ - ws_port: 3151 - ws_url: ws://127.0.0.1:3151/ - req_entities_limit: 10000 - filters_limit: 10000 - subscriptions_limit: 10000 - pubsub_polling_interval: 200 - max_nonce_ahead: 20 - gas_price_scale_factor: 1.5 - estimate_gas_scale_factor: 1.3 - estimate_gas_acceptable_overestimation: 5000 - max_tx_size: 1000000 - filters_disabled: false - api_namespaces: - - en - - eth - - net - - web3 - - zks - - pubsub - - debug - extended_api_tracing: false - prometheus: - listener_port: 3412 - pushgateway_url: http://127.0.0.1:9091 - push_interval_ms: 100 - healthcheck: - port: 3171 - merkle_tree: - port: 3172 -contract_verifier: - port: 3170 - url: http://127.0.0.1:3170/ - compilation_timeout: 240 - polling_interval: 1000 - threads_per_server: 128 - prometheus_port: 3314 -circuit_breaker: - sync_interval_ms: 120000 - http_req_max_retry_number: 10 - http_req_retry_interval_sec: 2 - replication_lag_limit_sec: 100 -mempool: - sync_interval_ms: 10 - sync_batch_size: 1000 - capacity: 10000000 - stuck_tx_timeout: 172800 - remove_stuck_txs: true - delay_interval: 100 -operations_manager: - delay_interval: 100 -state_keeper: - transaction_slots: 8192 - block_commit_deadline_ms: 2500 - miniblock_commit_deadline_ms: 1000 - miniblock_seal_queue_capacity: 10 - max_single_tx_gas: 15000000 - max_allowed_l2_tx_gas_limit: 15000000000 - reject_tx_at_geometry_percentage: 0.95 - reject_tx_at_eth_params_percentage: 0.95 - reject_tx_at_gas_percentage: 0.95 - close_block_at_geometry_percentage: 0.95 - close_block_at_eth_params_percentage: 0.95 - close_block_at_gas_percentage: 0.95 - minimal_l2_gas_price: 100000000 - compute_overhead_part: 0.0 - pubdata_overhead_part: 1.0 - batch_overhead_l1_gas: 800000 - max_gas_per_batch: 200000000 - max_pubdata_per_batch: 500000 - fee_model_version: V2 - validation_computational_gas_limit: 300000 - save_call_traces: true - max_circuits_per_batch: 31100 - miniblock_max_payload_size: 1000000 - protective_reads_persistence_enabled: false -house_keeper: - l1_batch_metrics_reporting_interval_ms: 10000 -prover: - setup_data_path: data/keys - prometheus_port: 3315 - max_attempts: 10 - generation_timeout_in_secs: 600 - setup_load_mode: FROM_DISK - specialized_group_id: 100 - queue_capacity: 10 - witness_vector_receiver_port: 3316 - zone_read_url: http://metadata.google.internal/computeMetadata/v1/instance/zone - shall_save_to_public_bucket: true - availability_check_interval_in_secs: 10000 - public_object_store: - file_backed: - file_backed_base_path: artifacts - max_retries: 10 - prover_object_store: - file_backed: - file_backed_base_path: artifacts - max_retries: 10 - cloud_type: LOCAL -prometheus: - listener_port: 3412 - pushgateway_url: http://127.0.0.1:9091 - push_interval_ms: 100 -db: - state_keeper_db_path: ./db/main/state_keeper - merkle_tree: - path: ./db/main/tree - mode: FULL - multi_get_chunk_size: 500 - block_cache_size_mb: 128 - memtable_capacity_mb: 256 - stalled_writes_timeout_sec: 60 - max_l1_batches_per_iter: 20 - experimental: - state_keeper_db_block_cache_capacity_mb: 128 - reads_persistence_enabled: false - processing_delay_ms: 0 - include_indices_and_filters_in_block_cache: false -eth: - sender: - aggregated_proof_sizes: - - 1 - wait_confirmations: 1 - tx_poll_period: 1 - aggregate_tx_poll_period: 1 - max_txs_in_flight: 30 - proof_sending_mode: SKIP_EVERY_PROOF - max_aggregated_tx_gas: 15000000 - max_eth_tx_data_size: 120000 - max_aggregated_blocks_to_commit: 1 - max_aggregated_blocks_to_execute: 45 - aggregated_block_commit_deadline: 1 - aggregated_block_prove_deadline: 10 - aggregated_block_execute_deadline: 10 - timestamp_criteria_max_allowed_lag: 30 - max_acceptable_priority_fee_in_gwei: 100000000000 - pubdata_sending_mode: BLOBS - tx_aggregation_paused: false - tx_aggregation_only_prove_and_execute: false - gas_adjuster: - default_priority_fee_per_gas: 1000000000 - max_base_fee_samples: 100 - pricing_formula_parameter_a: 1.5 - pricing_formula_parameter_b: 1.001 - internal_l1_pricing_multiplier: 0.8 - poll_period: 5 - num_samples_for_blob_base_fee_estimate: 10 - internal_pubdata_pricing_multiplier: 1.0 - watcher: - confirmations_for_eth_event: 0 - eth_node_poll_interval: 300 -witness_generator: - generation_timeout_in_secs: 900 - max_attempts: 10 - shall_save_to_public_bucket: true - prometheus_listener_port: 3116 - max_circuits_in_flight: 500 -witness_vector_generator: - max_prover_reservation_duration_in_secs: 1000 - prover_instance_wait_timeout_in_secs: 200 - prover_instance_poll_time_in_milli_secs: 250 - prometheus_listener_port: 3420 - prometheus_pushgateway_url: http://127.0.0.1:9091 - prometheus_push_interval_ms: 100 - specialized_group_id: 100 -proof_compressor: - compression_mode: 1 - prometheus_listener_port: 3321 - prometheus_pushgateway_url: http://127.0.0.1:9091 - prometheus_push_interval_ms: 100 - generation_timeout_in_secs: 3600 - max_attempts: 5 - universal_setup_path: keys/setup/setup_2^24.key - universal_setup_download_url: https://storage.googleapis.com/matterlabs-setup-keys-us/setup-keys/setup_2^24.key - verify_wrapper_proof: true -data_handler: - http_port: 3320 - proof_generation_timeout_in_secs: 18000 - tee_support: true -prover_group: - group_0: - - circuit_id: 1 - aggregation_round: 4 - - circuit_id: 2 - aggregation_round: 2 - - circuit_id: 255 - aggregation_round: 0 - group_1: - - circuit_id: 1 - aggregation_round: 0 - group_2: - - circuit_id: 2 - aggregation_round: 0 - - circuit_id: 4 - aggregation_round: 0 - - circuit_id: 6 - aggregation_round: 0 - - circuit_id: 9 - aggregation_round: 0 - group_3: - - circuit_id: 3 - aggregation_round: 0 - group_4: - - circuit_id: 11 - aggregation_round: 0 - - circuit_id: 12 - aggregation_round: 0 - - circuit_id: 13 - aggregation_round: 0 - group_5: - - circuit_id: 5 - aggregation_round: 0 - group_6: - - circuit_id: 3 - aggregation_round: 1 - group_7: - - circuit_id: 7 - aggregation_round: 0 - group_8: - - circuit_id: 8 - aggregation_round: 0 - group_9: - - circuit_id: 12 - aggregation_round: 1 - - circuit_id: 13 - aggregation_round: 1 - - circuit_id: 14 - aggregation_round: 1 - - circuit_id: 15 - aggregation_round: 1 - group_10: - - circuit_id: 10 - aggregation_round: 0 - group_11: - - circuit_id: 7 - aggregation_round: 1 - - circuit_id: 8 - aggregation_round: 1 - - circuit_id: 10 - aggregation_round: 1 - - circuit_id: 11 - aggregation_round: 1 - group_12: - - circuit_id: 4 - aggregation_round: 1 - - circuit_id: 5 - aggregation_round: 1 - - circuit_id: 6 - aggregation_round: 1 - - circuit_id: 9 - aggregation_round: 1 - group_13: - - circuit_id: 14 - aggregation_round: 0 - - circuit_id: 15 - aggregation_round: 0 - - circuit_id: 255 - aggregation_round: 0 - group_14: - - circuit_id: 16 - aggregation_round: 1 - - circuit_id: 17 - aggregation_round: 1 - - circuit_id: 18 - aggregation_round: 1 -prover_gateway: - api_url: http://127.0.0.1:3320 - api_poll_duration_secs: 1000 - prometheus_listener_port: 3310 - prometheus_pushgateway_url: http://127.0.0.1:9091 - prometheus_push_interval_ms: 100 -snapshot_creator: - storage_logs_chunk_size: 1000000 - concurrent_queries_count: 25 - object_store: - file_backed: - file_backed_base_path: artifacts - max_retries: 10 - version: 0 -observability: - log_format: plain - log_directives: zksync_node_test_utils=info,zksync_state_keeper=info,zksync_reorg_detector=info,zksync_consistency_checker=info,zksync_metadata_calculator=info,zksync_node_sync=info,zksync_node_consensus=info,zksync_contract_verification_server=info,zksync_node_api_server=info,zksync_tee_verifier_input_producer=info,zksync_node_framework=info,zksync_block_reverter=info,zksync_commitment_generator=info,zksync_node_db_pruner=info,zksync_eth_sender=info,zksync_node_fee_model=info,zksync_node_genesis=info,zksync_house_keeper=info,zksync_proof_data_handler=info,zksync_shared_metrics=info,zksync_node_test_utils=info,zksync_vm_runner=info,zksync_consensus_bft=info,zksync_consensus_network=info,zksync_consensus_storage=info,zksync_core_leftovers=debug,zksync_server=debug,zksync_contract_verifier=debug,zksync_dal=info,zksync_db_connection=info,zksync_eth_client=info,zksync_eth_watch=debug,zksync_storage=info,zksync_db_manager=info,zksync_merkle_tree=info,zksync_state=debug,zksync_utils=debug,zksync_queued_job_processor=info,zksync_types=info,zksync_mempool=debug,loadnext=info,vm=info,zksync_object_store=info,zksync_external_node=info,zksync_witness_generator=info,zksync_prover_fri=info,zksync_witness_vector_generator=info,zksync_web3_decl=debug,zksync_health_check=debug,zksync_proof_fri_compressor=info,vise_exporter=error,snapshots_creator=debug,zksync_base_token_adjuster=debug,zksync_external_price_api=debug,zksync_external_proof_integration_api=info -protective_reads_writer: - db_path: ./db/main/protective_reads - window_size: 3 - first_processed_batch: 0 -core_object_store: - file_backed: - file_backed_base_path: artifacts - max_retries: 10 -snapshot_recovery: - enabled: false - postgres: - max_concurrency: 10 - tree: - chunk_size: 200000 - object_store: - file_backed: - file_backed_base_path: artifacts - max_retries: 100 - experimental: - tree_recovery_parallel_persistence_buffer: 1 - drop_storage_key_preimages: true -pruning: - enabled: true - chunk_size: 10 - removal_delay_sec: 60 - data_retention_sec: 3600 -commitment_generator: - max_parallelism: 10 -da_dispatcher: - polling_interval_ms: 5000 - max_rows_to_dispatch: 100 - max_retries: 5 -base_token_adjuster: - price_polling_interval_ms: 30000 - price_cache_update_interval_ms: 2000 - max_tx_gas: 80000 - default_priority_fee_per_gas: 1000000 - max_acceptable_priority_fee_in_gwei: 100000000000 - l1_receipt_checking_sleep_ms: 30000 - l1_receipt_checking_max_attempts: 3 - l1_tx_sending_max_attempts: 3 - l1_tx_sending_sleep_ms: 30000 - halt_on_error: false - price_fetching_max_attempts: 3 - price_fetching_sleep_ms: 5000 - l1_update_deviation_percentage: 10 -basic_witness_input_producer: - db_path: ./db/main/basic_witness_input_producer - window_size: 3 - first_processed_batch: 0 -external_price_api_client: - source: forced - client_timeout_ms: 10000 - forced_numerator: 3 - forced_denominator: 2 -external_proof_integration_api: - http_port: 3073 -experimental_vm: - playground: - fast_vm_mode: SHADOW - db_path: ./db/main/vm_playground - first_processed_batch: 0 - reset: false - window_size: 1 - state_keeper_fast_vm_mode: OLD -prover_job_monitor: - prometheus_port: 3317 - max_db_connections: 9 - graceful_shutdown_timeout_ms: 5000 - gpu_prover_archiver_run_interval_ms: 86400000 - gpu_prover_archiver_archive_prover_after_ms: 172800000 - prover_jobs_archiver_run_interval_ms: 1800000 - prover_jobs_archiver_archive_jobs_after_ms: 172800000 - proof_compressor_job_requeuer_run_interval_ms: 10000 - prover_job_requeuer_run_interval_ms: 10000 - witness_generator_job_requeuer_run_interval_ms: 10000 - proof_compressor_queue_reporter_run_interval_ms: 10000 - prover_queue_reporter_run_interval_ms: 10000 - witness_generator_queue_reporter_run_interval_ms: 10000 - witness_job_queuer_run_interval_ms: 10000 diff --git a/chains/legacy/configs/genesis.yaml b/chains/legacy/configs/genesis.yaml deleted file mode 100644 index f4d655520ecb..000000000000 --- a/chains/legacy/configs/genesis.yaml +++ /dev/null @@ -1,14 +0,0 @@ -genesis_root: 0xabdb766b18a479a5c783a4b80e12686bc8ea3cc2d8a3050491b701d72370ebb5 -genesis_rollup_leaf_index: 54 -genesis_batch_commitment: 0x2d00e5f8d77afcebf58a6b82ae56ba967566fe7dfbcb6760319fb0d215d18ffd -genesis_protocol_version: 24 -default_aa_hash: 0x01000563374c277a2c1e34659a2a1e87371bb6d852ce142022d497bfb50b9e32 -bootloader_hash: 0x010008e742608b21bf7eb23c1a9d0602047e3618b464c9b59c0fba3b3d7ab66e -l1_chain_id: 9 -l2_chain_id: 270 -fee_account: '0x0000000000000000000000000000000000000001' -prover: - dummy_verifier: true - snark_wrapper_vk_hash: 0x14f97b81e54b35fe673d8708cc1a19e1ea5b5e348e12d31e39824ed4f42bbca2 -genesis_protocol_semantic_version: 0.24.2 -l1_batch_commit_data_generator_mode: Rollup diff --git a/chains/legacy/configs/secrets.yaml b/chains/legacy/configs/secrets.yaml deleted file mode 100644 index da7900a60e7f..000000000000 --- a/chains/legacy/configs/secrets.yaml +++ /dev/null @@ -1,8 +0,0 @@ -database: - server_url: postgres://postgres:notsecurepassword@localhost/zksync_local - prover_url: postgres://postgres:notsecurepassword@localhost/prover_local -l1: - l1_rpc_url: http://127.0.0.1:8545/ -consensus: - validator_key: validator:secret:bls12_381:3cf20d771450fcd0cbb3839b21cab41161af1554e35d8407a53b0a5d98ff04d4 - node_key: node:secret:ed25519:9a40791b5a6b1627fc538b1ddecfa843bd7c4cd01fc0a4d0da186f9d3e740d7c diff --git a/chains/legacy/configs/wallets.yaml b/chains/legacy/configs/wallets.yaml deleted file mode 100644 index 9dae092ef9a2..000000000000 --- a/chains/legacy/configs/wallets.yaml +++ /dev/null @@ -1,18 +0,0 @@ -deployer: - address: 0x270bd7c1befd1d4a316afe572cf2353827970ea3 - private_key: 0x91ccb83575c6861cefc58176d5096904115b5b0e62bec849aec5651be5817677 -operator: - address: 0xaff61e1f5d7a2218a5091e62b3be211838dd29ea - private_key: 0x2ba3da33dfce9a900debd8abf729935a799b93e57351b4928f5cea3f4d2460bc -blob_operator: - address: 0xf1be899ac8ce10f48a7d9b3a90fa0945ceb61465 - private_key: 0xc9828242ed912c9f26dc16acdceb882bb741c6acf4127e0ceb9a2b1fb1a9f8cc -fee_account: - address: 0x77f73525c604212c3232d5cbbcb570a1904b16b3 - private_key: 0xd92d55ee233f3c2a29753cce7d43d781dd3eb6a092c989ae3dccd3c690014ab1 -governor: - address: 0xf42d59d064dc3efa5c6984103f5354a4578f9d38 - private_key: 0x6b0cbc2c0afee36c7f8657b15062350ef52009148181c71104b58e5025dddaed -token_multiplier_setter: - address: 0x1bbbc0e929a4f09115eaacfb140930be50491de0 - private_key: 0x2d66e1ba0132f3d65a0767bf4c371f9b911104b07ef5a8d3a533d7e1b09a3fef diff --git a/contracts b/contracts index a0d5e448b3d9..99376fc6b9bd 160000 --- a/contracts +++ b/contracts @@ -1 +1 @@ -Subproject commit a0d5e448b3d96ddedfafcc83ab33b3a799290e8f +Subproject commit 99376fc6b9bd4945f9cf2b66229a9ed5c73ec0e3