Merge pull request #5711 from ethereum-optimism/fix/deploy-ts-checks-gaslimit

contracts-bedrock: deploy time checks

packages/contracts-bedrock/deploy/017-SystemConfigImpl.ts

@@ -2,17 +2,29 @@ import assert from 'assert'
 
 import { DeployFunction } from 'hardhat-deploy/dist/types'
 import '@eth-optimism/hardhat-deploy-config'
-import { ethers } from 'ethers'
+import { BigNumber } from 'ethers'
 
+import { defaultResourceConfig } from '../src/constants'
 import { assertContractVariable, deploy } from '../src/deploy-utils'
 
-const uint128Max = ethers.BigNumber.from('0xffffffffffffffffffffffffffffffff')
-
 const deployFn: DeployFunction = async (hre) => {
   const batcherHash = hre.ethers.utils
     .hexZeroPad(hre.deployConfig.batchSenderAddress, 32)
     .toLowerCase()
 
+  const l2GenesisBlockGasLimit = BigNumber.from(
+    hre.deployConfig.l2GenesisBlockGasLimit
+  )
+  const l2GasLimitLowerBound = BigNumber.from(
+    defaultResourceConfig.systemTxMaxGas +
+      defaultResourceConfig.maxResourceLimit
+  )
+  if (l2GenesisBlockGasLimit.lt(l2GasLimitLowerBound)) {
+    throw new Error(
+      `L2 genesis block gas limit must be at least ${l2GasLimitLowerBound}`
+    )
+  }
+
   await deploy({
     hre,
     name: 'SystemConfig',
@@ -21,16 +33,9 @@ const deployFn: DeployFunction = async (hre) => {
       hre.deployConfig.gasPriceOracleOverhead,
       hre.deployConfig.gasPriceOracleScalar,
       batcherHash,
-      hre.deployConfig.l2GenesisBlockGasLimit,
+      l2GenesisBlockGasLimit,
       hre.deployConfig.p2pSequencerAddress,
-      {
-        maxResourceLimit: 20_000_000,
-        elasticityMultiplier: 10,
-        baseFeeMaxChangeDenominator: 8,
-        systemTxMaxGas: 1_000_000,
-        minimumBaseFee: ethers.utils.parseUnits('1', 'gwei'),
-        maximumBaseFee: uint128Max,
-      },
+      defaultResourceConfig,
     ],
     postDeployAction: async (contract) => {
       await assertContractVariable(
@@ -56,12 +61,30 @@ const deployFn: DeployFunction = async (hre) => {
       )
 
       const config = await contract.resourceConfig()
-      assert(config.maxResourceLimit === 20_000_000)
-      assert(config.elasticityMultiplier === 10)
-      assert(config.baseFeeMaxChangeDenominator === 8)
-      assert(config.systemTxMaxGas === 1_000_000)
-      assert(ethers.utils.parseUnits('1', 'gwei').eq(config.minimumBaseFee))
-      assert(config.maximumBaseFee.eq(uint128Max))
+      assert(config.maxResourceLimit === defaultResourceConfig.maxResourceLimit)
+      assert(
+        config.elasticityMultiplier ===
+          defaultResourceConfig.elasticityMultiplier
+      )
+      assert(
+        config.baseFeeMaxChangeDenominator ===
+          defaultResourceConfig.baseFeeMaxChangeDenominator
+      )
+      assert(
+        BigNumber.from(config.systemTxMaxGas).eq(
+          defaultResourceConfig.systemTxMaxGas
+        )
+      )
+      assert(
+        BigNumber.from(config.minimumBaseFee).eq(
+          defaultResourceConfig.minimumBaseFee
+        )
+      )
+      assert(
+        BigNumber.from(config.maximumBaseFee).eq(
+          defaultResourceConfig.maximumBaseFee
+        )
+      )
     },
   })
 }

packages/contracts-bedrock/deploy/019-SystemDictatorInit.ts

 import assert from 'assert'
 
-import { ethers, BigNumber } from 'ethers'
+import { ethers } from 'ethers'
 import { DeployFunction } from 'hardhat-deploy/dist/types'
 import { awaitCondition } from '@eth-optimism/core-utils'
 import '@eth-optimism/hardhat-deploy-config'
@@ -10,6 +10,7 @@ import {
   getContractsFromArtifacts,
   getDeploymentAddress,
 } from '../src/deploy-utils'
+import { defaultResourceConfig } from '../src/constants'
 
 const deployFn: DeployFunction = async (hre) => {
   const { deployer } = await hre.getNamedAccounts()
@@ -102,16 +103,7 @@ const deployFn: DeployFunction = async (hre) => {
       unsafeBlockSigner: hre.deployConfig.p2pSequencerAddress,
       // The resource config is not exposed to the end user
       // to simplify deploy config. It may be introduced in the future.
-      resourceConfig: {
-        maxResourceLimit: 20_000_000,
-        elasticityMultiplier: 10,
-        baseFeeMaxChangeDenominator: 8,
-        minimumBaseFee: ethers.utils.parseUnits('1', 'gwei'),
-        systemTxMaxGas: 1_000_000,
-        maximumBaseFee: BigNumber.from(
-          '0xffffffffffffffffffffffffffffffff'
-        ).toString(),
-      },
+      resourceConfig: defaultResourceConfig,
     },
   }
 

packages/contracts-bedrock/src/constants.ts

+import { ethers } from 'ethers'
+
 /**
  * Predeploys are Solidity contracts that are injected into the initial L2 state and provide
  * various useful functions.
@@ -26,3 +28,14 @@ export const predeploys = {
   BaseFeeVault: '0x4200000000000000000000000000000000000019',
   L1FeeVault: '0x420000000000000000000000000000000000001a',
 }
+
+const uint128Max = ethers.BigNumber.from('0xffffffffffffffffffffffffffffffff')
+
+export const defaultResourceConfig = {
+  maxResourceLimit: 20_000_000,
+  elasticityMultiplier: 10,
+  baseFeeMaxChangeDenominator: 8,
+  minimumBaseFee: ethers.utils.parseUnits('1', 'gwei'),
+  systemTxMaxGas: 1_000_000,
+  maximumBaseFee: uint128Max,
+}