Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
N
nebula
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
exchain
nebula
Commits
a6181251
Commit
a6181251
authored
Nov 22, 2023
by
clabby
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Resolve conflicts
parent
b2202f6f
Changes
3
Expand all
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
68 additions
and
68 deletions
+68
-68
.gas-snapshot
packages/contracts-bedrock/.gas-snapshot
+53
-52
ChainAssertions.sol
packages/contracts-bedrock/scripts/ChainAssertions.sol
+15
-15
Deploy.s.sol
packages/contracts-bedrock/scripts/Deploy.s.sol
+0
-1
No files found.
packages/contracts-bedrock/.gas-snapshot
View file @
a6181251
This diff is collapsed.
Click to expand it.
packages/contracts-bedrock/scripts/ChainAssertions.sol
View file @
a6181251
...
...
@@ -23,33 +23,32 @@ library ChainAssertions {
/// @notice Asserts the correctness of an L1 deployment. This function expects that all contracts
/// within the `prox` ContractSet are proxies that have been setup and initialized.
function postDeployAssertions(
Types.ContractSet memory prox,
DeployConfig cfg,
uint256 l2OutputOracleStartingBlockNumber,
uint256 l2OutputOracleStartingTimestamp,
Vm vm
Types.ContractSet memory
_
prox,
DeployConfig
_
cfg,
uint256
_
l2OutputOracleStartingBlockNumber,
uint256
_
l2OutputOracleStartingTimestamp,
Vm
_
vm
)
internal
view
{
ResourceMetering.ResourceConfig memory rcfg = SystemConfig(prox.SystemConfig).resourceConfig();
ResourceMetering.ResourceConfig memory rcfg = SystemConfig(
_
prox.SystemConfig).resourceConfig();
ResourceMetering.ResourceConfig memory dflt = Constants.DEFAULT_RESOURCE_CONFIG();
require(keccak256(abi.encode(rcfg)) == keccak256(abi.encode(dflt)));
checkSystemConfig(
prox,
cfg, true);
checkL1CrossDomainMessenger(
prox,
vm);
checkL1StandardBridge(prox);
checkL2OutputOracle(
prox, cfg, l2OutputOracleStartingTimestamp,
l2OutputOracleStartingBlockNumber);
checkOptimismMintableERC20Factory(prox);
checkL1ERC721Bridge(prox);
checkOptimismPortal(
prox,
cfg, false);
checkProtocolVersions(
prox,
cfg, true);
checkSystemConfig(
_prox, _
cfg, true);
checkL1CrossDomainMessenger(
_prox, _
vm);
checkL1StandardBridge(
_
prox);
checkL2OutputOracle(
_prox, _cfg, _l2OutputOracleStartingTimestamp, _
l2OutputOracleStartingBlockNumber);
checkOptimismMintableERC20Factory(
_
prox);
checkL1ERC721Bridge(
_
prox);
checkOptimismPortal(
_prox, _
cfg, false);
checkProtocolVersions(
_prox, _
cfg, true);
}
/// @notice Asserts that the SystemConfig is setup correctly
function checkSystemConfig(Types.ContractSet memory _contracts, DeployConfig _cfg, bool _proxy) internal view {
ISystemConfigV0 config = ISystemConfigV0(_contracts.SystemConfig);
ResourceMetering.ResourceConfig memory rconfig = Constants.DEFAULT_RESOURCE_CONFIG();
if (_proxy) {
require(config.owner() == _cfg.finalSystemOwner());
...
...
@@ -65,6 +64,7 @@ library ChainAssertions {
require(config.unsafeBlockSigner() == address(0));
}
ResourceMetering.ResourceConfig memory rconfig = Constants.DEFAULT_RESOURCE_CONFIG();
ResourceMetering.ResourceConfig memory resourceConfig = config.resourceConfig();
require(resourceConfig.maxResourceLimit == rconfig.maxResourceLimit);
require(resourceConfig.elasticityMultiplier == rconfig.elasticityMultiplier);
...
...
packages/contracts-bedrock/scripts/Deploy.s.sol
View file @
a6181251
...
...
@@ -130,7 +130,6 @@ contract Deploy is Deployer {
});
}
////////////////////////////////////////////////////////////////
// State Changing Helper Functions //
////////////////////////////////////////////////////////////////
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment