fix(bedrock): arguments in L2OO deploy scripts (#2830)

* fix(bedrock): arguments in L2OO deploy scripts

* chore: changeset

.changeset/pink-bags-rule.md

+---
+'@eth-optimism/contracts-bedrock': patch
+---
+
+Fix for incorrect constructor args in deploy config

packages/contracts-bedrock/deploy-config/devnetL1.ts

@@ -2,11 +2,12 @@ import { ethers } from 'ethers'
 
 const config = {
   submissionInterval: 6,
-  l2BlockTime: 2,
   genesisOutput: ethers.constants.HashZero,
   historicalBlocks: 0,
-  startingBlockTimestamp:
+  startingBlockNumber: 0,
+  startingTimestamp:
     parseInt(process.env.L2OO_STARTING_BLOCK_TIMESTAMP, 10) || Date.now(),
+  l2BlockTime: 2,
   sequencerAddress: '0x70997970C51812dc3A010C7d01b50e0d17dc79C8',
 }
 

packages/contracts-bedrock/deploy-config/hardhat.ts

@@ -2,11 +2,12 @@ import { ethers } from 'ethers'
 
 const config = {
   submissionInterval: 6,
-  l2BlockTime: 2,
   genesisOutput: ethers.constants.HashZero,
   historicalBlocks: 0,
-  startingBlockTimestamp:
+  startingBlockNumber: 0,
+  startingTimestamp:
     parseInt(process.env.L2OO_STARTING_BLOCK_TIMESTAMP, 10) || Date.now(),
+  l2BlockTime: 2,
   sequencerAddress: '0x70997970C51812dc3A010C7d01b50e0d17dc79C8',
 }
 

packages/contracts-bedrock/deploy/000-L2OutputOracle.deploy.ts

@@ -7,11 +7,11 @@ const deployFn: DeployFunction = async (hre) => {
   const { deployer } = await hre.getNamedAccounts()
 
   if (
-    typeof hre.deployConfig.startingBlockTimestamp !== 'number' ||
-    isNaN(hre.deployConfig.startingBlockTimestamp)
+    typeof hre.deployConfig.startingTimestamp !== 'number' ||
+    isNaN(hre.deployConfig.startingTimestamp)
   ) {
     throw new Error(
-      'Cannot deploy L2OutputOracle without specifying a valid startingBlockTimestamp.'
+      'Cannot deploy L2OutputOracle without specifying a valid startingTimestamp.'
     )
   }
 
@@ -22,7 +22,8 @@ const deployFn: DeployFunction = async (hre) => {
       hre.deployConfig.l2BlockTime,
       hre.deployConfig.genesisOutput,
       hre.deployConfig.historicalBlocks,
-      hre.deployConfig.startingBlockTimestamp,
+      hre.deployConfig.startingBlockNumber,
+      hre.deployConfig.startingTimestamp,
       hre.deployConfig.sequencerAddress,
     ],
     log: true,

packages/contracts-bedrock/hardhat.config.ts

@@ -71,7 +71,10 @@ const config: HardhatUserConfig = {
     historicalBlocks: {
       type: 'number',
     },
-    startingBlockTimestamp: {
+    startingBlockNumber: {
+      type: 'number',
+    },
+    startingTimestamp: {
       type: 'number',
     },
     sequencerAddress: {

packages/integration-tests-bedrock/test/000_withdrawals.spec.ts

@@ -33,8 +33,8 @@ const getTargetOutput = async (
   withdrawalTimestamp: number
 ) => {
   const submissionInterval = (await oracle.SUBMISSION_INTERVAL()).toNumber()
-  const startingBlockTimestamp = (
-    await oracle.STARTING_BLOCK_TIMESTAMP()
+  const startingTimestamp = (
+    await oracle.STARTING_TIMESTAMP()
   ).toNumber()
   const nextTimestamp = (await oracle.nextTimestamp()).toNumber()
   let targetOutputTimestamp
@@ -45,10 +45,10 @@ const getTargetOutput = async (
     // Calculate the first timestamp greater than the burnBlock which will be appended.
     targetOutputTimestamp =
       Math.ceil(
-        (withdrawalTimestamp - startingBlockTimestamp) / submissionInterval
+        (withdrawalTimestamp - startingTimestamp) / submissionInterval
       ) *
         submissionInterval +
-      startingBlockTimestamp
+      startingTimestamp
   }
 
   return targetOutputTimestamp