Update eth_feeHistory to take into account changes to Flow fees surge factor

Author: m-Peter

api/api.go

@@ -813,12 +813,6 @@ func (b *BlockChainAPI) FeeHistory(
 	)
 
 	maxCount := min(uint64(blockCount), lastBlockNumber)
-
-	blockRewards := make([]*hexutil.Big, len(rewardPercentiles))
-	for i := range rewardPercentiles {
-		blockRewards[i] = (*hexutil.Big)(b.config.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
@@ -835,6 +829,16 @@ 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 {
+			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)

tests/e2e_web3js_test.go

@@ -3,6 +3,7 @@ package tests
 import (
 	_ "embed"
 	"encoding/hex"
+	"fmt"
 	"math/big"
 	"testing"
 	"time"
@@ -116,35 +117,40 @@ func TestWeb3_E2E(t *testing.T) {
 
 	t.Run("gas price updated with surge factor multipler", func(t *testing.T) {
 		runWeb3TestWithSetup(t, "eth_gas_price_surge_test", func(emu emulator.Emulator) {
-			res, err := flowSendTransaction(
-				emu,
-				`
-					import FlowFees from 0xe5a8b7f23e8b548f
-
-					// This transaction sets the FlowFees parameters
-					transaction() {
-						let flowFeesAccountAdmin: &FlowFees.Administrator
-
-						prepare(signer: auth(BorrowValue) &Account) {
-							self.flowFeesAccountAdmin = signer.storage.borrow<&FlowFees.Administrator>(
-								from: /storage/flowFeesAdmin
-							)
-							?? panic("Unable to borrow reference to administrator resource")
-						}
-
-						execute {
-							self.flowFeesAccountAdmin.setFeeParameters(
-								surgeFactor: 2.0,
-								inclusionEffortCost: 1.0,
-								executionEffortCost: 1.0
-							)
-						}
-					}
-
-				`,
-			)
-			require.NoError(t, err)
-			require.NoError(t, res.Error)
+			surgeFactorValues := []string{"1.1", "2.0", "4.0", "10.0", "100.0"}
+			for _, surgeFactor := range surgeFactorValues {
+				res, err := flowSendTransaction(
+					emu,
+					fmt.Sprintf(
+						`
+							import FlowFees from 0xe5a8b7f23e8b548f
+
+							// This transaction sets the FlowFees parameters
+							transaction() {
+								let flowFeesAccountAdmin: &FlowFees.Administrator
+
+								prepare(signer: auth(BorrowValue) &Account) {
+									self.flowFeesAccountAdmin = signer.storage.borrow<&FlowFees.Administrator>(
+										from: /storage/flowFeesAdmin
+									) ?? panic("Unable to borrow reference to administrator resource")
+								}
+
+								execute {
+									self.flowFeesAccountAdmin.setFeeParameters(
+										surgeFactor: %s,
+										inclusionEffortCost: 1.0,
+										executionEffortCost: 1.0
+									)
+								}
+							}
+
+						`,
+						surgeFactor,
+					),
+				)
+				require.NoError(t, err)
+				require.NoError(t, res.Error)
+			}
 		})
 	})
 

tests/web3js/eth_gas_price_surge_test.js

@@ -6,8 +6,8 @@ const web3 = conf.web3
 
 it('should update the value of eth_gasPrice', async () => {
     let gasPrice = await web3.eth.getGasPrice()
-    // The surge factor was set to 2.0
-    assert.equal(gasPrice, 2n * conf.minGasPrice)
+    // The surge factor was last set to 100.0
+    assert.equal(gasPrice, 100n * conf.minGasPrice)
 })
 
 it('should update the value of eth_MaxPriorityFeePerGas', async () => {
@@ -18,17 +18,17 @@ it('should update the value of eth_MaxPriorityFeePerGas', async () => {
     assert.equal(response.status, 200)
     assert.isDefined(response.body.result)
     let maxPriorityFeePerGas = utils.hexToNumber(response.body.result)
-    // The surge factor was set to 2.0
-    assert.equal(maxPriorityFeePerGas, 2n * conf.minGasPrice)
+    // The surge factor was last set to 100.0
+    assert.equal(maxPriorityFeePerGas, 100n * conf.minGasPrice)
 })
 
 it('should reject transactions with gas price lower than the updated value', async () => {
     let receiver = web3.eth.accounts.create()
     let transferValue = utils.toWei('2.5', 'ether')
 
     let gasPrice = await web3.eth.getGasPrice()
-    // The surge factor was set to 2.0
-    assert.equal(gasPrice, 2n * conf.minGasPrice)
+    // The surge factor was last set to 100.0
+    assert.equal(gasPrice, 100n * conf.minGasPrice)
 
     // assert that the minimum acceptable gas price
     // has been multiplied by the surge factor
@@ -54,8 +54,8 @@ it('should accept transactions with the updated gas price', async () => {
     let transferValue = utils.toWei('2.5', 'ether')
 
     let gasPrice = await web3.eth.getGasPrice()
-    // The surge factor was set to 2.0
-    assert.equal(gasPrice, 2n * conf.minGasPrice)
+    // The surge factor was last set to 100.0
+    assert.equal(gasPrice, 100n * conf.minGasPrice)
 
     let transfer = await helpers.signAndSend({
         from: conf.eoa.address,
@@ -79,3 +79,28 @@ it('should accept transactions with the updated gas price', async () => {
     let coinbaseFeesTx = await web3.eth.getTransactionFromBlock(latestBlockNumber, 1)
     assert.equal(coinbaseFeesTx.value, transferTxReceipt.gasUsed * gasPrice)
 })
+
+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,
+        {
+            oldestBlock: 1n,
+            reward: [
+                ['0x3a98'], // 100 * gas price = 15000
+                ['0x3a98'], // 100 * gas price = 15000
+                ['0x3a98'], // 100 * gas price = 15000
+                ['0x3a98'], // 100 * gas price = 15000
+                ['0x3a98'], // 100 * gas price = 15000
+                ['0x3a98'], // 100 * gas price = 15000
+                ['0x3a98'], // 100 * gas price = 15000
+                ['0x3a98'], // 100 * gas price = 15000
+                ['0x3a98'], // 100 * gas price = 15000
+            ],
+            baseFeePerGas: [1n, 1n, 1n, 1n, 1n, 1n, 1n, 1n, 1n],
+            gasUsedRatio: [0, 0.006205458333333334, 0, 0, 0, 0, 0, 0, 0.00035]
+        }
+    )
+})