@metamask/bridge-status-controller 69.0.0 → 70.0.0

package/dist/utils/network.cjs

@@ -0,0 +1,17 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.getNetworkClientIdByChainId = exports.getSelectedChainId = void 0;
+/* eslint-disable @typescript-eslint/explicit-function-return-type */
+const bridge_controller_1 = require("@metamask/bridge-controller");
+const getSelectedChainId = (messenger) => {
+    const { selectedNetworkClientId } = messenger.call('NetworkController:getState');
+    const networkClient = messenger.call('NetworkController:getNetworkClientById', selectedNetworkClientId);
+    return networkClient.configuration.chainId;
+};
+exports.getSelectedChainId = getSelectedChainId;
+const getNetworkClientIdByChainId = (messenger, chainId) => {
+    const hexChainId = (0, bridge_controller_1.formatChainIdToHex)(chainId);
+    return messenger.call('NetworkController:findNetworkClientIdByChainId', hexChainId);
+};
+exports.getNetworkClientIdByChainId = getNetworkClientIdByChainId;
+//# sourceMappingURL=network.cjs.map

package/dist/utils/network.cjs.map

@@ -0,0 +1 @@
+{"version":3,"file":"network.cjs","sourceRoot":"","sources":["../../src/utils/network.ts"],"names":[],"mappings":";;;AAAA,qEAAqE;AACrE,mEAGqC;AAI9B,MAAM,kBAAkB,GAAG,CAChC,SAA0C,EAC1C,EAAE;IACF,MAAM,EAAE,uBAAuB,EAAE,GAAG,SAAS,CAAC,IAAI,CAChD,4BAA4B,CAC7B,CAAC;IACF,MAAM,aAAa,GAAG,SAAS,CAAC,IAAI,CAClC,wCAAwC,EACxC,uBAAuB,CACxB,CAAC;IACF,OAAO,aAAa,CAAC,aAAa,CAAC,OAAO,CAAC;AAC7C,CAAC,CAAC;AAXW,QAAA,kBAAkB,sBAW7B;AAEK,MAAM,2BAA2B,GAAG,CACzC,SAA0C,EAC1C,OAA0C,EAC1C,EAAE;IACF,MAAM,UAAU,GAAG,IAAA,sCAAkB,EAAC,OAAO,CAAC,CAAC;IAC/C,OAAO,SAAS,CAAC,IAAI,CACnB,gDAAgD,EAChD,UAAU,CACX,CAAC;AACJ,CAAC,CAAC;AATW,QAAA,2BAA2B,+BAStC","sourcesContent":["/* eslint-disable @typescript-eslint/explicit-function-return-type */\nimport {\n  formatChainIdToHex,\n  GenericQuoteRequest,\n} from '@metamask/bridge-controller';\n\nimport { BridgeStatusControllerMessenger } from '../types';\n\nexport const getSelectedChainId = (\n  messenger: BridgeStatusControllerMessenger,\n) => {\n  const { selectedNetworkClientId } = messenger.call(\n    'NetworkController:getState',\n  );\n  const networkClient = messenger.call(\n    'NetworkController:getNetworkClientById',\n    selectedNetworkClientId,\n  );\n  return networkClient.configuration.chainId;\n};\n\nexport const getNetworkClientIdByChainId = (\n  messenger: BridgeStatusControllerMessenger,\n  chainId: GenericQuoteRequest['srcChainId'],\n) => {\n  const hexChainId = formatChainIdToHex(chainId);\n  return messenger.call(\n    'NetworkController:findNetworkClientIdByChainId',\n    hexChainId,\n  );\n};\n"]}

package/dist/utils/network.d.cts

@@ -0,0 +1,5 @@
+import { GenericQuoteRequest } from "@metamask/bridge-controller";
+import { BridgeStatusControllerMessenger } from "../types.cjs";
+export declare const getSelectedChainId: (messenger: BridgeStatusControllerMessenger) => `0x${string}`;
+export declare const getNetworkClientIdByChainId: (messenger: BridgeStatusControllerMessenger, chainId: GenericQuoteRequest['srcChainId']) => string;
+//# sourceMappingURL=network.d.cts.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"network.d.cts","sourceRoot":"","sources":["../../src/utils/network.ts"],"names":[],"mappings":"AACA,OAAO,EAEL,mBAAmB,EACpB,oCAAoC;AAErC,OAAO,EAAE,+BAA+B,EAAE,qBAAiB;AAE3D,eAAO,MAAM,kBAAkB,+DAW9B,CAAC;AAEF,eAAO,MAAM,2BAA2B,wDAE7B,mBAAmB,CAAC,YAAY,CAAC,WAO3C,CAAC"}

package/dist/utils/network.d.mts

@@ -0,0 +1,5 @@
+import { GenericQuoteRequest } from "@metamask/bridge-controller";
+import { BridgeStatusControllerMessenger } from "../types.mjs";
+export declare const getSelectedChainId: (messenger: BridgeStatusControllerMessenger) => `0x${string}`;
+export declare const getNetworkClientIdByChainId: (messenger: BridgeStatusControllerMessenger, chainId: GenericQuoteRequest['srcChainId']) => string;
+//# sourceMappingURL=network.d.mts.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"network.d.mts","sourceRoot":"","sources":["../../src/utils/network.ts"],"names":[],"mappings":"AACA,OAAO,EAEL,mBAAmB,EACpB,oCAAoC;AAErC,OAAO,EAAE,+BAA+B,EAAE,qBAAiB;AAE3D,eAAO,MAAM,kBAAkB,+DAW9B,CAAC;AAEF,eAAO,MAAM,2BAA2B,wDAE7B,mBAAmB,CAAC,YAAY,CAAC,WAO3C,CAAC"}

package/dist/utils/network.mjs

@@ -0,0 +1,12 @@
+/* eslint-disable @typescript-eslint/explicit-function-return-type */
+import { formatChainIdToHex } from "@metamask/bridge-controller";
+export const getSelectedChainId = (messenger) => {
+    const { selectedNetworkClientId } = messenger.call('NetworkController:getState');
+    const networkClient = messenger.call('NetworkController:getNetworkClientById', selectedNetworkClientId);
+    return networkClient.configuration.chainId;
+};
+export const getNetworkClientIdByChainId = (messenger, chainId) => {
+    const hexChainId = formatChainIdToHex(chainId);
+    return messenger.call('NetworkController:findNetworkClientIdByChainId', hexChainId);
+};
+//# sourceMappingURL=network.mjs.map

package/dist/utils/network.mjs.map

@@ -0,0 +1 @@
+{"version":3,"file":"network.mjs","sourceRoot":"","sources":["../../src/utils/network.ts"],"names":[],"mappings":"AAAA,qEAAqE;AACrE,OAAO,EACL,kBAAkB,EAEnB,oCAAoC;AAIrC,MAAM,CAAC,MAAM,kBAAkB,GAAG,CAChC,SAA0C,EAC1C,EAAE;IACF,MAAM,EAAE,uBAAuB,EAAE,GAAG,SAAS,CAAC,IAAI,CAChD,4BAA4B,CAC7B,CAAC;IACF,MAAM,aAAa,GAAG,SAAS,CAAC,IAAI,CAClC,wCAAwC,EACxC,uBAAuB,CACxB,CAAC;IACF,OAAO,aAAa,CAAC,aAAa,CAAC,OAAO,CAAC;AAC7C,CAAC,CAAC;AAEF,MAAM,CAAC,MAAM,2BAA2B,GAAG,CACzC,SAA0C,EAC1C,OAA0C,EAC1C,EAAE;IACF,MAAM,UAAU,GAAG,kBAAkB,CAAC,OAAO,CAAC,CAAC;IAC/C,OAAO,SAAS,CAAC,IAAI,CACnB,gDAAgD,EAChD,UAAU,CACX,CAAC;AACJ,CAAC,CAAC","sourcesContent":["/* eslint-disable @typescript-eslint/explicit-function-return-type */\nimport {\n  formatChainIdToHex,\n  GenericQuoteRequest,\n} from '@metamask/bridge-controller';\n\nimport { BridgeStatusControllerMessenger } from '../types';\n\nexport const getSelectedChainId = (\n  messenger: BridgeStatusControllerMessenger,\n) => {\n  const { selectedNetworkClientId } = messenger.call(\n    'NetworkController:getState',\n  );\n  const networkClient = messenger.call(\n    'NetworkController:getNetworkClientById',\n    selectedNetworkClientId,\n  );\n  return networkClient.configuration.chainId;\n};\n\nexport const getNetworkClientIdByChainId = (\n  messenger: BridgeStatusControllerMessenger,\n  chainId: GenericQuoteRequest['srcChainId'],\n) => {\n  const hexChainId = formatChainIdToHex(chainId);\n  return messenger.call(\n    'NetworkController:findNetworkClientIdByChainId',\n    hexChainId,\n  );\n};\n"]}

package/dist/utils/snaps.cjs

@@ -1,6 +1,8 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.createClientTransactionRequest = void 0;
+exports.handleNonEvmTx = exports.handleNonEvmTxResponse = exports.getTxMetaFields = exports.getClientRequest = exports.createClientTransactionRequest = void 0;
+const bridge_controller_1 = require("@metamask/bridge-controller");
+const transaction_controller_1 = require("@metamask/transaction-controller");
 const uuid_1 = require("uuid");
 /**
  * Creates a client request object for signing and sending a transaction
@@ -33,4 +35,147 @@ const createClientTransactionRequest = (snapId, transaction, scope, accountId, o
     };
 };
 exports.createClientTransactionRequest = createClientTransactionRequest;
+/**
+ * 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
+ */
+const getClientRequest = (trade, srcChainId, accountId, snapId) => {
+    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, exports.createClientTransactionRequest)(snapId, transactionData, scope, accountId, options);
+};
+exports.getClientRequest = getClientRequest;
+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 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
+ */
+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 = (0, bridge_controller_1.isCrossChain)(quoteResponse.quote.srcChainId, quoteResponse.quote.destChainId);
+    let hexChainId;
+    try {
+        hexChainId = (0, bridge_controller_1.formatChainIdToHex)(quoteResponse.quote.srcChainId);
+    }
+    catch {
+        hexChainId = '0x1';
+    }
+    // Extract the transaction data for storage
+    const tradeData = (0, bridge_controller_1.extractTradeData)(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 ?? 'mainnet',
+        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;
+/**
+ * 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
+ */
+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 = (0, exports.getClientRequest)(trade, quoteResponse.quote.srcChainId, selectedAccount.id, selectedAccount.metadata?.snap?.id);
+    const requestResponse = (await messenger.call('SnapController:handleRequest', request));
+    const txMeta = (0, exports.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;
+};
+exports.handleNonEvmTx = handleNonEvmTx;
 //# sourceMappingURL=snaps.cjs.map

package/dist/utils/snaps.cjs.map

@@ -1 +1 @@
-{"version":3,"file":"snaps.cjs","sourceRoot":"","sources":["../../src/utils/snaps.ts"],"names":[],"mappings":";;;AACA,+BAAkC;AAElC;;;;;;;;;;GAUG;AACI,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,IAAA,SAAI,GAAE;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;AAxBW,QAAA,8BAA8B,kCAwBzC","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.cjs","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/snaps.d.cts

@@ -1,4 +1,8 @@
+import type { AccountsControllerState } from "@metamask/accounts-controller";
+import type { QuoteMetadata, QuoteResponse, Trade } from "@metamask/bridge-controller";
+import type { TransactionMeta } from "@metamask/transaction-controller";
 import type { CaipChainId } from "@metamask/utils";
+import type { BridgeStatusControllerMessenger, SolanaTransactionMeta } from "../types.cjs";
 /**
  * Creates a client request object for signing and sending a transaction
  * Works for Solana, BTC, Tron, and other non-EVM networks
@@ -26,4 +30,62 @@ export declare const createClientTransactionRequest: (snapId: string, transactio
         };
     };
 };
+/**
+ * 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 declare const getClientRequest: (trade: Trade, srcChainId: number, accountId: string, snapId: string) => {
+    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;
+        };
+    };
+};
+export declare const getTxMetaFields: (quoteResponse: Omit<QuoteResponse<Trade, Trade>, '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 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 declare const handleNonEvmTxResponse: (snapResponse: string | {
+    transactionId: string;
+} | {
+    result: Record<string, string>;
+} | {
+    signature: string;
+}, trade: Trade, quoteResponse: Omit<QuoteResponse<Trade>, 'trade' | 'approval'> & QuoteMetadata, selectedAccount: AccountsControllerState['internalAccounts']['accounts'][string]) => TransactionMeta & SolanaTransactionMeta;
+/**
+ * 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 declare const handleNonEvmTx: (messenger: BridgeStatusControllerMessenger, trade: Trade, quoteResponse: QuoteResponse<Trade, Trade> & QuoteMetadata, selectedAccount: AccountsControllerState['internalAccounts']['accounts'][string]) => Promise<TransactionMeta>;
 //# sourceMappingURL=snaps.d.cts.map

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

@@ -1 +1 @@
-{"version":3,"file":"snaps.d.cts","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.cts","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.d.mts

@@ -1,4 +1,8 @@
+import type { AccountsControllerState } from "@metamask/accounts-controller";
+import type { QuoteMetadata, QuoteResponse, Trade } from "@metamask/bridge-controller";
+import type { TransactionMeta } from "@metamask/transaction-controller";
 import type { CaipChainId } from "@metamask/utils";
+import type { BridgeStatusControllerMessenger, SolanaTransactionMeta } from "../types.mjs";
 /**
  * Creates a client request object for signing and sending a transaction
  * Works for Solana, BTC, Tron, and other non-EVM networks
@@ -26,4 +30,62 @@ export declare const createClientTransactionRequest: (snapId: string, transactio
         };
     };
 };
+/**
+ * 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 declare const getClientRequest: (trade: Trade, srcChainId: number, accountId: string, snapId: string) => {
+    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;
+        };
+    };
+};
+export declare const getTxMetaFields: (quoteResponse: Omit<QuoteResponse<Trade, Trade>, '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 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 declare const handleNonEvmTxResponse: (snapResponse: string | {
+    transactionId: string;
+} | {
+    result: Record<string, string>;
+} | {
+    signature: string;
+}, trade: Trade, quoteResponse: Omit<QuoteResponse<Trade>, 'trade' | 'approval'> & QuoteMetadata, selectedAccount: AccountsControllerState['internalAccounts']['accounts'][string]) => TransactionMeta & SolanaTransactionMeta;
+/**
+ * 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 declare const handleNonEvmTx: (messenger: BridgeStatusControllerMessenger, trade: Trade, quoteResponse: QuoteResponse<Trade, Trade> & QuoteMetadata, selectedAccount: AccountsControllerState['internalAccounts']['accounts'][string]) => Promise<TransactionMeta>;
 //# sourceMappingURL=snaps.d.mts.map

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