@@ -1336,12 +1336,6 @@ func DoCall(ctx context.Context, b Backend, args TransactionArgs, blockNrOrHash
1336
1336
return nil , 0 , false , err , nil
1337
1337
}
1338
1338
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
-
1345
1339
// Setup context so it may be cancelled the call has completed
1346
1340
// or, in case of unmetered gas, setup a context with a timeout.
1347
1341
var cancel context.CancelFunc
@@ -1370,6 +1364,14 @@ func DoCall(ctx context.Context, b Backend, args TransactionArgs, blockNrOrHash
1370
1364
return nil , 0 , false , err , nil
1371
1365
}
1372
1366
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
+
1373
1375
// Get a new instance of the EVM.
1374
1376
evm , vmError , err := b .GetEVM (ctx , msg , statedb , XDCxState , header , & vm.Config {NoBaseFee : true })
1375
1377
if err != nil {
0 commit comments