systemcontracts: apply baseFee from policy contract for burning

chenquanyu · chenquanyu · commit 21fce6331e13 · 2024-04-16T15:25:00.000+08:00
Close #163
diff --git a/cmd/evm/internal/t8ntool/execution.go b/cmd/evm/internal/t8ntool/execution.go
@@ -24,6 +24,7 @@ import (
 	"github.com/ethereum/go-ethereum/common/math"
 	"github.com/ethereum/go-ethereum/consensus/ethash"
 	"github.com/ethereum/go-ethereum/consensus/misc"
+	"github.com/ethereum/go-ethereum/consensus/misc/eip1559"
 	"github.com/ethereum/go-ethereum/consensus/misc/eip4844"
 	"github.com/ethereum/go-ethereum/core"
 	"github.com/ethereum/go-ethereum/core/rawdb"
@@ -156,6 +157,13 @@ func (pre *Prestate) Apply(vmConfig vm.Config, chainConfig *params.ChainConfig,
 		GasLimit:    pre.Env.GasLimit,
 		GetHash:     getHash,
 	}
+	env := &pre.Env
+	env.BaseFee = eip1559.CalcBaseFee(chainConfig, &types.Header{
+		Number:   new(big.Int).SetUint64(env.Number - 1),
+		BaseFee:  env.ParentBaseFee,
+		GasUsed:  env.ParentGasUsed,
+		GasLimit: env.ParentGasLimit,
+	}, statedb)
 	// If currentBaseFee is defined, add it to the vmContext.
 	if pre.Env.BaseFee != nil {
 		vmContext.BaseFee = new(big.Int).Set(pre.Env.BaseFee)
diff --git a/cmd/evm/internal/t8ntool/transition.go b/cmd/evm/internal/t8ntool/transition.go
@@ -26,10 +26,8 @@ import (
 
 	"github.com/ethereum/go-ethereum/common"
 	"github.com/ethereum/go-ethereum/common/hexutil"
-	"github.com/ethereum/go-ethereum/consensus/misc/eip1559"
 	"github.com/ethereum/go-ethereum/core"
 	"github.com/ethereum/go-ethereum/core/state"
-	"github.com/ethereum/go-ethereum/core/types"
 	"github.com/ethereum/go-ethereum/core/vm"
 	"github.com/ethereum/go-ethereum/eth/tracers"
 	"github.com/ethereum/go-ethereum/eth/tracers/logger"
@@ -206,12 +204,6 @@ func applyLondonChecks(env *stEnv, chainConfig *params.ChainConfig) error {
 	if env.ParentBaseFee == nil || env.Number == 0 {
 		return NewError(ErrorConfig, errors.New("EIP-1559 config but missing 'currentBaseFee' in env section"))
 	}
-	env.BaseFee = eip1559.CalcBaseFee(chainConfig, &types.Header{
-		Number:   new(big.Int).SetUint64(env.Number - 1),
-		BaseFee:  env.ParentBaseFee,
-		GasUsed:  env.ParentGasUsed,
-		GasLimit: env.ParentGasLimit,
-	})
 	return nil
 }
 
diff --git a/consensus/beacon/consensus.go b/consensus/beacon/consensus.go
@@ -259,7 +259,7 @@ func (beacon *Beacon) verifyHeader(chain consensus.ChainHeaderReader, header, pa
 		return consensus.ErrInvalidNumber
 	}
 	// Verify the header's EIP-1559 attributes.
-	if err := eip1559.VerifyEIP1559Header(chain.Config(), parent, header); err != nil {
+	if err := eip1559.VerifyEIP1559Header(chain.Config(), parent, header, nil); err != nil {
 		return err
 	}
 	// Verify existence / non-existence of withdrawalsHash.
diff --git a/consensus/clique/clique.go b/consensus/clique/clique.go
@@ -357,7 +357,7 @@ func (c *Clique) verifyCascadingFields(chain consensus.ChainHeaderReader, header
 		if err := misc.VerifyGaslimit(parent.GasLimit, header.GasLimit); err != nil {
 			return err
 		}
-	} else if err := eip1559.VerifyEIP1559Header(chain.Config(), parent, header); err != nil {
+	} else if err := eip1559.VerifyEIP1559Header(chain.Config(), parent, header, nil); err != nil {
 		// Verify the header's EIP-1559 attributes.
 		return err
 	}
diff --git a/consensus/dbft/chainreader.go b/consensus/dbft/chainreader.go
@@ -18,6 +18,7 @@ type ChainHeaderReader interface {
 	GetBlockByNumber(uint64) *types.Block
 	VerifyBlock(block *types.Block) (*state.StateDB, types.Receipts, error)
 	ProcessState(block *types.Block) (*state.StateDB, types.Receipts, []*types.Log, uint64, error)
+	StateAt(root common.Hash) (*state.StateDB, error)
 }
 
 // ChainHeaderWriter is a Blockchain API abstraction needed for proper blockQueue
diff --git a/consensus/dbft/dbft.go b/consensus/dbft/dbft.go
@@ -903,6 +903,12 @@ func (c *DBFT) verifyCascadingFields(chain consensus.ChainHeaderReader, header *
 	if header.GasUsed > header.GasLimit {
 		return fmt.Errorf("invalid gasUsed: have %d, gasLimit %d", header.GasUsed, header.GasLimit)
 	}
+
+	state, err := c.chain.StateAt(parent.Root)
+	if err != nil {
+		return fmt.Errorf("failed to get state: err %w, root %s", err, parent.Root)
+	}
+
 	if !chain.Config().IsLondon(header.Number) {
 		// Verify BaseFee not present before EIP-1559 fork.
 		if header.BaseFee != nil {
@@ -911,7 +917,7 @@ func (c *DBFT) verifyCascadingFields(chain consensus.ChainHeaderReader, header *
 		if err := misc.VerifyGaslimit(parent.GasLimit, header.GasLimit); err != nil {
 			return err
 		}
-	} else if err := eip1559.VerifyEIP1559Header(chain.Config(), parent, header); err != nil {
+	} else if err := eip1559.VerifyEIP1559Header(chain.Config(), parent, header, state); err != nil {
 		// Verify the header's EIP-1559 attributes.
 		return err
 	}
diff --git a/consensus/ethash/consensus.go b/consensus/ethash/consensus.go
@@ -256,7 +256,7 @@ func (ethash *Ethash) verifyHeader(chain consensus.ChainHeaderReader, header, pa
 		if err := misc.VerifyGaslimit(parent.GasLimit, header.GasLimit); err != nil {
 			return err
 		}
-	} else if err := eip1559.VerifyEIP1559Header(chain.Config(), parent, header); err != nil {
+	} else if err := eip1559.VerifyEIP1559Header(chain.Config(), parent, header, nil); err != nil {
 		// Verify the header's EIP-1559 attributes.
 		return err
 	}
diff --git a/consensus/misc/eip1559/eip1559.go b/consensus/misc/eip1559/eip1559.go
@@ -24,14 +24,16 @@ import (
 	"github.com/ethereum/go-ethereum/common"
 	"github.com/ethereum/go-ethereum/common/math"
 	"github.com/ethereum/go-ethereum/consensus/misc"
+	"github.com/ethereum/go-ethereum/core/state"
+	"github.com/ethereum/go-ethereum/core/systemcontracts"
 	"github.com/ethereum/go-ethereum/core/types"
 	"github.com/ethereum/go-ethereum/params"
 )
 
 // VerifyEIP1559Header verifies some header attributes which were changed in EIP-1559,
 // - gas limit check
 // - basefee check
-func VerifyEIP1559Header(config *params.ChainConfig, parent, header *types.Header) error {
+func VerifyEIP1559Header(config *params.ChainConfig, parent, header *types.Header, state *state.StateDB) error {
 	// Verify that the gas limit remains within allowed bounds
 	parentGasLimit := parent.GasLimit
 	if !config.IsLondon(parent.Number) {
@@ -45,7 +47,7 @@ func VerifyEIP1559Header(config *params.ChainConfig, parent, header *types.Heade
 		return errors.New("header is missing baseFee")
 	}
 	// Verify the baseFee is correct based on the parent header.
-	expectedBaseFee := CalcBaseFee(config, parent)
+	expectedBaseFee := CalcBaseFee(config, parent, state)
 	if header.BaseFee.Cmp(expectedBaseFee) != 0 {
 		return fmt.Errorf("invalid baseFee: have %s, want %s, parentBaseFee %s, parentGasUsed %d",
 			header.BaseFee, expectedBaseFee, parent.BaseFee, parent.GasUsed)
@@ -54,12 +56,20 @@ func VerifyEIP1559Header(config *params.ChainConfig, parent, header *types.Heade
 }
 
 // CalcBaseFee calculates the basefee of the header.
-func CalcBaseFee(config *params.ChainConfig, parent *types.Header) *big.Int {
+func CalcBaseFee(config *params.ChainConfig, parent *types.Header, state *state.StateDB) *big.Int {
 	// If the current block is the first EIP-1559 block, return the InitialBaseFee.
 	if !config.IsLondon(parent.Number) {
 		return new(big.Int).SetUint64(params.InitialBaseFee)
 	}
 
+	// Read baseFee from policy if baseFee is set in policy contract
+	if state != nil {
+		baseFee := state.GetState(systemcontracts.PolicyProxyHash, systemcontracts.GetBaseFeeStateHash()).Big()
+		if baseFee.Cmp(common.Big0) > 0 {
+			return baseFee
+		}
+	}
+
 	parentGasTarget := parent.GasLimit / config.ElasticityMultiplier()
 	// If the parent gasUsed is the same as the target, the baseFee remains unchanged.
 	if parent.GasUsed == parentGasTarget {
diff --git a/consensus/misc/eip1559/eip1559_test.go b/consensus/misc/eip1559/eip1559_test.go
@@ -95,7 +95,7 @@ func TestBlockGasLimits(t *testing.T) {
 			BaseFee:  initial,
 			Number:   big.NewInt(tc.pNum + 1),
 		}
-		err := VerifyEIP1559Header(config(), parent, header)
+		err := VerifyEIP1559Header(config(), parent, header, nil)
 		if tc.ok && err != nil {
 			t.Errorf("test %d: Expected valid header: %s", i, err)
 		}
@@ -124,7 +124,7 @@ func TestCalcBaseFee(t *testing.T) {
 			GasUsed:  test.parentGasUsed,
 			BaseFee:  big.NewInt(test.parentBaseFee),
 		}
-		if have, want := CalcBaseFee(config(), parent), big.NewInt(test.expectedBaseFee); have.Cmp(want) != 0 {
+		if have, want := CalcBaseFee(config(), parent, nil), big.NewInt(test.expectedBaseFee); have.Cmp(want) != 0 {
 			t.Errorf("test %d: have %d  want %d, ", i, have, want)
 		}
 	}
diff --git a/core/chain_makers.go b/core/chain_makers.go
@@ -230,7 +230,7 @@ func (b *BlockGen) AddUncle(h *types.Header) {
 	// The gas limit and price should be derived from the parent
 	h.GasLimit = parent.GasLimit
 	if b.cm.config.IsLondon(h.Number) {
-		h.BaseFee = eip1559.CalcBaseFee(b.cm.config, parent)
+		h.BaseFee = eip1559.CalcBaseFee(b.cm.config, parent, nil)
 		if !b.cm.config.IsLondon(parent.Number) {
 			parentGasLimit := parent.GasLimit * b.cm.config.ElasticityMultiplier()
 			h.GasLimit = CalcGasLimit(parentGasLimit, parentGasLimit)
@@ -430,7 +430,7 @@ func (cm *chainMaker) makeHeader(parent *types.Block, state *state.StateDB, engi
 	}
 
 	if cm.config.IsLondon(header.Number) {
-		header.BaseFee = eip1559.CalcBaseFee(cm.config, parent.Header())
+		header.BaseFee = eip1559.CalcBaseFee(cm.config, parent.Header(), nil)
 		if !cm.config.IsLondon(parent.Number()) {
 			parentGasLimit := parent.GasLimit() * cm.config.ElasticityMultiplier()
 			header.GasLimit = CalcGasLimit(parentGasLimit, parentGasLimit)
diff --git a/core/state_processor_test.go b/core/state_processor_test.go
@@ -379,7 +379,7 @@ func GenerateBadBlock(parent *types.Block, engine consensus.Engine, txs types.Tr
 		UncleHash:  types.EmptyUncleHash,
 	}
 	if config.IsLondon(header.Number) {
-		header.BaseFee = eip1559.CalcBaseFee(config, parent.Header())
+		header.BaseFee = eip1559.CalcBaseFee(config, parent.Header(), nil)
 	}
 	if config.IsShanghai(header.Number, header.Time) {
 		header.WithdrawalsHash = &types.EmptyWithdrawalsHash
diff --git a/core/txpool/blobpool/blobpool.go b/core/txpool/blobpool/blobpool.go
@@ -399,7 +399,7 @@ func (p *BlobPool) Init(gasTip *big.Int, head *types.Header, reserve txpool.Addr
 		p.recheck(addr, nil)
 	}
 	var (
-		basefee = uint256.MustFromBig(eip1559.CalcBaseFee(p.chain.Config(), p.head))
+		basefee = uint256.MustFromBig(eip1559.CalcBaseFee(p.chain.Config(), p.head, p.state))
 		blobfee = uint256.MustFromBig(big.NewInt(params.BlobTxMinBlobGasprice))
 	)
 	if p.head.ExcessBlobGas != nil {
@@ -782,7 +782,7 @@ func (p *BlobPool) Reset(oldHead, newHead *types.Header) {
 	}
 	// Reset the price heap for the new set of basefee/blobfee pairs
 	var (
-		basefee = uint256.MustFromBig(eip1559.CalcBaseFee(p.chain.Config(), newHead))
+		basefee = uint256.MustFromBig(eip1559.CalcBaseFee(p.chain.Config(), newHead, p.state))
 		blobfee = uint256.MustFromBig(big.NewInt(params.BlobTxMinBlobGasprice))
 	)
 	if newHead.ExcessBlobGas != nil {
diff --git a/core/txpool/blobpool/blobpool_test.go b/core/txpool/blobpool/blobpool_test.go
@@ -102,7 +102,7 @@ func (bc *testBlockChain) CurrentBlock() *types.Header {
 			GasLimit: gasLimit,
 			GasUsed:  0,
 			BaseFee:  mid,
-		}).Cmp(bc.basefee.ToBig()) > 0 {
+		}, nil).Cmp(bc.basefee.ToBig()) > 0 {
 			hi = mid
 		} else {
 			lo = mid
diff --git a/core/txpool/legacypool/legacypool.go b/core/txpool/legacypool/legacypool.go
@@ -1281,7 +1281,14 @@ func (pool *LegacyPool) runReorg(done chan struct{}, reset *txpoolResetRequest,
 		pool.demoteUnexecutables()
 		if reset.newHead != nil {
 			if pool.chainconfig.IsLondon(new(big.Int).Add(reset.newHead.Number, big.NewInt(1))) {
-				pendingBaseFee := eip1559.CalcBaseFee(pool.chainconfig, reset.newHead)
+				state, err := pool.chain.StateAt(reset.newHead.Root)
+				if err != nil {
+					state, err = pool.chain.StateAt(types.EmptyRootHash)
+				}
+				if err != nil {
+					log.Error("Get state error", "err", err, "root", reset.newHead.Root)
+				}
+				pendingBaseFee := eip1559.CalcBaseFee(pool.chainconfig, reset.newHead, state)
 				pool.priced.SetBaseFee(pendingBaseFee)
 			} else {
 				pool.priced.Reheap()
diff --git a/eth/filters/api.go b/eth/filters/api.go
@@ -28,8 +28,10 @@ import (
 	"github.com/ethereum/go-ethereum"
 	"github.com/ethereum/go-ethereum/common"
 	"github.com/ethereum/go-ethereum/common/hexutil"
+	"github.com/ethereum/go-ethereum/consensus/misc/eip1559"
 	"github.com/ethereum/go-ethereum/core/types"
 	"github.com/ethereum/go-ethereum/internal/ethapi"
+	"github.com/ethereum/go-ethereum/log"
 	"github.com/ethereum/go-ethereum/rpc"
 )
 
@@ -169,9 +171,14 @@ func (api *FilterAPI) NewPendingTransactions(ctx context.Context, fullTx *bool)
 				// To keep the original behaviour, send a single tx hash in one notification.
 				// TODO(rjl493456442) Send a batch of tx hashes in one notification
 				latest := api.sys.backend.CurrentHeader()
+				state, _, err := api.sys.backend.StateAndHeaderByNumber(context.Background(), rpc.BlockNumber(latest.Number.Int64()))
+				if err != nil {
+					log.Error("Failed to get state", "err", err, "header number", latest.Number)
+				}
+				baseFee := eip1559.CalcBaseFee(chainConfig, latest, state)
 				for _, tx := range txs {
 					if fullTx != nil && *fullTx {
-						rpcTx := ethapi.NewRPCPendingTransaction(tx, latest, chainConfig)
+						rpcTx := ethapi.NewRPCPendingTransaction(tx, latest, chainConfig, baseFee)
 						notifier.Notify(rpcSub.ID, rpcTx)
 					} else {
 						notifier.Notify(rpcSub.ID, tx.Hash())
@@ -429,6 +436,11 @@ func (api *FilterAPI) GetFilterChanges(id rpc.ID) (interface{}, error) {
 
 	chainConfig := api.sys.backend.ChainConfig()
 	latest := api.sys.backend.CurrentHeader()
+	state, _, err := api.sys.backend.StateAndHeaderByNumber(context.Background(), rpc.BlockNumber(latest.Number.Int64()))
+	if err != nil {
+		log.Error("Failed to get state", "err", err, "header number", latest.Number)
+	}
+	baseFee := eip1559.CalcBaseFee(chainConfig, latest, state)
 
 	if f, found := api.filters[id]; found {
 		if !f.deadline.Stop() {
@@ -447,7 +459,7 @@ func (api *FilterAPI) GetFilterChanges(id rpc.ID) (interface{}, error) {
 			if f.fullTx {
 				txs := make([]*ethapi.RPCTransaction, 0, len(f.txs))
 				for _, tx := range f.txs {
-					txs = append(txs, ethapi.NewRPCPendingTransaction(tx, latest, chainConfig))
+					txs = append(txs, ethapi.NewRPCPendingTransaction(tx, latest, chainConfig, baseFee))
 				}
 				f.txs = nil
 				return txs, nil
diff --git a/eth/filters/filter_system.go b/eth/filters/filter_system.go
@@ -31,6 +31,7 @@ import (
 	"github.com/ethereum/go-ethereum/core"
 	"github.com/ethereum/go-ethereum/core/bloombits"
 	"github.com/ethereum/go-ethereum/core/rawdb"
+	"github.com/ethereum/go-ethereum/core/state"
 	"github.com/ethereum/go-ethereum/core/types"
 	"github.com/ethereum/go-ethereum/ethdb"
 	"github.com/ethereum/go-ethereum/event"
@@ -74,6 +75,8 @@ type Backend interface {
 
 	BloomStatus() (uint64, uint64)
 	ServiceFilter(ctx context.Context, session *bloombits.MatcherSession)
+
+	StateAndHeaderByNumber(ctx context.Context, number rpc.BlockNumber) (*state.StateDB, *types.Header, error)
 }
 
 // FilterSystem holds resources shared by all filters.
diff --git a/eth/filters/filter_system_test.go b/eth/filters/filter_system_test.go
@@ -33,6 +33,7 @@ import (
 	"github.com/ethereum/go-ethereum/core"
 	"github.com/ethereum/go-ethereum/core/bloombits"
 	"github.com/ethereum/go-ethereum/core/rawdb"
+	"github.com/ethereum/go-ethereum/core/state"
 	"github.com/ethereum/go-ethereum/core/types"
 	"github.com/ethereum/go-ethereum/crypto"
 	"github.com/ethereum/go-ethereum/ethdb"
@@ -180,6 +181,11 @@ func (b *testBackend) ServiceFilter(ctx context.Context, session *bloombits.Matc
 	}()
 }
 
+func (b *testBackend) StateAndHeaderByNumber(ctx context.Context, number rpc.BlockNumber) (*state.StateDB, *types.Header, error) {
+	header, err := b.HeaderByNumber(ctx, number)
+	return nil, header, err
+}
+
 func newTestFilterSystem(t testing.TB, db ethdb.Database, cfg Config) (*testBackend, *FilterSystem) {
 	backend := &testBackend{db: db}
 	sys := NewFilterSystem(backend, cfg)
diff --git a/eth/gasprice/feehistory.go b/eth/gasprice/feehistory.go
@@ -83,7 +83,11 @@ func (oracle *Oracle) processBlock(bf *blockFees, percentiles []float64) {
 		bf.results.baseFee = new(big.Int)
 	}
 	if chainconfig.IsLondon(big.NewInt(int64(bf.blockNumber + 1))) {
-		bf.results.nextBaseFee = eip1559.CalcBaseFee(chainconfig, bf.header)
+		state, _, err := oracle.backend.StateAndHeaderByNumber(context.Background(), rpc.BlockNumber(bf.blockNumber))
+		if err != nil {
+			log.Error("Failed to get state", "err", err, "header number", bf.blockNumber)
+		}
+		bf.results.nextBaseFee = eip1559.CalcBaseFee(chainconfig, bf.header, state)
 	} else {
 		bf.results.nextBaseFee = new(big.Int)
 	}
diff --git a/eth/gasprice/gasprice.go b/eth/gasprice/gasprice.go
@@ -24,6 +24,7 @@ import (
 	"github.com/ethereum/go-ethereum/common"
 	"github.com/ethereum/go-ethereum/common/lru"
 	"github.com/ethereum/go-ethereum/core"
+	"github.com/ethereum/go-ethereum/core/state"
 	"github.com/ethereum/go-ethereum/core/types"
 	"github.com/ethereum/go-ethereum/event"
 	"github.com/ethereum/go-ethereum/log"
@@ -57,6 +58,7 @@ type OracleBackend interface {
 	PendingBlockAndReceipts() (*types.Block, types.Receipts)
 	ChainConfig() *params.ChainConfig
 	SubscribeChainHeadEvent(ch chan<- core.ChainHeadEvent) event.Subscription
+	StateAndHeaderByNumber(ctx context.Context, number rpc.BlockNumber) (*state.StateDB, *types.Header, error)
 }
 
 // Oracle recommends gas prices based on the content of recent
diff --git a/eth/gasprice/gasprice_test.go b/eth/gasprice/gasprice_test.go
@@ -26,6 +26,7 @@ import (
 	"github.com/ethereum/go-ethereum/consensus/ethash"
 	"github.com/ethereum/go-ethereum/core"
 	"github.com/ethereum/go-ethereum/core/rawdb"
+	"github.com/ethereum/go-ethereum/core/state"
 	"github.com/ethereum/go-ethereum/core/types"
 	"github.com/ethereum/go-ethereum/core/vm"
 	"github.com/ethereum/go-ethereum/crypto"
@@ -182,6 +183,11 @@ func (b *testBackend) GetBlockByNumber(number uint64) *types.Block {
 	return b.chain.GetBlockByNumber(number)
 }
 
+func (b *testBackend) StateAndHeaderByNumber(ctx context.Context, number rpc.BlockNumber) (*state.StateDB, *types.Header, error) {
+	header, err := b.HeaderByNumber(ctx, number)
+	return nil, header, err
+}
+
 func TestSuggestTipCap(t *testing.T) {
 	config := Config{
 		Blocks:     3,
diff --git a/graphql/graphql.go b/graphql/graphql.go
@@ -36,6 +36,7 @@ import (
 	"github.com/ethereum/go-ethereum/core/types"
 	"github.com/ethereum/go-ethereum/eth/filters"
 	"github.com/ethereum/go-ethereum/internal/ethapi"
+	"github.com/ethereum/go-ethereum/log"
 	"github.com/ethereum/go-ethereum/rlp"
 	"github.com/ethereum/go-ethereum/rpc"
 )
@@ -773,7 +774,12 @@ func (b *Block) NextBaseFeePerGas(ctx context.Context) (*hexutil.Big, error) {
 			return nil, nil
 		}
 	}
-	nextBaseFee := eip1559.CalcBaseFee(chaincfg, header)
+	state, _, err := b.r.backend.StateAndHeaderByNumber(ctx, rpc.BlockNumber(header.Number.Int64()))
+	if err != nil {
+		log.Error("Failed to get state", "err", err, "header number", header.Number)
+		return nil, err
+	}
+	nextBaseFee := eip1559.CalcBaseFee(chaincfg, header, state)
 	return (*hexutil.Big)(nextBaseFee), nil
 }
 
diff --git a/internal/ethapi/api.go b/internal/ethapi/api.go
diff --git a/miner/worker.go b/miner/worker.go

Original file line number	Diff line number	Diff line change
`@@ -259,7 +259,7 @@ func (beacon *Beacon) verifyHeader(chain consensus.ChainHeaderReader, header, pa`
`259`	`259`	`return consensus.ErrInvalidNumber`
`260`	`260`	`}`
`261`	`261`	`// Verify the header's EIP-1559 attributes.`
`262`		`- if err := eip1559.VerifyEIP1559Header(chain.Config(), parent, header); err != nil {`
	`262`	`+ if err := eip1559.VerifyEIP1559Header(chain.Config(), parent, header, nil); err != nil {`
`263`	`263`	`return err`
`264`	`264`	`}`
`265`	`265`	`// Verify existence / non-existence of withdrawalsHash.`
Original file line number	Diff line number	Diff line change
`@@ -357,7 +357,7 @@ func (c *Clique) verifyCascadingFields(chain consensus.ChainHeaderReader, header`
`357`	`357`	`if err := misc.VerifyGaslimit(parent.GasLimit, header.GasLimit); err != nil {`
`358`	`358`	`return err`
`359`	`359`	`}`
`360`		`- } else if err := eip1559.VerifyEIP1559Header(chain.Config(), parent, header); err != nil {`
	`360`	`+ } else if err := eip1559.VerifyEIP1559Header(chain.Config(), parent, header, nil); err != nil {`
`361`	`361`	`// Verify the header's EIP-1559 attributes.`
`362`	`362`	`return err`
`363`	`363`	`}`
Original file line number	Diff line number	Diff line change
`@@ -18,6 +18,7 @@ type ChainHeaderReader interface {`
`18`	`18`	`GetBlockByNumber(uint64) *types.Block`
`19`	`19`	`VerifyBlock(block types.Block) (state.StateDB, types.Receipts, error)`
`20`	`20`	`ProcessState(block types.Block) (state.StateDB, types.Receipts, []*types.Log, uint64, error)`
	`21`	`+ StateAt(root common.Hash) (*state.StateDB, error)`
`21`	`22`	`}`
`22`	`23`
`23`	`24`	`// ChainHeaderWriter is a Blockchain API abstraction needed for proper blockQueue`
Original file line number	Diff line number	Diff line change
`@@ -256,7 +256,7 @@ func (ethash *Ethash) verifyHeader(chain consensus.ChainHeaderReader, header, pa`
`256`	`256`	`if err := misc.VerifyGaslimit(parent.GasLimit, header.GasLimit); err != nil {`
`257`	`257`	`return err`
`258`	`258`	`}`
`259`		`- } else if err := eip1559.VerifyEIP1559Header(chain.Config(), parent, header); err != nil {`
	`259`	`+ } else if err := eip1559.VerifyEIP1559Header(chain.Config(), parent, header, nil); err != nil {`
`260`	`260`	`// Verify the header's EIP-1559 attributes.`
`261`	`261`	`return err`
`262`	`262`	`}`
Original file line number	Diff line number	Diff line change
`@@ -95,7 +95,7 @@ func TestBlockGasLimits(t *testing.T) {`
`95`	`95`	`BaseFee: initial,`
`96`	`96`	`Number: big.NewInt(tc.pNum + 1),`
`97`	`97`	`}`
`98`		`- err := VerifyEIP1559Header(config(), parent, header)`
	`98`	`+ err := VerifyEIP1559Header(config(), parent, header, nil)`
`99`	`99`	`if tc.ok && err != nil {`
`100`	`100`	`t.Errorf("test %d: Expected valid header: %s", i, err)`
`101`	`101`	`}`
`@@ -124,7 +124,7 @@ func TestCalcBaseFee(t *testing.T) {`
`124`	`124`	`GasUsed: test.parentGasUsed,`
`125`	`125`	`BaseFee: big.NewInt(test.parentBaseFee),`
`126`	`126`	`}`
`127`		`- if have, want := CalcBaseFee(config(), parent), big.NewInt(test.expectedBaseFee); have.Cmp(want) != 0 {`
	`127`	`+ if have, want := CalcBaseFee(config(), parent, nil), big.NewInt(test.expectedBaseFee); have.Cmp(want) != 0 {`
`128`	`128`	`t.Errorf("test %d: have %d want %d, ", i, have, want)`
`129`	`129`	`}`
`130`	`130`	`}`