Fix create2 place

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

Author: Deniallugo

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

@@ -1,19 +1,14 @@
 use std::collections::HashMap;
 
-use ethers::types::{Address, H256, U256};
+use ethers::types::{Address, U256};
 use serde::{Deserialize, Serialize};
 
 use crate::{
     consts::ERC20_CONFIGS_FILE,
+    forge_interface::Create2Addresses,
     traits::{FileConfigTrait, FileConfigWithDefaultName},
 };
 
-#[derive(Debug, Deserialize, Serialize, Clone)]
-pub struct Create2Addresses {
-    pub create2_factory_addr: Address,
-    pub create2_factory_salt: H256,
-}
-
 #[derive(Debug, Deserialize, Serialize, Clone)]
 pub struct DeployL1CoreContractsOutput {
     pub contracts: Create2Addresses,

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

@@ -1,8 +1,9 @@
-use ethers::types::{Address, H256};
+use ethers::types::Address;
 use serde::{Deserialize, Serialize};
 
 use crate::{
-    forge_interface::deploy_ecosystem::input::InitialDeploymentConfig, traits::FileConfigTrait,
+    forge_interface::{deploy_ecosystem::input::InitialDeploymentConfig, Create2Addresses},
+    traits::FileConfigTrait,
     ContractsConfig,
 };
 
@@ -12,8 +13,7 @@ pub struct GatewayTxFiltererInput {
     pub bridgehub_proxy_addr: Address,
     pub chain_admin: Address,
     pub chain_proxy_admin: Address,
-    pub create2_factory_addr: Address,
-    pub create2_factory_salt: H256,
+    pub contract: Create2Addresses,
 }
 
 impl FileConfigTrait for GatewayTxFiltererInput {}
@@ -42,8 +42,10 @@ impl GatewayTxFiltererInput {
             bridgehub_proxy_addr,
             chain_admin,
             chain_proxy_admin,
-            create2_factory_addr,
-            create2_factory_salt,
+            contract: Create2Addresses {
+                create2_factory_addr,
+                create2_factory_salt,
+            },
         })
     }
 }

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

@@ -1,3 +1,6 @@
+use serde::{Deserialize, Serialize};
+use zksync_basic_types::{Address, H256};
+
 pub mod accept_ownership;
 pub mod deploy_ecosystem;
 pub mod deploy_gateway_tx_filterer;
@@ -9,3 +12,9 @@ pub mod register_chain;
 pub mod script_params;
 pub mod setup_legacy_bridge;
 pub mod upgrade_ecosystem;
+
+#[derive(Debug, Deserialize, Serialize, Clone)]
+pub struct Create2Addresses {
+    pub create2_factory_addr: Address,
+    pub create2_factory_salt: H256,
+}

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

@@ -5,8 +5,7 @@ use zkstack_cli_types::{L1BatchCommitmentMode, VMOption};
 use zksync_basic_types::{L2ChainId, H256};
 
 use crate::{
-    forge_interface::deploy_ecosystem::output::Create2Addresses, traits::FileConfigTrait,
-    ChainConfig, CoreContractsConfig,
+    forge_interface::Create2Addresses, traits::FileConfigTrait, ChainConfig, CoreContractsConfig,
 };
 
 #[derive(Debug, Deserialize, Serialize, Clone)]