Update tx submission logic to take into account the surge factor changes

Author: m-Peter

api/api.go

@@ -182,7 +182,12 @@ func (b *BlockChainAPI) SendRawTransaction(
 		return common.Hash{}, err
 	}
 
-	id, err := b.evm.SendRawTransaction(ctx, input)
+	feeParams, err := b.feeParameters.Get()
+	if err != nil {
+		return common.Hash{}, err
+	}
+
+	id, err := b.evm.SendRawTransaction(ctx, input, feeParams)
 	if err != nil {
 		return handleError[common.Hash](err, l, b.collector)
 	}

services/requester/requester.go

@@ -53,7 +53,11 @@ const estimateGasErrorRatio = 0.015
 type Requester interface {
 	// SendRawTransaction will submit signed transaction data to the network.
 	// The submitted EVM transaction hash is returned.
-	SendRawTransaction(ctx context.Context, data []byte) (common.Hash, error)
+	SendRawTransaction(
+		ctx context.Context,
+		data []byte,
+		feeParams *models.FeeParameters,
+	) (common.Hash, error)
 
 	// GetBalance returns the amount of wei for the given address in the state of the
 	// given EVM block height.
@@ -163,7 +167,11 @@ func NewEVM(
 	}, nil
 }
 
-func (e *EVM) SendRawTransaction(ctx context.Context, data []byte) (common.Hash, error) {
+func (e *EVM) SendRawTransaction(
+	ctx context.Context,
+	data []byte,
+	feeParams *models.FeeParameters,
+) (common.Hash, error) {
 	tx := &types.Transaction{}
 	if err := tx.UnmarshalBinary(data); err != nil {
 		return common.Hash{}, err
@@ -224,8 +232,14 @@ func (e *EVM) SendRawTransaction(ctx context.Context, data []byte) (common.Hash,
 		}
 	}
 
-	if tx.GasPrice().Cmp(e.config.GasPrice) < 0 && e.config.EnforceGasPrice {
-		return common.Hash{}, errs.NewTxGasPriceTooLowError(e.config.GasPrice)
+	surgeFactor := uint64(feeParams.SurgeFactor)
+	multiplier := new(big.Int).Exp(big.NewInt(10), big.NewInt(int64(8)), nil)
+	gp := e.config.GasPrice.Uint64()
+	gasPrice := new(big.Int).SetUint64(uint64(gp * surgeFactor))
+	newGasPrice := new(big.Int).Div(gasPrice, multiplier)
+
+	if tx.GasPrice().Cmp(newGasPrice) < 0 && e.config.EnforceGasPrice {
+		return common.Hash{}, errs.NewTxGasPriceTooLowError(newGasPrice)
 	}
 
 	if e.config.TxStateValidation == config.LocalIndexValidation {

tests/e2e_web3js_test.go

@@ -114,6 +114,40 @@ func TestWeb3_E2E(t *testing.T) {
 		})
 	})
 
+	t.Run("gas price 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)
+		})
+	})
+
 	t.Run("test filter-related endpoints", func(t *testing.T) {
 		runWeb3Test(t, "eth_filter_endpoints_test")
 	})

tests/web3js/eth_gas_price_surge_test.js

@@ -0,0 +1,63 @@
+const utils = require('web3-utils')
+const { assert } = require('chai')
+const conf = require('./config')
+const helpers = require('./helpers')
+const web3 = conf.web3
+
+it('updates the gas price', async () => {
+    let gasPrice = await web3.eth.getGasPrice()
+    assert.equal(gasPrice, 2n * conf.minGasPrice)
+
+    let receiver = web3.eth.accounts.create()
+
+    // make sure receiver balance is initially 0
+    let receiverWei = await web3.eth.getBalance(receiver.address)
+    assert.equal(receiverWei, 0n)
+
+    // get sender balance
+    let senderBalance = await web3.eth.getBalance(conf.eoa.address)
+    assert.equal(senderBalance, utils.toWei(conf.fundedAmount, 'ether'))
+
+    let txCount = await web3.eth.getTransactionCount(conf.eoa.address)
+    assert.equal(0n, txCount)
+
+    let transferValue = utils.toWei('2.5', 'ether')
+    // assert that the minimum acceptable gas price has been multiplied by the surge factor
+    try {
+        let transfer = await helpers.signAndSend({
+            from: conf.eoa.address,
+            to: receiver.address,
+            value: transferValue,
+            gasPrice: gasPrice - 10n,
+            gasLimit: 55_000,
+        })
+        assert.fail('should not have gotten here')
+    } catch (e) {
+        assert.include(
+            e.message,
+            `the minimum accepted gas price for transactions is: ${gasPrice}`
+        )
+    }
+
+    let transfer = await helpers.signAndSend({
+        from: conf.eoa.address,
+        to: receiver.address,
+        value: transferValue,
+        gasPrice: gasPrice,
+        gasLimit: 55_000,
+    })
+    assert.equal(transfer.receipt.status, conf.successStatus)
+    assert.equal(transfer.receipt.from, conf.eoa.address)
+    assert.equal(transfer.receipt.to, receiver.address)
+
+    let latestBlockNumber = await web3.eth.getBlockNumber()
+    let latestBlock = await web3.eth.getBlock(latestBlockNumber)
+    assert.equal(latestBlock.transactions.length, 2)
+
+    let transferTx = await web3.eth.getTransactionFromBlock(latestBlockNumber, 0)
+    let transferTxReceipt = await web3.eth.getTransactionReceipt(transferTx.hash)
+    assert.equal(transferTxReceipt.effectiveGasPrice, gasPrice)
+
+    let coinbaseFeesTx = await web3.eth.getTransactionFromBlock(latestBlockNumber, 1)
+    assert.equal(coinbaseFeesTx.value, transferTxReceipt.gasUsed * gasPrice)
+})