Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix(zk_toolbox): Use existing ecosystem #2534

Merged
merged 1 commit into from
Jul 30, 2024
Merged

fix(zk_toolbox): Use existing ecosystem #2534

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions etc/env/ecosystems/testnet.yaml → etc/env/ecosystems/sepolia.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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'
2 changes: 1 addition & 1 deletion zk_toolbox/crates/config/src/consts.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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";
Expand Down
5 changes: 4 additions & 1 deletion zk_toolbox/crates/zk_inception/src/commands/ecosystem/init.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
3 changes: 2 additions & 1 deletion zk_toolbox/crates/zk_inception/src/messages.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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";
Expand Down
Loading