Commit 0d99a87a authored by Matthew Slipper's avatar Matthew Slipper Committed by GitHub

op-deployer: Fix superchain proxy admin addr method (#13361)

Renames the ManagerOwnerAddrFor method to reflect what it actually does, and point it at the Sepolia proxy admin.
parent 3c27ab28
...@@ -145,7 +145,7 @@ func DelayedWETH(ctx context.Context, cfg DelayedWETHConfig) (opcm.DeployDelayed ...@@ -145,7 +145,7 @@ func DelayedWETH(ctx context.Context, cfg DelayedWETHConfig) (opcm.DeployDelayed
if err != nil { if err != nil {
return dwo, fmt.Errorf("error getting superchain config: %w", err) return dwo, fmt.Errorf("error getting superchain config: %w", err)
} }
proxyAdmin, err := standard.ManagerOwnerAddrFor(chainIDU64) proxyAdmin, err := standard.SuperchainProxyAdminAddrFor(chainIDU64)
if err != nil { if err != nil {
return dwo, fmt.Errorf("error getting superchain proxy admin: %w", err) return dwo, fmt.Errorf("error getting superchain proxy admin: %w", err)
} }
......
...@@ -275,7 +275,7 @@ func testApplyExistingOPCM(t *testing.T, l1ChainID uint64, forkRPCUrl string, ve ...@@ -275,7 +275,7 @@ func testApplyExistingOPCM(t *testing.T, l1ChainID uint64, forkRPCUrl string, ve
superchain, err := standard.SuperchainFor(l1ChainIDBig.Uint64()) superchain, err := standard.SuperchainFor(l1ChainIDBig.Uint64())
require.NoError(t, err) require.NoError(t, err)
managerOwner, err := standard.ManagerOwnerAddrFor(l1ChainIDBig.Uint64()) managerOwner, err := standard.SuperchainProxyAdminAddrFor(l1ChainIDBig.Uint64())
require.NoError(t, err) require.NoError(t, err)
superchainTests := []struct { superchainTests := []struct {
......
...@@ -40,7 +40,7 @@ func InitLiveStrategy(ctx context.Context, env *Env, intent *state.Intent, st *s ...@@ -40,7 +40,7 @@ func InitLiveStrategy(ctx context.Context, env *Env, intent *state.Intent, st *s
return fmt.Errorf("error getting superchain config: %w", err) return fmt.Errorf("error getting superchain config: %w", err)
} }
proxyAdmin, err := standard.ManagerOwnerAddrFor(intent.L1ChainID) proxyAdmin, err := standard.SuperchainProxyAdminAddrFor(intent.L1ChainID)
if err != nil { if err != nil {
return fmt.Errorf("error getting superchain proxy admin address: %w", err) return fmt.Errorf("error getting superchain proxy admin address: %w", err)
} }
......
...@@ -216,14 +216,15 @@ func ManagerImplementationAddrFor(chainID uint64) (common.Address, error) { ...@@ -216,14 +216,15 @@ func ManagerImplementationAddrFor(chainID uint64) (common.Address, error) {
} }
} }
func ManagerOwnerAddrFor(chainID uint64) (common.Address, error) { // SuperchainProxyAdminAddrFor returns the address of the Superchain ProxyAdmin for the given chain ID.
// These have been verified to be the ProxyAdmin addresses on Mainnet and Sepolia.
// DO NOT MODIFY THIS METHOD WITHOUT CLEARING IT WITH THE EVM SAFETY TEAM.
func SuperchainProxyAdminAddrFor(chainID uint64) (common.Address, error) {
switch chainID { switch chainID {
case 1: case 1:
// Set to superchain proxy admin
return common.HexToAddress("0x543bA4AADBAb8f9025686Bd03993043599c6fB04"), nil return common.HexToAddress("0x543bA4AADBAb8f9025686Bd03993043599c6fB04"), nil
case 11155111: case 11155111:
// Set to development multisig return common.HexToAddress("0x189aBAAaa82DfC015A588A7dbaD6F13b1D3485Bc"), nil
return common.HexToAddress("0xDEe57160aAfCF04c34C887B5962D0a69676d3C8B"), nil
default: default:
return common.Address{}, fmt.Errorf("unsupported chain ID: %d", chainID) return common.Address{}, fmt.Errorf("unsupported chain ID: %d", chainID)
} }
......
...@@ -363,7 +363,7 @@ func NewIntentStrict(deploymentStrategy DeploymentStrategy, l1ChainId uint64, l2 ...@@ -363,7 +363,7 @@ func NewIntentStrict(deploymentStrategy DeploymentStrategy, l1ChainId uint64, l2
intent.ConfigType = IntentConfigTypeStrict intent.ConfigType = IntentConfigTypeStrict
challenger, _ := standard.ChallengerAddressFor(l1ChainId) challenger, _ := standard.ChallengerAddressFor(l1ChainId)
l1ProxyAdminOwner, _ := standard.ManagerOwnerAddrFor(l1ChainId) l1ProxyAdminOwner, _ := standard.L1ProxyAdminOwner(l1ChainId)
for chainIndex := range intent.Chains { for chainIndex := range intent.Chains {
intent.Chains[chainIndex].Roles.Challenger = challenger intent.Chains[chainIndex].Roles.Challenger = challenger
intent.Chains[chainIndex].Roles.L1ProxyAdminOwner = l1ProxyAdminOwner intent.Chains[chainIndex].Roles.L1ProxyAdminOwner = l1ProxyAdminOwner
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment