op-chain-ops: deploy config to rollup config

Refactor to create a method on the deploy config
to create a rollup config. This will be useful
for creating a script to build a rollup config.

op-chain-ops/genesis/config.go

@@ -10,6 +10,7 @@ import (
 
 	"github.com/ethereum/go-ethereum/common"
 	"github.com/ethereum/go-ethereum/common/hexutil"
+	"github.com/ethereum/go-ethereum/core"
 	"github.com/ethereum/go-ethereum/core/types"
 	"github.com/ethereum/go-ethereum/log"
 	"github.com/ethereum/go-ethereum/rpc"
@@ -18,6 +19,8 @@ import (
 	"github.com/ethereum-optimism/optimism/op-bindings/predeploys"
 	"github.com/ethereum-optimism/optimism/op-chain-ops/immutables"
 	"github.com/ethereum-optimism/optimism/op-chain-ops/state"
+	"github.com/ethereum-optimism/optimism/op-node/eth"
+	"github.com/ethereum-optimism/optimism/op-node/rollup"
 )
 
 var ErrInvalidDeployConfig = errors.New("invalid deploy config")
@@ -267,6 +270,46 @@ func (d *DeployConfig) InitDeveloperDeployedAddresses() error {
 	return nil
 }
 
+// RollupConfig converts a DeployConfig to a rollup.Config
+func (d *DeployConfig) RollupConfig(l1StartBlock *types.Block, l2Genesis *core.Genesis) (*rollup.Config, error) {
+	if d.OptimismPortalProxy == (common.Address{}) {
+		return nil, errors.New("OptimismPortalProxy cannot be address(0)")
+	}
+	if d.SystemConfigProxy == (common.Address{}) {
+		return nil, errors.New("SystemConfigProxy cannot be address(0)")
+	}
+
+	return &rollup.Config{
+		Genesis: rollup.Genesis{
+			L1: eth.BlockID{
+				Hash:   l1StartBlock.Hash(),
+				Number: l1StartBlock.NumberU64(),
+			},
+			L2: eth.BlockID{
+				Hash:   l2Genesis.ToBlock().Hash(),
+				Number: 0,
+			},
+			L2Time: l1StartBlock.Time(),
+			SystemConfig: eth.SystemConfig{
+				BatcherAddr: d.BatchSenderAddress,
+				Overhead:    eth.Bytes32(common.BigToHash(new(big.Int).SetUint64(d.GasPriceOracleOverhead))),
+				Scalar:      eth.Bytes32(common.BigToHash(new(big.Int).SetUint64(d.GasPriceOracleScalar))),
+				GasLimit:    uint64(d.L2GenesisBlockGasLimit),
+			},
+		},
+		BlockTime:              d.L2BlockTime,
+		MaxSequencerDrift:      d.MaxSequencerDrift,
+		SeqWindowSize:          d.SequencerWindowSize,
+		ChannelTimeout:         d.ChannelTimeout,
+		L1ChainID:              new(big.Int).SetUint64(d.L1ChainID),
+		L2ChainID:              new(big.Int).SetUint64(d.L2ChainID),
+		P2PSequencerAddress:    d.P2PSequencerAddress,
+		BatchInboxAddress:      d.BatchInboxAddress,
+		DepositContractAddress: d.OptimismPortalProxy,
+		L1SystemConfigAddress:  d.SystemConfigProxy,
+	}, nil
+}
+
 // NewDeployConfig reads a config file given a path on the filesystem.
 func NewDeployConfig(path string) (*DeployConfig, error) {
 	file, err := os.ReadFile(path)

op-node/cmd/genesis/cmd.go

@@ -11,15 +11,11 @@ import (
 
 	"github.com/urfave/cli"
 
-	"github.com/ethereum/go-ethereum/common"
-	"github.com/ethereum/go-ethereum/core"
 	"github.com/ethereum/go-ethereum/core/types"
 	"github.com/ethereum/go-ethereum/ethclient"
 
 	"github.com/ethereum-optimism/optimism/op-bindings/hardhat"
 	"github.com/ethereum-optimism/optimism/op-chain-ops/genesis"
-	"github.com/ethereum-optimism/optimism/op-node/eth"
-	"github.com/ethereum-optimism/optimism/op-node/rollup"
 )
 
 var Subcommands = cli.Commands{
@@ -71,7 +67,7 @@ var Subcommands = cli.Commands{
 				return err
 			}
 
-			rollupConfig, err := makeRollupConfig(config, l1StartBlock, l2Genesis)
+			rollupConfig, err := config.RollupConfig(l1StartBlock, l2Genesis)
 			if err != nil {
 				return err
 			}
@@ -159,7 +155,7 @@ var Subcommands = cli.Commands{
 				return fmt.Errorf("error creating l2 developer genesis: %w", err)
 			}
 
-			rollupConfig, err := makeRollupConfig(config, l1StartBlock, l2Genesis)
+			rollupConfig, err := config.RollupConfig(l1StartBlock, l2Genesis)
 			if err != nil {
 				return err
 			}
@@ -175,45 +171,6 @@ var Subcommands = cli.Commands{
 	},
 }
 
-func makeRollupConfig(config *genesis.DeployConfig, l1StartBlock *types.Block, l2Genesis *core.Genesis) (*rollup.Config, error) {
-	if config.OptimismPortalProxy == (common.Address{}) {
-		return nil, errors.New("OptimismPortalProxy cannot be address(0)")
-	}
-	if config.SystemConfigProxy == (common.Address{}) {
-		return nil, errors.New("SystemConfigProxy cannot be address(0)")
-	}
-
-	return &rollup.Config{
-		Genesis: rollup.Genesis{
-			L1: eth.BlockID{
-				Hash:   l1StartBlock.Hash(),
-				Number: l1StartBlock.NumberU64(),
-			},
-			L2: eth.BlockID{
-				Hash:   l2Genesis.ToBlock().Hash(),
-				Number: 0,
-			},
-			L2Time: l1StartBlock.Time(),
-			SystemConfig: eth.SystemConfig{
-				BatcherAddr: config.BatchSenderAddress,
-				Overhead:    eth.Bytes32(common.BigToHash(new(big.Int).SetUint64(config.GasPriceOracleOverhead))),
-				Scalar:      eth.Bytes32(common.BigToHash(new(big.Int).SetUint64(config.GasPriceOracleScalar))),
-				GasLimit:    uint64(config.L2GenesisBlockGasLimit),
-			},
-		},
-		BlockTime:              config.L2BlockTime,
-		MaxSequencerDrift:      config.MaxSequencerDrift,
-		SeqWindowSize:          config.SequencerWindowSize,
-		ChannelTimeout:         config.ChannelTimeout,
-		L1ChainID:              new(big.Int).SetUint64(config.L1ChainID),
-		L2ChainID:              new(big.Int).SetUint64(config.L2ChainID),
-		P2PSequencerAddress:    config.P2PSequencerAddress,
-		BatchInboxAddress:      config.BatchInboxAddress,
-		DepositContractAddress: config.OptimismPortalProxy,
-		L1SystemConfigAddress:  config.SystemConfigProxy,
-	}, nil
-}
-
 func writeGenesisFile(outfile string, input interface{}) error {
 	f, err := os.OpenFile(outfile, os.O_WRONLY|os.O_CREATE|os.O_TRUNC, 0o755)
 	if err != nil {