From 34ce6f678508c2c89d91f1d33a7c24f0ce0b2d38 Mon Sep 17 00:00:00 2001 From: Marius van der Wijden Date: Tue, 18 Feb 2025 09:48:44 +0100 Subject: [PATCH] consensus/misc: sort forks chronologically --- consensus/misc/eip4844/eip4844.go | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/consensus/misc/eip4844/eip4844.go b/consensus/misc/eip4844/eip4844.go index 9a2f4728f5..32b34f4e53 100644 --- a/consensus/misc/eip4844/eip4844.go +++ b/consensus/misc/eip4844/eip4844.go @@ -83,12 +83,12 @@ func CalcExcessBlobGas(config *params.ChainConfig, parent *types.Header, headTim func CalcBlobFee(config *params.ChainConfig, header *types.Header) *big.Int { var frac uint64 switch config.LatestFork(header.Time) { + case forks.Osaka: + frac = config.BlobScheduleConfig.Osaka.UpdateFraction case forks.Prague: frac = config.BlobScheduleConfig.Prague.UpdateFraction case forks.Cancun: frac = config.BlobScheduleConfig.Cancun.UpdateFraction - case forks.Osaka: - frac = config.BlobScheduleConfig.Osaka.UpdateFraction default: panic("calculating blob fee on unsupported fork") } @@ -105,12 +105,12 @@ func MaxBlobsPerBlock(cfg *params.ChainConfig, time uint64) int { s = cfg.BlobScheduleConfig ) switch { + case cfg.IsOsaka(london, time) && s.Osaka != nil: + return s.Osaka.Max case cfg.IsPrague(london, time) && s.Prague != nil: return s.Prague.Max case cfg.IsCancun(london, time) && s.Cancun != nil: return s.Cancun.Max - case cfg.IsOsaka(london, time) && s.Osaka != nil: - return s.Osaka.Max default: return 0 } @@ -129,12 +129,12 @@ func LatestMaxBlobsPerBlock(cfg *params.ChainConfig) int { return 0 } switch { + case s.Osaka != nil: + return s.Osaka.Max case s.Prague != nil: return s.Prague.Max case s.Cancun != nil: return s.Cancun.Max - case s.Osaka != nil: - return s.Osaka.Max default: return 0 } @@ -150,12 +150,12 @@ func targetBlobsPerBlock(cfg *params.ChainConfig, time uint64) int { s = cfg.BlobScheduleConfig ) switch { + case cfg.IsOsaka(london, time) && s.Osaka != nil: + return s.Osaka.Target case cfg.IsPrague(london, time) && s.Prague != nil: return s.Prague.Target case cfg.IsCancun(london, time) && s.Cancun != nil: return s.Cancun.Target - case cfg.IsOsaka(london, time) && s.Osaka != nil: - return s.Osaka.Target default: return 0 }