change dependency structure

matter-labs · Nov 24, 2023 · f910a01 · f910a01
1 parent 1d97fae
commit f910a01
Show file tree

Hide file tree

Showing 3 changed files with 51 additions and 49 deletions.
diff --git a/ethereum/scripts/utils.ts b/ethereum/scripts/utils.ts
@@ -151,3 +151,51 @@ export function getTokens(network: string): L1Token[] {
     })
   );
 }
+
+export interface DeployedAddresses {
+  ZkSync: {
+    MailboxFacet: string;
+    AdminFacet: string;
+    ExecutorFacet: string;
+    GettersFacet: string;
+    Verifier: string;
+    DiamondInit: string;
+    DiamondUpgradeInit: string;
+    DefaultUpgrade: string;
+    DiamondProxy: string;
+  };
+  Bridges: {
+    ERC20BridgeImplementation: string;
+    ERC20BridgeProxy: string;
+    WethBridgeImplementation: string;
+    WethBridgeProxy: string;
+  };
+  Governance: string;
+  ValidatorTimeLock: string;
+  Create2Factory: string;
+}
+
+export function deployedAddressesFromEnv(): DeployedAddresses {
+  return {
+    ZkSync: {
+      MailboxFacet: getAddressFromEnv("CONTRACTS_MAILBOX_FACET_ADDR"),
+      AdminFacet: getAddressFromEnv("CONTRACTS_ADMIN_FACET_ADDR"),
+      ExecutorFacet: getAddressFromEnv("CONTRACTS_EXECUTOR_FACET_ADDR"),
+      GettersFacet: getAddressFromEnv("CONTRACTS_GETTERS_FACET_ADDR"),
+      DiamondInit: getAddressFromEnv("CONTRACTS_DIAMOND_INIT_ADDR"),
+      DiamondUpgradeInit: getAddressFromEnv("CONTRACTS_DIAMOND_UPGRADE_INIT_ADDR"),
+      DefaultUpgrade: getAddressFromEnv("CONTRACTS_DEFAULT_UPGRADE_ADDR"),
+      DiamondProxy: getAddressFromEnv("CONTRACTS_DIAMOND_PROXY_ADDR"),
+      Verifier: getAddressFromEnv("CONTRACTS_VERIFIER_ADDR"),
+    },
+    Bridges: {
+      ERC20BridgeImplementation: getAddressFromEnv("CONTRACTS_L1_ERC20_BRIDGE_IMPL_ADDR"),
+      ERC20BridgeProxy: getAddressFromEnv("CONTRACTS_L1_ERC20_BRIDGE_PROXY_ADDR"),
+      WethBridgeImplementation: getAddressFromEnv("CONTRACTS_L1_WETH_BRIDGE_IMPL_ADDR"),
+      WethBridgeProxy: getAddressFromEnv("CONTRACTS_L1_WETH_BRIDGE_PROXY_ADDR"),
+    },
+    Create2Factory: getAddressFromEnv("CONTRACTS_CREATE2_FACTORY_ADDR"),
+    ValidatorTimeLock: getAddressFromEnv("CONTRACTS_VALIDATOR_TIMELOCK_ADDR"),
+    Governance: getAddressFromEnv("CONTRACTS_GOVERNANCE_ADDR"),
+  };
+}
diff --git a/ethereum/src.ts/deploy.ts b/ethereum/src.ts/deploy.ts
@@ -19,67 +19,21 @@ import {
   getNumberFromEnv,
   readBatchBootloaderBytecode,
   getTokens,
+  DeployedAddresses,
+  deployedAddressesFromEnv,
 } from "../scripts/utils";
 import { deployViaCreate2 } from "./deploy-utils";
 import { IGovernanceFactory } from "../typechain/IGovernanceFactory";
 
 const L2_BOOTLOADER_BYTECODE_HASH = hexlify(hashL2Bytecode(readBatchBootloaderBytecode()));
 const L2_DEFAULT_ACCOUNT_BYTECODE_HASH = hexlify(hashL2Bytecode(readSystemContractsBytecode("DefaultAccount")));
 
-export interface DeployedAddresses {
-  ZkSync: {
-    MailboxFacet: string;
-    AdminFacet: string;
-    ExecutorFacet: string;
-    GettersFacet: string;
-    Verifier: string;
-    DiamondInit: string;
-    DiamondUpgradeInit: string;
-    DefaultUpgrade: string;
-    DiamondProxy: string;
-  };
-  Bridges: {
-    ERC20BridgeImplementation: string;
-    ERC20BridgeProxy: string;
-    WethBridgeImplementation: string;
-    WethBridgeProxy: string;
-  };
-  Governance: string;
-  ValidatorTimeLock: string;
-  Create2Factory: string;
-}
-
 export interface DeployerConfig {
   deployWallet: Wallet;
   ownerAddress?: string;
   verbose?: boolean;
 }
 
-export function deployedAddressesFromEnv(): DeployedAddresses {
-  return {
-    ZkSync: {
-      MailboxFacet: getAddressFromEnv("CONTRACTS_MAILBOX_FACET_ADDR"),
-      AdminFacet: getAddressFromEnv("CONTRACTS_ADMIN_FACET_ADDR"),
-      ExecutorFacet: getAddressFromEnv("CONTRACTS_EXECUTOR_FACET_ADDR"),
-      GettersFacet: getAddressFromEnv("CONTRACTS_GETTERS_FACET_ADDR"),
-      DiamondInit: getAddressFromEnv("CONTRACTS_DIAMOND_INIT_ADDR"),
-      DiamondUpgradeInit: getAddressFromEnv("CONTRACTS_DIAMOND_UPGRADE_INIT_ADDR"),
-      DefaultUpgrade: getAddressFromEnv("CONTRACTS_DEFAULT_UPGRADE_ADDR"),
-      DiamondProxy: getAddressFromEnv("CONTRACTS_DIAMOND_PROXY_ADDR"),
-      Verifier: getAddressFromEnv("CONTRACTS_VERIFIER_ADDR"),
-    },
-    Bridges: {
-      ERC20BridgeImplementation: getAddressFromEnv("CONTRACTS_L1_ERC20_BRIDGE_IMPL_ADDR"),
-      ERC20BridgeProxy: getAddressFromEnv("CONTRACTS_L1_ERC20_BRIDGE_PROXY_ADDR"),
-      WethBridgeImplementation: getAddressFromEnv("CONTRACTS_L1_WETH_BRIDGE_IMPL_ADDR"),
-      WethBridgeProxy: getAddressFromEnv("CONTRACTS_L1_WETH_BRIDGE_PROXY_ADDR"),
-    },
-    Create2Factory: getAddressFromEnv("CONTRACTS_CREATE2_FACTORY_ADDR"),
-    ValidatorTimeLock: getAddressFromEnv("CONTRACTS_VALIDATOR_TIMELOCK_ADDR"),
-    Governance: getAddressFromEnv("CONTRACTS_GOVERNANCE_ADDR"),
-  };
-}
-
 export class Deployer {
   public addresses: DeployedAddresses;
   private deployWallet: Wallet;

diff --git a/zksync/src/utils.ts b/zksync/src/utils.ts
@@ -1,7 +1,7 @@
 import { artifacts } from "hardhat";
 
 import { Interface } from "ethers/lib/utils";
-import { deployedAddressesFromEnv } from "../../ethereum/src.ts/deploy";
+import { deployedAddressesFromEnv } from "../../ethereum/scripts/utils";
 import { IZkSyncFactory } from "../../ethereum/typechain/IZkSyncFactory";
 
 import type { BytesLike, Wallet } from "ethers";