chore: Support Etherscan V2 verification

deploy/023_deploy_spoke_pool_verifier.ts

@@ -1,5 +1,6 @@
 import { DeployFunction } from "hardhat-deploy/types";
 import { HardhatRuntimeEnvironment } from "hardhat/types";
+import { verifyContract } from "../utils/utils.hre";
 
 const func: DeployFunction = async function (hre: HardhatRuntimeEnvironment) {
   const { deployer } = await hre.getNamedAccounts();
@@ -11,7 +12,7 @@ const func: DeployFunction = async function (hre: HardhatRuntimeEnvironment) {
     deterministicDeployment: "0x1234", // Salt for the create2 call.
   });
   console.log(`Deployed at block ${deployment.receipt.blockNumber} (tx: ${deployment.transactionHash})`);
-  await hre.run("verify:verify", { address: deployment.address, constructorArguments: [] });
+  await verifyContract(deployment.address, []);
 };
 
 module.exports = func;

hardhat.config.ts

@@ -129,7 +129,7 @@ const config: HardhatUserConfig = {
         enabled: true,
       },
       suppressedErrors: ["sendtransfer"],
-      contractsToCompile: ["SpokePoolPeriphery", "MulticallHandler"],
+      contractsToCompile: ["SpokePoolPeriphery", "MulticallHandler", "SpokePoolVerifier"],
     },
   },
   networks: {
@@ -400,167 +400,51 @@ const config: HardhatUserConfig = {
   },
   gasReporter: { enabled: process.env.REPORT_GAS !== undefined, currency: "USD" },
   etherscan: {
-    apiKey: {
-      mainnet: process.env.ETHERSCAN_API_KEY!,
-      sepolia: process.env.ETHERSCAN_API_KEY!,
-      optimisticEthereum: process.env.OPTIMISM_ETHERSCAN_API_KEY!,
-      optimisticSepolia: process.env.OPTIMISM_ETHERSCAN_API_KEY!,
-      arbitrumOne: process.env.ARBITRUM_ETHERSCAN_API_KEY!,
-      "arbitrum-sepolia": process.env.ARBITRUM_ETHERSCAN_API_KEY!,
-      polygon: process.env.POLYGON_ETHERSCAN_API_KEY!,
-      "polygon-amoy": process.env.POLYGON_ETHERSCAN_API_KEY!,
-      base: process.env.BASE_ETHERSCAN_API_KEY!,
-      "base-sepolia": process.env.BASE_ETHERSCAN_API_KEY!,
-      linea: process.env.LINEA_ETHERSCAN_API_KEY!,
-      scroll: process.env.SCROLL_ETHERSCAN_API_KEY!,
-      "scroll-sepolia": process.env.SCROLL_ETHERSCAN_API_KEY!,
-      "polygon-zk-evm": process.env.POLYGON_ZK_EVM_ETHERSCAN_API_KEY!,
-      "polygon-zk-evm-testnet": process.env.POLYGON_ZK_EVM_ETHERSCAN_API_KEY!,
-      bsc: process.env.BNB_ETHERSCAN_API_KEY!,
-      hyperevm: process.env.ETHERSCAN_API_KEY!,
-      mode: "blockscout",
-      "mode-sepolia": "blockscout",
-      tatara: "blockscout",
-      lisk: "blockscout",
-      "lisk-sepolia": "blockscout",
-      redstone: "blockscout",
-      blast: process.env.BLAST_ETHERSCAN_API_KEY!,
-      "blast-sepolia": process.env.BLAST_ETHERSCAN_API_KEY!,
-      zora: "routescan",
-      worldchain: "blockscout",
-      ink: "blockscout",
-      soneium: "blockscout",
-      unichain: process.env.UNICHAIN_ETHERSCAN_API_KEY!,
-      "unichain-sepolia": process.env.UNICHAIN_ETHERSCAN_API_KEY!,
-      "bob-sepolia": "blockscout",
-    },
+    apiKey: process.env.ETHERSCAN_API_KEY!,
     customChains: [
       {
-        network: "base",
-        chainId: CHAIN_IDs.BASE,
-        urls: {
-          apiURL: "https://api.basescan.org/api",
-          browserURL: "https://basescan.org",
-        },
-      },
-      {
-        network: "base-sepolia",
-        chainId: CHAIN_IDs.BASE_SEPOLIA,
-        urls: {
-          apiURL: "https://api-sepolia.basescan.org/api",
-          browserURL: "https://sepolia.basescan.org",
-        },
-      },
-      {
-        network: "ink",
-        chainId: CHAIN_IDs.INK,
-        urls: {
-          apiURL: "https://explorer.inkonchain.com/api",
-          browserURL: "https://explorer.inkonchain.com",
-        },
-      },
-      {
-        network: "soneium",
-        chainId: CHAIN_IDs.SONEIUM,
-        urls: {
-          apiURL: "https://soneium.blockscout.com/api",
-          browserURL: "https://soneium.blockscout.com",
-        },
-      },
-      {
-        network: "linea",
-        chainId: CHAIN_IDs.LINEA,
-        urls: {
-          apiURL: "https://api.lineascan.build/api",
-          browserURL: "https://lineascan.build",
-        },
-      },
-      {
-        network: "sepolia",
-        chainId: CHAIN_IDs.SEPOLIA,
+        network: "hyperevm",
+        chainId: CHAIN_IDs.HYPEREVM,
         urls: {
-          apiURL: "https://api-sepolia.etherscan.io/api",
-          browserURL: "https://sepolia.etherscan.io",
+          apiURL: "https://hyperevmscan.io/api",
+          browserURL: "https://hyperevmscan.io",
         },
       },
       {
-        network: "scroll",
-        chainId: CHAIN_IDs.SCROLL,
+        network: "zksync",
+        chainId: CHAIN_IDs.ZK_SYNC,
         urls: {
-          apiURL: "https://api.scrollscan.com/api",
-          browserURL: "https://scrollscan.com",
-        },
-      },
-      {
-        network: "scroll-sepolia",
-        chainId: CHAIN_IDs.SCROLL_SEPOLIA,
-        urls: {
-          apiURL: "https://api-sepolia.scrollscan.com/api",
-          browserURL: "https://api-sepolia.scrollscan.com",
-        },
-      },
-      {
-        network: "optimisticSepolia",
-        chainId: CHAIN_IDs.OPTIMISM_SEPOLIA,
-        urls: {
-          apiURL: "https://api-sepolia-optimistic.etherscan.io/api",
-          browserURL: "https://sepolia-optimism.etherscan.io",
-        },
-      },
-      {
-        network: "polygon-zk-evm",
-        chainId: 1101,
-        urls: {
-          apiURL: "https://api-zkevm.polygonscan.com/api",
-          browserURL: "https://zkevm.polygonscan.com",
-        },
-      },
-      {
-        network: "polygon-zk-evm-testnet",
-        chainId: 1442,
-        urls: {
-          apiURL: "https://api-testnet-zkevm.polygonscan.com/api",
-          browserURL: "https://testnet-zkevm.polygonscan.com/",
-        },
-      },
-      {
-        network: "polygon-amoy",
-        chainId: CHAIN_IDs.POLYGON_AMOY,
-        urls: {
-          apiURL: "https://api-amoy.polygonscan.com/api",
-          browserURL: "https://amoy.polygonscan.com",
-        },
-      },
-      {
-        network: "arbitrum-sepolia",
-        chainId: CHAIN_IDs.ARBITRUM_SEPOLIA,
-        urls: {
-          apiURL: "https://api-sepolia.arbiscan.io/api",
-          browserURL: "https://sepolia.arbiscan.io",
+          apiURL: "https://zksync2-mainnet-explorer.zksync.io/contract_verification",
+          browserURL: "https://era.zksync.network/",
         },
       },
+    ],
+  },
+  blockscout: {
+    enabled: true,
+    customChains: [
       {
-        network: "mode-sepolia",
-        chainId: CHAIN_IDs.MODE_SEPOLIA,
+        network: "bob-sepolia",
+        chainId: CHAIN_IDs.BOB_SEPOLIA,
         urls: {
-          apiURL: "https://api.routescan.io/v2/network/testnet/evm/919/etherscan",
-          browserURL: "https://testnet.modescan.io",
+          apiURL: "https://bob-sepolia.explorer.gobob.xyz/api",
+          browserURL: "https://bob-sepolia.explorer.gobob.xyz",
         },
       },
       {
-        network: "mode",
-        chainId: CHAIN_IDs.MODE,
+        network: "ink",
+        chainId: CHAIN_IDs.INK,
         urls: {
-          apiURL: "https://explorer.mode.network/api",
-          browserURL: "https://explorer.mode.network/",
+          apiURL: "https://explorer.inkonchain.com/api",
+          browserURL: "https://explorer.inkonchain.com",
         },
       },
       {
-        network: "tatara",
-        chainId: CHAIN_IDs.TATARA,
+        network: "lens",
+        chainId: CHAIN_IDs.LENS,
         urls: {
-          apiURL: "https://explorer.tatara.katana.network/api",
-          browserURL: "https://explorer.tatara.katana.network",
+          apiURL: "https://verify.lens.xyz/contract_verification",
+          browserURL: "https://explorer.lens.xyz/",
         },
       },
       {
@@ -580,67 +464,43 @@ const config: HardhatUserConfig = {
         },
       },
       {
-        network: "redstone",
-        chainId: CHAIN_IDs.REDSTONE,
-        urls: {
-          apiURL: "https://explorer.redstone.xyz/api",
-          browserURL: "https://explorer.redstone.xyz",
-        },
-      },
-      {
-        network: "blast",
-        chainId: CHAIN_IDs.BLAST,
-        urls: {
-          apiURL: "https://api.blastscan.io/api",
-          browserURL: "https://blastscan.io",
-        },
-      },
-      {
-        network: "blast-sepolia",
-        chainId: CHAIN_IDs.BLAST_SEPOLIA,
-        urls: {
-          apiURL: "https://api-sepolia.blastscan.io/api",
-          browserURL: "https://sepolia.blastscan.io",
-        },
-      },
-      {
-        network: "worldchain",
-        chainId: CHAIN_IDs.WORLD_CHAIN,
+        network: "mode",
+        chainId: CHAIN_IDs.MODE,
         urls: {
-          apiURL: "https://worldchain-mainnet.explorer.alchemy.com/api",
-          browserURL: "https://worldchain-mainnet.explorer.alchemy.com",
+          apiURL: "https://explorer.mode.network/api",
+          browserURL: "https://explorer.mode.network/",
         },
       },
       {
-        network: "zora",
-        chainId: CHAIN_IDs.ZORA,
+        network: "mode-sepolia",
+        chainId: CHAIN_IDs.MODE_SEPOLIA,
         urls: {
-          apiURL: "https://api.routescan.io/v2/network/mainnet/evm/7777777/etherscan",
-          browserURL: "https://zorascan.xyz",
+          apiURL: "https://api.routescan.io/v2/network/testnet/evm/919/etherscan",
+          browserURL: "https://testnet.modescan.io",
         },
       },
       {
-        network: "unichain",
-        chainId: CHAIN_IDs.UNICHAIN,
+        network: "redstone",
+        chainId: CHAIN_IDs.REDSTONE,
         urls: {
-          apiURL: "https://api.uniscan.xyz/api",
-          browserURL: "https://uniscan.xyz",
+          apiURL: "https://explorer.redstone.xyz/api",
+          browserURL: "https://explorer.redstone.xyz",
         },
       },
       {
-        network: "unichain-sepolia",
-        chainId: CHAIN_IDs.UNICHAIN_SEPOLIA,
+        network: "soneium",
+        chainId: CHAIN_IDs.SONEIUM,
         urls: {
-          apiURL: "https://api-sepolia.uniscan.xyz/api",
-          browserURL: "https://sepolia.uniscan.xyz",
+          apiURL: "https://soneium.blockscout.com/api",
+          browserURL: "https://soneium.blockscout.com",
         },
       },
       {
-        network: "bob-sepolia",
-        chainId: CHAIN_IDs.BOB_SEPOLIA,
+        network: "tatara",
+        chainId: CHAIN_IDs.TATARA,
         urls: {
-          apiURL: "https://bob-sepolia.explorer.gobob.xyz/api",
-          browserURL: "https://bob-sepolia.explorer.gobob.xyz",
+          apiURL: "https://explorer.tatara.katana.network/api",
+          browserURL: "https://explorer.tatara.katana.network",
         },
       },
     ],

package.json

@@ -85,9 +85,9 @@
     "@matterlabs/hardhat-zksync-deploy": "^0.6.3",
     "@matterlabs/hardhat-zksync-solc": "^1.4.0",
     "@matterlabs/hardhat-zksync-upgradable": "^0.1.0",
-    "@matterlabs/hardhat-zksync-verify": "^0.2.0",
+    "@matterlabs/hardhat-zksync-verify": "^1.9.0",
     "@matterlabs/zksync-contracts": "^0.2.4",
-    "@nomicfoundation/hardhat-verify": "^1.0.3",
+    "@nomicfoundation/hardhat-verify": "^2.0.14",
     "@nomiclabs/hardhat-ethers": "^2.2.3",
     "@nomiclabs/hardhat-waffle": "2.0.3",
     "@openzeppelin/hardhat-upgrades": "^1.22.0",

utils/utils.hre.ts

@@ -92,7 +92,17 @@ export async function deployNewProxy(
   // to the implementation's ABI on etherscan.
   // https://docs.openzeppelin.com/upgrades-plugins/1.x/api-hardhat-upgrades#verify
   const contract = `contracts/${name}.sol:${name}`;
-  await run("verify:verify", { address: instance, constructorArguments: constructorArgs, contract });
+  await verifyContract(instance, constructorArgs, contract);
+}
+
+export async function verifyContract(address: string, constructorArguments: any[], contract?: string) {
+  const { run, getChainId } = hre;
+  const chainId = Number(await getChainId());
+  if (hre.config.blockscout.enabled && hre.config.blockscout.customChains.some((chain) => chain.chainId === chainId)) {
+    await run("verify:blockscout", { address, constructorArguments, contract });
+  } else {
+    await run("verify:verify", { address, constructorArguments, contract });
+  }
 }
 
 export { hre };