From 5b61cbb572af6dd91e16d7ef3ad586258db94ed0 Mon Sep 17 00:00:00 2001
From: ArtificialPB <matej@kriptal.io>
Date: Wed, 21 Feb 2024 16:52:36 +0100
Subject: [PATCH] eth,internal: use correct baseFee when BlockOverrides is
 provided in call/traceCall

---
 eth/tracers/api.go     | 2 +-
 internal/ethapi/api.go | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/eth/tracers/api.go b/eth/tracers/api.go
index 4d4428f6c63b..683310820526 100644
--- a/eth/tracers/api.go
+++ b/eth/tracers/api.go
@@ -919,7 +919,7 @@ func (api *API) TraceCall(ctx context.Context, args ethapi.TransactionArgs, bloc
 		config.BlockOverrides.Apply(&vmctx)
 	}
 	// Execute the trace
-	msg, err := args.ToMessage(api.backend.RPCGasCap(), block.BaseFee())
+	msg, err := args.ToMessage(api.backend.RPCGasCap(), vmctx.BaseFee)
 	if err != nil {
 		return nil, err
 	}
diff --git a/internal/ethapi/api.go b/internal/ethapi/api.go
index e594154daa4b..02aeaff0c680 100644
--- a/internal/ethapi/api.go
+++ b/internal/ethapi/api.go
@@ -1093,14 +1093,14 @@ func doCall(ctx context.Context, b Backend, args TransactionArgs, state *state.S
 	defer cancel()
 
 	// Get a new instance of the EVM.
-	msg, err := args.ToMessage(globalGasCap, header.BaseFee)
-	if err != nil {
-		return nil, err
-	}
 	blockCtx := core.NewEVMBlockContext(header, NewChainContext(ctx, b), nil)
 	if blockOverrides != nil {
 		blockOverrides.Apply(&blockCtx)
 	}
+	msg, err := args.ToMessage(globalGasCap, blockCtx.BaseFee)
+	if err != nil {
+		return nil, err
+	}
 	evm := b.GetEVM(ctx, msg, state, header, &vm.Config{NoBaseFee: true}, &blockCtx)
 
 	// Wait for the context to be done and cancel the evm. Even if the