feat(transaction-controller): add configurable atomic option to batch transactions

Author: matthewwalsh0

packages/transaction-controller/CHANGELOG.md

@@ -7,6 +7,10 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [Unreleased]
 
+### Added
+
+- Add optional `atomic` property to `TransactionBatchRequest` to configure whether EIP-7702 batch calls revert together or can fail independently ([#8320](https://github.com/MetaMask/core/pull/8320))
+
 ### Changed
 
 - Bump `@metamask/accounts-controller` from `^37.1.0` to `^37.1.1` ([#8325](https://github.com/MetaMask/core/pull/8325))

packages/transaction-controller/src/types.ts

@@ -1801,6 +1801,14 @@ export type TransactionBatchSingleRequest = {
  * Currently only atomic batches are supported via EIP-7702.
  */
 export type TransactionBatchRequest = {
+  /**
+   * Whether the EIP-7702 batch transaction should be executed atomically.
+   * When `true` (default), all calls in the batch either succeed or revert together.
+   * When `false`, calls are independent — individual calls can fail without
+   * reverting the entire batch.
+   */
+  atomic?: boolean;
+
   batchId?: Hex;
 
   /** Whether to disable batch transaction processing via an EIP-7702 upgraded account. */

packages/transaction-controller/src/utils/batch.test.ts

@@ -894,6 +894,56 @@ describe('Batch Utils', () => {
       );
     });
 
+    it('passes atomic option to generateEIP7702BatchTransaction', async () => {
+      isAccountUpgradedToEIP7702Mock.mockResolvedValueOnce({
+        delegationAddress: undefined,
+        isSupported: true,
+      });
+
+      addTransactionMock.mockResolvedValueOnce({
+        transactionMeta: TRANSACTION_META_MOCK,
+        result: Promise.resolve(''),
+      });
+
+      generateEIP7702BatchTransactionMock.mockReturnValueOnce(
+        TRANSACTION_BATCH_PARAMS_MOCK,
+      );
+
+      request.request.atomic = false;
+
+      await addTransactionBatch(request);
+
+      expect(generateEIP7702BatchTransactionMock).toHaveBeenCalledWith(
+        FROM_MOCK,
+        expect.any(Array),
+        { atomic: false },
+      );
+    });
+
+    it('passes atomic as undefined to generateEIP7702BatchTransaction by default', async () => {
+      isAccountUpgradedToEIP7702Mock.mockResolvedValueOnce({
+        delegationAddress: undefined,
+        isSupported: true,
+      });
+
+      addTransactionMock.mockResolvedValueOnce({
+        transactionMeta: TRANSACTION_META_MOCK,
+        result: Promise.resolve(''),
+      });
+
+      generateEIP7702BatchTransactionMock.mockReturnValueOnce(
+        TRANSACTION_BATCH_PARAMS_MOCK,
+      );
+
+      await addTransactionBatch(request);
+
+      expect(generateEIP7702BatchTransactionMock).toHaveBeenCalledWith(
+        FROM_MOCK,
+        expect.any(Array),
+        { atomic: undefined },
+      );
+    });
+
     it('throws if chain not supported', async () => {
       doesChainSupportEIP7702Mock.mockReturnValue(false);
 

packages/transaction-controller/src/utils/batch.ts

@@ -284,6 +284,7 @@ async function addTransactionBatchWith7702(
   } = request;
 
   const {
+    atomic,
     batchId: batchIdOverride,
     disableUpgrade,
     from,
@@ -346,7 +347,13 @@ async function addTransactionBatchWith7702(
     ),
   );
 
-  const batchParams = generateEIP7702BatchTransaction(from, nestedTransactions);
+  const batchParams = generateEIP7702BatchTransaction(
+    from,
+    nestedTransactions,
+    {
+      atomic,
+    },
+  );
 
   const txParams: TransactionParams = {
     ...batchParams,

packages/transaction-controller/src/utils/eip7702.test.ts

@@ -44,6 +44,9 @@ const NETWORK_CLIENT_ID_MOCK = 'testNetworkClientId' as NetworkClientId;
 const DATA_MOCK =
   '0xe9ae5c530100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000004000000000000000000000000000000000000000000000000000000000000001c000000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000004000000000000000000000000000000000000000000000000000000000000000e000000000000000000000000009876543210987654321098765432109876543210000000000000000000000000000000000000000000000000000000000005678000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000021234000000000000000000000000000000000000000000000000000000000000000000000000000000000000abcdefabcdefabcdefabcdefabcdefabcdefabcd000000000000000000000000000000000000000000000000000000000000def0000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000029abc000000000000000000000000000000000000000000000000000000000000';
 
+const DATA_NON_ATOMIC_MOCK =
+  '0xe9ae5c530000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000004000000000000000000000000000000000000000000000000000000000000001c000000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000004000000000000000000000000000000000000000000000000000000000000000e000000000000000000000000009876543210987654321098765432109876543210000000000000000000000000000000000000000000000000000000000005678000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000021234000000000000000000000000000000000000000000000000000000000000000000000000000000000000abcdefabcdefabcdefabcdefabcdefabcdefabcd000000000000000000000000000000000000000000000000000000000000def0000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000029abc000000000000000000000000000000000000000000000000000000000000';
+
 const DATA_EMPTY_MOCK =
   '0xe9ae5c5301000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000040000000000000000000000000000000000000000000000000000000000000004000000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000000';
 
@@ -431,6 +434,74 @@ describe('EIP-7702 Utils', () => {
         to: ADDRESS_MOCK,
       });
     });
+
+    it('uses atomic mode by default', () => {
+      const result = generateEIP7702BatchTransaction(ADDRESS_MOCK, [
+        {
+          data: '0x1234',
+          to: ADDRESS_2_MOCK,
+          value: '0x5678',
+        },
+        {
+          data: '0x9abc',
+          to: ADDRESS_3_MOCK,
+          value: '0xdef0',
+        },
+      ]);
+
+      expect(result).toStrictEqual({
+        data: DATA_MOCK,
+        to: ADDRESS_MOCK,
+      });
+    });
+
+    it('uses atomic mode when atomic is true', () => {
+      const result = generateEIP7702BatchTransaction(
+        ADDRESS_MOCK,
+        [
+          {
+            data: '0x1234',
+            to: ADDRESS_2_MOCK,
+            value: '0x5678',
+          },
+          {
+            data: '0x9abc',
+            to: ADDRESS_3_MOCK,
+            value: '0xdef0',
+          },
+        ],
+        { atomic: true },
+      );
+
+      expect(result).toStrictEqual({
+        data: DATA_MOCK,
+        to: ADDRESS_MOCK,
+      });
+    });
+
+    it('uses non-atomic mode when atomic is false', () => {
+      const result = generateEIP7702BatchTransaction(
+        ADDRESS_MOCK,
+        [
+          {
+            data: '0x1234',
+            to: ADDRESS_2_MOCK,
+            value: '0x5678',
+          },
+          {
+            data: '0x9abc',
+            to: ADDRESS_3_MOCK,
+            value: '0xdef0',
+          },
+        ],
+        { atomic: false },
+      );
+
+      expect(result).toStrictEqual({
+        data: DATA_NON_ATOMIC_MOCK,
+        to: ADDRESS_MOCK,
+      });
+    });
   });
 
   describe('getDelegationAddress', () => {

packages/transaction-controller/src/utils/eip7702.ts

@@ -126,12 +126,18 @@ export async function isAccountUpgradedToEIP7702(
  *
  * @param from - The sender address.
  * @param transactions - The transactions to batch.
+ * @param options - Options bag.
+ * @param options.atomic - Whether the batch should be atomic. Defaults to `true`.
+ * When `true`, mode `0x01` is used and all calls revert together.
+ * When `false`, mode `0x00` is used and individual calls can fail independently.
  * @returns The batch transaction.
  */
 export function generateEIP7702BatchTransaction(
   from: Hex,
   transactions: BatchTransactionParams[],
+  options?: { atomic?: boolean },
 ): BatchTransactionParams {
+  const atomic = options?.atomic ?? true;
   const erc7821Contract = Contract.getInterface(ABI_IERC7821);
 
   const calls = transactions.map((transaction) => {
@@ -144,8 +150,7 @@ export function generateEIP7702BatchTransaction(
     ];
   });
 
-  // Single batch mode, no opData.
-  const mode = '0x01'.padEnd(66, '0');
+  const mode = (atomic ? '0x01' : '0x00').padEnd(66, '0');
 
   const callData = defaultAbiCoder.encode([CALLS_SIGNATURE], [calls]);