op-chain-ops: parse the new config

We need config options for the recipients of the fee vaults.
This adds it to the config parsing.

op-chain-ops/cmd/migrate/main.go

@@ -162,6 +162,9 @@ func main() {
 				L1StandardBridgeProxy:       l1StandardBridgeProxyDeployment.Address,
 				L1CrossDomainMessengerProxy: l1CrossDomainMessengerProxyDeployment.Address,
 				L1ERC721BridgeProxy:         l1ERC721BridgeProxyDeployment.Address,
+				BaseFeeVaultRecipient:       config.BaseFeeVaultRecipient,
+				L1FeeVaultRecipient:         config.L1FeeVaultRecipient,
+				SequencerFeeVaultRecipient:  config.SequencerFeeVaultRecipient,
 			}
 
 			dryRun := ctx.Bool("dry-run")

op-chain-ops/genesis/config.go

@@ -65,10 +65,16 @@ type DeployConfig struct {
 	L2GenesisBlockParentHash    common.Hash    `json:"l2GenesisBlockParentHash"`
 	L2GenesisBlockBaseFeePerGas *hexutil.Big   `json:"l2GenesisBlockBaseFeePerGas"`
 
-	ProxyAdminOwner             common.Address `json:"proxyAdminOwner"`
+	// Owner of the ProxyAdmin predeploy
+	ProxyAdminOwner common.Address `json:"proxyAdminOwner"`
+	// Owner of the L1CrossDomainMessenger predeploy
 	L2CrossDomainMessengerOwner common.Address `json:"l2CrossDomainMessengerOwner"`
-	OptimismBaseFeeRecipient    common.Address `json:"optimismBaseFeeRecipient"`
-	OptimismL1FeeRecipient      common.Address `json:"optimismL1FeeRecipient"`
+	// L1 recipient of fees accumulated in the BaseFeeVault
+	BaseFeeVaultRecipient common.Address `json:"baseFeeVaultRecipient"`
+	// L1 recipient of fees accumulated in the L1FeeVault
+	L1FeeVaultRecipient common.Address `json:"l1FeeVaultRecipient"`
+	// L1 recipient of fees accumulated in the SequencerFeeVault
+	SequencerFeeVaultRecipient common.Address `json:"sequencerFeeVaultRecipient"`
 
 	GasPriceOracleOverhead uint64 `json:"gasPriceOracleOverhead"`
 	GasPriceOracleScalar   uint64 `json:"gasPriceOracleScalar"`

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

@@ -41,6 +41,9 @@
   "optimismBaseFeeRecipient": "0x42000000000000000000000000000000000000f1",
   "optimismL1FeeRecipient": "0x0000000000000000000000000000000000000000",
   "l2CrossDomainMessengerOwner": "0x42000000000000000000000000000000000000f2",
+  "baseFeeVaultRecipient": "0x42000000000000000000000000000000000000f5",
+  "l1FeeVaultRecipient": "0x42000000000000000000000000000000000000f6",
+  "sequencerFeeVaultRecipient": "0x42000000000000000000000000000000000000f7",
   "proxyAdminOwner": "0x0000000000000000000000000000000000000000",
   "gasPriceOracleOverhead": 2100,
   "gasPriceOracleScalar": 1000000,

op-node/cmd/genesis/cmd.go

@@ -160,6 +160,9 @@ var Subcommands = cli.Commands{
 				L1StandardBridgeProxy:       l1SBP.Address,
 				L1CrossDomainMessengerProxy: l1XDMP.Address,
 				L1ERC721BridgeProxy:         l1ERC721BP.Address,
+				BaseFeeVaultRecipient:       config.BaseFeeVaultRecipient,
+				L1FeeVaultRecipient:         config.L1FeeVaultRecipient,
+				SequencerFeeVaultRecipient:  config.SequencerFeeVaultRecipient,
 			}
 			l2Genesis, err := genesis.BuildL2DeveloperGenesis(config, l1StartBlock, l2Addrs)
 			if err != nil {