@metamask/transaction-controller 52.0.0 → 52.2.0

package/dist/utils/batch.cjs

@@ -8,6 +8,7 @@ const eip7702_1 = require("./eip7702.cjs");
 const feature_flags_1 = require("./feature-flags.cjs");
 const validation_1 = require("./validation.cjs");
 const __1 = require("../index.cjs");
+const CollectPublishHook_1 = require("../hooks/CollectPublishHook.cjs");
 const logger_1 = require("../logger.cjs");
 const types_1 = require("../types.cjs");
 const log = (0, utils_1.createModuleLogger)(logger_1.projectLogger, 'batch');
@@ -25,8 +26,11 @@ async function addTransactionBatch(request) {
         request: userRequest,
         sizeLimit,
     });
-    const { batchId: batchIdOverride, from, networkClientId, requireApproval, transactions, } = userRequest;
+    const { batchId: batchIdOverride, from, networkClientId, requireApproval, securityAlertId, transactions, useHook, validateSecurity, } = userRequest;
     log('Adding', userRequest);
+    if (useHook) {
+        return await addTransactionBatchWithHook(request);
+    }
     const chainId = getChainId(networkClientId);
     const ethQuery = request.getEthQuery(networkClientId);
     const isChainSupported = (0, eip7702_1.doesChainSupportEIP7702)(chainId, messenger);
@@ -57,13 +61,34 @@ async function addTransactionBatch(request) {
         txParams.type = types_1.TransactionEnvelopeType.setCode;
         txParams.authorizationList = [{ address: upgradeContractAddress }];
     }
+    if (validateSecurity) {
+        const securityRequest = {
+            method: 'eth_sendTransaction',
+            params: [
+                {
+                    ...txParams,
+                    authorizationList: undefined,
+                    type: types_1.TransactionEnvelopeType.feeMarket,
+                },
+            ],
+            delegationMock: txParams.authorizationList?.[0]?.address,
+        };
+        log('Security request', securityRequest);
+        validateSecurity(securityRequest, chainId).catch((error) => {
+            log('Security validation failed', error);
+        });
+    }
     log('Adding batch transaction', txParams, networkClientId);
     const batchId = batchIdOverride ?? generateBatchId();
+    const securityAlertResponse = securityAlertId
+        ? { securityAlertId }
+        : undefined;
     const { result } = await addTransaction(txParams, {
         batchId,
         nestedTransactions,
         networkClientId,
         requireApproval,
+        securityAlertResponse,
         type: types_1.TransactionType.batch,
     });
     // Wait for the transaction to be published.
@@ -124,4 +149,120 @@ async function getNestedTransactionMeta(request, singleRequest, ethQuery) {
         type,
     };
 }
+/**
+ * Process a batch transaction using a publish batch hook.
+ *
+ * @param request - The request object including the user request and necessary callbacks.
+ * @returns The batch result object including the batch ID.
+ */
+async function addTransactionBatchWithHook(request) {
+    const { publishBatchHook, request: userRequest } = request;
+    const { from, networkClientId, transactions: nestedTransactions, } = userRequest;
+    log('Adding transaction batch using hook', userRequest);
+    if (!publishBatchHook) {
+        log('No publish batch hook provided');
+        throw new Error('No publish batch hook provided');
+    }
+    const batchId = generateBatchId();
+    const transactionCount = nestedTransactions.length;
+    const collectHook = new CollectPublishHook_1.CollectPublishHook(transactionCount);
+    const publishHook = collectHook.getHook();
+    const hookTransactions = [];
+    try {
+        for (const nestedTransaction of nestedTransactions) {
+            const hookTransaction = await processTransactionWithHook(batchId, nestedTransaction, publishHook, request);
+            hookTransactions.push(hookTransaction);
+        }
+        const { signedTransactions } = await collectHook.ready();
+        const transactions = hookTransactions.map((transaction, index) => ({
+            ...transaction,
+            signedTx: signedTransactions[index],
+        }));
+        log('Calling publish batch hook', { from, networkClientId, transactions });
+        const result = await publishBatchHook({
+            from,
+            networkClientId,
+            transactions,
+        });
+        log('Publish batch hook result', result);
+        if (!result) {
+            throw new Error('Publish batch hook did not return a result');
+        }
+        const transactionHashes = result.results.map(({ transactionHash }) => transactionHash);
+        collectHook.success(transactionHashes);
+        log('Completed batch transaction with hook', transactionHashes);
+        return {
+            batchId,
+        };
+    }
+    catch (error) {
+        log('Publish batch hook failed', error);
+        collectHook.error(error);
+        throw error;
+    }
+}
+/**
+ * Process a single transaction with a publish batch hook.
+ *
+ * @param batchId - ID of the transaction batch.
+ * @param nestedTransaction - The nested transaction request.
+ * @param publishHook - The publish hook to use for each transaction.
+ * @param request - The request object including the user request and necessary callbacks.
+ * @returns The single transaction request to be processed by the publish batch hook.
+ */
+async function processTransactionWithHook(batchId, nestedTransaction, publishHook, request) {
+    const { existingTransaction, params } = nestedTransaction;
+    const { addTransaction, getTransaction, request: userRequest, updateTransaction, } = request;
+    const { from, networkClientId } = userRequest;
+    if (existingTransaction) {
+        const { id, onPublish, signedTransaction } = existingTransaction;
+        const transactionMeta = getTransaction(id);
+        updateTransaction({ transactionId: id }, (_transactionMeta) => {
+            _transactionMeta.batchId = batchId;
+        });
+        publishHook(transactionMeta, signedTransaction)
+            .then(onPublish)
+            .catch(() => {
+            // Intentionally empty
+        });
+        log('Processed existing transaction with hook', {
+            id,
+            params,
+        });
+        return {
+            id,
+            params,
+        };
+    }
+    const { transactionMeta } = await addTransaction({
+        ...params,
+        from,
+    }, {
+        batchId,
+        disableGasBuffer: true,
+        networkClientId,
+        publishHook,
+        requireApproval: false,
+    });
+    const { id, txParams } = transactionMeta;
+    const data = txParams.data;
+    const gas = txParams.gas;
+    const maxFeePerGas = txParams.maxFeePerGas;
+    const maxPriorityFeePerGas = txParams.maxPriorityFeePerGas;
+    const to = txParams.to;
+    const value = txParams.value;
+    const newParams = {
+        data,
+        gas,
+        maxFeePerGas,
+        maxPriorityFeePerGas,
+        to,
+        value,
+    };
+    log('Processed new transaction with hook', { id, params: newParams });
+    return {
+        id,
+        params: newParams,
+    };
+}
 //# sourceMappingURL=batch.cjs.map

package/dist/utils/batch.cjs.map

@@ -1 +1 @@
-{"version":3,"file":"batch.cjs","sourceRoot":"","sources":["../../src/utils/batch.ts"],"names":[],"mappings":"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","sourcesContent":["import type EthQuery from '@metamask/eth-query';\nimport { rpcErrors } from '@metamask/rpc-errors';\nimport type { Hex } from '@metamask/utils';\nimport { bytesToHex, createModuleLogger } from '@metamask/utils';\nimport { parse, v4 } from 'uuid';\n\nimport {\n  doesChainSupportEIP7702,\n  generateEIP7702BatchTransaction,\n  isAccountUpgradedToEIP7702,\n} from './eip7702';\nimport {\n  getBatchSizeLimit,\n  getEIP7702SupportedChains,\n  getEIP7702UpgradeContractAddress,\n} from './feature-flags';\nimport { validateBatchRequest } from './validation';\nimport {\n  determineTransactionType,\n  type TransactionBatchRequest,\n  type TransactionController,\n  type TransactionControllerMessenger,\n} from '..';\nimport { projectLogger } from '../logger';\nimport type {\n  NestedTransactionMetadata,\n  TransactionBatchSingleRequest,\n} from '../types';\nimport {\n  TransactionEnvelopeType,\n  type TransactionBatchResult,\n  type TransactionParams,\n  TransactionType,\n} from '../types';\n\ntype AddTransactionBatchRequest = {\n  addTransaction: TransactionController['addTransaction'];\n  getChainId: (networkClientId: string) => Hex;\n  getEthQuery: (networkClientId: string) => EthQuery;\n  getInternalAccounts: () => Hex[];\n  messenger: TransactionControllerMessenger;\n  publicKeyEIP7702?: Hex;\n  request: TransactionBatchRequest;\n};\n\ntype IsAtomicBatchSupportedRequest = {\n  address: Hex;\n  getEthQuery: (chainId: Hex) => EthQuery;\n  messenger: TransactionControllerMessenger;\n  publicKeyEIP7702?: Hex;\n};\n\nconst log = createModuleLogger(projectLogger, 'batch');\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    addTransaction,\n    getChainId,\n    getInternalAccounts,\n    messenger,\n    publicKeyEIP7702,\n    request: userRequest,\n  } = request;\n\n  const sizeLimit = getBatchSizeLimit(messenger);\n\n  validateBatchRequest({\n    internalAccounts: getInternalAccounts(),\n    request: userRequest,\n    sizeLimit,\n  });\n\n  const {\n    batchId: batchIdOverride,\n    from,\n    networkClientId,\n    requireApproval,\n    transactions,\n  } = userRequest;\n\n  log('Adding', 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('EIP-7702 public key not specified');\n  }\n\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) {\n    log('Account upgraded to unsupported contract', from, delegationAddress);\n    throw rpcErrors.internal('Account upgraded to unsupported contract');\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    from,\n    ...batchParams,\n  };\n\n  if (!isSupported) {\n    const upgradeContractAddress = getEIP7702UpgradeContractAddress(\n      chainId,\n      messenger,\n      publicKeyEIP7702,\n    );\n\n    if (!upgradeContractAddress) {\n      throw rpcErrors.internal('Upgrade contract address not found');\n    }\n\n    txParams.type = TransactionEnvelopeType.setCode;\n    txParams.authorizationList = [{ address: upgradeContractAddress }];\n  }\n\n  log('Adding batch transaction', txParams, networkClientId);\n\n  const batchId = batchIdOverride ?? generateBatchId();\n\n  const { result } = await addTransaction(txParams, {\n    batchId,\n    nestedTransactions,\n    networkClientId,\n    requireApproval,\n    type: TransactionType.batch,\n  });\n\n  // Wait for the transaction to be published.\n  await result;\n\n  return {\n    batchId,\n  };\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: IsAtomicBatchSupportedRequest,\n): Promise<Hex[]> {\n  const {\n    address,\n    getEthQuery,\n    messenger,\n    publicKeyEIP7702: publicKey,\n  } = request;\n\n  if (!publicKey) {\n    throw rpcErrors.internal('EIP-7702 public key not specified');\n  }\n\n  const chainIds7702 = getEIP7702SupportedChains(messenger);\n  const chainIds: Hex[] = [];\n\n  for (const chainId of chainIds7702) {\n    const ethQuery = getEthQuery(chainId);\n\n    const { isSupported, delegationAddress } = await isAccountUpgradedToEIP7702(\n      address,\n      chainId,\n      publicKey,\n      messenger,\n      ethQuery,\n    );\n\n    if (!delegationAddress || isSupported) {\n      chainIds.push(chainId);\n    }\n  }\n\n  log('Atomic batch supported chains', chainIds);\n\n  return chainIds;\n}\n\n/**\n * Generate a tranasction 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 } = singleRequest;\n\n  const { type } = await determineTransactionType(\n    { from, ...params },\n    ethQuery,\n  );\n\n  return {\n    ...params,\n    type,\n  };\n}\n"]}
+{"version":3,"file":"batch.cjs","sourceRoot":"","sources":["../../src/utils/batch.ts"],"names":[],"mappings":"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","sourcesContent":["import type EthQuery from '@metamask/eth-query';\nimport { rpcErrors } from '@metamask/rpc-errors';\nimport type { Hex } from '@metamask/utils';\nimport { bytesToHex, createModuleLogger } from '@metamask/utils';\nimport { parse, v4 } from 'uuid';\n\nimport {\n  doesChainSupportEIP7702,\n  generateEIP7702BatchTransaction,\n  isAccountUpgradedToEIP7702,\n} from './eip7702';\nimport {\n  getBatchSizeLimit,\n  getEIP7702SupportedChains,\n  getEIP7702UpgradeContractAddress,\n} from './feature-flags';\nimport { validateBatchRequest } from './validation';\nimport {\n  determineTransactionType,\n  type BatchTransactionParams,\n  type TransactionController,\n  type TransactionControllerMessenger,\n  type TransactionMeta,\n} from '..';\nimport { CollectPublishHook } from '../hooks/CollectPublishHook';\nimport { projectLogger } from '../logger';\nimport type {\n  NestedTransactionMetadata,\n  SecurityAlertResponse,\n  TransactionBatchSingleRequest,\n  PublishBatchHook,\n  PublishBatchHookTransaction,\n  PublishHook,\n  TransactionBatchRequest,\n  ValidateSecurityRequest,\n} from '../types';\nimport {\n  TransactionEnvelopeType,\n  type TransactionBatchResult,\n  type TransactionParams,\n  TransactionType,\n} from '../types';\n\ntype AddTransactionBatchRequest = {\n  addTransaction: TransactionController['addTransaction'];\n  getChainId: (networkClientId: string) => Hex;\n  getEthQuery: (networkClientId: string) => EthQuery;\n  getInternalAccounts: () => Hex[];\n  getTransaction: (id: string) => TransactionMeta;\n  messenger: TransactionControllerMessenger;\n  publishBatchHook?: PublishBatchHook;\n  publicKeyEIP7702?: Hex;\n  request: TransactionBatchRequest;\n  updateTransaction: (\n    options: { transactionId: string },\n    callback: (transactionMeta: TransactionMeta) => void,\n  ) => void;\n};\n\ntype IsAtomicBatchSupportedRequest = {\n  address: Hex;\n  getEthQuery: (chainId: Hex) => EthQuery;\n  messenger: TransactionControllerMessenger;\n  publicKeyEIP7702?: Hex;\n};\n\nconst log = createModuleLogger(projectLogger, 'batch');\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    addTransaction,\n    getChainId,\n    getInternalAccounts,\n    messenger,\n    publicKeyEIP7702,\n    request: userRequest,\n  } = request;\n\n  const sizeLimit = getBatchSizeLimit(messenger);\n\n  validateBatchRequest({\n    internalAccounts: getInternalAccounts(),\n    request: userRequest,\n    sizeLimit,\n  });\n\n  const {\n    batchId: batchIdOverride,\n    from,\n    networkClientId,\n    requireApproval,\n    securityAlertId,\n    transactions,\n    useHook,\n    validateSecurity,\n  } = userRequest;\n\n  log('Adding', userRequest);\n\n  if (useHook) {\n    return await addTransactionBatchWithHook(request);\n  }\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('EIP-7702 public key not specified');\n  }\n\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) {\n    log('Account upgraded to unsupported contract', from, delegationAddress);\n    throw rpcErrors.internal('Account upgraded to unsupported contract');\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    from,\n    ...batchParams,\n  };\n\n  if (!isSupported) {\n    const upgradeContractAddress = getEIP7702UpgradeContractAddress(\n      chainId,\n      messenger,\n      publicKeyEIP7702,\n    );\n\n    if (!upgradeContractAddress) {\n      throw rpcErrors.internal('Upgrade contract address not found');\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    };\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 { result } = await addTransaction(txParams, {\n    batchId,\n    nestedTransactions,\n    networkClientId,\n    requireApproval,\n    securityAlertResponse,\n    type: TransactionType.batch,\n  });\n\n  // Wait for the transaction to be published.\n  await result;\n\n  return {\n    batchId,\n  };\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: IsAtomicBatchSupportedRequest,\n): Promise<Hex[]> {\n  const {\n    address,\n    getEthQuery,\n    messenger,\n    publicKeyEIP7702: publicKey,\n  } = request;\n\n  if (!publicKey) {\n    throw rpcErrors.internal('EIP-7702 public key not specified');\n  }\n\n  const chainIds7702 = getEIP7702SupportedChains(messenger);\n  const chainIds: Hex[] = [];\n\n  for (const chainId of chainIds7702) {\n    const ethQuery = getEthQuery(chainId);\n\n    const { isSupported, delegationAddress } = await isAccountUpgradedToEIP7702(\n      address,\n      chainId,\n      publicKey,\n      messenger,\n      ethQuery,\n    );\n\n    if (!delegationAddress || isSupported) {\n      chainIds.push(chainId);\n    }\n  }\n\n  log('Atomic batch supported chains', chainIds);\n\n  return chainIds;\n}\n\n/**\n * Generate a tranasction 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 } = singleRequest;\n\n  const { type } = await determineTransactionType(\n    { from, ...params },\n    ethQuery,\n  );\n\n  return {\n    ...params,\n    type,\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 { publishBatchHook, request: userRequest } = request;\n\n  const {\n    from,\n    networkClientId,\n    transactions: nestedTransactions,\n  } = userRequest;\n\n  log('Adding transaction batch using hook', userRequest);\n\n  if (!publishBatchHook) {\n    log('No publish batch hook provided');\n    throw new Error('No publish batch hook provided');\n  }\n\n  const batchId = generateBatchId();\n  const transactionCount = nestedTransactions.length;\n  const collectHook = new CollectPublishHook(transactionCount);\n  const publishHook = collectHook.getHook();\n  const hookTransactions: Omit<PublishBatchHookTransaction, 'signedTx'>[] = [];\n\n  try {\n    for (const nestedTransaction of nestedTransactions) {\n      const hookTransaction = await processTransactionWithHook(\n        batchId,\n        nestedTransaction,\n        publishHook,\n        request,\n      );\n\n      hookTransactions.push(hookTransaction);\n    }\n\n    const { signedTransactions } = await collectHook.ready();\n\n    const transactions = hookTransactions.map((transaction, index) => ({\n      ...transaction,\n      signedTx: signedTransactions[index],\n    }));\n\n    log('Calling publish batch hook', { from, networkClientId, transactions });\n\n    const result = await publishBatchHook({\n      from,\n      networkClientId,\n      transactions,\n    });\n\n    log('Publish batch hook result', result);\n\n    if (!result) {\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\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\n    throw error;\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 * @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) {\n  const { existingTransaction, params } = nestedTransaction;\n\n  const {\n    addTransaction,\n    getTransaction,\n    request: userRequest,\n    updateTransaction,\n  } = request;\n\n  const { from, networkClientId } = userRequest;\n\n  if (existingTransaction) {\n    const { id, onPublish, signedTransaction } = existingTransaction;\n    const transactionMeta = getTransaction(id);\n\n    updateTransaction({ transactionId: id }, (_transactionMeta) => {\n      _transactionMeta.batchId = batchId;\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 { transactionMeta } = await addTransaction(\n    {\n      ...params,\n      from,\n    },\n    {\n      batchId,\n      disableGasBuffer: true,\n      networkClientId,\n      publishHook,\n      requireApproval: false,\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', { id, params: newParams });\n\n  return {\n    id,\n    params: newParams,\n  };\n}\n"]}

package/dist/utils/batch.d.cts

@@ -1,15 +1,21 @@
 import type EthQuery from "@metamask/eth-query";
 import type { Hex } from "@metamask/utils";
-import { type TransactionBatchRequest, type TransactionController, type TransactionControllerMessenger } from "../index.cjs";
+import { type TransactionController, type TransactionControllerMessenger, type TransactionMeta } from "../index.cjs";
+import type { PublishBatchHook, TransactionBatchRequest } from "../types.cjs";
 import { type TransactionBatchResult } from "../types.cjs";
 type AddTransactionBatchRequest = {
     addTransaction: TransactionController['addTransaction'];
     getChainId: (networkClientId: string) => Hex;
     getEthQuery: (networkClientId: string) => EthQuery;
     getInternalAccounts: () => Hex[];
+    getTransaction: (id: string) => TransactionMeta;
     messenger: TransactionControllerMessenger;
+    publishBatchHook?: PublishBatchHook;
     publicKeyEIP7702?: Hex;
     request: TransactionBatchRequest;
+    updateTransaction: (options: {
+        transactionId: string;
+    }, callback: (transactionMeta: TransactionMeta) => void) => void;
 };
 type IsAtomicBatchSupportedRequest = {
     address: Hex;

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

@@ -1 +1 @@
-{"version":3,"file":"batch.d.cts","sourceRoot":"","sources":["../../src/utils/batch.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,QAAQ,4BAA4B;AAEhD,OAAO,KAAK,EAAE,GAAG,EAAE,wBAAwB;AAe3C,OAAO,EAEL,KAAK,uBAAuB,EAC5B,KAAK,qBAAqB,EAC1B,KAAK,8BAA8B,EACpC,qBAAW;AAMZ,OAAO,EAEL,KAAK,sBAAsB,EAG5B,qBAAiB;AAElB,KAAK,0BAA0B,GAAG;IAChC,cAAc,EAAE,qBAAqB,CAAC,gBAAgB,CAAC,CAAC;IACxD,UAAU,EAAE,CAAC,eAAe,EAAE,MAAM,KAAK,GAAG,CAAC;IAC7C,WAAW,EAAE,CAAC,eAAe,EAAE,MAAM,KAAK,QAAQ,CAAC;IACnD,mBAAmB,EAAE,MAAM,GAAG,EAAE,CAAC;IACjC,SAAS,EAAE,8BAA8B,CAAC;IAC1C,gBAAgB,CAAC,EAAE,GAAG,CAAC;IACvB,OAAO,EAAE,uBAAuB,CAAC;CAClC,CAAC;AAEF,KAAK,6BAA6B,GAAG;IACnC,OAAO,EAAE,GAAG,CAAC;IACb,WAAW,EAAE,CAAC,OAAO,EAAE,GAAG,KAAK,QAAQ,CAAC;IACxC,SAAS,EAAE,8BAA8B,CAAC;IAC1C,gBAAgB,CAAC,EAAE,GAAG,CAAC;CACxB,CAAC;AAIF;;;;;GAKG;AACH,wBAAsB,mBAAmB,CACvC,OAAO,EAAE,0BAA0B,GAClC,OAAO,CAAC,sBAAsB,CAAC,CAsGjC;AAED;;;;;GAKG;AACH,wBAAsB,sBAAsB,CAC1C,OAAO,EAAE,6BAA6B,GACrC,OAAO,CAAC,GAAG,EAAE,CAAC,CAkChB"}
+{"version":3,"file":"batch.d.cts","sourceRoot":"","sources":["../../src/utils/batch.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,QAAQ,4BAA4B;AAEhD,OAAO,KAAK,EAAE,GAAG,EAAE,wBAAwB;AAe3C,OAAO,EAGL,KAAK,qBAAqB,EAC1B,KAAK,8BAA8B,EACnC,KAAK,eAAe,EACrB,qBAAW;AAGZ,OAAO,KAAK,EAIV,gBAAgB,EAGhB,uBAAuB,EAExB,qBAAiB;AAClB,OAAO,EAEL,KAAK,sBAAsB,EAG5B,qBAAiB;AAElB,KAAK,0BAA0B,GAAG;IAChC,cAAc,EAAE,qBAAqB,CAAC,gBAAgB,CAAC,CAAC;IACxD,UAAU,EAAE,CAAC,eAAe,EAAE,MAAM,KAAK,GAAG,CAAC;IAC7C,WAAW,EAAE,CAAC,eAAe,EAAE,MAAM,KAAK,QAAQ,CAAC;IACnD,mBAAmB,EAAE,MAAM,GAAG,EAAE,CAAC;IACjC,cAAc,EAAE,CAAC,EAAE,EAAE,MAAM,KAAK,eAAe,CAAC;IAChD,SAAS,EAAE,8BAA8B,CAAC;IAC1C,gBAAgB,CAAC,EAAE,gBAAgB,CAAC;IACpC,gBAAgB,CAAC,EAAE,GAAG,CAAC;IACvB,OAAO,EAAE,uBAAuB,CAAC;IACjC,iBAAiB,EAAE,CACjB,OAAO,EAAE;QAAE,aAAa,EAAE,MAAM,CAAA;KAAE,EAClC,QAAQ,EAAE,CAAC,eAAe,EAAE,eAAe,KAAK,IAAI,KACjD,IAAI,CAAC;CACX,CAAC;AAEF,KAAK,6BAA6B,GAAG;IACnC,OAAO,EAAE,GAAG,CAAC;IACb,WAAW,EAAE,CAAC,OAAO,EAAE,GAAG,KAAK,QAAQ,CAAC;IACxC,SAAS,EAAE,8BAA8B,CAAC;IAC1C,gBAAgB,CAAC,EAAE,GAAG,CAAC;CACxB,CAAC;AAIF;;;;;GAKG;AACH,wBAAsB,mBAAmB,CACvC,OAAO,EAAE,0BAA0B,GAClC,OAAO,CAAC,sBAAsB,CAAC,CAsIjC;AAED;;;;;GAKG;AACH,wBAAsB,sBAAsB,CAC1C,OAAO,EAAE,6BAA6B,GACrC,OAAO,CAAC,GAAG,EAAE,CAAC,CAkChB"}

package/dist/utils/batch.d.mts

@@ -1,15 +1,21 @@
 import type EthQuery from "@metamask/eth-query";
 import type { Hex } from "@metamask/utils";
-import { type TransactionBatchRequest, type TransactionController, type TransactionControllerMessenger } from "../index.mjs";
+import { type TransactionController, type TransactionControllerMessenger, type TransactionMeta } from "../index.mjs";
+import type { PublishBatchHook, TransactionBatchRequest } from "../types.mjs";
 import { type TransactionBatchResult } from "../types.mjs";
 type AddTransactionBatchRequest = {
     addTransaction: TransactionController['addTransaction'];
     getChainId: (networkClientId: string) => Hex;
     getEthQuery: (networkClientId: string) => EthQuery;
     getInternalAccounts: () => Hex[];
+    getTransaction: (id: string) => TransactionMeta;
     messenger: TransactionControllerMessenger;
+    publishBatchHook?: PublishBatchHook;
     publicKeyEIP7702?: Hex;
     request: TransactionBatchRequest;
+    updateTransaction: (options: {
+        transactionId: string;
+    }, callback: (transactionMeta: TransactionMeta) => void) => void;
 };
 type IsAtomicBatchSupportedRequest = {
     address: Hex;

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

@@ -1 +1 @@
-{"version":3,"file":"batch.d.mts","sourceRoot":"","sources":["../../src/utils/batch.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,QAAQ,4BAA4B;AAEhD,OAAO,KAAK,EAAE,GAAG,EAAE,wBAAwB;AAe3C,OAAO,EAEL,KAAK,uBAAuB,EAC5B,KAAK,qBAAqB,EAC1B,KAAK,8BAA8B,EACpC,qBAAW;AAMZ,OAAO,EAEL,KAAK,sBAAsB,EAG5B,qBAAiB;AAElB,KAAK,0BAA0B,GAAG;IAChC,cAAc,EAAE,qBAAqB,CAAC,gBAAgB,CAAC,CAAC;IACxD,UAAU,EAAE,CAAC,eAAe,EAAE,MAAM,KAAK,GAAG,CAAC;IAC7C,WAAW,EAAE,CAAC,eAAe,EAAE,MAAM,KAAK,QAAQ,CAAC;IACnD,mBAAmB,EAAE,MAAM,GAAG,EAAE,CAAC;IACjC,SAAS,EAAE,8BAA8B,CAAC;IAC1C,gBAAgB,CAAC,EAAE,GAAG,CAAC;IACvB,OAAO,EAAE,uBAAuB,CAAC;CAClC,CAAC;AAEF,KAAK,6BAA6B,GAAG;IACnC,OAAO,EAAE,GAAG,CAAC;IACb,WAAW,EAAE,CAAC,OAAO,EAAE,GAAG,KAAK,QAAQ,CAAC;IACxC,SAAS,EAAE,8BAA8B,CAAC;IAC1C,gBAAgB,CAAC,EAAE,GAAG,CAAC;CACxB,CAAC;AAIF;;;;;GAKG;AACH,wBAAsB,mBAAmB,CACvC,OAAO,EAAE,0BAA0B,GAClC,OAAO,CAAC,sBAAsB,CAAC,CAsGjC;AAED;;;;;GAKG;AACH,wBAAsB,sBAAsB,CAC1C,OAAO,EAAE,6BAA6B,GACrC,OAAO,CAAC,GAAG,EAAE,CAAC,CAkChB"}
+{"version":3,"file":"batch.d.mts","sourceRoot":"","sources":["../../src/utils/batch.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,QAAQ,4BAA4B;AAEhD,OAAO,KAAK,EAAE,GAAG,EAAE,wBAAwB;AAe3C,OAAO,EAGL,KAAK,qBAAqB,EAC1B,KAAK,8BAA8B,EACnC,KAAK,eAAe,EACrB,qBAAW;AAGZ,OAAO,KAAK,EAIV,gBAAgB,EAGhB,uBAAuB,EAExB,qBAAiB;AAClB,OAAO,EAEL,KAAK,sBAAsB,EAG5B,qBAAiB;AAElB,KAAK,0BAA0B,GAAG;IAChC,cAAc,EAAE,qBAAqB,CAAC,gBAAgB,CAAC,CAAC;IACxD,UAAU,EAAE,CAAC,eAAe,EAAE,MAAM,KAAK,GAAG,CAAC;IAC7C,WAAW,EAAE,CAAC,eAAe,EAAE,MAAM,KAAK,QAAQ,CAAC;IACnD,mBAAmB,EAAE,MAAM,GAAG,EAAE,CAAC;IACjC,cAAc,EAAE,CAAC,EAAE,EAAE,MAAM,KAAK,eAAe,CAAC;IAChD,SAAS,EAAE,8BAA8B,CAAC;IAC1C,gBAAgB,CAAC,EAAE,gBAAgB,CAAC;IACpC,gBAAgB,CAAC,EAAE,GAAG,CAAC;IACvB,OAAO,EAAE,uBAAuB,CAAC;IACjC,iBAAiB,EAAE,CACjB,OAAO,EAAE;QAAE,aAAa,EAAE,MAAM,CAAA;KAAE,EAClC,QAAQ,EAAE,CAAC,eAAe,EAAE,eAAe,KAAK,IAAI,KACjD,IAAI,CAAC;CACX,CAAC;AAEF,KAAK,6BAA6B,GAAG;IACnC,OAAO,EAAE,GAAG,CAAC;IACb,WAAW,EAAE,CAAC,OAAO,EAAE,GAAG,KAAK,QAAQ,CAAC;IACxC,SAAS,EAAE,8BAA8B,CAAC;IAC1C,gBAAgB,CAAC,EAAE,GAAG,CAAC;CACxB,CAAC;AAIF;;;;;GAKG;AACH,wBAAsB,mBAAmB,CACvC,OAAO,EAAE,0BAA0B,GAClC,OAAO,CAAC,sBAAsB,CAAC,CAsIjC;AAED;;;;;GAKG;AACH,wBAAsB,sBAAsB,CAC1C,OAAO,EAAE,6BAA6B,GACrC,OAAO,CAAC,GAAG,EAAE,CAAC,CAkChB"}

package/dist/utils/batch.mjs

@@ -5,6 +5,7 @@ import { doesChainSupportEIP7702, generateEIP7702BatchTransaction, isAccountUpgr
 import { getBatchSizeLimit, getEIP7702SupportedChains, getEIP7702UpgradeContractAddress } from "./feature-flags.mjs";
 import { validateBatchRequest } from "./validation.mjs";
 import { determineTransactionType } from "../index.mjs";
+import { CollectPublishHook } from "../hooks/CollectPublishHook.mjs";
 import { projectLogger } from "../logger.mjs";
 import { TransactionEnvelopeType, TransactionType } from "../types.mjs";
 const log = createModuleLogger(projectLogger, 'batch');
@@ -22,8 +23,11 @@ export async function addTransactionBatch(request) {
         request: userRequest,
         sizeLimit,
     });
-    const { batchId: batchIdOverride, from, networkClientId, requireApproval, transactions, } = userRequest;
+    const { batchId: batchIdOverride, from, networkClientId, requireApproval, securityAlertId, transactions, useHook, validateSecurity, } = userRequest;
     log('Adding', userRequest);
+    if (useHook) {
+        return await addTransactionBatchWithHook(request);
+    }
     const chainId = getChainId(networkClientId);
     const ethQuery = request.getEthQuery(networkClientId);
     const isChainSupported = doesChainSupportEIP7702(chainId, messenger);
@@ -54,13 +58,34 @@ export async function addTransactionBatch(request) {
         txParams.type = TransactionEnvelopeType.setCode;
         txParams.authorizationList = [{ address: upgradeContractAddress }];
     }
+    if (validateSecurity) {
+        const securityRequest = {
+            method: 'eth_sendTransaction',
+            params: [
+                {
+                    ...txParams,
+                    authorizationList: undefined,
+                    type: TransactionEnvelopeType.feeMarket,
+                },
+            ],
+            delegationMock: txParams.authorizationList?.[0]?.address,
+        };
+        log('Security request', securityRequest);
+        validateSecurity(securityRequest, chainId).catch((error) => {
+            log('Security validation failed', error);
+        });
+    }
     log('Adding batch transaction', txParams, networkClientId);
     const batchId = batchIdOverride ?? generateBatchId();
+    const securityAlertResponse = securityAlertId
+        ? { securityAlertId }
+        : undefined;
     const { result } = await addTransaction(txParams, {
         batchId,
         nestedTransactions,
         networkClientId,
         requireApproval,
+        securityAlertResponse,
         type: TransactionType.batch,
     });
     // Wait for the transaction to be published.
@@ -119,4 +144,120 @@ async function getNestedTransactionMeta(request, singleRequest, ethQuery) {
         type,
     };
 }
+/**
+ * Process a batch transaction using a publish batch hook.
+ *
+ * @param request - The request object including the user request and necessary callbacks.
+ * @returns The batch result object including the batch ID.
+ */
+async function addTransactionBatchWithHook(request) {
+    const { publishBatchHook, request: userRequest } = request;
+    const { from, networkClientId, transactions: nestedTransactions, } = userRequest;
+    log('Adding transaction batch using hook', userRequest);
+    if (!publishBatchHook) {
+        log('No publish batch hook provided');
+        throw new Error('No publish batch hook provided');
+    }
+    const batchId = generateBatchId();
+    const transactionCount = nestedTransactions.length;
+    const collectHook = new CollectPublishHook(transactionCount);
+    const publishHook = collectHook.getHook();
+    const hookTransactions = [];
+    try {
+        for (const nestedTransaction of nestedTransactions) {
+            const hookTransaction = await processTransactionWithHook(batchId, nestedTransaction, publishHook, request);
+            hookTransactions.push(hookTransaction);
+        }
+        const { signedTransactions } = await collectHook.ready();
+        const transactions = hookTransactions.map((transaction, index) => ({
+            ...transaction,
+            signedTx: signedTransactions[index],
+        }));
+        log('Calling publish batch hook', { from, networkClientId, transactions });
+        const result = await publishBatchHook({
+            from,
+            networkClientId,
+            transactions,
+        });
+        log('Publish batch hook result', result);
+        if (!result) {
+            throw new Error('Publish batch hook did not return a result');
+        }
+        const transactionHashes = result.results.map(({ transactionHash }) => transactionHash);
+        collectHook.success(transactionHashes);
+        log('Completed batch transaction with hook', transactionHashes);
+        return {
+            batchId,
+        };
+    }
+    catch (error) {
+        log('Publish batch hook failed', error);
+        collectHook.error(error);
+        throw error;
+    }
+}
+/**
+ * Process a single transaction with a publish batch hook.
+ *
+ * @param batchId - ID of the transaction batch.
+ * @param nestedTransaction - The nested transaction request.
+ * @param publishHook - The publish hook to use for each transaction.
+ * @param request - The request object including the user request and necessary callbacks.
+ * @returns The single transaction request to be processed by the publish batch hook.
+ */
+async function processTransactionWithHook(batchId, nestedTransaction, publishHook, request) {
+    const { existingTransaction, params } = nestedTransaction;
+    const { addTransaction, getTransaction, request: userRequest, updateTransaction, } = request;
+    const { from, networkClientId } = userRequest;
+    if (existingTransaction) {
+        const { id, onPublish, signedTransaction } = existingTransaction;
+        const transactionMeta = getTransaction(id);
+        updateTransaction({ transactionId: id }, (_transactionMeta) => {
+            _transactionMeta.batchId = batchId;
+        });
+        publishHook(transactionMeta, signedTransaction)
+            .then(onPublish)
+            .catch(() => {
+            // Intentionally empty
+        });
+        log('Processed existing transaction with hook', {
+            id,
+            params,
+        });
+        return {
+            id,
+            params,
+        };
+    }
+    const { transactionMeta } = await addTransaction({
+        ...params,
+        from,
+    }, {
+        batchId,
+        disableGasBuffer: true,
+        networkClientId,
+        publishHook,
+        requireApproval: false,
+    });
+    const { id, txParams } = transactionMeta;
+    const data = txParams.data;
+    const gas = txParams.gas;
+    const maxFeePerGas = txParams.maxFeePerGas;
+    const maxPriorityFeePerGas = txParams.maxPriorityFeePerGas;
+    const to = txParams.to;
+    const value = txParams.value;
+    const newParams = {
+        data,
+        gas,
+        maxFeePerGas,
+        maxPriorityFeePerGas,
+        to,
+        value,
+    };
+    log('Processed new transaction with hook', { id, params: newParams });
+    return {
+        id,
+        params: newParams,
+    };
+}
 //# sourceMappingURL=batch.mjs.map

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 EthQuery from '@metamask/eth-query';\nimport { rpcErrors } from '@metamask/rpc-errors';\nimport type { Hex } from '@metamask/utils';\nimport { bytesToHex, createModuleLogger } from '@metamask/utils';\nimport { parse, v4 } from 'uuid';\n\nimport {\n  doesChainSupportEIP7702,\n  generateEIP7702BatchTransaction,\n  isAccountUpgradedToEIP7702,\n} from './eip7702';\nimport {\n  getBatchSizeLimit,\n  getEIP7702SupportedChains,\n  getEIP7702UpgradeContractAddress,\n} from './feature-flags';\nimport { validateBatchRequest } from './validation';\nimport {\n  determineTransactionType,\n  type TransactionBatchRequest,\n  type TransactionController,\n  type TransactionControllerMessenger,\n} from '..';\nimport { projectLogger } from '../logger';\nimport type {\n  NestedTransactionMetadata,\n  TransactionBatchSingleRequest,\n} from '../types';\nimport {\n  TransactionEnvelopeType,\n  type TransactionBatchResult,\n  type TransactionParams,\n  TransactionType,\n} from '../types';\n\ntype AddTransactionBatchRequest = {\n  addTransaction: TransactionController['addTransaction'];\n  getChainId: (networkClientId: string) => Hex;\n  getEthQuery: (networkClientId: string) => EthQuery;\n  getInternalAccounts: () => Hex[];\n  messenger: TransactionControllerMessenger;\n  publicKeyEIP7702?: Hex;\n  request: TransactionBatchRequest;\n};\n\ntype IsAtomicBatchSupportedRequest = {\n  address: Hex;\n  getEthQuery: (chainId: Hex) => EthQuery;\n  messenger: TransactionControllerMessenger;\n  publicKeyEIP7702?: Hex;\n};\n\nconst log = createModuleLogger(projectLogger, 'batch');\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    addTransaction,\n    getChainId,\n    getInternalAccounts,\n    messenger,\n    publicKeyEIP7702,\n    request: userRequest,\n  } = request;\n\n  const sizeLimit = getBatchSizeLimit(messenger);\n\n  validateBatchRequest({\n    internalAccounts: getInternalAccounts(),\n    request: userRequest,\n    sizeLimit,\n  });\n\n  const {\n    batchId: batchIdOverride,\n    from,\n    networkClientId,\n    requireApproval,\n    transactions,\n  } = userRequest;\n\n  log('Adding', 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('EIP-7702 public key not specified');\n  }\n\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) {\n    log('Account upgraded to unsupported contract', from, delegationAddress);\n    throw rpcErrors.internal('Account upgraded to unsupported contract');\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    from,\n    ...batchParams,\n  };\n\n  if (!isSupported) {\n    const upgradeContractAddress = getEIP7702UpgradeContractAddress(\n      chainId,\n      messenger,\n      publicKeyEIP7702,\n    );\n\n    if (!upgradeContractAddress) {\n      throw rpcErrors.internal('Upgrade contract address not found');\n    }\n\n    txParams.type = TransactionEnvelopeType.setCode;\n    txParams.authorizationList = [{ address: upgradeContractAddress }];\n  }\n\n  log('Adding batch transaction', txParams, networkClientId);\n\n  const batchId = batchIdOverride ?? generateBatchId();\n\n  const { result } = await addTransaction(txParams, {\n    batchId,\n    nestedTransactions,\n    networkClientId,\n    requireApproval,\n    type: TransactionType.batch,\n  });\n\n  // Wait for the transaction to be published.\n  await result;\n\n  return {\n    batchId,\n  };\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: IsAtomicBatchSupportedRequest,\n): Promise<Hex[]> {\n  const {\n    address,\n    getEthQuery,\n    messenger,\n    publicKeyEIP7702: publicKey,\n  } = request;\n\n  if (!publicKey) {\n    throw rpcErrors.internal('EIP-7702 public key not specified');\n  }\n\n  const chainIds7702 = getEIP7702SupportedChains(messenger);\n  const chainIds: Hex[] = [];\n\n  for (const chainId of chainIds7702) {\n    const ethQuery = getEthQuery(chainId);\n\n    const { isSupported, delegationAddress } = await isAccountUpgradedToEIP7702(\n      address,\n      chainId,\n      publicKey,\n      messenger,\n      ethQuery,\n    );\n\n    if (!delegationAddress || isSupported) {\n      chainIds.push(chainId);\n    }\n  }\n\n  log('Atomic batch supported chains', chainIds);\n\n  return chainIds;\n}\n\n/**\n * Generate a tranasction 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 } = singleRequest;\n\n  const { type } = await determineTransactionType(\n    { from, ...params },\n    ethQuery,\n  );\n\n  return {\n    ...params,\n    type,\n  };\n}\n"]}
+{"version":3,"file":"batch.mjs","sourceRoot":"","sources":["../../src/utils/batch.ts"],"names":[],"mappings":"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","sourcesContent":["import type EthQuery from '@metamask/eth-query';\nimport { rpcErrors } from '@metamask/rpc-errors';\nimport type { Hex } from '@metamask/utils';\nimport { bytesToHex, createModuleLogger } from '@metamask/utils';\nimport { parse, v4 } from 'uuid';\n\nimport {\n  doesChainSupportEIP7702,\n  generateEIP7702BatchTransaction,\n  isAccountUpgradedToEIP7702,\n} from './eip7702';\nimport {\n  getBatchSizeLimit,\n  getEIP7702SupportedChains,\n  getEIP7702UpgradeContractAddress,\n} from './feature-flags';\nimport { validateBatchRequest } from './validation';\nimport {\n  determineTransactionType,\n  type BatchTransactionParams,\n  type TransactionController,\n  type TransactionControllerMessenger,\n  type TransactionMeta,\n} from '..';\nimport { CollectPublishHook } from '../hooks/CollectPublishHook';\nimport { projectLogger } from '../logger';\nimport type {\n  NestedTransactionMetadata,\n  SecurityAlertResponse,\n  TransactionBatchSingleRequest,\n  PublishBatchHook,\n  PublishBatchHookTransaction,\n  PublishHook,\n  TransactionBatchRequest,\n  ValidateSecurityRequest,\n} from '../types';\nimport {\n  TransactionEnvelopeType,\n  type TransactionBatchResult,\n  type TransactionParams,\n  TransactionType,\n} from '../types';\n\ntype AddTransactionBatchRequest = {\n  addTransaction: TransactionController['addTransaction'];\n  getChainId: (networkClientId: string) => Hex;\n  getEthQuery: (networkClientId: string) => EthQuery;\n  getInternalAccounts: () => Hex[];\n  getTransaction: (id: string) => TransactionMeta;\n  messenger: TransactionControllerMessenger;\n  publishBatchHook?: PublishBatchHook;\n  publicKeyEIP7702?: Hex;\n  request: TransactionBatchRequest;\n  updateTransaction: (\n    options: { transactionId: string },\n    callback: (transactionMeta: TransactionMeta) => void,\n  ) => void;\n};\n\ntype IsAtomicBatchSupportedRequest = {\n  address: Hex;\n  getEthQuery: (chainId: Hex) => EthQuery;\n  messenger: TransactionControllerMessenger;\n  publicKeyEIP7702?: Hex;\n};\n\nconst log = createModuleLogger(projectLogger, 'batch');\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    addTransaction,\n    getChainId,\n    getInternalAccounts,\n    messenger,\n    publicKeyEIP7702,\n    request: userRequest,\n  } = request;\n\n  const sizeLimit = getBatchSizeLimit(messenger);\n\n  validateBatchRequest({\n    internalAccounts: getInternalAccounts(),\n    request: userRequest,\n    sizeLimit,\n  });\n\n  const {\n    batchId: batchIdOverride,\n    from,\n    networkClientId,\n    requireApproval,\n    securityAlertId,\n    transactions,\n    useHook,\n    validateSecurity,\n  } = userRequest;\n\n  log('Adding', userRequest);\n\n  if (useHook) {\n    return await addTransactionBatchWithHook(request);\n  }\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('EIP-7702 public key not specified');\n  }\n\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) {\n    log('Account upgraded to unsupported contract', from, delegationAddress);\n    throw rpcErrors.internal('Account upgraded to unsupported contract');\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    from,\n    ...batchParams,\n  };\n\n  if (!isSupported) {\n    const upgradeContractAddress = getEIP7702UpgradeContractAddress(\n      chainId,\n      messenger,\n      publicKeyEIP7702,\n    );\n\n    if (!upgradeContractAddress) {\n      throw rpcErrors.internal('Upgrade contract address not found');\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    };\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 { result } = await addTransaction(txParams, {\n    batchId,\n    nestedTransactions,\n    networkClientId,\n    requireApproval,\n    securityAlertResponse,\n    type: TransactionType.batch,\n  });\n\n  // Wait for the transaction to be published.\n  await result;\n\n  return {\n    batchId,\n  };\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: IsAtomicBatchSupportedRequest,\n): Promise<Hex[]> {\n  const {\n    address,\n    getEthQuery,\n    messenger,\n    publicKeyEIP7702: publicKey,\n  } = request;\n\n  if (!publicKey) {\n    throw rpcErrors.internal('EIP-7702 public key not specified');\n  }\n\n  const chainIds7702 = getEIP7702SupportedChains(messenger);\n  const chainIds: Hex[] = [];\n\n  for (const chainId of chainIds7702) {\n    const ethQuery = getEthQuery(chainId);\n\n    const { isSupported, delegationAddress } = await isAccountUpgradedToEIP7702(\n      address,\n      chainId,\n      publicKey,\n      messenger,\n      ethQuery,\n    );\n\n    if (!delegationAddress || isSupported) {\n      chainIds.push(chainId);\n    }\n  }\n\n  log('Atomic batch supported chains', chainIds);\n\n  return chainIds;\n}\n\n/**\n * Generate a tranasction 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 } = singleRequest;\n\n  const { type } = await determineTransactionType(\n    { from, ...params },\n    ethQuery,\n  );\n\n  return {\n    ...params,\n    type,\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 { publishBatchHook, request: userRequest } = request;\n\n  const {\n    from,\n    networkClientId,\n    transactions: nestedTransactions,\n  } = userRequest;\n\n  log('Adding transaction batch using hook', userRequest);\n\n  if (!publishBatchHook) {\n    log('No publish batch hook provided');\n    throw new Error('No publish batch hook provided');\n  }\n\n  const batchId = generateBatchId();\n  const transactionCount = nestedTransactions.length;\n  const collectHook = new CollectPublishHook(transactionCount);\n  const publishHook = collectHook.getHook();\n  const hookTransactions: Omit<PublishBatchHookTransaction, 'signedTx'>[] = [];\n\n  try {\n    for (const nestedTransaction of nestedTransactions) {\n      const hookTransaction = await processTransactionWithHook(\n        batchId,\n        nestedTransaction,\n        publishHook,\n        request,\n      );\n\n      hookTransactions.push(hookTransaction);\n    }\n\n    const { signedTransactions } = await collectHook.ready();\n\n    const transactions = hookTransactions.map((transaction, index) => ({\n      ...transaction,\n      signedTx: signedTransactions[index],\n    }));\n\n    log('Calling publish batch hook', { from, networkClientId, transactions });\n\n    const result = await publishBatchHook({\n      from,\n      networkClientId,\n      transactions,\n    });\n\n    log('Publish batch hook result', result);\n\n    if (!result) {\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\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\n    throw error;\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 * @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) {\n  const { existingTransaction, params } = nestedTransaction;\n\n  const {\n    addTransaction,\n    getTransaction,\n    request: userRequest,\n    updateTransaction,\n  } = request;\n\n  const { from, networkClientId } = userRequest;\n\n  if (existingTransaction) {\n    const { id, onPublish, signedTransaction } = existingTransaction;\n    const transactionMeta = getTransaction(id);\n\n    updateTransaction({ transactionId: id }, (_transactionMeta) => {\n      _transactionMeta.batchId = batchId;\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 { transactionMeta } = await addTransaction(\n    {\n      ...params,\n      from,\n    },\n    {\n      batchId,\n      disableGasBuffer: true,\n      networkClientId,\n      publishHook,\n      requireApproval: false,\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', { id, params: newParams });\n\n  return {\n    id,\n    params: newParams,\n  };\n}\n"]}

package/dist/utils/eip7702.cjs

@@ -11,6 +11,11 @@ const logger_1 = require("../logger.cjs");
 exports.DELEGATION_PREFIX = '0xef0100';
 exports.BATCH_FUNCTION_NAME = 'execute';
 exports.CALLS_SIGNATURE = '(address,uint256,bytes)[]';
+const UNSUPPORTED_PARAMS = [
+    'gas',
+    'maxFeePerGas',
+    'maxPriorityFeePerGas',
+];
 const log = (0, utils_1.createModuleLogger)(logger_1.projectLogger, 'eip-7702');
 /**
  * Determine if a chain supports EIP-7702 using LaunchDarkly feature flag.
@@ -72,6 +77,13 @@ function generateEIP7702BatchTransaction(from, transactions) {
     const erc7821Contract = contracts_1.Contract.getInterface(constants_1.ABI_IERC7821);
     const calls = transactions.map((transaction) => {
         const { data, to, value } = transaction;
+        const unsupported = UNSUPPORTED_PARAMS.filter((param) => transaction[param] !== undefined);
+        if (unsupported.length) {
+            const errorData = unsupported
+                .map((param) => `${param}: ${transaction[param]}`)
+                .join(', ');
+            throw new Error(`EIP-7702 batch transactions do not support gas parameters per call - ${errorData}`);
+        }
         return [
             to ?? '0x0000000000000000000000000000000000000000',
             value ?? '0x0',