wait for finalization and becoming deployed contract visisble as cont…

…ract

src/steps.ts

@@ -22,7 +22,7 @@ import { runIntegrationTestsScript, setupIntegrationTests } from "./integration-
 import { LogCallback, LogType } from "./log-utils";
 import { diffyscanRpcUrl, l1RpcUrl, l2RpcUrl, localL1RpcPort, localL2RpcPort, NetworkType } from "./rpc-utils";
 import { runStateMateScript, setupStateMateConfig, setupStateMateEnvs } from "./state-mate";
-import { runVerificationScript, setupGovExecutorVerification } from "./verification";
+import { runVerificationScript, setupGovExecutorVerification, waitForBlockFinalization } from "./verification";
 
 const NUM_L1_DEPLOYED_CONTRACTS = 10;
 
@@ -168,17 +168,49 @@ export interface Context {
         addGovExecutorToDeploymentArtifacts(ctx.govBridgeExecutor, "deployment_live_result.json");
       }
     },
+    {
+      name: "Wait for Finalization",
+      action: async(_, logCallback) => {
+        const deployResult = configFromArtifacts("deployment_live_result.json");
+
+        const l1LastBlockNumber = deployResult["ethereum"]["lastBlockNumber"];
+        const l1Provider = new JsonRpcProvider(l1RpcUrl(NetworkType.Live));
+        await waitForBlockFinalization(l1Provider, l1LastBlockNumber, logCallback);
+
+        const l2Provider = new JsonRpcProvider(l2RpcUrl(NetworkType.Live));
+        const l2LastBlockNumber = deployResult["optimism"]["lastBlockNumber"];
+        await waitForBlockFinalization(l2Provider, l2LastBlockNumber, logCallback);
+      }
+    },
     {
       name: "Verififcation",
       action: async (_, logCallback) => {
-        await runVerificationScript({ config: "l1_live_deployment_args.json", network: "l1", workingDirectory: "./lido-l2-with-steth", logCallback: logCallback });
-        await runVerificationScript({ config: "l2_live_deployment_args.json", network: "l2", workingDirectory: "./lido-l2-with-steth", logCallback: logCallback });
+        await runVerificationScript({
+          config: "l1_live_deployment_args.json",
+          network: "l1",
+          workingDirectory: "./lido-l2-with-steth",
+          rpcUrl: l1RpcUrl(NetworkType.Live),
+          logCallback: logCallback
+        });
+        await runVerificationScript({
+          config: "l2_live_deployment_args.json",
+          network: "l2",
+          workingDirectory: "./lido-l2-with-steth",
+          rpcUrl: l2RpcUrl(NetworkType.Live), 
+          logCallback: logCallback
+        });
         setupGovExecutorVerification();
-        await runVerificationScript({ config: "l2_live_gov_executor_deployment_args.json", network: "l2", workingDirectory: "./governance-crosschain-bridges", logCallback: logCallback });
+        await runVerificationScript({
+          config: "l2_live_gov_executor_deployment_args.json",
+          network: "l2",
+          workingDirectory: "./governance-crosschain-bridges",
+          rpcUrl: l2RpcUrl(NetworkType.Live), 
+          logCallback: logCallback
+        });
       }
     }
   ];
-  
+
   const testDeployedOnRealNetworkSteps: Step[] = [
     {
       name: "State-mate",

src/verification.ts

@@ -4,11 +4,13 @@ import dotenv from "dotenv";
 
 import { runCommand } from "./command-utils";
 import env from "./env";
-import { LogCallback } from "./log-utils";
+import { LogCallback, LogType } from "./log-utils";
+import { JsonRpcProvider } from "ethers";
 
 export async function runVerificationScript({
   config,
   network,
+  rpcUrl,
   workingDirectory,
   throwOnFail = true,
   tryNumber = 1,
@@ -17,15 +19,18 @@ export async function runVerificationScript({
 }: {
   config: string;
   network: string;
+  rpcUrl: string;
   workingDirectory: string;
   throwOnFail?: boolean;
   tryNumber?: number;
   maxTries?: number;
   logCallback: LogCallback;
 }) {
+  const provider = new JsonRpcProvider(rpcUrl);
   const args = configFromArtifacts(config);
   let contract: keyof typeof args;
   for (contract in args) {
+    await waitForContract(provider, contract, logCallback);
     const ctorArgs = args[contract];
     await runCommand({
       command: "npx",
@@ -40,6 +45,47 @@ export async function runVerificationScript({
   }
 }
 
+export async function waitForBlockFinalization(
+  provider: JsonRpcProvider,
+  blockNumber: number,
+  logCallback: LogCallback,
+  checkInterval: number = 10000
+) {
+  while (true) {
+    const finalizedBlock = await provider.getBlock("finalized");
+    const finalizedBlockNumber = finalizedBlock?.number;
+
+    if (finalizedBlockNumber === undefined) {
+      throw Error("Can't fetch block");
+    }
+    logCallback(`Waiting for block ${blockNumber} to be finalized. Current finalized block: ${finalizedBlockNumber}`, LogType.Level1);
+
+    if (blockNumber <= finalizedBlockNumber) {
+      return;
+    }
+    logCallback(`${blockNumber} isn't finalized. Retrying in ${checkInterval / 1000} seconds...`, LogType.Level1);
+    await new Promise(resolve => setTimeout(resolve, checkInterval));
+  }
+}
+
+async function waitForContract(
+  provider: JsonRpcProvider,
+  address: string,
+  logCallback: LogCallback,
+  checkInterval: number = 5000
+) {
+  logCallback(`Checking if address ${address} is an Contract or EOA...`, LogType.Level1);
+
+  while (true) {
+    const code = await provider.getCode(address);
+    if (code !== "0x") {
+      return;
+    }
+    logCallback(`${address} is EOA. Retrying in ${checkInterval / 1000} seconds...`, LogType.Level1);
+    await new Promise(resolve => setTimeout(resolve, checkInterval));
+  }
+}
+
 export function setupGovExecutorVerification() {
   dotenv.populate(
     process.env as { [key: string]: string },