edits intrinsic gas cost precheck

Signed-off-by: Konstantina Blazhukova <[email protected]>

Author: konstantinabl

packages/relay/src/lib/constants.ts

@@ -96,6 +96,15 @@ export default {
   TX_DEFAULT_GAS_DEFAULT: 400_000,
   TX_CREATE_EXTRA: 32_000,
   TX_DATA_ZERO_COST: 4,
+
+  // EIP-7623: Calldata floor pricing constants
+  TOTAL_COST_FLOOR_PER_TOKEN: 10,
+
+  // EIP-3860: Initcode cost for contract creation
+  INITCODE_WORD_COST: 2,
+
+  // EIP-7702: Authorization list cost for type 4 transactions
+  PER_EMPTY_ACCOUNT_COST: 25_000,
   BALANCES_UPDATE_INTERVAL: 900, // 15 minutes
   MAX_MIRROR_NODE_PAGINATION: 20,
   MIRROR_NODE_QUERY_LIMIT: 100,

packages/relay/src/lib/precheck.ts

@@ -2,6 +2,7 @@
 
 import { ConfigService } from '@hashgraph/json-rpc-config-service/dist/services';
 import { ethers, Transaction } from 'ethers';
+import { Logger } from 'pino';
 
 import { prepend0x } from '../formatters';
 import { MirrorNodeClient } from './clients';
@@ -205,7 +206,7 @@ export class Precheck {
    */
   gasLimit(tx: Transaction): void {
     const gasLimit = Number(tx.gasLimit);
-    const intrinsicGasCost = Precheck.transactionIntrinsicGasCost(tx.data);
+    const intrinsicGasCost = Precheck.transactionIntrinsicGasCost(tx);
 
     if (gasLimit > constants.MAX_TRANSACTION_FEE_THRESHOLD) {
       throw predefined.GAS_LIMIT_TOO_HIGH(gasLimit, constants.MAX_TRANSACTION_FEE_THRESHOLD);
@@ -215,30 +216,67 @@ export class Precheck {
   }
 
   /**
-   * Calculates the intrinsic gas cost based on the number of bytes in the data field.
-   * Using a loop that goes through every two characters in the string it counts the zero and non-zero bytes.
-   * Every two characters that are packed together and are both zero counts towards zero bytes.
-   * @param data - The data with the bytes to be calculated
-   * @returns The intrinsic gas cost.
-   * @private
+   * Calculates the intrinsic gas cost based on EIP-7623 floor pricing rules.
+   *
+   * The intrinsic gas is calculated as:
+   *   max(standardIntrinsicGas, floorPrice)
+   *
+   * Where:
+   *   - standardIntrinsicGas = TX_BASE_COST + calldata cost + contract creation cost + auth list cost
+   *   - floorPrice = TX_BASE_COST + TOTAL_COST_FLOOR_PER_TOKEN * tokens_in_calldata
+   *   - tokens_in_calldata = zero_bytes + non_zero_bytes * 4
+   *
+   * @see https://eips.ethereum.org/EIPS/eip-7623
+   * @see https://eips.ethereum.org/EIPS/eip-7702
+   * @see https://eips.ethereum.org/EIPS/eip-3860
+   *
+   * @param tx - The transaction object
+   * @returns The intrinsic gas cost (maximum of standard cost and floor price).
    */
-  public static transactionIntrinsicGasCost(data: string): number {
-    const trimmedData = data.replace('0x', '');
-
-    let zeros = 0;
-    let nonZeros = 0;
-    for (let index = 0; index < trimmedData.length; index += 2) {
-      const bytes = trimmedData[index] + trimmedData[index + 1];
-      if (bytes === '00') {
-        zeros++;
+  public static transactionIntrinsicGasCost(tx: Transaction): number {
+    const calldata = tx.data.replace('0x', '');
+
+    // Count zero and non-zero bytes in calldata
+    let zeroBytes = 0;
+    let nonZeroBytes = 0;
+    for (let index = 0; index < calldata.length; index += 2) {
+      const byte = calldata[index] + calldata[index + 1];
+      if (byte === '00') {
+        zeroBytes++;
       } else {
-        nonZeros++;
+        nonZeroBytes++;
       }
     }
 
-    return (
-      constants.TX_BASE_COST + constants.TX_DATA_ZERO_COST * zeros + constants.ISTANBUL_TX_DATA_NON_ZERO_COST * nonZeros
-    );
+    // EIP-7623: tokens_in_calldata = zero_bytes + non_zero_bytes * 4
+    const tokensInCalldata = zeroBytes + nonZeroBytes * 4;
+
+    // Standard intrinsic gas cost (calldata pricing: 4 gas per zero byte, 16 gas per non-zero byte)
+    let standardIntrinsicGas =
+      constants.TX_BASE_COST +
+      constants.TX_DATA_ZERO_COST * zeroBytes +
+      constants.ISTANBUL_TX_DATA_NON_ZERO_COST * nonZeroBytes;
+
+    // EIP-3860: Add contract creation cost if tx.to is null (contract deployment)
+    const isContractCreation = tx.to === null || tx.to === undefined;
+    if (isContractCreation) {
+      const calldataLengthInBytes = calldata.length / 2;
+      const words = Math.ceil(calldataLengthInBytes / 32);
+      standardIntrinsicGas += constants.TX_CREATE_EXTRA + constants.INITCODE_WORD_COST * words;
+    }
+
+    // EIP-7702: Add authorization list cost for type 4 transactions
+    // Note: ethers.js Transaction type may not have authorizationList property yet
+    const authorizationList = (tx as any).authorizationList;
+    if (tx.type === 4 && authorizationList && Array.isArray(authorizationList)) {
+      standardIntrinsicGas += constants.PER_EMPTY_ACCOUNT_COST * authorizationList.length;
+    }
+
+    // EIP-7623: Floor price for calldata-heavy transactions
+    const floorPrice = constants.TX_BASE_COST + constants.TOTAL_COST_FLOOR_PER_TOKEN * tokensInCalldata;
+
+    // Return the maximum of standard intrinsic gas and floor price
+    return Math.max(standardIntrinsicGas, floorPrice);
   }
 
   /**

packages/relay/src/lib/services/ethService/contractService/ContractService.ts

@@ -1,6 +1,7 @@
 // SPDX-License-Identifier: Apache-2.0
 
 import { ConfigService } from '@hashgraph/json-rpc-config-service/dist/services';
+import { Transaction } from 'ethers';
 import { Logger } from 'pino';
 
 import {
@@ -607,7 +608,9 @@ export class ContractService implements IContractService {
         return predefined.CONTRACT_REVERT(error.detail, error.data);
       }
       this.logger.warn(`Returning predefined gas for contract creation: ${gasTxBaseCost}`);
-      return numberTo0x(Precheck.transactionIntrinsicGasCost(transaction.data!));
+      // Create a minimal transaction-like object for intrinsic gas calculation
+      const txForGasCalc = { data: transaction.data!, to: transaction.to ?? null } as Transaction;
+      return numberTo0x(Precheck.transactionIntrinsicGasCost(txForGasCalc));
     } else if (isContractCall) {
       this.logger.warn(`Returning predefined gas for contract call: ${contractCallAverageGas}`);
       return contractCallAverageGas;