diff --git a/cmd/evm/internal/t8ntool/execution.go b/cmd/evm/internal/t8ntool/execution.go index 235b6ee55d..c378dfb032 100644 --- a/cmd/evm/internal/t8ntool/execution.go +++ b/cmd/evm/internal/t8ntool/execution.go @@ -377,7 +377,7 @@ func (pre *Prestate) Apply(vmConfig vm.Config, chainConfig *params.ChainConfig, // Gather the execution-layer triggered requests. var requests [][]byte - if chainConfig.IsPrague(vmContext.BlockNumber) { + if chainConfig.IsPrague(vmContext.BlockNumber) && chainConfig.Bor == nil { // EIP-6110 deposits var allLogs []*types.Log for _, receipt := range receipts { diff --git a/core/chain_makers.go b/core/chain_makers.go index 3fc2ed4a03..ee4c29b6c3 100644 --- a/core/chain_makers.go +++ b/core/chain_makers.go @@ -360,7 +360,7 @@ func GenerateChain(config *params.ChainConfig, parent *types.Block, engine conse } var requests [][]byte - if config.IsPrague(b.header.Number) { + if config.IsPrague(b.header.Number) && config.Bor == nil { // EIP-6110 deposits var blockLogs []*types.Log for _, r := range b.receipts { diff --git a/core/parallel_state_processor.go b/core/parallel_state_processor.go index 3c93cfd354..4dff3b7c67 100644 --- a/core/parallel_state_processor.go +++ b/core/parallel_state_processor.go @@ -401,9 +401,9 @@ func (p *ParallelStateProcessor) Process(block *types.Block, statedb *state.Stat return nil, err } - // Read requests if Prague is enabled. + // Read requests if Prague is enabled and bor consensus is not active. var requests [][]byte - if p.config.IsPrague(block.Number()) { + if p.config.IsPrague(block.Number()) && p.config.Bor == nil { // EIP-6110 deposits depositRequests, err := ParseDepositLogs(allLogs, p.config) if err != nil { diff --git a/core/state_processor.go b/core/state_processor.go index d71b461270..65f2193793 100644 --- a/core/state_processor.go +++ b/core/state_processor.go @@ -117,9 +117,9 @@ func (p *StateProcessor) Process(block *types.Block, statedb *state.StateDB, cfg receipts = append(receipts, receipt) 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 - if p.config.IsPrague(block.Number()) { + if p.config.IsPrague(block.Number()) && p.config.Bor == nil { // EIP-6110 deposits depositRequests, err := ParseDepositLogs(allLogs, p.config) if err != nil { diff --git a/miner/worker.go b/miner/worker.go index e52d8aa678..94a99a7a16 100644 --- a/miner/worker.go +++ b/miner/worker.go @@ -1410,9 +1410,9 @@ func (w *worker) generateWork(params *generateParams, witness bool) *newPayloadR for _, r := range work.receipts { 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 - if w.chainConfig.IsPrague(work.header.Number) { + if w.chainConfig.IsPrague(work.header.Number) && w.chainConfig.Bor == nil { // EIP-6110 deposits depositRequests, err := core.ParseDepositLogs(allLogs, w.chainConfig) if err != nil {