feat[contracts]: enable initiating L2 upgrade via L1 to L2 message #887
Merged
smartcontracts merged 2 commits intov0.4.0-rcfrom May 17, 2021
Merged
feat[contracts]: enable initiating L2 upgrade via L1 to L2 message #887smartcontracts merged 2 commits intov0.4.0-rcfrom
smartcontracts merged 2 commits intov0.4.0-rcfrom
Conversation
🦋 Changeset detectedLatest commit: f01dc0a The changes in this PR will be included in the next version bump. This PR includes changesets to release 1 package
Not sure what this means? Click here to learn what changesets are. Click here if you're a maintainer who wants to add another changeset to this PR |
smartcontracts
commented
May 17, 2021
packages/contracts/test/contracts/chugsplash/L2ChugSplashOwner.spec.ts
Outdated
Show resolved
Hide resolved
ben-chain
approved these changes
May 17, 2021
Collaborator
ben-chain
left a comment
ben-chain
left a comment
There was a problem hiding this comment.
Ahh, nice! I originally had figured that we would do it this way, and agree that this is 100% the way to go if to enable the upgrade to be initiated via an L2 account if desired.
For what it's worth, I think we are 95% of the way there to an OVM_CrossDomainOwnedProxy with this contract. Only update would require replacing the fallback function with a doCall(address _target, bytes memory _data) so that we can call arbitrary targets. Maybe we want the target to be hardcoded in this case, or maybe we just want it as-is to focus on getting stuff merged quickly. Approving under the assumption that that is the case.
smartcontracts
requested review from
annieke,
karlfloersch and
tynes
as code owners
smartcontracts
force-pushed
the
kelvin/chugsplash-owner
branch
from
4fc259f to
f01dc0a
Compare
ben-chain
pushed a commit
to ben-chain/optimism
that referenced
this pull request
May 18, 2021
…thereum-optimism#887) * feat[contracts]: enable initiating L2 upgrade via L1 to L2 message * chore: add changeset
ben-chain
pushed a commit
to ben-chain/optimism
that referenced
this pull request
Jun 23, 2021
…thereum-optimism#887) * feat[contracts]: enable initiating L2 upgrade via L1 to L2 message * chore: add changeset
theochap
pushed a commit
that referenced
this pull request
Dec 10, 2025
OptimismBot
pushed a commit
that referenced
this pull request
Feb 25, 2026
github-merge-queue bot
pushed a commit
that referenced
this pull request
Feb 25, 2026
* feat: l2cm impl l2contractsmanager (#837) * feat: add initial iteration of L2ContractsManager * feat: add network configuration structs * feat: load full config for L2ContractsManager * feat: implement L2CM::_apply * feat: add gas price oracle * refactor: move L2CM types to library * fix: upgrade ProxyAdmin predeploy * chore: enforce delegatecall for L2CM::upgrade * feat: add conditional upgrade for CGT * refactor: remove non-proxied predeploys * chore: renamed l2cm * refactor: l2cm address comments (#839) * refactor: rename _fullConfig to _loadFullConfig to match OPCM v2 * chore: remove non-proxied weth from implementations struct * test: add config preservation test * test: add CGT specific tests * refactor: avoid casting network config values to address * test: add test cases * chore: pr ready (#844) * chore: remove unnecesary casting on L2CM * feat: add interface for XForkL2ContractsManager * chore: add natspec to XForkL2ContractsManager * chore: pr ready * refactor: moves util functions out of L2CM implementation (#848) * feat: l2cm address comments (#850) * chore: add comment clarifying use `useCustomGasToken` * chore: upgrade both native native asset liquidity and liquidity controller predeploys together * feat: prohibit downgrading predeploy implementations * refactor: make isCustomGasToken part of the network full config * fix: add missing import * fix: use FeeVault legacy getters for backward compat * chore: update name XForkL2ContractsManager to L2ContractsManager * feat: conditionally skip some predeploys based on them being supported in a given chain (#857) * fix: l2cm address comments (#872) * chore: add todo tracking removal of L2ProxyAdmin skips * chore: add natspec comment for isPredeployNamespace * chore: use vm.prank(address,bool) to prank a delegatecall * chore: add todo for dev flags for CrossL2Inbox and L2ToL2CrossDomainMessenger * feat: allow immutables for L2CM in semgrep rules * chore: pr ready * test: L2CM verify testing (#874) * test: add coverage test for predeploy upgrades * chore: update test natspec * chore: just pr ready * chore: L2CM round comments (#877) * refactor: move helper function into Predeploys.s.sol * fix: add conditional deployer to L2CM * chore: update to l1block and l1blockCGT * test: fixes issue where OptimismSuperchainERC20 tests fail due to profile ambiguity * chore: just pr ready * chore: l2cm round comments2 (#883) * fix: move code length check out of isUpgradeable * chore: inline fullCofig_.isCustomGasToken initialization * chore: add public getters for the implementations on the L2CM * chore: remove XForkL2ContractsManager sol rule exclusion * test: add downgrade prevention test suite * chore: just pr ready * refactor: check for address 0 instead code length * Revert "refactor: check for address 0 instead code length" This reverts commit 1fa8694. * chore: remove non-needed check * chore: remove unused function in tests (#884) * refactor: l2cm group impls (#885) * refactor: remove individual getters in favor of a unified one * test: add test for getImplementations * test: add OZ v5 Initializable compatibility in L2ContractsManagerUtils (#887)
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
2 participants
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.
Description
Adds a new contract
L2ChugSplashOwnerwhich acts as an authenticated proxy to theL2ChugSplashDeployercontract. I've decided to do it this way because it gives us more options and ends up being simpler to test than #854. Writing this contract made me realize we really should have anCrossDomainOwnablehelper contract (cc: @ben-chain).