refactor(L1): merge SuperchainConfig into SystemConfig - #432
Open
jackchuma wants to merge 5 commits into
Open
Conversation
SuperchainConfig held the pause state and the Guardian/Incident Responder roles for a single chain, while every pausable contract reached it by hopping through SystemConfig. Collapsing the two removes a proxy, a shared ProxyAdmin, and an indirection from every `paused()` read. SystemConfig now owns: - `GUARDIAN` / `INCIDENT_RESPONDER` immutables, set via the constructor. - `pauseTimestamps` and the `pause`/`unpause`/`extend` API. - `paused(address)`, `pausable`, `expiration`, and `pauseExpiry` views. The former `superchainConfig` storage slot becomes `spacer_108_0_20` so existing deployments keep their layout, and `pauseTimestamps` is appended. Callers lose their `superchainConfig()` passthroughs (`config()` on DelayedWETH) and read pause state straight off SystemConfig, so their ABIs change and they take major version bumps. `initialize` also drops its `_superchainConfig` argument. Deploy tooling drops the whole superchain stage: no SuperchainConfig implementation, proxy, or dedicated ProxyAdmin, and no separate upgrade step for the shared proxy. The `superchainConfigGuardian` and `superchainConfigIncidentResponder` deploy-config keys are renamed to `guardian` and `incidentResponder` and now feed the SystemConfig constructor. Pause coverage from SuperchainConfig.t.sol moves into SystemConfig.t.sol. Co-authored-by: Cursor <cursoragent@cursor.com>
Collaborator
🟡 Heimdall Review Status
|
Co-authored-by: Codex <codex-noreply@coinbase.com>
Co-authored-by: Codex <codex-noreply@coinbase.com>
Co-authored-by: Cursor <cursoragent@cursor.com>
Co-authored-by: Codex <codex-noreply@coinbase.com>
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.
What changed? Why?
Merged the chain-local
SuperchainConfigintoSystemConfig, soSystemConfignow owns the Guardian and Incident Responder roles and the system-wide pause state. This removes the separateSuperchainConfigimplementation, proxy, sharedProxyAdmin, and deployment/upgrade stage, while removing an indirection from pause checks.The deployment config keys are renamed from
superchainConfigGuardianandsuperchainConfigIncidentRespondertoguardianandincidentResponder; the values now constructSystemConfigdirectly.Notes to reviewers
SystemConfig.initializeno longer accepts_superchainConfig; its constructor now accepts the Guardian and Incident Responder.superchainConfig()and the related passthrough getters on pausable contracts are removed, so consumers read pause state and roles fromSystemConfig.superchainConfigstorage slot remains as a spacer to preserve layout, andpauseTimestampis appended at slot 110.SystemConfigand the affected pausable contracts receive major-version changes.SystemDeployverifies that the legacy global and OptimismPortal pause records are clear, including expired pause records. A pause can still be submitted after that check and before the upgrade, so upgrades must be coordinated with the Guardian.How has it been tested?
SuperchainConfig.t.soltoSystemConfig.t.sol.just lint-check,just forge-build, and the semver-lock diff check pass.