@metamask-previews/bridge-status-controller 43.1.0-preview-f059664 → 44.0.0-preview-5a701133

package/dist/utils/snaps.d.mts

@@ -0,0 +1,29 @@
+import type { CaipChainId } from "@metamask/utils";
+/**
+ * Creates a client request object for signing and sending a transaction
+ * Works for Solana, BTC, Tron, and other non-EVM networks
+ *
+ * @param snapId - The snap ID to send the request to
+ * @param transaction - The base64 encoded transaction string
+ * @param scope - The CAIP-2 chain scope
+ * @param accountId - The account ID
+ * @param options - Optional network-specific options
+ * @returns The snap request object
+ */
+export declare const createClientTransactionRequest: (snapId: string, transaction: string, scope: CaipChainId, accountId: string, options?: Record<string, unknown>) => {
+    snapId: never;
+    origin: string;
+    handler: never;
+    request: {
+        id: string;
+        jsonrpc: string;
+        method: string;
+        params: {
+            options?: Record<string, unknown> | undefined;
+            transaction: string;
+            scope: `${string}:${string}`;
+            accountId: string;
+        };
+    };
+};
+//# sourceMappingURL=snaps.d.mts.map

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

@@ -0,0 +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;;;;;;;;;;;;;;;CAkBlC,CAAC"}

package/dist/utils/snaps.mjs

@@ -0,0 +1,31 @@
+import { v4 as uuid } from "uuid";
+/**
+ * Creates a client request object for signing and sending a transaction
+ * Works for Solana, BTC, Tron, and other non-EVM networks
+ *
+ * @param snapId - The snap ID to send the request to
+ * @param transaction - The base64 encoded transaction string
+ * @param scope - The CAIP-2 chain scope
+ * @param accountId - The account ID
+ * @param options - Optional network-specific options
+ * @returns The snap request object
+ */
+export const createClientTransactionRequest = (snapId, transaction, scope, accountId, options) => {
+    return {
+        snapId: snapId,
+        origin: 'metamask',
+        handler: 'onClientRequest',
+        request: {
+            id: uuid(),
+            jsonrpc: '2.0',
+            method: 'signAndSendTransaction',
+            params: {
+                transaction,
+                scope,
+                accountId,
+                ...(options && { options }),
+            },
+        },
+    };
+};
+//# sourceMappingURL=snaps.mjs.map

package/dist/utils/snaps.mjs.map

@@ -0,0 +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,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    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"]}

package/dist/utils/transaction.cjs

@@ -1,14 +1,14 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.findAndUpdateTransactionsInBatch = exports.getAddTransactionBatchParams = exports.toBatchTxParams = exports.getClientRequest = exports.handleMobileHardwareWalletDelay = exports.handleLineaDelay = exports.handleSolanaTxResponse = exports.getTxMetaFields = exports.getStatusRequestParams = exports.getUSDTAllowanceResetTx = exports.generateActionId = void 0;
+exports.findAndUpdateTransactionsInBatch = exports.getAddTransactionBatchParams = exports.toBatchTxParams = exports.getClientRequest = exports.handleMobileHardwareWalletDelay = exports.handleApprovalDelay = exports.handleNonEvmTxResponse = exports.getTxMetaFields = exports.getStatusRequestParams = exports.getUSDTAllowanceResetTx = exports.generateActionId = void 0;
 const bridge_controller_1 = require("@metamask/bridge-controller");
 const controller_utils_1 = require("@metamask/controller-utils");
-const keyring_api_1 = require("@metamask/keyring-api");
 const transaction_controller_1 = require("@metamask/transaction-controller");
 const utils_1 = require("@metamask/utils");
 const bignumber_js_1 = require("bignumber.js");
 const uuid_1 = require("uuid");
 const gas_1 = require("./gas.cjs");
+const snaps_1 = require("./snaps.cjs");
 const constants_1 = require("../constants.cjs");
 const generateActionId = () => (Date.now() + Math.random()).toString();
 exports.generateActionId = generateActionId;
@@ -37,8 +37,17 @@ 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: (0, bridge_controller_1.formatChainIdToHex)(quoteResponse.quote.destChainId),
+        destinationChainId,
         sourceTokenAmount: quoteResponse.quote.srcTokenAmount,
         sourceTokenSymbol: quoteResponse.quote.srcAsset.symbol,
         sourceTokenDecimals: quoteResponse.quote.srcAsset.decimals,
@@ -47,14 +56,24 @@ const getTxMetaFields = (quoteResponse, approvalTxId) => {
         destinationTokenSymbol: quoteResponse.quote.destAsset.symbol,
         destinationTokenDecimals: quoteResponse.quote.destAsset.decimals,
         destinationTokenAddress: quoteResponse.quote.destAsset.address,
-        chainId: (0, bridge_controller_1.formatChainIdToHex)(quoteResponse.quote.srcChainId),
+        // 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;
-const handleSolanaTxResponse = (snapResponse, quoteResponse, selectedAccount) => {
+/**
+ * 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;
@@ -63,9 +82,11 @@ const handleSolanaTxResponse = (snapResponse, quoteResponse, selectedAccount) =>
         hash = snapResponse;
     }
     else if (snapResponse && typeof snapResponse === 'object') {
-        // If it's an object with result property, try to get the signature
-        if (typeof snapResponse === 'object' &&
-            'result' in snapResponse &&
+        // 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
@@ -75,15 +96,26 @@ const handleSolanaTxResponse = (snapResponse, quoteResponse, selectedAccount) =>
                     snapResponse.result.hash ||
                     snapResponse.result.txHash;
         }
-        if (typeof snapResponse === 'object' &&
-            'signature' in snapResponse &&
+        else if ('signature' in snapResponse &&
             snapResponse.signature &&
             typeof snapResponse.signature === 'string') {
             hash = snapResponse.signature;
         }
     }
-    const hexChainId = (0, bridge_controller_1.formatChainIdToHex)(quoteResponse.quote.srcChainId);
     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 = typeof quoteResponse.trade === 'string'
+        ? quoteResponse.trade
+        : quoteResponse.trade.unsignedPsbtBase64;
     // Create a transaction meta object with bridge-specific fields
     return {
         ...(0, exports.getTxMetaFields)(quoteResponse),
@@ -91,26 +123,26 @@ const handleSolanaTxResponse = (snapResponse, quoteResponse, selectedAccount) =>
         id: hash ?? (0, uuid_1.v4)(),
         chainId: hexChainId,
         networkClientId: snapId ?? hexChainId,
-        txParams: { from: selectedAccountAddress, data: quoteResponse.trade },
+        txParams: { from: selectedAccountAddress, data: tradeData },
         type: isBridgeTx ? transaction_controller_1.TransactionType.bridge : transaction_controller_1.TransactionType.swap,
         status: transaction_controller_1.TransactionStatus.submitted,
         hash,
         origin: snapId,
-        // Add an explicit bridge flag to mark this as a Solana transaction
+        // Add an explicit flag to mark this as a non-EVM transaction
         isSolana: true,
         isBridgeTx,
     };
 };
-exports.handleSolanaTxResponse = handleSolanaTxResponse;
-const handleLineaDelay = async (quoteResponse) => {
-    if (bridge_controller_1.ChainId.LINEA === quoteResponse.quote.srcChainId) {
+exports.handleNonEvmTxResponse = handleNonEvmTxResponse;
+const handleApprovalDelay = async (quoteResponse) => {
+    if ([bridge_controller_1.ChainId.LINEA, bridge_controller_1.ChainId.BASE].includes(quoteResponse.quote.srcChainId)) {
         const debugLog = (0, utils_1.createProjectLogger)('bridge');
-        debugLog('Delaying submitting bridge tx to make Linea confirmation more likely');
-        const waitPromise = new Promise((resolve) => setTimeout(resolve, constants_1.LINEA_DELAY_MS));
+        debugLog('Delaying submitting bridge tx to make Linea and Base confirmation more likely');
+        const waitPromise = new Promise((resolve) => setTimeout(resolve, constants_1.APPROVAL_DELAY_MS));
         await waitPromise;
     }
 };
-exports.handleLineaDelay = handleLineaDelay;
+exports.handleApprovalDelay = handleApprovalDelay;
 /**
  * Adds a delay for hardware wallet transactions on mobile to fix an issue
  * where the Ledger does not get prompted for the 2nd approval.
@@ -125,23 +157,22 @@ 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 quoteResponse - The quote response containing trade details and metadata
+ * @param selectedAccount - The selected account information
+ * @returns The snap request object for signing and sending transaction
+ */
 const getClientRequest = (quoteResponse, selectedAccount) => {
-    const clientReqId = (0, uuid_1.v4)();
-    return {
-        origin: 'metamask',
-        snapId: selectedAccount.metadata.snap?.id,
-        handler: 'onClientRequest',
-        request: {
-            id: clientReqId,
-            jsonrpc: '2.0',
-            method: 'signAndSendTransactionWithoutConfirmation',
-            params: {
-                account: { address: selectedAccount.address },
-                transaction: quoteResponse.trade,
-                scope: keyring_api_1.SolScope.Mainnet,
-            },
-        },
-    };
+    const scope = (0, bridge_controller_1.formatChainIdToCaip)(quoteResponse.quote.srcChainId);
+    // Extract the transaction data - Bitcoin uses unsignedPsbtBase64, others use string
+    const transactionData = typeof quoteResponse.trade === 'string'
+        ? quoteResponse.trade
+        : quoteResponse.trade.unsignedPsbtBase64;
+    // Use the new unified interface
+    return (0, snaps_1.createClientTransactionRequest)(selectedAccount.metadata.snap?.id, transactionData, scope, selectedAccount.id);
 };
 exports.getClientRequest = getClientRequest;
 const toBatchTxParams = (disable7702, { chainId, gasLimit, ...trade }, { maxFeePerGas, maxPriorityFeePerGas, gas, }) => {

package/dist/utils/transaction.cjs.map

@@ -1 +1 @@
-{"version":3,"file":"transaction.cjs","sourceRoot":"","sources":["../../src/utils/transaction.ts"],"names":[],"mappings":"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","sourcesContent":["import type { AccountsControllerState } from '@metamask/accounts-controller';\nimport type { TxData } from '@metamask/bridge-controller';\nimport {\n  ChainId,\n  formatChainIdToHex,\n  getEthUsdtResetData,\n  isCrossChain,\n  isEthUsdt,\n  type QuoteMetadata,\n  type QuoteResponse,\n} from '@metamask/bridge-controller';\nimport { toHex } from '@metamask/controller-utils';\nimport { SolScope } from '@metamask/keyring-api';\nimport type {\n  BatchTransactionParams,\n  TransactionController,\n} from '@metamask/transaction-controller';\nimport {\n  TransactionStatus,\n  TransactionType,\n  type TransactionMeta,\n} from '@metamask/transaction-controller';\nimport { createProjectLogger } from '@metamask/utils';\nimport { BigNumber } from 'bignumber.js';\nimport { v4 as uuid } from 'uuid';\n\nimport { calculateGasFees } from './gas';\nimport type { TransactionBatchSingleRequest } from '../../../transaction-controller/src/types';\nimport { LINEA_DELAY_MS } from '../constants';\nimport type {\n  BridgeStatusControllerMessenger,\n  SolanaTransactionMeta,\n} from '../types';\n\nexport const generateActionId = () => (Date.now() + Math.random()).toString();\n\nexport const getUSDTAllowanceResetTx = async (\n  messagingSystem: BridgeStatusControllerMessenger,\n  quoteResponse: QuoteResponse<TxData | string> & QuoteMetadata,\n) => {\n  const hexChainId = formatChainIdToHex(quoteResponse.quote.srcChainId);\n  if (\n    quoteResponse.approval &&\n    isEthUsdt(hexChainId, quoteResponse.quote.srcAsset.address)\n  ) {\n    const allowance = new BigNumber(\n      await messagingSystem.call(\n        'BridgeController:getBridgeERC20Allowance',\n        quoteResponse.quote.srcAsset.address,\n        hexChainId,\n      ),\n    );\n    const shouldResetApproval =\n      allowance.lt(quoteResponse.sentAmount.amount) && allowance.gt(0);\n    if (shouldResetApproval) {\n      return { ...quoteResponse.approval, data: getEthUsdtResetData() };\n    }\n  }\n  return undefined;\n};\n\nexport const getStatusRequestParams = (\n  quoteResponse: QuoteResponse<string | TxData>,\n) => {\n  return {\n    bridgeId: quoteResponse.quote.bridgeId,\n    bridge: quoteResponse.quote.bridges[0],\n    srcChainId: quoteResponse.quote.srcChainId,\n    destChainId: quoteResponse.quote.destChainId,\n    quote: quoteResponse.quote,\n    refuel: Boolean(quoteResponse.quote.refuel),\n  };\n};\n\nexport const getTxMetaFields = (\n  quoteResponse: Omit<QuoteResponse<string | TxData>, 'approval' | 'trade'> &\n    QuoteMetadata,\n  approvalTxId?: string,\n): Omit<\n  TransactionMeta,\n  'networkClientId' | 'status' | 'time' | 'txParams' | 'id'\n> => {\n  return {\n    destinationChainId: formatChainIdToHex(quoteResponse.quote.destChainId),\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: formatChainIdToHex(quoteResponse.quote.srcChainId),\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\nexport const handleSolanaTxResponse = (\n  snapResponse:\n    | string\n    | { result: Record<string, string> }\n    | { signature: string },\n  quoteResponse: Omit<QuoteResponse<string>, 'approval'> & QuoteMetadata,\n  selectedAccount: AccountsControllerState['internalAccounts']['accounts'][string],\n): TransactionMeta & SolanaTransactionMeta => {\n  const selectedAccountAddress = selectedAccount.address;\n  const snapId = selectedAccount.metadata.snap?.id;\n  let hash;\n  // Handle different response formats\n  if (typeof snapResponse === 'string') {\n    hash = snapResponse;\n  } else if (snapResponse && typeof snapResponse === 'object') {\n    // If it's an object with result property, try to get the signature\n    if (\n      typeof snapResponse === 'object' &&\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    }\n    if (\n      typeof snapResponse === 'object' &&\n      'signature' in snapResponse &&\n      snapResponse.signature &&\n      typeof snapResponse.signature === 'string'\n    ) {\n      hash = snapResponse.signature;\n    }\n  }\n\n  const hexChainId = formatChainIdToHex(quoteResponse.quote.srcChainId);\n  const isBridgeTx = isCrossChain(\n    quoteResponse.quote.srcChainId,\n    quoteResponse.quote.destChainId,\n  );\n\n  // Create a transaction meta object with bridge-specific fields\n  return {\n    ...getTxMetaFields(quoteResponse),\n    time: Date.now(),\n    id: hash ?? uuid(),\n    chainId: hexChainId,\n    networkClientId: snapId ?? hexChainId,\n    txParams: { from: selectedAccountAddress, data: quoteResponse.trade },\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 bridge flag to mark this as a Solana transaction\n    isSolana: true, // TODO deprecate this and use chainId\n    isBridgeTx,\n  };\n};\n\nexport const handleLineaDelay = async (\n  quoteResponse: QuoteResponse<TxData | string>,\n) => {\n  if (ChainId.LINEA === quoteResponse.quote.srcChainId) {\n    const debugLog = createProjectLogger('bridge');\n    debugLog(\n      'Delaying submitting bridge tx to make Linea confirmation more likely',\n    );\n    const waitPromise = new Promise((resolve) =>\n      setTimeout(resolve, LINEA_DELAY_MS),\n    );\n    await waitPromise;\n  }\n};\n\n/**\n * Adds a delay for hardware wallet transactions on mobile to fix an issue\n * where the Ledger does not get prompted for the 2nd approval.\n * Extension does not have this issue.\n *\n * @param requireApproval - Whether the delay should be applied\n */\nexport const handleMobileHardwareWalletDelay = async (\n  requireApproval: boolean,\n) => {\n  if (requireApproval) {\n    const mobileHardwareWalletDelay = new Promise((resolve) =>\n      setTimeout(resolve, 1000),\n    );\n    await mobileHardwareWalletDelay;\n  }\n};\n\nexport const getClientRequest = (\n  quoteResponse: Omit<QuoteResponse<string>, 'approval'> & QuoteMetadata,\n  selectedAccount: AccountsControllerState['internalAccounts']['accounts'][string],\n) => {\n  const clientReqId = uuid();\n\n  return {\n    origin: 'metamask',\n    snapId: selectedAccount.metadata.snap?.id as never,\n    handler: 'onClientRequest' as never,\n    request: {\n      id: clientReqId,\n      jsonrpc: '2.0',\n      method: 'signAndSendTransactionWithoutConfirmation',\n      params: {\n        account: { address: selectedAccount.address },\n        transaction: quoteResponse.trade,\n        scope: SolScope.Mainnet,\n      },\n    },\n  };\n};\n\nexport const toBatchTxParams = (\n  disable7702: boolean,\n  { chainId, gasLimit, ...trade }: TxData,\n  {\n    maxFeePerGas,\n    maxPriorityFeePerGas,\n    gas,\n  }: { maxFeePerGas?: string; maxPriorityFeePerGas?: string; gas?: string },\n): BatchTransactionParams => {\n  const params = {\n    ...trade,\n    data: trade.data as `0x${string}`,\n    to: trade.to as `0x${string}`,\n    value: trade.value as `0x${string}`,\n  };\n  if (!disable7702) {\n    return params;\n  }\n\n  return {\n    ...params,\n    gas: toHex(gas ?? 0),\n    maxFeePerGas: toHex(maxFeePerGas ?? 0),\n    maxPriorityFeePerGas: toHex(maxPriorityFeePerGas ?? 0),\n  };\n};\n\nexport const getAddTransactionBatchParams = async ({\n  messagingSystem,\n  isBridgeTx,\n  approval,\n  resetApproval,\n  trade,\n  quoteResponse: {\n    quote: {\n      feeData: { txFee },\n      gasIncluded,\n      gasIncluded7702,\n    },\n    sentAmount,\n    toTokenAmount,\n  },\n  requireApproval = false,\n  estimateGasFeeFn,\n}: {\n  messagingSystem: BridgeStatusControllerMessenger;\n  isBridgeTx: boolean;\n  trade: TxData;\n  quoteResponse: Omit<QuoteResponse, 'approval' | 'trade'> & QuoteMetadata;\n  estimateGasFeeFn: typeof TransactionController.prototype.estimateGasFee;\n  approval?: TxData;\n  resetApproval?: TxData;\n  requireApproval?: boolean;\n}) => {\n  const isGasless = gasIncluded || gasIncluded7702;\n  const selectedAccount = messagingSystem.call(\n    'AccountsController:getAccountByAddress',\n    trade.from,\n  );\n  if (!selectedAccount) {\n    throw new Error(\n      'Failed to submit cross-chain swap batch transaction: unknown account in trade data',\n    );\n  }\n  const hexChainId = formatChainIdToHex(trade.chainId);\n  const networkClientId = messagingSystem.call(\n    'NetworkController:findNetworkClientIdByChainId',\n    hexChainId,\n  );\n\n  // When an active quote has gasIncluded7702 set to true,\n  // enable 7702 gasless txs for smart accounts\n  const disable7702 = gasIncluded7702 !== true;\n  const transactions: TransactionBatchSingleRequest[] = [];\n  if (resetApproval) {\n    const gasFees = await calculateGasFees(\n      disable7702,\n      messagingSystem,\n      estimateGasFeeFn,\n      resetApproval,\n      networkClientId,\n      hexChainId,\n      isGasless ? txFee : undefined,\n    );\n    transactions.push({\n      type: isBridgeTx\n        ? TransactionType.bridgeApproval\n        : TransactionType.swapApproval,\n      params: toBatchTxParams(disable7702, resetApproval, gasFees),\n    });\n  }\n  if (approval) {\n    const gasFees = await calculateGasFees(\n      disable7702,\n      messagingSystem,\n      estimateGasFeeFn,\n      approval,\n      networkClientId,\n      hexChainId,\n      isGasless ? txFee : undefined,\n    );\n    transactions.push({\n      type: isBridgeTx\n        ? TransactionType.bridgeApproval\n        : TransactionType.swapApproval,\n      params: toBatchTxParams(disable7702, approval, gasFees),\n    });\n  }\n  const gasFees = await calculateGasFees(\n    disable7702,\n    messagingSystem,\n    estimateGasFeeFn,\n    trade,\n    networkClientId,\n    hexChainId,\n    isGasless ? txFee : undefined,\n  );\n  transactions.push({\n    type: isBridgeTx ? TransactionType.bridge : TransactionType.swap,\n    params: toBatchTxParams(disable7702, trade, gasFees),\n    assetsFiatValues: {\n      sending: sentAmount?.valueInCurrency?.toString(),\n      receiving: toTokenAmount?.valueInCurrency?.toString(),\n    },\n  });\n  const transactionParams: Parameters<\n    TransactionController['addTransactionBatch']\n  >[0] = {\n    disable7702,\n    isGasFeeIncluded: Boolean(gasIncluded7702),\n    networkClientId,\n    requireApproval,\n    origin: 'metamask',\n    from: trade.from as `0x${string}`,\n    transactions,\n  };\n\n  return transactionParams;\n};\n\nexport const findAndUpdateTransactionsInBatch = ({\n  messagingSystem,\n  updateTransactionFn,\n  batchId,\n  txDataByType,\n}: {\n  messagingSystem: BridgeStatusControllerMessenger;\n  updateTransactionFn: typeof TransactionController.prototype.updateTransaction;\n  batchId: string;\n  txDataByType: { [key in TransactionType]?: string };\n}) => {\n  const txs = messagingSystem.call(\n    'TransactionController:getState',\n  ).transactions;\n  const txBatch: {\n    approvalMeta?: TransactionMeta;\n    tradeMeta?: TransactionMeta;\n  } = {\n    approvalMeta: undefined,\n    tradeMeta: undefined,\n  };\n\n  // This is a workaround to update the tx type after the tx is signed\n  // TODO: remove this once the tx type for batch txs is preserved in the tx controller\n  Object.entries(txDataByType).forEach(([txType, txData]) => {\n    // Find transaction by batchId and either matching data or delegation characteristics\n    const txMeta = txs.find((tx) => {\n      if (tx.batchId !== batchId) {\n        return false;\n      }\n\n      // For 7702 delegated transactions, check for delegation-specific fields\n      // These transactions might have authorizationList or delegationAddress\n      const is7702Transaction =\n        (Array.isArray(tx.txParams.authorizationList) &&\n          tx.txParams.authorizationList.length > 0) ||\n        Boolean(tx.delegationAddress);\n\n      if (is7702Transaction) {\n        // For 7702 transactions, we need to match based on transaction type\n        // since the data field might be different (batch execute call)\n        if (\n          txType === TransactionType.swap &&\n          tx.type === TransactionType.batch\n        ) {\n          return true;\n        }\n        // Also check if it's an approval transaction for 7702\n        if (\n          txType === TransactionType.swapApproval &&\n          tx.txParams.data === txData\n        ) {\n          return true;\n        }\n      }\n\n      // Default matching logic for non-7702 transactions\n      return tx.txParams.data === txData;\n    });\n\n    if (txMeta) {\n      const updatedTx = { ...txMeta, type: txType as TransactionType };\n      updateTransactionFn(updatedTx, `Update tx type to ${txType}`);\n      txBatch[\n        [TransactionType.bridgeApproval, TransactionType.swapApproval].includes(\n          txType as TransactionType,\n        )\n          ? 'approvalMeta'\n          : 'tradeMeta'\n      ] = updatedTx;\n    }\n  });\n\n  return txBatch;\n};\n"]}
+{"version":3,"file":"transaction.cjs","sourceRoot":"","sources":["../../src/utils/transaction.ts"],"names":[],"mappings":"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","sourcesContent":["import type { AccountsControllerState } from '@metamask/accounts-controller';\nimport type { TxData } from '@metamask/bridge-controller';\nimport {\n  ChainId,\n  formatChainIdToCaip,\n  formatChainIdToHex,\n  getEthUsdtResetData,\n  isCrossChain,\n  isEthUsdt,\n  type QuoteMetadata,\n  type QuoteResponse,\n} from '@metamask/bridge-controller';\nimport { toHex } from '@metamask/controller-utils';\nimport type {\n  BatchTransactionParams,\n  TransactionController,\n} from '@metamask/transaction-controller';\nimport {\n  TransactionStatus,\n  TransactionType,\n  type TransactionMeta,\n} from '@metamask/transaction-controller';\nimport { createProjectLogger } from '@metamask/utils';\nimport { BigNumber } from 'bignumber.js';\nimport { v4 as uuid } from 'uuid';\n\nimport { calculateGasFees } from './gas';\nimport { createClientTransactionRequest } from './snaps';\nimport type { TransactionBatchSingleRequest } from '../../../transaction-controller/src/types';\nimport { APPROVAL_DELAY_MS } from '../constants';\nimport type {\n  BridgeStatusControllerMessenger,\n  SolanaTransactionMeta,\n} from '../types';\n\nexport const generateActionId = () => (Date.now() + Math.random()).toString();\n\nexport const getUSDTAllowanceResetTx = async (\n  messagingSystem: BridgeStatusControllerMessenger,\n  quoteResponse: QuoteResponse<TxData | string> & QuoteMetadata,\n) => {\n  const hexChainId = formatChainIdToHex(quoteResponse.quote.srcChainId);\n  if (\n    quoteResponse.approval &&\n    isEthUsdt(hexChainId, quoteResponse.quote.srcAsset.address)\n  ) {\n    const allowance = new BigNumber(\n      await messagingSystem.call(\n        'BridgeController:getBridgeERC20Allowance',\n        quoteResponse.quote.srcAsset.address,\n        hexChainId,\n      ),\n    );\n    const shouldResetApproval =\n      allowance.lt(quoteResponse.sentAmount.amount) && allowance.gt(0);\n    if (shouldResetApproval) {\n      return { ...quoteResponse.approval, data: getEthUsdtResetData() };\n    }\n  }\n  return undefined;\n};\n\nexport const getStatusRequestParams = (\n  quoteResponse: QuoteResponse<string | TxData>,\n) => {\n  return {\n    bridgeId: quoteResponse.quote.bridgeId,\n    bridge: quoteResponse.quote.bridges[0],\n    srcChainId: quoteResponse.quote.srcChainId,\n    destChainId: quoteResponse.quote.destChainId,\n    quote: quoteResponse.quote,\n    refuel: Boolean(quoteResponse.quote.refuel),\n  };\n};\n\nexport const getTxMetaFields = (\n  quoteResponse: Omit<QuoteResponse<string | TxData>, 'approval' | 'trade'> &\n    QuoteMetadata,\n  approvalTxId?: string,\n): Omit<\n  TransactionMeta,\n  'networkClientId' | 'status' | 'time' | 'txParams' | 'id' | 'chainId'\n> => {\n  // Handle destination chain ID - should always be convertible for EVM destinations\n  let destinationChainId;\n  try {\n    destinationChainId = formatChainIdToHex(quoteResponse.quote.destChainId);\n  } catch {\n    // Fallback for non-EVM destination (shouldn't happen for BTC->EVM)\n    destinationChainId = '0x1' as `0x${string}`; // Default to mainnet\n  }\n\n  return {\n    destinationChainId,\n    sourceTokenAmount: quoteResponse.quote.srcTokenAmount,\n    sourceTokenSymbol: quoteResponse.quote.srcAsset.symbol,\n    sourceTokenDecimals: quoteResponse.quote.srcAsset.decimals,\n    sourceTokenAddress: quoteResponse.quote.srcAsset.address,\n\n    destinationTokenAmount: quoteResponse.quote.destTokenAmount,\n    destinationTokenSymbol: quoteResponse.quote.destAsset.symbol,\n    destinationTokenDecimals: quoteResponse.quote.destAsset.decimals,\n    destinationTokenAddress: quoteResponse.quote.destAsset.address,\n\n    // chainId is now excluded from this function and handled by the caller\n    approvalTxId,\n    // this is the decimal (non atomic) amount (not USD value) of source token to swap\n    swapTokenValue: quoteResponse.sentAmount.amount,\n  };\n};\n\n/**\n * Handles the response from non-EVM transaction submission\n * Works with the new unified ClientRequest:signAndSendTransaction interface\n * Supports Solana, Bitcoin, and other non-EVM chains\n *\n * @param snapResponse - The response from the snap after transaction submission\n * @param quoteResponse - The quote response containing trade details and metadata\n * @param selectedAccount - The selected account information\n * @returns The transaction metadata including non-EVM specific fields\n */\nexport const handleNonEvmTxResponse = (\n  snapResponse:\n    | string\n    | { transactionId: string } // New unified interface response\n    | { result: Record<string, string> }\n    | { signature: string },\n  quoteResponse: Omit<\n    QuoteResponse<string | { unsignedPsbtBase64: string }>,\n    'approval'\n  > &\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;\n  try {\n    hexChainId = formatChainIdToHex(quoteResponse.quote.srcChainId);\n  } catch {\n    // TODO: Fix chain ID activity list handling for Bitcoin\n    // Fallback to Ethereum mainnet for now\n    hexChainId = '0x1' as `0x${string}`;\n  }\n\n  // Extract the transaction data for storage\n  const tradeData =\n    typeof quoteResponse.trade === 'string'\n      ? quoteResponse.trade\n      : quoteResponse.trade.unsignedPsbtBase64;\n\n  // Create a transaction meta object with bridge-specific fields\n  return {\n    ...getTxMetaFields(quoteResponse),\n    time: Date.now(),\n    id: hash ?? uuid(),\n    chainId: hexChainId,\n    networkClientId: snapId ?? hexChainId,\n    txParams: { from: selectedAccountAddress, data: tradeData },\n    type: isBridgeTx ? TransactionType.bridge : TransactionType.swap,\n    status: TransactionStatus.submitted,\n    hash, // Add the transaction signature as hash\n    origin: snapId,\n    // Add an explicit flag to mark this as a non-EVM transaction\n    isSolana: true, // TODO deprecate this and use chainId to detect non-EVM chains\n    isBridgeTx,\n  };\n};\n\nexport const handleApprovalDelay = async (\n  quoteResponse: QuoteResponse<TxData | string>,\n) => {\n  if ([ChainId.LINEA, ChainId.BASE].includes(quoteResponse.quote.srcChainId)) {\n    const debugLog = createProjectLogger('bridge');\n    debugLog(\n      'Delaying submitting bridge tx to make Linea and Base confirmation more likely',\n    );\n    const waitPromise = new Promise((resolve) =>\n      setTimeout(resolve, APPROVAL_DELAY_MS),\n    );\n    await waitPromise;\n  }\n};\n\n/**\n * Adds a delay for hardware wallet transactions on mobile to fix an issue\n * where the Ledger does not get prompted for the 2nd approval.\n * Extension does not have this issue.\n *\n * @param requireApproval - Whether the delay should be applied\n */\nexport const handleMobileHardwareWalletDelay = async (\n  requireApproval: boolean,\n) => {\n  if (requireApproval) {\n    const mobileHardwareWalletDelay = new Promise((resolve) =>\n      setTimeout(resolve, 1000),\n    );\n    await mobileHardwareWalletDelay;\n  }\n};\n\n/**\n * Creates a request to sign and send a transaction for non-EVM chains\n * Uses the new unified ClientRequest:signAndSendTransaction interface\n *\n * @param quoteResponse - The quote response containing trade details and metadata\n * @param selectedAccount - The selected account information\n * @returns The snap request object for signing and sending transaction\n */\nexport const getClientRequest = (\n  quoteResponse: Omit<\n    QuoteResponse<string | { unsignedPsbtBase64: string }>,\n    'approval'\n  > &\n    QuoteMetadata,\n  selectedAccount: AccountsControllerState['internalAccounts']['accounts'][string],\n) => {\n  const scope = formatChainIdToCaip(quoteResponse.quote.srcChainId);\n\n  // Extract the transaction data - Bitcoin uses unsignedPsbtBase64, others use string\n  const transactionData =\n    typeof quoteResponse.trade === 'string'\n      ? quoteResponse.trade\n      : quoteResponse.trade.unsignedPsbtBase64;\n\n  // Use the new unified interface\n  return createClientTransactionRequest(\n    selectedAccount.metadata.snap?.id as string,\n    transactionData,\n    scope,\n    selectedAccount.id,\n  );\n};\n\nexport const toBatchTxParams = (\n  disable7702: boolean,\n  { chainId, gasLimit, ...trade }: TxData,\n  {\n    maxFeePerGas,\n    maxPriorityFeePerGas,\n    gas,\n  }: { maxFeePerGas?: string; maxPriorityFeePerGas?: string; gas?: string },\n): BatchTransactionParams => {\n  const params = {\n    ...trade,\n    data: trade.data as `0x${string}`,\n    to: trade.to as `0x${string}`,\n    value: trade.value as `0x${string}`,\n  };\n  if (!disable7702) {\n    return params;\n  }\n\n  return {\n    ...params,\n    gas: toHex(gas ?? 0),\n    maxFeePerGas: toHex(maxFeePerGas ?? 0),\n    maxPriorityFeePerGas: toHex(maxPriorityFeePerGas ?? 0),\n  };\n};\n\nexport const getAddTransactionBatchParams = async ({\n  messagingSystem,\n  isBridgeTx,\n  approval,\n  resetApproval,\n  trade,\n  quoteResponse: {\n    quote: {\n      feeData: { txFee },\n      gasIncluded,\n      gasIncluded7702,\n    },\n    sentAmount,\n    toTokenAmount,\n  },\n  requireApproval = false,\n  estimateGasFeeFn,\n}: {\n  messagingSystem: BridgeStatusControllerMessenger;\n  isBridgeTx: boolean;\n  trade: TxData;\n  quoteResponse: Omit<QuoteResponse, 'approval' | 'trade'> & QuoteMetadata;\n  estimateGasFeeFn: typeof TransactionController.prototype.estimateGasFee;\n  approval?: TxData;\n  resetApproval?: TxData;\n  requireApproval?: boolean;\n}) => {\n  const isGasless = gasIncluded || gasIncluded7702;\n  const selectedAccount = messagingSystem.call(\n    'AccountsController:getAccountByAddress',\n    trade.from,\n  );\n  if (!selectedAccount) {\n    throw new Error(\n      'Failed to submit cross-chain swap batch transaction: unknown account in trade data',\n    );\n  }\n  const hexChainId = formatChainIdToHex(trade.chainId);\n  const networkClientId = messagingSystem.call(\n    'NetworkController:findNetworkClientIdByChainId',\n    hexChainId,\n  );\n\n  // When an active quote has gasIncluded7702 set to true,\n  // enable 7702 gasless txs for smart accounts\n  const disable7702 = gasIncluded7702 !== true;\n  const transactions: TransactionBatchSingleRequest[] = [];\n  if (resetApproval) {\n    const gasFees = await calculateGasFees(\n      disable7702,\n      messagingSystem,\n      estimateGasFeeFn,\n      resetApproval,\n      networkClientId,\n      hexChainId,\n      isGasless ? txFee : undefined,\n    );\n    transactions.push({\n      type: isBridgeTx\n        ? TransactionType.bridgeApproval\n        : TransactionType.swapApproval,\n      params: toBatchTxParams(disable7702, resetApproval, gasFees),\n    });\n  }\n  if (approval) {\n    const gasFees = await calculateGasFees(\n      disable7702,\n      messagingSystem,\n      estimateGasFeeFn,\n      approval,\n      networkClientId,\n      hexChainId,\n      isGasless ? txFee : undefined,\n    );\n    transactions.push({\n      type: isBridgeTx\n        ? TransactionType.bridgeApproval\n        : TransactionType.swapApproval,\n      params: toBatchTxParams(disable7702, approval, gasFees),\n    });\n  }\n  const gasFees = await calculateGasFees(\n    disable7702,\n    messagingSystem,\n    estimateGasFeeFn,\n    trade,\n    networkClientId,\n    hexChainId,\n    isGasless ? txFee : undefined,\n  );\n  transactions.push({\n    type: isBridgeTx ? TransactionType.bridge : TransactionType.swap,\n    params: toBatchTxParams(disable7702, trade, gasFees),\n    assetsFiatValues: {\n      sending: sentAmount?.valueInCurrency?.toString(),\n      receiving: toTokenAmount?.valueInCurrency?.toString(),\n    },\n  });\n  const transactionParams: Parameters<\n    TransactionController['addTransactionBatch']\n  >[0] = {\n    disable7702,\n    isGasFeeIncluded: Boolean(gasIncluded7702),\n    networkClientId,\n    requireApproval,\n    origin: 'metamask',\n    from: trade.from as `0x${string}`,\n    transactions,\n  };\n\n  return transactionParams;\n};\n\nexport const findAndUpdateTransactionsInBatch = ({\n  messagingSystem,\n  updateTransactionFn,\n  batchId,\n  txDataByType,\n}: {\n  messagingSystem: BridgeStatusControllerMessenger;\n  updateTransactionFn: typeof TransactionController.prototype.updateTransaction;\n  batchId: string;\n  txDataByType: { [key in TransactionType]?: string };\n}) => {\n  const txs = messagingSystem.call(\n    'TransactionController:getState',\n  ).transactions;\n  const txBatch: {\n    approvalMeta?: TransactionMeta;\n    tradeMeta?: TransactionMeta;\n  } = {\n    approvalMeta: undefined,\n    tradeMeta: undefined,\n  };\n\n  // This is a workaround to update the tx type after the tx is signed\n  // TODO: remove this once the tx type for batch txs is preserved in the tx controller\n  Object.entries(txDataByType).forEach(([txType, txData]) => {\n    // Find transaction by batchId and either matching data or delegation characteristics\n    const txMeta = txs.find((tx) => {\n      if (tx.batchId !== batchId) {\n        return false;\n      }\n\n      // For 7702 delegated transactions, check for delegation-specific fields\n      // These transactions might have authorizationList or delegationAddress\n      const is7702Transaction =\n        (Array.isArray(tx.txParams.authorizationList) &&\n          tx.txParams.authorizationList.length > 0) ||\n        Boolean(tx.delegationAddress);\n\n      if (is7702Transaction) {\n        // For 7702 transactions, we need to match based on transaction type\n        // since the data field might be different (batch execute call)\n        if (\n          txType === TransactionType.swap &&\n          tx.type === TransactionType.batch\n        ) {\n          return true;\n        }\n        // Also check if it's an approval transaction for 7702\n        if (\n          txType === TransactionType.swapApproval &&\n          tx.txParams.data === txData\n        ) {\n          return true;\n        }\n      }\n\n      // Default matching logic for non-7702 transactions\n      return tx.txParams.data === txData;\n    });\n\n    if (txMeta) {\n      const updatedTx = { ...txMeta, type: txType as TransactionType };\n      updateTransactionFn(updatedTx, `Update tx type to ${txType}`);\n      txBatch[\n        [TransactionType.bridgeApproval, TransactionType.swapApproval].includes(\n          txType as TransactionType,\n        )\n          ? 'approvalMeta'\n          : 'tradeMeta'\n      ] = updatedTx;\n    }\n  });\n\n  return txBatch;\n};\n"]}

package/dist/utils/transaction.d.cts

@@ -1,7 +1,6 @@
 import type { AccountsControllerState } from "@metamask/accounts-controller";
 import type { TxData } from "@metamask/bridge-controller";
 import { type QuoteMetadata, type QuoteResponse } from "@metamask/bridge-controller";
-import { SolScope } from "@metamask/keyring-api";
 import type { BatchTransactionParams, TransactionController } from "@metamask/transaction-controller";
 import { TransactionType, type TransactionMeta } from "@metamask/transaction-controller";
 import type { BridgeStatusControllerMessenger, SolanaTransactionMeta } from "../types.cjs";
@@ -155,13 +154,27 @@ export declare const getStatusRequestParams: (quoteResponse: QuoteResponse<strin
     };
     refuel: boolean;
 };
-export declare const getTxMetaFields: (quoteResponse: Omit<QuoteResponse<string | TxData>, 'approval' | 'trade'> & QuoteMetadata, approvalTxId?: string) => Omit<TransactionMeta, 'networkClientId' | 'status' | 'time' | 'txParams' | 'id'>;
-export declare const handleSolanaTxResponse: (snapResponse: string | {
+export declare const getTxMetaFields: (quoteResponse: Omit<QuoteResponse<string | TxData>, 'approval' | 'trade'> & QuoteMetadata, approvalTxId?: string) => Omit<TransactionMeta, 'networkClientId' | 'status' | 'time' | 'txParams' | 'id' | 'chainId'>;
+/**
+ * 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
+ */
+export declare const handleNonEvmTxResponse: (snapResponse: string | {
+    transactionId: string;
+} | {
     result: Record<string, string>;
 } | {
     signature: string;
-}, quoteResponse: Omit<QuoteResponse<string>, 'approval'> & QuoteMetadata, selectedAccount: AccountsControllerState['internalAccounts']['accounts'][string]) => TransactionMeta & SolanaTransactionMeta;
-export declare const handleLineaDelay: (quoteResponse: QuoteResponse<TxData | string>) => Promise<void>;
+}, quoteResponse: Omit<QuoteResponse<string | {
+    unsignedPsbtBase64: string;
+}>, 'approval'> & QuoteMetadata, selectedAccount: AccountsControllerState['internalAccounts']['accounts'][string]) => TransactionMeta & SolanaTransactionMeta;
+export declare const handleApprovalDelay: (quoteResponse: QuoteResponse<TxData | string>) => Promise<void>;
 /**
  * Adds a delay for hardware wallet transactions on mobile to fix an issue
  * where the Ledger does not get prompted for the 2nd approval.
@@ -170,28 +183,29 @@ export declare const handleLineaDelay: (quoteResponse: QuoteResponse<TxData | st
  * @param requireApproval - Whether the delay should be applied
  */
 export declare const handleMobileHardwareWalletDelay: (requireApproval: boolean) => Promise<void>;
-export declare const getClientRequest: (quoteResponse: Omit<QuoteResponse<string>, 'approval'> & QuoteMetadata, selectedAccount: AccountsControllerState['internalAccounts']['accounts'][string]) => {
-    origin: string;
+/**
+ * Creates a request to sign and send a transaction for non-EVM chains
+ * Uses the new unified ClientRequest:signAndSendTransaction interface
+ *
+ * @param quoteResponse - The quote response containing trade details and metadata
+ * @param selectedAccount - The selected account information
+ * @returns The snap request object for signing and sending transaction
+ */
+export declare const getClientRequest: (quoteResponse: Omit<QuoteResponse<string | {
+    unsignedPsbtBase64: string;
+}>, 'approval'> & QuoteMetadata, selectedAccount: AccountsControllerState['internalAccounts']['accounts'][string]) => {
     snapId: never;
+    origin: string;
     handler: never;
     request: {
         id: string;
         jsonrpc: string;
         method: string;
         params: {
-            account: {
-                address: string;
-            };
-            transaction: string | ({
-                data: string;
-                value: string;
-                to: string;
-                from: string;
-                gasLimit: number | null;
-                chainId: number;
-                effectiveGas?: number | undefined;
-            } & string);
-            scope: SolScope;
+            options?: Record<string, unknown> | undefined;
+            transaction: string;
+            scope: `${string}:${string}`;
+            accountId: string;
         };
     };
 };

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

@@ -1 +1 @@
-{"version":3,"file":"transaction.d.cts","sourceRoot":"","sources":["../../src/utils/transaction.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,uBAAuB,EAAE,sCAAsC;AAC7E,OAAO,KAAK,EAAE,MAAM,EAAE,oCAAoC;AAC1D,OAAO,EAML,KAAK,aAAa,EAClB,KAAK,aAAa,EACnB,oCAAoC;AAErC,OAAO,EAAE,QAAQ,EAAE,8BAA8B;AACjD,OAAO,KAAK,EACV,sBAAsB,EACtB,qBAAqB,EACtB,yCAAyC;AAC1C,OAAO,EAEL,eAAe,EACf,KAAK,eAAe,EACrB,yCAAyC;AAQ1C,OAAO,KAAK,EACV,+BAA+B,EAC/B,qBAAqB,EACtB,qBAAiB;AAElB,eAAO,MAAM,gBAAgB,cAAgD,CAAC;AAE9E,eAAO,MAAM,uBAAuB,oEAEnB,cAAc,MAAM,GAAG,MAAM,CAAC,GAAG,aAAa;;;;;;;;cAqB9D,CAAC;AAEF,eAAO,MAAM,sBAAsB,kBAClB,cAAc,MAAM,GAAG,MAAM,CAAC;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;CAU9C,CAAC;AAEF,eAAO,MAAM,eAAe,kBACX,KAAK,cAAc,MAAM,GAAG,MAAM,CAAC,EAAE,UAAU,GAAG,OAAO,CAAC,GACvE,aAAa,iBACA,MAAM,KACpB,KACD,eAAe,EACf,iBAAiB,GAAG,QAAQ,GAAG,MAAM,GAAG,UAAU,GAAG,IAAI,CAmB1D,CAAC;AAEF,eAAO,MAAM,sBAAsB,iBAE7B,MAAM,GACN;IAAE,MAAM,EAAE,OAAO,MAAM,EAAE,MAAM,CAAC,CAAA;CAAE,GAClC;IAAE,SAAS,EAAE,MAAM,CAAA;CAAE,iBACV,KAAK,cAAc,MAAM,CAAC,EAAE,UAAU,CAAC,GAAG,aAAa,mBACrD,uBAAuB,CAAC,kBAAkB,CAAC,CAAC,UAAU,CAAC,CAAC,MAAM,CAAC,KAC/E,eAAe,GAAG,qBAsDpB,CAAC;AAEF,eAAO,MAAM,gBAAgB,kBACZ,cAAc,MAAM,GAAG,MAAM,CAAC,kBAY9C,CAAC;AAEF;;;;;;GAMG;AACH,eAAO,MAAM,+BAA+B,oBACzB,OAAO,kBAQzB,CAAC;AAEF,eAAO,MAAM,gBAAgB,kBACZ,KAAK,cAAc,MAAM,CAAC,EAAE,UAAU,CAAC,GAAG,aAAa,mBACrD,uBAAuB,CAAC,kBAAkB,CAAC,CAAC,UAAU,CAAC,CAAC,MAAM,CAAC;;;;;;;;;;;;;;;;;;;;;;;;CAmBjF,CAAC;AAEF,eAAO,MAAM,eAAe,gBACb,OAAO,mCACa,MAAM;;;;MAMtC,sBAiBF,CAAC;AAEF,eAAO,MAAM,4BAA4B;;gBAmB3B,OAAO;WACZ,MAAM;mBACE,KAAK,aAAa,EAAE,UAAU,GAAG,OAAO,CAAC,GAAG,aAAa;sBACtD,OAAO,sBAAsB,SAAS,CAAC,cAAc;;;;;;;;;;;;;;;;;;;;iFAyFxE,CAAC;AAEF,eAAO,MAAM,gCAAgC;;yBAOtB,OAAO,sBAAsB,SAAS,CAAC,iBAAiB;aACpE,MAAM;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;CAkEhB,CAAC"}
+{"version":3,"file":"transaction.d.cts","sourceRoot":"","sources":["../../src/utils/transaction.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,uBAAuB,EAAE,sCAAsC;AAC7E,OAAO,KAAK,EAAE,MAAM,EAAE,oCAAoC;AAC1D,OAAO,EAOL,KAAK,aAAa,EAClB,KAAK,aAAa,EACnB,oCAAoC;AAErC,OAAO,KAAK,EACV,sBAAsB,EACtB,qBAAqB,EACtB,yCAAyC;AAC1C,OAAO,EAEL,eAAe,EACf,KAAK,eAAe,EACrB,yCAAyC;AAS1C,OAAO,KAAK,EACV,+BAA+B,EAC/B,qBAAqB,EACtB,qBAAiB;AAElB,eAAO,MAAM,gBAAgB,cAAgD,CAAC;AAE9E,eAAO,MAAM,uBAAuB,oEAEnB,cAAc,MAAM,GAAG,MAAM,CAAC,GAAG,aAAa;;;;;;;;cAqB9D,CAAC;AAEF,eAAO,MAAM,sBAAsB,kBAClB,cAAc,MAAM,GAAG,MAAM,CAAC;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;CAU9C,CAAC;AAEF,eAAO,MAAM,eAAe,kBACX,KAAK,cAAc,MAAM,GAAG,MAAM,CAAC,EAAE,UAAU,GAAG,OAAO,CAAC,GACvE,aAAa,iBACA,MAAM,KACpB,KACD,eAAe,EACf,iBAAiB,GAAG,QAAQ,GAAG,MAAM,GAAG,UAAU,GAAG,IAAI,GAAG,SAAS,CA4BtE,CAAC;AAEF;;;;;;;;;GASG;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,iBACV,KACb,cAAc,MAAM,GAAG;IAAE,kBAAkB,EAAE,MAAM,CAAA;CAAE,CAAC,EACtD,UAAU,CACX,GACC,aAAa,mBACE,uBAAuB,CAAC,kBAAkB,CAAC,CAAC,UAAU,CAAC,CAAC,MAAM,CAAC,KAC/E,eAAe,GAAG,qBAmEpB,CAAC;AAEF,eAAO,MAAM,mBAAmB,kBACf,cAAc,MAAM,GAAG,MAAM,CAAC,kBAY9C,CAAC;AAEF;;;;;;GAMG;AACH,eAAO,MAAM,+BAA+B,oBACzB,OAAO,kBAQzB,CAAC;AAEF;;;;;;;GAOG;AACH,eAAO,MAAM,gBAAgB,kBACZ,KACb,cAAc,MAAM,GAAG;IAAE,kBAAkB,EAAE,MAAM,CAAA;CAAE,CAAC,EACtD,UAAU,CACX,GACC,aAAa,mBACE,uBAAuB,CAAC,kBAAkB,CAAC,CAAC,UAAU,CAAC,CAAC,MAAM,CAAC;;;;;;;;;;;;;;;CAiBjF,CAAC;AAEF,eAAO,MAAM,eAAe,gBACb,OAAO,mCACa,MAAM;;;;MAMtC,sBAiBF,CAAC;AAEF,eAAO,MAAM,4BAA4B;;gBAmB3B,OAAO;WACZ,MAAM;mBACE,KAAK,aAAa,EAAE,UAAU,GAAG,OAAO,CAAC,GAAG,aAAa;sBACtD,OAAO,sBAAsB,SAAS,CAAC,cAAc;;;;;;;;;;;;;;;;;;;;iFAyFxE,CAAC;AAEF,eAAO,MAAM,gCAAgC;;yBAOtB,OAAO,sBAAsB,SAAS,CAAC,iBAAiB;aACpE,MAAM;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;CAkEhB,CAAC"}

package/dist/utils/transaction.d.mts

@@ -1,7 +1,6 @@
 import type { AccountsControllerState } from "@metamask/accounts-controller";
 import type { TxData } from "@metamask/bridge-controller";
 import { type QuoteMetadata, type QuoteResponse } from "@metamask/bridge-controller";
-import { SolScope } from "@metamask/keyring-api";
 import type { BatchTransactionParams, TransactionController } from "@metamask/transaction-controller";
 import { TransactionType, type TransactionMeta } from "@metamask/transaction-controller";
 import type { BridgeStatusControllerMessenger, SolanaTransactionMeta } from "../types.mjs";
@@ -155,13 +154,27 @@ export declare const getStatusRequestParams: (quoteResponse: QuoteResponse<strin
     };
     refuel: boolean;
 };
-export declare const getTxMetaFields: (quoteResponse: Omit<QuoteResponse<string | TxData>, 'approval' | 'trade'> & QuoteMetadata, approvalTxId?: string) => Omit<TransactionMeta, 'networkClientId' | 'status' | 'time' | 'txParams' | 'id'>;
-export declare const handleSolanaTxResponse: (snapResponse: string | {
+export declare const getTxMetaFields: (quoteResponse: Omit<QuoteResponse<string | TxData>, 'approval' | 'trade'> & QuoteMetadata, approvalTxId?: string) => Omit<TransactionMeta, 'networkClientId' | 'status' | 'time' | 'txParams' | 'id' | 'chainId'>;
+/**
+ * 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
+ */
+export declare const handleNonEvmTxResponse: (snapResponse: string | {
+    transactionId: string;
+} | {
     result: Record<string, string>;
 } | {
     signature: string;
-}, quoteResponse: Omit<QuoteResponse<string>, 'approval'> & QuoteMetadata, selectedAccount: AccountsControllerState['internalAccounts']['accounts'][string]) => TransactionMeta & SolanaTransactionMeta;
-export declare const handleLineaDelay: (quoteResponse: QuoteResponse<TxData | string>) => Promise<void>;
+}, quoteResponse: Omit<QuoteResponse<string | {
+    unsignedPsbtBase64: string;
+}>, 'approval'> & QuoteMetadata, selectedAccount: AccountsControllerState['internalAccounts']['accounts'][string]) => TransactionMeta & SolanaTransactionMeta;
+export declare const handleApprovalDelay: (quoteResponse: QuoteResponse<TxData | string>) => Promise<void>;
 /**
  * Adds a delay for hardware wallet transactions on mobile to fix an issue
  * where the Ledger does not get prompted for the 2nd approval.
@@ -170,28 +183,29 @@ export declare const handleLineaDelay: (quoteResponse: QuoteResponse<TxData | st
  * @param requireApproval - Whether the delay should be applied
  */
 export declare const handleMobileHardwareWalletDelay: (requireApproval: boolean) => Promise<void>;
-export declare const getClientRequest: (quoteResponse: Omit<QuoteResponse<string>, 'approval'> & QuoteMetadata, selectedAccount: AccountsControllerState['internalAccounts']['accounts'][string]) => {
-    origin: string;
+/**
+ * Creates a request to sign and send a transaction for non-EVM chains
+ * Uses the new unified ClientRequest:signAndSendTransaction interface
+ *
+ * @param quoteResponse - The quote response containing trade details and metadata
+ * @param selectedAccount - The selected account information
+ * @returns The snap request object for signing and sending transaction
+ */
+export declare const getClientRequest: (quoteResponse: Omit<QuoteResponse<string | {
+    unsignedPsbtBase64: string;
+}>, 'approval'> & QuoteMetadata, selectedAccount: AccountsControllerState['internalAccounts']['accounts'][string]) => {
     snapId: never;
+    origin: string;
     handler: never;
     request: {
         id: string;
         jsonrpc: string;
         method: string;
         params: {
-            account: {
-                address: string;
-            };
-            transaction: string | ({
-                data: string;
-                value: string;
-                to: string;
-                from: string;
-                gasLimit: number | null;
-                chainId: number;
-                effectiveGas?: number | undefined;
-            } & string);
-            scope: SolScope;
+            options?: Record<string, unknown> | undefined;
+            transaction: string;
+            scope: `${string}:${string}`;
+            accountId: string;
         };
     };
 };

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

@@ -1 +1 @@
-{"version":3,"file":"transaction.d.mts","sourceRoot":"","sources":["../../src/utils/transaction.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,uBAAuB,EAAE,sCAAsC;AAC7E,OAAO,KAAK,EAAE,MAAM,EAAE,oCAAoC;AAC1D,OAAO,EAML,KAAK,aAAa,EAClB,KAAK,aAAa,EACnB,oCAAoC;AAErC,OAAO,EAAE,QAAQ,EAAE,8BAA8B;AACjD,OAAO,KAAK,EACV,sBAAsB,EACtB,qBAAqB,EACtB,yCAAyC;AAC1C,OAAO,EAEL,eAAe,EACf,KAAK,eAAe,EACrB,yCAAyC;AAQ1C,OAAO,KAAK,EACV,+BAA+B,EAC/B,qBAAqB,EACtB,qBAAiB;AAElB,eAAO,MAAM,gBAAgB,cAAgD,CAAC;AAE9E,eAAO,MAAM,uBAAuB,oEAEnB,cAAc,MAAM,GAAG,MAAM,CAAC,GAAG,aAAa;;;;;;;;cAqB9D,CAAC;AAEF,eAAO,MAAM,sBAAsB,kBAClB,cAAc,MAAM,GAAG,MAAM,CAAC;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;CAU9C,CAAC;AAEF,eAAO,MAAM,eAAe,kBACX,KAAK,cAAc,MAAM,GAAG,MAAM,CAAC,EAAE,UAAU,GAAG,OAAO,CAAC,GACvE,aAAa,iBACA,MAAM,KACpB,KACD,eAAe,EACf,iBAAiB,GAAG,QAAQ,GAAG,MAAM,GAAG,UAAU,GAAG,IAAI,CAmB1D,CAAC;AAEF,eAAO,MAAM,sBAAsB,iBAE7B,MAAM,GACN;IAAE,MAAM,EAAE,OAAO,MAAM,EAAE,MAAM,CAAC,CAAA;CAAE,GAClC;IAAE,SAAS,EAAE,MAAM,CAAA;CAAE,iBACV,KAAK,cAAc,MAAM,CAAC,EAAE,UAAU,CAAC,GAAG,aAAa,mBACrD,uBAAuB,CAAC,kBAAkB,CAAC,CAAC,UAAU,CAAC,CAAC,MAAM,CAAC,KAC/E,eAAe,GAAG,qBAsDpB,CAAC;AAEF,eAAO,MAAM,gBAAgB,kBACZ,cAAc,MAAM,GAAG,MAAM,CAAC,kBAY9C,CAAC;AAEF;;;;;;GAMG;AACH,eAAO,MAAM,+BAA+B,oBACzB,OAAO,kBAQzB,CAAC;AAEF,eAAO,MAAM,gBAAgB,kBACZ,KAAK,cAAc,MAAM,CAAC,EAAE,UAAU,CAAC,GAAG,aAAa,mBACrD,uBAAuB,CAAC,kBAAkB,CAAC,CAAC,UAAU,CAAC,CAAC,MAAM,CAAC;;;;;;;;;;;;;;;;;;;;;;;;CAmBjF,CAAC;AAEF,eAAO,MAAM,eAAe,gBACb,OAAO,mCACa,MAAM;;;;MAMtC,sBAiBF,CAAC;AAEF,eAAO,MAAM,4BAA4B;;gBAmB3B,OAAO;WACZ,MAAM;mBACE,KAAK,aAAa,EAAE,UAAU,GAAG,OAAO,CAAC,GAAG,aAAa;sBACtD,OAAO,sBAAsB,SAAS,CAAC,cAAc;;;;;;;;;;;;;;;;;;;;iFAyFxE,CAAC;AAEF,eAAO,MAAM,gCAAgC;;yBAOtB,OAAO,sBAAsB,SAAS,CAAC,iBAAiB;aACpE,MAAM;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;CAkEhB,CAAC"}
+{"version":3,"file":"transaction.d.mts","sourceRoot":"","sources":["../../src/utils/transaction.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,uBAAuB,EAAE,sCAAsC;AAC7E,OAAO,KAAK,EAAE,MAAM,EAAE,oCAAoC;AAC1D,OAAO,EAOL,KAAK,aAAa,EAClB,KAAK,aAAa,EACnB,oCAAoC;AAErC,OAAO,KAAK,EACV,sBAAsB,EACtB,qBAAqB,EACtB,yCAAyC;AAC1C,OAAO,EAEL,eAAe,EACf,KAAK,eAAe,EACrB,yCAAyC;AAS1C,OAAO,KAAK,EACV,+BAA+B,EAC/B,qBAAqB,EACtB,qBAAiB;AAElB,eAAO,MAAM,gBAAgB,cAAgD,CAAC;AAE9E,eAAO,MAAM,uBAAuB,oEAEnB,cAAc,MAAM,GAAG,MAAM,CAAC,GAAG,aAAa;;;;;;;;cAqB9D,CAAC;AAEF,eAAO,MAAM,sBAAsB,kBAClB,cAAc,MAAM,GAAG,MAAM,CAAC;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;CAU9C,CAAC;AAEF,eAAO,MAAM,eAAe,kBACX,KAAK,cAAc,MAAM,GAAG,MAAM,CAAC,EAAE,UAAU,GAAG,OAAO,CAAC,GACvE,aAAa,iBACA,MAAM,KACpB,KACD,eAAe,EACf,iBAAiB,GAAG,QAAQ,GAAG,MAAM,GAAG,UAAU,GAAG,IAAI,GAAG,SAAS,CA4BtE,CAAC;AAEF;;;;;;;;;GASG;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,iBACV,KACb,cAAc,MAAM,GAAG;IAAE,kBAAkB,EAAE,MAAM,CAAA;CAAE,CAAC,EACtD,UAAU,CACX,GACC,aAAa,mBACE,uBAAuB,CAAC,kBAAkB,CAAC,CAAC,UAAU,CAAC,CAAC,MAAM,CAAC,KAC/E,eAAe,GAAG,qBAmEpB,CAAC;AAEF,eAAO,MAAM,mBAAmB,kBACf,cAAc,MAAM,GAAG,MAAM,CAAC,kBAY9C,CAAC;AAEF;;;;;;GAMG;AACH,eAAO,MAAM,+BAA+B,oBACzB,OAAO,kBAQzB,CAAC;AAEF;;;;;;;GAOG;AACH,eAAO,MAAM,gBAAgB,kBACZ,KACb,cAAc,MAAM,GAAG;IAAE,kBAAkB,EAAE,MAAM,CAAA;CAAE,CAAC,EACtD,UAAU,CACX,GACC,aAAa,mBACE,uBAAuB,CAAC,kBAAkB,CAAC,CAAC,UAAU,CAAC,CAAC,MAAM,CAAC;;;;;;;;;;;;;;;CAiBjF,CAAC;AAEF,eAAO,MAAM,eAAe,gBACb,OAAO,mCACa,MAAM;;;;MAMtC,sBAiBF,CAAC;AAEF,eAAO,MAAM,4BAA4B;;gBAmB3B,OAAO;WACZ,MAAM;mBACE,KAAK,aAAa,EAAE,UAAU,GAAG,OAAO,CAAC,GAAG,aAAa;sBACtD,OAAO,sBAAsB,SAAS,CAAC,cAAc;;;;;;;;;;;;;;;;;;;;iFAyFxE,CAAC;AAEF,eAAO,MAAM,gCAAgC;;yBAOtB,OAAO,sBAAsB,SAAS,CAAC,iBAAiB;aACpE,MAAM;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;CAkEhB,CAAC"}