@metamask/bridge-status-controller 71.2.1 → 72.0.1

package/dist/utils/history.cjs

@@ -1,29 +1,37 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.isHistoryItemTooOld = exports.shouldPollHistoryItem = exports.getInitialHistoryItem = exports.getHistoryKey = exports.getMatchingHistoryEntryForApprovalTxMeta = exports.getMatchingHistoryEntryForTxMeta = exports.rekeyHistoryItemInState = void 0;
+exports.isHistoryItemTooOld = exports.shouldPollHistoryItem = exports.getInitialHistoryItem = exports.getHistoryKey = exports.getBatchSellHistoryItemsForTxHash = exports.getMatchingHistoryEntryForApprovalTxMeta = exports.getMatchingHistoryEntryForTxMeta = exports.isBatchSellHistoryItem = exports.rekeyHistoryItemInState = void 0;
 const bridge_controller_1 = require("@metamask/bridge-controller");
 const feature_flags_1 = require("./feature-flags.cjs");
-const rekeyHistoryItemInState = (state, actionId, txMeta) => {
-    const historyItem = state.txHistory[actionId];
-    if (!historyItem) {
-        return false;
-    }
-    state.txHistory[txMeta.id] = {
-        ...historyItem,
+const updateHistoryItem = (oldHistoryItem, txMeta) => {
+    return {
+        ...oldHistoryItem,
         txMetaId: txMeta.id,
-        originalTransactionId: historyItem.originalTransactionId ?? txMeta.id,
+        originalTransactionId: oldHistoryItem.originalTransactionId ?? txMeta.id,
         status: {
-            ...historyItem.status,
+            ...oldHistoryItem.status,
             srcChain: {
-                ...historyItem.status.srcChain,
-                txHash: txMeta.hash ?? historyItem.status.srcChain?.txHash,
+                ...oldHistoryItem.status.srcChain,
+                txHash: txMeta.hash ?? oldHistoryItem.status.srcChain?.txHash,
             },
         },
     };
-    delete state.txHistory[actionId];
+};
+const rekeyHistoryItemInState = (state, oldKey, newKey, txMeta) => {
+    const historyItem = state.txHistory[oldKey];
+    if (!historyItem) {
+        return false;
+    }
+    state.txHistory[newKey] = {
+        ...historyItem,
+        ...updateHistoryItem(historyItem, txMeta),
+    };
+    delete state.txHistory[oldKey];
     return true;
 };
 exports.rekeyHistoryItemInState = rekeyHistoryItemInState;
+const isBatchSellHistoryItem = (historyItem) => Boolean(historyItem?.batchSellData);
+exports.isBatchSellHistoryItem = isBatchSellHistoryItem;
 /**
  * Returns the history entry that matches the txMeta by id, actionId, batchId, or txHash
  *
@@ -39,7 +47,12 @@ const getMatchingHistoryEntryForTxMeta = (txHistory, txMeta) => {
             key === txMeta.actionId ||
             txMetaId === txMeta.id ||
             (actionId ? actionId === txMeta.actionId : false) ||
-            (batchId ? batchId === txMeta.batchId : false) ||
+            // When the batch is not atomic (BatchSell), ignore batchId matching to prevent txs
+            // in the batch from getting marked complete/failed too early if one fails
+            // Multiple BatchSell STX trades may have the same batchId
+            (Boolean(batchId) &&
+                !(0, exports.isBatchSellHistoryItem)(value) &&
+                batchId === txMeta.batchId) ||
             (txHash ? txHash.toLowerCase() === txMeta.hash?.toLowerCase() : false));
     });
 };
@@ -56,10 +69,47 @@ const getMatchingHistoryEntryForApprovalTxMeta = (txHistory, txMeta) => {
     return historyEntries.find(([_, value]) => value.approvalTxId ? value.approvalTxId === txMeta.id : false);
 };
 exports.getMatchingHistoryEntryForApprovalTxMeta = getMatchingHistoryEntryForApprovalTxMeta;
+/**
+ * Returns the BatchSell history items in the same batch as the provided tx hash.
+ *
+ * @param txHistory - The bridge status controller's history to search for matching history items
+ * @param txHashOrId - the hash or txMeta.id of a single trade in a BatchSell
+ * @returns The matching history items for the tx hash and a boolean indicating if it's a 7702 batch.
+ * @example
+ * getBatchSellHistoryItemsForTxHash(txHistory, id)
+ * If id is the hash or txMetaId of a BatchSell trade, it will return the history items for
+ * the trade and all other trades in the same batch.
+ */
+const getBatchSellHistoryItemsForTxHash = (txHistory, txHashOrId) => {
+    const historyItems = Object.values(txHistory);
+    if (!txHashOrId) {
+        return {
+            historyItems: [],
+            is7702Batch: false,
+        };
+    }
+    /**
+     * Either a delegation tx or a single STX BatchSell trade
+     */
+    const parentHistoryItem = historyItems.find(({ status, txMetaId }) => status.srcChain.txHash?.toLowerCase() === txHashOrId.toLowerCase() ||
+        txMetaId === txHashOrId);
+    // Match by batchId or by quoteId
+    const matchingHistoryItems = parentHistoryItem?.quoteIds?.map((quoteId) => txHistory[quoteId]) ??
+        historyItems.filter(({ batchId }) => batchId &&
+            parentHistoryItem?.batchId &&
+            batchId === parentHistoryItem.batchId);
+    return {
+        historyItems: matchingHistoryItems.filter((item) => item !== undefined),
+        is7702Batch: Boolean(parentHistoryItem) &&
+            Boolean(parentHistoryItem?.quoteIds?.length),
+    };
+};
+exports.getBatchSellHistoryItemsForTxHash = getBatchSellHistoryItemsForTxHash;
 /**
  * Determines the key to use for storing a bridge history item.
  * Uses actionId for pre-submission tracking, or bridgeTxMetaId for post-submission.
  *
+ * @deprecated specify an explicit history key instead
  * @param actionId - The action ID used for pre-submission tracking
  * @param bridgeTxMetaId - The transaction meta ID from bridgeTxMeta
  * @param syntheticTransactionId - The transactionId of the intent's placeholder transaction
@@ -75,11 +125,7 @@ function getHistoryKey(actionId, bridgeTxMetaId, syntheticTransactionId) {
 }
 exports.getHistoryKey = getHistoryKey;
 const getInitialHistoryItem = (args) => {
-    const { bridgeTxMeta, quoteResponse, startTime, slippagePercentage, initialDestAssetBalance, targetContractAddress, approvalTxId, isStxEnabled, location, abTests, activeAbTests, accountAddress: selectedAddress, originalTransactionId, actionId, tokenSecurityTypeDestination, } = args;
-    // Determine the key for this history item:
-    // - For pre-submission (non-batch EVM): use actionId
-    // - For post-submission or other cases: use bridgeTxMeta.id
-    const historyKey = getHistoryKey(actionId, bridgeTxMeta?.id, originalTransactionId);
+    const { bridgeTxMeta, quoteResponse, startTime, slippagePercentage, initialDestAssetBalance, targetContractAddress, approvalTxId, isStxEnabled, location, abTests, activeAbTests, accountAddress: selectedAddress, originalTransactionId, actionId, tokenSecurityTypeDestination, batchSellData, quoteIds, } = args;
     // Write all non-status fields to state so we can reference the quote in Activity list without the Bridge API
     // We know it's in progress but not the exact status yet
     const txHistoryItem = {
@@ -125,7 +171,13 @@ const getInitialHistoryItem = (args) => {
             tokenSecurityTypeDestination,
         }),
     };
-    return { historyKey, txHistoryItem };
+    if (batchSellData) {
+        txHistoryItem.batchSellData = batchSellData;
+    }
+    if (quoteIds) {
+        txHistoryItem.quoteIds = quoteIds;
+    }
+    return txHistoryItem;
 };
 exports.getInitialHistoryItem = getInitialHistoryItem;
 const shouldPollHistoryItem = (historyItem) => {

package/dist/utils/history.cjs.map

@@ -1 +1 @@
-{"version":3,"file":"history.cjs","sourceRoot":"","sources":["../../src/utils/history.ts"],"names":[],"mappings":"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","sourcesContent":["import {\n  StatusTypes,\n  isCrossChain,\n  isNonEvmChainId,\n  isTronChainId,\n} from '@metamask/bridge-controller';\nimport type { TransactionMeta } from '@metamask/transaction-controller';\n\nimport type {\n  BridgeHistoryItem,\n  BridgeStatusControllerMessenger,\n  BridgeStatusControllerState,\n  StartPollingForBridgeTxStatusArgsSerialized,\n} from '../types';\nimport { getMaxPendingHistoryItemAgeMs } from './feature-flags';\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\n/**\n * Returns the history entry that matches the txMeta by id, actionId, batchId, or txHash\n *\n * @param txHistory - The transaction history\n * @param txMeta - The transaction meta\n * @returns The history entry that matches the txMeta\n */\nexport const getMatchingHistoryEntryForTxMeta = (\n  txHistory: BridgeStatusControllerState['txHistory'],\n  txMeta: TransactionMeta,\n): [string, BridgeHistoryItem] | undefined => {\n  const historyEntries = Object.entries(txHistory);\n\n  return historyEntries.find(([key, value]) => {\n    const {\n      txMetaId,\n      actionId,\n      batchId,\n      status: {\n        srcChain: { txHash },\n      },\n    } = value;\n    return (\n      key === txMeta.id ||\n      key === txMeta.actionId ||\n      txMetaId === txMeta.id ||\n      (actionId ? actionId === txMeta.actionId : false) ||\n      (batchId ? batchId === txMeta.batchId : false) ||\n      (txHash ? txHash.toLowerCase() === txMeta.hash?.toLowerCase() : false)\n    );\n  });\n};\n\n/**\n * Returns the history entry whose approvalTxId matches the approval transaction\n *\n * @param txHistory - The transaction history\n * @param txMeta - The transaction meta\n * @returns The history entry that matches the txMeta\n */\nexport const getMatchingHistoryEntryForApprovalTxMeta = (\n  txHistory: BridgeStatusControllerState['txHistory'],\n  txMeta: TransactionMeta,\n): [string, BridgeHistoryItem] | undefined => {\n  const historyEntries = Object.entries(txHistory);\n\n  return historyEntries.find(([_, value]) =>\n    value.approvalTxId ? value.approvalTxId === txMeta.id : false,\n  );\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 * @param syntheticTransactionId - The transactionId of the intent's placeholder transaction\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  syntheticTransactionId?: string,\n): string {\n  const historyKey = actionId ?? bridgeTxMetaId ?? syntheticTransactionId;\n  if (!historyKey) {\n    throw new Error(\n      'Cannot add tx to history: either actionId, bridgeTxMeta.id, or syntheticTransactionId must be provided',\n    );\n  }\n  return historyKey;\n}\n\nexport const getInitialHistoryItem = (\n  args: StartPollingForBridgeTxStatusArgsSerialized,\n): {\n  historyKey: string;\n  txHistoryItem: BridgeHistoryItem;\n} => {\n  const {\n    bridgeTxMeta,\n    quoteResponse,\n    startTime,\n    slippagePercentage,\n    initialDestAssetBalance,\n    targetContractAddress,\n    approvalTxId,\n    isStxEnabled,\n    location,\n    abTests,\n    activeAbTests,\n    accountAddress: selectedAddress,\n    originalTransactionId,\n    actionId,\n    tokenSecurityTypeDestination,\n  } = args;\n  // Determine the key for this history item:\n  // - For pre-submission (non-batch EVM): use actionId\n  // - For post-submission or other cases: use bridgeTxMeta.id\n  const historyKey = getHistoryKey(\n    actionId,\n    bridgeTxMeta?.id,\n    originalTransactionId,\n  );\n\n  // Write all non-status fields to state so we can reference the quote in Activity list without the Bridge API\n  // We know it's in progress but not the exact status yet\n  const txHistoryItem = {\n    txMetaId: bridgeTxMeta?.id,\n    actionId,\n    originalTransactionId: originalTransactionId ?? bridgeTxMeta?.id, // Keep original for intent transactions\n    batchId: bridgeTxMeta?.batchId,\n    quote: quoteResponse.quote,\n    startTime,\n    estimatedProcessingTimeInSeconds:\n      quoteResponse.estimatedProcessingTimeInSeconds,\n    slippagePercentage,\n    pricingData: {\n      amountSent: quoteResponse.sentAmount?.amount ?? '0',\n      amountSentInUsd: quoteResponse.sentAmount?.usd ?? undefined,\n      quotedGasInUsd: quoteResponse.gasFee?.effective?.usd ?? undefined,\n      quotedReturnInUsd: quoteResponse.toTokenAmount?.usd ?? undefined,\n      quotedGasAmount: quoteResponse.gasFee?.effective?.amount ?? undefined,\n    },\n    initialDestAssetBalance,\n    targetContractAddress,\n    account: selectedAddress,\n    status: {\n      // We always have a PENDING status when we start polling for a tx, don't need the Bridge API for that\n      // Also we know the bare minimum fields for status at this point in time\n      status: StatusTypes.PENDING,\n      srcChain: {\n        chainId: quoteResponse.quote.srcChainId,\n        // We don't set the initial tx hash for STX transactions because they return a hash on submission\n        // but it is not finalized until confirmation on chain\n        txHash:\n          isNonEvmChainId(quoteResponse.quote.srcChainId) || !isStxEnabled\n            ? bridgeTxMeta?.hash\n            : undefined,\n      },\n    },\n    hasApprovalTx: Boolean(quoteResponse.approval),\n    approvalTxId,\n    isStxEnabled: Boolean(isStxEnabled),\n    featureId: quoteResponse.featureId,\n    location,\n    ...(abTests && { abTests }),\n    ...(activeAbTests && { activeAbTests }),\n    ...(tokenSecurityTypeDestination !== undefined && {\n      tokenSecurityTypeDestination,\n    }),\n  };\n\n  return { historyKey, txHistoryItem };\n};\n\nexport const shouldPollHistoryItem = (\n  historyItem: BridgeHistoryItem,\n): boolean => {\n  const isIntent = Boolean(historyItem?.quote?.intent);\n  const isBridgeTx = isCrossChain(\n    historyItem.quote.srcChainId,\n    historyItem.quote.destChainId,\n  );\n  const isTronTx = isTronChainId(historyItem.quote.srcChainId);\n\n  return [isBridgeTx, isIntent, isTronTx].some(Boolean);\n};\n\nexport const isHistoryItemTooOld = (\n  messenger: BridgeStatusControllerMessenger,\n  historyItem: BridgeHistoryItem,\n): boolean => {\n  const maxPendingHistoryItemAgeMs = getMaxPendingHistoryItemAgeMs(messenger);\n\n  return Date.now() - historyItem.startTime > maxPendingHistoryItemAgeMs;\n};\n"]}
+{"version":3,"file":"history.cjs","sourceRoot":"","sources":["../../src/utils/history.ts"],"names":[],"mappings":"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","sourcesContent":["import {\n  StatusTypes,\n  isCrossChain,\n  isNonEvmChainId,\n  isTronChainId,\n} from '@metamask/bridge-controller';\nimport type { TransactionMeta } from '@metamask/transaction-controller';\n\nimport type {\n  BridgeHistoryItem,\n  BridgeStatusControllerMessenger,\n  BridgeStatusControllerState,\n  StartPollingForBridgeTxStatusArgsSerialized,\n} from '../types';\nimport { getMaxPendingHistoryItemAgeMs } from './feature-flags';\n\nconst updateHistoryItem = (\n  oldHistoryItem: BridgeHistoryItem,\n  txMeta: { id: string; hash?: string },\n): Partial<BridgeHistoryItem> => {\n  return {\n    ...oldHistoryItem,\n    txMetaId: txMeta.id,\n    originalTransactionId: oldHistoryItem.originalTransactionId ?? txMeta.id,\n    status: {\n      ...oldHistoryItem.status,\n      srcChain: {\n        ...oldHistoryItem.status.srcChain,\n        txHash: txMeta.hash ?? oldHistoryItem.status.srcChain?.txHash,\n      },\n    },\n  };\n};\n\nexport const rekeyHistoryItemInState = (\n  state: BridgeStatusControllerState,\n  oldKey: string,\n  newKey: string,\n  txMeta: { id: string; hash?: string },\n): boolean => {\n  const historyItem = state.txHistory[oldKey];\n  if (!historyItem) {\n    return false;\n  }\n\n  state.txHistory[newKey] = {\n    ...historyItem,\n    ...updateHistoryItem(historyItem, txMeta),\n  };\n  delete state.txHistory[oldKey];\n  return true;\n};\n\nexport const isBatchSellHistoryItem = (\n  historyItem: BridgeHistoryItem,\n): boolean => Boolean(historyItem?.batchSellData);\n\n/**\n * Returns the history entry that matches the txMeta by id, actionId, batchId, or txHash\n *\n * @param txHistory - The transaction history\n * @param txMeta - The transaction meta\n * @returns The history entry that matches the txMeta\n */\nexport const getMatchingHistoryEntryForTxMeta = (\n  txHistory: BridgeStatusControllerState['txHistory'],\n  txMeta: TransactionMeta,\n): [string, BridgeHistoryItem] | undefined => {\n  const historyEntries = Object.entries(txHistory);\n\n  return historyEntries.find(([key, value]) => {\n    const {\n      txMetaId,\n      actionId,\n      batchId,\n      status: {\n        srcChain: { txHash },\n      },\n    } = value;\n    return (\n      key === txMeta.id ||\n      key === txMeta.actionId ||\n      txMetaId === txMeta.id ||\n      (actionId ? actionId === txMeta.actionId : false) ||\n      // When the batch is not atomic (BatchSell), ignore batchId matching to prevent txs\n      // in the batch from getting marked complete/failed too early if one fails\n      // Multiple BatchSell STX trades may have the same batchId\n      (Boolean(batchId) &&\n        !isBatchSellHistoryItem(value) &&\n        batchId === txMeta.batchId) ||\n      (txHash ? txHash.toLowerCase() === txMeta.hash?.toLowerCase() : false)\n    );\n  });\n};\n\n/**\n * Returns the history entry whose approvalTxId matches the approval transaction\n *\n * @param txHistory - The transaction history\n * @param txMeta - The transaction meta\n * @returns The history entry that matches the txMeta\n */\nexport const getMatchingHistoryEntryForApprovalTxMeta = (\n  txHistory: BridgeStatusControllerState['txHistory'],\n  txMeta: TransactionMeta,\n): [string, BridgeHistoryItem] | undefined => {\n  const historyEntries = Object.entries(txHistory);\n\n  return historyEntries.find(([_, value]) =>\n    value.approvalTxId ? value.approvalTxId === txMeta.id : false,\n  );\n};\n\n/**\n * Returns the BatchSell history items in the same batch as the provided tx hash.\n *\n * @param txHistory - The bridge status controller's history to search for matching history items\n * @param txHashOrId - the hash or txMeta.id of a single trade in a BatchSell\n * @returns The matching history items for the tx hash and a boolean indicating if it's a 7702 batch.\n * @example\n * getBatchSellHistoryItemsForTxHash(txHistory, id)\n * If id is the hash or txMetaId of a BatchSell trade, it will return the history items for\n * the trade and all other trades in the same batch.\n */\nexport const getBatchSellHistoryItemsForTxHash = (\n  txHistory: BridgeStatusControllerState['txHistory'],\n  txHashOrId?: string,\n): { historyItems: BridgeHistoryItem[]; is7702Batch: boolean } => {\n  const historyItems = Object.values(txHistory);\n\n  if (!txHashOrId) {\n    return {\n      historyItems: [],\n      is7702Batch: false,\n    };\n  }\n\n  /**\n   * Either a delegation tx or a single STX BatchSell trade\n   */\n  const parentHistoryItem = historyItems.find(\n    ({ status, txMetaId }) =>\n      status.srcChain.txHash?.toLowerCase() === txHashOrId.toLowerCase() ||\n      txMetaId === txHashOrId,\n  );\n\n  // Match by batchId or by quoteId\n  const matchingHistoryItems =\n    parentHistoryItem?.quoteIds?.map((quoteId) => txHistory[quoteId]) ??\n    historyItems.filter(\n      ({ batchId }) =>\n        batchId &&\n        parentHistoryItem?.batchId &&\n        batchId === parentHistoryItem.batchId,\n    );\n\n  return {\n    historyItems: matchingHistoryItems.filter((item) => item !== undefined),\n    is7702Batch:\n      Boolean(parentHistoryItem) &&\n      Boolean(parentHistoryItem?.quoteIds?.length),\n  };\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 * @deprecated specify an explicit history key instead\n * @param actionId - The action ID used for pre-submission tracking\n * @param bridgeTxMetaId - The transaction meta ID from bridgeTxMeta\n * @param syntheticTransactionId - The transactionId of the intent's placeholder transaction\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  syntheticTransactionId?: string,\n): string {\n  const historyKey = actionId ?? bridgeTxMetaId ?? syntheticTransactionId;\n  if (!historyKey) {\n    throw new Error(\n      'Cannot add tx to history: either actionId, bridgeTxMeta.id, or syntheticTransactionId must be provided',\n    );\n  }\n  return historyKey;\n}\n\nexport const getInitialHistoryItem = (\n  args: StartPollingForBridgeTxStatusArgsSerialized,\n): BridgeHistoryItem => {\n  const {\n    bridgeTxMeta,\n    quoteResponse,\n    startTime,\n    slippagePercentage,\n    initialDestAssetBalance,\n    targetContractAddress,\n    approvalTxId,\n    isStxEnabled,\n    location,\n    abTests,\n    activeAbTests,\n    accountAddress: selectedAddress,\n    originalTransactionId,\n    actionId,\n    tokenSecurityTypeDestination,\n    batchSellData,\n    quoteIds,\n  } = args;\n\n  // Write all non-status fields to state so we can reference the quote in Activity list without the Bridge API\n  // We know it's in progress but not the exact status yet\n  const txHistoryItem: BridgeHistoryItem = {\n    txMetaId: bridgeTxMeta?.id,\n    actionId,\n    originalTransactionId: originalTransactionId ?? bridgeTxMeta?.id, // Keep original for intent transactions\n    batchId: bridgeTxMeta?.batchId,\n    quote: quoteResponse.quote,\n    startTime,\n    estimatedProcessingTimeInSeconds:\n      quoteResponse.estimatedProcessingTimeInSeconds,\n    slippagePercentage,\n    pricingData: {\n      amountSent: quoteResponse.sentAmount?.amount ?? '0',\n      amountSentInUsd: quoteResponse.sentAmount?.usd ?? undefined,\n      quotedGasInUsd: quoteResponse.gasFee?.effective?.usd ?? undefined,\n      quotedReturnInUsd: quoteResponse.toTokenAmount?.usd ?? undefined,\n      quotedGasAmount: quoteResponse.gasFee?.effective?.amount ?? undefined,\n    },\n    initialDestAssetBalance,\n    targetContractAddress,\n    account: selectedAddress,\n    status: {\n      // We always have a PENDING status when we start polling for a tx, don't need the Bridge API for that\n      // Also we know the bare minimum fields for status at this point in time\n      status: StatusTypes.PENDING,\n      srcChain: {\n        chainId: quoteResponse.quote.srcChainId,\n        // We don't set the initial tx hash for STX transactions because they return a hash on submission\n        // but it is not finalized until confirmation on chain\n        txHash:\n          isNonEvmChainId(quoteResponse.quote.srcChainId) || !isStxEnabled\n            ? bridgeTxMeta?.hash\n            : undefined,\n      },\n    },\n    hasApprovalTx: Boolean(quoteResponse.approval),\n    approvalTxId,\n    isStxEnabled: Boolean(isStxEnabled),\n    featureId: quoteResponse.featureId,\n    location,\n    ...(abTests && { abTests }),\n    ...(activeAbTests && { activeAbTests }),\n    ...(tokenSecurityTypeDestination !== undefined && {\n      tokenSecurityTypeDestination,\n    }),\n  };\n\n  if (batchSellData) {\n    txHistoryItem.batchSellData = batchSellData;\n  }\n  if (quoteIds) {\n    txHistoryItem.quoteIds = quoteIds;\n  }\n\n  return txHistoryItem;\n};\n\nexport const shouldPollHistoryItem = (\n  historyItem: BridgeHistoryItem,\n): boolean => {\n  const isIntent = Boolean(historyItem?.quote?.intent);\n  const isBridgeTx = isCrossChain(\n    historyItem.quote.srcChainId,\n    historyItem.quote.destChainId,\n  );\n  const isTronTx = isTronChainId(historyItem.quote.srcChainId);\n\n  return [isBridgeTx, isIntent, isTronTx].some(Boolean);\n};\n\nexport const isHistoryItemTooOld = (\n  messenger: BridgeStatusControllerMessenger,\n  historyItem: BridgeHistoryItem,\n): boolean => {\n  const maxPendingHistoryItemAgeMs = getMaxPendingHistoryItemAgeMs(messenger);\n\n  return Date.now() - historyItem.startTime > maxPendingHistoryItemAgeMs;\n};\n"]}

package/dist/utils/history.d.cts

@@ -1,9 +1,10 @@
 import type { TransactionMeta } from "@metamask/transaction-controller";
 import type { BridgeHistoryItem, BridgeStatusControllerMessenger, BridgeStatusControllerState, StartPollingForBridgeTxStatusArgsSerialized } from "../types.cjs";
-export declare const rekeyHistoryItemInState: (state: BridgeStatusControllerState, actionId: string, txMeta: {
+export declare const rekeyHistoryItemInState: (state: BridgeStatusControllerState, oldKey: string, newKey: string, txMeta: {
     id: string;
     hash?: string;
 }) => boolean;
+export declare const isBatchSellHistoryItem: (historyItem: BridgeHistoryItem) => boolean;
 /**
  * Returns the history entry that matches the txMeta by id, actionId, batchId, or txHash
  *
@@ -20,10 +21,26 @@ export declare const getMatchingHistoryEntryForTxMeta: (txHistory: BridgeStatusC
  * @returns The history entry that matches the txMeta
  */
 export declare const getMatchingHistoryEntryForApprovalTxMeta: (txHistory: BridgeStatusControllerState['txHistory'], txMeta: TransactionMeta) => [string, BridgeHistoryItem] | undefined;
+/**
+ * Returns the BatchSell history items in the same batch as the provided tx hash.
+ *
+ * @param txHistory - The bridge status controller's history to search for matching history items
+ * @param txHashOrId - the hash or txMeta.id of a single trade in a BatchSell
+ * @returns The matching history items for the tx hash and a boolean indicating if it's a 7702 batch.
+ * @example
+ * getBatchSellHistoryItemsForTxHash(txHistory, id)
+ * If id is the hash or txMetaId of a BatchSell trade, it will return the history items for
+ * the trade and all other trades in the same batch.
+ */
+export declare const getBatchSellHistoryItemsForTxHash: (txHistory: BridgeStatusControllerState['txHistory'], txHashOrId?: string) => {
+    historyItems: BridgeHistoryItem[];
+    is7702Batch: boolean;
+};
 /**
  * Determines the key to use for storing a bridge history item.
  * Uses actionId for pre-submission tracking, or bridgeTxMetaId for post-submission.
  *
+ * @deprecated specify an explicit history key instead
  * @param actionId - The action ID used for pre-submission tracking
  * @param bridgeTxMetaId - The transaction meta ID from bridgeTxMeta
  * @param syntheticTransactionId - The transactionId of the intent's placeholder transaction
@@ -31,10 +48,7 @@ export declare const getMatchingHistoryEntryForApprovalTxMeta: (txHistory: Bridg
  * @throws Error if neither actionId nor bridgeTxMetaId is provided
  */
 export declare function getHistoryKey(actionId: string | undefined, bridgeTxMetaId: string | undefined, syntheticTransactionId?: string): string;
-export declare const getInitialHistoryItem: (args: StartPollingForBridgeTxStatusArgsSerialized) => {
-    historyKey: string;
-    txHistoryItem: BridgeHistoryItem;
-};
+export declare const getInitialHistoryItem: (args: StartPollingForBridgeTxStatusArgsSerialized) => BridgeHistoryItem;
 export declare const shouldPollHistoryItem: (historyItem: BridgeHistoryItem) => boolean;
 export declare const isHistoryItemTooOld: (messenger: BridgeStatusControllerMessenger, historyItem: BridgeHistoryItem) => boolean;
 //# sourceMappingURL=history.d.cts.map

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

@@ -1 +1 @@
-{"version":3,"file":"history.d.cts","sourceRoot":"","sources":["../../src/utils/history.ts"],"names":[],"mappings":"AAMA,OAAO,KAAK,EAAE,eAAe,EAAE,yCAAyC;AAExE,OAAO,KAAK,EACV,iBAAiB,EACjB,+BAA+B,EAC/B,2BAA2B,EAC3B,2CAA2C,EAC5C,qBAAiB;AAGlB,eAAO,MAAM,uBAAuB,UAC3B,2BAA2B,YACxB,MAAM,UACR;IAAE,EAAE,EAAE,MAAM,CAAC;IAAC,IAAI,CAAC,EAAE,MAAM,CAAA;CAAE,KACpC,OAoBF,CAAC;AAEF;;;;;;GAMG;AACH,eAAO,MAAM,gCAAgC,cAChC,2BAA2B,CAAC,WAAW,CAAC,UAC3C,eAAe,KACtB,CAAC,MAAM,EAAE,iBAAiB,CAAC,GAAG,SAqBhC,CAAC;AAEF;;;;;;GAMG;AACH,eAAO,MAAM,wCAAwC,cACxC,2BAA2B,CAAC,WAAW,CAAC,UAC3C,eAAe,KACtB,CAAC,MAAM,EAAE,iBAAiB,CAAC,GAAG,SAMhC,CAAC;AAEF;;;;;;;;;GASG;AACH,wBAAgB,aAAa,CAC3B,QAAQ,EAAE,MAAM,GAAG,SAAS,EAC5B,cAAc,EAAE,MAAM,GAAG,SAAS,EAClC,sBAAsB,CAAC,EAAE,MAAM,GAC9B,MAAM,CAQR;AAED,eAAO,MAAM,qBAAqB,SAC1B,2CAA2C;gBAErC,MAAM;mBACH,iBAAiB;CA6EjC,CAAC;AAEF,eAAO,MAAM,qBAAqB,gBACnB,iBAAiB,KAC7B,OASF,CAAC;AAEF,eAAO,MAAM,mBAAmB,4DAEjB,iBAAiB,KAC7B,OAIF,CAAC"}
+{"version":3,"file":"history.d.cts","sourceRoot":"","sources":["../../src/utils/history.ts"],"names":[],"mappings":"AAMA,OAAO,KAAK,EAAE,eAAe,EAAE,yCAAyC;AAExE,OAAO,KAAK,EACV,iBAAiB,EACjB,+BAA+B,EAC/B,2BAA2B,EAC3B,2CAA2C,EAC5C,qBAAiB;AAqBlB,eAAO,MAAM,uBAAuB,UAC3B,2BAA2B,UAC1B,MAAM,UACN,MAAM,UACN;IAAE,EAAE,EAAE,MAAM,CAAC;IAAC,IAAI,CAAC,EAAE,MAAM,CAAA;CAAE,KACpC,OAYF,CAAC;AAEF,eAAO,MAAM,sBAAsB,gBACpB,iBAAiB,KAC7B,OAA8C,CAAC;AAElD;;;;;;GAMG;AACH,eAAO,MAAM,gCAAgC,cAChC,2BAA2B,CAAC,WAAW,CAAC,UAC3C,eAAe,KACtB,CAAC,MAAM,EAAE,iBAAiB,CAAC,GAAG,SA0BhC,CAAC;AAEF;;;;;;GAMG;AACH,eAAO,MAAM,wCAAwC,cACxC,2BAA2B,CAAC,WAAW,CAAC,UAC3C,eAAe,KACtB,CAAC,MAAM,EAAE,iBAAiB,CAAC,GAAG,SAMhC,CAAC;AAEF;;;;;;;;;;GAUG;AACH,eAAO,MAAM,iCAAiC,cACjC,2BAA2B,CAAC,WAAW,CAAC,eACtC,MAAM;kBACF,iBAAiB,EAAE;iBAAe,OAAO;CAmC3D,CAAC;AAEF;;;;;;;;;;GAUG;AACH,wBAAgB,aAAa,CAC3B,QAAQ,EAAE,MAAM,GAAG,SAAS,EAC5B,cAAc,EAAE,MAAM,GAAG,SAAS,EAClC,sBAAsB,CAAC,EAAE,MAAM,GAC9B,MAAM,CAQR;AAED,eAAO,MAAM,qBAAqB,SAC1B,2CAA2C,KAChD,iBA6EF,CAAC;AAEF,eAAO,MAAM,qBAAqB,gBACnB,iBAAiB,KAC7B,OASF,CAAC;AAEF,eAAO,MAAM,mBAAmB,4DAEjB,iBAAiB,KAC7B,OAIF,CAAC"}

package/dist/utils/history.d.mts

@@ -1,9 +1,10 @@
 import type { TransactionMeta } from "@metamask/transaction-controller";
 import type { BridgeHistoryItem, BridgeStatusControllerMessenger, BridgeStatusControllerState, StartPollingForBridgeTxStatusArgsSerialized } from "../types.mjs";
-export declare const rekeyHistoryItemInState: (state: BridgeStatusControllerState, actionId: string, txMeta: {
+export declare const rekeyHistoryItemInState: (state: BridgeStatusControllerState, oldKey: string, newKey: string, txMeta: {
     id: string;
     hash?: string;
 }) => boolean;
+export declare const isBatchSellHistoryItem: (historyItem: BridgeHistoryItem) => boolean;
 /**
  * Returns the history entry that matches the txMeta by id, actionId, batchId, or txHash
  *
@@ -20,10 +21,26 @@ export declare const getMatchingHistoryEntryForTxMeta: (txHistory: BridgeStatusC
  * @returns The history entry that matches the txMeta
  */
 export declare const getMatchingHistoryEntryForApprovalTxMeta: (txHistory: BridgeStatusControllerState['txHistory'], txMeta: TransactionMeta) => [string, BridgeHistoryItem] | undefined;
+/**
+ * Returns the BatchSell history items in the same batch as the provided tx hash.
+ *
+ * @param txHistory - The bridge status controller's history to search for matching history items
+ * @param txHashOrId - the hash or txMeta.id of a single trade in a BatchSell
+ * @returns The matching history items for the tx hash and a boolean indicating if it's a 7702 batch.
+ * @example
+ * getBatchSellHistoryItemsForTxHash(txHistory, id)
+ * If id is the hash or txMetaId of a BatchSell trade, it will return the history items for
+ * the trade and all other trades in the same batch.
+ */
+export declare const getBatchSellHistoryItemsForTxHash: (txHistory: BridgeStatusControllerState['txHistory'], txHashOrId?: string) => {
+    historyItems: BridgeHistoryItem[];
+    is7702Batch: boolean;
+};
 /**
  * Determines the key to use for storing a bridge history item.
  * Uses actionId for pre-submission tracking, or bridgeTxMetaId for post-submission.
  *
+ * @deprecated specify an explicit history key instead
  * @param actionId - The action ID used for pre-submission tracking
  * @param bridgeTxMetaId - The transaction meta ID from bridgeTxMeta
  * @param syntheticTransactionId - The transactionId of the intent's placeholder transaction
@@ -31,10 +48,7 @@ export declare const getMatchingHistoryEntryForApprovalTxMeta: (txHistory: Bridg
  * @throws Error if neither actionId nor bridgeTxMetaId is provided
  */
 export declare function getHistoryKey(actionId: string | undefined, bridgeTxMetaId: string | undefined, syntheticTransactionId?: string): string;
-export declare const getInitialHistoryItem: (args: StartPollingForBridgeTxStatusArgsSerialized) => {
-    historyKey: string;
-    txHistoryItem: BridgeHistoryItem;
-};
+export declare const getInitialHistoryItem: (args: StartPollingForBridgeTxStatusArgsSerialized) => BridgeHistoryItem;
 export declare const shouldPollHistoryItem: (historyItem: BridgeHistoryItem) => boolean;
 export declare const isHistoryItemTooOld: (messenger: BridgeStatusControllerMessenger, historyItem: BridgeHistoryItem) => boolean;
 //# sourceMappingURL=history.d.mts.map

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

@@ -1 +1 @@
-{"version":3,"file":"history.d.mts","sourceRoot":"","sources":["../../src/utils/history.ts"],"names":[],"mappings":"AAMA,OAAO,KAAK,EAAE,eAAe,EAAE,yCAAyC;AAExE,OAAO,KAAK,EACV,iBAAiB,EACjB,+BAA+B,EAC/B,2BAA2B,EAC3B,2CAA2C,EAC5C,qBAAiB;AAGlB,eAAO,MAAM,uBAAuB,UAC3B,2BAA2B,YACxB,MAAM,UACR;IAAE,EAAE,EAAE,MAAM,CAAC;IAAC,IAAI,CAAC,EAAE,MAAM,CAAA;CAAE,KACpC,OAoBF,CAAC;AAEF;;;;;;GAMG;AACH,eAAO,MAAM,gCAAgC,cAChC,2BAA2B,CAAC,WAAW,CAAC,UAC3C,eAAe,KACtB,CAAC,MAAM,EAAE,iBAAiB,CAAC,GAAG,SAqBhC,CAAC;AAEF;;;;;;GAMG;AACH,eAAO,MAAM,wCAAwC,cACxC,2BAA2B,CAAC,WAAW,CAAC,UAC3C,eAAe,KACtB,CAAC,MAAM,EAAE,iBAAiB,CAAC,GAAG,SAMhC,CAAC;AAEF;;;;;;;;;GASG;AACH,wBAAgB,aAAa,CAC3B,QAAQ,EAAE,MAAM,GAAG,SAAS,EAC5B,cAAc,EAAE,MAAM,GAAG,SAAS,EAClC,sBAAsB,CAAC,EAAE,MAAM,GAC9B,MAAM,CAQR;AAED,eAAO,MAAM,qBAAqB,SAC1B,2CAA2C;gBAErC,MAAM;mBACH,iBAAiB;CA6EjC,CAAC;AAEF,eAAO,MAAM,qBAAqB,gBACnB,iBAAiB,KAC7B,OASF,CAAC;AAEF,eAAO,MAAM,mBAAmB,4DAEjB,iBAAiB,KAC7B,OAIF,CAAC"}
+{"version":3,"file":"history.d.mts","sourceRoot":"","sources":["../../src/utils/history.ts"],"names":[],"mappings":"AAMA,OAAO,KAAK,EAAE,eAAe,EAAE,yCAAyC;AAExE,OAAO,KAAK,EACV,iBAAiB,EACjB,+BAA+B,EAC/B,2BAA2B,EAC3B,2CAA2C,EAC5C,qBAAiB;AAqBlB,eAAO,MAAM,uBAAuB,UAC3B,2BAA2B,UAC1B,MAAM,UACN,MAAM,UACN;IAAE,EAAE,EAAE,MAAM,CAAC;IAAC,IAAI,CAAC,EAAE,MAAM,CAAA;CAAE,KACpC,OAYF,CAAC;AAEF,eAAO,MAAM,sBAAsB,gBACpB,iBAAiB,KAC7B,OAA8C,CAAC;AAElD;;;;;;GAMG;AACH,eAAO,MAAM,gCAAgC,cAChC,2BAA2B,CAAC,WAAW,CAAC,UAC3C,eAAe,KACtB,CAAC,MAAM,EAAE,iBAAiB,CAAC,GAAG,SA0BhC,CAAC;AAEF;;;;;;GAMG;AACH,eAAO,MAAM,wCAAwC,cACxC,2BAA2B,CAAC,WAAW,CAAC,UAC3C,eAAe,KACtB,CAAC,MAAM,EAAE,iBAAiB,CAAC,GAAG,SAMhC,CAAC;AAEF;;;;;;;;;;GAUG;AACH,eAAO,MAAM,iCAAiC,cACjC,2BAA2B,CAAC,WAAW,CAAC,eACtC,MAAM;kBACF,iBAAiB,EAAE;iBAAe,OAAO;CAmC3D,CAAC;AAEF;;;;;;;;;;GAUG;AACH,wBAAgB,aAAa,CAC3B,QAAQ,EAAE,MAAM,GAAG,SAAS,EAC5B,cAAc,EAAE,MAAM,GAAG,SAAS,EAClC,sBAAsB,CAAC,EAAE,MAAM,GAC9B,MAAM,CAQR;AAED,eAAO,MAAM,qBAAqB,SAC1B,2CAA2C,KAChD,iBA6EF,CAAC;AAEF,eAAO,MAAM,qBAAqB,gBACnB,iBAAiB,KAC7B,OASF,CAAC;AAEF,eAAO,MAAM,mBAAmB,4DAEjB,iBAAiB,KAC7B,OAIF,CAAC"}

package/dist/utils/history.mjs

@@ -1,25 +1,32 @@
 import { StatusTypes, isCrossChain, isNonEvmChainId, isTronChainId } from "@metamask/bridge-controller";
 import { getMaxPendingHistoryItemAgeMs } from "./feature-flags.mjs";
-export const rekeyHistoryItemInState = (state, actionId, txMeta) => {
-    const historyItem = state.txHistory[actionId];
-    if (!historyItem) {
-        return false;
-    }
-    state.txHistory[txMeta.id] = {
-        ...historyItem,
+const updateHistoryItem = (oldHistoryItem, txMeta) => {
+    return {
+        ...oldHistoryItem,
         txMetaId: txMeta.id,
-        originalTransactionId: historyItem.originalTransactionId ?? txMeta.id,
+        originalTransactionId: oldHistoryItem.originalTransactionId ?? txMeta.id,
         status: {
-            ...historyItem.status,
+            ...oldHistoryItem.status,
             srcChain: {
-                ...historyItem.status.srcChain,
-                txHash: txMeta.hash ?? historyItem.status.srcChain?.txHash,
+                ...oldHistoryItem.status.srcChain,
+                txHash: txMeta.hash ?? oldHistoryItem.status.srcChain?.txHash,
             },
         },
     };
-    delete state.txHistory[actionId];
+};
+export const rekeyHistoryItemInState = (state, oldKey, newKey, txMeta) => {
+    const historyItem = state.txHistory[oldKey];
+    if (!historyItem) {
+        return false;
+    }
+    state.txHistory[newKey] = {
+        ...historyItem,
+        ...updateHistoryItem(historyItem, txMeta),
+    };
+    delete state.txHistory[oldKey];
     return true;
 };
+export const isBatchSellHistoryItem = (historyItem) => Boolean(historyItem?.batchSellData);
 /**
  * Returns the history entry that matches the txMeta by id, actionId, batchId, or txHash
  *
@@ -35,7 +42,12 @@ export const getMatchingHistoryEntryForTxMeta = (txHistory, txMeta) => {
             key === txMeta.actionId ||
             txMetaId === txMeta.id ||
             (actionId ? actionId === txMeta.actionId : false) ||
-            (batchId ? batchId === txMeta.batchId : false) ||
+            // When the batch is not atomic (BatchSell), ignore batchId matching to prevent txs
+            // in the batch from getting marked complete/failed too early if one fails
+            // Multiple BatchSell STX trades may have the same batchId
+            (Boolean(batchId) &&
+                !isBatchSellHistoryItem(value) &&
+                batchId === txMeta.batchId) ||
             (txHash ? txHash.toLowerCase() === txMeta.hash?.toLowerCase() : false));
     });
 };
@@ -50,10 +62,46 @@ export const getMatchingHistoryEntryForApprovalTxMeta = (txHistory, txMeta) => {
     const historyEntries = Object.entries(txHistory);
     return historyEntries.find(([_, value]) => value.approvalTxId ? value.approvalTxId === txMeta.id : false);
 };
+/**
+ * Returns the BatchSell history items in the same batch as the provided tx hash.
+ *
+ * @param txHistory - The bridge status controller's history to search for matching history items
+ * @param txHashOrId - the hash or txMeta.id of a single trade in a BatchSell
+ * @returns The matching history items for the tx hash and a boolean indicating if it's a 7702 batch.
+ * @example
+ * getBatchSellHistoryItemsForTxHash(txHistory, id)
+ * If id is the hash or txMetaId of a BatchSell trade, it will return the history items for
+ * the trade and all other trades in the same batch.
+ */
+export const getBatchSellHistoryItemsForTxHash = (txHistory, txHashOrId) => {
+    const historyItems = Object.values(txHistory);
+    if (!txHashOrId) {
+        return {
+            historyItems: [],
+            is7702Batch: false,
+        };
+    }
+    /**
+     * Either a delegation tx or a single STX BatchSell trade
+     */
+    const parentHistoryItem = historyItems.find(({ status, txMetaId }) => status.srcChain.txHash?.toLowerCase() === txHashOrId.toLowerCase() ||
+        txMetaId === txHashOrId);
+    // Match by batchId or by quoteId
+    const matchingHistoryItems = parentHistoryItem?.quoteIds?.map((quoteId) => txHistory[quoteId]) ??
+        historyItems.filter(({ batchId }) => batchId &&
+            parentHistoryItem?.batchId &&
+            batchId === parentHistoryItem.batchId);
+    return {
+        historyItems: matchingHistoryItems.filter((item) => item !== undefined),
+        is7702Batch: Boolean(parentHistoryItem) &&
+            Boolean(parentHistoryItem?.quoteIds?.length),
+    };
+};
 /**
  * Determines the key to use for storing a bridge history item.
  * Uses actionId for pre-submission tracking, or bridgeTxMetaId for post-submission.
  *
+ * @deprecated specify an explicit history key instead
  * @param actionId - The action ID used for pre-submission tracking
  * @param bridgeTxMetaId - The transaction meta ID from bridgeTxMeta
  * @param syntheticTransactionId - The transactionId of the intent's placeholder transaction
@@ -68,11 +116,7 @@ export function getHistoryKey(actionId, bridgeTxMetaId, syntheticTransactionId)
     return historyKey;
 }
 export const getInitialHistoryItem = (args) => {
-    const { bridgeTxMeta, quoteResponse, startTime, slippagePercentage, initialDestAssetBalance, targetContractAddress, approvalTxId, isStxEnabled, location, abTests, activeAbTests, accountAddress: selectedAddress, originalTransactionId, actionId, tokenSecurityTypeDestination, } = args;
-    // Determine the key for this history item:
-    // - For pre-submission (non-batch EVM): use actionId
-    // - For post-submission or other cases: use bridgeTxMeta.id
-    const historyKey = getHistoryKey(actionId, bridgeTxMeta?.id, originalTransactionId);
+    const { bridgeTxMeta, quoteResponse, startTime, slippagePercentage, initialDestAssetBalance, targetContractAddress, approvalTxId, isStxEnabled, location, abTests, activeAbTests, accountAddress: selectedAddress, originalTransactionId, actionId, tokenSecurityTypeDestination, batchSellData, quoteIds, } = args;
     // Write all non-status fields to state so we can reference the quote in Activity list without the Bridge API
     // We know it's in progress but not the exact status yet
     const txHistoryItem = {
@@ -118,7 +162,13 @@ export const getInitialHistoryItem = (args) => {
             tokenSecurityTypeDestination,
         }),
     };
-    return { historyKey, txHistoryItem };
+    if (batchSellData) {
+        txHistoryItem.batchSellData = batchSellData;
+    }
+    if (quoteIds) {
+        txHistoryItem.quoteIds = quoteIds;
+    }
+    return txHistoryItem;
 };
 export const shouldPollHistoryItem = (historyItem) => {
     const isIntent = Boolean(historyItem?.quote?.intent);

package/dist/utils/history.mjs.map

@@ -1 +1 @@
-{"version":3,"file":"history.mjs","sourceRoot":"","sources":["../../src/utils/history.ts"],"names":[],"mappings":"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","sourcesContent":["import {\n  StatusTypes,\n  isCrossChain,\n  isNonEvmChainId,\n  isTronChainId,\n} from '@metamask/bridge-controller';\nimport type { TransactionMeta } from '@metamask/transaction-controller';\n\nimport type {\n  BridgeHistoryItem,\n  BridgeStatusControllerMessenger,\n  BridgeStatusControllerState,\n  StartPollingForBridgeTxStatusArgsSerialized,\n} from '../types';\nimport { getMaxPendingHistoryItemAgeMs } from './feature-flags';\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\n/**\n * Returns the history entry that matches the txMeta by id, actionId, batchId, or txHash\n *\n * @param txHistory - The transaction history\n * @param txMeta - The transaction meta\n * @returns The history entry that matches the txMeta\n */\nexport const getMatchingHistoryEntryForTxMeta = (\n  txHistory: BridgeStatusControllerState['txHistory'],\n  txMeta: TransactionMeta,\n): [string, BridgeHistoryItem] | undefined => {\n  const historyEntries = Object.entries(txHistory);\n\n  return historyEntries.find(([key, value]) => {\n    const {\n      txMetaId,\n      actionId,\n      batchId,\n      status: {\n        srcChain: { txHash },\n      },\n    } = value;\n    return (\n      key === txMeta.id ||\n      key === txMeta.actionId ||\n      txMetaId === txMeta.id ||\n      (actionId ? actionId === txMeta.actionId : false) ||\n      (batchId ? batchId === txMeta.batchId : false) ||\n      (txHash ? txHash.toLowerCase() === txMeta.hash?.toLowerCase() : false)\n    );\n  });\n};\n\n/**\n * Returns the history entry whose approvalTxId matches the approval transaction\n *\n * @param txHistory - The transaction history\n * @param txMeta - The transaction meta\n * @returns The history entry that matches the txMeta\n */\nexport const getMatchingHistoryEntryForApprovalTxMeta = (\n  txHistory: BridgeStatusControllerState['txHistory'],\n  txMeta: TransactionMeta,\n): [string, BridgeHistoryItem] | undefined => {\n  const historyEntries = Object.entries(txHistory);\n\n  return historyEntries.find(([_, value]) =>\n    value.approvalTxId ? value.approvalTxId === txMeta.id : false,\n  );\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 * @param syntheticTransactionId - The transactionId of the intent's placeholder transaction\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  syntheticTransactionId?: string,\n): string {\n  const historyKey = actionId ?? bridgeTxMetaId ?? syntheticTransactionId;\n  if (!historyKey) {\n    throw new Error(\n      'Cannot add tx to history: either actionId, bridgeTxMeta.id, or syntheticTransactionId must be provided',\n    );\n  }\n  return historyKey;\n}\n\nexport const getInitialHistoryItem = (\n  args: StartPollingForBridgeTxStatusArgsSerialized,\n): {\n  historyKey: string;\n  txHistoryItem: BridgeHistoryItem;\n} => {\n  const {\n    bridgeTxMeta,\n    quoteResponse,\n    startTime,\n    slippagePercentage,\n    initialDestAssetBalance,\n    targetContractAddress,\n    approvalTxId,\n    isStxEnabled,\n    location,\n    abTests,\n    activeAbTests,\n    accountAddress: selectedAddress,\n    originalTransactionId,\n    actionId,\n    tokenSecurityTypeDestination,\n  } = args;\n  // Determine the key for this history item:\n  // - For pre-submission (non-batch EVM): use actionId\n  // - For post-submission or other cases: use bridgeTxMeta.id\n  const historyKey = getHistoryKey(\n    actionId,\n    bridgeTxMeta?.id,\n    originalTransactionId,\n  );\n\n  // Write all non-status fields to state so we can reference the quote in Activity list without the Bridge API\n  // We know it's in progress but not the exact status yet\n  const txHistoryItem = {\n    txMetaId: bridgeTxMeta?.id,\n    actionId,\n    originalTransactionId: originalTransactionId ?? bridgeTxMeta?.id, // Keep original for intent transactions\n    batchId: bridgeTxMeta?.batchId,\n    quote: quoteResponse.quote,\n    startTime,\n    estimatedProcessingTimeInSeconds:\n      quoteResponse.estimatedProcessingTimeInSeconds,\n    slippagePercentage,\n    pricingData: {\n      amountSent: quoteResponse.sentAmount?.amount ?? '0',\n      amountSentInUsd: quoteResponse.sentAmount?.usd ?? undefined,\n      quotedGasInUsd: quoteResponse.gasFee?.effective?.usd ?? undefined,\n      quotedReturnInUsd: quoteResponse.toTokenAmount?.usd ?? undefined,\n      quotedGasAmount: quoteResponse.gasFee?.effective?.amount ?? undefined,\n    },\n    initialDestAssetBalance,\n    targetContractAddress,\n    account: selectedAddress,\n    status: {\n      // We always have a PENDING status when we start polling for a tx, don't need the Bridge API for that\n      // Also we know the bare minimum fields for status at this point in time\n      status: StatusTypes.PENDING,\n      srcChain: {\n        chainId: quoteResponse.quote.srcChainId,\n        // We don't set the initial tx hash for STX transactions because they return a hash on submission\n        // but it is not finalized until confirmation on chain\n        txHash:\n          isNonEvmChainId(quoteResponse.quote.srcChainId) || !isStxEnabled\n            ? bridgeTxMeta?.hash\n            : undefined,\n      },\n    },\n    hasApprovalTx: Boolean(quoteResponse.approval),\n    approvalTxId,\n    isStxEnabled: Boolean(isStxEnabled),\n    featureId: quoteResponse.featureId,\n    location,\n    ...(abTests && { abTests }),\n    ...(activeAbTests && { activeAbTests }),\n    ...(tokenSecurityTypeDestination !== undefined && {\n      tokenSecurityTypeDestination,\n    }),\n  };\n\n  return { historyKey, txHistoryItem };\n};\n\nexport const shouldPollHistoryItem = (\n  historyItem: BridgeHistoryItem,\n): boolean => {\n  const isIntent = Boolean(historyItem?.quote?.intent);\n  const isBridgeTx = isCrossChain(\n    historyItem.quote.srcChainId,\n    historyItem.quote.destChainId,\n  );\n  const isTronTx = isTronChainId(historyItem.quote.srcChainId);\n\n  return [isBridgeTx, isIntent, isTronTx].some(Boolean);\n};\n\nexport const isHistoryItemTooOld = (\n  messenger: BridgeStatusControllerMessenger,\n  historyItem: BridgeHistoryItem,\n): boolean => {\n  const maxPendingHistoryItemAgeMs = getMaxPendingHistoryItemAgeMs(messenger);\n\n  return Date.now() - historyItem.startTime > maxPendingHistoryItemAgeMs;\n};\n"]}
+{"version":3,"file":"history.mjs","sourceRoot":"","sources":["../../src/utils/history.ts"],"names":[],"mappings":"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","sourcesContent":["import {\n  StatusTypes,\n  isCrossChain,\n  isNonEvmChainId,\n  isTronChainId,\n} from '@metamask/bridge-controller';\nimport type { TransactionMeta } from '@metamask/transaction-controller';\n\nimport type {\n  BridgeHistoryItem,\n  BridgeStatusControllerMessenger,\n  BridgeStatusControllerState,\n  StartPollingForBridgeTxStatusArgsSerialized,\n} from '../types';\nimport { getMaxPendingHistoryItemAgeMs } from './feature-flags';\n\nconst updateHistoryItem = (\n  oldHistoryItem: BridgeHistoryItem,\n  txMeta: { id: string; hash?: string },\n): Partial<BridgeHistoryItem> => {\n  return {\n    ...oldHistoryItem,\n    txMetaId: txMeta.id,\n    originalTransactionId: oldHistoryItem.originalTransactionId ?? txMeta.id,\n    status: {\n      ...oldHistoryItem.status,\n      srcChain: {\n        ...oldHistoryItem.status.srcChain,\n        txHash: txMeta.hash ?? oldHistoryItem.status.srcChain?.txHash,\n      },\n    },\n  };\n};\n\nexport const rekeyHistoryItemInState = (\n  state: BridgeStatusControllerState,\n  oldKey: string,\n  newKey: string,\n  txMeta: { id: string; hash?: string },\n): boolean => {\n  const historyItem = state.txHistory[oldKey];\n  if (!historyItem) {\n    return false;\n  }\n\n  state.txHistory[newKey] = {\n    ...historyItem,\n    ...updateHistoryItem(historyItem, txMeta),\n  };\n  delete state.txHistory[oldKey];\n  return true;\n};\n\nexport const isBatchSellHistoryItem = (\n  historyItem: BridgeHistoryItem,\n): boolean => Boolean(historyItem?.batchSellData);\n\n/**\n * Returns the history entry that matches the txMeta by id, actionId, batchId, or txHash\n *\n * @param txHistory - The transaction history\n * @param txMeta - The transaction meta\n * @returns The history entry that matches the txMeta\n */\nexport const getMatchingHistoryEntryForTxMeta = (\n  txHistory: BridgeStatusControllerState['txHistory'],\n  txMeta: TransactionMeta,\n): [string, BridgeHistoryItem] | undefined => {\n  const historyEntries = Object.entries(txHistory);\n\n  return historyEntries.find(([key, value]) => {\n    const {\n      txMetaId,\n      actionId,\n      batchId,\n      status: {\n        srcChain: { txHash },\n      },\n    } = value;\n    return (\n      key === txMeta.id ||\n      key === txMeta.actionId ||\n      txMetaId === txMeta.id ||\n      (actionId ? actionId === txMeta.actionId : false) ||\n      // When the batch is not atomic (BatchSell), ignore batchId matching to prevent txs\n      // in the batch from getting marked complete/failed too early if one fails\n      // Multiple BatchSell STX trades may have the same batchId\n      (Boolean(batchId) &&\n        !isBatchSellHistoryItem(value) &&\n        batchId === txMeta.batchId) ||\n      (txHash ? txHash.toLowerCase() === txMeta.hash?.toLowerCase() : false)\n    );\n  });\n};\n\n/**\n * Returns the history entry whose approvalTxId matches the approval transaction\n *\n * @param txHistory - The transaction history\n * @param txMeta - The transaction meta\n * @returns The history entry that matches the txMeta\n */\nexport const getMatchingHistoryEntryForApprovalTxMeta = (\n  txHistory: BridgeStatusControllerState['txHistory'],\n  txMeta: TransactionMeta,\n): [string, BridgeHistoryItem] | undefined => {\n  const historyEntries = Object.entries(txHistory);\n\n  return historyEntries.find(([_, value]) =>\n    value.approvalTxId ? value.approvalTxId === txMeta.id : false,\n  );\n};\n\n/**\n * Returns the BatchSell history items in the same batch as the provided tx hash.\n *\n * @param txHistory - The bridge status controller's history to search for matching history items\n * @param txHashOrId - the hash or txMeta.id of a single trade in a BatchSell\n * @returns The matching history items for the tx hash and a boolean indicating if it's a 7702 batch.\n * @example\n * getBatchSellHistoryItemsForTxHash(txHistory, id)\n * If id is the hash or txMetaId of a BatchSell trade, it will return the history items for\n * the trade and all other trades in the same batch.\n */\nexport const getBatchSellHistoryItemsForTxHash = (\n  txHistory: BridgeStatusControllerState['txHistory'],\n  txHashOrId?: string,\n): { historyItems: BridgeHistoryItem[]; is7702Batch: boolean } => {\n  const historyItems = Object.values(txHistory);\n\n  if (!txHashOrId) {\n    return {\n      historyItems: [],\n      is7702Batch: false,\n    };\n  }\n\n  /**\n   * Either a delegation tx or a single STX BatchSell trade\n   */\n  const parentHistoryItem = historyItems.find(\n    ({ status, txMetaId }) =>\n      status.srcChain.txHash?.toLowerCase() === txHashOrId.toLowerCase() ||\n      txMetaId === txHashOrId,\n  );\n\n  // Match by batchId or by quoteId\n  const matchingHistoryItems =\n    parentHistoryItem?.quoteIds?.map((quoteId) => txHistory[quoteId]) ??\n    historyItems.filter(\n      ({ batchId }) =>\n        batchId &&\n        parentHistoryItem?.batchId &&\n        batchId === parentHistoryItem.batchId,\n    );\n\n  return {\n    historyItems: matchingHistoryItems.filter((item) => item !== undefined),\n    is7702Batch:\n      Boolean(parentHistoryItem) &&\n      Boolean(parentHistoryItem?.quoteIds?.length),\n  };\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 * @deprecated specify an explicit history key instead\n * @param actionId - The action ID used for pre-submission tracking\n * @param bridgeTxMetaId - The transaction meta ID from bridgeTxMeta\n * @param syntheticTransactionId - The transactionId of the intent's placeholder transaction\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  syntheticTransactionId?: string,\n): string {\n  const historyKey = actionId ?? bridgeTxMetaId ?? syntheticTransactionId;\n  if (!historyKey) {\n    throw new Error(\n      'Cannot add tx to history: either actionId, bridgeTxMeta.id, or syntheticTransactionId must be provided',\n    );\n  }\n  return historyKey;\n}\n\nexport const getInitialHistoryItem = (\n  args: StartPollingForBridgeTxStatusArgsSerialized,\n): BridgeHistoryItem => {\n  const {\n    bridgeTxMeta,\n    quoteResponse,\n    startTime,\n    slippagePercentage,\n    initialDestAssetBalance,\n    targetContractAddress,\n    approvalTxId,\n    isStxEnabled,\n    location,\n    abTests,\n    activeAbTests,\n    accountAddress: selectedAddress,\n    originalTransactionId,\n    actionId,\n    tokenSecurityTypeDestination,\n    batchSellData,\n    quoteIds,\n  } = args;\n\n  // Write all non-status fields to state so we can reference the quote in Activity list without the Bridge API\n  // We know it's in progress but not the exact status yet\n  const txHistoryItem: BridgeHistoryItem = {\n    txMetaId: bridgeTxMeta?.id,\n    actionId,\n    originalTransactionId: originalTransactionId ?? bridgeTxMeta?.id, // Keep original for intent transactions\n    batchId: bridgeTxMeta?.batchId,\n    quote: quoteResponse.quote,\n    startTime,\n    estimatedProcessingTimeInSeconds:\n      quoteResponse.estimatedProcessingTimeInSeconds,\n    slippagePercentage,\n    pricingData: {\n      amountSent: quoteResponse.sentAmount?.amount ?? '0',\n      amountSentInUsd: quoteResponse.sentAmount?.usd ?? undefined,\n      quotedGasInUsd: quoteResponse.gasFee?.effective?.usd ?? undefined,\n      quotedReturnInUsd: quoteResponse.toTokenAmount?.usd ?? undefined,\n      quotedGasAmount: quoteResponse.gasFee?.effective?.amount ?? undefined,\n    },\n    initialDestAssetBalance,\n    targetContractAddress,\n    account: selectedAddress,\n    status: {\n      // We always have a PENDING status when we start polling for a tx, don't need the Bridge API for that\n      // Also we know the bare minimum fields for status at this point in time\n      status: StatusTypes.PENDING,\n      srcChain: {\n        chainId: quoteResponse.quote.srcChainId,\n        // We don't set the initial tx hash for STX transactions because they return a hash on submission\n        // but it is not finalized until confirmation on chain\n        txHash:\n          isNonEvmChainId(quoteResponse.quote.srcChainId) || !isStxEnabled\n            ? bridgeTxMeta?.hash\n            : undefined,\n      },\n    },\n    hasApprovalTx: Boolean(quoteResponse.approval),\n    approvalTxId,\n    isStxEnabled: Boolean(isStxEnabled),\n    featureId: quoteResponse.featureId,\n    location,\n    ...(abTests && { abTests }),\n    ...(activeAbTests && { activeAbTests }),\n    ...(tokenSecurityTypeDestination !== undefined && {\n      tokenSecurityTypeDestination,\n    }),\n  };\n\n  if (batchSellData) {\n    txHistoryItem.batchSellData = batchSellData;\n  }\n  if (quoteIds) {\n    txHistoryItem.quoteIds = quoteIds;\n  }\n\n  return txHistoryItem;\n};\n\nexport const shouldPollHistoryItem = (\n  historyItem: BridgeHistoryItem,\n): boolean => {\n  const isIntent = Boolean(historyItem?.quote?.intent);\n  const isBridgeTx = isCrossChain(\n    historyItem.quote.srcChainId,\n    historyItem.quote.destChainId,\n  );\n  const isTronTx = isTronChainId(historyItem.quote.srcChainId);\n\n  return [isBridgeTx, isIntent, isTronTx].some(Boolean);\n};\n\nexport const isHistoryItemTooOld = (\n  messenger: BridgeStatusControllerMessenger,\n  historyItem: BridgeHistoryItem,\n): boolean => {\n  const maxPendingHistoryItemAgeMs = getMaxPendingHistoryItemAgeMs(messenger);\n\n  return Date.now() - historyItem.startTime > maxPendingHistoryItemAgeMs;\n};\n"]}

package/dist/utils/metrics.cjs

@@ -86,11 +86,13 @@ const getRequestParamFromHistory = (historyItem) => {
     };
 };
 exports.getRequestParamFromHistory = getRequestParamFromHistory;
-const getTradeDataFromQuote = (quoteResponse) => {
+const getTradeDataFromQuote = (quoteResponse, batchSellTrades) => {
     return {
         usd_quoted_gas: Number(quoteResponse.gasFee?.effective?.usd ?? 0),
-        gas_included: quoteResponse.quote.gasIncluded ?? false,
-        gas_included_7702: quoteResponse.quote.gasIncluded7702 ?? false,
+        gas_included: quoteResponse.quote.gasIncluded ?? batchSellTrades?.gasIncluded ?? false,
+        gas_included_7702: quoteResponse.quote.gasIncluded7702 ??
+            batchSellTrades?.gasIncluded7702 ??
+            false,
         provider: (0, bridge_controller_1.formatProviderLabel)(quoteResponse.quote),
         quoted_time_minutes: Number(quoteResponse.estimatedProcessingTimeInSeconds / 60),
         usd_quoted_return: Number(quoteResponse.adjustedReturn?.usd ?? 0),
@@ -106,19 +108,20 @@ exports.getPriceImpactFromQuote = getPriceImpactFromQuote;
  * The quote is used to populate event properties before confirmation
  *
  * @param quoteResponse - The quote response
- * @param isStxEnabledOnClient - Whether smart transactions are enabled on the client, for example the getSmartTransactionsEnabled selector value from the extension
+ * @param isStxEnabled - Whether smart transactions are enabled on the client, for example the getSmartTransactionsEnabled selector value from the extension
  * @param accountHardwareType - The hardware wallet type used to submit the tx, or null if not 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 - Legacy A/B test context for `ab_tests` (backward compatibility)
  * @param activeAbTests - New A/B test context for `active_ab_tests` (migration target)
  * @param tokenSecurityTypeDestination - The security classification of the destination token, supplied by the client (e.g. from token security/scanning data). Pass `null` when no security data is available.
+ * @param batchSellTrades - The batch sell trades response
  * @returns The properties for the pre-confirmation event
  */
-const getPreConfirmationPropertiesFromQuote = (quoteResponse, isStxEnabledOnClient, accountHardwareType, location = bridge_controller_1.MetaMetricsSwapsEventSource.MainView, abTests, activeAbTests, tokenSecurityTypeDestination) => {
+const getPreConfirmationPropertiesFromQuote = (quoteResponse, isStxEnabled, accountHardwareType, location, abTests, activeAbTests, tokenSecurityTypeDestination, batchSellTrades) => {
     const { quote } = quoteResponse;
     return {
         ...(0, exports.getPriceImpactFromQuote)(quote),
-        ...(0, exports.getTradeDataFromQuote)(quoteResponse),
+        ...(0, exports.getTradeDataFromQuote)(quoteResponse, batchSellTrades),
         chain_id_source: (0, bridge_controller_1.formatChainIdToCaip)(quote.srcChainId),
         token_symbol_source: quote.srcAsset.symbol,
         token_address_source: quote.srcAsset.assetId,
@@ -130,7 +133,7 @@ const getPreConfirmationPropertiesFromQuote = (quoteResponse, isStxEnabledOnClie
         is_hardware_wallet: accountHardwareType !== null,
         swap_type: (0, bridge_controller_1.getSwapType)(quoteResponse.quote.srcChainId, quoteResponse.quote.destChainId),
         usd_amount_source: Number(quoteResponse.sentAmount?.usd ?? 0),
-        stx_enabled: isStxEnabledOnClient,
+        stx_enabled: isStxEnabled,
         action_type: bridge_controller_1.MetricsActionType.SWAPBRIDGE_V1,
         custom_slippage: false, // TODO detect whether the user changed the default slippage
         location,