feat(zkstack): Add zksync_os flag for ecosystem init

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

Author: Deniallugo

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

@@ -142,6 +142,7 @@ pub struct DeployL1Config {
     pub support_l2_legacy_shared_bridge_test: bool,
     pub contracts: ContractsDeployL1Config,
     pub tokens: TokensDeployL1Config,
+    pub is_zk_sync_os: bool,
 }
 
 impl FileConfigTrait for DeployL1Config {}
@@ -155,8 +156,10 @@ impl DeployL1Config {
         testnet_verifier: bool,
         l1_network: L1Network,
         support_l2_legacy_shared_bridge_test: bool,
+        zksync_os: bool,
     ) -> Self {
         Self {
+            is_zk_sync_os: zksync_os,
             era_chain_id,
             testnet_verifier,
             owner_address: wallets_config.governor.address,

zkstack_cli/crates/zkstack/src/commands/ecosystem/args/init.rs

@@ -17,7 +17,7 @@ use crate::{
         MSG_BRIDGEHUB, MSG_DEPLOY_ECOSYSTEM_PROMPT, MSG_DEPLOY_ERC20_PROMPT, MSG_DEV_ARG_HELP,
         MSG_L1_RPC_URL_HELP, MSG_L1_RPC_URL_INVALID_ERR, MSG_NO_PORT_REALLOCATION_HELP,
         MSG_OBSERVABILITY_HELP, MSG_OBSERVABILITY_PROMPT, MSG_RPC_URL_PROMPT,
-        MSG_SERVER_COMMAND_HELP, MSG_SERVER_DB_NAME_HELP, MSG_SERVER_DB_URL_HELP,
+        MSG_SERVER_COMMAND_HELP, MSG_SERVER_DB_NAME_HELP, MSG_SERVER_DB_URL_HELP, MSG_ZKSYNC_OS,
     },
 };
 
@@ -127,6 +127,8 @@ pub struct EcosystemInitArgs {
     pub server_command: Option<String>,
     #[clap(long, help = MSG_BRIDGEHUB)]
     pub bridgehub: Option<String>,
+    #[clap(long, help = MSG_ZKSYNC_OS)]
+    pub zksync_os: bool,
 }
 
 impl EcosystemInitArgs {
@@ -153,6 +155,7 @@ impl EcosystemInitArgs {
             validium_args,
             support_l2_legacy_shared_bridge_test,
             bridgehub,
+            zksync_os,
             ..
         } = self;
 
@@ -213,6 +216,7 @@ impl EcosystemInitArgs {
                 .unwrap_or_default(),
             bridgehub_address,
             deploy_ecosystem,
+            zksync_os,
         })
     }
 }
@@ -231,6 +235,7 @@ pub struct EcosystemInitArgsFinal {
     pub support_l2_legacy_shared_bridge_test: bool,
     pub bridgehub_address: Option<H160>,
     pub deploy_ecosystem: bool,
+    pub zksync_os: bool,
 }
 
 #[derive(Debug, Clone, Serialize, Deserialize, Parser)]
@@ -302,6 +307,8 @@ pub struct InitNewCTMArgs {
     pub support_l2_legacy_shared_bridge_test: Option<bool>,
     #[clap(long, help = MSG_BRIDGEHUB)]
     pub bridgehub: Option<String>,
+    #[clap(long, help = MSG_ZKSYNC_OS)]
+    pub zksync_os: bool,
 }
 
 impl InitNewCTMArgs {
@@ -316,6 +323,7 @@ impl InitNewCTMArgs {
             skip_contract_compilation_override,
             support_l2_legacy_shared_bridge_test,
             bridgehub,
+            zksync_os,
         } = self;
 
         // Fill ecosystem args
@@ -340,6 +348,7 @@ impl InitNewCTMArgs {
             support_l2_legacy_shared_bridge_test: support_l2_legacy_shared_bridge_test
                 .unwrap_or(false),
             bridgehub_address,
+            zksync_os,
         })
     }
 }
@@ -352,6 +361,7 @@ pub struct InitNewCTMArgsFinal {
     pub skip_contract_compilation_override: bool,
     pub support_l2_legacy_shared_bridge_test: bool,
     pub bridgehub_address: Option<H160>,
+    pub zksync_os: bool,
 }
 
 impl From<EcosystemInitArgsFinal> for InitNewCTMArgsFinal {
@@ -363,6 +373,7 @@ impl From<EcosystemInitArgsFinal> for InitNewCTMArgsFinal {
             skip_contract_compilation_override: args.skip_contract_compilation_override,
             support_l2_legacy_shared_bridge_test: args.support_l2_legacy_shared_bridge_test,
             bridgehub_address: args.bridgehub_address,
+            zksync_os: args.zksync_os,
         }
     }
 }

zkstack_cli/crates/zkstack/src/commands/ecosystem/build_transactions.rs

@@ -51,6 +51,7 @@ pub async fn run(args: BuildTransactionsArgs, shell: &Shell) -> anyhow::Result<(
         false,
         false,
         None,
+        false,
     )
     .await?;
 

zkstack_cli/crates/zkstack/src/commands/ecosystem/common.rs

@@ -51,6 +51,7 @@ pub async fn deploy_l1(
     broadcast: bool,
     support_l2_legacy_shared_bridge_test: bool,
     bridgehub_address: Option<H160>,
+    zksync_os: bool,
 ) -> anyhow::Result<ContractsConfig> {
     let deploy_config_path = DEPLOY_ECOSYSTEM_SCRIPT_PARAMS.input(&config.path_to_l1_foundry());
     let genesis_config_path = config.default_configs_path().join(GENESIS_FILE);
@@ -67,6 +68,7 @@ pub async fn deploy_l1(
         config.prover_version == ProverMode::NoProofs,
         config.l1_network,
         support_l2_legacy_shared_bridge_test,
+        zksync_os,
     );
     deploy_config.save(shell, deploy_config_path)?;
 
@@ -138,6 +140,8 @@ pub async fn deploy_l1_core_contracts(
         config.prover_version == ProverMode::NoProofs,
         config.l1_network,
         support_l2_legacy_shared_bridge_test,
+        // ZKSync OS flag is not used in core contracts deployment
+        false,
     );
 
     deploy_config.save(shell, deploy_config_path)?;

zkstack_cli/crates/zkstack/src/commands/ecosystem/init.rs

@@ -134,6 +134,7 @@ async fn init_ecosystem(
         initial_deployment_config,
         init_args.support_l2_legacy_shared_bridge_test,
         init_args.bridgehub_address,
+        init_args.zksync_os,
     )
     .await?;
     contracts.save_with_base_path(shell, &ecosystem_config.config)?;

zkstack_cli/crates/zkstack/src/commands/ecosystem/init_new_ctm.rs

@@ -79,6 +79,7 @@ async fn init_ctm(
         initial_deployment_config,
         init_args.support_l2_legacy_shared_bridge_test,
         init_args.bridgehub_address, // Scripts are expected to consume 0 address for BH
+        init_args.zksync_os,
     )
     .await?;
     contracts.save_with_base_path(shell, &ecosystem_config.config)?;
@@ -93,6 +94,7 @@ pub async fn deploy_new_ctm(
     initial_deployment_config: &InitialDeploymentConfig,
     support_l2_legacy_shared_bridge_test: bool,
     bridgehub_address: Option<H160>,
+    zksync_os: bool,
 ) -> anyhow::Result<ContractsConfig> {
     let l1_rpc_url = ecosystem.l1_rpc_url.clone();
     let spinner = Spinner::new(MSG_DEPLOYING_ECOSYSTEM_CONTRACTS_SPINNER);
@@ -106,6 +108,7 @@ pub async fn deploy_new_ctm(
         true,
         support_l2_legacy_shared_bridge_test,
         bridgehub_address,
+        zksync_os,
     )
     .await?;
     spinner.finish();

zkstack_cli/crates/zkstack/src/messages.rs

@@ -662,3 +662,4 @@ pub(super) const MSG_AVAIL_BRIDGE_API_URL_PROMPT: &str = "Attestation bridge API
 pub(super) const MSG_AVAIL_SEED_PHRASE_PROMPT: &str = "Seed phrase";
 pub(super) const MSG_AVAIL_GAS_RELAY_API_KEY_PROMPT: &str = "Gas relay API key";
 pub(super) const MSG_INVALID_URL_ERR: &str = "Invalid URL format";
+pub(super) const MSG_ZKSYNC_OS: &str = "Deploy CTM for zksync os flag";