diff --git a/internal/ethapi/api.go b/internal/ethapi/api.go index d308cead62..fda0341a17 100644 --- a/internal/ethapi/api.go +++ b/internal/ethapi/api.go @@ -1202,6 +1202,11 @@ func DoEstimateGas(ctx context.Context, b Backend, args TransactionArgs, blockNr if err := args.CallDefaults(gasCap, header.BaseFee, b.ChainConfig().ChainID); err != nil { return 0, err } + // when gas is over header.GasLimit, just recap with header.GasLimit + if uint64(*args.Gas) > header.GasLimit { + *args.Gas = (hexutil.Uint64)(header.GasLimit) + } + call := args.ToMessage(header.BaseFee) // Run the gas estimation andwrap any revertals into a custom return estimate, revert, err := gasestimator.Estimate(ctx, call, opts, gasCap)