internal/ethapi: accept both hex and decimal for blockCount #23363
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
karalabe
requested changes
Aug 9, 2021
There was a problem hiding this comment.
Nonononon :D
Please make a new type rpc.DecimalOrHex inside rpc/types.go and add a custom JSON unmarshaller, similar to https://github.com/ethereum/go-ethereum/blob/master/rpc/types.go#L71
rjl493456442
reviewed
Aug 9, 2021
internal/ethapi/api.go
Outdated
| @@ -87,8 +87,23 @@ type feeHistoryResult struct { | |||
| GasUsedRatio []float64 `json:"gasUsedRatio"` | |||
| } | |||
|
|
|||
| func (s *PublicEthereumAPI) FeeHistory(ctx context.Context, blockCount hexutil.Uint, lastBlock rpc.BlockNumber, rewardPercentiles []float64) (*feeHistoryResult, error) { | |||
| oldest, reward, baseFee, gasUsed, err := s.b.FeeHistory(ctx, int(blockCount), lastBlock, rewardPercentiles) | |||
| func (s *PublicEthereumAPI) FeeHistory(ctx context.Context, blockCount interface{}, lastBlock rpc.BlockNumber, rewardPercentiles []float64) (*feeHistoryResult, error) { | |||
There was a problem hiding this comment.
Perhaps defining the rpc.HexUintOrUint type to resolve the value from the json stream is better?
zsfelfoldi
force-pushed
the
blockcount-type
branch
from
83c4a9c to
5e95b5d
Compare
sidhujag
pushed a commit
to sidhujag/go-ethereum
that referenced
this pull request
Aug 15, 2021
1 task
atif-konasl
pushed a commit
to frozeman/pandora-execution-engine
that referenced
this pull request
Oct 15, 2021
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.
This PR allows both hex and decimal formats for the blockCount input parameter eth_feeHistory API.