add feehistory-cap

rpc/ethereum/backend/backend.go

@@ -892,6 +892,11 @@ func (e *EVMBackend) RPCFilterCap() int32 {
 	return e.cfg.JSONRPC.FilterCap
 }
 
+// RPCFeeHistoryCap is the limit for total number of blocks that can be fetched
+func (e *EVMBackend) RPCFeeHistgoryCap() int32 {
+	return e.cfg.JSONRPC.FeeHistoryCap
+}
+
 // RPCMinGasPrice returns the minimum gas price for a transaction obtained from
 // the node config. If set value is 0, it will default to 20.
 

rpc/ethereum/backend/feebackend.go

@@ -128,7 +128,7 @@ func (e *EVMBackend) FeeHistory(userBlockCount rpc.DecimalOrHex, /* number block
 		blockEnd = int64(blockNumber)
 	}
 	userBlockCountInt := int64(userBlockCount)
-	const maxBlockCount = 100
+	maxBlockCount := int64(e.cfg.JSONRPC.FeeHistoryCap)
 	if userBlockCountInt > maxBlockCount {
 		return nil, fmt.Errorf("FeeHistory user block count %d higher than %d", userBlockCountInt, maxBlockCount)
 	}
@@ -155,19 +155,19 @@ func (e *EVMBackend) FeeHistory(userBlockCount rpc.DecimalOrHex, /* number block
 		index := int32(blockID - blockStart)
 		// eth block
 		ethBlock, err := e.GetBlockByNumber(rpctypes.BlockNumber(blockID), true)
-		if err != nil {
+		if ethBlock == nil {
 			return nil, err
 		}
 
 		// tendermint block
 		tendermintblock, err := e.GetTendermintBlockByNumber(rpctypes.BlockNumber(blockID))
-		if err != nil {
+		if tendermintblock == nil {
 			return nil, err
 		}
 
 		// tendermint block result
 		tendermintBlockResult, err := e.clientCtx.Client.BlockResults(e.ctx, &tendermintblock.Block.Height)
-		if err != nil {
+		if tendermintBlockResult == nil {
 			e.logger.Debug("block result not found", "height", tendermintblock.Block.Height, "error", err.Error())
 			return nil, err
 		}

server/config/config.go

@@ -32,6 +32,8 @@ const (
 
 	DefaultFilterCap int32 = 200
 
+	DefaultFeeHistoryCap int32 = 100
+
 	DefaultEVMTimeout = 5 * time.Second
 	// default 1.0 eth
 	DefaultTxFeeCap float64 = 1.0
@@ -72,6 +74,8 @@ type JSONRPCConfig struct {
 	TxFeeCap float64 `mapstructure:"txfee-cap"`
 	// FilterCap is the global cap for total number of filters that can be created.
 	FilterCap int32 `mapstructure:"filter-cap"`
+	// FeeHistoryCap is the global cap for total number of blocks that can be fetched
+	FeeHistoryCap int32 `mapstructure:"feehistory-cap"`
 	// Enable defines if the EVM RPC server should be enabled.
 	Enable bool `mapstructure:"enable"`
 }
@@ -153,14 +157,15 @@ func GetDefaultAPINamespaces() []string {
 // DefaultJSONRPCConfig returns an EVM config with the JSON-RPC API enabled by default
 func DefaultJSONRPCConfig() *JSONRPCConfig {
 	return &JSONRPCConfig{
-		Enable:     true,
-		API:        GetDefaultAPINamespaces(),
-		Address:    DefaultJSONRPCAddress,
-		WsAddress:  DefaultJSONRPCWsAddress,
-		GasCap:     DefaultGasCap,
-		EVMTimeout: DefaultEVMTimeout,
-		TxFeeCap:   DefaultTxFeeCap,
-		FilterCap:  DefaultFilterCap,
+		Enable:        true,
+		API:           GetDefaultAPINamespaces(),
+		Address:       DefaultJSONRPCAddress,
+		WsAddress:     DefaultJSONRPCWsAddress,
+		GasCap:        DefaultGasCap,
+		EVMTimeout:    DefaultEVMTimeout,
+		TxFeeCap:      DefaultTxFeeCap,
+		FilterCap:     DefaultFilterCap,
+		FeeHistoryCap: DefaultFeeHistoryCap,
 	}
 }
 
@@ -174,6 +179,10 @@ func (c JSONRPCConfig) Validate() error {
 		return errors.New("JSON-RPC filter-cap cannot be negative")
 	}
 
+	if c.FeeHistoryCap <= 0 {
+		return errors.New("JSON-RPC feehistory-cap cannot be negative or 0")
+	}
+
 	if c.TxFeeCap < 0 {
 		return errors.New("JSON-RPC tx fee cap cannot be negative")
 	}
@@ -230,14 +239,15 @@ func GetConfig(v *viper.Viper) Config {
 			Tracer: v.GetString("evm.tracer"),
 		},
 		JSONRPC: JSONRPCConfig{
-			Enable:     v.GetBool("json-rpc.enable"),
-			API:        v.GetStringSlice("json-rpc.api"),
-			Address:    v.GetString("json-rpc.address"),
-			WsAddress:  v.GetString("json-rpc.ws-address"),
-			GasCap:     v.GetUint64("json-rpc.gas-cap"),
-			FilterCap:  v.GetInt32("json-rpc.filter-cap"),
-			TxFeeCap:   v.GetFloat64("json-rpc.txfee-cap"),
-			EVMTimeout: v.GetDuration("json-rpc.evm-timeout"),
+			Enable:        v.GetBool("json-rpc.enable"),
+			API:           v.GetStringSlice("json-rpc.api"),
+			Address:       v.GetString("json-rpc.address"),
+			WsAddress:     v.GetString("json-rpc.ws-address"),
+			GasCap:        v.GetUint64("json-rpc.gas-cap"),
+			FilterCap:     v.GetInt32("json-rpc.filter-cap"),
+			FeeHistoryCap: v.GetInt32("json-rpc.feehistory-cap"),
+			TxFeeCap:      v.GetFloat64("json-rpc.txfee-cap"),
+			EVMTimeout:    v.GetDuration("json-rpc.evm-timeout"),
 		},
 		TLS: TLSConfig{
 			CertificatePath: v.GetString("tls.certificate-path"),

server/config/toml.go

@@ -44,6 +44,10 @@ txfee-cap = {{ .JSONRPC.TxFeeCap }}
 # FilterCap sets the global cap for total number of filters that can be created
 filter-cap = {{ .JSONRPC.FilterCap }}
 
+# FeeHistoryCap sets the global cap for total number of blocks that can be fetched
+feehistory-cap = {{ .JSONRPC.FeeHistoryCap }}
+
+
 ###############################################################################
 ###                             TLS Configuration                           ###
 ###############################################################################

server/flags/flags.go

@@ -26,14 +26,15 @@ const (
 
 // JSON-RPC flags
 const (
-	JSONRPCEnable     = "json-rpc.enable"
-	JSONRPCAPI        = "json-rpc.api"
-	JSONRPCAddress    = "json-rpc.address"
-	JSONWsAddress     = "json-rpc.ws-address"
-	JSONRPCGasCap     = "json-rpc.gas-cap"
-	JSONRPCEVMTimeout = "json-rpc.evm-timeout"
-	JSONRPCTxFeeCap   = "json-rpc.txfee-cap"
-	JSONRPCFilterCap  = "json-rpc.filter-cap"
+	JSONRPCEnable       = "json-rpc.enable"
+	JSONRPCAPI          = "json-rpc.api"
+	JSONRPCAddress      = "json-rpc.address"
+	JSONWsAddress       = "json-rpc.ws-address"
+	JSONRPCGasCap       = "json-rpc.gas-cap"
+	JSONRPCEVMTimeout   = "json-rpc.evm-timeout"
+	JSONRPCTxFeeCap     = "json-rpc.txfee-cap"
+	JSONRPCFilterCap    = "json-rpc.filter-cap"
+	JSONRPFeeHistoryCap = "json-rpc.feehistory-cap"
 )
 
 // EVM flags