Remove more

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

Author: Deniallugo

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

@@ -1,68 +1,14 @@
-use ethers::{
-    prelude::U256,
-    types::{Address, H256},
-};
+use ethers::types::{Address, H256};
 use serde::{Deserialize, Serialize};
 use zkstack_cli_types::{L1Network, VMOption};
-use zksync_basic_types::{protocol_version::ProtocolSemanticVersion, u256_to_h256};
+use zksync_basic_types::u256_to_h256;
 
 use crate::{
     forge_interface::deploy_ecosystem::input::InitialDeploymentConfig, traits::FileConfigTrait,
-    ContractsGenesisConfig, WalletsConfig,
+    WalletsConfig,
 };
 
 /// Part of the genesis config influencing `DeployGatewayCTMInput`.
-#[derive(Debug)]
-pub struct GenesisInput {
-    pub bootloader_hash: Option<H256>,
-    pub default_aa_hash: Option<H256>,
-    pub evm_emulator_hash: Option<H256>,
-    pub rollup_last_leaf_index: Option<u64>,
-    pub genesis_commitment: H256,
-    pub genesis_root_hash: H256,
-    pub protocol_version: ProtocolSemanticVersion,
-}
-
-impl GenesisInput {
-    pub fn new(
-        contract_genesis_config: &ContractsGenesisConfig,
-        vmoption: VMOption,
-    ) -> anyhow::Result<Self> {
-        let protocol_version = contract_genesis_config.protocol_semantic_version()?;
-        match vmoption {
-            VMOption::EraVM => Ok(Self {
-                bootloader_hash: Some(contract_genesis_config.0.get("bootloader_hash")?),
-                default_aa_hash: Some(contract_genesis_config.0.get("default_aa_hash")?),
-                evm_emulator_hash: Some(
-                    contract_genesis_config
-                        .0
-                        .get_opt("evm_emulator_hash")?
-                        .unwrap_or_default(),
-                ),
-                genesis_root_hash: contract_genesis_config.0.get("genesis_root")?,
-                rollup_last_leaf_index: Some(
-                    contract_genesis_config.0.get("genesis_rollup_leaf_index")?,
-                ),
-                genesis_commitment: contract_genesis_config.0.get("genesis_batch_commitment")?,
-                protocol_version,
-            }),
-            VMOption::ZKSyncOsVM => {
-                let one = u256_to_h256(U256::one());
-                let genesis_root = contract_genesis_config.0.get("genesis_root")?;
-                Ok(Self {
-                    genesis_root_hash: genesis_root,
-                    // Placeholders, not used in zkSync OS mode. But necessary to be provided.
-                    genesis_commitment: one,
-                    bootloader_hash: None,
-                    default_aa_hash: None,
-                    evm_emulator_hash: None,
-                    rollup_last_leaf_index: None,
-                    protocol_version,
-                })
-            }
-        }
-    }
-}
 
 #[derive(Debug, Deserialize, Serialize, Clone)]
 pub struct DeployCTMConfig {
@@ -78,7 +24,6 @@ impl FileConfigTrait for DeployCTMConfig {}
 impl DeployCTMConfig {
     #[allow(clippy::too_many_arguments)]
     pub fn new(
-        genesis_input: &GenesisInput,
         wallets_config: &WalletsConfig,
         initial_deployment_config: &InitialDeploymentConfig,
         testnet_verifier: bool,
@@ -97,14 +42,6 @@ impl DeployCTMConfig {
                 // TODO verify correctnesss
                 governance_security_council_address: wallets_config.governor.address,
                 governance_min_delay: initial_deployment_config.governance_min_delay,
-                bootloader_hash: genesis_input.bootloader_hash,
-                default_aa_hash: genesis_input.default_aa_hash,
-                evm_emulator_hash: genesis_input.evm_emulator_hash,
-                // These values are not optional in genesis config with file based configuration
-                genesis_batch_commitment: genesis_input.genesis_commitment,
-                genesis_rollup_leaf_index: genesis_input.rollup_last_leaf_index,
-                genesis_root: genesis_input.genesis_root_hash,
-                latest_protocol_version: genesis_input.protocol_version.pack(),
                 validator_timelock_execution_delay: initial_deployment_config
                     .validator_timelock_execution_delay,
                 avail_l1_da_validator_addr: l1_network.avail_l1_da_validator_addr(),
@@ -121,17 +58,6 @@ pub struct ContractsDeployCTMConfig {
     pub governance_security_council_address: Address,
     pub governance_min_delay: u64,
     pub validator_timelock_execution_delay: u64,
-    pub genesis_root: H256,
-    pub genesis_batch_commitment: H256,
-    pub latest_protocol_version: U256,
-    #[serde(skip_serializing_if = "Option::is_none")]
-    pub genesis_rollup_leaf_index: Option<u64>,
-    #[serde(skip_serializing_if = "Option::is_none")]
-    pub bootloader_hash: Option<H256>,
-    #[serde(skip_serializing_if = "Option::is_none")]
-    pub default_aa_hash: Option<H256>,
-    #[serde(skip_serializing_if = "Option::is_none")]
-    pub evm_emulator_hash: Option<H256>,
     #[serde(skip_serializing_if = "Option::is_none")]
     pub avail_l1_da_validator_addr: Option<Address>,
 }

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

@@ -6,7 +6,6 @@ use ethers::{
 };
 use rand::Rng;
 use serde::{Deserialize, Serialize};
-use zkstack_cli_types::VMOption;
 use zksync_basic_types::L2ChainId;
 
 use crate::{
@@ -101,7 +100,6 @@ 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 {}
@@ -113,10 +111,8 @@ impl DeployL1Config {
         initial_deployment_config: &InitialDeploymentConfig,
         era_chain_id: L2ChainId,
         support_l2_legacy_shared_bridge_test: bool,
-        vm_option: VMOption,
     ) -> Self {
         Self {
-            is_zk_sync_os: vm_option.is_zksync_os(),
             era_chain_id,
             owner_address: wallets_config.governor.address,
             support_l2_legacy_shared_bridge_test,

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

@@ -4,10 +4,7 @@ use zkstack_cli_types::VMOption;
 use zksync_basic_types::L2ChainId;
 
 use crate::{
-    forge_interface::{
-        deploy_ctm::input::GenesisInput, deploy_ecosystem::input::InitialDeploymentConfig,
-    },
-    traits::FileConfigTrait,
+    forge_interface::deploy_ecosystem::input::InitialDeploymentConfig, traits::FileConfigTrait,
     CoreContractsConfig,
 };
 
@@ -45,7 +42,6 @@ impl FileConfigTrait for EcosystemUpgradeInput {}
 impl EcosystemUpgradeInput {
     #[allow(clippy::too_many_arguments)]
     pub fn new(
-        new_genesis_input: &GenesisInput,
         current_contracts_config: &CoreContractsConfig,
         gateway_upgrade_config: &GatewayUpgradeContractsConfig,
         // It is expected to not change between the versions
@@ -67,12 +63,6 @@ impl EcosystemUpgradeInput {
                 create2_factory_salt: initial_deployment_config.create2_factory_salt,
                 governance_min_delay: initial_deployment_config.governance_min_delay,
                 max_number_of_chains: initial_deployment_config.max_number_of_chains,
-                // These values are not optional in genesis config with file based configuration
-                genesis_batch_commitment: new_genesis_input.genesis_commitment,
-                bootloader_hash: new_genesis_input.bootloader_hash,
-                default_aa_hash: new_genesis_input.default_aa_hash,
-                genesis_rollup_leaf_index: new_genesis_input.rollup_last_leaf_index,
-                genesis_root: new_genesis_input.genesis_root_hash,
                 bridgehub_proxy_address: current_contracts_config
                     .core_ecosystem_contracts
                     .bridgehub_proxy_addr,
@@ -89,14 +79,13 @@ impl EcosystemUpgradeInput {
                     .ctm(vm_option)
                     .validator_timelock_addr,
                 governance_security_council_address: Address::zero(),
-                latest_protocol_version: new_genesis_input.protocol_version.pack(),
-                evm_emulator_hash: new_genesis_input.evm_emulator_hash,
                 l1_bytecodes_supplier_addr: current_contracts_config
                     .ctm(vm_option)
                     .l1_bytecodes_supplier_addr,
                 protocol_upgrade_handler_proxy_address: Address::zero(),
                 rollup_da_manager: Address::zero(),
-                validator_timelock_execution_delay: 0,
+                validator_timelock_execution_delay: initial_deployment_config
+                    .validator_timelock_execution_delay,
             },
             gateway: gateway_upgrade_config.clone(),
             tokens: GatewayUpgradeTokensConfig {
@@ -119,11 +108,6 @@ pub struct EcosystemUpgradeContractsConfig {
     #[serde(skip_serializing_if = "Option::is_none")]
     pub create2_factory_addr: Option<Address>,
     pub validator_timelock_execution_delay: u64,
-    pub genesis_root: H256,
-    pub genesis_rollup_leaf_index: Option<u64>,
-    pub genesis_batch_commitment: H256,
-    pub bootloader_hash: Option<H256>,
-    pub default_aa_hash: Option<H256>,
 
     pub bridgehub_proxy_address: Address,
     pub shared_bridge_proxy_address: Address,
@@ -134,8 +118,6 @@ pub struct EcosystemUpgradeContractsConfig {
     pub old_validator_timelock: Address,
 
     pub governance_security_council_address: Address,
-    pub latest_protocol_version: U256,
-    pub evm_emulator_hash: Option<H256>,
     pub l1_bytecodes_supplier_addr: Address,
     pub protocol_upgrade_handler_proxy_address: Address,
     pub rollup_da_manager: Address,

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

@@ -9,15 +9,12 @@ use zkstack_cli_common::{
 };
 use zkstack_cli_config::{
     forge_interface::{
-        deploy_ctm::{
-            input::{DeployCTMConfig, GenesisInput},
-            output::DeployCTMOutput,
-        },
+        deploy_ctm::{input::DeployCTMConfig, output::DeployCTMOutput},
         deploy_ecosystem::input::InitialDeploymentConfig,
         script_params::DEPLOY_CTM_SCRIPT_PARAMS,
     },
     traits::{ReadConfig, SaveConfig, SaveConfigWithBasePath},
-    ContractsGenesisConfig, CoreContractsConfig, EcosystemConfig, ZkStackConfig,
+    CoreContractsConfig, EcosystemConfig, ZkStackConfig,
 };
 use zkstack_cli_types::{L1Network, ProverMode, VMOption};
 
@@ -173,14 +170,10 @@ pub async fn deploy_new_ctm(
     let mut contracts_config = config.get_contracts_config()?;
     let deploy_config_path =
         DEPLOY_CTM_SCRIPT_PARAMS.input(&config.path_to_foundry_scripts_for_ctm(vm_option));
-    let genesis_config_path = config.default_genesis_path(vm_option);
-    let default_genesis_config = ContractsGenesisConfig::read(shell, &genesis_config_path).await?;
-    let default_genesis_input = GenesisInput::new(&default_genesis_config, vm_option)?;
 
     let wallets_config = config.get_wallets()?;
     // For deploying ecosystem we only need genesis batch params
     let deploy_config = DeployCTMConfig::new(
-        &default_genesis_input,
         &wallets_config,
         initial_deployment_config,
         config.prover_version == ProverMode::NoProofs,

zkstack_cli/crates/zkstack/src/commands/dev/commands/upgrades/default_ecosystem_upgrade.rs

@@ -11,7 +11,6 @@ use xshell::{cmd, Shell};
 use zkstack_cli_common::{ethereum::get_ethers_provider, forge::Forge, logger, spinner::Spinner};
 use zkstack_cli_config::{
     forge_interface::{
-        deploy_ctm::input::GenesisInput,
         script_params::{
             ForgeScriptParams, FINALIZE_UPGRADE_SCRIPT_PARAMS, V29_UPGRADE_ECOSYSTEM_PARAMS,
         },
@@ -141,8 +140,6 @@ async fn no_governance_prepare(
     };
 
     let genesis_config_path = ecosystem_config.default_genesis_path(vm_option);
-    let default_genesis_config = ContractsGenesisConfig::read(shell, &genesis_config_path).await?;
-    let default_genesis_input = GenesisInput::new(&default_genesis_config, vm_option)?;
     let current_contracts_config = ecosystem_config.get_contracts_config()?;
     let bridgehub_proxy_address = current_contracts_config
         .core_ecosystem_contracts
@@ -188,10 +185,6 @@ async fn no_governance_prepare(
     let ecosystem_upgrade_config_path = get_ecosystem_upgrade_params(upgrade_version)
         .input(&ecosystem_config.path_to_foundry_scripts_for_ctm(vm_option));
 
-    let mut new_genesis = default_genesis_input;
-    let new_version = new_genesis.protocol_version;
-    new_genesis.protocol_version = new_version;
-
     let gateway_upgrade_config = get_gateway_state_transition_config(ecosystem_config).await?;
 
     let upgrade_specific_config = match upgrade_version {
@@ -217,7 +210,6 @@ async fn no_governance_prepare(
     };
 
     let ecosystem_upgrade = EcosystemUpgradeInput::new(
-        &new_genesis,
         &current_contracts_config,
         &gateway_upgrade_config,
         &initial_deployment_config,

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

@@ -51,7 +51,6 @@ pub async fn deploy_l1_core_contracts(
         initial_deployment_config,
         config.era_chain_id,
         support_l2_legacy_shared_bridge_test,
-        vm_option,
     );
 
     deploy_config.save(shell, deploy_config_path)?;

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

@@ -130,7 +130,7 @@ async fn init_ecosystem(
         )
         .await?;
 
-        // // If we are deploying non-zksync os ecosystem, but zksync os ecosystem config exists
+        // If we are deploying non-zksync os ecosystem, but zksync os ecosystem config exists
         if !init_args.vm_option.is_zksync_os() && init_args.dev {
             rebuild_all_contracts(
                 shell,