@metamask-previews/bridge-status-controller 30.0.0-preview-ca9d0265 → 32.0.0-preview-c6e5eb7

package/dist/utils/transaction.mjs

@@ -42,7 +42,10 @@ export const handleSolanaTxResponse = (snapResponse, quoteResponse, selectedAcco
     }
     else if (snapResponse && typeof snapResponse === 'object') {
         // If it's an object with result property, try to get the signature
-        if (snapResponse.result && typeof snapResponse.result === 'object') {
+        if (typeof snapResponse === 'object' &&
+            'result' in snapResponse &&
+            snapResponse.result &&
+            typeof snapResponse.result === 'object') {
             // Try to extract signature from common locations in response object
             hash =
                 snapResponse.result.signature ||
@@ -50,6 +53,12 @@ export const handleSolanaTxResponse = (snapResponse, quoteResponse, selectedAcco
                     snapResponse.result.hash ||
                     snapResponse.result.txHash;
         }
+        if (typeof snapResponse === 'object' &&
+            'signature' in snapResponse &&
+            snapResponse.signature &&
+            typeof snapResponse.signature === 'string') {
+            hash = snapResponse.signature;
+        }
     }
     const hexChainId = formatChainIdToHex(quoteResponse.quote.srcChainId);
     const isBridgeTx = isCrossChain(quoteResponse.quote.srcChainId, quoteResponse.quote.destChainId);

package/dist/utils/transaction.mjs.map

@@ -1 +1 @@
-{"version":3,"file":"transaction.mjs","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  isCrossChain,\n  type QuoteMetadata,\n  type QuoteResponse,\n} from '@metamask/bridge-controller';\nimport { SolScope } from '@metamask/keyring-api';\nimport {\n  TransactionStatus,\n  TransactionType,\n  type TransactionMeta,\n} from '@metamask/transaction-controller';\nimport { createProjectLogger } from '@metamask/utils';\nimport { v4 as uuid } from 'uuid';\n\nimport { LINEA_DELAY_MS } from '../constants';\nimport type { SolanaTransactionMeta } from '../types';\n\nexport const generateActionId = () => (Date.now() + Math.random()).toString();\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: string | { result: Record<string, 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 (snapResponse.result && typeof snapResponse.result === 'object') {\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  }\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: 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\nexport const getKeyringRequest = (\n  quoteResponse: Omit<QuoteResponse<string>, 'approval'> & QuoteMetadata,\n  selectedAccount: AccountsControllerState['internalAccounts']['accounts'][string],\n) => {\n  const keyringReqId = uuid();\n  const snapRequestId = uuid();\n\n  return {\n    origin: 'metamask',\n    snapId: selectedAccount.metadata.snap?.id as never,\n    handler: 'onKeyringRequest' as never,\n    request: {\n      id: keyringReqId,\n      jsonrpc: '2.0',\n      method: 'keyring_submitRequest',\n      params: {\n        request: {\n          params: {\n            account: { address: selectedAccount.address },\n            transaction: quoteResponse.trade,\n            scope: SolScope.Mainnet,\n          },\n          method: 'signAndSendTransaction',\n        },\n        id: snapRequestId,\n        account: selectedAccount.id,\n        scope: SolScope.Mainnet,\n      },\n    },\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"]}
+{"version":3,"file":"transaction.mjs","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  isCrossChain,\n  type QuoteMetadata,\n  type QuoteResponse,\n} from '@metamask/bridge-controller';\nimport { SolScope } from '@metamask/keyring-api';\nimport {\n  TransactionStatus,\n  TransactionType,\n  type TransactionMeta,\n} from '@metamask/transaction-controller';\nimport { createProjectLogger } from '@metamask/utils';\nimport { v4 as uuid } from 'uuid';\n\nimport { LINEA_DELAY_MS } from '../constants';\nimport type { SolanaTransactionMeta } from '../types';\n\nexport const generateActionId = () => (Date.now() + Math.random()).toString();\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: 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\nexport const getKeyringRequest = (\n  quoteResponse: Omit<QuoteResponse<string>, 'approval'> & QuoteMetadata,\n  selectedAccount: AccountsControllerState['internalAccounts']['accounts'][string],\n) => {\n  const keyringReqId = uuid();\n  const snapRequestId = uuid();\n\n  return {\n    origin: 'metamask',\n    snapId: selectedAccount.metadata.snap?.id as never,\n    handler: 'onKeyringRequest' as never,\n    request: {\n      id: keyringReqId,\n      jsonrpc: '2.0',\n      method: 'keyring_submitRequest',\n      params: {\n        request: {\n          params: {\n            account: { address: selectedAccount.address },\n            transaction: quoteResponse.trade,\n            scope: SolScope.Mainnet,\n          },\n          method: 'signAndSendTransaction',\n        },\n        id: snapRequestId,\n        account: selectedAccount.id,\n        scope: SolScope.Mainnet,\n      },\n    },\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"]}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@metamask-previews/bridge-status-controller",
-  "version": "30.0.0-preview-ca9d0265",
+  "version": "32.0.0-preview-c6e5eb7",
   "description": "Manages bridge-related status fetching functionality for MetaMask",
   "keywords": [
     "MetaMask",
@@ -50,22 +50,21 @@
     "@metamask/base-controller": "^8.0.1",
     "@metamask/controller-utils": "^11.10.0",
     "@metamask/keyring-api": "^18.0.0",
-    "@metamask/polling-controller": "^13.0.0",
+    "@metamask/polling-controller": "^14.0.0",
     "@metamask/superstruct": "^3.1.0",
-    "@metamask/user-operation-controller": "^36.0.0",
+    "@metamask/user-operation-controller": "^37.0.0",
     "@metamask/utils": "^11.2.0",
     "bignumber.js": "^9.1.2",
     "uuid": "^8.3.2"
   },
   "devDependencies": {
-    "@metamask/accounts-controller": "^30.0.0",
+    "@metamask/accounts-controller": "^31.0.0",
     "@metamask/auto-changelog": "^3.4.4",
-    "@metamask/bridge-controller": "^32.2.0",
-    "@metamask/gas-fee-controller": "^23.0.0",
-    "@metamask/multichain-transactions-controller": "^2.0.0",
-    "@metamask/network-controller": "^23.6.0",
+    "@metamask/bridge-controller": "^33.0.1",
+    "@metamask/gas-fee-controller": "^24.0.0",
+    "@metamask/network-controller": "^24.0.0",
     "@metamask/snaps-controllers": "^12.3.1",
-    "@metamask/transaction-controller": "^57.3.0",
+    "@metamask/transaction-controller": "^58.0.0",
     "@types/jest": "^27.4.1",
     "deepmerge": "^4.2.2",
     "jest": "^27.5.1",
@@ -78,13 +77,12 @@
     "typescript": "~5.2.2"
   },
   "peerDependencies": {
-    "@metamask/accounts-controller": "^30.0.0",
-    "@metamask/bridge-controller": "^32.0.0",
-    "@metamask/gas-fee-controller": "^23.0.0",
-    "@metamask/multichain-transactions-controller": "^2.0.0",
-    "@metamask/network-controller": "^23.0.0",
+    "@metamask/accounts-controller": "^31.0.0",
+    "@metamask/bridge-controller": "^33.0.0",
+    "@metamask/gas-fee-controller": "^24.0.0",
+    "@metamask/network-controller": "^24.0.0",
     "@metamask/snaps-controllers": "^12.0.0",
-    "@metamask/transaction-controller": "^57.0.0"
+    "@metamask/transaction-controller": "^58.0.0"
   },
   "engines": {
     "node": "^18.18 || >=20"