Skip to content

fix(L1): bump semver for contracts changed since the last release - #438

Merged
jackchuma merged 1 commit into
mainfrom
fix/bump-contract-versions
Sep 15, 2026
Merged

jackchuma merged 1 commit into
mainfrom
fix/bump-contract-versions

Conversation

@jackchuma

Copy link
Copy Markdown
Collaborator

Summary

OptimismPortal2, DisputeGameFactory, and AggregateVerifier all have source changes relative to what is currently deployed onchain, but they still declare the same semver. This bumps each one so the onchain version() actually distinguishes the artifacts.

Verified against live contracts on L1 (Base mainnet and Base Sepolia both report the same values):

Contract Live onchain This branch (before) After
OptimismPortal2 5.2.0 5.2.0 6.0.0
DisputeGameFactory 1.4.0 1.4.0 1.5.0
AggregateVerifier not deployed 0.2.0 0.3.0

Why each bump

OptimismPortal2 5.2.0 → 6.0.0 (major). The ETHLockbox removal is an interface break: the ethLockbox() getter and the OptimismPortal_InvalidLockboxState error are both gone from the ABI, and the storage slot is now a spacer.

DisputeGameFactory 1.4.0 → 1.5.0 (minor). Game proxies are now deployed via cloneDeterministic instead of clone, and the duplicate-UUID check moved so the UUID can serve as the CREATE2 salt. The ABI snapshot is byte-identical, so this is a behavioral change only.

AggregateVerifier 0.2.0 → 0.3.0 (minor). 0.1.0 shipped in the v8.2.x tags. The releases/v8.3.0 branch carries the scheduleId / ProtocolVersions pinning work but reverted the cadence fork-gating in #436, so it is a genuinely different artifact from main. The backport claims 0.2.0 for that release, and main — which is a superset with the cadence work — moves to 0.3.0 so the two bytecodes do not share a version number.

Companion PR

A backport targeting releases/v8.3.0 applies the same OptimismPortal2 and DisputeGameFactory bumps (those two files are identical on both branches) and takes AggregateVerifier from 0.1.0 to 0.2.0.

Testing

  • just snapshots regenerated from a clean build; only snapshots/semver-lock.json changes, covering exactly the three contracts. No ABI or storage layout changes, as expected for a version-string-only edit.
  • just test: 1231 passed, 0 failed, 1 skipped.
  • just lint-check clean.

Made with Cursor

OptimismPortal2, DisputeGameFactory, and AggregateVerifier all have source
changes relative to the versions currently deployed onchain, but still declare
the same semver. Bump each so the onchain version distinguishes the artifacts.

- OptimismPortal2 5.2.0 -> 6.0.0: ETHLockbox removal drops the `ethLockbox()`
  getter and the `OptimismPortal_InvalidLockboxState` error from the ABI.
- DisputeGameFactory 1.4.0 -> 1.5.0: game proxies are now deployed with
  `cloneDeterministic`; the ABI is unchanged.
- AggregateVerifier 0.2.0 -> 0.3.0: reserves 0.2.0 for the v8.3.0 release
  branch, which ships the schedule-pinning work without the cadence changes.

Co-authored-by: Cursor <cursoragent@cursor.com>
@cb-heimdall

cb-heimdall commented Sep 14, 2026

Copy link
Copy Markdown
Collaborator

✅ Heimdall Review Status

Requirement Status More Info
Reviews 1/1
Denominator calculation
Show calculation
1 if user is bot 0
1 if user is external 0
2 if repo is sensitive 0
From .codeflow.yml 1
Additional review requirements
Show calculation
Max 0
0
From CODEOWNERS 0
Global minimum 0
Max 1
1
1 if commit is unverified 0
Sum 1

@jackchuma
jackchuma merged commit cfa6229 into main Sep 15, 2026
6 checks passed
@jackchuma
jackchuma deleted the fix/bump-contract-versions branch September 15, 2026 00:01
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>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants