internal/ethapi: accept both hex and decimal for blockCount (#23363)
This commit is contained in:
parent
d60cfd2604
commit
97bd6cd216
@ -87,7 +87,7 @@ type feeHistoryResult struct {
|
||||
GasUsedRatio []float64 `json:"gasUsedRatio"`
|
||||
}
|
||||
|
||||
func (s *PublicEthereumAPI) FeeHistory(ctx context.Context, blockCount hexutil.Uint, lastBlock rpc.BlockNumber, rewardPercentiles []float64) (*feeHistoryResult, error) {
|
||||
func (s *PublicEthereumAPI) FeeHistory(ctx context.Context, blockCount rpc.DecimalOrHex, lastBlock rpc.BlockNumber, rewardPercentiles []float64) (*feeHistoryResult, error) {
|
||||
oldest, reward, baseFee, gasUsed, err := s.b.FeeHistory(ctx, int(blockCount), lastBlock, rewardPercentiles)
|
||||
if err != nil {
|
||||
return nil, err
|
||||
|
22
rpc/types.go
22
rpc/types.go
@ -21,6 +21,7 @@ import (
|
||||
"encoding/json"
|
||||
"fmt"
|
||||
"math"
|
||||
"strconv"
|
||||
"strings"
|
||||
|
||||
"github.com/ethereum/go-ethereum/common"
|
||||
@ -191,3 +192,24 @@ func BlockNumberOrHashWithHash(hash common.Hash, canonical bool) BlockNumberOrHa
|
||||
RequireCanonical: canonical,
|
||||
}
|
||||
}
|
||||
|
||||
// DecimalOrHex unmarshals a non-negative decimal or hex parameter into a uint64.
|
||||
type DecimalOrHex uint64
|
||||
|
||||
// UnmarshalJSON implements json.Unmarshaler.
|
||||
func (dh *DecimalOrHex) UnmarshalJSON(data []byte) error {
|
||||
input := strings.TrimSpace(string(data))
|
||||
if len(input) >= 2 && input[0] == '"' && input[len(input)-1] == '"' {
|
||||
input = input[1 : len(input)-1]
|
||||
}
|
||||
|
||||
value, err := strconv.ParseUint(input, 10, 64)
|
||||
if err != nil {
|
||||
value, err = hexutil.DecodeUint64(input)
|
||||
}
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
*dh = DecimalOrHex(value)
|
||||
return nil
|
||||
}
|
||||
|
Loading…
Reference in New Issue
Block a user