From ccede75223717d4e61e3512f609d0fe8127f4fa9 Mon Sep 17 00:00:00 2001 From: Lucca Martins Date: Thu, 20 Feb 2025 11:03:17 -0300 Subject: [PATCH] removing requests from bor --- cmd/evm/internal/t8ntool/execution.go | 23 +---------------------- core/chain_makers.go | 13 +------------ core/parallel_state_processor.go | 11 +---------- miner/worker.go | 8 -------- 4 files changed, 3 insertions(+), 52 deletions(-) diff --git a/cmd/evm/internal/t8ntool/execution.go b/cmd/evm/internal/t8ntool/execution.go index f5f91d8fa3..749ad32c63 100644 --- a/cmd/evm/internal/t8ntool/execution.go +++ b/cmd/evm/internal/t8ntool/execution.go @@ -394,28 +394,7 @@ func (pre *Prestate) Apply(vmConfig vm.Config, chainConfig *params.ChainConfig, execRs.CurrentExcessBlobGas = (*math.HexOrDecimal64)(&excessBlobGas) execRs.CurrentBlobGasUsed = (*math.HexOrDecimal64)(&blobGasUsed) } - if chainConfig.IsPrague(vmContext.BlockNumber) { - // Parse the requests from the logs - var allLogs []*types.Log - for _, receipt := range receipts { - allLogs = append(allLogs, receipt.Logs...) - } - requests, err := core.ParseDepositLogs(allLogs, chainConfig) - if err != nil { - return nil, nil, nil, NewError(ErrorEVM, fmt.Errorf("could not parse requests logs: %v", err)) - } - // Calculate the requests root - h := types.DeriveSha(requests, trie.NewStackTrie(nil)) - execRs.RequestsHash = &h - // Get the deposits from the requests - deposits := make(types.Deposits, 0) - for _, req := range requests { - if dep, ok := req.Inner().(*types.Deposit); ok { - deposits = append(deposits, dep) - } - } - execRs.DepositRequests = &deposits - } + // Re-create statedb instance with new root upon the updated database // for accessing latest states. statedb, err = state.New(root, statedb.Database()) diff --git a/core/chain_makers.go b/core/chain_makers.go index 15a37cdb7e..8cc5db4774 100644 --- a/core/chain_makers.go +++ b/core/chain_makers.go @@ -359,18 +359,7 @@ func GenerateChain(config *params.ChainConfig, parent *types.Block, engine conse gen(i, b) } - var requests types.Requests - if config.IsPrague(b.header.Number) { - for _, r := range b.receipts { - d, err := ParseDepositLogs(r.Logs, config) - if err != nil { - panic(fmt.Sprintf("failed to parse deposit log: %v", err)) - } - requests = append(requests, d...) - } - } - - body := types.Body{Transactions: b.txs, Uncles: b.uncles, Withdrawals: b.withdrawals, Requests: requests} + body := types.Body{Transactions: b.txs, Uncles: b.uncles, Withdrawals: b.withdrawals, Requests: nil} block, err := b.engine.FinalizeAndAssemble(cm, b.header, statedb, &body, b.receipts) if err != nil { panic(err) diff --git a/core/parallel_state_processor.go b/core/parallel_state_processor.go index b73cb89fa4..85b60d9d07 100644 --- a/core/parallel_state_processor.go +++ b/core/parallel_state_processor.go @@ -394,21 +394,12 @@ func (p *ParallelStateProcessor) Process(block *types.Block, statedb *state.Stat return nil, err } - // Read requests if Prague is enabled. - var requests types.Requests - if p.config.IsPrague(block.Number()) { - requests, err = ParseDepositLogs(allLogs, p.config) - if err != nil { - return nil, err - } - } - // Finalize the block, applying any consensus engine specific extras (e.g. block rewards) p.engine.Finalize(p.bc, header, statedb, block.Body()) return &ProcessResult{ Receipts: receipts, - Requests: requests, + Requests: nil, Logs: allLogs, GasUsed: *usedGas, }, nil diff --git a/miner/worker.go b/miner/worker.go index 1782e47441..cccf430e3b 100644 --- a/miner/worker.go +++ b/miner/worker.go @@ -1407,14 +1407,6 @@ func (w *worker) generateWork(params *generateParams, witness bool) *newPayloadR for _, r := range work.receipts { allLogs = append(allLogs, r.Logs...) } - // Read requests if Prague is enabled. - if w.chainConfig.IsPrague(work.header.Number) { - requests, err := core.ParseDepositLogs(allLogs, w.chainConfig) - if err != nil { - return &newPayloadResult{err: err} - } - body.Requests = requests - } block, err := w.engine.FinalizeAndAssemble(w.chain, work.header, work.state, &body, work.receipts) if err != nil {