fix ValidateGenesisIntegrity

bitwiseguy · bitwiseguy · commit c9fdbb2a4819 · 2025-04-14T13:10:38.000-04:00
diff --git a/ops/internal/manage/validation.go b/ops/internal/manage/validation.go
@@ -109,12 +109,12 @@ func ValidateGenesisIntegrity(cfg *config.Chain, genesis *core.Genesis) error {
 	}
 
 	out.Optimism = &params.OptimismConfig{
-		EIP1559Elasticity:  cfg.Optimism.EIP1559Elasticity,
-		EIP1559Denominator: cfg.Optimism.EIP1559Denominator,
+		EIP1559Elasticity:  cfg.Genesis.FeeParams.EIP1559Elasticity,
+		EIP1559Denominator: cfg.Genesis.FeeParams.EIP1559Denominator,
 	}
 
-	if cfg.Optimism.EIP1559DenominatorCanyon != 0 {
-		out.Optimism.EIP1559DenominatorCanyon = &cfg.Optimism.EIP1559DenominatorCanyon
+	if cfg.Genesis.FeeParams.EIP1559DenominatorCanyon != 0 {
+		out.Optimism.EIP1559DenominatorCanyon = &cfg.Genesis.FeeParams.EIP1559DenominatorCanyon
 	}
 
 	genCopy := &core.Genesis{

Original file line number	Diff line number	Diff line change
`@@ -109,12 +109,12 @@ func ValidateGenesisIntegrity(cfg config.Chain, genesis core.Genesis) error {`
`109`	`109`	`}`
`110`	`110`
`111`	`111`	`out.Optimism = &params.OptimismConfig{`
`112`		`- EIP1559Elasticity: cfg.Optimism.EIP1559Elasticity,`
`113`		`- EIP1559Denominator: cfg.Optimism.EIP1559Denominator,`
	`112`	`+ EIP1559Elasticity: cfg.Genesis.FeeParams.EIP1559Elasticity,`
	`113`	`+ EIP1559Denominator: cfg.Genesis.FeeParams.EIP1559Denominator,`
`114`	`114`	`}`
`115`	`115`
`116`		`- if cfg.Optimism.EIP1559DenominatorCanyon != 0 {`
`117`		`- out.Optimism.EIP1559DenominatorCanyon = &cfg.Optimism.EIP1559DenominatorCanyon`
	`116`	`+ if cfg.Genesis.FeeParams.EIP1559DenominatorCanyon != 0 {`
	`117`	`+ out.Optimism.EIP1559DenominatorCanyon = &cfg.Genesis.FeeParams.EIP1559DenominatorCanyon`
`118`	`118`	`}`
`119`	`119`
`120`	`120`	`genCopy := &core.Genesis{`