feat: add support to automatically upgrade account

app/scripts/controller-init/confirmations/transaction-controller-init.ts

@@ -13,6 +13,8 @@ import {
   SmartTransactionStatuses,
 } from '@metamask/smart-transactions-controller';
 import { Hex } from '@metamask/utils';
+import { NetworkClientId } from '@metamask/network-controller';
+import { toHex } from '@metamask/controller-utils';
 import { trace } from '../../../../shared/lib/trace';
 import { getIsSmartTransaction } from '../../../../shared/modules/selectors';
 import { getShieldGatewayConfig } from '../../../../shared/modules/shield';
@@ -346,6 +348,19 @@ function getUIState(flatState: ControllerFlatState) {
   return { metamask: flatState };
 }
 
+async function getNextNonce(
+  transactionController: TransactionController,
+  address: string,
+  networkClientId: NetworkClientId,
+): Promise<Hex> {
+  const nonceLock = await transactionController.getNonceLock(
+    address,
+    networkClientId,
+  );
+  nonceLock.releaseLock();
+  return toHex(nonceLock.nextNonce);
+}
+
 export async function publishHook({
   flatState,
   initMessenger,
@@ -373,6 +388,8 @@ export async function publishHook({
         transactionController,
       ),
       messenger: initMessenger,
+      getNextNonce: (address, networkClientId) =>
+        getNextNonce(transactionController, address, networkClientId),
     }).getHook();
 
     const result = await hook(transactionMeta, signedTx);

app/scripts/lib/transaction/hooks/delegation-7702-publish.test.ts

@@ -13,6 +13,8 @@ import {
   TransactionMeta,
   TransactionType,
 } from '@metamask/transaction-controller';
+import { NetworkClientId } from '@metamask/network-controller';
+import { Hex } from '@metamask/utils';
 import { getDeleGatorEnvironment } from '../../../../../shared/lib/delegation';
 import { GAS_FEE_TOKEN_MOCK } from '../../../../../test/data/confirmations/gas';
 import { TransactionControllerInitMessenger } from '../../../controller-init/messengers/transaction-controller-messenger';
@@ -77,6 +79,10 @@ describe('Delegation 7702 Publish Hook', () => {
     TransactionController['isAtomicBatchSupported']
   > = jest.fn();
 
+  const getNextNonceMock: jest.MockedFn<
+    (address: string, networkClientId: NetworkClientId) => Promise<Hex>
+  > = jest.fn();
+
   const signDelegationControllerMock: jest.MockedFn<
     DelegationControllerSignDelegationAction['handler']
   > = jest.fn();
@@ -135,6 +141,7 @@ describe('Delegation 7702 Publish Hook', () => {
     hookClass = new Delegation7702PublishHook({
       isAtomicBatchSupported: isAtomicBatchSupportedMock,
       messenger,
+      getNextNonce: getNextNonceMock,
     });
 
     isAtomicBatchSupportedMock.mockResolvedValue([]);

app/scripts/lib/transaction/hooks/delegation-7702-publish.ts

@@ -9,7 +9,9 @@ import {
   PublishHookResult,
   TransactionMeta,
 } from '@metamask/transaction-controller';
-import { Hex, createProjectLogger } from '@metamask/utils';
+import { Hex, add0x, createProjectLogger } from '@metamask/utils';
+import { toHex } from '@metamask/controller-utils';
+import { NetworkClientId } from '@metamask/network-controller';
 import {
   BATCH_DEFAULT_MODE,
   Caveat,
@@ -41,6 +43,7 @@ import {
   submitRelayTransaction,
   waitForRelayResult,
 } from '../transaction-relay';
+import { stripSingleLeadingZero } from '../util';
 
 const EMPTY_HEX = '0x';
 const POLLING_INTERVAL_MS = 1000; // 1 Second
@@ -58,17 +61,28 @@ export class Delegation7702PublishHook {
 
   #messenger: TransactionControllerInitMessenger;
 
+  #getNextNonce: (
+    address: string,
+    networkClientId: NetworkClientId,
+  ) => Promise<Hex>;
+
   constructor({
     isAtomicBatchSupported,
     messenger,
+    getNextNonce,
   }: {
     isAtomicBatchSupported: (
       request: IsAtomicBatchSupportedRequest,
     ) => Promise<IsAtomicBatchSupportedResult>;
     messenger: TransactionControllerInitMessenger;
+    getNextNonce: (
+      address: string,
+      networkClientId: NetworkClientId,
+    ) => Promise<Hex>;
   }) {
     this.#isAtomicBatchSupported = isAtomicBatchSupported;
     this.#messenger = messenger;
+    this.#getNextNonce = getNextNonce;
   }
 
   getHook(): PublishHook {
@@ -348,8 +362,11 @@ export class Delegation7702PublishHook {
     transactionMeta: TransactionMeta,
     upgradeContractAddress?: Hex,
   ): Promise<AuthorizationList> {
-    const { chainId, txParams } = transactionMeta;
-    const { from, nonce } = txParams;
+    const { chainId, txParams, networkClientId } = transactionMeta;
+    const { from, nonce: txNonce } = txParams;
+    const nextNonce = await this.#getNextNonce(from, networkClientId);
+
+    const nonce = txNonce ?? nextNonce;
 
     log('Including authorization as not upgraded');
 
@@ -393,10 +410,10 @@ export class Delegation7702PublishHook {
   }
 
   #decodeAuthorizationSignature(signature: Hex) {
-    const r = signature.slice(0, 66) as Hex;
-    const s = `0x${signature.slice(66, 130)}` as Hex;
+    const r = stripSingleLeadingZero(signature.slice(0, 66)) as Hex;
+    const s = stripSingleLeadingZero(add0x(signature.slice(66, 130))) as Hex;
     const v = parseInt(signature.slice(130, 132), 16);
-    const yParity = v - 27 === 0 ? ('0x' as const) : ('0x1' as const);
+    const yParity = toHex(v - 27 === 0 ? 0 : 1);
 
     return {
       r,

app/scripts/lib/transaction/util.test.ts

@@ -32,6 +32,7 @@ import {
   AddTransactionRequest,
   addDappTransaction,
   addTransaction,
+  stripSingleLeadingZero,
 } from './util';
 
 jest.mock('../ppom/ppom-util');
@@ -695,4 +696,16 @@ describe('Transaction Utils', () => {
       });
     });
   });
+
+  describe('stripSingleLeadingZero', () => {
+    it('returns the same hex if it does not start with 0x0', () => {
+      expect(stripSingleLeadingZero('0x1a2b3c')).toBe('0x1a2b3c');
+    });
+
+    it('strips a single leading zero from the hex', () => {
+      expect(stripSingleLeadingZero('0x0123')).toBe('0x123');
+      expect(stripSingleLeadingZero('0x0abcdef')).toBe('0xabcdef');
+      expect(stripSingleLeadingZero('0x0001')).toBe('0x001');
+    });
+  });
 });

app/scripts/lib/transaction/util.ts

@@ -360,3 +360,10 @@ async function validateSecurity(request: AddTransactionRequest) {
     handlePPOMError(error, 'Error validating JSON RPC using PPOM: ');
   }
 }
+
+export function stripSingleLeadingZero(hex: string): string {
+  if (!hex.startsWith('0x0') || hex.length <= 3) {
+    return hex;
+  }
+  return `0x${hex.slice(3)}`;
+}

ui/pages/confirmations/hooks/gas/useIsGaslessSupported.test.ts

@@ -2,7 +2,6 @@ import { act } from 'react-dom/test-utils';
 import { genUnapprovedContractInteractionConfirmation } from '../../../../../test/data/confirmations/contract-interaction';
 import { getMockConfirmStateForTransaction } from '../../../../../test/data/confirmations/helper';
 import { renderHookWithConfirmContextProvider } from '../../../../../test/lib/confirmations/render-helpers';
-import { isAtomicBatchSupported } from '../../../../store/controller-actions/transaction-controller';
 import { isRelaySupported } from '../../../../store/actions';
 import { useIsGaslessSupported } from './useIsGaslessSupported';
 import { useGaslessSupportedSmartTransactions } from './useGaslessSupportedSmartTransactions';
@@ -17,8 +16,6 @@ jest.mock('../../../../store/actions', () => ({
 
 jest.mock('./useGaslessSupportedSmartTransactions');
 
-const CHAIN_ID_MOCK = '0x5';
-
 async function runHook() {
   const { result } = renderHookWithConfirmContextProvider(
     useIsGaslessSupported,
@@ -35,7 +32,6 @@ async function runHook() {
 }
 
 describe('useIsGaslessSupported', () => {
-  const isAtomicBatchSupportedMock = jest.mocked(isAtomicBatchSupported);
   const isRelaySupportedMock = jest.mocked(isRelaySupported);
   const useGaslessSupportedSmartTransactionsMock = jest.mocked(
     useGaslessSupportedSmartTransactions,
@@ -44,7 +40,6 @@ describe('useIsGaslessSupported', () => {
   beforeEach(() => {
     jest.resetAllMocks();
 
-    isAtomicBatchSupportedMock.mockResolvedValue([]);
     isRelaySupportedMock.mockResolvedValue(false);
     useGaslessSupportedSmartTransactionsMock.mockReturnValue({
       isSmartTransaction: false,
@@ -73,13 +68,6 @@ describe('useIsGaslessSupported', () => {
   describe('if smart transaction disabled', () => {
     it('returns true if chain supports EIP-7702 and account is supported and relay supported and send bundle supported', async () => {
       isRelaySupportedMock.mockResolvedValue(true);
-      isAtomicBatchSupportedMock.mockResolvedValue([
-        {
-          chainId: CHAIN_ID_MOCK,
-          isSupported: true,
-          delegationAddress: '0x123',
-        },
-      ]);
 
       const result = await runHook();
 
@@ -89,27 +77,8 @@ describe('useIsGaslessSupported', () => {
       });
     });
 
-    it('returns false if account not upgraded', async () => {
-      isRelaySupportedMock.mockResolvedValue(true);
-      isAtomicBatchSupportedMock.mockResolvedValue([
-        {
-          chainId: CHAIN_ID_MOCK,
-          isSupported: false,
-          delegationAddress: undefined,
-        },
-      ]);
-
-      const result = await runHook();
-
-      expect(result).toStrictEqual({
-        isSupported: false,
-        isSmartTransaction: false,
-      });
-    });
-
     it('returns false if chain does not support EIP-7702', async () => {
-      isRelaySupportedMock.mockResolvedValue(true);
-      isAtomicBatchSupportedMock.mockResolvedValue([]);
+      isRelaySupportedMock.mockResolvedValue(false);
 
       const result = await runHook();
 
@@ -120,14 +89,7 @@ describe('useIsGaslessSupported', () => {
     });
 
     it('returns false if upgraded account not supported', async () => {
-      isRelaySupportedMock.mockResolvedValue(true);
-      isAtomicBatchSupportedMock.mockResolvedValue([
-        {
-          chainId: CHAIN_ID_MOCK,
-          isSupported: false,
-          delegationAddress: '0x123',
-        },
-      ]);
+      isRelaySupportedMock.mockResolvedValue(false);
 
       const result = await runHook();
 
@@ -139,13 +101,6 @@ describe('useIsGaslessSupported', () => {
 
     it('returns false if relay not supported', async () => {
       isRelaySupportedMock.mockResolvedValue(false);
-      isAtomicBatchSupportedMock.mockResolvedValue([
-        {
-          chainId: CHAIN_ID_MOCK,
-          isSupported: true,
-          delegationAddress: '0x123',
-        },
-      ]);
 
       const result = await runHook();
 
@@ -169,18 +124,6 @@ describe('useIsGaslessSupported', () => {
     });
   });
 
-  it('returns false if atomic batch returns no matching chainId', async () => {
-    isRelaySupportedMock.mockResolvedValue(true);
-    isAtomicBatchSupportedMock.mockResolvedValue([
-      { chainId: '0x1', isSupported: true, delegationAddress: '0x123' },
-    ]);
-    const result = await runHook();
-    expect(result).toStrictEqual({
-      isSupported: false,
-      isSmartTransaction: false,
-    });
-  });
-
   it('returns pending state when useGaslessSupportedSmartTransactions is pending', async () => {
     useGaslessSupportedSmartTransactionsMock.mockReturnValue({
       isSmartTransaction: true,
@@ -189,19 +132,11 @@ describe('useIsGaslessSupported', () => {
     });
 
     // these mocks shouldn't be called when pending is true
-    isAtomicBatchSupportedMock.mockResolvedValue([
-      {
-        chainId: CHAIN_ID_MOCK,
-        isSupported: true,
-        delegationAddress: '0x123',
-      },
-    ]);
     isRelaySupportedMock.mockResolvedValue(true);
 
     const result = await runHook();
 
     // since pending=true, 7702 eligibility shouldn't be checked yet
-    expect(isAtomicBatchSupportedMock).not.toHaveBeenCalled();
     expect(isRelaySupportedMock).not.toHaveBeenCalled();
 
     expect(result).toStrictEqual({

ui/pages/confirmations/hooks/gas/useIsGaslessSupported.ts

@@ -1,7 +1,5 @@
 import { TransactionMeta } from '@metamask/transaction-controller';
-import { Hex } from '@metamask/utils';
 import { useAsyncResult } from '../../../../hooks/useAsync';
-import { isAtomicBatchSupported } from '../../../../store/controller-actions/transaction-controller';
 import { useConfirmContext } from '../../context/confirm';
 import { isRelaySupported } from '../../../../store/actions';
 import { useGaslessSupportedSmartTransactions } from './useGaslessSupportedSmartTransactions';
@@ -21,8 +19,7 @@ export function useIsGaslessSupported() {
   const { currentConfirmation: transactionMeta } =
     useConfirmContext<TransactionMeta>();
 
-  const { chainId, txParams } = transactionMeta ?? {};
-  const { from } = txParams ?? {};
+  const { chainId } = transactionMeta ?? {};
 
   const {
     isSmartTransaction,
@@ -33,17 +30,6 @@ export function useIsGaslessSupported() {
   const shouldCheck7702Eligibility =
     !pending && !isSmartTransactionAndBundleSupported;
 
-  const { value: atomicBatchSupportResult } = useAsyncResult(async () => {
-    if (!shouldCheck7702Eligibility) {
-      return undefined;
-    }
-
-    return isAtomicBatchSupported({
-      address: from as Hex,
-      chainIds: [chainId],
-    });
-  }, [chainId, from, shouldCheck7702Eligibility]);
-
   const { value: relaySupportsChain } = useAsyncResult(async () => {
     if (!shouldCheck7702Eligibility) {
       return undefined;
@@ -52,14 +38,8 @@ export function useIsGaslessSupported() {
     return isRelaySupported(chainId);
   }, [chainId, shouldCheck7702Eligibility]);
 
-  const atomicBatchChainSupport = atomicBatchSupportResult?.find(
-    (result) => result.chainId.toLowerCase() === chainId.toLowerCase(),
-  );
-
-  // Currently requires upgraded account, can also support no `delegationAddress` in future.
   const is7702Supported = Boolean(
-    atomicBatchChainSupport?.isSupported &&
-      relaySupportsChain &&
+    relaySupportsChain &&
       // contract deployments can't be delegated
       transactionMeta?.txParams.to !== undefined,
   );