Finalize gas bound caller (#526)

gas-bound-caller/README.md

@@ -48,4 +48,4 @@ Since `GasBoundCaller` would be the contract that calls the `_to` contract, the
 
 It should be deployed via a built-in CREATE2 factory on each individual chain.
 
-TODO(EVM-585)
+The current address on both sepolia testnet and mainnet for zkSync Era is `0xc706EC7dfA5D4Dc87f29f859094165E8290530f5`.

gas-bound-caller/hardhat.config.ts

@@ -1,30 +1,15 @@
 import "@matterlabs/hardhat-zksync-chai-matchers";
 import "@matterlabs/hardhat-zksync-node";
 import "@matterlabs/hardhat-zksync-solc";
+import "@matterlabs/hardhat-zksync-verify";
 import "@nomiclabs/hardhat-ethers";
 import "hardhat-typechain";
 
-// This version of system contracts requires a pre release of the compiler
-const COMPILER_VERSION = "1.5.0";
-const PRE_RELEASE_VERSION = "prerelease-a167aa3-code4rena";
-function getZksolcUrl(): string {
-  // @ts-ignore
-  const platform = { darwin: "macosx", linux: "linux", win32: "windows" }[process.platform];
-  // @ts-ignore
-  const toolchain = { linux: "-musl", win32: "-gnu", darwin: "" }[process.platform];
-  const arch = process.arch === "x64" ? "amd64" : process.arch;
-  const ext = process.platform === "win32" ? ".exe" : "";
-
-  return `https://github.com/matter-labs/era-compiler-solidity/releases/download/${PRE_RELEASE_VERSION}/zksolc-${platform}-${arch}${toolchain}-v${COMPILER_VERSION}${ext}`;
-}
-
-console.log(`Using zksolc from ${getZksolcUrl()}`);
-
 export default {
   zksolc: {
+    version: "1.5.0",
     compilerSource: "binary",
     settings: {
-      compilerPath: getZksolcUrl(),
       isSystem: true,
     },
   },
@@ -55,6 +40,20 @@ export default {
       ethNetwork: "localhost",
       zksync: true,
     },
+    zkSyncTestnet: {
+      url: "https://sepolia.era.zksync.dev",
+      ethNetwork: "sepolia",
+      zksync: true,
+      // contract verification endpoint
+      verifyURL: "https://explorer.sepolia.era.zksync.dev/contract_verification",
+    },
+    zkSyncMainnet: {
+      url: "https://mainnet.era.zksync.io",
+      ethNetwork: "mainnet",
+      zksync: true,
+      // contract verification endpoint
+      verifyURL: "https://zksync2-mainnet-explorer.zksync.io/contract_verification",
+    },
   },
   paths: {
     sources: "./contracts",

gas-bound-caller/package.json

@@ -20,6 +20,7 @@
   "devDependencies": {
     "@matterlabs/hardhat-zksync-chai-matchers": "^0.1.4",
     "@matterlabs/hardhat-zksync-node": "^0.0.1-beta.7",
+    "@matterlabs/hardhat-zksync-verify": "0.6.1",
     "@nomicfoundation/hardhat-chai-matchers": "^1.0.3",
     "@nomiclabs/hardhat-ethers": "^2.0.0",
     "@typechain/ethers-v5": "^2.0.0",
@@ -54,6 +55,8 @@
     "clean": "yarn clean:bootloader && yarn clean:system-contracts",
     "test": "yarn build && hardhat test --network zkSyncTestNode",
     "test-node": "hardhat node-zksync --tag v0.0.1-vm1.5.0",
+    "check-canonical-bytecode": "ts-node ./scripts/check-canonical-bytecode.ts",
+    "verify": "hardhat run scripts/verify.ts",
     "deploy-on-hyperchain": "ts-node ./scripts/deploy-on-hyperchain.ts",
     "deploy-on-localhost": "hardhat deploy --network localhost"
   }

gas-bound-caller/scripts/verify.ts

@@ -0,0 +1,31 @@
+// hardhat import should be the first import in the file
+import * as hardhat from "hardhat";
+
+const EXPECTED_ADDRESS = "0xc706EC7dfA5D4Dc87f29f859094165E8290530f5";
+
+// eslint-disable-next-line @typescript-eslint/no-explicit-any
+function verifyPromise(address: string, constructorArguments?: Array<any>, libraries?: object): Promise<any> {
+  return new Promise((resolve, reject) => {
+    hardhat
+      .run("verify:verify", { address, constructorArguments, libraries })
+      .then(() => resolve(`Successfully verified ${address}`))
+      .catch((e) => reject(`Failed to verify ${address}\nError: ${e.message}`));
+  });
+}
+
+async function main() {
+  if (process.env.CHAIN_ETH_NETWORK == "localhost") {
+    console.log("Skip contract verification on localhost");
+    return;
+  }
+
+  const message = await verifyPromise(EXPECTED_ADDRESS);
+  console.log(message.status == "fulfilled" ? message.value : message.reason);
+}
+
+main()
+  .then(() => process.exit(0))
+  .catch((err) => {
+    console.error("Error:", err.message || err);
+    process.exit(1);
+  });

yarn.lock

@@ -752,6 +752,26 @@
     sinon-chai "^3.7.0"
     undici "^5.14.0"
 
+"@matterlabs/[email protected]":
+  version "0.6.1"
+  resolved "https://registry.yarnpkg.com/@matterlabs/hardhat-zksync-verify/-/hardhat-zksync-verify-0.6.1.tgz#3fd83f4177ac0b138656ed93d4756ec27f1d329d"
+  integrity sha512-W9gI4k1UnuQ2MaBnK1f7E8Z2C4uHxpeDkzmB/ZCKClai2A3vK2jAbfqiQbX0HvuLq2OOq4dbx83KehAXjXoHlw==
+  dependencies:
+    "@ethersproject/abi" "^5.1.2"
+    "@ethersproject/address" "5.7.0"
+    "@matterlabs/hardhat-zksync-solc" "^1.1.4"
+    "@nomicfoundation/hardhat-verify" "^2.0.0"
+    "@openzeppelin/contracts" "^4.9.2"
+    axios "^1.6.2"
+    cbor "^8.1.0"
+    chai "^4.3.6"
+    chalk "4.1.2"
+    debug "^4.1.1"
+    hardhat "^2.14.0"
+    sinon "^17.0.1"
+    sinon-chai "^3.7.0"
+    zksync-ethers "^5.0.0"
+
 "@matterlabs/hardhat-zksync-verify@^0.2.0":
   version "0.2.2"
   resolved "https://registry.yarnpkg.com/@matterlabs/hardhat-zksync-verify/-/hardhat-zksync-verify-0.2.2.tgz#daa34bc4404096ed0f44461ee366c1cb0e5a4f2f"
@@ -7517,6 +7537,13 @@ yocto-queue@^1.0.0:
   resolved "https://registry.yarnpkg.com/yocto-queue/-/yocto-queue-1.0.0.tgz#7f816433fb2cbc511ec8bf7d263c3b58a1a3c251"
   integrity sha512-9bnSc/HEW2uRy67wc+T8UwauLuPJVn28jb+GtJY16iiKWyvmYJRXVT4UamsAEGQfPohgr2q4Tq0sQbQlxTfi1g==
 
+zksync-ethers@^5.0.0:
+  version "5.8.0"
+  resolved "https://registry.yarnpkg.com/zksync-ethers/-/zksync-ethers-5.8.0.tgz#ff054345048f851c33cb6efcf2094f40d4da6063"
+  integrity sha512-/4qI5UElh0lspu0ew2IXBCO+O9kXEzZOM7JqvlfRWWGIUKZ+EDXnjIPgkH0y5/MnMT3FDq9koAAUCyZVWqHUJg==
+  dependencies:
+    ethers "~5.7.0"
+
 "zksync-ethers@https://github.com/zksync-sdk/zksync-ethers#ethers-v5-feat/bridgehub":
   version "5.1.0"
   resolved "https://github.com/zksync-sdk/zksync-ethers#28ccbe7d67b170c202b17475e06a82002e6e3acc"