fix build issue

Signed-off-by: Faisal Usmani <faisal.of.usmani@gmail.com>

Author: fusmanii

deploy/023_deploy_spoke_pool_verifier.ts

@@ -1,6 +1,5 @@
 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();
@@ -12,7 +11,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 verifyContract(deployment.address, []);
+  await hre.run("verify:verify", { address: deployment.address, constructorArguments: [] });
 };
 
 module.exports = func;

deploy/040_deploy_multicall_handler.ts

@@ -1,14 +1,13 @@
 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();
 
   // @note if deploying this contract on a chain like Linea that only supports up to
   // solc 0.8.19, the hardhat.config solc version needs to be overridden and this
   // contract needs to be recompiled.
-  const deployment = await hre.deployments.deploy("Multicallhandler", {
+  await hre.deployments.deploy("Multicallhandler", {
     contract: "MulticallHandler",
     from: deployer,
     log: true,
@@ -17,7 +16,6 @@ const func: DeployFunction = async function (hre: HardhatRuntimeEnvironment) {
     deterministicDeployment: "0x12345678", // Salt for the create2 call. This will deploy this contract
     // at the same address on all chains except ZkSync and Linea which are not EVM equivalent.
   });
-  await verifyContract(deployment.address, []);
 };
 module.exports = func;
 func.tags = ["Multicallhandler"];

deploy/110_deploy_universal_adapter.ts

@@ -6,7 +6,6 @@ import { CCTP_NO_DOMAIN } from "@across-protocol/constants";
 import { CIRCLE_UNINITIALIZED_DOMAIN_ID } from "./consts";
 import assert from "assert";
 import { getDeployedAddress } from "../src/DeploymentUtils";
-import { verifyContract } from "../utils/utils.hre";
 
 const func: DeployFunction = async function (hre: HardhatRuntimeEnvironment) {
   const { SPOKE_CHAIN_ID } = process.env;
@@ -35,14 +34,13 @@ const func: DeployFunction = async function (hre: HardhatRuntimeEnvironment) {
     oftDstEid,
     oftFeeCap,
   ];
-  console.log(`Deploying new Universal Adapter on ${SPOKE_CHAIN_ID} with args:`, args);
   const instance = await hre.deployments.deploy("Universal_Adapter", {
     from: deployer,
     log: true,
     skipIfAlreadyDeployed: false,
     args,
   });
-  await verifyContract(instance.address, args);
+  await hre.run("verify:verify", { address: instance.address, constructorArguments: args });
 };
 
 module.exports = func;

deploy/112_deploy_spokepool_periphery.ts

@@ -2,7 +2,6 @@ import { DeployFunction } from "hardhat-deploy/types";
 import { HardhatRuntimeEnvironment } from "hardhat/types";
 import { L1_ADDRESS_MAP, L2_ADDRESS_MAP } from "./consts";
 import { CHAIN_IDs } from "@across-protocol/constants";
-import { verifyContract } from "../utils/utils.hre";
 
 const func: DeployFunction = async function (hre: HardhatRuntimeEnvironment) {
   const contractName = "SpokePoolPeriphery";
@@ -27,7 +26,10 @@ const func: DeployFunction = async function (hre: HardhatRuntimeEnvironment) {
     args: constructorArgs,
   });
 
-  await verifyContract(deployment.address, constructorArgs);
+  await hre.run("verify:verify", {
+    address: deployment.address,
+    constructorArguments: constructorArgs,
+  });
 };
 module.exports = func;
 func.tags = ["SpokePoolPeriphery"];

utils/utils.hre.ts

@@ -92,17 +92,7 @@ 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 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 });
-  }
+  await run("verify:verify", { address: instance, constructorArguments: constructorArgs, contract });
 }
 
 export { hre };