@metamask/transaction-controller 63.3.1 → 64.1.0

package/dist/utils/batch.mjs

@@ -5,8 +5,10 @@ import { parse, v4 } from "uuid";
 import { ERROR_MESSGE_PUBLIC_KEY, doesChainSupportEIP7702, generateEIP7702BatchTransaction, isAccountUpgradedToEIP7702 } from "./eip7702.mjs";
 import { getBatchSizeLimit, getEIP7702SupportedChains, getEIP7702UpgradeContractAddress } from "./feature-flags.mjs";
 import { simulateGasBatch } from "./gas.mjs";
+import { getChainId } from "./provider.mjs";
+import { determineTransactionType } from "./transaction-type.mjs";
 import { validateBatchRequest } from "./validation.mjs";
-import { determineTransactionType, GasFeeEstimateLevel, TransactionStatus } from "../index.mjs";
+import { GasFeeEstimateLevel, TransactionStatus } from "../index.mjs";
 import { DefaultGasFeeFlow } from "../gas-flows/DefaultGasFeeFlow.mjs";
 import { updateTransactionGasEstimates } from "../helpers/GasFeePoller.mjs";
 import { CollectPublishHook } from "../hooks/CollectPublishHook.mjs";
@@ -51,7 +53,7 @@ export async function addTransactionBatch(request) {
  * @returns The chain IDs that support atomic batch transactions.
  */
 export async function isAtomicBatchSupported(request) {
-    const { address, chainIds, getEthQuery, messenger, publicKeyEIP7702: publicKey, } = request;
+    const { address, chainIds, messenger, publicKeyEIP7702: publicKey } = request;
     if (!publicKey) {
         throw rpcErrors.internal(ERROR_MESSGE_PUBLIC_KEY);
     }
@@ -59,8 +61,8 @@ export async function isAtomicBatchSupported(request) {
     const filteredChainIds = chainIds7702.filter((chainId) => !chainIds || chainIds.includes(chainId));
     const resultsRaw = await Promise.all(filteredChainIds.map(async (chainId) => {
         try {
-            const ethQuery = getEthQuery(chainId);
-            const { isSupported, delegationAddress } = await isAccountUpgradedToEIP7702(address, chainId, publicKey, messenger, ethQuery);
+            const networkClientId = messenger.call('NetworkController:findNetworkClientIdByChainId', chainId);
+            const { isSupported, delegationAddress } = await isAccountUpgradedToEIP7702(address, chainId, publicKey, messenger, networkClientId);
             const upgradeContractAddress = getEIP7702UpgradeContractAddress(chainId, messenger, publicKey);
             return {
                 chainId,
@@ -93,10 +95,11 @@ function generateBatchId() {
  *
  * @param request - The batch request.
  * @param singleRequest - The request for a single transaction.
- * @param ethQuery - The EthQuery instance used to interact with the Ethereum blockchain.
+ * @param messenger - The transaction controller messenger.
+ * @param networkClientId - The network client ID.
  * @returns The metadata for the nested transaction.
  */
-async function getNestedTransactionMeta(request, singleRequest, ethQuery) {
+async function getNestedTransactionMeta(request, singleRequest, messenger, networkClientId) {
     const { from } = request;
     const { params, type: requestedType } = singleRequest;
     if (requestedType) {
@@ -105,7 +108,7 @@ async function getNestedTransactionMeta(request, singleRequest, ethQuery) {
             type: requestedType,
         };
     }
-    const { type: determinedType } = await determineTransactionType({ from, ...params }, ethQuery);
+    const { type: determinedType } = await determineTransactionType({ from, ...params }, { messenger, networkClientId });
     return {
         ...params,
         type: determinedType,
@@ -118,10 +121,9 @@ async function getNestedTransactionMeta(request, singleRequest, ethQuery) {
  * @returns The batch result object including the batch ID.
  */
 async function addTransactionBatchWith7702(request) {
-    const { addTransaction, getChainId, messenger, publicKeyEIP7702, request: userRequest, } = request;
-    const { batchId: batchIdOverride, disableUpgrade, from, gasFeeToken, gasLimit7702, networkClientId, origin, overwriteUpgrade, requestId, requiredAssets, requireApproval, securityAlertId, skipInitialGasEstimate, transactions, validateSecurity, } = userRequest;
-    const chainId = getChainId(networkClientId);
-    const ethQuery = request.getEthQuery(networkClientId);
+    const { addTransaction, messenger, publicKeyEIP7702, request: userRequest, } = request;
+    const { batchId: batchIdOverride, disableUpgrade, from, gasFeeToken, gasLimit7702, networkClientId, origin, overwriteUpgrade, requestId, requiredAssets, requireApproval, securityAlertId, skipInitialGasEstimate, transactions, excludeNativeTokenForFee, isGasFeeIncluded, isGasFeeSponsored, validateSecurity, } = userRequest;
+    const chainId = getChainId({ messenger, networkClientId });
     const isChainSupported = doesChainSupportEIP7702(chainId, messenger);
     if (!isChainSupported) {
         log('Chain does not support EIP-7702', chainId);
@@ -132,7 +134,7 @@ async function addTransactionBatchWith7702(request) {
     }
     let requiresUpgrade = false;
     if (!disableUpgrade) {
-        const { delegationAddress, isSupported } = await isAccountUpgradedToEIP7702(from, chainId, publicKeyEIP7702, messenger, ethQuery);
+        const { delegationAddress, isSupported } = await isAccountUpgradedToEIP7702(from, chainId, publicKeyEIP7702, messenger, networkClientId);
         log('Account', { delegationAddress, isSupported });
         if (!isSupported && delegationAddress && !overwriteUpgrade) {
             log('Account upgraded to unsupported contract', from, delegationAddress);
@@ -145,7 +147,7 @@ async function addTransactionBatchWith7702(request) {
             });
         }
     }
-    const nestedTransactions = await Promise.all(transactions.map((tx) => getNestedTransactionMeta(userRequest, tx, ethQuery)));
+    const nestedTransactions = await Promise.all(transactions.map((tx) => getNestedTransactionMeta(userRequest, tx, messenger, networkClientId)));
     const batchParams = generateEIP7702BatchTransaction(from, nestedTransactions);
     const txParams = {
         ...batchParams,
@@ -199,8 +201,9 @@ async function addTransactionBatchWith7702(request) {
     const { result } = await addTransaction(txParams, {
         batchId,
         gasFeeToken,
-        isGasFeeIncluded: userRequest.isGasFeeIncluded,
-        isGasFeeSponsored: userRequest.isGasFeeSponsored,
+        excludeNativeTokenForFee,
+        isGasFeeIncluded,
+        isGasFeeSponsored,
         nestedTransactions,
         networkClientId,
         origin,
@@ -232,7 +235,6 @@ async function addTransactionBatchWithHook(request) {
     const sequentialPublishBatchHook = new SequentialPublishBatchHook({
         publishTransaction: request.publishTransaction,
         getTransaction: request.getTransaction,
-        getEthQuery: request.getEthQuery,
         getPendingTransactionTracker: request.getPendingTransactionTracker,
     });
     let { disable7702, disableSequential } = userRequest;
@@ -490,14 +492,13 @@ function newBatchMetadata(transactionBatchMeta) {
  * @returns The prepared transaction batch metadata.
  */
 async function prepareApprovalData({ batchId, request, }) {
-    const { messenger, request: userRequest, isSimulationEnabled, getChainId, getEthQuery, getGasFeeEstimates, getSimulationConfig, update, } = request;
+    const { messenger, request: userRequest, isSimulationEnabled, getGasFeeEstimates, getSimulationConfig, update, } = request;
     const { from, origin, networkClientId, transactions: nestedTransactions, } = userRequest;
-    const ethQuery = getEthQuery(networkClientId);
     if (!isSimulationEnabled()) {
         throw new Error('Cannot create transaction batch as simulation not supported');
     }
     log('Preparing approval data for batch');
-    const chainId = getChainId(networkClientId);
+    const chainId = getChainId({ messenger, networkClientId });
     const { totalGasLimit: gasLimit } = await simulateGasBatch({
         chainId,
         from,
@@ -518,7 +519,6 @@ async function prepareApprovalData({ batchId, request, }) {
         networkClientId,
     });
     const gasFeeResponse = await defaultGasFeeFlow.getGasFees({
-        ethQuery,
         gasFeeControllerData,
         messenger,
         transactionMeta: {

package/dist/utils/batch.mjs.map

@@ -1 +1 @@
-{"version":3,"file":"batch.mjs","sourceRoot":"","sources":["../../src/utils/batch.ts"],"names":[],"mappings":"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","sourcesContent":["import type {\n  AcceptResultCallbacks,\n  AddResult,\n} from '@metamask/approval-controller';\nimport {\n  ApprovalType,\n  ORIGIN_METAMASK,\n  toHex,\n} from '@metamask/controller-utils';\nimport type EthQuery from '@metamask/eth-query';\nimport type {\n  FetchGasFeeEstimateOptions,\n  GasFeeState,\n} from '@metamask/gas-fee-controller';\nimport { JsonRpcError, rpcErrors } from '@metamask/rpc-errors';\nimport type { Hex } from '@metamask/utils';\nimport { bytesToHex, createModuleLogger } from '@metamask/utils';\nimport type { WritableDraft } from 'immer/dist/internal.js';\nimport { parse, v4 } from 'uuid';\n\nimport {\n  ERROR_MESSGE_PUBLIC_KEY,\n  doesChainSupportEIP7702,\n  generateEIP7702BatchTransaction,\n  isAccountUpgradedToEIP7702,\n} from './eip7702';\nimport {\n  getBatchSizeLimit,\n  getEIP7702SupportedChains,\n  getEIP7702UpgradeContractAddress,\n} from './feature-flags';\nimport { simulateGasBatch } from './gas';\nimport { validateBatchRequest } from './validation';\nimport {\n  determineTransactionType,\n  GasFeeEstimateLevel,\n  TransactionStatus,\n} from '..';\nimport type {\n  BatchTransactionParams,\n  GetSimulationConfig,\n  PublishBatchHookRequest,\n  TransactionController,\n  TransactionControllerMessenger,\n  TransactionControllerState,\n  TransactionMeta,\n} from '..';\nimport { DefaultGasFeeFlow } from '../gas-flows/DefaultGasFeeFlow';\nimport { updateTransactionGasEstimates } from '../helpers/GasFeePoller';\nimport type { PendingTransactionTracker } from '../helpers/PendingTransactionTracker';\nimport { CollectPublishHook } from '../hooks/CollectPublishHook';\nimport { SequentialPublishBatchHook } from '../hooks/SequentialPublishBatchHook';\nimport { projectLogger } from '../logger';\nimport { TransactionEnvelopeType, TransactionType } from '../types';\nimport type {\n  NestedTransactionMetadata,\n  SecurityAlertResponse,\n  TransactionBatchSingleRequest,\n  PublishBatchHook,\n  PublishBatchHookTransaction,\n  PublishHook,\n  TransactionBatchRequest,\n  ValidateSecurityRequest,\n  IsAtomicBatchSupportedResult,\n  IsAtomicBatchSupportedResultEntry,\n  TransactionBatchMeta,\n} from '../types';\nimport type { TransactionBatchResult, TransactionParams } from '../types';\n\ntype UpdateStateCallback = (\n  callback: (\n    state: WritableDraft<TransactionControllerState>,\n  ) => void | TransactionControllerState,\n) => void;\n\ntype AddTransactionBatchRequest = {\n  addTransaction: TransactionController['addTransaction'];\n  estimateGas: TransactionController['estimateGas'];\n  getChainId: (networkClientId: string) => Hex;\n  getEthQuery: (networkClientId: string) => EthQuery;\n  getGasFeeEstimates: (\n    options: FetchGasFeeEstimateOptions,\n  ) => Promise<GasFeeState>;\n  getInternalAccounts: () => Hex[];\n  getPendingTransactionTracker: (\n    networkClientId: string,\n  ) => PendingTransactionTracker;\n  getSimulationConfig: GetSimulationConfig;\n  getTransaction: (id: string) => TransactionMeta;\n  isSimulationEnabled: () => boolean;\n  messenger: TransactionControllerMessenger;\n  publishBatchHook?: PublishBatchHook;\n  publishTransaction: (\n    _ethQuery: EthQuery,\n    transactionMeta: TransactionMeta,\n  ) => Promise<Hex>;\n  publicKeyEIP7702?: Hex;\n  request: TransactionBatchRequest;\n  requestId?: string;\n  signTransaction: (\n    transactionMeta: TransactionMeta,\n  ) => Promise<string | undefined>;\n  update: UpdateStateCallback;\n  updateTransaction: (\n    options: { transactionId: string },\n    callback: (transactionMeta: TransactionMeta) => void,\n  ) => void;\n};\n\ntype IsAtomicBatchSupportedRequestInternal = {\n  address: Hex;\n  chainIds?: Hex[];\n  getEthQuery: (chainId: Hex) => EthQuery;\n  messenger: TransactionControllerMessenger;\n  publicKeyEIP7702?: Hex;\n};\n\nconst log = createModuleLogger(projectLogger, 'batch');\n\nexport const ERROR_MESSAGE_NO_UPGRADE_CONTRACT =\n  'Upgrade contract address not found';\n\n/**\n * Add a batch transaction.\n *\n * @param request - The request object including the user request and necessary callbacks.\n * @returns The batch result object including the batch ID.\n */\nexport async function addTransactionBatch(\n  request: AddTransactionBatchRequest,\n): Promise<TransactionBatchResult> {\n  const {\n    getInternalAccounts,\n    messenger,\n    request: transactionBatchRequest,\n  } = request;\n  const sizeLimit = getBatchSizeLimit(messenger);\n\n  validateBatchRequest({\n    internalAccounts: getInternalAccounts(),\n    request: transactionBatchRequest,\n    sizeLimit,\n  });\n\n  log('Adding', transactionBatchRequest);\n\n  if (!transactionBatchRequest.disable7702) {\n    try {\n      return await addTransactionBatchWith7702(request);\n    } catch (error: unknown) {\n      const isEIP7702NotSupportedError =\n        error instanceof JsonRpcError &&\n        error.message === 'Chain does not support EIP-7702';\n\n      if (!isEIP7702NotSupportedError) {\n        throw error;\n      }\n    }\n  }\n\n  return await addTransactionBatchWithHook(request);\n}\n\n/**\n * Determine which chains support atomic batch transactions for the given account.\n *\n * @param request - The request object including the account address and necessary callbacks.\n * @returns The chain IDs that support atomic batch transactions.\n */\nexport async function isAtomicBatchSupported(\n  request: IsAtomicBatchSupportedRequestInternal,\n): Promise<IsAtomicBatchSupportedResult> {\n  const {\n    address,\n    chainIds,\n    getEthQuery,\n    messenger,\n    publicKeyEIP7702: publicKey,\n  } = request;\n\n  if (!publicKey) {\n    throw rpcErrors.internal(ERROR_MESSGE_PUBLIC_KEY);\n  }\n\n  const chainIds7702 = getEIP7702SupportedChains(messenger);\n\n  const filteredChainIds = chainIds7702.filter(\n    (chainId) => !chainIds || chainIds.includes(chainId),\n  );\n\n  const resultsRaw: (IsAtomicBatchSupportedResultEntry | undefined)[] =\n    await Promise.all(\n      filteredChainIds.map(async (chainId) => {\n        try {\n          const ethQuery = getEthQuery(chainId);\n\n          const { isSupported, delegationAddress } =\n            await isAccountUpgradedToEIP7702(\n              address,\n              chainId,\n              publicKey,\n              messenger,\n              ethQuery,\n            );\n\n          const upgradeContractAddress = getEIP7702UpgradeContractAddress(\n            chainId,\n            messenger,\n            publicKey,\n          );\n\n          return {\n            chainId,\n            delegationAddress,\n            isSupported,\n            upgradeContractAddress,\n          };\n        } catch (error) {\n          log('Error checking atomic batch support', chainId, error);\n          return undefined;\n        }\n      }),\n    );\n\n  const results = resultsRaw.filter(\n    (result): result is IsAtomicBatchSupportedResultEntry => Boolean(result),\n  );\n\n  log('Atomic batch supported results', results);\n\n  return results;\n}\n\n/**\n * Generate a transaction batch ID.\n *\n * @returns  A unique batch ID as a hexadecimal string.\n */\nfunction generateBatchId(): Hex {\n  const idString = v4();\n  const idBytes = new Uint8Array(parse(idString));\n  return bytesToHex(idBytes);\n}\n\n/**\n * Generate the metadata for a nested transaction.\n *\n * @param request - The batch request.\n * @param singleRequest - The request for a single transaction.\n * @param ethQuery - The EthQuery instance used to interact with the Ethereum blockchain.\n * @returns The metadata for the nested transaction.\n */\nasync function getNestedTransactionMeta(\n  request: TransactionBatchRequest,\n  singleRequest: TransactionBatchSingleRequest,\n  ethQuery: EthQuery,\n): Promise<NestedTransactionMetadata> {\n  const { from } = request;\n  const { params, type: requestedType } = singleRequest;\n\n  if (requestedType) {\n    return {\n      ...params,\n      type: requestedType,\n    };\n  }\n\n  const { type: determinedType } = await determineTransactionType(\n    { from, ...params },\n    ethQuery,\n  );\n\n  return {\n    ...params,\n    type: determinedType,\n  };\n}\n\n/**\n * Process a batch transaction using an EIP-7702 transaction.\n *\n * @param request - The request object including the user request and necessary callbacks.\n * @returns The batch result object including the batch ID.\n */\nasync function addTransactionBatchWith7702(\n  request: AddTransactionBatchRequest,\n): Promise<TransactionBatchResult> {\n  const {\n    addTransaction,\n    getChainId,\n    messenger,\n    publicKeyEIP7702,\n    request: userRequest,\n  } = request;\n\n  const {\n    batchId: batchIdOverride,\n    disableUpgrade,\n    from,\n    gasFeeToken,\n    gasLimit7702,\n    networkClientId,\n    origin,\n    overwriteUpgrade,\n    requestId,\n    requiredAssets,\n    requireApproval,\n    securityAlertId,\n    skipInitialGasEstimate,\n    transactions,\n    validateSecurity,\n  } = userRequest;\n\n  const chainId = getChainId(networkClientId);\n  const ethQuery = request.getEthQuery(networkClientId);\n  const isChainSupported = doesChainSupportEIP7702(chainId, messenger);\n\n  if (!isChainSupported) {\n    log('Chain does not support EIP-7702', chainId);\n    throw rpcErrors.internal('Chain does not support EIP-7702');\n  }\n\n  if (!publicKeyEIP7702) {\n    throw rpcErrors.internal(ERROR_MESSGE_PUBLIC_KEY);\n  }\n\n  let requiresUpgrade = false;\n\n  if (!disableUpgrade) {\n    const { delegationAddress, isSupported } = await isAccountUpgradedToEIP7702(\n      from,\n      chainId,\n      publicKeyEIP7702,\n      messenger,\n      ethQuery,\n    );\n\n    log('Account', { delegationAddress, isSupported });\n\n    if (!isSupported && delegationAddress && !overwriteUpgrade) {\n      log('Account upgraded to unsupported contract', from, delegationAddress);\n      throw rpcErrors.internal('Account upgraded to unsupported contract');\n    }\n\n    requiresUpgrade = !isSupported;\n\n    if (requiresUpgrade && delegationAddress) {\n      log('Overwriting authorization as already upgraded', {\n        current: delegationAddress,\n      });\n    }\n  }\n\n  const nestedTransactions = await Promise.all(\n    transactions.map((tx) =>\n      getNestedTransactionMeta(userRequest, tx, ethQuery),\n    ),\n  );\n\n  const batchParams = generateEIP7702BatchTransaction(from, nestedTransactions);\n\n  const txParams: TransactionParams = {\n    ...batchParams,\n    from,\n    gas: gasLimit7702,\n    maxFeePerGas: nestedTransactions[0]?.maxFeePerGas,\n    maxPriorityFeePerGas: nestedTransactions[0]?.maxPriorityFeePerGas,\n  };\n\n  if (requiresUpgrade) {\n    const upgradeContractAddress = getEIP7702UpgradeContractAddress(\n      chainId,\n      messenger,\n      publicKeyEIP7702,\n    );\n\n    if (!upgradeContractAddress) {\n      throw rpcErrors.internal(ERROR_MESSAGE_NO_UPGRADE_CONTRACT);\n    }\n\n    txParams.type = TransactionEnvelopeType.setCode;\n    txParams.authorizationList = [{ address: upgradeContractAddress }];\n  }\n\n  if (validateSecurity) {\n    const securityRequest: ValidateSecurityRequest = {\n      method: 'eth_sendTransaction',\n      params: [\n        {\n          ...txParams,\n          authorizationList: undefined,\n          type: TransactionEnvelopeType.feeMarket,\n        },\n      ],\n      delegationMock: txParams.authorizationList?.[0]?.address,\n      origin,\n    };\n\n    log('Security request', securityRequest);\n\n    validateSecurity(securityRequest, chainId).catch((error) => {\n      log('Security validation failed', error);\n    });\n  }\n\n  log('Adding batch transaction', txParams, networkClientId);\n\n  const batchId = batchIdOverride ?? generateBatchId();\n\n  const securityAlertResponse = securityAlertId\n    ? ({ securityAlertId } as SecurityAlertResponse)\n    : undefined;\n\n  const existingTransaction = transactions.find(\n    (tx) => tx.existingTransaction,\n  )?.existingTransaction;\n\n  if (existingTransaction) {\n    await convertTransactionToEIP7702({\n      batchId,\n      existingTransaction,\n      nestedTransactions,\n      request,\n      txParams,\n    });\n\n    return { batchId };\n  }\n\n  const { result } = await addTransaction(txParams, {\n    batchId,\n    gasFeeToken,\n    isGasFeeIncluded: userRequest.isGasFeeIncluded,\n    isGasFeeSponsored: userRequest.isGasFeeSponsored,\n    nestedTransactions,\n    networkClientId,\n    origin,\n    requestId,\n    requireApproval,\n    requiredAssets,\n    securityAlertResponse,\n    skipInitialGasEstimate,\n    type: TransactionType.batch,\n  });\n\n  const transactionHash = await result;\n\n  log('Batch transaction added', { batchId, transactionHash });\n\n  return {\n    batchId,\n  };\n}\n\n/**\n * Process a batch transaction using a publish batch hook.\n *\n * @param request - The request object including the user request and necessary callbacks.\n * @returns The batch result object including the batch ID.\n */\nasync function addTransactionBatchWithHook(\n  request: AddTransactionBatchRequest,\n): Promise<TransactionBatchResult> {\n  const {\n    messenger,\n    publishBatchHook: requestPublishBatchHook,\n    request: userRequest,\n    update,\n  } = request;\n\n  const {\n    batchId: batchIdOverride,\n    from,\n    networkClientId,\n    origin,\n    requireApproval,\n    transactions: requestedTransactions,\n  } = userRequest;\n\n  let resultCallbacks: AcceptResultCallbacks | undefined;\n  let isSequentialBatchHook = false;\n\n  log('Adding transaction batch using hook', userRequest);\n\n  const sequentialPublishBatchHook = new SequentialPublishBatchHook({\n    publishTransaction: request.publishTransaction,\n    getTransaction: request.getTransaction,\n    getEthQuery: request.getEthQuery,\n    getPendingTransactionTracker: request.getPendingTransactionTracker,\n  });\n\n  let { disable7702, disableSequential } = userRequest;\n  const { disableHook, useHook } = userRequest;\n\n  // use hook is a temporary alias for disable7702 and disableSequential\n  if (useHook) {\n    disable7702 = true;\n    disableSequential = true;\n  }\n\n  let publishBatchHook = null;\n\n  if (!disableHook && requestPublishBatchHook) {\n    publishBatchHook = requestPublishBatchHook;\n  } else if (!disableSequential) {\n    publishBatchHook = sequentialPublishBatchHook.getHook();\n    isSequentialBatchHook = true;\n  }\n\n  if (!publishBatchHook) {\n    log(`No supported batch methods found`, {\n      disable7702,\n      disableHook,\n      disableSequential,\n    });\n    throw rpcErrors.internal(`Can't process batch`);\n  }\n\n  let txBatchMeta: TransactionBatchMeta | undefined;\n  const batchId = batchIdOverride ?? generateBatchId();\n\n  const nestedTransactions = requestedTransactions.map((tx) => ({\n    ...tx,\n    origin,\n  }));\n\n  const transactionCount = nestedTransactions.length;\n  const collectHook = new CollectPublishHook(transactionCount);\n\n  try {\n    if (requireApproval) {\n      txBatchMeta = await prepareApprovalData({\n        batchId,\n        request,\n      });\n\n      resultCallbacks = (await requestApproval(txBatchMeta, messenger))\n        .resultCallbacks;\n    }\n\n    const publishHook = collectHook.getHook();\n    const hookTransactions: Omit<PublishBatchHookTransaction, 'signedTx'>[] =\n      [];\n\n    let index = 0;\n\n    for (const nestedTransaction of nestedTransactions) {\n      const hookTransaction = await processTransactionWithHook(\n        batchId,\n        nestedTransaction,\n        publishHook,\n        request,\n        txBatchMeta,\n        index,\n      );\n\n      hookTransactions.push(hookTransaction);\n      index += 1;\n    }\n\n    const { signedTransactions } = await collectHook.ready();\n\n    const transactions = hookTransactions.map((transaction, i) => ({\n      ...transaction,\n      signedTx: signedTransactions[i],\n    }));\n\n    const hookParams: PublishBatchHookRequest = {\n      from,\n      networkClientId,\n      transactions,\n    };\n\n    log('Calling publish batch hook', hookParams);\n\n    let result = await publishBatchHook(hookParams);\n\n    log('Publish batch hook result', result);\n\n    if (!result && !isSequentialBatchHook && !disableSequential) {\n      log('Fallback to sequential publish batch hook due to empty results');\n      const sequentialBatchHook = sequentialPublishBatchHook.getHook();\n      result = await sequentialBatchHook(hookParams);\n    }\n\n    if (!result?.results?.length) {\n      throw new Error('Publish batch hook did not return a result');\n    }\n\n    const transactionHashes = result.results.map(\n      ({ transactionHash }) => transactionHash,\n    );\n\n    collectHook.success(transactionHashes);\n    resultCallbacks?.success();\n\n    log('Completed batch transaction with hook', transactionHashes);\n\n    return {\n      batchId,\n    };\n  } catch (error) {\n    log('Publish batch hook failed', error);\n\n    collectHook.error(error);\n    resultCallbacks?.error(error as Error);\n\n    throw error;\n  } finally {\n    log('Cleaning up publish batch hook', batchId);\n    wipeTransactionBatchById(update, batchId);\n  }\n}\n\n/**\n * Process a single transaction with a publish batch hook.\n *\n * @param batchId - ID of the transaction batch.\n * @param nestedTransaction - The nested transaction request.\n * @param publishHook - The publish hook to use for each transaction.\n * @param request - The request object including the user request and necessary callbacks.\n * @param txBatchMeta - Metadata for the transaction batch.\n * @param index - The index of the transaction in the batch.\n * @returns The single transaction request to be processed by the publish batch hook.\n */\nasync function processTransactionWithHook(\n  batchId: Hex,\n  nestedTransaction: TransactionBatchSingleRequest,\n  publishHook: PublishHook,\n  request: AddTransactionBatchRequest,\n  txBatchMeta: TransactionBatchMeta | undefined,\n  index: number,\n): Promise<\n  Omit<PublishBatchHookTransaction, 'signedTx'> & { type?: TransactionType }\n> {\n  const { assetsFiatValues, existingTransaction, params, type } =\n    nestedTransaction;\n\n  const {\n    addTransaction,\n    getTransaction,\n    request: userRequest,\n    updateTransaction,\n  } = request;\n\n  const { from, networkClientId, origin } = userRequest;\n\n  if (existingTransaction) {\n    const { id, onPublish } = existingTransaction;\n    let transactionMeta = getTransaction(id);\n    const currentNonceHex = transactionMeta.txParams.nonce;\n    let { signedTransaction } = existingTransaction;\n\n    const currentNonceNum = currentNonceHex\n      ? parseInt(currentNonceHex, 16)\n      : undefined;\n\n    const newNonce =\n      index > 0 && currentNonceNum !== undefined\n        ? currentNonceNum + index\n        : undefined;\n\n    updateTransaction({ transactionId: id }, (_transactionMeta) => {\n      _transactionMeta.batchId = batchId;\n\n      if (newNonce) {\n        _transactionMeta.txParams.nonce = toHex(newNonce);\n      }\n    });\n\n    if (newNonce) {\n      const signResult = await updateTransactionSignature({\n        transactionId: id,\n        request,\n      });\n\n      signedTransaction = signResult.newSignature;\n      transactionMeta = signResult.transactionMeta;\n    }\n\n    publishHook(transactionMeta, signedTransaction)\n      .then(onPublish)\n      .catch(() => {\n        // Intentionally empty\n      });\n\n    log('Processed existing transaction with hook', {\n      id,\n      params,\n    });\n\n    return {\n      id,\n      params,\n    };\n  }\n\n  const transactionMetaForGasEstimates = {\n    ...txBatchMeta,\n    txParams: { ...params, from, gas: txBatchMeta?.gas ?? params.gas },\n  };\n\n  if (txBatchMeta) {\n    updateTransactionGasEstimates({\n      txMeta: transactionMetaForGasEstimates as TransactionMeta,\n      userFeeLevel: GasFeeEstimateLevel.Medium,\n    });\n  }\n\n  const { transactionMeta } = await addTransaction(\n    transactionMetaForGasEstimates.txParams,\n    {\n      assetsFiatValues,\n      batchId,\n      disableGasBuffer: true,\n      networkClientId,\n      origin,\n      publishHook,\n      requireApproval: false,\n      type,\n    },\n  );\n\n  const { id, txParams } = transactionMeta;\n  const data = txParams.data as Hex | undefined;\n  const gas = txParams.gas as Hex | undefined;\n  const maxFeePerGas = txParams.maxFeePerGas as Hex | undefined;\n  const maxPriorityFeePerGas = txParams.maxPriorityFeePerGas as Hex | undefined;\n  const to = txParams.to as Hex | undefined;\n  const value = txParams.value as Hex | undefined;\n\n  const newParams: BatchTransactionParams = {\n    data,\n    gas,\n    maxFeePerGas,\n    maxPriorityFeePerGas,\n    to,\n    value,\n  };\n\n  log('Processed new transaction with hook', {\n    id,\n    params: newParams,\n    type,\n  });\n\n  return {\n    id,\n    params: newParams,\n    type,\n  };\n}\n\n/**\n * Requests approval for a transaction batch by interacting with the ApprovalController.\n *\n * @param txBatchMeta - Metadata for the transaction batch, including its ID and origin.\n * @param messenger - The messenger instance used to communicate with the ApprovalController.\n * @returns A promise that resolves to the result of adding the approval request.\n */\nasync function requestApproval(\n  txBatchMeta: TransactionBatchMeta,\n  messenger: TransactionControllerMessenger,\n): Promise<AddResult> {\n  const id = String(txBatchMeta.id);\n  const { origin } = txBatchMeta;\n  const type = ApprovalType.TransactionBatch;\n  const requestData = { txBatchId: id };\n\n  log('Requesting approval for transaction batch', id);\n  return (await messenger.call(\n    'ApprovalController:addRequest',\n    {\n      id,\n      origin: origin ?? ORIGIN_METAMASK,\n      requestData,\n      expectsResult: true,\n      type,\n    },\n    true,\n  )) as Promise<AddResult>;\n}\n\n/**\n * Adds batch metadata to the transaction controller state.\n *\n * @param transactionBatchMeta - The transaction batch metadata to be added.\n * @param update - The update function to modify the transaction controller state.\n */\nfunction addBatchMetadata(\n  transactionBatchMeta: TransactionBatchMeta,\n  update: UpdateStateCallback,\n): void {\n  update((state) => {\n    state.transactionBatches = [\n      ...state.transactionBatches,\n      transactionBatchMeta,\n    ];\n  });\n}\n\n/**\n * Wipes a specific transaction batch from the transaction controller state by its ID.\n *\n * @param update - The update function to modify the transaction controller state.\n * @param id - The ID of the transaction batch to be wiped.\n */\nfunction wipeTransactionBatchById(\n  update: UpdateStateCallback,\n  id: string,\n): void {\n  update((state) => {\n    state.transactionBatches = state.transactionBatches.filter(\n      (batch) => batch.id !== id,\n    );\n  });\n}\n\n/**\n * Create a new batch metadata object.\n *\n * @param transactionBatchMeta - The transaction batch metadata object to be created.\n * @returns A new TransactionBatchMeta object.\n */\nfunction newBatchMetadata(\n  transactionBatchMeta: Omit<TransactionBatchMeta, 'status'>,\n): TransactionBatchMeta {\n  return {\n    ...transactionBatchMeta,\n    status: TransactionStatus.unapproved,\n  };\n}\n\n/**\n * Prepares the approval data for a transaction batch.\n *\n * @param options - The options object containing necessary parameters.\n * @param options.batchId - The batch ID for the transaction batch.\n * @param options.request - The request object including the user request and necessary callbacks.\n * @returns The prepared transaction batch metadata.\n */\nasync function prepareApprovalData({\n  batchId,\n  request,\n}: {\n  batchId: Hex;\n  request: AddTransactionBatchRequest;\n}): Promise<TransactionBatchMeta> {\n  const {\n    messenger,\n    request: userRequest,\n    isSimulationEnabled,\n    getChainId,\n    getEthQuery,\n    getGasFeeEstimates,\n    getSimulationConfig,\n    update,\n  } = request;\n\n  const {\n    from,\n    origin,\n    networkClientId,\n    transactions: nestedTransactions,\n  } = userRequest;\n\n  const ethQuery = getEthQuery(networkClientId);\n\n  if (!isSimulationEnabled()) {\n    throw new Error(\n      'Cannot create transaction batch as simulation not supported',\n    );\n  }\n  log('Preparing approval data for batch');\n  const chainId = getChainId(networkClientId);\n\n  const { totalGasLimit: gasLimit } = await simulateGasBatch({\n    chainId,\n    from,\n    getSimulationConfig,\n    transactions: nestedTransactions,\n  });\n\n  const txBatchMeta: TransactionBatchMeta = newBatchMetadata({\n    chainId,\n    from,\n    gas: gasLimit,\n    id: batchId,\n    networkClientId,\n    origin,\n    transactions: nestedTransactions,\n  });\n\n  const defaultGasFeeFlow = new DefaultGasFeeFlow();\n  const gasFeeControllerData = await getGasFeeEstimates({\n    networkClientId,\n  });\n\n  const gasFeeResponse = await defaultGasFeeFlow.getGasFees({\n    ethQuery,\n    gasFeeControllerData,\n    messenger,\n    transactionMeta: {\n      ...txBatchMeta,\n      txParams: {\n        from,\n        gas: gasLimit,\n      },\n      time: Date.now(),\n    },\n  });\n\n  txBatchMeta.gasFeeEstimates = gasFeeResponse.estimates;\n\n  log('Saving transaction batch metadata', txBatchMeta);\n  addBatchMetadata(txBatchMeta, update);\n\n  return txBatchMeta;\n}\n\n/**\n * Convert an existing transaction to an EIP-7702 batch transaction.\n *\n * @param options - Options object.\n * @param options.batchId - Batch ID for the transaction batch.\n * @param options.existingTransaction - Existing transaction to be converted.\n * @param options.nestedTransactions - Nested transactions to be included in the batch.\n * @param options.request - Request object including the user request and necessary callbacks.\n * @param options.txParams - Transaction parameters for the new EIP-7702 transaction.\n * @param options.existingTransaction.id - ID of the existing transaction.\n * @param options.existingTransaction.onPublish - Callback for when the transaction is published.\n * @returns Promise that resolves after the publish callback has been invoked.\n */\nasync function convertTransactionToEIP7702({\n  batchId,\n  existingTransaction,\n  nestedTransactions,\n  request,\n  txParams,\n}: {\n  batchId: Hex;\n  request: AddTransactionBatchRequest;\n  existingTransaction: {\n    id: string;\n    onPublish?: ({\n      transactionHash,\n      newSignature,\n    }: {\n      transactionHash: string | undefined;\n      newSignature: Hex;\n    }) => void;\n  };\n  nestedTransactions: NestedTransactionMetadata[];\n  txParams: TransactionParams;\n}): Promise<void> {\n  const { getTransaction, estimateGas, updateTransaction } = request;\n  const existingTransactionMeta = getTransaction(existingTransaction.id);\n\n  if (!existingTransactionMeta) {\n    throw new Error('Existing transaction not found');\n  }\n\n  log('Converting existing transaction to 7702', { batchId, txParams });\n\n  const { networkClientId } = existingTransactionMeta;\n  const newGasResult = await estimateGas(txParams, networkClientId);\n\n  log('Estimated gas for converted EIP-7702 transaction', newGasResult);\n\n  updateTransaction(\n    { transactionId: existingTransactionMeta.id },\n    (transactionMeta) => {\n      transactionMeta.batchId = batchId;\n      transactionMeta.nestedTransactions = nestedTransactions;\n      transactionMeta.txParams = txParams;\n      transactionMeta.txParams.gas = newGasResult.gas;\n      transactionMeta.txParams.gasLimit = newGasResult.gas;\n      transactionMeta.txParams.maxFeePerGas =\n        existingTransactionMeta.txParams.maxFeePerGas;\n      transactionMeta.txParams.maxPriorityFeePerGas =\n        existingTransactionMeta.txParams.maxPriorityFeePerGas;\n      transactionMeta.txParams.nonce = existingTransactionMeta.txParams.nonce;\n      transactionMeta.txParams.type ??= TransactionEnvelopeType.feeMarket;\n    },\n  );\n\n  const { newSignature } = await updateTransactionSignature({\n    request,\n    transactionId: existingTransactionMeta.id,\n  });\n\n  existingTransaction.onPublish?.({\n    transactionHash: undefined,\n    newSignature,\n  });\n\n  log('Transaction updated to EIP-7702', { batchId, txParams, newSignature });\n}\n\n/**\n * Update the signature of an existing transaction.\n *\n * @param options - Options object.\n * @param options.request - The request object including the user request and necessary callbacks.\n * @param options.transactionId - The ID of the transaction to update.\n * @returns An object containing the new signature and updated transaction metadata.\n */\nasync function updateTransactionSignature({\n  request,\n  transactionId,\n}: {\n  request: AddTransactionBatchRequest;\n  transactionId: string;\n}): Promise<{\n  newSignature: Hex;\n  transactionMeta: TransactionMeta;\n}> {\n  const { getTransaction, signTransaction } = request;\n  const metadataToSign = getTransaction(transactionId);\n\n  log('Re-signing existing transaction', {\n    transactionId,\n    txParams: metadataToSign.txParams,\n  });\n\n  const newSignature = (await signTransaction(metadataToSign)) as\n    | Hex\n    | undefined;\n\n  if (!newSignature) {\n    throw new Error('Failed to re-sign transaction');\n  }\n\n  const transactionMeta = getTransaction(transactionId);\n\n  log('New signature', newSignature);\n\n  return { newSignature, transactionMeta };\n}\n"]}
+{"version":3,"file":"batch.mjs","sourceRoot":"","sources":["../../src/utils/batch.ts"],"names":[],"mappings":"AAIA,OAAO,EACL,YAAY,EACZ,eAAe,EACf,KAAK,EACN,mCAAmC;AAMpC,OAAO,EAAE,YAAY,EAAE,SAAS,EAAE,6BAA6B;AAE/D,OAAO,EAAE,UAAU,EAAE,kBAAkB,EAAE,wBAAwB;AAEjE,OAAO,EAAE,KAAK,EAAE,EAAE,EAAE,aAAa;AAEjC,OAAO,EACL,uBAAuB,EACvB,uBAAuB,EACvB,+BAA+B,EAC/B,0BAA0B,EAC3B,sBAAkB;AACnB,OAAO,EACL,iBAAiB,EACjB,yBAAyB,EACzB,gCAAgC,EACjC,4BAAwB;AACzB,OAAO,EAAE,gBAAgB,EAAE,kBAAc;AACzC,OAAO,EAAE,UAAU,EAAE,uBAAmB;AACxC,OAAO,EAAE,wBAAwB,EAAE,+BAA2B;AAC9D,OAAO,EAAE,oBAAoB,EAAE,yBAAqB;AACpD,OAAO,EAAE,mBAAmB,EAAE,iBAAiB,EAAE,qBAAW;AAU5D,OAAO,EAAE,iBAAiB,EAAE,2CAAuC;AACnE,OAAO,EAAE,6BAA6B,EAAE,oCAAgC;AAExE,OAAO,EAAE,kBAAkB,EAAE,wCAAoC;AACjE,OAAO,EAAE,0BAA0B,EAAE,gDAA4C;AACjF,OAAO,EAAE,aAAa,EAAE,sBAAkB;AAC1C,OAAO,EAAE,uBAAuB,EAAE,eAAe,EAAE,qBAAiB;AA0DpE,MAAM,GAAG,GAAG,kBAAkB,CAAC,aAAa,EAAE,OAAO,CAAC,CAAC;AAEvD,MAAM,CAAC,MAAM,iCAAiC,GAC5C,oCAAoC,CAAC;AAEvC;;;;;GAKG;AACH,MAAM,CAAC,KAAK,UAAU,mBAAmB,CACvC,OAAmC;IAEnC,MAAM,EACJ,mBAAmB,EACnB,SAAS,EACT,OAAO,EAAE,uBAAuB,GACjC,GAAG,OAAO,CAAC;IACZ,MAAM,SAAS,GAAG,iBAAiB,CAAC,SAAS,CAAC,CAAC;IAE/C,oBAAoB,CAAC;QACnB,gBAAgB,EAAE,mBAAmB,EAAE;QACvC,OAAO,EAAE,uBAAuB;QAChC,SAAS;KACV,CAAC,CAAC;IAEH,GAAG,CAAC,QAAQ,EAAE,uBAAuB,CAAC,CAAC;IAEvC,IAAI,CAAC,uBAAuB,CAAC,WAAW,EAAE,CAAC;QACzC,IAAI,CAAC;YACH,OAAO,MAAM,2BAA2B,CAAC,OAAO,CAAC,CAAC;QACpD,CAAC;QAAC,OAAO,KAAc,EAAE,CAAC;YACxB,MAAM,0BAA0B,GAC9B,KAAK,YAAY,YAAY;gBAC7B,KAAK,CAAC,OAAO,KAAK,iCAAiC,CAAC;YAEtD,IAAI,CAAC,0BAA0B,EAAE,CAAC;gBAChC,MAAM,KAAK,CAAC;YACd,CAAC;QACH,CAAC;IACH,CAAC;IAED,OAAO,MAAM,2BAA2B,CAAC,OAAO,CAAC,CAAC;AACpD,CAAC;AAED;;;;;GAKG;AACH,MAAM,CAAC,KAAK,UAAU,sBAAsB,CAC1C,OAA8C;IAE9C,MAAM,EAAE,OAAO,EAAE,QAAQ,EAAE,SAAS,EAAE,gBAAgB,EAAE,SAAS,EAAE,GAAG,OAAO,CAAC;IAE9E,IAAI,CAAC,SAAS,EAAE,CAAC;QACf,MAAM,SAAS,CAAC,QAAQ,CAAC,uBAAuB,CAAC,CAAC;IACpD,CAAC;IAED,MAAM,YAAY,GAAG,yBAAyB,CAAC,SAAS,CAAC,CAAC;IAE1D,MAAM,gBAAgB,GAAG,YAAY,CAAC,MAAM,CAC1C,CAAC,OAAO,EAAE,EAAE,CAAC,CAAC,QAAQ,IAAI,QAAQ,CAAC,QAAQ,CAAC,OAAO,CAAC,CACrD,CAAC;IAEF,MAAM,UAAU,GACd,MAAM,OAAO,CAAC,GAAG,CACf,gBAAgB,CAAC,GAAG,CAAC,KAAK,EAAE,OAAO,EAAE,EAAE;QACrC,IAAI,CAAC;YACH,MAAM,eAAe,GAAG,SAAS,CAAC,IAAI,CACpC,gDAAgD,EAChD,OAAO,CACR,CAAC;YAEF,MAAM,EAAE,WAAW,EAAE,iBAAiB,EAAE,GACtC,MAAM,0BAA0B,CAC9B,OAAO,EACP,OAAO,EACP,SAAS,EACT,SAAS,EACT,eAAe,CAChB,CAAC;YAEJ,MAAM,sBAAsB,GAAG,gCAAgC,CAC7D,OAAO,EACP,SAAS,EACT,SAAS,CACV,CAAC;YAEF,OAAO;gBACL,OAAO;gBACP,iBAAiB;gBACjB,WAAW;gBACX,sBAAsB;aACvB,CAAC;QACJ,CAAC;QAAC,OAAO,KAAK,EAAE,CAAC;YACf,GAAG,CAAC,qCAAqC,EAAE,OAAO,EAAE,KAAK,CAAC,CAAC;YAC3D,OAAO,SAAS,CAAC;QACnB,CAAC;IACH,CAAC,CAAC,CACH,CAAC;IAEJ,MAAM,OAAO,GAAG,UAAU,CAAC,MAAM,CAC/B,CAAC,MAAM,EAA+C,EAAE,CAAC,OAAO,CAAC,MAAM,CAAC,CACzE,CAAC;IAEF,GAAG,CAAC,gCAAgC,EAAE,OAAO,CAAC,CAAC;IAE/C,OAAO,OAAO,CAAC;AACjB,CAAC;AAED;;;;GAIG;AACH,SAAS,eAAe;IACtB,MAAM,QAAQ,GAAG,EAAE,EAAE,CAAC;IACtB,MAAM,OAAO,GAAG,IAAI,UAAU,CAAC,KAAK,CAAC,QAAQ,CAAC,CAAC,CAAC;IAChD,OAAO,UAAU,CAAC,OAAO,CAAC,CAAC;AAC7B,CAAC;AAED;;;;;;;;GAQG;AACH,KAAK,UAAU,wBAAwB,CACrC,OAAgC,EAChC,aAA4C,EAC5C,SAAyC,EACzC,eAAgC;IAEhC,MAAM,EAAE,IAAI,EAAE,GAAG,OAAO,CAAC;IACzB,MAAM,EAAE,MAAM,EAAE,IAAI,EAAE,aAAa,EAAE,GAAG,aAAa,CAAC;IAEtD,IAAI,aAAa,EAAE,CAAC;QAClB,OAAO;YACL,GAAG,MAAM;YACT,IAAI,EAAE,aAAa;SACpB,CAAC;IACJ,CAAC;IAED,MAAM,EAAE,IAAI,EAAE,cAAc,EAAE,GAAG,MAAM,wBAAwB,CAC7D,EAAE,IAAI,EAAE,GAAG,MAAM,EAAE,EACnB,EAAE,SAAS,EAAE,eAAe,EAAE,CAC/B,CAAC;IAEF,OAAO;QACL,GAAG,MAAM;QACT,IAAI,EAAE,cAAc;KACrB,CAAC;AACJ,CAAC;AAED;;;;;GAKG;AACH,KAAK,UAAU,2BAA2B,CACxC,OAAmC;IAEnC,MAAM,EACJ,cAAc,EACd,SAAS,EACT,gBAAgB,EAChB,OAAO,EAAE,WAAW,GACrB,GAAG,OAAO,CAAC;IAEZ,MAAM,EACJ,OAAO,EAAE,eAAe,EACxB,cAAc,EACd,IAAI,EACJ,WAAW,EACX,YAAY,EACZ,eAAe,EACf,MAAM,EACN,gBAAgB,EAChB,SAAS,EACT,cAAc,EACd,eAAe,EACf,eAAe,EACf,sBAAsB,EACtB,YAAY,EACZ,wBAAwB,EACxB,gBAAgB,EAChB,iBAAiB,EACjB,gBAAgB,GACjB,GAAG,WAAW,CAAC;IAEhB,MAAM,OAAO,GAAG,UAAU,CAAC,EAAE,SAAS,EAAE,eAAe,EAAE,CAAC,CAAC;IAC3D,MAAM,gBAAgB,GAAG,uBAAuB,CAAC,OAAO,EAAE,SAAS,CAAC,CAAC;IAErE,IAAI,CAAC,gBAAgB,EAAE,CAAC;QACtB,GAAG,CAAC,iCAAiC,EAAE,OAAO,CAAC,CAAC;QAChD,MAAM,SAAS,CAAC,QAAQ,CAAC,iCAAiC,CAAC,CAAC;IAC9D,CAAC;IAED,IAAI,CAAC,gBAAgB,EAAE,CAAC;QACtB,MAAM,SAAS,CAAC,QAAQ,CAAC,uBAAuB,CAAC,CAAC;IACpD,CAAC;IAED,IAAI,eAAe,GAAG,KAAK,CAAC;IAE5B,IAAI,CAAC,cAAc,EAAE,CAAC;QACpB,MAAM,EAAE,iBAAiB,EAAE,WAAW,EAAE,GAAG,MAAM,0BAA0B,CACzE,IAAI,EACJ,OAAO,EACP,gBAAgB,EAChB,SAAS,EACT,eAAe,CAChB,CAAC;QAEF,GAAG,CAAC,SAAS,EAAE,EAAE,iBAAiB,EAAE,WAAW,EAAE,CAAC,CAAC;QAEnD,IAAI,CAAC,WAAW,IAAI,iBAAiB,IAAI,CAAC,gBAAgB,EAAE,CAAC;YAC3D,GAAG,CAAC,0CAA0C,EAAE,IAAI,EAAE,iBAAiB,CAAC,CAAC;YACzE,MAAM,SAAS,CAAC,QAAQ,CAAC,0CAA0C,CAAC,CAAC;QACvE,CAAC;QAED,eAAe,GAAG,CAAC,WAAW,CAAC;QAE/B,IAAI,eAAe,IAAI,iBAAiB,EAAE,CAAC;YACzC,GAAG,CAAC,+CAA+C,EAAE;gBACnD,OAAO,EAAE,iBAAiB;aAC3B,CAAC,CAAC;QACL,CAAC;IACH,CAAC;IAED,MAAM,kBAAkB,GAAG,MAAM,OAAO,CAAC,GAAG,CAC1C,YAAY,CAAC,GAAG,CAAC,CAAC,EAAE,EAAE,EAAE,CACtB,wBAAwB,CAAC,WAAW,EAAE,EAAE,EAAE,SAAS,EAAE,eAAe,CAAC,CACtE,CACF,CAAC;IAEF,MAAM,WAAW,GAAG,+BAA+B,CAAC,IAAI,EAAE,kBAAkB,CAAC,CAAC;IAE9E,MAAM,QAAQ,GAAsB;QAClC,GAAG,WAAW;QACd,IAAI;QACJ,GAAG,EAAE,YAAY;QACjB,YAAY,EAAE,kBAAkB,CAAC,CAAC,CAAC,EAAE,YAAY;QACjD,oBAAoB,EAAE,kBAAkB,CAAC,CAAC,CAAC,EAAE,oBAAoB;KAClE,CAAC;IAEF,IAAI,eAAe,EAAE,CAAC;QACpB,MAAM,sBAAsB,GAAG,gCAAgC,CAC7D,OAAO,EACP,SAAS,EACT,gBAAgB,CACjB,CAAC;QAEF,IAAI,CAAC,sBAAsB,EAAE,CAAC;YAC5B,MAAM,SAAS,CAAC,QAAQ,CAAC,iCAAiC,CAAC,CAAC;QAC9D,CAAC;QAED,QAAQ,CAAC,IAAI,GAAG,uBAAuB,CAAC,OAAO,CAAC;QAChD,QAAQ,CAAC,iBAAiB,GAAG,CAAC,EAAE,OAAO,EAAE,sBAAsB,EAAE,CAAC,CAAC;IACrE,CAAC;IAED,IAAI,gBAAgB,EAAE,CAAC;QACrB,MAAM,eAAe,GAA4B;YAC/C,MAAM,EAAE,qBAAqB;YAC7B,MAAM,EAAE;gBACN;oBACE,GAAG,QAAQ;oBACX,iBAAiB,EAAE,SAAS;oBAC5B,IAAI,EAAE,uBAAuB,CAAC,SAAS;iBACxC;aACF;YACD,cAAc,EAAE,QAAQ,CAAC,iBAAiB,EAAE,CAAC,CAAC,CAAC,EAAE,OAAO;YACxD,MAAM;SACP,CAAC;QAEF,GAAG,CAAC,kBAAkB,EAAE,eAAe,CAAC,CAAC;QAEzC,gBAAgB,CAAC,eAAe,EAAE,OAAO,CAAC,CAAC,KAAK,CAAC,CAAC,KAAK,EAAE,EAAE;YACzD,GAAG,CAAC,4BAA4B,EAAE,KAAK,CAAC,CAAC;QAC3C,CAAC,CAAC,CAAC;IACL,CAAC;IAED,GAAG,CAAC,0BAA0B,EAAE,QAAQ,EAAE,eAAe,CAAC,CAAC;IAE3D,MAAM,OAAO,GAAG,eAAe,IAAI,eAAe,EAAE,CAAC;IAErD,MAAM,qBAAqB,GAAG,eAAe;QAC3C,CAAC,CAAE,EAAE,eAAe,EAA4B;QAChD,CAAC,CAAC,SAAS,CAAC;IAEd,MAAM,mBAAmB,GAAG,YAAY,CAAC,IAAI,CAC3C,CAAC,EAAE,EAAE,EAAE,CAAC,EAAE,CAAC,mBAAmB,CAC/B,EAAE,mBAAmB,CAAC;IAEvB,IAAI,mBAAmB,EAAE,CAAC;QACxB,MAAM,2BAA2B,CAAC;YAChC,OAAO;YACP,mBAAmB;YACnB,kBAAkB;YAClB,OAAO;YACP,QAAQ;SACT,CAAC,CAAC;QAEH,OAAO,EAAE,OAAO,EAAE,CAAC;IACrB,CAAC;IAED,MAAM,EAAE,MAAM,EAAE,GAAG,MAAM,cAAc,CAAC,QAAQ,EAAE;QAChD,OAAO;QACP,WAAW;QACX,wBAAwB;QACxB,gBAAgB;QAChB,iBAAiB;QACjB,kBAAkB;QAClB,eAAe;QACf,MAAM;QACN,SAAS;QACT,eAAe;QACf,cAAc;QACd,qBAAqB;QACrB,sBAAsB;QACtB,IAAI,EAAE,eAAe,CAAC,KAAK;KAC5B,CAAC,CAAC;IAEH,MAAM,eAAe,GAAG,MAAM,MAAM,CAAC;IAErC,GAAG,CAAC,yBAAyB,EAAE,EAAE,OAAO,EAAE,eAAe,EAAE,CAAC,CAAC;IAE7D,OAAO;QACL,OAAO;KACR,CAAC;AACJ,CAAC;AAED;;;;;GAKG;AACH,KAAK,UAAU,2BAA2B,CACxC,OAAmC;IAEnC,MAAM,EACJ,SAAS,EACT,gBAAgB,EAAE,uBAAuB,EACzC,OAAO,EAAE,WAAW,EACpB,MAAM,GACP,GAAG,OAAO,CAAC;IAEZ,MAAM,EACJ,OAAO,EAAE,eAAe,EACxB,IAAI,EACJ,eAAe,EACf,MAAM,EACN,eAAe,EACf,YAAY,EAAE,qBAAqB,GACpC,GAAG,WAAW,CAAC;IAEhB,IAAI,eAAkD,CAAC;IACvD,IAAI,qBAAqB,GAAG,KAAK,CAAC;IAElC,GAAG,CAAC,qCAAqC,EAAE,WAAW,CAAC,CAAC;IAExD,MAAM,0BAA0B,GAAG,IAAI,0BAA0B,CAAC;QAChE,kBAAkB,EAAE,OAAO,CAAC,kBAAkB;QAC9C,cAAc,EAAE,OAAO,CAAC,cAAc;QACtC,4BAA4B,EAAE,OAAO,CAAC,4BAA4B;KACnE,CAAC,CAAC;IAEH,IAAI,EAAE,WAAW,EAAE,iBAAiB,EAAE,GAAG,WAAW,CAAC;IACrD,MAAM,EAAE,WAAW,EAAE,OAAO,EAAE,GAAG,WAAW,CAAC;IAE7C,sEAAsE;IACtE,IAAI,OAAO,EAAE,CAAC;QACZ,WAAW,GAAG,IAAI,CAAC;QACnB,iBAAiB,GAAG,IAAI,CAAC;IAC3B,CAAC;IAED,IAAI,gBAAgB,GAAG,IAAI,CAAC;IAE5B,IAAI,CAAC,WAAW,IAAI,uBAAuB,EAAE,CAAC;QAC5C,gBAAgB,GAAG,uBAAuB,CAAC;IAC7C,CAAC;SAAM,IAAI,CAAC,iBAAiB,EAAE,CAAC;QAC9B,gBAAgB,GAAG,0BAA0B,CAAC,OAAO,EAAE,CAAC;QACxD,qBAAqB,GAAG,IAAI,CAAC;IAC/B,CAAC;IAED,IAAI,CAAC,gBAAgB,EAAE,CAAC;QACtB,GAAG,CAAC,kCAAkC,EAAE;YACtC,WAAW;YACX,WAAW;YACX,iBAAiB;SAClB,CAAC,CAAC;QACH,MAAM,SAAS,CAAC,QAAQ,CAAC,qBAAqB,CAAC,CAAC;IAClD,CAAC;IAED,IAAI,WAA6C,CAAC;IAClD,MAAM,OAAO,GAAG,eAAe,IAAI,eAAe,EAAE,CAAC;IAErD,MAAM,kBAAkB,GAAG,qBAAqB,CAAC,GAAG,CAAC,CAAC,EAAE,EAAE,EAAE,CAAC,CAAC;QAC5D,GAAG,EAAE;QACL,MAAM;KACP,CAAC,CAAC,CAAC;IAEJ,MAAM,gBAAgB,GAAG,kBAAkB,CAAC,MAAM,CAAC;IACnD,MAAM,WAAW,GAAG,IAAI,kBAAkB,CAAC,gBAAgB,CAAC,CAAC;IAE7D,IAAI,CAAC;QACH,IAAI,eAAe,EAAE,CAAC;YACpB,WAAW,GAAG,MAAM,mBAAmB,CAAC;gBACtC,OAAO;gBACP,OAAO;aACR,CAAC,CAAC;YAEH,eAAe,GAAG,CAAC,MAAM,eAAe,CAAC,WAAW,EAAE,SAAS,CAAC,CAAC;iBAC9D,eAAe,CAAC;QACrB,CAAC;QAED,MAAM,WAAW,GAAG,WAAW,CAAC,OAAO,EAAE,CAAC;QAC1C,MAAM,gBAAgB,GACpB,EAAE,CAAC;QAEL,IAAI,KAAK,GAAG,CAAC,CAAC;QAEd,KAAK,MAAM,iBAAiB,IAAI,kBAAkB,EAAE,CAAC;YACnD,MAAM,eAAe,GAAG,MAAM,0BAA0B,CACtD,OAAO,EACP,iBAAiB,EACjB,WAAW,EACX,OAAO,EACP,WAAW,EACX,KAAK,CACN,CAAC;YAEF,gBAAgB,CAAC,IAAI,CAAC,eAAe,CAAC,CAAC;YACvC,KAAK,IAAI,CAAC,CAAC;QACb,CAAC;QAED,MAAM,EAAE,kBAAkB,EAAE,GAAG,MAAM,WAAW,CAAC,KAAK,EAAE,CAAC;QAEzD,MAAM,YAAY,GAAG,gBAAgB,CAAC,GAAG,CAAC,CAAC,WAAW,EAAE,CAAC,EAAE,EAAE,CAAC,CAAC;YAC7D,GAAG,WAAW;YACd,QAAQ,EAAE,kBAAkB,CAAC,CAAC,CAAC;SAChC,CAAC,CAAC,CAAC;QAEJ,MAAM,UAAU,GAA4B;YAC1C,IAAI;YACJ,eAAe;YACf,YAAY;SACb,CAAC;QAEF,GAAG,CAAC,4BAA4B,EAAE,UAAU,CAAC,CAAC;QAE9C,IAAI,MAAM,GAAG,MAAM,gBAAgB,CAAC,UAAU,CAAC,CAAC;QAEhD,GAAG,CAAC,2BAA2B,EAAE,MAAM,CAAC,CAAC;QAEzC,IAAI,CAAC,MAAM,IAAI,CAAC,qBAAqB,IAAI,CAAC,iBAAiB,EAAE,CAAC;YAC5D,GAAG,CAAC,gEAAgE,CAAC,CAAC;YACtE,MAAM,mBAAmB,GAAG,0BAA0B,CAAC,OAAO,EAAE,CAAC;YACjE,MAAM,GAAG,MAAM,mBAAmB,CAAC,UAAU,CAAC,CAAC;QACjD,CAAC;QAED,IAAI,CAAC,MAAM,EAAE,OAAO,EAAE,MAAM,EAAE,CAAC;YAC7B,MAAM,IAAI,KAAK,CAAC,4CAA4C,CAAC,CAAC;QAChE,CAAC;QAED,MAAM,iBAAiB,GAAG,MAAM,CAAC,OAAO,CAAC,GAAG,CAC1C,CAAC,EAAE,eAAe,EAAE,EAAE,EAAE,CAAC,eAAe,CACzC,CAAC;QAEF,WAAW,CAAC,OAAO,CAAC,iBAAiB,CAAC,CAAC;QACvC,eAAe,EAAE,OAAO,EAAE,CAAC;QAE3B,GAAG,CAAC,uCAAuC,EAAE,iBAAiB,CAAC,CAAC;QAEhE,OAAO;YACL,OAAO;SACR,CAAC;IACJ,CAAC;IAAC,OAAO,KAAK,EAAE,CAAC;QACf,GAAG,CAAC,2BAA2B,EAAE,KAAK,CAAC,CAAC;QAExC,WAAW,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC;QACzB,eAAe,EAAE,KAAK,CAAC,KAAc,CAAC,CAAC;QAEvC,MAAM,KAAK,CAAC;IACd,CAAC;YAAS,CAAC;QACT,GAAG,CAAC,gCAAgC,EAAE,OAAO,CAAC,CAAC;QAC/C,wBAAwB,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;IAC5C,CAAC;AACH,CAAC;AAED;;;;;;;;;;GAUG;AACH,KAAK,UAAU,0BAA0B,CACvC,OAAY,EACZ,iBAAgD,EAChD,WAAwB,EACxB,OAAmC,EACnC,WAA6C,EAC7C,KAAa;IAIb,MAAM,EAAE,gBAAgB,EAAE,mBAAmB,EAAE,MAAM,EAAE,IAAI,EAAE,GAC3D,iBAAiB,CAAC;IAEpB,MAAM,EACJ,cAAc,EACd,cAAc,EACd,OAAO,EAAE,WAAW,EACpB,iBAAiB,GAClB,GAAG,OAAO,CAAC;IAEZ,MAAM,EAAE,IAAI,EAAE,eAAe,EAAE,MAAM,EAAE,GAAG,WAAW,CAAC;IAEtD,IAAI,mBAAmB,EAAE,CAAC;QACxB,MAAM,EAAE,EAAE,EAAE,SAAS,EAAE,GAAG,mBAAmB,CAAC;QAC9C,IAAI,eAAe,GAAG,cAAc,CAAC,EAAE,CAAC,CAAC;QACzC,MAAM,eAAe,GAAG,eAAe,CAAC,QAAQ,CAAC,KAAK,CAAC;QACvD,IAAI,EAAE,iBAAiB,EAAE,GAAG,mBAAmB,CAAC;QAEhD,MAAM,eAAe,GAAG,eAAe;YACrC,CAAC,CAAC,QAAQ,CAAC,eAAe,EAAE,EAAE,CAAC;YAC/B,CAAC,CAAC,SAAS,CAAC;QAEd,MAAM,QAAQ,GACZ,KAAK,GAAG,CAAC,IAAI,eAAe,KAAK,SAAS;YACxC,CAAC,CAAC,eAAe,GAAG,KAAK;YACzB,CAAC,CAAC,SAAS,CAAC;QAEhB,iBAAiB,CAAC,EAAE,aAAa,EAAE,EAAE,EAAE,EAAE,CAAC,gBAAgB,EAAE,EAAE;YAC5D,gBAAgB,CAAC,OAAO,GAAG,OAAO,CAAC;YAEnC,IAAI,QAAQ,EAAE,CAAC;gBACb,gBAAgB,CAAC,QAAQ,CAAC,KAAK,GAAG,KAAK,CAAC,QAAQ,CAAC,CAAC;YACpD,CAAC;QACH,CAAC,CAAC,CAAC;QAEH,IAAI,QAAQ,EAAE,CAAC;YACb,MAAM,UAAU,GAAG,MAAM,0BAA0B,CAAC;gBAClD,aAAa,EAAE,EAAE;gBACjB,OAAO;aACR,CAAC,CAAC;YAEH,iBAAiB,GAAG,UAAU,CAAC,YAAY,CAAC;YAC5C,eAAe,GAAG,UAAU,CAAC,eAAe,CAAC;QAC/C,CAAC;QAED,WAAW,CAAC,eAAe,EAAE,iBAAiB,CAAC;aAC5C,IAAI,CAAC,SAAS,CAAC;aACf,KAAK,CAAC,GAAG,EAAE;YACV,sBAAsB;QACxB,CAAC,CAAC,CAAC;QAEL,GAAG,CAAC,0CAA0C,EAAE;YAC9C,EAAE;YACF,MAAM;SACP,CAAC,CAAC;QAEH,OAAO;YACL,EAAE;YACF,MAAM;SACP,CAAC;IACJ,CAAC;IAED,MAAM,8BAA8B,GAAG;QACrC,GAAG,WAAW;QACd,QAAQ,EAAE,EAAE,GAAG,MAAM,EAAE,IAAI,EAAE,GAAG,EAAE,WAAW,EAAE,GAAG,IAAI,MAAM,CAAC,GAAG,EAAE;KACnE,CAAC;IAEF,IAAI,WAAW,EAAE,CAAC;QAChB,6BAA6B,CAAC;YAC5B,MAAM,EAAE,8BAAiD;YACzD,YAAY,EAAE,mBAAmB,CAAC,MAAM;SACzC,CAAC,CAAC;IACL,CAAC;IAED,MAAM,EAAE,eAAe,EAAE,GAAG,MAAM,cAAc,CAC9C,8BAA8B,CAAC,QAAQ,EACvC;QACE,gBAAgB;QAChB,OAAO;QACP,gBAAgB,EAAE,IAAI;QACtB,eAAe;QACf,MAAM;QACN,WAAW;QACX,eAAe,EAAE,KAAK;QACtB,IAAI;KACL,CACF,CAAC;IAEF,MAAM,EAAE,EAAE,EAAE,QAAQ,EAAE,GAAG,eAAe,CAAC;IACzC,MAAM,IAAI,GAAG,QAAQ,CAAC,IAAuB,CAAC;IAC9C,MAAM,GAAG,GAAG,QAAQ,CAAC,GAAsB,CAAC;IAC5C,MAAM,YAAY,GAAG,QAAQ,CAAC,YAA+B,CAAC;IAC9D,MAAM,oBAAoB,GAAG,QAAQ,CAAC,oBAAuC,CAAC;IAC9E,MAAM,EAAE,GAAG,QAAQ,CAAC,EAAqB,CAAC;IAC1C,MAAM,KAAK,GAAG,QAAQ,CAAC,KAAwB,CAAC;IAEhD,MAAM,SAAS,GAA2B;QACxC,IAAI;QACJ,GAAG;QACH,YAAY;QACZ,oBAAoB;QACpB,EAAE;QACF,KAAK;KACN,CAAC;IAEF,GAAG,CAAC,qCAAqC,EAAE;QACzC,EAAE;QACF,MAAM,EAAE,SAAS;QACjB,IAAI;KACL,CAAC,CAAC;IAEH,OAAO;QACL,EAAE;QACF,MAAM,EAAE,SAAS;QACjB,IAAI;KACL,CAAC;AACJ,CAAC;AAED;;;;;;GAMG;AACH,KAAK,UAAU,eAAe,CAC5B,WAAiC,EACjC,SAAyC;IAEzC,MAAM,EAAE,GAAG,MAAM,CAAC,WAAW,CAAC,EAAE,CAAC,CAAC;IAClC,MAAM,EAAE,MAAM,EAAE,GAAG,WAAW,CAAC;IAC/B,MAAM,IAAI,GAAG,YAAY,CAAC,gBAAgB,CAAC;IAC3C,MAAM,WAAW,GAAG,EAAE,SAAS,EAAE,EAAE,EAAE,CAAC;IAEtC,GAAG,CAAC,2CAA2C,EAAE,EAAE,CAAC,CAAC;IACrD,OAAO,CAAC,MAAM,SAAS,CAAC,IAAI,CAC1B,+BAA+B,EAC/B;QACE,EAAE;QACF,MAAM,EAAE,MAAM,IAAI,eAAe;QACjC,WAAW;QACX,aAAa,EAAE,IAAI;QACnB,IAAI;KACL,EACD,IAAI,CACL,CAAuB,CAAC;AAC3B,CAAC;AAED;;;;;GAKG;AACH,SAAS,gBAAgB,CACvB,oBAA0C,EAC1C,MAA2B;IAE3B,MAAM,CAAC,CAAC,KAAK,EAAE,EAAE;QACf,KAAK,CAAC,kBAAkB,GAAG;YACzB,GAAG,KAAK,CAAC,kBAAkB;YAC3B,oBAAoB;SACrB,CAAC;IACJ,CAAC,CAAC,CAAC;AACL,CAAC;AAED;;;;;GAKG;AACH,SAAS,wBAAwB,CAC/B,MAA2B,EAC3B,EAAU;IAEV,MAAM,CAAC,CAAC,KAAK,EAAE,EAAE;QACf,KAAK,CAAC,kBAAkB,GAAG,KAAK,CAAC,kBAAkB,CAAC,MAAM,CACxD,CAAC,KAAK,EAAE,EAAE,CAAC,KAAK,CAAC,EAAE,KAAK,EAAE,CAC3B,CAAC;IACJ,CAAC,CAAC,CAAC;AACL,CAAC;AAED;;;;;GAKG;AACH,SAAS,gBAAgB,CACvB,oBAA0D;IAE1D,OAAO;QACL,GAAG,oBAAoB;QACvB,MAAM,EAAE,iBAAiB,CAAC,UAAU;KACrC,CAAC;AACJ,CAAC;AAED;;;;;;;GAOG;AACH,KAAK,UAAU,mBAAmB,CAAC,EACjC,OAAO,EACP,OAAO,GAIR;IACC,MAAM,EACJ,SAAS,EACT,OAAO,EAAE,WAAW,EACpB,mBAAmB,EACnB,kBAAkB,EAClB,mBAAmB,EACnB,MAAM,GACP,GAAG,OAAO,CAAC;IAEZ,MAAM,EACJ,IAAI,EACJ,MAAM,EACN,eAAe,EACf,YAAY,EAAE,kBAAkB,GACjC,GAAG,WAAW,CAAC;IAEhB,IAAI,CAAC,mBAAmB,EAAE,EAAE,CAAC;QAC3B,MAAM,IAAI,KAAK,CACb,6DAA6D,CAC9D,CAAC;IACJ,CAAC;IACD,GAAG,CAAC,mCAAmC,CAAC,CAAC;IACzC,MAAM,OAAO,GAAG,UAAU,CAAC,EAAE,SAAS,EAAE,eAAe,EAAE,CAAC,CAAC;IAE3D,MAAM,EAAE,aAAa,EAAE,QAAQ,EAAE,GAAG,MAAM,gBAAgB,CAAC;QACzD,OAAO;QACP,IAAI;QACJ,mBAAmB;QACnB,YAAY,EAAE,kBAAkB;KACjC,CAAC,CAAC;IAEH,MAAM,WAAW,GAAyB,gBAAgB,CAAC;QACzD,OAAO;QACP,IAAI;QACJ,GAAG,EAAE,QAAQ;QACb,EAAE,EAAE,OAAO;QACX,eAAe;QACf,MAAM;QACN,YAAY,EAAE,kBAAkB;KACjC,CAAC,CAAC;IAEH,MAAM,iBAAiB,GAAG,IAAI,iBAAiB,EAAE,CAAC;IAClD,MAAM,oBAAoB,GAAG,MAAM,kBAAkB,CAAC;QACpD,eAAe;KAChB,CAAC,CAAC;IAEH,MAAM,cAAc,GAAG,MAAM,iBAAiB,CAAC,UAAU,CAAC;QACxD,oBAAoB;QACpB,SAAS;QACT,eAAe,EAAE;YACf,GAAG,WAAW;YACd,QAAQ,EAAE;gBACR,IAAI;gBACJ,GAAG,EAAE,QAAQ;aACd;YACD,IAAI,EAAE,IAAI,CAAC,GAAG,EAAE;SACjB;KACF,CAAC,CAAC;IAEH,WAAW,CAAC,eAAe,GAAG,cAAc,CAAC,SAAS,CAAC;IAEvD,GAAG,CAAC,mCAAmC,EAAE,WAAW,CAAC,CAAC;IACtD,gBAAgB,CAAC,WAAW,EAAE,MAAM,CAAC,CAAC;IAEtC,OAAO,WAAW,CAAC;AACrB,CAAC;AAED;;;;;;;;;;;;GAYG;AACH,KAAK,UAAU,2BAA2B,CAAC,EACzC,OAAO,EACP,mBAAmB,EACnB,kBAAkB,EAClB,OAAO,EACP,QAAQ,GAgBT;IACC,MAAM,EAAE,cAAc,EAAE,WAAW,EAAE,iBAAiB,EAAE,GAAG,OAAO,CAAC;IACnE,MAAM,uBAAuB,GAAG,cAAc,CAAC,mBAAmB,CAAC,EAAE,CAAC,CAAC;IAEvE,IAAI,CAAC,uBAAuB,EAAE,CAAC;QAC7B,MAAM,IAAI,KAAK,CAAC,gCAAgC,CAAC,CAAC;IACpD,CAAC;IAED,GAAG,CAAC,yCAAyC,EAAE,EAAE,OAAO,EAAE,QAAQ,EAAE,CAAC,CAAC;IAEtE,MAAM,EAAE,eAAe,EAAE,GAAG,uBAAuB,CAAC;IACpD,MAAM,YAAY,GAAG,MAAM,WAAW,CAAC,QAAQ,EAAE,eAAe,CAAC,CAAC;IAElE,GAAG,CAAC,kDAAkD,EAAE,YAAY,CAAC,CAAC;IAEtE,iBAAiB,CACf,EAAE,aAAa,EAAE,uBAAuB,CAAC,EAAE,EAAE,EAC7C,CAAC,eAAe,EAAE,EAAE;;QAClB,eAAe,CAAC,OAAO,GAAG,OAAO,CAAC;QAClC,eAAe,CAAC,kBAAkB,GAAG,kBAAkB,CAAC;QACxD,eAAe,CAAC,QAAQ,GAAG,QAAQ,CAAC;QACpC,eAAe,CAAC,QAAQ,CAAC,GAAG,GAAG,YAAY,CAAC,GAAG,CAAC;QAChD,eAAe,CAAC,QAAQ,CAAC,QAAQ,GAAG,YAAY,CAAC,GAAG,CAAC;QACrD,eAAe,CAAC,QAAQ,CAAC,YAAY;YACnC,uBAAuB,CAAC,QAAQ,CAAC,YAAY,CAAC;QAChD,eAAe,CAAC,QAAQ,CAAC,oBAAoB;YAC3C,uBAAuB,CAAC,QAAQ,CAAC,oBAAoB,CAAC;QACxD,eAAe,CAAC,QAAQ,CAAC,KAAK,GAAG,uBAAuB,CAAC,QAAQ,CAAC,KAAK,CAAC;QACxE,MAAA,eAAe,CAAC,QAAQ,EAAC,IAAI,QAAJ,IAAI,GAAK,uBAAuB,CAAC,SAAS,EAAC;IACtE,CAAC,CACF,CAAC;IAEF,MAAM,EAAE,YAAY,EAAE,GAAG,MAAM,0BAA0B,CAAC;QACxD,OAAO;QACP,aAAa,EAAE,uBAAuB,CAAC,EAAE;KAC1C,CAAC,CAAC;IAEH,mBAAmB,CAAC,SAAS,EAAE,CAAC;QAC9B,eAAe,EAAE,SAAS;QAC1B,YAAY;KACb,CAAC,CAAC;IAEH,GAAG,CAAC,iCAAiC,EAAE,EAAE,OAAO,EAAE,QAAQ,EAAE,YAAY,EAAE,CAAC,CAAC;AAC9E,CAAC;AAED;;;;;;;GAOG;AACH,KAAK,UAAU,0BAA0B,CAAC,EACxC,OAAO,EACP,aAAa,GAId;IAIC,MAAM,EAAE,cAAc,EAAE,eAAe,EAAE,GAAG,OAAO,CAAC;IACpD,MAAM,cAAc,GAAG,cAAc,CAAC,aAAa,CAAC,CAAC;IAErD,GAAG,CAAC,iCAAiC,EAAE;QACrC,aAAa;QACb,QAAQ,EAAE,cAAc,CAAC,QAAQ;KAClC,CAAC,CAAC;IAEH,MAAM,YAAY,GAAG,CAAC,MAAM,eAAe,CAAC,cAAc,CAAC,CAE9C,CAAC;IAEd,IAAI,CAAC,YAAY,EAAE,CAAC;QAClB,MAAM,IAAI,KAAK,CAAC,+BAA+B,CAAC,CAAC;IACnD,CAAC;IAED,MAAM,eAAe,GAAG,cAAc,CAAC,aAAa,CAAC,CAAC;IAEtD,GAAG,CAAC,eAAe,EAAE,YAAY,CAAC,CAAC;IAEnC,OAAO,EAAE,YAAY,EAAE,eAAe,EAAE,CAAC;AAC3C,CAAC","sourcesContent":["import type {\n  AcceptResultCallbacks,\n  AddResult,\n} from '@metamask/approval-controller';\nimport {\n  ApprovalType,\n  ORIGIN_METAMASK,\n  toHex,\n} from '@metamask/controller-utils';\nimport type {\n  FetchGasFeeEstimateOptions,\n  GasFeeState,\n} from '@metamask/gas-fee-controller';\nimport type { NetworkClientId } from '@metamask/network-controller';\nimport { JsonRpcError, rpcErrors } from '@metamask/rpc-errors';\nimport type { Hex } from '@metamask/utils';\nimport { bytesToHex, createModuleLogger } from '@metamask/utils';\nimport type { WritableDraft } from 'immer/dist/internal.js';\nimport { parse, v4 } from 'uuid';\n\nimport {\n  ERROR_MESSGE_PUBLIC_KEY,\n  doesChainSupportEIP7702,\n  generateEIP7702BatchTransaction,\n  isAccountUpgradedToEIP7702,\n} from './eip7702';\nimport {\n  getBatchSizeLimit,\n  getEIP7702SupportedChains,\n  getEIP7702UpgradeContractAddress,\n} from './feature-flags';\nimport { simulateGasBatch } from './gas';\nimport { getChainId } from './provider';\nimport { determineTransactionType } from './transaction-type';\nimport { validateBatchRequest } from './validation';\nimport { GasFeeEstimateLevel, TransactionStatus } from '..';\nimport type {\n  BatchTransactionParams,\n  GetSimulationConfig,\n  PublishBatchHookRequest,\n  TransactionController,\n  TransactionControllerMessenger,\n  TransactionControllerState,\n  TransactionMeta,\n} from '..';\nimport { DefaultGasFeeFlow } from '../gas-flows/DefaultGasFeeFlow';\nimport { updateTransactionGasEstimates } from '../helpers/GasFeePoller';\nimport type { PendingTransactionTracker } from '../helpers/PendingTransactionTracker';\nimport { CollectPublishHook } from '../hooks/CollectPublishHook';\nimport { SequentialPublishBatchHook } from '../hooks/SequentialPublishBatchHook';\nimport { projectLogger } from '../logger';\nimport { TransactionEnvelopeType, TransactionType } from '../types';\nimport type {\n  NestedTransactionMetadata,\n  SecurityAlertResponse,\n  TransactionBatchSingleRequest,\n  PublishBatchHook,\n  PublishBatchHookTransaction,\n  PublishHook,\n  TransactionBatchRequest,\n  ValidateSecurityRequest,\n  IsAtomicBatchSupportedResult,\n  IsAtomicBatchSupportedResultEntry,\n  TransactionBatchMeta,\n} from '../types';\nimport type { TransactionBatchResult, TransactionParams } from '../types';\n\ntype UpdateStateCallback = (\n  callback: (\n    state: WritableDraft<TransactionControllerState>,\n  ) => void | TransactionControllerState,\n) => void;\n\ntype AddTransactionBatchRequest = {\n  addTransaction: TransactionController['addTransaction'];\n  estimateGas: TransactionController['estimateGas'];\n  getGasFeeEstimates: (\n    options: FetchGasFeeEstimateOptions,\n  ) => Promise<GasFeeState>;\n  getInternalAccounts: () => Hex[];\n  getPendingTransactionTracker: (\n    networkClientId: string,\n  ) => PendingTransactionTracker;\n  getSimulationConfig: GetSimulationConfig;\n  getTransaction: (id: string) => TransactionMeta;\n  isSimulationEnabled: () => boolean;\n  messenger: TransactionControllerMessenger;\n  publishBatchHook?: PublishBatchHook;\n  publishTransaction: (transactionMeta: TransactionMeta) => Promise<Hex>;\n  publicKeyEIP7702?: Hex;\n  request: TransactionBatchRequest;\n  requestId?: string;\n  signTransaction: (\n    transactionMeta: TransactionMeta,\n  ) => Promise<string | undefined>;\n  update: UpdateStateCallback;\n  updateTransaction: (\n    options: { transactionId: string },\n    callback: (transactionMeta: TransactionMeta) => void,\n  ) => void;\n};\n\ntype IsAtomicBatchSupportedRequestInternal = {\n  address: Hex;\n  chainIds?: Hex[];\n  messenger: TransactionControllerMessenger;\n  publicKeyEIP7702?: Hex;\n};\n\nconst log = createModuleLogger(projectLogger, 'batch');\n\nexport const ERROR_MESSAGE_NO_UPGRADE_CONTRACT =\n  'Upgrade contract address not found';\n\n/**\n * Add a batch transaction.\n *\n * @param request - The request object including the user request and necessary callbacks.\n * @returns The batch result object including the batch ID.\n */\nexport async function addTransactionBatch(\n  request: AddTransactionBatchRequest,\n): Promise<TransactionBatchResult> {\n  const {\n    getInternalAccounts,\n    messenger,\n    request: transactionBatchRequest,\n  } = request;\n  const sizeLimit = getBatchSizeLimit(messenger);\n\n  validateBatchRequest({\n    internalAccounts: getInternalAccounts(),\n    request: transactionBatchRequest,\n    sizeLimit,\n  });\n\n  log('Adding', transactionBatchRequest);\n\n  if (!transactionBatchRequest.disable7702) {\n    try {\n      return await addTransactionBatchWith7702(request);\n    } catch (error: unknown) {\n      const isEIP7702NotSupportedError =\n        error instanceof JsonRpcError &&\n        error.message === 'Chain does not support EIP-7702';\n\n      if (!isEIP7702NotSupportedError) {\n        throw error;\n      }\n    }\n  }\n\n  return await addTransactionBatchWithHook(request);\n}\n\n/**\n * Determine which chains support atomic batch transactions for the given account.\n *\n * @param request - The request object including the account address and necessary callbacks.\n * @returns The chain IDs that support atomic batch transactions.\n */\nexport async function isAtomicBatchSupported(\n  request: IsAtomicBatchSupportedRequestInternal,\n): Promise<IsAtomicBatchSupportedResult> {\n  const { address, chainIds, messenger, publicKeyEIP7702: publicKey } = request;\n\n  if (!publicKey) {\n    throw rpcErrors.internal(ERROR_MESSGE_PUBLIC_KEY);\n  }\n\n  const chainIds7702 = getEIP7702SupportedChains(messenger);\n\n  const filteredChainIds = chainIds7702.filter(\n    (chainId) => !chainIds || chainIds.includes(chainId),\n  );\n\n  const resultsRaw: (IsAtomicBatchSupportedResultEntry | undefined)[] =\n    await Promise.all(\n      filteredChainIds.map(async (chainId) => {\n        try {\n          const networkClientId = messenger.call(\n            'NetworkController:findNetworkClientIdByChainId',\n            chainId,\n          );\n\n          const { isSupported, delegationAddress } =\n            await isAccountUpgradedToEIP7702(\n              address,\n              chainId,\n              publicKey,\n              messenger,\n              networkClientId,\n            );\n\n          const upgradeContractAddress = getEIP7702UpgradeContractAddress(\n            chainId,\n            messenger,\n            publicKey,\n          );\n\n          return {\n            chainId,\n            delegationAddress,\n            isSupported,\n            upgradeContractAddress,\n          };\n        } catch (error) {\n          log('Error checking atomic batch support', chainId, error);\n          return undefined;\n        }\n      }),\n    );\n\n  const results = resultsRaw.filter(\n    (result): result is IsAtomicBatchSupportedResultEntry => Boolean(result),\n  );\n\n  log('Atomic batch supported results', results);\n\n  return results;\n}\n\n/**\n * Generate a transaction batch ID.\n *\n * @returns  A unique batch ID as a hexadecimal string.\n */\nfunction generateBatchId(): Hex {\n  const idString = v4();\n  const idBytes = new Uint8Array(parse(idString));\n  return bytesToHex(idBytes);\n}\n\n/**\n * Generate the metadata for a nested transaction.\n *\n * @param request - The batch request.\n * @param singleRequest - The request for a single transaction.\n * @param messenger - The transaction controller messenger.\n * @param networkClientId - The network client ID.\n * @returns The metadata for the nested transaction.\n */\nasync function getNestedTransactionMeta(\n  request: TransactionBatchRequest,\n  singleRequest: TransactionBatchSingleRequest,\n  messenger: TransactionControllerMessenger,\n  networkClientId: NetworkClientId,\n): Promise<NestedTransactionMetadata> {\n  const { from } = request;\n  const { params, type: requestedType } = singleRequest;\n\n  if (requestedType) {\n    return {\n      ...params,\n      type: requestedType,\n    };\n  }\n\n  const { type: determinedType } = await determineTransactionType(\n    { from, ...params },\n    { messenger, networkClientId },\n  );\n\n  return {\n    ...params,\n    type: determinedType,\n  };\n}\n\n/**\n * Process a batch transaction using an EIP-7702 transaction.\n *\n * @param request - The request object including the user request and necessary callbacks.\n * @returns The batch result object including the batch ID.\n */\nasync function addTransactionBatchWith7702(\n  request: AddTransactionBatchRequest,\n): Promise<TransactionBatchResult> {\n  const {\n    addTransaction,\n    messenger,\n    publicKeyEIP7702,\n    request: userRequest,\n  } = request;\n\n  const {\n    batchId: batchIdOverride,\n    disableUpgrade,\n    from,\n    gasFeeToken,\n    gasLimit7702,\n    networkClientId,\n    origin,\n    overwriteUpgrade,\n    requestId,\n    requiredAssets,\n    requireApproval,\n    securityAlertId,\n    skipInitialGasEstimate,\n    transactions,\n    excludeNativeTokenForFee,\n    isGasFeeIncluded,\n    isGasFeeSponsored,\n    validateSecurity,\n  } = userRequest;\n\n  const chainId = getChainId({ messenger, networkClientId });\n  const isChainSupported = doesChainSupportEIP7702(chainId, messenger);\n\n  if (!isChainSupported) {\n    log('Chain does not support EIP-7702', chainId);\n    throw rpcErrors.internal('Chain does not support EIP-7702');\n  }\n\n  if (!publicKeyEIP7702) {\n    throw rpcErrors.internal(ERROR_MESSGE_PUBLIC_KEY);\n  }\n\n  let requiresUpgrade = false;\n\n  if (!disableUpgrade) {\n    const { delegationAddress, isSupported } = await isAccountUpgradedToEIP7702(\n      from,\n      chainId,\n      publicKeyEIP7702,\n      messenger,\n      networkClientId,\n    );\n\n    log('Account', { delegationAddress, isSupported });\n\n    if (!isSupported && delegationAddress && !overwriteUpgrade) {\n      log('Account upgraded to unsupported contract', from, delegationAddress);\n      throw rpcErrors.internal('Account upgraded to unsupported contract');\n    }\n\n    requiresUpgrade = !isSupported;\n\n    if (requiresUpgrade && delegationAddress) {\n      log('Overwriting authorization as already upgraded', {\n        current: delegationAddress,\n      });\n    }\n  }\n\n  const nestedTransactions = await Promise.all(\n    transactions.map((tx) =>\n      getNestedTransactionMeta(userRequest, tx, messenger, networkClientId),\n    ),\n  );\n\n  const batchParams = generateEIP7702BatchTransaction(from, nestedTransactions);\n\n  const txParams: TransactionParams = {\n    ...batchParams,\n    from,\n    gas: gasLimit7702,\n    maxFeePerGas: nestedTransactions[0]?.maxFeePerGas,\n    maxPriorityFeePerGas: nestedTransactions[0]?.maxPriorityFeePerGas,\n  };\n\n  if (requiresUpgrade) {\n    const upgradeContractAddress = getEIP7702UpgradeContractAddress(\n      chainId,\n      messenger,\n      publicKeyEIP7702,\n    );\n\n    if (!upgradeContractAddress) {\n      throw rpcErrors.internal(ERROR_MESSAGE_NO_UPGRADE_CONTRACT);\n    }\n\n    txParams.type = TransactionEnvelopeType.setCode;\n    txParams.authorizationList = [{ address: upgradeContractAddress }];\n  }\n\n  if (validateSecurity) {\n    const securityRequest: ValidateSecurityRequest = {\n      method: 'eth_sendTransaction',\n      params: [\n        {\n          ...txParams,\n          authorizationList: undefined,\n          type: TransactionEnvelopeType.feeMarket,\n        },\n      ],\n      delegationMock: txParams.authorizationList?.[0]?.address,\n      origin,\n    };\n\n    log('Security request', securityRequest);\n\n    validateSecurity(securityRequest, chainId).catch((error) => {\n      log('Security validation failed', error);\n    });\n  }\n\n  log('Adding batch transaction', txParams, networkClientId);\n\n  const batchId = batchIdOverride ?? generateBatchId();\n\n  const securityAlertResponse = securityAlertId\n    ? ({ securityAlertId } as SecurityAlertResponse)\n    : undefined;\n\n  const existingTransaction = transactions.find(\n    (tx) => tx.existingTransaction,\n  )?.existingTransaction;\n\n  if (existingTransaction) {\n    await convertTransactionToEIP7702({\n      batchId,\n      existingTransaction,\n      nestedTransactions,\n      request,\n      txParams,\n    });\n\n    return { batchId };\n  }\n\n  const { result } = await addTransaction(txParams, {\n    batchId,\n    gasFeeToken,\n    excludeNativeTokenForFee,\n    isGasFeeIncluded,\n    isGasFeeSponsored,\n    nestedTransactions,\n    networkClientId,\n    origin,\n    requestId,\n    requireApproval,\n    requiredAssets,\n    securityAlertResponse,\n    skipInitialGasEstimate,\n    type: TransactionType.batch,\n  });\n\n  const transactionHash = await result;\n\n  log('Batch transaction added', { batchId, transactionHash });\n\n  return {\n    batchId,\n  };\n}\n\n/**\n * Process a batch transaction using a publish batch hook.\n *\n * @param request - The request object including the user request and necessary callbacks.\n * @returns The batch result object including the batch ID.\n */\nasync function addTransactionBatchWithHook(\n  request: AddTransactionBatchRequest,\n): Promise<TransactionBatchResult> {\n  const {\n    messenger,\n    publishBatchHook: requestPublishBatchHook,\n    request: userRequest,\n    update,\n  } = request;\n\n  const {\n    batchId: batchIdOverride,\n    from,\n    networkClientId,\n    origin,\n    requireApproval,\n    transactions: requestedTransactions,\n  } = userRequest;\n\n  let resultCallbacks: AcceptResultCallbacks | undefined;\n  let isSequentialBatchHook = false;\n\n  log('Adding transaction batch using hook', userRequest);\n\n  const sequentialPublishBatchHook = new SequentialPublishBatchHook({\n    publishTransaction: request.publishTransaction,\n    getTransaction: request.getTransaction,\n    getPendingTransactionTracker: request.getPendingTransactionTracker,\n  });\n\n  let { disable7702, disableSequential } = userRequest;\n  const { disableHook, useHook } = userRequest;\n\n  // use hook is a temporary alias for disable7702 and disableSequential\n  if (useHook) {\n    disable7702 = true;\n    disableSequential = true;\n  }\n\n  let publishBatchHook = null;\n\n  if (!disableHook && requestPublishBatchHook) {\n    publishBatchHook = requestPublishBatchHook;\n  } else if (!disableSequential) {\n    publishBatchHook = sequentialPublishBatchHook.getHook();\n    isSequentialBatchHook = true;\n  }\n\n  if (!publishBatchHook) {\n    log(`No supported batch methods found`, {\n      disable7702,\n      disableHook,\n      disableSequential,\n    });\n    throw rpcErrors.internal(`Can't process batch`);\n  }\n\n  let txBatchMeta: TransactionBatchMeta | undefined;\n  const batchId = batchIdOverride ?? generateBatchId();\n\n  const nestedTransactions = requestedTransactions.map((tx) => ({\n    ...tx,\n    origin,\n  }));\n\n  const transactionCount = nestedTransactions.length;\n  const collectHook = new CollectPublishHook(transactionCount);\n\n  try {\n    if (requireApproval) {\n      txBatchMeta = await prepareApprovalData({\n        batchId,\n        request,\n      });\n\n      resultCallbacks = (await requestApproval(txBatchMeta, messenger))\n        .resultCallbacks;\n    }\n\n    const publishHook = collectHook.getHook();\n    const hookTransactions: Omit<PublishBatchHookTransaction, 'signedTx'>[] =\n      [];\n\n    let index = 0;\n\n    for (const nestedTransaction of nestedTransactions) {\n      const hookTransaction = await processTransactionWithHook(\n        batchId,\n        nestedTransaction,\n        publishHook,\n        request,\n        txBatchMeta,\n        index,\n      );\n\n      hookTransactions.push(hookTransaction);\n      index += 1;\n    }\n\n    const { signedTransactions } = await collectHook.ready();\n\n    const transactions = hookTransactions.map((transaction, i) => ({\n      ...transaction,\n      signedTx: signedTransactions[i],\n    }));\n\n    const hookParams: PublishBatchHookRequest = {\n      from,\n      networkClientId,\n      transactions,\n    };\n\n    log('Calling publish batch hook', hookParams);\n\n    let result = await publishBatchHook(hookParams);\n\n    log('Publish batch hook result', result);\n\n    if (!result && !isSequentialBatchHook && !disableSequential) {\n      log('Fallback to sequential publish batch hook due to empty results');\n      const sequentialBatchHook = sequentialPublishBatchHook.getHook();\n      result = await sequentialBatchHook(hookParams);\n    }\n\n    if (!result?.results?.length) {\n      throw new Error('Publish batch hook did not return a result');\n    }\n\n    const transactionHashes = result.results.map(\n      ({ transactionHash }) => transactionHash,\n    );\n\n    collectHook.success(transactionHashes);\n    resultCallbacks?.success();\n\n    log('Completed batch transaction with hook', transactionHashes);\n\n    return {\n      batchId,\n    };\n  } catch (error) {\n    log('Publish batch hook failed', error);\n\n    collectHook.error(error);\n    resultCallbacks?.error(error as Error);\n\n    throw error;\n  } finally {\n    log('Cleaning up publish batch hook', batchId);\n    wipeTransactionBatchById(update, batchId);\n  }\n}\n\n/**\n * Process a single transaction with a publish batch hook.\n *\n * @param batchId - ID of the transaction batch.\n * @param nestedTransaction - The nested transaction request.\n * @param publishHook - The publish hook to use for each transaction.\n * @param request - The request object including the user request and necessary callbacks.\n * @param txBatchMeta - Metadata for the transaction batch.\n * @param index - The index of the transaction in the batch.\n * @returns The single transaction request to be processed by the publish batch hook.\n */\nasync function processTransactionWithHook(\n  batchId: Hex,\n  nestedTransaction: TransactionBatchSingleRequest,\n  publishHook: PublishHook,\n  request: AddTransactionBatchRequest,\n  txBatchMeta: TransactionBatchMeta | undefined,\n  index: number,\n): Promise<\n  Omit<PublishBatchHookTransaction, 'signedTx'> & { type?: TransactionType }\n> {\n  const { assetsFiatValues, existingTransaction, params, type } =\n    nestedTransaction;\n\n  const {\n    addTransaction,\n    getTransaction,\n    request: userRequest,\n    updateTransaction,\n  } = request;\n\n  const { from, networkClientId, origin } = userRequest;\n\n  if (existingTransaction) {\n    const { id, onPublish } = existingTransaction;\n    let transactionMeta = getTransaction(id);\n    const currentNonceHex = transactionMeta.txParams.nonce;\n    let { signedTransaction } = existingTransaction;\n\n    const currentNonceNum = currentNonceHex\n      ? parseInt(currentNonceHex, 16)\n      : undefined;\n\n    const newNonce =\n      index > 0 && currentNonceNum !== undefined\n        ? currentNonceNum + index\n        : undefined;\n\n    updateTransaction({ transactionId: id }, (_transactionMeta) => {\n      _transactionMeta.batchId = batchId;\n\n      if (newNonce) {\n        _transactionMeta.txParams.nonce = toHex(newNonce);\n      }\n    });\n\n    if (newNonce) {\n      const signResult = await updateTransactionSignature({\n        transactionId: id,\n        request,\n      });\n\n      signedTransaction = signResult.newSignature;\n      transactionMeta = signResult.transactionMeta;\n    }\n\n    publishHook(transactionMeta, signedTransaction)\n      .then(onPublish)\n      .catch(() => {\n        // Intentionally empty\n      });\n\n    log('Processed existing transaction with hook', {\n      id,\n      params,\n    });\n\n    return {\n      id,\n      params,\n    };\n  }\n\n  const transactionMetaForGasEstimates = {\n    ...txBatchMeta,\n    txParams: { ...params, from, gas: txBatchMeta?.gas ?? params.gas },\n  };\n\n  if (txBatchMeta) {\n    updateTransactionGasEstimates({\n      txMeta: transactionMetaForGasEstimates as TransactionMeta,\n      userFeeLevel: GasFeeEstimateLevel.Medium,\n    });\n  }\n\n  const { transactionMeta } = await addTransaction(\n    transactionMetaForGasEstimates.txParams,\n    {\n      assetsFiatValues,\n      batchId,\n      disableGasBuffer: true,\n      networkClientId,\n      origin,\n      publishHook,\n      requireApproval: false,\n      type,\n    },\n  );\n\n  const { id, txParams } = transactionMeta;\n  const data = txParams.data as Hex | undefined;\n  const gas = txParams.gas as Hex | undefined;\n  const maxFeePerGas = txParams.maxFeePerGas as Hex | undefined;\n  const maxPriorityFeePerGas = txParams.maxPriorityFeePerGas as Hex | undefined;\n  const to = txParams.to as Hex | undefined;\n  const value = txParams.value as Hex | undefined;\n\n  const newParams: BatchTransactionParams = {\n    data,\n    gas,\n    maxFeePerGas,\n    maxPriorityFeePerGas,\n    to,\n    value,\n  };\n\n  log('Processed new transaction with hook', {\n    id,\n    params: newParams,\n    type,\n  });\n\n  return {\n    id,\n    params: newParams,\n    type,\n  };\n}\n\n/**\n * Requests approval for a transaction batch by interacting with the ApprovalController.\n *\n * @param txBatchMeta - Metadata for the transaction batch, including its ID and origin.\n * @param messenger - The messenger instance used to communicate with the ApprovalController.\n * @returns A promise that resolves to the result of adding the approval request.\n */\nasync function requestApproval(\n  txBatchMeta: TransactionBatchMeta,\n  messenger: TransactionControllerMessenger,\n): Promise<AddResult> {\n  const id = String(txBatchMeta.id);\n  const { origin } = txBatchMeta;\n  const type = ApprovalType.TransactionBatch;\n  const requestData = { txBatchId: id };\n\n  log('Requesting approval for transaction batch', id);\n  return (await messenger.call(\n    'ApprovalController:addRequest',\n    {\n      id,\n      origin: origin ?? ORIGIN_METAMASK,\n      requestData,\n      expectsResult: true,\n      type,\n    },\n    true,\n  )) as Promise<AddResult>;\n}\n\n/**\n * Adds batch metadata to the transaction controller state.\n *\n * @param transactionBatchMeta - The transaction batch metadata to be added.\n * @param update - The update function to modify the transaction controller state.\n */\nfunction addBatchMetadata(\n  transactionBatchMeta: TransactionBatchMeta,\n  update: UpdateStateCallback,\n): void {\n  update((state) => {\n    state.transactionBatches = [\n      ...state.transactionBatches,\n      transactionBatchMeta,\n    ];\n  });\n}\n\n/**\n * Wipes a specific transaction batch from the transaction controller state by its ID.\n *\n * @param update - The update function to modify the transaction controller state.\n * @param id - The ID of the transaction batch to be wiped.\n */\nfunction wipeTransactionBatchById(\n  update: UpdateStateCallback,\n  id: string,\n): void {\n  update((state) => {\n    state.transactionBatches = state.transactionBatches.filter(\n      (batch) => batch.id !== id,\n    );\n  });\n}\n\n/**\n * Create a new batch metadata object.\n *\n * @param transactionBatchMeta - The transaction batch metadata object to be created.\n * @returns A new TransactionBatchMeta object.\n */\nfunction newBatchMetadata(\n  transactionBatchMeta: Omit<TransactionBatchMeta, 'status'>,\n): TransactionBatchMeta {\n  return {\n    ...transactionBatchMeta,\n    status: TransactionStatus.unapproved,\n  };\n}\n\n/**\n * Prepares the approval data for a transaction batch.\n *\n * @param options - The options object containing necessary parameters.\n * @param options.batchId - The batch ID for the transaction batch.\n * @param options.request - The request object including the user request and necessary callbacks.\n * @returns The prepared transaction batch metadata.\n */\nasync function prepareApprovalData({\n  batchId,\n  request,\n}: {\n  batchId: Hex;\n  request: AddTransactionBatchRequest;\n}): Promise<TransactionBatchMeta> {\n  const {\n    messenger,\n    request: userRequest,\n    isSimulationEnabled,\n    getGasFeeEstimates,\n    getSimulationConfig,\n    update,\n  } = request;\n\n  const {\n    from,\n    origin,\n    networkClientId,\n    transactions: nestedTransactions,\n  } = userRequest;\n\n  if (!isSimulationEnabled()) {\n    throw new Error(\n      'Cannot create transaction batch as simulation not supported',\n    );\n  }\n  log('Preparing approval data for batch');\n  const chainId = getChainId({ messenger, networkClientId });\n\n  const { totalGasLimit: gasLimit } = await simulateGasBatch({\n    chainId,\n    from,\n    getSimulationConfig,\n    transactions: nestedTransactions,\n  });\n\n  const txBatchMeta: TransactionBatchMeta = newBatchMetadata({\n    chainId,\n    from,\n    gas: gasLimit,\n    id: batchId,\n    networkClientId,\n    origin,\n    transactions: nestedTransactions,\n  });\n\n  const defaultGasFeeFlow = new DefaultGasFeeFlow();\n  const gasFeeControllerData = await getGasFeeEstimates({\n    networkClientId,\n  });\n\n  const gasFeeResponse = await defaultGasFeeFlow.getGasFees({\n    gasFeeControllerData,\n    messenger,\n    transactionMeta: {\n      ...txBatchMeta,\n      txParams: {\n        from,\n        gas: gasLimit,\n      },\n      time: Date.now(),\n    },\n  });\n\n  txBatchMeta.gasFeeEstimates = gasFeeResponse.estimates;\n\n  log('Saving transaction batch metadata', txBatchMeta);\n  addBatchMetadata(txBatchMeta, update);\n\n  return txBatchMeta;\n}\n\n/**\n * Convert an existing transaction to an EIP-7702 batch transaction.\n *\n * @param options - Options object.\n * @param options.batchId - Batch ID for the transaction batch.\n * @param options.existingTransaction - Existing transaction to be converted.\n * @param options.nestedTransactions - Nested transactions to be included in the batch.\n * @param options.request - Request object including the user request and necessary callbacks.\n * @param options.txParams - Transaction parameters for the new EIP-7702 transaction.\n * @param options.existingTransaction.id - ID of the existing transaction.\n * @param options.existingTransaction.onPublish - Callback for when the transaction is published.\n * @returns Promise that resolves after the publish callback has been invoked.\n */\nasync function convertTransactionToEIP7702({\n  batchId,\n  existingTransaction,\n  nestedTransactions,\n  request,\n  txParams,\n}: {\n  batchId: Hex;\n  request: AddTransactionBatchRequest;\n  existingTransaction: {\n    id: string;\n    onPublish?: ({\n      transactionHash,\n      newSignature,\n    }: {\n      transactionHash: string | undefined;\n      newSignature: Hex;\n    }) => void;\n  };\n  nestedTransactions: NestedTransactionMetadata[];\n  txParams: TransactionParams;\n}): Promise<void> {\n  const { getTransaction, estimateGas, updateTransaction } = request;\n  const existingTransactionMeta = getTransaction(existingTransaction.id);\n\n  if (!existingTransactionMeta) {\n    throw new Error('Existing transaction not found');\n  }\n\n  log('Converting existing transaction to 7702', { batchId, txParams });\n\n  const { networkClientId } = existingTransactionMeta;\n  const newGasResult = await estimateGas(txParams, networkClientId);\n\n  log('Estimated gas for converted EIP-7702 transaction', newGasResult);\n\n  updateTransaction(\n    { transactionId: existingTransactionMeta.id },\n    (transactionMeta) => {\n      transactionMeta.batchId = batchId;\n      transactionMeta.nestedTransactions = nestedTransactions;\n      transactionMeta.txParams = txParams;\n      transactionMeta.txParams.gas = newGasResult.gas;\n      transactionMeta.txParams.gasLimit = newGasResult.gas;\n      transactionMeta.txParams.maxFeePerGas =\n        existingTransactionMeta.txParams.maxFeePerGas;\n      transactionMeta.txParams.maxPriorityFeePerGas =\n        existingTransactionMeta.txParams.maxPriorityFeePerGas;\n      transactionMeta.txParams.nonce = existingTransactionMeta.txParams.nonce;\n      transactionMeta.txParams.type ??= TransactionEnvelopeType.feeMarket;\n    },\n  );\n\n  const { newSignature } = await updateTransactionSignature({\n    request,\n    transactionId: existingTransactionMeta.id,\n  });\n\n  existingTransaction.onPublish?.({\n    transactionHash: undefined,\n    newSignature,\n  });\n\n  log('Transaction updated to EIP-7702', { batchId, txParams, newSignature });\n}\n\n/**\n * Update the signature of an existing transaction.\n *\n * @param options - Options object.\n * @param options.request - The request object including the user request and necessary callbacks.\n * @param options.transactionId - The ID of the transaction to update.\n * @returns An object containing the new signature and updated transaction metadata.\n */\nasync function updateTransactionSignature({\n  request,\n  transactionId,\n}: {\n  request: AddTransactionBatchRequest;\n  transactionId: string;\n}): Promise<{\n  newSignature: Hex;\n  transactionMeta: TransactionMeta;\n}> {\n  const { getTransaction, signTransaction } = request;\n  const metadataToSign = getTransaction(transactionId);\n\n  log('Re-signing existing transaction', {\n    transactionId,\n    txParams: metadataToSign.txParams,\n  });\n\n  const newSignature = (await signTransaction(metadataToSign)) as\n    | Hex\n    | undefined;\n\n  if (!newSignature) {\n    throw new Error('Failed to re-sign transaction');\n  }\n\n  const transactionMeta = getTransaction(transactionId);\n\n  log('New signature', newSignature);\n\n  return { newSignature, transactionMeta };\n}\n"]}

package/dist/utils/eip7702.cjs

@@ -6,6 +6,7 @@ const contracts_1 = require("@ethersproject/contracts");
 const controller_utils_1 = require("@metamask/controller-utils");
 const utils_1 = require("@metamask/utils");
 const feature_flags_1 = require("./feature-flags.cjs");
+const provider_1 = require("./provider.cjs");
 const constants_1 = require("../constants.cjs");
 const logger_1 = require("../logger.cjs");
 exports.DELEGATION_PREFIX = '0xef0100';
@@ -29,11 +30,17 @@ exports.doesChainSupportEIP7702 = doesChainSupportEIP7702;
  * Retrieve the delegation address for an account.
  *
  * @param address - The address to check.
- * @param ethQuery - The EthQuery instance to communicate with the blockchain.
+ * @param messenger - The TransactionController messenger.
+ * @param networkClientId - The network client ID to use.
  * @returns  The delegation address if it exists.
  */
-async function getDelegationAddress(address, ethQuery) {
-    const code = await (0, controller_utils_1.query)(ethQuery, 'eth_getCode', [address]);
+async function getDelegationAddress(address, messenger, networkClientId) {
+    const code = (await (0, provider_1.rpcRequest)({
+        messenger,
+        networkClientId,
+        method: 'eth_getCode',
+        params: [address, 'latest'],
+    }));
     const normalizedCode = (0, utils_1.add0x)(code?.toLowerCase?.() ?? '');
     const hasDelegation = code?.length === 48 && normalizedCode.startsWith(exports.DELEGATION_PREFIX);
     return hasDelegation
@@ -48,12 +55,12 @@ exports.getDelegationAddress = getDelegationAddress;
  * @param chainId - The chain ID.
  * @param publicKey - Public key used to validate EIP-7702 contract signatures in feature flags.
  * @param messenger - The messenger instance.
- * @param ethQuery - The EthQuery instance to communicate with the blockchain.
+ * @param networkClientId - The network client ID to use.
  * @returns An object with the results of the check.
  */
-async function isAccountUpgradedToEIP7702(address, chainId, publicKey, messenger, ethQuery) {
+async function isAccountUpgradedToEIP7702(address, chainId, publicKey, messenger, networkClientId) {
     const contractAddresses = (0, feature_flags_1.getEIP7702ContractAddresses)(chainId, messenger, publicKey);
-    const delegationAddress = await getDelegationAddress(address, ethQuery);
+    const delegationAddress = await getDelegationAddress(address, messenger, networkClientId);
     const isSupported = Boolean(delegationAddress &&
         contractAddresses.some((contract) => contract.toLowerCase() === delegationAddress.toLowerCase()));
     return {

package/dist/utils/eip7702.cjs.map

@@ -1 +1 @@
-{"version":3,"file":"eip7702.cjs","sourceRoot":"","sources":["../../src/utils/eip7702.ts"],"names":[],"mappings":"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","sourcesContent":["import { defaultAbiCoder } from '@ethersproject/abi';\nimport { Contract } from '@ethersproject/contracts';\nimport { query, toHex } from '@metamask/controller-utils';\nimport type EthQuery from '@metamask/eth-query';\nimport { createModuleLogger, add0x } from '@metamask/utils';\nimport type { Hex } from '@metamask/utils';\n\nimport {\n  getEIP7702ContractAddresses,\n  getEIP7702SupportedChains,\n} from './feature-flags';\nimport { ABI_IERC7821 } from '../constants';\nimport { projectLogger } from '../logger';\nimport type { TransactionControllerMessenger } from '../TransactionController';\nimport type {\n  BatchTransactionParams,\n  Authorization,\n  AuthorizationList,\n  TransactionMeta,\n} from '../types';\n\nexport const DELEGATION_PREFIX = '0xef0100';\nexport const BATCH_FUNCTION_NAME = 'execute';\nexport const CALLS_SIGNATURE = '(address,uint256,bytes)[]';\nexport const ERROR_MESSGE_PUBLIC_KEY = 'EIP-7702 public key not specified';\n\nconst log = createModuleLogger(projectLogger, 'eip-7702');\n\n/**\n * Determine if a chain supports EIP-7702 using LaunchDarkly feature flag.\n *\n * @param chainId - Hexadecimal ID of the chain.\n * @param messenger - Messenger instance.\n * @returns True if the chain supports EIP-7702.\n */\nexport function doesChainSupportEIP7702(\n  chainId: Hex,\n  messenger: TransactionControllerMessenger,\n): boolean {\n  const supportedChains = getEIP7702SupportedChains(messenger);\n\n  return supportedChains.some(\n    (supportedChainId) =>\n      supportedChainId.toLowerCase() === chainId.toLowerCase(),\n  );\n}\n\n/**\n * Retrieve the delegation address for an account.\n *\n * @param address - The address to check.\n * @param ethQuery - The EthQuery instance to communicate with the blockchain.\n * @returns  The delegation address if it exists.\n */\nexport async function getDelegationAddress(\n  address: Hex,\n  ethQuery: EthQuery,\n): Promise<Hex | undefined> {\n  const code = await query(ethQuery, 'eth_getCode', [address]);\n  const normalizedCode = add0x(code?.toLowerCase?.() ?? '');\n\n  const hasDelegation =\n    code?.length === 48 && normalizedCode.startsWith(DELEGATION_PREFIX);\n\n  return hasDelegation\n    ? add0x(normalizedCode.slice(DELEGATION_PREFIX.length))\n    : undefined;\n}\n\n/**\n * Determine if an account has been upgraded to a supported EIP-7702 contract.\n *\n * @param address - The EOA address to check.\n * @param chainId - The chain ID.\n * @param publicKey - Public key used to validate EIP-7702 contract signatures in feature flags.\n * @param messenger - The messenger instance.\n * @param ethQuery - The EthQuery instance to communicate with the blockchain.\n * @returns An object with the results of the check.\n */\nexport async function isAccountUpgradedToEIP7702(\n  address: Hex,\n  chainId: Hex,\n  publicKey: Hex,\n  messenger: TransactionControllerMessenger,\n  ethQuery: EthQuery,\n): Promise<{\n  delegationAddress: Hex | undefined;\n  isSupported: boolean;\n}> {\n  const contractAddresses = getEIP7702ContractAddresses(\n    chainId,\n    messenger,\n    publicKey,\n  );\n\n  const delegationAddress = await getDelegationAddress(address, ethQuery);\n\n  const isSupported = Boolean(\n    delegationAddress &&\n      contractAddresses.some(\n        (contract) =>\n          contract.toLowerCase() === delegationAddress.toLowerCase(),\n      ),\n  );\n\n  return {\n    delegationAddress,\n    isSupported,\n  };\n}\n\n/**\n * Generate an EIP-7702 batch transaction.\n *\n * @param from - The sender address.\n * @param transactions - The transactions to batch.\n * @returns The batch transaction.\n */\nexport function generateEIP7702BatchTransaction(\n  from: Hex,\n  transactions: BatchTransactionParams[],\n): BatchTransactionParams {\n  const erc7821Contract = Contract.getInterface(ABI_IERC7821);\n\n  const calls = transactions.map((transaction) => {\n    const { data, to, value } = transaction;\n\n    return [\n      to ?? '0x0000000000000000000000000000000000000000',\n      value ?? '0x0',\n      data ?? '0x',\n    ];\n  });\n\n  // Single batch mode, no opData.\n  const mode = '0x01'.padEnd(66, '0');\n\n  const callData = defaultAbiCoder.encode([CALLS_SIGNATURE], [calls]);\n\n  const data = erc7821Contract.encodeFunctionData(BATCH_FUNCTION_NAME, [\n    mode,\n    callData,\n  ]) as Hex;\n\n  log('Transaction data', data);\n\n  return {\n    data,\n    to: from,\n  };\n}\n\n/**\n * Sign an authorization list.\n *\n * @param options - Options bag.\n * @param options.authorizationList - The authorization list to sign.\n * @param options.messenger - The controller messenger.\n * @param options.transactionMeta - The transaction metadata.\n * @returns The signed authorization list.\n */\nexport async function signAuthorizationList({\n  authorizationList,\n  messenger,\n  transactionMeta,\n}: {\n  authorizationList?: AuthorizationList;\n  messenger: TransactionControllerMessenger;\n  transactionMeta: TransactionMeta;\n}): Promise<Required<AuthorizationList | undefined>> {\n  if (!authorizationList) {\n    return undefined;\n  }\n\n  const signedAuthorizationList: Required<AuthorizationList> = [];\n  let index = 0;\n\n  for (const authorization of authorizationList) {\n    const signedAuthorization = await signAuthorization(\n      authorization,\n      transactionMeta,\n      messenger,\n      index,\n    );\n\n    signedAuthorizationList.push(signedAuthorization);\n    index += 1;\n  }\n\n  return signedAuthorizationList;\n}\n\n/**\n * Signs an authorization.\n *\n * @param authorization - The authorization to sign.\n * @param transactionMeta - The associated transaction metadata.\n * @param messenger - The messenger to use for signing.\n * @param index - The index of the authorization in the list.\n * @returns The signed authorization.\n */\nasync function signAuthorization(\n  authorization: Authorization,\n  transactionMeta: TransactionMeta,\n  messenger: TransactionControllerMessenger,\n  index: number,\n): Promise<Required<Authorization>> {\n  const finalAuthorization = prepareAuthorization(\n    authorization,\n    transactionMeta,\n    index,\n  );\n\n  const { txParams } = transactionMeta;\n  const { from } = txParams;\n  const { address, chainId, nonce } = finalAuthorization;\n  const chainIdDecimal = parseInt(chainId, 16);\n  const nonceDecimal = parseInt(nonce, 16);\n\n  const signature = await messenger.call(\n    'KeyringController:signEip7702Authorization',\n    {\n      chainId: chainIdDecimal,\n      contractAddress: address,\n      from,\n      nonce: nonceDecimal,\n    },\n  );\n\n  // eslint-disable-next-line id-length\n  const r = signature.slice(0, 66) as Hex;\n  // eslint-disable-next-line id-length\n  const s = add0x(signature.slice(66, 130));\n  // eslint-disable-next-line id-length\n  const v = parseInt(signature.slice(130, 132), 16);\n  const yParity = toHex(v - 27 === 0 ? 0 : 1);\n\n  const result: Required<Authorization> = {\n    address,\n    chainId,\n    nonce,\n    r,\n    s,\n    yParity,\n  };\n\n  log('Signed authorization', result);\n\n  return result;\n}\n\n/**\n * Prepares an authorization for signing by populating the chainId and nonce.\n *\n * @param authorization - The authorization to prepare.\n * @param transactionMeta - The associated transaction metadata.\n * @param index - The index of the authorization in the list.\n * @returns The prepared authorization.\n */\nfunction prepareAuthorization(\n  authorization: Authorization,\n  transactionMeta: TransactionMeta,\n  index: number,\n): Authorization & { chainId: Hex; nonce: Hex } {\n  const { chainId: existingChainId, nonce: existingNonce } = authorization;\n  const { txParams, chainId: transactionChainId } = transactionMeta;\n  const { nonce: transactionNonce } = txParams;\n\n  const chainId = existingChainId ?? transactionChainId;\n  let nonce = existingNonce;\n\n  nonce ??= toHex(parseInt(transactionNonce as string, 16) + 1 + index);\n\n  const result = {\n    ...authorization,\n    chainId,\n    nonce,\n  };\n\n  log('Prepared authorization', result);\n\n  return result;\n}\n"]}
+{"version":3,"file":"eip7702.cjs","sourceRoot":"","sources":["../../src/utils/eip7702.ts"],"names":[],"mappings":"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","sourcesContent":["import { defaultAbiCoder } from '@ethersproject/abi';\nimport { Contract } from '@ethersproject/contracts';\nimport { toHex } from '@metamask/controller-utils';\nimport type { NetworkClientId } from '@metamask/network-controller';\nimport { createModuleLogger, add0x } from '@metamask/utils';\nimport type { Hex } from '@metamask/utils';\n\nimport {\n  getEIP7702ContractAddresses,\n  getEIP7702SupportedChains,\n} from './feature-flags';\nimport { rpcRequest } from './provider';\nimport { ABI_IERC7821 } from '../constants';\nimport { projectLogger } from '../logger';\nimport type { TransactionControllerMessenger } from '../TransactionController';\nimport type {\n  BatchTransactionParams,\n  Authorization,\n  AuthorizationList,\n  TransactionMeta,\n} from '../types';\n\nexport const DELEGATION_PREFIX = '0xef0100';\nexport const BATCH_FUNCTION_NAME = 'execute';\nexport const CALLS_SIGNATURE = '(address,uint256,bytes)[]';\nexport const ERROR_MESSGE_PUBLIC_KEY = 'EIP-7702 public key not specified';\n\nconst log = createModuleLogger(projectLogger, 'eip-7702');\n\n/**\n * Determine if a chain supports EIP-7702 using LaunchDarkly feature flag.\n *\n * @param chainId - Hexadecimal ID of the chain.\n * @param messenger - Messenger instance.\n * @returns True if the chain supports EIP-7702.\n */\nexport function doesChainSupportEIP7702(\n  chainId: Hex,\n  messenger: TransactionControllerMessenger,\n): boolean {\n  const supportedChains = getEIP7702SupportedChains(messenger);\n\n  return supportedChains.some(\n    (supportedChainId) =>\n      supportedChainId.toLowerCase() === chainId.toLowerCase(),\n  );\n}\n\n/**\n * Retrieve the delegation address for an account.\n *\n * @param address - The address to check.\n * @param messenger - The TransactionController messenger.\n * @param networkClientId - The network client ID to use.\n * @returns  The delegation address if it exists.\n */\nexport async function getDelegationAddress(\n  address: Hex,\n  messenger: TransactionControllerMessenger,\n  networkClientId: NetworkClientId,\n): Promise<Hex | undefined> {\n  const code = (await rpcRequest({\n    messenger,\n    networkClientId,\n    method: 'eth_getCode',\n    params: [address, 'latest'],\n  })) as string;\n  const normalizedCode = add0x(code?.toLowerCase?.() ?? '');\n\n  const hasDelegation =\n    code?.length === 48 && normalizedCode.startsWith(DELEGATION_PREFIX);\n\n  return hasDelegation\n    ? add0x(normalizedCode.slice(DELEGATION_PREFIX.length))\n    : undefined;\n}\n\n/**\n * Determine if an account has been upgraded to a supported EIP-7702 contract.\n *\n * @param address - The EOA address to check.\n * @param chainId - The chain ID.\n * @param publicKey - Public key used to validate EIP-7702 contract signatures in feature flags.\n * @param messenger - The messenger instance.\n * @param networkClientId - The network client ID to use.\n * @returns An object with the results of the check.\n */\nexport async function isAccountUpgradedToEIP7702(\n  address: Hex,\n  chainId: Hex,\n  publicKey: Hex,\n  messenger: TransactionControllerMessenger,\n  networkClientId: NetworkClientId,\n): Promise<{\n  delegationAddress: Hex | undefined;\n  isSupported: boolean;\n}> {\n  const contractAddresses = getEIP7702ContractAddresses(\n    chainId,\n    messenger,\n    publicKey,\n  );\n\n  const delegationAddress = await getDelegationAddress(\n    address,\n    messenger,\n    networkClientId,\n  );\n\n  const isSupported = Boolean(\n    delegationAddress &&\n      contractAddresses.some(\n        (contract) =>\n          contract.toLowerCase() === delegationAddress.toLowerCase(),\n      ),\n  );\n\n  return {\n    delegationAddress,\n    isSupported,\n  };\n}\n\n/**\n * Generate an EIP-7702 batch transaction.\n *\n * @param from - The sender address.\n * @param transactions - The transactions to batch.\n * @returns The batch transaction.\n */\nexport function generateEIP7702BatchTransaction(\n  from: Hex,\n  transactions: BatchTransactionParams[],\n): BatchTransactionParams {\n  const erc7821Contract = Contract.getInterface(ABI_IERC7821);\n\n  const calls = transactions.map((transaction) => {\n    const { data, to, value } = transaction;\n\n    return [\n      to ?? '0x0000000000000000000000000000000000000000',\n      value ?? '0x0',\n      data ?? '0x',\n    ];\n  });\n\n  // Single batch mode, no opData.\n  const mode = '0x01'.padEnd(66, '0');\n\n  const callData = defaultAbiCoder.encode([CALLS_SIGNATURE], [calls]);\n\n  const data = erc7821Contract.encodeFunctionData(BATCH_FUNCTION_NAME, [\n    mode,\n    callData,\n  ]) as Hex;\n\n  log('Transaction data', data);\n\n  return {\n    data,\n    to: from,\n  };\n}\n\n/**\n * Sign an authorization list.\n *\n * @param options - Options bag.\n * @param options.authorizationList - The authorization list to sign.\n * @param options.messenger - The controller messenger.\n * @param options.transactionMeta - The transaction metadata.\n * @returns The signed authorization list.\n */\nexport async function signAuthorizationList({\n  authorizationList,\n  messenger,\n  transactionMeta,\n}: {\n  authorizationList?: AuthorizationList;\n  messenger: TransactionControllerMessenger;\n  transactionMeta: TransactionMeta;\n}): Promise<Required<AuthorizationList | undefined>> {\n  if (!authorizationList) {\n    return undefined;\n  }\n\n  const signedAuthorizationList: Required<AuthorizationList> = [];\n  let index = 0;\n\n  for (const authorization of authorizationList) {\n    const signedAuthorization = await signAuthorization(\n      authorization,\n      transactionMeta,\n      messenger,\n      index,\n    );\n\n    signedAuthorizationList.push(signedAuthorization);\n    index += 1;\n  }\n\n  return signedAuthorizationList;\n}\n\n/**\n * Signs an authorization.\n *\n * @param authorization - The authorization to sign.\n * @param transactionMeta - The associated transaction metadata.\n * @param messenger - The messenger to use for signing.\n * @param index - The index of the authorization in the list.\n * @returns The signed authorization.\n */\nasync function signAuthorization(\n  authorization: Authorization,\n  transactionMeta: TransactionMeta,\n  messenger: TransactionControllerMessenger,\n  index: number,\n): Promise<Required<Authorization>> {\n  const finalAuthorization = prepareAuthorization(\n    authorization,\n    transactionMeta,\n    index,\n  );\n\n  const { txParams } = transactionMeta;\n  const { from } = txParams;\n  const { address, chainId, nonce } = finalAuthorization;\n  const chainIdDecimal = parseInt(chainId, 16);\n  const nonceDecimal = parseInt(nonce, 16);\n\n  const signature = await messenger.call(\n    'KeyringController:signEip7702Authorization',\n    {\n      chainId: chainIdDecimal,\n      contractAddress: address,\n      from,\n      nonce: nonceDecimal,\n    },\n  );\n\n  // eslint-disable-next-line id-length\n  const r = signature.slice(0, 66) as Hex;\n  // eslint-disable-next-line id-length\n  const s = add0x(signature.slice(66, 130));\n  // eslint-disable-next-line id-length\n  const v = parseInt(signature.slice(130, 132), 16);\n  const yParity = toHex(v - 27 === 0 ? 0 : 1);\n\n  const result: Required<Authorization> = {\n    address,\n    chainId,\n    nonce,\n    r,\n    s,\n    yParity,\n  };\n\n  log('Signed authorization', result);\n\n  return result;\n}\n\n/**\n * Prepares an authorization for signing by populating the chainId and nonce.\n *\n * @param authorization - The authorization to prepare.\n * @param transactionMeta - The associated transaction metadata.\n * @param index - The index of the authorization in the list.\n * @returns The prepared authorization.\n */\nfunction prepareAuthorization(\n  authorization: Authorization,\n  transactionMeta: TransactionMeta,\n  index: number,\n): Authorization & { chainId: Hex; nonce: Hex } {\n  const { chainId: existingChainId, nonce: existingNonce } = authorization;\n  const { txParams, chainId: transactionChainId } = transactionMeta;\n  const { nonce: transactionNonce } = txParams;\n\n  const chainId = existingChainId ?? transactionChainId;\n  let nonce = existingNonce;\n\n  nonce ??= toHex(parseInt(transactionNonce as string, 16) + 1 + index);\n\n  const result = {\n    ...authorization,\n    chainId,\n    nonce,\n  };\n\n  log('Prepared authorization', result);\n\n  return result;\n}\n"]}

package/dist/utils/eip7702.d.cts

@@ -1,4 +1,4 @@
-import type EthQuery from "@metamask/eth-query";
+import type { NetworkClientId } from "@metamask/network-controller";
 import type { Hex } from "@metamask/utils";
 import type { TransactionControllerMessenger } from "../TransactionController.cjs";
 import type { BatchTransactionParams, AuthorizationList, TransactionMeta } from "../types.cjs";
@@ -18,10 +18,11 @@ export declare function doesChainSupportEIP7702(chainId: Hex, messenger: Transac
  * Retrieve the delegation address for an account.
  *
  * @param address - The address to check.
- * @param ethQuery - The EthQuery instance to communicate with the blockchain.
+ * @param messenger - The TransactionController messenger.
+ * @param networkClientId - The network client ID to use.
  * @returns  The delegation address if it exists.
  */
-export declare function getDelegationAddress(address: Hex, ethQuery: EthQuery): Promise<Hex | undefined>;
+export declare function getDelegationAddress(address: Hex, messenger: TransactionControllerMessenger, networkClientId: NetworkClientId): Promise<Hex | undefined>;
 /**
  * Determine if an account has been upgraded to a supported EIP-7702 contract.
  *
@@ -29,10 +30,10 @@ export declare function getDelegationAddress(address: Hex, ethQuery: EthQuery):
  * @param chainId - The chain ID.
  * @param publicKey - Public key used to validate EIP-7702 contract signatures in feature flags.
  * @param messenger - The messenger instance.
- * @param ethQuery - The EthQuery instance to communicate with the blockchain.
+ * @param networkClientId - The network client ID to use.
  * @returns An object with the results of the check.
  */
-export declare function isAccountUpgradedToEIP7702(address: Hex, chainId: Hex, publicKey: Hex, messenger: TransactionControllerMessenger, ethQuery: EthQuery): Promise<{
+export declare function isAccountUpgradedToEIP7702(address: Hex, chainId: Hex, publicKey: Hex, messenger: TransactionControllerMessenger, networkClientId: NetworkClientId): Promise<{
     delegationAddress: Hex | undefined;
     isSupported: boolean;
 }>;

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

@@ -1 +1 @@
-{"version":3,"file":"eip7702.d.cts","sourceRoot":"","sources":["../../src/utils/eip7702.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,QAAQ,4BAA4B;AAEhD,OAAO,KAAK,EAAE,GAAG,EAAE,wBAAwB;AAQ3C,OAAO,KAAK,EAAE,8BAA8B,EAAE,qCAAiC;AAC/E,OAAO,KAAK,EACV,sBAAsB,EAEtB,iBAAiB,EACjB,eAAe,EAChB,qBAAiB;AAElB,eAAO,MAAM,iBAAiB,aAAa,CAAC;AAC5C,eAAO,MAAM,mBAAmB,YAAY,CAAC;AAC7C,eAAO,MAAM,eAAe,8BAA8B,CAAC;AAC3D,eAAO,MAAM,uBAAuB,sCAAsC,CAAC;AAI3E;;;;;;GAMG;AACH,wBAAgB,uBAAuB,CACrC,OAAO,EAAE,GAAG,EACZ,SAAS,EAAE,8BAA8B,GACxC,OAAO,CAOT;AAED;;;;;;GAMG;AACH,wBAAsB,oBAAoB,CACxC,OAAO,EAAE,GAAG,EACZ,QAAQ,EAAE,QAAQ,GACjB,OAAO,CAAC,GAAG,GAAG,SAAS,CAAC,CAU1B;AAED;;;;;;;;;GASG;AACH,wBAAsB,0BAA0B,CAC9C,OAAO,EAAE,GAAG,EACZ,OAAO,EAAE,GAAG,EACZ,SAAS,EAAE,GAAG,EACd,SAAS,EAAE,8BAA8B,EACzC,QAAQ,EAAE,QAAQ,GACjB,OAAO,CAAC;IACT,iBAAiB,EAAE,GAAG,GAAG,SAAS,CAAC;IACnC,WAAW,EAAE,OAAO,CAAC;CACtB,CAAC,CAqBD;AAED;;;;;;GAMG;AACH,wBAAgB,+BAA+B,CAC7C,IAAI,EAAE,GAAG,EACT,YAAY,EAAE,sBAAsB,EAAE,GACrC,sBAAsB,CA6BxB;AAED;;;;;;;;GAQG;AACH,wBAAsB,qBAAqB,CAAC,EAC1C,iBAAiB,EACjB,SAAS,EACT,eAAe,GAChB,EAAE;IACD,iBAAiB,CAAC,EAAE,iBAAiB,CAAC;IACtC,SAAS,EAAE,8BAA8B,CAAC;IAC1C,eAAe,EAAE,eAAe,CAAC;CAClC,GAAG,OAAO,CAAC,QAAQ,CAAC,iBAAiB,GAAG,SAAS,CAAC,CAAC,CAqBnD"}
+{"version":3,"file":"eip7702.d.cts","sourceRoot":"","sources":["../../src/utils/eip7702.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,EAAE,eAAe,EAAE,qCAAqC;AAEpE,OAAO,KAAK,EAAE,GAAG,EAAE,wBAAwB;AAS3C,OAAO,KAAK,EAAE,8BAA8B,EAAE,qCAAiC;AAC/E,OAAO,KAAK,EACV,sBAAsB,EAEtB,iBAAiB,EACjB,eAAe,EAChB,qBAAiB;AAElB,eAAO,MAAM,iBAAiB,aAAa,CAAC;AAC5C,eAAO,MAAM,mBAAmB,YAAY,CAAC;AAC7C,eAAO,MAAM,eAAe,8BAA8B,CAAC;AAC3D,eAAO,MAAM,uBAAuB,sCAAsC,CAAC;AAI3E;;;;;;GAMG;AACH,wBAAgB,uBAAuB,CACrC,OAAO,EAAE,GAAG,EACZ,SAAS,EAAE,8BAA8B,GACxC,OAAO,CAOT;AAED;;;;;;;GAOG;AACH,wBAAsB,oBAAoB,CACxC,OAAO,EAAE,GAAG,EACZ,SAAS,EAAE,8BAA8B,EACzC,eAAe,EAAE,eAAe,GAC/B,OAAO,CAAC,GAAG,GAAG,SAAS,CAAC,CAe1B;AAED;;;;;;;;;GASG;AACH,wBAAsB,0BAA0B,CAC9C,OAAO,EAAE,GAAG,EACZ,OAAO,EAAE,GAAG,EACZ,SAAS,EAAE,GAAG,EACd,SAAS,EAAE,8BAA8B,EACzC,eAAe,EAAE,eAAe,GAC/B,OAAO,CAAC;IACT,iBAAiB,EAAE,GAAG,GAAG,SAAS,CAAC;IACnC,WAAW,EAAE,OAAO,CAAC;CACtB,CAAC,CAyBD;AAED;;;;;;GAMG;AACH,wBAAgB,+BAA+B,CAC7C,IAAI,EAAE,GAAG,EACT,YAAY,EAAE,sBAAsB,EAAE,GACrC,sBAAsB,CA6BxB;AAED;;;;;;;;GAQG;AACH,wBAAsB,qBAAqB,CAAC,EAC1C,iBAAiB,EACjB,SAAS,EACT,eAAe,GAChB,EAAE;IACD,iBAAiB,CAAC,EAAE,iBAAiB,CAAC;IACtC,SAAS,EAAE,8BAA8B,CAAC;IAC1C,eAAe,EAAE,eAAe,CAAC;CAClC,GAAG,OAAO,CAAC,QAAQ,CAAC,iBAAiB,GAAG,SAAS,CAAC,CAAC,CAqBnD"}

package/dist/utils/eip7702.d.mts

@@ -1,4 +1,4 @@
-import type EthQuery from "@metamask/eth-query";
+import type { NetworkClientId } from "@metamask/network-controller";
 import type { Hex } from "@metamask/utils";
 import type { TransactionControllerMessenger } from "../TransactionController.mjs";
 import type { BatchTransactionParams, AuthorizationList, TransactionMeta } from "../types.mjs";
@@ -18,10 +18,11 @@ export declare function doesChainSupportEIP7702(chainId: Hex, messenger: Transac
  * Retrieve the delegation address for an account.
  *
  * @param address - The address to check.
- * @param ethQuery - The EthQuery instance to communicate with the blockchain.
+ * @param messenger - The TransactionController messenger.
+ * @param networkClientId - The network client ID to use.
  * @returns  The delegation address if it exists.
  */
-export declare function getDelegationAddress(address: Hex, ethQuery: EthQuery): Promise<Hex | undefined>;
+export declare function getDelegationAddress(address: Hex, messenger: TransactionControllerMessenger, networkClientId: NetworkClientId): Promise<Hex | undefined>;
 /**
  * Determine if an account has been upgraded to a supported EIP-7702 contract.
  *
@@ -29,10 +30,10 @@ export declare function getDelegationAddress(address: Hex, ethQuery: EthQuery):
  * @param chainId - The chain ID.
  * @param publicKey - Public key used to validate EIP-7702 contract signatures in feature flags.
  * @param messenger - The messenger instance.
- * @param ethQuery - The EthQuery instance to communicate with the blockchain.
+ * @param networkClientId - The network client ID to use.
  * @returns An object with the results of the check.
  */
-export declare function isAccountUpgradedToEIP7702(address: Hex, chainId: Hex, publicKey: Hex, messenger: TransactionControllerMessenger, ethQuery: EthQuery): Promise<{
+export declare function isAccountUpgradedToEIP7702(address: Hex, chainId: Hex, publicKey: Hex, messenger: TransactionControllerMessenger, networkClientId: NetworkClientId): Promise<{
     delegationAddress: Hex | undefined;
     isSupported: boolean;
 }>;

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

@@ -1 +1 @@
-{"version":3,"file":"eip7702.d.mts","sourceRoot":"","sources":["../../src/utils/eip7702.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,QAAQ,4BAA4B;AAEhD,OAAO,KAAK,EAAE,GAAG,EAAE,wBAAwB;AAQ3C,OAAO,KAAK,EAAE,8BAA8B,EAAE,qCAAiC;AAC/E,OAAO,KAAK,EACV,sBAAsB,EAEtB,iBAAiB,EACjB,eAAe,EAChB,qBAAiB;AAElB,eAAO,MAAM,iBAAiB,aAAa,CAAC;AAC5C,eAAO,MAAM,mBAAmB,YAAY,CAAC;AAC7C,eAAO,MAAM,eAAe,8BAA8B,CAAC;AAC3D,eAAO,MAAM,uBAAuB,sCAAsC,CAAC;AAI3E;;;;;;GAMG;AACH,wBAAgB,uBAAuB,CACrC,OAAO,EAAE,GAAG,EACZ,SAAS,EAAE,8BAA8B,GACxC,OAAO,CAOT;AAED;;;;;;GAMG;AACH,wBAAsB,oBAAoB,CACxC,OAAO,EAAE,GAAG,EACZ,QAAQ,EAAE,QAAQ,GACjB,OAAO,CAAC,GAAG,GAAG,SAAS,CAAC,CAU1B;AAED;;;;;;;;;GASG;AACH,wBAAsB,0BAA0B,CAC9C,OAAO,EAAE,GAAG,EACZ,OAAO,EAAE,GAAG,EACZ,SAAS,EAAE,GAAG,EACd,SAAS,EAAE,8BAA8B,EACzC,QAAQ,EAAE,QAAQ,GACjB,OAAO,CAAC;IACT,iBAAiB,EAAE,GAAG,GAAG,SAAS,CAAC;IACnC,WAAW,EAAE,OAAO,CAAC;CACtB,CAAC,CAqBD;AAED;;;;;;GAMG;AACH,wBAAgB,+BAA+B,CAC7C,IAAI,EAAE,GAAG,EACT,YAAY,EAAE,sBAAsB,EAAE,GACrC,sBAAsB,CA6BxB;AAED;;;;;;;;GAQG;AACH,wBAAsB,qBAAqB,CAAC,EAC1C,iBAAiB,EACjB,SAAS,EACT,eAAe,GAChB,EAAE;IACD,iBAAiB,CAAC,EAAE,iBAAiB,CAAC;IACtC,SAAS,EAAE,8BAA8B,CAAC;IAC1C,eAAe,EAAE,eAAe,CAAC;CAClC,GAAG,OAAO,CAAC,QAAQ,CAAC,iBAAiB,GAAG,SAAS,CAAC,CAAC,CAqBnD"}
+{"version":3,"file":"eip7702.d.mts","sourceRoot":"","sources":["../../src/utils/eip7702.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,EAAE,eAAe,EAAE,qCAAqC;AAEpE,OAAO,KAAK,EAAE,GAAG,EAAE,wBAAwB;AAS3C,OAAO,KAAK,EAAE,8BAA8B,EAAE,qCAAiC;AAC/E,OAAO,KAAK,EACV,sBAAsB,EAEtB,iBAAiB,EACjB,eAAe,EAChB,qBAAiB;AAElB,eAAO,MAAM,iBAAiB,aAAa,CAAC;AAC5C,eAAO,MAAM,mBAAmB,YAAY,CAAC;AAC7C,eAAO,MAAM,eAAe,8BAA8B,CAAC;AAC3D,eAAO,MAAM,uBAAuB,sCAAsC,CAAC;AAI3E;;;;;;GAMG;AACH,wBAAgB,uBAAuB,CACrC,OAAO,EAAE,GAAG,EACZ,SAAS,EAAE,8BAA8B,GACxC,OAAO,CAOT;AAED;;;;;;;GAOG;AACH,wBAAsB,oBAAoB,CACxC,OAAO,EAAE,GAAG,EACZ,SAAS,EAAE,8BAA8B,EACzC,eAAe,EAAE,eAAe,GAC/B,OAAO,CAAC,GAAG,GAAG,SAAS,CAAC,CAe1B;AAED;;;;;;;;;GASG;AACH,wBAAsB,0BAA0B,CAC9C,OAAO,EAAE,GAAG,EACZ,OAAO,EAAE,GAAG,EACZ,SAAS,EAAE,GAAG,EACd,SAAS,EAAE,8BAA8B,EACzC,eAAe,EAAE,eAAe,GAC/B,OAAO,CAAC;IACT,iBAAiB,EAAE,GAAG,GAAG,SAAS,CAAC;IACnC,WAAW,EAAE,OAAO,CAAC;CACtB,CAAC,CAyBD;AAED;;;;;;GAMG;AACH,wBAAgB,+BAA+B,CAC7C,IAAI,EAAE,GAAG,EACT,YAAY,EAAE,sBAAsB,EAAE,GACrC,sBAAsB,CA6BxB;AAED;;;;;;;;GAQG;AACH,wBAAsB,qBAAqB,CAAC,EAC1C,iBAAiB,EACjB,SAAS,EACT,eAAe,GAChB,EAAE;IACD,iBAAiB,CAAC,EAAE,iBAAiB,CAAC;IACtC,SAAS,EAAE,8BAA8B,CAAC;IAC1C,eAAe,EAAE,eAAe,CAAC;CAClC,GAAG,OAAO,CAAC,QAAQ,CAAC,iBAAiB,GAAG,SAAS,CAAC,CAAC,CAqBnD"}

package/dist/utils/eip7702.mjs

@@ -1,8 +1,9 @@
 import { defaultAbiCoder } from "@ethersproject/abi";
 import { Contract } from "@ethersproject/contracts";
-import { query, toHex } from "@metamask/controller-utils";
+import { toHex } from "@metamask/controller-utils";
 import { createModuleLogger, add0x } from "@metamask/utils";
 import { getEIP7702ContractAddresses, getEIP7702SupportedChains } from "./feature-flags.mjs";
+import { rpcRequest } from "./provider.mjs";
 import { ABI_IERC7821 } from "../constants.mjs";
 import { projectLogger } from "../logger.mjs";
 export const DELEGATION_PREFIX = '0xef0100';
@@ -25,11 +26,17 @@ export function doesChainSupportEIP7702(chainId, messenger) {
  * Retrieve the delegation address for an account.
  *
  * @param address - The address to check.
- * @param ethQuery - The EthQuery instance to communicate with the blockchain.
+ * @param messenger - The TransactionController messenger.
+ * @param networkClientId - The network client ID to use.
  * @returns  The delegation address if it exists.
  */
-export async function getDelegationAddress(address, ethQuery) {
-    const code = await query(ethQuery, 'eth_getCode', [address]);
+export async function getDelegationAddress(address, messenger, networkClientId) {
+    const code = (await rpcRequest({
+        messenger,
+        networkClientId,
+        method: 'eth_getCode',
+        params: [address, 'latest'],
+    }));
     const normalizedCode = add0x(code?.toLowerCase?.() ?? '');
     const hasDelegation = code?.length === 48 && normalizedCode.startsWith(DELEGATION_PREFIX);
     return hasDelegation
@@ -43,12 +50,12 @@ export async function getDelegationAddress(address, ethQuery) {
  * @param chainId - The chain ID.
  * @param publicKey - Public key used to validate EIP-7702 contract signatures in feature flags.
  * @param messenger - The messenger instance.
- * @param ethQuery - The EthQuery instance to communicate with the blockchain.
+ * @param networkClientId - The network client ID to use.
  * @returns An object with the results of the check.
  */
-export async function isAccountUpgradedToEIP7702(address, chainId, publicKey, messenger, ethQuery) {
+export async function isAccountUpgradedToEIP7702(address, chainId, publicKey, messenger, networkClientId) {
     const contractAddresses = getEIP7702ContractAddresses(chainId, messenger, publicKey);
-    const delegationAddress = await getDelegationAddress(address, ethQuery);
+    const delegationAddress = await getDelegationAddress(address, messenger, networkClientId);
     const isSupported = Boolean(delegationAddress &&
         contractAddresses.some((contract) => contract.toLowerCase() === delegationAddress.toLowerCase()));
     return {