Remove option to invoke snaps, and only support invoking wallet_requestExecutionPermissions on the walletApi

jeffsmale90 · jeffsmale90 · commit 66e2a31e2422 · 2025-09-11T09:55:31.000+12:00
diff --git a/packages/delegation-toolkit/src/experimental/erc7715RequestExecutionPermissionsAction.ts b/packages/delegation-toolkit/src/experimental/erc7715RequestExecutionPermissionsAction.ts
@@ -125,44 +125,24 @@ export type RequestExecutionPermissionsReturnType = PermissionResponse<
  * @template Signer - The type of the signer, either an Address or Account.
  * @param client - The client to use for the request.
  * @param parameters - The permissions requests to grant.
- * @param kernelSnapId - The ID of the kernel snap to invoke, undefined to request via the wallet RPC method.
  * @returns A promise that resolves to the permission responses.
  * @description
- * This function formats the permissions requests and invokes the wallet snap to grant permissions.
+ * This function formats the permissions requests and invokes the wallet method to grant permissions.
  * It will throw an error if the permissions could not be granted.
  */
 export async function erc7715RequestExecutionPermissionsAction(
   client: MetaMaskExtensionClient,
   parameters: RequestExecutionPermissionsParameters,
-  kernelSnapId: string | undefined,
 ): Promise<RequestExecutionPermissionsReturnType> {
   const formattedPermissionRequest = parameters.map(formatPermissionsRequest);
 
-  let result: PermissionResponse<AccountSigner, PermissionTypes>[] | null;
-
-  if (kernelSnapId) {
-    result = await client.request(
-      {
-        method: 'wallet_invokeSnap',
-        params: {
-          snapId: kernelSnapId,
-          request: {
-            method: 'wallet_requestExecutionPermissions',
-            params: formattedPermissionRequest,
-          },
-        },
-      },
-      { retryCount: 0 },
-    );
-  } else {
-    result = await client.request(
-      {
-        method: 'wallet_requestExecutionPermissions',
-        params: formattedPermissionRequest,
-      },
-      { retryCount: 0 },
-    );
-  }
+  const result = await client.request(
+    {
+      method: 'wallet_requestExecutionPermissions',
+      params: formattedPermissionRequest,
+    },
+    { retryCount: 0 },
+  );
 
   if (!result) {
     throw new Error('Failed to grant permissions');
diff --git a/packages/delegation-toolkit/src/experimental/index.ts b/packages/delegation-toolkit/src/experimental/index.ts
@@ -11,7 +11,6 @@ import {
 } from './erc7710RedeemDelegationAction';
 import { erc7715RequestExecutionPermissionsAction } from './erc7715RequestExecutionPermissionsAction';
 import type { RequestExecutionPermissionsParameters } from './erc7715RequestExecutionPermissionsAction';
-import { ensureSnapsAuthorized } from './snapsAuthorization';
 import type { MetaMaskExtensionClient } from './snapsAuthorization';
 
 export {
@@ -27,48 +26,17 @@ export {
   type DelegationStorageConfig,
 } from './delegationStorage';
 
-type Erc7715ProviderConfig = {
-  useWalletMethod: boolean;
-  snapIds?: {
-    kernelSnapId?: string;
-    providerSnapId?: string;
-  };
-};
+type Erc7715ProviderConfig = Record<string, never>;
 
 export const erc7715ProviderActions =
-  (erc7715ProviderConfig: Erc7715ProviderConfig = { useWalletMethod: false }) =>
+  (_erc7715ProviderConfig: Erc7715ProviderConfig = {}) =>
   (client: Client) => ({
     requestExecutionPermissions: async (
       parameters: RequestExecutionPermissionsParameters,
     ) => {
-      const { useWalletMethod, snapIds } = erc7715ProviderConfig;
-
-      let kernelSnapId: string | undefined;
-
-      if (!useWalletMethod) {
-        kernelSnapId =
-          snapIds?.kernelSnapId ?? 'npm:@metamask/permissions-kernel-snap';
-
-        const snapIdsToAuthorize = {
-          kernelSnapId,
-          providerSnapId:
-            snapIds?.providerSnapId ?? 'npm:@metamask/gator-permissions-snap',
-        };
-
-        if (
-          !(await ensureSnapsAuthorized(
-            client as MetaMaskExtensionClient,
-            snapIdsToAuthorize,
-          ))
-        ) {
-          throw new Error('Snaps not authorized');
-        }
-      }
-
       return erc7715RequestExecutionPermissionsAction(
         client as MetaMaskExtensionClient,
         parameters,
-        kernelSnapId,
       );
     },
   });
diff --git a/packages/delegation-toolkit/src/experimental/snapsAuthorization.ts b/packages/delegation-toolkit/src/experimental/snapsAuthorization.ts
@@ -6,59 +6,14 @@ import type {
 } from '@metamask/7715-permission-types';
 import type { Account, Chain, Client, RpcSchema, Transport } from 'viem';
 
-/**
- * Represents the authorization status of installed MetaMask Snaps.
- *
- * @property {string} version - The version of the installed Snap.
- * @property {string} id - The unique identifier of the Snap.
- * @property {boolean} enabled - Whether the Snap is currently enabled.
- * @property {boolean} blocked - Whether the Snap is currently blocked.
- */
-export type SnapAuthorizations = Record<
-  string,
-  { version: string; id: string; enabled: boolean; blocked: boolean }
->;
-
 /**
  * RPC schema for MetaMask related methods.
  *
- * Extends the base RPC schema with methods specific to interacting with Snaps:
+ * Extends the base RPC schema with methods specific to interacting with EIP-7715:
  * - `wallet_invokeSnap`: Invokes a method on a specific Snap.
- * - `wallet_getSnaps`: Retrieves all installed Snaps and their authorization status.
- * - `wallet_requestSnaps`: Requests permission to use specific Snaps.
  */
 export type MetaMaskExtensionSchema = RpcSchema &
   [
-    {
-      // eslint-disable-next-line @typescript-eslint/naming-convention
-      Method: 'wallet_invokeSnap';
-      // eslint-disable-next-line @typescript-eslint/naming-convention
-      Params: {
-        snapId: string;
-        request: {
-          method: string;
-          params: unknown[];
-        };
-      };
-      // eslint-disable-next-line @typescript-eslint/naming-convention
-      ReturnType: unknown;
-    },
-    {
-      // eslint-disable-next-line @typescript-eslint/naming-convention
-      Method: 'wallet_getSnaps';
-      // eslint-disable-next-line @typescript-eslint/naming-convention
-      Params: Record<string, unknown>;
-      // eslint-disable-next-line @typescript-eslint/naming-convention
-      ReturnType: SnapAuthorizations;
-    },
-    {
-      // eslint-disable-next-line @typescript-eslint/naming-convention
-      Method: 'wallet_requestSnaps';
-      // eslint-disable-next-line @typescript-eslint/naming-convention
-      Params: Record<string, unknown>;
-      // eslint-disable-next-line @typescript-eslint/naming-convention
-      ReturnType: SnapAuthorizations;
-    },
     {
       // eslint-disable-next-line @typescript-eslint/naming-convention
       Method: 'wallet_requestExecutionPermissions';
@@ -82,80 +37,3 @@ export type MetaMaskExtensionClient = Client<
   Account | undefined,
   MetaMaskExtensionSchema
 >;
-
-/**
- * Checks if a specific snap is authorized, within the specified authorizations object..
- *
- * @param authorizations - The SnapAuthorizations object containing installed Snaps and their authorization status.
- * @param snapId - The ID of the snap to check.
- * @returns A boolean indicating whether the snap is authorized.
- */
-const isSnapAuthorized = (
-  authorizations: SnapAuthorizations,
-  snapId: string,
-) => {
-  const authorization = authorizations[snapId];
-  const isAuthorized =
-    (authorization?.enabled && !authorization?.blocked) || false;
-
-  return isAuthorized;
-};
-
-/**
- * Requests re-authorization of a specific snap.
- *
- * @param client - The SnapClient instance used to interact with MetaMask Snaps.
- * @param snapId - The ID of the snap to re-authorize.
- * @returns A promise that resolves to a boolean indicating whether the snap was re-authorized.
- */
-const reAuthorize = async (client: MetaMaskExtensionClient, snapId: string) => {
-  const newAuthorizations = await client.request({
-    method: 'wallet_requestSnaps',
-    params: {
-      [snapId]: {} as Record<string, unknown>,
-    },
-  });
-
-  return isSnapAuthorized(newAuthorizations, snapId);
-};
-
-/**
- * Ensures that the required MetaMask Snaps for ERC-7715 permissions are authorized.
- *
- * @param client - The SnapClient instance used to interact with MetaMask Snaps.
- * @param snapIds - Optional object containing custom snap IDs to use.
- * @param snapIds.kernelSnapId - Custom ID for the permissions kernel snap (defaults to 'npm:@metamask/permissions-kernel-snap').
- * @param snapIds.providerSnapId - Custom ID for the permissions provider snap (defaults to 'npm:@metamask/gator-permissions-snap').
- * @returns A promise that resolves to a boolean indicating whether both snaps are authorized.
- * @description
- * This function attempts to authorize both the kernel and provider snaps required for ERC-7715 permissions.
- * It returns true only if both snaps are successfully authorized.
- */
-export async function ensureSnapsAuthorized(
-  client: MetaMaskExtensionClient,
-  {
-    kernelSnapId,
-    providerSnapId,
-  }: { kernelSnapId: string; providerSnapId: string },
-) {
-  const existingAuthorizations = await client.request({
-    method: 'wallet_getSnaps',
-    params: {} as Record<string, never>,
-  });
-
-  if (
-    !isSnapAuthorized(existingAuthorizations, kernelSnapId) &&
-    !(await reAuthorize(client, kernelSnapId))
-  ) {
-    return false;
-  }
-
-  if (
-    !isSnapAuthorized(existingAuthorizations, providerSnapId) &&
-    !(await reAuthorize(client, providerSnapId))
-  ) {
-    return false;
-  }
-
-  return true;
-}
diff --git a/packages/delegation-toolkit/test/experimental/erc7715RequestExecutionPermissionsAction.test.ts b/packages/delegation-toolkit/test/experimental/erc7715RequestExecutionPermissionsAction.test.ts
