feat: Add account upgrade and check status RPC methods

app/scripts/controller-init/utils.ts

@@ -196,7 +196,9 @@ function getControllerOrThrow<Name extends ControllerName>(
   const controller = controllersByName[name];
 
   if (!controller) {
-    throw new Error(`Controller requested before it was initialized: ${name}`);
+    throw new Error(
+      `Controller requested before it was initialized: ${String(name)}`,
+    );
   }
 
   return controller;

app/scripts/metamask-controller.js

@@ -52,6 +52,7 @@ import {
   ERC1155,
   ERC20,
   ERC721,
+  toHex,
 } from '@metamask/controller-utils';
 
 import { AccountsController } from '@metamask/accounts-controller';
@@ -69,7 +70,6 @@ import {
   TransactionStatus,
   TransactionType,
 } from '@metamask/transaction-controller';
-
 import { Interface } from '@ethersproject/abi';
 import { abiERC1155, abiERC721 } from '@metamask/metamask-eth-abis';
 import {
@@ -113,6 +113,11 @@ import {
   walletSendCalls,
 } from '@metamask/eip-5792-middleware';
 
+import {
+  walletUpgradeAccount,
+  walletGetAccountUpgradeStatus,
+} from '@metamask/eip-7702-internal-rpc-middleware';
+
 import {
   Caip25CaveatMutators,
   Caip25CaveatType,
@@ -137,6 +142,7 @@ import {
   SecretType,
   RecoveryError,
 } from '@metamask/seedless-onboarding-controller';
+import { createEIP7702UpgradeTransaction } from '../../shared/lib/eip7702-utils';
 import {
   FEATURE_VERSION_2,
   isMultichainAccountsFeatureEnabled,
@@ -218,6 +224,8 @@ import {
   isGatorPermissionsFeatureEnabled,
 } from '../../shared/modules/environment';
 import { isSnapPreinstalled } from '../../shared/lib/snaps/snaps';
+// eslint-disable-next-line import/no-restricted-paths
+import { isFlask } from '../../ui/helpers/utils/build-types';
 import { getShieldGatewayConfig } from '../../shared/modules/shield';
 import {
   HYPERLIQUID_ORIGIN,
@@ -1276,6 +1284,35 @@ export default class MetamaskController extends EventEmitter {
       ),
     });
 
+    this.eip7702Middleware = createScaffoldMiddleware({
+      wallet_upgradeAccount: createAsyncMiddleware(async (req, res) => {
+        await walletUpgradeAccount(req, res, {
+          upgradeAccount: this.upgradeAccount.bind(this),
+          getCurrentChainIdForDomain:
+            this.getCurrentChainIdForDomain.bind(this),
+          isAtomicBatchSupported: this.txController.isAtomicBatchSupported.bind(
+            this.txController,
+          ),
+          getAccounts: this.getPermittedAccounts.bind(this, req.origin),
+        });
+      }),
+      wallet_getAccountUpgradeStatus: createAsyncMiddleware(
+        async (req, res) => {
+          await walletGetAccountUpgradeStatus(req, res, {
+            getCurrentChainIdForDomain:
+              this.getCurrentChainIdForDomain.bind(this),
+            getCode: this.getCode.bind(this),
+            getNetworkConfigurationByChainId:
+              this.controllerMessenger.call.bind(
+                this.controllerMessenger,
+                'NetworkController:getNetworkConfigurationByChainId',
+              ),
+            getAccounts: this.getPermittedAccounts.bind(this, req.origin),
+          });
+        },
+      ),
+    });
+
     this.metamaskMiddleware = createMetamaskMiddleware({
       static: {
         eth_syncing: false,
@@ -1539,6 +1576,22 @@ export default class MetamaskController extends EventEmitter {
     }
   }
 
+  /**
+   * Returns the current chainId (hex string) for a given domain/origin.
+   * Used by EIP-7702 middleware hooks.
+   * @param {string} domain
+   * @returns {string | undefined}
+   */
+  getCurrentChainIdForDomain(domain) {
+    const networkClientId =
+      this.selectedNetworkController.getNetworkClientIdForDomain(domain);
+    const { chainId } =
+      this.networkController.getNetworkConfigurationByNetworkClientId(
+        networkClientId,
+      );
+    return chainId;
+  }
+
   // Provides a method for getting feature flags for the multichain
   // initial rollout, such that we can remotely modify polling interval
   getInfuraFeatureFlags() {
@@ -6990,6 +7043,13 @@ export default class MetamaskController extends EventEmitter {
       }),
     );
 
+    if (
+      subjectType === SubjectType.Snap &&
+      (isFlask() || isSnapPreinstalled(origin))
+    ) {
+      engine.push(this.eip7702Middleware);
+    }
+
     if (subjectType !== SubjectType.Internal) {
       engine.push(
         this.permissionController.createPermissionMiddleware({
@@ -7445,6 +7505,7 @@ export default class MetamaskController extends EventEmitter {
         ...this.setupCommonMiddlewareHooks(origin),
       }),
     );
+
     engine.push(this.metamaskMiddleware);
 
     engine.push(this.eip5792Middleware);
@@ -8869,4 +8930,42 @@ export default class MetamaskController extends EventEmitter {
       initRequest,
     });
   }
+
+  /**
+   * Upgrades an account to support EIP-7702 delegation.
+   * Uses shared EIP-7702 utility to avoid code duplication.
+   *
+   * @param {string} address - The account address to upgrade
+   * @param {string} upgradeContractAddress - The contract address to delegate to
+   * @param {number} chainId - The chain ID for the upgrade
+   * @returns {Promise<{transactionHash: string, delegatedTo: string}>}
+   */
+  async upgradeAccount(address, upgradeContractAddress, chainId) {
+    // Get the network client for the specified chain
+    const networkClientId = this.networkController.findNetworkClientIdByChainId(
+      toHex(chainId),
+    );
+
+    return createEIP7702UpgradeTransaction(
+      {
+        address,
+        upgradeContractAddress,
+        networkClientId,
+      },
+      async (transactionParams, options) => {
+        const transactionMeta = await addTransaction(
+          this.getAddTransactionRequest({
+            transactionParams,
+            transactionOptions: {
+              ...options,
+              origin: 'metamask',
+              requireApproval: true,
+            },
+            waitForSubmit: true,
+          }),
+        );
+        return transactionMeta;
+      },
+    );
+  }
 }

lavamoat/browserify/beta/policy.json

@@ -1049,6 +1049,14 @@
         "uuid": true
       }
     },
+    "@metamask/eip-7702-internal-rpc-middleware": {
+      "packages": {
+        "@metamask/controller-utils": true,
+        "@metamask/rpc-errors": true,
+        "@metamask/superstruct": true,
+        "@metamask/utils": true
+      }
+    },
     "@metamask/ens-controller": {
       "packages": {
         "@ethersproject/providers": true,

lavamoat/browserify/experimental/policy.json

@@ -1049,6 +1049,14 @@
         "uuid": true
       }
     },
+    "@metamask/eip-7702-internal-rpc-middleware": {
+      "packages": {
+        "@metamask/controller-utils": true,
+        "@metamask/rpc-errors": true,
+        "@metamask/superstruct": true,
+        "@metamask/utils": true
+      }
+    },
     "@metamask/ens-controller": {
       "packages": {
         "@ethersproject/providers": true,

lavamoat/browserify/flask/policy.json

@@ -1049,6 +1049,14 @@
         "uuid": true
       }
     },
+    "@metamask/eip-7702-internal-rpc-middleware": {
+      "packages": {
+        "@metamask/controller-utils": true,
+        "@metamask/rpc-errors": true,
+        "@metamask/superstruct": true,
+        "@metamask/utils": true
+      }
+    },
     "@metamask/ens-controller": {
       "packages": {
         "@ethersproject/providers": true,

lavamoat/browserify/main/policy.json

@@ -1049,6 +1049,14 @@
         "uuid": true
       }
     },
+    "@metamask/eip-7702-internal-rpc-middleware": {
+      "packages": {
+        "@metamask/controller-utils": true,
+        "@metamask/rpc-errors": true,
+        "@metamask/superstruct": true,
+        "@metamask/utils": true
+      }
+    },
     "@metamask/ens-controller": {
       "packages": {
         "@ethersproject/providers": true,

package.json

@@ -286,6 +286,7 @@
     "@metamask/design-system-tailwind-preset": "^0.6.1",
     "@metamask/design-tokens": "^8.1.1",
     "@metamask/eip-5792-middleware": "^1.1.0",
+    "@metamask/eip-7702-internal-rpc-middleware": "1.0.0",
     "@metamask/ens-controller": "^17.0.1",
     "@metamask/ens-resolver-snap": "^0.1.4",
     "@metamask/error-reporting-service": "^2.0.0",

shared/lib/eip7702-utils.ts

@@ -0,0 +1,135 @@
+import {
+  TransactionEnvelopeType,
+  TransactionType,
+  TransactionParams,
+} from '@metamask/transaction-controller';
+import { Hex } from '@metamask/utils';
+
+export const EIP_7702_REVOKE_ADDRESS =
+  '0x0000000000000000000000000000000000000000';
+
+export type EIP7702TransactionParams = {
+  address: Hex;
+  upgradeContractAddress?: Hex;
+  networkClientId: string;
+};
+
+export type EIP7702TransactionResult = {
+  transactionHash: string;
+  delegatedTo?: string;
+  transactionId?: string;
+};
+
+/**
+ * Creates an EIP-7702 upgrade transaction.
+ *
+ * @param params - The transaction parameters
+ * @param addTransactionAndWaitForPublish - Function to add transaction and wait for publish
+ * @returns Promise with transaction result
+ */
+export async function createEIP7702UpgradeTransaction(
+  params: EIP7702TransactionParams,
+  addTransactionAndWaitForPublish: (
+    transactionParams: TransactionParams,
+    options: {
+      networkClientId: string;
+      requireApproval?: boolean;
+      type?: TransactionType;
+    },
+  ) => Promise<Record<string, unknown>>,
+): Promise<EIP7702TransactionResult> {
+  const { address, upgradeContractAddress, networkClientId } = params;
+
+  if (!upgradeContractAddress) {
+    throw new Error('Upgrade contract address is required');
+  }
+
+  const transactionParams: TransactionParams = {
+    authorizationList: [
+      {
+        address: upgradeContractAddress,
+      },
+    ],
+    from: address,
+    to: address,
+    type: TransactionEnvelopeType.setCode,
+  };
+
+  const transactionMeta = await addTransactionAndWaitForPublish(
+    transactionParams,
+    {
+      networkClientId,
+      requireApproval: true,
+      type: TransactionType.batch,
+    },
+  );
+
+  return {
+    transactionHash: transactionMeta.hash as string,
+    delegatedTo: upgradeContractAddress,
+    transactionId: transactionMeta.id as string,
+  };
+}
+
+/**
+ * Creates an EIP-7702 downgrade transaction.
+ *
+ * @param params - The transaction parameters
+ * @param addTransactionAndWaitForPublish - Function to add transaction and wait for publish
+ * @returns Promise with transaction result
+ */
+export async function createEIP7702DowngradeTransaction(
+  params: EIP7702TransactionParams,
+  addTransactionAndWaitForPublish: (
+    transactionParams: TransactionParams,
+    options: {
+      networkClientId: string;
+      requireApproval?: boolean;
+      type?: TransactionType;
+    },
+  ) => Promise<Record<string, unknown>>,
+): Promise<EIP7702TransactionResult> {
+  const { address, networkClientId } = params;
+
+  const transactionParams: TransactionParams = {
+    authorizationList: [
+      {
+        address: EIP_7702_REVOKE_ADDRESS,
+      },
+    ],
+    from: address,
+    to: address,
+    type: TransactionEnvelopeType.setCode,
+  };
+
+  const transactionMeta = await addTransactionAndWaitForPublish(
+    transactionParams,
+    {
+      networkClientId,
+      requireApproval: true,
+      type: TransactionType.revokeDelegation,
+    },
+  );
+
+  return {
+    transactionHash: transactionMeta.hash as string,
+    transactionId: transactionMeta.id as string,
+  };
+}
+
+/**
+ * Checks if an account is upgraded by checking if it has code.
+ *
+ * @param address - The account address to check
+ * @param networkClientId - The network client ID
+ * @param getCode - Function to get account code
+ * @returns Promise with boolean indicating if account is upgraded
+ */
+export async function isAccountUpgraded(
+  address: Hex,
+  networkClientId: string,
+  getCode: (address: Hex, networkClientId: string) => Promise<string | null>,
+): Promise<boolean> {
+  const code = await getCode(address, networkClientId);
+  return Boolean(code && code.length > 2);
+}