revert: "feat: zksync support for core solidity package"

solidity/.gitignore

@@ -15,10 +15,3 @@ docs
 flattened/
 buildArtifact.json
 fixtures/
-# ZKSync
-artifacts-zk
-cache-zk
-core-utils/zksync/artifacts/output
-.zksolc-libraries-cache/
-typechain-types/
-typechain/

solidity/exportBuildArtifact.sh

@@ -37,42 +37,3 @@ else
   echo 'Failed to process build artifact with jq'
   exit 1
 fi
-
-# ZKSYNC
-
-if [ "$ZKSYNC" = "true" ]; then
-  # Define the artifacts directory
-  artifactsDir="./artifacts-zk/build-info"
-  # Define the output file
-  outputFileJson="./dist/zksync/buildArtifact.json"
-  outputFileJs="./dist/zksync/buildArtifact.js"
-  outputFileTsd="./dist/zksync/buildArtifact.d.ts"
-
-  # log that we're in the script
-  echo 'Finding and processing ZKSync hardhat build artifact...'
-
-  # Find most recently modified JSON build artifact
-  if [ "$(uname)" = "Darwin" ]; then
-    # for local flow
-    jsonFiles=$(find "$artifactsDir" -type f -name "*.json" -exec stat -f "%m %N" {} \; | sort -rn | head -n 1 | cut -d' ' -f2-)
-  else
-    # for CI flow
-    jsonFiles=$(find "$artifactsDir" -type f -name "*.json" -exec stat -c "%Y %n" {} \; | sort -rn | head -n 1 | cut -d' ' -f2-)
-  fi
-
-  if [ ! -f "$jsonFiles" ]; then
-    echo 'Failed to find ZKSync build artifact'
-    exit 1
-  fi
-
-  # Extract required keys and write to outputFile
-  if jq -c '{input, solcLongVersion, zk_version: .output.zk_version}' "$jsonFiles" >"$outputFileJson"; then
-    echo "export const buildArtifact = " >"$outputFileJs"
-    cat "$outputFileJson" >>"$outputFileJs"
-    echo "export const buildArtifact: any" >"$outputFileTsd"
-    echo 'Finished processing ZKSync build artifact.'
-  else
-    echo 'Failed to process ZKSync build artifact with jq'
-    exit 1
-  fi
-fi

solidity/hardhat.config.cts

@@ -22,7 +22,7 @@ module.exports = {
     currency: 'USD',
   },
   typechain: {
-    outDir: './core-utils/typechain',
+    outDir: './types',
     target: 'ethers-v5',
     alwaysGenerateOverloads: true,
     node16Modules: true,

solidity/package.json

@@ -13,7 +13,6 @@
   },
   "devDependencies": {
     "@layerzerolabs/solidity-examples": "^1.1.0",
-    "@matterlabs/hardhat-zksync-solc": "^1.2.4",
     "@nomiclabs/hardhat-ethers": "^2.2.3",
     "@nomiclabs/hardhat-waffle": "^2.0.6",
     "@typechain/ethers-v5": "^11.1.2",
@@ -36,19 +35,17 @@
     "ts-node": "^10.8.0",
     "tsx": "^4.19.1",
     "typechain": "patch:typechain@npm%3A8.3.2#~/.yarn/patches/typechain-npm-8.3.2-b02e27439e.patch",
-    "typescript": "5.3.3",
-    "zksync-ethers": "^5.10.0"
+    "typescript": "5.3.3"
   },
   "directories": {
     "test": "test"
   },
   "type": "module",
   "exports": {
     ".": "./dist/index.js",
-    "./mailbox": "./dist/typechain/contracts/Mailbox.js",
+    "./mailbox": "./dist/contracts/Mailbox.js",
     "./buildArtifact.js": "./dist/buildArtifact.js",
     "./buildArtifact.json": "./dist/buildArtifact.json",
-    "./buildArtifact-zksync.js": "./dist/zksync/buildArtifact.js",
     "./contracts": "./contracts"
   },
   "types": "./dist/index.d.ts",
@@ -68,15 +65,12 @@
   "license": "Apache-2.0",
   "scripts": {
     "build": "yarn version:update && yarn hardhat-esm compile && tsc && ./exportBuildArtifact.sh",
-    "build:zk": "yarn hardhat-zk compile && ts-node generate-artifact-exports.mjs && ZKSYNC=true ./exportBuildArtifact.sh && yarn copy-artifacts",
-    "prepublishOnly": "yarn build && yarn build:zk",
     "lint": "solhint contracts/**/*.sol",
-    "clean": "yarn hardhat-esm clean && yarn hardhat-zk clean && rm -rf ./dist ./cache ./cache-zk ./types ./coverage ./out ./forge-cache ./fixtures",
+    "clean": "yarn hardhat-esm clean && rm -rf ./dist ./cache ./types ./coverage ./out ./forge-cache ./fixtures",
     "coverage": "yarn fixtures && ./coverage.sh",
     "docs": "forge doc",
     "fixtures": "mkdir -p ./fixtures/aggregation ./fixtures/multisig",
     "hardhat-esm": "NODE_OPTIONS='--experimental-loader ts-node/esm/transpile-only --no-warnings=ExperimentalWarning' hardhat --config hardhat.config.cts",
-    "hardhat-zk": "NODE_OPTIONS='--experimental-loader ts-node/esm/transpile-only --no-warnings=ExperimentalWarning' hardhat --config zk-hardhat.config.cts",
     "prettier": "prettier --write ./contracts ./test",
     "test": "yarn version:exhaustive && yarn hardhat-esm test && yarn test:forge",
     "test:hardhat": "yarn hardhat-esm test",
@@ -88,8 +82,7 @@
     "storage": "./storage.sh",
     "version:update": "sh ./bytecodeversion.sh",
     "version:changed": "yarn version:update && git diff --exit-code",
-    "version:exhaustive": "yarn tsx ./test/exhaustiveversion.test.ts",
-    "copy-artifacts": "mkdir -p dist/zksync/artifacts && cp core-utils/zksync/artifacts/*.json dist/zksync/artifacts/"
+    "version:exhaustive": "yarn tsx ./test/exhaustiveversion.test.ts"
   },
   "peerDependencies": {
     "@ethersproject/abi": "*",

solidity/test/lib/mailboxes.ts

@@ -18,8 +18,8 @@ import {
   LegacyMultisigIsm,
   TestMailbox,
   TestMerkleTreeHook,
-} from '../../core-utils/typechain';
-import { DispatchEvent } from '../../core-utils/typechain/contracts/Mailbox';
+} from '../../types';
+import { DispatchEvent } from '../../types/contracts/Mailbox';
 
 export type MessageAndProof = {
   proof: MerkleProof;

solidity/test/merkle.test.ts

@@ -2,7 +2,7 @@ import { expect } from 'chai';
 import { utils } from 'ethers';
 
 import merkleTestCases from '../../vectors/merkle.json' assert { type: 'json' };
-import { TestMerkle, TestMerkle__factory } from '../core-utils/typechain';
+import { TestMerkle, TestMerkle__factory } from '../types';
 
 import { getSigner } from './signer';
 

solidity/test/message.test.ts

@@ -8,11 +8,7 @@ import {
 } from '@hyperlane-xyz/utils';
 
 import testCases from '../../vectors/message.json' assert { type: 'json' };
-import {
-  Mailbox__factory,
-  TestMessage,
-  TestMessage__factory,
-} from '../core-utils/typechain';
+import { Mailbox__factory, TestMessage, TestMessage__factory } from '../types';
 
 import { getSigner, getSigners } from './signer';
 

solidity/test/mockMailbox.test.ts

@@ -3,10 +3,7 @@ import { utils } from 'ethers';
 
 import { addressToBytes32 } from '@hyperlane-xyz/utils';
 
-import {
-  MockMailbox__factory,
-  TestRecipient__factory,
-} from '../core-utils/typechain';
+import { MockMailbox__factory, TestRecipient__factory } from '../types';
 
 import { getSigner } from './signer';
 

solidity/test/testrecipient.test.ts

@@ -3,7 +3,7 @@ import { utils } from 'ethers';
 
 import { addressToBytes32 } from '@hyperlane-xyz/utils';
 
-import { TestRecipient, TestRecipient__factory } from '../core-utils/typechain';
+import { TestRecipient, TestRecipient__factory } from '../types';
 
 import { getSigner } from './signer';
 

solidity/tsconfig.json

@@ -2,7 +2,7 @@
   "extends": "../tsconfig.json",
   "compilerOptions": {
     "outDir": "./dist",
-    "rootDir": "./core-utils"
+    "rootDir": "./types"
   },
-  "exclude": ["./test", "hardhat.config.cts", "./dist", "zk-hardhat.config.cts"]
+  "exclude": ["./test", "hardhat.config.cts", "./dist"]
 }