feat: update zkstack-cli for updated scripts (#4481)

## 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? -->
<!-- The `Why` has to be clear to non-Matter Labs entities running their
own ZK Chain -->
<!-- Example: PR templates ensure PR reviewers, observers, and future
iterators are in context about the evolution of repos. -->

## Is this a breaking change?
- [ ] Yes
- [ ] No

## Operational changes
<!-- Any config changes? Any new flags? Any changes to any scripts? -->
<!-- Please add anything that non-Matter Labs entities running their own
ZK Chain may need to know -->

## 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 `zkstack dev fmt` and `zkstack dev
lint`.

Author: Raid5594

contracts

@@ -56,9 +56,9 @@ pub struct ForgeScript {
 impl ForgeScript {
     /// Run the forge script command.
     pub fn run(mut self, shell: &Shell) -> anyhow::Result<()> {
-        // When running the DeployL1 script, we skip recompiling the Bridgehub
+        // When running the DeployCTM script, we skip recompiling the Bridgehub
         // because it must be compiled with a low optimizer-runs value.
-        if self.script_path == Path::new("deploy-scripts/DeployL1.s.sol") {
+        if self.script_path == Path::new("deploy-scripts/DeployCTM.s.sol") {
             let skip_path: String = String::from("contracts/bridgehub/*");
             self.args.add_arg(ForgeScriptArg::Skip { skip_path });
         }

zkstack_cli/crates/common/src/forge.rs

@@ -8,7 +8,7 @@ use zksync_system_constants::{L2_ASSET_ROUTER_ADDRESS, L2_NATIVE_TOKEN_VAULT_ADD
 use crate::{
     consts::CONTRACTS_FILE,
     forge_interface::{
-        deploy_ecosystem::output::DeployL1Output,
+        deploy_ecosystem::output::{DeployCTMOutput, DeployL1CoreContractsOutput},
         deploy_l2_contracts::output::{
             ConsensusRegistryOutput, DefaultL2UpgradeOutput, InitializeBridgeOutput,
             L2DAValidatorAddressOutput, Multicall3Output, TimestampAsserterOutput,
@@ -18,6 +18,80 @@ use crate::{
     traits::{FileConfigTrait, FileConfigWithDefaultName},
 };
 
+#[derive(Debug, Deserialize, Serialize, Clone, Default)]
+pub struct CoreContractsConfig {
+    pub create2_factory_addr: Address,
+    pub create2_factory_salt: H256,
+    pub core_ecosystem_contracts: CoreEcosystemContracts,
+    pub bridges: BridgesContracts,
+    pub l1: L1CoreContracts,
+    #[serde(flatten)]
+    pub other: serde_json::Value,
+}
+
+impl CoreContractsConfig {
+    pub fn update_from_l1_output(
+        &mut self,
+        deploy_l1_core_contracts_output: &DeployL1CoreContractsOutput,
+    ) {
+        self.create2_factory_addr = deploy_l1_core_contracts_output.create2_factory_addr;
+        self.create2_factory_salt = deploy_l1_core_contracts_output.create2_factory_salt;
+        self.bridges.erc20.l1_address = deploy_l1_core_contracts_output
+            .deployed_addresses
+            .bridges
+            .erc20_bridge_proxy_addr;
+        self.bridges.shared.l1_address = deploy_l1_core_contracts_output
+            .deployed_addresses
+            .bridges
+            .shared_bridge_proxy_addr;
+        self.bridges.l1_nullifier_addr = Some(
+            deploy_l1_core_contracts_output
+                .deployed_addresses
+                .bridges
+                .l1_nullifier_proxy_addr,
+        );
+        self.core_ecosystem_contracts.bridgehub_proxy_addr = deploy_l1_core_contracts_output
+            .deployed_addresses
+            .bridgehub
+            .bridgehub_proxy_addr;
+        self.core_ecosystem_contracts.message_root_proxy_addr = Some(
+            deploy_l1_core_contracts_output
+                .deployed_addresses
+                .bridgehub
+                .message_root_proxy_addr,
+        );
+        self.core_ecosystem_contracts.transparent_proxy_admin_addr =
+            deploy_l1_core_contracts_output
+                .deployed_addresses
+                .transparent_proxy_admin_addr;
+        self.core_ecosystem_contracts
+            .stm_deployment_tracker_proxy_addr = Some(
+            deploy_l1_core_contracts_output
+                .deployed_addresses
+                .bridgehub
+                .ctm_deployment_tracker_proxy_addr,
+        );
+
+        self.l1.governance_addr = deploy_l1_core_contracts_output
+            .deployed_addresses
+            .governance_addr;
+        self.core_ecosystem_contracts.native_token_vault_addr = Some(
+            deploy_l1_core_contracts_output
+                .deployed_addresses
+                .native_token_vault_addr,
+        );
+        self.l1.chain_admin_addr = deploy_l1_core_contracts_output
+            .deployed_addresses
+            .chain_admin;
+    }
+}
+
+impl FileConfigWithDefaultName for CoreContractsConfig {
+    const FILE_NAME: &'static str = CONTRACTS_FILE;
+}
+
+impl FileConfigTrait for CoreContractsConfig {}
+
 #[derive(Debug, Deserialize, Serialize, Clone, Default)]
 pub struct ContractsConfig {
     pub create2_factory_addr: Address,
@@ -33,7 +107,7 @@ pub struct ContractsConfig {
 }
 
 impl ContractsConfig {
-    pub fn update_from_l1_output(&mut self, deploy_l1_output: &DeployL1Output) {
+    pub fn update_from_l1_output(&mut self, deploy_l1_output: &DeployCTMOutput) {
         self.create2_factory_addr = deploy_l1_output.create2_factory_addr;
         self.create2_factory_salt = deploy_l1_output.create2_factory_salt;
         self.bridges.erc20.l1_address = deploy_l1_output
@@ -216,6 +290,44 @@ impl FileConfigWithDefaultName for ContractsConfig {
 
 impl FileConfigTrait for ContractsConfig {}
 
+#[derive(Debug, Deserialize, Serialize, Clone, Default)]
+pub struct ContractsConfigForDeployERC20 {
+    pub create2_factory_addr: Address,
+    pub create2_factory_salt: H256,
+}
+
+impl From<ContractsConfig> for ContractsConfigForDeployERC20 {
+    fn from(config: ContractsConfig) -> Self {
+        ContractsConfigForDeployERC20 {
+            create2_factory_addr: config.create2_factory_addr,
+            create2_factory_salt: config.create2_factory_salt,
+        }
+    }
+}
+
+impl From<CoreContractsConfig> for ContractsConfigForDeployERC20 {
+    fn from(config: CoreContractsConfig) -> Self {
+        ContractsConfigForDeployERC20 {
+            create2_factory_addr: config.create2_factory_addr,
+            create2_factory_salt: config.create2_factory_salt,
+        }
+    }
+}
+
+#[derive(Debug, Serialize, Deserialize, Clone, PartialEq, Default)]
+pub struct CoreEcosystemContracts {
+    pub bridgehub_proxy_addr: Address,
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub message_root_proxy_addr: Option<Address>,
+    pub transparent_proxy_admin_addr: Address,
+    // `Option` to be able to parse configs from pre-gateway protocol version.
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub stm_deployment_tracker_proxy_addr: Option<Address>,
+    // `Option` to be able to parse configs from pre-gateway protocol version.
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub native_token_vault_addr: Option<Address>,
+}
+
 #[derive(Debug, Serialize, Deserialize, Clone, PartialEq, Default)]
 pub struct EcosystemContracts {
     pub bridgehub_proxy_addr: Address,
@@ -299,6 +411,19 @@ pub struct L1Contracts {
     pub transaction_filterer_addr: Option<Address>,
 }
 
+#[derive(Debug, Serialize, Deserialize, Clone, Default)]
+pub struct L1CoreContracts {
+    pub governance_addr: Address,
+    #[serde(default)]
+    pub chain_admin_addr: Address,
+    // `Option` to be able to parse configs from pre-gateway protocol version.
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub access_control_restriction_addr: Option<Address>,
+    // `Option` to be able to parse configs from pre-gateway protocol version.
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub chain_proxy_admin_addr: Option<Address>,
+}
+
 #[derive(Debug, Serialize, Deserialize, Clone, Default)]
 pub struct EthProofManagerContracts {
     pub proof_manager_addr: Address,

zkstack_cli/crates/config/src/contracts.rs

@@ -12,7 +12,7 @@ use zksync_basic_types::{protocol_version::ProtocolSemanticVersion, L2ChainId};
 use crate::{
     consts::INITIAL_DEPLOYMENT_FILE,
     traits::{FileConfigTrait, FileConfigWithDefaultName},
-    ContractsConfig, GenesisConfig, WalletsConfig, ERC20_DEPLOYMENT_FILE,
+    ContractsConfigForDeployERC20, GenesisConfig, WalletsConfig, ERC20_DEPLOYMENT_FILE,
 };
 
 /// Part of the genesis config influencing `DeployGatewayCTMInput`.
@@ -256,7 +256,7 @@ impl FileConfigTrait for DeployErc20Config {}
 impl DeployErc20Config {
     pub fn new(
         erc20_deployment_config: &Erc20DeploymentConfig,
-        contracts_config: &ContractsConfig,
+        contracts_config: &ContractsConfigForDeployERC20,
         additional_addresses_for_minting: Vec<Address>,
     ) -> Self {
         let mut tokens = HashMap::new();

zkstack_cli/crates/config/src/forge_interface/deploy_ecosystem/input.rs

@@ -9,21 +9,45 @@ use crate::{
 };
 
 #[derive(Debug, Deserialize, Serialize, Clone)]
-pub struct DeployL1Output {
+pub struct DeployL1CoreContractsOutput {
+    pub create2_factory_addr: Address,
+    pub create2_factory_salt: H256,
+    pub deployer_addr: Address,
+    pub era_chain_id: u32,
+    pub l1_chain_id: u32,
+    pub owner_address: Address,
+    pub deployed_addresses: DeployL1CoreContractsDeployedAddressesOutput,
+}
+
+#[derive(Debug, Deserialize, Serialize, Clone)]
+pub struct DeployL1CoreContractsDeployedAddressesOutput {
+    pub governance_addr: Address,
+    pub transparent_proxy_admin_addr: Address,
+    pub chain_admin: Address,
+    pub access_control_restriction_addr: Address,
+    pub bridgehub: L1BridgehubOutput,
+    pub bridges: L1BridgesOutput,
+    pub native_token_vault_addr: Address,
+}
+
+impl FileConfigTrait for DeployL1CoreContractsOutput {}
+
+#[derive(Debug, Deserialize, Serialize, Clone)]
+pub struct DeployCTMOutput {
     pub create2_factory_addr: Address,
     pub create2_factory_salt: H256,
     pub deployer_addr: Address,
     pub era_chain_id: u32,
     pub l1_chain_id: u32,
     pub multicall3_addr: Address,
     pub owner_address: Address,
-    pub contracts_config: DeployL1ContractsConfigOutput,
-    pub deployed_addresses: DeployL1DeployedAddressesOutput,
+    pub contracts_config: DeployCTMContractsConfigOutput,
+    pub deployed_addresses: DeployCTMDeployedAddressesOutput,
     pub expected_rollup_l2_da_validator_addr: Address,
 }
 
 #[derive(Debug, Deserialize, Serialize, Clone)]
-pub struct DeployL1DeployedAddressesOutput {
+pub struct DeployCTMDeployedAddressesOutput {
     pub governance_addr: Address,
     pub transparent_proxy_admin_addr: Address,
     pub validator_timelock_addr: Address,
@@ -40,10 +64,10 @@ pub struct DeployL1DeployedAddressesOutput {
     pub server_notifier_proxy_addr: Address,
 }
 
-impl FileConfigTrait for DeployL1Output {}
+impl FileConfigTrait for DeployCTMOutput {}
 
 #[derive(Debug, Deserialize, Serialize, Clone)]
-pub struct DeployL1ContractsConfigOutput {
+pub struct DeployCTMContractsConfigOutput {
     pub diamond_cut_data: String,
     pub force_deployments_data: Option<String>,
 }

zkstack_cli/crates/config/src/forge_interface/deploy_ecosystem/output.rs

@@ -24,10 +24,10 @@ impl ForgeScriptParams {
     }
 }
 
-pub const DEPLOY_ECOSYSTEM_SCRIPT_PARAMS: ForgeScriptParams = ForgeScriptParams {
+pub const DEPLOY_CTM_SCRIPT_PARAMS: ForgeScriptParams = ForgeScriptParams {
     input: "script-config/config-deploy-l1.toml",
     output: "script-out/output-deploy-l1.toml",
-    script_path: "deploy-scripts/DeployL1.s.sol",
+    script_path: "deploy-scripts/DeployCTM.s.sol",
 };
 
 pub const DEPLOY_ECOSYSTEM_CORE_CONTRACTS_SCRIPT_PARAMS: ForgeScriptParams = ForgeScriptParams {
@@ -37,7 +37,7 @@ pub const DEPLOY_ECOSYSTEM_CORE_CONTRACTS_SCRIPT_PARAMS: ForgeScriptParams = For
 };
 
 pub const REGISTER_CTM_SCRIPT_PARAMS: ForgeScriptParams = ForgeScriptParams {
-    input: "script-config/config-deploy-l1.toml",
+    input: "script-config/config-register-ctm-l1.toml",
     output: "script-out/register-ctm-l1.toml",
     script_path: "deploy-scripts/RegisterCTM.s.sol",
 };

zkstack_cli/crates/config/src/forge_interface/script_params.rs

@@ -1,5 +1,6 @@
 use std::{path::PathBuf, str::FromStr};
 
+use anyhow::{Context, Result};
 use clap::Parser;
 use serde::{Deserialize, Serialize};
 use url::Url;
@@ -10,7 +11,7 @@ use crate::{
     consts::DEFAULT_UNSIGNED_TRANSACTIONS_DIR,
     defaults::LOCAL_RPC_URL,
     messages::{
-        MSG_L1_RPC_URL_HELP, MSG_L1_RPC_URL_INVALID_ERR, MSG_RPC_URL_PROMPT,
+        MSG_BRIDGEHUB, MSG_L1_RPC_URL_HELP, MSG_L1_RPC_URL_INVALID_ERR, MSG_RPC_URL_PROMPT,
         MSG_SENDER_ADDRESS_PROMPT,
     },
 };
@@ -28,10 +29,12 @@ pub struct BuildTransactionsArgs {
     #[clap(flatten)]
     #[serde(flatten)]
     pub forge_args: ForgeScriptArgs,
+    #[clap(long, help = MSG_BRIDGEHUB)]
+    pub bridgehub: String,
 }
 
 impl BuildTransactionsArgs {
-    pub fn fill_values_with_prompt(self) -> BuildTransactionsFinal {
+    pub fn fill_values_with_prompt(self) -> Result<BuildTransactionsFinal> {
         let sender = self.sender.unwrap_or_else(|| {
             Prompt::new(MSG_SENDER_ADDRESS_PROMPT)
                 .validate_with(|val: &String| -> Result<(), String> {
@@ -50,12 +53,20 @@ impl BuildTransactionsArgs {
                 })
                 .ask()
         });
-        BuildTransactionsFinal {
+
+        // Parse bridgehub address
+        let bridgehub_address = self
+            .bridgehub
+            .parse::<H160>()
+            .with_context(|| format!("Invalid bridgehub address format: {}", self.bridgehub))?;
+
+        Ok(BuildTransactionsFinal {
             sender,
             out: self.out.unwrap_or(DEFAULT_UNSIGNED_TRANSACTIONS_DIR.into()),
             forge_args: self.forge_args.clone(),
             l1_rpc_url,
-        }
+            bridgehub_address,
+        })
     }
 }
 
@@ -65,4 +76,5 @@ pub struct BuildTransactionsFinal {
     pub out: PathBuf,
     pub forge_args: ForgeScriptArgs,
     pub l1_rpc_url: String,
+    pub bridgehub_address: H160,
 }