diff --git a/etc/env/ecosystems/testnet.yaml b/etc/env/ecosystems/sepolia.yaml similarity index 98% rename from etc/env/ecosystems/testnet.yaml rename to etc/env/ecosystems/sepolia.yaml index 72192d6b5528..1c0d9ef135cb 100644 --- a/etc/env/ecosystems/testnet.yaml +++ b/etc/env/ecosystems/sepolia.yaml @@ -21,3 +21,6 @@ l1: verifier_addr: 0xAC3a2Dc46ceA843F0A9d6554f8804AeD18ff0795 validator_timelock_addr: 0xD3876643180A79d0A56d0900C060528395f34453 base_token_addr: '0x0000000000000000000000000000000000000000' +l2: + testnet_paymaster_addr: '0x0000000000000000000000000000000000000000' + default_l2_upgrader: '0x0000000000000000000000000000000000000000' diff --git a/zk_toolbox/crates/config/src/consts.rs b/zk_toolbox/crates/config/src/consts.rs index 0fd55ebe0db6..f97f8aa3e4f8 100644 --- a/zk_toolbox/crates/config/src/consts.rs +++ b/zk_toolbox/crates/config/src/consts.rs @@ -28,7 +28,7 @@ pub(crate) const LOCAL_CONFIGS_PATH: &str = "configs/"; pub(crate) const LOCAL_DB_PATH: &str = "db/"; /// Path to ecosystem contacts -pub(crate) const ECOSYSTEM_PATH: &str = "etc/ecosystem"; +pub(crate) const ECOSYSTEM_PATH: &str = "etc/env/ecosystems"; /// Path to l1 contracts foundry folder inside zksync-era pub(crate) const L1_CONTRACTS_FOUNDRY: &str = "contracts/l1-contracts"; diff --git a/zk_toolbox/crates/zk_inception/src/commands/ecosystem/init.rs b/zk_toolbox/crates/zk_inception/src/commands/ecosystem/init.rs index 4fa6c8c47d8d..d5f9445e4dcc 100644 --- a/zk_toolbox/crates/zk_inception/src/commands/ecosystem/init.rs +++ b/zk_toolbox/crates/zk_inception/src/commands/ecosystem/init.rs @@ -276,7 +276,10 @@ async fn deploy_ecosystem( } L1Network::Sepolia | L1Network::Mainnet => ecosystem_config .get_preexisting_configs_path() - .join(ecosystem_config.l1_network.to_string().to_lowercase()), + .join(format!( + "{}.yaml", + ecosystem_config.l1_network.to_string().to_lowercase() + )), }); ContractsConfig::read(shell, ecosystem_contracts_path) diff --git a/zk_toolbox/crates/zk_inception/src/messages.rs b/zk_toolbox/crates/zk_inception/src/messages.rs index 4e1ad9074389..8b17ef57e182 100644 --- a/zk_toolbox/crates/zk_inception/src/messages.rs +++ b/zk_toolbox/crates/zk_inception/src/messages.rs @@ -54,7 +54,8 @@ pub(super) const MSG_DEPLOY_ECOSYSTEM_PROMPT: &str = pub(super) const MSG_L1_RPC_URL_PROMPT: &str = "What is the RPC URL of the L1 network?"; pub(super) const MSG_DEPLOY_PAYMASTER_PROMPT: &str = "Do you want to deploy Paymaster contract?"; pub(super) const MSG_DEPLOY_ERC20_PROMPT: &str = "Do you want to deploy some test ERC20s?"; -pub(super) const MSG_ECOSYSTEM_CONTRACTS_PATH_PROMPT: &str = "Provide the path to the ecosystem contracts or keep it empty and you will be added to ZkSync ecosystem"; +pub(super) const MSG_ECOSYSTEM_CONTRACTS_PATH_PROMPT: &str = "Provide the path to the ecosystem contracts or keep it empty and you will use ZkSync ecosystem config. \ +For using this config, you need to have governance wallet"; pub(super) const MSG_L1_RPC_URL_INVALID_ERR: &str = "Invalid RPC URL"; pub(super) const MSG_ECOSYSTEM_CONTRACTS_PATH_INVALID_ERR: &str = "Invalid path"; pub(super) const MSG_GENESIS_DATABASE_ERR: &str = "Unable to perform genesis on the database";