From 9dae1bab9bb77ff98eed381a33e2aa33cbc799d3 Mon Sep 17 00:00:00 2001
From: Rez <rez@berachain.com>
Date: Sun, 23 Mar 2025 09:28:19 +1100
Subject: [PATCH] Add error handling in Apply

---
 eth/gasestimator/gasestimator.go     |  4 +++-
 eth/tracers/api.go                   |  4 +++-
 internal/ethapi/api.go               |  4 +++-
 internal/ethapi/override/override.go | 12 ++++++++++--
 4 files changed, 19 insertions(+), 5 deletions(-)

diff --git a/eth/gasestimator/gasestimator.go b/eth/gasestimator/gasestimator.go
index a6c4718cf4..fc8e3a2e42 100644
--- a/eth/gasestimator/gasestimator.go
+++ b/eth/gasestimator/gasestimator.go
@@ -223,7 +223,9 @@ func run(ctx context.Context, call *core.Message, opts *Options) (*core.Executio
 		dirtyState = opts.State.Copy()
 	)
 	if opts.BlockOverrides != nil {
-		opts.BlockOverrides.Apply(&evmContext)
+		if err := opts.BlockOverrides.Apply(&evmContext); err != nil {
+			return nil, err
+		}
 	}
 	// Lower the basefee to 0 to avoid breaking EVM
 	// invariants (basefee < feecap).
diff --git a/eth/tracers/api.go b/eth/tracers/api.go
index 627dd487fc..3cb86c80e2 100644
--- a/eth/tracers/api.go
+++ b/eth/tracers/api.go
@@ -950,7 +950,9 @@ func (api *API) TraceCall(ctx context.Context, args ethapi.TransactionArgs, bloc
 	vmctx := core.NewEVMBlockContext(block.Header(), api.chainContext(ctx), nil)
 	// Apply the customization rules if required.
 	if config != nil {
-		config.BlockOverrides.Apply(&vmctx)
+		if overrideErr := config.BlockOverrides.Apply(&vmctx); overrideErr != nil {
+			return nil, overrideErr
+		}
 		rules := api.backend.ChainConfig().Rules(vmctx.BlockNumber, vmctx.Random != nil, vmctx.Time)
 
 		precompiles = vm.ActivePrecompiledContracts(rules)
diff --git a/internal/ethapi/api.go b/internal/ethapi/api.go
index f3975d35a0..d701c58856 100644
--- a/internal/ethapi/api.go
+++ b/internal/ethapi/api.go
@@ -660,7 +660,9 @@ func (context *ChainContext) Config() *params.ChainConfig {
 func doCall(ctx context.Context, b Backend, args TransactionArgs, state *state.StateDB, header *types.Header, overrides *override.StateOverride, blockOverrides *override.BlockOverrides, timeout time.Duration, globalGasCap uint64) (*core.ExecutionResult, error) {
 	blockCtx := core.NewEVMBlockContext(header, NewChainContext(ctx, b), nil)
 	if blockOverrides != nil {
-		blockOverrides.Apply(&blockCtx)
+		if err := blockOverrides.Apply(&blockCtx); err != nil {
+			return nil, err
+		}
 	}
 	rules := b.ChainConfig().Rules(blockCtx.BlockNumber, blockCtx.Random != nil, blockCtx.Time)
 	precompiles := vm.ActivePrecompiledContracts(rules)
diff --git a/internal/ethapi/override/override.go b/internal/ethapi/override/override.go
index 394dbff560..8845f73953 100644
--- a/internal/ethapi/override/override.go
+++ b/internal/ethapi/override/override.go
@@ -17,6 +17,7 @@
 package override
 
 import (
+	"errors"
 	"fmt"
 	"math/big"
 
@@ -133,9 +134,15 @@ type BlockOverrides struct {
 }
 
 // Apply overrides the given header fields into the given block context.
-func (o *BlockOverrides) Apply(blockCtx *vm.BlockContext) {
+func (o *BlockOverrides) Apply(blockCtx *vm.BlockContext) error {
 	if o == nil {
-		return
+		return nil
+	}
+	if o.BeaconRoot != nil {
+		return errors.New(`"beaconRoot" is not supported for this RPC method`)
+	}
+	if o.Withdrawals != nil {
+		return errors.New(`"withdrawals" is not supported for this RPC method`)
 	}
 	if o.Number != nil {
 		blockCtx.BlockNumber = o.Number.ToInt()
@@ -161,6 +168,7 @@ func (o *BlockOverrides) Apply(blockCtx *vm.BlockContext) {
 	if o.BlobBaseFee != nil {
 		blockCtx.BlobBaseFee = o.BlobBaseFee.ToInt()
 	}
+	return nil
 }
 
 // MakeHeader returns a new header object with the overridden