chain config: move 'optimism' to 'genesis.fee_params'

Author: bitwiseguy

ops/internal/config/chain.go

@@ -75,7 +75,7 @@ type Chain struct {
 	MaxSequencerDrift    uint64              `toml:"max_sequencer_drift"`
 	GasPayingToken       *ChecksummedAddress `toml:"gas_paying_token,omitempty"`
 	Hardforks            Hardforks           `toml:"hardforks"`
-	Optimism             Optimism            `toml:"optimism"`
+	Optimism             *FeeParams          `toml:"optimism"`
 	AltDA                *AltDA              `toml:"alt_da"`
 	Genesis              Genesis             `toml:"genesis"`
 	Roles                Roles               `toml:"roles"`
@@ -116,6 +116,7 @@ type Genesis struct {
 	L1           GenesisRef   `toml:"l1"`
 	L2           GenesisRef   `toml:"l2"`
 	SystemConfig SystemConfig `toml:"system_config"`
+	FeeParams    *FeeParams   `toml:"fee_params,omitempty"`
 }
 
 type GenesisRef struct {
@@ -124,12 +125,13 @@ type GenesisRef struct {
 }
 
 type SystemConfig struct {
-	BatcherAddr       ChecksummedAddress `json:"batcherAddr" toml:"batcherAddress"`
-	Overhead          common.Hash        `json:"overhead" toml:"overhead"`
-	Scalar            common.Hash        `json:"scalar" toml:"scalar"`
-	GasLimit          uint64             `json:"gasLimit" toml:"gasLimit"`
-	BaseFeeScalar     *uint64            `json:"baseFeeScalar,omitempty" toml:"baseFeeScalar,omitempty"`
-	BlobBaseFeeScalar *uint64            `json:"blobBaseFeeScalar,omitempty" toml:"blobBaseFeeScalar,omitempty"`
+	BatcherAddr       ChecksummedAddress  `json:"batcherAddr" toml:"batcherAddress"`
+	BatchInboxAddr    *ChecksummedAddress `json:"batchInboxAddr" toml:"batch_inbox_addr"`
+	Overhead          common.Hash         `json:"overhead" toml:"overhead"`
+	Scalar            common.Hash         `json:"scalar" toml:"scalar"`
+	GasLimit          uint64              `json:"gasLimit" toml:"gasLimit"`
+	BaseFeeScalar     *uint64             `json:"baseFeeScalar,omitempty" toml:"baseFeeScalar,omitempty"`
+	BlobBaseFeeScalar *uint64             `json:"blobBaseFeeScalar,omitempty" toml:"blobBaseFeeScalar,omitempty"`
 }
 
 type AltDA struct {
@@ -139,7 +141,7 @@ type AltDA struct {
 	DaCommitmentType           string             `toml:"da_commitment_type"`
 }
 
-type Optimism struct {
+type FeeParams struct {
 	EIP1559Elasticity        uint64 `toml:"eip1559_elasticity"`
 	EIP1559Denominator       uint64 `toml:"eip1559_denominator"`
 	EIP1559DenominatorCanyon uint64 `toml:"eip1559_denominator_canyon"`

ops/internal/config/testdata/all.toml

@@ -7,7 +7,6 @@ governed_by_optimism = true
 superchain_time = 0
 data_availability_type = "eth-da"
 chain_id = 10
-batch_inbox_addr = "0xFF00000000000000000000000000000000000010"
 block_time = 2
 seq_window_size = 3600
 max_sequencer_drift = 600
@@ -21,11 +20,6 @@ max_sequencer_drift = 600
   holocene_time = 1720627203 # Wed 10 Jul 2024 16:00:03 UTC
   isthmus_time = 1720627204 # Wed 10 Jul 2024 16:00:04 UTC
 
-[optimism]
-  eip1559_elasticity = 6
-  eip1559_denominator = 50
-  eip1559_denominator_canyon = 250
-
 [genesis]
   l2_time = 1686068903
   [genesis.l1]
@@ -36,11 +30,16 @@ max_sequencer_drift = 600
     number = 105235063
   [genesis.system_config]
     batcherAddress = "0x6887246668a3b87F54DeB3b94Ba47a6f63F32985"
+    batch_inbox_addr = "0xFF00000000000000000000000000000000000010"
     overhead = "0x00000000000000000000000000000000000000000000000000000000000000bc"
     scalar = "0x00000000000000000000000000000000000000000000000000000000000a6fe0"
     gasLimit = 30000000
     baseFeeScalar = 123
     blobBaseFeeScalar = 456
+  [genesis.fee_params]
+    eip1559_elasticity = 6
+    eip1559_denominator = 50
+    eip1559_denominator_canyon = 250
 
 [roles]
   SystemConfigOwner = "0x847B5c174615B1B7fDF770882256e2D3E95b9D92"

ops/internal/manage/staging.go

@@ -34,7 +34,6 @@ func InflateChainConfig(st *state.State) (*config.StagedChain, error) {
 
 	cfg := new(config.StagedChain)
 	cfg.ChainID = chainID.Big().Uint64()
-	cfg.BatchInboxAddr = config.NewChecksummedAddress(dc.BatchInboxAddress)
 	cfg.BlockTime = dc.L2BlockTime
 	cfg.SeqWindowSize = dc.SequencerWindowSize
 	cfg.MaxSequencerDrift = dc.MaxSequencerDrift
@@ -54,12 +53,6 @@ func InflateChainConfig(st *state.State) (*config.StagedChain, error) {
 		return nil, fmt.Errorf("failed to copy deploy config hardfork times: %w", err)
 	}
 
-	cfg.Optimism = config.Optimism{
-		EIP1559Elasticity:        dc.EIP1559Elasticity,
-		EIP1559Denominator:       dc.EIP1559Denominator,
-		EIP1559DenominatorCanyon: dc.EIP1559DenominatorCanyon,
-	}
-
 	if dc.UseAltDA {
 		cfg.AltDA = &config.AltDA{
 			DaChallengeContractAddress: config.ChecksummedAddress(dc.DAChallengeProxy),
@@ -83,10 +76,16 @@ func InflateChainConfig(st *state.State) (*config.StagedChain, error) {
 			Number: rollup.Genesis.L2.Number,
 		},
 		SystemConfig: config.SystemConfig{
-			BatcherAddr: *config.NewChecksummedAddress(rollup.Genesis.SystemConfig.BatcherAddr),
-			Overhead:    common.Hash(rollup.Genesis.SystemConfig.Overhead),
-			Scalar:      common.Hash(rollup.Genesis.SystemConfig.Scalar),
-			GasLimit:    rollup.Genesis.SystemConfig.GasLimit,
+			BatcherAddr:    *config.NewChecksummedAddress(rollup.Genesis.SystemConfig.BatcherAddr),
+			BatchInboxAddr: config.NewChecksummedAddress(dc.BatchInboxAddress),
+			Overhead:       common.Hash(rollup.Genesis.SystemConfig.Overhead),
+			Scalar:         common.Hash(rollup.Genesis.SystemConfig.Scalar),
+			GasLimit:       rollup.Genesis.SystemConfig.GasLimit,
+		},
+		FeeParams: &config.FeeParams{
+			EIP1559Elasticity:        dc.EIP1559Elasticity,
+			EIP1559Denominator:       dc.EIP1559Denominator,
+			EIP1559DenominatorCanyon: dc.EIP1559DenominatorCanyon,
 		},
 	}