Skip to content

wip: add flag for superchain proxy admin address #19

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

Draft
asymmetric wants to merge 4 commits into
base: develop
Choose a base branch
from
Draft

wip: add flag for superchain proxy admin address #19

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
9aba34f
wip: hardcode superadmin proxy address
asymmetric Feb 17, 2025
bcc4a22
wip: debug precompiles
asymmetric Feb 18, 2025
54cc520
Revert "wip: debug precompiles"
asymmetric Feb 18, 2025
f24f38e
add flag to specify superchain-proxy-admin
asymmetric Feb 24, 2025
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
8 changes: 8 additions & 0 deletions op-deployer/pkg/deployer/bootstrap/flags.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@ const (
MIPSVersionFlagName = "mips-version"
ProxyOwnerFlagName = "proxy-owner"
SuperchainProxyAdminOwnerFlagName = "superchain-proxy-admin-owner"
GBSuperchainProxyAdminFlagName = "gb-superchain-proxy-admin"
ProtocolVersionsOwnerFlagName = "protocol-versions-owner"
GuardianFlagName = "guardian"
PausedFlagName = "paused"
Expand Down Expand Up @@ -86,6 +87,12 @@ var (
EnvVars: deployer.PrefixEnvVar("SUPERCHAIN_PROXY_ADMIN_OWNER"),
Value: common.Address{}.Hex(),
}
SuperchainProxyAdminFlag = &cli.StringFlag{
Name: GBSuperchainProxyAdminFlagName,
Usage: "GB: Address for the superchain proxy admin",
EnvVars: deployer.PrefixEnvVar("GB_SUPERCHAIN_PROXY_ADMIN"),
Value: common.Address{}.Hex(),
}
ProtocolVersionsOwnerFlag = &cli.StringFlag{
Name: ProtocolVersionsOwnerFlagName,
Usage: "Owner address for protocol versions",
Expand Down Expand Up @@ -156,6 +163,7 @@ var ImplementationsFlags = []cli.Flag{
ProtocolVersionsProxyFlag,
UpgradeControllerFlag,
UseInteropFlag,
SuperchainProxyAdminFlag,
}

var ProxyFlags = []cli.Flag{
Expand Down
13 changes: 5 additions & 8 deletions op-deployer/pkg/deployer/bootstrap/implementations.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,6 @@ import (
"math/big"
"strings"

"github.com/ethereum-optimism/optimism/op-deployer/pkg/deployer/standard"

"github.com/ethereum-optimism/optimism/op-deployer/pkg/deployer/artifacts"
"github.com/ethereum-optimism/optimism/op-deployer/pkg/deployer/broadcaster"
"github.com/ethereum-optimism/optimism/op-deployer/pkg/deployer/opcm"
Expand Down Expand Up @@ -43,6 +41,7 @@ type ImplementationsConfig struct {
ProtocolVersionsProxy common.Address `cli:"protocol-versions-proxy"`
UpgradeController common.Address `cli:"upgrade-controller"`
UseInterop bool `cli:"use-interop"`
GBSuperchainProxyAdmin common.Address `cli:"gb-superchain-proxy-admin"`

Logger log.Logger

Expand Down Expand Up @@ -99,6 +98,9 @@ func (c *ImplementationsConfig) Check() error {
if c.UpgradeController == (common.Address{}) {
return errors.New("upgrade controller must be specified")
}
if c.GBSuperchainProxyAdmin == (common.Address{}) {
return errors.New("super proxy admin must be specified")
}
return nil
}

Expand Down Expand Up @@ -179,11 +181,6 @@ func Implementations(ctx context.Context, cfg ImplementationsConfig) (opcm.Deplo
return dio, fmt.Errorf("failed to create script host: %w", err)
}

superProxyAdmin, err := standard.SuperchainProxyAdminAddrFor(chainID.Uint64())
if err != nil {
return dio, fmt.Errorf("failed to get superchain proxy admin address: %w", err)
}

if dio, err = opcm.DeployImplementations(
l1Host,
opcm.DeployImplementationsInput{
Expand All @@ -196,7 +193,7 @@ func Implementations(ctx context.Context, cfg ImplementationsConfig) (opcm.Deplo
L1ContractsRelease: cfg.L1ContractsRelease,
SuperchainConfigProxy: cfg.SuperchainConfigProxy,
ProtocolVersionsProxy: cfg.ProtocolVersionsProxy,
SuperchainProxyAdmin: superProxyAdmin,
SuperchainProxyAdmin: cfg.GBSuperchainProxyAdmin,
UpgradeController: cfg.UpgradeController,
UseInterop: cfg.UseInterop,
},
Expand Down