@metamask/transaction-pay-controller 4.0.0 → 5.0.0

package/dist/strategy/relay/relay-submit.cjs

@@ -7,6 +7,7 @@ const utils_1 = require("@metamask/utils");
 const constants_1 = require("./constants.cjs");
 const logger_1 = require("../../logger.cjs");
 const transaction_1 = require("../../utils/transaction.cjs");
+const FALLBACK_HASH = '0x0';
 const log = (0, utils_1.createModuleLogger)(logger_1.projectLogger, 'relay-strategy');
 /**
  * Submits Relay quotes.
@@ -21,12 +22,7 @@ async function submitRelayQuotes(request) {
     for (const quote of quotes) {
         ({ transactionHash } = await executeSingleQuote(quote.original, messenger, transaction));
     }
-    const isSkipTransaction = quotes.some((q) => q.original.skipTransaction);
-    if (isSkipTransaction) {
-        log('Skipping original transaction', transactionHash);
-        return { transactionHash };
-    }
-    return { transactionHash: undefined };
+    return { transactionHash };
 }
 exports.submitRelayQuotes = submitRelayQuotes;
 /**
@@ -46,29 +42,24 @@ async function executeSingleQuote(quote, messenger, transaction) {
     const transactionParams = quote.steps[0].items[0].data;
     const chainId = (0, controller_utils_1.toHex)(transactionParams.chainId);
     const from = transactionParams.from;
-    if (quote.skipTransaction) {
-        (0, transaction_1.updateTransaction)({
-            transactionId: transaction.id,
-            messenger,
-            note: 'Remove nonce from skipped transaction',
-        }, (tx) => {
-            tx.txParams.nonce = undefined;
-        });
-    }
-    const transactionHash = await submitTransactions(quote, chainId, from, transaction.id, messenger);
-    await waitForRelayCompletion(quote);
-    log('Relay request completed');
-    if (quote.skipTransaction) {
-        log('Updating intent complete flag on transaction', transaction.id);
-        (0, transaction_1.updateTransaction)({
-            transactionId: transaction.id,
-            messenger,
-            note: 'Intent complete after Relay completion',
-        }, (tx) => {
-            tx.isIntentComplete = true;
-        });
-    }
-    return { transactionHash };
+    (0, transaction_1.updateTransaction)({
+        transactionId: transaction.id,
+        messenger,
+        note: 'Remove nonce from skipped transaction',
+    }, (tx) => {
+        tx.txParams.nonce = undefined;
+    });
+    await submitTransactions(quote, chainId, from, transaction.id, messenger);
+    const targetHash = await waitForRelayCompletion(quote);
+    log('Relay request completed', targetHash);
+    (0, transaction_1.updateTransaction)({
+        transactionId: transaction.id,
+        messenger,
+        note: 'Intent complete after Relay completion',
+    }, (tx) => {
+        tx.isIntentComplete = true;
+    });
+    return { transactionHash: targetHash };
 }
 /**
  * Wait for a Relay request to complete.
@@ -77,6 +68,11 @@ async function executeSingleQuote(quote, messenger, transaction) {
  * @returns A promise that resolves when the Relay request is complete.
  */
 async function waitForRelayCompletion(quote) {
+    if (quote.details.currencyIn.currency.chainId ===
+        quote.details.currencyOut.currency.chainId) {
+        log('Skipping polling as same chain');
+        return FALLBACK_HASH;
+    }
     const { endpoint, method } = quote.steps
         .slice(-1)[0]
         .items.slice(-1)[0].check;
@@ -86,12 +82,13 @@ async function waitForRelayCompletion(quote) {
         const status = (await response.json());
         log('Polled status', status.status, status);
         if (status.status === 'success') {
-            return;
+            const targetHash = status.txHashes?.slice(-1)[0];
+            return targetHash ?? FALLBACK_HASH;
         }
-        if (['failure', 'refund'].includes(status.status)) {
+        if (['failure', 'refund', 'fallback'].includes(status.status)) {
             throw new Error(`Relay request failed with status: ${status.status}`);
         }
-        await new Promise((resolve) => setTimeout(resolve, 1000));
+        await new Promise((resolve) => setTimeout(resolve, constants_1.RELAY_POLLING_INTERVAL));
     }
 }
 /**

package/dist/strategy/relay/relay-submit.cjs.map

@@ -1 +1 @@
-{"version":3,"file":"relay-submit.cjs","sourceRoot":"","sources":["../../../src/strategy/relay/relay-submit.ts"],"names":[],"mappings":"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","sourcesContent":["import {\n  ORIGIN_METAMASK,\n  successfulFetch,\n  toHex,\n} from '@metamask/controller-utils';\nimport {\n  TransactionType,\n  type TransactionParams,\n} from '@metamask/transaction-controller';\nimport type { TransactionMeta } from '@metamask/transaction-controller';\nimport type { Hex } from '@metamask/utils';\nimport { createModuleLogger } from '@metamask/utils';\n\nimport { RELAY_FALLBACK_GAS_LIMIT, RELAY_URL_BASE } from './constants';\nimport type { RelayQuote, RelayStatus } from './types';\nimport { projectLogger } from '../../logger';\nimport type {\n  PayStrategyExecuteRequest,\n  TransactionPayControllerMessenger,\n} from '../../types';\nimport {\n  collectTransactionIds,\n  getTransaction,\n  updateTransaction,\n  waitForTransactionConfirmed,\n} from '../../utils/transaction';\n\nconst log = createModuleLogger(projectLogger, 'relay-strategy');\n\n/**\n * Submits Relay quotes.\n *\n * @param request - Request object.\n * @returns An object containing the transaction hash if available.\n */\nexport async function submitRelayQuotes(\n  request: PayStrategyExecuteRequest<RelayQuote>,\n): Promise<{ transactionHash?: Hex }> {\n  log('Executing quotes', request);\n\n  const { quotes, messenger, transaction } = request;\n\n  let transactionHash: Hex | undefined;\n\n  for (const quote of quotes) {\n    ({ transactionHash } = await executeSingleQuote(\n      quote.original,\n      messenger,\n      transaction,\n    ));\n  }\n\n  const isSkipTransaction = quotes.some((q) => q.original.skipTransaction);\n\n  if (isSkipTransaction) {\n    log('Skipping original transaction', transactionHash);\n    return { transactionHash };\n  }\n\n  return { transactionHash: undefined };\n}\n\n/**\n * Executes a single Relay quote.\n *\n * @param quote - Relay quote to execute.\n * @param messenger - Controller messenger.\n * @param transaction - Original transaction meta.\n * @returns An object containing the transaction hash if available.\n */\nasync function executeSingleQuote(\n  quote: RelayQuote,\n  messenger: TransactionPayControllerMessenger,\n  transaction: TransactionMeta,\n) {\n  log('Executing single quote', quote);\n\n  const { kind } = quote.steps[0];\n\n  if (kind !== 'transaction') {\n    throw new Error(`Unsupported step kind: ${kind as string}`);\n  }\n\n  const transactionParams = quote.steps[0].items[0].data;\n  const chainId = toHex(transactionParams.chainId);\n  const from = transactionParams.from as Hex;\n\n  if (quote.skipTransaction) {\n    updateTransaction(\n      {\n        transactionId: transaction.id,\n        messenger,\n        note: 'Remove nonce from skipped transaction',\n      },\n      (tx) => {\n        tx.txParams.nonce = undefined;\n      },\n    );\n  }\n\n  const transactionHash = await submitTransactions(\n    quote,\n    chainId,\n    from,\n    transaction.id,\n    messenger,\n  );\n\n  await waitForRelayCompletion(quote);\n\n  log('Relay request completed');\n\n  if (quote.skipTransaction) {\n    log('Updating intent complete flag on transaction', transaction.id);\n\n    updateTransaction(\n      {\n        transactionId: transaction.id,\n        messenger,\n        note: 'Intent complete after Relay completion',\n      },\n      (tx) => {\n        tx.isIntentComplete = true;\n      },\n    );\n  }\n\n  return { transactionHash };\n}\n\n/**\n * Wait for a Relay request to complete.\n *\n * @param quote - Relay quote associated with the request.\n * @returns A promise that resolves when the Relay request is complete.\n */\nasync function waitForRelayCompletion(quote: RelayQuote) {\n  const { endpoint, method } = quote.steps\n    .slice(-1)[0]\n    .items.slice(-1)[0].check;\n\n  const url = `${RELAY_URL_BASE}${endpoint}`;\n\n  while (true) {\n    const response = await successfulFetch(url, { method });\n    const status = (await response.json()) as RelayStatus;\n\n    log('Polled status', status.status, status);\n\n    if (status.status === 'success') {\n      return;\n    }\n\n    if (['failure', 'refund'].includes(status.status)) {\n      throw new Error(`Relay request failed with status: ${status.status}`);\n    }\n\n    await new Promise((resolve) => setTimeout(resolve, 1000));\n  }\n}\n\n/**\n * Normalize the parameters from a relay quote step to match TransactionParams.\n *\n * @param params - Parameters from a relay quote step.\n * @returns Normalized transaction parameters.\n */\nfunction normalizeParams(\n  params: RelayQuote['steps'][0]['items'][0]['data'],\n): TransactionParams {\n  return {\n    data: params.data,\n    from: params.from,\n    gas: toHex(params.gas ?? RELAY_FALLBACK_GAS_LIMIT),\n    maxFeePerGas: toHex(params.maxFeePerGas),\n    maxPriorityFeePerGas: toHex(params.maxPriorityFeePerGas),\n    to: params.to,\n    value: toHex(params.value ?? '0'),\n  };\n}\n\n/**\n * Submit transactions for a relay quote.\n *\n * @param quote - Relay quote.\n * @param chainId - ID of the chain.\n * @param from - Address of the sender.\n * @param parentTransactionId - ID of the parent transaction.\n * @param messenger - Controller messenger.\n * @returns Hash of the last submitted transaction.\n */\nasync function submitTransactions(\n  quote: RelayQuote,\n  chainId: Hex,\n  from: Hex,\n  parentTransactionId: string,\n  messenger: TransactionPayControllerMessenger,\n): Promise<Hex> {\n  const params = quote.steps.flatMap((s) => s.items).map((i) => i.data);\n  const normalizedParams = params.map(normalizeParams);\n  const transactionIds: string[] = [];\n\n  const networkClientId = messenger.call(\n    'NetworkController:findNetworkClientIdByChainId',\n    chainId,\n  );\n\n  log('Adding transactions', {\n    normalizedParams,\n    chainId,\n    from,\n    networkClientId,\n  });\n\n  const { end } = collectTransactionIds(\n    chainId,\n    from,\n    messenger,\n    (transactionId) => {\n      transactionIds.push(transactionId);\n\n      updateTransaction(\n        {\n          transactionId: parentTransactionId,\n          messenger,\n          note: 'Add required transaction ID from Relay submission',\n        },\n        (tx) => {\n          if (!tx.requiredTransactionIds) {\n            tx.requiredTransactionIds = [];\n          }\n\n          tx.requiredTransactionIds.push(transactionId);\n        },\n      );\n    },\n  );\n\n  let result: { result: Promise<string> } | undefined;\n\n  if (params.length === 1) {\n    result = await messenger.call(\n      'TransactionController:addTransaction',\n      normalizedParams[0],\n      {\n        networkClientId,\n        origin: ORIGIN_METAMASK,\n        requireApproval: false,\n      },\n    );\n  } else {\n    await messenger.call('TransactionController:addTransactionBatch', {\n      from,\n      networkClientId,\n      origin: ORIGIN_METAMASK,\n      requireApproval: false,\n      transactions: normalizedParams.map((p, i) => ({\n        params: {\n          data: p.data as Hex,\n          gas: p.gas as Hex,\n          to: p.to as Hex,\n          value: p.value as Hex,\n        },\n        type: i === 0 ? TransactionType.tokenMethodApprove : undefined,\n      })),\n    });\n  }\n\n  end();\n\n  log('Added transactions', transactionIds);\n\n  if (result) {\n    const txHash = await result.result;\n    log('Submitted transaction', txHash);\n  }\n\n  await Promise.all(\n    transactionIds.map((txId) => waitForTransactionConfirmed(txId, messenger)),\n  );\n\n  log('All transactions confirmed', transactionIds);\n\n  const hash = getTransaction(transactionIds.slice(-1)[0], messenger)?.hash;\n\n  return hash as Hex;\n}\n"]}
+{"version":3,"file":"relay-submit.cjs","sourceRoot":"","sources":["../../../src/strategy/relay/relay-submit.ts"],"names":[],"mappings":"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","sourcesContent":["import {\n  ORIGIN_METAMASK,\n  successfulFetch,\n  toHex,\n} from '@metamask/controller-utils';\nimport {\n  TransactionType,\n  type TransactionParams,\n} from '@metamask/transaction-controller';\nimport type { TransactionMeta } from '@metamask/transaction-controller';\nimport type { Hex } from '@metamask/utils';\nimport { createModuleLogger } from '@metamask/utils';\n\nimport {\n  RELAY_FALLBACK_GAS_LIMIT,\n  RELAY_POLLING_INTERVAL,\n  RELAY_URL_BASE,\n} from './constants';\nimport type { RelayQuote, RelayStatus } from './types';\nimport { projectLogger } from '../../logger';\nimport type {\n  PayStrategyExecuteRequest,\n  TransactionPayControllerMessenger,\n} from '../../types';\nimport {\n  collectTransactionIds,\n  getTransaction,\n  updateTransaction,\n  waitForTransactionConfirmed,\n} from '../../utils/transaction';\n\nconst FALLBACK_HASH = '0x0' as Hex;\n\nconst log = createModuleLogger(projectLogger, 'relay-strategy');\n\n/**\n * Submits Relay quotes.\n *\n * @param request - Request object.\n * @returns An object containing the transaction hash if available.\n */\nexport async function submitRelayQuotes(\n  request: PayStrategyExecuteRequest<RelayQuote>,\n): Promise<{ transactionHash?: Hex }> {\n  log('Executing quotes', request);\n\n  const { quotes, messenger, transaction } = request;\n\n  let transactionHash: Hex | undefined;\n\n  for (const quote of quotes) {\n    ({ transactionHash } = await executeSingleQuote(\n      quote.original,\n      messenger,\n      transaction,\n    ));\n  }\n\n  return { transactionHash };\n}\n\n/**\n * Executes a single Relay quote.\n *\n * @param quote - Relay quote to execute.\n * @param messenger - Controller messenger.\n * @param transaction - Original transaction meta.\n * @returns An object containing the transaction hash if available.\n */\nasync function executeSingleQuote(\n  quote: RelayQuote,\n  messenger: TransactionPayControllerMessenger,\n  transaction: TransactionMeta,\n) {\n  log('Executing single quote', quote);\n\n  const { kind } = quote.steps[0];\n\n  if (kind !== 'transaction') {\n    throw new Error(`Unsupported step kind: ${kind as string}`);\n  }\n\n  const transactionParams = quote.steps[0].items[0].data;\n  const chainId = toHex(transactionParams.chainId);\n  const from = transactionParams.from as Hex;\n\n  updateTransaction(\n    {\n      transactionId: transaction.id,\n      messenger,\n      note: 'Remove nonce from skipped transaction',\n    },\n    (tx) => {\n      tx.txParams.nonce = undefined;\n    },\n  );\n\n  await submitTransactions(quote, chainId, from, transaction.id, messenger);\n\n  const targetHash = await waitForRelayCompletion(quote);\n\n  log('Relay request completed', targetHash);\n\n  updateTransaction(\n    {\n      transactionId: transaction.id,\n      messenger,\n      note: 'Intent complete after Relay completion',\n    },\n    (tx) => {\n      tx.isIntentComplete = true;\n    },\n  );\n\n  return { transactionHash: targetHash };\n}\n\n/**\n * Wait for a Relay request to complete.\n *\n * @param quote - Relay quote associated with the request.\n * @returns A promise that resolves when the Relay request is complete.\n */\nasync function waitForRelayCompletion(quote: RelayQuote): Promise<Hex> {\n  if (\n    quote.details.currencyIn.currency.chainId ===\n    quote.details.currencyOut.currency.chainId\n  ) {\n    log('Skipping polling as same chain');\n    return FALLBACK_HASH;\n  }\n\n  const { endpoint, method } = quote.steps\n    .slice(-1)[0]\n    .items.slice(-1)[0].check;\n\n  const url = `${RELAY_URL_BASE}${endpoint}`;\n\n  while (true) {\n    const response = await successfulFetch(url, { method });\n    const status = (await response.json()) as RelayStatus;\n\n    log('Polled status', status.status, status);\n\n    if (status.status === 'success') {\n      const targetHash = status.txHashes?.slice(-1)[0] as Hex;\n      return targetHash ?? FALLBACK_HASH;\n    }\n\n    if (['failure', 'refund', 'fallback'].includes(status.status)) {\n      throw new Error(`Relay request failed with status: ${status.status}`);\n    }\n\n    await new Promise((resolve) => setTimeout(resolve, RELAY_POLLING_INTERVAL));\n  }\n}\n\n/**\n * Normalize the parameters from a relay quote step to match TransactionParams.\n *\n * @param params - Parameters from a relay quote step.\n * @returns Normalized transaction parameters.\n */\nfunction normalizeParams(\n  params: RelayQuote['steps'][0]['items'][0]['data'],\n): TransactionParams {\n  return {\n    data: params.data,\n    from: params.from,\n    gas: toHex(params.gas ?? RELAY_FALLBACK_GAS_LIMIT),\n    maxFeePerGas: toHex(params.maxFeePerGas),\n    maxPriorityFeePerGas: toHex(params.maxPriorityFeePerGas),\n    to: params.to,\n    value: toHex(params.value ?? '0'),\n  };\n}\n\n/**\n * Submit transactions for a relay quote.\n *\n * @param quote - Relay quote.\n * @param chainId - ID of the chain.\n * @param from - Address of the sender.\n * @param parentTransactionId - ID of the parent transaction.\n * @param messenger - Controller messenger.\n * @returns Hash of the last submitted transaction.\n */\nasync function submitTransactions(\n  quote: RelayQuote,\n  chainId: Hex,\n  from: Hex,\n  parentTransactionId: string,\n  messenger: TransactionPayControllerMessenger,\n): Promise<Hex> {\n  const params = quote.steps.flatMap((s) => s.items).map((i) => i.data);\n  const normalizedParams = params.map(normalizeParams);\n  const transactionIds: string[] = [];\n\n  const networkClientId = messenger.call(\n    'NetworkController:findNetworkClientIdByChainId',\n    chainId,\n  );\n\n  log('Adding transactions', {\n    normalizedParams,\n    chainId,\n    from,\n    networkClientId,\n  });\n\n  const { end } = collectTransactionIds(\n    chainId,\n    from,\n    messenger,\n    (transactionId) => {\n      transactionIds.push(transactionId);\n\n      updateTransaction(\n        {\n          transactionId: parentTransactionId,\n          messenger,\n          note: 'Add required transaction ID from Relay submission',\n        },\n        (tx) => {\n          if (!tx.requiredTransactionIds) {\n            tx.requiredTransactionIds = [];\n          }\n\n          tx.requiredTransactionIds.push(transactionId);\n        },\n      );\n    },\n  );\n\n  let result: { result: Promise<string> } | undefined;\n\n  if (params.length === 1) {\n    result = await messenger.call(\n      'TransactionController:addTransaction',\n      normalizedParams[0],\n      {\n        networkClientId,\n        origin: ORIGIN_METAMASK,\n        requireApproval: false,\n      },\n    );\n  } else {\n    await messenger.call('TransactionController:addTransactionBatch', {\n      from,\n      networkClientId,\n      origin: ORIGIN_METAMASK,\n      requireApproval: false,\n      transactions: normalizedParams.map((p, i) => ({\n        params: {\n          data: p.data as Hex,\n          gas: p.gas as Hex,\n          to: p.to as Hex,\n          value: p.value as Hex,\n        },\n        type: i === 0 ? TransactionType.tokenMethodApprove : undefined,\n      })),\n    });\n  }\n\n  end();\n\n  log('Added transactions', transactionIds);\n\n  if (result) {\n    const txHash = await result.result;\n    log('Submitted transaction', txHash);\n  }\n\n  await Promise.all(\n    transactionIds.map((txId) => waitForTransactionConfirmed(txId, messenger)),\n  );\n\n  log('All transactions confirmed', transactionIds);\n\n  const hash = getTransaction(transactionIds.slice(-1)[0], messenger)?.hash;\n\n  return hash as Hex;\n}\n"]}

package/dist/strategy/relay/relay-submit.d.cts.map

@@ -1 +1 @@
-{"version":3,"file":"relay-submit.d.cts","sourceRoot":"","sources":["../../../src/strategy/relay/relay-submit.ts"],"names":[],"mappings":"AAUA,OAAO,KAAK,EAAE,GAAG,EAAE,wBAAwB;AAI3C,OAAO,KAAK,EAAE,UAAU,EAAe,oBAAgB;AAEvD,OAAO,KAAK,EACV,yBAAyB,EAE1B,wBAAoB;AAUrB;;;;;GAKG;AACH,wBAAsB,iBAAiB,CACrC,OAAO,EAAE,yBAAyB,CAAC,UAAU,CAAC,GAC7C,OAAO,CAAC;IAAE,eAAe,CAAC,EAAE,GAAG,CAAA;CAAE,CAAC,CAuBpC"}
+{"version":3,"file":"relay-submit.d.cts","sourceRoot":"","sources":["../../../src/strategy/relay/relay-submit.ts"],"names":[],"mappings":"AAUA,OAAO,KAAK,EAAE,GAAG,EAAE,wBAAwB;AAQ3C,OAAO,KAAK,EAAE,UAAU,EAAe,oBAAgB;AAEvD,OAAO,KAAK,EACV,yBAAyB,EAE1B,wBAAoB;AAYrB;;;;;GAKG;AACH,wBAAsB,iBAAiB,CACrC,OAAO,EAAE,yBAAyB,CAAC,UAAU,CAAC,GAC7C,OAAO,CAAC;IAAE,eAAe,CAAC,EAAE,GAAG,CAAA;CAAE,CAAC,CAgBpC"}

package/dist/strategy/relay/relay-submit.d.mts.map

@@ -1 +1 @@
-{"version":3,"file":"relay-submit.d.mts","sourceRoot":"","sources":["../../../src/strategy/relay/relay-submit.ts"],"names":[],"mappings":"AAUA,OAAO,KAAK,EAAE,GAAG,EAAE,wBAAwB;AAI3C,OAAO,KAAK,EAAE,UAAU,EAAe,oBAAgB;AAEvD,OAAO,KAAK,EACV,yBAAyB,EAE1B,wBAAoB;AAUrB;;;;;GAKG;AACH,wBAAsB,iBAAiB,CACrC,OAAO,EAAE,yBAAyB,CAAC,UAAU,CAAC,GAC7C,OAAO,CAAC;IAAE,eAAe,CAAC,EAAE,GAAG,CAAA;CAAE,CAAC,CAuBpC"}
+{"version":3,"file":"relay-submit.d.mts","sourceRoot":"","sources":["../../../src/strategy/relay/relay-submit.ts"],"names":[],"mappings":"AAUA,OAAO,KAAK,EAAE,GAAG,EAAE,wBAAwB;AAQ3C,OAAO,KAAK,EAAE,UAAU,EAAe,oBAAgB;AAEvD,OAAO,KAAK,EACV,yBAAyB,EAE1B,wBAAoB;AAYrB;;;;;GAKG;AACH,wBAAsB,iBAAiB,CACrC,OAAO,EAAE,yBAAyB,CAAC,UAAU,CAAC,GAC7C,OAAO,CAAC;IAAE,eAAe,CAAC,EAAE,GAAG,CAAA;CAAE,CAAC,CAgBpC"}

package/dist/strategy/relay/relay-submit.mjs

@@ -1,9 +1,10 @@
 import { ORIGIN_METAMASK, successfulFetch, toHex } from "@metamask/controller-utils";
 import { TransactionType } from "@metamask/transaction-controller";
 import { createModuleLogger } from "@metamask/utils";
-import { RELAY_FALLBACK_GAS_LIMIT, RELAY_URL_BASE } from "./constants.mjs";
+import { RELAY_FALLBACK_GAS_LIMIT, RELAY_POLLING_INTERVAL, RELAY_URL_BASE } from "./constants.mjs";
 import { projectLogger } from "../../logger.mjs";
 import { collectTransactionIds, getTransaction, updateTransaction, waitForTransactionConfirmed } from "../../utils/transaction.mjs";
+const FALLBACK_HASH = '0x0';
 const log = createModuleLogger(projectLogger, 'relay-strategy');
 /**
  * Submits Relay quotes.
@@ -18,12 +19,7 @@ export async function submitRelayQuotes(request) {
     for (const quote of quotes) {
         ({ transactionHash } = await executeSingleQuote(quote.original, messenger, transaction));
     }
-    const isSkipTransaction = quotes.some((q) => q.original.skipTransaction);
-    if (isSkipTransaction) {
-        log('Skipping original transaction', transactionHash);
-        return { transactionHash };
-    }
-    return { transactionHash: undefined };
+    return { transactionHash };
 }
 /**
  * Executes a single Relay quote.
@@ -42,29 +38,24 @@ async function executeSingleQuote(quote, messenger, transaction) {
     const transactionParams = quote.steps[0].items[0].data;
     const chainId = toHex(transactionParams.chainId);
     const from = transactionParams.from;
-    if (quote.skipTransaction) {
-        updateTransaction({
-            transactionId: transaction.id,
-            messenger,
-            note: 'Remove nonce from skipped transaction',
-        }, (tx) => {
-            tx.txParams.nonce = undefined;
-        });
-    }
-    const transactionHash = await submitTransactions(quote, chainId, from, transaction.id, messenger);
-    await waitForRelayCompletion(quote);
-    log('Relay request completed');
-    if (quote.skipTransaction) {
-        log('Updating intent complete flag on transaction', transaction.id);
-        updateTransaction({
-            transactionId: transaction.id,
-            messenger,
-            note: 'Intent complete after Relay completion',
-        }, (tx) => {
-            tx.isIntentComplete = true;
-        });
-    }
-    return { transactionHash };
+    updateTransaction({
+        transactionId: transaction.id,
+        messenger,
+        note: 'Remove nonce from skipped transaction',
+    }, (tx) => {
+        tx.txParams.nonce = undefined;
+    });
+    await submitTransactions(quote, chainId, from, transaction.id, messenger);
+    const targetHash = await waitForRelayCompletion(quote);
+    log('Relay request completed', targetHash);
+    updateTransaction({
+        transactionId: transaction.id,
+        messenger,
+        note: 'Intent complete after Relay completion',
+    }, (tx) => {
+        tx.isIntentComplete = true;
+    });
+    return { transactionHash: targetHash };
 }
 /**
  * Wait for a Relay request to complete.
@@ -73,6 +64,11 @@ async function executeSingleQuote(quote, messenger, transaction) {
  * @returns A promise that resolves when the Relay request is complete.
  */
 async function waitForRelayCompletion(quote) {
+    if (quote.details.currencyIn.currency.chainId ===
+        quote.details.currencyOut.currency.chainId) {
+        log('Skipping polling as same chain');
+        return FALLBACK_HASH;
+    }
     const { endpoint, method } = quote.steps
         .slice(-1)[0]
         .items.slice(-1)[0].check;
@@ -82,12 +78,13 @@ async function waitForRelayCompletion(quote) {
         const status = (await response.json());
         log('Polled status', status.status, status);
         if (status.status === 'success') {
-            return;
+            const targetHash = status.txHashes?.slice(-1)[0];
+            return targetHash ?? FALLBACK_HASH;
         }
-        if (['failure', 'refund'].includes(status.status)) {
+        if (['failure', 'refund', 'fallback'].includes(status.status)) {
             throw new Error(`Relay request failed with status: ${status.status}`);
         }
-        await new Promise((resolve) => setTimeout(resolve, 1000));
+        await new Promise((resolve) => setTimeout(resolve, RELAY_POLLING_INTERVAL));
     }
 }
 /**

package/dist/strategy/relay/relay-submit.mjs.map

@@ -1 +1 @@
-{"version":3,"file":"relay-submit.mjs","sourceRoot":"","sources":["../../../src/strategy/relay/relay-submit.ts"],"names":[],"mappings":"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","sourcesContent":["import {\n  ORIGIN_METAMASK,\n  successfulFetch,\n  toHex,\n} from '@metamask/controller-utils';\nimport {\n  TransactionType,\n  type TransactionParams,\n} from '@metamask/transaction-controller';\nimport type { TransactionMeta } from '@metamask/transaction-controller';\nimport type { Hex } from '@metamask/utils';\nimport { createModuleLogger } from '@metamask/utils';\n\nimport { RELAY_FALLBACK_GAS_LIMIT, RELAY_URL_BASE } from './constants';\nimport type { RelayQuote, RelayStatus } from './types';\nimport { projectLogger } from '../../logger';\nimport type {\n  PayStrategyExecuteRequest,\n  TransactionPayControllerMessenger,\n} from '../../types';\nimport {\n  collectTransactionIds,\n  getTransaction,\n  updateTransaction,\n  waitForTransactionConfirmed,\n} from '../../utils/transaction';\n\nconst log = createModuleLogger(projectLogger, 'relay-strategy');\n\n/**\n * Submits Relay quotes.\n *\n * @param request - Request object.\n * @returns An object containing the transaction hash if available.\n */\nexport async function submitRelayQuotes(\n  request: PayStrategyExecuteRequest<RelayQuote>,\n): Promise<{ transactionHash?: Hex }> {\n  log('Executing quotes', request);\n\n  const { quotes, messenger, transaction } = request;\n\n  let transactionHash: Hex | undefined;\n\n  for (const quote of quotes) {\n    ({ transactionHash } = await executeSingleQuote(\n      quote.original,\n      messenger,\n      transaction,\n    ));\n  }\n\n  const isSkipTransaction = quotes.some((q) => q.original.skipTransaction);\n\n  if (isSkipTransaction) {\n    log('Skipping original transaction', transactionHash);\n    return { transactionHash };\n  }\n\n  return { transactionHash: undefined };\n}\n\n/**\n * Executes a single Relay quote.\n *\n * @param quote - Relay quote to execute.\n * @param messenger - Controller messenger.\n * @param transaction - Original transaction meta.\n * @returns An object containing the transaction hash if available.\n */\nasync function executeSingleQuote(\n  quote: RelayQuote,\n  messenger: TransactionPayControllerMessenger,\n  transaction: TransactionMeta,\n) {\n  log('Executing single quote', quote);\n\n  const { kind } = quote.steps[0];\n\n  if (kind !== 'transaction') {\n    throw new Error(`Unsupported step kind: ${kind as string}`);\n  }\n\n  const transactionParams = quote.steps[0].items[0].data;\n  const chainId = toHex(transactionParams.chainId);\n  const from = transactionParams.from as Hex;\n\n  if (quote.skipTransaction) {\n    updateTransaction(\n      {\n        transactionId: transaction.id,\n        messenger,\n        note: 'Remove nonce from skipped transaction',\n      },\n      (tx) => {\n        tx.txParams.nonce = undefined;\n      },\n    );\n  }\n\n  const transactionHash = await submitTransactions(\n    quote,\n    chainId,\n    from,\n    transaction.id,\n    messenger,\n  );\n\n  await waitForRelayCompletion(quote);\n\n  log('Relay request completed');\n\n  if (quote.skipTransaction) {\n    log('Updating intent complete flag on transaction', transaction.id);\n\n    updateTransaction(\n      {\n        transactionId: transaction.id,\n        messenger,\n        note: 'Intent complete after Relay completion',\n      },\n      (tx) => {\n        tx.isIntentComplete = true;\n      },\n    );\n  }\n\n  return { transactionHash };\n}\n\n/**\n * Wait for a Relay request to complete.\n *\n * @param quote - Relay quote associated with the request.\n * @returns A promise that resolves when the Relay request is complete.\n */\nasync function waitForRelayCompletion(quote: RelayQuote) {\n  const { endpoint, method } = quote.steps\n    .slice(-1)[0]\n    .items.slice(-1)[0].check;\n\n  const url = `${RELAY_URL_BASE}${endpoint}`;\n\n  while (true) {\n    const response = await successfulFetch(url, { method });\n    const status = (await response.json()) as RelayStatus;\n\n    log('Polled status', status.status, status);\n\n    if (status.status === 'success') {\n      return;\n    }\n\n    if (['failure', 'refund'].includes(status.status)) {\n      throw new Error(`Relay request failed with status: ${status.status}`);\n    }\n\n    await new Promise((resolve) => setTimeout(resolve, 1000));\n  }\n}\n\n/**\n * Normalize the parameters from a relay quote step to match TransactionParams.\n *\n * @param params - Parameters from a relay quote step.\n * @returns Normalized transaction parameters.\n */\nfunction normalizeParams(\n  params: RelayQuote['steps'][0]['items'][0]['data'],\n): TransactionParams {\n  return {\n    data: params.data,\n    from: params.from,\n    gas: toHex(params.gas ?? RELAY_FALLBACK_GAS_LIMIT),\n    maxFeePerGas: toHex(params.maxFeePerGas),\n    maxPriorityFeePerGas: toHex(params.maxPriorityFeePerGas),\n    to: params.to,\n    value: toHex(params.value ?? '0'),\n  };\n}\n\n/**\n * Submit transactions for a relay quote.\n *\n * @param quote - Relay quote.\n * @param chainId - ID of the chain.\n * @param from - Address of the sender.\n * @param parentTransactionId - ID of the parent transaction.\n * @param messenger - Controller messenger.\n * @returns Hash of the last submitted transaction.\n */\nasync function submitTransactions(\n  quote: RelayQuote,\n  chainId: Hex,\n  from: Hex,\n  parentTransactionId: string,\n  messenger: TransactionPayControllerMessenger,\n): Promise<Hex> {\n  const params = quote.steps.flatMap((s) => s.items).map((i) => i.data);\n  const normalizedParams = params.map(normalizeParams);\n  const transactionIds: string[] = [];\n\n  const networkClientId = messenger.call(\n    'NetworkController:findNetworkClientIdByChainId',\n    chainId,\n  );\n\n  log('Adding transactions', {\n    normalizedParams,\n    chainId,\n    from,\n    networkClientId,\n  });\n\n  const { end } = collectTransactionIds(\n    chainId,\n    from,\n    messenger,\n    (transactionId) => {\n      transactionIds.push(transactionId);\n\n      updateTransaction(\n        {\n          transactionId: parentTransactionId,\n          messenger,\n          note: 'Add required transaction ID from Relay submission',\n        },\n        (tx) => {\n          if (!tx.requiredTransactionIds) {\n            tx.requiredTransactionIds = [];\n          }\n\n          tx.requiredTransactionIds.push(transactionId);\n        },\n      );\n    },\n  );\n\n  let result: { result: Promise<string> } | undefined;\n\n  if (params.length === 1) {\n    result = await messenger.call(\n      'TransactionController:addTransaction',\n      normalizedParams[0],\n      {\n        networkClientId,\n        origin: ORIGIN_METAMASK,\n        requireApproval: false,\n      },\n    );\n  } else {\n    await messenger.call('TransactionController:addTransactionBatch', {\n      from,\n      networkClientId,\n      origin: ORIGIN_METAMASK,\n      requireApproval: false,\n      transactions: normalizedParams.map((p, i) => ({\n        params: {\n          data: p.data as Hex,\n          gas: p.gas as Hex,\n          to: p.to as Hex,\n          value: p.value as Hex,\n        },\n        type: i === 0 ? TransactionType.tokenMethodApprove : undefined,\n      })),\n    });\n  }\n\n  end();\n\n  log('Added transactions', transactionIds);\n\n  if (result) {\n    const txHash = await result.result;\n    log('Submitted transaction', txHash);\n  }\n\n  await Promise.all(\n    transactionIds.map((txId) => waitForTransactionConfirmed(txId, messenger)),\n  );\n\n  log('All transactions confirmed', transactionIds);\n\n  const hash = getTransaction(transactionIds.slice(-1)[0], messenger)?.hash;\n\n  return hash as Hex;\n}\n"]}
+{"version":3,"file":"relay-submit.mjs","sourceRoot":"","sources":["../../../src/strategy/relay/relay-submit.ts"],"names":[],"mappings":"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","sourcesContent":["import {\n  ORIGIN_METAMASK,\n  successfulFetch,\n  toHex,\n} from '@metamask/controller-utils';\nimport {\n  TransactionType,\n  type TransactionParams,\n} from '@metamask/transaction-controller';\nimport type { TransactionMeta } from '@metamask/transaction-controller';\nimport type { Hex } from '@metamask/utils';\nimport { createModuleLogger } from '@metamask/utils';\n\nimport {\n  RELAY_FALLBACK_GAS_LIMIT,\n  RELAY_POLLING_INTERVAL,\n  RELAY_URL_BASE,\n} from './constants';\nimport type { RelayQuote, RelayStatus } from './types';\nimport { projectLogger } from '../../logger';\nimport type {\n  PayStrategyExecuteRequest,\n  TransactionPayControllerMessenger,\n} from '../../types';\nimport {\n  collectTransactionIds,\n  getTransaction,\n  updateTransaction,\n  waitForTransactionConfirmed,\n} from '../../utils/transaction';\n\nconst FALLBACK_HASH = '0x0' as Hex;\n\nconst log = createModuleLogger(projectLogger, 'relay-strategy');\n\n/**\n * Submits Relay quotes.\n *\n * @param request - Request object.\n * @returns An object containing the transaction hash if available.\n */\nexport async function submitRelayQuotes(\n  request: PayStrategyExecuteRequest<RelayQuote>,\n): Promise<{ transactionHash?: Hex }> {\n  log('Executing quotes', request);\n\n  const { quotes, messenger, transaction } = request;\n\n  let transactionHash: Hex | undefined;\n\n  for (const quote of quotes) {\n    ({ transactionHash } = await executeSingleQuote(\n      quote.original,\n      messenger,\n      transaction,\n    ));\n  }\n\n  return { transactionHash };\n}\n\n/**\n * Executes a single Relay quote.\n *\n * @param quote - Relay quote to execute.\n * @param messenger - Controller messenger.\n * @param transaction - Original transaction meta.\n * @returns An object containing the transaction hash if available.\n */\nasync function executeSingleQuote(\n  quote: RelayQuote,\n  messenger: TransactionPayControllerMessenger,\n  transaction: TransactionMeta,\n) {\n  log('Executing single quote', quote);\n\n  const { kind } = quote.steps[0];\n\n  if (kind !== 'transaction') {\n    throw new Error(`Unsupported step kind: ${kind as string}`);\n  }\n\n  const transactionParams = quote.steps[0].items[0].data;\n  const chainId = toHex(transactionParams.chainId);\n  const from = transactionParams.from as Hex;\n\n  updateTransaction(\n    {\n      transactionId: transaction.id,\n      messenger,\n      note: 'Remove nonce from skipped transaction',\n    },\n    (tx) => {\n      tx.txParams.nonce = undefined;\n    },\n  );\n\n  await submitTransactions(quote, chainId, from, transaction.id, messenger);\n\n  const targetHash = await waitForRelayCompletion(quote);\n\n  log('Relay request completed', targetHash);\n\n  updateTransaction(\n    {\n      transactionId: transaction.id,\n      messenger,\n      note: 'Intent complete after Relay completion',\n    },\n    (tx) => {\n      tx.isIntentComplete = true;\n    },\n  );\n\n  return { transactionHash: targetHash };\n}\n\n/**\n * Wait for a Relay request to complete.\n *\n * @param quote - Relay quote associated with the request.\n * @returns A promise that resolves when the Relay request is complete.\n */\nasync function waitForRelayCompletion(quote: RelayQuote): Promise<Hex> {\n  if (\n    quote.details.currencyIn.currency.chainId ===\n    quote.details.currencyOut.currency.chainId\n  ) {\n    log('Skipping polling as same chain');\n    return FALLBACK_HASH;\n  }\n\n  const { endpoint, method } = quote.steps\n    .slice(-1)[0]\n    .items.slice(-1)[0].check;\n\n  const url = `${RELAY_URL_BASE}${endpoint}`;\n\n  while (true) {\n    const response = await successfulFetch(url, { method });\n    const status = (await response.json()) as RelayStatus;\n\n    log('Polled status', status.status, status);\n\n    if (status.status === 'success') {\n      const targetHash = status.txHashes?.slice(-1)[0] as Hex;\n      return targetHash ?? FALLBACK_HASH;\n    }\n\n    if (['failure', 'refund', 'fallback'].includes(status.status)) {\n      throw new Error(`Relay request failed with status: ${status.status}`);\n    }\n\n    await new Promise((resolve) => setTimeout(resolve, RELAY_POLLING_INTERVAL));\n  }\n}\n\n/**\n * Normalize the parameters from a relay quote step to match TransactionParams.\n *\n * @param params - Parameters from a relay quote step.\n * @returns Normalized transaction parameters.\n */\nfunction normalizeParams(\n  params: RelayQuote['steps'][0]['items'][0]['data'],\n): TransactionParams {\n  return {\n    data: params.data,\n    from: params.from,\n    gas: toHex(params.gas ?? RELAY_FALLBACK_GAS_LIMIT),\n    maxFeePerGas: toHex(params.maxFeePerGas),\n    maxPriorityFeePerGas: toHex(params.maxPriorityFeePerGas),\n    to: params.to,\n    value: toHex(params.value ?? '0'),\n  };\n}\n\n/**\n * Submit transactions for a relay quote.\n *\n * @param quote - Relay quote.\n * @param chainId - ID of the chain.\n * @param from - Address of the sender.\n * @param parentTransactionId - ID of the parent transaction.\n * @param messenger - Controller messenger.\n * @returns Hash of the last submitted transaction.\n */\nasync function submitTransactions(\n  quote: RelayQuote,\n  chainId: Hex,\n  from: Hex,\n  parentTransactionId: string,\n  messenger: TransactionPayControllerMessenger,\n): Promise<Hex> {\n  const params = quote.steps.flatMap((s) => s.items).map((i) => i.data);\n  const normalizedParams = params.map(normalizeParams);\n  const transactionIds: string[] = [];\n\n  const networkClientId = messenger.call(\n    'NetworkController:findNetworkClientIdByChainId',\n    chainId,\n  );\n\n  log('Adding transactions', {\n    normalizedParams,\n    chainId,\n    from,\n    networkClientId,\n  });\n\n  const { end } = collectTransactionIds(\n    chainId,\n    from,\n    messenger,\n    (transactionId) => {\n      transactionIds.push(transactionId);\n\n      updateTransaction(\n        {\n          transactionId: parentTransactionId,\n          messenger,\n          note: 'Add required transaction ID from Relay submission',\n        },\n        (tx) => {\n          if (!tx.requiredTransactionIds) {\n            tx.requiredTransactionIds = [];\n          }\n\n          tx.requiredTransactionIds.push(transactionId);\n        },\n      );\n    },\n  );\n\n  let result: { result: Promise<string> } | undefined;\n\n  if (params.length === 1) {\n    result = await messenger.call(\n      'TransactionController:addTransaction',\n      normalizedParams[0],\n      {\n        networkClientId,\n        origin: ORIGIN_METAMASK,\n        requireApproval: false,\n      },\n    );\n  } else {\n    await messenger.call('TransactionController:addTransactionBatch', {\n      from,\n      networkClientId,\n      origin: ORIGIN_METAMASK,\n      requireApproval: false,\n      transactions: normalizedParams.map((p, i) => ({\n        params: {\n          data: p.data as Hex,\n          gas: p.gas as Hex,\n          to: p.to as Hex,\n          value: p.value as Hex,\n        },\n        type: i === 0 ? TransactionType.tokenMethodApprove : undefined,\n      })),\n    });\n  }\n\n  end();\n\n  log('Added transactions', transactionIds);\n\n  if (result) {\n    const txHash = await result.result;\n    log('Submitted transaction', txHash);\n  }\n\n  await Promise.all(\n    transactionIds.map((txId) => waitForTransactionConfirmed(txId, messenger)),\n  );\n\n  log('All transactions confirmed', transactionIds);\n\n  const hash = getTransaction(transactionIds.slice(-1)[0], messenger)?.hash;\n\n  return hash as Hex;\n}\n"]}

package/dist/strategy/relay/types.cjs.map

@@ -1 +1 @@
-{"version":3,"file":"types.cjs","sourceRoot":"","sources":["../../../src/strategy/relay/types.ts"],"names":[],"mappings":"","sourcesContent":["import type { Hex } from '@metamask/utils';\n\nexport type RelayQuote = {\n  details: {\n    currencyIn: {\n      amountUsd: string;\n    };\n    currencyOut: {\n      amountFormatted: string;\n      amountUsd: string;\n      currency: {\n        decimals: number;\n      };\n      minimumAmount: string;\n    };\n    timeEstimate: number;\n  };\n  fees: {\n    gas: {\n      amountUsd: string;\n    };\n  };\n  steps: {\n    items: {\n      check: {\n        endpoint: string;\n        method: 'GET' | 'POST';\n      };\n      data: {\n        chainId: number;\n        data: Hex;\n        from: Hex;\n        gas?: string;\n        maxFeePerGas: string;\n        maxPriorityFeePerGas: string;\n        to: Hex;\n        value: string;\n      };\n      status: 'complete' | 'incomplete';\n    }[];\n    kind: 'transaction';\n  }[];\n  skipTransaction?: boolean;\n};\n\nexport type RelayStatus = {\n  status:\n    | 'refund'\n    | 'waiting'\n    | 'failure'\n    | 'pending'\n    | 'submitted'\n    | 'success';\n  inTxHashes: string[];\n  txHashes: string[];\n  updatedAt: number;\n  originChainId: number;\n  destinationChainId: number;\n};\n"]}
+{"version":3,"file":"types.cjs","sourceRoot":"","sources":["../../../src/strategy/relay/types.ts"],"names":[],"mappings":"","sourcesContent":["import type { Hex } from '@metamask/utils';\n\nexport type RelayQuote = {\n  details: {\n    currencyIn: {\n      amountFormatted: string;\n      amountUsd: string;\n      currency: {\n        chainId: number;\n        decimals: number;\n      };\n    };\n    currencyOut: {\n      amountFormatted: string;\n      amountUsd: string;\n      currency: {\n        chainId: number;\n        decimals: number;\n      };\n      minimumAmount: string;\n    };\n    timeEstimate: number;\n  };\n  fees: {\n    relayer: {\n      amountUsd: string;\n    };\n  };\n  steps: {\n    items: {\n      check: {\n        endpoint: string;\n        method: 'GET' | 'POST';\n      };\n      data: {\n        chainId: number;\n        data: Hex;\n        from: Hex;\n        gas?: string;\n        maxFeePerGas: string;\n        maxPriorityFeePerGas: string;\n        to: Hex;\n        value: string;\n      };\n      status: 'complete' | 'incomplete';\n    }[];\n    kind: 'transaction';\n  }[];\n};\n\nexport type RelayStatus = {\n  status:\n    | 'refund'\n    | 'waiting'\n    | 'failure'\n    | 'pending'\n    | 'submitted'\n    | 'success';\n  inTxHashes: string[];\n  txHashes: string[];\n  updatedAt: number;\n  originChainId: number;\n  destinationChainId: number;\n};\n"]}

package/dist/strategy/relay/types.d.cts

@@ -2,12 +2,18 @@ import type { Hex } from "@metamask/utils";
 export type RelayQuote = {
     details: {
         currencyIn: {
+            amountFormatted: string;
             amountUsd: string;
+            currency: {
+                chainId: number;
+                decimals: number;
+            };
         };
         currencyOut: {
             amountFormatted: string;
             amountUsd: string;
             currency: {
+                chainId: number;
                 decimals: number;
             };
             minimumAmount: string;
@@ -15,7 +21,7 @@ export type RelayQuote = {
         timeEstimate: number;
     };
     fees: {
-        gas: {
+        relayer: {
             amountUsd: string;
         };
     };
@@ -39,7 +45,6 @@ export type RelayQuote = {
         }[];
         kind: 'transaction';
     }[];
-    skipTransaction?: boolean;
 };
 export type RelayStatus = {
     status: 'refund' | 'waiting' | 'failure' | 'pending' | 'submitted' | 'success';

package/dist/strategy/relay/types.d.cts.map

@@ -1 +1 @@
-{"version":3,"file":"types.d.cts","sourceRoot":"","sources":["../../../src/strategy/relay/types.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,GAAG,EAAE,wBAAwB;AAE3C,MAAM,MAAM,UAAU,GAAG;IACvB,OAAO,EAAE;QACP,UAAU,EAAE;YACV,SAAS,EAAE,MAAM,CAAC;SACnB,CAAC;QACF,WAAW,EAAE;YACX,eAAe,EAAE,MAAM,CAAC;YACxB,SAAS,EAAE,MAAM,CAAC;YAClB,QAAQ,EAAE;gBACR,QAAQ,EAAE,MAAM,CAAC;aAClB,CAAC;YACF,aAAa,EAAE,MAAM,CAAC;SACvB,CAAC;QACF,YAAY,EAAE,MAAM,CAAC;KACtB,CAAC;IACF,IAAI,EAAE;QACJ,GAAG,EAAE;YACH,SAAS,EAAE,MAAM,CAAC;SACnB,CAAC;KACH,CAAC;IACF,KAAK,EAAE;QACL,KAAK,EAAE;YACL,KAAK,EAAE;gBACL,QAAQ,EAAE,MAAM,CAAC;gBACjB,MAAM,EAAE,KAAK,GAAG,MAAM,CAAC;aACxB,CAAC;YACF,IAAI,EAAE;gBACJ,OAAO,EAAE,MAAM,CAAC;gBAChB,IAAI,EAAE,GAAG,CAAC;gBACV,IAAI,EAAE,GAAG,CAAC;gBACV,GAAG,CAAC,EAAE,MAAM,CAAC;gBACb,YAAY,EAAE,MAAM,CAAC;gBACrB,oBAAoB,EAAE,MAAM,CAAC;gBAC7B,EAAE,EAAE,GAAG,CAAC;gBACR,KAAK,EAAE,MAAM,CAAC;aACf,CAAC;YACF,MAAM,EAAE,UAAU,GAAG,YAAY,CAAC;SACnC,EAAE,CAAC;QACJ,IAAI,EAAE,aAAa,CAAC;KACrB,EAAE,CAAC;IACJ,eAAe,CAAC,EAAE,OAAO,CAAC;CAC3B,CAAC;AAEF,MAAM,MAAM,WAAW,GAAG;IACxB,MAAM,EACF,QAAQ,GACR,SAAS,GACT,SAAS,GACT,SAAS,GACT,WAAW,GACX,SAAS,CAAC;IACd,UAAU,EAAE,MAAM,EAAE,CAAC;IACrB,QAAQ,EAAE,MAAM,EAAE,CAAC;IACnB,SAAS,EAAE,MAAM,CAAC;IAClB,aAAa,EAAE,MAAM,CAAC;IACtB,kBAAkB,EAAE,MAAM,CAAC;CAC5B,CAAC"}
+{"version":3,"file":"types.d.cts","sourceRoot":"","sources":["../../../src/strategy/relay/types.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,GAAG,EAAE,wBAAwB;AAE3C,MAAM,MAAM,UAAU,GAAG;IACvB,OAAO,EAAE;QACP,UAAU,EAAE;YACV,eAAe,EAAE,MAAM,CAAC;YACxB,SAAS,EAAE,MAAM,CAAC;YAClB,QAAQ,EAAE;gBACR,OAAO,EAAE,MAAM,CAAC;gBAChB,QAAQ,EAAE,MAAM,CAAC;aAClB,CAAC;SACH,CAAC;QACF,WAAW,EAAE;YACX,eAAe,EAAE,MAAM,CAAC;YACxB,SAAS,EAAE,MAAM,CAAC;YAClB,QAAQ,EAAE;gBACR,OAAO,EAAE,MAAM,CAAC;gBAChB,QAAQ,EAAE,MAAM,CAAC;aAClB,CAAC;YACF,aAAa,EAAE,MAAM,CAAC;SACvB,CAAC;QACF,YAAY,EAAE,MAAM,CAAC;KACtB,CAAC;IACF,IAAI,EAAE;QACJ,OAAO,EAAE;YACP,SAAS,EAAE,MAAM,CAAC;SACnB,CAAC;KACH,CAAC;IACF,KAAK,EAAE;QACL,KAAK,EAAE;YACL,KAAK,EAAE;gBACL,QAAQ,EAAE,MAAM,CAAC;gBACjB,MAAM,EAAE,KAAK,GAAG,MAAM,CAAC;aACxB,CAAC;YACF,IAAI,EAAE;gBACJ,OAAO,EAAE,MAAM,CAAC;gBAChB,IAAI,EAAE,GAAG,CAAC;gBACV,IAAI,EAAE,GAAG,CAAC;gBACV,GAAG,CAAC,EAAE,MAAM,CAAC;gBACb,YAAY,EAAE,MAAM,CAAC;gBACrB,oBAAoB,EAAE,MAAM,CAAC;gBAC7B,EAAE,EAAE,GAAG,CAAC;gBACR,KAAK,EAAE,MAAM,CAAC;aACf,CAAC;YACF,MAAM,EAAE,UAAU,GAAG,YAAY,CAAC;SACnC,EAAE,CAAC;QACJ,IAAI,EAAE,aAAa,CAAC;KACrB,EAAE,CAAC;CACL,CAAC;AAEF,MAAM,MAAM,WAAW,GAAG;IACxB,MAAM,EACF,QAAQ,GACR,SAAS,GACT,SAAS,GACT,SAAS,GACT,WAAW,GACX,SAAS,CAAC;IACd,UAAU,EAAE,MAAM,EAAE,CAAC;IACrB,QAAQ,EAAE,MAAM,EAAE,CAAC;IACnB,SAAS,EAAE,MAAM,CAAC;IAClB,aAAa,EAAE,MAAM,CAAC;IACtB,kBAAkB,EAAE,MAAM,CAAC;CAC5B,CAAC"}

package/dist/strategy/relay/types.d.mts

@@ -2,12 +2,18 @@ import type { Hex } from "@metamask/utils";
 export type RelayQuote = {
     details: {
         currencyIn: {
+            amountFormatted: string;
             amountUsd: string;
+            currency: {
+                chainId: number;
+                decimals: number;
+            };
         };
         currencyOut: {
             amountFormatted: string;
             amountUsd: string;
             currency: {
+                chainId: number;
                 decimals: number;
             };
             minimumAmount: string;
@@ -15,7 +21,7 @@ export type RelayQuote = {
         timeEstimate: number;
     };
     fees: {
-        gas: {
+        relayer: {
             amountUsd: string;
         };
     };
@@ -39,7 +45,6 @@ export type RelayQuote = {
         }[];
         kind: 'transaction';
     }[];
-    skipTransaction?: boolean;
 };
 export type RelayStatus = {
     status: 'refund' | 'waiting' | 'failure' | 'pending' | 'submitted' | 'success';

package/dist/strategy/relay/types.d.mts.map

@@ -1 +1 @@
-{"version":3,"file":"types.d.mts","sourceRoot":"","sources":["../../../src/strategy/relay/types.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,GAAG,EAAE,wBAAwB;AAE3C,MAAM,MAAM,UAAU,GAAG;IACvB,OAAO,EAAE;QACP,UAAU,EAAE;YACV,SAAS,EAAE,MAAM,CAAC;SACnB,CAAC;QACF,WAAW,EAAE;YACX,eAAe,EAAE,MAAM,CAAC;YACxB,SAAS,EAAE,MAAM,CAAC;YAClB,QAAQ,EAAE;gBACR,QAAQ,EAAE,MAAM,CAAC;aAClB,CAAC;YACF,aAAa,EAAE,MAAM,CAAC;SACvB,CAAC;QACF,YAAY,EAAE,MAAM,CAAC;KACtB,CAAC;IACF,IAAI,EAAE;QACJ,GAAG,EAAE;YACH,SAAS,EAAE,MAAM,CAAC;SACnB,CAAC;KACH,CAAC;IACF,KAAK,EAAE;QACL,KAAK,EAAE;YACL,KAAK,EAAE;gBACL,QAAQ,EAAE,MAAM,CAAC;gBACjB,MAAM,EAAE,KAAK,GAAG,MAAM,CAAC;aACxB,CAAC;YACF,IAAI,EAAE;gBACJ,OAAO,EAAE,MAAM,CAAC;gBAChB,IAAI,EAAE,GAAG,CAAC;gBACV,IAAI,EAAE,GAAG,CAAC;gBACV,GAAG,CAAC,EAAE,MAAM,CAAC;gBACb,YAAY,EAAE,MAAM,CAAC;gBACrB,oBAAoB,EAAE,MAAM,CAAC;gBAC7B,EAAE,EAAE,GAAG,CAAC;gBACR,KAAK,EAAE,MAAM,CAAC;aACf,CAAC;YACF,MAAM,EAAE,UAAU,GAAG,YAAY,CAAC;SACnC,EAAE,CAAC;QACJ,IAAI,EAAE,aAAa,CAAC;KACrB,EAAE,CAAC;IACJ,eAAe,CAAC,EAAE,OAAO,CAAC;CAC3B,CAAC;AAEF,MAAM,MAAM,WAAW,GAAG;IACxB,MAAM,EACF,QAAQ,GACR,SAAS,GACT,SAAS,GACT,SAAS,GACT,WAAW,GACX,SAAS,CAAC;IACd,UAAU,EAAE,MAAM,EAAE,CAAC;IACrB,QAAQ,EAAE,MAAM,EAAE,CAAC;IACnB,SAAS,EAAE,MAAM,CAAC;IAClB,aAAa,EAAE,MAAM,CAAC;IACtB,kBAAkB,EAAE,MAAM,CAAC;CAC5B,CAAC"}
+{"version":3,"file":"types.d.mts","sourceRoot":"","sources":["../../../src/strategy/relay/types.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,GAAG,EAAE,wBAAwB;AAE3C,MAAM,MAAM,UAAU,GAAG;IACvB,OAAO,EAAE;QACP,UAAU,EAAE;YACV,eAAe,EAAE,MAAM,CAAC;YACxB,SAAS,EAAE,MAAM,CAAC;YAClB,QAAQ,EAAE;gBACR,OAAO,EAAE,MAAM,CAAC;gBAChB,QAAQ,EAAE,MAAM,CAAC;aAClB,CAAC;SACH,CAAC;QACF,WAAW,EAAE;YACX,eAAe,EAAE,MAAM,CAAC;YACxB,SAAS,EAAE,MAAM,CAAC;YAClB,QAAQ,EAAE;gBACR,OAAO,EAAE,MAAM,CAAC;gBAChB,QAAQ,EAAE,MAAM,CAAC;aAClB,CAAC;YACF,aAAa,EAAE,MAAM,CAAC;SACvB,CAAC;QACF,YAAY,EAAE,MAAM,CAAC;KACtB,CAAC;IACF,IAAI,EAAE;QACJ,OAAO,EAAE;YACP,SAAS,EAAE,MAAM,CAAC;SACnB,CAAC;KACH,CAAC;IACF,KAAK,EAAE;QACL,KAAK,EAAE;YACL,KAAK,EAAE;gBACL,QAAQ,EAAE,MAAM,CAAC;gBACjB,MAAM,EAAE,KAAK,GAAG,MAAM,CAAC;aACxB,CAAC;YACF,IAAI,EAAE;gBACJ,OAAO,EAAE,MAAM,CAAC;gBAChB,IAAI,EAAE,GAAG,CAAC;gBACV,IAAI,EAAE,GAAG,CAAC;gBACV,GAAG,CAAC,EAAE,MAAM,CAAC;gBACb,YAAY,EAAE,MAAM,CAAC;gBACrB,oBAAoB,EAAE,MAAM,CAAC;gBAC7B,EAAE,EAAE,GAAG,CAAC;gBACR,KAAK,EAAE,MAAM,CAAC;aACf,CAAC;YACF,MAAM,EAAE,UAAU,GAAG,YAAY,CAAC;SACnC,EAAE,CAAC;QACJ,IAAI,EAAE,aAAa,CAAC;KACrB,EAAE,CAAC;CACL,CAAC;AAEF,MAAM,MAAM,WAAW,GAAG;IACxB,MAAM,EACF,QAAQ,GACR,SAAS,GACT,SAAS,GACT,SAAS,GACT,WAAW,GACX,SAAS,CAAC;IACd,UAAU,EAAE,MAAM,EAAE,CAAC;IACrB,QAAQ,EAAE,MAAM,EAAE,CAAC;IACnB,SAAS,EAAE,MAAM,CAAC;IAClB,aAAa,EAAE,MAAM,CAAC;IACtB,kBAAkB,EAAE,MAAM,CAAC;CAC5B,CAAC"}

package/dist/strategy/relay/types.mjs.map

@@ -1 +1 @@
-{"version":3,"file":"types.mjs","sourceRoot":"","sources":["../../../src/strategy/relay/types.ts"],"names":[],"mappings":"","sourcesContent":["import type { Hex } from '@metamask/utils';\n\nexport type RelayQuote = {\n  details: {\n    currencyIn: {\n      amountUsd: string;\n    };\n    currencyOut: {\n      amountFormatted: string;\n      amountUsd: string;\n      currency: {\n        decimals: number;\n      };\n      minimumAmount: string;\n    };\n    timeEstimate: number;\n  };\n  fees: {\n    gas: {\n      amountUsd: string;\n    };\n  };\n  steps: {\n    items: {\n      check: {\n        endpoint: string;\n        method: 'GET' | 'POST';\n      };\n      data: {\n        chainId: number;\n        data: Hex;\n        from: Hex;\n        gas?: string;\n        maxFeePerGas: string;\n        maxPriorityFeePerGas: string;\n        to: Hex;\n        value: string;\n      };\n      status: 'complete' | 'incomplete';\n    }[];\n    kind: 'transaction';\n  }[];\n  skipTransaction?: boolean;\n};\n\nexport type RelayStatus = {\n  status:\n    | 'refund'\n    | 'waiting'\n    | 'failure'\n    | 'pending'\n    | 'submitted'\n    | 'success';\n  inTxHashes: string[];\n  txHashes: string[];\n  updatedAt: number;\n  originChainId: number;\n  destinationChainId: number;\n};\n"]}
+{"version":3,"file":"types.mjs","sourceRoot":"","sources":["../../../src/strategy/relay/types.ts"],"names":[],"mappings":"","sourcesContent":["import type { Hex } from '@metamask/utils';\n\nexport type RelayQuote = {\n  details: {\n    currencyIn: {\n      amountFormatted: string;\n      amountUsd: string;\n      currency: {\n        chainId: number;\n        decimals: number;\n      };\n    };\n    currencyOut: {\n      amountFormatted: string;\n      amountUsd: string;\n      currency: {\n        chainId: number;\n        decimals: number;\n      };\n      minimumAmount: string;\n    };\n    timeEstimate: number;\n  };\n  fees: {\n    relayer: {\n      amountUsd: string;\n    };\n  };\n  steps: {\n    items: {\n      check: {\n        endpoint: string;\n        method: 'GET' | 'POST';\n      };\n      data: {\n        chainId: number;\n        data: Hex;\n        from: Hex;\n        gas?: string;\n        maxFeePerGas: string;\n        maxPriorityFeePerGas: string;\n        to: Hex;\n        value: string;\n      };\n      status: 'complete' | 'incomplete';\n    }[];\n    kind: 'transaction';\n  }[];\n};\n\nexport type RelayStatus = {\n  status:\n    | 'refund'\n    | 'waiting'\n    | 'failure'\n    | 'pending'\n    | 'submitted'\n    | 'success';\n  inTxHashes: string[];\n  txHashes: string[];\n  updatedAt: number;\n  originChainId: number;\n  destinationChainId: number;\n};\n"]}

package/dist/tests/messenger-mock.cjs

@@ -28,6 +28,7 @@ function getMessengerMock({ skipRegister, } = {}) {
     const getCurrencyRateControllerStateMock = jest.fn();
     const getAccountTrackerControllerStateMock = jest.fn();
     const getNetworkClientByIdMock = jest.fn();
+    const getDelegationTransactionMock = jest.fn();
     const messenger = new messenger_1.Messenger({
         namespace: messenger_1.MOCK_ANY_NAMESPACE,
     });
@@ -50,6 +51,7 @@ function getMessengerMock({ skipRegister, } = {}) {
         messenger.registerActionHandler('AccountTrackerController:getState', getAccountTrackerControllerStateMock);
         messenger.registerActionHandler('CurrencyRateController:getState', getCurrencyRateControllerStateMock);
         messenger.registerActionHandler('NetworkController:getNetworkClientById', getNetworkClientByIdMock);
+        messenger.registerActionHandler('TransactionPayController:getDelegationTransaction', getDelegationTransactionMock);
     }
     const publish = messenger.publish.bind(messenger);
     return {
@@ -61,6 +63,7 @@ function getMessengerMock({ skipRegister, } = {}) {
         getBridgeStatusControllerStateMock,
         getControllerStateMock,
         getCurrencyRateControllerStateMock,
+        getDelegationTransactionMock,
         getGasFeeControllerStateMock,
         getNetworkClientByIdMock,
         getRemoteFeatureFlagControllerStateMock,

package/dist/tests/messenger-mock.cjs.map

@@ -1 +1 @@
-{"version":3,"file":"messenger-mock.cjs","sourceRoot":"","sources":["../../src/tests/messenger-mock.ts"],"names":[],"mappings":"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","sourcesContent":["import type { TokensControllerGetStateAction } from '@metamask/assets-controllers';\nimport type { TokenBalancesControllerGetStateAction } from '@metamask/assets-controllers';\nimport type { TokenRatesControllerGetStateAction } from '@metamask/assets-controllers';\nimport type { AccountTrackerControllerGetStateAction } from '@metamask/assets-controllers';\nimport type { BridgeStatusControllerGetStateAction } from '@metamask/bridge-status-controller';\nimport type {\n  MessengerActions,\n  MessengerEvents,\n  MockAnyNamespace,\n} from '@metamask/messenger';\nimport { Messenger, MOCK_ANY_NAMESPACE } from '@metamask/messenger';\nimport type { NetworkControllerGetNetworkClientByIdAction } from '@metamask/network-controller';\nimport type { NetworkControllerFindNetworkClientIdByChainIdAction } from '@metamask/network-controller';\nimport type { RemoteFeatureFlagControllerGetStateAction } from '@metamask/remote-feature-flag-controller';\nimport type {\n  TransactionControllerAddTransactionAction,\n  TransactionControllerAddTransactionBatchAction,\n  TransactionControllerGetStateAction,\n} from '@metamask/transaction-controller';\nimport type { TransactionControllerUpdateTransactionAction } from '@metamask/transaction-controller';\n\nimport type { TransactionPayControllerMessenger } from '..';\nimport type { BridgeStatusControllerSubmitTxAction } from '../../../bridge-status-controller/src/types';\nimport type { TransactionPayControllerGetStrategyAction } from '../types';\nimport { type TransactionPayControllerGetStateAction } from '../types';\n\ntype AllActions = MessengerActions<TransactionPayControllerMessenger>;\ntype AllEvents = MessengerEvents<TransactionPayControllerMessenger>;\ntype RootMessenger = Messenger<MockAnyNamespace, AllActions, AllEvents>;\n\n/**\n * Creates a mock controller messenger for testing.\n *\n * @param options - Options for creating the messenger mock.\n * @param options.skipRegister - Whether to skip registering action handlers.\n * @returns The mock messenger and associated mock functions.\n */\nexport function getMessengerMock({\n  skipRegister,\n}: { skipRegister?: boolean } = {}) {\n  const getControllerStateMock: jest.MockedFn<\n    TransactionPayControllerGetStateAction['handler']\n  > = jest.fn();\n\n  const getStrategyMock: jest.MockedFn<\n    TransactionPayControllerGetStrategyAction['handler']\n  > = jest.fn();\n\n  const getTransactionControllerStateMock: jest.MockedFn<\n    TransactionControllerGetStateAction['handler']\n  > = jest.fn();\n\n  const addTransactionMock: jest.MockedFn<\n    TransactionControllerAddTransactionAction['handler']\n  > = jest.fn();\n\n  const addTransactionBatchMock: jest.MockedFn<\n    TransactionControllerAddTransactionBatchAction['handler']\n  > = jest.fn();\n\n  const findNetworkClientIdByChainIdMock: jest.MockedFn<\n    NetworkControllerFindNetworkClientIdByChainIdAction['handler']\n  > = jest.fn();\n\n  const fetchQuotesMock = jest.fn();\n\n  const getRemoteFeatureFlagControllerStateMock: jest.MockedFn<\n    RemoteFeatureFlagControllerGetStateAction['handler']\n  > = jest.fn();\n\n  const getGasFeeControllerStateMock = jest.fn();\n\n  const submitTransactionMock: jest.MockedFunction<\n    BridgeStatusControllerSubmitTxAction['handler']\n  > = jest.fn();\n\n  const updateTransactionMock: jest.MockedFn<\n    TransactionControllerUpdateTransactionAction['handler']\n  > = jest.fn();\n\n  const getBridgeStatusControllerStateMock: jest.MockedFn<\n    BridgeStatusControllerGetStateAction['handler']\n  > = jest.fn();\n\n  const getTokensControllerStateMock: jest.MockedFn<\n    TokensControllerGetStateAction['handler']\n  > = jest.fn();\n\n  const getTokenBalanceControllerStateMock: jest.MockedFn<\n    TokenBalancesControllerGetStateAction['handler']\n  > = jest.fn();\n\n  const getTokenRatesControllerStateMock: jest.MockedFn<\n    TokenRatesControllerGetStateAction['handler']\n  > = jest.fn();\n\n  const getCurrencyRateControllerStateMock = jest.fn();\n\n  const getAccountTrackerControllerStateMock: jest.MockedFn<\n    AccountTrackerControllerGetStateAction['handler']\n  > = jest.fn();\n\n  const getNetworkClientByIdMock: jest.MockedFn<\n    NetworkControllerGetNetworkClientByIdAction['handler']\n  > = jest.fn();\n\n  const messenger: RootMessenger = new Messenger({\n    namespace: MOCK_ANY_NAMESPACE,\n  });\n\n  if (skipRegister !== true) {\n    messenger.registerActionHandler(\n      'TransactionPayController:getState',\n      getControllerStateMock,\n    );\n\n    messenger.registerActionHandler(\n      'TransactionPayController:getStrategy',\n      getStrategyMock,\n    );\n\n    messenger.registerActionHandler(\n      'TransactionController:getState',\n      getTransactionControllerStateMock,\n    );\n\n    messenger.registerActionHandler(\n      'TransactionController:addTransaction',\n      addTransactionMock,\n    );\n\n    messenger.registerActionHandler(\n      'TransactionController:addTransactionBatch',\n      addTransactionBatchMock,\n    );\n\n    messenger.registerActionHandler(\n      'NetworkController:findNetworkClientIdByChainId',\n      findNetworkClientIdByChainIdMock,\n    );\n\n    messenger.registerActionHandler(\n      'BridgeController:fetchQuotes',\n      fetchQuotesMock,\n    );\n\n    messenger.registerActionHandler(\n      'RemoteFeatureFlagController:getState',\n      getRemoteFeatureFlagControllerStateMock,\n    );\n\n    messenger.registerActionHandler(\n      'BridgeStatusController:submitTx',\n      submitTransactionMock,\n    );\n\n    messenger.registerActionHandler(\n      'GasFeeController:getState',\n      getGasFeeControllerStateMock,\n    );\n\n    messenger.registerActionHandler(\n      'TransactionController:updateTransaction',\n      updateTransactionMock,\n    );\n\n    messenger.registerActionHandler(\n      'BridgeStatusController:getState',\n      getBridgeStatusControllerStateMock,\n    );\n\n    messenger.registerActionHandler(\n      'TokensController:getState',\n      getTokensControllerStateMock,\n    );\n\n    messenger.registerActionHandler(\n      'TokenBalancesController:getState',\n      getTokenBalanceControllerStateMock,\n    );\n\n    messenger.registerActionHandler(\n      'TokenRatesController:getState',\n      getTokenRatesControllerStateMock,\n    );\n\n    messenger.registerActionHandler(\n      'AccountTrackerController:getState',\n      getAccountTrackerControllerStateMock,\n    );\n\n    messenger.registerActionHandler(\n      'CurrencyRateController:getState',\n      getCurrencyRateControllerStateMock,\n    );\n\n    messenger.registerActionHandler(\n      'NetworkController:getNetworkClientById',\n      getNetworkClientByIdMock,\n    );\n  }\n\n  const publish = messenger.publish.bind(messenger);\n\n  return {\n    addTransactionMock,\n    addTransactionBatchMock,\n    fetchQuotesMock,\n    findNetworkClientIdByChainIdMock,\n    getAccountTrackerControllerStateMock,\n    getBridgeStatusControllerStateMock,\n    getControllerStateMock,\n    getCurrencyRateControllerStateMock,\n    getGasFeeControllerStateMock,\n    getNetworkClientByIdMock,\n    getRemoteFeatureFlagControllerStateMock,\n    getStrategyMock,\n    getTokenBalanceControllerStateMock,\n    getTokenRatesControllerStateMock,\n    getTokensControllerStateMock,\n    getTransactionControllerStateMock,\n    messenger: messenger as TransactionPayControllerMessenger,\n    publish,\n    submitTransactionMock,\n    updateTransactionMock,\n  };\n}\n"]}
+{"version":3,"file":"messenger-mock.cjs","sourceRoot":"","sources":["../../src/tests/messenger-mock.ts"],"names":[],"mappings":"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","sourcesContent":["import type { TokensControllerGetStateAction } from '@metamask/assets-controllers';\nimport type { TokenBalancesControllerGetStateAction } from '@metamask/assets-controllers';\nimport type { TokenRatesControllerGetStateAction } from '@metamask/assets-controllers';\nimport type { AccountTrackerControllerGetStateAction } from '@metamask/assets-controllers';\nimport type { BridgeStatusControllerGetStateAction } from '@metamask/bridge-status-controller';\nimport type {\n  MessengerActions,\n  MessengerEvents,\n  MockAnyNamespace,\n} from '@metamask/messenger';\nimport { Messenger, MOCK_ANY_NAMESPACE } from '@metamask/messenger';\nimport type { NetworkControllerGetNetworkClientByIdAction } from '@metamask/network-controller';\nimport type { NetworkControllerFindNetworkClientIdByChainIdAction } from '@metamask/network-controller';\nimport type { RemoteFeatureFlagControllerGetStateAction } from '@metamask/remote-feature-flag-controller';\nimport type {\n  TransactionControllerAddTransactionAction,\n  TransactionControllerAddTransactionBatchAction,\n  TransactionControllerGetStateAction,\n} from '@metamask/transaction-controller';\nimport type { TransactionControllerUpdateTransactionAction } from '@metamask/transaction-controller';\n\nimport type { TransactionPayControllerMessenger } from '..';\nimport type { BridgeStatusControllerSubmitTxAction } from '../../../bridge-status-controller/src/types';\nimport type {\n  TransactionPayControllerGetDelegationTransactionAction,\n  TransactionPayControllerGetStrategyAction,\n} from '../types';\nimport { type TransactionPayControllerGetStateAction } from '../types';\n\ntype AllActions = MessengerActions<TransactionPayControllerMessenger>;\ntype AllEvents = MessengerEvents<TransactionPayControllerMessenger>;\ntype RootMessenger = Messenger<MockAnyNamespace, AllActions, AllEvents>;\n\n/**\n * Creates a mock controller messenger for testing.\n *\n * @param options - Options for creating the messenger mock.\n * @param options.skipRegister - Whether to skip registering action handlers.\n * @returns The mock messenger and associated mock functions.\n */\nexport function getMessengerMock({\n  skipRegister,\n}: { skipRegister?: boolean } = {}) {\n  const getControllerStateMock: jest.MockedFn<\n    TransactionPayControllerGetStateAction['handler']\n  > = jest.fn();\n\n  const getStrategyMock: jest.MockedFn<\n    TransactionPayControllerGetStrategyAction['handler']\n  > = jest.fn();\n\n  const getTransactionControllerStateMock: jest.MockedFn<\n    TransactionControllerGetStateAction['handler']\n  > = jest.fn();\n\n  const addTransactionMock: jest.MockedFn<\n    TransactionControllerAddTransactionAction['handler']\n  > = jest.fn();\n\n  const addTransactionBatchMock: jest.MockedFn<\n    TransactionControllerAddTransactionBatchAction['handler']\n  > = jest.fn();\n\n  const findNetworkClientIdByChainIdMock: jest.MockedFn<\n    NetworkControllerFindNetworkClientIdByChainIdAction['handler']\n  > = jest.fn();\n\n  const fetchQuotesMock = jest.fn();\n\n  const getRemoteFeatureFlagControllerStateMock: jest.MockedFn<\n    RemoteFeatureFlagControllerGetStateAction['handler']\n  > = jest.fn();\n\n  const getGasFeeControllerStateMock = jest.fn();\n\n  const submitTransactionMock: jest.MockedFunction<\n    BridgeStatusControllerSubmitTxAction['handler']\n  > = jest.fn();\n\n  const updateTransactionMock: jest.MockedFn<\n    TransactionControllerUpdateTransactionAction['handler']\n  > = jest.fn();\n\n  const getBridgeStatusControllerStateMock: jest.MockedFn<\n    BridgeStatusControllerGetStateAction['handler']\n  > = jest.fn();\n\n  const getTokensControllerStateMock: jest.MockedFn<\n    TokensControllerGetStateAction['handler']\n  > = jest.fn();\n\n  const getTokenBalanceControllerStateMock: jest.MockedFn<\n    TokenBalancesControllerGetStateAction['handler']\n  > = jest.fn();\n\n  const getTokenRatesControllerStateMock: jest.MockedFn<\n    TokenRatesControllerGetStateAction['handler']\n  > = jest.fn();\n\n  const getCurrencyRateControllerStateMock = jest.fn();\n\n  const getAccountTrackerControllerStateMock: jest.MockedFn<\n    AccountTrackerControllerGetStateAction['handler']\n  > = jest.fn();\n\n  const getNetworkClientByIdMock: jest.MockedFn<\n    NetworkControllerGetNetworkClientByIdAction['handler']\n  > = jest.fn();\n\n  const getDelegationTransactionMock: jest.MockedFn<\n    TransactionPayControllerGetDelegationTransactionAction['handler']\n  > = jest.fn();\n\n  const messenger: RootMessenger = new Messenger({\n    namespace: MOCK_ANY_NAMESPACE,\n  });\n\n  if (skipRegister !== true) {\n    messenger.registerActionHandler(\n      'TransactionPayController:getState',\n      getControllerStateMock,\n    );\n\n    messenger.registerActionHandler(\n      'TransactionPayController:getStrategy',\n      getStrategyMock,\n    );\n\n    messenger.registerActionHandler(\n      'TransactionController:getState',\n      getTransactionControllerStateMock,\n    );\n\n    messenger.registerActionHandler(\n      'TransactionController:addTransaction',\n      addTransactionMock,\n    );\n\n    messenger.registerActionHandler(\n      'TransactionController:addTransactionBatch',\n      addTransactionBatchMock,\n    );\n\n    messenger.registerActionHandler(\n      'NetworkController:findNetworkClientIdByChainId',\n      findNetworkClientIdByChainIdMock,\n    );\n\n    messenger.registerActionHandler(\n      'BridgeController:fetchQuotes',\n      fetchQuotesMock,\n    );\n\n    messenger.registerActionHandler(\n      'RemoteFeatureFlagController:getState',\n      getRemoteFeatureFlagControllerStateMock,\n    );\n\n    messenger.registerActionHandler(\n      'BridgeStatusController:submitTx',\n      submitTransactionMock,\n    );\n\n    messenger.registerActionHandler(\n      'GasFeeController:getState',\n      getGasFeeControllerStateMock,\n    );\n\n    messenger.registerActionHandler(\n      'TransactionController:updateTransaction',\n      updateTransactionMock,\n    );\n\n    messenger.registerActionHandler(\n      'BridgeStatusController:getState',\n      getBridgeStatusControllerStateMock,\n    );\n\n    messenger.registerActionHandler(\n      'TokensController:getState',\n      getTokensControllerStateMock,\n    );\n\n    messenger.registerActionHandler(\n      'TokenBalancesController:getState',\n      getTokenBalanceControllerStateMock,\n    );\n\n    messenger.registerActionHandler(\n      'TokenRatesController:getState',\n      getTokenRatesControllerStateMock,\n    );\n\n    messenger.registerActionHandler(\n      'AccountTrackerController:getState',\n      getAccountTrackerControllerStateMock,\n    );\n\n    messenger.registerActionHandler(\n      'CurrencyRateController:getState',\n      getCurrencyRateControllerStateMock,\n    );\n\n    messenger.registerActionHandler(\n      'NetworkController:getNetworkClientById',\n      getNetworkClientByIdMock,\n    );\n\n    messenger.registerActionHandler(\n      'TransactionPayController:getDelegationTransaction',\n      getDelegationTransactionMock,\n    );\n  }\n\n  const publish = messenger.publish.bind(messenger);\n\n  return {\n    addTransactionMock,\n    addTransactionBatchMock,\n    fetchQuotesMock,\n    findNetworkClientIdByChainIdMock,\n    getAccountTrackerControllerStateMock,\n    getBridgeStatusControllerStateMock,\n    getControllerStateMock,\n    getCurrencyRateControllerStateMock,\n    getDelegationTransactionMock,\n    getGasFeeControllerStateMock,\n    getNetworkClientByIdMock,\n    getRemoteFeatureFlagControllerStateMock,\n    getStrategyMock,\n    getTokenBalanceControllerStateMock,\n    getTokenRatesControllerStateMock,\n    getTokensControllerStateMock,\n    getTransactionControllerStateMock,\n    messenger: messenger as TransactionPayControllerMessenger,\n    publish,\n    submitTransactionMock,\n    updateTransactionMock,\n  };\n}\n"]}

package/dist/tests/messenger-mock.d.cts

@@ -18,6 +18,7 @@ export declare function getMessengerMock({ skipRegister, }?: {
     getBridgeStatusControllerStateMock: jest.MockedFn<() => import("@metamask/bridge-status-controller").BridgeStatusControllerState>;
     getControllerStateMock: jest.MockedFn<() => import("../index.cjs").TransactionPayControllerState>;
     getCurrencyRateControllerStateMock: jest.Mock<any, any>;
+    getDelegationTransactionMock: jest.MockedFn<import("../types.cjs").GetDelegationTransactionCallback>;
     getGasFeeControllerStateMock: jest.Mock<any, any>;
     getNetworkClientByIdMock: jest.MockedFn<{
         (infuraNetworkClientId: import("@metamask/controller-utils").InfuraNetworkType): import("@metamask/network-controller").AutoManagedNetworkClient<import("@metamask/network-controller").InfuraNetworkClientConfiguration>;
@@ -178,28 +179,14 @@ export declare function getMessengerMock({ skipRegister, }?: {
         } | {
             unsignedPsbtBase64: string;
             inputsToSign: {}[] | null;
-        };
-        approval?: {
-            chainId: number;
-            to: string;
-            from: string;
-            value: string;
-            data: string;
-            gasLimit: number | null;
-            effectiveGas?: number | undefined;
-        } | undefined;
-    } & {
-        trade: string | {
-            chainId: number;
-            to: string;
-            from: string;
-            value: string;
-            data: string;
-            gasLimit: number | null;
-            effectiveGas?: number | undefined;
         } | {
-            unsignedPsbtBase64: string;
-            inputsToSign: {}[] | null;
+            raw_data_hex: string;
+            visible?: boolean | undefined;
+            raw_data?: {
+                contract?: {
+                    type?: string | undefined;
+                }[] | undefined;
+            } | null | undefined;
         };
         approval?: {
             chainId: number;
@@ -209,9 +196,20 @@ export declare function getMessengerMock({ skipRegister, }?: {
             data: string;
             gasLimit: number | null;
             effectiveGas?: number | undefined;
+        } | {
+            raw_data_hex: string;
+            visible?: boolean | undefined;
+            raw_data?: {
+                contract?: {
+                    type?: string | undefined;
+                }[] | undefined;
+            } | null | undefined;
         } | undefined;
+    } & {
+        trade: import("@metamask/bridge-controller").Trade;
+        approval?: import("@metamask/bridge-controller").Trade | undefined;
         featureId?: import("@metamask/bridge-controller").FeatureId | undefined;
-    } & Partial<import("@metamask/bridge-controller").QuoteMetadata>, isStxEnabledOnClient: boolean) => Promise<import("@metamask/transaction-controller").TransactionMeta & Partial<import("../../../bridge-status-controller/src/types.cjs").SolanaTransactionMeta>>>;
+    } & import("@metamask/bridge-controller").QuoteMetadata, isStxEnabledOnClient: boolean) => Promise<import("@metamask/transaction-controller").TransactionMeta & Partial<import("../../../bridge-status-controller/src/types.cjs").SolanaTransactionMeta>>>;
     updateTransactionMock: jest.MockedFn<(transactionMeta: import("@metamask/transaction-controller").TransactionMeta, note: string) => void>;
 };
 //# sourceMappingURL=messenger-mock.d.cts.map

package/dist/tests/messenger-mock.d.cts.map

@@ -1 +1 @@
-{"version":3,"file":"messenger-mock.d.cts","sourceRoot":"","sources":["../../src/tests/messenger-mock.ts"],"names":[],"mappings":";AAqBA,OAAO,KAAK,EAAE,iCAAiC,EAAE,qBAAW;AAS5D;;;;;;GAMG;AACH,wBAAgB,gBAAgB,CAAC,EAC/B,YAAY,GACb,GAAE;IAAE,YAAY,CAAC,EAAE,OAAO,CAAA;CAAO;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;EA2LjC"}
+{"version":3,"file":"messenger-mock.d.cts","sourceRoot":"","sources":["../../src/tests/messenger-mock.ts"],"names":[],"mappings":";AAqBA,OAAO,KAAK,EAAE,iCAAiC,EAAE,qBAAW;AAY5D;;;;;;GAMG;AACH,wBAAgB,gBAAgB,CAAC,EAC/B,YAAY,GACb,GAAE;IAAE,YAAY,CAAC,EAAE,OAAO,CAAA;CAAO;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;EAqMjC"}