internal/ethapi: recap higher args.Gas with block GasLimit in DoEstimateGas #29738
+5
−0
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
fjl
requested changes
May 28, 2024
| @@ -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) | |||
There was a problem hiding this comment.
Please change it so that args.Gas is cleared to nil if it was previously nil before the call to args.CallDefaults. @karalabe and I think it's cleaner this way.
There was a problem hiding this comment.
The reason is that gasestimator.Estimate is meant to be self-contained (and already has support for capping to the block gas limit). This PR as is currently leaks one of the decisions out to the outside world and that's going to get messy long term, so our best solution is to "undo" the bad default that "CallDefaults" sets. That way at least the "error" is self contained to this few lines of code and doesn't keep bubbling further on the stack.
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Fix the issue (#29695)
We can just recap the args.Gas with block GasLimit when gas is over block GasLimit.
It still enables check the case when args.Gas == nil, and makes args.Gas is capped with block GasLimit