Skip to content

feat(deploy): deploy implementations before proxies #12114

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
maurelian merged 3 commits into from
Sep 26, 2024
Merged

feat(deploy): deploy implementations before proxies #12114

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
23ca830
feat(deploy): deploy implementations before proxies
maurelian Sep 25, 2024
bf04805
test(deploy): Move ASR impl deployment to deployProxies
maurelian Sep 25, 2024
f70779f
test(deploy): Rename deploy functions to correspond to OPCM
maurelian Sep 25, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
21 changes: 12 additions & 9 deletions packages/contracts-bedrock/scripts/deploy/Deploy.s.sol
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -398,9 +398,10 @@ contract Deploy is Deployer {
mustGetAddress("AddressManager");
mustGetAddress("ProxyAdmin");

deployProxies();
deployImplementations();
initializeImplementations();

deployOpChain();
initializeOpChain();

setAlphabetFaultGameImplementation({ _allowUpgrade: false });
setFastFaultGameImplementation({ _allowUpgrade: false });
Expand All @@ -411,9 +412,9 @@ contract Deploy is Deployer {
transferDelayedWETHOwnership();
}

/// @notice Deploy all of the proxies
function deployProxies() public {
console.log("Deploying proxies");
/// @notice Deploy all of the OP Chain specific contracts
function deployOpChain() public {
console.log("Deploying OP Chain contracts");

deployERC1967Proxy("OptimismPortalProxy");
deployERC1967Proxy("SystemConfigProxy");
Expand All @@ -431,6 +432,8 @@ contract Deploy is Deployer {
deployERC1967Proxy("PermissionedDelayedWETHProxy");
deployERC1967Proxy("AnchorStateRegistryProxy");

deployAnchorStateRegistry();

transferAddressManagerOwnership(); // to the ProxyAdmin
}

Expand All @@ -450,12 +453,12 @@ contract Deploy is Deployer {
deployDelayedWETH();
deployPreimageOracle();
deployMips();
deployAnchorStateRegistry();
}

/// @notice Initialize all of the implementations
function initializeImplementations() public {
console.log("Initializing implementations");
/// @notice Initialize all of the proxies in an OP Chain by upgrading to the correct proxy and calling the
/// initialize function
function initializeOpChain() public {
console.log("Initializing Op Chain proxies");
// Selectively initialize either the original OptimismPortal or the new OptimismPortal2. Since this will upgrade
// the proxy, we cannot initialize both.
if (cfg.useFaultProofs()) {
Expand Down