Skip to content

sysgo: restore portal ProxyAdmin owners after superroot migration #19084

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
Inphi merged 1 commit into from
Feb 4, 2026
Merged

sysgo: restore portal ProxyAdmin owners after superroot migration #19084

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
1 change: 0 additions & 1 deletion op-acceptance-tests/tests/isthmus/preinterop/interop_readiness_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -103,7 +103,6 @@ func init() {
}

func TestInteropReadiness(gt *testing.T) {
gt.Skip("TODO(#18616): Skipping interop readiness test for now")
t := devtest.ParallelT(gt)
sys := presets.NewSimpleInterop(t)

Expand Down
20 changes: 20 additions & 0 deletions op-devstack/sysgo/superroot.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -523,6 +523,26 @@ func resetOwnershipAfterMigration(
l1PAO,
)

// The migration temporarily transfers ownership of each portal ProxyAdmin to the DelegateCallProxy
// to satisfy the delegatecall requirement of the OPCM. Reset these back to the L1 proxy admin owner
// after the shared admin contracts are restored.
for _, cfg := range opChainConfigs {
portal := getOptimismPortal(t, w3Client, cfg.SystemConfigProxy)
portalProxyAdmin := getProxyAdmin(t, w3Client, portal)
// In some setups the migration may already restore ownership. Only reset when still owned by the proxy.
if getOwner(t, w3Client, portalProxyAdmin) == delegateCallProxy {
transferOwnershipForDelegateCallProxy(
t,
l1ChainID,
ownerPrivateKey,
client,
delegateCallProxy,
portalProxyAdmin,
l1PAO,
)
}
}

// The Proxy Admin owner is changed. Assert that the admin of other proxies are consistent
var sharedAnchorStateRegistryProxy common.Address
err = w3Client.Call(w3eth.CallFunc(portal0, anchorStateRegistryFn).Returns(&sharedAnchorStateRegistryProxy))
Expand Down