Commit e943ef82 authored by Mark Tyneway's avatar Mark Tyneway

contracts-bedrock: update deployment

parent 304884d7
...@@ -17,6 +17,8 @@ const deployFn: DeployFunction = async (hre) => { ...@@ -17,6 +17,8 @@ const deployFn: DeployFunction = async (hre) => {
'L2OutputOracleProxy' 'L2OutputOracleProxy'
) )
const Artifact__SystemConfigProxy = await hre.deployments.get('SystemConfigProxy')
const portalGuardian = hre.deployConfig.portalGuardian const portalGuardian = hre.deployConfig.portalGuardian
const portalGuardianCode = await hre.ethers.provider.getCode(portalGuardian) const portalGuardianCode = await hre.ethers.provider.getCode(portalGuardian)
if (portalGuardianCode === '0x') { if (portalGuardianCode === '0x') {
...@@ -41,6 +43,7 @@ const deployFn: DeployFunction = async (hre) => { ...@@ -41,6 +43,7 @@ const deployFn: DeployFunction = async (hre) => {
L2OutputOracleProxy.address, L2OutputOracleProxy.address,
portalGuardian, portalGuardian,
true, // paused true, // paused
Artifact__SystemConfigProxy.address,
], ],
postDeployAction: async (contract) => { postDeployAction: async (contract) => {
await assertContractVariable( await assertContractVariable(
...@@ -53,6 +56,11 @@ const deployFn: DeployFunction = async (hre) => { ...@@ -53,6 +56,11 @@ const deployFn: DeployFunction = async (hre) => {
'GUARDIAN', 'GUARDIAN',
hre.deployConfig.portalGuardian hre.deployConfig.portalGuardian
) )
await assertContractVariable(
contract,
'SYSTEM_CONFIG',
Artifact__SystemConfigProxy.address
)
}, },
}) })
} }
......
import assert from 'assert' import assert from 'assert'
import { ethers } from 'ethers' import { ethers, BigNumber } from 'ethers'
import { DeployFunction } from 'hardhat-deploy/dist/types' import { DeployFunction } from 'hardhat-deploy/dist/types'
import { awaitCondition } from '@eth-optimism/core-utils' import { awaitCondition } from '@eth-optimism/core-utils'
import '@eth-optimism/hardhat-deploy-config' import '@eth-optimism/hardhat-deploy-config'
...@@ -100,6 +100,16 @@ const deployFn: DeployFunction = async (hre) => { ...@@ -100,6 +100,16 @@ const deployFn: DeployFunction = async (hre) => {
), ),
gasLimit: hre.deployConfig.l2GenesisBlockGasLimit, gasLimit: hre.deployConfig.l2GenesisBlockGasLimit,
unsafeBlockSigner: hre.deployConfig.p2pSequencerAddress, unsafeBlockSigner: hre.deployConfig.p2pSequencerAddress,
resourceConfig: {
maxResourceLimit: 20_000_000,
elasticityMultiplier: 10,
baseFeeMaxChangeDenominator: 8,
minimumBaseFee: 1000000000,
systemTxMaxGas: 1_000_000,
maximumBaseFee: BigNumber.from(
'0xffffffffffffffffffffffffffffffff'
).toString(),
},
}, },
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment