Skip to content

Commit

Permalink
fix(zk_toolbox): Use existing ecosystem (#2534)
Browse files Browse the repository at this point in the history
## What ❔

<!-- What are the changes this PR brings about? -->
<!-- Example: This PR adds a PR template to the repo. -->
<!-- (For bigger PRs adding more context is appreciated) -->

## Why ❔

<!-- Why are these changes done? What goal do they contribute to? What
are the principles behind them? -->
<!-- Example: PR templates ensure PR reviewers, observers, and future
iterators are in context about the evolution of repos. -->

## Checklist

<!-- Check your PR fulfills the following items. -->
<!-- For draft PRs check the boxes as you complete them. -->

- [ ] 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 `zk fmt` and `zk lint`.

Signed-off-by: Danil <[email protected]>
  • Loading branch information
Deniallugo authored Jul 30, 2024
1 parent 3fac8ac commit 99fd2bd
Show file tree
Hide file tree
Showing 4 changed files with 10 additions and 3 deletions.
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
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
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
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

0 comments on commit 99fd2bd

Please sign in to comment.