@metamask/bridge-status-controller 68.0.2 → 69.0.0

package/dist/utils/intent-api.d.mts

@@ -1,8 +1,9 @@
+import { BridgeClientId, ChainId } from "@metamask/bridge-controller";
 import { TransactionStatus } from "@metamask/transaction-controller";
-import { IntentOrder, IntentOrderStatus } from "./validators.mjs";
+import { IntentStatusResponse, IntentOrderStatus } from "./validators.mjs";
 import type { FetchFunction, StatusResponse } from "../types.mjs";
 export type IntentSubmissionParams = {
-    srcChainId: string;
+    srcChainId: ChainId;
     quoteId: string;
     signature: string;
     order: unknown;
@@ -10,21 +11,21 @@ export type IntentSubmissionParams = {
     aggregatorId: string;
 };
 export type IntentApi = {
-    submitIntent(params: IntentSubmissionParams, clientId: string): Promise<IntentOrder>;
-    getOrderStatus(orderId: string, aggregatorId: string, srcChainId: string, clientId: string): Promise<IntentOrder>;
+    submitIntent(params: IntentSubmissionParams, clientId: BridgeClientId): Promise<IntentStatusResponse>;
+    getOrderStatus(orderId: string, aggregatorId: string, srcChainId: ChainId, clientId: BridgeClientId): Promise<IntentStatusResponse>;
 };
 export type GetJwtFn = () => Promise<string | undefined>;
 export declare class IntentApiImpl implements IntentApi {
     #private;
     constructor(baseUrl: string, fetchFn: FetchFunction, getJwt: GetJwtFn);
-    submitIntent(params: IntentSubmissionParams, clientId: string): Promise<IntentOrder>;
-    getOrderStatus(orderId: string, aggregatorId: string, srcChainId: string, clientId: string): Promise<IntentOrder>;
+    submitIntent(params: IntentSubmissionParams, clientId: BridgeClientId): Promise<IntentStatusResponse>;
+    getOrderStatus(orderId: string, aggregatorId: string, srcChainId: ChainId, clientId: BridgeClientId): Promise<IntentStatusResponse>;
 }
 export type IntentBridgeStatus = {
     status: StatusResponse;
     txHash?: string;
     transactionStatus: TransactionStatus;
 };
-export declare const translateIntentOrderToBridgeStatus: (intentOrder: IntentOrder, srcChainId: number, fallbackTxHash?: string) => IntentBridgeStatus;
+export declare const translateIntentOrderToBridgeStatus: (intentOrder: IntentStatusResponse, srcChainId: number, fallbackTxHash?: string) => IntentBridgeStatus;
 export declare function mapIntentOrderStatusToTransactionStatus(intentStatus: IntentOrderStatus): TransactionStatus;
 //# sourceMappingURL=intent-api.d.mts.map

package/dist/utils/intent-api.d.mts.map

@@ -1 +1 @@
-{"version":3,"file":"intent-api.d.mts","sourceRoot":"","sources":["../../src/utils/intent-api.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,iBAAiB,EAAE,yCAAyC;AAErE,OAAO,EACL,WAAW,EACX,iBAAiB,EAElB,yBAAqB;AACtB,OAAO,KAAK,EAAE,aAAa,EAAE,cAAc,EAAE,qBAAiB;AAE9D,MAAM,MAAM,sBAAsB,GAAG;IACnC,UAAU,EAAE,MAAM,CAAC;IACnB,OAAO,EAAE,MAAM,CAAC;IAChB,SAAS,EAAE,MAAM,CAAC;IAClB,KAAK,EAAE,OAAO,CAAC;IACf,WAAW,EAAE,MAAM,CAAC;IACpB,YAAY,EAAE,MAAM,CAAC;CACtB,CAAC;AAEF,MAAM,MAAM,SAAS,GAAG;IACtB,YAAY,CACV,MAAM,EAAE,sBAAsB,EAC9B,QAAQ,EAAE,MAAM,GACf,OAAO,CAAC,WAAW,CAAC,CAAC;IACxB,cAAc,CACZ,OAAO,EAAE,MAAM,EACf,YAAY,EAAE,MAAM,EACpB,UAAU,EAAE,MAAM,EAClB,QAAQ,EAAE,MAAM,GACf,OAAO,CAAC,WAAW,CAAC,CAAC;CACzB,CAAC;AAEF,MAAM,MAAM,QAAQ,GAAG,MAAM,OAAO,CAAC,MAAM,GAAG,SAAS,CAAC,CAAC;AAEzD,qBAAa,aAAc,YAAW,SAAS;;gBAOjC,OAAO,EAAE,MAAM,EAAE,OAAO,EAAE,aAAa,EAAE,MAAM,EAAE,QAAQ;IAM/D,YAAY,CAChB,MAAM,EAAE,sBAAsB,EAC9B,QAAQ,EAAE,MAAM,GACf,OAAO,CAAC,WAAW,CAAC;IAwBjB,cAAc,CAClB,OAAO,EAAE,MAAM,EACf,YAAY,EAAE,MAAM,EACpB,UAAU,EAAE,MAAM,EAClB,QAAQ,EAAE,MAAM,GACf,OAAO,CAAC,WAAW,CAAC;CAmBxB;AAED,MAAM,MAAM,kBAAkB,GAAG;IAC/B,MAAM,EAAE,cAAc,CAAC;IACvB,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,iBAAiB,EAAE,iBAAiB,CAAC;CACtC,CAAC;AAEF,eAAO,MAAM,kCAAkC,gBAChC,WAAW,cACZ,MAAM,mBACD,MAAM,KACtB,kBAsCF,CAAC;AAEF,wBAAgB,uCAAuC,CACrD,YAAY,EAAE,iBAAiB,GAC9B,iBAAiB,CAenB"}
+{"version":3,"file":"intent-api.d.mts","sourceRoot":"","sources":["../../src/utils/intent-api.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,cAAc,EACd,OAAO,EAGR,oCAAoC;AACrC,OAAO,EAAE,iBAAiB,EAAE,yCAAyC;AAErE,OAAO,EACL,oBAAoB,EACpB,iBAAiB,EAElB,yBAAqB;AACtB,OAAO,KAAK,EAAE,aAAa,EAAE,cAAc,EAAE,qBAAiB;AAE9D,MAAM,MAAM,sBAAsB,GAAG;IACnC,UAAU,EAAE,OAAO,CAAC;IACpB,OAAO,EAAE,MAAM,CAAC;IAChB,SAAS,EAAE,MAAM,CAAC;IAClB,KAAK,EAAE,OAAO,CAAC;IACf,WAAW,EAAE,MAAM,CAAC;IACpB,YAAY,EAAE,MAAM,CAAC;CACtB,CAAC;AAEF,MAAM,MAAM,SAAS,GAAG;IACtB,YAAY,CACV,MAAM,EAAE,sBAAsB,EAC9B,QAAQ,EAAE,cAAc,GACvB,OAAO,CAAC,oBAAoB,CAAC,CAAC;IACjC,cAAc,CACZ,OAAO,EAAE,MAAM,EACf,YAAY,EAAE,MAAM,EACpB,UAAU,EAAE,OAAO,EACnB,QAAQ,EAAE,cAAc,GACvB,OAAO,CAAC,oBAAoB,CAAC,CAAC;CAClC,CAAC;AAEF,MAAM,MAAM,QAAQ,GAAG,MAAM,OAAO,CAAC,MAAM,GAAG,SAAS,CAAC,CAAC;AAEzD,qBAAa,aAAc,YAAW,SAAS;;gBAOjC,OAAO,EAAE,MAAM,EAAE,OAAO,EAAE,aAAa,EAAE,MAAM,EAAE,QAAQ;IAM/D,YAAY,CAChB,MAAM,EAAE,sBAAsB,EAC9B,QAAQ,EAAE,cAAc,GACvB,OAAO,CAAC,oBAAoB,CAAC;IAwB1B,cAAc,CAClB,OAAO,EAAE,MAAM,EACf,YAAY,EAAE,MAAM,EACpB,UAAU,EAAE,OAAO,EACnB,QAAQ,EAAE,cAAc,GACvB,OAAO,CAAC,oBAAoB,CAAC;CAmBjC;AAED,MAAM,MAAM,kBAAkB,GAAG;IAC/B,MAAM,EAAE,cAAc,CAAC;IACvB,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,iBAAiB,EAAE,iBAAiB,CAAC;CACtC,CAAC;AAEF,eAAO,MAAM,kCAAkC,gBAChC,oBAAoB,cACrB,MAAM,mBACD,MAAM,KACtB,kBAsCF,CAAC;AAEF,wBAAgB,uCAAuC,CACrD,YAAY,EAAE,iBAAiB,GAC9B,iBAAiB,CAenB"}

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/metrics.cjs

@@ -107,10 +107,11 @@ exports.getPriceImpactFromQuote = getPriceImpactFromQuote;
  * @param isStxEnabledOnClient - Whether smart transactions are enabled on the client, for example the getSmartTransactionsEnabled selector value from the extension
  * @param isHardwareAccount - whether the tx is submitted using a hardware wallet
  * @param location - The entry point from which the user initiated the swap or bridge (e.g. Main View, Token View, Trending Explore)
- * @param abTests - A/B test context to attribute events to specific experiments
+ * @param abTests - Legacy A/B test context for `ab_tests` (backward compatibility)
+ * @param activeAbTests - New A/B test context for `active_ab_tests` (migration target)
  * @returns The properties for the pre-confirmation event
  */
-const getPreConfirmationPropertiesFromQuote = (quoteResponse, isStxEnabledOnClient, isHardwareAccount, location = bridge_controller_1.MetaMetricsSwapsEventSource.MainView, abTests) => {
+const getPreConfirmationPropertiesFromQuote = (quoteResponse, isStxEnabledOnClient, isHardwareAccount, location = bridge_controller_1.MetaMetricsSwapsEventSource.MainView, abTests, activeAbTests) => {
     const { quote } = quoteResponse;
     return {
         ...(0, exports.getPriceImpactFromQuote)(quote),
@@ -126,7 +127,14 @@ const getPreConfirmationPropertiesFromQuote = (quoteResponse, isStxEnabledOnClie
         action_type: bridge_controller_1.MetricsActionType.SWAPBRIDGE_V1,
         custom_slippage: false, // TODO detect whether the user changed the default slippage
         location,
-        ...(abTests && Object.keys(abTests).length > 0 && { ab_tests: abTests }),
+        ...(abTests &&
+            Object.keys(abTests).length > 0 && {
+            ab_tests: abTests,
+        }),
+        ...(activeAbTests &&
+            activeAbTests.length > 0 && {
+            active_ab_tests: activeAbTests,
+        }),
     };
 };
 exports.getPreConfirmationPropertiesFromQuote = getPreConfirmationPropertiesFromQuote;

package/dist/utils/metrics.cjs.map

@@ -1 +1 @@
-{"version":3,"file":"metrics.cjs","sourceRoot":"","sources":["../../src/utils/metrics.ts"],"names":[],"mappings":"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","sourcesContent":["/* eslint-disable camelcase */\n/* eslint-disable @typescript-eslint/naming-convention */\n/* eslint-disable @typescript-eslint/explicit-function-return-type */\nimport type { AccountsControllerState } from '@metamask/accounts-controller';\nimport {\n  StatusTypes,\n  formatChainIdToHex,\n  isEthUsdt,\n  formatChainIdToCaip,\n  formatProviderLabel,\n  isCustomSlippage,\n  getSwapType,\n  isHardwareWallet,\n  formatAddressToAssetId,\n  MetricsActionType,\n  MetricsSwapType,\n  MetaMetricsSwapsEventSource,\n} from '@metamask/bridge-controller';\nimport type {\n  QuoteFetchData,\n  QuoteMetadata,\n  QuoteResponse,\n  TxStatusData,\n  RequestParams,\n  TradeData,\n  RequestMetadata,\n} from '@metamask/bridge-controller';\nimport {\n  TransactionStatus,\n  TransactionType,\n} from '@metamask/transaction-controller';\nimport type { TransactionMeta } from '@metamask/transaction-controller';\nimport type { CaipAssetType } from '@metamask/utils';\nimport { BigNumber } from 'bignumber.js';\n\nimport { calcActualGasUsed } from './gas';\nimport {\n  getActualBridgeReceivedAmount,\n  getActualSwapReceivedAmount,\n} from './swap-received-amount';\nimport type { BridgeHistoryItem } from '../types';\n\nexport const getTxStatusesFromHistory = ({\n  status,\n  hasApprovalTx,\n  approvalTxId,\n  quote,\n}: BridgeHistoryItem): TxStatusData => {\n  const source_transaction = status.srcChain.txHash\n    ? StatusTypes.COMPLETE\n    : StatusTypes.PENDING;\n  const destination_transaction = status.destChain?.txHash\n    ? status.status\n    : StatusTypes.PENDING;\n\n  const hexChainId = formatChainIdToHex(quote.srcChainId);\n  const isEthUsdtTx = isEthUsdt(hexChainId, quote.srcAsset.address);\n  const allowance_reset_transaction = status.srcChain.txHash\n    ? StatusTypes.COMPLETE\n    : undefined;\n  const approval_transaction = status.srcChain.txHash\n    ? StatusTypes.COMPLETE\n    : StatusTypes.PENDING;\n\n  return {\n    allowance_reset_transaction: isEthUsdtTx\n      ? allowance_reset_transaction\n      : undefined,\n    approval_transaction:\n      hasApprovalTx || approvalTxId ? approval_transaction : undefined,\n    source_transaction,\n    destination_transaction:\n      status.status === StatusTypes.FAILED\n        ? StatusTypes.FAILED\n        : destination_transaction,\n  };\n};\n\n/**\n * Calculate the properties for a finalized transaction event based on the txHistory\n * and txMeta\n *\n * @param historyItem - The bridge history item\n * @param txMeta - The transaction meta from the TransactionController\n * @param approvalTxMeta - The approval transaction meta from the TransactionController\n * @returns The properties for the finalized transaction\n */\nexport const getFinalizedTxProperties = (\n  historyItem: BridgeHistoryItem,\n  txMeta?: TransactionMeta,\n  approvalTxMeta?: TransactionMeta,\n) => {\n  const startTime =\n    approvalTxMeta?.submittedTime ??\n    txMeta?.submittedTime ??\n    historyItem.startTime;\n  const completionTime =\n    txMeta?.type === TransactionType.swap\n      ? txMeta?.time\n      : historyItem.completionTime;\n\n  const actualGas = calcActualGasUsed(\n    historyItem,\n    txMeta?.txReceipt,\n    approvalTxMeta?.txReceipt,\n  );\n\n  const actualReturn =\n    txMeta?.type === TransactionType.swap\n      ? getActualSwapReceivedAmount(historyItem, actualGas, txMeta)\n      : getActualBridgeReceivedAmount(historyItem);\n\n  const quotedVsUsedGasRatio =\n    historyItem.pricingData?.quotedGasAmount && actualGas?.amount\n      ? new BigNumber(historyItem.pricingData.quotedGasAmount)\n          .multipliedBy(new BigNumber(10).pow(18))\n          .div(actualGas.amount)\n          .toNumber()\n      : 0;\n\n  const quoteVsExecutionRatio =\n    historyItem.pricingData?.quotedReturnInUsd && actualReturn?.usd\n      ? new BigNumber(historyItem.pricingData.quotedReturnInUsd)\n          .div(actualReturn.usd)\n          .toNumber()\n      : 0;\n\n  return {\n    actual_time_minutes:\n      completionTime && startTime ? (completionTime - startTime) / 60000 : 0,\n    usd_actual_return: Number(actualReturn?.usd ?? 0),\n    usd_actual_gas: actualGas?.usd ?? 0,\n    quote_vs_execution_ratio: quoteVsExecutionRatio,\n    quoted_vs_used_gas_ratio: quotedVsUsedGasRatio,\n  };\n};\n\nexport const getRequestParamFromHistory = (\n  historyItem: BridgeHistoryItem,\n): RequestParams => {\n  return {\n    chain_id_source: formatChainIdToCaip(historyItem.quote.srcChainId),\n    token_symbol_source: historyItem.quote.srcAsset.symbol,\n    token_address_source: historyItem.quote.srcAsset.assetId,\n    chain_id_destination: formatChainIdToCaip(historyItem.quote.destChainId),\n    token_symbol_destination: historyItem.quote.destAsset.symbol,\n    token_address_destination: historyItem.quote.destAsset.assetId,\n  };\n};\n\nexport const getTradeDataFromQuote = (\n  quoteResponse: QuoteResponse & Partial<QuoteMetadata>,\n): TradeData => {\n  return {\n    usd_quoted_gas: Number(quoteResponse.gasFee?.effective?.usd ?? 0),\n    gas_included: quoteResponse.quote.gasIncluded ?? false,\n    gas_included_7702: quoteResponse.quote.gasIncluded7702 ?? false,\n    provider: formatProviderLabel(quoteResponse.quote),\n    quoted_time_minutes: Number(\n      quoteResponse.estimatedProcessingTimeInSeconds / 60,\n    ),\n    usd_quoted_return: Number(quoteResponse.adjustedReturn?.usd ?? 0),\n  };\n};\n\nexport const getPriceImpactFromQuote = (\n  quote: QuoteResponse['quote'],\n): Pick<QuoteFetchData, 'price_impact'> => {\n  return { price_impact: Number(quote.priceData?.priceImpact ?? '0') };\n};\n\n/**\n * Before the tx is confirmed, its data is not available in txHistory\n * The quote is used to populate event properties before confirmation\n *\n * @param quoteResponse - The quote response\n * @param isStxEnabledOnClient - Whether smart transactions are enabled on the client, for example the getSmartTransactionsEnabled selector value from the extension\n * @param isHardwareAccount - whether the tx is submitted using a hardware wallet\n * @param location - The entry point from which the user initiated the swap or bridge (e.g. Main View, Token View, Trending Explore)\n * @param abTests - A/B test context to attribute events to specific experiments\n * @returns The properties for the pre-confirmation event\n */\nexport const getPreConfirmationPropertiesFromQuote = (\n  quoteResponse: QuoteResponse & Partial<QuoteMetadata>,\n  isStxEnabledOnClient: boolean,\n  isHardwareAccount: boolean,\n  location: MetaMetricsSwapsEventSource = MetaMetricsSwapsEventSource.MainView,\n  abTests?: Record<string, string>,\n) => {\n  const { quote } = quoteResponse;\n  return {\n    ...getPriceImpactFromQuote(quote),\n    ...getTradeDataFromQuote(quoteResponse),\n    chain_id_source: formatChainIdToCaip(quote.srcChainId),\n    token_symbol_source: quote.srcAsset.symbol,\n    chain_id_destination: formatChainIdToCaip(quote.destChainId),\n    token_symbol_destination: quote.destAsset.symbol,\n    is_hardware_wallet: isHardwareAccount,\n    swap_type: getSwapType(\n      quoteResponse.quote.srcChainId,\n      quoteResponse.quote.destChainId,\n    ),\n    usd_amount_source: Number(quoteResponse.sentAmount?.usd ?? 0),\n    stx_enabled: isStxEnabledOnClient,\n    action_type: MetricsActionType.SWAPBRIDGE_V1,\n    custom_slippage: false, // TODO detect whether the user changed the default slippage\n    location,\n    ...(abTests && Object.keys(abTests).length > 0 && { ab_tests: abTests }),\n  };\n};\n\nexport const getTradeDataFromHistory = (\n  historyItem: BridgeHistoryItem,\n): TradeData => {\n  return {\n    usd_quoted_gas: Number(historyItem.pricingData?.quotedGasInUsd ?? 0),\n    gas_included: historyItem.quote.gasIncluded ?? false,\n    gas_included_7702: historyItem.quote.gasIncluded7702 ?? false,\n    provider: formatProviderLabel(historyItem.quote),\n    quoted_time_minutes: Number(\n      historyItem.estimatedProcessingTimeInSeconds / 60,\n    ),\n    usd_quoted_return: Number(historyItem.pricingData?.quotedReturnInUsd ?? 0),\n  };\n};\n\nexport const getRequestMetadataFromHistory = (\n  historyItem: BridgeHistoryItem,\n  account?: AccountsControllerState['internalAccounts']['accounts'][string],\n): RequestMetadata => {\n  const { quote, slippagePercentage, isStxEnabled } = historyItem;\n\n  return {\n    slippage_limit: slippagePercentage,\n    custom_slippage: isCustomSlippage(slippagePercentage),\n    usd_amount_source: Number(historyItem.pricingData?.amountSentInUsd ?? 0),\n    swap_type: getSwapType(quote.srcChainId, quote.destChainId),\n    is_hardware_wallet: isHardwareWallet(account),\n    stx_enabled: isStxEnabled ?? false,\n    security_warnings: [],\n  };\n};\n\n/**\n * Get the properties for a swap transaction that is not in the txHistory\n *\n * @param transactionMeta - The transaction meta\n * @returns The properties for the swap transaction\n */\nexport const getEVMTxPropertiesFromTransactionMeta = (\n  transactionMeta: TransactionMeta,\n) => {\n  return {\n    source_transaction: [\n      TransactionStatus.failed,\n      TransactionStatus.dropped,\n      TransactionStatus.rejected,\n    ].includes(transactionMeta.status)\n      ? StatusTypes.FAILED\n      : StatusTypes.COMPLETE,\n    error_message: transactionMeta.error?.message ?? '',\n    chain_id_source: formatChainIdToCaip(transactionMeta.chainId),\n    chain_id_destination: formatChainIdToCaip(transactionMeta.chainId),\n    token_symbol_source: transactionMeta.sourceTokenSymbol ?? '',\n    token_symbol_destination: transactionMeta.destinationTokenSymbol ?? '',\n    usd_amount_source: 0,\n    stx_enabled: false,\n    token_address_source:\n      formatAddressToAssetId(\n        transactionMeta.sourceTokenAddress ?? '',\n        transactionMeta.chainId,\n      ) ?? ('' as CaipAssetType),\n    token_address_destination:\n      formatAddressToAssetId(\n        transactionMeta.destinationTokenAddress ?? '',\n        transactionMeta.chainId,\n      ) ?? ('' as CaipAssetType),\n    custom_slippage: false,\n    is_hardware_wallet: false,\n    swap_type:\n      transactionMeta.type &&\n      [TransactionType.swap, TransactionType.swapApproval].includes(\n        transactionMeta.type,\n      )\n        ? MetricsSwapType.SINGLE\n        : MetricsSwapType.CROSSCHAIN,\n    security_warnings: [],\n    price_impact: 0,\n    usd_quoted_gas: 0,\n    gas_included: false,\n    gas_included_7702: false,\n    quoted_time_minutes: 0,\n    usd_quoted_return: 0,\n    provider: '' as `${string}_${string}`,\n    actual_time_minutes: 0,\n    quote_vs_execution_ratio: 0,\n    quoted_vs_used_gas_ratio: 0,\n    usd_actual_return: 0,\n    usd_actual_gas: 0,\n    action_type: MetricsActionType.SWAPBRIDGE_V1,\n  };\n};\n"]}
+{"version":3,"file":"metrics.cjs","sourceRoot":"","sources":["../../src/utils/metrics.ts"],"names":[],"mappings":"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","sourcesContent":["/* eslint-disable camelcase */\n/* eslint-disable @typescript-eslint/naming-convention */\n/* eslint-disable @typescript-eslint/explicit-function-return-type */\nimport type { AccountsControllerState } from '@metamask/accounts-controller';\nimport {\n  StatusTypes,\n  formatChainIdToHex,\n  isEthUsdt,\n  formatChainIdToCaip,\n  formatProviderLabel,\n  isCustomSlippage,\n  getSwapType,\n  isHardwareWallet,\n  formatAddressToAssetId,\n  MetricsActionType,\n  MetricsSwapType,\n  MetaMetricsSwapsEventSource,\n} from '@metamask/bridge-controller';\nimport type {\n  QuoteFetchData,\n  QuoteMetadata,\n  QuoteResponse,\n  TxStatusData,\n  RequestParams,\n  TradeData,\n  RequestMetadata,\n} from '@metamask/bridge-controller';\nimport {\n  TransactionStatus,\n  TransactionType,\n} from '@metamask/transaction-controller';\nimport type { TransactionMeta } from '@metamask/transaction-controller';\nimport type { CaipAssetType } from '@metamask/utils';\nimport { BigNumber } from 'bignumber.js';\n\nimport { calcActualGasUsed } from './gas';\nimport {\n  getActualBridgeReceivedAmount,\n  getActualSwapReceivedAmount,\n} from './swap-received-amount';\nimport type { BridgeHistoryItem } from '../types';\n\nexport const getTxStatusesFromHistory = ({\n  status,\n  hasApprovalTx,\n  approvalTxId,\n  quote,\n}: BridgeHistoryItem): TxStatusData => {\n  const source_transaction = status.srcChain.txHash\n    ? StatusTypes.COMPLETE\n    : StatusTypes.PENDING;\n  const destination_transaction = status.destChain?.txHash\n    ? status.status\n    : StatusTypes.PENDING;\n\n  const hexChainId = formatChainIdToHex(quote.srcChainId);\n  const isEthUsdtTx = isEthUsdt(hexChainId, quote.srcAsset.address);\n  const allowance_reset_transaction = status.srcChain.txHash\n    ? StatusTypes.COMPLETE\n    : undefined;\n  const approval_transaction = status.srcChain.txHash\n    ? StatusTypes.COMPLETE\n    : StatusTypes.PENDING;\n\n  return {\n    allowance_reset_transaction: isEthUsdtTx\n      ? allowance_reset_transaction\n      : undefined,\n    approval_transaction:\n      hasApprovalTx || approvalTxId ? approval_transaction : undefined,\n    source_transaction,\n    destination_transaction:\n      status.status === StatusTypes.FAILED\n        ? StatusTypes.FAILED\n        : destination_transaction,\n  };\n};\n\n/**\n * Calculate the properties for a finalized transaction event based on the txHistory\n * and txMeta\n *\n * @param historyItem - The bridge history item\n * @param txMeta - The transaction meta from the TransactionController\n * @param approvalTxMeta - The approval transaction meta from the TransactionController\n * @returns The properties for the finalized transaction\n */\nexport const getFinalizedTxProperties = (\n  historyItem: BridgeHistoryItem,\n  txMeta?: TransactionMeta,\n  approvalTxMeta?: TransactionMeta,\n) => {\n  const startTime =\n    approvalTxMeta?.submittedTime ??\n    txMeta?.submittedTime ??\n    historyItem.startTime;\n  const completionTime =\n    txMeta?.type === TransactionType.swap\n      ? txMeta?.time\n      : historyItem.completionTime;\n\n  const actualGas = calcActualGasUsed(\n    historyItem,\n    txMeta?.txReceipt,\n    approvalTxMeta?.txReceipt,\n  );\n\n  const actualReturn =\n    txMeta?.type === TransactionType.swap\n      ? getActualSwapReceivedAmount(historyItem, actualGas, txMeta)\n      : getActualBridgeReceivedAmount(historyItem);\n\n  const quotedVsUsedGasRatio =\n    historyItem.pricingData?.quotedGasAmount && actualGas?.amount\n      ? new BigNumber(historyItem.pricingData.quotedGasAmount)\n          .multipliedBy(new BigNumber(10).pow(18))\n          .div(actualGas.amount)\n          .toNumber()\n      : 0;\n\n  const quoteVsExecutionRatio =\n    historyItem.pricingData?.quotedReturnInUsd && actualReturn?.usd\n      ? new BigNumber(historyItem.pricingData.quotedReturnInUsd)\n          .div(actualReturn.usd)\n          .toNumber()\n      : 0;\n\n  return {\n    actual_time_minutes:\n      completionTime && startTime ? (completionTime - startTime) / 60000 : 0,\n    usd_actual_return: Number(actualReturn?.usd ?? 0),\n    usd_actual_gas: actualGas?.usd ?? 0,\n    quote_vs_execution_ratio: quoteVsExecutionRatio,\n    quoted_vs_used_gas_ratio: quotedVsUsedGasRatio,\n  };\n};\n\nexport const getRequestParamFromHistory = (\n  historyItem: BridgeHistoryItem,\n): RequestParams => {\n  return {\n    chain_id_source: formatChainIdToCaip(historyItem.quote.srcChainId),\n    token_symbol_source: historyItem.quote.srcAsset.symbol,\n    token_address_source: historyItem.quote.srcAsset.assetId,\n    chain_id_destination: formatChainIdToCaip(historyItem.quote.destChainId),\n    token_symbol_destination: historyItem.quote.destAsset.symbol,\n    token_address_destination: historyItem.quote.destAsset.assetId,\n  };\n};\n\nexport const getTradeDataFromQuote = (\n  quoteResponse: QuoteResponse & Partial<QuoteMetadata>,\n): TradeData => {\n  return {\n    usd_quoted_gas: Number(quoteResponse.gasFee?.effective?.usd ?? 0),\n    gas_included: quoteResponse.quote.gasIncluded ?? false,\n    gas_included_7702: quoteResponse.quote.gasIncluded7702 ?? false,\n    provider: formatProviderLabel(quoteResponse.quote),\n    quoted_time_minutes: Number(\n      quoteResponse.estimatedProcessingTimeInSeconds / 60,\n    ),\n    usd_quoted_return: Number(quoteResponse.adjustedReturn?.usd ?? 0),\n  };\n};\n\nexport const getPriceImpactFromQuote = (\n  quote: QuoteResponse['quote'],\n): Pick<QuoteFetchData, 'price_impact'> => {\n  return { price_impact: Number(quote.priceData?.priceImpact ?? '0') };\n};\n\n/**\n * Before the tx is confirmed, its data is not available in txHistory\n * The quote is used to populate event properties before confirmation\n *\n * @param quoteResponse - The quote response\n * @param isStxEnabledOnClient - Whether smart transactions are enabled on the client, for example the getSmartTransactionsEnabled selector value from the extension\n * @param isHardwareAccount - whether the tx is submitted using a hardware wallet\n * @param location - The entry point from which the user initiated the swap or bridge (e.g. Main View, Token View, Trending Explore)\n * @param abTests - Legacy A/B test context for `ab_tests` (backward compatibility)\n * @param activeAbTests - New A/B test context for `active_ab_tests` (migration target)\n * @returns The properties for the pre-confirmation event\n */\nexport const getPreConfirmationPropertiesFromQuote = (\n  quoteResponse: QuoteResponse & Partial<QuoteMetadata>,\n  isStxEnabledOnClient: boolean,\n  isHardwareAccount: boolean,\n  location: MetaMetricsSwapsEventSource = MetaMetricsSwapsEventSource.MainView,\n  abTests?: Record<string, string>,\n  activeAbTests?: { key: string; value: string }[],\n) => {\n  const { quote } = quoteResponse;\n  return {\n    ...getPriceImpactFromQuote(quote),\n    ...getTradeDataFromQuote(quoteResponse),\n    chain_id_source: formatChainIdToCaip(quote.srcChainId),\n    token_symbol_source: quote.srcAsset.symbol,\n    chain_id_destination: formatChainIdToCaip(quote.destChainId),\n    token_symbol_destination: quote.destAsset.symbol,\n    is_hardware_wallet: isHardwareAccount,\n    swap_type: getSwapType(\n      quoteResponse.quote.srcChainId,\n      quoteResponse.quote.destChainId,\n    ),\n    usd_amount_source: Number(quoteResponse.sentAmount?.usd ?? 0),\n    stx_enabled: isStxEnabledOnClient,\n    action_type: MetricsActionType.SWAPBRIDGE_V1,\n    custom_slippage: false, // TODO detect whether the user changed the default slippage\n    location,\n    ...(abTests &&\n      Object.keys(abTests).length > 0 && {\n        ab_tests: abTests,\n      }),\n    ...(activeAbTests &&\n      activeAbTests.length > 0 && {\n        active_ab_tests: activeAbTests,\n      }),\n  };\n};\n\nexport const getTradeDataFromHistory = (\n  historyItem: BridgeHistoryItem,\n): TradeData => {\n  return {\n    usd_quoted_gas: Number(historyItem.pricingData?.quotedGasInUsd ?? 0),\n    gas_included: historyItem.quote.gasIncluded ?? false,\n    gas_included_7702: historyItem.quote.gasIncluded7702 ?? false,\n    provider: formatProviderLabel(historyItem.quote),\n    quoted_time_minutes: Number(\n      historyItem.estimatedProcessingTimeInSeconds / 60,\n    ),\n    usd_quoted_return: Number(historyItem.pricingData?.quotedReturnInUsd ?? 0),\n  };\n};\n\nexport const getRequestMetadataFromHistory = (\n  historyItem: BridgeHistoryItem,\n  account?: AccountsControllerState['internalAccounts']['accounts'][string],\n): RequestMetadata => {\n  const { quote, slippagePercentage, isStxEnabled } = historyItem;\n\n  return {\n    slippage_limit: slippagePercentage,\n    custom_slippage: isCustomSlippage(slippagePercentage),\n    usd_amount_source: Number(historyItem.pricingData?.amountSentInUsd ?? 0),\n    swap_type: getSwapType(quote.srcChainId, quote.destChainId),\n    is_hardware_wallet: isHardwareWallet(account),\n    stx_enabled: isStxEnabled ?? false,\n    security_warnings: [],\n  };\n};\n\n/**\n * Get the properties for a swap transaction that is not in the txHistory\n *\n * @param transactionMeta - The transaction meta\n * @returns The properties for the swap transaction\n */\nexport const getEVMTxPropertiesFromTransactionMeta = (\n  transactionMeta: TransactionMeta,\n) => {\n  return {\n    source_transaction: [\n      TransactionStatus.failed,\n      TransactionStatus.dropped,\n      TransactionStatus.rejected,\n    ].includes(transactionMeta.status)\n      ? StatusTypes.FAILED\n      : StatusTypes.COMPLETE,\n    error_message: transactionMeta.error?.message ?? '',\n    chain_id_source: formatChainIdToCaip(transactionMeta.chainId),\n    chain_id_destination: formatChainIdToCaip(transactionMeta.chainId),\n    token_symbol_source: transactionMeta.sourceTokenSymbol ?? '',\n    token_symbol_destination: transactionMeta.destinationTokenSymbol ?? '',\n    usd_amount_source: 0,\n    stx_enabled: false,\n    token_address_source:\n      formatAddressToAssetId(\n        transactionMeta.sourceTokenAddress ?? '',\n        transactionMeta.chainId,\n      ) ?? ('' as CaipAssetType),\n    token_address_destination:\n      formatAddressToAssetId(\n        transactionMeta.destinationTokenAddress ?? '',\n        transactionMeta.chainId,\n      ) ?? ('' as CaipAssetType),\n    custom_slippage: false,\n    is_hardware_wallet: false,\n    swap_type:\n      transactionMeta.type &&\n      [TransactionType.swap, TransactionType.swapApproval].includes(\n        transactionMeta.type,\n      )\n        ? MetricsSwapType.SINGLE\n        : MetricsSwapType.CROSSCHAIN,\n    security_warnings: [],\n    price_impact: 0,\n    usd_quoted_gas: 0,\n    gas_included: false,\n    gas_included_7702: false,\n    quoted_time_minutes: 0,\n    usd_quoted_return: 0,\n    provider: '' as `${string}_${string}`,\n    actual_time_minutes: 0,\n    quote_vs_execution_ratio: 0,\n    quoted_vs_used_gas_ratio: 0,\n    usd_actual_return: 0,\n    usd_actual_gas: 0,\n    action_type: MetricsActionType.SWAPBRIDGE_V1,\n  };\n};\n"]}

package/dist/utils/metrics.d.cts

@@ -31,10 +31,18 @@ export declare const getPriceImpactFromQuote: (quote: QuoteResponse['quote']) =>
  * @param isStxEnabledOnClient - Whether smart transactions are enabled on the client, for example the getSmartTransactionsEnabled selector value from the extension
  * @param isHardwareAccount - whether the tx is submitted using a hardware wallet
  * @param location - The entry point from which the user initiated the swap or bridge (e.g. Main View, Token View, Trending Explore)
- * @param abTests - A/B test context to attribute events to specific experiments
+ * @param abTests - Legacy A/B test context for `ab_tests` (backward compatibility)
+ * @param activeAbTests - New A/B test context for `active_ab_tests` (migration target)
  * @returns The properties for the pre-confirmation event
  */
-export declare const getPreConfirmationPropertiesFromQuote: (quoteResponse: QuoteResponse & Partial<QuoteMetadata>, isStxEnabledOnClient: boolean, isHardwareAccount: boolean, location?: MetaMetricsSwapsEventSource, abTests?: Record<string, string>) => {
+export declare const getPreConfirmationPropertiesFromQuote: (quoteResponse: QuoteResponse & Partial<QuoteMetadata>, isStxEnabledOnClient: boolean, isHardwareAccount: boolean, location?: MetaMetricsSwapsEventSource, abTests?: Record<string, string>, activeAbTests?: {
+    key: string;
+    value: string;
+}[]) => {
+    active_ab_tests?: {
+        key: string;
+        value: string;
+    }[] | undefined;
     ab_tests?: Record<string, string> | undefined;
     chain_id_source: `${string}:${string}`;
     token_symbol_source: string;

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

@@ -1 +1 @@
-{"version":3,"file":"metrics.d.cts","sourceRoot":"","sources":["../../src/utils/metrics.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,EAAE,uBAAuB,EAAE,sCAAsC;AAC7E,OAAO,EACL,WAAW,EASX,iBAAiB,EACjB,eAAe,EACf,2BAA2B,EAC5B,oCAAoC;AACrC,OAAO,KAAK,EACV,cAAc,EACd,aAAa,EACb,aAAa,EACb,YAAY,EACZ,aAAa,EACb,SAAS,EACT,eAAe,EAChB,oCAAoC;AAKrC,OAAO,KAAK,EAAE,eAAe,EAAE,yCAAyC;AASxE,OAAO,KAAK,EAAE,iBAAiB,EAAE,qBAAiB;AAElD,eAAO,MAAM,wBAAwB,oDAKlC,iBAAiB,KAAG,YA6BtB,CAAC;AAEF;;;;;;;;GAQG;AACH,eAAO,MAAM,wBAAwB,gBACtB,iBAAiB,WACrB,eAAe,mBACP,eAAe;;;;;;CA6CjC,CAAC;AAEF,eAAO,MAAM,0BAA0B,gBACxB,iBAAiB,KAC7B,aASF,CAAC;AAEF,eAAO,MAAM,qBAAqB,kBACjB,aAAa,GAAG,QAAQ,aAAa,CAAC,KACpD,SAWF,CAAC;AAEF,eAAO,MAAM,uBAAuB,UAC3B,aAAa,CAAC,OAAO,CAAC,KAC5B,KAAK,cAAc,EAAE,cAAc,CAErC,CAAC;AAEF;;;;;;;;;;GAUG;AACH,eAAO,MAAM,qCAAqC,kBACjC,aAAa,GAAG,QAAQ,aAAa,CAAC,wBAC/B,OAAO,qBACV,OAAO,aAChB,2BAA2B,YAC3B,OAAO,MAAM,EAAE,MAAM,CAAC;;;;;;;;;;;;;;;;;;;;CAsBjC,CAAC;AAEF,eAAO,MAAM,uBAAuB,gBACrB,iBAAiB,KAC7B,SAWF,CAAC;AAEF,eAAO,MAAM,6BAA6B,gBAC3B,iBAAiB,YACpB,uBAAuB,CAAC,kBAAkB,CAAC,CAAC,UAAU,CAAC,CAAC,MAAM,CAAC,KACxE,eAYF,CAAC;AAEF;;;;;GAKG;AACH,eAAO,MAAM,qCAAqC,oBAC/B,eAAe;;;;;;;;;;;;;;;;;;;;;;;;;;;;CAmDjC,CAAC"}
+{"version":3,"file":"metrics.d.cts","sourceRoot":"","sources":["../../src/utils/metrics.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,EAAE,uBAAuB,EAAE,sCAAsC;AAC7E,OAAO,EACL,WAAW,EASX,iBAAiB,EACjB,eAAe,EACf,2BAA2B,EAC5B,oCAAoC;AACrC,OAAO,KAAK,EACV,cAAc,EACd,aAAa,EACb,aAAa,EACb,YAAY,EACZ,aAAa,EACb,SAAS,EACT,eAAe,EAChB,oCAAoC;AAKrC,OAAO,KAAK,EAAE,eAAe,EAAE,yCAAyC;AASxE,OAAO,KAAK,EAAE,iBAAiB,EAAE,qBAAiB;AAElD,eAAO,MAAM,wBAAwB,oDAKlC,iBAAiB,KAAG,YA6BtB,CAAC;AAEF;;;;;;;;GAQG;AACH,eAAO,MAAM,wBAAwB,gBACtB,iBAAiB,WACrB,eAAe,mBACP,eAAe;;;;;;CA6CjC,CAAC;AAEF,eAAO,MAAM,0BAA0B,gBACxB,iBAAiB,KAC7B,aASF,CAAC;AAEF,eAAO,MAAM,qBAAqB,kBACjB,aAAa,GAAG,QAAQ,aAAa,CAAC,KACpD,SAWF,CAAC;AAEF,eAAO,MAAM,uBAAuB,UAC3B,aAAa,CAAC,OAAO,CAAC,KAC5B,KAAK,cAAc,EAAE,cAAc,CAErC,CAAC;AAEF;;;;;;;;;;;GAWG;AACH,eAAO,MAAM,qCAAqC,kBACjC,aAAa,GAAG,QAAQ,aAAa,CAAC,wBAC/B,OAAO,qBACV,OAAO,aAChB,2BAA2B,YAC3B,OAAO,MAAM,EAAE,MAAM,CAAC,kBAChB;IAAE,GAAG,EAAE,MAAM,CAAC;IAAC,KAAK,EAAE,MAAM,CAAA;CAAE,EAAE;;aAAzB,MAAM;eAAS,MAAM;;;;;;;;;;;;;;;;;;;;;CA6B7C,CAAC;AAEF,eAAO,MAAM,uBAAuB,gBACrB,iBAAiB,KAC7B,SAWF,CAAC;AAEF,eAAO,MAAM,6BAA6B,gBAC3B,iBAAiB,YACpB,uBAAuB,CAAC,kBAAkB,CAAC,CAAC,UAAU,CAAC,CAAC,MAAM,CAAC,KACxE,eAYF,CAAC;AAEF;;;;;GAKG;AACH,eAAO,MAAM,qCAAqC,oBAC/B,eAAe;;;;;;;;;;;;;;;;;;;;;;;;;;;;CAmDjC,CAAC"}

package/dist/utils/metrics.d.mts

@@ -31,10 +31,18 @@ export declare const getPriceImpactFromQuote: (quote: QuoteResponse['quote']) =>
  * @param isStxEnabledOnClient - Whether smart transactions are enabled on the client, for example the getSmartTransactionsEnabled selector value from the extension
  * @param isHardwareAccount - whether the tx is submitted using a hardware wallet
  * @param location - The entry point from which the user initiated the swap or bridge (e.g. Main View, Token View, Trending Explore)
- * @param abTests - A/B test context to attribute events to specific experiments
+ * @param abTests - Legacy A/B test context for `ab_tests` (backward compatibility)
+ * @param activeAbTests - New A/B test context for `active_ab_tests` (migration target)
  * @returns The properties for the pre-confirmation event
  */
-export declare const getPreConfirmationPropertiesFromQuote: (quoteResponse: QuoteResponse & Partial<QuoteMetadata>, isStxEnabledOnClient: boolean, isHardwareAccount: boolean, location?: MetaMetricsSwapsEventSource, abTests?: Record<string, string>) => {
+export declare const getPreConfirmationPropertiesFromQuote: (quoteResponse: QuoteResponse & Partial<QuoteMetadata>, isStxEnabledOnClient: boolean, isHardwareAccount: boolean, location?: MetaMetricsSwapsEventSource, abTests?: Record<string, string>, activeAbTests?: {
+    key: string;
+    value: string;
+}[]) => {
+    active_ab_tests?: {
+        key: string;
+        value: string;
+    }[] | undefined;
     ab_tests?: Record<string, string> | undefined;
     chain_id_source: `${string}:${string}`;
     token_symbol_source: string;

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

@@ -1 +1 @@
-{"version":3,"file":"metrics.d.mts","sourceRoot":"","sources":["../../src/utils/metrics.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,EAAE,uBAAuB,EAAE,sCAAsC;AAC7E,OAAO,EACL,WAAW,EASX,iBAAiB,EACjB,eAAe,EACf,2BAA2B,EAC5B,oCAAoC;AACrC,OAAO,KAAK,EACV,cAAc,EACd,aAAa,EACb,aAAa,EACb,YAAY,EACZ,aAAa,EACb,SAAS,EACT,eAAe,EAChB,oCAAoC;AAKrC,OAAO,KAAK,EAAE,eAAe,EAAE,yCAAyC;AASxE,OAAO,KAAK,EAAE,iBAAiB,EAAE,qBAAiB;AAElD,eAAO,MAAM,wBAAwB,oDAKlC,iBAAiB,KAAG,YA6BtB,CAAC;AAEF;;;;;;;;GAQG;AACH,eAAO,MAAM,wBAAwB,gBACtB,iBAAiB,WACrB,eAAe,mBACP,eAAe;;;;;;CA6CjC,CAAC;AAEF,eAAO,MAAM,0BAA0B,gBACxB,iBAAiB,KAC7B,aASF,CAAC;AAEF,eAAO,MAAM,qBAAqB,kBACjB,aAAa,GAAG,QAAQ,aAAa,CAAC,KACpD,SAWF,CAAC;AAEF,eAAO,MAAM,uBAAuB,UAC3B,aAAa,CAAC,OAAO,CAAC,KAC5B,KAAK,cAAc,EAAE,cAAc,CAErC,CAAC;AAEF;;;;;;;;;;GAUG;AACH,eAAO,MAAM,qCAAqC,kBACjC,aAAa,GAAG,QAAQ,aAAa,CAAC,wBAC/B,OAAO,qBACV,OAAO,aAChB,2BAA2B,YAC3B,OAAO,MAAM,EAAE,MAAM,CAAC;;;;;;;;;;;;;;;;;;;;CAsBjC,CAAC;AAEF,eAAO,MAAM,uBAAuB,gBACrB,iBAAiB,KAC7B,SAWF,CAAC;AAEF,eAAO,MAAM,6BAA6B,gBAC3B,iBAAiB,YACpB,uBAAuB,CAAC,kBAAkB,CAAC,CAAC,UAAU,CAAC,CAAC,MAAM,CAAC,KACxE,eAYF,CAAC;AAEF;;;;;GAKG;AACH,eAAO,MAAM,qCAAqC,oBAC/B,eAAe;;;;;;;;;;;;;;;;;;;;;;;;;;;;CAmDjC,CAAC"}
+{"version":3,"file":"metrics.d.mts","sourceRoot":"","sources":["../../src/utils/metrics.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,EAAE,uBAAuB,EAAE,sCAAsC;AAC7E,OAAO,EACL,WAAW,EASX,iBAAiB,EACjB,eAAe,EACf,2BAA2B,EAC5B,oCAAoC;AACrC,OAAO,KAAK,EACV,cAAc,EACd,aAAa,EACb,aAAa,EACb,YAAY,EACZ,aAAa,EACb,SAAS,EACT,eAAe,EAChB,oCAAoC;AAKrC,OAAO,KAAK,EAAE,eAAe,EAAE,yCAAyC;AASxE,OAAO,KAAK,EAAE,iBAAiB,EAAE,qBAAiB;AAElD,eAAO,MAAM,wBAAwB,oDAKlC,iBAAiB,KAAG,YA6BtB,CAAC;AAEF;;;;;;;;GAQG;AACH,eAAO,MAAM,wBAAwB,gBACtB,iBAAiB,WACrB,eAAe,mBACP,eAAe;;;;;;CA6CjC,CAAC;AAEF,eAAO,MAAM,0BAA0B,gBACxB,iBAAiB,KAC7B,aASF,CAAC;AAEF,eAAO,MAAM,qBAAqB,kBACjB,aAAa,GAAG,QAAQ,aAAa,CAAC,KACpD,SAWF,CAAC;AAEF,eAAO,MAAM,uBAAuB,UAC3B,aAAa,CAAC,OAAO,CAAC,KAC5B,KAAK,cAAc,EAAE,cAAc,CAErC,CAAC;AAEF;;;;;;;;;;;GAWG;AACH,eAAO,MAAM,qCAAqC,kBACjC,aAAa,GAAG,QAAQ,aAAa,CAAC,wBAC/B,OAAO,qBACV,OAAO,aAChB,2BAA2B,YAC3B,OAAO,MAAM,EAAE,MAAM,CAAC,kBAChB;IAAE,GAAG,EAAE,MAAM,CAAC;IAAC,KAAK,EAAE,MAAM,CAAA;CAAE,EAAE;;aAAzB,MAAM;eAAS,MAAM;;;;;;;;;;;;;;;;;;;;;CA6B7C,CAAC;AAEF,eAAO,MAAM,uBAAuB,gBACrB,iBAAiB,KAC7B,SAWF,CAAC;AAEF,eAAO,MAAM,6BAA6B,gBAC3B,iBAAiB,YACpB,uBAAuB,CAAC,kBAAkB,CAAC,CAAC,UAAU,CAAC,CAAC,MAAM,CAAC,KACxE,eAYF,CAAC;AAEF;;;;;GAKG;AACH,eAAO,MAAM,qCAAqC,oBAC/B,eAAe;;;;;;;;;;;;;;;;;;;;;;;;;;;;CAmDjC,CAAC"}

package/dist/utils/metrics.mjs

@@ -99,10 +99,11 @@ export const getPriceImpactFromQuote = (quote) => {
  * @param isStxEnabledOnClient - Whether smart transactions are enabled on the client, for example the getSmartTransactionsEnabled selector value from the extension
  * @param isHardwareAccount - whether the tx is submitted using a hardware wallet
  * @param location - The entry point from which the user initiated the swap or bridge (e.g. Main View, Token View, Trending Explore)
- * @param abTests - A/B test context to attribute events to specific experiments
+ * @param abTests - Legacy A/B test context for `ab_tests` (backward compatibility)
+ * @param activeAbTests - New A/B test context for `active_ab_tests` (migration target)
  * @returns The properties for the pre-confirmation event
  */
-export const getPreConfirmationPropertiesFromQuote = (quoteResponse, isStxEnabledOnClient, isHardwareAccount, location = MetaMetricsSwapsEventSource.MainView, abTests) => {
+export const getPreConfirmationPropertiesFromQuote = (quoteResponse, isStxEnabledOnClient, isHardwareAccount, location = MetaMetricsSwapsEventSource.MainView, abTests, activeAbTests) => {
     const { quote } = quoteResponse;
     return {
         ...getPriceImpactFromQuote(quote),
@@ -118,7 +119,14 @@ export const getPreConfirmationPropertiesFromQuote = (quoteResponse, isStxEnable
         action_type: MetricsActionType.SWAPBRIDGE_V1,
         custom_slippage: false, // TODO detect whether the user changed the default slippage
         location,
-        ...(abTests && Object.keys(abTests).length > 0 && { ab_tests: abTests }),
+        ...(abTests &&
+            Object.keys(abTests).length > 0 && {
+            ab_tests: abTests,
+        }),
+        ...(activeAbTests &&
+            activeAbTests.length > 0 && {
+            active_ab_tests: activeAbTests,
+        }),
     };
 };
 export const getTradeDataFromHistory = (historyItem) => {

package/dist/utils/metrics.mjs.map

@@ -1 +1 @@
-{"version":3,"file":"metrics.mjs","sourceRoot":"","sources":["../../src/utils/metrics.ts"],"names":[],"mappings":"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","sourcesContent":["/* eslint-disable camelcase */\n/* eslint-disable @typescript-eslint/naming-convention */\n/* eslint-disable @typescript-eslint/explicit-function-return-type */\nimport type { AccountsControllerState } from '@metamask/accounts-controller';\nimport {\n  StatusTypes,\n  formatChainIdToHex,\n  isEthUsdt,\n  formatChainIdToCaip,\n  formatProviderLabel,\n  isCustomSlippage,\n  getSwapType,\n  isHardwareWallet,\n  formatAddressToAssetId,\n  MetricsActionType,\n  MetricsSwapType,\n  MetaMetricsSwapsEventSource,\n} from '@metamask/bridge-controller';\nimport type {\n  QuoteFetchData,\n  QuoteMetadata,\n  QuoteResponse,\n  TxStatusData,\n  RequestParams,\n  TradeData,\n  RequestMetadata,\n} from '@metamask/bridge-controller';\nimport {\n  TransactionStatus,\n  TransactionType,\n} from '@metamask/transaction-controller';\nimport type { TransactionMeta } from '@metamask/transaction-controller';\nimport type { CaipAssetType } from '@metamask/utils';\nimport { BigNumber } from 'bignumber.js';\n\nimport { calcActualGasUsed } from './gas';\nimport {\n  getActualBridgeReceivedAmount,\n  getActualSwapReceivedAmount,\n} from './swap-received-amount';\nimport type { BridgeHistoryItem } from '../types';\n\nexport const getTxStatusesFromHistory = ({\n  status,\n  hasApprovalTx,\n  approvalTxId,\n  quote,\n}: BridgeHistoryItem): TxStatusData => {\n  const source_transaction = status.srcChain.txHash\n    ? StatusTypes.COMPLETE\n    : StatusTypes.PENDING;\n  const destination_transaction = status.destChain?.txHash\n    ? status.status\n    : StatusTypes.PENDING;\n\n  const hexChainId = formatChainIdToHex(quote.srcChainId);\n  const isEthUsdtTx = isEthUsdt(hexChainId, quote.srcAsset.address);\n  const allowance_reset_transaction = status.srcChain.txHash\n    ? StatusTypes.COMPLETE\n    : undefined;\n  const approval_transaction = status.srcChain.txHash\n    ? StatusTypes.COMPLETE\n    : StatusTypes.PENDING;\n\n  return {\n    allowance_reset_transaction: isEthUsdtTx\n      ? allowance_reset_transaction\n      : undefined,\n    approval_transaction:\n      hasApprovalTx || approvalTxId ? approval_transaction : undefined,\n    source_transaction,\n    destination_transaction:\n      status.status === StatusTypes.FAILED\n        ? StatusTypes.FAILED\n        : destination_transaction,\n  };\n};\n\n/**\n * Calculate the properties for a finalized transaction event based on the txHistory\n * and txMeta\n *\n * @param historyItem - The bridge history item\n * @param txMeta - The transaction meta from the TransactionController\n * @param approvalTxMeta - The approval transaction meta from the TransactionController\n * @returns The properties for the finalized transaction\n */\nexport const getFinalizedTxProperties = (\n  historyItem: BridgeHistoryItem,\n  txMeta?: TransactionMeta,\n  approvalTxMeta?: TransactionMeta,\n) => {\n  const startTime =\n    approvalTxMeta?.submittedTime ??\n    txMeta?.submittedTime ??\n    historyItem.startTime;\n  const completionTime =\n    txMeta?.type === TransactionType.swap\n      ? txMeta?.time\n      : historyItem.completionTime;\n\n  const actualGas = calcActualGasUsed(\n    historyItem,\n    txMeta?.txReceipt,\n    approvalTxMeta?.txReceipt,\n  );\n\n  const actualReturn =\n    txMeta?.type === TransactionType.swap\n      ? getActualSwapReceivedAmount(historyItem, actualGas, txMeta)\n      : getActualBridgeReceivedAmount(historyItem);\n\n  const quotedVsUsedGasRatio =\n    historyItem.pricingData?.quotedGasAmount && actualGas?.amount\n      ? new BigNumber(historyItem.pricingData.quotedGasAmount)\n          .multipliedBy(new BigNumber(10).pow(18))\n          .div(actualGas.amount)\n          .toNumber()\n      : 0;\n\n  const quoteVsExecutionRatio =\n    historyItem.pricingData?.quotedReturnInUsd && actualReturn?.usd\n      ? new BigNumber(historyItem.pricingData.quotedReturnInUsd)\n          .div(actualReturn.usd)\n          .toNumber()\n      : 0;\n\n  return {\n    actual_time_minutes:\n      completionTime && startTime ? (completionTime - startTime) / 60000 : 0,\n    usd_actual_return: Number(actualReturn?.usd ?? 0),\n    usd_actual_gas: actualGas?.usd ?? 0,\n    quote_vs_execution_ratio: quoteVsExecutionRatio,\n    quoted_vs_used_gas_ratio: quotedVsUsedGasRatio,\n  };\n};\n\nexport const getRequestParamFromHistory = (\n  historyItem: BridgeHistoryItem,\n): RequestParams => {\n  return {\n    chain_id_source: formatChainIdToCaip(historyItem.quote.srcChainId),\n    token_symbol_source: historyItem.quote.srcAsset.symbol,\n    token_address_source: historyItem.quote.srcAsset.assetId,\n    chain_id_destination: formatChainIdToCaip(historyItem.quote.destChainId),\n    token_symbol_destination: historyItem.quote.destAsset.symbol,\n    token_address_destination: historyItem.quote.destAsset.assetId,\n  };\n};\n\nexport const getTradeDataFromQuote = (\n  quoteResponse: QuoteResponse & Partial<QuoteMetadata>,\n): TradeData => {\n  return {\n    usd_quoted_gas: Number(quoteResponse.gasFee?.effective?.usd ?? 0),\n    gas_included: quoteResponse.quote.gasIncluded ?? false,\n    gas_included_7702: quoteResponse.quote.gasIncluded7702 ?? false,\n    provider: formatProviderLabel(quoteResponse.quote),\n    quoted_time_minutes: Number(\n      quoteResponse.estimatedProcessingTimeInSeconds / 60,\n    ),\n    usd_quoted_return: Number(quoteResponse.adjustedReturn?.usd ?? 0),\n  };\n};\n\nexport const getPriceImpactFromQuote = (\n  quote: QuoteResponse['quote'],\n): Pick<QuoteFetchData, 'price_impact'> => {\n  return { price_impact: Number(quote.priceData?.priceImpact ?? '0') };\n};\n\n/**\n * Before the tx is confirmed, its data is not available in txHistory\n * The quote is used to populate event properties before confirmation\n *\n * @param quoteResponse - The quote response\n * @param isStxEnabledOnClient - Whether smart transactions are enabled on the client, for example the getSmartTransactionsEnabled selector value from the extension\n * @param isHardwareAccount - whether the tx is submitted using a hardware wallet\n * @param location - The entry point from which the user initiated the swap or bridge (e.g. Main View, Token View, Trending Explore)\n * @param abTests - A/B test context to attribute events to specific experiments\n * @returns The properties for the pre-confirmation event\n */\nexport const getPreConfirmationPropertiesFromQuote = (\n  quoteResponse: QuoteResponse & Partial<QuoteMetadata>,\n  isStxEnabledOnClient: boolean,\n  isHardwareAccount: boolean,\n  location: MetaMetricsSwapsEventSource = MetaMetricsSwapsEventSource.MainView,\n  abTests?: Record<string, string>,\n) => {\n  const { quote } = quoteResponse;\n  return {\n    ...getPriceImpactFromQuote(quote),\n    ...getTradeDataFromQuote(quoteResponse),\n    chain_id_source: formatChainIdToCaip(quote.srcChainId),\n    token_symbol_source: quote.srcAsset.symbol,\n    chain_id_destination: formatChainIdToCaip(quote.destChainId),\n    token_symbol_destination: quote.destAsset.symbol,\n    is_hardware_wallet: isHardwareAccount,\n    swap_type: getSwapType(\n      quoteResponse.quote.srcChainId,\n      quoteResponse.quote.destChainId,\n    ),\n    usd_amount_source: Number(quoteResponse.sentAmount?.usd ?? 0),\n    stx_enabled: isStxEnabledOnClient,\n    action_type: MetricsActionType.SWAPBRIDGE_V1,\n    custom_slippage: false, // TODO detect whether the user changed the default slippage\n    location,\n    ...(abTests && Object.keys(abTests).length > 0 && { ab_tests: abTests }),\n  };\n};\n\nexport const getTradeDataFromHistory = (\n  historyItem: BridgeHistoryItem,\n): TradeData => {\n  return {\n    usd_quoted_gas: Number(historyItem.pricingData?.quotedGasInUsd ?? 0),\n    gas_included: historyItem.quote.gasIncluded ?? false,\n    gas_included_7702: historyItem.quote.gasIncluded7702 ?? false,\n    provider: formatProviderLabel(historyItem.quote),\n    quoted_time_minutes: Number(\n      historyItem.estimatedProcessingTimeInSeconds / 60,\n    ),\n    usd_quoted_return: Number(historyItem.pricingData?.quotedReturnInUsd ?? 0),\n  };\n};\n\nexport const getRequestMetadataFromHistory = (\n  historyItem: BridgeHistoryItem,\n  account?: AccountsControllerState['internalAccounts']['accounts'][string],\n): RequestMetadata => {\n  const { quote, slippagePercentage, isStxEnabled } = historyItem;\n\n  return {\n    slippage_limit: slippagePercentage,\n    custom_slippage: isCustomSlippage(slippagePercentage),\n    usd_amount_source: Number(historyItem.pricingData?.amountSentInUsd ?? 0),\n    swap_type: getSwapType(quote.srcChainId, quote.destChainId),\n    is_hardware_wallet: isHardwareWallet(account),\n    stx_enabled: isStxEnabled ?? false,\n    security_warnings: [],\n  };\n};\n\n/**\n * Get the properties for a swap transaction that is not in the txHistory\n *\n * @param transactionMeta - The transaction meta\n * @returns The properties for the swap transaction\n */\nexport const getEVMTxPropertiesFromTransactionMeta = (\n  transactionMeta: TransactionMeta,\n) => {\n  return {\n    source_transaction: [\n      TransactionStatus.failed,\n      TransactionStatus.dropped,\n      TransactionStatus.rejected,\n    ].includes(transactionMeta.status)\n      ? StatusTypes.FAILED\n      : StatusTypes.COMPLETE,\n    error_message: transactionMeta.error?.message ?? '',\n    chain_id_source: formatChainIdToCaip(transactionMeta.chainId),\n    chain_id_destination: formatChainIdToCaip(transactionMeta.chainId),\n    token_symbol_source: transactionMeta.sourceTokenSymbol ?? '',\n    token_symbol_destination: transactionMeta.destinationTokenSymbol ?? '',\n    usd_amount_source: 0,\n    stx_enabled: false,\n    token_address_source:\n      formatAddressToAssetId(\n        transactionMeta.sourceTokenAddress ?? '',\n        transactionMeta.chainId,\n      ) ?? ('' as CaipAssetType),\n    token_address_destination:\n      formatAddressToAssetId(\n        transactionMeta.destinationTokenAddress ?? '',\n        transactionMeta.chainId,\n      ) ?? ('' as CaipAssetType),\n    custom_slippage: false,\n    is_hardware_wallet: false,\n    swap_type:\n      transactionMeta.type &&\n      [TransactionType.swap, TransactionType.swapApproval].includes(\n        transactionMeta.type,\n      )\n        ? MetricsSwapType.SINGLE\n        : MetricsSwapType.CROSSCHAIN,\n    security_warnings: [],\n    price_impact: 0,\n    usd_quoted_gas: 0,\n    gas_included: false,\n    gas_included_7702: false,\n    quoted_time_minutes: 0,\n    usd_quoted_return: 0,\n    provider: '' as `${string}_${string}`,\n    actual_time_minutes: 0,\n    quote_vs_execution_ratio: 0,\n    quoted_vs_used_gas_ratio: 0,\n    usd_actual_return: 0,\n    usd_actual_gas: 0,\n    action_type: MetricsActionType.SWAPBRIDGE_V1,\n  };\n};\n"]}
+{"version":3,"file":"metrics.mjs","sourceRoot":"","sources":["../../src/utils/metrics.ts"],"names":[],"mappings":"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","sourcesContent":["/* eslint-disable camelcase */\n/* eslint-disable @typescript-eslint/naming-convention */\n/* eslint-disable @typescript-eslint/explicit-function-return-type */\nimport type { AccountsControllerState } from '@metamask/accounts-controller';\nimport {\n  StatusTypes,\n  formatChainIdToHex,\n  isEthUsdt,\n  formatChainIdToCaip,\n  formatProviderLabel,\n  isCustomSlippage,\n  getSwapType,\n  isHardwareWallet,\n  formatAddressToAssetId,\n  MetricsActionType,\n  MetricsSwapType,\n  MetaMetricsSwapsEventSource,\n} from '@metamask/bridge-controller';\nimport type {\n  QuoteFetchData,\n  QuoteMetadata,\n  QuoteResponse,\n  TxStatusData,\n  RequestParams,\n  TradeData,\n  RequestMetadata,\n} from '@metamask/bridge-controller';\nimport {\n  TransactionStatus,\n  TransactionType,\n} from '@metamask/transaction-controller';\nimport type { TransactionMeta } from '@metamask/transaction-controller';\nimport type { CaipAssetType } from '@metamask/utils';\nimport { BigNumber } from 'bignumber.js';\n\nimport { calcActualGasUsed } from './gas';\nimport {\n  getActualBridgeReceivedAmount,\n  getActualSwapReceivedAmount,\n} from './swap-received-amount';\nimport type { BridgeHistoryItem } from '../types';\n\nexport const getTxStatusesFromHistory = ({\n  status,\n  hasApprovalTx,\n  approvalTxId,\n  quote,\n}: BridgeHistoryItem): TxStatusData => {\n  const source_transaction = status.srcChain.txHash\n    ? StatusTypes.COMPLETE\n    : StatusTypes.PENDING;\n  const destination_transaction = status.destChain?.txHash\n    ? status.status\n    : StatusTypes.PENDING;\n\n  const hexChainId = formatChainIdToHex(quote.srcChainId);\n  const isEthUsdtTx = isEthUsdt(hexChainId, quote.srcAsset.address);\n  const allowance_reset_transaction = status.srcChain.txHash\n    ? StatusTypes.COMPLETE\n    : undefined;\n  const approval_transaction = status.srcChain.txHash\n    ? StatusTypes.COMPLETE\n    : StatusTypes.PENDING;\n\n  return {\n    allowance_reset_transaction: isEthUsdtTx\n      ? allowance_reset_transaction\n      : undefined,\n    approval_transaction:\n      hasApprovalTx || approvalTxId ? approval_transaction : undefined,\n    source_transaction,\n    destination_transaction:\n      status.status === StatusTypes.FAILED\n        ? StatusTypes.FAILED\n        : destination_transaction,\n  };\n};\n\n/**\n * Calculate the properties for a finalized transaction event based on the txHistory\n * and txMeta\n *\n * @param historyItem - The bridge history item\n * @param txMeta - The transaction meta from the TransactionController\n * @param approvalTxMeta - The approval transaction meta from the TransactionController\n * @returns The properties for the finalized transaction\n */\nexport const getFinalizedTxProperties = (\n  historyItem: BridgeHistoryItem,\n  txMeta?: TransactionMeta,\n  approvalTxMeta?: TransactionMeta,\n) => {\n  const startTime =\n    approvalTxMeta?.submittedTime ??\n    txMeta?.submittedTime ??\n    historyItem.startTime;\n  const completionTime =\n    txMeta?.type === TransactionType.swap\n      ? txMeta?.time\n      : historyItem.completionTime;\n\n  const actualGas = calcActualGasUsed(\n    historyItem,\n    txMeta?.txReceipt,\n    approvalTxMeta?.txReceipt,\n  );\n\n  const actualReturn =\n    txMeta?.type === TransactionType.swap\n      ? getActualSwapReceivedAmount(historyItem, actualGas, txMeta)\n      : getActualBridgeReceivedAmount(historyItem);\n\n  const quotedVsUsedGasRatio =\n    historyItem.pricingData?.quotedGasAmount && actualGas?.amount\n      ? new BigNumber(historyItem.pricingData.quotedGasAmount)\n          .multipliedBy(new BigNumber(10).pow(18))\n          .div(actualGas.amount)\n          .toNumber()\n      : 0;\n\n  const quoteVsExecutionRatio =\n    historyItem.pricingData?.quotedReturnInUsd && actualReturn?.usd\n      ? new BigNumber(historyItem.pricingData.quotedReturnInUsd)\n          .div(actualReturn.usd)\n          .toNumber()\n      : 0;\n\n  return {\n    actual_time_minutes:\n      completionTime && startTime ? (completionTime - startTime) / 60000 : 0,\n    usd_actual_return: Number(actualReturn?.usd ?? 0),\n    usd_actual_gas: actualGas?.usd ?? 0,\n    quote_vs_execution_ratio: quoteVsExecutionRatio,\n    quoted_vs_used_gas_ratio: quotedVsUsedGasRatio,\n  };\n};\n\nexport const getRequestParamFromHistory = (\n  historyItem: BridgeHistoryItem,\n): RequestParams => {\n  return {\n    chain_id_source: formatChainIdToCaip(historyItem.quote.srcChainId),\n    token_symbol_source: historyItem.quote.srcAsset.symbol,\n    token_address_source: historyItem.quote.srcAsset.assetId,\n    chain_id_destination: formatChainIdToCaip(historyItem.quote.destChainId),\n    token_symbol_destination: historyItem.quote.destAsset.symbol,\n    token_address_destination: historyItem.quote.destAsset.assetId,\n  };\n};\n\nexport const getTradeDataFromQuote = (\n  quoteResponse: QuoteResponse & Partial<QuoteMetadata>,\n): TradeData => {\n  return {\n    usd_quoted_gas: Number(quoteResponse.gasFee?.effective?.usd ?? 0),\n    gas_included: quoteResponse.quote.gasIncluded ?? false,\n    gas_included_7702: quoteResponse.quote.gasIncluded7702 ?? false,\n    provider: formatProviderLabel(quoteResponse.quote),\n    quoted_time_minutes: Number(\n      quoteResponse.estimatedProcessingTimeInSeconds / 60,\n    ),\n    usd_quoted_return: Number(quoteResponse.adjustedReturn?.usd ?? 0),\n  };\n};\n\nexport const getPriceImpactFromQuote = (\n  quote: QuoteResponse['quote'],\n): Pick<QuoteFetchData, 'price_impact'> => {\n  return { price_impact: Number(quote.priceData?.priceImpact ?? '0') };\n};\n\n/**\n * Before the tx is confirmed, its data is not available in txHistory\n * The quote is used to populate event properties before confirmation\n *\n * @param quoteResponse - The quote response\n * @param isStxEnabledOnClient - Whether smart transactions are enabled on the client, for example the getSmartTransactionsEnabled selector value from the extension\n * @param isHardwareAccount - whether the tx is submitted using a hardware wallet\n * @param location - The entry point from which the user initiated the swap or bridge (e.g. Main View, Token View, Trending Explore)\n * @param abTests - Legacy A/B test context for `ab_tests` (backward compatibility)\n * @param activeAbTests - New A/B test context for `active_ab_tests` (migration target)\n * @returns The properties for the pre-confirmation event\n */\nexport const getPreConfirmationPropertiesFromQuote = (\n  quoteResponse: QuoteResponse & Partial<QuoteMetadata>,\n  isStxEnabledOnClient: boolean,\n  isHardwareAccount: boolean,\n  location: MetaMetricsSwapsEventSource = MetaMetricsSwapsEventSource.MainView,\n  abTests?: Record<string, string>,\n  activeAbTests?: { key: string; value: string }[],\n) => {\n  const { quote } = quoteResponse;\n  return {\n    ...getPriceImpactFromQuote(quote),\n    ...getTradeDataFromQuote(quoteResponse),\n    chain_id_source: formatChainIdToCaip(quote.srcChainId),\n    token_symbol_source: quote.srcAsset.symbol,\n    chain_id_destination: formatChainIdToCaip(quote.destChainId),\n    token_symbol_destination: quote.destAsset.symbol,\n    is_hardware_wallet: isHardwareAccount,\n    swap_type: getSwapType(\n      quoteResponse.quote.srcChainId,\n      quoteResponse.quote.destChainId,\n    ),\n    usd_amount_source: Number(quoteResponse.sentAmount?.usd ?? 0),\n    stx_enabled: isStxEnabledOnClient,\n    action_type: MetricsActionType.SWAPBRIDGE_V1,\n    custom_slippage: false, // TODO detect whether the user changed the default slippage\n    location,\n    ...(abTests &&\n      Object.keys(abTests).length > 0 && {\n        ab_tests: abTests,\n      }),\n    ...(activeAbTests &&\n      activeAbTests.length > 0 && {\n        active_ab_tests: activeAbTests,\n      }),\n  };\n};\n\nexport const getTradeDataFromHistory = (\n  historyItem: BridgeHistoryItem,\n): TradeData => {\n  return {\n    usd_quoted_gas: Number(historyItem.pricingData?.quotedGasInUsd ?? 0),\n    gas_included: historyItem.quote.gasIncluded ?? false,\n    gas_included_7702: historyItem.quote.gasIncluded7702 ?? false,\n    provider: formatProviderLabel(historyItem.quote),\n    quoted_time_minutes: Number(\n      historyItem.estimatedProcessingTimeInSeconds / 60,\n    ),\n    usd_quoted_return: Number(historyItem.pricingData?.quotedReturnInUsd ?? 0),\n  };\n};\n\nexport const getRequestMetadataFromHistory = (\n  historyItem: BridgeHistoryItem,\n  account?: AccountsControllerState['internalAccounts']['accounts'][string],\n): RequestMetadata => {\n  const { quote, slippagePercentage, isStxEnabled } = historyItem;\n\n  return {\n    slippage_limit: slippagePercentage,\n    custom_slippage: isCustomSlippage(slippagePercentage),\n    usd_amount_source: Number(historyItem.pricingData?.amountSentInUsd ?? 0),\n    swap_type: getSwapType(quote.srcChainId, quote.destChainId),\n    is_hardware_wallet: isHardwareWallet(account),\n    stx_enabled: isStxEnabled ?? false,\n    security_warnings: [],\n  };\n};\n\n/**\n * Get the properties for a swap transaction that is not in the txHistory\n *\n * @param transactionMeta - The transaction meta\n * @returns The properties for the swap transaction\n */\nexport const getEVMTxPropertiesFromTransactionMeta = (\n  transactionMeta: TransactionMeta,\n) => {\n  return {\n    source_transaction: [\n      TransactionStatus.failed,\n      TransactionStatus.dropped,\n      TransactionStatus.rejected,\n    ].includes(transactionMeta.status)\n      ? StatusTypes.FAILED\n      : StatusTypes.COMPLETE,\n    error_message: transactionMeta.error?.message ?? '',\n    chain_id_source: formatChainIdToCaip(transactionMeta.chainId),\n    chain_id_destination: formatChainIdToCaip(transactionMeta.chainId),\n    token_symbol_source: transactionMeta.sourceTokenSymbol ?? '',\n    token_symbol_destination: transactionMeta.destinationTokenSymbol ?? '',\n    usd_amount_source: 0,\n    stx_enabled: false,\n    token_address_source:\n      formatAddressToAssetId(\n        transactionMeta.sourceTokenAddress ?? '',\n        transactionMeta.chainId,\n      ) ?? ('' as CaipAssetType),\n    token_address_destination:\n      formatAddressToAssetId(\n        transactionMeta.destinationTokenAddress ?? '',\n        transactionMeta.chainId,\n      ) ?? ('' as CaipAssetType),\n    custom_slippage: false,\n    is_hardware_wallet: false,\n    swap_type:\n      transactionMeta.type &&\n      [TransactionType.swap, TransactionType.swapApproval].includes(\n        transactionMeta.type,\n      )\n        ? MetricsSwapType.SINGLE\n        : MetricsSwapType.CROSSCHAIN,\n    security_warnings: [],\n    price_impact: 0,\n    usd_quoted_gas: 0,\n    gas_included: false,\n    gas_included_7702: false,\n    quoted_time_minutes: 0,\n    usd_quoted_return: 0,\n    provider: '' as `${string}_${string}`,\n    actual_time_minutes: 0,\n    quote_vs_execution_ratio: 0,\n    quoted_vs_used_gas_ratio: 0,\n    usd_actual_return: 0,\n    usd_actual_gas: 0,\n    action_type: MetricsActionType.SWAPBRIDGE_V1,\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;
                 }