@metamask-previews/transaction-pay-controller 19.2.1-preview-5e99f980f → 19.2.1-preview-42c8fd288

package/CHANGELOG.md

@@ -11,6 +11,10 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 - Bump `@metamask/assets-controllers` from `^104.0.0` to `^104.1.0` ([#8509](https://github.com/MetaMask/core/pull/8509))
 
+### Fixed
+
+- Route Across status polling through the configured Across API base and support `depositTxnRef`/`fillTxnRef` for Across status responses ([#8512](https://github.com/MetaMask/core/pull/8512))
+
 ## [19.2.1]
 
 ### Fixed

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

@@ -144,17 +144,15 @@ async function submitTransactions(quote, parentTransactionId, acrossDepositType,
     const hash = transactionIds.length
         ? (0, transaction_1.getTransaction)(transactionIds.slice(-1)[0], messenger)?.hash
         : undefined;
-    return await waitForAcrossCompletion(quote.original, hash, messenger);
+    return await waitForAcrossCompletion(hash, messenger);
 }
-async function waitForAcrossCompletion(quote, transactionHash, messenger) {
-    if (!transactionHash || !quote.quote.id) {
+async function waitForAcrossCompletion(transactionHash, messenger) {
+    if (!transactionHash) {
         return transactionHash;
     }
     const config = (0, feature_flags_1.getPayStrategiesConfig)(messenger);
     const params = new URLSearchParams({
-        depositId: quote.quote.id,
-        originChainId: String(quote.quote.swapTx.chainId),
-        txHash: transactionHash,
+        depositTxnRef: transactionHash,
     });
     const url = `${config.across.apiBase}/deposit/status?${params.toString()}`;
     let attempt = 0;
@@ -188,6 +186,7 @@ async function waitForAcrossCompletion(quote, transactionHash, messenger) {
         if (normalizedStatus &&
             ['completed', 'filled', 'success'].includes(normalizedStatus)) {
             return (status.destinationTxHash ??
+                status.fillTxnRef ??
                 status.fillTxHash ??
                 status.txHash ??
                 transactionHash);

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

@@ -1 +1 @@
-{"version":3,"file":"across-submit.cjs","sourceRoot":"","sources":["../../../src/strategy/across/across-submit.ts"],"names":[],"mappings":";;;AAAA,iEAIoC;AACpC,6EAAmE;AAOnE,2CAAqD;AAErD,6CAA6C;AAM7C,iEAAmE;AACnE,6DAKiC;AACjC,qDAA8D;AAG9D,MAAM,GAAG,GAAG,IAAA,0BAAkB,EAAC,sBAAa,EAAE,iBAAiB,CAAC,CAAC;AACjE,MAAM,2BAA2B,GAAG,IAAI,CAAC;AAOzC;;;;;GAKG;AACI,KAAK,UAAU,kBAAkB,CACtC,OAA+C;IAE/C,GAAG,CAAC,kBAAkB,EAAE,OAAO,CAAC,CAAC;IAEjC,MAAM,EAAE,MAAM,EAAE,SAAS,EAAE,WAAW,EAAE,GAAG,OAAO,CAAC;IACnD,IAAI,eAAgC,CAAC;IAErC,KAAK,MAAM,KAAK,IAAI,MAAM,EAAE,CAAC;QAC3B,CAAC,EAAE,eAAe,EAAE,GAAG,MAAM,kBAAkB,CAC7C,KAAK,EACL,SAAS,EACT,WAAW,CACZ,CAAC,CAAC;IACL,CAAC;IAED,OAAO,EAAE,eAAe,EAAE,CAAC;AAC7B,CAAC;AAjBD,gDAiBC;AAED,KAAK,UAAU,kBAAkB,CAC/B,KAAuC,EACvC,SAA4C,EAC5C,WAA4B;IAE5B,GAAG,CAAC,wBAAwB,EAAE,KAAK,CAAC,CAAC;IAErC,IAAA,+BAAiB,EACf;QACE,aAAa,EAAE,WAAW,CAAC,EAAE;QAC7B,SAAS;QACT,IAAI,EAAE,uCAAuC;KAC9C,EACD,CAAC,EAAE,EAAE,EAAE;QACL,EAAE,CAAC,QAAQ,CAAC,KAAK,GAAG,SAAS,CAAC;IAChC,CAAC,CACF,CAAC;IAEF,MAAM,iBAAiB,GAAG,oBAAoB,CAAC,WAAW,CAAC,IAAI,CAAC,CAAC;IACjE,MAAM,eAAe,GAAG,MAAM,kBAAkB,CAC9C,KAAK,EACL,WAAW,CAAC,EAAE,EACd,iBAAiB,EACjB,SAAS,CACV,CAAC;IAEF,IAAA,+BAAiB,EACf;QACE,aAAa,EAAE,WAAW,CAAC,EAAE;QAC7B,SAAS;QACT,IAAI,EAAE,yCAAyC;KAChD,EACD,CAAC,EAAE,EAAE,EAAE;QACL,EAAE,CAAC,gBAAgB,GAAG,IAAI,CAAC;IAC7B,CAAC,CACF,CAAC;IAEF,OAAO,EAAE,eAAe,EAAE,CAAC;AAC7B,CAAC;AAED;;;;;;;;GAQG;AACH,KAAK,UAAU,kBAAkB,CAC/B,KAAuC,EACvC,mBAA2B,EAC3B,iBAAkC,EAClC,SAA4C;IAE5C,MAAM,EAAE,MAAM,EAAE,GAAG,KAAK,CAAC,QAAQ,CAAC,KAAK,CAAC;IACxC,MAAM,EAAE,SAAS,EAAE,cAAc,EAAE,MAAM,EAAE,GAAG,KAAK,CAAC,QAAQ,CAAC,QAAQ,CAAC;IACtE,MAAM,EAAE,IAAI,EAAE,GAAG,KAAK,CAAC,OAAO,CAAC;IAC/B,MAAM,OAAO,GAAG,IAAA,wBAAK,EAAC,MAAM,CAAC,OAAO,CAAC,CAAC;IACtC,MAAM,mBAAmB,GAAG,IAAA,2CAA4B,EAAC;QACvD,KAAK,EAAE,KAAK,CAAC,QAAQ,CAAC,KAAK;QAC3B,QAAQ,EAAE,iBAAiB;KAC5B,CAAC,CAAC;IAEH,MAAM,eAAe,GAAG,SAAS,CAAC,IAAI,CACpC,gDAAgD,EAChD,OAAO,CACR,CAAC;IAEF,MAAM,aAAa,GACjB,MAAM,IAAI,mBAAmB,CAAC,MAAM,GAAG,CAAC;QACtC,CAAC,CAAC,cAAc,CAAC,CAAC,CAAC,EAAE,GAAG;QACxB,CAAC,CAAC,SAAS,CAAC;IAEhB,IAAI,MAAM,IAAI,mBAAmB,CAAC,MAAM,GAAG,CAAC,IAAI,aAAa,KAAK,SAAS,EAAE,CAAC;QAC5E,MAAM,IAAI,KAAK,CAAC,+CAA+C,CAAC,CAAC;IACnE,CAAC;IAED,MAAM,YAAY,GAChB,aAAa,KAAK,SAAS,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,IAAA,wBAAK,EAAC,aAAa,CAAC,CAAC;IAEjE,MAAM,YAAY,GAAgC,mBAAmB,CAAC,GAAG,CACvE,CAAC,WAAW,EAAE,KAAK,EAAE,EAAE;QACrB,MAAM,QAAQ,GAAG,YAAY,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,cAAc,CAAC,KAAK,CAAC,EAAE,GAAG,CAAC;QAEvE,IAAI,QAAQ,KAAK,SAAS,IAAI,CAAC,YAAY,EAAE,CAAC;YAC5C,MAAM,YAAY,GAChB,WAAW,CAAC,IAAI,KAAK,UAAU;gBAC7B,CAAC,CAAC,oEAAoE,KAAK,EAAE;gBAC7E,CAAC,CAAC,qDAAqD,CAAC;YAE5D,MAAM,IAAI,KAAK,CAAC,YAAY,CAAC,CAAC;QAChC,CAAC;QAED,OAAO;YACL,MAAM,EAAE,sBAAsB,CAAC,IAAI,EAAE;gBACnC,OAAO,EAAE,WAAW,CAAC,OAAO;gBAC5B,IAAI,EAAE,WAAW,CAAC,IAAI;gBACtB,QAAQ;gBACR,YAAY,EAAE,WAAW,CAAC,YAAY;gBACtC,oBAAoB,EAAE,WAAW,CAAC,oBAAoB;gBACtD,EAAE,EAAE,WAAW,CAAC,EAAE;gBAClB,KAAK,EAAE,WAAW,CAAC,KAAK;aACzB,CAAC;YACF,IAAI,EAAE,WAAW,CAAC,IAAI,IAAI,iBAAiB;SAC5C,CAAC;IACJ,CAAC,CACF,CAAC;IAEF,MAAM,cAAc,GAAa,EAAE,CAAC;IAEpC,MAAM,EAAE,GAAG,EAAE,GAAG,IAAA,mCAAqB,EACnC,OAAO,EACP,IAAI,EACJ,SAAS,EACT,CAAC,aAAa,EAAE,EAAE;QAChB,cAAc,CAAC,IAAI,CAAC,aAAa,CAAC,CAAC;QAEnC,IAAA,+BAAiB,EACf;YACE,aAAa,EAAE,mBAAmB;YAClC,SAAS;YACT,IAAI,EAAE,oDAAoD;SAC3D,EACD,CAAC,EAAE,EAAE,EAAE;YACL,EAAE,CAAC,sBAAsB,KAAzB,EAAE,CAAC,sBAAsB,GAAK,EAAE,EAAC;YACjC,EAAE,CAAC,sBAAsB,CAAC,IAAI,CAAC,aAAa,CAAC,CAAC;QAChD,CAAC,CACF,CAAC;IACJ,CAAC,CACF,CAAC;IAEF,IAAI,MAA+C,CAAC;IAEpD,IAAI,CAAC;QACH,IAAI,YAAY,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;YAC9B,MAAM,GAAG,MAAM,SAAS,CAAC,IAAI,CAC3B,sCAAsC,EACtC,YAAY,CAAC,CAAC,CAAC,CAAC,MAAM,EACtB;gBACE,eAAe;gBACf,MAAM,EAAE,kCAAe;gBACvB,eAAe,EAAE,KAAK;gBACtB,IAAI,EAAE,YAAY,CAAC,CAAC,CAAC,CAAC,IAAI;aAC3B,CACF,CAAC;QACJ,CAAC;aAAM,CAAC;YACN,MAAM,iBAAiB,GAAG,YAAY,CAAC,GAAG,CAAC,CAAC,EAAE,MAAM,EAAE,IAAI,EAAE,EAAE,EAAE,CAAC,CAAC;gBAChE,MAAM,EAAE,wBAAwB,CAAC,MAAM,CAAC;gBACxC,IAAI;aACL,CAAC,CAAC,CAAC;YAEJ,MAAM,SAAS,CAAC,IAAI,CAAC,2CAA2C,EAAE;gBAChE,WAAW,EAAE,CAAC,YAAY;gBAC1B,WAAW,EAAE,OAAO,CAAC,YAAY,CAAC;gBAClC,iBAAiB,EAAE,OAAO,CAAC,YAAY,CAAC;gBACxC,IAAI;gBACJ,YAAY;gBACZ,eAAe;gBACf,MAAM,EAAE,kCAAe;gBACvB,eAAe,EAAE,KAAK;gBACtB,YAAY,EAAE,iBAAiB;aAChC,CAAC,CAAC;QACL,CAAC;IACH,CAAC;YAAS,CAAC;QACT,GAAG,EAAE,CAAC;IACR,CAAC;IAED,IAAI,MAAM,EAAE,CAAC;QACX,MAAM,MAAM,GAAG,MAAM,MAAM,CAAC,MAAM,CAAC;QACnC,GAAG,CAAC,uBAAuB,EAAE,MAAM,CAAC,CAAC;IACvC,CAAC;IAED,MAAM,OAAO,CAAC,GAAG,CACf,cAAc,CAAC,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,IAAA,yCAA2B,EAAC,IAAI,EAAE,SAAS,CAAC,CAAC,CAC3E,CAAC;IAEF,MAAM,IAAI,GAAG,cAAc,CAAC,MAAM;QAChC,CAAC,CAAC,IAAA,4BAAc,EAAC,cAAc,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,EAAE,SAAS,CAAC,EAAE,IAAI;QAC9D,CAAC,CAAC,SAAS,CAAC;IAEd,OAAO,MAAM,uBAAuB,CAClC,KAAK,CAAC,QAAQ,EACd,IAAuB,EACvB,SAAS,CACV,CAAC;AACJ,CAAC;AASD,KAAK,UAAU,uBAAuB,CACpC,KAAkB,EAClB,eAAgC,EAChC,SAA4C;IAE5C,IAAI,CAAC,eAAe,IAAI,CAAC,KAAK,CAAC,KAAK,CAAC,EAAE,EAAE,CAAC;QACxC,OAAO,eAAe,CAAC;IACzB,CAAC;IAED,MAAM,MAAM,GAAG,IAAA,sCAAsB,EAAC,SAAS,CAAC,CAAC;IACjD,MAAM,MAAM,GAAG,IAAI,eAAe,CAAC;QACjC,SAAS,EAAE,KAAK,CAAC,KAAK,CAAC,EAAE;QACzB,aAAa,EAAE,MAAM,CAAC,KAAK,CAAC,KAAK,CAAC,MAAM,CAAC,OAAO,CAAC;QACjD,MAAM,EAAE,eAAe;KACxB,CAAC,CAAC;IACH,MAAM,GAAG,GAAG,GAAG,MAAM,CAAC,MAAM,CAAC,OAAO,mBAAmB,MAAM,CAAC,QAAQ,EAAE,EAAE,CAAC;IAE3E,IAAI,OAAO,GAAG,CAAC,CAAC;IAEhB,OAAO,IAAI,EAAE,CAAC;QACZ,OAAO,IAAI,CAAC,CAAC;QACb,IAAI,MAA4B,CAAC;QAEjC,IAAI,CAAC;YACH,MAAM,QAAQ,GAAG,MAAM,IAAA,kCAAe,EAAC,GAAG,EAAE;gBAC1C,MAAM,EAAE,KAAK;gBACb,OAAO,EAAE;oBACP,MAAM,EAAE,kBAAkB;iBAC3B;aACF,CAAC,CAAC;YACH,MAAM,GAAG,CAAC,MAAM,QAAQ,CAAC,IAAI,EAAE,CAAyB,CAAC;QAC3D,CAAC;QAAC,OAAO,KAAK,EAAE,CAAC;YACf,GAAG,CAAC,sCAAsC,EAAE;gBAC1C,OAAO;gBACP,KAAK,EAAE,MAAM,CAAC,KAAK,CAAC;gBACpB,eAAe;aAChB,CAAC,CAAC;YAEH,MAAM,IAAI,OAAO,CAAC,CAAC,OAAO,EAAE,EAAE,CAC5B,UAAU,CAAC,OAAO,EAAE,2BAA2B,CAAC,CACjD,CAAC;YACF,SAAS;QACX,CAAC;QAED,MAAM,gBAAgB,GAAG,MAAM,CAAC,MAAM,EAAE,WAAW,EAAE,CAAC;QAEtD,GAAG,CAAC,sBAAsB,EAAE;YAC1B,OAAO;YACP,MAAM,EAAE,gBAAgB;YACxB,eAAe;SAChB,CAAC,CAAC;QAEH,IACE,gBAAgB;YAChB,CAAC,WAAW,EAAE,QAAQ,EAAE,SAAS,CAAC,CAAC,QAAQ,CAAC,gBAAgB,CAAC,EAC7D,CAAC;YACD,OAAO,CACL,MAAM,CAAC,iBAAiB;gBACxB,MAAM,CAAC,UAAU;gBACjB,MAAM,CAAC,MAAM;gBACb,eAAe,CAChB,CAAC;QACJ,CAAC;QAED,IACE,gBAAgB;YAChB,CAAC,OAAO,EAAE,QAAQ,EAAE,QAAQ,EAAE,UAAU,CAAC,CAAC,QAAQ,CAAC,gBAAgB,CAAC,EACpE,CAAC;YACD,MAAM,IAAI,KAAK,CAAC,sCAAsC,gBAAgB,EAAE,CAAC,CAAC;QAC5E,CAAC;QAED,MAAM,IAAI,OAAO,CAAC,CAAC,OAAO,EAAE,EAAE,CAC5B,UAAU,CAAC,OAAO,EAAE,2BAA2B,CAAC,CACjD,CAAC;IACJ,CAAC;AACH,CAAC;AAED,SAAS,oBAAoB,CAC3B,eAAiC;IAEjC,QAAQ,eAAe,EAAE,CAAC;QACxB,KAAK,wCAAe,CAAC,YAAY;YAC/B,OAAO,wCAAe,CAAC,kBAAkB,CAAC;QAC5C,KAAK,wCAAe,CAAC,cAAc;YACjC,OAAO,wCAAe,CAAC,oBAAoB,CAAC;QAC9C,KAAK,SAAS;YACZ,OAAO,wCAAe,CAAC,kBAAkB,CAAC;QAC5C;YACE,OAAO,eAAe,CAAC;IAC3B,CAAC;AACH,CAAC;AAED,SAAS,sBAAsB,CAC7B,IAAS,EACT,MAQC;IAED,MAAM,KAAK,GAAG,IAAA,wBAAK,EAAC,MAAM,CAAC,KAAK,IAAI,KAAK,CAAC,CAAC;IAE3C,OAAO;QACL,IAAI,EAAE,MAAM,CAAC,IAAI;QACjB,IAAI;QACJ,GAAG,EAAE,MAAM,CAAC,QAAQ,KAAK,SAAS,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,IAAA,wBAAK,EAAC,MAAM,CAAC,QAAQ,CAAC;QACvE,YAAY,EAAE,oBAAoB,CAAC,MAAM,CAAC,YAAY,CAAC;QACvD,oBAAoB,EAAE,oBAAoB,CAAC,MAAM,CAAC,oBAAoB,CAAC;QACvE,EAAE,EAAE,MAAM,CAAC,EAAE;QACb,KAAK;KACN,CAAC;AACJ,CAAC;AAED,SAAS,oBAAoB,CAAC,KAAc;IAC1C,IAAI,KAAK,KAAK,SAAS,EAAE,CAAC;QACxB,OAAO,SAAS,CAAC;IACnB,CAAC;IAED,OAAO,IAAA,wBAAK,EAAC,KAAK,CAAC,CAAC;AACtB,CAAC;AAED,SAAS,wBAAwB,CAC/B,MAAyB;IAEzB,OAAO;QACL,IAAI,EAAE,MAAM,CAAC,IAAuB;QACpC,GAAG,EAAE,MAAM,CAAC,GAAsB;QAClC,YAAY,EAAE,MAAM,CAAC,YAA+B;QACpD,oBAAoB,EAAE,MAAM,CAAC,oBAAuC;QACpE,EAAE,EAAE,MAAM,CAAC,EAAqB;QAChC,KAAK,EAAE,MAAM,CAAC,KAAwB;KACvC,CAAC;AACJ,CAAC","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\n  try {\n    if (transactions.length === 1) {\n      result = await messenger.call(\n        'TransactionController:addTransaction',\n        transactions[0].params,\n        {\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        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(\n    quote.original,\n    hash as Hex | undefined,\n    messenger,\n  );\n}\n\ntype AcrossStatusResponse = {\n  status?: string;\n  destinationTxHash?: Hex;\n  fillTxHash?: Hex;\n  txHash?: Hex;\n};\n\nasync function waitForAcrossCompletion(\n  quote: AcrossQuote,\n  transactionHash: Hex | undefined,\n  messenger: TransactionPayControllerMessenger,\n): Promise<Hex | undefined> {\n  if (!transactionHash || !quote.quote.id) {\n    return transactionHash;\n  }\n\n  const config = getPayStrategiesConfig(messenger);\n  const params = new URLSearchParams({\n    depositId: quote.quote.id,\n    originChainId: String(quote.quote.swapTx.chainId),\n    txHash: 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.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.cjs","sourceRoot":"","sources":["../../../src/strategy/across/across-submit.ts"],"names":[],"mappings":";;;AAAA,iEAIoC;AACpC,6EAAmE;AAOnE,2CAAqD;AAErD,6CAA6C;AAM7C,iEAAmE;AACnE,6DAKiC;AACjC,qDAA8D;AAG9D,MAAM,GAAG,GAAG,IAAA,0BAAkB,EAAC,sBAAa,EAAE,iBAAiB,CAAC,CAAC;AACjE,MAAM,2BAA2B,GAAG,IAAI,CAAC;AAOzC;;;;;GAKG;AACI,KAAK,UAAU,kBAAkB,CACtC,OAA+C;IAE/C,GAAG,CAAC,kBAAkB,EAAE,OAAO,CAAC,CAAC;IAEjC,MAAM,EAAE,MAAM,EAAE,SAAS,EAAE,WAAW,EAAE,GAAG,OAAO,CAAC;IACnD,IAAI,eAAgC,CAAC;IAErC,KAAK,MAAM,KAAK,IAAI,MAAM,EAAE,CAAC;QAC3B,CAAC,EAAE,eAAe,EAAE,GAAG,MAAM,kBAAkB,CAC7C,KAAK,EACL,SAAS,EACT,WAAW,CACZ,CAAC,CAAC;IACL,CAAC;IAED,OAAO,EAAE,eAAe,EAAE,CAAC;AAC7B,CAAC;AAjBD,gDAiBC;AAED,KAAK,UAAU,kBAAkB,CAC/B,KAAuC,EACvC,SAA4C,EAC5C,WAA4B;IAE5B,GAAG,CAAC,wBAAwB,EAAE,KAAK,CAAC,CAAC;IAErC,IAAA,+BAAiB,EACf;QACE,aAAa,EAAE,WAAW,CAAC,EAAE;QAC7B,SAAS;QACT,IAAI,EAAE,uCAAuC;KAC9C,EACD,CAAC,EAAE,EAAE,EAAE;QACL,EAAE,CAAC,QAAQ,CAAC,KAAK,GAAG,SAAS,CAAC;IAChC,CAAC,CACF,CAAC;IAEF,MAAM,iBAAiB,GAAG,oBAAoB,CAAC,WAAW,CAAC,IAAI,CAAC,CAAC;IACjE,MAAM,eAAe,GAAG,MAAM,kBAAkB,CAC9C,KAAK,EACL,WAAW,CAAC,EAAE,EACd,iBAAiB,EACjB,SAAS,CACV,CAAC;IAEF,IAAA,+BAAiB,EACf;QACE,aAAa,EAAE,WAAW,CAAC,EAAE;QAC7B,SAAS;QACT,IAAI,EAAE,yCAAyC;KAChD,EACD,CAAC,EAAE,EAAE,EAAE;QACL,EAAE,CAAC,gBAAgB,GAAG,IAAI,CAAC;IAC7B,CAAC,CACF,CAAC;IAEF,OAAO,EAAE,eAAe,EAAE,CAAC;AAC7B,CAAC;AAED;;;;;;;;GAQG;AACH,KAAK,UAAU,kBAAkB,CAC/B,KAAuC,EACvC,mBAA2B,EAC3B,iBAAkC,EAClC,SAA4C;IAE5C,MAAM,EAAE,MAAM,EAAE,GAAG,KAAK,CAAC,QAAQ,CAAC,KAAK,CAAC;IACxC,MAAM,EAAE,SAAS,EAAE,cAAc,EAAE,MAAM,EAAE,GAAG,KAAK,CAAC,QAAQ,CAAC,QAAQ,CAAC;IACtE,MAAM,EAAE,IAAI,EAAE,GAAG,KAAK,CAAC,OAAO,CAAC;IAC/B,MAAM,OAAO,GAAG,IAAA,wBAAK,EAAC,MAAM,CAAC,OAAO,CAAC,CAAC;IACtC,MAAM,mBAAmB,GAAG,IAAA,2CAA4B,EAAC;QACvD,KAAK,EAAE,KAAK,CAAC,QAAQ,CAAC,KAAK;QAC3B,QAAQ,EAAE,iBAAiB;KAC5B,CAAC,CAAC;IAEH,MAAM,eAAe,GAAG,SAAS,CAAC,IAAI,CACpC,gDAAgD,EAChD,OAAO,CACR,CAAC;IAEF,MAAM,aAAa,GACjB,MAAM,IAAI,mBAAmB,CAAC,MAAM,GAAG,CAAC;QACtC,CAAC,CAAC,cAAc,CAAC,CAAC,CAAC,EAAE,GAAG;QACxB,CAAC,CAAC,SAAS,CAAC;IAEhB,IAAI,MAAM,IAAI,mBAAmB,CAAC,MAAM,GAAG,CAAC,IAAI,aAAa,KAAK,SAAS,EAAE,CAAC;QAC5E,MAAM,IAAI,KAAK,CAAC,+CAA+C,CAAC,CAAC;IACnE,CAAC;IAED,MAAM,YAAY,GAChB,aAAa,KAAK,SAAS,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,IAAA,wBAAK,EAAC,aAAa,CAAC,CAAC;IAEjE,MAAM,YAAY,GAAgC,mBAAmB,CAAC,GAAG,CACvE,CAAC,WAAW,EAAE,KAAK,EAAE,EAAE;QACrB,MAAM,QAAQ,GAAG,YAAY,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,cAAc,CAAC,KAAK,CAAC,EAAE,GAAG,CAAC;QAEvE,IAAI,QAAQ,KAAK,SAAS,IAAI,CAAC,YAAY,EAAE,CAAC;YAC5C,MAAM,YAAY,GAChB,WAAW,CAAC,IAAI,KAAK,UAAU;gBAC7B,CAAC,CAAC,oEAAoE,KAAK,EAAE;gBAC7E,CAAC,CAAC,qDAAqD,CAAC;YAE5D,MAAM,IAAI,KAAK,CAAC,YAAY,CAAC,CAAC;QAChC,CAAC;QAED,OAAO;YACL,MAAM,EAAE,sBAAsB,CAAC,IAAI,EAAE;gBACnC,OAAO,EAAE,WAAW,CAAC,OAAO;gBAC5B,IAAI,EAAE,WAAW,CAAC,IAAI;gBACtB,QAAQ;gBACR,YAAY,EAAE,WAAW,CAAC,YAAY;gBACtC,oBAAoB,EAAE,WAAW,CAAC,oBAAoB;gBACtD,EAAE,EAAE,WAAW,CAAC,EAAE;gBAClB,KAAK,EAAE,WAAW,CAAC,KAAK;aACzB,CAAC;YACF,IAAI,EAAE,WAAW,CAAC,IAAI,IAAI,iBAAiB;SAC5C,CAAC;IACJ,CAAC,CACF,CAAC;IAEF,MAAM,cAAc,GAAa,EAAE,CAAC;IAEpC,MAAM,EAAE,GAAG,EAAE,GAAG,IAAA,mCAAqB,EACnC,OAAO,EACP,IAAI,EACJ,SAAS,EACT,CAAC,aAAa,EAAE,EAAE;QAChB,cAAc,CAAC,IAAI,CAAC,aAAa,CAAC,CAAC;QAEnC,IAAA,+BAAiB,EACf;YACE,aAAa,EAAE,mBAAmB;YAClC,SAAS;YACT,IAAI,EAAE,oDAAoD;SAC3D,EACD,CAAC,EAAE,EAAE,EAAE;YACL,EAAE,CAAC,sBAAsB,KAAzB,EAAE,CAAC,sBAAsB,GAAK,EAAE,EAAC;YACjC,EAAE,CAAC,sBAAsB,CAAC,IAAI,CAAC,aAAa,CAAC,CAAC;QAChD,CAAC,CACF,CAAC;IACJ,CAAC,CACF,CAAC;IAEF,IAAI,MAA+C,CAAC;IAEpD,IAAI,CAAC;QACH,IAAI,YAAY,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;YAC9B,MAAM,GAAG,MAAM,SAAS,CAAC,IAAI,CAC3B,sCAAsC,EACtC,YAAY,CAAC,CAAC,CAAC,CAAC,MAAM,EACtB;gBACE,eAAe;gBACf,MAAM,EAAE,kCAAe;gBACvB,eAAe,EAAE,KAAK;gBACtB,IAAI,EAAE,YAAY,CAAC,CAAC,CAAC,CAAC,IAAI;aAC3B,CACF,CAAC;QACJ,CAAC;aAAM,CAAC;YACN,MAAM,iBAAiB,GAAG,YAAY,CAAC,GAAG,CAAC,CAAC,EAAE,MAAM,EAAE,IAAI,EAAE,EAAE,EAAE,CAAC,CAAC;gBAChE,MAAM,EAAE,wBAAwB,CAAC,MAAM,CAAC;gBACxC,IAAI;aACL,CAAC,CAAC,CAAC;YAEJ,MAAM,SAAS,CAAC,IAAI,CAAC,2CAA2C,EAAE;gBAChE,WAAW,EAAE,CAAC,YAAY;gBAC1B,WAAW,EAAE,OAAO,CAAC,YAAY,CAAC;gBAClC,iBAAiB,EAAE,OAAO,CAAC,YAAY,CAAC;gBACxC,IAAI;gBACJ,YAAY;gBACZ,eAAe;gBACf,MAAM,EAAE,kCAAe;gBACvB,eAAe,EAAE,KAAK;gBACtB,YAAY,EAAE,iBAAiB;aAChC,CAAC,CAAC;QACL,CAAC;IACH,CAAC;YAAS,CAAC;QACT,GAAG,EAAE,CAAC;IACR,CAAC;IAED,IAAI,MAAM,EAAE,CAAC;QACX,MAAM,MAAM,GAAG,MAAM,MAAM,CAAC,MAAM,CAAC;QACnC,GAAG,CAAC,uBAAuB,EAAE,MAAM,CAAC,CAAC;IACvC,CAAC;IAED,MAAM,OAAO,CAAC,GAAG,CACf,cAAc,CAAC,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,IAAA,yCAA2B,EAAC,IAAI,EAAE,SAAS,CAAC,CAAC,CAC3E,CAAC;IAEF,MAAM,IAAI,GAAG,cAAc,CAAC,MAAM;QAChC,CAAC,CAAC,IAAA,4BAAc,EAAC,cAAc,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,EAAE,SAAS,CAAC,EAAE,IAAI;QAC9D,CAAC,CAAC,SAAS,CAAC;IAEd,OAAO,MAAM,uBAAuB,CAAC,IAAuB,EAAE,SAAS,CAAC,CAAC;AAC3E,CAAC;AAYD,KAAK,UAAU,uBAAuB,CACpC,eAAgC,EAChC,SAA4C;IAE5C,IAAI,CAAC,eAAe,EAAE,CAAC;QACrB,OAAO,eAAe,CAAC;IACzB,CAAC;IAED,MAAM,MAAM,GAAG,IAAA,sCAAsB,EAAC,SAAS,CAAC,CAAC;IACjD,MAAM,MAAM,GAAG,IAAI,eAAe,CAAC;QACjC,aAAa,EAAE,eAAe;KAC/B,CAAC,CAAC;IACH,MAAM,GAAG,GAAG,GAAG,MAAM,CAAC,MAAM,CAAC,OAAO,mBAAmB,MAAM,CAAC,QAAQ,EAAE,EAAE,CAAC;IAE3E,IAAI,OAAO,GAAG,CAAC,CAAC;IAEhB,OAAO,IAAI,EAAE,CAAC;QACZ,OAAO,IAAI,CAAC,CAAC;QACb,IAAI,MAA4B,CAAC;QAEjC,IAAI,CAAC;YACH,MAAM,QAAQ,GAAG,MAAM,IAAA,kCAAe,EAAC,GAAG,EAAE;gBAC1C,MAAM,EAAE,KAAK;gBACb,OAAO,EAAE;oBACP,MAAM,EAAE,kBAAkB;iBAC3B;aACF,CAAC,CAAC;YACH,MAAM,GAAG,CAAC,MAAM,QAAQ,CAAC,IAAI,EAAE,CAAyB,CAAC;QAC3D,CAAC;QAAC,OAAO,KAAK,EAAE,CAAC;YACf,GAAG,CAAC,sCAAsC,EAAE;gBAC1C,OAAO;gBACP,KAAK,EAAE,MAAM,CAAC,KAAK,CAAC;gBACpB,eAAe;aAChB,CAAC,CAAC;YAEH,MAAM,IAAI,OAAO,CAAC,CAAC,OAAO,EAAE,EAAE,CAC5B,UAAU,CAAC,OAAO,EAAE,2BAA2B,CAAC,CACjD,CAAC;YACF,SAAS;QACX,CAAC;QAED,MAAM,gBAAgB,GAAG,MAAM,CAAC,MAAM,EAAE,WAAW,EAAE,CAAC;QAEtD,GAAG,CAAC,sBAAsB,EAAE;YAC1B,OAAO;YACP,MAAM,EAAE,gBAAgB;YACxB,eAAe;SAChB,CAAC,CAAC;QAEH,IACE,gBAAgB;YAChB,CAAC,WAAW,EAAE,QAAQ,EAAE,SAAS,CAAC,CAAC,QAAQ,CAAC,gBAAgB,CAAC,EAC7D,CAAC;YACD,OAAO,CACL,MAAM,CAAC,iBAAiB;gBACxB,MAAM,CAAC,UAAU;gBACjB,MAAM,CAAC,UAAU;gBACjB,MAAM,CAAC,MAAM;gBACb,eAAe,CAChB,CAAC;QACJ,CAAC;QAED,IACE,gBAAgB;YAChB,CAAC,OAAO,EAAE,QAAQ,EAAE,QAAQ,EAAE,UAAU,CAAC,CAAC,QAAQ,CAAC,gBAAgB,CAAC,EACpE,CAAC;YACD,MAAM,IAAI,KAAK,CAAC,sCAAsC,gBAAgB,EAAE,CAAC,CAAC;QAC5E,CAAC;QAED,MAAM,IAAI,OAAO,CAAC,CAAC,OAAO,EAAE,EAAE,CAC5B,UAAU,CAAC,OAAO,EAAE,2BAA2B,CAAC,CACjD,CAAC;IACJ,CAAC;AACH,CAAC;AAED,SAAS,oBAAoB,CAC3B,eAAiC;IAEjC,QAAQ,eAAe,EAAE,CAAC;QACxB,KAAK,wCAAe,CAAC,YAAY;YAC/B,OAAO,wCAAe,CAAC,kBAAkB,CAAC;QAC5C,KAAK,wCAAe,CAAC,cAAc;YACjC,OAAO,wCAAe,CAAC,oBAAoB,CAAC;QAC9C,KAAK,SAAS;YACZ,OAAO,wCAAe,CAAC,kBAAkB,CAAC;QAC5C;YACE,OAAO,eAAe,CAAC;IAC3B,CAAC;AACH,CAAC;AAED,SAAS,sBAAsB,CAC7B,IAAS,EACT,MAQC;IAED,MAAM,KAAK,GAAG,IAAA,wBAAK,EAAC,MAAM,CAAC,KAAK,IAAI,KAAK,CAAC,CAAC;IAE3C,OAAO;QACL,IAAI,EAAE,MAAM,CAAC,IAAI;QACjB,IAAI;QACJ,GAAG,EAAE,MAAM,CAAC,QAAQ,KAAK,SAAS,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,IAAA,wBAAK,EAAC,MAAM,CAAC,QAAQ,CAAC;QACvE,YAAY,EAAE,oBAAoB,CAAC,MAAM,CAAC,YAAY,CAAC;QACvD,oBAAoB,EAAE,oBAAoB,CAAC,MAAM,CAAC,oBAAoB,CAAC;QACvE,EAAE,EAAE,MAAM,CAAC,EAAE;QACb,KAAK;KACN,CAAC;AACJ,CAAC;AAED,SAAS,oBAAoB,CAAC,KAAc;IAC1C,IAAI,KAAK,KAAK,SAAS,EAAE,CAAC;QACxB,OAAO,SAAS,CAAC;IACnB,CAAC;IAED,OAAO,IAAA,wBAAK,EAAC,KAAK,CAAC,CAAC;AACtB,CAAC;AAED,SAAS,wBAAwB,CAC/B,MAAyB;IAEzB,OAAO;QACL,IAAI,EAAE,MAAM,CAAC,IAAuB;QACpC,GAAG,EAAE,MAAM,CAAC,GAAsB;QAClC,YAAY,EAAE,MAAM,CAAC,YAA+B;QACpD,oBAAoB,EAAE,MAAM,CAAC,oBAAuC;QACpE,EAAE,EAAE,MAAM,CAAC,EAAqB;QAChC,KAAK,EAAE,MAAM,CAAC,KAAwB;KACvC,CAAC;AACJ,CAAC","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\n  try {\n    if (transactions.length === 1) {\n      result = await messenger.call(\n        'TransactionController:addTransaction',\n        transactions[0].params,\n        {\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        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"]}

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

@@ -140,17 +140,15 @@ async function submitTransactions(quote, parentTransactionId, acrossDepositType,
     const hash = transactionIds.length
         ? getTransaction(transactionIds.slice(-1)[0], messenger)?.hash
         : undefined;
-    return await waitForAcrossCompletion(quote.original, hash, messenger);
+    return await waitForAcrossCompletion(hash, messenger);
 }
-async function waitForAcrossCompletion(quote, transactionHash, messenger) {
-    if (!transactionHash || !quote.quote.id) {
+async function waitForAcrossCompletion(transactionHash, messenger) {
+    if (!transactionHash) {
         return transactionHash;
     }
     const config = getPayStrategiesConfig(messenger);
     const params = new URLSearchParams({
-        depositId: quote.quote.id,
-        originChainId: String(quote.quote.swapTx.chainId),
-        txHash: transactionHash,
+        depositTxnRef: transactionHash,
     });
     const url = `${config.across.apiBase}/deposit/status?${params.toString()}`;
     let attempt = 0;
@@ -184,6 +182,7 @@ async function waitForAcrossCompletion(quote, transactionHash, messenger) {
         if (normalizedStatus &&
             ['completed', 'filled', 'success'].includes(normalizedStatus)) {
             return (status.destinationTxHash ??
+                status.fillTxnRef ??
                 status.fillTxHash ??
                 status.txHash ??
                 transactionHash);

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":"AAAA,OAAO,EACL,eAAe,EACf,eAAe,EACf,KAAK,EACN,mCAAmC;AACpC,OAAO,EAAE,eAAe,EAAE,yCAAyC;AAOnE,OAAO,EAAE,kBAAkB,EAAE,wBAAwB;AAErD,OAAO,EAAE,aAAa,EAAE,yBAAqB;AAM7C,OAAO,EAAE,sBAAsB,EAAE,sCAAkC;AACnE,OAAO,EACL,qBAAqB,EACrB,cAAc,EACd,iBAAiB,EACjB,2BAA2B,EAC5B,oCAAgC;AACjC,OAAO,EAAE,4BAA4B,EAAE,2BAAuB;AAG9D,MAAM,GAAG,GAAG,kBAAkB,CAAC,aAAa,EAAE,iBAAiB,CAAC,CAAC;AACjE,MAAM,2BAA2B,GAAG,IAAI,CAAC;AAOzC;;;;;GAKG;AACH,MAAM,CAAC,KAAK,UAAU,kBAAkB,CACtC,OAA+C;IAE/C,GAAG,CAAC,kBAAkB,EAAE,OAAO,CAAC,CAAC;IAEjC,MAAM,EAAE,MAAM,EAAE,SAAS,EAAE,WAAW,EAAE,GAAG,OAAO,CAAC;IACnD,IAAI,eAAgC,CAAC;IAErC,KAAK,MAAM,KAAK,IAAI,MAAM,EAAE,CAAC;QAC3B,CAAC,EAAE,eAAe,EAAE,GAAG,MAAM,kBAAkB,CAC7C,KAAK,EACL,SAAS,EACT,WAAW,CACZ,CAAC,CAAC;IACL,CAAC;IAED,OAAO,EAAE,eAAe,EAAE,CAAC;AAC7B,CAAC;AAED,KAAK,UAAU,kBAAkB,CAC/B,KAAuC,EACvC,SAA4C,EAC5C,WAA4B;IAE5B,GAAG,CAAC,wBAAwB,EAAE,KAAK,CAAC,CAAC;IAErC,iBAAiB,CACf;QACE,aAAa,EAAE,WAAW,CAAC,EAAE;QAC7B,SAAS;QACT,IAAI,EAAE,uCAAuC;KAC9C,EACD,CAAC,EAAE,EAAE,EAAE;QACL,EAAE,CAAC,QAAQ,CAAC,KAAK,GAAG,SAAS,CAAC;IAChC,CAAC,CACF,CAAC;IAEF,MAAM,iBAAiB,GAAG,oBAAoB,CAAC,WAAW,CAAC,IAAI,CAAC,CAAC;IACjE,MAAM,eAAe,GAAG,MAAM,kBAAkB,CAC9C,KAAK,EACL,WAAW,CAAC,EAAE,EACd,iBAAiB,EACjB,SAAS,CACV,CAAC;IAEF,iBAAiB,CACf;QACE,aAAa,EAAE,WAAW,CAAC,EAAE;QAC7B,SAAS;QACT,IAAI,EAAE,yCAAyC;KAChD,EACD,CAAC,EAAE,EAAE,EAAE;QACL,EAAE,CAAC,gBAAgB,GAAG,IAAI,CAAC;IAC7B,CAAC,CACF,CAAC;IAEF,OAAO,EAAE,eAAe,EAAE,CAAC;AAC7B,CAAC;AAED;;;;;;;;GAQG;AACH,KAAK,UAAU,kBAAkB,CAC/B,KAAuC,EACvC,mBAA2B,EAC3B,iBAAkC,EAClC,SAA4C;IAE5C,MAAM,EAAE,MAAM,EAAE,GAAG,KAAK,CAAC,QAAQ,CAAC,KAAK,CAAC;IACxC,MAAM,EAAE,SAAS,EAAE,cAAc,EAAE,MAAM,EAAE,GAAG,KAAK,CAAC,QAAQ,CAAC,QAAQ,CAAC;IACtE,MAAM,EAAE,IAAI,EAAE,GAAG,KAAK,CAAC,OAAO,CAAC;IAC/B,MAAM,OAAO,GAAG,KAAK,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC;IACtC,MAAM,mBAAmB,GAAG,4BAA4B,CAAC;QACvD,KAAK,EAAE,KAAK,CAAC,QAAQ,CAAC,KAAK;QAC3B,QAAQ,EAAE,iBAAiB;KAC5B,CAAC,CAAC;IAEH,MAAM,eAAe,GAAG,SAAS,CAAC,IAAI,CACpC,gDAAgD,EAChD,OAAO,CACR,CAAC;IAEF,MAAM,aAAa,GACjB,MAAM,IAAI,mBAAmB,CAAC,MAAM,GAAG,CAAC;QACtC,CAAC,CAAC,cAAc,CAAC,CAAC,CAAC,EAAE,GAAG;QACxB,CAAC,CAAC,SAAS,CAAC;IAEhB,IAAI,MAAM,IAAI,mBAAmB,CAAC,MAAM,GAAG,CAAC,IAAI,aAAa,KAAK,SAAS,EAAE,CAAC;QAC5E,MAAM,IAAI,KAAK,CAAC,+CAA+C,CAAC,CAAC;IACnE,CAAC;IAED,MAAM,YAAY,GAChB,aAAa,KAAK,SAAS,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,KAAK,CAAC,aAAa,CAAC,CAAC;IAEjE,MAAM,YAAY,GAAgC,mBAAmB,CAAC,GAAG,CACvE,CAAC,WAAW,EAAE,KAAK,EAAE,EAAE;QACrB,MAAM,QAAQ,GAAG,YAAY,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,cAAc,CAAC,KAAK,CAAC,EAAE,GAAG,CAAC;QAEvE,IAAI,QAAQ,KAAK,SAAS,IAAI,CAAC,YAAY,EAAE,CAAC;YAC5C,MAAM,YAAY,GAChB,WAAW,CAAC,IAAI,KAAK,UAAU;gBAC7B,CAAC,CAAC,oEAAoE,KAAK,EAAE;gBAC7E,CAAC,CAAC,qDAAqD,CAAC;YAE5D,MAAM,IAAI,KAAK,CAAC,YAAY,CAAC,CAAC;QAChC,CAAC;QAED,OAAO;YACL,MAAM,EAAE,sBAAsB,CAAC,IAAI,EAAE;gBACnC,OAAO,EAAE,WAAW,CAAC,OAAO;gBAC5B,IAAI,EAAE,WAAW,CAAC,IAAI;gBACtB,QAAQ;gBACR,YAAY,EAAE,WAAW,CAAC,YAAY;gBACtC,oBAAoB,EAAE,WAAW,CAAC,oBAAoB;gBACtD,EAAE,EAAE,WAAW,CAAC,EAAE;gBAClB,KAAK,EAAE,WAAW,CAAC,KAAK;aACzB,CAAC;YACF,IAAI,EAAE,WAAW,CAAC,IAAI,IAAI,iBAAiB;SAC5C,CAAC;IACJ,CAAC,CACF,CAAC;IAEF,MAAM,cAAc,GAAa,EAAE,CAAC;IAEpC,MAAM,EAAE,GAAG,EAAE,GAAG,qBAAqB,CACnC,OAAO,EACP,IAAI,EACJ,SAAS,EACT,CAAC,aAAa,EAAE,EAAE;QAChB,cAAc,CAAC,IAAI,CAAC,aAAa,CAAC,CAAC;QAEnC,iBAAiB,CACf;YACE,aAAa,EAAE,mBAAmB;YAClC,SAAS;YACT,IAAI,EAAE,oDAAoD;SAC3D,EACD,CAAC,EAAE,EAAE,EAAE;YACL,EAAE,CAAC,sBAAsB,KAAzB,EAAE,CAAC,sBAAsB,GAAK,EAAE,EAAC;YACjC,EAAE,CAAC,sBAAsB,CAAC,IAAI,CAAC,aAAa,CAAC,CAAC;QAChD,CAAC,CACF,CAAC;IACJ,CAAC,CACF,CAAC;IAEF,IAAI,MAA+C,CAAC;IAEpD,IAAI,CAAC;QACH,IAAI,YAAY,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;YAC9B,MAAM,GAAG,MAAM,SAAS,CAAC,IAAI,CAC3B,sCAAsC,EACtC,YAAY,CAAC,CAAC,CAAC,CAAC,MAAM,EACtB;gBACE,eAAe;gBACf,MAAM,EAAE,eAAe;gBACvB,eAAe,EAAE,KAAK;gBACtB,IAAI,EAAE,YAAY,CAAC,CAAC,CAAC,CAAC,IAAI;aAC3B,CACF,CAAC;QACJ,CAAC;aAAM,CAAC;YACN,MAAM,iBAAiB,GAAG,YAAY,CAAC,GAAG,CAAC,CAAC,EAAE,MAAM,EAAE,IAAI,EAAE,EAAE,EAAE,CAAC,CAAC;gBAChE,MAAM,EAAE,wBAAwB,CAAC,MAAM,CAAC;gBACxC,IAAI;aACL,CAAC,CAAC,CAAC;YAEJ,MAAM,SAAS,CAAC,IAAI,CAAC,2CAA2C,EAAE;gBAChE,WAAW,EAAE,CAAC,YAAY;gBAC1B,WAAW,EAAE,OAAO,CAAC,YAAY,CAAC;gBAClC,iBAAiB,EAAE,OAAO,CAAC,YAAY,CAAC;gBACxC,IAAI;gBACJ,YAAY;gBACZ,eAAe;gBACf,MAAM,EAAE,eAAe;gBACvB,eAAe,EAAE,KAAK;gBACtB,YAAY,EAAE,iBAAiB;aAChC,CAAC,CAAC;QACL,CAAC;IACH,CAAC;YAAS,CAAC;QACT,GAAG,EAAE,CAAC;IACR,CAAC;IAED,IAAI,MAAM,EAAE,CAAC;QACX,MAAM,MAAM,GAAG,MAAM,MAAM,CAAC,MAAM,CAAC;QACnC,GAAG,CAAC,uBAAuB,EAAE,MAAM,CAAC,CAAC;IACvC,CAAC;IAED,MAAM,OAAO,CAAC,GAAG,CACf,cAAc,CAAC,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,2BAA2B,CAAC,IAAI,EAAE,SAAS,CAAC,CAAC,CAC3E,CAAC;IAEF,MAAM,IAAI,GAAG,cAAc,CAAC,MAAM;QAChC,CAAC,CAAC,cAAc,CAAC,cAAc,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,EAAE,SAAS,CAAC,EAAE,IAAI;QAC9D,CAAC,CAAC,SAAS,CAAC;IAEd,OAAO,MAAM,uBAAuB,CAClC,KAAK,CAAC,QAAQ,EACd,IAAuB,EACvB,SAAS,CACV,CAAC;AACJ,CAAC;AASD,KAAK,UAAU,uBAAuB,CACpC,KAAkB,EAClB,eAAgC,EAChC,SAA4C;IAE5C,IAAI,CAAC,eAAe,IAAI,CAAC,KAAK,CAAC,KAAK,CAAC,EAAE,EAAE,CAAC;QACxC,OAAO,eAAe,CAAC;IACzB,CAAC;IAED,MAAM,MAAM,GAAG,sBAAsB,CAAC,SAAS,CAAC,CAAC;IACjD,MAAM,MAAM,GAAG,IAAI,eAAe,CAAC;QACjC,SAAS,EAAE,KAAK,CAAC,KAAK,CAAC,EAAE;QACzB,aAAa,EAAE,MAAM,CAAC,KAAK,CAAC,KAAK,CAAC,MAAM,CAAC,OAAO,CAAC;QACjD,MAAM,EAAE,eAAe;KACxB,CAAC,CAAC;IACH,MAAM,GAAG,GAAG,GAAG,MAAM,CAAC,MAAM,CAAC,OAAO,mBAAmB,MAAM,CAAC,QAAQ,EAAE,EAAE,CAAC;IAE3E,IAAI,OAAO,GAAG,CAAC,CAAC;IAEhB,OAAO,IAAI,EAAE,CAAC;QACZ,OAAO,IAAI,CAAC,CAAC;QACb,IAAI,MAA4B,CAAC;QAEjC,IAAI,CAAC;YACH,MAAM,QAAQ,GAAG,MAAM,eAAe,CAAC,GAAG,EAAE;gBAC1C,MAAM,EAAE,KAAK;gBACb,OAAO,EAAE;oBACP,MAAM,EAAE,kBAAkB;iBAC3B;aACF,CAAC,CAAC;YACH,MAAM,GAAG,CAAC,MAAM,QAAQ,CAAC,IAAI,EAAE,CAAyB,CAAC;QAC3D,CAAC;QAAC,OAAO,KAAK,EAAE,CAAC;YACf,GAAG,CAAC,sCAAsC,EAAE;gBAC1C,OAAO;gBACP,KAAK,EAAE,MAAM,CAAC,KAAK,CAAC;gBACpB,eAAe;aAChB,CAAC,CAAC;YAEH,MAAM,IAAI,OAAO,CAAC,CAAC,OAAO,EAAE,EAAE,CAC5B,UAAU,CAAC,OAAO,EAAE,2BAA2B,CAAC,CACjD,CAAC;YACF,SAAS;QACX,CAAC;QAED,MAAM,gBAAgB,GAAG,MAAM,CAAC,MAAM,EAAE,WAAW,EAAE,CAAC;QAEtD,GAAG,CAAC,sBAAsB,EAAE;YAC1B,OAAO;YACP,MAAM,EAAE,gBAAgB;YACxB,eAAe;SAChB,CAAC,CAAC;QAEH,IACE,gBAAgB;YAChB,CAAC,WAAW,EAAE,QAAQ,EAAE,SAAS,CAAC,CAAC,QAAQ,CAAC,gBAAgB,CAAC,EAC7D,CAAC;YACD,OAAO,CACL,MAAM,CAAC,iBAAiB;gBACxB,MAAM,CAAC,UAAU;gBACjB,MAAM,CAAC,MAAM;gBACb,eAAe,CAChB,CAAC;QACJ,CAAC;QAED,IACE,gBAAgB;YAChB,CAAC,OAAO,EAAE,QAAQ,EAAE,QAAQ,EAAE,UAAU,CAAC,CAAC,QAAQ,CAAC,gBAAgB,CAAC,EACpE,CAAC;YACD,MAAM,IAAI,KAAK,CAAC,sCAAsC,gBAAgB,EAAE,CAAC,CAAC;QAC5E,CAAC;QAED,MAAM,IAAI,OAAO,CAAC,CAAC,OAAO,EAAE,EAAE,CAC5B,UAAU,CAAC,OAAO,EAAE,2BAA2B,CAAC,CACjD,CAAC;IACJ,CAAC;AACH,CAAC;AAED,SAAS,oBAAoB,CAC3B,eAAiC;IAEjC,QAAQ,eAAe,EAAE,CAAC;QACxB,KAAK,eAAe,CAAC,YAAY;YAC/B,OAAO,eAAe,CAAC,kBAAkB,CAAC;QAC5C,KAAK,eAAe,CAAC,cAAc;YACjC,OAAO,eAAe,CAAC,oBAAoB,CAAC;QAC9C,KAAK,SAAS;YACZ,OAAO,eAAe,CAAC,kBAAkB,CAAC;QAC5C;YACE,OAAO,eAAe,CAAC;IAC3B,CAAC;AACH,CAAC;AAED,SAAS,sBAAsB,CAC7B,IAAS,EACT,MAQC;IAED,MAAM,KAAK,GAAG,KAAK,CAAC,MAAM,CAAC,KAAK,IAAI,KAAK,CAAC,CAAC;IAE3C,OAAO;QACL,IAAI,EAAE,MAAM,CAAC,IAAI;QACjB,IAAI;QACJ,GAAG,EAAE,MAAM,CAAC,QAAQ,KAAK,SAAS,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,KAAK,CAAC,MAAM,CAAC,QAAQ,CAAC;QACvE,YAAY,EAAE,oBAAoB,CAAC,MAAM,CAAC,YAAY,CAAC;QACvD,oBAAoB,EAAE,oBAAoB,CAAC,MAAM,CAAC,oBAAoB,CAAC;QACvE,EAAE,EAAE,MAAM,CAAC,EAAE;QACb,KAAK;KACN,CAAC;AACJ,CAAC;AAED,SAAS,oBAAoB,CAAC,KAAc;IAC1C,IAAI,KAAK,KAAK,SAAS,EAAE,CAAC;QACxB,OAAO,SAAS,CAAC;IACnB,CAAC;IAED,OAAO,KAAK,CAAC,KAAK,CAAC,CAAC;AACtB,CAAC;AAED,SAAS,wBAAwB,CAC/B,MAAyB;IAEzB,OAAO;QACL,IAAI,EAAE,MAAM,CAAC,IAAuB;QACpC,GAAG,EAAE,MAAM,CAAC,GAAsB;QAClC,YAAY,EAAE,MAAM,CAAC,YAA+B;QACpD,oBAAoB,EAAE,MAAM,CAAC,oBAAuC;QACpE,EAAE,EAAE,MAAM,CAAC,EAAqB;QAChC,KAAK,EAAE,MAAM,CAAC,KAAwB;KACvC,CAAC;AACJ,CAAC","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\n  try {\n    if (transactions.length === 1) {\n      result = await messenger.call(\n        'TransactionController:addTransaction',\n        transactions[0].params,\n        {\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        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(\n    quote.original,\n    hash as Hex | undefined,\n    messenger,\n  );\n}\n\ntype AcrossStatusResponse = {\n  status?: string;\n  destinationTxHash?: Hex;\n  fillTxHash?: Hex;\n  txHash?: Hex;\n};\n\nasync function waitForAcrossCompletion(\n  quote: AcrossQuote,\n  transactionHash: Hex | undefined,\n  messenger: TransactionPayControllerMessenger,\n): Promise<Hex | undefined> {\n  if (!transactionHash || !quote.quote.id) {\n    return transactionHash;\n  }\n\n  const config = getPayStrategiesConfig(messenger);\n  const params = new URLSearchParams({\n    depositId: quote.quote.id,\n    originChainId: String(quote.quote.swapTx.chainId),\n    txHash: 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.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 { 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\n  try {\n    if (transactions.length === 1) {\n      result = await messenger.call(\n        'TransactionController:addTransaction',\n        transactions[0].params,\n        {\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        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"]}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@metamask-previews/transaction-pay-controller",
-  "version": "19.2.1-preview-5e99f980f",
+  "version": "19.2.1-preview-42c8fd288",
   "description": "Manages alternate payment strategies to provide required funds for transactions in MetaMask",
   "keywords": [
     "Ethereum",