Update deployment scripts

Author: Hrom131

deploy/config/base.ts

@@ -4,6 +4,7 @@ export const historicalDeployConfig: HistoricalDeployConfig = {
   blockHeader:
     "0x0000ec2480377962272e6ceefe662388c2323b08f1750e741d9900000000000000000000b8876bf9d189b5c88e4a7724032e0a1123e506fcfbbc785ac85f7546b4b63b4c12c9c468ac1102177c033abd",
   blockHeight: 914431n,
+  lastHistoryEpochStartTime: 1757050390n,
   cumulativeWork: "0x0000000000000000000000000000000000000000e2290521afb0314879068960",
   historyBlocksTreeRoot: "0xc6caf356aaf3a2e95ab3274f08f273097178644550d8f9b0354ef526d35a6bac",
   proofBlocksCount: 914432n,

deploy/config/ethereum.ts

@@ -4,6 +4,7 @@ export const historicalDeployConfig: HistoricalDeployConfig = {
   blockHeader:
     "0x0000ec2480377962272e6ceefe662388c2323b08f1750e741d9900000000000000000000b8876bf9d189b5c88e4a7724032e0a1123e506fcfbbc785ac85f7546b4b63b4c12c9c468ac1102177c033abd",
   blockHeight: 914431n,
+  lastHistoryEpochStartTime: 1757050390n,
   cumulativeWork: "0x0000000000000000000000000000000000000000e2290521afb0314879068960",
   historyBlocksTreeRoot: "0xc6caf356aaf3a2e95ab3274f08f273097178644550d8f9b0354ef526d35a6bac",
   proofBlocksCount: 914432n,

deploy/config/localhost.ts

@@ -11,7 +11,8 @@ export const historicalDeployConfig: HistoricalDeployConfig = {
   blockHeader:
     "0x00a00220e968938e8359a569ee6572db4d84e0b4e082872d83a5010000000000000000009c9671154ec76af4d624d88a1359373f85b76328f4afe78a3e53c7be83bcf21396c3b268912b02178f54c573",
   blockHeight: 912383n,
-  cumulativeWork: "0x0000000000000000000000000000000000000000de5f1bd9bd93c239552a585e",
+  lastHistoryEpochStartTime: 1755895678n,
+  cumulativeWork: "0x0000000000000000000000000000000000000000de5ea5e3576fb66c630a9540",
   historyBlocksTreeRoot: "0xd2fde3f66540b59b7b41411d875c0ecee424d70dce15d3685566c34ed66feae3",
   proofBlocksCount: 912384n,
 };

deploy/config/sepolia.ts

@@ -9,9 +9,10 @@ export const deployConfig: DeployConfig = {
 
 export const historicalDeployConfig: HistoricalDeployConfig = {
   blockHeader:
-    "0x0000ec2480377962272e6ceefe662388c2323b08f1750e741d9900000000000000000000b8876bf9d189b5c88e4a7724032e0a1123e506fcfbbc785ac85f7546b4b63b4c12c9c468ac1102177c033abd",
-  blockHeight: 914431n,
-  cumulativeWork: "0x0000000000000000000000000000000000000000e2290521afb0314879068960",
-  historyBlocksTreeRoot: "0xc6caf356aaf3a2e95ab3274f08f273097178644550d8f9b0354ef526d35a6bac",
-  proofBlocksCount: 914432n,
+    "0x00a00220e968938e8359a569ee6572db4d84e0b4e082872d83a5010000000000000000009c9671154ec76af4d624d88a1359373f85b76328f4afe78a3e53c7be83bcf21396c3b268912b02178f54c573",
+  blockHeight: 912383n,
+  lastHistoryEpochStartTime: 1755895678n,
+  cumulativeWork: "0x0000000000000000000000000000000000000000de5ea5e3576fb66c630a9540",
+  historyBlocksTreeRoot: "0xd2fde3f66540b59b7b41411d875c0ecee424d70dce15d3685566c34ed66feae3",
+  proofBlocksCount: 912384n,
 };

deploy/config/types.ts

@@ -10,6 +10,7 @@ export type HistoricalDeployConfig = {
   blockHeader: string;
   blockHeight: BigNumberish;
   cumulativeWork: BigNumberish;
+  lastHistoryEpochStartTime: BigNumberish;
   historyBlocksTreeRoot: string;
   proofBlocksCount: bigint;
 };

deploy/historical/1_HistoricalSPVGateway.migration.ts

@@ -1,39 +1,33 @@
 import { Deployer, Reporter } from "@solarity/hardhat-migrate";
 
-import { HistoryProofVerifier914432__factory, ICreateX__factory, HistoricalSPVGateway__factory } from "@ethers-v6";
+import { ICreateX__factory, HistoricalSPVGateway__factory } from "@ethers-v6";
 
 import path from "path";
 import { ethers } from "hardhat";
 import { getHistoryProofFromFile, getHistoryProofPublicInputsFromFile } from "@/test/helpers";
 
 import { getHistoricalConfig } from "../config/config";
 import { getGuardedSalt } from "../helpers/helpers";
+import { deployHistoryVerifier } from "./helpers";
 
 export = async (deployer: Deployer) => {
   const config = await getHistoricalConfig();
 
   const createXDeployer = await deployer.deployed(ICreateX__factory, "0xba5Ed099633D3B313e4D5F7bdc1305d3c28ba5Ed");
 
-  // zero address + 00 (cross-chain redeploy protection) + 0000 + ASCII(HPV914432)
-  const historyVerifier914432Salt = `0x0000000000000000000000000000000000000000000000485056393134343332`;
-
-  await createXDeployer.deployCreate2(historyVerifier914432Salt, HistoryProofVerifier914432__factory.bytecode);
-
-  const historyVerifierAddress = await createXDeployer.computeCreate2Address(
-    getGuardedSalt(historyVerifier914432Salt),
-    ethers.keccak256(HistoryProofVerifier914432__factory.bytecode),
-  );
+  const historyVerifierAddress = await deployHistoryVerifier(deployer, config.proofBlocksCount);
 
   const proofDirPath = path.join(__dirname, "./proofs", config.proofBlocksCount.toString());
 
   const proof = getHistoryProofFromFile(proofDirPath);
   const publicInputs = getHistoryProofPublicInputsFromFile(proofDirPath);
 
   const historicalSPVInitData = HistoricalSPVGateway__factory.createInterface().encodeFunctionData(
-    "__HistoricalSPVGateway_init(bytes,uint64,uint256,bytes32,(address,bytes32[],bytes))",
+    "__HistoricalSPVGateway_init(bytes,uint64,uint32,uint256,bytes32,(address,bytes32[],bytes))",
     [
       config.blockHeader,
       config.blockHeight,
+      config.lastHistoryEpochStartTime,
       config.cumulativeWork,
       config.historyBlocksTreeRoot,
       {

deploy/historical/helpers/index.ts

@@ -0,0 +1 @@
+export * from "./verifiers";

deploy/historical/helpers/verifiers.ts

@@ -0,0 +1,44 @@
+import { getGuardedSalt } from "@/deploy/helpers/helpers";
+import {
+  ICreateX__factory,
+  HistoryProofVerifier912384__factory,
+  HistoryProofVerifier914432__factory,
+} from "@/generated-types/ethers";
+import { Deployer } from "@solarity/hardhat-migrate";
+import { ethers } from "hardhat";
+
+export async function deployHistoryVerifier(deployer: Deployer, blocksCount: bigint): Promise<string> {
+  const createXDeployer = await deployer.deployed(ICreateX__factory, "0xba5Ed099633D3B313e4D5F7bdc1305d3c28ba5Ed");
+
+  const verifierBytecode = getHistoryVerifierBytecode(blocksCount);
+  const verifierSalt = getHistoryVerifierSalt(blocksCount);
+
+  const verifierAddress = await createXDeployer.computeCreate2Address(
+    getGuardedSalt(verifierSalt),
+    ethers.keccak256(verifierBytecode),
+  );
+
+  if ((await ethers.provider.getCode(verifierAddress)) == "") {
+    await createXDeployer.deployCreate2(verifierSalt, verifierBytecode);
+  }
+
+  return verifierAddress;
+}
+
+export function getHistoryVerifierBytecode(blocksCount: bigint): string {
+  switch (blocksCount) {
+    case 912384n:
+      return HistoryProofVerifier912384__factory.bytecode;
+    case 914432n:
+      return HistoryProofVerifier914432__factory.bytecode;
+    default:
+      throw new Error("Unsupported blocks count!");
+  }
+}
+
+export function getHistoryVerifierSalt(blocksCount: bigint): string {
+  const saltSuffix = ethers.hexlify(ethers.toUtf8Bytes(`HPV${blocksCount}`));
+
+  // zero address + 00 (cross-chain redeploy protection) + 0000 + ASCII(HPV + {blocksCount})
+  return `${ethers.ZeroAddress}000000${saltSuffix.slice(2)}`;
+}