From 91ec341b8aab19da7cfff125f0d94490df65cd06 Mon Sep 17 00:00:00 2001 From: Alexander Melnikov Date: Fri, 25 Oct 2024 07:35:05 -0600 Subject: [PATCH] chore(configs): Adjust file based configs (#3171) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit ## What ❔ * Add fields to mainnet.yaml so that `zkstack` can create mainnet ecosystem * Add comment about typo in `max_acceptable_priority_fee_in_gwei` (caused problems before) * Add `l1_batch_min_age_before_execute_seconds` to avoid sending Execute tx too early ## Why ❔ * To make things work ## Checklist - [ ] PR title corresponds to the body of PR (we generate changelog entries from PRs). - [ ] Tests for the changes have been added / updated. - [ ] Documentation comments have been added / updated. - [ ] Code has been formatted via `zkstack dev fmt` and `zkstack dev lint`. --- etc/env/ecosystems/mainnet.yaml | 5 +++++ etc/env/file_based/general.yaml | 2 +- etc/env/file_based/overrides/mainnet.yaml | 1 + etc/env/file_based/overrides/testnet.yaml | 1 + 4 files changed, 8 insertions(+), 1 deletion(-) diff --git a/etc/env/ecosystems/mainnet.yaml b/etc/env/ecosystems/mainnet.yaml index 7d4266e8b76..f7b09150793 100644 --- a/etc/env/ecosystems/mainnet.yaml +++ b/etc/env/ecosystems/mainnet.yaml @@ -1,3 +1,5 @@ +create2_factory_addr: 0xce0042b868300000d44a59004da54a005ffdcf9f +create2_factory_salt: '0x0000000000000000000000000000000000000000000000000000000000000000' ecosystem_contracts: bridgehub_proxy_addr: 0x303a465B659cBB0ab36eE643eA362c509EEb5213 state_transition_proxy_addr: 0xc2eE6b6af7d616f6e27ce7F4A451Aedc2b0F5f5C @@ -17,3 +19,6 @@ l1: verifier_addr: 0x70F3FBf8a427155185Ec90BED8a3434203de9604 validator_timelock_addr: 0x5D8ba173Dc6C3c90C8f7C04C9288BeF5FDbAd06E base_token_addr: '0x0000000000000000000000000000000000000000' +l2: + testnet_paymaster_addr: '0x0000000000000000000000000000000000000000' + default_l2_upgrader: '0x0000000000000000000000000000000000000000' diff --git a/etc/env/file_based/general.yaml b/etc/env/file_based/general.yaml index 587ba4614a5..8758d38186f 100644 --- a/etc/env/file_based/general.yaml +++ b/etc/env/file_based/general.yaml @@ -106,7 +106,7 @@ eth: max_eth_tx_data_size: 120000 aggregated_proof_sizes: [ 1 ] max_aggregated_tx_gas: 15000000 - max_acceptable_priority_fee_in_gwei: 100000000000 + max_acceptable_priority_fee_in_gwei: 100000000000 # typo: value is in wei (100 gwei) pubdata_sending_mode: BLOBS gas_adjuster: default_priority_fee_per_gas: 1000000000 diff --git a/etc/env/file_based/overrides/mainnet.yaml b/etc/env/file_based/overrides/mainnet.yaml index 7565aac869a..847f9ae98aa 100644 --- a/etc/env/file_based/overrides/mainnet.yaml +++ b/etc/env/file_based/overrides/mainnet.yaml @@ -11,6 +11,7 @@ eth: aggregated_block_prove_deadline: 300 aggregated_block_execute_deadline: 300 timestamp_criteria_max_allowed_lag: 104000 # 29h + l1_batch_min_age_before_execute_seconds: 76000 # 21h wait_confirmations: null gas_adjuster: pricing_formula_parameter_a: 1.06 diff --git a/etc/env/file_based/overrides/testnet.yaml b/etc/env/file_based/overrides/testnet.yaml index d36cf9fc7bc..4643a963ed7 100644 --- a/etc/env/file_based/overrides/testnet.yaml +++ b/etc/env/file_based/overrides/testnet.yaml @@ -11,6 +11,7 @@ eth: aggregated_block_prove_deadline: 300 aggregated_block_execute_deadline: 300 timestamp_criteria_max_allowed_lag: 104000 # 29h + l1_batch_min_age_before_execute_seconds: 1500 # 25m wait_confirmations: null gas_adjuster: pricing_formula_parameter_a: 1.1