@@ -1330,12 +1330,6 @@ func DoCall(ctx context.Context, b Backend, args TransactionArgs, blockNrOrHash
1330
1330
return nil , 0 , false , err , nil
1331
1331
}
1332
1332
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
-
1339
1333
// Setup context so it may be cancelled the call has completed
1340
1334
// or, in case of unmetered gas, setup a context with a timeout.
1341
1335
var cancel context.CancelFunc
@@ -1364,6 +1358,14 @@ func DoCall(ctx context.Context, b Backend, args TransactionArgs, blockNrOrHash
1364
1358
return nil , 0 , false , err , nil
1365
1359
}
1366
1360
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
+
1367
1369
// Get a new instance of the EVM.
1368
1370
evm , vmError , err := b .GetEVM (ctx , msg , statedb , XDCxState , header , & vm.Config {NoBaseFee : true })
1369
1371
if err != nil {
0 commit comments