perf: Improvement/zksync-support

solidity/contracts/isms/multisig/StorageMultisigIsm.sol

@@ -8,6 +8,7 @@ import {AbstractMessageIdMultisigIsm} from "./AbstractMessageIdMultisigIsm.sol";
 import {IInterchainSecurityModule} from "../../interfaces/IInterchainSecurityModule.sol";
 import {IThresholdAddressFactory} from "../../interfaces/IThresholdAddressFactory.sol";
 import {MinimalProxy} from "../../libs/MinimalProxy.sol";
+import {PackageVersioned} from "../../PackageVersioned.sol";
 
 // ============ External Imports ============
 import {OwnableUpgradeable} from "@openzeppelin/contracts-upgradeable/access/OwnableUpgradeable.sol";
@@ -81,7 +82,10 @@ contract StorageMessageIdMultisigIsm is
     ) AbstractStorageMultisigIsm(_validators, _threshold) {}
 }
 
-abstract contract StorageMultisigIsmFactory is IThresholdAddressFactory {
+abstract contract StorageMultisigIsmFactory is
+    IThresholdAddressFactory,
+    PackageVersioned
+{
     /**
      * @notice Emitted when a multisig module is deployed
      * @param module The deployed ISM

solidity/core-utils/zksync/artifacts/index.ts

@@ -30,9 +30,9 @@ const currentDirectory = path.dirname(currentFilePath);
  * @param directory The directory to read artifact files from.
  * @return An array of artifact file names that end with '.js'.
  */
-const getArtifactFiles = (directory: string): string[] => {
+function getArtifactFiles(directory: string): string[] {
   return readdirSync(directory).filter((file) => file.endsWith('.js')); // Filter for .js files
-};
+}
 
 /**
  * @dev Exports the list of artifact names without the .js extension.
@@ -47,18 +47,18 @@ export const zksyncArtifactNames = getArtifactFiles(
  * @param name The name of the artifact to check.
  * @return True if the artifact exists, false otherwise.
  */
-export const artifactExists = (name: string): boolean => {
+export function artifactExists(name: string): boolean {
   return zksyncArtifactNames.includes(`${name}.js`); // Check if the artifact file exists
-};
+}
 
 /**
  * @dev Loads a ZkSync artifact by its name.
  * @param name The name of the artifact to load.
  * @return The loaded ZkSyncArtifact or undefined if it cannot be loaded.
  */
-const loadZkArtifact = async (
+export async function loadZkArtifact(
   name: string,
-): Promise<ZkSyncArtifact | undefined> => {
+): Promise<ZkSyncArtifact | undefined> {
   try {
     const artifactModule = await import(
       join(currentDirectory, 'output', `${name}.js`)
@@ -68,13 +68,13 @@ const loadZkArtifact = async (
     console.error(`Error loading artifact: ${name}`, error);
     return undefined;
   }
-};
+}
 
 /**
  * @dev Loads all ZkSync artifacts into a map.
  * @return A map of artifact names to their corresponding ZkSync artifacts.
  */
-export const loadAllZkArtifacts = async (): Promise<ArtifactMap> => {
+export async function loadAllZkArtifacts(): Promise<ArtifactMap> {
   const zkSyncArtifactMap: ArtifactMap = {};
 
   // Load all artifacts concurrently
@@ -88,15 +88,15 @@ export const loadAllZkArtifacts = async (): Promise<ArtifactMap> => {
   await Promise.all(loadPromises);
 
   return zkSyncArtifactMap; // Return the populated artifact map
-};
+}
 
 /**
  * @dev Retrieves a specific ZkSync artifact by its file name.
  * @param name The name of the artifact to retrieve.
  * @return The loaded ZkSyncArtifact or undefined if it cannot be loaded.
  */
-export const getZkArtifactByName = async (
+export async function getZkArtifactByName(
   name: string,
-): Promise<ZkSyncArtifact | undefined> => {
+): Promise<ZkSyncArtifact | undefined> {
   return loadZkArtifact(name);
-};
+}

solidity/test/isms/MultisigIsm.t.sol

@@ -228,7 +228,9 @@ contract MerkleRootMultisigIsmTest is AbstractMultisigIsmTest {
         mailbox = new TestMailbox(ORIGIN);
         merkleTreeHook = new TestMerkleTreeHook(address(mailbox));
         noopHook = new TestPostDispatchHook();
-        factory = new StaticMerkleRootMultisigIsmFactory();
+        factory = IThresholdAddressFactory(
+            address(new StaticMerkleRootMultisigIsmFactory())
+        );
         mailbox.setDefaultHook(address(merkleTreeHook));
         mailbox.setRequiredHook(address(noopHook));
     }
@@ -285,7 +287,9 @@ contract MessageIdMultisigIsmTest is AbstractMultisigIsmTest {
         merkleTreeHook = new TestMerkleTreeHook(address(mailbox));
         noopHook = new TestPostDispatchHook();
 
-        factory = new StaticMessageIdMultisigIsmFactory();
+        factory = IThresholdAddressFactory(
+            address(new StaticMessageIdMultisigIsmFactory())
+        );
         mailbox.setDefaultHook(address(merkleTreeHook));
         mailbox.setRequiredHook(address(noopHook));
     }

typescript/cli/src/deploy/core.ts

@@ -19,8 +19,8 @@ import { runSingleChainSelectionStep } from '../utils/chains.js';
 import { indentYamlOrJson } from '../utils/files.js';
 
 import {
-  checkTechStackCoreConfigCompatibility,
   completeDeploy,
+  isIsmCompatible,
   prepareDeploy,
   runDeployPlanStep,
   runPreflightChecksForChains,
@@ -85,7 +85,7 @@ export async function runCoreDeploy(params: DeployParams) {
   const { technicalStack: chainTechnicalStack } =
     context.multiProvider.getChainMetadata(chain);
 
-  if (!checkTechStackCoreConfigCompatibility({ chainTechnicalStack, config })) {
+  if (!isIsmCompatible({ chainTechnicalStack, config })) {
     logRed(
       'ERROR: CoreConfig is not compatible with the selected Chain Technical Stack!',
     );

typescript/cli/src/deploy/utils.ts

@@ -23,7 +23,6 @@ import {
   logGray,
   logGreen,
   logPink,
-  logRed,
   logTable,
 } from '../logger.js';
 import { nativeBalancesAreSufficient } from '../utils/balances.js';
@@ -199,21 +198,18 @@ function transformChainMetadataForDisplay(chainMetadata: ChainMetadata) {
  * @param {CoreConfig} params.config - The core configuration to check.
  * @returns {boolean} True if the configuration is compatible, false otherwise.
  */
-export function checkTechStackCoreConfigCompatibility({
+export function isIsmCompatible({
   chainTechnicalStack,
   config,
 }: {
   chainTechnicalStack: ChainTechnicalStack | undefined;
   config: CoreConfig;
 }): boolean {
+  if (shouldSkipStaticDeployment(chainTechnicalStack)) return true;
+
   // Static deployment is not available on certain chains (e.g., ZKSync) for aggregation ISMs.
-  if (
-    shouldSkipStaticDeployment(chainTechnicalStack) &&
+  return (
     typeof config.defaultIsm !== 'string' &&
     config.defaultIsm.type === IsmType.AGGREGATION
-  ) {
-    logRed('⛔ Static contract deployment not available on ZKSync!');
-    return false;
-  }
-  return true;
+  );
 }

typescript/cli/test-configs/zksync/chains/zksync1/metadata.yaml

@@ -8,6 +8,6 @@ nativeToken:
   decimals: 18
   name: Ether
   symbol: ETH
-protocol: zksync
+protocol: ethereum
 rpcUrls:
   - http: http://127.0.0.1:8011

typescript/cli/test-configs/zksync/chains/zksync2/metadata.yaml

@@ -8,6 +8,6 @@ nativeToken:
   decimals: 18
   name: Ether
   symbol: ETH
-protocol: zksync
+protocol: ethereum
 rpcUrls:
   - http: http://127.0.0.1:3050

typescript/sdk/src/core/EvmCoreModule.ts

@@ -468,9 +468,7 @@ export class EvmCoreModule extends HyperlaneModule<
     // Check if we should skip static address set deployment
     if (shouldSkipStaticDeployment(technicalStack)) {
       return createDefaultProxyFactoryFactories();
-    } else {
-      // Otherwise, deploy ISM factories
-      return await EvmCoreModule.deployIsmFactories(params);
     }
+    return EvmCoreModule.deployIsmFactories(params);
   }
 }

typescript/sdk/src/deploy/HyperlaneDeployer.ts

@@ -463,8 +463,9 @@ export abstract class HyperlaneDeployer<
     let verificationInput: ContractVerificationInput;
     if (isZKSyncChain) {
       if (!artifact) {
-        // TODO: ARTIFACT NOT FOUND ERROR
-        throw Error('Artifact not found');
+        throw new Error(
+          `No ZKSync artifact found for contract: ${contractName}`,
+        );
       }
       verificationInput = await getContractVerificationInputForZKSync({
         name: contractName,

typescript/sdk/src/deploy/proxy.ts

@@ -1,9 +1,9 @@
 import { ethers } from 'ethers';
-import * as zk from 'zksync-ethers';
+import { Provider as ZKSyncProvider } from 'zksync-ethers';
 
 import { Address, eqAddress } from '@hyperlane-xyz/utils';
 
-type Provider = ethers.providers.Provider | zk.Provider;
+type Provider = ethers.providers.Provider | ZKSyncProvider;
 
 export type UpgradeConfig = {
   timelock: {

typescript/sdk/src/deploy/verify/ZKSyncContractVerifier.ts

@@ -56,7 +56,7 @@ export class ZKSyncContractVerifier {
    * @notice Creates a mapping of contract names to source names from build artifacts
    * @dev This method processes the input to create a mapping required for constructing fully qualified contract names
    */
-  private async createContractSourceMapFromBuildArtifacts() {
+  private createContractSourceMapFromBuildArtifacts() {
     const contractRegex = /contract\s+([A-Z][a-zA-Z0-9]*)/g;
     Object.entries((buildArtifact as BuildArtifact).input.sources).forEach(
       ([sourceName, { content }]) => {
@@ -179,9 +179,7 @@ export class ZKSyncContractVerifier {
       'Sending request to explorer...',
     );
 
-    let response: Response;
-
-    response = await fetch(url.toString(), {
+    const response = await fetch(url.toString(), {
       method: 'POST',
       headers: { 'Content-Type': 'application/json' },
       body: JSON.stringify(options),

typescript/sdk/src/deploy/verify/utils.ts

@@ -7,6 +7,8 @@ import { ChainMap, ChainName } from '../../types.js';
 
 import { ContractVerificationInput } from './types.js';
 
+const { Interface } = await import('@ethersproject/abi');
+
 export function formatFunctionArguments(
   fragment: utils.Fragment,
   args: any[],
@@ -90,9 +92,7 @@ export async function getContractVerificationInputForZKSync({
   );
 }
 
-export async function encodeArguments(abi: any, constructorArgs: any[]) {
-  const { Interface } = await import('@ethersproject/abi');
-
+export function encodeArguments(abi: any, constructorArgs: any[]): string {
   const contractInterface = new Interface(abi);
   let deployArgumentsEncoded;
   try {

typescript/sdk/src/ism/EvmIsmModule.ts

@@ -420,7 +420,6 @@ export class EvmIsmModule extends HyperlaneModule<
           factory: new TrustedRelayerIsm__factory(),
           contractName: IsmType.TRUSTED_RELAYER,
           constructorArgs: [this.args.addresses.mailbox, config.relayer],
-          implementationAddress: undefined,
         });
 
       case IsmType.TEST_ISM:
@@ -431,56 +430,35 @@ export class EvmIsmModule extends HyperlaneModule<
           constructorArgs: [],
         });
       case IsmType.STORAGE_MESSAGE_ID_MULTISIG:
-        return this.deployStorageMessageIdMultisigIsm({
-          config,
-          logger,
-        });
       case IsmType.STORAGE_MERKLE_ROOT_MULTISIG:
         return this.deployStorageMultisigIsm({
           config,
-          logger,
         });
 
       default:
         throw new Error(`Unsupported ISM type ${ismType}`);
     }
   }
 
-  // TODO: handle logging part
-  protected async deployStorageMessageIdMultisigIsm({
-    config,
-    logger,
-  }: {
-    config: MultisigIsmConfig;
-    logger: Logger;
-  }): Promise<IMultisigIsm> {
-    const signer = this.multiProvider.getSigner(this.chain);
-
-    const contract = await this.deployer.deployContractFromFactory({
-      chain: this.chain,
-      factory: new StorageMessageIdMultisigIsm__factory(),
-      contractName: IsmType.STORAGE_MESSAGE_ID_MULTISIG,
-      constructorArgs: [config.validators, config.threshold],
-    });
-    return IMultisigIsm__factory.connect(contract.address, signer);
-  }
-
-  // TODO: handle logging part
   protected async deployStorageMultisigIsm({
     config,
-    logger,
   }: {
     config: MultisigIsmConfig;
-    logger: Logger;
   }): Promise<IMultisigIsm> {
     const signer = this.multiProvider.getSigner(this.chain);
 
+    const factory =
+      config.type === IsmType.STORAGE_MERKLE_ROOT_MULTISIG
+        ? new StorageMerkleRootMultisigIsm__factory()
+        : new StorageMessageIdMultisigIsm__factory();
+
     const contract = await this.deployer.deployContractFromFactory({
       chain: this.chain,
-      factory: new StorageMerkleRootMultisigIsm__factory(),
-      contractName: IsmType.STORAGE_MERKLE_ROOT_MULTISIG,
+      factory: factory,
+      contractName: config.type,
       constructorArgs: [config.validators, config.threshold],
     });
+
     return IMultisigIsm__factory.connect(contract.address, signer);
   }