fix: delegated account + gasIncluded7702=false

Author: micaelae

packages/bridge-status-controller/src/bridge-status-controller.test.ts

@@ -26,7 +26,10 @@ import type {
   MockAnyNamespace,
 } from '@metamask/messenger';
 import type { Provider } from '@metamask/network-controller';
-import { CHAIN_IDS } from '@metamask/transaction-controller';
+import {
+  CHAIN_IDS,
+  GasFeeEstimateType,
+} from '@metamask/transaction-controller';
 import {
   TransactionType,
   TransactionStatus,
@@ -2833,6 +2836,7 @@ describe('BridgeStatusController', () => {
 
     const mockEstimateGasFeeResult = {
       estimates: {
+        type: GasFeeEstimateType.FeeMarket,
         high: {
           suggestedMaxFeePerGas: '0x1234',
           suggestedMaxPriorityFeePerGas: '0x5678',
@@ -3636,6 +3640,7 @@ describe('BridgeStatusController', () => {
         mockMessengerCall.mockReturnValueOnce('arbitrum-client-id');
         mockMessengerCall.mockResolvedValueOnce({
           estimates: {
+            type: GasFeeEstimateType.FeeMarket,
             high: {
               suggestedMaxFeePerGas: '0x1234',
               suggestedMaxPriorityFeePerGas: '0x5678',
@@ -3806,6 +3811,7 @@ describe('BridgeStatusController', () => {
 
     const mockEstimateGasFeeResult = {
       estimates: {
+        type: GasFeeEstimateType.FeeMarket,
         high: {
           suggestedMaxFeePerGas: '0x1234',
           suggestedMaxPriorityFeePerGas: '0x5678',

packages/bridge-status-controller/src/utils/transaction.test.ts

@@ -11,6 +11,7 @@ import type {
   TxData,
 } from '@metamask/bridge-controller';
 import {
+  GasFeeEstimateType,
   TransactionStatus,
   TransactionType,
 } from '@metamask/transaction-controller';
@@ -1709,10 +1710,14 @@ describe('Bridge Status Controller Transaction Utils', () => {
             [FeeType.METABRIDGE]: {
               amount: '100000000000000000',
             },
-            txFee: {
-              maxFeePerGas: '50000000000000000',
-              maxPriorityFeePerGas: '50000000000000000',
-            },
+            ...(overrides.gasIncluded7702 || overrides.gasIncluded
+              ? {
+                  txFee: {
+                    maxFeePerGas: '50000000000000000',
+                    maxPriorityFeePerGas: '50000000000000000',
+                  },
+                }
+              : {}),
           },
           gasIncluded: overrides.gasIncluded ?? false,
           gasIncluded7702: overrides.gasIncluded7702 ?? false,
@@ -1961,6 +1966,7 @@ describe('Bridge Status Controller Transaction Utils', () => {
 
       const mockMessenger = createMockMessagingSystem({
         estimates: {
+          type: GasFeeEstimateType.FeeMarket,
           medium: {
             maxFeePerGas: '0xabc',
             maxPriorityFeePerGas: '0xdef',
@@ -2012,11 +2018,18 @@ describe('Bridge Status Controller Transaction Utils', () => {
       `);
       // Transaction params should include gas fields
       expect(result.transactions).toHaveLength(1);
-      expect(result.transactions[0].params).toHaveProperty('gas');
-      expect(result.transactions[0].params).toHaveProperty('maxFeePerGas');
-      expect(result.transactions[0].params).toHaveProperty(
-        'maxPriorityFeePerGas',
-      );
+      // TxFee values from the estimateGasFee call
+      expect(result.transactions[0].params).toMatchInlineSnapshot(`
+        {
+          "data": "0xbridgeData",
+          "from": "0xUserAddress",
+          "gas": "0x5208",
+          "maxFeePerGas": "0xabc",
+          "maxPriorityFeePerGas": "0xdef",
+          "to": "0xBridgeContract",
+          "value": "0x1000",
+        }
+      `);
     });
 
     it('should enable 7702 and omit gas fields when isDelegatedAccount is true and gasIncluded7702 is true', async () => {
@@ -2050,11 +2063,18 @@ describe('Bridge Status Controller Transaction Utils', () => {
       ).toHaveLength(0);
       // Transaction params should NOT include gas fields
       expect(result.transactions).toHaveLength(1);
-      expect(result.transactions[0].params).not.toHaveProperty('gas');
-      expect(result.transactions[0].params).not.toHaveProperty('maxFeePerGas');
-      expect(result.transactions[0].params).not.toHaveProperty(
-        'maxPriorityFeePerGas',
-      );
+      // These are the txFee values from the quote response
+      expect(result.transactions[0].params).toMatchInlineSnapshot(`
+        {
+          "data": "0xbridgeData",
+          "from": "0xUserAddress",
+          "gas": "0x5208",
+          "maxFeePerGas": "0xb1a2bc2ec50000",
+          "maxPriorityFeePerGas": "0xb1a2bc2ec50000",
+          "to": "0xBridgeContract",
+          "value": "0x1000",
+        }
+      `);
     });
   });
 

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

@@ -16,6 +16,7 @@ import type {
 } from '@metamask/bridge-controller';
 import { toHex } from '@metamask/controller-utils';
 import {
+  GasFeeEstimateType,
   TransactionStatus,
   TransactionType,
 } from '@metamask/transaction-controller';
@@ -58,6 +59,22 @@ const is7702Tx = (tx: TransactionMeta) => {
   );
 };
 
+const getGasFeeEstimates = async (
+  messenger: BridgeStatusControllerMessenger,
+  args: Parameters<TransactionController['estimateGasFee']>[0],
+) => {
+  const { estimates } = await messenger.call(
+    'TransactionController:estimateGasFee',
+    args,
+  );
+
+  if (estimates?.type === GasFeeEstimateType.FeeMarket) {
+    return estimates[BRIDGE_PREFERRED_GAS_ESTIMATE];
+  }
+
+  return undefined;
+};
+
 export const getTransactions = (messenger: BridgeStatusControllerMessenger) => {
   return messenger.call('TransactionController:getState').transactions ?? [];
 };
@@ -298,7 +315,6 @@ export const toQuoteAndTxMetadata = ({
  * @param trade.gasLimit - the gas limit to use for the gas fee estimates
  * @param networkClientId - the network client ID to use for the gas fee estimates
  * @param chainId - the chain ID to use for the gas fee estimates
- * @param isGasIncluded7702 - whether the gas is included via 7702
  * @param simulatedGasFeeLimits - either the txFee from the quote or the simulated gas fee limits for the batch sell
  * @returns The gas fee estimates for the transaction
  */
@@ -307,7 +323,6 @@ export const toTransactionParams = async (
   { chainId: tradeChainId, gasLimit, ...trade }: TxData,
   networkClientId: string,
   chainId: Hex,
-  isGasIncluded7702: boolean,
   simulatedGasFeeLimits?: SimulatedGasFeeLimits | TxFeeGasLimits,
 ): Promise<BatchTransactionParams> => {
   const normalizedTrade = {
@@ -317,16 +332,14 @@ export const toTransactionParams = async (
     from: trade.from,
     value: trade.value,
   };
-  if (isGasIncluded7702 && !simulatedGasFeeLimits) {
-    return normalizedTrade;
-  }
   const transactionParams = {
     ...trade,
     // Only add gasLimit and gas if they're truthy
     gas: gasLimit ? toHex(gasLimit) : undefined,
     ...normalizedTrade,
   };
 
+  // Use bridge-api's provided gas fee estimates
   if (simulatedGasFeeLimits) {
     return {
       ...transactionParams,
@@ -336,32 +349,16 @@ export const toTransactionParams = async (
   }
 
   // Get transaction's 1559 gas fee estimates
-  const { estimates } = await messenger.call(
-    'TransactionController:estimateGasFee',
-    {
-      transactionParams,
-      networkClientId,
-      chainId,
-    },
-  );
-
-  let gasFeeEstimates: Partial<Record<keyof SimulatedGasFeeLimits, Hex>> = {
-    maxFeePerGas: undefined,
-    maxPriorityFeePerGas: undefined,
-  };
-  if (
-    estimates &&
-    BRIDGE_PREFERRED_GAS_ESTIMATE in estimates &&
-    typeof estimates[BRIDGE_PREFERRED_GAS_ESTIMATE] === 'object' &&
-    'maxFeePerGas' in estimates[BRIDGE_PREFERRED_GAS_ESTIMATE]
-  ) {
-    gasFeeEstimates = estimates[BRIDGE_PREFERRED_GAS_ESTIMATE];
-  }
+  const gasFeeEstimates = await getGasFeeEstimates(messenger, {
+    transactionParams,
+    networkClientId,
+    chainId,
+  });
 
   return {
     ...transactionParams,
-    maxFeePerGas: gasFeeEstimates.maxFeePerGas,
-    maxPriorityFeePerGas: gasFeeEstimates.maxPriorityFeePerGas,
+    maxFeePerGas: gasFeeEstimates?.maxFeePerGas,
+    maxPriorityFeePerGas: gasFeeEstimates?.maxPriorityFeePerGas,
   };
 };
 
@@ -390,14 +387,13 @@ export const getAddTransactionBatchParams = async ({
   const networkClientId = getNetworkClientIdByChainId(messenger, hexChainId);
 
   const transactions: TransactionBatchSingleRequest[] = await Promise.all(
-    tradeData.map(async ({ tx, txFee, quoteResponse: { quote }, ...rest }) => ({
+    tradeData.map(async ({ tx, txFee, quoteResponse: _, ...rest }) => ({
       params: await toTransactionParams(
         messenger,
         tx,
         networkClientId,
         hexChainId,
-        Boolean(quote.gasIncluded7702),
-        isDelegatedAccount ? undefined : txFee,
+        txFee,
       ),
       ...rest,
     })),
@@ -635,7 +631,6 @@ export const submitEvmTransaction = async ({
     trade,
     networkClientId,
     hexChainId,
-    false,
     txFee,
   );