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

(fix): check for bor config when enabling prague requests

Browse source
This commit is contained in:
Manav Darji 2025-03-28 11:42:27 +05:30
parent 98d09399f7
commit eb7f26f380
No known key found for this signature in database
GPG key ID: A426F0124435F36E
5 changed files with 8 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
cmd/evm/internal/t8ntool/execution.go
View file

@ -377,7 +377,7 @@ func (pre *Prestate) Apply(vmConfig vm.Config, chainConfig *params.ChainConfig,
// Gather the execution-layer triggered requests. // Gather the execution-layer triggered requests.
var requests [][]byte var requests [][]byte
if chainConfig.IsPrague(vmContext.BlockNumber) { if chainConfig.IsPrague(vmContext.BlockNumber) && chainConfig.Bor == nil {
// EIP-6110 deposits // EIP-6110 deposits
var allLogs []*types.Log var allLogs []*types.Log
for _, receipt := range receipts { for _, receipt := range receipts {

2
core/chain_makers.go
View file

@ -360,7 +360,7 @@ func GenerateChain(config *params.ChainConfig, parent *types.Block, engine conse
} }
var requests [][]byte var requests [][]byte
if config.IsPrague(b.header.Number) { if config.IsPrague(b.header.Number) && config.Bor == nil {
// EIP-6110 deposits // EIP-6110 deposits
var blockLogs []*types.Log var blockLogs []*types.Log
for _, r := range b.receipts { for _, r := range b.receipts {

4
core/parallel_state_processor.go
View file

@ -401,9 +401,9 @@ func (p *ParallelStateProcessor) Process(block *types.Block, statedb *state.Stat
return nil, err return nil, err
} }
// Read requests if Prague is enabled. // Read requests if Prague is enabled and bor consensus is not active.
var requests [][]byte var requests [][]byte
if p.config.IsPrague(block.Number()) { if p.config.IsPrague(block.Number()) && p.config.Bor == nil {
// EIP-6110 deposits // EIP-6110 deposits
depositRequests, err := ParseDepositLogs(allLogs, p.config) depositRequests, err := ParseDepositLogs(allLogs, p.config)
if err != nil { if err != nil {

4
core/state_processor.go
View file

@ -117,9 +117,9 @@ func (p *StateProcessor) Process(block *types.Block, statedb *state.StateDB, cfg
receipts = append(receipts, receipt) receipts = append(receipts, receipt)
allLogs = append(allLogs, receipt.Logs...) allLogs = append(allLogs, receipt.Logs...)
} }
// Read requests if Prague is enabled. // Read requests if Prague is enabled and bor consensus is not active.
var requests [][]byte var requests [][]byte
if p.config.IsPrague(block.Number()) { if p.config.IsPrague(block.Number()) && p.config.Bor == nil {
// EIP-6110 deposits // EIP-6110 deposits
depositRequests, err := ParseDepositLogs(allLogs, p.config) depositRequests, err := ParseDepositLogs(allLogs, p.config)
if err != nil { if err != nil {

4
miner/worker.go
View file

@ -1410,9 +1410,9 @@ func (w *worker) generateWork(params *generateParams, witness bool) *newPayloadR
for _, r := range work.receipts { for _, r := range work.receipts {
allLogs = append(allLogs, r.Logs...) allLogs = append(allLogs, r.Logs...)
} }
// Collect consensus-layer requests if Prague is enabled. // Collect consensus-layer requests if Prague is enabled and bor consensus is not active.
var requests [][]byte var requests [][]byte
if w.chainConfig.IsPrague(work.header.Number) { if w.chainConfig.IsPrague(work.header.Number) && w.chainConfig.Bor == nil {
// EIP-6110 deposits // EIP-6110 deposits
depositRequests, err := core.ParseDepositLogs(allLogs, w.chainConfig) depositRequests, err := core.ParseDepositLogs(allLogs, w.chainConfig)
if err != nil { if err != nil {