Merge pull request #4199 from...

Merge pull request #4199 from ethereum-optimism/12-03-op-chain-ops_Remove_inconsistent_ownership_config_fields

op-chain-ops: Remove inconsistent ownership config fields

op-chain-ops/genesis/config.go

@@ -72,8 +72,8 @@ type DeployConfig struct {
 
 	// Owner of the ProxyAdmin predeploy
 	ProxyAdminOwner common.Address `json:"proxyAdminOwner"`
-	// Owner of the L1CrossDomainMessenger predeploy
-	L2CrossDomainMessengerOwner common.Address `json:"l2CrossDomainMessengerOwner"`
+	// Owner of the system on L1
+	FinalSystemOwner common.Address `json:"finalSystemOwner"`
 	// L1 recipient of fees accumulated in the BaseFeeVault
 	BaseFeeVaultRecipient common.Address `json:"baseFeeVaultRecipient"`
 	// L1 recipient of fees accumulated in the L1FeeVault
@@ -149,12 +149,12 @@ func (d *DeployConfig) Check() error {
 	if d.SystemConfigOwner == (common.Address{}) {
 		return fmt.Errorf("%w: SystemConfigOwner cannot be address(0)", ErrInvalidDeployConfig)
 	}
+	if d.FinalSystemOwner == (common.Address{}) {
+		return fmt.Errorf("%w: FinalSystemOwner cannot be address(0)", ErrInvalidDeployConfig)
+	}
 	if d.ProxyAdminOwner == (common.Address{}) {
 		return fmt.Errorf("%w: ProxyAdminOwner cannot be address(0)", ErrInvalidDeployConfig)
 	}
-	if d.L2CrossDomainMessengerOwner == (common.Address{}) {
-		return fmt.Errorf("%w: L2CrossDomainMessengerOwner cannot be address(0)", ErrInvalidDeployConfig)
-	}
 	if d.BaseFeeVaultRecipient == (common.Address{}) {
 		log.Warn("BaseFeeVaultRecipient is address(0)")
 	}
@@ -385,7 +385,7 @@ func NewL2StorageConfig(config *DeployConfig, block *types.Block) (state.Storage
 	}
 	storage["L2CrossDomainMessenger"] = state.StorageValues{
 		"_initialized": 1,
-		"_owner":       config.L2CrossDomainMessengerOwner,
+		"_owner":       config.ProxyAdminOwner,
 		// re-entrency lock
 		"_status":          1,
 		"_initializing":    false,

op-chain-ops/genesis/layer_one.go

@@ -141,7 +141,7 @@ func BuildL1DeveloperGenesis(config *DeployConfig) (*core.Genesis, error) {
 	}
 	data, err = l1XDMABI.Pack(
 		"initialize",
-		config.ProxyAdminOwner,
+		config.FinalSystemOwner,
 	)
 	if err != nil {
 		return nil, err

op-chain-ops/genesis/testdata/test-deploy-config-full.json

@@ -19,6 +19,7 @@
   "cliqueSignerAddress": "0x0000000000000000000000000000000000000000",
   "l1GenesisBlockGasLimit": "0xe4e1c0",
   "l1GenesisBlockDifficulty": "0x1",
+  "finalSystemOwner": "0x0000000000000000000000000000000000000111",
   "finalizationPeriodSeconds": 2,
   "l1GenesisBlockMixHash": "0x0000000000000000000000000000000000000000000000000000000000000000",
   "l1GenesisBlockCoinbase": "0x0000000000000000000000000000000000000000",
@@ -37,7 +38,6 @@
   "l2GenesisBlockGasUsed": "0x0",
   "l2GenesisBlockParentHash": "0x0000000000000000000000000000000000000000000000000000000000000000",
   "l2GenesisBlockBaseFeePerGas": "0x3b9aca00",
-  "l2CrossDomainMessengerOwner": "0x42000000000000000000000000000000000000f2",
   "baseFeeVaultRecipient": "0x42000000000000000000000000000000000000f5",
   "l1FeeVaultRecipient": "0x42000000000000000000000000000000000000f6",
   "sequencerFeeVaultRecipient": "0x42000000000000000000000000000000000000f7",
@@ -46,7 +46,7 @@
   "l1ERC721BridgeProxy": "0x4200000000000000000000000000000000000060",
   "systemConfigProxy": "0x4200000000000000000000000000000000000061",
   "optimismPortalProxy": "0x4200000000000000000000000000000000000062",
-  "proxyAdminOwner": "0x0000000000000000000000000000000000000000",
+  "proxyAdminOwner": "0x0000000000000000000000000000000000000222",
   "gasPriceOracleOverhead": 2100,
   "gasPriceOracleScalar": 1000000,
   "deploymentWaitConfirmations": 1,

op-e2e/e2eutils/setup.go

@@ -98,7 +98,6 @@ func MakeDeployParams(t require.TestingT, tp *TestParams) *DeployParams {
 		L2GenesisBlockParentHash:    common.Hash{},
 		L2GenesisBlockBaseFeePerGas: uint64ToBig(1000_000_000),
 
-		L2CrossDomainMessengerOwner: common.Address{0: 0x42, 19: 0xf2}, // tbd
 		GasPriceOracleOverhead:      2100,
 		GasPriceOracleScalar:        1000_000,
 		DeploymentWaitConfirmations: 1,

op-e2e/setup.go

@@ -90,8 +90,6 @@ func DefaultSystemConfig(t *testing.T) SystemConfig {
 		L2GenesisBlockParentHash:    common.Hash{},
 		L2GenesisBlockBaseFeePerGas: uint642big(7),
 
-		L2CrossDomainMessengerOwner: common.Address{0: 0x52, 19: 0xf3}, // tbd
-
 		GasPriceOracleOverhead: 2100,
 		GasPriceOracleScalar:   1_000_000,
 

packages/contracts-bedrock/deploy-config/devnetL1.json

@@ -21,7 +21,7 @@
   "l1FeeVaultRecipient": "0x71bE63f3384f5fb98995898A86B02Fb2426c5788",
   "sequencerFeeVaultRecipient": "0xfabb0ac9d68b0b445fb7357272ff202c5651694a",
   "proxyAdminOwner": "0xBcd4042DE499D14e55001CcbB24a551F3b954096",
-  "l2CrossDomainMessengerOwner": "0xBcd4042DE499D14e55001CcbB24a551F3b954096",
+  "finalSystemOwner": "0xBcd4042DE499D14e55001CcbB24a551F3b954096",
   "finalizationPeriodSeconds": 2,
   "deploymentWaitConfirmations": 1,
   "fundDevAccounts": true,
@@ -32,4 +32,4 @@
   "eip1559Elasticity": 2,
   "l1GenesisBlockTimestamp": "0x638a4554",
   "l1StartingBlockTag": "earliest"
-}
+}
\ No newline at end of file