From 2d6a0e800773b7c1de6a7f6ac16e7ae7b3ebb0a0 Mon Sep 17 00:00:00 2001 From: Felix Lange Date: Tue, 17 Feb 2026 13:35:29 +0100 Subject: [PATCH] Improve error handling and request initialization Refactor error handling and request initialization in postExecution. --- core/state_processor.go | 21 ++++++++++----------- 1 file changed, 10 insertions(+), 11 deletions(-) diff --git a/core/state_processor.go b/core/state_processor.go index 0c2942e42f..9954ec5240 100644 --- a/core/state_processor.go +++ b/core/state_processor.go @@ -135,26 +135,25 @@ func (p *StateProcessor) Process(ctx context.Context, block *types.Block, stated func postExecution(ctx context.Context, config *params.ChainConfig, block *types.Block, allLogs []*types.Log, evm *vm.EVM) (requests [][]byte, err error) { _, _, spanEnd := telemetry.StartSpan(ctx, "core.postExecution") defer spanEnd(&err) + // Read requests if Prague is enabled. if config.IsPrague(block.Number(), block.Time()) { - requests = [][]byte{} + var requests [][]byte // EIP-6110 - if err = ParseDepositLogs(&requests, allLogs, config); err != nil { - err = fmt.Errorf("failed to parse deposit logs: %w", err) - return + if err := ParseDepositLogs(&requests, allLogs, config); err != nil { + return nil, fmt.Errorf("failed to parse deposit logs: %w", err) } // EIP-7002 - if err = ProcessWithdrawalQueue(&requests, evm); err != nil { - err = fmt.Errorf("failed to process withdrawal queue: %w", err) - return + if err := ProcessWithdrawalQueue(&requests, evm); err != nil { + return nil, fmt.Errorf("failed to process withdrawal queue: %w", err) } // EIP-7251 - if err = ProcessConsolidationQueue(&requests, evm); err != nil { - err = fmt.Errorf("failed to process consolidation queue: %w", err) - return + if err := ProcessConsolidationQueue(&requests, evm); err != nil { + return nil, fmt.Errorf("failed to process consolidation queue: %w", err) } } - return + + return requests, nil } // ApplyTransactionWithEVM attempts to apply a transaction to the given state database