fix: configurable L2 genesis block number

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

@@ -182,7 +182,7 @@ func main() {
 				return err
 			}
 
-			opNodeConfig, err := config.RollupConfig(block, res.TransitionBlockHash)
+			opNodeConfig, err := config.RollupConfig(block, res.TransitionBlockHash, res.TransitionHeight)
 			if err != nil {
 				return err
 			}

op-chain-ops/genesis/config.go

@@ -269,9 +269,8 @@ func (d *DeployConfig) InitDeveloperDeployedAddresses() error {
 	return nil
 }
 
-// TODO: convert the input to this function
 // RollupConfig converts a DeployConfig to a rollup.Config
-func (d *DeployConfig) RollupConfig(l1StartBlock *types.Block, l2GenesisBlockHash common.Hash) (*rollup.Config, error) {
+func (d *DeployConfig) RollupConfig(l1StartBlock *types.Block, l2GenesisBlockHash common.Hash, l2GenesisBlockNumber uint64) (*rollup.Config, error) {
 	if d.OptimismPortalProxy == (common.Address{}) {
 		return nil, errors.New("OptimismPortalProxy cannot be address(0)")
 	}
@@ -287,7 +286,7 @@ func (d *DeployConfig) RollupConfig(l1StartBlock *types.Block, l2GenesisBlockHas
 			},
 			L2: eth.BlockID{
 				Hash:   l2GenesisBlockHash,
-				Number: 0,
+				Number: l2GenesisBlockNumber,
 			},
 			L2Time: l1StartBlock.Time(),
 			SystemConfig: eth.SystemConfig{

op-node/cmd/genesis/cmd.go

@@ -67,7 +67,8 @@ var Subcommands = cli.Commands{
 				return err
 			}
 
-			rollupConfig, err := config.RollupConfig(l1StartBlock, l2Genesis.ToBlock().Hash())
+			l2GenesisBlock := l2Genesis.ToBlock()
+			rollupConfig, err := config.RollupConfig(l1StartBlock, l2GenesisBlock.Hash(), l2GenesisBlock.Number().Uint64())
 			if err != nil {
 				return err
 			}
@@ -155,7 +156,8 @@ var Subcommands = cli.Commands{
 				return fmt.Errorf("error creating l2 developer genesis: %w", err)
 			}
 
-			rollupConfig, err := config.RollupConfig(l1StartBlock, l2Genesis.ToBlock().Hash())
+			l2GenesisBlock := l2Genesis.ToBlock()
+			rollupConfig, err := config.RollupConfig(l1StartBlock, l2GenesisBlock.Hash(), l2GenesisBlock.Number().Uint64())
 			if err != nil {
 				return err
 			}