Merged
Conversation
5737e30 to
db40d0d
Compare
dapperscene6
commented
Jun 14, 2023
script/deploy/l1/DeployBedrock.s.sol
Outdated
| SystemDictator.L2OutputOracleDynamicConfig memory l2OutputOracleDynamicConfig; | ||
| l2OutputOracleDynamicConfig.l2OutputOracleStartingBlockNumber = deployConfig.l2OutputOracleStartingBlockNumber; | ||
| l2OutputOracleDynamicConfig.l2OutputOracleStartingTimestamp = block.timestamp; | ||
| l2OutputOracleDynamicConfig.l2OutputOracleStartingTimestamp = deployConfig.l2OutputOracleStartingBlockNumber; |
Contributor
Author
There was a problem hiding this comment.
Change to deployConfig.l2OutputOracleStartingTimestamp
66d8a82 to
efe161e
Compare
mdehoog
reviewed
Jun 14, 2023
script/deploy/l1/DeployBedrock.s.sol
Outdated
| deployConfig.p2pSequencerAddress, | ||
| defaultResourceCfg | ||
| ); | ||
| require(deployConfig.l2GenesisBlockGasLimit > defaultResourceCfg.systemTxMaxGas + defaultResourceCfg.maxResourceLimit, "Deploy: l2GenesisBlockGasLimit too low"); |
anikaraghu
reviewed
Jun 14, 2023
| require(address(L1ERC721Bridge(address(l1ERC721BridgeProxy)).messenger())== address(l1CrossDomainMessengerProxy), "l1ERC721BridgeProxy messenger is incorrect"); | ||
|
|
||
| vm.broadcast(deployer); | ||
| systemDictator.finalize(); |
Contributor
There was a problem hiding this comment.
efe161e to
18a4f7c
Compare
Approved review 1480242168 from anikaraghu is now dismissed due to new commit. Re-request for approval.
5559c9c to
27a91bb
Compare
27a91bb to
1c285df
Compare
anikaraghu
approved these changes
Jun 14, 2023
| l2OutputOracleDynamicConfig.l2OutputOracleStartingTimestamp = block.timestamp; | ||
| l2OutputOracleDynamicConfig.l2OutputOracleStartingTimestamp = deployConfig.l2OutputOracleStartingTimestamp; | ||
|
|
||
| bool optimismPortalDynamicConfig = true; |
Contributor
There was a problem hiding this comment.
tiny nit: could comment what this means
roberto-bayardo
approved these changes
Jun 14, 2023
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Adds a few additional checks and updates bedrock configuration to match our current deploy plan