system: clarify config value

op-chain-ops/genesis/config.go

@@ -195,7 +195,7 @@ func NewL2StorageConfig(config *DeployConfig, block *types.Block, l2Addrs *L2Add
 		"_owner": common.Address{},
 	}
 	storage["ProxyAdmin"] = state.StorageValues{
-		"owner": l2Addrs.ProxyAdmin,
+		"owner": l2Addrs.ProxyAdminOwner,
 	}
 	return storage, nil
 }

op-chain-ops/genesis/layer_two.go

@@ -12,7 +12,7 @@ import (
 // L2Addresses represents L1 contract addresses
 // that are required for the construction of an L2 state
 type L2Addresses struct {
-	ProxyAdmin                  common.Address
+	ProxyAdminOwner             common.Address
 	L1StandardBridgeProxy       common.Address
 	L1CrossDomainMessengerProxy common.Address
 	L1ERC721BridgeProxy         common.Address
@@ -36,7 +36,8 @@ func BuildL2DeveloperGenesis(config *DeployConfig, l1StartBlock *types.Block, l2
 	// Use the known developer addresses if they are not set
 	if l2Addrs == nil {
 		l2Addrs = &L2Addresses{
-			ProxyAdmin:                  predeploys.DevProxyAdminAddr,
+			// corresponds to m/44'/60'/0'/0/1 in the 'test test... junk' mnemonic
+			ProxyAdminOwner:             common.HexToAddress("0x70997970C51812dc3A010C7d01b50e0d17dc79C8"),
 			L1StandardBridgeProxy:       predeploys.DevL1StandardBridgeAddr,
 			L1CrossDomainMessengerProxy: predeploys.DevL1CrossDomainMessengerAddr,
 			L1ERC721BridgeProxy:         predeploys.DevL1ERC721BridgeAddr,

op-chain-ops/genesis/layer_two_test.go

@@ -16,7 +16,6 @@ import (
 	"github.com/ethereum/go-ethereum/core"
 	"github.com/ethereum/go-ethereum/crypto"
 
-	"github.com/ethereum-optimism/optimism/op-bindings/hardhat"
 	"github.com/ethereum-optimism/optimism/op-bindings/predeploys"
 	"github.com/ethereum-optimism/optimism/op-chain-ops/genesis"
 	"github.com/stretchr/testify/require"
@@ -31,19 +30,9 @@ func init() {
 var testKey, _ = crypto.HexToECDSA("b71c71a67e1177ad4e901695e1b4b9ee17ae16c6668d313eac2f96dbcda3f291")
 
 func TestBuildL2DeveloperGenesis(t *testing.T) {
-	hh, err := hardhat.New(
-		"alpha-1",
-		nil,
-		[]string{"../../packages/contracts-bedrock/deployments"},
-	)
-	require.Nil(t, err)
-
 	config, err := genesis.NewDeployConfig("./testdata/test-deploy-config-devnet-l1.json")
 	require.Nil(t, err)
 
-	proxyAdmin, err := hh.GetDeployment("ProxyAdmin")
-	require.Nil(t, err)
-
 	backend := backends.NewSimulatedBackend(
 		core.GenesisAlloc{
 			crypto.PubkeyToAddress(testKey.PublicKey): {Balance: big.NewInt(10000000000000000)},
@@ -52,12 +41,8 @@ func TestBuildL2DeveloperGenesis(t *testing.T) {
 	)
 	block, err := backend.BlockByNumber(context.Background(), common.Big0)
 	require.NoError(t, err)
-	gen, err := genesis.BuildL2DeveloperGenesis(config, block, &genesis.L2Addresses{
-		ProxyAdmin:                  proxyAdmin.Address,
-		L1ERC721BridgeProxy:         predeploys.DevL1ERC721BridgeAddr,
-		L1CrossDomainMessengerProxy: predeploys.DevL1CrossDomainMessengerAddr,
-		L1StandardBridgeProxy:       predeploys.DevL1StandardBridgeAddr,
-	})
+
+	gen, err := genesis.BuildL2DeveloperGenesis(config, block, nil)
 	require.Nil(t, err)
 	require.NotNil(t, gen)
 
@@ -101,12 +86,8 @@ func TestBuildL2DeveloperGenesisDevAccountsFunding(t *testing.T) {
 	)
 	block, err := backend.BlockByNumber(context.Background(), common.Big0)
 	require.NoError(t, err)
-	gen, err := genesis.BuildL2DeveloperGenesis(config, block, &genesis.L2Addresses{
-		ProxyAdmin:                  common.Address{},
-		L1ERC721BridgeProxy:         predeploys.DevL1ERC721BridgeAddr,
-		L1CrossDomainMessengerProxy: predeploys.DevL1CrossDomainMessengerAddr,
-		L1StandardBridgeProxy:       predeploys.DevL1StandardBridgeAddr,
-	})
+
+	gen, err := genesis.BuildL2DeveloperGenesis(config, block, nil)
 	require.NoError(t, err)
 	require.Equal(t, 2319, len(gen.Alloc))
 }

op-chain-ops/mnemonic.txt

+test test test test test test test test test test test junk

op-e2e/e2eutils/setup.go

@@ -168,6 +168,7 @@ func Setup(t require.TestingT, deployParams *DeployParams, alloc *AllocParams) *
 	}
 
 	l1Block := l1Genesis.ToBlock()
+
 	l2Genesis, err := genesis.BuildL2DeveloperGenesis(deployConf, l1Block, nil)
 	require.NoError(t, err, "failed to create l2 genesis")
 	if alloc.PrefundTestUsers {