Update gas estimation logic to account for the max gas limit introduced by EIP-7825

Author: m-Peter

services/requester/requester.go

@@ -345,6 +345,36 @@ func (e *EVM) EstimateGas(
 		passingGasLimit = uint64(*txArgs.Gas)
 	}
 
+	// Cap the maximum gas allowance according to EIP-7825 if the estimation targets Osaka
+	if passingGasLimit > gethParams.MaxTxGas {
+		latestBlockHeight, err := e.blocks.LatestEVMHeight()
+		if err != nil {
+			return 0, err
+		}
+		latestBlock, err := e.blocks.GetByHeight(latestBlockHeight)
+		if err != nil {
+			return 0, err
+		}
+		blockNumber, blockTime := new(big.Int).SetUint64(latestBlock.Height), latestBlock.Timestamp
+		emulatorConfig := emulator.NewConfig(
+			emulator.WithChainID(e.config.EVMNetworkID),
+			emulator.WithBlockNumber(blockNumber),
+			emulator.WithBlockTime(blockTime),
+		)
+
+		if blockOverrides != nil {
+			if blockOverrides.Number != nil {
+				blockNumber = blockOverrides.Number.ToInt()
+			}
+			if blockOverrides.Time != nil {
+				blockTime = uint64(*blockOverrides.Time)
+			}
+		}
+		if emulatorConfig.ChainConfig.IsOsaka(blockNumber, blockTime) {
+			passingGasLimit = gethParams.MaxTxGas
+		}
+	}
+
 	// We first execute the transaction at the highest allowable gas limit,
 	// since if this fails we can return the error immediately.
 	result, err := dryRun(passingGasLimit)

tests/web3js/estimate_gas_overrides_test.js

@@ -101,4 +101,23 @@ it('should apply block overrides on eth_estimateGas', async () => {
     assert.equal(response.status, 200)
     assert.isDefined(response.body)
     assert.equal(web3.utils.hexToNumber(response.body.result), 273693n)
+
+    // test that gas estimation still allows gas limits above the configured
+    // EIP-7825 value
+    txArgs = {
+        from: conf.eoa.address,
+        to: contractAddress,
+        gas: '0x10F4240', // this is equal to 17,777,216, which is greater than 16,777,216
+        gasPrice: web3.utils.toHex(conf.minGasPrice),
+        value: '0x0',
+        data: testFuncSelector,
+    }
+
+    response = await helpers.callRPCMethod(
+        'eth_estimateGas',
+        [txArgs, 'latest', null, null]
+    )
+    assert.equal(response.status, 200)
+    assert.isDefined(response.body)
+    assert.equal(web3.utils.hexToNumber(response.body.result), 21473n)
 })