From 998cfd857333548822ea40a880fe38d38a892d31 Mon Sep 17 00:00:00 2001 From: Sina Mahmoodi Date: Mon, 29 Jul 2024 11:27:27 +0200 Subject: [PATCH] reinit vmenv in miner --- miner/worker.go | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) diff --git a/miner/worker.go b/miner/worker.go index 0bc822dc6d..ea0f04eaf9 100644 --- a/miner/worker.go +++ b/miner/worker.go @@ -195,17 +195,14 @@ func (miner *Miner) prepareWork(genParams *generateParams) (*environment, error) log.Error("Failed to create sealing context", "err", err) return nil, err } - var ( - context vm.BlockContext - vmenv *vm.EVM - ) if header.ParentBeaconRoot != nil { - context = core.NewEVMBlockContext(header, miner.chain, nil) - vmenv = vm.NewEVM(context, vm.TxContext{}, env.state, miner.chainConfig, vm.Config{}) + context := core.NewEVMBlockContext(header, miner.chain, nil) + vmenv := vm.NewEVM(context, vm.TxContext{}, env.state, miner.chainConfig, vm.Config{}) core.ProcessBeaconBlockRoot(*header.ParentBeaconRoot, vmenv, env.state) } if miner.chainConfig.IsPrague(header.Number, header.Time) { - // Prague is enabled after Cancun so vmenv should be initialized. + context := core.NewEVMBlockContext(header, miner.chain, nil) + vmenv := vm.NewEVM(context, vm.TxContext{}, env.state, miner.chainConfig, vm.Config{}) core.ProcessParentBlockHash(env.state, vmenv, header.ParentHash) } return env, nil