diff --git a/core/chain_makers.go b/core/chain_makers.go index 1fcfd629bd..ab0a1339a6 100644 --- a/core/chain_makers.go +++ b/core/chain_makers.go @@ -512,12 +512,10 @@ func GenerateVerkleChain(config *params.ChainConfig, parent *types.Block, engine // Save pre state for proof generation // preState := statedb.Copy() - if config.Bor == nil { // EIP-2935 / 7709 - blockContext := NewEVMBlockContext(b.header, cm, &b.header.Coinbase) - blockContext.Random = &common.Hash{} // enable post-merge instruction set - evm := vm.NewEVM(blockContext, statedb, cm.config, vm.Config{}) - ProcessParentBlockHash(b.header.ParentHash, evm) - } + blockContext := NewEVMBlockContext(b.header, cm, &b.header.Coinbase) + blockContext.Random = &common.Hash{} // enable post-merge instruction set + evm := vm.NewEVM(blockContext, statedb, cm.config, vm.Config{}) + ProcessParentBlockHash(b.header.ParentHash, evm) // Execute any user modifications to the block. if gen != nil { diff --git a/core/state_processor.go b/core/state_processor.go index fb11fb3bac..218b1c3008 100644 --- a/core/state_processor.go +++ b/core/state_processor.go @@ -89,7 +89,7 @@ func (p *StateProcessor) Process(block *types.Block, statedb *state.StateDB, cfg if beaconRoot := block.BeaconRoot(); beaconRoot != nil { ProcessBeaconBlockRoot(*beaconRoot, evm) } - if (p.config.IsPrague(block.Number()) || p.config.IsVerkle(block.Number())) && p.config.Bor == nil { + if p.config.IsPrague(block.Number()) || p.config.IsVerkle(block.Number()) { // EIP-2935 ProcessParentBlockHash(block.ParentHash(), evm) } diff --git a/eth/state_accessor.go b/eth/state_accessor.go index 62501bab11..111ea70469 100644 --- a/eth/state_accessor.go +++ b/eth/state_accessor.go @@ -252,7 +252,7 @@ func (eth *Ethereum) stateAtTransaction(ctx context.Context, block *types.Block, core.ProcessBeaconBlockRoot(*beaconRoot, evm) } // If prague hardfork, insert parent block hash in the state as per EIP-2935. - if eth.blockchain.Config().IsPrague(block.Number()) && eth.blockchain.Config().Bor != nil { + if eth.blockchain.Config().IsPrague(block.Number()) { core.ProcessParentBlockHash(block.ParentHash(), evm) } if txIndex == 0 && len(block.Transactions()) == 0 {