@metamask-previews/bridge-status-controller 72.0.0-preview-4bcc1c6c1 → 72.0.1-preview-34aa73a7b

package/CHANGELOG.md

@@ -7,6 +7,15 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [Unreleased]
 
+## [72.0.1]
+
+### Fixed
+
+- Fix gas-related transaction options for batch and batch-sell swaps ([#8979](https://github.com/MetaMask/core/pull/8979))
+  - When the fee is paid in an ERC20 token, set it as the `gasFeeToken`
+  - Set `excludeNativeTokenForFee=true` when `gasFeeToken` is set, which tells the TransactionController to use the gasFeeToken for payment regardless of whether the user has enough native assets
+  - Set `skipInitialGasEstimate=false` if submitting gasIncluded7702 quotes and account has not been upgraded to a smart account
+
 ## [72.0.0]
 
 ### Added
@@ -1238,7 +1247,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 - Initial release ([#5317](https://github.com/MetaMask/core/pull/5317))
 
-[Unreleased]: https://github.com/MetaMask/core/compare/@metamask/bridge-status-controller@72.0.0...HEAD
+[Unreleased]: https://github.com/MetaMask/core/compare/@metamask/bridge-status-controller@72.0.1...HEAD
+[72.0.1]: https://github.com/MetaMask/core/compare/@metamask/bridge-status-controller@72.0.0...@metamask/bridge-status-controller@72.0.1
 [72.0.0]: https://github.com/MetaMask/core/compare/@metamask/bridge-status-controller@71.2.1...@metamask/bridge-status-controller@72.0.0
 [71.2.1]: https://github.com/MetaMask/core/compare/@metamask/bridge-status-controller@71.2.0...@metamask/bridge-status-controller@71.2.1
 [71.2.0]: https://github.com/MetaMask/core/compare/@metamask/bridge-status-controller@71.1.4...@metamask/bridge-status-controller@71.2.0

package/dist/strategy/batch-sell-strategy.cjs

@@ -29,8 +29,10 @@ async function* submitBatchSellHandler(args) {
         disable7702: (0, transaction_1.shouldDisable7702)(gasIncluded7702, gasIncluded, isDelegatedAccount),
         isGasFeeSponsored: gasSponsored,
         isGasFeeIncluded: Boolean(gasIncluded7702),
-        skipInitialGasEstimate: false,
-        excludeNativeTokenForFee: Boolean(gasFeeToken),
+        skipInitialGasEstimate: gasIncluded7702
+            ? isDelegatedAccount
+            : Boolean(gasFeeToken),
+        excludeNativeTokenForFee: !gasFeeToken,
     });
     // Submit the batch to the TransactionController
     const { batchId } = await addTransactionBatchFn(transactionParams);

package/dist/strategy/batch-sell-strategy.cjs.map

@@ -1 +1 @@
-{"version":3,"file":"batch-sell-strategy.cjs","sourceRoot":"","sources":["../../src/strategy/batch-sell-strategy.ts"],"names":[],"mappings":";;;AACA,6EAG0C;AAG1C,0DAQ8B;AAC9B,uCAAqC;AAGrC,MAAM,qBAAqB,GAAG,CAAC,EAC7B,aAAa,EAAE,EAAE,OAAO,EAAE,KAAK,EAAE,GACd,EAAU,EAAE,CAAC,OAAO,IAAI,KAAK,CAAC,SAAS,CAAC;AAE7D;;;;;GAKG;AACI,KAAK,SAAS,CAAC,CAAC,sBAAsB,CAC3C,IAA2D;IAE3D,MAAM,EACJ,eAAe,EACf,cAAc,EACd,SAAS,EACT,qBAAqB,EACrB,kBAAkB,EAClB,eAAe,GAChB,GAAG,IAAI,CAAC;IAET,MAAM,SAAS,GAAG,IAAA,uCAAyB,EAAC;QAC1C,cAAc;QACd,eAAe;KAChB,CAAC,CAAC;IAEH,MAAM,EAAE,eAAe,EAAE,WAAW,EAAE,YAAY,EAAE,GAAG,eAAe,CAAC;IAEvE,MAAM,WAAW,GAAG,SAAS,CAAC,IAAI,CAChC,CAAC,EAAE,IAAI,EAAE,EAAE,EAAE,CAAC,IAAI,KAAK,wCAAe,CAAC,mBAAmB,CAC3D,EAAE,EAAE,CAAC,EAAE,CAAC;IAET,MAAM,iBAAiB,GAAG,MAAM,IAAA,0CAA4B,EAAC;QAC3D,SAAS;QACT,SAAS;QACT,eAAe;QACf,kBAAkB;QAClB,8DAA8D;QAC9D,MAAM,EAAE,KAAK;QACb,WAAW,EAAE,IAAA,+BAAiB,EAC5B,eAAe,EACf,WAAW,EACX,kBAAkB,CACnB;QACD,iBAAiB,EAAE,YAAY;QAC/B,gBAAgB,EAAE,OAAO,CAAC,eAAe,CAAC;QAC1C,sBAAsB,EAAE,KAAK;QAC7B,wBAAwB,EAAE,OAAO,CAAC,WAAW,CAAC;KAC/C,CAAC,CAAC;IAEH,gDAAgD;IAChD,MAAM,EAAE,OAAO,EAAE,GAAG,MAAM,qBAAqB,CAAC,iBAAiB,CAAC,CAAC;IAEnE,2DAA2D;IAC3D,MAAM,gBAAgB,GAAG,IAAA,wCAA0B,EAAC;QAClD,SAAS;QACT,OAAO;QACP,SAAS;KACV,CAAC,CAAC,MAAM,CACP,CAAC,QAAQ,EAAgE,EAAE,CACzE,IAAA,uBAAS,EAAC,QAAQ,CAAC,IAAI,CAAC,IAAI,QAAQ,CAAC,MAAM,KAAK,SAAS,CAC5D,CAAC;IAEF,sEAAsE;IACtE,MAAM,sBAAsB,GAAG,gBAAgB,CAAC,IAAI,CAClD,CAAC,EAAE,MAAM,EAAE,EAAE,EAAE,CACb,MAAM,EAAE,IAAI;QACZ,CAAC,IAAA,uBAAS,EAAC,MAAM,CAAC,IAAI,CAAC,IAAI,IAAA,uCAAyB,EAAC,MAAM,CAAC,CAAC,CAChE,CAAC;IACF,MAAM,cAAc,GAAG,sBAAsB,EAAE,MAAM,CAAC;IACtD,IAAI,CAAC,cAAc,EAAE,CAAC;QACpB,MAAM,IAAI,KAAK,CACb,4DAA4D,CAC7D,CAAC;IACJ,CAAC;IAED,oBAAoB;IACpB,IAAI,IAAA,sBAAQ,EAAC,cAAc,CAAC,IAAI,IAAA,uCAAyB,EAAC,cAAc,CAAC,EAAE,CAAC;QAC1E,MAAM,QAAQ,GAAG,KAAK,CAAC,IAAI,CACzB,IAAI,GAAG,CAAC,gBAAgB,CAAC,GAAG,CAAC,qBAAqB,CAAC,CAAC,CACrD,CAAC;QAEF,kEAAkE;QAClE,MAAM;YACJ,IAAI,EAAE,kBAAU,CAAC,cAAc;YAC/B,OAAO,EAAE;gBACP,UAAU,EAAE,cAAc,CAAC,EAAE;gBAC7B,aAAa,EAAE,sBAAsB,CAAC,aAAa;gBACnD,aAAa,EAAE,eAAe;gBAC9B,QAAQ;gBACR,YAAY,EAAE,cAAc;aAC7B;SACF,CAAC;QACF,mFAAmF;QACnF,KAAK,MAAM,iBAAiB,IAAI,gBAAgB,EAAE,CAAC;YACjD,MAAM,EAAE,aAAa,EAAE,GAAG,iBAAiB,CAAC;YAE5C,MAAM;gBACJ,IAAI,EAAE,kBAAU,CAAC,cAAc;gBAC/B,OAAO,EAAE;oBACP,UAAU,EAAE,qBAAqB,CAAC,iBAAiB,CAAC;oBACpD,aAAa;oBACb,aAAa,EAAE,eAAe;iBAC/B;aACF,CAAC;QACJ,CAAC;IACH,CAAC;SAAM,CAAC;QACN,0DAA0D;QAC1D,6DAA6D;QAC7D,uDAAuD;QACvD,KAAK,MAAM,EAAE,MAAM,EAAE,aAAa,EAAE,IAAI,gBAAgB,EAAE,CAAC;YACzD,MAAM;gBACJ,IAAI,EAAE,kBAAU,CAAC,cAAc;gBAC/B,OAAO,EAAE;oBACP,UAAU,EAAE,MAAM,CAAC,EAAE;oBACrB,aAAa;oBACb,aAAa,EAAE,eAAe;oBAC9B,YAAY,EAAE,MAAM;iBACrB;aACF,CAAC;QACJ,CAAC;IACH,CAAC;IAED,MAAM;QACJ,IAAI,EAAE,kBAAU,CAAC,YAAY;QAC7B,OAAO,EAAE;YACP,SAAS,EAAE,cAAc;SAC1B;KACF,CAAC;AACJ,CAAC;AAxHD,wDAwHC","sourcesContent":["import { BatchSellTradesResponse, TxData } from '@metamask/bridge-controller';\nimport {\n  TransactionMeta,\n  TransactionType,\n} from '@metamask/transaction-controller';\n\nimport { QuoteAndTxMetadata } from '../types';\nimport {\n  findAllTransactionsInBatch,\n  getAddTransactionBatchParams,\n  hasNestedSwapTransactions,\n  is7702Tx,\n  isTradeTx,\n  shouldDisable7702,\n  toQuoteAndTxMetadataBatch,\n} from '../utils/transaction';\nimport { SubmitStep } from './types';\nimport type { SubmitStrategyParams, SubmitStepResult } from './types';\n\nconst getHistoryKeyForQuote = ({\n  quoteResponse: { quoteId, quote },\n}: QuoteAndTxMetadata): string => quoteId ?? quote.requestId;\n\n/**\n * Submits batch-sell transactions to the TransactionController\n *\n * @param args - The parameters for the transaction\n * @yields The approvalMeta and tradeMeta for the first batch sell transaction\n */\nexport async function* submitBatchSellHandler(\n  args: SubmitStrategyParams<TxData, BatchSellTradesResponse>,\n): AsyncGenerator<SubmitStepResult, void, void> {\n  const {\n    requireApproval,\n    quoteResponses,\n    messenger,\n    addTransactionBatchFn,\n    isDelegatedAccount,\n    batchSellTrades,\n  } = args;\n\n  const tradeData = toQuoteAndTxMetadataBatch({\n    quoteResponses,\n    batchSellTrades,\n  });\n\n  const { gasIncluded7702, gasIncluded, gasSponsored } = batchSellTrades;\n\n  const gasFeeToken = tradeData.find(\n    ({ type }) => type === TransactionType.tokenMethodTransfer,\n  )?.tx.to;\n\n  const transactionParams = await getAddTransactionBatchParams({\n    messenger,\n    tradeData,\n    requireApproval,\n    isDelegatedAccount,\n    // Tx success/failure is independent of other txs in the batch\n    atomic: false,\n    disable7702: shouldDisable7702(\n      gasIncluded7702,\n      gasIncluded,\n      isDelegatedAccount,\n    ),\n    isGasFeeSponsored: gasSponsored,\n    isGasFeeIncluded: Boolean(gasIncluded7702),\n    skipInitialGasEstimate: false,\n    excludeNativeTokenForFee: Boolean(gasFeeToken),\n  });\n\n  // Submit the batch to the TransactionController\n  const { batchId } = await addTransactionBatchFn(transactionParams);\n\n  // Find all batch transaction metas and add them to history\n  const allTradesInBatch = findAllTransactionsInBatch({\n    messenger,\n    batchId,\n    tradeData,\n  }).filter(\n    (metadata): metadata is QuoteAndTxMetadata & { txMeta: TransactionMeta } =>\n      isTradeTx(metadata.type) && metadata.txMeta !== undefined,\n  );\n\n  // This is either the delegation tx or the first STX swap in the batch\n  const firstTradeWithMetadata = allTradesInBatch.find(\n    ({ txMeta }) =>\n      txMeta?.type &&\n      (isTradeTx(txMeta.type) || hasNestedSwapTransactions(txMeta)),\n  );\n  const firstTradeMeta = firstTradeWithMetadata?.txMeta;\n  if (!firstTradeMeta) {\n    throw new Error(\n      'Failed to add BatchSell trade to history: txMeta not found',\n    );\n  }\n\n  // Nested/7702 batch\n  if (is7702Tx(firstTradeMeta) || hasNestedSwapTransactions(firstTradeMeta)) {\n    const quoteIds = Array.from(\n      new Set(allTradesInBatch.map(getHistoryKeyForQuote)),\n    );\n\n    // Create 1 history item for the parent tx, keyed by the txMeta.id\n    yield {\n      type: SubmitStep.AddHistoryItem,\n      payload: {\n        historyKey: firstTradeMeta.id,\n        quoteResponse: firstTradeWithMetadata.quoteResponse,\n        batchSellData: batchSellTrades,\n        quoteIds,\n        bridgeTxMeta: firstTradeMeta,\n      },\n    };\n    // Then create a new history item for each nested trade, keyed by quoteId/requestId\n    for (const tradeWithMetadata of allTradesInBatch) {\n      const { quoteResponse } = tradeWithMetadata;\n\n      yield {\n        type: SubmitStep.AddHistoryItem,\n        payload: {\n          historyKey: getHistoryKeyForQuote(tradeWithMetadata),\n          quoteResponse,\n          batchSellData: batchSellTrades,\n        },\n      };\n    }\n  } else {\n    // Each trade has its own txMeta if not submitted via 7702\n    // Create a new history item for each one, keyed by txMeta.id\n    // Note that the approvalTxId is not tracked in history\n    for (const { txMeta, quoteResponse } of allTradesInBatch) {\n      yield {\n        type: SubmitStep.AddHistoryItem,\n        payload: {\n          historyKey: txMeta.id,\n          quoteResponse,\n          batchSellData: batchSellTrades,\n          bridgeTxMeta: txMeta,\n        },\n      };\n    }\n  }\n\n  yield {\n    type: SubmitStep.SetTradeMeta,\n    payload: {\n      tradeMeta: firstTradeMeta,\n    },\n  };\n}\n"]}
+{"version":3,"file":"batch-sell-strategy.cjs","sourceRoot":"","sources":["../../src/strategy/batch-sell-strategy.ts"],"names":[],"mappings":"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","sourcesContent":["import { BatchSellTradesResponse, TxData } from '@metamask/bridge-controller';\nimport {\n  TransactionMeta,\n  TransactionType,\n} from '@metamask/transaction-controller';\n\nimport { QuoteAndTxMetadata } from '../types';\nimport {\n  findAllTransactionsInBatch,\n  getAddTransactionBatchParams,\n  hasNestedSwapTransactions,\n  is7702Tx,\n  isTradeTx,\n  shouldDisable7702,\n  toQuoteAndTxMetadataBatch,\n} from '../utils/transaction';\nimport { SubmitStep } from './types';\nimport type { SubmitStrategyParams, SubmitStepResult } from './types';\n\nconst getHistoryKeyForQuote = ({\n  quoteResponse: { quoteId, quote },\n}: QuoteAndTxMetadata): string => quoteId ?? quote.requestId;\n\n/**\n * Submits batch-sell transactions to the TransactionController\n *\n * @param args - The parameters for the transaction\n * @yields The approvalMeta and tradeMeta for the first batch sell transaction\n */\nexport async function* submitBatchSellHandler(\n  args: SubmitStrategyParams<TxData, BatchSellTradesResponse>,\n): AsyncGenerator<SubmitStepResult, void, void> {\n  const {\n    requireApproval,\n    quoteResponses,\n    messenger,\n    addTransactionBatchFn,\n    isDelegatedAccount,\n    batchSellTrades,\n  } = args;\n\n  const tradeData = toQuoteAndTxMetadataBatch({\n    quoteResponses,\n    batchSellTrades,\n  });\n\n  const { gasIncluded7702, gasIncluded, gasSponsored } = batchSellTrades;\n\n  const gasFeeToken = tradeData.find(\n    ({ type }) => type === TransactionType.tokenMethodTransfer,\n  )?.tx.to;\n\n  const transactionParams = await getAddTransactionBatchParams({\n    messenger,\n    tradeData,\n    requireApproval,\n    isDelegatedAccount,\n    // Tx success/failure is independent of other txs in the batch\n    atomic: false,\n    disable7702: shouldDisable7702(\n      gasIncluded7702,\n      gasIncluded,\n      isDelegatedAccount,\n    ),\n    isGasFeeSponsored: gasSponsored,\n    isGasFeeIncluded: Boolean(gasIncluded7702),\n    skipInitialGasEstimate: gasIncluded7702\n      ? isDelegatedAccount\n      : Boolean(gasFeeToken),\n    excludeNativeTokenForFee: !gasFeeToken,\n  });\n\n  // Submit the batch to the TransactionController\n  const { batchId } = await addTransactionBatchFn(transactionParams);\n\n  // Find all batch transaction metas and add them to history\n  const allTradesInBatch = findAllTransactionsInBatch({\n    messenger,\n    batchId,\n    tradeData,\n  }).filter(\n    (metadata): metadata is QuoteAndTxMetadata & { txMeta: TransactionMeta } =>\n      isTradeTx(metadata.type) && metadata.txMeta !== undefined,\n  );\n\n  // This is either the delegation tx or the first STX swap in the batch\n  const firstTradeWithMetadata = allTradesInBatch.find(\n    ({ txMeta }) =>\n      txMeta?.type &&\n      (isTradeTx(txMeta.type) || hasNestedSwapTransactions(txMeta)),\n  );\n  const firstTradeMeta = firstTradeWithMetadata?.txMeta;\n  if (!firstTradeMeta) {\n    throw new Error(\n      'Failed to add BatchSell trade to history: txMeta not found',\n    );\n  }\n\n  // Nested/7702 batch\n  if (is7702Tx(firstTradeMeta) || hasNestedSwapTransactions(firstTradeMeta)) {\n    const quoteIds = Array.from(\n      new Set(allTradesInBatch.map(getHistoryKeyForQuote)),\n    );\n\n    // Create 1 history item for the parent tx, keyed by the txMeta.id\n    yield {\n      type: SubmitStep.AddHistoryItem,\n      payload: {\n        historyKey: firstTradeMeta.id,\n        quoteResponse: firstTradeWithMetadata.quoteResponse,\n        batchSellData: batchSellTrades,\n        quoteIds,\n        bridgeTxMeta: firstTradeMeta,\n      },\n    };\n    // Then create a new history item for each nested trade, keyed by quoteId/requestId\n    for (const tradeWithMetadata of allTradesInBatch) {\n      const { quoteResponse } = tradeWithMetadata;\n\n      yield {\n        type: SubmitStep.AddHistoryItem,\n        payload: {\n          historyKey: getHistoryKeyForQuote(tradeWithMetadata),\n          quoteResponse,\n          batchSellData: batchSellTrades,\n        },\n      };\n    }\n  } else {\n    // Each trade has its own txMeta if not submitted via 7702\n    // Create a new history item for each one, keyed by txMeta.id\n    // Note that the approvalTxId is not tracked in history\n    for (const { txMeta, quoteResponse } of allTradesInBatch) {\n      yield {\n        type: SubmitStep.AddHistoryItem,\n        payload: {\n          historyKey: txMeta.id,\n          quoteResponse,\n          batchSellData: batchSellTrades,\n          bridgeTxMeta: txMeta,\n        },\n      };\n    }\n  }\n\n  yield {\n    type: SubmitStep.SetTradeMeta,\n    payload: {\n      tradeMeta: firstTradeMeta,\n    },\n  };\n}\n"]}

package/dist/strategy/batch-sell-strategy.d.cts.map

@@ -1 +1 @@
-{"version":3,"file":"batch-sell-strategy.d.cts","sourceRoot":"","sources":["../../src/strategy/batch-sell-strategy.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,uBAAuB,EAAE,MAAM,EAAE,oCAAoC;AAiB9E,OAAO,KAAK,EAAE,oBAAoB,EAAE,gBAAgB,EAAE,oBAAgB;AAMtE;;;;;GAKG;AACH,wBAAuB,sBAAsB,CAC3C,IAAI,EAAE,oBAAoB,CAAC,MAAM,EAAE,uBAAuB,CAAC,GAC1D,cAAc,CAAC,gBAAgB,EAAE,IAAI,EAAE,IAAI,CAAC,CAsH9C"}
+{"version":3,"file":"batch-sell-strategy.d.cts","sourceRoot":"","sources":["../../src/strategy/batch-sell-strategy.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,uBAAuB,EAAE,MAAM,EAAE,oCAAoC;AAiB9E,OAAO,KAAK,EAAE,oBAAoB,EAAE,gBAAgB,EAAE,oBAAgB;AAMtE;;;;;GAKG;AACH,wBAAuB,sBAAsB,CAC3C,IAAI,EAAE,oBAAoB,CAAC,MAAM,EAAE,uBAAuB,CAAC,GAC1D,cAAc,CAAC,gBAAgB,EAAE,IAAI,EAAE,IAAI,CAAC,CAwH9C"}

package/dist/strategy/batch-sell-strategy.d.mts.map

@@ -1 +1 @@
-{"version":3,"file":"batch-sell-strategy.d.mts","sourceRoot":"","sources":["../../src/strategy/batch-sell-strategy.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,uBAAuB,EAAE,MAAM,EAAE,oCAAoC;AAiB9E,OAAO,KAAK,EAAE,oBAAoB,EAAE,gBAAgB,EAAE,oBAAgB;AAMtE;;;;;GAKG;AACH,wBAAuB,sBAAsB,CAC3C,IAAI,EAAE,oBAAoB,CAAC,MAAM,EAAE,uBAAuB,CAAC,GAC1D,cAAc,CAAC,gBAAgB,EAAE,IAAI,EAAE,IAAI,CAAC,CAsH9C"}
+{"version":3,"file":"batch-sell-strategy.d.mts","sourceRoot":"","sources":["../../src/strategy/batch-sell-strategy.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,uBAAuB,EAAE,MAAM,EAAE,oCAAoC;AAiB9E,OAAO,KAAK,EAAE,oBAAoB,EAAE,gBAAgB,EAAE,oBAAgB;AAMtE;;;;;GAKG;AACH,wBAAuB,sBAAsB,CAC3C,IAAI,EAAE,oBAAoB,CAAC,MAAM,EAAE,uBAAuB,CAAC,GAC1D,cAAc,CAAC,gBAAgB,EAAE,IAAI,EAAE,IAAI,CAAC,CAwH9C"}

package/dist/strategy/batch-sell-strategy.mjs

@@ -26,8 +26,10 @@ export async function* submitBatchSellHandler(args) {
         disable7702: shouldDisable7702(gasIncluded7702, gasIncluded, isDelegatedAccount),
         isGasFeeSponsored: gasSponsored,
         isGasFeeIncluded: Boolean(gasIncluded7702),
-        skipInitialGasEstimate: false,
-        excludeNativeTokenForFee: Boolean(gasFeeToken),
+        skipInitialGasEstimate: gasIncluded7702
+            ? isDelegatedAccount
+            : Boolean(gasFeeToken),
+        excludeNativeTokenForFee: !gasFeeToken,
     });
     // Submit the batch to the TransactionController
     const { batchId } = await addTransactionBatchFn(transactionParams);

package/dist/strategy/batch-sell-strategy.mjs.map

@@ -1 +1 @@
-{"version":3,"file":"batch-sell-strategy.mjs","sourceRoot":"","sources":["../../src/strategy/batch-sell-strategy.ts"],"names":[],"mappings":"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","sourcesContent":["import { BatchSellTradesResponse, TxData } from '@metamask/bridge-controller';\nimport {\n  TransactionMeta,\n  TransactionType,\n} from '@metamask/transaction-controller';\n\nimport { QuoteAndTxMetadata } from '../types';\nimport {\n  findAllTransactionsInBatch,\n  getAddTransactionBatchParams,\n  hasNestedSwapTransactions,\n  is7702Tx,\n  isTradeTx,\n  shouldDisable7702,\n  toQuoteAndTxMetadataBatch,\n} from '../utils/transaction';\nimport { SubmitStep } from './types';\nimport type { SubmitStrategyParams, SubmitStepResult } from './types';\n\nconst getHistoryKeyForQuote = ({\n  quoteResponse: { quoteId, quote },\n}: QuoteAndTxMetadata): string => quoteId ?? quote.requestId;\n\n/**\n * Submits batch-sell transactions to the TransactionController\n *\n * @param args - The parameters for the transaction\n * @yields The approvalMeta and tradeMeta for the first batch sell transaction\n */\nexport async function* submitBatchSellHandler(\n  args: SubmitStrategyParams<TxData, BatchSellTradesResponse>,\n): AsyncGenerator<SubmitStepResult, void, void> {\n  const {\n    requireApproval,\n    quoteResponses,\n    messenger,\n    addTransactionBatchFn,\n    isDelegatedAccount,\n    batchSellTrades,\n  } = args;\n\n  const tradeData = toQuoteAndTxMetadataBatch({\n    quoteResponses,\n    batchSellTrades,\n  });\n\n  const { gasIncluded7702, gasIncluded, gasSponsored } = batchSellTrades;\n\n  const gasFeeToken = tradeData.find(\n    ({ type }) => type === TransactionType.tokenMethodTransfer,\n  )?.tx.to;\n\n  const transactionParams = await getAddTransactionBatchParams({\n    messenger,\n    tradeData,\n    requireApproval,\n    isDelegatedAccount,\n    // Tx success/failure is independent of other txs in the batch\n    atomic: false,\n    disable7702: shouldDisable7702(\n      gasIncluded7702,\n      gasIncluded,\n      isDelegatedAccount,\n    ),\n    isGasFeeSponsored: gasSponsored,\n    isGasFeeIncluded: Boolean(gasIncluded7702),\n    skipInitialGasEstimate: false,\n    excludeNativeTokenForFee: Boolean(gasFeeToken),\n  });\n\n  // Submit the batch to the TransactionController\n  const { batchId } = await addTransactionBatchFn(transactionParams);\n\n  // Find all batch transaction metas and add them to history\n  const allTradesInBatch = findAllTransactionsInBatch({\n    messenger,\n    batchId,\n    tradeData,\n  }).filter(\n    (metadata): metadata is QuoteAndTxMetadata & { txMeta: TransactionMeta } =>\n      isTradeTx(metadata.type) && metadata.txMeta !== undefined,\n  );\n\n  // This is either the delegation tx or the first STX swap in the batch\n  const firstTradeWithMetadata = allTradesInBatch.find(\n    ({ txMeta }) =>\n      txMeta?.type &&\n      (isTradeTx(txMeta.type) || hasNestedSwapTransactions(txMeta)),\n  );\n  const firstTradeMeta = firstTradeWithMetadata?.txMeta;\n  if (!firstTradeMeta) {\n    throw new Error(\n      'Failed to add BatchSell trade to history: txMeta not found',\n    );\n  }\n\n  // Nested/7702 batch\n  if (is7702Tx(firstTradeMeta) || hasNestedSwapTransactions(firstTradeMeta)) {\n    const quoteIds = Array.from(\n      new Set(allTradesInBatch.map(getHistoryKeyForQuote)),\n    );\n\n    // Create 1 history item for the parent tx, keyed by the txMeta.id\n    yield {\n      type: SubmitStep.AddHistoryItem,\n      payload: {\n        historyKey: firstTradeMeta.id,\n        quoteResponse: firstTradeWithMetadata.quoteResponse,\n        batchSellData: batchSellTrades,\n        quoteIds,\n        bridgeTxMeta: firstTradeMeta,\n      },\n    };\n    // Then create a new history item for each nested trade, keyed by quoteId/requestId\n    for (const tradeWithMetadata of allTradesInBatch) {\n      const { quoteResponse } = tradeWithMetadata;\n\n      yield {\n        type: SubmitStep.AddHistoryItem,\n        payload: {\n          historyKey: getHistoryKeyForQuote(tradeWithMetadata),\n          quoteResponse,\n          batchSellData: batchSellTrades,\n        },\n      };\n    }\n  } else {\n    // Each trade has its own txMeta if not submitted via 7702\n    // Create a new history item for each one, keyed by txMeta.id\n    // Note that the approvalTxId is not tracked in history\n    for (const { txMeta, quoteResponse } of allTradesInBatch) {\n      yield {\n        type: SubmitStep.AddHistoryItem,\n        payload: {\n          historyKey: txMeta.id,\n          quoteResponse,\n          batchSellData: batchSellTrades,\n          bridgeTxMeta: txMeta,\n        },\n      };\n    }\n  }\n\n  yield {\n    type: SubmitStep.SetTradeMeta,\n    payload: {\n      tradeMeta: firstTradeMeta,\n    },\n  };\n}\n"]}
+{"version":3,"file":"batch-sell-strategy.mjs","sourceRoot":"","sources":["../../src/strategy/batch-sell-strategy.ts"],"names":[],"mappings":"AACA,OAAO,EAEL,eAAe,EAChB,yCAAyC;AAG1C,OAAO,EACL,0BAA0B,EAC1B,4BAA4B,EAC5B,yBAAyB,EACzB,QAAQ,EACR,SAAS,EACT,iBAAiB,EACjB,yBAAyB,EAC1B,iCAA6B;AAC9B,OAAO,EAAE,UAAU,EAAE,oBAAgB;AAGrC,MAAM,qBAAqB,GAAG,CAAC,EAC7B,aAAa,EAAE,EAAE,OAAO,EAAE,KAAK,EAAE,GACd,EAAU,EAAE,CAAC,OAAO,IAAI,KAAK,CAAC,SAAS,CAAC;AAE7D;;;;;GAKG;AACH,MAAM,CAAC,KAAK,SAAS,CAAC,CAAC,sBAAsB,CAC3C,IAA2D;IAE3D,MAAM,EACJ,eAAe,EACf,cAAc,EACd,SAAS,EACT,qBAAqB,EACrB,kBAAkB,EAClB,eAAe,GAChB,GAAG,IAAI,CAAC;IAET,MAAM,SAAS,GAAG,yBAAyB,CAAC;QAC1C,cAAc;QACd,eAAe;KAChB,CAAC,CAAC;IAEH,MAAM,EAAE,eAAe,EAAE,WAAW,EAAE,YAAY,EAAE,GAAG,eAAe,CAAC;IAEvE,MAAM,WAAW,GAAG,SAAS,CAAC,IAAI,CAChC,CAAC,EAAE,IAAI,EAAE,EAAE,EAAE,CAAC,IAAI,KAAK,eAAe,CAAC,mBAAmB,CAC3D,EAAE,EAAE,CAAC,EAAE,CAAC;IAET,MAAM,iBAAiB,GAAG,MAAM,4BAA4B,CAAC;QAC3D,SAAS;QACT,SAAS;QACT,eAAe;QACf,kBAAkB;QAClB,8DAA8D;QAC9D,MAAM,EAAE,KAAK;QACb,WAAW,EAAE,iBAAiB,CAC5B,eAAe,EACf,WAAW,EACX,kBAAkB,CACnB;QACD,iBAAiB,EAAE,YAAY;QAC/B,gBAAgB,EAAE,OAAO,CAAC,eAAe,CAAC;QAC1C,sBAAsB,EAAE,eAAe;YACrC,CAAC,CAAC,kBAAkB;YACpB,CAAC,CAAC,OAAO,CAAC,WAAW,CAAC;QACxB,wBAAwB,EAAE,CAAC,WAAW;KACvC,CAAC,CAAC;IAEH,gDAAgD;IAChD,MAAM,EAAE,OAAO,EAAE,GAAG,MAAM,qBAAqB,CAAC,iBAAiB,CAAC,CAAC;IAEnE,2DAA2D;IAC3D,MAAM,gBAAgB,GAAG,0BAA0B,CAAC;QAClD,SAAS;QACT,OAAO;QACP,SAAS;KACV,CAAC,CAAC,MAAM,CACP,CAAC,QAAQ,EAAgE,EAAE,CACzE,SAAS,CAAC,QAAQ,CAAC,IAAI,CAAC,IAAI,QAAQ,CAAC,MAAM,KAAK,SAAS,CAC5D,CAAC;IAEF,sEAAsE;IACtE,MAAM,sBAAsB,GAAG,gBAAgB,CAAC,IAAI,CAClD,CAAC,EAAE,MAAM,EAAE,EAAE,EAAE,CACb,MAAM,EAAE,IAAI;QACZ,CAAC,SAAS,CAAC,MAAM,CAAC,IAAI,CAAC,IAAI,yBAAyB,CAAC,MAAM,CAAC,CAAC,CAChE,CAAC;IACF,MAAM,cAAc,GAAG,sBAAsB,EAAE,MAAM,CAAC;IACtD,IAAI,CAAC,cAAc,EAAE,CAAC;QACpB,MAAM,IAAI,KAAK,CACb,4DAA4D,CAC7D,CAAC;IACJ,CAAC;IAED,oBAAoB;IACpB,IAAI,QAAQ,CAAC,cAAc,CAAC,IAAI,yBAAyB,CAAC,cAAc,CAAC,EAAE,CAAC;QAC1E,MAAM,QAAQ,GAAG,KAAK,CAAC,IAAI,CACzB,IAAI,GAAG,CAAC,gBAAgB,CAAC,GAAG,CAAC,qBAAqB,CAAC,CAAC,CACrD,CAAC;QAEF,kEAAkE;QAClE,MAAM;YACJ,IAAI,EAAE,UAAU,CAAC,cAAc;YAC/B,OAAO,EAAE;gBACP,UAAU,EAAE,cAAc,CAAC,EAAE;gBAC7B,aAAa,EAAE,sBAAsB,CAAC,aAAa;gBACnD,aAAa,EAAE,eAAe;gBAC9B,QAAQ;gBACR,YAAY,EAAE,cAAc;aAC7B;SACF,CAAC;QACF,mFAAmF;QACnF,KAAK,MAAM,iBAAiB,IAAI,gBAAgB,EAAE,CAAC;YACjD,MAAM,EAAE,aAAa,EAAE,GAAG,iBAAiB,CAAC;YAE5C,MAAM;gBACJ,IAAI,EAAE,UAAU,CAAC,cAAc;gBAC/B,OAAO,EAAE;oBACP,UAAU,EAAE,qBAAqB,CAAC,iBAAiB,CAAC;oBACpD,aAAa;oBACb,aAAa,EAAE,eAAe;iBAC/B;aACF,CAAC;QACJ,CAAC;IACH,CAAC;SAAM,CAAC;QACN,0DAA0D;QAC1D,6DAA6D;QAC7D,uDAAuD;QACvD,KAAK,MAAM,EAAE,MAAM,EAAE,aAAa,EAAE,IAAI,gBAAgB,EAAE,CAAC;YACzD,MAAM;gBACJ,IAAI,EAAE,UAAU,CAAC,cAAc;gBAC/B,OAAO,EAAE;oBACP,UAAU,EAAE,MAAM,CAAC,EAAE;oBACrB,aAAa;oBACb,aAAa,EAAE,eAAe;oBAC9B,YAAY,EAAE,MAAM;iBACrB;aACF,CAAC;QACJ,CAAC;IACH,CAAC;IAED,MAAM;QACJ,IAAI,EAAE,UAAU,CAAC,YAAY;QAC7B,OAAO,EAAE;YACP,SAAS,EAAE,cAAc;SAC1B;KACF,CAAC;AACJ,CAAC","sourcesContent":["import { BatchSellTradesResponse, TxData } from '@metamask/bridge-controller';\nimport {\n  TransactionMeta,\n  TransactionType,\n} from '@metamask/transaction-controller';\n\nimport { QuoteAndTxMetadata } from '../types';\nimport {\n  findAllTransactionsInBatch,\n  getAddTransactionBatchParams,\n  hasNestedSwapTransactions,\n  is7702Tx,\n  isTradeTx,\n  shouldDisable7702,\n  toQuoteAndTxMetadataBatch,\n} from '../utils/transaction';\nimport { SubmitStep } from './types';\nimport type { SubmitStrategyParams, SubmitStepResult } from './types';\n\nconst getHistoryKeyForQuote = ({\n  quoteResponse: { quoteId, quote },\n}: QuoteAndTxMetadata): string => quoteId ?? quote.requestId;\n\n/**\n * Submits batch-sell transactions to the TransactionController\n *\n * @param args - The parameters for the transaction\n * @yields The approvalMeta and tradeMeta for the first batch sell transaction\n */\nexport async function* submitBatchSellHandler(\n  args: SubmitStrategyParams<TxData, BatchSellTradesResponse>,\n): AsyncGenerator<SubmitStepResult, void, void> {\n  const {\n    requireApproval,\n    quoteResponses,\n    messenger,\n    addTransactionBatchFn,\n    isDelegatedAccount,\n    batchSellTrades,\n  } = args;\n\n  const tradeData = toQuoteAndTxMetadataBatch({\n    quoteResponses,\n    batchSellTrades,\n  });\n\n  const { gasIncluded7702, gasIncluded, gasSponsored } = batchSellTrades;\n\n  const gasFeeToken = tradeData.find(\n    ({ type }) => type === TransactionType.tokenMethodTransfer,\n  )?.tx.to;\n\n  const transactionParams = await getAddTransactionBatchParams({\n    messenger,\n    tradeData,\n    requireApproval,\n    isDelegatedAccount,\n    // Tx success/failure is independent of other txs in the batch\n    atomic: false,\n    disable7702: shouldDisable7702(\n      gasIncluded7702,\n      gasIncluded,\n      isDelegatedAccount,\n    ),\n    isGasFeeSponsored: gasSponsored,\n    isGasFeeIncluded: Boolean(gasIncluded7702),\n    skipInitialGasEstimate: gasIncluded7702\n      ? isDelegatedAccount\n      : Boolean(gasFeeToken),\n    excludeNativeTokenForFee: !gasFeeToken,\n  });\n\n  // Submit the batch to the TransactionController\n  const { batchId } = await addTransactionBatchFn(transactionParams);\n\n  // Find all batch transaction metas and add them to history\n  const allTradesInBatch = findAllTransactionsInBatch({\n    messenger,\n    batchId,\n    tradeData,\n  }).filter(\n    (metadata): metadata is QuoteAndTxMetadata & { txMeta: TransactionMeta } =>\n      isTradeTx(metadata.type) && metadata.txMeta !== undefined,\n  );\n\n  // This is either the delegation tx or the first STX swap in the batch\n  const firstTradeWithMetadata = allTradesInBatch.find(\n    ({ txMeta }) =>\n      txMeta?.type &&\n      (isTradeTx(txMeta.type) || hasNestedSwapTransactions(txMeta)),\n  );\n  const firstTradeMeta = firstTradeWithMetadata?.txMeta;\n  if (!firstTradeMeta) {\n    throw new Error(\n      'Failed to add BatchSell trade to history: txMeta not found',\n    );\n  }\n\n  // Nested/7702 batch\n  if (is7702Tx(firstTradeMeta) || hasNestedSwapTransactions(firstTradeMeta)) {\n    const quoteIds = Array.from(\n      new Set(allTradesInBatch.map(getHistoryKeyForQuote)),\n    );\n\n    // Create 1 history item for the parent tx, keyed by the txMeta.id\n    yield {\n      type: SubmitStep.AddHistoryItem,\n      payload: {\n        historyKey: firstTradeMeta.id,\n        quoteResponse: firstTradeWithMetadata.quoteResponse,\n        batchSellData: batchSellTrades,\n        quoteIds,\n        bridgeTxMeta: firstTradeMeta,\n      },\n    };\n    // Then create a new history item for each nested trade, keyed by quoteId/requestId\n    for (const tradeWithMetadata of allTradesInBatch) {\n      const { quoteResponse } = tradeWithMetadata;\n\n      yield {\n        type: SubmitStep.AddHistoryItem,\n        payload: {\n          historyKey: getHistoryKeyForQuote(tradeWithMetadata),\n          quoteResponse,\n          batchSellData: batchSellTrades,\n        },\n      };\n    }\n  } else {\n    // Each trade has its own txMeta if not submitted via 7702\n    // Create a new history item for each one, keyed by txMeta.id\n    // Note that the approvalTxId is not tracked in history\n    for (const { txMeta, quoteResponse } of allTradesInBatch) {\n      yield {\n        type: SubmitStep.AddHistoryItem,\n        payload: {\n          historyKey: txMeta.id,\n          quoteResponse,\n          batchSellData: batchSellTrades,\n          bridgeTxMeta: txMeta,\n        },\n      };\n    }\n  }\n\n  yield {\n    type: SubmitStep.SetTradeMeta,\n    payload: {\n      tradeMeta: firstTradeMeta,\n    },\n  };\n}\n"]}

package/dist/strategy/batch-strategy.cjs

@@ -1,6 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.submitBatchHandler = void 0;
+const bridge_controller_1 = require("@metamask/bridge-controller");
 const transaction_1 = require("../utils/transaction.cjs");
 const types_1 = require("./types.cjs");
 /**
@@ -15,6 +16,10 @@ async function* submitBatchHandler(args) {
         quoteResponse,
         isBridgeTx,
     });
+    const gasFeeToken = quoteResponse.quote.feeData[bridge_controller_1.FeeType.TX_FEE]?.asset?.address &&
+        (0, bridge_controller_1.isNativeAddress)(quoteResponse.quote.feeData[bridge_controller_1.FeeType.TX_FEE].asset.address)
+        ? undefined
+        : quoteResponse.quote.feeData[bridge_controller_1.FeeType.TX_FEE]?.asset?.address;
     const transactionParams = await (0, transaction_1.getAddTransactionBatchParams)({
         tradeData,
         requireApproval,
@@ -24,6 +29,11 @@ async function* submitBatchHandler(args) {
         disable7702: (0, transaction_1.shouldDisable7702)(quoteResponse.quote.gasIncluded7702, quoteResponse.quote.gasIncluded, isDelegatedAccount),
         isGasFeeSponsored: Boolean(quoteResponse.quote.gasSponsored),
         isGasFeeIncluded: Boolean(quoteResponse.quote.gasIncluded7702),
+        gasFeeToken,
+        skipInitialGasEstimate: quoteResponse.quote.gasIncluded7702
+            ? isDelegatedAccount
+            : Boolean(gasFeeToken),
+        excludeNativeTokenForFee: !gasFeeToken,
     });
     const { batchId } = await addTransactionBatchFn(transactionParams);
     const quoteAndTxMetas = (0, transaction_1.findAllTransactionsInBatch)({

package/dist/strategy/batch-strategy.cjs.map

@@ -1 +1 @@
-{"version":3,"file":"batch-strategy.cjs","sourceRoot":"","sources":["../../src/strategy/batch-strategy.ts"],"names":[],"mappings":";;;AAEA,0DAO8B;AAC9B,uCAAqC;AAGrC;;;;;GAKG;AACI,KAAK,SAAS,CAAC,CAAC,kBAAkB,CACvC,IAAkC;IAElC,MAAM,EACJ,eAAe,EACf,cAAc,EAAE,CAAC,aAAa,CAAC,EAC/B,SAAS,EACT,UAAU,EACV,qBAAqB,EACrB,kBAAkB,GACnB,GAAG,IAAI,CAAC;IAET,MAAM,SAAS,GAAG,IAAA,kCAAoB,EAAC;QACrC,aAAa;QACb,UAAU;KACX,CAAC,CAAC;IAEH,MAAM,iBAAiB,GAAG,MAAM,IAAA,0CAA4B,EAAC;QAC3D,SAAS;QACT,eAAe;QACf,kBAAkB;QAClB,SAAS;QACT,MAAM,EAAE,IAAI;QACZ,WAAW,EAAE,IAAA,+BAAiB,EAC5B,aAAa,CAAC,KAAK,CAAC,eAAe,EACnC,aAAa,CAAC,KAAK,CAAC,WAAW,EAC/B,kBAAkB,CACnB;QACD,iBAAiB,EAAE,OAAO,CAAC,aAAa,CAAC,KAAK,CAAC,YAAY,CAAC;QAC5D,gBAAgB,EAAE,OAAO,CAAC,aAAa,CAAC,KAAK,CAAC,eAAe,CAAC;KAC/D,CAAC,CAAC;IAEH,MAAM,EAAE,OAAO,EAAE,GAAG,MAAM,qBAAqB,CAAC,iBAAiB,CAAC,CAAC;IAEnE,MAAM,eAAe,GAAG,IAAA,wCAA0B,EAAC;QACjD,SAAS;QACT,OAAO;QACP,SAAS;KACV,CAAC,CAAC;IAEH,MAAM;QACJ,IAAI,EAAE,kBAAU,CAAC,uBAAuB;QACxC,OAAO,EAAE;YACP,eAAe;SAChB;KACF,CAAC;IAEF,MAAM,SAAS,GAAG,eAAe,CAAC,IAAI,CACpC,CAAC,EAAE,IAAI,EAAE,MAAM,EAAE,EAAE,EAAE,CAAC,IAAA,uBAAS,EAAC,IAAI,CAAC,IAAI,MAAM,CAChD,EAAE,MAAM,CAAC;IAEV,MAAM,YAAY,GAAG,eAAe,CAAC,IAAI,CACvC,CAAC,EAAE,IAAI,EAAE,MAAM,EAAE,EAAE,EAAE,CAAC,IAAA,0BAAY,EAAC,IAAI,CAAC,IAAI,MAAM,CACnD,EAAE,MAAM,CAAC;IAEV,IAAI,CAAC,SAAS,EAAE,CAAC;QACf,MAAM,IAAI,KAAK,CACb,0EAA0E,CAC3E,CAAC;IACJ,CAAC;IAED,MAAM;QACJ,IAAI,EAAE,kBAAU,CAAC,YAAY;QAC7B,OAAO,EAAE,EAAE,SAAS,EAAE;KACvB,CAAC;IAEF,MAAM;QACJ,IAAI,EAAE,kBAAU,CAAC,cAAc;QAC/B,OAAO,EAAE;YACP,UAAU,EAAE,SAAS,CAAC,EAAE;YACxB,YAAY,EAAE,YAAY,EAAE,EAAE;YAC9B,YAAY,EAAE;gBACZ,EAAE,EAAE,SAAS,CAAC,EAAE;gBAChB,IAAI,EAAE,SAAS,CAAC,IAAI;gBACpB,OAAO,EAAE,SAAS,CAAC,OAAO;aAC3B;YACD,aAAa;SACd;KACF,CAAC;AACJ,CAAC;AA/ED,gDA+EC","sourcesContent":["import type { TxData } from '@metamask/bridge-controller';\n\nimport {\n  findAllTransactionsInBatch,\n  getAddTransactionBatchParams,\n  isApprovalTx,\n  isTradeTx,\n  shouldDisable7702,\n  toQuoteAndTxMetadata,\n} from '../utils/transaction';\nimport { SubmitStep } from './types';\nimport type { SubmitStrategyParams, SubmitStepResult } from './types';\n\n/**\n * Submits batched EVM transactions to the TransactionController\n *\n * @param args - The parameters for the transaction\n * @yields The approvalMeta and tradeMeta for the batched transaction\n */\nexport async function* submitBatchHandler(\n  args: SubmitStrategyParams<TxData>,\n): AsyncGenerator<SubmitStepResult, void, void> {\n  const {\n    requireApproval,\n    quoteResponses: [quoteResponse],\n    messenger,\n    isBridgeTx,\n    addTransactionBatchFn,\n    isDelegatedAccount,\n  } = args;\n\n  const tradeData = toQuoteAndTxMetadata({\n    quoteResponse,\n    isBridgeTx,\n  });\n\n  const transactionParams = await getAddTransactionBatchParams({\n    tradeData,\n    requireApproval,\n    isDelegatedAccount,\n    messenger,\n    atomic: true,\n    disable7702: shouldDisable7702(\n      quoteResponse.quote.gasIncluded7702,\n      quoteResponse.quote.gasIncluded,\n      isDelegatedAccount,\n    ),\n    isGasFeeSponsored: Boolean(quoteResponse.quote.gasSponsored),\n    isGasFeeIncluded: Boolean(quoteResponse.quote.gasIncluded7702),\n  });\n\n  const { batchId } = await addTransactionBatchFn(transactionParams);\n\n  const quoteAndTxMetas = findAllTransactionsInBatch({\n    messenger,\n    batchId,\n    tradeData,\n  });\n\n  yield {\n    type: SubmitStep.UpdateBatchTransactions,\n    payload: {\n      quoteAndTxMetas,\n    },\n  };\n\n  const tradeMeta = quoteAndTxMetas.find(\n    ({ type, txMeta }) => isTradeTx(type) && txMeta,\n  )?.txMeta;\n\n  const approvalMeta = quoteAndTxMetas.find(\n    ({ type, txMeta }) => isApprovalTx(type) && txMeta,\n  )?.txMeta;\n\n  if (!tradeMeta) {\n    throw new Error(\n      'Failed to update cross-chain swap transaction batch: tradeMeta not found',\n    );\n  }\n\n  yield {\n    type: SubmitStep.SetTradeMeta,\n    payload: { tradeMeta },\n  };\n\n  yield {\n    type: SubmitStep.AddHistoryItem,\n    payload: {\n      historyKey: tradeMeta.id,\n      approvalTxId: approvalMeta?.id,\n      bridgeTxMeta: {\n        id: tradeMeta.id,\n        hash: tradeMeta.hash,\n        batchId: tradeMeta.batchId,\n      },\n      quoteResponse,\n    },\n  };\n}\n"]}
+{"version":3,"file":"batch-strategy.cjs","sourceRoot":"","sources":["../../src/strategy/batch-strategy.ts"],"names":[],"mappings":"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","sourcesContent":["import { FeeType, isNativeAddress } from '@metamask/bridge-controller';\nimport type { TxData } from '@metamask/bridge-controller';\nimport type { Hex } from '@metamask/utils';\n\nimport {\n  findAllTransactionsInBatch,\n  getAddTransactionBatchParams,\n  isApprovalTx,\n  isTradeTx,\n  shouldDisable7702,\n  toQuoteAndTxMetadata,\n} from '../utils/transaction';\nimport { SubmitStep } from './types';\nimport type { SubmitStrategyParams, SubmitStepResult } from './types';\n\n/**\n * Submits batched EVM transactions to the TransactionController\n *\n * @param args - The parameters for the transaction\n * @yields The approvalMeta and tradeMeta for the batched transaction\n */\nexport async function* submitBatchHandler(\n  args: SubmitStrategyParams<TxData>,\n): AsyncGenerator<SubmitStepResult, void, void> {\n  const {\n    requireApproval,\n    quoteResponses: [quoteResponse],\n    messenger,\n    isBridgeTx,\n    addTransactionBatchFn,\n    isDelegatedAccount,\n  } = args;\n\n  const tradeData = toQuoteAndTxMetadata({\n    quoteResponse,\n    isBridgeTx,\n  });\n\n  const gasFeeToken =\n    quoteResponse.quote.feeData[FeeType.TX_FEE]?.asset?.address &&\n    isNativeAddress(quoteResponse.quote.feeData[FeeType.TX_FEE].asset.address)\n      ? undefined\n      : (quoteResponse.quote.feeData[FeeType.TX_FEE]?.asset?.address as Hex);\n\n  const transactionParams = await getAddTransactionBatchParams({\n    tradeData,\n    requireApproval,\n    isDelegatedAccount,\n    messenger,\n    atomic: true,\n    disable7702: shouldDisable7702(\n      quoteResponse.quote.gasIncluded7702,\n      quoteResponse.quote.gasIncluded,\n      isDelegatedAccount,\n    ),\n    isGasFeeSponsored: Boolean(quoteResponse.quote.gasSponsored),\n    isGasFeeIncluded: Boolean(quoteResponse.quote.gasIncluded7702),\n    gasFeeToken,\n    skipInitialGasEstimate: quoteResponse.quote.gasIncluded7702\n      ? isDelegatedAccount\n      : Boolean(gasFeeToken),\n    excludeNativeTokenForFee: !gasFeeToken,\n  });\n\n  const { batchId } = await addTransactionBatchFn(transactionParams);\n\n  const quoteAndTxMetas = findAllTransactionsInBatch({\n    messenger,\n    batchId,\n    tradeData,\n  });\n\n  yield {\n    type: SubmitStep.UpdateBatchTransactions,\n    payload: {\n      quoteAndTxMetas,\n    },\n  };\n\n  const tradeMeta = quoteAndTxMetas.find(\n    ({ type, txMeta }) => isTradeTx(type) && txMeta,\n  )?.txMeta;\n\n  const approvalMeta = quoteAndTxMetas.find(\n    ({ type, txMeta }) => isApprovalTx(type) && txMeta,\n  )?.txMeta;\n\n  if (!tradeMeta) {\n    throw new Error(\n      'Failed to update cross-chain swap transaction batch: tradeMeta not found',\n    );\n  }\n\n  yield {\n    type: SubmitStep.SetTradeMeta,\n    payload: { tradeMeta },\n  };\n\n  yield {\n    type: SubmitStep.AddHistoryItem,\n    payload: {\n      historyKey: tradeMeta.id,\n      approvalTxId: approvalMeta?.id,\n      bridgeTxMeta: {\n        id: tradeMeta.id,\n        hash: tradeMeta.hash,\n        batchId: tradeMeta.batchId,\n      },\n      quoteResponse,\n    },\n  };\n}\n"]}

package/dist/strategy/batch-strategy.d.cts.map

@@ -1 +1 @@
-{"version":3,"file":"batch-strategy.d.cts","sourceRoot":"","sources":["../../src/strategy/batch-strategy.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,MAAM,EAAE,oCAAoC;AAW1D,OAAO,KAAK,EAAE,oBAAoB,EAAE,gBAAgB,EAAE,oBAAgB;AAEtE;;;;;GAKG;AACH,wBAAuB,kBAAkB,CACvC,IAAI,EAAE,oBAAoB,CAAC,MAAM,CAAC,GACjC,cAAc,CAAC,gBAAgB,EAAE,IAAI,EAAE,IAAI,CAAC,CA6E9C"}
+{"version":3,"file":"batch-strategy.d.cts","sourceRoot":"","sources":["../../src/strategy/batch-strategy.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,MAAM,EAAE,oCAAoC;AAY1D,OAAO,KAAK,EAAE,oBAAoB,EAAE,gBAAgB,EAAE,oBAAgB;AAEtE;;;;;GAKG;AACH,wBAAuB,kBAAkB,CACvC,IAAI,EAAE,oBAAoB,CAAC,MAAM,CAAC,GACjC,cAAc,CAAC,gBAAgB,EAAE,IAAI,EAAE,IAAI,CAAC,CAwF9C"}

package/dist/strategy/batch-strategy.d.mts.map

@@ -1 +1 @@
-{"version":3,"file":"batch-strategy.d.mts","sourceRoot":"","sources":["../../src/strategy/batch-strategy.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,MAAM,EAAE,oCAAoC;AAW1D,OAAO,KAAK,EAAE,oBAAoB,EAAE,gBAAgB,EAAE,oBAAgB;AAEtE;;;;;GAKG;AACH,wBAAuB,kBAAkB,CACvC,IAAI,EAAE,oBAAoB,CAAC,MAAM,CAAC,GACjC,cAAc,CAAC,gBAAgB,EAAE,IAAI,EAAE,IAAI,CAAC,CA6E9C"}
+{"version":3,"file":"batch-strategy.d.mts","sourceRoot":"","sources":["../../src/strategy/batch-strategy.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,MAAM,EAAE,oCAAoC;AAY1D,OAAO,KAAK,EAAE,oBAAoB,EAAE,gBAAgB,EAAE,oBAAgB;AAEtE;;;;;GAKG;AACH,wBAAuB,kBAAkB,CACvC,IAAI,EAAE,oBAAoB,CAAC,MAAM,CAAC,GACjC,cAAc,CAAC,gBAAgB,EAAE,IAAI,EAAE,IAAI,CAAC,CAwF9C"}

package/dist/strategy/batch-strategy.mjs

@@ -1,3 +1,4 @@
+import { FeeType, isNativeAddress } from "@metamask/bridge-controller";
 import { findAllTransactionsInBatch, getAddTransactionBatchParams, isApprovalTx, isTradeTx, shouldDisable7702, toQuoteAndTxMetadata } from "../utils/transaction.mjs";
 import { SubmitStep } from "./types.mjs";
 /**
@@ -12,6 +13,10 @@ export async function* submitBatchHandler(args) {
         quoteResponse,
         isBridgeTx,
     });
+    const gasFeeToken = quoteResponse.quote.feeData[FeeType.TX_FEE]?.asset?.address &&
+        isNativeAddress(quoteResponse.quote.feeData[FeeType.TX_FEE].asset.address)
+        ? undefined
+        : quoteResponse.quote.feeData[FeeType.TX_FEE]?.asset?.address;
     const transactionParams = await getAddTransactionBatchParams({
         tradeData,
         requireApproval,
@@ -21,6 +26,11 @@ export async function* submitBatchHandler(args) {
         disable7702: shouldDisable7702(quoteResponse.quote.gasIncluded7702, quoteResponse.quote.gasIncluded, isDelegatedAccount),
         isGasFeeSponsored: Boolean(quoteResponse.quote.gasSponsored),
         isGasFeeIncluded: Boolean(quoteResponse.quote.gasIncluded7702),
+        gasFeeToken,
+        skipInitialGasEstimate: quoteResponse.quote.gasIncluded7702
+            ? isDelegatedAccount
+            : Boolean(gasFeeToken),
+        excludeNativeTokenForFee: !gasFeeToken,
     });
     const { batchId } = await addTransactionBatchFn(transactionParams);
     const quoteAndTxMetas = findAllTransactionsInBatch({

package/dist/strategy/batch-strategy.mjs.map

@@ -1 +1 @@
-{"version":3,"file":"batch-strategy.mjs","sourceRoot":"","sources":["../../src/strategy/batch-strategy.ts"],"names":[],"mappings":"AAEA,OAAO,EACL,0BAA0B,EAC1B,4BAA4B,EAC5B,YAAY,EACZ,SAAS,EACT,iBAAiB,EACjB,oBAAoB,EACrB,iCAA6B;AAC9B,OAAO,EAAE,UAAU,EAAE,oBAAgB;AAGrC;;;;;GAKG;AACH,MAAM,CAAC,KAAK,SAAS,CAAC,CAAC,kBAAkB,CACvC,IAAkC;IAElC,MAAM,EACJ,eAAe,EACf,cAAc,EAAE,CAAC,aAAa,CAAC,EAC/B,SAAS,EACT,UAAU,EACV,qBAAqB,EACrB,kBAAkB,GACnB,GAAG,IAAI,CAAC;IAET,MAAM,SAAS,GAAG,oBAAoB,CAAC;QACrC,aAAa;QACb,UAAU;KACX,CAAC,CAAC;IAEH,MAAM,iBAAiB,GAAG,MAAM,4BAA4B,CAAC;QAC3D,SAAS;QACT,eAAe;QACf,kBAAkB;QAClB,SAAS;QACT,MAAM,EAAE,IAAI;QACZ,WAAW,EAAE,iBAAiB,CAC5B,aAAa,CAAC,KAAK,CAAC,eAAe,EACnC,aAAa,CAAC,KAAK,CAAC,WAAW,EAC/B,kBAAkB,CACnB;QACD,iBAAiB,EAAE,OAAO,CAAC,aAAa,CAAC,KAAK,CAAC,YAAY,CAAC;QAC5D,gBAAgB,EAAE,OAAO,CAAC,aAAa,CAAC,KAAK,CAAC,eAAe,CAAC;KAC/D,CAAC,CAAC;IAEH,MAAM,EAAE,OAAO,EAAE,GAAG,MAAM,qBAAqB,CAAC,iBAAiB,CAAC,CAAC;IAEnE,MAAM,eAAe,GAAG,0BAA0B,CAAC;QACjD,SAAS;QACT,OAAO;QACP,SAAS;KACV,CAAC,CAAC;IAEH,MAAM;QACJ,IAAI,EAAE,UAAU,CAAC,uBAAuB;QACxC,OAAO,EAAE;YACP,eAAe;SAChB;KACF,CAAC;IAEF,MAAM,SAAS,GAAG,eAAe,CAAC,IAAI,CACpC,CAAC,EAAE,IAAI,EAAE,MAAM,EAAE,EAAE,EAAE,CAAC,SAAS,CAAC,IAAI,CAAC,IAAI,MAAM,CAChD,EAAE,MAAM,CAAC;IAEV,MAAM,YAAY,GAAG,eAAe,CAAC,IAAI,CACvC,CAAC,EAAE,IAAI,EAAE,MAAM,EAAE,EAAE,EAAE,CAAC,YAAY,CAAC,IAAI,CAAC,IAAI,MAAM,CACnD,EAAE,MAAM,CAAC;IAEV,IAAI,CAAC,SAAS,EAAE,CAAC;QACf,MAAM,IAAI,KAAK,CACb,0EAA0E,CAC3E,CAAC;IACJ,CAAC;IAED,MAAM;QACJ,IAAI,EAAE,UAAU,CAAC,YAAY;QAC7B,OAAO,EAAE,EAAE,SAAS,EAAE;KACvB,CAAC;IAEF,MAAM;QACJ,IAAI,EAAE,UAAU,CAAC,cAAc;QAC/B,OAAO,EAAE;YACP,UAAU,EAAE,SAAS,CAAC,EAAE;YACxB,YAAY,EAAE,YAAY,EAAE,EAAE;YAC9B,YAAY,EAAE;gBACZ,EAAE,EAAE,SAAS,CAAC,EAAE;gBAChB,IAAI,EAAE,SAAS,CAAC,IAAI;gBACpB,OAAO,EAAE,SAAS,CAAC,OAAO;aAC3B;YACD,aAAa;SACd;KACF,CAAC;AACJ,CAAC","sourcesContent":["import type { TxData } from '@metamask/bridge-controller';\n\nimport {\n  findAllTransactionsInBatch,\n  getAddTransactionBatchParams,\n  isApprovalTx,\n  isTradeTx,\n  shouldDisable7702,\n  toQuoteAndTxMetadata,\n} from '../utils/transaction';\nimport { SubmitStep } from './types';\nimport type { SubmitStrategyParams, SubmitStepResult } from './types';\n\n/**\n * Submits batched EVM transactions to the TransactionController\n *\n * @param args - The parameters for the transaction\n * @yields The approvalMeta and tradeMeta for the batched transaction\n */\nexport async function* submitBatchHandler(\n  args: SubmitStrategyParams<TxData>,\n): AsyncGenerator<SubmitStepResult, void, void> {\n  const {\n    requireApproval,\n    quoteResponses: [quoteResponse],\n    messenger,\n    isBridgeTx,\n    addTransactionBatchFn,\n    isDelegatedAccount,\n  } = args;\n\n  const tradeData = toQuoteAndTxMetadata({\n    quoteResponse,\n    isBridgeTx,\n  });\n\n  const transactionParams = await getAddTransactionBatchParams({\n    tradeData,\n    requireApproval,\n    isDelegatedAccount,\n    messenger,\n    atomic: true,\n    disable7702: shouldDisable7702(\n      quoteResponse.quote.gasIncluded7702,\n      quoteResponse.quote.gasIncluded,\n      isDelegatedAccount,\n    ),\n    isGasFeeSponsored: Boolean(quoteResponse.quote.gasSponsored),\n    isGasFeeIncluded: Boolean(quoteResponse.quote.gasIncluded7702),\n  });\n\n  const { batchId } = await addTransactionBatchFn(transactionParams);\n\n  const quoteAndTxMetas = findAllTransactionsInBatch({\n    messenger,\n    batchId,\n    tradeData,\n  });\n\n  yield {\n    type: SubmitStep.UpdateBatchTransactions,\n    payload: {\n      quoteAndTxMetas,\n    },\n  };\n\n  const tradeMeta = quoteAndTxMetas.find(\n    ({ type, txMeta }) => isTradeTx(type) && txMeta,\n  )?.txMeta;\n\n  const approvalMeta = quoteAndTxMetas.find(\n    ({ type, txMeta }) => isApprovalTx(type) && txMeta,\n  )?.txMeta;\n\n  if (!tradeMeta) {\n    throw new Error(\n      'Failed to update cross-chain swap transaction batch: tradeMeta not found',\n    );\n  }\n\n  yield {\n    type: SubmitStep.SetTradeMeta,\n    payload: { tradeMeta },\n  };\n\n  yield {\n    type: SubmitStep.AddHistoryItem,\n    payload: {\n      historyKey: tradeMeta.id,\n      approvalTxId: approvalMeta?.id,\n      bridgeTxMeta: {\n        id: tradeMeta.id,\n        hash: tradeMeta.hash,\n        batchId: tradeMeta.batchId,\n      },\n      quoteResponse,\n    },\n  };\n}\n"]}
+{"version":3,"file":"batch-strategy.mjs","sourceRoot":"","sources":["../../src/strategy/batch-strategy.ts"],"names":[],"mappings":"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","sourcesContent":["import { FeeType, isNativeAddress } from '@metamask/bridge-controller';\nimport type { TxData } from '@metamask/bridge-controller';\nimport type { Hex } from '@metamask/utils';\n\nimport {\n  findAllTransactionsInBatch,\n  getAddTransactionBatchParams,\n  isApprovalTx,\n  isTradeTx,\n  shouldDisable7702,\n  toQuoteAndTxMetadata,\n} from '../utils/transaction';\nimport { SubmitStep } from './types';\nimport type { SubmitStrategyParams, SubmitStepResult } from './types';\n\n/**\n * Submits batched EVM transactions to the TransactionController\n *\n * @param args - The parameters for the transaction\n * @yields The approvalMeta and tradeMeta for the batched transaction\n */\nexport async function* submitBatchHandler(\n  args: SubmitStrategyParams<TxData>,\n): AsyncGenerator<SubmitStepResult, void, void> {\n  const {\n    requireApproval,\n    quoteResponses: [quoteResponse],\n    messenger,\n    isBridgeTx,\n    addTransactionBatchFn,\n    isDelegatedAccount,\n  } = args;\n\n  const tradeData = toQuoteAndTxMetadata({\n    quoteResponse,\n    isBridgeTx,\n  });\n\n  const gasFeeToken =\n    quoteResponse.quote.feeData[FeeType.TX_FEE]?.asset?.address &&\n    isNativeAddress(quoteResponse.quote.feeData[FeeType.TX_FEE].asset.address)\n      ? undefined\n      : (quoteResponse.quote.feeData[FeeType.TX_FEE]?.asset?.address as Hex);\n\n  const transactionParams = await getAddTransactionBatchParams({\n    tradeData,\n    requireApproval,\n    isDelegatedAccount,\n    messenger,\n    atomic: true,\n    disable7702: shouldDisable7702(\n      quoteResponse.quote.gasIncluded7702,\n      quoteResponse.quote.gasIncluded,\n      isDelegatedAccount,\n    ),\n    isGasFeeSponsored: Boolean(quoteResponse.quote.gasSponsored),\n    isGasFeeIncluded: Boolean(quoteResponse.quote.gasIncluded7702),\n    gasFeeToken,\n    skipInitialGasEstimate: quoteResponse.quote.gasIncluded7702\n      ? isDelegatedAccount\n      : Boolean(gasFeeToken),\n    excludeNativeTokenForFee: !gasFeeToken,\n  });\n\n  const { batchId } = await addTransactionBatchFn(transactionParams);\n\n  const quoteAndTxMetas = findAllTransactionsInBatch({\n    messenger,\n    batchId,\n    tradeData,\n  });\n\n  yield {\n    type: SubmitStep.UpdateBatchTransactions,\n    payload: {\n      quoteAndTxMetas,\n    },\n  };\n\n  const tradeMeta = quoteAndTxMetas.find(\n    ({ type, txMeta }) => isTradeTx(type) && txMeta,\n  )?.txMeta;\n\n  const approvalMeta = quoteAndTxMetas.find(\n    ({ type, txMeta }) => isApprovalTx(type) && txMeta,\n  )?.txMeta;\n\n  if (!tradeMeta) {\n    throw new Error(\n      'Failed to update cross-chain swap transaction batch: tradeMeta not found',\n    );\n  }\n\n  yield {\n    type: SubmitStep.SetTradeMeta,\n    payload: { tradeMeta },\n  };\n\n  yield {\n    type: SubmitStep.AddHistoryItem,\n    payload: {\n      historyKey: tradeMeta.id,\n      approvalTxId: approvalMeta?.id,\n      bridgeTxMeta: {\n        id: tradeMeta.id,\n        hash: tradeMeta.hash,\n        batchId: tradeMeta.batchId,\n      },\n      quoteResponse,\n    },\n  };\n}\n"]}

package/dist/utils/transaction.cjs

@@ -35,12 +35,9 @@ const shouldDisable7702 = (gasIncluded7702 = false, gasIncluded = false, isDeleg
         return false;
     }
     // Enable batching when the account is already delegated (to avoid the in-flight transaction limit for delegated accounts)
-    if (isDelegatedAccount) {
-        return false;
-    }
     // For gasless transactions with STX/sendBundle we keep disabling 7702
-    if (gasIncluded) {
-        return true;
+    if (isDelegatedAccount && !gasIncluded) {
+        return false;
     }
     /**
      * Explicitly return default instead of falsy value (see TransactionBatchRequest.disable7702)
@@ -278,24 +275,25 @@ exports.toQuoteAndTxMetadataBatch = toQuoteAndTxMetadataBatch;
  * @returns The gas fee estimates for the transaction
  */
 const toTransactionParams = async (messenger, { chainId: tradeChainId, gasLimit, ...trade }, networkClientId, chainId, simulatedGasFeeLimits) => {
-    const normalizedTrade = {
-        ...trade,
+    const transactionParams = {
         data: trade.data,
         to: trade.to,
         from: trade.from,
         value: trade.value,
-    };
-    const transactionParams = {
-        ...normalizedTrade,
-        // Only add gasLimit and gas if they're truthy
+        // Only add gas if it's truthy
         gas: gasLimit ? (0, controller_utils_1.toHex)(gasLimit) : undefined,
     };
     // Use bridge-api's provided gas fee estimates
     if (simulatedGasFeeLimits) {
         return {
             ...transactionParams,
-            maxFeePerGas: (0, controller_utils_1.toHex)(simulatedGasFeeLimits.maxFeePerGas),
-            maxPriorityFeePerGas: (0, controller_utils_1.toHex)(simulatedGasFeeLimits.maxPriorityFeePerGas),
+            // Sometimes estimates are hex, somethings numeric strings
+            maxFeePerGas: (0, utils_1.isStrictHexString)(simulatedGasFeeLimits.maxFeePerGas)
+                ? simulatedGasFeeLimits.maxFeePerGas
+                : (0, controller_utils_1.toHex)(simulatedGasFeeLimits.maxFeePerGas),
+            maxPriorityFeePerGas: (0, utils_1.isStrictHexString)(simulatedGasFeeLimits.maxPriorityFeePerGas)
+                ? simulatedGasFeeLimits.maxPriorityFeePerGas
+                : (0, controller_utils_1.toHex)(simulatedGasFeeLimits.maxPriorityFeePerGas),
         };
     }
     // Get transaction's 1559 gas fee estimates

package/dist/utils/transaction.cjs.map

@@ -1 +1 @@
-{"version":3,"file":"transaction.cjs","sourceRoot":"","sources":["../../src/utils/transaction.ts"],"names":[],"mappings":"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","sourcesContent":["/* eslint-disable @typescript-eslint/explicit-function-return-type */\nimport {\n  ChainId,\n  formatChainIdToHex,\n  BRIDGE_PREFERRED_GAS_ESTIMATE,\n  isEvmTxData,\n  FeeType,\n  BatchSellTransactionType,\n} from '@metamask/bridge-controller';\nimport type {\n  BatchSellTradesResponse,\n  QuoteMetadata,\n  QuoteResponse,\n  SimulatedGasFeeLimits,\n  Trade,\n  TxData,\n  TxFeeGasLimits,\n} from '@metamask/bridge-controller';\nimport { toHex } from '@metamask/controller-utils';\nimport {\n  GasFeeEstimateType,\n  TransactionStatus,\n  TransactionType,\n} from '@metamask/transaction-controller';\nimport type {\n  IsAtomicBatchSupportedResultEntry,\n  TransactionController,\n  TransactionMeta,\n  TransactionBatchSingleRequest,\n  BatchTransactionParams,\n} from '@metamask/transaction-controller';\nimport { createProjectLogger } from '@metamask/utils';\nimport type { Hex } from '@metamask/utils';\n\nimport { APPROVAL_DELAY_MS } from '../constants';\nimport type { BridgeStatusControllerMessenger } from '../types';\nimport type { QuoteAndTxMetadata } from '../types';\nimport { getAccountByAddress } from './accounts';\nimport { getNetworkClientIdByChainId } from './network';\n\nexport const isApprovalTx = (type: TransactionType) =>\n  type === TransactionType.bridgeApproval ||\n  type === TransactionType.swapApproval;\nexport const isTradeTx = (type: TransactionType) =>\n  type === TransactionType.bridge || type === TransactionType.swap;\nexport const isCrossChainTx = (type: TransactionType) =>\n  isTradeTx(type) || isApprovalTx(type);\n\n/**\n * For 7702 delegated transactions, check for delegation-specific fields\n * These transactions might have authorizationList or delegationAddress\n *\n * @param tx - The transaction meta\n * @returns Whether the transaction is a 7702 transaction\n */\nexport const is7702Tx = (tx: TransactionMeta) => {\n  return (\n    (Array.isArray(tx.txParams.authorizationList) &&\n      tx.txParams.authorizationList.length > 0) ||\n    Boolean(tx.delegationAddress)\n  );\n};\n\nexport const shouldDisable7702 = (\n  gasIncluded7702: boolean = false,\n  gasIncluded: boolean = false,\n  isDelegatedAccount: boolean = false,\n): boolean => {\n  // Enable 7702 batching when the quote includes gasless 7702 support\n  if (gasIncluded7702) {\n    return false;\n  }\n  // Enable batching when the account is already delegated (to avoid the in-flight transaction limit for delegated accounts)\n  if (isDelegatedAccount) {\n    return false;\n  }\n  // For gasless transactions with STX/sendBundle we keep disabling 7702\n  if (gasIncluded) {\n    return true;\n  }\n  /**\n   * Explicitly return default instead of falsy value (see TransactionBatchRequest.disable7702)\n   */\n  return true;\n};\n\nexport const hasNestedSwapTransactions = (txMeta: TransactionMeta) => {\n  return Boolean(\n    txMeta?.nestedTransactions?.some((tx) => tx.type === TransactionType.swap),\n  );\n};\n\nexport const getGasFeeEstimates = async (\n  messenger: BridgeStatusControllerMessenger,\n  args: Parameters<TransactionController['estimateGasFee']>[0],\n) => {\n  const { estimates } = await messenger.call(\n    'TransactionController:estimateGasFee',\n    args,\n  );\n\n  if (estimates?.type === GasFeeEstimateType.FeeMarket) {\n    return estimates[BRIDGE_PREFERRED_GAS_ESTIMATE];\n  }\n\n  return undefined;\n};\n\nexport const getTransactions = (messenger: BridgeStatusControllerMessenger) => {\n  return messenger.call('TransactionController:getState').transactions ?? [];\n};\n\nexport const getTransactionMetaById = (\n  messenger: BridgeStatusControllerMessenger,\n  txId?: string,\n) => {\n  return getTransactions(messenger).find(\n    (tx: TransactionMeta) => tx.id === txId,\n  );\n};\n\nexport const getTransactionMetaByHash = (\n  messenger: BridgeStatusControllerMessenger,\n  txHash?: string,\n) => {\n  return getTransactions(messenger).find(\n    (tx: TransactionMeta) => tx.hash?.toLowerCase() === txHash?.toLowerCase(),\n  );\n};\n\nexport const updateTransaction = (\n  messenger: BridgeStatusControllerMessenger,\n  txMeta: TransactionMeta,\n  txMetaUpdates: Partial<TransactionMeta>,\n  note: string,\n) => {\n  return messenger.call(\n    'TransactionController:updateTransaction',\n    { ...txMeta, ...txMetaUpdates },\n    note,\n  );\n};\n\nexport const checkIsDelegatedAccount = async (\n  messenger: BridgeStatusControllerMessenger,\n  fromAddress: Hex,\n  chainIds: Hex[],\n): Promise<boolean> => {\n  try {\n    const atomicBatchSupport = await messenger.call(\n      'TransactionController:isAtomicBatchSupported',\n      {\n        address: fromAddress,\n        chainIds,\n      },\n    );\n    return atomicBatchSupport.some(\n      (entry: IsAtomicBatchSupportedResultEntry) =>\n        entry.isSupported && entry.delegationAddress,\n    );\n  } catch {\n    return false;\n  }\n};\n\nconst waitForHashAndReturnFinalTxMeta = async (\n  messenger: BridgeStatusControllerMessenger,\n  hashPromise?: Awaited<\n    ReturnType<TransactionController['addTransaction']>\n  >['result'],\n): Promise<TransactionMeta> => {\n  const txHash = await hashPromise;\n  const finalTransactionMeta = getTransactionMetaByHash(messenger, txHash);\n  if (!finalTransactionMeta) {\n    throw new Error(\n      'Failed to submit cross-chain swap tx: txMeta for txHash was not found',\n    );\n  }\n  return finalTransactionMeta;\n};\n\nexport const addTransaction = async (\n  messenger: BridgeStatusControllerMessenger,\n  ...args: Parameters<TransactionController['addTransaction']>\n) => {\n  const { result } = await messenger.call(\n    'TransactionController:addTransaction',\n    ...args,\n  );\n  return await waitForHashAndReturnFinalTxMeta(messenger, result);\n};\n\nexport const generateActionId = () => (Date.now() + Math.random()).toString();\n\n/**\n * Adds a synthetic transaction to the TransactionController to display pending intent orders in the UI\n *\n * @param messenger - The messenger to use for the transaction\n * @param args - The arguments for the transaction\n * @returns The transaction meta\n */\nexport const addSyntheticTransaction = async (\n  messenger: BridgeStatusControllerMessenger,\n  ...args: Parameters<TransactionController['addTransaction']>\n) => {\n  const { transactionMeta } = await messenger.call(\n    'TransactionController:addTransaction',\n    args[0],\n    {\n      origin: 'metamask',\n      actionId: generateActionId(),\n      isStateOnly: true,\n      isInternal: true,\n      ...args[1],\n    },\n  );\n  return transactionMeta;\n};\n\nexport const handleApprovalDelay = async (\n  srcChainId: QuoteResponse['quote']['srcChainId'],\n) => {\n  if ([ChainId.LINEA, ChainId.BASE].includes(srcChainId)) {\n    const debugLog = createProjectLogger('bridge');\n    debugLog(\n      'Delaying submitting bridge tx to make Linea and Base confirmation more likely',\n    );\n    const waitPromise = new Promise((resolve) =>\n      setTimeout(resolve, APPROVAL_DELAY_MS),\n    );\n    await waitPromise;\n  }\n};\n\n/**\n * Adds a delay for hardware wallet transactions on mobile to fix an issue\n * where the Ledger does not get prompted for the 2nd approval.\n * Extension does not have this issue.\n *\n * @param requireApproval - Whether the delay should be applied\n */\nexport const handleMobileHardwareWalletDelay = async (\n  requireApproval: boolean,\n) => {\n  if (requireApproval) {\n    const mobileHardwareWalletDelay = new Promise((resolve) =>\n      setTimeout(resolve, 1000),\n    );\n    await mobileHardwareWalletDelay;\n  }\n};\n\n/**\n * Waits until a given transaction (by id) reaches confirmed/finalized status or fails/times out.\n *\n * @deprecated use addTransaction util\n * @param messenger - the BridgeStatusControllerMessenger\n * @param txId - the transaction ID\n * @param options - the options for the timeout and poll\n * @param options.timeoutMs - the timeout in milliseconds\n * @param options.pollMs - the poll interval in milliseconds\n * @returns the transaction meta\n */\nexport const waitForTxConfirmation = async (\n  messenger: BridgeStatusControllerMessenger,\n  txId: string,\n  {\n    timeoutMs = 5 * 60_000,\n    pollMs = 3_000,\n  }: { timeoutMs?: number; pollMs?: number } = {},\n): Promise<TransactionMeta> => {\n  const start = Date.now();\n  while (true) {\n    const meta = getTransactionMetaById(messenger, txId);\n\n    if (meta) {\n      if (meta.status === TransactionStatus.confirmed) {\n        return meta;\n      }\n      if (\n        meta.status === TransactionStatus.failed ||\n        meta.status === TransactionStatus.dropped ||\n        meta.status === TransactionStatus.rejected\n      ) {\n        throw new Error('Approval transaction did not confirm');\n      }\n    }\n\n    if (Date.now() - start > timeoutMs) {\n      throw new Error('Timed out waiting for approval confirmation');\n    }\n\n    await new Promise((resolve) => setTimeout(resolve, pollMs));\n  }\n};\n\nexport const toQuoteAndTxMetadata = ({\n  quoteResponse,\n  isBridgeTx,\n}: {\n  quoteResponse: QuoteResponse<Trade, Trade> & QuoteMetadata;\n  isBridgeTx: boolean;\n}): Omit<QuoteAndTxMetadata, 'txMeta'>[] => {\n  const tradeData: QuoteAndTxMetadata[] = [];\n\n  const approvalTxType = isBridgeTx\n    ? TransactionType.bridgeApproval\n    : TransactionType.swapApproval;\n\n  if (quoteResponse.resetApproval) {\n    tradeData.push({\n      quoteResponse,\n      tx: quoteResponse.resetApproval,\n      type: approvalTxType,\n      txFee: quoteResponse.quote.feeData[FeeType.TX_FEE],\n    });\n  }\n  if (quoteResponse.approval && isEvmTxData(quoteResponse.approval)) {\n    tradeData.push({\n      quoteResponse,\n      tx: quoteResponse.approval,\n      type: approvalTxType,\n      txFee: quoteResponse.quote.feeData[FeeType.TX_FEE],\n    });\n  }\n  tradeData.push({\n    quoteResponse,\n    tx: quoteResponse.trade as TxData,\n    type: isBridgeTx ? TransactionType.bridge : TransactionType.swap,\n    assetsFiatValues: {\n      sending: quoteResponse.sentAmount?.valueInCurrency?.toString(),\n      receiving: quoteResponse.toTokenAmount?.valueInCurrency?.toString(),\n    },\n    txFee: quoteResponse.quote.feeData[FeeType.TX_FEE],\n  });\n\n  return tradeData;\n};\n\n/**\n * Build the trade+quote metadata array for the batch sell transaction\n * This ties together the quote, the tx params and the txMeta after submission\n *\n * @param options - The options for the batch sell transaction\n * @param options.quoteResponses - The quote responses for the batch sell transaction\n * @param options.batchSellTrades - The batch sell trades for the batch sell transaction\n * @returns The trade+quote metadata array for the batch sell transaction\n */\nexport const toQuoteAndTxMetadataBatch = ({\n  quoteResponses,\n  batchSellTrades,\n}: {\n  quoteResponses: (QuoteResponse<TxData, TxData> & QuoteMetadata)[];\n  batchSellTrades: BatchSellTradesResponse;\n}): Omit<QuoteAndTxMetadata, 'txMeta'>[] => {\n  const tradeData: QuoteAndTxMetadata[] = [];\n\n  const {\n    transactions,\n    gasIncluded7702,\n    gasIncluded,\n    gasSponsored = false,\n  } = batchSellTrades;\n\n  for (const transaction of transactions) {\n    const { type, maxFeePerGas, maxPriorityFeePerGas, ...tx } = transaction;\n    // Match the trade or approval tx data with the quote response\n    const matchingQuoteResponse =\n      quoteResponses.find(\n        ({ approval, trade }) =>\n          trade?.data.toLowerCase() === tx.data.toLowerCase() ||\n          approval?.data.toLowerCase() === tx.data.toLowerCase(),\n      ) ?? quoteResponses[0];\n\n    // Include gasIncluded and gasIncluded7702 from the gasless batch\n    const normalizedQuote = {\n      ...matchingQuoteResponse,\n      quote: {\n        ...matchingQuoteResponse.quote,\n        gasIncluded,\n        gasIncluded7702,\n        gasSponsored,\n      },\n    };\n\n    const commonTradeData = {\n      tx,\n      quoteResponse: normalizedQuote,\n      txFee: { maxFeePerGas, maxPriorityFeePerGas },\n    };\n\n    if (type === BatchSellTransactionType.TRADE) {\n      tradeData.push({\n        ...commonTradeData,\n        type: TransactionType.swap,\n        assetsFiatValues: {\n          sending:\n            matchingQuoteResponse.sentAmount?.valueInCurrency?.toString(),\n          receiving:\n            matchingQuoteResponse.toTokenAmount?.valueInCurrency?.toString(),\n        },\n      });\n    } else {\n      tradeData.push({\n        ...commonTradeData,\n        type:\n          type === BatchSellTransactionType.APPROVAL\n            ? TransactionType.swapApproval\n            : TransactionType.tokenMethodTransfer,\n      });\n    }\n  }\n\n  return tradeData;\n};\n\n/**\n * Appends the gas fee estimates for a transaction and normalizes the trade data\n *\n * @param messenger - The messenger for the gas fee estimates\n * @param trade - the trade data to append gas fees to\n * @param trade.chainId - ignored, use chainId instead\n * @param trade.gasLimit - the gas limit to use for the gas fee estimates\n * @param networkClientId - the network client ID to use for the gas fee estimates\n * @param chainId - the chain ID to use for the gas fee estimates\n * @param simulatedGasFeeLimits - either the txFee from the quote or the simulated gas fee limits for the batch sell\n * @returns The gas fee estimates for the transaction\n */\nexport const toTransactionParams = async (\n  messenger: BridgeStatusControllerMessenger,\n  { chainId: tradeChainId, gasLimit, ...trade }: TxData,\n  networkClientId: string,\n  chainId: Hex,\n  simulatedGasFeeLimits?: SimulatedGasFeeLimits | TxFeeGasLimits,\n): Promise<BatchTransactionParams> => {\n  const normalizedTrade = {\n    ...trade,\n    data: trade.data,\n    to: trade.to,\n    from: trade.from,\n    value: trade.value,\n  };\n  const transactionParams = {\n    ...normalizedTrade,\n    // Only add gasLimit and gas if they're truthy\n    gas: gasLimit ? toHex(gasLimit) : undefined,\n  };\n\n  // Use bridge-api's provided gas fee estimates\n  if (simulatedGasFeeLimits) {\n    return {\n      ...transactionParams,\n      maxFeePerGas: toHex(simulatedGasFeeLimits.maxFeePerGas),\n      maxPriorityFeePerGas: toHex(simulatedGasFeeLimits.maxPriorityFeePerGas),\n    };\n  }\n\n  // Get transaction's 1559 gas fee estimates\n  const gasFeeEstimates = await getGasFeeEstimates(messenger, {\n    transactionParams,\n    networkClientId,\n    chainId,\n  });\n\n  return {\n    ...transactionParams,\n    maxFeePerGas: gasFeeEstimates?.maxFeePerGas,\n    maxPriorityFeePerGas: gasFeeEstimates?.maxPriorityFeePerGas,\n  };\n};\n\nexport const getAddTransactionBatchParams = async ({\n  messenger,\n  tradeData,\n  requireApproval = false,\n  isDelegatedAccount,\n  ...addTransactionBatchParams\n}: Partial<Parameters<TransactionController['addTransactionBatch']>[0]> & {\n  messenger: BridgeStatusControllerMessenger;\n  tradeData: QuoteAndTxMetadata[];\n  requireApproval?: boolean;\n  isDelegatedAccount?: boolean;\n}): Promise<Parameters<TransactionController['addTransactionBatch']>[0]> => {\n  const trade = tradeData[0].tx;\n  const selectedAccount = getAccountByAddress(messenger, trade.from);\n  if (!selectedAccount) {\n    throw new Error(\n      'Failed to submit cross-chain swap batch transaction: unknown account in trade data',\n    );\n  }\n  const hexChainId = formatChainIdToHex(trade.chainId);\n  const networkClientId = getNetworkClientIdByChainId(messenger, hexChainId);\n\n  const transactions: TransactionBatchSingleRequest[] = await Promise.all(\n    tradeData.map(async ({ tx, txFee, assetsFiatValues, type }) => ({\n      params: await toTransactionParams(\n        messenger,\n        tx,\n        networkClientId,\n        hexChainId,\n        txFee,\n      ),\n      assetsFiatValues,\n      type,\n    })),\n  );\n\n  return {\n    networkClientId,\n    requireApproval,\n    origin: 'metamask',\n    from: selectedAccount.address as Hex,\n    isInternal: true,\n    transactions,\n    ...addTransactionBatchParams,\n  };\n};\n\nexport const findAllTransactionsInBatch = ({\n  messenger,\n  batchId,\n  tradeData,\n}: {\n  messenger: BridgeStatusControllerMessenger;\n  batchId: string;\n  tradeData: QuoteAndTxMetadata[];\n}): QuoteAndTxMetadata[] => {\n  // Filter for transactions with batchId\n  const txs = getTransactions(messenger).filter(\n    (tx: TransactionMeta) => tx.batchId === batchId,\n  );\n\n  return tradeData.map((tradeWithMetadata) => {\n    const { tx, type } = tradeWithMetadata;\n    return {\n      ...tradeWithMetadata,\n      txMeta: txs.find((txMeta: TransactionMeta) => {\n        if (is7702Tx(txMeta)) {\n          // For 7702 transactions, we need to match based on transaction type\n          // since the data field might be different (batch execute call)\n          if (isTradeTx(type) && txMeta.type === TransactionType.batch) {\n            return true;\n          }\n          // Also check if it's an approval transaction for 7702\n          if (isApprovalTx(type) && txMeta.txParams.data === tx.data) {\n            return true;\n          }\n        }\n        // Default matching logic for non-7702 transactions\n        if (txMeta.txParams.data === tx.data) {\n          return true;\n        }\n        return false;\n      }),\n    };\n  });\n};\n\n/**\n * This is a workaround to update the tx type after submission. Batch txs are submitted with\n * the \"batch\" type, but we need to update to swap/bridge for display purposes.\n *\n * @param params - The parameters for the transaction search\n * @param params.messenger - The messenger to use for the transaction\n * @param params.allTradesWithMetadata - The quote, tx data and type for each transaction in the batch\n * @returns A list of transaction metas for each trade in the batch]\n *\n * @example\n * [\n *   {...tradeData[0], tradeMeta: TransactionMeta}\n *   {...tradeData[1], tradeMeta: TransactionMeta}\n *   {...tradeData[2], tradeMeta: TransactionMeta}\n *   {...tradeData[3], tradeMeta: TransactionMeta}\n * ]\n */\nexport const updateTransactionsInBatch = ({\n  messenger,\n  allTradesWithMetadata,\n}: {\n  messenger: BridgeStatusControllerMessenger;\n  allTradesWithMetadata: QuoteAndTxMetadata[];\n}) => {\n  return allTradesWithMetadata.map((tradeWithMetadata) => {\n    const { txMeta, type } = tradeWithMetadata;\n\n    if (txMeta) {\n      // Update the tx type from batch to swap/bridge\n      updateTransaction(\n        messenger,\n        txMeta,\n        { type },\n        `Update tx type to ${type}`,\n      );\n      const updatedTx = { ...txMeta, type };\n      return { ...tradeWithMetadata, txMeta: updatedTx, type };\n    }\n\n    return tradeWithMetadata;\n  });\n};\n"]}
+{"version":3,"file":"transaction.cjs","sourceRoot":"","sources":["../../src/utils/transaction.ts"],"names":[],"mappings":"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","sourcesContent":["/* eslint-disable @typescript-eslint/explicit-function-return-type */\nimport {\n  ChainId,\n  formatChainIdToHex,\n  BRIDGE_PREFERRED_GAS_ESTIMATE,\n  isEvmTxData,\n  FeeType,\n  BatchSellTransactionType,\n} from '@metamask/bridge-controller';\nimport type {\n  BatchSellTradesResponse,\n  QuoteMetadata,\n  QuoteResponse,\n  SimulatedGasFeeLimits,\n  Trade,\n  TxData,\n  TxFeeGasLimits,\n} from '@metamask/bridge-controller';\nimport { toHex } from '@metamask/controller-utils';\nimport {\n  GasFeeEstimateType,\n  TransactionStatus,\n  TransactionType,\n} from '@metamask/transaction-controller';\nimport type {\n  IsAtomicBatchSupportedResultEntry,\n  TransactionController,\n  TransactionMeta,\n  TransactionBatchSingleRequest,\n  BatchTransactionParams,\n} from '@metamask/transaction-controller';\nimport { createProjectLogger, isStrictHexString } from '@metamask/utils';\nimport type { Hex } from '@metamask/utils';\n\nimport { APPROVAL_DELAY_MS } from '../constants';\nimport type { BridgeStatusControllerMessenger } from '../types';\nimport type { QuoteAndTxMetadata } from '../types';\nimport { getAccountByAddress } from './accounts';\nimport { getNetworkClientIdByChainId } from './network';\n\nexport const isApprovalTx = (type: TransactionType) =>\n  type === TransactionType.bridgeApproval ||\n  type === TransactionType.swapApproval;\nexport const isTradeTx = (type: TransactionType) =>\n  type === TransactionType.bridge || type === TransactionType.swap;\nexport const isCrossChainTx = (type: TransactionType) =>\n  isTradeTx(type) || isApprovalTx(type);\n\n/**\n * For 7702 delegated transactions, check for delegation-specific fields\n * These transactions might have authorizationList or delegationAddress\n *\n * @param tx - The transaction meta\n * @returns Whether the transaction is a 7702 transaction\n */\nexport const is7702Tx = (tx: TransactionMeta) => {\n  return (\n    (Array.isArray(tx.txParams.authorizationList) &&\n      tx.txParams.authorizationList.length > 0) ||\n    Boolean(tx.delegationAddress)\n  );\n};\n\nexport const shouldDisable7702 = (\n  gasIncluded7702: boolean = false,\n  gasIncluded: boolean = false,\n  isDelegatedAccount: boolean = false,\n): boolean => {\n  // Enable 7702 batching when the quote includes gasless 7702 support\n  if (gasIncluded7702) {\n    return false;\n  }\n  // Enable batching when the account is already delegated (to avoid the in-flight transaction limit for delegated accounts)\n  // For gasless transactions with STX/sendBundle we keep disabling 7702\n  if (isDelegatedAccount && !gasIncluded) {\n    return false;\n  }\n  /**\n   * Explicitly return default instead of falsy value (see TransactionBatchRequest.disable7702)\n   */\n  return true;\n};\n\nexport const hasNestedSwapTransactions = (txMeta: TransactionMeta) => {\n  return Boolean(\n    txMeta?.nestedTransactions?.some((tx) => tx.type === TransactionType.swap),\n  );\n};\n\nexport const getGasFeeEstimates = async (\n  messenger: BridgeStatusControllerMessenger,\n  args: Parameters<TransactionController['estimateGasFee']>[0],\n) => {\n  const { estimates } = await messenger.call(\n    'TransactionController:estimateGasFee',\n    args,\n  );\n\n  if (estimates?.type === GasFeeEstimateType.FeeMarket) {\n    return estimates[BRIDGE_PREFERRED_GAS_ESTIMATE];\n  }\n\n  return undefined;\n};\n\nexport const getTransactions = (messenger: BridgeStatusControllerMessenger) => {\n  return messenger.call('TransactionController:getState').transactions ?? [];\n};\n\nexport const getTransactionMetaById = (\n  messenger: BridgeStatusControllerMessenger,\n  txId?: string,\n) => {\n  return getTransactions(messenger).find(\n    (tx: TransactionMeta) => tx.id === txId,\n  );\n};\n\nexport const getTransactionMetaByHash = (\n  messenger: BridgeStatusControllerMessenger,\n  txHash?: string,\n) => {\n  return getTransactions(messenger).find(\n    (tx: TransactionMeta) => tx.hash?.toLowerCase() === txHash?.toLowerCase(),\n  );\n};\n\nexport const updateTransaction = (\n  messenger: BridgeStatusControllerMessenger,\n  txMeta: TransactionMeta,\n  txMetaUpdates: Partial<TransactionMeta>,\n  note: string,\n) => {\n  return messenger.call(\n    'TransactionController:updateTransaction',\n    { ...txMeta, ...txMetaUpdates },\n    note,\n  );\n};\n\nexport const checkIsDelegatedAccount = async (\n  messenger: BridgeStatusControllerMessenger,\n  fromAddress: Hex,\n  chainIds: Hex[],\n): Promise<boolean> => {\n  try {\n    const atomicBatchSupport = await messenger.call(\n      'TransactionController:isAtomicBatchSupported',\n      {\n        address: fromAddress,\n        chainIds,\n      },\n    );\n    return atomicBatchSupport.some(\n      (entry: IsAtomicBatchSupportedResultEntry) =>\n        entry.isSupported && entry.delegationAddress,\n    );\n  } catch {\n    return false;\n  }\n};\n\nconst waitForHashAndReturnFinalTxMeta = async (\n  messenger: BridgeStatusControllerMessenger,\n  hashPromise?: Awaited<\n    ReturnType<TransactionController['addTransaction']>\n  >['result'],\n): Promise<TransactionMeta> => {\n  const txHash = await hashPromise;\n  const finalTransactionMeta = getTransactionMetaByHash(messenger, txHash);\n  if (!finalTransactionMeta) {\n    throw new Error(\n      'Failed to submit cross-chain swap tx: txMeta for txHash was not found',\n    );\n  }\n  return finalTransactionMeta;\n};\n\nexport const addTransaction = async (\n  messenger: BridgeStatusControllerMessenger,\n  ...args: Parameters<TransactionController['addTransaction']>\n) => {\n  const { result } = await messenger.call(\n    'TransactionController:addTransaction',\n    ...args,\n  );\n  return await waitForHashAndReturnFinalTxMeta(messenger, result);\n};\n\nexport const generateActionId = () => (Date.now() + Math.random()).toString();\n\n/**\n * Adds a synthetic transaction to the TransactionController to display pending intent orders in the UI\n *\n * @param messenger - The messenger to use for the transaction\n * @param args - The arguments for the transaction\n * @returns The transaction meta\n */\nexport const addSyntheticTransaction = async (\n  messenger: BridgeStatusControllerMessenger,\n  ...args: Parameters<TransactionController['addTransaction']>\n) => {\n  const { transactionMeta } = await messenger.call(\n    'TransactionController:addTransaction',\n    args[0],\n    {\n      origin: 'metamask',\n      actionId: generateActionId(),\n      isStateOnly: true,\n      isInternal: true,\n      ...args[1],\n    },\n  );\n  return transactionMeta;\n};\n\nexport const handleApprovalDelay = async (\n  srcChainId: QuoteResponse['quote']['srcChainId'],\n) => {\n  if ([ChainId.LINEA, ChainId.BASE].includes(srcChainId)) {\n    const debugLog = createProjectLogger('bridge');\n    debugLog(\n      'Delaying submitting bridge tx to make Linea and Base confirmation more likely',\n    );\n    const waitPromise = new Promise((resolve) =>\n      setTimeout(resolve, APPROVAL_DELAY_MS),\n    );\n    await waitPromise;\n  }\n};\n\n/**\n * Adds a delay for hardware wallet transactions on mobile to fix an issue\n * where the Ledger does not get prompted for the 2nd approval.\n * Extension does not have this issue.\n *\n * @param requireApproval - Whether the delay should be applied\n */\nexport const handleMobileHardwareWalletDelay = async (\n  requireApproval: boolean,\n) => {\n  if (requireApproval) {\n    const mobileHardwareWalletDelay = new Promise((resolve) =>\n      setTimeout(resolve, 1000),\n    );\n    await mobileHardwareWalletDelay;\n  }\n};\n\n/**\n * Waits until a given transaction (by id) reaches confirmed/finalized status or fails/times out.\n *\n * @deprecated use addTransaction util\n * @param messenger - the BridgeStatusControllerMessenger\n * @param txId - the transaction ID\n * @param options - the options for the timeout and poll\n * @param options.timeoutMs - the timeout in milliseconds\n * @param options.pollMs - the poll interval in milliseconds\n * @returns the transaction meta\n */\nexport const waitForTxConfirmation = async (\n  messenger: BridgeStatusControllerMessenger,\n  txId: string,\n  {\n    timeoutMs = 5 * 60_000,\n    pollMs = 3_000,\n  }: { timeoutMs?: number; pollMs?: number } = {},\n): Promise<TransactionMeta> => {\n  const start = Date.now();\n  while (true) {\n    const meta = getTransactionMetaById(messenger, txId);\n\n    if (meta) {\n      if (meta.status === TransactionStatus.confirmed) {\n        return meta;\n      }\n      if (\n        meta.status === TransactionStatus.failed ||\n        meta.status === TransactionStatus.dropped ||\n        meta.status === TransactionStatus.rejected\n      ) {\n        throw new Error('Approval transaction did not confirm');\n      }\n    }\n\n    if (Date.now() - start > timeoutMs) {\n      throw new Error('Timed out waiting for approval confirmation');\n    }\n\n    await new Promise((resolve) => setTimeout(resolve, pollMs));\n  }\n};\n\nexport const toQuoteAndTxMetadata = ({\n  quoteResponse,\n  isBridgeTx,\n}: {\n  quoteResponse: QuoteResponse<Trade, Trade> & QuoteMetadata;\n  isBridgeTx: boolean;\n}): Omit<QuoteAndTxMetadata, 'txMeta'>[] => {\n  const tradeData: QuoteAndTxMetadata[] = [];\n\n  const approvalTxType = isBridgeTx\n    ? TransactionType.bridgeApproval\n    : TransactionType.swapApproval;\n\n  if (quoteResponse.resetApproval) {\n    tradeData.push({\n      quoteResponse,\n      tx: quoteResponse.resetApproval,\n      type: approvalTxType,\n      txFee: quoteResponse.quote.feeData[FeeType.TX_FEE],\n    });\n  }\n  if (quoteResponse.approval && isEvmTxData(quoteResponse.approval)) {\n    tradeData.push({\n      quoteResponse,\n      tx: quoteResponse.approval,\n      type: approvalTxType,\n      txFee: quoteResponse.quote.feeData[FeeType.TX_FEE],\n    });\n  }\n  tradeData.push({\n    quoteResponse,\n    tx: quoteResponse.trade as TxData,\n    type: isBridgeTx ? TransactionType.bridge : TransactionType.swap,\n    assetsFiatValues: {\n      sending: quoteResponse.sentAmount?.valueInCurrency?.toString(),\n      receiving: quoteResponse.toTokenAmount?.valueInCurrency?.toString(),\n    },\n    txFee: quoteResponse.quote.feeData[FeeType.TX_FEE],\n  });\n\n  return tradeData;\n};\n\n/**\n * Build the trade+quote metadata array for the batch sell transaction\n * This ties together the quote, the tx params and the txMeta after submission\n *\n * @param options - The options for the batch sell transaction\n * @param options.quoteResponses - The quote responses for the batch sell transaction\n * @param options.batchSellTrades - The batch sell trades for the batch sell transaction\n * @returns The trade+quote metadata array for the batch sell transaction\n */\nexport const toQuoteAndTxMetadataBatch = ({\n  quoteResponses,\n  batchSellTrades,\n}: {\n  quoteResponses: (QuoteResponse<TxData, TxData> & QuoteMetadata)[];\n  batchSellTrades: BatchSellTradesResponse;\n}): Omit<QuoteAndTxMetadata, 'txMeta'>[] => {\n  const tradeData: QuoteAndTxMetadata[] = [];\n\n  const {\n    transactions,\n    gasIncluded7702,\n    gasIncluded,\n    gasSponsored = false,\n  } = batchSellTrades;\n\n  for (const transaction of transactions) {\n    const { type, maxFeePerGas, maxPriorityFeePerGas, ...tx } = transaction;\n    // Match the trade or approval tx data with the quote response\n    const matchingQuoteResponse =\n      quoteResponses.find(\n        ({ approval, trade }) =>\n          trade?.data.toLowerCase() === tx.data.toLowerCase() ||\n          approval?.data.toLowerCase() === tx.data.toLowerCase(),\n      ) ?? quoteResponses[0];\n\n    // Include gasIncluded and gasIncluded7702 from the gasless batch\n    const normalizedQuote = {\n      ...matchingQuoteResponse,\n      quote: {\n        ...matchingQuoteResponse.quote,\n        gasIncluded,\n        gasIncluded7702,\n        gasSponsored,\n      },\n    };\n\n    const commonTradeData = {\n      tx,\n      quoteResponse: normalizedQuote,\n      txFee: { maxFeePerGas, maxPriorityFeePerGas },\n    };\n\n    if (type === BatchSellTransactionType.TRADE) {\n      tradeData.push({\n        ...commonTradeData,\n        type: TransactionType.swap,\n        assetsFiatValues: {\n          sending:\n            matchingQuoteResponse.sentAmount?.valueInCurrency?.toString(),\n          receiving:\n            matchingQuoteResponse.toTokenAmount?.valueInCurrency?.toString(),\n        },\n      });\n    } else {\n      tradeData.push({\n        ...commonTradeData,\n        type:\n          type === BatchSellTransactionType.APPROVAL\n            ? TransactionType.swapApproval\n            : TransactionType.tokenMethodTransfer,\n      });\n    }\n  }\n\n  return tradeData;\n};\n\n/**\n * Appends the gas fee estimates for a transaction and normalizes the trade data\n *\n * @param messenger - The messenger for the gas fee estimates\n * @param trade - the trade data to append gas fees to\n * @param trade.chainId - ignored, use chainId instead\n * @param trade.gasLimit - the gas limit to use for the gas fee estimates\n * @param networkClientId - the network client ID to use for the gas fee estimates\n * @param chainId - the chain ID to use for the gas fee estimates\n * @param simulatedGasFeeLimits - either the txFee from the quote or the simulated gas fee limits for the batch sell\n * @returns The gas fee estimates for the transaction\n */\nexport const toTransactionParams = async (\n  messenger: BridgeStatusControllerMessenger,\n  { chainId: tradeChainId, gasLimit, ...trade }: TxData,\n  networkClientId: string,\n  chainId: Hex,\n  simulatedGasFeeLimits?: SimulatedGasFeeLimits | TxFeeGasLimits,\n): Promise<BatchTransactionParams> => {\n  const transactionParams = {\n    data: trade.data,\n    to: trade.to,\n    from: trade.from,\n    value: trade.value,\n    // Only add gas if it's truthy\n    gas: gasLimit ? toHex(gasLimit) : undefined,\n  };\n\n  // Use bridge-api's provided gas fee estimates\n  if (simulatedGasFeeLimits) {\n    return {\n      ...transactionParams,\n      // Sometimes estimates are hex, somethings numeric strings\n      maxFeePerGas: isStrictHexString(simulatedGasFeeLimits.maxFeePerGas)\n        ? simulatedGasFeeLimits.maxFeePerGas\n        : toHex(simulatedGasFeeLimits.maxFeePerGas),\n      maxPriorityFeePerGas: isStrictHexString(\n        simulatedGasFeeLimits.maxPriorityFeePerGas,\n      )\n        ? simulatedGasFeeLimits.maxPriorityFeePerGas\n        : toHex(simulatedGasFeeLimits.maxPriorityFeePerGas),\n    };\n  }\n\n  // Get transaction's 1559 gas fee estimates\n  const gasFeeEstimates = await getGasFeeEstimates(messenger, {\n    transactionParams,\n    networkClientId,\n    chainId,\n  });\n\n  return {\n    ...transactionParams,\n    maxFeePerGas: gasFeeEstimates?.maxFeePerGas,\n    maxPriorityFeePerGas: gasFeeEstimates?.maxPriorityFeePerGas,\n  };\n};\n\nexport const getAddTransactionBatchParams = async ({\n  messenger,\n  tradeData,\n  requireApproval = false,\n  isDelegatedAccount,\n  ...addTransactionBatchParams\n}: Partial<Parameters<TransactionController['addTransactionBatch']>[0]> & {\n  messenger: BridgeStatusControllerMessenger;\n  tradeData: QuoteAndTxMetadata[];\n  requireApproval?: boolean;\n  isDelegatedAccount?: boolean;\n}): Promise<Parameters<TransactionController['addTransactionBatch']>[0]> => {\n  const trade = tradeData[0].tx;\n  const selectedAccount = getAccountByAddress(messenger, trade.from);\n  if (!selectedAccount) {\n    throw new Error(\n      'Failed to submit cross-chain swap batch transaction: unknown account in trade data',\n    );\n  }\n  const hexChainId = formatChainIdToHex(trade.chainId);\n  const networkClientId = getNetworkClientIdByChainId(messenger, hexChainId);\n\n  const transactions: TransactionBatchSingleRequest[] = await Promise.all(\n    tradeData.map(async ({ tx, txFee, assetsFiatValues, type }) => ({\n      params: await toTransactionParams(\n        messenger,\n        tx,\n        networkClientId,\n        hexChainId,\n        txFee,\n      ),\n      assetsFiatValues,\n      type,\n    })),\n  );\n\n  return {\n    networkClientId,\n    requireApproval,\n    origin: 'metamask',\n    from: selectedAccount.address as Hex,\n    isInternal: true,\n    transactions,\n    ...addTransactionBatchParams,\n  };\n};\n\nexport const findAllTransactionsInBatch = ({\n  messenger,\n  batchId,\n  tradeData,\n}: {\n  messenger: BridgeStatusControllerMessenger;\n  batchId: string;\n  tradeData: QuoteAndTxMetadata[];\n}): QuoteAndTxMetadata[] => {\n  // Filter for transactions with batchId\n  const txs = getTransactions(messenger).filter(\n    (tx: TransactionMeta) => tx.batchId === batchId,\n  );\n\n  return tradeData.map((tradeWithMetadata) => {\n    const { tx, type } = tradeWithMetadata;\n    return {\n      ...tradeWithMetadata,\n      txMeta: txs.find((txMeta: TransactionMeta) => {\n        if (is7702Tx(txMeta)) {\n          // For 7702 transactions, we need to match based on transaction type\n          // since the data field might be different (batch execute call)\n          if (isTradeTx(type) && txMeta.type === TransactionType.batch) {\n            return true;\n          }\n          // Also check if it's an approval transaction for 7702\n          if (isApprovalTx(type) && txMeta.txParams.data === tx.data) {\n            return true;\n          }\n        }\n        // Default matching logic for non-7702 transactions\n        if (txMeta.txParams.data === tx.data) {\n          return true;\n        }\n        return false;\n      }),\n    };\n  });\n};\n\n/**\n * This is a workaround to update the tx type after submission. Batch txs are submitted with\n * the \"batch\" type, but we need to update to swap/bridge for display purposes.\n *\n * @param params - The parameters for the transaction search\n * @param params.messenger - The messenger to use for the transaction\n * @param params.allTradesWithMetadata - The quote, tx data and type for each transaction in the batch\n * @returns A list of transaction metas for each trade in the batch]\n *\n * @example\n * [\n *   {...tradeData[0], tradeMeta: TransactionMeta}\n *   {...tradeData[1], tradeMeta: TransactionMeta}\n *   {...tradeData[2], tradeMeta: TransactionMeta}\n *   {...tradeData[3], tradeMeta: TransactionMeta}\n * ]\n */\nexport const updateTransactionsInBatch = ({\n  messenger,\n  allTradesWithMetadata,\n}: {\n  messenger: BridgeStatusControllerMessenger;\n  allTradesWithMetadata: QuoteAndTxMetadata[];\n}) => {\n  return allTradesWithMetadata.map((tradeWithMetadata) => {\n    const { txMeta, type } = tradeWithMetadata;\n\n    if (txMeta) {\n      // Update the tx type from batch to swap/bridge\n      updateTransaction(\n        messenger,\n        txMeta,\n        { type },\n        `Update tx type to ${type}`,\n      );\n      const updatedTx = { ...txMeta, type };\n      return { ...tradeWithMetadata, txMeta: updatedTx, type };\n    }\n\n    return tradeWithMetadata;\n  });\n};\n"]}

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

@@ -1 +1 @@
-{"version":3,"file":"transaction.d.cts","sourceRoot":"","sources":["../../src/utils/transaction.ts"],"names":[],"mappings":"AASA,OAAO,KAAK,EACV,uBAAuB,EACvB,aAAa,EACb,aAAa,EACb,qBAAqB,EACrB,KAAK,EACL,MAAM,EACN,cAAc,EACf,oCAAoC;AAErC,OAAO,EAGL,eAAe,EAChB,yCAAyC;AAC1C,OAAO,KAAK,EAEV,qBAAqB,EACrB,eAAe,EAEf,sBAAsB,EACvB,yCAAyC;AAE1C,OAAO,KAAK,EAAE,GAAG,EAAE,wBAAwB;AAG3C,OAAO,KAAK,EAAE,+BAA+B,EAAE,qBAAiB;AAChE,OAAO,KAAK,EAAE,kBAAkB,EAAE,qBAAiB;AAInD,eAAO,MAAM,YAAY,SAAU,eAAe,YAEX,CAAC;AACxC,eAAO,MAAM,SAAS,SAAU,eAAe,YACmB,CAAC;AACnE,eAAO,MAAM,cAAc,SAAU,eAAe,YACb,CAAC;AAExC;;;;;;GAMG;AACH,eAAO,MAAM,QAAQ,OAAQ,eAAe,YAM3C,CAAC;AAEF,eAAO,MAAM,iBAAiB,qBACX,OAAO,gBACX,OAAO,uBACA,OAAO,KAC1B,OAiBF,CAAC;AAEF,eAAO,MAAM,yBAAyB,WAAY,eAAe,YAIhE,CAAC;AAEF,eAAO,MAAM,kBAAkB,qDAEvB,WAAW,qBAAqB,CAAC,gBAAgB,CAAC,CAAC,CAAC,CAAC,CAAC,oGAY7D,CAAC;AAEF,eAAO,MAAM,eAAe,mEAE3B,CAAC;AAEF,eAAO,MAAM,sBAAsB,sDAE1B,MAAM,gCAKd,CAAC;AAEF,eAAO,MAAM,wBAAwB,wDAE1B,MAAM,gCAKhB,CAAC;AAEF,eAAO,MAAM,iBAAiB,uDAEpB,eAAe,iBACR,QAAQ,eAAe,CAAC,QACjC,MAAM,SAOb,CAAC;AAEF,eAAO,MAAM,uBAAuB,4DAErB,GAAG,YACN,GAAG,EAAE,KACd,QAAQ,OAAO,CAgBjB,CAAC;AAkBF,eAAO,MAAM,cAAc,6NAS1B,CAAC;AAEF,eAAO,MAAM,gBAAgB,cAAgD,CAAC;AAE9E;;;;;;GAMG;AACH,eAAO,MAAM,uBAAuB,6NAgBnC,CAAC;AAEF,eAAO,MAAM,mBAAmB,eAClB,aAAa,CAAC,OAAO,CAAC,CAAC,YAAY,CAAC,kBAYjD,CAAC;AAEF;;;;;;GAMG;AACH,eAAO,MAAM,+BAA+B,oBACzB,OAAO,kBAQzB,CAAC;AAEF;;;;;;;;;;GAUG;AACH,eAAO,MAAM,qBAAqB,qDAE1B,MAAM;;;MAKX,QAAQ,eAAe,CAwBzB,CAAC;AAEF,eAAO,MAAM,oBAAoB;mBAIhB,cAAc,KAAK,EAAE,KAAK,CAAC,GAAG,aAAa;gBAC9C,OAAO;MACjB,KAAK,kBAAkB,EAAE,QAAQ,CAAC,EAmCrC,CAAC;AAEF;;;;;;;;GAQG;AACH,eAAO,MAAM,yBAAyB;oBAIpB,CAAC,cAAc,MAAM,EAAE,MAAM,CAAC,GAAG,aAAa,CAAC,EAAE;qBAChD,uBAAuB;MACtC,KAAK,kBAAkB,EAAE,QAAQ,CAAC,EA4DrC,CAAC;AAEF;;;;;;;;;;;GAWG;AACH,eAAO,MAAM,mBAAmB,8FAEiB,MAAM,mBACpC,MAAM,WACd,GAAG,0BACY,qBAAqB,GAAG,cAAc,KAC7D,QAAQ,sBAAsB,CAmChC,CAAC;AAEF,eAAO,MAAM,4BAA4B;;eAQ5B,kBAAkB,EAAE;;;MAG7B,QAAQ,WAAW,qBAAqB,CAAC,qBAAqB,CAAC,CAAC,CAAC,CAAC,CAAC,CAkCtE,CAAC;AAEF,eAAO,MAAM,0BAA0B;;aAM5B,MAAM;eACJ,kBAAkB,EAAE;MAC7B,kBAAkB,EA8BrB,CAAC;AAEF;;;;;;;;;;;;;;;;GAgBG;AACH,eAAO,MAAM,yBAAyB;;2BAKb,kBAAkB,EAAE;0BAmB5C,CAAC"}
+{"version":3,"file":"transaction.d.cts","sourceRoot":"","sources":["../../src/utils/transaction.ts"],"names":[],"mappings":"AASA,OAAO,KAAK,EACV,uBAAuB,EACvB,aAAa,EACb,aAAa,EACb,qBAAqB,EACrB,KAAK,EACL,MAAM,EACN,cAAc,EACf,oCAAoC;AAErC,OAAO,EAGL,eAAe,EAChB,yCAAyC;AAC1C,OAAO,KAAK,EAEV,qBAAqB,EACrB,eAAe,EAEf,sBAAsB,EACvB,yCAAyC;AAE1C,OAAO,KAAK,EAAE,GAAG,EAAE,wBAAwB;AAG3C,OAAO,KAAK,EAAE,+BAA+B,EAAE,qBAAiB;AAChE,OAAO,KAAK,EAAE,kBAAkB,EAAE,qBAAiB;AAInD,eAAO,MAAM,YAAY,SAAU,eAAe,YAEX,CAAC;AACxC,eAAO,MAAM,SAAS,SAAU,eAAe,YACmB,CAAC;AACnE,eAAO,MAAM,cAAc,SAAU,eAAe,YACb,CAAC;AAExC;;;;;;GAMG;AACH,eAAO,MAAM,QAAQ,OAAQ,eAAe,YAM3C,CAAC;AAEF,eAAO,MAAM,iBAAiB,qBACX,OAAO,gBACX,OAAO,uBACA,OAAO,KAC1B,OAcF,CAAC;AAEF,eAAO,MAAM,yBAAyB,WAAY,eAAe,YAIhE,CAAC;AAEF,eAAO,MAAM,kBAAkB,qDAEvB,WAAW,qBAAqB,CAAC,gBAAgB,CAAC,CAAC,CAAC,CAAC,CAAC,oGAY7D,CAAC;AAEF,eAAO,MAAM,eAAe,mEAE3B,CAAC;AAEF,eAAO,MAAM,sBAAsB,sDAE1B,MAAM,gCAKd,CAAC;AAEF,eAAO,MAAM,wBAAwB,wDAE1B,MAAM,gCAKhB,CAAC;AAEF,eAAO,MAAM,iBAAiB,uDAEpB,eAAe,iBACR,QAAQ,eAAe,CAAC,QACjC,MAAM,SAOb,CAAC;AAEF,eAAO,MAAM,uBAAuB,4DAErB,GAAG,YACN,GAAG,EAAE,KACd,QAAQ,OAAO,CAgBjB,CAAC;AAkBF,eAAO,MAAM,cAAc,6NAS1B,CAAC;AAEF,eAAO,MAAM,gBAAgB,cAAgD,CAAC;AAE9E;;;;;;GAMG;AACH,eAAO,MAAM,uBAAuB,6NAgBnC,CAAC;AAEF,eAAO,MAAM,mBAAmB,eAClB,aAAa,CAAC,OAAO,CAAC,CAAC,YAAY,CAAC,kBAYjD,CAAC;AAEF;;;;;;GAMG;AACH,eAAO,MAAM,+BAA+B,oBACzB,OAAO,kBAQzB,CAAC;AAEF;;;;;;;;;;GAUG;AACH,eAAO,MAAM,qBAAqB,qDAE1B,MAAM;;;MAKX,QAAQ,eAAe,CAwBzB,CAAC;AAEF,eAAO,MAAM,oBAAoB;mBAIhB,cAAc,KAAK,EAAE,KAAK,CAAC,GAAG,aAAa;gBAC9C,OAAO;MACjB,KAAK,kBAAkB,EAAE,QAAQ,CAAC,EAmCrC,CAAC;AAEF;;;;;;;;GAQG;AACH,eAAO,MAAM,yBAAyB;oBAIpB,CAAC,cAAc,MAAM,EAAE,MAAM,CAAC,GAAG,aAAa,CAAC,EAAE;qBAChD,uBAAuB;MACtC,KAAK,kBAAkB,EAAE,QAAQ,CAAC,EA4DrC,CAAC;AAEF;;;;;;;;;;;GAWG;AACH,eAAO,MAAM,mBAAmB,8FAEiB,MAAM,mBACpC,MAAM,WACd,GAAG,0BACY,qBAAqB,GAAG,cAAc,KAC7D,QAAQ,sBAAsB,CAsChC,CAAC;AAEF,eAAO,MAAM,4BAA4B;;eAQ5B,kBAAkB,EAAE;;;MAG7B,QAAQ,WAAW,qBAAqB,CAAC,qBAAqB,CAAC,CAAC,CAAC,CAAC,CAAC,CAkCtE,CAAC;AAEF,eAAO,MAAM,0BAA0B;;aAM5B,MAAM;eACJ,kBAAkB,EAAE;MAC7B,kBAAkB,EA8BrB,CAAC;AAEF;;;;;;;;;;;;;;;;GAgBG;AACH,eAAO,MAAM,yBAAyB;;2BAKb,kBAAkB,EAAE;0BAmB5C,CAAC"}

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

@@ -1 +1 @@
-{"version":3,"file":"transaction.d.mts","sourceRoot":"","sources":["../../src/utils/transaction.ts"],"names":[],"mappings":"AASA,OAAO,KAAK,EACV,uBAAuB,EACvB,aAAa,EACb,aAAa,EACb,qBAAqB,EACrB,KAAK,EACL,MAAM,EACN,cAAc,EACf,oCAAoC;AAErC,OAAO,EAGL,eAAe,EAChB,yCAAyC;AAC1C,OAAO,KAAK,EAEV,qBAAqB,EACrB,eAAe,EAEf,sBAAsB,EACvB,yCAAyC;AAE1C,OAAO,KAAK,EAAE,GAAG,EAAE,wBAAwB;AAG3C,OAAO,KAAK,EAAE,+BAA+B,EAAE,qBAAiB;AAChE,OAAO,KAAK,EAAE,kBAAkB,EAAE,qBAAiB;AAInD,eAAO,MAAM,YAAY,SAAU,eAAe,YAEX,CAAC;AACxC,eAAO,MAAM,SAAS,SAAU,eAAe,YACmB,CAAC;AACnE,eAAO,MAAM,cAAc,SAAU,eAAe,YACb,CAAC;AAExC;;;;;;GAMG;AACH,eAAO,MAAM,QAAQ,OAAQ,eAAe,YAM3C,CAAC;AAEF,eAAO,MAAM,iBAAiB,qBACX,OAAO,gBACX,OAAO,uBACA,OAAO,KAC1B,OAiBF,CAAC;AAEF,eAAO,MAAM,yBAAyB,WAAY,eAAe,YAIhE,CAAC;AAEF,eAAO,MAAM,kBAAkB,qDAEvB,WAAW,qBAAqB,CAAC,gBAAgB,CAAC,CAAC,CAAC,CAAC,CAAC,oGAY7D,CAAC;AAEF,eAAO,MAAM,eAAe,mEAE3B,CAAC;AAEF,eAAO,MAAM,sBAAsB,sDAE1B,MAAM,gCAKd,CAAC;AAEF,eAAO,MAAM,wBAAwB,wDAE1B,MAAM,gCAKhB,CAAC;AAEF,eAAO,MAAM,iBAAiB,uDAEpB,eAAe,iBACR,QAAQ,eAAe,CAAC,QACjC,MAAM,SAOb,CAAC;AAEF,eAAO,MAAM,uBAAuB,4DAErB,GAAG,YACN,GAAG,EAAE,KACd,QAAQ,OAAO,CAgBjB,CAAC;AAkBF,eAAO,MAAM,cAAc,6NAS1B,CAAC;AAEF,eAAO,MAAM,gBAAgB,cAAgD,CAAC;AAE9E;;;;;;GAMG;AACH,eAAO,MAAM,uBAAuB,6NAgBnC,CAAC;AAEF,eAAO,MAAM,mBAAmB,eAClB,aAAa,CAAC,OAAO,CAAC,CAAC,YAAY,CAAC,kBAYjD,CAAC;AAEF;;;;;;GAMG;AACH,eAAO,MAAM,+BAA+B,oBACzB,OAAO,kBAQzB,CAAC;AAEF;;;;;;;;;;GAUG;AACH,eAAO,MAAM,qBAAqB,qDAE1B,MAAM;;;MAKX,QAAQ,eAAe,CAwBzB,CAAC;AAEF,eAAO,MAAM,oBAAoB;mBAIhB,cAAc,KAAK,EAAE,KAAK,CAAC,GAAG,aAAa;gBAC9C,OAAO;MACjB,KAAK,kBAAkB,EAAE,QAAQ,CAAC,EAmCrC,CAAC;AAEF;;;;;;;;GAQG;AACH,eAAO,MAAM,yBAAyB;oBAIpB,CAAC,cAAc,MAAM,EAAE,MAAM,CAAC,GAAG,aAAa,CAAC,EAAE;qBAChD,uBAAuB;MACtC,KAAK,kBAAkB,EAAE,QAAQ,CAAC,EA4DrC,CAAC;AAEF;;;;;;;;;;;GAWG;AACH,eAAO,MAAM,mBAAmB,8FAEiB,MAAM,mBACpC,MAAM,WACd,GAAG,0BACY,qBAAqB,GAAG,cAAc,KAC7D,QAAQ,sBAAsB,CAmChC,CAAC;AAEF,eAAO,MAAM,4BAA4B;;eAQ5B,kBAAkB,EAAE;;;MAG7B,QAAQ,WAAW,qBAAqB,CAAC,qBAAqB,CAAC,CAAC,CAAC,CAAC,CAAC,CAkCtE,CAAC;AAEF,eAAO,MAAM,0BAA0B;;aAM5B,MAAM;eACJ,kBAAkB,EAAE;MAC7B,kBAAkB,EA8BrB,CAAC;AAEF;;;;;;;;;;;;;;;;GAgBG;AACH,eAAO,MAAM,yBAAyB;;2BAKb,kBAAkB,EAAE;0BAmB5C,CAAC"}
+{"version":3,"file":"transaction.d.mts","sourceRoot":"","sources":["../../src/utils/transaction.ts"],"names":[],"mappings":"AASA,OAAO,KAAK,EACV,uBAAuB,EACvB,aAAa,EACb,aAAa,EACb,qBAAqB,EACrB,KAAK,EACL,MAAM,EACN,cAAc,EACf,oCAAoC;AAErC,OAAO,EAGL,eAAe,EAChB,yCAAyC;AAC1C,OAAO,KAAK,EAEV,qBAAqB,EACrB,eAAe,EAEf,sBAAsB,EACvB,yCAAyC;AAE1C,OAAO,KAAK,EAAE,GAAG,EAAE,wBAAwB;AAG3C,OAAO,KAAK,EAAE,+BAA+B,EAAE,qBAAiB;AAChE,OAAO,KAAK,EAAE,kBAAkB,EAAE,qBAAiB;AAInD,eAAO,MAAM,YAAY,SAAU,eAAe,YAEX,CAAC;AACxC,eAAO,MAAM,SAAS,SAAU,eAAe,YACmB,CAAC;AACnE,eAAO,MAAM,cAAc,SAAU,eAAe,YACb,CAAC;AAExC;;;;;;GAMG;AACH,eAAO,MAAM,QAAQ,OAAQ,eAAe,YAM3C,CAAC;AAEF,eAAO,MAAM,iBAAiB,qBACX,OAAO,gBACX,OAAO,uBACA,OAAO,KAC1B,OAcF,CAAC;AAEF,eAAO,MAAM,yBAAyB,WAAY,eAAe,YAIhE,CAAC;AAEF,eAAO,MAAM,kBAAkB,qDAEvB,WAAW,qBAAqB,CAAC,gBAAgB,CAAC,CAAC,CAAC,CAAC,CAAC,oGAY7D,CAAC;AAEF,eAAO,MAAM,eAAe,mEAE3B,CAAC;AAEF,eAAO,MAAM,sBAAsB,sDAE1B,MAAM,gCAKd,CAAC;AAEF,eAAO,MAAM,wBAAwB,wDAE1B,MAAM,gCAKhB,CAAC;AAEF,eAAO,MAAM,iBAAiB,uDAEpB,eAAe,iBACR,QAAQ,eAAe,CAAC,QACjC,MAAM,SAOb,CAAC;AAEF,eAAO,MAAM,uBAAuB,4DAErB,GAAG,YACN,GAAG,EAAE,KACd,QAAQ,OAAO,CAgBjB,CAAC;AAkBF,eAAO,MAAM,cAAc,6NAS1B,CAAC;AAEF,eAAO,MAAM,gBAAgB,cAAgD,CAAC;AAE9E;;;;;;GAMG;AACH,eAAO,MAAM,uBAAuB,6NAgBnC,CAAC;AAEF,eAAO,MAAM,mBAAmB,eAClB,aAAa,CAAC,OAAO,CAAC,CAAC,YAAY,CAAC,kBAYjD,CAAC;AAEF;;;;;;GAMG;AACH,eAAO,MAAM,+BAA+B,oBACzB,OAAO,kBAQzB,CAAC;AAEF;;;;;;;;;;GAUG;AACH,eAAO,MAAM,qBAAqB,qDAE1B,MAAM;;;MAKX,QAAQ,eAAe,CAwBzB,CAAC;AAEF,eAAO,MAAM,oBAAoB;mBAIhB,cAAc,KAAK,EAAE,KAAK,CAAC,GAAG,aAAa;gBAC9C,OAAO;MACjB,KAAK,kBAAkB,EAAE,QAAQ,CAAC,EAmCrC,CAAC;AAEF;;;;;;;;GAQG;AACH,eAAO,MAAM,yBAAyB;oBAIpB,CAAC,cAAc,MAAM,EAAE,MAAM,CAAC,GAAG,aAAa,CAAC,EAAE;qBAChD,uBAAuB;MACtC,KAAK,kBAAkB,EAAE,QAAQ,CAAC,EA4DrC,CAAC;AAEF;;;;;;;;;;;GAWG;AACH,eAAO,MAAM,mBAAmB,8FAEiB,MAAM,mBACpC,MAAM,WACd,GAAG,0BACY,qBAAqB,GAAG,cAAc,KAC7D,QAAQ,sBAAsB,CAsChC,CAAC;AAEF,eAAO,MAAM,4BAA4B;;eAQ5B,kBAAkB,EAAE;;;MAG7B,QAAQ,WAAW,qBAAqB,CAAC,qBAAqB,CAAC,CAAC,CAAC,CAAC,CAAC,CAkCtE,CAAC;AAEF,eAAO,MAAM,0BAA0B;;aAM5B,MAAM;eACJ,kBAAkB,EAAE;MAC7B,kBAAkB,EA8BrB,CAAC;AAEF;;;;;;;;;;;;;;;;GAgBG;AACH,eAAO,MAAM,yBAAyB;;2BAKb,kBAAkB,EAAE;0BAmB5C,CAAC"}

package/dist/utils/transaction.mjs

@@ -2,7 +2,7 @@
 import { ChainId, formatChainIdToHex, BRIDGE_PREFERRED_GAS_ESTIMATE, isEvmTxData, FeeType, BatchSellTransactionType } from "@metamask/bridge-controller";
 import { toHex } from "@metamask/controller-utils";
 import { GasFeeEstimateType, TransactionStatus, TransactionType } from "@metamask/transaction-controller";
-import { createProjectLogger } from "@metamask/utils";
+import { createProjectLogger, isStrictHexString } from "@metamask/utils";
 import { APPROVAL_DELAY_MS } from "../constants.mjs";
 import { getAccountByAddress } from "./accounts.mjs";
 import { getNetworkClientIdByChainId } from "./network.mjs";
@@ -28,12 +28,9 @@ export const shouldDisable7702 = (gasIncluded7702 = false, gasIncluded = false,
         return false;
     }
     // Enable batching when the account is already delegated (to avoid the in-flight transaction limit for delegated accounts)
-    if (isDelegatedAccount) {
-        return false;
-    }
     // For gasless transactions with STX/sendBundle we keep disabling 7702
-    if (gasIncluded) {
-        return true;
+    if (isDelegatedAccount && !gasIncluded) {
+        return false;
     }
     /**
      * Explicitly return default instead of falsy value (see TransactionBatchRequest.disable7702)
@@ -255,24 +252,25 @@ export const toQuoteAndTxMetadataBatch = ({ quoteResponses, batchSellTrades, })
  * @returns The gas fee estimates for the transaction
  */
 export const toTransactionParams = async (messenger, { chainId: tradeChainId, gasLimit, ...trade }, networkClientId, chainId, simulatedGasFeeLimits) => {
-    const normalizedTrade = {
-        ...trade,
+    const transactionParams = {
         data: trade.data,
         to: trade.to,
         from: trade.from,
         value: trade.value,
-    };
-    const transactionParams = {
-        ...normalizedTrade,
-        // Only add gasLimit and gas if they're truthy
+        // Only add gas if it's truthy
         gas: gasLimit ? toHex(gasLimit) : undefined,
     };
     // Use bridge-api's provided gas fee estimates
     if (simulatedGasFeeLimits) {
         return {
             ...transactionParams,
-            maxFeePerGas: toHex(simulatedGasFeeLimits.maxFeePerGas),
-            maxPriorityFeePerGas: toHex(simulatedGasFeeLimits.maxPriorityFeePerGas),
+            // Sometimes estimates are hex, somethings numeric strings
+            maxFeePerGas: isStrictHexString(simulatedGasFeeLimits.maxFeePerGas)
+                ? simulatedGasFeeLimits.maxFeePerGas
+                : toHex(simulatedGasFeeLimits.maxFeePerGas),
+            maxPriorityFeePerGas: isStrictHexString(simulatedGasFeeLimits.maxPriorityFeePerGas)
+                ? simulatedGasFeeLimits.maxPriorityFeePerGas
+                : toHex(simulatedGasFeeLimits.maxPriorityFeePerGas),
         };
     }
     // Get transaction's 1559 gas fee estimates

package/dist/utils/transaction.mjs.map

@@ -1 +1 @@
-{"version":3,"file":"transaction.mjs","sourceRoot":"","sources":["../../src/utils/transaction.ts"],"names":[],"mappings":"AAAA,qEAAqE;AACrE,OAAO,EACL,OAAO,EACP,kBAAkB,EAClB,6BAA6B,EAC7B,WAAW,EACX,OAAO,EACP,wBAAwB,EACzB,oCAAoC;AAUrC,OAAO,EAAE,KAAK,EAAE,mCAAmC;AACnD,OAAO,EACL,kBAAkB,EAClB,iBAAiB,EACjB,eAAe,EAChB,yCAAyC;AAQ1C,OAAO,EAAE,mBAAmB,EAAE,wBAAwB;AAGtD,OAAO,EAAE,iBAAiB,EAAE,yBAAqB;AAGjD,OAAO,EAAE,mBAAmB,EAAE,uBAAmB;AACjD,OAAO,EAAE,2BAA2B,EAAE,sBAAkB;AAExD,MAAM,CAAC,MAAM,YAAY,GAAG,CAAC,IAAqB,EAAE,EAAE,CACpD,IAAI,KAAK,eAAe,CAAC,cAAc;IACvC,IAAI,KAAK,eAAe,CAAC,YAAY,CAAC;AACxC,MAAM,CAAC,MAAM,SAAS,GAAG,CAAC,IAAqB,EAAE,EAAE,CACjD,IAAI,KAAK,eAAe,CAAC,MAAM,IAAI,IAAI,KAAK,eAAe,CAAC,IAAI,CAAC;AACnE,MAAM,CAAC,MAAM,cAAc,GAAG,CAAC,IAAqB,EAAE,EAAE,CACtD,SAAS,CAAC,IAAI,CAAC,IAAI,YAAY,CAAC,IAAI,CAAC,CAAC;AAExC;;;;;;GAMG;AACH,MAAM,CAAC,MAAM,QAAQ,GAAG,CAAC,EAAmB,EAAE,EAAE;IAC9C,OAAO,CACL,CAAC,KAAK,CAAC,OAAO,CAAC,EAAE,CAAC,QAAQ,CAAC,iBAAiB,CAAC;QAC3C,EAAE,CAAC,QAAQ,CAAC,iBAAiB,CAAC,MAAM,GAAG,CAAC,CAAC;QAC3C,OAAO,CAAC,EAAE,CAAC,iBAAiB,CAAC,CAC9B,CAAC;AACJ,CAAC,CAAC;AAEF,MAAM,CAAC,MAAM,iBAAiB,GAAG,CAC/B,kBAA2B,KAAK,EAChC,cAAuB,KAAK,EAC5B,qBAA8B,KAAK,EAC1B,EAAE;IACX,oEAAoE;IACpE,IAAI,eAAe,EAAE,CAAC;QACpB,OAAO,KAAK,CAAC;IACf,CAAC;IACD,0HAA0H;IAC1H,IAAI,kBAAkB,EAAE,CAAC;QACvB,OAAO,KAAK,CAAC;IACf,CAAC;IACD,sEAAsE;IACtE,IAAI,WAAW,EAAE,CAAC;QAChB,OAAO,IAAI,CAAC;IACd,CAAC;IACD;;OAEG;IACH,OAAO,IAAI,CAAC;AACd,CAAC,CAAC;AAEF,MAAM,CAAC,MAAM,yBAAyB,GAAG,CAAC,MAAuB,EAAE,EAAE;IACnE,OAAO,OAAO,CACZ,MAAM,EAAE,kBAAkB,EAAE,IAAI,CAAC,CAAC,EAAE,EAAE,EAAE,CAAC,EAAE,CAAC,IAAI,KAAK,eAAe,CAAC,IAAI,CAAC,CAC3E,CAAC;AACJ,CAAC,CAAC;AAEF,MAAM,CAAC,MAAM,kBAAkB,GAAG,KAAK,EACrC,SAA0C,EAC1C,IAA4D,EAC5D,EAAE;IACF,MAAM,EAAE,SAAS,EAAE,GAAG,MAAM,SAAS,CAAC,IAAI,CACxC,sCAAsC,EACtC,IAAI,CACL,CAAC;IAEF,IAAI,SAAS,EAAE,IAAI,KAAK,kBAAkB,CAAC,SAAS,EAAE,CAAC;QACrD,OAAO,SAAS,CAAC,6BAA6B,CAAC,CAAC;IAClD,CAAC;IAED,OAAO,SAAS,CAAC;AACnB,CAAC,CAAC;AAEF,MAAM,CAAC,MAAM,eAAe,GAAG,CAAC,SAA0C,EAAE,EAAE;IAC5E,OAAO,SAAS,CAAC,IAAI,CAAC,gCAAgC,CAAC,CAAC,YAAY,IAAI,EAAE,CAAC;AAC7E,CAAC,CAAC;AAEF,MAAM,CAAC,MAAM,sBAAsB,GAAG,CACpC,SAA0C,EAC1C,IAAa,EACb,EAAE;IACF,OAAO,eAAe,CAAC,SAAS,CAAC,CAAC,IAAI,CACpC,CAAC,EAAmB,EAAE,EAAE,CAAC,EAAE,CAAC,EAAE,KAAK,IAAI,CACxC,CAAC;AACJ,CAAC,CAAC;AAEF,MAAM,CAAC,MAAM,wBAAwB,GAAG,CACtC,SAA0C,EAC1C,MAAe,EACf,EAAE;IACF,OAAO,eAAe,CAAC,SAAS,CAAC,CAAC,IAAI,CACpC,CAAC,EAAmB,EAAE,EAAE,CAAC,EAAE,CAAC,IAAI,EAAE,WAAW,EAAE,KAAK,MAAM,EAAE,WAAW,EAAE,CAC1E,CAAC;AACJ,CAAC,CAAC;AAEF,MAAM,CAAC,MAAM,iBAAiB,GAAG,CAC/B,SAA0C,EAC1C,MAAuB,EACvB,aAAuC,EACvC,IAAY,EACZ,EAAE;IACF,OAAO,SAAS,CAAC,IAAI,CACnB,yCAAyC,EACzC,EAAE,GAAG,MAAM,EAAE,GAAG,aAAa,EAAE,EAC/B,IAAI,CACL,CAAC;AACJ,CAAC,CAAC;AAEF,MAAM,CAAC,MAAM,uBAAuB,GAAG,KAAK,EAC1C,SAA0C,EAC1C,WAAgB,EAChB,QAAe,EACG,EAAE;IACpB,IAAI,CAAC;QACH,MAAM,kBAAkB,GAAG,MAAM,SAAS,CAAC,IAAI,CAC7C,8CAA8C,EAC9C;YACE,OAAO,EAAE,WAAW;YACpB,QAAQ;SACT,CACF,CAAC;QACF,OAAO,kBAAkB,CAAC,IAAI,CAC5B,CAAC,KAAwC,EAAE,EAAE,CAC3C,KAAK,CAAC,WAAW,IAAI,KAAK,CAAC,iBAAiB,CAC/C,CAAC;IACJ,CAAC;IAAC,MAAM,CAAC;QACP,OAAO,KAAK,CAAC;IACf,CAAC;AACH,CAAC,CAAC;AAEF,MAAM,+BAA+B,GAAG,KAAK,EAC3C,SAA0C,EAC1C,WAEW,EACe,EAAE;IAC5B,MAAM,MAAM,GAAG,MAAM,WAAW,CAAC;IACjC,MAAM,oBAAoB,GAAG,wBAAwB,CAAC,SAAS,EAAE,MAAM,CAAC,CAAC;IACzE,IAAI,CAAC,oBAAoB,EAAE,CAAC;QAC1B,MAAM,IAAI,KAAK,CACb,uEAAuE,CACxE,CAAC;IACJ,CAAC;IACD,OAAO,oBAAoB,CAAC;AAC9B,CAAC,CAAC;AAEF,MAAM,CAAC,MAAM,cAAc,GAAG,KAAK,EACjC,SAA0C,EAC1C,GAAG,IAAyD,EAC5D,EAAE;IACF,MAAM,EAAE,MAAM,EAAE,GAAG,MAAM,SAAS,CAAC,IAAI,CACrC,sCAAsC,EACtC,GAAG,IAAI,CACR,CAAC;IACF,OAAO,MAAM,+BAA+B,CAAC,SAAS,EAAE,MAAM,CAAC,CAAC;AAClE,CAAC,CAAC;AAEF,MAAM,CAAC,MAAM,gBAAgB,GAAG,GAAG,EAAE,CAAC,CAAC,IAAI,CAAC,GAAG,EAAE,GAAG,IAAI,CAAC,MAAM,EAAE,CAAC,CAAC,QAAQ,EAAE,CAAC;AAE9E;;;;;;GAMG;AACH,MAAM,CAAC,MAAM,uBAAuB,GAAG,KAAK,EAC1C,SAA0C,EAC1C,GAAG,IAAyD,EAC5D,EAAE;IACF,MAAM,EAAE,eAAe,EAAE,GAAG,MAAM,SAAS,CAAC,IAAI,CAC9C,sCAAsC,EACtC,IAAI,CAAC,CAAC,CAAC,EACP;QACE,MAAM,EAAE,UAAU;QAClB,QAAQ,EAAE,gBAAgB,EAAE;QAC5B,WAAW,EAAE,IAAI;QACjB,UAAU,EAAE,IAAI;QAChB,GAAG,IAAI,CAAC,CAAC,CAAC;KACX,CACF,CAAC;IACF,OAAO,eAAe,CAAC;AACzB,CAAC,CAAC;AAEF,MAAM,CAAC,MAAM,mBAAmB,GAAG,KAAK,EACtC,UAAgD,EAChD,EAAE;IACF,IAAI,CAAC,OAAO,CAAC,KAAK,EAAE,OAAO,CAAC,IAAI,CAAC,CAAC,QAAQ,CAAC,UAAU,CAAC,EAAE,CAAC;QACvD,MAAM,QAAQ,GAAG,mBAAmB,CAAC,QAAQ,CAAC,CAAC;QAC/C,QAAQ,CACN,+EAA+E,CAChF,CAAC;QACF,MAAM,WAAW,GAAG,IAAI,OAAO,CAAC,CAAC,OAAO,EAAE,EAAE,CAC1C,UAAU,CAAC,OAAO,EAAE,iBAAiB,CAAC,CACvC,CAAC;QACF,MAAM,WAAW,CAAC;IACpB,CAAC;AACH,CAAC,CAAC;AAEF;;;;;;GAMG;AACH,MAAM,CAAC,MAAM,+BAA+B,GAAG,KAAK,EAClD,eAAwB,EACxB,EAAE;IACF,IAAI,eAAe,EAAE,CAAC;QACpB,MAAM,yBAAyB,GAAG,IAAI,OAAO,CAAC,CAAC,OAAO,EAAE,EAAE,CACxD,UAAU,CAAC,OAAO,EAAE,IAAI,CAAC,CAC1B,CAAC;QACF,MAAM,yBAAyB,CAAC;IAClC,CAAC;AACH,CAAC,CAAC;AAEF;;;;;;;;;;GAUG;AACH,MAAM,CAAC,MAAM,qBAAqB,GAAG,KAAK,EACxC,SAA0C,EAC1C,IAAY,EACZ,EACE,SAAS,GAAG,CAAC,GAAG,KAAM,EACtB,MAAM,GAAG,IAAK,MAC6B,EAAE,EACrB,EAAE;IAC5B,MAAM,KAAK,GAAG,IAAI,CAAC,GAAG,EAAE,CAAC;IACzB,OAAO,IAAI,EAAE,CAAC;QACZ,MAAM,IAAI,GAAG,sBAAsB,CAAC,SAAS,EAAE,IAAI,CAAC,CAAC;QAErD,IAAI,IAAI,EAAE,CAAC;YACT,IAAI,IAAI,CAAC,MAAM,KAAK,iBAAiB,CAAC,SAAS,EAAE,CAAC;gBAChD,OAAO,IAAI,CAAC;YACd,CAAC;YACD,IACE,IAAI,CAAC,MAAM,KAAK,iBAAiB,CAAC,MAAM;gBACxC,IAAI,CAAC,MAAM,KAAK,iBAAiB,CAAC,OAAO;gBACzC,IAAI,CAAC,MAAM,KAAK,iBAAiB,CAAC,QAAQ,EAC1C,CAAC;gBACD,MAAM,IAAI,KAAK,CAAC,sCAAsC,CAAC,CAAC;YAC1D,CAAC;QACH,CAAC;QAED,IAAI,IAAI,CAAC,GAAG,EAAE,GAAG,KAAK,GAAG,SAAS,EAAE,CAAC;YACnC,MAAM,IAAI,KAAK,CAAC,6CAA6C,CAAC,CAAC;QACjE,CAAC;QAED,MAAM,IAAI,OAAO,CAAC,CAAC,OAAO,EAAE,EAAE,CAAC,UAAU,CAAC,OAAO,EAAE,MAAM,CAAC,CAAC,CAAC;IAC9D,CAAC;AACH,CAAC,CAAC;AAEF,MAAM,CAAC,MAAM,oBAAoB,GAAG,CAAC,EACnC,aAAa,EACb,UAAU,GAIX,EAAwC,EAAE;IACzC,MAAM,SAAS,GAAyB,EAAE,CAAC;IAE3C,MAAM,cAAc,GAAG,UAAU;QAC/B,CAAC,CAAC,eAAe,CAAC,cAAc;QAChC,CAAC,CAAC,eAAe,CAAC,YAAY,CAAC;IAEjC,IAAI,aAAa,CAAC,aAAa,EAAE,CAAC;QAChC,SAAS,CAAC,IAAI,CAAC;YACb,aAAa;YACb,EAAE,EAAE,aAAa,CAAC,aAAa;YAC/B,IAAI,EAAE,cAAc;YACpB,KAAK,EAAE,aAAa,CAAC,KAAK,CAAC,OAAO,CAAC,OAAO,CAAC,MAAM,CAAC;SACnD,CAAC,CAAC;IACL,CAAC;IACD,IAAI,aAAa,CAAC,QAAQ,IAAI,WAAW,CAAC,aAAa,CAAC,QAAQ,CAAC,EAAE,CAAC;QAClE,SAAS,CAAC,IAAI,CAAC;YACb,aAAa;YACb,EAAE,EAAE,aAAa,CAAC,QAAQ;YAC1B,IAAI,EAAE,cAAc;YACpB,KAAK,EAAE,aAAa,CAAC,KAAK,CAAC,OAAO,CAAC,OAAO,CAAC,MAAM,CAAC;SACnD,CAAC,CAAC;IACL,CAAC;IACD,SAAS,CAAC,IAAI,CAAC;QACb,aAAa;QACb,EAAE,EAAE,aAAa,CAAC,KAAe;QACjC,IAAI,EAAE,UAAU,CAAC,CAAC,CAAC,eAAe,CAAC,MAAM,CAAC,CAAC,CAAC,eAAe,CAAC,IAAI;QAChE,gBAAgB,EAAE;YAChB,OAAO,EAAE,aAAa,CAAC,UAAU,EAAE,eAAe,EAAE,QAAQ,EAAE;YAC9D,SAAS,EAAE,aAAa,CAAC,aAAa,EAAE,eAAe,EAAE,QAAQ,EAAE;SACpE;QACD,KAAK,EAAE,aAAa,CAAC,KAAK,CAAC,OAAO,CAAC,OAAO,CAAC,MAAM,CAAC;KACnD,CAAC,CAAC;IAEH,OAAO,SAAS,CAAC;AACnB,CAAC,CAAC;AAEF;;;;;;;;GAQG;AACH,MAAM,CAAC,MAAM,yBAAyB,GAAG,CAAC,EACxC,cAAc,EACd,eAAe,GAIhB,EAAwC,EAAE;IACzC,MAAM,SAAS,GAAyB,EAAE,CAAC;IAE3C,MAAM,EACJ,YAAY,EACZ,eAAe,EACf,WAAW,EACX,YAAY,GAAG,KAAK,GACrB,GAAG,eAAe,CAAC;IAEpB,KAAK,MAAM,WAAW,IAAI,YAAY,EAAE,CAAC;QACvC,MAAM,EAAE,IAAI,EAAE,YAAY,EAAE,oBAAoB,EAAE,GAAG,EAAE,EAAE,GAAG,WAAW,CAAC;QACxE,8DAA8D;QAC9D,MAAM,qBAAqB,GACzB,cAAc,CAAC,IAAI,CACjB,CAAC,EAAE,QAAQ,EAAE,KAAK,EAAE,EAAE,EAAE,CACtB,KAAK,EAAE,IAAI,CAAC,WAAW,EAAE,KAAK,EAAE,CAAC,IAAI,CAAC,WAAW,EAAE;YACnD,QAAQ,EAAE,IAAI,CAAC,WAAW,EAAE,KAAK,EAAE,CAAC,IAAI,CAAC,WAAW,EAAE,CACzD,IAAI,cAAc,CAAC,CAAC,CAAC,CAAC;QAEzB,iEAAiE;QACjE,MAAM,eAAe,GAAG;YACtB,GAAG,qBAAqB;YACxB,KAAK,EAAE;gBACL,GAAG,qBAAqB,CAAC,KAAK;gBAC9B,WAAW;gBACX,eAAe;gBACf,YAAY;aACb;SACF,CAAC;QAEF,MAAM,eAAe,GAAG;YACtB,EAAE;YACF,aAAa,EAAE,eAAe;YAC9B,KAAK,EAAE,EAAE,YAAY,EAAE,oBAAoB,EAAE;SAC9C,CAAC;QAEF,IAAI,IAAI,KAAK,wBAAwB,CAAC,KAAK,EAAE,CAAC;YAC5C,SAAS,CAAC,IAAI,CAAC;gBACb,GAAG,eAAe;gBAClB,IAAI,EAAE,eAAe,CAAC,IAAI;gBAC1B,gBAAgB,EAAE;oBAChB,OAAO,EACL,qBAAqB,CAAC,UAAU,EAAE,eAAe,EAAE,QAAQ,EAAE;oBAC/D,SAAS,EACP,qBAAqB,CAAC,aAAa,EAAE,eAAe,EAAE,QAAQ,EAAE;iBACnE;aACF,CAAC,CAAC;QACL,CAAC;aAAM,CAAC;YACN,SAAS,CAAC,IAAI,CAAC;gBACb,GAAG,eAAe;gBAClB,IAAI,EACF,IAAI,KAAK,wBAAwB,CAAC,QAAQ;oBACxC,CAAC,CAAC,eAAe,CAAC,YAAY;oBAC9B,CAAC,CAAC,eAAe,CAAC,mBAAmB;aAC1C,CAAC,CAAC;QACL,CAAC;IACH,CAAC;IAED,OAAO,SAAS,CAAC;AACnB,CAAC,CAAC;AAEF;;;;;;;;;;;GAWG;AACH,MAAM,CAAC,MAAM,mBAAmB,GAAG,KAAK,EACtC,SAA0C,EAC1C,EAAE,OAAO,EAAE,YAAY,EAAE,QAAQ,EAAE,GAAG,KAAK,EAAU,EACrD,eAAuB,EACvB,OAAY,EACZ,qBAA8D,EAC7B,EAAE;IACnC,MAAM,eAAe,GAAG;QACtB,GAAG,KAAK;QACR,IAAI,EAAE,KAAK,CAAC,IAAI;QAChB,EAAE,EAAE,KAAK,CAAC,EAAE;QACZ,IAAI,EAAE,KAAK,CAAC,IAAI;QAChB,KAAK,EAAE,KAAK,CAAC,KAAK;KACnB,CAAC;IACF,MAAM,iBAAiB,GAAG;QACxB,GAAG,eAAe;QAClB,8CAA8C;QAC9C,GAAG,EAAE,QAAQ,CAAC,CAAC,CAAC,KAAK,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC,SAAS;KAC5C,CAAC;IAEF,8CAA8C;IAC9C,IAAI,qBAAqB,EAAE,CAAC;QAC1B,OAAO;YACL,GAAG,iBAAiB;YACpB,YAAY,EAAE,KAAK,CAAC,qBAAqB,CAAC,YAAY,CAAC;YACvD,oBAAoB,EAAE,KAAK,CAAC,qBAAqB,CAAC,oBAAoB,CAAC;SACxE,CAAC;IACJ,CAAC;IAED,2CAA2C;IAC3C,MAAM,eAAe,GAAG,MAAM,kBAAkB,CAAC,SAAS,EAAE;QAC1D,iBAAiB;QACjB,eAAe;QACf,OAAO;KACR,CAAC,CAAC;IAEH,OAAO;QACL,GAAG,iBAAiB;QACpB,YAAY,EAAE,eAAe,EAAE,YAAY;QAC3C,oBAAoB,EAAE,eAAe,EAAE,oBAAoB;KAC5D,CAAC;AACJ,CAAC,CAAC;AAEF,MAAM,CAAC,MAAM,4BAA4B,GAAG,KAAK,EAAE,EACjD,SAAS,EACT,SAAS,EACT,eAAe,GAAG,KAAK,EACvB,kBAAkB,EAClB,GAAG,yBAAyB,EAM7B,EAAwE,EAAE;IACzE,MAAM,KAAK,GAAG,SAAS,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC;IAC9B,MAAM,eAAe,GAAG,mBAAmB,CAAC,SAAS,EAAE,KAAK,CAAC,IAAI,CAAC,CAAC;IACnE,IAAI,CAAC,eAAe,EAAE,CAAC;QACrB,MAAM,IAAI,KAAK,CACb,oFAAoF,CACrF,CAAC;IACJ,CAAC;IACD,MAAM,UAAU,GAAG,kBAAkB,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC;IACrD,MAAM,eAAe,GAAG,2BAA2B,CAAC,SAAS,EAAE,UAAU,CAAC,CAAC;IAE3E,MAAM,YAAY,GAAoC,MAAM,OAAO,CAAC,GAAG,CACrE,SAAS,CAAC,GAAG,CAAC,KAAK,EAAE,EAAE,EAAE,EAAE,KAAK,EAAE,gBAAgB,EAAE,IAAI,EAAE,EAAE,EAAE,CAAC,CAAC;QAC9D,MAAM,EAAE,MAAM,mBAAmB,CAC/B,SAAS,EACT,EAAE,EACF,eAAe,EACf,UAAU,EACV,KAAK,CACN;QACD,gBAAgB;QAChB,IAAI;KACL,CAAC,CAAC,CACJ,CAAC;IAEF,OAAO;QACL,eAAe;QACf,eAAe;QACf,MAAM,EAAE,UAAU;QAClB,IAAI,EAAE,eAAe,CAAC,OAAc;QACpC,UAAU,EAAE,IAAI;QAChB,YAAY;QACZ,GAAG,yBAAyB;KAC7B,CAAC;AACJ,CAAC,CAAC;AAEF,MAAM,CAAC,MAAM,0BAA0B,GAAG,CAAC,EACzC,SAAS,EACT,OAAO,EACP,SAAS,GAKV,EAAwB,EAAE;IACzB,uCAAuC;IACvC,MAAM,GAAG,GAAG,eAAe,CAAC,SAAS,CAAC,CAAC,MAAM,CAC3C,CAAC,EAAmB,EAAE,EAAE,CAAC,EAAE,CAAC,OAAO,KAAK,OAAO,CAChD,CAAC;IAEF,OAAO,SAAS,CAAC,GAAG,CAAC,CAAC,iBAAiB,EAAE,EAAE;QACzC,MAAM,EAAE,EAAE,EAAE,IAAI,EAAE,GAAG,iBAAiB,CAAC;QACvC,OAAO;YACL,GAAG,iBAAiB;YACpB,MAAM,EAAE,GAAG,CAAC,IAAI,CAAC,CAAC,MAAuB,EAAE,EAAE;gBAC3C,IAAI,QAAQ,CAAC,MAAM,CAAC,EAAE,CAAC;oBACrB,oEAAoE;oBACpE,+DAA+D;oBAC/D,IAAI,SAAS,CAAC,IAAI,CAAC,IAAI,MAAM,CAAC,IAAI,KAAK,eAAe,CAAC,KAAK,EAAE,CAAC;wBAC7D,OAAO,IAAI,CAAC;oBACd,CAAC;oBACD,sDAAsD;oBACtD,IAAI,YAAY,CAAC,IAAI,CAAC,IAAI,MAAM,CAAC,QAAQ,CAAC,IAAI,KAAK,EAAE,CAAC,IAAI,EAAE,CAAC;wBAC3D,OAAO,IAAI,CAAC;oBACd,CAAC;gBACH,CAAC;gBACD,mDAAmD;gBACnD,IAAI,MAAM,CAAC,QAAQ,CAAC,IAAI,KAAK,EAAE,CAAC,IAAI,EAAE,CAAC;oBACrC,OAAO,IAAI,CAAC;gBACd,CAAC;gBACD,OAAO,KAAK,CAAC;YACf,CAAC,CAAC;SACH,CAAC;IACJ,CAAC,CAAC,CAAC;AACL,CAAC,CAAC;AAEF;;;;;;;;;;;;;;;;GAgBG;AACH,MAAM,CAAC,MAAM,yBAAyB,GAAG,CAAC,EACxC,SAAS,EACT,qBAAqB,GAItB,EAAE,EAAE;IACH,OAAO,qBAAqB,CAAC,GAAG,CAAC,CAAC,iBAAiB,EAAE,EAAE;QACrD,MAAM,EAAE,MAAM,EAAE,IAAI,EAAE,GAAG,iBAAiB,CAAC;QAE3C,IAAI,MAAM,EAAE,CAAC;YACX,+CAA+C;YAC/C,iBAAiB,CACf,SAAS,EACT,MAAM,EACN,EAAE,IAAI,EAAE,EACR,qBAAqB,IAAI,EAAE,CAC5B,CAAC;YACF,MAAM,SAAS,GAAG,EAAE,GAAG,MAAM,EAAE,IAAI,EAAE,CAAC;YACtC,OAAO,EAAE,GAAG,iBAAiB,EAAE,MAAM,EAAE,SAAS,EAAE,IAAI,EAAE,CAAC;QAC3D,CAAC;QAED,OAAO,iBAAiB,CAAC;IAC3B,CAAC,CAAC,CAAC;AACL,CAAC,CAAC","sourcesContent":["/* eslint-disable @typescript-eslint/explicit-function-return-type */\nimport {\n  ChainId,\n  formatChainIdToHex,\n  BRIDGE_PREFERRED_GAS_ESTIMATE,\n  isEvmTxData,\n  FeeType,\n  BatchSellTransactionType,\n} from '@metamask/bridge-controller';\nimport type {\n  BatchSellTradesResponse,\n  QuoteMetadata,\n  QuoteResponse,\n  SimulatedGasFeeLimits,\n  Trade,\n  TxData,\n  TxFeeGasLimits,\n} from '@metamask/bridge-controller';\nimport { toHex } from '@metamask/controller-utils';\nimport {\n  GasFeeEstimateType,\n  TransactionStatus,\n  TransactionType,\n} from '@metamask/transaction-controller';\nimport type {\n  IsAtomicBatchSupportedResultEntry,\n  TransactionController,\n  TransactionMeta,\n  TransactionBatchSingleRequest,\n  BatchTransactionParams,\n} from '@metamask/transaction-controller';\nimport { createProjectLogger } from '@metamask/utils';\nimport type { Hex } from '@metamask/utils';\n\nimport { APPROVAL_DELAY_MS } from '../constants';\nimport type { BridgeStatusControllerMessenger } from '../types';\nimport type { QuoteAndTxMetadata } from '../types';\nimport { getAccountByAddress } from './accounts';\nimport { getNetworkClientIdByChainId } from './network';\n\nexport const isApprovalTx = (type: TransactionType) =>\n  type === TransactionType.bridgeApproval ||\n  type === TransactionType.swapApproval;\nexport const isTradeTx = (type: TransactionType) =>\n  type === TransactionType.bridge || type === TransactionType.swap;\nexport const isCrossChainTx = (type: TransactionType) =>\n  isTradeTx(type) || isApprovalTx(type);\n\n/**\n * For 7702 delegated transactions, check for delegation-specific fields\n * These transactions might have authorizationList or delegationAddress\n *\n * @param tx - The transaction meta\n * @returns Whether the transaction is a 7702 transaction\n */\nexport const is7702Tx = (tx: TransactionMeta) => {\n  return (\n    (Array.isArray(tx.txParams.authorizationList) &&\n      tx.txParams.authorizationList.length > 0) ||\n    Boolean(tx.delegationAddress)\n  );\n};\n\nexport const shouldDisable7702 = (\n  gasIncluded7702: boolean = false,\n  gasIncluded: boolean = false,\n  isDelegatedAccount: boolean = false,\n): boolean => {\n  // Enable 7702 batching when the quote includes gasless 7702 support\n  if (gasIncluded7702) {\n    return false;\n  }\n  // Enable batching when the account is already delegated (to avoid the in-flight transaction limit for delegated accounts)\n  if (isDelegatedAccount) {\n    return false;\n  }\n  // For gasless transactions with STX/sendBundle we keep disabling 7702\n  if (gasIncluded) {\n    return true;\n  }\n  /**\n   * Explicitly return default instead of falsy value (see TransactionBatchRequest.disable7702)\n   */\n  return true;\n};\n\nexport const hasNestedSwapTransactions = (txMeta: TransactionMeta) => {\n  return Boolean(\n    txMeta?.nestedTransactions?.some((tx) => tx.type === TransactionType.swap),\n  );\n};\n\nexport const getGasFeeEstimates = async (\n  messenger: BridgeStatusControllerMessenger,\n  args: Parameters<TransactionController['estimateGasFee']>[0],\n) => {\n  const { estimates } = await messenger.call(\n    'TransactionController:estimateGasFee',\n    args,\n  );\n\n  if (estimates?.type === GasFeeEstimateType.FeeMarket) {\n    return estimates[BRIDGE_PREFERRED_GAS_ESTIMATE];\n  }\n\n  return undefined;\n};\n\nexport const getTransactions = (messenger: BridgeStatusControllerMessenger) => {\n  return messenger.call('TransactionController:getState').transactions ?? [];\n};\n\nexport const getTransactionMetaById = (\n  messenger: BridgeStatusControllerMessenger,\n  txId?: string,\n) => {\n  return getTransactions(messenger).find(\n    (tx: TransactionMeta) => tx.id === txId,\n  );\n};\n\nexport const getTransactionMetaByHash = (\n  messenger: BridgeStatusControllerMessenger,\n  txHash?: string,\n) => {\n  return getTransactions(messenger).find(\n    (tx: TransactionMeta) => tx.hash?.toLowerCase() === txHash?.toLowerCase(),\n  );\n};\n\nexport const updateTransaction = (\n  messenger: BridgeStatusControllerMessenger,\n  txMeta: TransactionMeta,\n  txMetaUpdates: Partial<TransactionMeta>,\n  note: string,\n) => {\n  return messenger.call(\n    'TransactionController:updateTransaction',\n    { ...txMeta, ...txMetaUpdates },\n    note,\n  );\n};\n\nexport const checkIsDelegatedAccount = async (\n  messenger: BridgeStatusControllerMessenger,\n  fromAddress: Hex,\n  chainIds: Hex[],\n): Promise<boolean> => {\n  try {\n    const atomicBatchSupport = await messenger.call(\n      'TransactionController:isAtomicBatchSupported',\n      {\n        address: fromAddress,\n        chainIds,\n      },\n    );\n    return atomicBatchSupport.some(\n      (entry: IsAtomicBatchSupportedResultEntry) =>\n        entry.isSupported && entry.delegationAddress,\n    );\n  } catch {\n    return false;\n  }\n};\n\nconst waitForHashAndReturnFinalTxMeta = async (\n  messenger: BridgeStatusControllerMessenger,\n  hashPromise?: Awaited<\n    ReturnType<TransactionController['addTransaction']>\n  >['result'],\n): Promise<TransactionMeta> => {\n  const txHash = await hashPromise;\n  const finalTransactionMeta = getTransactionMetaByHash(messenger, txHash);\n  if (!finalTransactionMeta) {\n    throw new Error(\n      'Failed to submit cross-chain swap tx: txMeta for txHash was not found',\n    );\n  }\n  return finalTransactionMeta;\n};\n\nexport const addTransaction = async (\n  messenger: BridgeStatusControllerMessenger,\n  ...args: Parameters<TransactionController['addTransaction']>\n) => {\n  const { result } = await messenger.call(\n    'TransactionController:addTransaction',\n    ...args,\n  );\n  return await waitForHashAndReturnFinalTxMeta(messenger, result);\n};\n\nexport const generateActionId = () => (Date.now() + Math.random()).toString();\n\n/**\n * Adds a synthetic transaction to the TransactionController to display pending intent orders in the UI\n *\n * @param messenger - The messenger to use for the transaction\n * @param args - The arguments for the transaction\n * @returns The transaction meta\n */\nexport const addSyntheticTransaction = async (\n  messenger: BridgeStatusControllerMessenger,\n  ...args: Parameters<TransactionController['addTransaction']>\n) => {\n  const { transactionMeta } = await messenger.call(\n    'TransactionController:addTransaction',\n    args[0],\n    {\n      origin: 'metamask',\n      actionId: generateActionId(),\n      isStateOnly: true,\n      isInternal: true,\n      ...args[1],\n    },\n  );\n  return transactionMeta;\n};\n\nexport const handleApprovalDelay = async (\n  srcChainId: QuoteResponse['quote']['srcChainId'],\n) => {\n  if ([ChainId.LINEA, ChainId.BASE].includes(srcChainId)) {\n    const debugLog = createProjectLogger('bridge');\n    debugLog(\n      'Delaying submitting bridge tx to make Linea and Base confirmation more likely',\n    );\n    const waitPromise = new Promise((resolve) =>\n      setTimeout(resolve, APPROVAL_DELAY_MS),\n    );\n    await waitPromise;\n  }\n};\n\n/**\n * Adds a delay for hardware wallet transactions on mobile to fix an issue\n * where the Ledger does not get prompted for the 2nd approval.\n * Extension does not have this issue.\n *\n * @param requireApproval - Whether the delay should be applied\n */\nexport const handleMobileHardwareWalletDelay = async (\n  requireApproval: boolean,\n) => {\n  if (requireApproval) {\n    const mobileHardwareWalletDelay = new Promise((resolve) =>\n      setTimeout(resolve, 1000),\n    );\n    await mobileHardwareWalletDelay;\n  }\n};\n\n/**\n * Waits until a given transaction (by id) reaches confirmed/finalized status or fails/times out.\n *\n * @deprecated use addTransaction util\n * @param messenger - the BridgeStatusControllerMessenger\n * @param txId - the transaction ID\n * @param options - the options for the timeout and poll\n * @param options.timeoutMs - the timeout in milliseconds\n * @param options.pollMs - the poll interval in milliseconds\n * @returns the transaction meta\n */\nexport const waitForTxConfirmation = async (\n  messenger: BridgeStatusControllerMessenger,\n  txId: string,\n  {\n    timeoutMs = 5 * 60_000,\n    pollMs = 3_000,\n  }: { timeoutMs?: number; pollMs?: number } = {},\n): Promise<TransactionMeta> => {\n  const start = Date.now();\n  while (true) {\n    const meta = getTransactionMetaById(messenger, txId);\n\n    if (meta) {\n      if (meta.status === TransactionStatus.confirmed) {\n        return meta;\n      }\n      if (\n        meta.status === TransactionStatus.failed ||\n        meta.status === TransactionStatus.dropped ||\n        meta.status === TransactionStatus.rejected\n      ) {\n        throw new Error('Approval transaction did not confirm');\n      }\n    }\n\n    if (Date.now() - start > timeoutMs) {\n      throw new Error('Timed out waiting for approval confirmation');\n    }\n\n    await new Promise((resolve) => setTimeout(resolve, pollMs));\n  }\n};\n\nexport const toQuoteAndTxMetadata = ({\n  quoteResponse,\n  isBridgeTx,\n}: {\n  quoteResponse: QuoteResponse<Trade, Trade> & QuoteMetadata;\n  isBridgeTx: boolean;\n}): Omit<QuoteAndTxMetadata, 'txMeta'>[] => {\n  const tradeData: QuoteAndTxMetadata[] = [];\n\n  const approvalTxType = isBridgeTx\n    ? TransactionType.bridgeApproval\n    : TransactionType.swapApproval;\n\n  if (quoteResponse.resetApproval) {\n    tradeData.push({\n      quoteResponse,\n      tx: quoteResponse.resetApproval,\n      type: approvalTxType,\n      txFee: quoteResponse.quote.feeData[FeeType.TX_FEE],\n    });\n  }\n  if (quoteResponse.approval && isEvmTxData(quoteResponse.approval)) {\n    tradeData.push({\n      quoteResponse,\n      tx: quoteResponse.approval,\n      type: approvalTxType,\n      txFee: quoteResponse.quote.feeData[FeeType.TX_FEE],\n    });\n  }\n  tradeData.push({\n    quoteResponse,\n    tx: quoteResponse.trade as TxData,\n    type: isBridgeTx ? TransactionType.bridge : TransactionType.swap,\n    assetsFiatValues: {\n      sending: quoteResponse.sentAmount?.valueInCurrency?.toString(),\n      receiving: quoteResponse.toTokenAmount?.valueInCurrency?.toString(),\n    },\n    txFee: quoteResponse.quote.feeData[FeeType.TX_FEE],\n  });\n\n  return tradeData;\n};\n\n/**\n * Build the trade+quote metadata array for the batch sell transaction\n * This ties together the quote, the tx params and the txMeta after submission\n *\n * @param options - The options for the batch sell transaction\n * @param options.quoteResponses - The quote responses for the batch sell transaction\n * @param options.batchSellTrades - The batch sell trades for the batch sell transaction\n * @returns The trade+quote metadata array for the batch sell transaction\n */\nexport const toQuoteAndTxMetadataBatch = ({\n  quoteResponses,\n  batchSellTrades,\n}: {\n  quoteResponses: (QuoteResponse<TxData, TxData> & QuoteMetadata)[];\n  batchSellTrades: BatchSellTradesResponse;\n}): Omit<QuoteAndTxMetadata, 'txMeta'>[] => {\n  const tradeData: QuoteAndTxMetadata[] = [];\n\n  const {\n    transactions,\n    gasIncluded7702,\n    gasIncluded,\n    gasSponsored = false,\n  } = batchSellTrades;\n\n  for (const transaction of transactions) {\n    const { type, maxFeePerGas, maxPriorityFeePerGas, ...tx } = transaction;\n    // Match the trade or approval tx data with the quote response\n    const matchingQuoteResponse =\n      quoteResponses.find(\n        ({ approval, trade }) =>\n          trade?.data.toLowerCase() === tx.data.toLowerCase() ||\n          approval?.data.toLowerCase() === tx.data.toLowerCase(),\n      ) ?? quoteResponses[0];\n\n    // Include gasIncluded and gasIncluded7702 from the gasless batch\n    const normalizedQuote = {\n      ...matchingQuoteResponse,\n      quote: {\n        ...matchingQuoteResponse.quote,\n        gasIncluded,\n        gasIncluded7702,\n        gasSponsored,\n      },\n    };\n\n    const commonTradeData = {\n      tx,\n      quoteResponse: normalizedQuote,\n      txFee: { maxFeePerGas, maxPriorityFeePerGas },\n    };\n\n    if (type === BatchSellTransactionType.TRADE) {\n      tradeData.push({\n        ...commonTradeData,\n        type: TransactionType.swap,\n        assetsFiatValues: {\n          sending:\n            matchingQuoteResponse.sentAmount?.valueInCurrency?.toString(),\n          receiving:\n            matchingQuoteResponse.toTokenAmount?.valueInCurrency?.toString(),\n        },\n      });\n    } else {\n      tradeData.push({\n        ...commonTradeData,\n        type:\n          type === BatchSellTransactionType.APPROVAL\n            ? TransactionType.swapApproval\n            : TransactionType.tokenMethodTransfer,\n      });\n    }\n  }\n\n  return tradeData;\n};\n\n/**\n * Appends the gas fee estimates for a transaction and normalizes the trade data\n *\n * @param messenger - The messenger for the gas fee estimates\n * @param trade - the trade data to append gas fees to\n * @param trade.chainId - ignored, use chainId instead\n * @param trade.gasLimit - the gas limit to use for the gas fee estimates\n * @param networkClientId - the network client ID to use for the gas fee estimates\n * @param chainId - the chain ID to use for the gas fee estimates\n * @param simulatedGasFeeLimits - either the txFee from the quote or the simulated gas fee limits for the batch sell\n * @returns The gas fee estimates for the transaction\n */\nexport const toTransactionParams = async (\n  messenger: BridgeStatusControllerMessenger,\n  { chainId: tradeChainId, gasLimit, ...trade }: TxData,\n  networkClientId: string,\n  chainId: Hex,\n  simulatedGasFeeLimits?: SimulatedGasFeeLimits | TxFeeGasLimits,\n): Promise<BatchTransactionParams> => {\n  const normalizedTrade = {\n    ...trade,\n    data: trade.data,\n    to: trade.to,\n    from: trade.from,\n    value: trade.value,\n  };\n  const transactionParams = {\n    ...normalizedTrade,\n    // Only add gasLimit and gas if they're truthy\n    gas: gasLimit ? toHex(gasLimit) : undefined,\n  };\n\n  // Use bridge-api's provided gas fee estimates\n  if (simulatedGasFeeLimits) {\n    return {\n      ...transactionParams,\n      maxFeePerGas: toHex(simulatedGasFeeLimits.maxFeePerGas),\n      maxPriorityFeePerGas: toHex(simulatedGasFeeLimits.maxPriorityFeePerGas),\n    };\n  }\n\n  // Get transaction's 1559 gas fee estimates\n  const gasFeeEstimates = await getGasFeeEstimates(messenger, {\n    transactionParams,\n    networkClientId,\n    chainId,\n  });\n\n  return {\n    ...transactionParams,\n    maxFeePerGas: gasFeeEstimates?.maxFeePerGas,\n    maxPriorityFeePerGas: gasFeeEstimates?.maxPriorityFeePerGas,\n  };\n};\n\nexport const getAddTransactionBatchParams = async ({\n  messenger,\n  tradeData,\n  requireApproval = false,\n  isDelegatedAccount,\n  ...addTransactionBatchParams\n}: Partial<Parameters<TransactionController['addTransactionBatch']>[0]> & {\n  messenger: BridgeStatusControllerMessenger;\n  tradeData: QuoteAndTxMetadata[];\n  requireApproval?: boolean;\n  isDelegatedAccount?: boolean;\n}): Promise<Parameters<TransactionController['addTransactionBatch']>[0]> => {\n  const trade = tradeData[0].tx;\n  const selectedAccount = getAccountByAddress(messenger, trade.from);\n  if (!selectedAccount) {\n    throw new Error(\n      'Failed to submit cross-chain swap batch transaction: unknown account in trade data',\n    );\n  }\n  const hexChainId = formatChainIdToHex(trade.chainId);\n  const networkClientId = getNetworkClientIdByChainId(messenger, hexChainId);\n\n  const transactions: TransactionBatchSingleRequest[] = await Promise.all(\n    tradeData.map(async ({ tx, txFee, assetsFiatValues, type }) => ({\n      params: await toTransactionParams(\n        messenger,\n        tx,\n        networkClientId,\n        hexChainId,\n        txFee,\n      ),\n      assetsFiatValues,\n      type,\n    })),\n  );\n\n  return {\n    networkClientId,\n    requireApproval,\n    origin: 'metamask',\n    from: selectedAccount.address as Hex,\n    isInternal: true,\n    transactions,\n    ...addTransactionBatchParams,\n  };\n};\n\nexport const findAllTransactionsInBatch = ({\n  messenger,\n  batchId,\n  tradeData,\n}: {\n  messenger: BridgeStatusControllerMessenger;\n  batchId: string;\n  tradeData: QuoteAndTxMetadata[];\n}): QuoteAndTxMetadata[] => {\n  // Filter for transactions with batchId\n  const txs = getTransactions(messenger).filter(\n    (tx: TransactionMeta) => tx.batchId === batchId,\n  );\n\n  return tradeData.map((tradeWithMetadata) => {\n    const { tx, type } = tradeWithMetadata;\n    return {\n      ...tradeWithMetadata,\n      txMeta: txs.find((txMeta: TransactionMeta) => {\n        if (is7702Tx(txMeta)) {\n          // For 7702 transactions, we need to match based on transaction type\n          // since the data field might be different (batch execute call)\n          if (isTradeTx(type) && txMeta.type === TransactionType.batch) {\n            return true;\n          }\n          // Also check if it's an approval transaction for 7702\n          if (isApprovalTx(type) && txMeta.txParams.data === tx.data) {\n            return true;\n          }\n        }\n        // Default matching logic for non-7702 transactions\n        if (txMeta.txParams.data === tx.data) {\n          return true;\n        }\n        return false;\n      }),\n    };\n  });\n};\n\n/**\n * This is a workaround to update the tx type after submission. Batch txs are submitted with\n * the \"batch\" type, but we need to update to swap/bridge for display purposes.\n *\n * @param params - The parameters for the transaction search\n * @param params.messenger - The messenger to use for the transaction\n * @param params.allTradesWithMetadata - The quote, tx data and type for each transaction in the batch\n * @returns A list of transaction metas for each trade in the batch]\n *\n * @example\n * [\n *   {...tradeData[0], tradeMeta: TransactionMeta}\n *   {...tradeData[1], tradeMeta: TransactionMeta}\n *   {...tradeData[2], tradeMeta: TransactionMeta}\n *   {...tradeData[3], tradeMeta: TransactionMeta}\n * ]\n */\nexport const updateTransactionsInBatch = ({\n  messenger,\n  allTradesWithMetadata,\n}: {\n  messenger: BridgeStatusControllerMessenger;\n  allTradesWithMetadata: QuoteAndTxMetadata[];\n}) => {\n  return allTradesWithMetadata.map((tradeWithMetadata) => {\n    const { txMeta, type } = tradeWithMetadata;\n\n    if (txMeta) {\n      // Update the tx type from batch to swap/bridge\n      updateTransaction(\n        messenger,\n        txMeta,\n        { type },\n        `Update tx type to ${type}`,\n      );\n      const updatedTx = { ...txMeta, type };\n      return { ...tradeWithMetadata, txMeta: updatedTx, type };\n    }\n\n    return tradeWithMetadata;\n  });\n};\n"]}
+{"version":3,"file":"transaction.mjs","sourceRoot":"","sources":["../../src/utils/transaction.ts"],"names":[],"mappings":"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","sourcesContent":["/* eslint-disable @typescript-eslint/explicit-function-return-type */\nimport {\n  ChainId,\n  formatChainIdToHex,\n  BRIDGE_PREFERRED_GAS_ESTIMATE,\n  isEvmTxData,\n  FeeType,\n  BatchSellTransactionType,\n} from '@metamask/bridge-controller';\nimport type {\n  BatchSellTradesResponse,\n  QuoteMetadata,\n  QuoteResponse,\n  SimulatedGasFeeLimits,\n  Trade,\n  TxData,\n  TxFeeGasLimits,\n} from '@metamask/bridge-controller';\nimport { toHex } from '@metamask/controller-utils';\nimport {\n  GasFeeEstimateType,\n  TransactionStatus,\n  TransactionType,\n} from '@metamask/transaction-controller';\nimport type {\n  IsAtomicBatchSupportedResultEntry,\n  TransactionController,\n  TransactionMeta,\n  TransactionBatchSingleRequest,\n  BatchTransactionParams,\n} from '@metamask/transaction-controller';\nimport { createProjectLogger, isStrictHexString } from '@metamask/utils';\nimport type { Hex } from '@metamask/utils';\n\nimport { APPROVAL_DELAY_MS } from '../constants';\nimport type { BridgeStatusControllerMessenger } from '../types';\nimport type { QuoteAndTxMetadata } from '../types';\nimport { getAccountByAddress } from './accounts';\nimport { getNetworkClientIdByChainId } from './network';\n\nexport const isApprovalTx = (type: TransactionType) =>\n  type === TransactionType.bridgeApproval ||\n  type === TransactionType.swapApproval;\nexport const isTradeTx = (type: TransactionType) =>\n  type === TransactionType.bridge || type === TransactionType.swap;\nexport const isCrossChainTx = (type: TransactionType) =>\n  isTradeTx(type) || isApprovalTx(type);\n\n/**\n * For 7702 delegated transactions, check for delegation-specific fields\n * These transactions might have authorizationList or delegationAddress\n *\n * @param tx - The transaction meta\n * @returns Whether the transaction is a 7702 transaction\n */\nexport const is7702Tx = (tx: TransactionMeta) => {\n  return (\n    (Array.isArray(tx.txParams.authorizationList) &&\n      tx.txParams.authorizationList.length > 0) ||\n    Boolean(tx.delegationAddress)\n  );\n};\n\nexport const shouldDisable7702 = (\n  gasIncluded7702: boolean = false,\n  gasIncluded: boolean = false,\n  isDelegatedAccount: boolean = false,\n): boolean => {\n  // Enable 7702 batching when the quote includes gasless 7702 support\n  if (gasIncluded7702) {\n    return false;\n  }\n  // Enable batching when the account is already delegated (to avoid the in-flight transaction limit for delegated accounts)\n  // For gasless transactions with STX/sendBundle we keep disabling 7702\n  if (isDelegatedAccount && !gasIncluded) {\n    return false;\n  }\n  /**\n   * Explicitly return default instead of falsy value (see TransactionBatchRequest.disable7702)\n   */\n  return true;\n};\n\nexport const hasNestedSwapTransactions = (txMeta: TransactionMeta) => {\n  return Boolean(\n    txMeta?.nestedTransactions?.some((tx) => tx.type === TransactionType.swap),\n  );\n};\n\nexport const getGasFeeEstimates = async (\n  messenger: BridgeStatusControllerMessenger,\n  args: Parameters<TransactionController['estimateGasFee']>[0],\n) => {\n  const { estimates } = await messenger.call(\n    'TransactionController:estimateGasFee',\n    args,\n  );\n\n  if (estimates?.type === GasFeeEstimateType.FeeMarket) {\n    return estimates[BRIDGE_PREFERRED_GAS_ESTIMATE];\n  }\n\n  return undefined;\n};\n\nexport const getTransactions = (messenger: BridgeStatusControllerMessenger) => {\n  return messenger.call('TransactionController:getState').transactions ?? [];\n};\n\nexport const getTransactionMetaById = (\n  messenger: BridgeStatusControllerMessenger,\n  txId?: string,\n) => {\n  return getTransactions(messenger).find(\n    (tx: TransactionMeta) => tx.id === txId,\n  );\n};\n\nexport const getTransactionMetaByHash = (\n  messenger: BridgeStatusControllerMessenger,\n  txHash?: string,\n) => {\n  return getTransactions(messenger).find(\n    (tx: TransactionMeta) => tx.hash?.toLowerCase() === txHash?.toLowerCase(),\n  );\n};\n\nexport const updateTransaction = (\n  messenger: BridgeStatusControllerMessenger,\n  txMeta: TransactionMeta,\n  txMetaUpdates: Partial<TransactionMeta>,\n  note: string,\n) => {\n  return messenger.call(\n    'TransactionController:updateTransaction',\n    { ...txMeta, ...txMetaUpdates },\n    note,\n  );\n};\n\nexport const checkIsDelegatedAccount = async (\n  messenger: BridgeStatusControllerMessenger,\n  fromAddress: Hex,\n  chainIds: Hex[],\n): Promise<boolean> => {\n  try {\n    const atomicBatchSupport = await messenger.call(\n      'TransactionController:isAtomicBatchSupported',\n      {\n        address: fromAddress,\n        chainIds,\n      },\n    );\n    return atomicBatchSupport.some(\n      (entry: IsAtomicBatchSupportedResultEntry) =>\n        entry.isSupported && entry.delegationAddress,\n    );\n  } catch {\n    return false;\n  }\n};\n\nconst waitForHashAndReturnFinalTxMeta = async (\n  messenger: BridgeStatusControllerMessenger,\n  hashPromise?: Awaited<\n    ReturnType<TransactionController['addTransaction']>\n  >['result'],\n): Promise<TransactionMeta> => {\n  const txHash = await hashPromise;\n  const finalTransactionMeta = getTransactionMetaByHash(messenger, txHash);\n  if (!finalTransactionMeta) {\n    throw new Error(\n      'Failed to submit cross-chain swap tx: txMeta for txHash was not found',\n    );\n  }\n  return finalTransactionMeta;\n};\n\nexport const addTransaction = async (\n  messenger: BridgeStatusControllerMessenger,\n  ...args: Parameters<TransactionController['addTransaction']>\n) => {\n  const { result } = await messenger.call(\n    'TransactionController:addTransaction',\n    ...args,\n  );\n  return await waitForHashAndReturnFinalTxMeta(messenger, result);\n};\n\nexport const generateActionId = () => (Date.now() + Math.random()).toString();\n\n/**\n * Adds a synthetic transaction to the TransactionController to display pending intent orders in the UI\n *\n * @param messenger - The messenger to use for the transaction\n * @param args - The arguments for the transaction\n * @returns The transaction meta\n */\nexport const addSyntheticTransaction = async (\n  messenger: BridgeStatusControllerMessenger,\n  ...args: Parameters<TransactionController['addTransaction']>\n) => {\n  const { transactionMeta } = await messenger.call(\n    'TransactionController:addTransaction',\n    args[0],\n    {\n      origin: 'metamask',\n      actionId: generateActionId(),\n      isStateOnly: true,\n      isInternal: true,\n      ...args[1],\n    },\n  );\n  return transactionMeta;\n};\n\nexport const handleApprovalDelay = async (\n  srcChainId: QuoteResponse['quote']['srcChainId'],\n) => {\n  if ([ChainId.LINEA, ChainId.BASE].includes(srcChainId)) {\n    const debugLog = createProjectLogger('bridge');\n    debugLog(\n      'Delaying submitting bridge tx to make Linea and Base confirmation more likely',\n    );\n    const waitPromise = new Promise((resolve) =>\n      setTimeout(resolve, APPROVAL_DELAY_MS),\n    );\n    await waitPromise;\n  }\n};\n\n/**\n * Adds a delay for hardware wallet transactions on mobile to fix an issue\n * where the Ledger does not get prompted for the 2nd approval.\n * Extension does not have this issue.\n *\n * @param requireApproval - Whether the delay should be applied\n */\nexport const handleMobileHardwareWalletDelay = async (\n  requireApproval: boolean,\n) => {\n  if (requireApproval) {\n    const mobileHardwareWalletDelay = new Promise((resolve) =>\n      setTimeout(resolve, 1000),\n    );\n    await mobileHardwareWalletDelay;\n  }\n};\n\n/**\n * Waits until a given transaction (by id) reaches confirmed/finalized status or fails/times out.\n *\n * @deprecated use addTransaction util\n * @param messenger - the BridgeStatusControllerMessenger\n * @param txId - the transaction ID\n * @param options - the options for the timeout and poll\n * @param options.timeoutMs - the timeout in milliseconds\n * @param options.pollMs - the poll interval in milliseconds\n * @returns the transaction meta\n */\nexport const waitForTxConfirmation = async (\n  messenger: BridgeStatusControllerMessenger,\n  txId: string,\n  {\n    timeoutMs = 5 * 60_000,\n    pollMs = 3_000,\n  }: { timeoutMs?: number; pollMs?: number } = {},\n): Promise<TransactionMeta> => {\n  const start = Date.now();\n  while (true) {\n    const meta = getTransactionMetaById(messenger, txId);\n\n    if (meta) {\n      if (meta.status === TransactionStatus.confirmed) {\n        return meta;\n      }\n      if (\n        meta.status === TransactionStatus.failed ||\n        meta.status === TransactionStatus.dropped ||\n        meta.status === TransactionStatus.rejected\n      ) {\n        throw new Error('Approval transaction did not confirm');\n      }\n    }\n\n    if (Date.now() - start > timeoutMs) {\n      throw new Error('Timed out waiting for approval confirmation');\n    }\n\n    await new Promise((resolve) => setTimeout(resolve, pollMs));\n  }\n};\n\nexport const toQuoteAndTxMetadata = ({\n  quoteResponse,\n  isBridgeTx,\n}: {\n  quoteResponse: QuoteResponse<Trade, Trade> & QuoteMetadata;\n  isBridgeTx: boolean;\n}): Omit<QuoteAndTxMetadata, 'txMeta'>[] => {\n  const tradeData: QuoteAndTxMetadata[] = [];\n\n  const approvalTxType = isBridgeTx\n    ? TransactionType.bridgeApproval\n    : TransactionType.swapApproval;\n\n  if (quoteResponse.resetApproval) {\n    tradeData.push({\n      quoteResponse,\n      tx: quoteResponse.resetApproval,\n      type: approvalTxType,\n      txFee: quoteResponse.quote.feeData[FeeType.TX_FEE],\n    });\n  }\n  if (quoteResponse.approval && isEvmTxData(quoteResponse.approval)) {\n    tradeData.push({\n      quoteResponse,\n      tx: quoteResponse.approval,\n      type: approvalTxType,\n      txFee: quoteResponse.quote.feeData[FeeType.TX_FEE],\n    });\n  }\n  tradeData.push({\n    quoteResponse,\n    tx: quoteResponse.trade as TxData,\n    type: isBridgeTx ? TransactionType.bridge : TransactionType.swap,\n    assetsFiatValues: {\n      sending: quoteResponse.sentAmount?.valueInCurrency?.toString(),\n      receiving: quoteResponse.toTokenAmount?.valueInCurrency?.toString(),\n    },\n    txFee: quoteResponse.quote.feeData[FeeType.TX_FEE],\n  });\n\n  return tradeData;\n};\n\n/**\n * Build the trade+quote metadata array for the batch sell transaction\n * This ties together the quote, the tx params and the txMeta after submission\n *\n * @param options - The options for the batch sell transaction\n * @param options.quoteResponses - The quote responses for the batch sell transaction\n * @param options.batchSellTrades - The batch sell trades for the batch sell transaction\n * @returns The trade+quote metadata array for the batch sell transaction\n */\nexport const toQuoteAndTxMetadataBatch = ({\n  quoteResponses,\n  batchSellTrades,\n}: {\n  quoteResponses: (QuoteResponse<TxData, TxData> & QuoteMetadata)[];\n  batchSellTrades: BatchSellTradesResponse;\n}): Omit<QuoteAndTxMetadata, 'txMeta'>[] => {\n  const tradeData: QuoteAndTxMetadata[] = [];\n\n  const {\n    transactions,\n    gasIncluded7702,\n    gasIncluded,\n    gasSponsored = false,\n  } = batchSellTrades;\n\n  for (const transaction of transactions) {\n    const { type, maxFeePerGas, maxPriorityFeePerGas, ...tx } = transaction;\n    // Match the trade or approval tx data with the quote response\n    const matchingQuoteResponse =\n      quoteResponses.find(\n        ({ approval, trade }) =>\n          trade?.data.toLowerCase() === tx.data.toLowerCase() ||\n          approval?.data.toLowerCase() === tx.data.toLowerCase(),\n      ) ?? quoteResponses[0];\n\n    // Include gasIncluded and gasIncluded7702 from the gasless batch\n    const normalizedQuote = {\n      ...matchingQuoteResponse,\n      quote: {\n        ...matchingQuoteResponse.quote,\n        gasIncluded,\n        gasIncluded7702,\n        gasSponsored,\n      },\n    };\n\n    const commonTradeData = {\n      tx,\n      quoteResponse: normalizedQuote,\n      txFee: { maxFeePerGas, maxPriorityFeePerGas },\n    };\n\n    if (type === BatchSellTransactionType.TRADE) {\n      tradeData.push({\n        ...commonTradeData,\n        type: TransactionType.swap,\n        assetsFiatValues: {\n          sending:\n            matchingQuoteResponse.sentAmount?.valueInCurrency?.toString(),\n          receiving:\n            matchingQuoteResponse.toTokenAmount?.valueInCurrency?.toString(),\n        },\n      });\n    } else {\n      tradeData.push({\n        ...commonTradeData,\n        type:\n          type === BatchSellTransactionType.APPROVAL\n            ? TransactionType.swapApproval\n            : TransactionType.tokenMethodTransfer,\n      });\n    }\n  }\n\n  return tradeData;\n};\n\n/**\n * Appends the gas fee estimates for a transaction and normalizes the trade data\n *\n * @param messenger - The messenger for the gas fee estimates\n * @param trade - the trade data to append gas fees to\n * @param trade.chainId - ignored, use chainId instead\n * @param trade.gasLimit - the gas limit to use for the gas fee estimates\n * @param networkClientId - the network client ID to use for the gas fee estimates\n * @param chainId - the chain ID to use for the gas fee estimates\n * @param simulatedGasFeeLimits - either the txFee from the quote or the simulated gas fee limits for the batch sell\n * @returns The gas fee estimates for the transaction\n */\nexport const toTransactionParams = async (\n  messenger: BridgeStatusControllerMessenger,\n  { chainId: tradeChainId, gasLimit, ...trade }: TxData,\n  networkClientId: string,\n  chainId: Hex,\n  simulatedGasFeeLimits?: SimulatedGasFeeLimits | TxFeeGasLimits,\n): Promise<BatchTransactionParams> => {\n  const transactionParams = {\n    data: trade.data,\n    to: trade.to,\n    from: trade.from,\n    value: trade.value,\n    // Only add gas if it's truthy\n    gas: gasLimit ? toHex(gasLimit) : undefined,\n  };\n\n  // Use bridge-api's provided gas fee estimates\n  if (simulatedGasFeeLimits) {\n    return {\n      ...transactionParams,\n      // Sometimes estimates are hex, somethings numeric strings\n      maxFeePerGas: isStrictHexString(simulatedGasFeeLimits.maxFeePerGas)\n        ? simulatedGasFeeLimits.maxFeePerGas\n        : toHex(simulatedGasFeeLimits.maxFeePerGas),\n      maxPriorityFeePerGas: isStrictHexString(\n        simulatedGasFeeLimits.maxPriorityFeePerGas,\n      )\n        ? simulatedGasFeeLimits.maxPriorityFeePerGas\n        : toHex(simulatedGasFeeLimits.maxPriorityFeePerGas),\n    };\n  }\n\n  // Get transaction's 1559 gas fee estimates\n  const gasFeeEstimates = await getGasFeeEstimates(messenger, {\n    transactionParams,\n    networkClientId,\n    chainId,\n  });\n\n  return {\n    ...transactionParams,\n    maxFeePerGas: gasFeeEstimates?.maxFeePerGas,\n    maxPriorityFeePerGas: gasFeeEstimates?.maxPriorityFeePerGas,\n  };\n};\n\nexport const getAddTransactionBatchParams = async ({\n  messenger,\n  tradeData,\n  requireApproval = false,\n  isDelegatedAccount,\n  ...addTransactionBatchParams\n}: Partial<Parameters<TransactionController['addTransactionBatch']>[0]> & {\n  messenger: BridgeStatusControllerMessenger;\n  tradeData: QuoteAndTxMetadata[];\n  requireApproval?: boolean;\n  isDelegatedAccount?: boolean;\n}): Promise<Parameters<TransactionController['addTransactionBatch']>[0]> => {\n  const trade = tradeData[0].tx;\n  const selectedAccount = getAccountByAddress(messenger, trade.from);\n  if (!selectedAccount) {\n    throw new Error(\n      'Failed to submit cross-chain swap batch transaction: unknown account in trade data',\n    );\n  }\n  const hexChainId = formatChainIdToHex(trade.chainId);\n  const networkClientId = getNetworkClientIdByChainId(messenger, hexChainId);\n\n  const transactions: TransactionBatchSingleRequest[] = await Promise.all(\n    tradeData.map(async ({ tx, txFee, assetsFiatValues, type }) => ({\n      params: await toTransactionParams(\n        messenger,\n        tx,\n        networkClientId,\n        hexChainId,\n        txFee,\n      ),\n      assetsFiatValues,\n      type,\n    })),\n  );\n\n  return {\n    networkClientId,\n    requireApproval,\n    origin: 'metamask',\n    from: selectedAccount.address as Hex,\n    isInternal: true,\n    transactions,\n    ...addTransactionBatchParams,\n  };\n};\n\nexport const findAllTransactionsInBatch = ({\n  messenger,\n  batchId,\n  tradeData,\n}: {\n  messenger: BridgeStatusControllerMessenger;\n  batchId: string;\n  tradeData: QuoteAndTxMetadata[];\n}): QuoteAndTxMetadata[] => {\n  // Filter for transactions with batchId\n  const txs = getTransactions(messenger).filter(\n    (tx: TransactionMeta) => tx.batchId === batchId,\n  );\n\n  return tradeData.map((tradeWithMetadata) => {\n    const { tx, type } = tradeWithMetadata;\n    return {\n      ...tradeWithMetadata,\n      txMeta: txs.find((txMeta: TransactionMeta) => {\n        if (is7702Tx(txMeta)) {\n          // For 7702 transactions, we need to match based on transaction type\n          // since the data field might be different (batch execute call)\n          if (isTradeTx(type) && txMeta.type === TransactionType.batch) {\n            return true;\n          }\n          // Also check if it's an approval transaction for 7702\n          if (isApprovalTx(type) && txMeta.txParams.data === tx.data) {\n            return true;\n          }\n        }\n        // Default matching logic for non-7702 transactions\n        if (txMeta.txParams.data === tx.data) {\n          return true;\n        }\n        return false;\n      }),\n    };\n  });\n};\n\n/**\n * This is a workaround to update the tx type after submission. Batch txs are submitted with\n * the \"batch\" type, but we need to update to swap/bridge for display purposes.\n *\n * @param params - The parameters for the transaction search\n * @param params.messenger - The messenger to use for the transaction\n * @param params.allTradesWithMetadata - The quote, tx data and type for each transaction in the batch\n * @returns A list of transaction metas for each trade in the batch]\n *\n * @example\n * [\n *   {...tradeData[0], tradeMeta: TransactionMeta}\n *   {...tradeData[1], tradeMeta: TransactionMeta}\n *   {...tradeData[2], tradeMeta: TransactionMeta}\n *   {...tradeData[3], tradeMeta: TransactionMeta}\n * ]\n */\nexport const updateTransactionsInBatch = ({\n  messenger,\n  allTradesWithMetadata,\n}: {\n  messenger: BridgeStatusControllerMessenger;\n  allTradesWithMetadata: QuoteAndTxMetadata[];\n}) => {\n  return allTradesWithMetadata.map((tradeWithMetadata) => {\n    const { txMeta, type } = tradeWithMetadata;\n\n    if (txMeta) {\n      // Update the tx type from batch to swap/bridge\n      updateTransaction(\n        messenger,\n        txMeta,\n        { type },\n        `Update tx type to ${type}`,\n      );\n      const updatedTx = { ...txMeta, type };\n      return { ...tradeWithMetadata, txMeta: updatedTx, type };\n    }\n\n    return tradeWithMetadata;\n  });\n};\n"]}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@metamask-previews/bridge-status-controller",
-  "version": "72.0.0-preview-4bcc1c6c1",
+  "version": "72.0.1-preview-34aa73a7b",
   "description": "Manages bridge-related status fetching functionality for MetaMask",
   "keywords": [
     "Ethereum",