fix: Override lower bound gas when gasLimit is defined

Author: pedronfigueiredo

packages/transaction-controller/src/gas-flows/OracleLayer1GasFeeFlow.test.ts

@@ -105,6 +105,7 @@ describe('OracleLayer1GasFeeFlow', () => {
       expect(transactionFactoryMock).toHaveBeenCalledWith(
         {
           from: TRANSACTION_PARAMS_MOCK.from,
+          gas: TRANSACTION_PARAMS_MOCK.gas,
           gasLimit: TRANSACTION_PARAMS_MOCK.gas,
         },
         expect.anything(),

packages/transaction-controller/src/gas-flows/OracleLayer1GasFeeFlow.ts

@@ -2,7 +2,6 @@ import { Contract } from '@ethersproject/contracts';
 import { Web3Provider, type ExternalProvider } from '@ethersproject/providers';
 import type { Hex } from '@metamask/utils';
 import { createModuleLogger } from '@metamask/utils';
-import { omit } from 'lodash';
 
 import { projectLogger } from '../logger';
 import type {
@@ -103,7 +102,7 @@ export abstract class OracleLayer1GasFeeFlow implements Layer1GasFeeFlow {
     transactionMeta: TransactionMeta,
   ): TransactionMeta['txParams'] {
     return {
-      ...omit(transactionMeta.txParams, 'gas'),
+      ...transactionMeta.txParams,
       gasLimit: transactionMeta.txParams.gas,
     };
   }

packages/transaction-controller/src/types.ts

@@ -752,12 +752,14 @@ export type TransactionParams = {
   from: string;
 
   /**
-   * same as gasLimit?
+   * Maximum number of units of gas to use for this transaction.
    */
   gas?: string;
 
   /**
-   * Maxmimum number of units of gas to use for this transaction.
+   * Maximum number of units of gas to use for this transaction.
+   *
+   * @deprecated Use `gas` instead.
    */
   gasLimit?: string;
 

packages/transaction-controller/src/utils/gas.ts

@@ -141,11 +141,6 @@ async function getGas(
     return [txMeta.txParams.gas, undefined, txMeta.txParams.gas];
   }
 
-  if (txMeta.txParams.gasLimit) {
-    log('Using value from request', txMeta.txParams.gasLimit);
-    return [txMeta.txParams.gasLimit, undefined, txMeta.txParams.gasLimit];
-  }
-
   if (await requiresFixedGas(request)) {
     log('Using fixed value', FIXED_GAS);
     return [FIXED_GAS, undefined, FIXED_GAS];

packages/transaction-controller/src/utils/utils.ts

@@ -58,6 +58,11 @@ export function normalizeTransactionParams(txParams: TransactionParams) {
     normalizedTxParams.value = '0x0';
   }
 
+  if (normalizedTxParams.gasLimit) {
+    normalizedTxParams.gas =
+       normalizedTxParams.gas || normalizedTxParams.gasLimit;
+  }
+
   return normalizedTxParams;
 }