predeploys: add L2 `ProxyAdmin`

We need an instance of the `ProxyAdmin` on L2 to manage each
of the other predeploys. This change ranges across the entire
codebase and the spec is updated with the new predeploy.

op-bindings/predeploys/addresses.go

@@ -18,6 +18,20 @@ const (
 	LegacyMessagePasser           = "0x4200000000000000000000000000000000000000"
 	L2ERC721Bridge                = "0x4200000000000000000000000000000000000014"
 	OptimismMintableERC721Factory = "0x4200000000000000000000000000000000000017"
+	L2ToL1MessagePasser           = "0x4200000000000000000000000000000000000016"
+	DeployerWhitelist             = "0x4200000000000000000000000000000000000002"
+	LegacyERC20ETH                = "0xDeadDeAddeAddEAddeadDEaDDEAdDeaDDeAD0000"
+	WETH9                         = "0x4200000000000000000000000000000000000006"
+	L2CrossDomainMessenger        = "0x4200000000000000000000000000000000000007"
+	L2StandardBridge              = "0x4200000000000000000000000000000000000010"
+	SequencerFeeVault             = "0x4200000000000000000000000000000000000011"
+	OptimismMintableERC20Factory  = "0x4200000000000000000000000000000000000012"
+	L1BlockNumber                 = "0x4200000000000000000000000000000000000013"
+	GasPriceOracle                = "0x420000000000000000000000000000000000000F"
+	L1Block                       = "0x4200000000000000000000000000000000000015"
+	GovernanceToken               = "0x4200000000000000000000000000000000000042"
+	LegacyMessagePasser           = "0x4200000000000000000000000000000000000000"
+	ProxyAdmin                    = "0x4200000000000000000000000000000000000018"
 )
 
 var (
@@ -36,6 +50,20 @@ var (
 	LegacyMessagePasserAddr           = common.HexToAddress(LegacyMessagePasser)
 	L2ERC721BridgeAddr                = common.HexToAddress(L2ERC721Bridge)
 	OptimismMintableERC721FactoryAddr = common.HexToAddress(OptimismMintableERC721Factory)
+	L2ToL1MessagePasserAddr           = common.HexToAddress(L2ToL1MessagePasser)
+	DeployerWhitelistAddr             = common.HexToAddress(DeployerWhitelist)
+	LegacyERC20ETHAddr                = common.HexToAddress(LegacyERC20ETH)
+	WETH9Addr                         = common.HexToAddress(WETH9)
+	L2CrossDomainMessengerAddr        = common.HexToAddress(L2CrossDomainMessenger)
+	L2StandardBridgeAddr              = common.HexToAddress(L2StandardBridge)
+	SequencerFeeVaultAddr             = common.HexToAddress(SequencerFeeVault)
+	OptimismMintableERC20FactoryAddr  = common.HexToAddress(OptimismMintableERC20Factory)
+	L1BlockNumberAddr                 = common.HexToAddress(L1BlockNumber)
+	GasPriceOracleAddr                = common.HexToAddress(GasPriceOracle)
+	L1BlockAddr                       = common.HexToAddress(L1Block)
+	GovernanceTokenAddr               = common.HexToAddress(GovernanceToken)
+	LegacyMessagePasserAddr           = common.HexToAddress(LegacyMessagePasser)
+	ProxyAdminAddr                    = common.HexToAddress(ProxyAdmin)
 
 	Predeploys = make(map[string]*common.Address)
 )
@@ -56,4 +84,5 @@ func init() {
 	Predeploys["LegacyMessagePasser"] = &LegacyMessagePasserAddr
 	Predeploys["L2ERC721Bridge"] = &L2ERC721BridgeAddr
 	Predeploys["OptimismMintableERC721Factory"] = &OptimismMintableERC721FactoryAddr
+	Predeploys["ProxyAdmin"] = &ProxyAdminAddr
 }

op-chain-ops/genesis/config.go

@@ -187,5 +187,9 @@ func NewL2StorageConfig(config *DeployConfig, block *types.Block, proxyL1Standar
 		// TODO: this should be set to the MintManager
 		"_owner": common.Address{},
 	}
+	storage["ProxyAdmin"] = state.StorageValues{
+		// TODO: this needs to be configurable
+		"owner": common.Address{},
+	}
 	return storage, nil
 }

op-chain-ops/genesis/layer_two_test.go

@@ -71,13 +71,13 @@ func TestBuildL2DeveloperGenesis(t *testing.T) {
 		require.Equal(t, ok, true)
 		require.Greater(t, len(account.Code), 0)
 
-		if name == "GovernanceToken" || name == "LegacyERC20ETH" {
+		if name == "GovernanceToken" || name == "LegacyERC20ETH" || name == "ProxyAdmin" {
 			continue
 		}
 
 		adminSlot, ok := account.Storage[genesis.AdminSlot]
 		require.Equal(t, ok, true)
-		require.Equal(t, adminSlot, proxyAdmin.Address.Hash())
+		require.Equal(t, adminSlot, predeploys.ProxyAdminAddr.Hash())
 		require.Equal(t, account.Code, depB)
 	}
 	require.Equal(t, 2341, len(gen.Alloc))

op-chain-ops/genesis/setters.go

@@ -47,14 +47,16 @@ func setProxies(db vm.StateDB, proxyAdminAddr common.Address, namespace *big.Int
 		bigAddr := new(big.Int).Or(namespace, new(big.Int).SetUint64(i))
 		addr := common.BigToAddress(bigAddr)
 
-		// There is no proxy at the governance token address
-		if addr == predeploys.GovernanceTokenAddr {
+		// There is no proxy at the governance token address or
+		// the proxy admin address. LegacyERC20ETH lives in the
+		// 0xDead namespace so it can be ignored here
+		if addr == predeploys.GovernanceTokenAddr || addr == predeploys.ProxyAdminAddr {
 			continue
 		}
 
 		db.CreateAccount(addr)
 		db.SetCode(addr, depBytecode)
-		db.SetState(addr, AdminSlot, proxyAdminAddr.Hash())
+		db.SetState(addr, AdminSlot, predeploys.ProxyAdminAddr.Hash())
 	}
 	return nil
 }
@@ -76,6 +78,8 @@ func SetImplementations(db vm.StateDB, storage state.StorageConfig, immutable im
 			addr = predeploys.GovernanceTokenAddr
 		case predeploys.LegacyERC20ETHAddr:
 			addr = predeploys.LegacyERC20ETHAddr
+		case predeploys.ProxyAdminAddr:
+			addr = predeploys.ProxyAdminAddr
 		default:
 			addr, err = AddressToCodeNamespace(*address)
 			if err != nil {

packages/contracts-bedrock/contracts/libraries/Predeploys.sol

@@ -89,4 +89,9 @@ library Predeploys {
      *         L2ToL1MessagePasser contract instead.
      */
     address internal constant LEGACY_MESSAGE_PASSER = 0x4200000000000000000000000000000000000000;
+
+    /**
+     * @notice Address of the ProxyAdmin predeploy.
+     */
+    address internal constant PROXY_ADMIN = 0x4200000000000000000000000000000000000018;
 }

packages/contracts-bedrock/src/constants.ts

@@ -22,4 +22,9 @@ export const predeploys = {
   LegacyMessagePasser: '0x4200000000000000000000000000000000000000',
   L2ERC721Bridge: '0x4200000000000000000000000000000000000014',
   OptimismMintableERC721Factory: '0x4200000000000000000000000000000000000017',
+  ProxyAdmin: '0x4200000000000000000000000000000000000018',
+}
+
+export const futurePredeploys = {
+  System1: '0x4200000000000000000000000000000000000014',
 }

specs/predeploys.md

@@ -5,8 +5,8 @@
 **Table of Contents**
 
 - [Overview](#overview)
-- [OVM\_L2ToL1MessagePasser](#ovm%5C_l2tol1messagepasser)
-- [OVM\_DeployerWhitelist](#ovm%5C_deployerwhitelist)
+- [L2ToL1MessagePasser](#l2tol1messagepasser)
+- [DeployerWhitelist](#deployerwhitelist)
 - [OVM\_ETH](#ovm%5C_eth)
 - [WETH9](#weth9)
 - [L2CrossDomainMessenger](#l2crossdomainmessenger)
@@ -16,6 +16,7 @@
 - [L1BlockNumber](#l1blocknumber)
 - [OVM\_GasPriceOracle](#ovm%5C_gaspriceoracle)
 - [L1Block](#l1block)
+- [ProxyAdmin](#proxyadmin)
 
 <!-- END doctoc generated TOC please keep comment here to allow auto update -->
 
@@ -52,8 +53,9 @@ or `Bedrock`. Deprecated contracts should not be used.
 | L2ToL1MessagePasser           | 0x4200000000000000000000000000000000000016 | Bedrock    | No         |
 | L2ERC721Bridge                | 0x4200000000000000000000000000000000000014 | Legacy     | No         |
 | OptimismMintableERC721Factory | 0x4200000000000000000000000000000000000017 | Bedrock    | No         |
+| ProxyAdmin                    | 0x4200000000000000000000000000000000000018 | Bedrock    | No         |
 
-## OVM\_L2ToL1MessagePasser
+## L2ToL1MessagePasser
 
 The `OVM_L2ToL1MessagePasser` stores commitments to withdrawal transactions.
 When a user is submitting the withdrawing transaction on L1, they provide a
@@ -370,3 +372,9 @@ interface L1Block {
     ) external;
 }
 ```
+
+## ProxyAdmin
+
+The `ProxyAdmin` is the owner of all of the proxy contracts set at the
+predeploys. It is not behind a proxy itself. The owner of the `ProxyAdmin` will
+have the ability to upgrade any of the other predeploy contracts.