forks/go-ethereum
1
0
Fork 1
mirror of https://github.com/ethereum/go-ethereum.git synced 2026-07-26 06:36:43 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

core: check for bor config when enabling prague requests

Browse source
This commit is contained in:
Manav Darji 2025-04-30 14:58:51 -04:00
parent 8ea52f5036
commit 73fa700a9a
No known key found for this signature in database
GPG key ID: A426F0124435F36E
3 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
core/chain_makers.go
View file

@ -478,7 +478,7 @@ func GenerateVerkleChain(config *params.ChainConfig, parent *types.Block, engine
// preState := statedb.Copy() // preState := statedb.Copy()
// Pre-execution system calls. // Pre-execution system calls.
if config.IsPrague(b.header.Number) { if config.IsPrague(b.header.Number) && config.Bor == nil {
// EIP-2935 // EIP-2935
blockContext := NewEVMBlockContext(b.header, cm, &b.header.Coinbase) blockContext := NewEVMBlockContext(b.header, cm, &b.header.Coinbase)
vmenv := vm.NewEVM(blockContext, vm.TxContext{}, statedb, cm.config, vm.Config{}) vmenv := vm.NewEVM(blockContext, vm.TxContext{}, statedb, cm.config, vm.Config{})

2
core/genesis.go
View file

@ -511,7 +511,7 @@ func (g *Genesis) toBlockWithRoot(root common.Hash) *types.Block {
head.BlobGasUsed = new(uint64) head.BlobGasUsed = new(uint64)
} }
} }
if conf.IsPrague(num) { if conf.IsPrague(num) && conf.Bor == nil {
emptyRequests := [][]byte{{0x00}, {0x01}, {0x02}} emptyRequests := [][]byte{{0x00}, {0x01}, {0x02}}
rhash := types.CalcRequestsHash(emptyRequests) rhash := types.CalcRequestsHash(emptyRequests)
head.RequestsHash = &rhash head.RequestsHash = &rhash

2
core/state_processor.go
View file

@ -89,7 +89,7 @@ func (p *StateProcessor) Process(block *types.Block, statedb *state.StateDB, cfg
if beaconRoot := block.BeaconRoot(); beaconRoot != nil { if beaconRoot := block.BeaconRoot(); beaconRoot != nil {
ProcessBeaconBlockRoot(*beaconRoot, vmenv, tracingStateDB) ProcessBeaconBlockRoot(*beaconRoot, vmenv, tracingStateDB)
} }
if p.config.IsPrague(block.Number()) { if p.config.IsPrague(block.Number()) && p.config.Bor == nil {
ProcessParentBlockHash(block.ParentHash(), vmenv, tracingStateDB) ProcessParentBlockHash(block.ParentHash(), vmenv, tracingStateDB)
} }