Generate authorization list

Author: matthewwalsh0

packages/transaction-controller/src/TransactionController.test.ts

@@ -79,7 +79,12 @@ import {
   WalletDevice,
 } from './types';
 import { addTransactionBatch } from './utils/batch';
-import { DELEGATION_PREFIX, getDelegationAddress } from './utils/eip7702';
+import {
+  DELEGATION_PREFIX,
+  doesChainSupportEIP7702,
+  getDelegationAddress,
+} from './utils/eip7702';
+import { getEIP7702UpgradeContractAddress } from './utils/feature-flags';
 import { addGasBuffer, estimateGas, updateGas } from './utils/gas';
 import { updateGasFees } from './utils/gas-fees';
 import { getGasFeeFlow } from './utils/gas-flow';
@@ -125,6 +130,7 @@ jest.mock('./helpers/MultichainTrackingHelper');
 jest.mock('./helpers/PendingTransactionTracker');
 jest.mock('./hooks/ExtraTransactionsPublishHook');
 jest.mock('./utils/batch');
+jest.mock('./utils/feature-flags');
 jest.mock('./utils/gas');
 jest.mock('./utils/gas-fees');
 jest.mock('./utils/gas-flow');
@@ -141,6 +147,7 @@ jest.mock('./helpers/ResimulateHelper', () => ({
 jest.mock('./utils/eip7702', () => ({
   ...jest.requireActual('./utils/eip7702'),
   getDelegationAddress: jest.fn(),
+  doesChainSupportEIP7702: jest.fn(),
 }));
 
 // TODO: Replace `any` with type
@@ -535,6 +542,10 @@ describe('TransactionController', () => {
   const addTransactionBatchMock = jest.mocked(addTransactionBatch);
   const methodDataHelperClassMock = jest.mocked(MethodDataHelper);
   const getDelegationAddressMock = jest.mocked(getDelegationAddress);
+  const doesChainSupportEIP7702Mock = jest.mocked(doesChainSupportEIP7702);
+  const getEIP7702UpgradeContractAddressMock = jest.mocked(
+    getEIP7702UpgradeContractAddress,
+  );
 
   let mockEthQuery: EthQuery;
   let getNonceLockSpy: jest.Mock;
@@ -674,6 +685,7 @@ describe('TransactionController', () => {
       getPermittedAccounts: async () => [ACCOUNT_MOCK],
       hooks: {},
       isEIP7702GasFeeTokensEnabled: isEIP7702GasFeeTokensEnabledMock,
+      publicKeyEIP7702: '0x1234',
       sign: signMock,
       transactionHistoryLimit: 40,
       ...givenOptions,
@@ -2290,13 +2302,15 @@ describe('TransactionController', () => {
         );
       });
 
-      it('with use7702Fees if isEIP7702GasFeeTokensEnabled returns true', async () => {
+      it('with use7702Fees if isEIP7702GasFeeTokensEnabled returns true and chain supports 7702', async () => {
+        isEIP7702GasFeeTokensEnabledMock.mockResolvedValueOnce(true);
+        doesChainSupportEIP7702Mock.mockReturnValueOnce(true);
+        getDelegationAddressMock.mockResolvedValueOnce(ACCOUNT_2_MOCK);
+
         getSimulationDataMock.mockResolvedValueOnce(
           SIMULATION_DATA_RESULT_MOCK,
         );
 
-        isEIP7702GasFeeTokensEnabledMock.mockResolvedValueOnce(true);
-
         const { controller } = setupController();
 
         await controller.addTransaction(
@@ -2319,27 +2333,24 @@ describe('TransactionController', () => {
         );
       });
 
-      it('with authorizationList', async () => {
+      it('with authorization list if isEIP7702GasFeeTokensEnabled returns true and no delegation address', async () => {
+        isEIP7702GasFeeTokensEnabledMock.mockResolvedValueOnce(true);
+        doesChainSupportEIP7702Mock.mockReturnValueOnce(true);
+
         getSimulationDataMock.mockResolvedValueOnce(
           SIMULATION_DATA_RESULT_MOCK,
         );
 
+        getEIP7702UpgradeContractAddressMock.mockReturnValueOnce(
+          ACCOUNT_2_MOCK,
+        );
+
         const { controller } = setupController();
 
         await controller.addTransaction(
           {
             from: ACCOUNT_MOCK,
             to: ACCOUNT_MOCK,
-            authorizationList: [
-              {
-                address: ACCOUNT_2_MOCK,
-                chainId: CHAIN_ID_MOCK,
-                nonce: toHex(NONCE_MOCK),
-                r: '0x1',
-                s: '0x2',
-                yParity: '0x1',
-              },
-            ],
           },
           {
             networkClientId: NETWORK_CLIENT_ID_MOCK,

packages/transaction-controller/src/TransactionController.ts

@@ -118,14 +118,21 @@ import {
   TransactionStatus,
   SimulationErrorCode,
 } from './types';
-import { addTransactionBatch, isAtomicBatchSupported } from './utils/batch';
+import {
+  addTransactionBatch,
+  ERROR_MESSAGE_NO_UPGRADE_CONTRACT,
+  isAtomicBatchSupported,
+} from './utils/batch';
 import {
   DELEGATION_PREFIX,
+  doesChainSupportEIP7702,
+  ERROR_MESSGE_PUBLIC_KEY,
   generateEIP7702BatchTransaction,
   getDelegationAddress,
   signAuthorizationList,
 } from './utils/eip7702';
 import { validateConfirmedExternalTransaction } from './utils/external-transactions';
+import { getEIP7702UpgradeContractAddress } from './utils/feature-flags';
 import { addGasBuffer, estimateGas, updateGas } from './utils/gas';
 import { updateGasFees } from './utils/gas-fees';
 import { getGasFeeFlow } from './utils/gas-flow';
@@ -143,6 +150,7 @@ import {
 } from './utils/nonce';
 import { prepareTransaction, serializeTransaction } from './utils/prepare';
 import { getTransactionParamsWithIncreasedGasFee } from './utils/retry';
+import type { GetSimulationDataRequest } from './utils/simulation';
 import { getSimulationData } from './utils/simulation';
 import {
   updatePostTransactionBalance,
@@ -3974,20 +3982,8 @@ export class TransactionController extends BaseController<
       traceContext?: TraceContext;
     } = {},
   ) {
-    const {
-      id: transactionId,
-      chainId,
-      txParams,
-      simulationData: prevSimulationData,
-    } = transactionMeta;
-
-    const {
-      authorizationList: authorizationListRaw,
-      from,
-      to,
-      value,
-      data,
-    } = txParams;
+    const { id: transactionId, simulationData: prevSimulationData } =
+      transactionMeta;
 
     let simulationData: SimulationData = {
       error: {
@@ -4000,39 +3996,11 @@ export class TransactionController extends BaseController<
     let gasFeeTokens: GasFeeToken[] = [];
 
     if (this.#isSimulationEnabled()) {
-      const authorizationAddress = txParams?.authorizationList?.[0]?.address;
-
-      const senderCode =
-        authorizationAddress &&
-        ((DELEGATION_PREFIX + remove0x(authorizationAddress)) as Hex);
-
-      const use7702Fees =
-        await this.#isEIP7702GasFeeTokensEnabled(transactionMeta);
-
-      const authorizationList = authorizationListRaw?.map((authorization) => ({
-        address: authorization.address,
-        from: from as Hex,
-      }));
-
-      const result = await this.#trace(
-        { name: 'Simulate', parentContext: traceContext },
-        () =>
-          getSimulationData(
-            {
-              authorizationList,
-              chainId,
-              data: data as Hex,
-              from: from as Hex,
-              to: to as Hex,
-              value: value as Hex,
-            },
-            {
-              blockTime,
-              senderCode,
-              use7702Fees,
-            },
-          ),
-      );
+      const result = await this.#getSimulationData({
+        blockTime,
+        traceContext,
+        transactionMeta,
+      });
 
       gasFeeTokens = result?.gasFeeTokens;
       simulationData = result?.simulationData;
@@ -4264,4 +4232,89 @@ export class TransactionController extends BaseController<
       newTransactionMeta,
     );
   }
+
+  async #getSimulationData({
+    blockTime,
+    traceContext,
+    transactionMeta,
+  }: {
+    blockTime?: number;
+    traceContext?: TraceContext;
+    transactionMeta: TransactionMeta;
+  }) {
+    const { chainId, delegationAddress, txParams } = transactionMeta;
+    const { data, from, to, value } = txParams;
+    const authorizationAddress = txParams?.authorizationList?.[0]?.address;
+
+    const senderCode =
+      authorizationAddress &&
+      ((DELEGATION_PREFIX + remove0x(authorizationAddress)) as Hex);
+
+    const is7702GasFeeTokensEnabled =
+      await this.#isEIP7702GasFeeTokensEnabled(transactionMeta);
+
+    const use7702Fees =
+      is7702GasFeeTokensEnabled &&
+      doesChainSupportEIP7702(chainId, this.messagingSystem);
+
+    let authorizationList:
+      | GetSimulationDataRequest['authorizationList']
+      | undefined;
+
+    if (use7702Fees && !delegationAddress) {
+      authorizationList = this.#getSimulationAuthorizationList({
+        chainId,
+        from: from as Hex,
+      });
+    }
+
+    return await this.#trace(
+      { name: 'Simulate', parentContext: traceContext },
+      () =>
+        getSimulationData(
+          {
+            authorizationList,
+            chainId,
+            data: data as Hex,
+            from: from as Hex,
+            to: to as Hex,
+            value: value as Hex,
+          },
+          {
+            blockTime,
+            senderCode,
+            use7702Fees,
+          },
+        ),
+    );
+  }
+
+  #getSimulationAuthorizationList({
+    chainId,
+    from,
+  }: {
+    chainId: Hex;
+    from: Hex;
+  }): GetSimulationDataRequest['authorizationList'] | undefined {
+    if (!this.#publicKeyEIP7702) {
+      throw rpcErrors.internal(ERROR_MESSGE_PUBLIC_KEY);
+    }
+
+    const upgradeAddress = getEIP7702UpgradeContractAddress(
+      chainId,
+      this.messagingSystem,
+      this.#publicKeyEIP7702,
+    );
+
+    if (!upgradeAddress) {
+      throw rpcErrors.internal(ERROR_MESSAGE_NO_UPGRADE_CONTRACT);
+    }
+
+    return [
+      {
+        address: upgradeAddress,
+        from: from as Hex,
+      },
+    ];
+  }
 }

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

@@ -1,7 +1,12 @@
 import { rpcErrors } from '@metamask/rpc-errors';
 
-import { addTransactionBatch, isAtomicBatchSupported } from './batch';
 import {
+  ERROR_MESSAGE_NO_UPGRADE_CONTRACT,
+  addTransactionBatch,
+  isAtomicBatchSupported,
+} from './batch';
+import {
+  ERROR_MESSGE_PUBLIC_KEY,
   doesChainSupportEIP7702,
   generateEIP7702BatchTransaction,
   isAccountUpgradedToEIP7702,
@@ -371,9 +376,7 @@ describe('Batch Utils', () => {
 
       await expect(
         addTransactionBatch({ ...request, publicKeyEIP7702: undefined }),
-      ).rejects.toThrow(
-        rpcErrors.internal('EIP-7702 public key not specified'),
-      );
+      ).rejects.toThrow(rpcErrors.internal(ERROR_MESSGE_PUBLIC_KEY));
     });
 
     it('throws if account upgraded to unsupported contract', async () => {
@@ -399,7 +402,7 @@ describe('Batch Utils', () => {
       getEIP7702UpgradeContractAddressMock.mockReturnValueOnce(undefined);
 
       await expect(addTransactionBatch(request)).rejects.toThrow(
-        rpcErrors.internal('Upgrade contract address not found'),
+        rpcErrors.internal(ERROR_MESSAGE_NO_UPGRADE_CONTRACT),
       );
     });
 
@@ -1159,9 +1162,7 @@ describe('Batch Utils', () => {
           messenger: MESSENGER_MOCK,
           publicKeyEIP7702: undefined,
         }),
-      ).rejects.toThrow(
-        rpcErrors.internal('EIP-7702 public key not specified'),
-      );
+      ).rejects.toThrow(rpcErrors.internal(ERROR_MESSGE_PUBLIC_KEY));
     });
 
     it('does not throw if error getting provider', async () => {