@metamask/bridge-status-controller 68.1.0 → 70.0.0

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

@@ -1 +1 @@
-{"version":3,"file":"snaps.d.mts","sourceRoot":"","sources":["../../src/utils/snaps.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,WAAW,EAAE,wBAAwB;AAGnD;;;;;;;;;;GAUG;AACH,eAAO,MAAM,8BAA8B,WACjC,MAAM,eACD,MAAM,SACZ,WAAW,aACP,MAAM,YACP,OAAO,MAAM,EAAE,OAAO,CAAC;;;;;;;;;;;;;;;CAmBlC,CAAC"}
+{"version":3,"file":"snaps.d.mts","sourceRoot":"","sources":["../../src/utils/snaps.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,uBAAuB,EAAE,sCAAsC;AAC7E,OAAO,KAAK,EACV,aAAa,EACb,aAAa,EACb,KAAK,EACN,oCAAoC;AAYrC,OAAO,KAAK,EAAE,eAAe,EAAE,yCAAyC;AACxE,OAAO,KAAK,EAAE,WAAW,EAAO,wBAAwB;AAGxD,OAAO,KAAK,EACV,+BAA+B,EAC/B,qBAAqB,EACtB,qBAAiB;AAElB;;;;;;;;;;GAUG;AACH,eAAO,MAAM,8BAA8B,WACjC,MAAM,eACD,MAAM,SACZ,WAAW,aACP,MAAM,YACP,OAAO,MAAM,EAAE,OAAO,CAAC;;;;;;;;;;;;;;;CAmBlC,CAAC;AAEF;;;;;;;;;GASG;AACH,eAAO,MAAM,gBAAgB,UACpB,KAAK,cACA,MAAM,aACP,MAAM,UACT,MAAM;;;;;;;;;;;;;;;CAsBf,CAAC;AAEF,eAAO,MAAM,eAAe,kBACX,KAAK,cAAc,KAAK,EAAE,KAAK,CAAC,EAAE,UAAU,GAAG,OAAO,CAAC,GACpE,aAAa,iBACA,MAAM,KACpB,KACD,eAAe,EACf,iBAAiB,GAAG,QAAQ,GAAG,MAAM,GAAG,UAAU,GAAG,IAAI,GAAG,SAAS,CA4BtE,CAAC;AAEF;;;;;;;;;;GAUG;AACH,eAAO,MAAM,sBAAsB,iBAE7B,MAAM,GACN;IAAE,aAAa,EAAE,MAAM,CAAA;CAAE,GACzB;IAAE,MAAM,EAAE,OAAO,MAAM,EAAE,MAAM,CAAC,CAAA;CAAE,GAClC;IAAE,SAAS,EAAE,MAAM,CAAA;CAAE,SAClB,KAAK,iBACG,KAAK,cAAc,KAAK,CAAC,EAAE,OAAO,GAAG,UAAU,CAAC,GAC7D,aAAa,mBACE,uBAAuB,CAAC,kBAAkB,CAAC,CAAC,UAAU,CAAC,CAAC,MAAM,CAAC,KAC/E,eAAe,GAAG,qBA6DpB,CAAC;AAEF;;;;;;;;;;;GAWG;AACH,eAAO,MAAM,cAAc,sDAElB,KAAK,iBACG,cAAc,KAAK,EAAE,KAAK,CAAC,GAAG,aAAa,mBACzC,uBAAuB,CAAC,kBAAkB,CAAC,CAAC,UAAU,CAAC,CAAC,MAAM,CAAC,KAC/E,QAAQ,eAAe,CAgCzB,CAAC"}

package/dist/utils/snaps.mjs

@@ -1,3 +1,5 @@
+import { extractTradeData, formatChainIdToCaip, formatChainIdToHex, isCrossChain, isTronTrade } from "@metamask/bridge-controller";
+import { TransactionStatus, TransactionType } from "@metamask/transaction-controller";
 import { v4 as uuid } from "uuid";
 /**
  * Creates a client request object for signing and sending a transaction
@@ -29,4 +31,143 @@ export const createClientTransactionRequest = (snapId, transaction, scope, accou
         },
     };
 };
+/**
+ * Creates a request to sign and send a transaction for non-EVM chains
+ * Uses the new unified ClientRequest:signAndSendTransaction interface
+ *
+ * @param trade - The trade data
+ * @param srcChainId - The source chain ID
+ * @param accountId - The selected account ID
+ * @param snapId - The snap ID
+ * @returns The snap request object for signing and sending transaction
+ */
+export const getClientRequest = (trade, srcChainId, accountId, snapId) => {
+    const scope = formatChainIdToCaip(srcChainId);
+    const transactionData = extractTradeData(trade);
+    // Tron trades need the visible flag and contract type to be included in the request options
+    const options = isTronTrade(trade)
+        ? {
+            visible: trade.visible,
+            type: trade.raw_data?.contract?.[0]?.type,
+        }
+        : undefined;
+    // Use the new unified interface
+    return createClientTransactionRequest(snapId, transactionData, scope, accountId, options);
+};
+export const getTxMetaFields = (quoteResponse, approvalTxId) => {
+    // Handle destination chain ID - should always be convertible for EVM destinations
+    let destinationChainId;
+    try {
+        destinationChainId = formatChainIdToHex(quoteResponse.quote.destChainId);
+    }
+    catch {
+        // Fallback for non-EVM destination (shouldn't happen for BTC->EVM)
+        destinationChainId = '0x1'; // Default to mainnet
+    }
+    return {
+        destinationChainId,
+        sourceTokenAmount: quoteResponse.quote.srcTokenAmount,
+        sourceTokenSymbol: quoteResponse.quote.srcAsset.symbol,
+        sourceTokenDecimals: quoteResponse.quote.srcAsset.decimals,
+        sourceTokenAddress: quoteResponse.quote.srcAsset.address,
+        destinationTokenAmount: quoteResponse.quote.destTokenAmount,
+        destinationTokenSymbol: quoteResponse.quote.destAsset.symbol,
+        destinationTokenDecimals: quoteResponse.quote.destAsset.decimals,
+        destinationTokenAddress: quoteResponse.quote.destAsset.address,
+        // chainId is now excluded from this function and handled by the caller
+        approvalTxId,
+        // this is the decimal (non atomic) amount (not USD value) of source token to swap
+        swapTokenValue: quoteResponse.sentAmount.amount,
+    };
+};
+/**
+ * Handles the response from non-EVM transaction submission
+ * Works with the new unified ClientRequest:signAndSendTransaction interface
+ * Supports Solana, Bitcoin, and other non-EVM chains
+ *
+ * @param snapResponse - The response from the snap after transaction submission
+ * @param trade - The non-evm trade or approval data
+ * @param quoteResponse - The quote response containing trade details and metadata
+ * @param selectedAccount - The selected account information
+ * @returns The transaction metadata including non-EVM specific fields
+ */
+export const handleNonEvmTxResponse = (snapResponse, trade, quoteResponse, selectedAccount) => {
+    const selectedAccountAddress = selectedAccount.address;
+    const snapId = selectedAccount.metadata.snap?.id;
+    let hash;
+    // Handle different response formats
+    if (typeof snapResponse === 'string') {
+        hash = snapResponse;
+    }
+    else if (snapResponse && typeof snapResponse === 'object') {
+        // Check for new unified interface response format first
+        if ('transactionId' in snapResponse && snapResponse.transactionId) {
+            hash = snapResponse.transactionId;
+        }
+        else if ('result' in snapResponse &&
+            snapResponse.result &&
+            typeof snapResponse.result === 'object') {
+            // Try to extract signature from common locations in response object
+            hash =
+                snapResponse.result.signature ||
+                    snapResponse.result.txid ||
+                    snapResponse.result.hash ||
+                    snapResponse.result.txHash;
+        }
+        else if ('signature' in snapResponse &&
+            snapResponse.signature &&
+            typeof snapResponse.signature === 'string') {
+            hash = snapResponse.signature;
+        }
+    }
+    const isBridgeTx = isCrossChain(quoteResponse.quote.srcChainId, quoteResponse.quote.destChainId);
+    let hexChainId;
+    try {
+        hexChainId = formatChainIdToHex(quoteResponse.quote.srcChainId);
+    }
+    catch {
+        hexChainId = '0x1';
+    }
+    // Extract the transaction data for storage
+    const tradeData = extractTradeData(trade);
+    // Create a transaction meta object with bridge-specific fields
+    return {
+        ...getTxMetaFields(quoteResponse),
+        time: Date.now(),
+        id: hash ?? uuid(),
+        chainId: hexChainId,
+        networkClientId: snapId ?? 'mainnet',
+        txParams: { from: selectedAccountAddress, data: tradeData },
+        type: isBridgeTx ? TransactionType.bridge : TransactionType.swap,
+        status: TransactionStatus.submitted,
+        hash, // Add the transaction signature as hash
+        origin: snapId,
+        // Add an explicit flag to mark this as a non-EVM transaction
+        isSolana: true, // TODO deprecate this and use chainId to detect non-EVM chains
+        isBridgeTx,
+    };
+};
+/**
+ * Submits the transaction to the snap using the new unified ClientRequest interface
+ * Works for all non-EVM chains (Solana, BTC, Tron)
+ * This adds an approval tx to the ApprovalsController in the background
+ * The client needs to handle the approval tx by redirecting to the confirmation page with the approvalTxId in the URL
+ *
+ * @param messenger - The BridgeStatusControllerMessenger instance
+ * @param trade - The trade data (can be approval or main trade)
+ * @param quoteResponse - The quote response containing metadata
+ * @param selectedAccount - The account to submit the transaction for
+ * @returns The transaction meta
+ */
+export const handleNonEvmTx = async (messenger, trade, quoteResponse, selectedAccount) => {
+    if (!selectedAccount.metadata?.snap?.id) {
+        throw new Error('Failed to submit cross-chain swap transaction: undefined snap id');
+    }
+    const request = getClientRequest(trade, quoteResponse.quote.srcChainId, selectedAccount.id, selectedAccount.metadata?.snap?.id);
+    const requestResponse = (await messenger.call('SnapController:handleRequest', request));
+    const txMeta = handleNonEvmTxResponse(requestResponse, trade, quoteResponse, selectedAccount);
+    // TODO remove this eventually, just returning it now to match extension behavior
+    // OR if the snap can propagate the snapRequestId or keyringReqId to the ApprovalsController, this can return the approvalTxId instead and clients won't need to subscribe to the ApprovalsController state to redirect
+    return txMeta;
+};
 //# sourceMappingURL=snaps.mjs.map

package/dist/utils/snaps.mjs.map

@@ -1 +1 @@
-{"version":3,"file":"snaps.mjs","sourceRoot":"","sources":["../../src/utils/snaps.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,EAAE,IAAI,IAAI,EAAE,aAAa;AAElC;;;;;;;;;;GAUG;AACH,MAAM,CAAC,MAAM,8BAA8B,GAAG,CAC5C,MAAc,EACd,WAAmB,EACnB,KAAkB,EAClB,SAAiB,EACjB,OAAiC,EACjC,EAAE;IACF,OAAO;QACL,kCAAkC;QAClC,MAAM,EAAE,MAAe;QACvB,MAAM,EAAE,UAAU;QAClB,OAAO,EAAE,iBAA0B;QACnC,OAAO,EAAE;YACP,EAAE,EAAE,IAAI,EAAE;YACV,OAAO,EAAE,KAAK;YACd,MAAM,EAAE,wBAAwB;YAChC,MAAM,EAAE;gBACN,WAAW;gBACX,KAAK;gBACL,SAAS;gBACT,GAAG,CAAC,OAAO,IAAI,EAAE,OAAO,EAAE,CAAC;aAC5B;SACF;KACF,CAAC;AACJ,CAAC,CAAC","sourcesContent":["import type { CaipChainId } from '@metamask/utils';\nimport { v4 as uuid } from 'uuid';\n\n/**\n * Creates a client request object for signing and sending a transaction\n * Works for Solana, BTC, Tron, and other non-EVM networks\n *\n * @param snapId - The snap ID to send the request to\n * @param transaction - The base64 encoded transaction string\n * @param scope - The CAIP-2 chain scope\n * @param accountId - The account ID\n * @param options - Optional network-specific options\n * @returns The snap request object\n */\nexport const createClientTransactionRequest = (\n  snapId: string,\n  transaction: string,\n  scope: CaipChainId,\n  accountId: string,\n  options?: Record<string, unknown>,\n) => {\n  return {\n    // TODO: remove 'as never' typing.\n    snapId: snapId as never,\n    origin: 'metamask',\n    handler: 'onClientRequest' as never,\n    request: {\n      id: uuid(),\n      jsonrpc: '2.0',\n      method: 'signAndSendTransaction',\n      params: {\n        transaction,\n        scope,\n        accountId,\n        ...(options && { options }),\n      },\n    },\n  };\n};\n"]}
+{"version":3,"file":"snaps.mjs","sourceRoot":"","sources":["../../src/utils/snaps.ts"],"names":[],"mappings":"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","sourcesContent":["/* eslint-disable @typescript-eslint/explicit-function-return-type */\nimport type { AccountsControllerState } from '@metamask/accounts-controller';\nimport type {\n  QuoteMetadata,\n  QuoteResponse,\n  Trade,\n} from '@metamask/bridge-controller';\nimport {\n  extractTradeData,\n  formatChainIdToCaip,\n  formatChainIdToHex,\n  isCrossChain,\n  isTronTrade,\n} from '@metamask/bridge-controller';\nimport {\n  TransactionStatus,\n  TransactionType,\n} from '@metamask/transaction-controller';\nimport type { TransactionMeta } from '@metamask/transaction-controller';\nimport type { CaipChainId, Hex } from '@metamask/utils';\nimport { v4 as uuid } from 'uuid';\n\nimport type {\n  BridgeStatusControllerMessenger,\n  SolanaTransactionMeta,\n} from '../types';\n\n/**\n * Creates a client request object for signing and sending a transaction\n * Works for Solana, BTC, Tron, and other non-EVM networks\n *\n * @param snapId - The snap ID to send the request to\n * @param transaction - The base64 encoded transaction string\n * @param scope - The CAIP-2 chain scope\n * @param accountId - The account ID\n * @param options - Optional network-specific options\n * @returns The snap request object\n */\nexport const createClientTransactionRequest = (\n  snapId: string,\n  transaction: string,\n  scope: CaipChainId,\n  accountId: string,\n  options?: Record<string, unknown>,\n) => {\n  return {\n    // TODO: remove 'as never' typing.\n    snapId: snapId as never,\n    origin: 'metamask',\n    handler: 'onClientRequest' as never,\n    request: {\n      id: uuid(),\n      jsonrpc: '2.0',\n      method: 'signAndSendTransaction',\n      params: {\n        transaction,\n        scope,\n        accountId,\n        ...(options && { options }),\n      },\n    },\n  };\n};\n\n/**\n * Creates a request to sign and send a transaction for non-EVM chains\n * Uses the new unified ClientRequest:signAndSendTransaction interface\n *\n * @param trade - The trade data\n * @param srcChainId - The source chain ID\n * @param accountId - The selected account ID\n * @param snapId - The snap ID\n * @returns The snap request object for signing and sending transaction\n */\nexport const getClientRequest = (\n  trade: Trade,\n  srcChainId: number,\n  accountId: string,\n  snapId: string,\n) => {\n  const scope = formatChainIdToCaip(srcChainId);\n\n  const transactionData = extractTradeData(trade);\n\n  // Tron trades need the visible flag and contract type to be included in the request options\n  const options = isTronTrade(trade)\n    ? {\n        visible: trade.visible,\n        type: trade.raw_data?.contract?.[0]?.type,\n      }\n    : undefined;\n\n  // Use the new unified interface\n  return createClientTransactionRequest(\n    snapId,\n    transactionData,\n    scope,\n    accountId,\n    options,\n  );\n};\n\nexport const getTxMetaFields = (\n  quoteResponse: Omit<QuoteResponse<Trade, Trade>, 'approval' | 'trade'> &\n    QuoteMetadata,\n  approvalTxId?: string,\n): Omit<\n  TransactionMeta,\n  'networkClientId' | 'status' | 'time' | 'txParams' | 'id' | 'chainId'\n> => {\n  // Handle destination chain ID - should always be convertible for EVM destinations\n  let destinationChainId;\n  try {\n    destinationChainId = formatChainIdToHex(quoteResponse.quote.destChainId);\n  } catch {\n    // Fallback for non-EVM destination (shouldn't happen for BTC->EVM)\n    destinationChainId = '0x1' as `0x${string}`; // Default to mainnet\n  }\n\n  return {\n    destinationChainId,\n    sourceTokenAmount: quoteResponse.quote.srcTokenAmount,\n    sourceTokenSymbol: quoteResponse.quote.srcAsset.symbol,\n    sourceTokenDecimals: quoteResponse.quote.srcAsset.decimals,\n    sourceTokenAddress: quoteResponse.quote.srcAsset.address,\n\n    destinationTokenAmount: quoteResponse.quote.destTokenAmount,\n    destinationTokenSymbol: quoteResponse.quote.destAsset.symbol,\n    destinationTokenDecimals: quoteResponse.quote.destAsset.decimals,\n    destinationTokenAddress: quoteResponse.quote.destAsset.address,\n\n    // chainId is now excluded from this function and handled by the caller\n    approvalTxId,\n    // this is the decimal (non atomic) amount (not USD value) of source token to swap\n    swapTokenValue: quoteResponse.sentAmount.amount,\n  };\n};\n\n/**\n * Handles the response from non-EVM transaction submission\n * Works with the new unified ClientRequest:signAndSendTransaction interface\n * Supports Solana, Bitcoin, and other non-EVM chains\n *\n * @param snapResponse - The response from the snap after transaction submission\n * @param trade - The non-evm trade or approval data\n * @param quoteResponse - The quote response containing trade details and metadata\n * @param selectedAccount - The selected account information\n * @returns The transaction metadata including non-EVM specific fields\n */\nexport const handleNonEvmTxResponse = (\n  snapResponse:\n    | string\n    | { transactionId: string } // New unified interface response\n    | { result: Record<string, string> }\n    | { signature: string },\n  trade: Trade,\n  quoteResponse: Omit<QuoteResponse<Trade>, 'trade' | 'approval'> &\n    QuoteMetadata,\n  selectedAccount: AccountsControllerState['internalAccounts']['accounts'][string],\n): TransactionMeta & SolanaTransactionMeta => {\n  const selectedAccountAddress = selectedAccount.address;\n  const snapId = selectedAccount.metadata.snap?.id;\n  let hash;\n  // Handle different response formats\n  if (typeof snapResponse === 'string') {\n    hash = snapResponse;\n  } else if (snapResponse && typeof snapResponse === 'object') {\n    // Check for new unified interface response format first\n    if ('transactionId' in snapResponse && snapResponse.transactionId) {\n      hash = snapResponse.transactionId;\n    } else if (\n      'result' in snapResponse &&\n      snapResponse.result &&\n      typeof snapResponse.result === 'object'\n    ) {\n      // Try to extract signature from common locations in response object\n      hash =\n        snapResponse.result.signature ||\n        snapResponse.result.txid ||\n        snapResponse.result.hash ||\n        snapResponse.result.txHash;\n    } else if (\n      'signature' in snapResponse &&\n      snapResponse.signature &&\n      typeof snapResponse.signature === 'string'\n    ) {\n      hash = snapResponse.signature;\n    }\n  }\n\n  const isBridgeTx = isCrossChain(\n    quoteResponse.quote.srcChainId,\n    quoteResponse.quote.destChainId,\n  );\n\n  let hexChainId: Hex;\n  try {\n    hexChainId = formatChainIdToHex(quoteResponse.quote.srcChainId);\n  } catch {\n    hexChainId = '0x1';\n  }\n  // Extract the transaction data for storage\n  const tradeData = extractTradeData(trade);\n\n  // Create a transaction meta object with bridge-specific fields\n  return {\n    ...getTxMetaFields(quoteResponse),\n    time: Date.now(),\n    id: hash ?? uuid(),\n    chainId: hexChainId,\n    networkClientId: snapId ?? 'mainnet',\n    txParams: { from: selectedAccountAddress, data: tradeData },\n    type: isBridgeTx ? TransactionType.bridge : TransactionType.swap,\n    status: TransactionStatus.submitted,\n    hash, // Add the transaction signature as hash\n    origin: snapId,\n    // Add an explicit flag to mark this as a non-EVM transaction\n    isSolana: true, // TODO deprecate this and use chainId to detect non-EVM chains\n    isBridgeTx,\n  };\n};\n\n/**\n * Submits the transaction to the snap using the new unified ClientRequest interface\n * Works for all non-EVM chains (Solana, BTC, Tron)\n * This adds an approval tx to the ApprovalsController in the background\n * The client needs to handle the approval tx by redirecting to the confirmation page with the approvalTxId in the URL\n *\n * @param messenger - The BridgeStatusControllerMessenger instance\n * @param trade - The trade data (can be approval or main trade)\n * @param quoteResponse - The quote response containing metadata\n * @param selectedAccount - The account to submit the transaction for\n * @returns The transaction meta\n */\nexport const handleNonEvmTx = async (\n  messenger: BridgeStatusControllerMessenger,\n  trade: Trade,\n  quoteResponse: QuoteResponse<Trade, Trade> & QuoteMetadata,\n  selectedAccount: AccountsControllerState['internalAccounts']['accounts'][string],\n): Promise<TransactionMeta> => {\n  if (!selectedAccount.metadata?.snap?.id) {\n    throw new Error(\n      'Failed to submit cross-chain swap transaction: undefined snap id',\n    );\n  }\n\n  const request = getClientRequest(\n    trade,\n    quoteResponse.quote.srcChainId,\n    selectedAccount.id,\n    selectedAccount.metadata?.snap?.id,\n  );\n  const requestResponse = (await messenger.call(\n    'SnapController:handleRequest',\n    request,\n  )) as\n    | string\n    | { transactionId: string }\n    | { result: Record<string, string> }\n    | { signature: string };\n\n  const txMeta = handleNonEvmTxResponse(\n    requestResponse,\n    trade,\n    quoteResponse,\n    selectedAccount,\n  );\n\n  // TODO remove this eventually, just returning it now to match extension behavior\n  // OR if the snap can propagate the snapRequestId or keyringReqId to the ApprovalsController, this can return the approvalTxId instead and clients won't need to subscribe to the ApprovalsController state to redirect\n  return txMeta;\n};\n"]}

package/dist/utils/trace.cjs

@@ -0,0 +1,31 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.getApprovalTraceParams = exports.getTraceParams = void 0;
+/* eslint-disable @typescript-eslint/explicit-function-return-type */
+const bridge_controller_1 = require("@metamask/bridge-controller");
+const constants_1 = require("../constants.cjs");
+const getTraceParams = (quoteResponse, isStxEnabledOnClient) => {
+    return {
+        name: (0, bridge_controller_1.isCrossChain)(quoteResponse.quote.srcChainId, quoteResponse.quote.destChainId)
+            ? constants_1.TraceName.BridgeTransactionCompleted
+            : constants_1.TraceName.SwapTransactionCompleted,
+        data: {
+            srcChainId: (0, bridge_controller_1.formatChainIdToCaip)(quoteResponse.quote.srcChainId),
+            stxEnabled: isStxEnabledOnClient,
+        },
+    };
+};
+exports.getTraceParams = getTraceParams;
+const getApprovalTraceParams = (quoteResponse, isStxEnabledOnClient) => {
+    return {
+        name: (0, bridge_controller_1.isCrossChain)(quoteResponse.quote.srcChainId, quoteResponse.quote.destChainId)
+            ? constants_1.TraceName.BridgeTransactionApprovalCompleted
+            : constants_1.TraceName.SwapTransactionApprovalCompleted,
+        data: {
+            srcChainId: (0, bridge_controller_1.formatChainIdToCaip)(quoteResponse.quote.srcChainId),
+            stxEnabled: isStxEnabledOnClient,
+        },
+    };
+};
+exports.getApprovalTraceParams = getApprovalTraceParams;
+//# sourceMappingURL=trace.cjs.map

package/dist/utils/trace.cjs.map

@@ -0,0 +1 @@
+{"version":3,"file":"trace.cjs","sourceRoot":"","sources":["../../src/utils/trace.ts"],"names":[],"mappings":";;;AAAA,qEAAqE;AACrE,mEAIqC;AAErC,gDAAyC;AAElC,MAAM,cAAc,GAAG,CAC5B,aAA4B,EAC5B,oBAA6B,EAC7B,EAAE;IACF,OAAO;QACL,IAAI,EAAE,IAAA,gCAAY,EAChB,aAAa,CAAC,KAAK,CAAC,UAAU,EAC9B,aAAa,CAAC,KAAK,CAAC,WAAW,CAChC;YACC,CAAC,CAAC,qBAAS,CAAC,0BAA0B;YACtC,CAAC,CAAC,qBAAS,CAAC,wBAAwB;QACtC,IAAI,EAAE;YACJ,UAAU,EAAE,IAAA,uCAAmB,EAAC,aAAa,CAAC,KAAK,CAAC,UAAU,CAAC;YAC/D,UAAU,EAAE,oBAAoB;SACjC;KACF,CAAC;AACJ,CAAC,CAAC;AAhBW,QAAA,cAAc,kBAgBzB;AAEK,MAAM,sBAAsB,GAAG,CACpC,aAA4B,EAC5B,oBAA6B,EAC7B,EAAE;IACF,OAAO;QACL,IAAI,EAAE,IAAA,gCAAY,EAChB,aAAa,CAAC,KAAK,CAAC,UAAU,EAC9B,aAAa,CAAC,KAAK,CAAC,WAAW,CAChC;YACC,CAAC,CAAC,qBAAS,CAAC,kCAAkC;YAC9C,CAAC,CAAC,qBAAS,CAAC,gCAAgC;QAC9C,IAAI,EAAE;YACJ,UAAU,EAAE,IAAA,uCAAmB,EAAC,aAAa,CAAC,KAAK,CAAC,UAAU,CAAC;YAC/D,UAAU,EAAE,oBAAoB;SACjC;KACF,CAAC;AACJ,CAAC,CAAC;AAhBW,QAAA,sBAAsB,0BAgBjC","sourcesContent":["/* eslint-disable @typescript-eslint/explicit-function-return-type */\nimport {\n  formatChainIdToCaip,\n  isCrossChain,\n  QuoteResponse,\n} from '@metamask/bridge-controller';\n\nimport { TraceName } from '../constants';\n\nexport const getTraceParams = (\n  quoteResponse: QuoteResponse,\n  isStxEnabledOnClient: boolean,\n) => {\n  return {\n    name: isCrossChain(\n      quoteResponse.quote.srcChainId,\n      quoteResponse.quote.destChainId,\n    )\n      ? TraceName.BridgeTransactionCompleted\n      : TraceName.SwapTransactionCompleted,\n    data: {\n      srcChainId: formatChainIdToCaip(quoteResponse.quote.srcChainId),\n      stxEnabled: isStxEnabledOnClient,\n    },\n  };\n};\n\nexport const getApprovalTraceParams = (\n  quoteResponse: QuoteResponse,\n  isStxEnabledOnClient: boolean,\n) => {\n  return {\n    name: isCrossChain(\n      quoteResponse.quote.srcChainId,\n      quoteResponse.quote.destChainId,\n    )\n      ? TraceName.BridgeTransactionApprovalCompleted\n      : TraceName.SwapTransactionApprovalCompleted,\n    data: {\n      srcChainId: formatChainIdToCaip(quoteResponse.quote.srcChainId),\n      stxEnabled: isStxEnabledOnClient,\n    },\n  };\n};\n"]}

package/dist/utils/trace.d.cts

@@ -0,0 +1,17 @@
+import { QuoteResponse } from "@metamask/bridge-controller";
+import { TraceName } from "../constants.cjs";
+export declare const getTraceParams: (quoteResponse: QuoteResponse, isStxEnabledOnClient: boolean) => {
+    name: TraceName;
+    data: {
+        srcChainId: `${string}:${string}`;
+        stxEnabled: boolean;
+    };
+};
+export declare const getApprovalTraceParams: (quoteResponse: QuoteResponse, isStxEnabledOnClient: boolean) => {
+    name: TraceName;
+    data: {
+        srcChainId: `${string}:${string}`;
+        stxEnabled: boolean;
+    };
+};
+//# sourceMappingURL=trace.d.cts.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"trace.d.cts","sourceRoot":"","sources":["../../src/utils/trace.ts"],"names":[],"mappings":"AACA,OAAO,EAGL,aAAa,EACd,oCAAoC;AAErC,OAAO,EAAE,SAAS,EAAE,yBAAqB;AAEzC,eAAO,MAAM,cAAc,kBACV,aAAa,wBACN,OAAO;;;;;;CAc9B,CAAC;AAEF,eAAO,MAAM,sBAAsB,kBAClB,aAAa,wBACN,OAAO;;;;;;CAc9B,CAAC"}

package/dist/utils/trace.d.mts

@@ -0,0 +1,17 @@
+import { QuoteResponse } from "@metamask/bridge-controller";
+import { TraceName } from "../constants.mjs";
+export declare const getTraceParams: (quoteResponse: QuoteResponse, isStxEnabledOnClient: boolean) => {
+    name: TraceName;
+    data: {
+        srcChainId: `${string}:${string}`;
+        stxEnabled: boolean;
+    };
+};
+export declare const getApprovalTraceParams: (quoteResponse: QuoteResponse, isStxEnabledOnClient: boolean) => {
+    name: TraceName;
+    data: {
+        srcChainId: `${string}:${string}`;
+        stxEnabled: boolean;
+    };
+};
+//# sourceMappingURL=trace.d.mts.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"trace.d.mts","sourceRoot":"","sources":["../../src/utils/trace.ts"],"names":[],"mappings":"AACA,OAAO,EAGL,aAAa,EACd,oCAAoC;AAErC,OAAO,EAAE,SAAS,EAAE,yBAAqB;AAEzC,eAAO,MAAM,cAAc,kBACV,aAAa,wBACN,OAAO;;;;;;CAc9B,CAAC;AAEF,eAAO,MAAM,sBAAsB,kBAClB,aAAa,wBACN,OAAO;;;;;;CAc9B,CAAC"}

package/dist/utils/trace.mjs

@@ -0,0 +1,26 @@
+/* eslint-disable @typescript-eslint/explicit-function-return-type */
+import { formatChainIdToCaip, isCrossChain } from "@metamask/bridge-controller";
+import { TraceName } from "../constants.mjs";
+export const getTraceParams = (quoteResponse, isStxEnabledOnClient) => {
+    return {
+        name: isCrossChain(quoteResponse.quote.srcChainId, quoteResponse.quote.destChainId)
+            ? TraceName.BridgeTransactionCompleted
+            : TraceName.SwapTransactionCompleted,
+        data: {
+            srcChainId: formatChainIdToCaip(quoteResponse.quote.srcChainId),
+            stxEnabled: isStxEnabledOnClient,
+        },
+    };
+};
+export const getApprovalTraceParams = (quoteResponse, isStxEnabledOnClient) => {
+    return {
+        name: isCrossChain(quoteResponse.quote.srcChainId, quoteResponse.quote.destChainId)
+            ? TraceName.BridgeTransactionApprovalCompleted
+            : TraceName.SwapTransactionApprovalCompleted,
+        data: {
+            srcChainId: formatChainIdToCaip(quoteResponse.quote.srcChainId),
+            stxEnabled: isStxEnabledOnClient,
+        },
+    };
+};
+//# sourceMappingURL=trace.mjs.map

package/dist/utils/trace.mjs.map

@@ -0,0 +1 @@
+{"version":3,"file":"trace.mjs","sourceRoot":"","sources":["../../src/utils/trace.ts"],"names":[],"mappings":"AAAA,qEAAqE;AACrE,OAAO,EACL,mBAAmB,EACnB,YAAY,EAEb,oCAAoC;AAErC,OAAO,EAAE,SAAS,EAAE,yBAAqB;AAEzC,MAAM,CAAC,MAAM,cAAc,GAAG,CAC5B,aAA4B,EAC5B,oBAA6B,EAC7B,EAAE;IACF,OAAO;QACL,IAAI,EAAE,YAAY,CAChB,aAAa,CAAC,KAAK,CAAC,UAAU,EAC9B,aAAa,CAAC,KAAK,CAAC,WAAW,CAChC;YACC,CAAC,CAAC,SAAS,CAAC,0BAA0B;YACtC,CAAC,CAAC,SAAS,CAAC,wBAAwB;QACtC,IAAI,EAAE;YACJ,UAAU,EAAE,mBAAmB,CAAC,aAAa,CAAC,KAAK,CAAC,UAAU,CAAC;YAC/D,UAAU,EAAE,oBAAoB;SACjC;KACF,CAAC;AACJ,CAAC,CAAC;AAEF,MAAM,CAAC,MAAM,sBAAsB,GAAG,CACpC,aAA4B,EAC5B,oBAA6B,EAC7B,EAAE;IACF,OAAO;QACL,IAAI,EAAE,YAAY,CAChB,aAAa,CAAC,KAAK,CAAC,UAAU,EAC9B,aAAa,CAAC,KAAK,CAAC,WAAW,CAChC;YACC,CAAC,CAAC,SAAS,CAAC,kCAAkC;YAC9C,CAAC,CAAC,SAAS,CAAC,gCAAgC;QAC9C,IAAI,EAAE;YACJ,UAAU,EAAE,mBAAmB,CAAC,aAAa,CAAC,KAAK,CAAC,UAAU,CAAC;YAC/D,UAAU,EAAE,oBAAoB;SACjC;KACF,CAAC;AACJ,CAAC,CAAC","sourcesContent":["/* eslint-disable @typescript-eslint/explicit-function-return-type */\nimport {\n  formatChainIdToCaip,\n  isCrossChain,\n  QuoteResponse,\n} from '@metamask/bridge-controller';\n\nimport { TraceName } from '../constants';\n\nexport const getTraceParams = (\n  quoteResponse: QuoteResponse,\n  isStxEnabledOnClient: boolean,\n) => {\n  return {\n    name: isCrossChain(\n      quoteResponse.quote.srcChainId,\n      quoteResponse.quote.destChainId,\n    )\n      ? TraceName.BridgeTransactionCompleted\n      : TraceName.SwapTransactionCompleted,\n    data: {\n      srcChainId: formatChainIdToCaip(quoteResponse.quote.srcChainId),\n      stxEnabled: isStxEnabledOnClient,\n    },\n  };\n};\n\nexport const getApprovalTraceParams = (\n  quoteResponse: QuoteResponse,\n  isStxEnabledOnClient: boolean,\n) => {\n  return {\n    name: isCrossChain(\n      quoteResponse.quote.srcChainId,\n      quoteResponse.quote.destChainId,\n    )\n      ? TraceName.BridgeTransactionApprovalCompleted\n      : TraceName.SwapTransactionApprovalCompleted,\n    data: {\n      srcChainId: formatChainIdToCaip(quoteResponse.quote.srcChainId),\n      stxEnabled: isStxEnabledOnClient,\n    },\n  };\n};\n"]}

package/dist/utils/transaction.cjs

@@ -1,13 +1,14 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.getIntentFromQuote = exports.getHistoryKey = exports.findAndUpdateTransactionsInBatch = exports.getAddTransactionBatchParams = exports.toBatchTxParams = exports.rekeyHistoryItemInState = exports.waitForTxConfirmation = exports.getClientRequest = exports.handleMobileHardwareWalletDelay = exports.handleApprovalDelay = exports.handleNonEvmTxResponse = exports.getTxMetaFields = exports.getStatusRequestParams = exports.generateActionId = void 0;
+exports.findAndUpdateTransactionsInBatch = exports.getAddTransactionBatchParams = exports.toBatchTxParams = exports.waitForTxConfirmation = exports.handleMobileHardwareWalletDelay = exports.handleApprovalDelay = exports.getStatusRequestParams = exports.generateActionId = void 0;
+/* eslint-disable @typescript-eslint/explicit-function-return-type */
 const bridge_controller_1 = require("@metamask/bridge-controller");
 const controller_utils_1 = require("@metamask/controller-utils");
 const transaction_controller_1 = require("@metamask/transaction-controller");
 const utils_1 = require("@metamask/utils");
-const uuid_1 = require("uuid");
+const accounts_1 = require("./accounts.cjs");
 const gas_1 = require("./gas.cjs");
-const snaps_1 = require("./snaps.cjs");
+const network_1 = require("./network.cjs");
 const constants_1 = require("../constants.cjs");
 const generateActionId = () => (Date.now() + Math.random()).toString();
 exports.generateActionId = generateActionId;
@@ -22,102 +23,6 @@ const getStatusRequestParams = (quoteResponse) => {
     };
 };
 exports.getStatusRequestParams = getStatusRequestParams;
-const getTxMetaFields = (quoteResponse, approvalTxId) => {
-    // Handle destination chain ID - should always be convertible for EVM destinations
-    let destinationChainId;
-    try {
-        destinationChainId = (0, bridge_controller_1.formatChainIdToHex)(quoteResponse.quote.destChainId);
-    }
-    catch {
-        // Fallback for non-EVM destination (shouldn't happen for BTC->EVM)
-        destinationChainId = '0x1'; // Default to mainnet
-    }
-    return {
-        destinationChainId,
-        sourceTokenAmount: quoteResponse.quote.srcTokenAmount,
-        sourceTokenSymbol: quoteResponse.quote.srcAsset.symbol,
-        sourceTokenDecimals: quoteResponse.quote.srcAsset.decimals,
-        sourceTokenAddress: quoteResponse.quote.srcAsset.address,
-        destinationTokenAmount: quoteResponse.quote.destTokenAmount,
-        destinationTokenSymbol: quoteResponse.quote.destAsset.symbol,
-        destinationTokenDecimals: quoteResponse.quote.destAsset.decimals,
-        destinationTokenAddress: quoteResponse.quote.destAsset.address,
-        // chainId is now excluded from this function and handled by the caller
-        approvalTxId,
-        // this is the decimal (non atomic) amount (not USD value) of source token to swap
-        swapTokenValue: quoteResponse.sentAmount.amount,
-    };
-};
-exports.getTxMetaFields = getTxMetaFields;
-/**
- * Handles the response from non-EVM transaction submission
- * Works with the new unified ClientRequest:signAndSendTransaction interface
- * Supports Solana, Bitcoin, and other non-EVM chains
- *
- * @param snapResponse - The response from the snap after transaction submission
- * @param quoteResponse - The quote response containing trade details and metadata
- * @param selectedAccount - The selected account information
- * @returns The transaction metadata including non-EVM specific fields
- */
-const handleNonEvmTxResponse = (snapResponse, quoteResponse, selectedAccount) => {
-    const selectedAccountAddress = selectedAccount.address;
-    const snapId = selectedAccount.metadata.snap?.id;
-    let hash;
-    // Handle different response formats
-    if (typeof snapResponse === 'string') {
-        hash = snapResponse;
-    }
-    else if (snapResponse && typeof snapResponse === 'object') {
-        // Check for new unified interface response format first
-        if ('transactionId' in snapResponse && snapResponse.transactionId) {
-            hash = snapResponse.transactionId;
-        }
-        else if ('result' in snapResponse &&
-            snapResponse.result &&
-            typeof snapResponse.result === 'object') {
-            // Try to extract signature from common locations in response object
-            hash =
-                snapResponse.result.signature ||
-                    snapResponse.result.txid ||
-                    snapResponse.result.hash ||
-                    snapResponse.result.txHash;
-        }
-        else if ('signature' in snapResponse &&
-            snapResponse.signature &&
-            typeof snapResponse.signature === 'string') {
-            hash = snapResponse.signature;
-        }
-    }
-    const isBridgeTx = (0, bridge_controller_1.isCrossChain)(quoteResponse.quote.srcChainId, quoteResponse.quote.destChainId);
-    let hexChainId;
-    try {
-        hexChainId = (0, bridge_controller_1.formatChainIdToHex)(quoteResponse.quote.srcChainId);
-    }
-    catch {
-        // TODO: Fix chain ID activity list handling for Bitcoin
-        // Fallback to Ethereum mainnet for now
-        hexChainId = '0x1';
-    }
-    // Extract the transaction data for storage
-    const tradeData = (0, bridge_controller_1.extractTradeData)(quoteResponse.trade);
-    // Create a transaction meta object with bridge-specific fields
-    return {
-        ...(0, exports.getTxMetaFields)(quoteResponse),
-        time: Date.now(),
-        id: hash ?? (0, uuid_1.v4)(),
-        chainId: hexChainId,
-        networkClientId: snapId ?? hexChainId,
-        txParams: { from: selectedAccountAddress, data: tradeData },
-        type: isBridgeTx ? transaction_controller_1.TransactionType.bridge : transaction_controller_1.TransactionType.swap,
-        status: transaction_controller_1.TransactionStatus.submitted,
-        hash, // Add the transaction signature as hash
-        origin: snapId,
-        // Add an explicit flag to mark this as a non-EVM transaction
-        isSolana: true, // TODO deprecate this and use chainId to detect non-EVM chains
-        isBridgeTx,
-    };
-};
-exports.handleNonEvmTxResponse = handleNonEvmTxResponse;
 const handleApprovalDelay = async (srcChainId) => {
     if ([bridge_controller_1.ChainId.LINEA, bridge_controller_1.ChainId.BASE].includes(srcChainId)) {
         const debugLog = (0, utils_1.createProjectLogger)('bridge');
@@ -141,29 +46,6 @@ const handleMobileHardwareWalletDelay = async (requireApproval) => {
     }
 };
 exports.handleMobileHardwareWalletDelay = handleMobileHardwareWalletDelay;
-/**
- * Creates a request to sign and send a transaction for non-EVM chains
- * Uses the new unified ClientRequest:signAndSendTransaction interface
- *
- * @param trade - The trade data
- * @param srcChainId - The source chain ID
- * @param selectedAccount - The selected account information
- * @returns The snap request object for signing and sending transaction
- */
-const getClientRequest = (trade, srcChainId, selectedAccount) => {
-    const scope = (0, bridge_controller_1.formatChainIdToCaip)(srcChainId);
-    const transactionData = (0, bridge_controller_1.extractTradeData)(trade);
-    // Tron trades need the visible flag and contract type to be included in the request options
-    const options = (0, bridge_controller_1.isTronTrade)(trade)
-        ? {
-            visible: trade.visible,
-            type: trade.raw_data?.contract?.[0]?.type,
-        }
-        : undefined;
-    // Use the new unified interface
-    return (0, snaps_1.createClientTransactionRequest)(selectedAccount.metadata.snap?.id, transactionData, scope, selectedAccount.id, options);
-};
-exports.getClientRequest = getClientRequest;
 const waitForTxConfirmation = async (messenger, txId, { timeoutMs = 5 * 60000, pollMs = 3000, } = {}) => {
     const start = Date.now();
     while (true) {
@@ -186,35 +68,14 @@ const waitForTxConfirmation = async (messenger, txId, { timeoutMs = 5 * 60000, p
     }
 };
 exports.waitForTxConfirmation = waitForTxConfirmation;
-const rekeyHistoryItemInState = (state, actionId, txMeta) => {
-    const historyItem = state.txHistory[actionId];
-    if (!historyItem) {
-        return false;
-    }
-    state.txHistory[txMeta.id] = {
-        ...historyItem,
-        txMetaId: txMeta.id,
-        originalTransactionId: historyItem.originalTransactionId ?? txMeta.id,
-        status: {
-            ...historyItem.status,
-            srcChain: {
-                ...historyItem.status.srcChain,
-                txHash: txMeta.hash ?? historyItem.status.srcChain?.txHash,
-            },
-        },
-    };
-    delete state.txHistory[actionId];
-    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,40 +86,43 @@ 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, }) => {
     const isGasless = gasIncluded || gasIncluded7702;
-    const selectedAccount = messenger.call('AccountsController:getAccountByAddress', trade.from);
+    const selectedAccount = (0, accounts_1.getAccountByAddress)(messenger, trade.from);
     if (!selectedAccount) {
         throw new Error('Failed to submit cross-chain swap batch transaction: unknown account in trade data');
     }
     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;
+    const networkClientId = (0, network_1.getNetworkClientIdByChainId)(messenger, hexChainId);
+    // 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, 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, 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, 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(),
@@ -277,7 +141,7 @@ const getAddTransactionBatchParams = async ({ messenger, isBridgeTx, approval, r
     return transactionParams;
 };
 exports.getAddTransactionBatchParams = getAddTransactionBatchParams;
-const findAndUpdateTransactionsInBatch = ({ messenger, updateTransactionFn, batchId, txDataByType, }) => {
+const findAndUpdateTransactionsInBatch = ({ messenger, batchId, txDataByType, }) => {
     const txs = messenger.call('TransactionController:getState').transactions;
     const txBatch = {
         approvalMeta: undefined,
@@ -286,6 +150,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 +167,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;
                 }
@@ -314,7 +184,7 @@ const findAndUpdateTransactionsInBatch = ({ messenger, updateTransactionFn, batc
         });
         if (txMeta) {
             const updatedTx = { ...txMeta, type: txType };
-            updateTransactionFn(updatedTx, `Update tx type to ${txType}`);
+            messenger.call('TransactionController:updateTransaction', updatedTx, `Update tx type to ${txType}`);
             txBatch[[transaction_controller_1.TransactionType.bridgeApproval, transaction_controller_1.TransactionType.swapApproval].includes(txType)
                 ? 'approvalMeta'
                 : 'tradeMeta'] = updatedTx;
@@ -323,36 +193,4 @@ const findAndUpdateTransactionsInBatch = ({ messenger, updateTransactionFn, batc
     return txBatch;
 };
 exports.findAndUpdateTransactionsInBatch = findAndUpdateTransactionsInBatch;
-/**
- * Determines the key to use for storing a bridge history item.
- * Uses actionId for pre-submission tracking, or bridgeTxMetaId for post-submission.
- *
- * @param actionId - The action ID used for pre-submission tracking
- * @param bridgeTxMetaId - The transaction meta ID from bridgeTxMeta
- * @returns The key to use for the history item
- * @throws Error if neither actionId nor bridgeTxMetaId is provided
- */
-function getHistoryKey(actionId, bridgeTxMetaId) {
-    const historyKey = actionId ?? bridgeTxMetaId;
-    if (!historyKey) {
-        throw new Error('Cannot add tx to history: either actionId or bridgeTxMeta.id must be provided');
-    }
-    return historyKey;
-}
-exports.getHistoryKey = getHistoryKey;
-/**
- * Extracts and validates the intent data from a quote response.
- *
- * @param quoteResponse - The quote response that may contain intent data
- * @returns The intent data from the quote
- * @throws Error if the quote does not contain intent data
- */
-function getIntentFromQuote(quoteResponse) {
-    const { intent } = quoteResponse.quote;
-    if (!intent) {
-        throw new Error('submitIntent: missing intent data');
-    }
-    return intent;
-}
-exports.getIntentFromQuote = getIntentFromQuote;
 //# sourceMappingURL=transaction.cjs.map