chore(zkstack): Follow ups form traits

Signed-off-by: Danil <[email protected]>

Author: Deniallugo

zkstack_cli/crates/config/src/chain.rs

@@ -312,7 +312,7 @@ impl ZkStackConfigTrait for ChainConfig {
         self.link_to_code().join(CONTRACTS_PATH)
     }
 
-    fn path_to_l1_foundry(&self) -> PathBuf {
+    fn path_to_foundry_scripts(&self) -> PathBuf {
         self.contracts_path()
             .join(L1_CONTRACTS_FOUNDRY_INSIDE_CONTRACTS)
     }

zkstack_cli/crates/config/src/ecosystem.rs

@@ -338,7 +338,7 @@ impl ZkStackConfigTrait for EcosystemConfig {
         self.link_to_code().join(CONTRACTS_PATH)
     }
 
-    fn path_to_l1_foundry(&self) -> PathBuf {
+    fn path_to_foundry_scripts(&self) -> PathBuf {
         self.contracts_path()
             .join(L1_CONTRACTS_FOUNDRY_INSIDE_CONTRACTS)
     }

zkstack_cli/crates/config/src/zkstack_config.rs

@@ -61,10 +61,12 @@ impl ZkStackConfigTrait for ZkStackConfig {
         }
     }
 
-    fn path_to_l1_foundry(&self) -> PathBuf {
+    fn path_to_foundry_scripts(&self) -> PathBuf {
         match self {
-            ZkStackConfig::EcosystemConfig(ecosystem) => ecosystem.path_to_l1_foundry().clone(),
-            ZkStackConfig::ChainConfig(chain) => chain.path_to_l1_foundry().clone(),
+            ZkStackConfig::EcosystemConfig(ecosystem) => {
+                ecosystem.path_to_foundry_scripts().clone()
+            }
+            ZkStackConfig::ChainConfig(chain) => chain.path_to_foundry_scripts().clone(),
         }
     }
 }
@@ -73,8 +75,11 @@ pub trait ZkStackConfigTrait {
     /// Link to the repository, please use it with a caution and prefer specific links
     fn link_to_code(&self) -> PathBuf;
 
+    /// Path to the directory with default configs inside the repository
     fn default_configs_path(&self) -> PathBuf;
+    /// Path to the directory with contracts
     fn contracts_path(&self) -> PathBuf;
 
-    fn path_to_l1_foundry(&self) -> PathBuf;
+    /// Path to the directory with L1 Foundry contracts
+    fn path_to_foundry_scripts(&self) -> PathBuf;
 }

zkstack_cli/crates/zkstack/src/admin_functions.rs

@@ -135,7 +135,7 @@ pub async fn make_permanent_rollup(
             (chain_admin_addr, diamond_proxy_address),
         )
         .unwrap();
-    let foundry_contracts_path = ecosystem_config.path_to_l1_foundry();
+    let foundry_contracts_path = ecosystem_config.path_to_foundry_scripts();
     let forge = Forge::new(&foundry_contracts_path)
         .script(
             &ACCEPT_GOVERNANCE_SCRIPT_PARAMS.script(),
@@ -178,7 +178,7 @@ pub async fn governance_execute_calls(
             (Token::Bytes(encoded_calls), governance_address),
         )
         .unwrap();
-    let foundry_contracts_path = ecosystem_config.path_to_l1_foundry();
+    let foundry_contracts_path = ecosystem_config.path_to_foundry_scripts();
     let forge = Forge::new(&foundry_contracts_path)
         .script(
             &ACCEPT_GOVERNANCE_SCRIPT_PARAMS.script(),
@@ -228,7 +228,7 @@ pub async fn ecosystem_admin_execute_calls(
             (Token::Bytes(encoded_calls), ecosystem_admin_addr),
         )
         .unwrap();
-    let foundry_contracts_path = ecosystem_config.path_to_l1_foundry();
+    let foundry_contracts_path = ecosystem_config.path_to_foundry_scripts();
     let forge = Forge::new(&foundry_contracts_path)
         .script(
             &ACCEPT_GOVERNANCE_SCRIPT_PARAMS.script(),
@@ -273,7 +273,7 @@ pub async fn admin_execute_upgrade(
             ),
         )
         .unwrap();
-    let foundry_contracts_path = ecosystem_config.path_to_l1_foundry();
+    let foundry_contracts_path = ecosystem_config.path_to_foundry_scripts();
     let forge = Forge::new(&foundry_contracts_path)
         .script(
             &ACCEPT_GOVERNANCE_SCRIPT_PARAMS.script(),
@@ -318,7 +318,7 @@ pub async fn admin_schedule_upgrade(
             ),
         )
         .unwrap();
-    let foundry_contracts_path = ecosystem_config.path_to_l1_foundry();
+    let foundry_contracts_path = ecosystem_config.path_to_foundry_scripts();
     let forge = Forge::new(&foundry_contracts_path)
         .script(
             &ACCEPT_GOVERNANCE_SCRIPT_PARAMS.script(),
@@ -368,7 +368,7 @@ pub async fn admin_update_validator(
             ),
         )
         .unwrap();
-    let foundry_contracts_path = ecosystem_config.path_to_l1_foundry();
+    let foundry_contracts_path = ecosystem_config.path_to_foundry_scripts();
     let forge = Forge::new(&foundry_contracts_path)
         .script(
             &ACCEPT_GOVERNANCE_SCRIPT_PARAMS.script(),

zkstack_cli/crates/zkstack/src/commands/chain/accept_chain_ownership.rs

@@ -19,7 +19,7 @@ pub async fn run(args: ForgeScriptArgs, shell: &Shell) -> anyhow::Result<()> {
     let spinner = Spinner::new(MSG_ACCEPTING_ADMIN_SPINNER);
     accept_admin(
         shell,
-        chain_config.path_to_l1_foundry(),
+        chain_config.path_to_foundry_scripts(),
         contracts.l1.chain_admin_addr,
         &chain_config.get_wallets_config()?.governor,
         contracts.l1.diamond_proxy_addr,

zkstack_cli/crates/zkstack/src/commands/chain/args/create.rs

@@ -82,7 +82,6 @@ impl ChainCreateArgs {
         number_of_chains: u32,
         l1_network: &L1Network,
         possible_erc20: Vec<Erc20Token>,
-        link_to_code: PathBuf,
     ) -> anyhow::Result<ChainCreateArgsFinal> {
         let mut chain_name = self
             .chain_name
@@ -242,7 +241,6 @@ impl ChainCreateArgs {
             set_as_default,
             legacy_bridge: self.legacy_bridge,
             evm_emulator,
-            link_to_code,
             update_submodules: self.update_submodules,
             tight_ports: self.tight_ports,
         })
@@ -261,7 +259,6 @@ pub struct ChainCreateArgsFinal {
     pub set_as_default: bool,
     pub legacy_bridge: bool,
     pub evm_emulator: bool,
-    pub link_to_code: PathBuf,
     pub update_submodules: Option<bool>,
     pub tight_ports: bool,
 }

zkstack_cli/crates/zkstack/src/commands/chain/create.rs

@@ -35,7 +35,6 @@ pub async fn create(
             ecosystem_config.list_of_chains().len() as u32,
             &ecosystem_config.l1_network,
             tokens,
-            ecosystem_config.link_to_code(),
         )
         .context(MSG_ARGS_VALIDATOR_ERR)?;
 

zkstack_cli/crates/zkstack/src/commands/chain/deploy_l2_contracts.rs

@@ -144,7 +144,7 @@ async fn build_and_deploy(
     .await?;
     update_config(
         shell,
-        &DEPLOY_L2_CONTRACTS_SCRIPT_PARAMS.output(&chain_config.path_to_l1_foundry()),
+        &DEPLOY_L2_CONTRACTS_SCRIPT_PARAMS.output(&chain_config.path_to_foundry_scripts()),
     )?;
     Ok(())
 }
@@ -297,11 +297,11 @@ async fn call_forge(
     )
     .await?;
 
-    let foundry_contracts_path = chain_config.path_to_l1_foundry();
+    let foundry_contracts_path = chain_config.path_to_foundry_scripts();
     let secrets = chain_config.get_secrets_config().await?;
     input.save(
         shell,
-        DEPLOY_L2_CONTRACTS_SCRIPT_PARAMS.input(&chain_config.path_to_l1_foundry()),
+        DEPLOY_L2_CONTRACTS_SCRIPT_PARAMS.input(&chain_config.path_to_foundry_scripts()),
     )?;
 
     let mut forge = Forge::new(&foundry_contracts_path)

zkstack_cli/crates/zkstack/src/commands/chain/deploy_paymaster.rs

@@ -27,7 +27,7 @@ pub async fn deploy_paymaster(
     broadcast: bool,
 ) -> anyhow::Result<()> {
     let input = DeployPaymasterInput::new(chain_config)?;
-    let foundry_contracts_path = chain_config.path_to_l1_foundry();
+    let foundry_contracts_path = chain_config.path_to_foundry_scripts();
     input.save(
         shell,
         DEPLOY_PAYMASTER_SCRIPT_PARAMS.input(&foundry_contracts_path),

zkstack_cli/crates/zkstack/src/commands/chain/enable_evm_emulator.rs

@@ -22,7 +22,7 @@ pub async fn run(args: ForgeScriptArgs, shell: &Shell) -> anyhow::Result<()> {
 
     enable_evm_emulator(
         shell,
-        &chain_config.path_to_l1_foundry(),
+        &chain_config.path_to_foundry_scripts(),
         contracts.l1.chain_admin_addr,
         &chain_config.get_wallets_config()?.governor,
         contracts.l1.diamond_proxy_addr,