From b36a8be32f80f5a36388fe8bc00b2343a3d4586d Mon Sep 17 00:00:00 2001 From: Adrian Sutton Date: Wed, 25 Oct 2023 07:03:33 +1000 Subject: [PATCH] op-service: Update CalcBaseFee call --- op-e2e/actions/l1_miner.go | 2 +- op-program/client/l2/engineapi/block_processor.go | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/op-e2e/actions/l1_miner.go b/op-e2e/actions/l1_miner.go index 70c5059a16c0..c9d085877bf6 100644 --- a/op-e2e/actions/l1_miner.go +++ b/op-e2e/actions/l1_miner.go @@ -67,7 +67,7 @@ func (s *L1Miner) ActL1StartBlock(timeDelta uint64) Action { MixDigest: common.Hash{}, // TODO: maybe randomize this (prev-randao value) } if s.l1Cfg.Config.IsLondon(header.Number) { - header.BaseFee = eip1559.CalcBaseFee(s.l1Cfg.Config, parent) + header.BaseFee = eip1559.CalcBaseFee(s.l1Cfg.Config, parent, header.Time) // At the transition, double the gas limit so the gas target is equal to the old gas limit. if !s.l1Cfg.Config.IsLondon(parent.Number) { header.GasLimit = parent.GasLimit * s.l1Cfg.Config.ElasticityMultiplier() diff --git a/op-program/client/l2/engineapi/block_processor.go b/op-program/client/l2/engineapi/block_processor.go index 22c6e1441401..c6966e0d94c2 100644 --- a/op-program/client/l2/engineapi/block_processor.go +++ b/op-program/client/l2/engineapi/block_processor.go @@ -68,7 +68,7 @@ func NewBlockProcessorFromHeader(provider BlockDataProvider, h *types.Header) (* return nil, fmt.Errorf("get parent state: %w", err) } header.Number = new(big.Int).Add(parentHeader.Number, common.Big1) - header.BaseFee = eip1559.CalcBaseFee(provider.Config(), parentHeader) + header.BaseFee = eip1559.CalcBaseFee(provider.Config(), parentHeader, header.Time) header.GasUsed = 0 gasPool := new(core.GasPool).AddGas(header.GasLimit) return &BlockProcessor{