@metamask/bridge-status-controller 68.1.0 → 69.0.0

package/dist/utils/intent-api.mjs

@@ -10,9 +10,9 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
     return kind === "m" ? f : kind === "a" ? f.call(receiver) : f ? f.value : state.get(receiver);
 };
 var _IntentApiImpl_baseUrl, _IntentApiImpl_fetchFn, _IntentApiImpl_getJwt;
-import { getClientHeaders, StatusTypes } from "@metamask/bridge-controller";
+import { BridgeClientId, ChainId, getClientHeaders, StatusTypes } from "@metamask/bridge-controller";
 import { TransactionStatus } from "@metamask/transaction-controller";
-import { IntentOrderStatus, validateIntentOrderResponse } from "./validators.mjs";
+import { IntentOrderStatus, validateIntentStatusResponse } from "./validators.mjs";
 export class IntentApiImpl {
     constructor(baseUrl, fetchFn, getJwt) {
         _IntentApiImpl_baseUrl.set(this, void 0);
@@ -34,7 +34,7 @@ export class IntentApiImpl {
                 },
                 body: JSON.stringify(params),
             });
-            if (!validateIntentOrderResponse(response)) {
+            if (!validateIntentStatusResponse(response)) {
                 throw new Error('Invalid submitOrder response');
             }
             return response;
@@ -54,7 +54,7 @@ export class IntentApiImpl {
                 method: 'GET',
                 headers: getClientHeaders({ clientId, jwt }),
             });
-            if (!validateIntentOrderResponse(response)) {
+            if (!validateIntentStatusResponse(response)) {
                 throw new Error('Invalid getOrderStatus response');
             }
             return response;

package/dist/utils/intent-api.mjs.map

@@ -1 +1 @@
-{"version":3,"file":"intent-api.mjs","sourceRoot":"","sources":["../../src/utils/intent-api.ts"],"names":[],"mappings":"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","sourcesContent":["import { getClientHeaders, StatusTypes } from '@metamask/bridge-controller';\nimport { TransactionStatus } from '@metamask/transaction-controller';\n\nimport {\n  IntentOrder,\n  IntentOrderStatus,\n  validateIntentOrderResponse,\n} from './validators';\nimport type { FetchFunction, StatusResponse } from '../types';\n\nexport type IntentSubmissionParams = {\n  srcChainId: string;\n  quoteId: string;\n  signature: string;\n  order: unknown;\n  userAddress: string;\n  aggregatorId: string;\n};\n\nexport type IntentApi = {\n  submitIntent(\n    params: IntentSubmissionParams,\n    clientId: string,\n  ): Promise<IntentOrder>;\n  getOrderStatus(\n    orderId: string,\n    aggregatorId: string,\n    srcChainId: string,\n    clientId: string,\n  ): Promise<IntentOrder>;\n};\n\nexport type GetJwtFn = () => Promise<string | undefined>;\n\nexport class IntentApiImpl implements IntentApi {\n  readonly #baseUrl: string;\n\n  readonly #fetchFn: FetchFunction;\n\n  readonly #getJwt: GetJwtFn;\n\n  constructor(baseUrl: string, fetchFn: FetchFunction, getJwt: GetJwtFn) {\n    this.#baseUrl = baseUrl;\n    this.#fetchFn = fetchFn;\n    this.#getJwt = getJwt;\n  }\n\n  async submitIntent(\n    params: IntentSubmissionParams,\n    clientId: string,\n  ): Promise<IntentOrder> {\n    const endpoint = `${this.#baseUrl}/submitOrder`;\n    try {\n      const jwt = await this.#getJwt();\n      const response = await this.#fetchFn(endpoint, {\n        method: 'POST',\n        headers: {\n          'Content-Type': 'application/json',\n          ...getClientHeaders({ clientId, jwt }),\n        },\n        body: JSON.stringify(params),\n      });\n      if (!validateIntentOrderResponse(response)) {\n        throw new Error('Invalid submitOrder response');\n      }\n      return response;\n    } catch (error: unknown) {\n      if (error instanceof Error) {\n        throw new Error(`Failed to submit intent: ${error.message}`);\n      }\n      throw new Error('Failed to submit intent');\n    }\n  }\n\n  async getOrderStatus(\n    orderId: string,\n    aggregatorId: string,\n    srcChainId: string,\n    clientId: string,\n  ): Promise<IntentOrder> {\n    const endpoint = `${this.#baseUrl}/getOrderStatus?orderId=${orderId}&aggregatorId=${encodeURIComponent(aggregatorId)}&srcChainId=${srcChainId}`;\n    try {\n      const jwt = await this.#getJwt();\n      const response = await this.#fetchFn(endpoint, {\n        method: 'GET',\n        headers: getClientHeaders({ clientId, jwt }),\n      });\n      if (!validateIntentOrderResponse(response)) {\n        throw new Error('Invalid getOrderStatus response');\n      }\n      return response;\n    } catch (error: unknown) {\n      if (error instanceof Error) {\n        throw new Error(`Failed to get order status: ${error.message}`);\n      }\n      throw new Error('Failed to get order status');\n    }\n  }\n}\n\nexport type IntentBridgeStatus = {\n  status: StatusResponse;\n  txHash?: string;\n  transactionStatus: TransactionStatus;\n};\n\nexport const translateIntentOrderToBridgeStatus = (\n  intentOrder: IntentOrder,\n  srcChainId: number,\n  fallbackTxHash?: string,\n): IntentBridgeStatus => {\n  let statusType: StatusTypes;\n  switch (intentOrder.status) {\n    case IntentOrderStatus.CONFIRMED:\n    case IntentOrderStatus.COMPLETED:\n      statusType = StatusTypes.COMPLETE;\n      break;\n    case IntentOrderStatus.FAILED:\n    case IntentOrderStatus.EXPIRED:\n    case IntentOrderStatus.CANCELLED:\n      statusType = StatusTypes.FAILED;\n      break;\n    case IntentOrderStatus.PENDING:\n      statusType = StatusTypes.PENDING;\n      break;\n    case IntentOrderStatus.SUBMITTED:\n      statusType = StatusTypes.SUBMITTED;\n      break;\n    default:\n      statusType = StatusTypes.UNKNOWN;\n  }\n\n  const txHash = intentOrder.txHash ?? fallbackTxHash ?? '';\n  const status: StatusResponse = {\n    status: statusType,\n    srcChain: {\n      chainId: srcChainId,\n      txHash,\n    },\n  };\n\n  return {\n    status,\n    txHash,\n    transactionStatus: mapIntentOrderStatusToTransactionStatus(\n      intentOrder.status,\n    ),\n  };\n};\n\nexport function mapIntentOrderStatusToTransactionStatus(\n  intentStatus: IntentOrderStatus,\n): TransactionStatus {\n  switch (intentStatus) {\n    case IntentOrderStatus.PENDING:\n    case IntentOrderStatus.SUBMITTED:\n      return TransactionStatus.submitted;\n    case IntentOrderStatus.CONFIRMED:\n    case IntentOrderStatus.COMPLETED:\n      return TransactionStatus.confirmed;\n    case IntentOrderStatus.FAILED:\n    case IntentOrderStatus.EXPIRED:\n    case IntentOrderStatus.CANCELLED:\n      return TransactionStatus.failed;\n    default:\n      return TransactionStatus.submitted;\n  }\n}\n"]}
+{"version":3,"file":"intent-api.mjs","sourceRoot":"","sources":["../../src/utils/intent-api.ts"],"names":[],"mappings":"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","sourcesContent":["import {\n  BridgeClientId,\n  ChainId,\n  getClientHeaders,\n  StatusTypes,\n} from '@metamask/bridge-controller';\nimport { TransactionStatus } from '@metamask/transaction-controller';\n\nimport {\n  IntentStatusResponse,\n  IntentOrderStatus,\n  validateIntentStatusResponse,\n} from './validators';\nimport type { FetchFunction, StatusResponse } from '../types';\n\nexport type IntentSubmissionParams = {\n  srcChainId: ChainId;\n  quoteId: string;\n  signature: string;\n  order: unknown;\n  userAddress: string;\n  aggregatorId: string;\n};\n\nexport type IntentApi = {\n  submitIntent(\n    params: IntentSubmissionParams,\n    clientId: BridgeClientId,\n  ): Promise<IntentStatusResponse>;\n  getOrderStatus(\n    orderId: string,\n    aggregatorId: string,\n    srcChainId: ChainId,\n    clientId: BridgeClientId,\n  ): Promise<IntentStatusResponse>;\n};\n\nexport type GetJwtFn = () => Promise<string | undefined>;\n\nexport class IntentApiImpl implements IntentApi {\n  readonly #baseUrl: string;\n\n  readonly #fetchFn: FetchFunction;\n\n  readonly #getJwt: GetJwtFn;\n\n  constructor(baseUrl: string, fetchFn: FetchFunction, getJwt: GetJwtFn) {\n    this.#baseUrl = baseUrl;\n    this.#fetchFn = fetchFn;\n    this.#getJwt = getJwt;\n  }\n\n  async submitIntent(\n    params: IntentSubmissionParams,\n    clientId: BridgeClientId,\n  ): Promise<IntentStatusResponse> {\n    const endpoint = `${this.#baseUrl}/submitOrder`;\n    try {\n      const jwt = await this.#getJwt();\n      const response = await this.#fetchFn(endpoint, {\n        method: 'POST',\n        headers: {\n          'Content-Type': 'application/json',\n          ...getClientHeaders({ clientId, jwt }),\n        },\n        body: JSON.stringify(params),\n      });\n      if (!validateIntentStatusResponse(response)) {\n        throw new Error('Invalid submitOrder response');\n      }\n      return response;\n    } catch (error: unknown) {\n      if (error instanceof Error) {\n        throw new Error(`Failed to submit intent: ${error.message}`);\n      }\n      throw new Error('Failed to submit intent');\n    }\n  }\n\n  async getOrderStatus(\n    orderId: string,\n    aggregatorId: string,\n    srcChainId: ChainId,\n    clientId: BridgeClientId,\n  ): Promise<IntentStatusResponse> {\n    const endpoint = `${this.#baseUrl}/getOrderStatus?orderId=${orderId}&aggregatorId=${encodeURIComponent(aggregatorId)}&srcChainId=${srcChainId}`;\n    try {\n      const jwt = await this.#getJwt();\n      const response = await this.#fetchFn(endpoint, {\n        method: 'GET',\n        headers: getClientHeaders({ clientId, jwt }),\n      });\n      if (!validateIntentStatusResponse(response)) {\n        throw new Error('Invalid getOrderStatus response');\n      }\n      return response;\n    } catch (error: unknown) {\n      if (error instanceof Error) {\n        throw new Error(`Failed to get order status: ${error.message}`);\n      }\n      throw new Error('Failed to get order status');\n    }\n  }\n}\n\nexport type IntentBridgeStatus = {\n  status: StatusResponse;\n  txHash?: string;\n  transactionStatus: TransactionStatus;\n};\n\nexport const translateIntentOrderToBridgeStatus = (\n  intentOrder: IntentStatusResponse,\n  srcChainId: number,\n  fallbackTxHash?: string,\n): IntentBridgeStatus => {\n  let statusType: StatusTypes;\n  switch (intentOrder.status) {\n    case IntentOrderStatus.CONFIRMED:\n    case IntentOrderStatus.COMPLETED:\n      statusType = StatusTypes.COMPLETE;\n      break;\n    case IntentOrderStatus.FAILED:\n    case IntentOrderStatus.EXPIRED:\n    case IntentOrderStatus.CANCELLED:\n      statusType = StatusTypes.FAILED;\n      break;\n    case IntentOrderStatus.PENDING:\n      statusType = StatusTypes.PENDING;\n      break;\n    case IntentOrderStatus.SUBMITTED:\n      statusType = StatusTypes.SUBMITTED;\n      break;\n    default:\n      statusType = StatusTypes.UNKNOWN;\n  }\n\n  const txHash = intentOrder.txHash ?? fallbackTxHash ?? '';\n  const status: StatusResponse = {\n    status: statusType,\n    srcChain: {\n      chainId: srcChainId,\n      txHash,\n    },\n  };\n\n  return {\n    status,\n    txHash,\n    transactionStatus: mapIntentOrderStatusToTransactionStatus(\n      intentOrder.status,\n    ),\n  };\n};\n\nexport function mapIntentOrderStatusToTransactionStatus(\n  intentStatus: IntentOrderStatus,\n): TransactionStatus {\n  switch (intentStatus) {\n    case IntentOrderStatus.PENDING:\n    case IntentOrderStatus.SUBMITTED:\n      return TransactionStatus.submitted;\n    case IntentOrderStatus.CONFIRMED:\n    case IntentOrderStatus.COMPLETED:\n      return TransactionStatus.confirmed;\n    case IntentOrderStatus.FAILED:\n    case IntentOrderStatus.EXPIRED:\n    case IntentOrderStatus.CANCELLED:\n      return TransactionStatus.failed;\n    default:\n      return TransactionStatus.submitted;\n  }\n}\n"]}

package/dist/utils/transaction.cjs

@@ -207,14 +207,14 @@ const rekeyHistoryItemInState = (state, actionId, txMeta) => {
     return true;
 };
 exports.rekeyHistoryItemInState = rekeyHistoryItemInState;
-const toBatchTxParams = (disable7702, { chainId, gasLimit, ...trade }, { maxFeePerGas, maxPriorityFeePerGas, gas, }) => {
+const toBatchTxParams = (skipGasFields, { chainId, gasLimit, ...trade }, { maxFeePerGas, maxPriorityFeePerGas, gas, }) => {
     const params = {
         ...trade,
         data: trade.data,
         to: trade.to,
         value: trade.value,
     };
-    if (!disable7702) {
+    if (skipGasFields) {
         return params;
     }
     return {
@@ -225,7 +225,7 @@ const toBatchTxParams = (disable7702, { chainId, gasLimit, ...trade }, { maxFeeP
     };
 };
 exports.toBatchTxParams = toBatchTxParams;
-const getAddTransactionBatchParams = async ({ messenger, isBridgeTx, approval, resetApproval, trade, quoteResponse: { quote: { feeData: { txFee }, gasIncluded, gasIncluded7702, gasSponsored, }, sentAmount, toTokenAmount, }, requireApproval = false, estimateGasFeeFn, }) => {
+const getAddTransactionBatchParams = async ({ messenger, isBridgeTx, approval, resetApproval, trade, quoteResponse: { quote: { feeData: { txFee }, gasIncluded, gasIncluded7702, gasSponsored, }, sentAmount, toTokenAmount, }, requireApproval = false, isDelegatedAccount = false, estimateGasFeeFn, }) => {
     const isGasless = gasIncluded || gasIncluded7702;
     const selectedAccount = messenger.call('AccountsController:getAccountByAddress', trade.from);
     if (!selectedAccount) {
@@ -233,32 +233,35 @@ const getAddTransactionBatchParams = async ({ messenger, isBridgeTx, approval, r
     }
     const hexChainId = (0, bridge_controller_1.formatChainIdToHex)(trade.chainId);
     const networkClientId = messenger.call('NetworkController:findNetworkClientIdByChainId', hexChainId);
-    // When an active quote has gasIncluded7702 set to true,
-    // enable 7702 gasless txs for smart accounts
-    const disable7702 = gasIncluded7702 !== true;
+    // Gas fields should be omitted only when gas is sponsored via 7702
+    const skipGasFields = gasIncluded7702 === true;
+    // Enable 7702 batching when the quote includes gasless 7702 support,
+    // or when the account is already delegated (to avoid the in-flight
+    // transaction limit for delegated accounts)
+    const disable7702 = !skipGasFields && !isDelegatedAccount;
     const transactions = [];
     if (resetApproval) {
-        const gasFees = await (0, gas_1.calculateGasFees)(disable7702, messenger, estimateGasFeeFn, resetApproval, networkClientId, hexChainId, isGasless ? txFee : undefined);
+        const gasFees = await (0, gas_1.calculateGasFees)(skipGasFields, messenger, estimateGasFeeFn, resetApproval, networkClientId, hexChainId, isGasless ? txFee : undefined);
         transactions.push({
             type: isBridgeTx
                 ? transaction_controller_1.TransactionType.bridgeApproval
                 : transaction_controller_1.TransactionType.swapApproval,
-            params: (0, exports.toBatchTxParams)(disable7702, resetApproval, gasFees),
+            params: (0, exports.toBatchTxParams)(skipGasFields, resetApproval, gasFees),
         });
     }
     if (approval) {
-        const gasFees = await (0, gas_1.calculateGasFees)(disable7702, messenger, estimateGasFeeFn, approval, networkClientId, hexChainId, isGasless ? txFee : undefined);
+        const gasFees = await (0, gas_1.calculateGasFees)(skipGasFields, messenger, estimateGasFeeFn, approval, networkClientId, hexChainId, isGasless ? txFee : undefined);
         transactions.push({
             type: isBridgeTx
                 ? transaction_controller_1.TransactionType.bridgeApproval
                 : transaction_controller_1.TransactionType.swapApproval,
-            params: (0, exports.toBatchTxParams)(disable7702, approval, gasFees),
+            params: (0, exports.toBatchTxParams)(skipGasFields, approval, gasFees),
         });
     }
-    const gasFees = await (0, gas_1.calculateGasFees)(disable7702, messenger, estimateGasFeeFn, trade, networkClientId, hexChainId, isGasless ? txFee : undefined);
+    const gasFees = await (0, gas_1.calculateGasFees)(skipGasFields, messenger, estimateGasFeeFn, trade, networkClientId, hexChainId, isGasless ? txFee : undefined);
     transactions.push({
         type: isBridgeTx ? transaction_controller_1.TransactionType.bridge : transaction_controller_1.TransactionType.swap,
-        params: (0, exports.toBatchTxParams)(disable7702, trade, gasFees),
+        params: (0, exports.toBatchTxParams)(skipGasFields, trade, gasFees),
         assetsFiatValues: {
             sending: sentAmount?.valueInCurrency?.toString(),
             receiving: toTokenAmount?.valueInCurrency?.toString(),
@@ -286,6 +289,10 @@ const findAndUpdateTransactionsInBatch = ({ messenger, updateTransactionFn, batc
     // This is a workaround to update the tx type after the tx is signed
     // TODO: remove this once the tx type for batch txs is preserved in the tx controller
     Object.entries(txDataByType).forEach(([txType, txData]) => {
+        // Skip types not present in the batch (e.g. swap entry is undefined for bridge txs)
+        if (txData === undefined) {
+            return;
+        }
         // Find transaction by batchId and either matching data or delegation characteristics
         const txMeta = txs.find((tx) => {
             if (tx.batchId !== batchId) {
@@ -299,12 +306,14 @@ const findAndUpdateTransactionsInBatch = ({ messenger, updateTransactionFn, batc
             if (is7702Transaction) {
                 // For 7702 transactions, we need to match based on transaction type
                 // since the data field might be different (batch execute call)
-                if (txType === transaction_controller_1.TransactionType.swap &&
+                if ((txType === transaction_controller_1.TransactionType.swap ||
+                    txType === transaction_controller_1.TransactionType.bridge) &&
                     tx.type === transaction_controller_1.TransactionType.batch) {
                     return true;
                 }
                 // Also check if it's an approval transaction for 7702
-                if (txType === transaction_controller_1.TransactionType.swapApproval &&
+                if ((txType === transaction_controller_1.TransactionType.swapApproval ||
+                    txType === transaction_controller_1.TransactionType.bridgeApproval) &&
                     tx.txParams.data === txData) {
                     return true;
                 }

package/dist/utils/transaction.cjs.map

@@ -1 +1 @@
-{"version":3,"file":"transaction.cjs","sourceRoot":"","sources":["../../src/utils/transaction.ts"],"names":[],"mappings":";;;AACA,mEAOqC;AAQrC,iEAAmD;AACnD,6EAG0C;AAM1C,2CAAsD;AACtD,+BAAkC;AAElC,mCAAyC;AACzC,uCAAyD;AAEzD,gDAAiD;AAO1C,MAAM,gBAAgB,GAAG,GAAG,EAAE,CAAC,CAAC,IAAI,CAAC,GAAG,EAAE,GAAG,IAAI,CAAC,MAAM,EAAE,CAAC,CAAC,QAAQ,EAAE,CAAC;AAAjE,QAAA,gBAAgB,oBAAiD;AAEvE,MAAM,sBAAsB,GAAG,CAAC,aAA4B,EAAE,EAAE;IACrE,OAAO;QACL,QAAQ,EAAE,aAAa,CAAC,KAAK,CAAC,QAAQ;QACtC,MAAM,EAAE,aAAa,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC,CAAC;QACtC,UAAU,EAAE,aAAa,CAAC,KAAK,CAAC,UAAU;QAC1C,WAAW,EAAE,aAAa,CAAC,KAAK,CAAC,WAAW;QAC5C,KAAK,EAAE,aAAa,CAAC,KAAK;QAC1B,MAAM,EAAE,OAAO,CAAC,aAAa,CAAC,KAAK,CAAC,MAAM,CAAC;KAC5C,CAAC;AACJ,CAAC,CAAC;AATW,QAAA,sBAAsB,0BASjC;AAEK,MAAM,eAAe,GAAG,CAC7B,aACe,EACf,YAAqB,EAIrB,EAAE;IACF,kFAAkF;IAClF,IAAI,kBAAkB,CAAC;IACvB,IAAI,CAAC;QACH,kBAAkB,GAAG,IAAA,sCAAkB,EAAC,aAAa,CAAC,KAAK,CAAC,WAAW,CAAC,CAAC;IAC3E,CAAC;IAAC,MAAM,CAAC;QACP,mEAAmE;QACnE,kBAAkB,GAAG,KAAsB,CAAC,CAAC,qBAAqB;IACpE,CAAC;IAED,OAAO;QACL,kBAAkB;QAClB,iBAAiB,EAAE,aAAa,CAAC,KAAK,CAAC,cAAc;QACrD,iBAAiB,EAAE,aAAa,CAAC,KAAK,CAAC,QAAQ,CAAC,MAAM;QACtD,mBAAmB,EAAE,aAAa,CAAC,KAAK,CAAC,QAAQ,CAAC,QAAQ;QAC1D,kBAAkB,EAAE,aAAa,CAAC,KAAK,CAAC,QAAQ,CAAC,OAAO;QAExD,sBAAsB,EAAE,aAAa,CAAC,KAAK,CAAC,eAAe;QAC3D,sBAAsB,EAAE,aAAa,CAAC,KAAK,CAAC,SAAS,CAAC,MAAM;QAC5D,wBAAwB,EAAE,aAAa,CAAC,KAAK,CAAC,SAAS,CAAC,QAAQ;QAChE,uBAAuB,EAAE,aAAa,CAAC,KAAK,CAAC,SAAS,CAAC,OAAO;QAE9D,uEAAuE;QACvE,YAAY;QACZ,kFAAkF;QAClF,cAAc,EAAE,aAAa,CAAC,UAAU,CAAC,MAAM;KAChD,CAAC;AACJ,CAAC,CAAC;AAlCW,QAAA,eAAe,mBAkC1B;AAEF;;;;;;;;;GASG;AACI,MAAM,sBAAsB,GAAG,CACpC,YAIyB,EACzB,aAAqE,EACrE,eAAgF,EACvC,EAAE;IAC3C,MAAM,sBAAsB,GAAG,eAAe,CAAC,OAAO,CAAC;IACvD,MAAM,MAAM,GAAG,eAAe,CAAC,QAAQ,CAAC,IAAI,EAAE,EAAE,CAAC;IACjD,IAAI,IAAI,CAAC;IACT,oCAAoC;IACpC,IAAI,OAAO,YAAY,KAAK,QAAQ,EAAE,CAAC;QACrC,IAAI,GAAG,YAAY,CAAC;IACtB,CAAC;SAAM,IAAI,YAAY,IAAI,OAAO,YAAY,KAAK,QAAQ,EAAE,CAAC;QAC5D,wDAAwD;QACxD,IAAI,eAAe,IAAI,YAAY,IAAI,YAAY,CAAC,aAAa,EAAE,CAAC;YAClE,IAAI,GAAG,YAAY,CAAC,aAAa,CAAC;QACpC,CAAC;aAAM,IACL,QAAQ,IAAI,YAAY;YACxB,YAAY,CAAC,MAAM;YACnB,OAAO,YAAY,CAAC,MAAM,KAAK,QAAQ,EACvC,CAAC;YACD,oEAAoE;YACpE,IAAI;gBACF,YAAY,CAAC,MAAM,CAAC,SAAS;oBAC7B,YAAY,CAAC,MAAM,CAAC,IAAI;oBACxB,YAAY,CAAC,MAAM,CAAC,IAAI;oBACxB,YAAY,CAAC,MAAM,CAAC,MAAM,CAAC;QAC/B,CAAC;aAAM,IACL,WAAW,IAAI,YAAY;YAC3B,YAAY,CAAC,SAAS;YACtB,OAAO,YAAY,CAAC,SAAS,KAAK,QAAQ,EAC1C,CAAC;YACD,IAAI,GAAG,YAAY,CAAC,SAAS,CAAC;QAChC,CAAC;IACH,CAAC;IAED,MAAM,UAAU,GAAG,IAAA,gCAAY,EAC7B,aAAa,CAAC,KAAK,CAAC,UAAU,EAC9B,aAAa,CAAC,KAAK,CAAC,WAAW,CAChC,CAAC;IAEF,IAAI,UAAU,CAAC;IACf,IAAI,CAAC;QACH,UAAU,GAAG,IAAA,sCAAkB,EAAC,aAAa,CAAC,KAAK,CAAC,UAAU,CAAC,CAAC;IAClE,CAAC;IAAC,MAAM,CAAC;QACP,wDAAwD;QACxD,uCAAuC;QACvC,UAAU,GAAG,KAAsB,CAAC;IACtC,CAAC;IAED,2CAA2C;IAC3C,MAAM,SAAS,GAAG,IAAA,oCAAgB,EAAC,aAAa,CAAC,KAAK,CAAC,CAAC;IAExD,+DAA+D;IAC/D,OAAO;QACL,GAAG,IAAA,uBAAe,EAAC,aAAa,CAAC;QACjC,IAAI,EAAE,IAAI,CAAC,GAAG,EAAE;QAChB,EAAE,EAAE,IAAI,IAAI,IAAA,SAAI,GAAE;QAClB,OAAO,EAAE,UAAU;QACnB,eAAe,EAAE,MAAM,IAAI,UAAU;QACrC,QAAQ,EAAE,EAAE,IAAI,EAAE,sBAAsB,EAAE,IAAI,EAAE,SAAS,EAAE;QAC3D,IAAI,EAAE,UAAU,CAAC,CAAC,CAAC,wCAAe,CAAC,MAAM,CAAC,CAAC,CAAC,wCAAe,CAAC,IAAI;QAChE,MAAM,EAAE,0CAAiB,CAAC,SAAS;QACnC,IAAI,EAAE,wCAAwC;QAC9C,MAAM,EAAE,MAAM;QACd,6DAA6D;QAC7D,QAAQ,EAAE,IAAI,EAAE,+DAA+D;QAC/E,UAAU;KACX,CAAC;AACJ,CAAC,CAAC;AAxEW,QAAA,sBAAsB,0BAwEjC;AAEK,MAAM,mBAAmB,GAAG,KAAK,EACtC,UAAgD,EAChD,EAAE;IACF,IAAI,CAAC,2BAAO,CAAC,KAAK,EAAE,2BAAO,CAAC,IAAI,CAAC,CAAC,QAAQ,CAAC,UAAU,CAAC,EAAE,CAAC;QACvD,MAAM,QAAQ,GAAG,IAAA,2BAAmB,EAAC,QAAQ,CAAC,CAAC;QAC/C,QAAQ,CACN,+EAA+E,CAChF,CAAC;QACF,MAAM,WAAW,GAAG,IAAI,OAAO,CAAC,CAAC,OAAO,EAAE,EAAE,CAC1C,UAAU,CAAC,OAAO,EAAE,6BAAiB,CAAC,CACvC,CAAC;QACF,MAAM,WAAW,CAAC;IACpB,CAAC;AACH,CAAC,CAAC;AAbW,QAAA,mBAAmB,uBAa9B;AAEF;;;;;;GAMG;AACI,MAAM,+BAA+B,GAAG,KAAK,EAClD,eAAwB,EACxB,EAAE;IACF,IAAI,eAAe,EAAE,CAAC;QACpB,MAAM,yBAAyB,GAAG,IAAI,OAAO,CAAC,CAAC,OAAO,EAAE,EAAE,CACxD,UAAU,CAAC,OAAO,EAAE,IAAI,CAAC,CAC1B,CAAC;QACF,MAAM,yBAAyB,CAAC;IAClC,CAAC;AACH,CAAC,CAAC;AATW,QAAA,+BAA+B,mCAS1C;AAEF;;;;;;;;GAQG;AACI,MAAM,gBAAgB,GAAG,CAC9B,KAAY,EACZ,UAAkB,EAClB,eAAgF,EAChF,EAAE;IACF,MAAM,KAAK,GAAG,IAAA,uCAAmB,EAAC,UAAU,CAAC,CAAC;IAE9C,MAAM,eAAe,GAAG,IAAA,oCAAgB,EAAC,KAAK,CAAC,CAAC;IAEhD,4FAA4F;IAC5F,MAAM,OAAO,GAAG,IAAA,+BAAW,EAAC,KAAK,CAAC;QAChC,CAAC,CAAC;YACE,OAAO,EAAE,KAAK,CAAC,OAAO;YACtB,IAAI,EAAE,KAAK,CAAC,QAAQ,EAAE,QAAQ,EAAE,CAAC,CAAC,CAAC,EAAE,IAAI;SAC1C;QACH,CAAC,CAAC,SAAS,CAAC;IAEd,gCAAgC;IAChC,OAAO,IAAA,sCAA8B,EACnC,eAAe,CAAC,QAAQ,CAAC,IAAI,EAAE,EAAY,EAC3C,eAAe,EACf,KAAK,EACL,eAAe,CAAC,EAAE,EAClB,OAAO,CACR,CAAC;AACJ,CAAC,CAAC;AAzBW,QAAA,gBAAgB,oBAyB3B;AAEK,MAAM,qBAAqB,GAAG,KAAK,EACxC,SAA0C,EAC1C,IAAY,EACZ,EACE,SAAS,GAAG,CAAC,GAAG,KAAM,EACtB,MAAM,GAAG,IAAK,MAC6B,EAAE,EACrB,EAAE;IAC5B,MAAM,KAAK,GAAG,IAAI,CAAC,GAAG,EAAE,CAAC;IACzB,OAAO,IAAI,EAAE,CAAC;QACZ,MAAM,EAAE,YAAY,EAAE,GAAG,SAAS,CAAC,IAAI,CAAC,gCAAgC,CAAC,CAAC;QAC1E,MAAM,IAAI,GAAG,YAAY,CAAC,IAAI,CAAC,CAAC,EAAmB,EAAE,EAAE,CAAC,EAAE,CAAC,EAAE,KAAK,IAAI,CAAC,CAAC;QAExE,IAAI,IAAI,EAAE,CAAC;YACT,IAAI,IAAI,CAAC,MAAM,KAAK,0CAAiB,CAAC,SAAS,EAAE,CAAC;gBAChD,OAAO,IAAI,CAAC;YACd,CAAC;YACD,IACE,IAAI,CAAC,MAAM,KAAK,0CAAiB,CAAC,MAAM;gBACxC,IAAI,CAAC,MAAM,KAAK,0CAAiB,CAAC,OAAO;gBACzC,IAAI,CAAC,MAAM,KAAK,0CAAiB,CAAC,QAAQ,EAC1C,CAAC;gBACD,MAAM,IAAI,KAAK,CAAC,sCAAsC,CAAC,CAAC;YAC1D,CAAC;QACH,CAAC;QAED,IAAI,IAAI,CAAC,GAAG,EAAE,GAAG,KAAK,GAAG,SAAS,EAAE,CAAC;YACnC,MAAM,IAAI,KAAK,CAAC,6CAA6C,CAAC,CAAC;QACjE,CAAC;QAED,MAAM,IAAI,OAAO,CAAC,CAAC,OAAO,EAAE,EAAE,CAAC,UAAU,CAAC,OAAO,EAAE,MAAM,CAAC,CAAC,CAAC;IAC9D,CAAC;AACH,CAAC,CAAC;AAhCW,QAAA,qBAAqB,yBAgChC;AAEK,MAAM,uBAAuB,GAAG,CACrC,KAAkC,EAClC,QAAgB,EAChB,MAAqC,EAC5B,EAAE;IACX,MAAM,WAAW,GAAG,KAAK,CAAC,SAAS,CAAC,QAAQ,CAAC,CAAC;IAC9C,IAAI,CAAC,WAAW,EAAE,CAAC;QACjB,OAAO,KAAK,CAAC;IACf,CAAC;IAED,KAAK,CAAC,SAAS,CAAC,MAAM,CAAC,EAAE,CAAC,GAAG;QAC3B,GAAG,WAAW;QACd,QAAQ,EAAE,MAAM,CAAC,EAAE;QACnB,qBAAqB,EAAE,WAAW,CAAC,qBAAqB,IAAI,MAAM,CAAC,EAAE;QACrE,MAAM,EAAE;YACN,GAAG,WAAW,CAAC,MAAM;YACrB,QAAQ,EAAE;gBACR,GAAG,WAAW,CAAC,MAAM,CAAC,QAAQ;gBAC9B,MAAM,EAAE,MAAM,CAAC,IAAI,IAAI,WAAW,CAAC,MAAM,CAAC,QAAQ,EAAE,MAAM;aAC3D;SACF;KACF,CAAC;IACF,OAAO,KAAK,CAAC,SAAS,CAAC,QAAQ,CAAC,CAAC;IACjC,OAAO,IAAI,CAAC;AACd,CAAC,CAAC;AAxBW,QAAA,uBAAuB,2BAwBlC;AAEK,MAAM,eAAe,GAAG,CAC7B,WAAoB,EACpB,EAAE,OAAO,EAAE,QAAQ,EAAE,GAAG,KAAK,EAAU,EACvC,EACE,YAAY,EACZ,oBAAoB,EACpB,GAAG,GACoE,EACjD,EAAE;IAC1B,MAAM,MAAM,GAAG;QACb,GAAG,KAAK;QACR,IAAI,EAAE,KAAK,CAAC,IAAqB;QACjC,EAAE,EAAE,KAAK,CAAC,EAAmB;QAC7B,KAAK,EAAE,KAAK,CAAC,KAAsB;KACpC,CAAC;IACF,IAAI,CAAC,WAAW,EAAE,CAAC;QACjB,OAAO,MAAM,CAAC;IAChB,CAAC;IAED,OAAO;QACL,GAAG,MAAM;QACT,GAAG,EAAE,IAAA,wBAAK,EAAC,GAAG,IAAI,CAAC,CAAC;QACpB,YAAY,EAAE,IAAA,wBAAK,EAAC,YAAY,IAAI,CAAC,CAAC;QACtC,oBAAoB,EAAE,IAAA,wBAAK,EAAC,oBAAoB,IAAI,CAAC,CAAC;KACvD,CAAC;AACJ,CAAC,CAAC;AAzBW,QAAA,eAAe,mBAyB1B;AAEK,MAAM,4BAA4B,GAAG,KAAK,EAAE,EACjD,SAAS,EACT,UAAU,EACV,QAAQ,EACR,aAAa,EACb,KAAK,EACL,aAAa,EAAE,EACb,KAAK,EAAE,EACL,OAAO,EAAE,EAAE,KAAK,EAAE,EAClB,WAAW,EACX,eAAe,EACf,YAAY,GACb,EACD,UAAU,EACV,aAAa,GACd,EACD,eAAe,GAAG,KAAK,EACvB,gBAAgB,GAWjB,EAAE,EAAE;IACH,MAAM,SAAS,GAAG,WAAW,IAAI,eAAe,CAAC;IACjD,MAAM,eAAe,GAAG,SAAS,CAAC,IAAI,CACpC,wCAAwC,EACxC,KAAK,CAAC,IAAI,CACX,CAAC;IACF,IAAI,CAAC,eAAe,EAAE,CAAC;QACrB,MAAM,IAAI,KAAK,CACb,oFAAoF,CACrF,CAAC;IACJ,CAAC;IACD,MAAM,UAAU,GAAG,IAAA,sCAAkB,EAAC,KAAK,CAAC,OAAO,CAAC,CAAC;IACrD,MAAM,eAAe,GAAG,SAAS,CAAC,IAAI,CACpC,gDAAgD,EAChD,UAAU,CACX,CAAC;IAEF,wDAAwD;IACxD,6CAA6C;IAC7C,MAAM,WAAW,GAAG,eAAe,KAAK,IAAI,CAAC;IAC7C,MAAM,YAAY,GAAoC,EAAE,CAAC;IACzD,IAAI,aAAa,EAAE,CAAC;QAClB,MAAM,OAAO,GAAG,MAAM,IAAA,sBAAgB,EACpC,WAAW,EACX,SAAS,EACT,gBAAgB,EAChB,aAAa,EACb,eAAe,EACf,UAAU,EACV,SAAS,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,SAAS,CAC9B,CAAC;QACF,YAAY,CAAC,IAAI,CAAC;YAChB,IAAI,EAAE,UAAU;gBACd,CAAC,CAAC,wCAAe,CAAC,cAAc;gBAChC,CAAC,CAAC,wCAAe,CAAC,YAAY;YAChC,MAAM,EAAE,IAAA,uBAAe,EAAC,WAAW,EAAE,aAAa,EAAE,OAAO,CAAC;SAC7D,CAAC,CAAC;IACL,CAAC;IACD,IAAI,QAAQ,EAAE,CAAC;QACb,MAAM,OAAO,GAAG,MAAM,IAAA,sBAAgB,EACpC,WAAW,EACX,SAAS,EACT,gBAAgB,EAChB,QAAQ,EACR,eAAe,EACf,UAAU,EACV,SAAS,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,SAAS,CAC9B,CAAC;QACF,YAAY,CAAC,IAAI,CAAC;YAChB,IAAI,EAAE,UAAU;gBACd,CAAC,CAAC,wCAAe,CAAC,cAAc;gBAChC,CAAC,CAAC,wCAAe,CAAC,YAAY;YAChC,MAAM,EAAE,IAAA,uBAAe,EAAC,WAAW,EAAE,QAAQ,EAAE,OAAO,CAAC;SACxD,CAAC,CAAC;IACL,CAAC;IACD,MAAM,OAAO,GAAG,MAAM,IAAA,sBAAgB,EACpC,WAAW,EACX,SAAS,EACT,gBAAgB,EAChB,KAAK,EACL,eAAe,EACf,UAAU,EACV,SAAS,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,SAAS,CAC9B,CAAC;IACF,YAAY,CAAC,IAAI,CAAC;QAChB,IAAI,EAAE,UAAU,CAAC,CAAC,CAAC,wCAAe,CAAC,MAAM,CAAC,CAAC,CAAC,wCAAe,CAAC,IAAI;QAChE,MAAM,EAAE,IAAA,uBAAe,EAAC,WAAW,EAAE,KAAK,EAAE,OAAO,CAAC;QACpD,gBAAgB,EAAE;YAChB,OAAO,EAAE,UAAU,EAAE,eAAe,EAAE,QAAQ,EAAE;YAChD,SAAS,EAAE,aAAa,EAAE,eAAe,EAAE,QAAQ,EAAE;SACtD;KACF,CAAC,CAAC;IACH,MAAM,iBAAiB,GAEhB;QACL,WAAW;QACX,gBAAgB,EAAE,OAAO,CAAC,eAAe,CAAC;QAC1C,iBAAiB,EAAE,OAAO,CAAC,YAAY,CAAC;QACxC,eAAe;QACf,eAAe;QACf,MAAM,EAAE,UAAU;QAClB,IAAI,EAAE,KAAK,CAAC,IAAqB;QACjC,YAAY;KACb,CAAC;IAEF,OAAO,iBAAiB,CAAC;AAC3B,CAAC,CAAC;AAlHW,QAAA,4BAA4B,gCAkHvC;AAEK,MAAM,gCAAgC,GAAG,CAAC,EAC/C,SAAS,EACT,mBAAmB,EACnB,OAAO,EACP,YAAY,GAMb,EAAE,EAAE;IACH,MAAM,GAAG,GAAG,SAAS,CAAC,IAAI,CAAC,gCAAgC,CAAC,CAAC,YAAY,CAAC;IAC1E,MAAM,OAAO,GAGT;QACF,YAAY,EAAE,SAAS;QACvB,SAAS,EAAE,SAAS;KACrB,CAAC;IAEF,oEAAoE;IACpE,qFAAqF;IACrF,MAAM,CAAC,OAAO,CAAC,YAAY,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,MAAM,EAAE,MAAM,CAAC,EAAE,EAAE;QACxD,qFAAqF;QACrF,MAAM,MAAM,GAAG,GAAG,CAAC,IAAI,CAAC,CAAC,EAAE,EAAE,EAAE;YAC7B,IAAI,EAAE,CAAC,OAAO,KAAK,OAAO,EAAE,CAAC;gBAC3B,OAAO,KAAK,CAAC;YACf,CAAC;YAED,wEAAwE;YACxE,uEAAuE;YACvE,MAAM,iBAAiB,GACrB,CAAC,KAAK,CAAC,OAAO,CAAC,EAAE,CAAC,QAAQ,CAAC,iBAAiB,CAAC;gBAC3C,EAAE,CAAC,QAAQ,CAAC,iBAAiB,CAAC,MAAM,GAAG,CAAC,CAAC;gBAC3C,OAAO,CAAC,EAAE,CAAC,iBAAiB,CAAC,CAAC;YAEhC,IAAI,iBAAiB,EAAE,CAAC;gBACtB,oEAAoE;gBACpE,+DAA+D;gBAC/D,IACE,MAAM,KAAK,wCAAe,CAAC,IAAI;oBAC/B,EAAE,CAAC,IAAI,KAAK,wCAAe,CAAC,KAAK,EACjC,CAAC;oBACD,OAAO,IAAI,CAAC;gBACd,CAAC;gBACD,sDAAsD;gBACtD,IACE,MAAM,KAAK,wCAAe,CAAC,YAAY;oBACvC,EAAE,CAAC,QAAQ,CAAC,IAAI,KAAK,MAAM,EAC3B,CAAC;oBACD,OAAO,IAAI,CAAC;gBACd,CAAC;YACH,CAAC;YAED,mDAAmD;YACnD,OAAO,EAAE,CAAC,QAAQ,CAAC,IAAI,KAAK,MAAM,CAAC;QACrC,CAAC,CAAC,CAAC;QAEH,IAAI,MAAM,EAAE,CAAC;YACX,MAAM,SAAS,GAAG,EAAE,GAAG,MAAM,EAAE,IAAI,EAAE,MAAyB,EAAE,CAAC;YACjE,mBAAmB,CAAC,SAAS,EAAE,qBAAqB,MAAM,EAAE,CAAC,CAAC;YAC9D,OAAO,CACL,CAAC,wCAAe,CAAC,cAAc,EAAE,wCAAe,CAAC,YAAY,CAAC,CAAC,QAAQ,CACrE,MAAyB,CAC1B;gBACC,CAAC,CAAC,cAAc;gBAChB,CAAC,CAAC,WAAW,CAChB,GAAG,SAAS,CAAC;QAChB,CAAC;IACH,CAAC,CAAC,CAAC;IAEH,OAAO,OAAO,CAAC;AACjB,CAAC,CAAC;AAxEW,QAAA,gCAAgC,oCAwE3C;AAEF;;;;;;;;GAQG;AACH,SAAgB,aAAa,CAC3B,QAA4B,EAC5B,cAAkC;IAElC,MAAM,UAAU,GAAG,QAAQ,IAAI,cAAc,CAAC;IAC9C,IAAI,CAAC,UAAU,EAAE,CAAC;QAChB,MAAM,IAAI,KAAK,CACb,+EAA+E,CAChF,CAAC;IACJ,CAAC;IACD,OAAO,UAAU,CAAC;AACpB,CAAC;AAXD,sCAWC;AAED;;;;;;GAMG;AACH,SAAgB,kBAAkB,CAChC,aAA6D;IAE7D,MAAM,EAAE,MAAM,EAAE,GAAG,aAAa,CAAC,KAAK,CAAC;IACvC,IAAI,CAAC,MAAM,EAAE,CAAC;QACZ,MAAM,IAAI,KAAK,CAAC,mCAAmC,CAAC,CAAC;IACvD,CAAC;IACD,OAAO,MAAM,CAAC;AAChB,CAAC;AARD,gDAQC","sourcesContent":["import type { AccountsControllerState } from '@metamask/accounts-controller';\nimport {\n  ChainId,\n  extractTradeData,\n  isTronTrade,\n  formatChainIdToCaip,\n  formatChainIdToHex,\n  isCrossChain,\n} from '@metamask/bridge-controller';\nimport type {\n  Intent,\n  QuoteMetadata,\n  QuoteResponse,\n  Trade,\n  TxData,\n} from '@metamask/bridge-controller';\nimport { toHex } from '@metamask/controller-utils';\nimport {\n  TransactionStatus,\n  TransactionType,\n} from '@metamask/transaction-controller';\nimport type {\n  BatchTransactionParams,\n  TransactionController,\n  TransactionMeta,\n} from '@metamask/transaction-controller';\nimport { createProjectLogger } from '@metamask/utils';\nimport { v4 as uuid } from 'uuid';\n\nimport { calculateGasFees } from './gas';\nimport { createClientTransactionRequest } from './snaps';\nimport type { TransactionBatchSingleRequest } from '../../../transaction-controller/src/types';\nimport { APPROVAL_DELAY_MS } from '../constants';\nimport type {\n  BridgeStatusControllerMessenger,\n  SolanaTransactionMeta,\n} from '../types';\nimport type { BridgeStatusControllerState } from '../types';\n\nexport const generateActionId = () => (Date.now() + Math.random()).toString();\n\nexport const getStatusRequestParams = (quoteResponse: QuoteResponse) => {\n  return {\n    bridgeId: quoteResponse.quote.bridgeId,\n    bridge: quoteResponse.quote.bridges[0],\n    srcChainId: quoteResponse.quote.srcChainId,\n    destChainId: quoteResponse.quote.destChainId,\n    quote: quoteResponse.quote,\n    refuel: Boolean(quoteResponse.quote.refuel),\n  };\n};\n\nexport const getTxMetaFields = (\n  quoteResponse: Omit<QuoteResponse<Trade, Trade>, 'approval' | 'trade'> &\n    QuoteMetadata,\n  approvalTxId?: string,\n): Omit<\n  TransactionMeta,\n  'networkClientId' | 'status' | 'time' | 'txParams' | 'id' | 'chainId'\n> => {\n  // Handle destination chain ID - should always be convertible for EVM destinations\n  let destinationChainId;\n  try {\n    destinationChainId = formatChainIdToHex(quoteResponse.quote.destChainId);\n  } catch {\n    // Fallback for non-EVM destination (shouldn't happen for BTC->EVM)\n    destinationChainId = '0x1' as `0x${string}`; // Default to mainnet\n  }\n\n  return {\n    destinationChainId,\n    sourceTokenAmount: quoteResponse.quote.srcTokenAmount,\n    sourceTokenSymbol: quoteResponse.quote.srcAsset.symbol,\n    sourceTokenDecimals: quoteResponse.quote.srcAsset.decimals,\n    sourceTokenAddress: quoteResponse.quote.srcAsset.address,\n\n    destinationTokenAmount: quoteResponse.quote.destTokenAmount,\n    destinationTokenSymbol: quoteResponse.quote.destAsset.symbol,\n    destinationTokenDecimals: quoteResponse.quote.destAsset.decimals,\n    destinationTokenAddress: quoteResponse.quote.destAsset.address,\n\n    // chainId is now excluded from this function and handled by the caller\n    approvalTxId,\n    // this is the decimal (non atomic) amount (not USD value) of source token to swap\n    swapTokenValue: quoteResponse.sentAmount.amount,\n  };\n};\n\n/**\n * Handles the response from non-EVM transaction submission\n * Works with the new unified ClientRequest:signAndSendTransaction interface\n * Supports Solana, Bitcoin, and other non-EVM chains\n *\n * @param snapResponse - The response from the snap after transaction submission\n * @param quoteResponse - The quote response containing trade details and metadata\n * @param selectedAccount - The selected account information\n * @returns The transaction metadata including non-EVM specific fields\n */\nexport const handleNonEvmTxResponse = (\n  snapResponse:\n    | string\n    | { transactionId: string } // New unified interface response\n    | { result: Record<string, string> }\n    | { signature: string },\n  quoteResponse: Omit<QuoteResponse<Trade>, 'approval'> & QuoteMetadata,\n  selectedAccount: AccountsControllerState['internalAccounts']['accounts'][string],\n): TransactionMeta & SolanaTransactionMeta => {\n  const selectedAccountAddress = selectedAccount.address;\n  const snapId = selectedAccount.metadata.snap?.id;\n  let hash;\n  // Handle different response formats\n  if (typeof snapResponse === 'string') {\n    hash = snapResponse;\n  } else if (snapResponse && typeof snapResponse === 'object') {\n    // Check for new unified interface response format first\n    if ('transactionId' in snapResponse && snapResponse.transactionId) {\n      hash = snapResponse.transactionId;\n    } else if (\n      'result' in snapResponse &&\n      snapResponse.result &&\n      typeof snapResponse.result === 'object'\n    ) {\n      // Try to extract signature from common locations in response object\n      hash =\n        snapResponse.result.signature ||\n        snapResponse.result.txid ||\n        snapResponse.result.hash ||\n        snapResponse.result.txHash;\n    } else if (\n      'signature' in snapResponse &&\n      snapResponse.signature &&\n      typeof snapResponse.signature === 'string'\n    ) {\n      hash = snapResponse.signature;\n    }\n  }\n\n  const isBridgeTx = isCrossChain(\n    quoteResponse.quote.srcChainId,\n    quoteResponse.quote.destChainId,\n  );\n\n  let hexChainId;\n  try {\n    hexChainId = formatChainIdToHex(quoteResponse.quote.srcChainId);\n  } catch {\n    // TODO: Fix chain ID activity list handling for Bitcoin\n    // Fallback to Ethereum mainnet for now\n    hexChainId = '0x1' as `0x${string}`;\n  }\n\n  // Extract the transaction data for storage\n  const tradeData = extractTradeData(quoteResponse.trade);\n\n  // Create a transaction meta object with bridge-specific fields\n  return {\n    ...getTxMetaFields(quoteResponse),\n    time: Date.now(),\n    id: hash ?? uuid(),\n    chainId: hexChainId,\n    networkClientId: snapId ?? hexChainId,\n    txParams: { from: selectedAccountAddress, data: tradeData },\n    type: isBridgeTx ? TransactionType.bridge : TransactionType.swap,\n    status: TransactionStatus.submitted,\n    hash, // Add the transaction signature as hash\n    origin: snapId,\n    // Add an explicit flag to mark this as a non-EVM transaction\n    isSolana: true, // TODO deprecate this and use chainId to detect non-EVM chains\n    isBridgeTx,\n  };\n};\n\nexport const handleApprovalDelay = async (\n  srcChainId: QuoteResponse['quote']['srcChainId'],\n) => {\n  if ([ChainId.LINEA, ChainId.BASE].includes(srcChainId)) {\n    const debugLog = createProjectLogger('bridge');\n    debugLog(\n      'Delaying submitting bridge tx to make Linea and Base confirmation more likely',\n    );\n    const waitPromise = new Promise((resolve) =>\n      setTimeout(resolve, APPROVAL_DELAY_MS),\n    );\n    await waitPromise;\n  }\n};\n\n/**\n * Adds a delay for hardware wallet transactions on mobile to fix an issue\n * where the Ledger does not get prompted for the 2nd approval.\n * Extension does not have this issue.\n *\n * @param requireApproval - Whether the delay should be applied\n */\nexport const handleMobileHardwareWalletDelay = async (\n  requireApproval: boolean,\n) => {\n  if (requireApproval) {\n    const mobileHardwareWalletDelay = new Promise((resolve) =>\n      setTimeout(resolve, 1000),\n    );\n    await mobileHardwareWalletDelay;\n  }\n};\n\n/**\n * Creates a request to sign and send a transaction for non-EVM chains\n * Uses the new unified ClientRequest:signAndSendTransaction interface\n *\n * @param trade - The trade data\n * @param srcChainId - The source chain ID\n * @param selectedAccount - The selected account information\n * @returns The snap request object for signing and sending transaction\n */\nexport const getClientRequest = (\n  trade: Trade,\n  srcChainId: number,\n  selectedAccount: AccountsControllerState['internalAccounts']['accounts'][string],\n) => {\n  const scope = formatChainIdToCaip(srcChainId);\n\n  const transactionData = extractTradeData(trade);\n\n  // Tron trades need the visible flag and contract type to be included in the request options\n  const options = isTronTrade(trade)\n    ? {\n        visible: trade.visible,\n        type: trade.raw_data?.contract?.[0]?.type,\n      }\n    : undefined;\n\n  // Use the new unified interface\n  return createClientTransactionRequest(\n    selectedAccount.metadata.snap?.id as string,\n    transactionData,\n    scope,\n    selectedAccount.id,\n    options,\n  );\n};\n\nexport const waitForTxConfirmation = async (\n  messenger: BridgeStatusControllerMessenger,\n  txId: string,\n  {\n    timeoutMs = 5 * 60_000,\n    pollMs = 3_000,\n  }: { timeoutMs?: number; pollMs?: number } = {},\n): Promise<TransactionMeta> => {\n  const start = Date.now();\n  while (true) {\n    const { transactions } = messenger.call('TransactionController:getState');\n    const meta = transactions.find((tx: TransactionMeta) => tx.id === txId);\n\n    if (meta) {\n      if (meta.status === TransactionStatus.confirmed) {\n        return meta;\n      }\n      if (\n        meta.status === TransactionStatus.failed ||\n        meta.status === TransactionStatus.dropped ||\n        meta.status === TransactionStatus.rejected\n      ) {\n        throw new Error('Approval transaction did not confirm');\n      }\n    }\n\n    if (Date.now() - start > timeoutMs) {\n      throw new Error('Timed out waiting for approval confirmation');\n    }\n\n    await new Promise((resolve) => setTimeout(resolve, pollMs));\n  }\n};\n\nexport const rekeyHistoryItemInState = (\n  state: BridgeStatusControllerState,\n  actionId: string,\n  txMeta: { id: string; hash?: string },\n): boolean => {\n  const historyItem = state.txHistory[actionId];\n  if (!historyItem) {\n    return false;\n  }\n\n  state.txHistory[txMeta.id] = {\n    ...historyItem,\n    txMetaId: txMeta.id,\n    originalTransactionId: historyItem.originalTransactionId ?? txMeta.id,\n    status: {\n      ...historyItem.status,\n      srcChain: {\n        ...historyItem.status.srcChain,\n        txHash: txMeta.hash ?? historyItem.status.srcChain?.txHash,\n      },\n    },\n  };\n  delete state.txHistory[actionId];\n  return true;\n};\n\nexport const toBatchTxParams = (\n  disable7702: boolean,\n  { chainId, gasLimit, ...trade }: TxData,\n  {\n    maxFeePerGas,\n    maxPriorityFeePerGas,\n    gas,\n  }: { maxFeePerGas?: string; maxPriorityFeePerGas?: string; gas?: string },\n): BatchTransactionParams => {\n  const params = {\n    ...trade,\n    data: trade.data as `0x${string}`,\n    to: trade.to as `0x${string}`,\n    value: trade.value as `0x${string}`,\n  };\n  if (!disable7702) {\n    return params;\n  }\n\n  return {\n    ...params,\n    gas: toHex(gas ?? 0),\n    maxFeePerGas: toHex(maxFeePerGas ?? 0),\n    maxPriorityFeePerGas: toHex(maxPriorityFeePerGas ?? 0),\n  };\n};\n\nexport const getAddTransactionBatchParams = async ({\n  messenger,\n  isBridgeTx,\n  approval,\n  resetApproval,\n  trade,\n  quoteResponse: {\n    quote: {\n      feeData: { txFee },\n      gasIncluded,\n      gasIncluded7702,\n      gasSponsored,\n    },\n    sentAmount,\n    toTokenAmount,\n  },\n  requireApproval = false,\n  estimateGasFeeFn,\n}: {\n  messenger: BridgeStatusControllerMessenger;\n  isBridgeTx: boolean;\n  trade: TxData;\n  quoteResponse: Omit<QuoteResponse, 'approval' | 'trade'> &\n    Partial<QuoteMetadata>;\n  estimateGasFeeFn: typeof TransactionController.prototype.estimateGasFee;\n  approval?: TxData;\n  resetApproval?: TxData;\n  requireApproval?: boolean;\n}) => {\n  const isGasless = gasIncluded || gasIncluded7702;\n  const selectedAccount = messenger.call(\n    'AccountsController:getAccountByAddress',\n    trade.from,\n  );\n  if (!selectedAccount) {\n    throw new Error(\n      'Failed to submit cross-chain swap batch transaction: unknown account in trade data',\n    );\n  }\n  const hexChainId = formatChainIdToHex(trade.chainId);\n  const networkClientId = messenger.call(\n    'NetworkController:findNetworkClientIdByChainId',\n    hexChainId,\n  );\n\n  // When an active quote has gasIncluded7702 set to true,\n  // enable 7702 gasless txs for smart accounts\n  const disable7702 = gasIncluded7702 !== true;\n  const transactions: TransactionBatchSingleRequest[] = [];\n  if (resetApproval) {\n    const gasFees = await calculateGasFees(\n      disable7702,\n      messenger,\n      estimateGasFeeFn,\n      resetApproval,\n      networkClientId,\n      hexChainId,\n      isGasless ? txFee : undefined,\n    );\n    transactions.push({\n      type: isBridgeTx\n        ? TransactionType.bridgeApproval\n        : TransactionType.swapApproval,\n      params: toBatchTxParams(disable7702, resetApproval, gasFees),\n    });\n  }\n  if (approval) {\n    const gasFees = await calculateGasFees(\n      disable7702,\n      messenger,\n      estimateGasFeeFn,\n      approval,\n      networkClientId,\n      hexChainId,\n      isGasless ? txFee : undefined,\n    );\n    transactions.push({\n      type: isBridgeTx\n        ? TransactionType.bridgeApproval\n        : TransactionType.swapApproval,\n      params: toBatchTxParams(disable7702, approval, gasFees),\n    });\n  }\n  const gasFees = await calculateGasFees(\n    disable7702,\n    messenger,\n    estimateGasFeeFn,\n    trade,\n    networkClientId,\n    hexChainId,\n    isGasless ? txFee : undefined,\n  );\n  transactions.push({\n    type: isBridgeTx ? TransactionType.bridge : TransactionType.swap,\n    params: toBatchTxParams(disable7702, trade, gasFees),\n    assetsFiatValues: {\n      sending: sentAmount?.valueInCurrency?.toString(),\n      receiving: toTokenAmount?.valueInCurrency?.toString(),\n    },\n  });\n  const transactionParams: Parameters<\n    TransactionController['addTransactionBatch']\n  >[0] = {\n    disable7702,\n    isGasFeeIncluded: Boolean(gasIncluded7702),\n    isGasFeeSponsored: Boolean(gasSponsored),\n    networkClientId,\n    requireApproval,\n    origin: 'metamask',\n    from: trade.from as `0x${string}`,\n    transactions,\n  };\n\n  return transactionParams;\n};\n\nexport const findAndUpdateTransactionsInBatch = ({\n  messenger,\n  updateTransactionFn,\n  batchId,\n  txDataByType,\n}: {\n  messenger: BridgeStatusControllerMessenger;\n  updateTransactionFn: typeof TransactionController.prototype.updateTransaction;\n  batchId: string;\n  txDataByType: { [key in TransactionType]?: string };\n}) => {\n  const txs = messenger.call('TransactionController:getState').transactions;\n  const txBatch: {\n    approvalMeta?: TransactionMeta;\n    tradeMeta?: TransactionMeta;\n  } = {\n    approvalMeta: undefined,\n    tradeMeta: undefined,\n  };\n\n  // This is a workaround to update the tx type after the tx is signed\n  // TODO: remove this once the tx type for batch txs is preserved in the tx controller\n  Object.entries(txDataByType).forEach(([txType, txData]) => {\n    // Find transaction by batchId and either matching data or delegation characteristics\n    const txMeta = txs.find((tx) => {\n      if (tx.batchId !== batchId) {\n        return false;\n      }\n\n      // For 7702 delegated transactions, check for delegation-specific fields\n      // These transactions might have authorizationList or delegationAddress\n      const is7702Transaction =\n        (Array.isArray(tx.txParams.authorizationList) &&\n          tx.txParams.authorizationList.length > 0) ||\n        Boolean(tx.delegationAddress);\n\n      if (is7702Transaction) {\n        // For 7702 transactions, we need to match based on transaction type\n        // since the data field might be different (batch execute call)\n        if (\n          txType === TransactionType.swap &&\n          tx.type === TransactionType.batch\n        ) {\n          return true;\n        }\n        // Also check if it's an approval transaction for 7702\n        if (\n          txType === TransactionType.swapApproval &&\n          tx.txParams.data === txData\n        ) {\n          return true;\n        }\n      }\n\n      // Default matching logic for non-7702 transactions\n      return tx.txParams.data === txData;\n    });\n\n    if (txMeta) {\n      const updatedTx = { ...txMeta, type: txType as TransactionType };\n      updateTransactionFn(updatedTx, `Update tx type to ${txType}`);\n      txBatch[\n        [TransactionType.bridgeApproval, TransactionType.swapApproval].includes(\n          txType as TransactionType,\n        )\n          ? 'approvalMeta'\n          : 'tradeMeta'\n      ] = updatedTx;\n    }\n  });\n\n  return txBatch;\n};\n\n/**\n * Determines the key to use for storing a bridge history item.\n * Uses actionId for pre-submission tracking, or bridgeTxMetaId for post-submission.\n *\n * @param actionId - The action ID used for pre-submission tracking\n * @param bridgeTxMetaId - The transaction meta ID from bridgeTxMeta\n * @returns The key to use for the history item\n * @throws Error if neither actionId nor bridgeTxMetaId is provided\n */\nexport function getHistoryKey(\n  actionId: string | undefined,\n  bridgeTxMetaId: string | undefined,\n): string {\n  const historyKey = actionId ?? bridgeTxMetaId;\n  if (!historyKey) {\n    throw new Error(\n      'Cannot add tx to history: either actionId or bridgeTxMeta.id must be provided',\n    );\n  }\n  return historyKey;\n}\n\n/**\n * Extracts and validates the intent data from a quote response.\n *\n * @param quoteResponse - The quote response that may contain intent data\n * @returns The intent data from the quote\n * @throws Error if the quote does not contain intent data\n */\nexport function getIntentFromQuote(\n  quoteResponse: QuoteResponse & { quote: { intent?: Intent } },\n): Intent {\n  const { intent } = quoteResponse.quote;\n  if (!intent) {\n    throw new Error('submitIntent: missing intent data');\n  }\n  return intent;\n}\n"]}
+{"version":3,"file":"transaction.cjs","sourceRoot":"","sources":["../../src/utils/transaction.ts"],"names":[],"mappings":"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","sourcesContent":["import type { AccountsControllerState } from '@metamask/accounts-controller';\nimport {\n  ChainId,\n  extractTradeData,\n  isTronTrade,\n  formatChainIdToCaip,\n  formatChainIdToHex,\n  isCrossChain,\n} from '@metamask/bridge-controller';\nimport type {\n  Intent,\n  QuoteMetadata,\n  QuoteResponse,\n  Trade,\n  TxData,\n} from '@metamask/bridge-controller';\nimport { toHex } from '@metamask/controller-utils';\nimport {\n  TransactionStatus,\n  TransactionType,\n} from '@metamask/transaction-controller';\nimport type {\n  BatchTransactionParams,\n  TransactionController,\n  TransactionMeta,\n} from '@metamask/transaction-controller';\nimport { createProjectLogger } from '@metamask/utils';\nimport { v4 as uuid } from 'uuid';\n\nimport { calculateGasFees } from './gas';\nimport { createClientTransactionRequest } from './snaps';\nimport type { TransactionBatchSingleRequest } from '../../../transaction-controller/src/types';\nimport { APPROVAL_DELAY_MS } from '../constants';\nimport type {\n  BridgeStatusControllerMessenger,\n  SolanaTransactionMeta,\n} from '../types';\nimport type { BridgeStatusControllerState } from '../types';\n\nexport const generateActionId = () => (Date.now() + Math.random()).toString();\n\nexport const getStatusRequestParams = (quoteResponse: QuoteResponse) => {\n  return {\n    bridgeId: quoteResponse.quote.bridgeId,\n    bridge: quoteResponse.quote.bridges[0],\n    srcChainId: quoteResponse.quote.srcChainId,\n    destChainId: quoteResponse.quote.destChainId,\n    quote: quoteResponse.quote,\n    refuel: Boolean(quoteResponse.quote.refuel),\n  };\n};\n\nexport const getTxMetaFields = (\n  quoteResponse: Omit<QuoteResponse<Trade, Trade>, 'approval' | 'trade'> &\n    QuoteMetadata,\n  approvalTxId?: string,\n): Omit<\n  TransactionMeta,\n  'networkClientId' | 'status' | 'time' | 'txParams' | 'id' | 'chainId'\n> => {\n  // Handle destination chain ID - should always be convertible for EVM destinations\n  let destinationChainId;\n  try {\n    destinationChainId = formatChainIdToHex(quoteResponse.quote.destChainId);\n  } catch {\n    // Fallback for non-EVM destination (shouldn't happen for BTC->EVM)\n    destinationChainId = '0x1' as `0x${string}`; // Default to mainnet\n  }\n\n  return {\n    destinationChainId,\n    sourceTokenAmount: quoteResponse.quote.srcTokenAmount,\n    sourceTokenSymbol: quoteResponse.quote.srcAsset.symbol,\n    sourceTokenDecimals: quoteResponse.quote.srcAsset.decimals,\n    sourceTokenAddress: quoteResponse.quote.srcAsset.address,\n\n    destinationTokenAmount: quoteResponse.quote.destTokenAmount,\n    destinationTokenSymbol: quoteResponse.quote.destAsset.symbol,\n    destinationTokenDecimals: quoteResponse.quote.destAsset.decimals,\n    destinationTokenAddress: quoteResponse.quote.destAsset.address,\n\n    // chainId is now excluded from this function and handled by the caller\n    approvalTxId,\n    // this is the decimal (non atomic) amount (not USD value) of source token to swap\n    swapTokenValue: quoteResponse.sentAmount.amount,\n  };\n};\n\n/**\n * Handles the response from non-EVM transaction submission\n * Works with the new unified ClientRequest:signAndSendTransaction interface\n * Supports Solana, Bitcoin, and other non-EVM chains\n *\n * @param snapResponse - The response from the snap after transaction submission\n * @param quoteResponse - The quote response containing trade details and metadata\n * @param selectedAccount - The selected account information\n * @returns The transaction metadata including non-EVM specific fields\n */\nexport const handleNonEvmTxResponse = (\n  snapResponse:\n    | string\n    | { transactionId: string } // New unified interface response\n    | { result: Record<string, string> }\n    | { signature: string },\n  quoteResponse: Omit<QuoteResponse<Trade>, 'approval'> & QuoteMetadata,\n  selectedAccount: AccountsControllerState['internalAccounts']['accounts'][string],\n): TransactionMeta & SolanaTransactionMeta => {\n  const selectedAccountAddress = selectedAccount.address;\n  const snapId = selectedAccount.metadata.snap?.id;\n  let hash;\n  // Handle different response formats\n  if (typeof snapResponse === 'string') {\n    hash = snapResponse;\n  } else if (snapResponse && typeof snapResponse === 'object') {\n    // Check for new unified interface response format first\n    if ('transactionId' in snapResponse && snapResponse.transactionId) {\n      hash = snapResponse.transactionId;\n    } else if (\n      'result' in snapResponse &&\n      snapResponse.result &&\n      typeof snapResponse.result === 'object'\n    ) {\n      // Try to extract signature from common locations in response object\n      hash =\n        snapResponse.result.signature ||\n        snapResponse.result.txid ||\n        snapResponse.result.hash ||\n        snapResponse.result.txHash;\n    } else if (\n      'signature' in snapResponse &&\n      snapResponse.signature &&\n      typeof snapResponse.signature === 'string'\n    ) {\n      hash = snapResponse.signature;\n    }\n  }\n\n  const isBridgeTx = isCrossChain(\n    quoteResponse.quote.srcChainId,\n    quoteResponse.quote.destChainId,\n  );\n\n  let hexChainId;\n  try {\n    hexChainId = formatChainIdToHex(quoteResponse.quote.srcChainId);\n  } catch {\n    // TODO: Fix chain ID activity list handling for Bitcoin\n    // Fallback to Ethereum mainnet for now\n    hexChainId = '0x1' as `0x${string}`;\n  }\n\n  // Extract the transaction data for storage\n  const tradeData = extractTradeData(quoteResponse.trade);\n\n  // Create a transaction meta object with bridge-specific fields\n  return {\n    ...getTxMetaFields(quoteResponse),\n    time: Date.now(),\n    id: hash ?? uuid(),\n    chainId: hexChainId,\n    networkClientId: snapId ?? hexChainId,\n    txParams: { from: selectedAccountAddress, data: tradeData },\n    type: isBridgeTx ? TransactionType.bridge : TransactionType.swap,\n    status: TransactionStatus.submitted,\n    hash, // Add the transaction signature as hash\n    origin: snapId,\n    // Add an explicit flag to mark this as a non-EVM transaction\n    isSolana: true, // TODO deprecate this and use chainId to detect non-EVM chains\n    isBridgeTx,\n  };\n};\n\nexport const handleApprovalDelay = async (\n  srcChainId: QuoteResponse['quote']['srcChainId'],\n) => {\n  if ([ChainId.LINEA, ChainId.BASE].includes(srcChainId)) {\n    const debugLog = createProjectLogger('bridge');\n    debugLog(\n      'Delaying submitting bridge tx to make Linea and Base confirmation more likely',\n    );\n    const waitPromise = new Promise((resolve) =>\n      setTimeout(resolve, APPROVAL_DELAY_MS),\n    );\n    await waitPromise;\n  }\n};\n\n/**\n * Adds a delay for hardware wallet transactions on mobile to fix an issue\n * where the Ledger does not get prompted for the 2nd approval.\n * Extension does not have this issue.\n *\n * @param requireApproval - Whether the delay should be applied\n */\nexport const handleMobileHardwareWalletDelay = async (\n  requireApproval: boolean,\n) => {\n  if (requireApproval) {\n    const mobileHardwareWalletDelay = new Promise((resolve) =>\n      setTimeout(resolve, 1000),\n    );\n    await mobileHardwareWalletDelay;\n  }\n};\n\n/**\n * Creates a request to sign and send a transaction for non-EVM chains\n * Uses the new unified ClientRequest:signAndSendTransaction interface\n *\n * @param trade - The trade data\n * @param srcChainId - The source chain ID\n * @param selectedAccount - The selected account information\n * @returns The snap request object for signing and sending transaction\n */\nexport const getClientRequest = (\n  trade: Trade,\n  srcChainId: number,\n  selectedAccount: AccountsControllerState['internalAccounts']['accounts'][string],\n) => {\n  const scope = formatChainIdToCaip(srcChainId);\n\n  const transactionData = extractTradeData(trade);\n\n  // Tron trades need the visible flag and contract type to be included in the request options\n  const options = isTronTrade(trade)\n    ? {\n        visible: trade.visible,\n        type: trade.raw_data?.contract?.[0]?.type,\n      }\n    : undefined;\n\n  // Use the new unified interface\n  return createClientTransactionRequest(\n    selectedAccount.metadata.snap?.id as string,\n    transactionData,\n    scope,\n    selectedAccount.id,\n    options,\n  );\n};\n\nexport const waitForTxConfirmation = async (\n  messenger: BridgeStatusControllerMessenger,\n  txId: string,\n  {\n    timeoutMs = 5 * 60_000,\n    pollMs = 3_000,\n  }: { timeoutMs?: number; pollMs?: number } = {},\n): Promise<TransactionMeta> => {\n  const start = Date.now();\n  while (true) {\n    const { transactions } = messenger.call('TransactionController:getState');\n    const meta = transactions.find((tx: TransactionMeta) => tx.id === txId);\n\n    if (meta) {\n      if (meta.status === TransactionStatus.confirmed) {\n        return meta;\n      }\n      if (\n        meta.status === TransactionStatus.failed ||\n        meta.status === TransactionStatus.dropped ||\n        meta.status === TransactionStatus.rejected\n      ) {\n        throw new Error('Approval transaction did not confirm');\n      }\n    }\n\n    if (Date.now() - start > timeoutMs) {\n      throw new Error('Timed out waiting for approval confirmation');\n    }\n\n    await new Promise((resolve) => setTimeout(resolve, pollMs));\n  }\n};\n\nexport const rekeyHistoryItemInState = (\n  state: BridgeStatusControllerState,\n  actionId: string,\n  txMeta: { id: string; hash?: string },\n): boolean => {\n  const historyItem = state.txHistory[actionId];\n  if (!historyItem) {\n    return false;\n  }\n\n  state.txHistory[txMeta.id] = {\n    ...historyItem,\n    txMetaId: txMeta.id,\n    originalTransactionId: historyItem.originalTransactionId ?? txMeta.id,\n    status: {\n      ...historyItem.status,\n      srcChain: {\n        ...historyItem.status.srcChain,\n        txHash: txMeta.hash ?? historyItem.status.srcChain?.txHash,\n      },\n    },\n  };\n  delete state.txHistory[actionId];\n  return true;\n};\n\nexport const toBatchTxParams = (\n  skipGasFields: boolean,\n  { chainId, gasLimit, ...trade }: TxData,\n  {\n    maxFeePerGas,\n    maxPriorityFeePerGas,\n    gas,\n  }: { maxFeePerGas?: string; maxPriorityFeePerGas?: string; gas?: string },\n): BatchTransactionParams => {\n  const params = {\n    ...trade,\n    data: trade.data as `0x${string}`,\n    to: trade.to as `0x${string}`,\n    value: trade.value as `0x${string}`,\n  };\n  if (skipGasFields) {\n    return params;\n  }\n\n  return {\n    ...params,\n    gas: toHex(gas ?? 0),\n    maxFeePerGas: toHex(maxFeePerGas ?? 0),\n    maxPriorityFeePerGas: toHex(maxPriorityFeePerGas ?? 0),\n  };\n};\n\nexport const getAddTransactionBatchParams = async ({\n  messenger,\n  isBridgeTx,\n  approval,\n  resetApproval,\n  trade,\n  quoteResponse: {\n    quote: {\n      feeData: { txFee },\n      gasIncluded,\n      gasIncluded7702,\n      gasSponsored,\n    },\n    sentAmount,\n    toTokenAmount,\n  },\n  requireApproval = false,\n  isDelegatedAccount = false,\n  estimateGasFeeFn,\n}: {\n  messenger: BridgeStatusControllerMessenger;\n  isBridgeTx: boolean;\n  trade: TxData;\n  quoteResponse: Omit<QuoteResponse, 'approval' | 'trade'> &\n    Partial<QuoteMetadata>;\n  estimateGasFeeFn: typeof TransactionController.prototype.estimateGasFee;\n  approval?: TxData;\n  resetApproval?: TxData;\n  requireApproval?: boolean;\n  isDelegatedAccount?: boolean;\n}) => {\n  const isGasless = gasIncluded || gasIncluded7702;\n  const selectedAccount = messenger.call(\n    'AccountsController:getAccountByAddress',\n    trade.from,\n  );\n  if (!selectedAccount) {\n    throw new Error(\n      'Failed to submit cross-chain swap batch transaction: unknown account in trade data',\n    );\n  }\n  const hexChainId = formatChainIdToHex(trade.chainId);\n  const networkClientId = messenger.call(\n    'NetworkController:findNetworkClientIdByChainId',\n    hexChainId,\n  );\n\n  // Gas fields should be omitted only when gas is sponsored via 7702\n  const skipGasFields = gasIncluded7702 === true;\n  // Enable 7702 batching when the quote includes gasless 7702 support,\n  // or when the account is already delegated (to avoid the in-flight\n  // transaction limit for delegated accounts)\n  const disable7702 = !skipGasFields && !isDelegatedAccount;\n  const transactions: TransactionBatchSingleRequest[] = [];\n  if (resetApproval) {\n    const gasFees = await calculateGasFees(\n      skipGasFields,\n      messenger,\n      estimateGasFeeFn,\n      resetApproval,\n      networkClientId,\n      hexChainId,\n      isGasless ? txFee : undefined,\n    );\n    transactions.push({\n      type: isBridgeTx\n        ? TransactionType.bridgeApproval\n        : TransactionType.swapApproval,\n      params: toBatchTxParams(skipGasFields, resetApproval, gasFees),\n    });\n  }\n  if (approval) {\n    const gasFees = await calculateGasFees(\n      skipGasFields,\n      messenger,\n      estimateGasFeeFn,\n      approval,\n      networkClientId,\n      hexChainId,\n      isGasless ? txFee : undefined,\n    );\n    transactions.push({\n      type: isBridgeTx\n        ? TransactionType.bridgeApproval\n        : TransactionType.swapApproval,\n      params: toBatchTxParams(skipGasFields, approval, gasFees),\n    });\n  }\n  const gasFees = await calculateGasFees(\n    skipGasFields,\n    messenger,\n    estimateGasFeeFn,\n    trade,\n    networkClientId,\n    hexChainId,\n    isGasless ? txFee : undefined,\n  );\n  transactions.push({\n    type: isBridgeTx ? TransactionType.bridge : TransactionType.swap,\n    params: toBatchTxParams(skipGasFields, trade, gasFees),\n    assetsFiatValues: {\n      sending: sentAmount?.valueInCurrency?.toString(),\n      receiving: toTokenAmount?.valueInCurrency?.toString(),\n    },\n  });\n  const transactionParams: Parameters<\n    TransactionController['addTransactionBatch']\n  >[0] = {\n    disable7702,\n    isGasFeeIncluded: Boolean(gasIncluded7702),\n    isGasFeeSponsored: Boolean(gasSponsored),\n    networkClientId,\n    requireApproval,\n    origin: 'metamask',\n    from: trade.from as `0x${string}`,\n    transactions,\n  };\n\n  return transactionParams;\n};\n\nexport const findAndUpdateTransactionsInBatch = ({\n  messenger,\n  updateTransactionFn,\n  batchId,\n  txDataByType,\n}: {\n  messenger: BridgeStatusControllerMessenger;\n  updateTransactionFn: typeof TransactionController.prototype.updateTransaction;\n  batchId: string;\n  txDataByType: { [key in TransactionType]?: string };\n}) => {\n  const txs = messenger.call('TransactionController:getState').transactions;\n  const txBatch: {\n    approvalMeta?: TransactionMeta;\n    tradeMeta?: TransactionMeta;\n  } = {\n    approvalMeta: undefined,\n    tradeMeta: undefined,\n  };\n\n  // This is a workaround to update the tx type after the tx is signed\n  // TODO: remove this once the tx type for batch txs is preserved in the tx controller\n  Object.entries(txDataByType).forEach(([txType, txData]) => {\n    // Skip types not present in the batch (e.g. swap entry is undefined for bridge txs)\n    if (txData === undefined) {\n      return;\n    }\n\n    // Find transaction by batchId and either matching data or delegation characteristics\n    const txMeta = txs.find((tx) => {\n      if (tx.batchId !== batchId) {\n        return false;\n      }\n\n      // For 7702 delegated transactions, check for delegation-specific fields\n      // These transactions might have authorizationList or delegationAddress\n      const is7702Transaction =\n        (Array.isArray(tx.txParams.authorizationList) &&\n          tx.txParams.authorizationList.length > 0) ||\n        Boolean(tx.delegationAddress);\n\n      if (is7702Transaction) {\n        // For 7702 transactions, we need to match based on transaction type\n        // since the data field might be different (batch execute call)\n        if (\n          (txType === TransactionType.swap ||\n            txType === TransactionType.bridge) &&\n          tx.type === TransactionType.batch\n        ) {\n          return true;\n        }\n        // Also check if it's an approval transaction for 7702\n        if (\n          (txType === TransactionType.swapApproval ||\n            txType === TransactionType.bridgeApproval) &&\n          tx.txParams.data === txData\n        ) {\n          return true;\n        }\n      }\n\n      // Default matching logic for non-7702 transactions\n      return tx.txParams.data === txData;\n    });\n\n    if (txMeta) {\n      const updatedTx = { ...txMeta, type: txType as TransactionType };\n      updateTransactionFn(updatedTx, `Update tx type to ${txType}`);\n      txBatch[\n        [TransactionType.bridgeApproval, TransactionType.swapApproval].includes(\n          txType as TransactionType,\n        )\n          ? 'approvalMeta'\n          : 'tradeMeta'\n      ] = updatedTx;\n    }\n  });\n\n  return txBatch;\n};\n\n/**\n * Determines the key to use for storing a bridge history item.\n * Uses actionId for pre-submission tracking, or bridgeTxMetaId for post-submission.\n *\n * @param actionId - The action ID used for pre-submission tracking\n * @param bridgeTxMetaId - The transaction meta ID from bridgeTxMeta\n * @returns The key to use for the history item\n * @throws Error if neither actionId nor bridgeTxMetaId is provided\n */\nexport function getHistoryKey(\n  actionId: string | undefined,\n  bridgeTxMetaId: string | undefined,\n): string {\n  const historyKey = actionId ?? bridgeTxMetaId;\n  if (!historyKey) {\n    throw new Error(\n      'Cannot add tx to history: either actionId or bridgeTxMeta.id must be provided',\n    );\n  }\n  return historyKey;\n}\n\n/**\n * Extracts and validates the intent data from a quote response.\n *\n * @param quoteResponse - The quote response that may contain intent data\n * @returns The intent data from the quote\n * @throws Error if the quote does not contain intent data\n */\nexport function getIntentFromQuote(\n  quoteResponse: QuoteResponse & { quote: { intent?: Intent } },\n): Intent {\n  const { intent } = quoteResponse.quote;\n  if (!intent) {\n    throw new Error('submitIntent: missing intent data');\n  }\n  return intent;\n}\n"]}

package/dist/utils/transaction.d.cts

@@ -233,12 +233,12 @@ export declare const rekeyHistoryItemInState: (state: BridgeStatusControllerStat
     id: string;
     hash?: string;
 }) => boolean;
-export declare const toBatchTxParams: (disable7702: boolean, { chainId, gasLimit, ...trade }: TxData, { maxFeePerGas, maxPriorityFeePerGas, gas, }: {
+export declare const toBatchTxParams: (skipGasFields: boolean, { chainId, gasLimit, ...trade }: TxData, { maxFeePerGas, maxPriorityFeePerGas, gas, }: {
     maxFeePerGas?: string | undefined;
     maxPriorityFeePerGas?: string | undefined;
     gas?: string | undefined;
 }) => BatchTransactionParams;
-export declare const getAddTransactionBatchParams: ({ messenger, isBridgeTx, approval, resetApproval, trade, quoteResponse: { quote: { feeData: { txFee }, gasIncluded, gasIncluded7702, gasSponsored, }, sentAmount, toTokenAmount, }, requireApproval, estimateGasFeeFn, }: {
+export declare const getAddTransactionBatchParams: ({ messenger, isBridgeTx, approval, resetApproval, trade, quoteResponse: { quote: { feeData: { txFee }, gasIncluded, gasIncluded7702, gasSponsored, }, sentAmount, toTokenAmount, }, requireApproval, isDelegatedAccount, estimateGasFeeFn, }: {
     messenger: BridgeStatusControllerMessenger;
     isBridgeTx: boolean;
     trade: TxData;
@@ -263,6 +263,7 @@ export declare const getAddTransactionBatchParams: ({ messenger, isBridgeTx, app
         effectiveGas?: number | undefined;
     } | undefined;
     requireApproval?: boolean | undefined;
+    isDelegatedAccount?: boolean | undefined;
 }) => Promise<import("@metamask/transaction-controller").TransactionBatchRequest>;
 export declare const findAndUpdateTransactionsInBatch: ({ messenger, updateTransactionFn, batchId, txDataByType, }: {
     messenger: BridgeStatusControllerMessenger;
@@ -292,6 +293,7 @@ export declare const findAndUpdateTransactionsInBatch: ({ messenger, updateTrans
         predictBuy?: string | undefined;
         predictClaim?: string | undefined;
         predictDeposit?: string | undefined;
+        predictDepositAndOrder?: string | undefined;
         predictSell?: string | undefined;
         predictWithdraw?: string | undefined;
         predictRelayDeposit?: string | undefined;

package/dist/utils/transaction.d.cts.map

@@ -1 +1 @@
-{"version":3,"file":"transaction.d.cts","sourceRoot":"","sources":["../../src/utils/transaction.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"transaction.d.cts","sourceRoot":"","sources":["../../src/utils/transaction.ts"],"names":[],"mappings":"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"}

package/dist/utils/transaction.d.mts

@@ -233,12 +233,12 @@ export declare const rekeyHistoryItemInState: (state: BridgeStatusControllerStat
     id: string;
     hash?: string;
 }) => boolean;
-export declare const toBatchTxParams: (disable7702: boolean, { chainId, gasLimit, ...trade }: TxData, { maxFeePerGas, maxPriorityFeePerGas, gas, }: {
+export declare const toBatchTxParams: (skipGasFields: boolean, { chainId, gasLimit, ...trade }: TxData, { maxFeePerGas, maxPriorityFeePerGas, gas, }: {
     maxFeePerGas?: string | undefined;
     maxPriorityFeePerGas?: string | undefined;
     gas?: string | undefined;
 }) => BatchTransactionParams;
-export declare const getAddTransactionBatchParams: ({ messenger, isBridgeTx, approval, resetApproval, trade, quoteResponse: { quote: { feeData: { txFee }, gasIncluded, gasIncluded7702, gasSponsored, }, sentAmount, toTokenAmount, }, requireApproval, estimateGasFeeFn, }: {
+export declare const getAddTransactionBatchParams: ({ messenger, isBridgeTx, approval, resetApproval, trade, quoteResponse: { quote: { feeData: { txFee }, gasIncluded, gasIncluded7702, gasSponsored, }, sentAmount, toTokenAmount, }, requireApproval, isDelegatedAccount, estimateGasFeeFn, }: {
     messenger: BridgeStatusControllerMessenger;
     isBridgeTx: boolean;
     trade: TxData;
@@ -263,6 +263,7 @@ export declare const getAddTransactionBatchParams: ({ messenger, isBridgeTx, app
         effectiveGas?: number | undefined;
     } | undefined;
     requireApproval?: boolean | undefined;
+    isDelegatedAccount?: boolean | undefined;
 }) => Promise<import("@metamask/transaction-controller").TransactionBatchRequest>;
 export declare const findAndUpdateTransactionsInBatch: ({ messenger, updateTransactionFn, batchId, txDataByType, }: {
     messenger: BridgeStatusControllerMessenger;
@@ -292,6 +293,7 @@ export declare const findAndUpdateTransactionsInBatch: ({ messenger, updateTrans
         predictBuy?: string | undefined;
         predictClaim?: string | undefined;
         predictDeposit?: string | undefined;
+        predictDepositAndOrder?: string | undefined;
         predictSell?: string | undefined;
         predictWithdraw?: string | undefined;
         predictRelayDeposit?: string | undefined;

package/dist/utils/transaction.d.mts.map

@@ -1 +1 @@
-{"version":3,"file":"transaction.d.mts","sourceRoot":"","sources":["../../src/utils/transaction.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"transaction.d.mts","sourceRoot":"","sources":["../../src/utils/transaction.ts"],"names":[],"mappings":"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"}

package/dist/utils/transaction.mjs

@@ -195,14 +195,14 @@ export const rekeyHistoryItemInState = (state, actionId, txMeta) => {
     delete state.txHistory[actionId];
     return true;
 };
-export const toBatchTxParams = (disable7702, { chainId, gasLimit, ...trade }, { maxFeePerGas, maxPriorityFeePerGas, gas, }) => {
+export const toBatchTxParams = (skipGasFields, { chainId, gasLimit, ...trade }, { maxFeePerGas, maxPriorityFeePerGas, gas, }) => {
     const params = {
         ...trade,
         data: trade.data,
         to: trade.to,
         value: trade.value,
     };
-    if (!disable7702) {
+    if (skipGasFields) {
         return params;
     }
     return {
@@ -212,7 +212,7 @@ export const toBatchTxParams = (disable7702, { chainId, gasLimit, ...trade }, {
         maxPriorityFeePerGas: toHex(maxPriorityFeePerGas ?? 0),
     };
 };
-export const getAddTransactionBatchParams = async ({ messenger, isBridgeTx, approval, resetApproval, trade, quoteResponse: { quote: { feeData: { txFee }, gasIncluded, gasIncluded7702, gasSponsored, }, sentAmount, toTokenAmount, }, requireApproval = false, estimateGasFeeFn, }) => {
+export const getAddTransactionBatchParams = async ({ messenger, isBridgeTx, approval, resetApproval, trade, quoteResponse: { quote: { feeData: { txFee }, gasIncluded, gasIncluded7702, gasSponsored, }, sentAmount, toTokenAmount, }, requireApproval = false, isDelegatedAccount = false, estimateGasFeeFn, }) => {
     const isGasless = gasIncluded || gasIncluded7702;
     const selectedAccount = messenger.call('AccountsController:getAccountByAddress', trade.from);
     if (!selectedAccount) {
@@ -220,32 +220,35 @@ export const getAddTransactionBatchParams = async ({ messenger, isBridgeTx, appr
     }
     const hexChainId = formatChainIdToHex(trade.chainId);
     const networkClientId = messenger.call('NetworkController:findNetworkClientIdByChainId', hexChainId);
-    // When an active quote has gasIncluded7702 set to true,
-    // enable 7702 gasless txs for smart accounts
-    const disable7702 = gasIncluded7702 !== true;
+    // Gas fields should be omitted only when gas is sponsored via 7702
+    const skipGasFields = gasIncluded7702 === true;
+    // Enable 7702 batching when the quote includes gasless 7702 support,
+    // or when the account is already delegated (to avoid the in-flight
+    // transaction limit for delegated accounts)
+    const disable7702 = !skipGasFields && !isDelegatedAccount;
     const transactions = [];
     if (resetApproval) {
-        const gasFees = await calculateGasFees(disable7702, messenger, estimateGasFeeFn, resetApproval, networkClientId, hexChainId, isGasless ? txFee : undefined);
+        const gasFees = await calculateGasFees(skipGasFields, messenger, estimateGasFeeFn, resetApproval, networkClientId, hexChainId, isGasless ? txFee : undefined);
         transactions.push({
             type: isBridgeTx
                 ? TransactionType.bridgeApproval
                 : TransactionType.swapApproval,
-            params: toBatchTxParams(disable7702, resetApproval, gasFees),
+            params: toBatchTxParams(skipGasFields, resetApproval, gasFees),
         });
     }
     if (approval) {
-        const gasFees = await calculateGasFees(disable7702, messenger, estimateGasFeeFn, approval, networkClientId, hexChainId, isGasless ? txFee : undefined);
+        const gasFees = await calculateGasFees(skipGasFields, messenger, estimateGasFeeFn, approval, networkClientId, hexChainId, isGasless ? txFee : undefined);
         transactions.push({
             type: isBridgeTx
                 ? TransactionType.bridgeApproval
                 : TransactionType.swapApproval,
-            params: toBatchTxParams(disable7702, approval, gasFees),
+            params: toBatchTxParams(skipGasFields, approval, gasFees),
         });
     }
-    const gasFees = await calculateGasFees(disable7702, messenger, estimateGasFeeFn, trade, networkClientId, hexChainId, isGasless ? txFee : undefined);
+    const gasFees = await calculateGasFees(skipGasFields, messenger, estimateGasFeeFn, trade, networkClientId, hexChainId, isGasless ? txFee : undefined);
     transactions.push({
         type: isBridgeTx ? TransactionType.bridge : TransactionType.swap,
-        params: toBatchTxParams(disable7702, trade, gasFees),
+        params: toBatchTxParams(skipGasFields, trade, gasFees),
         assetsFiatValues: {
             sending: sentAmount?.valueInCurrency?.toString(),
             receiving: toTokenAmount?.valueInCurrency?.toString(),
@@ -272,6 +275,10 @@ export const findAndUpdateTransactionsInBatch = ({ messenger, updateTransactionF
     // This is a workaround to update the tx type after the tx is signed
     // TODO: remove this once the tx type for batch txs is preserved in the tx controller
     Object.entries(txDataByType).forEach(([txType, txData]) => {
+        // Skip types not present in the batch (e.g. swap entry is undefined for bridge txs)
+        if (txData === undefined) {
+            return;
+        }
         // Find transaction by batchId and either matching data or delegation characteristics
         const txMeta = txs.find((tx) => {
             if (tx.batchId !== batchId) {
@@ -285,12 +292,14 @@ export const findAndUpdateTransactionsInBatch = ({ messenger, updateTransactionF
             if (is7702Transaction) {
                 // For 7702 transactions, we need to match based on transaction type
                 // since the data field might be different (batch execute call)
-                if (txType === TransactionType.swap &&
+                if ((txType === TransactionType.swap ||
+                    txType === TransactionType.bridge) &&
                     tx.type === TransactionType.batch) {
                     return true;
                 }
                 // Also check if it's an approval transaction for 7702
-                if (txType === TransactionType.swapApproval &&
+                if ((txType === TransactionType.swapApproval ||
+                    txType === TransactionType.bridgeApproval) &&
                     tx.txParams.data === txData) {
                     return true;
                 }