fix(rpc): align fee history

CHANGELOG.md

@@ -39,8 +39,8 @@ Ref: https://keepachangelog.com/en/1.0.0/
 ## Unreleased
 
 ### Bug Fixes
-
 * (rpc) [#1613](https://github.com/evmos/ethermint/pull/1613) Change the default json-rpc listen address to localhost.
+* (rpc) [#1611](https://github.com/evmos/ethermint/pull/1611) Add missing next fee in fee history as ethereum.
 
 ## [v0.21.0-rc1] - 2022-1-13
 

rpc/backend/chain_info.go

@@ -191,7 +191,7 @@ func (b *Backend) FeeHistory(
 		reward[i] = make([]*hexutil.Big, rewardCount)
 	}
 
-	thisBaseFee := make([]*hexutil.Big, blockCount)
+	thisBaseFee := make([]*hexutil.Big, blockCount+1)
 	thisGasUsedRatio := make([]float64, blockCount)
 
 	// rewards should only be calculated if reward percentiles were included
@@ -227,6 +227,7 @@ func (b *Backend) FeeHistory(
 
 		// copy
 		thisBaseFee[index] = (*hexutil.Big)(oneFeeHistory.BaseFee)
+		thisBaseFee[index+1] = (*hexutil.Big)(oneFeeHistory.NextBaseFee)
 		thisGasUsedRatio[index] = oneFeeHistory.GasUsedRatio
 		if calculateRewards {
 			for j := 0; j < rewardCount; j++ {

rpc/backend/chain_info_test.go

@@ -405,6 +405,7 @@ func (suite *BackendTestSuite) TestFeeHistory() {
 		{
 			"pass - Valid FeeHistoryResults object",
 			func(validator sdk.AccAddress) {
+				var header metadata.MD
 				baseFee := sdk.NewInt(1)
 				queryClient := suite.backend.queryClient.QueryClient.(*mocks.EVMQueryClient)
 				client := suite.backend.clientCtx.Client.(*mocks.Client)
@@ -414,12 +415,14 @@ func (suite *BackendTestSuite) TestFeeHistory() {
 				RegisterBaseFee(queryClient, baseFee)
 				RegisterValidatorAccount(queryClient, validator)
 				RegisterConsensusParams(client, 1)
+				RegisterParams(queryClient, &header, 1)
+				RegisterParamsWithoutHeader(queryClient, 1)
 			},
 			1,
 			1,
 			&rpc.FeeHistoryResult{
 				OldestBlock:  (*hexutil.Big)(big.NewInt(0)),
-				BaseFee:      []*hexutil.Big{(*hexutil.Big)(big.NewInt(1))},
+				BaseFee:      []*hexutil.Big{(*hexutil.Big)(big.NewInt(1)), (*hexutil.Big)(big.NewInt(1))},
 				GasUsedRatio: []float64{0},
 				Reward:       [][]*hexutil.Big{{(*hexutil.Big)(big.NewInt(0)), (*hexutil.Big)(big.NewInt(0)), (*hexutil.Big)(big.NewInt(0)), (*hexutil.Big)(big.NewInt(0))}},
 			},

rpc/backend/utils.go

@@ -30,6 +30,7 @@ import (
 
 	"github.com/ethereum/go-ethereum/common"
 	"github.com/ethereum/go-ethereum/common/hexutil"
+	"github.com/ethereum/go-ethereum/consensus/misc"
 	ethtypes "github.com/ethereum/go-ethereum/core/types"
 
 	abci "github.com/tendermint/tendermint/abci/types"
@@ -132,7 +133,12 @@ func (b *Backend) processBlock(
 
 	// set basefee
 	targetOneFeeHistory.BaseFee = blockBaseFee
-
+	cfg := b.ChainConfig()
+	if cfg.IsLondon(big.NewInt(blockHeight + 1)) {
+		targetOneFeeHistory.NextBaseFee = misc.CalcBaseFee(cfg, b.CurrentHeader())
+	} else {
+		targetOneFeeHistory.NextBaseFee = new(big.Int)
+	}
 	// set gas used ratio
 	gasLimitUint64, ok := (*ethBlock)["gasLimit"].(hexutil.Uint64)
 	if !ok {

rpc/types/types.go

@@ -98,7 +98,7 @@ type SignTransactionResult struct {
 }
 
 type OneFeeHistory struct {
-	BaseFee      *big.Int   // base fee  for each block
-	Reward       []*big.Int // each element of the array will have the tip provided to miners for the percentile given
-	GasUsedRatio float64    // the ratio of gas used to the gas limit for each block
+	BaseFee, NextBaseFee *big.Int   // base fee for each block
+	Reward               []*big.Int // each element of the array will have the tip provided to miners for the percentile given
+	GasUsedRatio         float64    // the ratio of gas used to the gas limit for each block
 }

tests/integration_tests/test_fee_history.py

@@ -0,0 +1,46 @@
+import pytest
+from web3 import Web3
+
+from .network import setup_ethermint
+from .utils import (
+    ADDRS,
+    send_transaction,
+)
+
+
+@pytest.fixture(scope="module")
+def custom_ethermint(tmp_path_factory):
+    path = tmp_path_factory.mktemp("fee-history")
+    yield from setup_ethermint(path, 26500, long_timeout_commit=True)
+
+
+@pytest.fixture(
+    scope="module", params=["ethermint", "geth", "ethermint-ws"]
+)
+def cluster(request, custom_ethermint, geth):
+    """
+    run on both ethermint and geth
+    """
+    provider = request.param
+    if provider == "ethermint":
+        yield custom_ethermint
+    elif provider == "geth":
+        yield geth
+    elif provider == "ethermint-ws":
+        ethermint_ws = custom_ethermint.copy()
+        ethermint_ws.use_websocket()
+        yield ethermint_ws
+    else:
+        raise NotImplementedError
+
+
+def test_basic(cluster):
+    w3: Web3 = cluster.w3
+    eth_rpc = w3.provider
+    tx_value = 10
+    gas_price = w3.eth.gas_price
+    tx = {"to": ADDRS["community"], "value": tx_value, "gasPrice": gas_price}
+    send_transaction(w3, tx)
+    for provider in [eth_rpc]:
+        fee_history = provider.make_request("eth_feeHistory", [4, "latest", [100]])
+        assert len(fee_history["result"]["baseFeePerGas"]) == 5

tests/rpc/rpc_test.go

@@ -597,6 +597,6 @@ func TestEth_FeeHistory(t *testing.T) {
 
 	require.Equal(t, info["oldestBlock"].(string), "0x6")
 	require.Equal(t, 4, len(gasUsedRatio))
-	require.Equal(t, 4, len(baseFeePerGas))
+	require.Equal(t, 5, len(baseFeePerGas))
 	require.Equal(t, 4, len(reward))
 }