wip

Author: pedronfigueiredo

packages/transaction-controller/src/hooks/ExtraTransactionsPublishHook.test.ts

@@ -88,7 +88,6 @@ describe('ExtraTransactionsPublishHook', () => {
           params: BATCH_TRANSACTION_PARAMS_2_MOCK,
         },
       ],
-      useHook: true,
     });
   });
 

packages/transaction-controller/src/hooks/ExtraTransactionsPublishHook.ts

@@ -107,7 +107,6 @@ export class ExtraTransactionsPublishHook {
       from,
       networkClientId,
       transactions,
-      useHook: true,
     });
 
     return resultPromise.promise;

packages/transaction-controller/src/types.ts

@@ -1569,12 +1569,6 @@ export type TransactionBatchRequest = {
   /** Transactions to be submitted as part of the batch. */
   transactions: TransactionBatchSingleRequest[];
 
-  /**
-   * Whether to use the publish batch hook to submit the batch.
-   * Defaults to false.
-   */
-  useHook?: boolean;
-
   /**
    * Callback to trigger security validation in the client.
    *

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

@@ -384,14 +384,6 @@ describe('Batch Utils', () => {
       );
     });
 
-    it('throws if chain not supported', async () => {
-      doesChainSupportEIP7702Mock.mockReturnValueOnce(false);
-
-      await expect(addTransactionBatch(request)).rejects.toThrow(
-        rpcErrors.internal('Chain does not support EIP-7702'),
-      );
-    });
-
     it('throws if no public key', async () => {
       doesChainSupportEIP7702Mock.mockReturnValueOnce(true);
 
@@ -570,6 +562,10 @@ describe('Batch Utils', () => {
     });
 
     describe('with publish batch hook', () => {
+      beforeEach(() => {
+        doesChainSupportEIP7702Mock.mockReturnValueOnce(false);
+      });
+
       it('adds each nested transaction', async () => {
         const publishBatchHook = jest.fn();
 
@@ -581,7 +577,7 @@ describe('Batch Utils', () => {
         addTransactionBatch({
           ...request,
           publishBatchHook,
-          request: { ...request.request, useHook: true },
+          request: { ...request.request },
         }).catch(() => {
           // Intentionally empty
         });
@@ -639,7 +635,7 @@ describe('Batch Utils', () => {
         addTransactionBatch({
           ...request,
           publishBatchHook,
-          request: { ...request.request, useHook: true },
+          request: { ...request.request },
         }).catch(() => {
           // Intentionally empty
         });
@@ -718,7 +714,7 @@ describe('Batch Utils', () => {
         addTransactionBatch({
           ...request,
           publishBatchHook,
-          request: { ...request.request, useHook: true },
+          request: { ...request.request },
         }).catch(() => {
           // Intentionally empty
         });
@@ -801,7 +797,6 @@ describe('Batch Utils', () => {
               },
               request.request.transactions[1],
             ],
-            useHook: true,
           },
         }).catch(() => {
           // Intentionally empty
@@ -900,7 +895,6 @@ describe('Batch Utils', () => {
               },
               request.request.transactions[1],
             ],
-            useHook: true,
           },
         }).catch(() => {
           // Intentionally empty
@@ -951,7 +945,7 @@ describe('Batch Utils', () => {
         const resultPromise = addTransactionBatch({
           ...request,
           publishBatchHook,
-          request: { ...request.request, useHook: true },
+          request: { ...request.request },
         });
 
         resultPromise.catch(() => {
@@ -1011,7 +1005,7 @@ describe('Batch Utils', () => {
         addTransactionBatch({
           ...request,
           publishBatchHook,
-          request: { ...request.request, useHook: true },
+          request: { ...request.request },
         }).catch(() => {
           // Intentionally empty
         });
@@ -1064,7 +1058,7 @@ describe('Batch Utils', () => {
         addTransactionBatch({
           ...request,
           publishBatchHook,
-          request: { ...request.request, useHook: true },
+          request: { ...request.request },
         }).catch(() => {
           // Intentionally empty
         });
@@ -1089,6 +1083,10 @@ describe('Batch Utils', () => {
     });
 
     describe('with sequential publish batch hook', () => {
+      beforeEach(() => {
+        doesChainSupportEIP7702Mock.mockReturnValueOnce(false);
+      });
+
       let sequentialPublishBatchHook: jest.MockedFn<PublishBatchHook>;
 
       beforeEach(() => {
@@ -1158,7 +1156,7 @@ describe('Batch Utils', () => {
         addTransactionBatch({
           ...request,
           publishBatchHook: undefined,
-          request: { ...request.request, useHook: true },
+          request: { ...request.request },
         }).catch(() => {
           // Intentionally empty
         });
@@ -1194,7 +1192,7 @@ describe('Batch Utils', () => {
         const resultPromise = addTransactionBatch({
           ...request,
           publishBatchHook: undefined,
-          request: { ...request.request, useHook: true },
+          request: { ...request.request },
         });
 
         resultPromise.catch(() => {
@@ -1220,7 +1218,7 @@ describe('Batch Utils', () => {
           addTransactionBatch({
             ...request,
             publishBatchHook: undefined,
-            request: { ...request.request, useHook: true },
+            request: { ...request.request },
           }),
         ).rejects.toThrow('Test error');
 
@@ -1230,6 +1228,10 @@ describe('Batch Utils', () => {
   });
 
   describe('isAtomicBatchSupported', () => {
+    beforeEach(() => {
+      jest.resetAllMocks();
+    });
+
     it('includes all feature flag chains if chain IDs not specified', async () => {
       getEIP7702SupportedChainsMock.mockReturnValueOnce([
         CHAIN_ID_MOCK,

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

@@ -100,15 +100,15 @@ export async function addTransactionBatch(
     sizeLimit,
   });
 
-  const { useHook } = userRequest;
-
   log('Adding', userRequest);
 
-  if (useHook) {
-    return await addTransactionBatchWithHook(request);
+  const chainId = request.getChainId(request.request.networkClientId);
+  const isChainSupportingEIP7702 = doesChainSupportEIP7702(chainId, messenger);
+  if (isChainSupportingEIP7702) {
+    return await addTransactionBatchWith7702(request);
   }
 
-  return await addTransactionBatchWith7702(request);
+  return await addTransactionBatchWithHook(request);
 }
 
 /**
@@ -249,12 +249,6 @@ async function addTransactionBatchWith7702(
 
   const chainId = getChainId(networkClientId);
   const ethQuery = request.getEthQuery(networkClientId);
-  const isChainSupported = doesChainSupportEIP7702(chainId, messenger);
-
-  if (!isChainSupported) {
-    log('Chain does not support EIP-7702', chainId);
-    throw rpcErrors.internal('Chain does not support EIP-7702');
-  }
 
   if (!publicKeyEIP7702) {
     throw rpcErrors.internal(ERROR_MESSGE_PUBLIC_KEY);