Skip to content

update bedrock contract deployment#11

Merged
dapperscene6 merged 1 commit intomainfrom
dapperscene6/update-bedrock-deploy
Jun 14, 2023
Merged

update bedrock contract deployment#11
dapperscene6 merged 1 commit intomainfrom
dapperscene6/update-bedrock-deploy

Conversation

@dapperscene6
Copy link
Contributor

@dapperscene6 dapperscene6 commented Jun 14, 2023

Adds a few additional checks and updates bedrock configuration to match our current deploy plan

@dapperscene6 dapperscene6 force-pushed the dapperscene6/update-bedrock-deploy branch 3 times, most recently from 5737e30 to db40d0d Compare June 14, 2023 16:07
SystemDictator.L2OutputOracleDynamicConfig memory l2OutputOracleDynamicConfig;
l2OutputOracleDynamicConfig.l2OutputOracleStartingBlockNumber = deployConfig.l2OutputOracleStartingBlockNumber;
l2OutputOracleDynamicConfig.l2OutputOracleStartingTimestamp = block.timestamp;
l2OutputOracleDynamicConfig.l2OutputOracleStartingTimestamp = deployConfig.l2OutputOracleStartingBlockNumber;
Copy link
Contributor Author

@dapperscene6 dapperscene6 Jun 14, 2023

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Change to deployConfig.l2OutputOracleStartingTimestamp

@dapperscene6 dapperscene6 force-pushed the dapperscene6/update-bedrock-deploy branch 4 times, most recently from 66d8a82 to efe161e Compare June 14, 2023 20:18
deployConfig.p2pSequencerAddress,
defaultResourceCfg
);
require(deployConfig.l2GenesisBlockGasLimit > defaultResourceCfg.systemTxMaxGas + defaultResourceCfg.maxResourceLimit, "Deploy: l2GenesisBlockGasLimit too low");
Copy link

@mdehoog mdehoog Jun 14, 2023

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

>=

require(address(L1ERC721Bridge(address(l1ERC721BridgeProxy)).messenger())== address(l1CrossDomainMessengerProxy), "l1ERC721BridgeProxy messenger is incorrect");

vm.broadcast(deployer);
systemDictator.finalize();
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

anikaraghu
anikaraghu previously approved these changes Jun 14, 2023
Copy link
Contributor

@anikaraghu anikaraghu left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM

@dapperscene6 dapperscene6 force-pushed the dapperscene6/update-bedrock-deploy branch from efe161e to 18a4f7c Compare June 14, 2023 20:28
@cb-heimdall cb-heimdall dismissed anikaraghu’s stale review June 14, 2023 20:28

Approved review 1480242168 from anikaraghu is now dismissed due to new commit. Re-request for approval.

@dapperscene6 dapperscene6 force-pushed the dapperscene6/update-bedrock-deploy branch 3 times, most recently from 5559c9c to 27a91bb Compare June 14, 2023 20:55
@dapperscene6 dapperscene6 force-pushed the dapperscene6/update-bedrock-deploy branch from 27a91bb to 1c285df Compare June 14, 2023 20:55
l2OutputOracleDynamicConfig.l2OutputOracleStartingTimestamp = block.timestamp;
l2OutputOracleDynamicConfig.l2OutputOracleStartingTimestamp = deployConfig.l2OutputOracleStartingTimestamp;

bool optimismPortalDynamicConfig = true;
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

tiny nit: could comment what this means

@dapperscene6 dapperscene6 merged commit 5e2cb36 into main Jun 14, 2023
@dapperscene6 dapperscene6 deleted the dapperscene6/update-bedrock-deploy branch June 14, 2023 22:22
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants