Skip to content

Commit cc88cd9

Browse files
committed
eth/tracers,internal/ethapi: use correct baseFee when BlockOverrides is provided in call/traceCall (ethereum#29051)
1 parent 9804280 commit cc88cd9

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
@@ -1330,12 +1330,6 @@ func DoCall(ctx context.Context, b Backend, args TransactionArgs, blockNrOrHash
13301330
return nil, 0, false, err, nil
13311331
}
13321332

1333-
msg, err := args.ToMessage(b, header.Number, globalGasCap, header.BaseFee)
1334-
if err != nil {
1335-
return nil, 0, false, err, nil
1336-
}
1337-
msg.SetBalanceTokenFeeForCall()
1338-
13391333
// Setup context so it may be cancelled the call has completed
13401334
// or, in case of unmetered gas, setup a context with a timeout.
13411335
var cancel context.CancelFunc
@@ -1364,6 +1358,14 @@ func DoCall(ctx context.Context, b Backend, args TransactionArgs, blockNrOrHash
13641358
return nil, 0, false, err, nil
13651359
}
13661360

1361+
// TODO: replace header.BaseFee with blockCtx.BaseFee
1362+
// reference: https://github.com/ethereum/go-ethereum/pull/29051
1363+
msg, err := args.ToMessage(b, header.Number, globalGasCap, header.BaseFee)
1364+
if err != nil {
1365+
return nil, 0, false, err, nil
1366+
}
1367+
msg.SetBalanceTokenFeeForCall()
1368+
13671369
// Get a new instance of the EVM.
13681370
evm, vmError, err := b.GetEVM(ctx, msg, statedb, XDCxState, header, &vm.Config{NoBaseFee: true})
13691371
if err != nil {

0 commit comments

Comments
 (0)