Add deterministic deployment

Author: Hrom131

contracts/interfaces/ICreateX.sol

@@ -0,0 +1,21 @@
+// SPDX-License-Identifier: MIT
+pragma solidity ^0.8.28;
+
+interface ICreateX {
+    struct Values {
+        uint256 constructorAmount;
+        uint256 initCallAmount;
+    }
+
+    function deployCreate2AndInit(
+        bytes32 salt_,
+        bytes memory initCode_,
+        bytes memory data_,
+        Values memory values_
+    ) external payable returns (address newContract_);
+
+    function computeCreate2Address(
+        bytes32 salt_,
+        bytes32 initCodeHash_
+    ) external view returns (address computedAddress_);
+}

deploy/1_SPVGateway.migration.ts

@@ -1,19 +1,27 @@
 import { Deployer, Reporter } from "@solarity/hardhat-migrate";
 
-import { SPVGateway__factory } from "@ethers-v6";
+import { SPVGateway__factory, ICreateX__factory } from "@ethers-v6";
 
 import { getConfig } from "./config/config";
+import { getSPVGatewayAddr, getSPVGatewaySalt } from "./helpers/helpers";
 
 export = async (deployer: Deployer) => {
-  const config = (await getConfig())!;
+  const config = await getConfig();
 
-  const spvGateway = await deployer.deploy(SPVGateway__factory);
+  const createXDeployer = await deployer.deployed(ICreateX__factory, "0xba5Ed099633D3B313e4D5F7bdc1305d3c28ba5Ed");
 
-  await spvGateway["__SPVGateway_init(bytes,uint256,uint256)"](
-    config.blockHeader,
-    config.blockHeight,
-    config.cumulativeWork,
+  const salt = getSPVGatewaySalt();
+  const initCalldata = SPVGateway__factory.createInterface().encodeFunctionData(
+    "__SPVGateway_init(bytes,uint64,uint256)",
+    [config.blockHeader, config.blockHeight, config.cumulativeWork],
   );
 
-  Reporter.reportContracts(["SPVGateway", await spvGateway.getAddress()]);
+  await createXDeployer.deployCreate2AndInit(salt, SPVGateway__factory.bytecode, initCalldata, {
+    constructorAmount: 0n,
+    initCallAmount: 0n,
+  });
+
+  const spvGatewayAddr = await getSPVGatewayAddr(createXDeployer);
+
+  Reporter.reportContracts(["SPVGateway", spvGatewayAddr]);
 };

deploy/config/sepolia.ts

@@ -2,7 +2,7 @@ import { DeployConfig } from "./types";
 
 export const deployConfig: DeployConfig = {
   blockHeader:
-    "0x0100000000000000000000000000000000000000000000000000000000000000000000003ba3edfd7a7b12b27ac72c3e67768f617fc81bc3888a51323a9fb8aa4b1e5e4a29ab5f49ffff001d1dac2b7c",
-  blockHeight: 0,
-  cumulativeWork: 0,
+    "0x010000006397bb6abd4fc521c0d3f6071b5650389f0b4551bc40b4e6b067306900000000ace470aecda9c8818c8fe57688cd2a772b5a57954a00df0420a7dd546b6d2c576b0e7f49ffff001d33f0192f",
+  blockHeight: 2016,
+  cumulativeWork: "0x000000000000000000000000000000000000000000000000000007e107e107e1",
 };

deploy/helpers/helpers.ts

@@ -0,0 +1,16 @@
+import { SPVGateway__factory, ICreateX } from "@/generated-types/ethers";
+
+import { ethers } from "hardhat";
+
+export async function getSPVGatewayAddr(createXDeployer: ICreateX): Promise<string> {
+  const salt = getSPVGatewaySalt();
+  const guardedSalt = ethers.keccak256(ethers.AbiCoder.defaultAbiCoder().encode(["bytes32"], [salt]));
+
+  const initcodeHash = ethers.keccak256(SPVGateway__factory.bytecode);
+
+  return await createXDeployer.computeCreate2Address(guardedSalt, initcodeHash);
+}
+
+export function getSPVGatewaySalt(): string {
+  return `0x0000000000000000000000000000000000000000000012341234123412341231`;
+}

hardhat.config.ts

@@ -50,15 +50,7 @@ const config: HardhatUserConfig = {
     },
   },
   etherscan: {
-    apiKey: {
-      sepolia: `${process.env.ETHERSCAN_KEY}`,
-      mainnet: `${process.env.ETHERSCAN_KEY}`,
-      bscTestnet: `${process.env.BSCSCAN_KEY}`,
-      bsc: `${process.env.BSCSCAN_KEY}`,
-      polygon: `${process.env.POLYGONSCAN_KEY}`,
-      avalancheFujiTestnet: `${process.env.AVALANCHE_KEY}`,
-      avalanche: `${process.env.AVALANCHE_KEY}`,
-    },
+    apiKey: `${process.env.ETHERSCAN_KEY}`,
   },
   migrate: {
     paths: {