fix(L1): bump SystemConfig semver for the ETHLockbox removal - #440
Merged
Merged
Conversation
#439 bumped OptimismPortal2, DisputeGameFactory and AggregateVerifier because each had source changes relative to the versions deployed onchain while still declaring the same semver. SystemConfig meets that description too and was missed. #378 changed two behaviours without touching the version: - `paused()` no longer selects the pause identifier based on whether the ETH_LOCKBOX feature is enabled; it always uses `optimismPortal()`. - `_setFeature` no longer guards ETH_LOCKBOX against being disabled while the portal still has a lockbox configured, or toggled while paused. snapshots/semver-lock.json already records both a different sourceCodeHash and initCodeHash for SystemConfig across that change, so the lock file and the declared version disagreed. Minor rather than major: no function, error or event declarations were added or removed, so the ABI is unchanged. This matches the DisputeGameFactory 1.4.0 -> 1.5.0 precedent in #439; OptimismPortal2 went major only because it dropped `ethLockbox()` from its ABI. Co-authored-by: Cursor <cursoragent@cursor.com>
Collaborator
✅ Heimdall Review Status
|
0xth4nh
approved these changes
Sep 15, 2026
jackchuma
added a commit
that referenced
this pull request
Sep 17, 2026
main bumped OptimismPortal2 5.2.0 -> 6.0.0 in #438 for the ETHLockbox removal, and this branch independently bumped 5.2.0 -> 6.0.0 for dropping `superchainConfig()`. After merging main both ABIs declare 6.0.0 while differing by that getter, which is the same divergence #438 and #440 set out to remove. Major rather than minor: the removal is a breaking ABI change, matching the reason Co-authored-by: Cursor <cursoragent@cursor.com> #438 took the portal major in the first place.
jackchuma
added a commit
that referenced
this pull request
Sep 17, 2026
* refactor(L1): merge SuperchainConfig into SystemConfig 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> * fix(L1): preserve pause state during upgrade Co-authored-by: Codex <codex-noreply@coinbase.com> * fix(L1): preserve legacy pause records during migration Co-authored-by: Codex <codex-noreply@coinbase.com> * chore(L1): refresh SystemConfig semver-lock hash Co-authored-by: Cursor <cursoragent@cursor.com> * docs(L1): document legacy pause migration risk Co-authored-by: Codex <codex-noreply@coinbase.com> * fix(L1): bump OptimismPortal2 semver for the superchainConfig removal main bumped OptimismPortal2 5.2.0 -> 6.0.0 in #438 for the ETHLockbox removal, and this branch independently bumped 5.2.0 -> 6.0.0 for dropping `superchainConfig()`. After merging main both ABIs declare 6.0.0 while differing by that getter, which is the same divergence #438 and #440 set out to remove. Major rather than minor: the removal is a breaking ABI change, matching the reason Co-authored-by: Cursor <cursoragent@cursor.com> #438 took the portal major in the first place. * test(L1): drop duplicated systemConfig assertions Porting the `superchainConfig()` assertions onto `systemConfig()` left three getter tests asserting the same address twice in a row. Co-authored-by: Cursor <cursoragent@cursor.com> * fix(L1): validate supplied SystemConfig pause authorities The Guardian and Incident Responder are now constructor immutables on the SystemConfig implementation, so when `deploy` is handed a prebuilt implementation set it never reads `implementationsInput.guardian` or `.incidentResponder` at all. A stale implementation therefore installs its own pause authorities and the deploy input silently has no effect. Require a supplied implementation to carry the configured roles, and apply the same non-zero Guardian check that freshly deployed implementations already get, so a chain cannot deploy with nobody able to unpause it. Co-authored-by: Cursor <cursoragent@cursor.com> * docs(L1): name both pause roles in the migration warning Legacy `SuperchainConfig.pause` is gated on `_assertOnlyGuardianOrIncidentResponder`, so the Incident Responder can also open a pause in the window between the check and the upgrade. Co-authored-by: Cursor <cursoragent@cursor.com> * chore(L1): restore semver-lock hashes built from source artifacts A `just snapshots-check-no-build` run after the test-profile build rewrote the ProtocolVersions and TEEProverRegistry initCodeHashes from those artifacts, and they were committed alongside the OptimismPortal2 bump. Regenerated with `just semver-lock`, which force-builds the source graph first. Co-authored-by: Cursor <cursoragent@cursor.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
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.
Summary
#439 bumped
OptimismPortal2,DisputeGameFactoryandAggregateVerifieron the grounds that each "[has] source changes relative to the versions currently deployed onchain, but still declare the same semver."SystemConfigmeets that same description and was missed, so this bumps it3.13.2->3.14.0.Why it qualifies
#378 (ETHLockbox removal) changed
SystemConfigbehaviour without touching the version:paused()no longer selects the pause identifier based on whether theETH_LOCKBOXfeature is enabled._setFeatureno longer guardsETH_LOCKBOXagainst being disabled while the portal still has a lockbox configured, or toggled while the system is paused.snapshots/semver-lock.jsonalready recorded the divergence. Comparing1baa168c(the commit Base's ZeronetSystemConfigimplementation was built from) againstmain:1baa168cmainsourceCodeHash0x1a24ffe1…0x780ff372…initCodeHash0x3e8e52d9…0xb91123c7…@custom:semver3.13.23.13.2So the lock file and the declared version disagreed: the contract changed, the version did not.
Why minor, not major
No function, error or event declarations were added or removed, so the ABI is unchanged. That matches the
DisputeGameFactory1.4.0->1.5.0precedent in #439.OptimismPortal2went major there only because it droppedethLockbox()from its ABI.Impact
Without this, a chain upgraded for Cobalt reports an unchanged
SystemConfigversion, soversion()cannot distinguish the pre- and post-upgrade implementations and operators have to fall back to comparing implementation addresses. This surfaced while preparing the Zeronet Cobalt upgrade in contract-deployments#790, where the facilitator guide currently has to call outSystemConfigas a special case for exactly this reason.Testing
just semver-lockregenerated; only theSystemConfigentry moves.just snapshotsproduces no further changes, so no ABI or storage snapshot is affected.just test: 1231 passed, 0 failed, 1 skipped.A backport to
releases/v8.3.0follows separately.Made with Cursor