From 8d9bd32fa9a23b0c171a7103a6896c1b28060a93 Mon Sep 17 00:00:00 2001 From: MariusVanDerWijden Date: Wed, 1 Jul 2026 10:31:02 +0200 Subject: [PATCH] params: undo checks --- params/config.go | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) diff --git a/params/config.go b/params/config.go index f31e53dde7..1dadf0e43f 100644 --- a/params/config.go +++ b/params/config.go @@ -688,7 +688,7 @@ func (c *ChainConfig) Description() string { banner += fmt.Sprintf(" - BPO5: @%-10v blob: (%s)\n", *c.BPO5Time, c.BlobScheduleConfig.BPO5) } if c.AmsterdamTime != nil { - banner += fmt.Sprintf(" - Amsterdam: @%-10v blob: (%s)\n", *c.AmsterdamTime, c.BlobScheduleConfig.Amsterdam) + banner += fmt.Sprintf(" - Amsterdam: @%-10v blob: (%s)\n", *c.AmsterdamTime, c.BlobScheduleConfig.Amsterdam) } if c.UBTTime != nil { banner += fmt.Sprintf(" - UBT: @%-10v blob: (%s)\n", *c.UBTTime, c.BlobScheduleConfig.UBT) @@ -997,7 +997,6 @@ func (c *ChainConfig) CheckConfigForkOrder() error { name string timestamp *uint64 config *BlobConfig - inherits bool // fork introduces no blob params; inherits the latest prior fork's schedule }{ {name: "cancun", timestamp: c.CancunTime, config: bsc.Cancun}, {name: "prague", timestamp: c.PragueTime, config: bsc.Prague}, @@ -1007,17 +1006,14 @@ func (c *ChainConfig) CheckConfigForkOrder() error { {name: "bpo3", timestamp: c.BPO3Time, config: bsc.BPO3}, {name: "bpo4", timestamp: c.BPO4Time, config: bsc.BPO4}, {name: "bpo5", timestamp: c.BPO5Time, config: bsc.BPO5}, - // Amsterdam (EIP-7928 BAL) doesn't change blob parameters. The blob - // resolver (eip4844.latestBlobConfig) has no Amsterdam case and falls - // through to Osaka, so an explicit amsterdam blob entry isn't required. - {name: "amsterdam", timestamp: c.AmsterdamTime, config: bsc.Amsterdam, inherits: true}, + {name: "amsterdam", timestamp: c.AmsterdamTime, config: bsc.Amsterdam}, } { if cur.config != nil { if err := cur.config.validate(); err != nil { return fmt.Errorf("invalid chain configuration in blobSchedule for fork %q: %v", cur.name, err) } } - if cur.timestamp != nil && !cur.inherits { + if cur.timestamp != nil { // If the fork is configured, a blob schedule must be defined for it. if cur.config == nil { return fmt.Errorf("invalid chain configuration: missing entry for fork %q in blobSchedule", cur.name)