Skip to content

Commit 8fc2958

Browse files
gzliudanwanwiset25
authored andcommitted
eth/tracers,internal/ethapi: use correct baseFee when BlockOverrides is provided in call/traceCall (ethereum#29051)
1 parent cbe225a commit 8fc2958

File tree

2 files changed

+10
-6
lines changed

2 files changed

+10
-6
lines changed

eth/api_tracer.go

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -691,6 +691,8 @@ func (api *PrivateDebugAPI) TraceCall(ctx context.Context, args ethapi.Transacti
691691
}
692692
}
693693
// Execute the trace
694+
// TODO: replace block.BaseFee() with vmctx.BaseFee
695+
// reference: https://github.com/ethereum/go-ethereum/pull/29051
694696
msg, err := args.ToMessage(api.eth.ApiBackend, block.Number(), api.eth.ApiBackend.RPCGasCap(), block.BaseFee())
695697
if err != nil {
696698
return nil, err

internal/ethapi/api.go

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1336,12 +1336,6 @@ func DoCall(ctx context.Context, b Backend, args TransactionArgs, blockNrOrHash
13361336
return nil, 0, false, err, nil
13371337
}
13381338

1339-
msg, err := args.ToMessage(b, header.Number, globalGasCap, header.BaseFee)
1340-
if err != nil {
1341-
return nil, 0, false, err, nil
1342-
}
1343-
msg.SetBalanceTokenFeeForCall()
1344-
13451339
// Setup context so it may be cancelled the call has completed
13461340
// or, in case of unmetered gas, setup a context with a timeout.
13471341
var cancel context.CancelFunc
@@ -1370,6 +1364,14 @@ func DoCall(ctx context.Context, b Backend, args TransactionArgs, blockNrOrHash
13701364
return nil, 0, false, err, nil
13711365
}
13721366

1367+
// TODO: replace header.BaseFee with blockCtx.BaseFee
1368+
// reference: https://github.com/ethereum/go-ethereum/pull/29051
1369+
msg, err := args.ToMessage(b, header.Number, globalGasCap, header.BaseFee)
1370+
if err != nil {
1371+
return nil, 0, false, err, nil
1372+
}
1373+
msg.SetBalanceTokenFeeForCall()
1374+
13731375
// Get a new instance of the EVM.
13741376
evm, vmError, err := b.GetEVM(ctx, msg, statedb, XDCxState, header, &vm.Config{NoBaseFee: true})
13751377
if err != nil {

0 commit comments

Comments
 (0)