@metamask-previews/transaction-pay-controller 22.4.0-preview-6d2aeda → 22.4.0-preview-fe92f4bb3

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

@@ -2,9 +2,11 @@ import { ORIGIN_METAMASK, successfulFetch, toHex } from "@metamask/controller-ut
 import { TransactionType } from "@metamask/transaction-controller";
 import { createModuleLogger } from "@metamask/utils";
 import { projectLogger } from "../../logger.mjs";
+import { accountSupports7702 } from "../../utils/7702.mjs";
 import { getPayStrategiesConfig } from "../../utils/feature-flags.mjs";
-import { collectTransactionIds, getTransaction, updateTransaction, waitForTransactionConfirmed } from "../../utils/transaction.mjs";
-import { getAcrossOrderedTransactions } from "./transactions.mjs";
+import { getGasBuffer } from "../../utils/feature-flags.mjs";
+import { collectTransactionIds, getTransaction, updateTransaction, isPredictWithdrawTransaction, waitForTransactionConfirmed } from "../../utils/transaction.mjs";
+import { getAcrossOrderedTransactions, getOriginalTransactionGas } from "./transactions.mjs";
 const log = createModuleLogger(projectLogger, 'across-strategy');
 const ACROSS_STATUS_POLL_INTERVAL = 1000;
 /**
@@ -31,8 +33,8 @@ async function executeSingleQuote(quote, messenger, transaction) {
     }, (tx) => {
         tx.txParams.nonce = undefined;
     });
-    const acrossDepositType = getAcrossDepositType(transaction.type);
-    const transactionHash = await submitTransactions(quote, transaction.id, acrossDepositType, messenger);
+    const acrossDepositType = getAcrossDepositType(transaction);
+    const transactionHash = await submitTransactions(quote, transaction, acrossDepositType, messenger);
     updateTransaction({
         transactionId: transaction.id,
         messenger,
@@ -46,12 +48,12 @@ async function executeSingleQuote(quote, messenger, transaction) {
  * Submit transactions for an Across quote.
  *
  * @param quote - Across quote.
- * @param parentTransactionId - ID of the parent transaction.
+ * @param parentTransaction - Parent transaction.
  * @param acrossDepositType - Transaction type used for the swap/deposit step.
  * @param messenger - Controller messenger.
  * @returns Hash of the last submitted transaction, if available.
  */
-async function submitTransactions(quote, parentTransactionId, acrossDepositType, messenger) {
+async function submitTransactions(quote, parentTransaction, acrossDepositType, messenger) {
     const { swapTx } = quote.original.quote;
     const { gasLimits: quoteGasLimits, is7702 } = quote.original.metamask;
     const { from } = quote.request;
@@ -60,19 +62,56 @@ async function submitTransactions(quote, parentTransactionId, acrossDepositType,
         quote: quote.original.quote,
         swapType: acrossDepositType,
     });
+    const shouldPrependOriginalTransaction = quote.request.isPostQuote === true &&
+        parentTransaction.txParams.to !== undefined;
+    const hasPrependedOriginalGasLimit = shouldPrependOriginalTransaction &&
+        !is7702 &&
+        quoteGasLimits.length > orderedTransactions.length;
+    const gasLimitOffset = hasPrependedOriginalGasLimit ? 1 : 0;
+    const transactionCount = orderedTransactions.length + (shouldPrependOriginalTransaction ? 1 : 0);
     const networkClientId = messenger.call('NetworkController:findNetworkClientIdByChainId', chainId);
-    const batchGasLimit = is7702 && orderedTransactions.length > 1
+    const is7702Batch = is7702 && transactionCount > 1;
+    const canUseQuotedBatchGasLimit = is7702Batch &&
+        (!shouldPrependOriginalTransaction ||
+            hasOriginalTransactionGas(parentTransaction));
+    const batchGasLimit = canUseQuotedBatchGasLimit
         ? quoteGasLimits[0]?.max
         : undefined;
-    if (is7702 && orderedTransactions.length > 1 && batchGasLimit === undefined) {
+    if (canUseQuotedBatchGasLimit && batchGasLimit === undefined) {
         throw new Error('Missing quote gas limit for Across 7702 batch');
     }
-    const gasLimit7702 = batchGasLimit === undefined ? undefined : toHex(batchGasLimit);
-    const transactions = orderedTransactions.map((transaction, index) => {
-        const gasLimit = gasLimit7702 ? undefined : quoteGasLimits[index]?.max;
-        if (gasLimit === undefined && !gasLimit7702) {
+    const quotedGasLimit7702 = batchGasLimit === undefined ? undefined : toHex(batchGasLimit);
+    const parentHasAuthorizationList = Boolean(parentTransaction.txParams.authorizationList?.length);
+    const shouldUseGasFeeToken7702Submit = shouldEstimate7702SubmitBatch(parentTransaction, quote)
+        ? accountSupports7702(messenger, from)
+        : false;
+    const shouldUse7702Submit = [
+        Boolean(quotedGasLimit7702),
+        is7702Batch,
+        parentHasAuthorizationList,
+        shouldUseGasFeeToken7702Submit,
+    ].some(Boolean);
+    const shouldEstimateGasLimit7702 = !quotedGasLimit7702 && shouldUse7702Submit;
+    const estimatedGasLimit7702 = shouldEstimateGasLimit7702
+        ? await estimateSubmitBatchGasLimit7702({
+            chainId,
+            from,
+            messenger,
+            orderedTransactions,
+            parentTransaction,
+            shouldPrependOriginalTransaction,
+        })
+        : undefined;
+    const gasLimit7702 = quotedGasLimit7702 ?? estimatedGasLimit7702;
+    const submitAs7702 = shouldUse7702Submit || Boolean(gasLimit7702);
+    const acrossTransactions = orderedTransactions.map((transaction, index) => {
+        const gasLimit = submitAs7702
+            ? undefined
+            : quoteGasLimits[index + gasLimitOffset]?.max;
+        if (gasLimit === undefined && !submitAs7702) {
+            const quoteGasIndex = index + gasLimitOffset;
             const errorMessage = transaction.kind === 'approval'
-                ? `Missing quote gas limit for Across approval transaction at index ${index}`
+                ? `Missing quote gas limit for Across approval transaction at index ${quoteGasIndex}`
                 : 'Missing quote gas limit for Across swap transaction';
             throw new Error(errorMessage);
         }
@@ -89,11 +128,19 @@ async function submitTransactions(quote, parentTransactionId, acrossDepositType,
             type: transaction.type ?? acrossDepositType,
         };
     });
+    const originalTransaction = shouldPrependOriginalTransaction
+        ? [
+            buildOriginalTransaction(parentTransaction, submitAs7702 || !hasPrependedOriginalGasLimit
+                ? undefined
+                : quoteGasLimits[0]?.max),
+        ]
+        : [];
+    const transactions = [...originalTransaction, ...acrossTransactions];
     const transactionIds = [];
     const { end } = collectTransactionIds(chainId, from, messenger, (transactionId) => {
         transactionIds.push(transactionId);
         updateTransaction({
-            transactionId: parentTransactionId,
+            transactionId: parentTransaction.id,
             messenger,
             note: 'Add required transaction ID from Across submission',
         }, (tx) => {
@@ -105,9 +152,11 @@ async function submitTransactions(quote, parentTransactionId, acrossDepositType,
     const gasFeeToken = quote.fees.isSourceGasFeeToken
         ? quote.request.sourceTokenAddress
         : undefined;
+    const excludeNativeTokenForFee = gasFeeToken ? true : undefined;
     try {
         if (transactions.length === 1) {
             result = await messenger.call('TransactionController:addTransaction', transactions[0].params, {
+                excludeNativeTokenForFee,
                 gasFeeToken,
                 networkClientId,
                 origin: ORIGIN_METAMASK,
@@ -121,9 +170,10 @@ async function submitTransactions(quote, parentTransactionId, acrossDepositType,
                 type,
             }));
             await messenger.call('TransactionController:addTransactionBatch', {
-                disable7702: !gasLimit7702,
-                disableHook: Boolean(gasLimit7702),
-                disableSequential: Boolean(gasLimit7702),
+                disable7702: !submitAs7702,
+                disableHook: submitAs7702,
+                disableSequential: submitAs7702,
+                excludeNativeTokenForFee,
                 from,
                 gasFeeToken,
                 gasLimit7702,
@@ -147,6 +197,13 @@ async function submitTransactions(quote, parentTransactionId, acrossDepositType,
         : undefined;
     return await waitForAcrossCompletion(hash, messenger);
 }
+/**
+ * Poll Across until a submitted deposit reaches a terminal status.
+ *
+ * @param transactionHash - Source-chain deposit transaction hash.
+ * @param messenger - Controller messenger.
+ * @returns Destination/fill transaction hash when available, otherwise the source hash.
+ */
 async function waitForAcrossCompletion(transactionHash, messenger) {
     if (!transactionHash) {
         return transactionHash;
@@ -199,8 +256,124 @@ async function waitForAcrossCompletion(transactionHash, messenger) {
         await new Promise((resolve) => setTimeout(resolve, ACROSS_STATUS_POLL_INTERVAL));
     }
 }
-function getAcrossDepositType(transactionType) {
-    switch (transactionType) {
+/**
+ * Check whether submit should estimate a 7702 batch gas limit.
+ *
+ * This is needed for Predict withdraw post-quote flows that pay source-chain
+ * gas with the source token, because the final submit batch can differ from the
+ * batch shape that Across quoted.
+ *
+ * @param parentTransaction - Original transaction metadata.
+ * @param quote - Across quote selected for execution.
+ * @returns Whether submit should try to estimate the final 7702 batch gas.
+ */
+function shouldEstimate7702SubmitBatch(parentTransaction, quote) {
+    return (isPredictWithdrawTransaction(parentTransaction) &&
+        quote.request.isPostQuote === true &&
+        quote.fees.isSourceGasFeeToken === true);
+}
+/**
+ * Estimate the 7702 batch gas limit for the actual submit payload.
+ *
+ * Quotes can contain a combined 7702 gas limit that only covered the Across
+ * approval/swap legs. When submit prepends the original transaction, estimate
+ * the final batch shape so the gas limit covers every submitted leg.
+ *
+ * @param args - Estimation arguments.
+ * @param args.chainId - Source chain ID.
+ * @param args.from - Sender address.
+ * @param args.messenger - Controller messenger.
+ * @param args.orderedTransactions - Across approval/swap legs in submission order.
+ * @param args.parentTransaction - Original transaction that may be prepended.
+ * @param args.shouldPrependOriginalTransaction - Whether to include the original transaction in the estimate.
+ * @returns Hex gas limit, or `undefined` when estimation is unavailable.
+ */
+async function estimateSubmitBatchGasLimit7702({ chainId, from, messenger, orderedTransactions, parentTransaction, shouldPrependOriginalTransaction, }) {
+    if (!accountSupports7702(messenger, from)) {
+        return undefined;
+    }
+    const originalTransaction = shouldPrependOriginalTransaction
+        ? [buildOriginalTransaction(parentTransaction)]
+        : [];
+    const acrossTransactions = orderedTransactions.map((transaction) => ({
+        params: buildTransactionParams(from, {
+            chainId: transaction.chainId,
+            data: transaction.data,
+            maxFeePerGas: transaction.maxFeePerGas,
+            maxPriorityFeePerGas: transaction.maxPriorityFeePerGas,
+            to: transaction.to,
+            value: transaction.value,
+        }),
+        type: transaction.type,
+    }));
+    const transactions = [...originalTransaction, ...acrossTransactions];
+    try {
+        const result = await messenger.call('TransactionController:estimateGasBatch', {
+            chainId,
+            from,
+            transactions: transactions.map(({ params }) => toBatchTransactionParams(params)),
+        });
+        if (result.gasLimits.length !== 1) {
+            return undefined;
+        }
+        const gasLimit = Math.ceil(result.gasLimits[0] * getGasBuffer(messenger, chainId));
+        return toHex(gasLimit);
+    }
+    catch {
+        return undefined;
+    }
+}
+/**
+ * Build the original parent transaction as a prepared batch leg.
+ *
+ * @param transaction - Original transaction metadata.
+ * @param gasLimit - Optional gas limit to pin on the original leg.
+ * @returns Prepared transaction params and transaction type for the original leg.
+ */
+function buildOriginalTransaction(transaction, gasLimit) {
+    return {
+        params: {
+            data: transaction.txParams.data,
+            from: transaction.txParams.from,
+            gas: gasLimit === undefined ? undefined : toHex(gasLimit),
+            to: transaction.txParams.to,
+            value: transaction.txParams.value,
+        },
+        type: getOriginalTransactionType(transaction),
+    };
+}
+/**
+ * Get the transaction type to use for the original batch leg.
+ *
+ * @param transaction - Original transaction metadata.
+ * @returns `predictWithdraw` for Predict withdrawals; otherwise the original type.
+ */
+function getOriginalTransactionType(transaction) {
+    if (isPredictWithdrawTransaction(transaction)) {
+        return TransactionType.predictWithdraw;
+    }
+    return transaction.type;
+}
+/**
+ * Check whether the original transaction already has a usable gas limit.
+ *
+ * @param transaction - Original transaction metadata.
+ * @returns Whether the original or nested transaction gas is a positive integer.
+ */
+function hasOriginalTransactionGas(transaction) {
+    return getOriginalTransactionGas(transaction) !== undefined;
+}
+/**
+ * Get the transaction type for the Across bridge/deposit leg.
+ *
+ * @param transaction - Original parent transaction.
+ * @returns Across-specific transaction type for known flows, or the original type.
+ */
+function getAcrossDepositType(transaction) {
+    if (isPredictWithdrawTransaction(transaction)) {
+        return TransactionType.predictAcrossWithdraw;
+    }
+    switch (transaction.type) {
         case TransactionType.perpsDeposit:
             return TransactionType.perpsAcrossDeposit;
         case TransactionType.predictDeposit:
@@ -208,9 +381,23 @@ function getAcrossDepositType(transactionType) {
         case undefined:
             return TransactionType.perpsAcrossDeposit;
         default:
-            return transactionType;
+            return transaction.type;
     }
 }
+/**
+ * Build TransactionController params for an Across approval or swap leg.
+ *
+ * @param from - Sender address.
+ * @param params - Across transaction fields.
+ * @param params.chainId - Source chain ID.
+ * @param params.data - Transaction calldata.
+ * @param params.gasLimit - Optional gas limit.
+ * @param params.to - Recipient contract address.
+ * @param params.value - Optional native value.
+ * @param params.maxFeePerGas - Optional EIP-1559 max fee.
+ * @param params.maxPriorityFeePerGas - Optional EIP-1559 priority fee.
+ * @returns TransactionController params.
+ */
 function buildTransactionParams(from, params) {
     const value = toHex(params.value ?? '0x0');
     return {
@@ -223,12 +410,24 @@ function buildTransactionParams(from, params) {
         value,
     };
 }
+/**
+ * Normalize an optional numeric string or hex string into a hex value.
+ *
+ * @param value - Optional value to normalize.
+ * @returns Hex value, or `undefined` when no value is provided.
+ */
 function normalizeOptionalHex(value) {
     if (value === undefined) {
         return undefined;
     }
     return toHex(value);
 }
+/**
+ * Convert full TransactionController params into batch transaction params.
+ *
+ * @param params - Transaction params.
+ * @returns Batch-compatible transaction params.
+ */
 function toBatchTransactionParams(params) {
     return {
         data: params.data,

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

@@ -1 +1 @@
-{"version":3,"file":"across-submit.mjs","sourceRoot":"","sources":["../../../src/strategy/across/across-submit.ts"],"names":[],"mappings":"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","sourcesContent":["import {\n  ORIGIN_METAMASK,\n  successfulFetch,\n  toHex,\n} from '@metamask/controller-utils';\nimport { TransactionType } from '@metamask/transaction-controller';\nimport type {\n  BatchTransactionParams,\n  TransactionMeta,\n  TransactionParams,\n} from '@metamask/transaction-controller';\nimport type { Hex } from '@metamask/utils';\nimport { createModuleLogger } from '@metamask/utils';\n\nimport { projectLogger } from '../../logger';\nimport type {\n  PayStrategyExecuteRequest,\n  TransactionPayControllerMessenger,\n  TransactionPayQuote,\n} from '../../types';\nimport { getPayStrategiesConfig } from '../../utils/feature-flags';\nimport {\n  collectTransactionIds,\n  getTransaction,\n  updateTransaction,\n  waitForTransactionConfirmed,\n} from '../../utils/transaction';\nimport { getAcrossOrderedTransactions } from './transactions';\nimport type { AcrossQuote } from './types';\n\nconst log = createModuleLogger(projectLogger, 'across-strategy');\nconst ACROSS_STATUS_POLL_INTERVAL = 1000;\n\ntype PreparedAcrossTransaction = {\n  params: TransactionParams;\n  type: TransactionType;\n};\n\n/**\n * Submit Across quotes.\n *\n * @param request - Request object.\n * @returns An object containing the transaction hash if available.\n */\nexport async function submitAcrossQuotes(\n  request: PayStrategyExecuteRequest<AcrossQuote>,\n): Promise<{ transactionHash?: Hex }> {\n  log('Executing quotes', request);\n\n  const { quotes, messenger, transaction } = request;\n  let transactionHash: Hex | undefined;\n\n  for (const quote of quotes) {\n    ({ transactionHash } = await executeSingleQuote(\n      quote,\n      messenger,\n      transaction,\n    ));\n  }\n\n  return { transactionHash };\n}\n\nasync function executeSingleQuote(\n  quote: TransactionPayQuote<AcrossQuote>,\n  messenger: TransactionPayControllerMessenger,\n  transaction: TransactionMeta,\n): Promise<{ transactionHash?: Hex }> {\n  log('Executing single quote', quote);\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  const acrossDepositType = getAcrossDepositType(transaction.type);\n  const transactionHash = await submitTransactions(\n    quote,\n    transaction.id,\n    acrossDepositType,\n    messenger,\n  );\n\n  updateTransaction(\n    {\n      transactionId: transaction.id,\n      messenger,\n      note: 'Intent complete after Across submission',\n    },\n    (tx) => {\n      tx.isIntentComplete = true;\n    },\n  );\n\n  return { transactionHash };\n}\n\n/**\n * Submit transactions for an Across quote.\n *\n * @param quote - Across quote.\n * @param parentTransactionId - ID of the parent transaction.\n * @param acrossDepositType - Transaction type used for the swap/deposit step.\n * @param messenger - Controller messenger.\n * @returns Hash of the last submitted transaction, if available.\n */\nasync function submitTransactions(\n  quote: TransactionPayQuote<AcrossQuote>,\n  parentTransactionId: string,\n  acrossDepositType: TransactionType,\n  messenger: TransactionPayControllerMessenger,\n): Promise<Hex | undefined> {\n  const { swapTx } = quote.original.quote;\n  const { gasLimits: quoteGasLimits, is7702 } = quote.original.metamask;\n  const { from } = quote.request;\n  const chainId = toHex(swapTx.chainId);\n  const orderedTransactions = getAcrossOrderedTransactions({\n    quote: quote.original.quote,\n    swapType: acrossDepositType,\n  });\n\n  const networkClientId = messenger.call(\n    'NetworkController:findNetworkClientIdByChainId',\n    chainId,\n  );\n\n  const batchGasLimit =\n    is7702 && orderedTransactions.length > 1\n      ? quoteGasLimits[0]?.max\n      : undefined;\n\n  if (is7702 && orderedTransactions.length > 1 && batchGasLimit === undefined) {\n    throw new Error('Missing quote gas limit for Across 7702 batch');\n  }\n\n  const gasLimit7702 =\n    batchGasLimit === undefined ? undefined : toHex(batchGasLimit);\n\n  const transactions: PreparedAcrossTransaction[] = orderedTransactions.map(\n    (transaction, index) => {\n      const gasLimit = gasLimit7702 ? undefined : quoteGasLimits[index]?.max;\n\n      if (gasLimit === undefined && !gasLimit7702) {\n        const errorMessage =\n          transaction.kind === 'approval'\n            ? `Missing quote gas limit for Across approval transaction at index ${index}`\n            : 'Missing quote gas limit for Across swap transaction';\n\n        throw new Error(errorMessage);\n      }\n\n      return {\n        params: buildTransactionParams(from, {\n          chainId: transaction.chainId,\n          data: transaction.data,\n          gasLimit,\n          maxFeePerGas: transaction.maxFeePerGas,\n          maxPriorityFeePerGas: transaction.maxPriorityFeePerGas,\n          to: transaction.to,\n          value: transaction.value,\n        }),\n        type: transaction.type ?? acrossDepositType,\n      };\n    },\n  );\n\n  const transactionIds: string[] = [];\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 Across submission',\n        },\n        (tx) => {\n          tx.requiredTransactionIds ??= [];\n          tx.requiredTransactionIds.push(transactionId);\n        },\n      );\n    },\n  );\n\n  let result: { result: Promise<string> } | undefined;\n  const gasFeeToken = quote.fees.isSourceGasFeeToken\n    ? quote.request.sourceTokenAddress\n    : undefined;\n\n  try {\n    if (transactions.length === 1) {\n      result = await messenger.call(\n        'TransactionController:addTransaction',\n        transactions[0].params,\n        {\n          gasFeeToken,\n          networkClientId,\n          origin: ORIGIN_METAMASK,\n          requireApproval: false,\n          type: transactions[0].type,\n        },\n      );\n    } else {\n      const batchTransactions = transactions.map(({ params, type }) => ({\n        params: toBatchTransactionParams(params),\n        type,\n      }));\n\n      await messenger.call('TransactionController:addTransactionBatch', {\n        disable7702: !gasLimit7702,\n        disableHook: Boolean(gasLimit7702),\n        disableSequential: Boolean(gasLimit7702),\n        from,\n        gasFeeToken,\n        gasLimit7702,\n        networkClientId,\n        origin: ORIGIN_METAMASK,\n        requireApproval: false,\n        transactions: batchTransactions,\n      });\n    }\n  } finally {\n    end();\n  }\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  const hash = transactionIds.length\n    ? getTransaction(transactionIds.slice(-1)[0], messenger)?.hash\n    : undefined;\n\n  return await waitForAcrossCompletion(hash as Hex | undefined, messenger);\n}\n\ntype AcrossStatusResponse = {\n  depositId?: number | string;\n  depositTxnRef?: Hex;\n  status?: string;\n  destinationTxHash?: Hex;\n  fillTxnRef?: Hex;\n  fillTxHash?: Hex;\n  txHash?: Hex;\n};\n\nasync function waitForAcrossCompletion(\n  transactionHash: Hex | undefined,\n  messenger: TransactionPayControllerMessenger,\n): Promise<Hex | undefined> {\n  if (!transactionHash) {\n    return transactionHash;\n  }\n\n  const config = getPayStrategiesConfig(messenger);\n  const params = new URLSearchParams({\n    depositTxnRef: transactionHash,\n  });\n  const url = `${config.across.apiBase}/deposit/status?${params.toString()}`;\n\n  let attempt = 0;\n\n  while (true) {\n    attempt += 1;\n    let status: AcrossStatusResponse;\n\n    try {\n      const response = await successfulFetch(url, {\n        method: 'GET',\n        headers: {\n          Accept: 'application/json',\n        },\n      });\n      status = (await response.json()) as AcrossStatusResponse;\n    } catch (error) {\n      log('Across status polling request failed', {\n        attempt,\n        error: String(error),\n        transactionHash,\n      });\n\n      await new Promise((resolve) =>\n        setTimeout(resolve, ACROSS_STATUS_POLL_INTERVAL),\n      );\n      continue;\n    }\n\n    const normalizedStatus = status.status?.toLowerCase();\n\n    log('Polled Across status', {\n      attempt,\n      status: normalizedStatus,\n      transactionHash,\n    });\n\n    if (\n      normalizedStatus &&\n      ['completed', 'filled', 'success'].includes(normalizedStatus)\n    ) {\n      return (\n        status.destinationTxHash ??\n        status.fillTxnRef ??\n        status.fillTxHash ??\n        status.txHash ??\n        transactionHash\n      );\n    }\n\n    if (\n      normalizedStatus &&\n      ['error', 'failed', 'refund', 'refunded'].includes(normalizedStatus)\n    ) {\n      throw new Error(`Across request failed with status: ${normalizedStatus}`);\n    }\n\n    await new Promise((resolve) =>\n      setTimeout(resolve, ACROSS_STATUS_POLL_INTERVAL),\n    );\n  }\n}\n\nfunction getAcrossDepositType(\n  transactionType?: TransactionType,\n): TransactionType {\n  switch (transactionType) {\n    case TransactionType.perpsDeposit:\n      return TransactionType.perpsAcrossDeposit;\n    case TransactionType.predictDeposit:\n      return TransactionType.predictAcrossDeposit;\n    case undefined:\n      return TransactionType.perpsAcrossDeposit;\n    default:\n      return transactionType;\n  }\n}\n\nfunction buildTransactionParams(\n  from: Hex,\n  params: {\n    chainId: number;\n    data: Hex;\n    gasLimit?: number;\n    to: Hex;\n    value?: Hex;\n    maxFeePerGas?: string;\n    maxPriorityFeePerGas?: string;\n  },\n): TransactionParams {\n  const value = toHex(params.value ?? '0x0');\n\n  return {\n    data: params.data,\n    from,\n    gas: params.gasLimit === undefined ? undefined : toHex(params.gasLimit),\n    maxFeePerGas: normalizeOptionalHex(params.maxFeePerGas),\n    maxPriorityFeePerGas: normalizeOptionalHex(params.maxPriorityFeePerGas),\n    to: params.to,\n    value,\n  };\n}\n\nfunction normalizeOptionalHex(value?: string): Hex | undefined {\n  if (value === undefined) {\n    return undefined;\n  }\n\n  return toHex(value);\n}\n\nfunction toBatchTransactionParams(\n  params: TransactionParams,\n): BatchTransactionParams {\n  return {\n    data: params.data as Hex | undefined,\n    gas: params.gas as Hex | undefined,\n    maxFeePerGas: params.maxFeePerGas as Hex | undefined,\n    maxPriorityFeePerGas: params.maxPriorityFeePerGas as Hex | undefined,\n    to: params.to as Hex | undefined,\n    value: params.value as Hex | undefined,\n  };\n}\n"]}
+{"version":3,"file":"across-submit.mjs","sourceRoot":"","sources":["../../../src/strategy/across/across-submit.ts"],"names":[],"mappings":"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","sourcesContent":["import {\n  ORIGIN_METAMASK,\n  successfulFetch,\n  toHex,\n} from '@metamask/controller-utils';\nimport { TransactionType } from '@metamask/transaction-controller';\nimport type {\n  BatchTransactionParams,\n  TransactionMeta,\n  TransactionParams,\n} from '@metamask/transaction-controller';\nimport type { Hex } from '@metamask/utils';\nimport { createModuleLogger } from '@metamask/utils';\n\nimport { projectLogger } from '../../logger';\nimport type {\n  PayStrategyExecuteRequest,\n  TransactionPayControllerMessenger,\n  TransactionPayQuote,\n} from '../../types';\nimport { accountSupports7702 } from '../../utils/7702';\nimport { getPayStrategiesConfig } from '../../utils/feature-flags';\nimport { getGasBuffer } from '../../utils/feature-flags';\nimport {\n  collectTransactionIds,\n  getTransaction,\n  updateTransaction,\n  isPredictWithdrawTransaction,\n  waitForTransactionConfirmed,\n} from '../../utils/transaction';\nimport {\n  getAcrossOrderedTransactions,\n  getOriginalTransactionGas,\n} from './transactions';\nimport type { AcrossQuote } from './types';\n\nconst log = createModuleLogger(projectLogger, 'across-strategy');\nconst ACROSS_STATUS_POLL_INTERVAL = 1000;\n\ntype PreparedAcrossTransaction = {\n  params: TransactionParams;\n  type: TransactionMeta['type'];\n};\n\n/**\n * Submit Across quotes.\n *\n * @param request - Request object.\n * @returns An object containing the transaction hash if available.\n */\nexport async function submitAcrossQuotes(\n  request: PayStrategyExecuteRequest<AcrossQuote>,\n): Promise<{ transactionHash?: Hex }> {\n  log('Executing quotes', request);\n\n  const { quotes, messenger, transaction } = request;\n  let transactionHash: Hex | undefined;\n\n  for (const quote of quotes) {\n    ({ transactionHash } = await executeSingleQuote(\n      quote,\n      messenger,\n      transaction,\n    ));\n  }\n\n  return { transactionHash };\n}\n\nasync function executeSingleQuote(\n  quote: TransactionPayQuote<AcrossQuote>,\n  messenger: TransactionPayControllerMessenger,\n  transaction: TransactionMeta,\n): Promise<{ transactionHash?: Hex }> {\n  log('Executing single quote', quote);\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  const acrossDepositType = getAcrossDepositType(transaction);\n  const transactionHash = await submitTransactions(\n    quote,\n    transaction,\n    acrossDepositType,\n    messenger,\n  );\n\n  updateTransaction(\n    {\n      transactionId: transaction.id,\n      messenger,\n      note: 'Intent complete after Across submission',\n    },\n    (tx) => {\n      tx.isIntentComplete = true;\n    },\n  );\n\n  return { transactionHash };\n}\n\n/**\n * Submit transactions for an Across quote.\n *\n * @param quote - Across quote.\n * @param parentTransaction - Parent transaction.\n * @param acrossDepositType - Transaction type used for the swap/deposit step.\n * @param messenger - Controller messenger.\n * @returns Hash of the last submitted transaction, if available.\n */\nasync function submitTransactions(\n  quote: TransactionPayQuote<AcrossQuote>,\n  parentTransaction: TransactionMeta,\n  acrossDepositType: TransactionType,\n  messenger: TransactionPayControllerMessenger,\n): Promise<Hex | undefined> {\n  const { swapTx } = quote.original.quote;\n  const { gasLimits: quoteGasLimits, is7702 } = quote.original.metamask;\n  const { from } = quote.request;\n  const chainId = toHex(swapTx.chainId);\n  const orderedTransactions = getAcrossOrderedTransactions({\n    quote: quote.original.quote,\n    swapType: acrossDepositType,\n  });\n  const shouldPrependOriginalTransaction =\n    quote.request.isPostQuote === true &&\n    parentTransaction.txParams.to !== undefined;\n  const hasPrependedOriginalGasLimit =\n    shouldPrependOriginalTransaction &&\n    !is7702 &&\n    quoteGasLimits.length > orderedTransactions.length;\n  const gasLimitOffset = hasPrependedOriginalGasLimit ? 1 : 0;\n  const transactionCount =\n    orderedTransactions.length + (shouldPrependOriginalTransaction ? 1 : 0);\n\n  const networkClientId = messenger.call(\n    'NetworkController:findNetworkClientIdByChainId',\n    chainId,\n  );\n\n  const is7702Batch = is7702 && transactionCount > 1;\n  const canUseQuotedBatchGasLimit =\n    is7702Batch &&\n    (!shouldPrependOriginalTransaction ||\n      hasOriginalTransactionGas(parentTransaction));\n  const batchGasLimit = canUseQuotedBatchGasLimit\n    ? quoteGasLimits[0]?.max\n    : undefined;\n\n  if (canUseQuotedBatchGasLimit && batchGasLimit === undefined) {\n    throw new Error('Missing quote gas limit for Across 7702 batch');\n  }\n\n  const quotedGasLimit7702 =\n    batchGasLimit === undefined ? undefined : toHex(batchGasLimit);\n  const parentHasAuthorizationList = Boolean(\n    parentTransaction.txParams.authorizationList?.length,\n  );\n\n  const shouldUseGasFeeToken7702Submit = shouldEstimate7702SubmitBatch(\n    parentTransaction,\n    quote,\n  )\n    ? accountSupports7702(messenger, from)\n    : false;\n  const shouldUse7702Submit = [\n    Boolean(quotedGasLimit7702),\n    is7702Batch,\n    parentHasAuthorizationList,\n    shouldUseGasFeeToken7702Submit,\n  ].some(Boolean);\n\n  const shouldEstimateGasLimit7702 = !quotedGasLimit7702 && shouldUse7702Submit;\n\n  const estimatedGasLimit7702 = shouldEstimateGasLimit7702\n    ? await estimateSubmitBatchGasLimit7702({\n        chainId,\n        from,\n        messenger,\n        orderedTransactions,\n        parentTransaction,\n        shouldPrependOriginalTransaction,\n      })\n    : undefined;\n\n  const gasLimit7702 = quotedGasLimit7702 ?? estimatedGasLimit7702;\n  const submitAs7702 = shouldUse7702Submit || Boolean(gasLimit7702);\n\n  const acrossTransactions: PreparedAcrossTransaction[] =\n    orderedTransactions.map((transaction, index) => {\n      const gasLimit = submitAs7702\n        ? undefined\n        : quoteGasLimits[index + gasLimitOffset]?.max;\n\n      if (gasLimit === undefined && !submitAs7702) {\n        const quoteGasIndex = index + gasLimitOffset;\n        const errorMessage =\n          transaction.kind === 'approval'\n            ? `Missing quote gas limit for Across approval transaction at index ${quoteGasIndex}`\n            : 'Missing quote gas limit for Across swap transaction';\n\n        throw new Error(errorMessage);\n      }\n\n      return {\n        params: buildTransactionParams(from, {\n          chainId: transaction.chainId,\n          data: transaction.data,\n          gasLimit,\n          maxFeePerGas: transaction.maxFeePerGas,\n          maxPriorityFeePerGas: transaction.maxPriorityFeePerGas,\n          to: transaction.to,\n          value: transaction.value,\n        }),\n        type: transaction.type ?? acrossDepositType,\n      };\n    });\n  const originalTransaction = shouldPrependOriginalTransaction\n    ? [\n        buildOriginalTransaction(\n          parentTransaction,\n          submitAs7702 || !hasPrependedOriginalGasLimit\n            ? undefined\n            : quoteGasLimits[0]?.max,\n        ),\n      ]\n    : [];\n  const transactions = [...originalTransaction, ...acrossTransactions];\n\n  const transactionIds: string[] = [];\n\n  const { end } = collectTransactionIds(\n    chainId,\n    from,\n    messenger,\n    (transactionId) => {\n      transactionIds.push(transactionId);\n\n      updateTransaction(\n        {\n          transactionId: parentTransaction.id,\n          messenger,\n          note: 'Add required transaction ID from Across submission',\n        },\n        (tx) => {\n          tx.requiredTransactionIds ??= [];\n          tx.requiredTransactionIds.push(transactionId);\n        },\n      );\n    },\n  );\n\n  let result: { result: Promise<string> } | undefined;\n  const gasFeeToken = quote.fees.isSourceGasFeeToken\n    ? quote.request.sourceTokenAddress\n    : undefined;\n  const excludeNativeTokenForFee = gasFeeToken ? true : undefined;\n\n  try {\n    if (transactions.length === 1) {\n      result = await messenger.call(\n        'TransactionController:addTransaction',\n        transactions[0].params,\n        {\n          excludeNativeTokenForFee,\n          gasFeeToken,\n          networkClientId,\n          origin: ORIGIN_METAMASK,\n          requireApproval: false,\n          type: transactions[0].type,\n        },\n      );\n    } else {\n      const batchTransactions = transactions.map(({ params, type }) => ({\n        params: toBatchTransactionParams(params),\n        type,\n      }));\n\n      await messenger.call('TransactionController:addTransactionBatch', {\n        disable7702: !submitAs7702,\n        disableHook: submitAs7702,\n        disableSequential: submitAs7702,\n        excludeNativeTokenForFee,\n        from,\n        gasFeeToken,\n        gasLimit7702,\n        networkClientId,\n        origin: ORIGIN_METAMASK,\n        requireApproval: false,\n        transactions: batchTransactions,\n      });\n    }\n  } finally {\n    end();\n  }\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  const hash = transactionIds.length\n    ? getTransaction(transactionIds.slice(-1)[0], messenger)?.hash\n    : undefined;\n\n  return await waitForAcrossCompletion(hash as Hex | undefined, messenger);\n}\n\ntype AcrossStatusResponse = {\n  depositId?: number | string;\n  depositTxnRef?: Hex;\n  status?: string;\n  destinationTxHash?: Hex;\n  fillTxnRef?: Hex;\n  fillTxHash?: Hex;\n  txHash?: Hex;\n};\n\n/**\n * Poll Across until a submitted deposit reaches a terminal status.\n *\n * @param transactionHash - Source-chain deposit transaction hash.\n * @param messenger - Controller messenger.\n * @returns Destination/fill transaction hash when available, otherwise the source hash.\n */\nasync function waitForAcrossCompletion(\n  transactionHash: Hex | undefined,\n  messenger: TransactionPayControllerMessenger,\n): Promise<Hex | undefined> {\n  if (!transactionHash) {\n    return transactionHash;\n  }\n\n  const config = getPayStrategiesConfig(messenger);\n  const params = new URLSearchParams({\n    depositTxnRef: transactionHash,\n  });\n  const url = `${config.across.apiBase}/deposit/status?${params.toString()}`;\n\n  let attempt = 0;\n\n  while (true) {\n    attempt += 1;\n    let status: AcrossStatusResponse;\n\n    try {\n      const response = await successfulFetch(url, {\n        method: 'GET',\n        headers: {\n          Accept: 'application/json',\n        },\n      });\n      status = (await response.json()) as AcrossStatusResponse;\n    } catch (error) {\n      log('Across status polling request failed', {\n        attempt,\n        error: String(error),\n        transactionHash,\n      });\n\n      await new Promise((resolve) =>\n        setTimeout(resolve, ACROSS_STATUS_POLL_INTERVAL),\n      );\n      continue;\n    }\n\n    const normalizedStatus = status.status?.toLowerCase();\n\n    log('Polled Across status', {\n      attempt,\n      status: normalizedStatus,\n      transactionHash,\n    });\n\n    if (\n      normalizedStatus &&\n      ['completed', 'filled', 'success'].includes(normalizedStatus)\n    ) {\n      return (\n        status.destinationTxHash ??\n        status.fillTxnRef ??\n        status.fillTxHash ??\n        status.txHash ??\n        transactionHash\n      );\n    }\n\n    if (\n      normalizedStatus &&\n      ['error', 'failed', 'refund', 'refunded'].includes(normalizedStatus)\n    ) {\n      throw new Error(`Across request failed with status: ${normalizedStatus}`);\n    }\n\n    await new Promise((resolve) =>\n      setTimeout(resolve, ACROSS_STATUS_POLL_INTERVAL),\n    );\n  }\n}\n\n/**\n * Check whether submit should estimate a 7702 batch gas limit.\n *\n * This is needed for Predict withdraw post-quote flows that pay source-chain\n * gas with the source token, because the final submit batch can differ from the\n * batch shape that Across quoted.\n *\n * @param parentTransaction - Original transaction metadata.\n * @param quote - Across quote selected for execution.\n * @returns Whether submit should try to estimate the final 7702 batch gas.\n */\nfunction shouldEstimate7702SubmitBatch(\n  parentTransaction: TransactionMeta,\n  quote: TransactionPayQuote<AcrossQuote>,\n): boolean {\n  return (\n    isPredictWithdrawTransaction(parentTransaction) &&\n    quote.request.isPostQuote === true &&\n    quote.fees.isSourceGasFeeToken === true\n  );\n}\n\n/**\n * Estimate the 7702 batch gas limit for the actual submit payload.\n *\n * Quotes can contain a combined 7702 gas limit that only covered the Across\n * approval/swap legs. When submit prepends the original transaction, estimate\n * the final batch shape so the gas limit covers every submitted leg.\n *\n * @param args - Estimation arguments.\n * @param args.chainId - Source chain ID.\n * @param args.from - Sender address.\n * @param args.messenger - Controller messenger.\n * @param args.orderedTransactions - Across approval/swap legs in submission order.\n * @param args.parentTransaction - Original transaction that may be prepended.\n * @param args.shouldPrependOriginalTransaction - Whether to include the original transaction in the estimate.\n * @returns Hex gas limit, or `undefined` when estimation is unavailable.\n */\nasync function estimateSubmitBatchGasLimit7702({\n  chainId,\n  from,\n  messenger,\n  orderedTransactions,\n  parentTransaction,\n  shouldPrependOriginalTransaction,\n}: {\n  chainId: Hex;\n  from: Hex;\n  messenger: TransactionPayControllerMessenger;\n  orderedTransactions: ReturnType<typeof getAcrossOrderedTransactions>;\n  parentTransaction: TransactionMeta;\n  shouldPrependOriginalTransaction: boolean;\n}): Promise<Hex | undefined> {\n  if (!accountSupports7702(messenger, from)) {\n    return undefined;\n  }\n\n  const originalTransaction = shouldPrependOriginalTransaction\n    ? [buildOriginalTransaction(parentTransaction)]\n    : [];\n\n  const acrossTransactions = orderedTransactions.map((transaction) => ({\n    params: buildTransactionParams(from, {\n      chainId: transaction.chainId,\n      data: transaction.data,\n      maxFeePerGas: transaction.maxFeePerGas,\n      maxPriorityFeePerGas: transaction.maxPriorityFeePerGas,\n      to: transaction.to,\n      value: transaction.value,\n    }),\n    type: transaction.type,\n  }));\n\n  const transactions = [...originalTransaction, ...acrossTransactions];\n\n  try {\n    const result = await messenger.call(\n      'TransactionController:estimateGasBatch',\n      {\n        chainId,\n        from,\n        transactions: transactions.map(({ params }) =>\n          toBatchTransactionParams(params),\n        ),\n      },\n    );\n\n    if (result.gasLimits.length !== 1) {\n      return undefined;\n    }\n\n    const gasLimit = Math.ceil(\n      result.gasLimits[0] * getGasBuffer(messenger, chainId),\n    );\n\n    return toHex(gasLimit);\n  } catch {\n    return undefined;\n  }\n}\n\n/**\n * Build the original parent transaction as a prepared batch leg.\n *\n * @param transaction - Original transaction metadata.\n * @param gasLimit - Optional gas limit to pin on the original leg.\n * @returns Prepared transaction params and transaction type for the original leg.\n */\nfunction buildOriginalTransaction(\n  transaction: TransactionMeta,\n  gasLimit?: number,\n): PreparedAcrossTransaction {\n  return {\n    params: {\n      data: transaction.txParams.data,\n      from: transaction.txParams.from,\n      gas: gasLimit === undefined ? undefined : toHex(gasLimit),\n      to: transaction.txParams.to,\n      value: transaction.txParams.value,\n    } as TransactionParams,\n    type: getOriginalTransactionType(transaction),\n  };\n}\n\n/**\n * Get the transaction type to use for the original batch leg.\n *\n * @param transaction - Original transaction metadata.\n * @returns `predictWithdraw` for Predict withdrawals; otherwise the original type.\n */\nfunction getOriginalTransactionType(\n  transaction: TransactionMeta,\n): TransactionMeta['type'] {\n  if (isPredictWithdrawTransaction(transaction)) {\n    return TransactionType.predictWithdraw;\n  }\n\n  return transaction.type;\n}\n\n/**\n * Check whether the original transaction already has a usable gas limit.\n *\n * @param transaction - Original transaction metadata.\n * @returns Whether the original or nested transaction gas is a positive integer.\n */\nfunction hasOriginalTransactionGas(transaction: TransactionMeta): boolean {\n  return getOriginalTransactionGas(transaction) !== undefined;\n}\n\n/**\n * Get the transaction type for the Across bridge/deposit leg.\n *\n * @param transaction - Original parent transaction.\n * @returns Across-specific transaction type for known flows, or the original type.\n */\nfunction getAcrossDepositType(transaction: TransactionMeta): TransactionType {\n  if (isPredictWithdrawTransaction(transaction)) {\n    return TransactionType.predictAcrossWithdraw;\n  }\n\n  switch (transaction.type) {\n    case TransactionType.perpsDeposit:\n      return TransactionType.perpsAcrossDeposit;\n    case TransactionType.predictDeposit:\n      return TransactionType.predictAcrossDeposit;\n    case undefined:\n      return TransactionType.perpsAcrossDeposit;\n    default:\n      return transaction.type as TransactionType;\n  }\n}\n\n/**\n * Build TransactionController params for an Across approval or swap leg.\n *\n * @param from - Sender address.\n * @param params - Across transaction fields.\n * @param params.chainId - Source chain ID.\n * @param params.data - Transaction calldata.\n * @param params.gasLimit - Optional gas limit.\n * @param params.to - Recipient contract address.\n * @param params.value - Optional native value.\n * @param params.maxFeePerGas - Optional EIP-1559 max fee.\n * @param params.maxPriorityFeePerGas - Optional EIP-1559 priority fee.\n * @returns TransactionController params.\n */\nfunction buildTransactionParams(\n  from: Hex,\n  params: {\n    chainId: number;\n    data: Hex;\n    gasLimit?: number;\n    to: Hex;\n    value?: Hex;\n    maxFeePerGas?: string;\n    maxPriorityFeePerGas?: string;\n  },\n): TransactionParams {\n  const value = toHex(params.value ?? '0x0');\n\n  return {\n    data: params.data,\n    from,\n    gas: params.gasLimit === undefined ? undefined : toHex(params.gasLimit),\n    maxFeePerGas: normalizeOptionalHex(params.maxFeePerGas),\n    maxPriorityFeePerGas: normalizeOptionalHex(params.maxPriorityFeePerGas),\n    to: params.to,\n    value,\n  };\n}\n\n/**\n * Normalize an optional numeric string or hex string into a hex value.\n *\n * @param value - Optional value to normalize.\n * @returns Hex value, or `undefined` when no value is provided.\n */\nfunction normalizeOptionalHex(value?: string): Hex | undefined {\n  if (value === undefined) {\n    return undefined;\n  }\n\n  return toHex(value);\n}\n\n/**\n * Convert full TransactionController params into batch transaction params.\n *\n * @param params - Transaction params.\n * @returns Batch-compatible transaction params.\n */\nfunction toBatchTransactionParams(\n  params: TransactionParams,\n): BatchTransactionParams {\n  return {\n    data: params.data as Hex | undefined,\n    gas: params.gas as Hex | undefined,\n    maxFeePerGas: params.maxFeePerGas as Hex | undefined,\n    maxPriorityFeePerGas: params.maxPriorityFeePerGas as Hex | undefined,\n    to: params.to as Hex | undefined,\n    value: params.value as Hex | undefined,\n  };\n}\n"]}

package/dist/strategy/across/transactions.cjs

@@ -1,7 +1,8 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.getAcrossOrderedTransactions = void 0;
+exports.getOriginalTransactionGas = exports.getAcrossOrderedTransactions = void 0;
 const transaction_controller_1 = require("@metamask/transaction-controller");
+const bignumber_js_1 = require("bignumber.js");
 function getAcrossOrderedTransactions({ quote, swapType, }) {
     const swapChainId = quote.swapTx.chainId;
     const approvalTransactions = (quote.approvalTxns ?? []).map((approval) => ({
@@ -20,4 +21,23 @@ function getAcrossOrderedTransactions({ quote, swapType, }) {
     ];
 }
 exports.getAcrossOrderedTransactions = getAcrossOrderedTransactions;
+/**
+ * Get a usable gas limit from the original or nested transaction.
+ *
+ * @param transaction - Original transaction metadata.
+ * @returns Positive integer gas limit if present, otherwise undefined.
+ */
+function getOriginalTransactionGas(transaction) {
+    const nestedGas = transaction.nestedTransactions?.find((tx) => tx.gas)?.gas;
+    const rawGas = nestedGas ?? transaction.txParams.gas;
+    if (rawGas === undefined) {
+        return undefined;
+    }
+    const gas = new bignumber_js_1.BigNumber(rawGas);
+    if (!gas.isFinite() || gas.isNaN() || !gas.isInteger() || gas.lte(0)) {
+        return undefined;
+    }
+    return gas.toNumber();
+}
+exports.getOriginalTransactionGas = getOriginalTransactionGas;
 //# sourceMappingURL=transactions.cjs.map

package/dist/strategy/across/transactions.cjs.map

@@ -1 +1 @@
-{"version":3,"file":"transactions.cjs","sourceRoot":"","sources":["../../../src/strategy/across/transactions.ts"],"names":[],"mappings":";;;AAAA,6EAAmE;AAgBnE,SAAgB,4BAA4B,CAAC,EAC3C,KAAK,EACL,QAAQ,GAIT;IACC,MAAM,WAAW,GAAG,KAAK,CAAC,MAAM,CAAC,OAAO,CAAC;IACzC,MAAM,oBAAoB,GAAG,CAAC,KAAK,CAAC,YAAY,IAAI,EAAE,CAAC,CAAC,GAAG,CAAC,CAAC,QAAQ,EAAE,EAAE,CAAC,CAAC;QACzE,GAAG,QAAQ;QACX,OAAO,EAAE,QAAQ,CAAC,OAAO,IAAI,WAAW;QACxC,IAAI,EAAE,UAAmB;QACzB,IAAI,EAAE,wCAAe,CAAC,kBAAkB;KACzC,CAAC,CAAC,CAAC;IAEJ,OAAO;QACL,GAAG,oBAAoB;QACvB;YACE,GAAG,KAAK,CAAC,MAAM;YACf,IAAI,EAAE,MAAM;YACZ,IAAI,EAAE,QAAQ;SACf;KACF,CAAC;AACJ,CAAC;AAvBD,oEAuBC","sourcesContent":["import { TransactionType } from '@metamask/transaction-controller';\n\nimport type { AcrossSwapApprovalResponse } from './types';\n\nexport type AcrossOrderedTransaction = {\n  chainId: number;\n  data: `0x${string}`;\n  gas?: string;\n  kind: 'approval' | 'swap';\n  maxFeePerGas?: string;\n  maxPriorityFeePerGas?: string;\n  to: `0x${string}`;\n  type?: TransactionType;\n  value?: `0x${string}`;\n};\n\nexport function getAcrossOrderedTransactions({\n  quote,\n  swapType,\n}: {\n  quote: AcrossSwapApprovalResponse;\n  swapType?: TransactionType;\n}): AcrossOrderedTransaction[] {\n  const swapChainId = quote.swapTx.chainId;\n  const approvalTransactions = (quote.approvalTxns ?? []).map((approval) => ({\n    ...approval,\n    chainId: approval.chainId ?? swapChainId,\n    kind: 'approval' as const,\n    type: TransactionType.tokenMethodApprove,\n  }));\n\n  return [\n    ...approvalTransactions,\n    {\n      ...quote.swapTx,\n      kind: 'swap',\n      type: swapType,\n    },\n  ];\n}\n"]}
+{"version":3,"file":"transactions.cjs","sourceRoot":"","sources":["../../../src/strategy/across/transactions.ts"],"names":[],"mappings":";;;AAAA,6EAAmE;AAEnE,+CAAyC;AAgBzC,SAAgB,4BAA4B,CAAC,EAC3C,KAAK,EACL,QAAQ,GAIT;IACC,MAAM,WAAW,GAAG,KAAK,CAAC,MAAM,CAAC,OAAO,CAAC;IACzC,MAAM,oBAAoB,GAAG,CAAC,KAAK,CAAC,YAAY,IAAI,EAAE,CAAC,CAAC,GAAG,CAAC,CAAC,QAAQ,EAAE,EAAE,CAAC,CAAC;QACzE,GAAG,QAAQ;QACX,OAAO,EAAE,QAAQ,CAAC,OAAO,IAAI,WAAW;QACxC,IAAI,EAAE,UAAmB;QACzB,IAAI,EAAE,wCAAe,CAAC,kBAAkB;KACzC,CAAC,CAAC,CAAC;IAEJ,OAAO;QACL,GAAG,oBAAoB;QACvB;YACE,GAAG,KAAK,CAAC,MAAM;YACf,IAAI,EAAE,MAAM;YACZ,IAAI,EAAE,QAAQ;SACf;KACF,CAAC;AACJ,CAAC;AAvBD,oEAuBC;AAED;;;;;GAKG;AACH,SAAgB,yBAAyB,CACvC,WAA4B;IAE5B,MAAM,SAAS,GAAG,WAAW,CAAC,kBAAkB,EAAE,IAAI,CAAC,CAAC,EAAE,EAAE,EAAE,CAAC,EAAE,CAAC,GAAG,CAAC,EAAE,GAAG,CAAC;IAC5E,MAAM,MAAM,GAAG,SAAS,IAAI,WAAW,CAAC,QAAQ,CAAC,GAAG,CAAC;IAErD,IAAI,MAAM,KAAK,SAAS,EAAE,CAAC;QACzB,OAAO,SAAS,CAAC;IACnB,CAAC;IAED,MAAM,GAAG,GAAG,IAAI,wBAAS,CAAC,MAAM,CAAC,CAAC;IAElC,IAAI,CAAC,GAAG,CAAC,QAAQ,EAAE,IAAI,GAAG,CAAC,KAAK,EAAE,IAAI,CAAC,GAAG,CAAC,SAAS,EAAE,IAAI,GAAG,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC;QACrE,OAAO,SAAS,CAAC;IACnB,CAAC;IAED,OAAO,GAAG,CAAC,QAAQ,EAAE,CAAC;AACxB,CAAC;AAjBD,8DAiBC","sourcesContent":["import { TransactionType } from '@metamask/transaction-controller';\nimport type { TransactionMeta } from '@metamask/transaction-controller';\nimport { BigNumber } from 'bignumber.js';\n\nimport type { AcrossSwapApprovalResponse } from './types';\n\nexport type AcrossOrderedTransaction = {\n  chainId: number;\n  data: `0x${string}`;\n  gas?: string;\n  kind: 'approval' | 'swap';\n  maxFeePerGas?: string;\n  maxPriorityFeePerGas?: string;\n  to: `0x${string}`;\n  type?: TransactionType;\n  value?: `0x${string}`;\n};\n\nexport function getAcrossOrderedTransactions({\n  quote,\n  swapType,\n}: {\n  quote: AcrossSwapApprovalResponse;\n  swapType?: TransactionType;\n}): AcrossOrderedTransaction[] {\n  const swapChainId = quote.swapTx.chainId;\n  const approvalTransactions = (quote.approvalTxns ?? []).map((approval) => ({\n    ...approval,\n    chainId: approval.chainId ?? swapChainId,\n    kind: 'approval' as const,\n    type: TransactionType.tokenMethodApprove,\n  }));\n\n  return [\n    ...approvalTransactions,\n    {\n      ...quote.swapTx,\n      kind: 'swap',\n      type: swapType,\n    },\n  ];\n}\n\n/**\n * Get a usable gas limit from the original or nested transaction.\n *\n * @param transaction - Original transaction metadata.\n * @returns Positive integer gas limit if present, otherwise undefined.\n */\nexport function getOriginalTransactionGas(\n  transaction: TransactionMeta,\n): number | undefined {\n  const nestedGas = transaction.nestedTransactions?.find((tx) => tx.gas)?.gas;\n  const rawGas = nestedGas ?? transaction.txParams.gas;\n\n  if (rawGas === undefined) {\n    return undefined;\n  }\n\n  const gas = new BigNumber(rawGas);\n\n  if (!gas.isFinite() || gas.isNaN() || !gas.isInteger() || gas.lte(0)) {\n    return undefined;\n  }\n\n  return gas.toNumber();\n}\n"]}

package/dist/strategy/across/transactions.d.cts

@@ -1,4 +1,5 @@
 import { TransactionType } from "@metamask/transaction-controller";
+import type { TransactionMeta } from "@metamask/transaction-controller";
 import type { AcrossSwapApprovalResponse } from "./types.cjs";
 export type AcrossOrderedTransaction = {
     chainId: number;
@@ -15,4 +16,11 @@ export declare function getAcrossOrderedTransactions({ quote, swapType, }: {
     quote: AcrossSwapApprovalResponse;
     swapType?: TransactionType;
 }): AcrossOrderedTransaction[];
+/**
+ * Get a usable gas limit from the original or nested transaction.
+ *
+ * @param transaction - Original transaction metadata.
+ * @returns Positive integer gas limit if present, otherwise undefined.
+ */
+export declare function getOriginalTransactionGas(transaction: TransactionMeta): number | undefined;
 //# sourceMappingURL=transactions.d.cts.map

package/dist/strategy/across/transactions.d.cts.map

@@ -1 +1 @@
-{"version":3,"file":"transactions.d.cts","sourceRoot":"","sources":["../../../src/strategy/across/transactions.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,eAAe,EAAE,yCAAyC;AAEnE,OAAO,KAAK,EAAE,0BAA0B,EAAE,oBAAgB;AAE1D,MAAM,MAAM,wBAAwB,GAAG;IACrC,OAAO,EAAE,MAAM,CAAC;IAChB,IAAI,EAAE,KAAK,MAAM,EAAE,CAAC;IACpB,GAAG,CAAC,EAAE,MAAM,CAAC;IACb,IAAI,EAAE,UAAU,GAAG,MAAM,CAAC;IAC1B,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB,oBAAoB,CAAC,EAAE,MAAM,CAAC;IAC9B,EAAE,EAAE,KAAK,MAAM,EAAE,CAAC;IAClB,IAAI,CAAC,EAAE,eAAe,CAAC;IACvB,KAAK,CAAC,EAAE,KAAK,MAAM,EAAE,CAAC;CACvB,CAAC;AAEF,wBAAgB,4BAA4B,CAAC,EAC3C,KAAK,EACL,QAAQ,GACT,EAAE;IACD,KAAK,EAAE,0BAA0B,CAAC;IAClC,QAAQ,CAAC,EAAE,eAAe,CAAC;CAC5B,GAAG,wBAAwB,EAAE,CAiB7B"}
+{"version":3,"file":"transactions.d.cts","sourceRoot":"","sources":["../../../src/strategy/across/transactions.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,eAAe,EAAE,yCAAyC;AACnE,OAAO,KAAK,EAAE,eAAe,EAAE,yCAAyC;AAGxE,OAAO,KAAK,EAAE,0BAA0B,EAAE,oBAAgB;AAE1D,MAAM,MAAM,wBAAwB,GAAG;IACrC,OAAO,EAAE,MAAM,CAAC;IAChB,IAAI,EAAE,KAAK,MAAM,EAAE,CAAC;IACpB,GAAG,CAAC,EAAE,MAAM,CAAC;IACb,IAAI,EAAE,UAAU,GAAG,MAAM,CAAC;IAC1B,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB,oBAAoB,CAAC,EAAE,MAAM,CAAC;IAC9B,EAAE,EAAE,KAAK,MAAM,EAAE,CAAC;IAClB,IAAI,CAAC,EAAE,eAAe,CAAC;IACvB,KAAK,CAAC,EAAE,KAAK,MAAM,EAAE,CAAC;CACvB,CAAC;AAEF,wBAAgB,4BAA4B,CAAC,EAC3C,KAAK,EACL,QAAQ,GACT,EAAE;IACD,KAAK,EAAE,0BAA0B,CAAC;IAClC,QAAQ,CAAC,EAAE,eAAe,CAAC;CAC5B,GAAG,wBAAwB,EAAE,CAiB7B;AAED;;;;;GAKG;AACH,wBAAgB,yBAAyB,CACvC,WAAW,EAAE,eAAe,GAC3B,MAAM,GAAG,SAAS,CAepB"}

package/dist/strategy/across/transactions.d.mts

@@ -1,4 +1,5 @@
 import { TransactionType } from "@metamask/transaction-controller";
+import type { TransactionMeta } from "@metamask/transaction-controller";
 import type { AcrossSwapApprovalResponse } from "./types.mjs";
 export type AcrossOrderedTransaction = {
     chainId: number;
@@ -15,4 +16,11 @@ export declare function getAcrossOrderedTransactions({ quote, swapType, }: {
     quote: AcrossSwapApprovalResponse;
     swapType?: TransactionType;
 }): AcrossOrderedTransaction[];
+/**
+ * Get a usable gas limit from the original or nested transaction.
+ *
+ * @param transaction - Original transaction metadata.
+ * @returns Positive integer gas limit if present, otherwise undefined.
+ */
+export declare function getOriginalTransactionGas(transaction: TransactionMeta): number | undefined;
 //# sourceMappingURL=transactions.d.mts.map

package/dist/strategy/across/transactions.d.mts.map

@@ -1 +1 @@
-{"version":3,"file":"transactions.d.mts","sourceRoot":"","sources":["../../../src/strategy/across/transactions.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,eAAe,EAAE,yCAAyC;AAEnE,OAAO,KAAK,EAAE,0BAA0B,EAAE,oBAAgB;AAE1D,MAAM,MAAM,wBAAwB,GAAG;IACrC,OAAO,EAAE,MAAM,CAAC;IAChB,IAAI,EAAE,KAAK,MAAM,EAAE,CAAC;IACpB,GAAG,CAAC,EAAE,MAAM,CAAC;IACb,IAAI,EAAE,UAAU,GAAG,MAAM,CAAC;IAC1B,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB,oBAAoB,CAAC,EAAE,MAAM,CAAC;IAC9B,EAAE,EAAE,KAAK,MAAM,EAAE,CAAC;IAClB,IAAI,CAAC,EAAE,eAAe,CAAC;IACvB,KAAK,CAAC,EAAE,KAAK,MAAM,EAAE,CAAC;CACvB,CAAC;AAEF,wBAAgB,4BAA4B,CAAC,EAC3C,KAAK,EACL,QAAQ,GACT,EAAE;IACD,KAAK,EAAE,0BAA0B,CAAC;IAClC,QAAQ,CAAC,EAAE,eAAe,CAAC;CAC5B,GAAG,wBAAwB,EAAE,CAiB7B"}
+{"version":3,"file":"transactions.d.mts","sourceRoot":"","sources":["../../../src/strategy/across/transactions.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,eAAe,EAAE,yCAAyC;AACnE,OAAO,KAAK,EAAE,eAAe,EAAE,yCAAyC;AAGxE,OAAO,KAAK,EAAE,0BAA0B,EAAE,oBAAgB;AAE1D,MAAM,MAAM,wBAAwB,GAAG;IACrC,OAAO,EAAE,MAAM,CAAC;IAChB,IAAI,EAAE,KAAK,MAAM,EAAE,CAAC;IACpB,GAAG,CAAC,EAAE,MAAM,CAAC;IACb,IAAI,EAAE,UAAU,GAAG,MAAM,CAAC;IAC1B,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB,oBAAoB,CAAC,EAAE,MAAM,CAAC;IAC9B,EAAE,EAAE,KAAK,MAAM,EAAE,CAAC;IAClB,IAAI,CAAC,EAAE,eAAe,CAAC;IACvB,KAAK,CAAC,EAAE,KAAK,MAAM,EAAE,CAAC;CACvB,CAAC;AAEF,wBAAgB,4BAA4B,CAAC,EAC3C,KAAK,EACL,QAAQ,GACT,EAAE;IACD,KAAK,EAAE,0BAA0B,CAAC;IAClC,QAAQ,CAAC,EAAE,eAAe,CAAC;CAC5B,GAAG,wBAAwB,EAAE,CAiB7B;AAED;;;;;GAKG;AACH,wBAAgB,yBAAyB,CACvC,WAAW,EAAE,eAAe,GAC3B,MAAM,GAAG,SAAS,CAepB"}

package/dist/strategy/across/transactions.mjs

@@ -1,4 +1,5 @@
 import { TransactionType } from "@metamask/transaction-controller";
+import { BigNumber } from "bignumber.js";
 export function getAcrossOrderedTransactions({ quote, swapType, }) {
     const swapChainId = quote.swapTx.chainId;
     const approvalTransactions = (quote.approvalTxns ?? []).map((approval) => ({
@@ -16,4 +17,22 @@ export function getAcrossOrderedTransactions({ quote, swapType, }) {
         },
     ];
 }
+/**
+ * Get a usable gas limit from the original or nested transaction.
+ *
+ * @param transaction - Original transaction metadata.
+ * @returns Positive integer gas limit if present, otherwise undefined.
+ */
+export function getOriginalTransactionGas(transaction) {
+    const nestedGas = transaction.nestedTransactions?.find((tx) => tx.gas)?.gas;
+    const rawGas = nestedGas ?? transaction.txParams.gas;
+    if (rawGas === undefined) {
+        return undefined;
+    }
+    const gas = new BigNumber(rawGas);
+    if (!gas.isFinite() || gas.isNaN() || !gas.isInteger() || gas.lte(0)) {
+        return undefined;
+    }
+    return gas.toNumber();
+}
 //# sourceMappingURL=transactions.mjs.map

package/dist/strategy/across/transactions.mjs.map

@@ -1 +1 @@
-{"version":3,"file":"transactions.mjs","sourceRoot":"","sources":["../../../src/strategy/across/transactions.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,eAAe,EAAE,yCAAyC;AAgBnE,MAAM,UAAU,4BAA4B,CAAC,EAC3C,KAAK,EACL,QAAQ,GAIT;IACC,MAAM,WAAW,GAAG,KAAK,CAAC,MAAM,CAAC,OAAO,CAAC;IACzC,MAAM,oBAAoB,GAAG,CAAC,KAAK,CAAC,YAAY,IAAI,EAAE,CAAC,CAAC,GAAG,CAAC,CAAC,QAAQ,EAAE,EAAE,CAAC,CAAC;QACzE,GAAG,QAAQ;QACX,OAAO,EAAE,QAAQ,CAAC,OAAO,IAAI,WAAW;QACxC,IAAI,EAAE,UAAmB;QACzB,IAAI,EAAE,eAAe,CAAC,kBAAkB;KACzC,CAAC,CAAC,CAAC;IAEJ,OAAO;QACL,GAAG,oBAAoB;QACvB;YACE,GAAG,KAAK,CAAC,MAAM;YACf,IAAI,EAAE,MAAM;YACZ,IAAI,EAAE,QAAQ;SACf;KACF,CAAC;AACJ,CAAC","sourcesContent":["import { TransactionType } from '@metamask/transaction-controller';\n\nimport type { AcrossSwapApprovalResponse } from './types';\n\nexport type AcrossOrderedTransaction = {\n  chainId: number;\n  data: `0x${string}`;\n  gas?: string;\n  kind: 'approval' | 'swap';\n  maxFeePerGas?: string;\n  maxPriorityFeePerGas?: string;\n  to: `0x${string}`;\n  type?: TransactionType;\n  value?: `0x${string}`;\n};\n\nexport function getAcrossOrderedTransactions({\n  quote,\n  swapType,\n}: {\n  quote: AcrossSwapApprovalResponse;\n  swapType?: TransactionType;\n}): AcrossOrderedTransaction[] {\n  const swapChainId = quote.swapTx.chainId;\n  const approvalTransactions = (quote.approvalTxns ?? []).map((approval) => ({\n    ...approval,\n    chainId: approval.chainId ?? swapChainId,\n    kind: 'approval' as const,\n    type: TransactionType.tokenMethodApprove,\n  }));\n\n  return [\n    ...approvalTransactions,\n    {\n      ...quote.swapTx,\n      kind: 'swap',\n      type: swapType,\n    },\n  ];\n}\n"]}
+{"version":3,"file":"transactions.mjs","sourceRoot":"","sources":["../../../src/strategy/across/transactions.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,eAAe,EAAE,yCAAyC;AAEnE,OAAO,EAAE,SAAS,EAAE,qBAAqB;AAgBzC,MAAM,UAAU,4BAA4B,CAAC,EAC3C,KAAK,EACL,QAAQ,GAIT;IACC,MAAM,WAAW,GAAG,KAAK,CAAC,MAAM,CAAC,OAAO,CAAC;IACzC,MAAM,oBAAoB,GAAG,CAAC,KAAK,CAAC,YAAY,IAAI,EAAE,CAAC,CAAC,GAAG,CAAC,CAAC,QAAQ,EAAE,EAAE,CAAC,CAAC;QACzE,GAAG,QAAQ;QACX,OAAO,EAAE,QAAQ,CAAC,OAAO,IAAI,WAAW;QACxC,IAAI,EAAE,UAAmB;QACzB,IAAI,EAAE,eAAe,CAAC,kBAAkB;KACzC,CAAC,CAAC,CAAC;IAEJ,OAAO;QACL,GAAG,oBAAoB;QACvB;YACE,GAAG,KAAK,CAAC,MAAM;YACf,IAAI,EAAE,MAAM;YACZ,IAAI,EAAE,QAAQ;SACf;KACF,CAAC;AACJ,CAAC;AAED;;;;;GAKG;AACH,MAAM,UAAU,yBAAyB,CACvC,WAA4B;IAE5B,MAAM,SAAS,GAAG,WAAW,CAAC,kBAAkB,EAAE,IAAI,CAAC,CAAC,EAAE,EAAE,EAAE,CAAC,EAAE,CAAC,GAAG,CAAC,EAAE,GAAG,CAAC;IAC5E,MAAM,MAAM,GAAG,SAAS,IAAI,WAAW,CAAC,QAAQ,CAAC,GAAG,CAAC;IAErD,IAAI,MAAM,KAAK,SAAS,EAAE,CAAC;QACzB,OAAO,SAAS,CAAC;IACnB,CAAC;IAED,MAAM,GAAG,GAAG,IAAI,SAAS,CAAC,MAAM,CAAC,CAAC;IAElC,IAAI,CAAC,GAAG,CAAC,QAAQ,EAAE,IAAI,GAAG,CAAC,KAAK,EAAE,IAAI,CAAC,GAAG,CAAC,SAAS,EAAE,IAAI,GAAG,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC;QACrE,OAAO,SAAS,CAAC;IACnB,CAAC;IAED,OAAO,GAAG,CAAC,QAAQ,EAAE,CAAC;AACxB,CAAC","sourcesContent":["import { TransactionType } from '@metamask/transaction-controller';\nimport type { TransactionMeta } from '@metamask/transaction-controller';\nimport { BigNumber } from 'bignumber.js';\n\nimport type { AcrossSwapApprovalResponse } from './types';\n\nexport type AcrossOrderedTransaction = {\n  chainId: number;\n  data: `0x${string}`;\n  gas?: string;\n  kind: 'approval' | 'swap';\n  maxFeePerGas?: string;\n  maxPriorityFeePerGas?: string;\n  to: `0x${string}`;\n  type?: TransactionType;\n  value?: `0x${string}`;\n};\n\nexport function getAcrossOrderedTransactions({\n  quote,\n  swapType,\n}: {\n  quote: AcrossSwapApprovalResponse;\n  swapType?: TransactionType;\n}): AcrossOrderedTransaction[] {\n  const swapChainId = quote.swapTx.chainId;\n  const approvalTransactions = (quote.approvalTxns ?? []).map((approval) => ({\n    ...approval,\n    chainId: approval.chainId ?? swapChainId,\n    kind: 'approval' as const,\n    type: TransactionType.tokenMethodApprove,\n  }));\n\n  return [\n    ...approvalTransactions,\n    {\n      ...quote.swapTx,\n      kind: 'swap',\n      type: swapType,\n    },\n  ];\n}\n\n/**\n * Get a usable gas limit from the original or nested transaction.\n *\n * @param transaction - Original transaction metadata.\n * @returns Positive integer gas limit if present, otherwise undefined.\n */\nexport function getOriginalTransactionGas(\n  transaction: TransactionMeta,\n): number | undefined {\n  const nestedGas = transaction.nestedTransactions?.find((tx) => tx.gas)?.gas;\n  const rawGas = nestedGas ?? transaction.txParams.gas;\n\n  if (rawGas === undefined) {\n    return undefined;\n  }\n\n  const gas = new BigNumber(rawGas);\n\n  if (!gas.isFinite() || gas.isNaN() || !gas.isInteger() || gas.lte(0)) {\n    return undefined;\n  }\n\n  return gas.toNumber();\n}\n"]}

package/dist/utils/feature-flags.cjs

@@ -244,7 +244,7 @@ exports.getPayStrategiesConfig = getPayStrategiesConfig;
 function isRelayExecuteEnabled(messenger) {
     const state = messenger.call('RemoteFeatureFlagController:getState');
     const featureFlags = state.remoteFeatureFlags?.confirmations_pay ?? {};
-    return featureFlags.payStrategies?.relay?.gaslessEnabled ?? false;
+    return featureFlags.payStrategies?.relay?.isGaslessEnabled ?? false;
 }
 exports.isRelayExecuteEnabled = isRelayExecuteEnabled;
 /**