forks/go-ethereum
1
0
Fork 1
mirror of https://github.com/ethereum/go-ethereum.git synced 2026-08-20 10:52:25 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

miner: simplify check for BeaconRoot

Browse source
This commit is contained in:
Felix Lange 2023-08-25 16:13:55 +02:00
parent 3f2219eefc
commit 48bebc9b30
1 changed files with 1 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
miner/worker.go
View file

@ -962,14 +962,7 @@ func (w *worker) prepareWork(genParams *generateParams) (*environment, error) {
log.Error("Failed to create sealing context", "err", err) log.Error("Failed to create sealing context", "err", err)
return nil, err return nil, err
} }
if w.chainConfig.IsCancun(header.Number, header.Time) { if header.BeaconRoot != nil {
if header.BeaconRoot == nil {
// Failure: we are unable to construct a block if we do not have
// the beacon root.
err = errors.New("missing parentBeaconRoot")
log.Error("Failed to construct block", "err", err)
return nil, err
}
context := core.NewEVMBlockContext(header, w.chain, nil) context := core.NewEVMBlockContext(header, w.chain, nil)
vmenv := vm.NewEVM(context, vm.TxContext{}, env.state, w.chainConfig, vm.Config{}) vmenv := vm.NewEVM(context, vm.TxContext{}, env.state, w.chainConfig, vm.Config{})
core.ProcessBeaconBlockRoot(*header.BeaconRoot, vmenv, env.state) core.ProcessBeaconBlockRoot(*header.BeaconRoot, vmenv, env.state)