Improve eth_feeHistory block reward calculation

Author: m-Peter

api/api.go

@@ -856,6 +856,21 @@ func (b *BlockChainAPI) FeeHistory(
 	)
 
 	maxCount := min(uint64(blockCount), lastBlockNumber)
+
+	blockRewards := make([]*hexutil.Big, len(rewardPercentiles))
+	gasPrice := b.config.GasPrice
+
+	feeParams, err := b.feeParameters.Get()
+	if err != nil {
+		b.logger.Warn().Err(err).Msg("fee parameters unavailable; falling back to base gas price")
+	} else {
+		gasPrice = feeParams.CalculateGasPrice(b.config.GasPrice)
+	}
+
+	for i := range rewardPercentiles {
+		blockRewards[i] = (*hexutil.Big)(gasPrice)
+	}
+
 	for i := maxCount; i >= uint64(1); i-- {
 		// If the requested block count is 5, and the last block number
 		// is 20, then we need the blocks [16, 17, 18, 19, 20] in this
@@ -872,21 +887,6 @@ func (b *BlockChainAPI) FeeHistory(
 
 		baseFees = append(baseFees, (*hexutil.Big)(models.BaseFeePerGas))
 
-		blockRewards := make([]*hexutil.Big, len(rewardPercentiles))
-		feeParams, err := b.feeParameters.Get()
-		if err != nil {
-			b.logger.Warn().
-				Uint64("height", blockHeight).
-				Err(err).
-				Msg("failed to get fee parameters for block in fee history")
-
-			continue
-		}
-		gasPrice := feeParams.CalculateGasPrice(b.config.GasPrice)
-		for i := range rewardPercentiles {
-			blockRewards[i] = (*hexutil.Big)(gasPrice)
-		}
-
 		rewards = append(rewards, blockRewards)
 
 		gasUsedRatio := float64(block.TotalGasUsed) / float64(BlockGasLimit)

bootstrap/bootstrap.go

@@ -819,12 +819,11 @@ func getNetworkFeeParams(
 	}
 
 	// sanity check, should never occur
-	if _, ok := val.(cadence.UFix64); !ok {
+	surgeFactor, ok := val.(cadence.UFix64)
+	if !ok {
 		return nil, fmt.Errorf("failed to convert surgeFactor %v to UFix64, got type: %T", val, val)
 	}
 
-	surgeFactor := val.(cadence.UFix64)
-
 	logger.Debug().
 		Uint64("surge-factor", uint64(surgeFactor)).
 		Msg("get current surge factor executed")

tests/web3js/eth_gas_price_surge_test.js

@@ -83,7 +83,6 @@ it('should accept transactions with the updated gas price', async () => {
 
 it('should update gas price for eth_feeFistory', async () => {
     let response = await web3.eth.getFeeHistory(10, 'latest', [20])
-    console.log('Response: ', response)
 
     assert.deepEqual(
         response,