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
f2eaaa83
Unverified
Commit
f2eaaa83
authored
Dec 03, 2024
by
Maurelian
Committed by
GitHub
Dec 03, 2024
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
feat: Remove thin wrapper _run() function overload (#13101)
parent
3435fcc1
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
8 additions
and
11 deletions
+8
-11
Deploy.s.sol
packages/contracts-bedrock/scripts/deploy/Deploy.s.sol
+7
-10
DeployOwnership.s.sol
...es/contracts-bedrock/scripts/deploy/DeployOwnership.s.sol
+1
-1
No files found.
packages/contracts-bedrock/scripts/deploy/Deploy.s.sol
View file @
f2eaaa83
...
...
@@ -161,7 +161,7 @@ contract Deploy is Deployer {
/// @notice Deploy all of the L1 contracts necessary for a full Superchain with a single Op Chain.
function run() public {
console.log("Deploying a fresh OP Stack including SuperchainConfig");
_run();
_run(
{ _needsSuperchain: true }
);
}
/// @notice Deploy a new OP Chain using an existing SuperchainConfig and ProtocolVersions
...
...
@@ -183,27 +183,24 @@ contract Deploy is Deployer {
save("ProtocolVersions", pvProxy.implementation());
save("ProtocolVersionsProxy", _protocolVersionsProxy);
_run(
false
);
_run(
{ _needsSuperchain: false }
);
}
/// @notice Used for L1 alloc generation.
function runWithStateDump() public {
vm.chainId(cfg.l1ChainID());
_run();
_run(
{ _needsSuperchain: true }
);
vm.dumpState(Config.stateDumpPath(""));
}
/// @notice Deploy all L1 contracts and write the state diff to a file.
/// Used to generate kontrol tests.
function runWithStateDiff() public stateDiff {
_run();
}
/// @notice Compatibility function for tests that override _run().
function _run() internal virtual {
_run(true);
_run({ _needsSuperchain: true });
}
/// @notice Internal function containing the deploy logic.
function _run(bool _needsSuperchain) internal {
function _run(bool _needsSuperchain) internal
virtual
{
console.log("start of L1 Deploy!");
// Set up the Superchain if needed.
...
...
packages/contracts-bedrock/scripts/deploy/DeployOwnership.s.sol
View file @
f2eaaa83
...
...
@@ -59,7 +59,7 @@ struct GuardianConfig {
/// be used as an example to guide the setup and configuration of the Safe contracts.
contract DeployOwnership is Deploy {
/// @notice Internal function containing the deploy logic.
function _run() internal override {
function _run(
bool
) internal override {
console.log("start of Ownership Deployment");
// The SuperchainConfig is needed as a constructor argument to the Deputy Guardian Module
deploySuperchainConfig();
...
...
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