Add token-approval-revocation permission type and related RPC conversion

Author: mj-kiwi

lib/delegatable-framework

@@ -7,6 +7,10 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [Unreleased]
 
+### Added
+
+- New permission type `token-approval-revocation`
+
 ## [0.6.0]
 
 ### Added

packages/7715-permission-types/CHANGELOG.md

@@ -10,6 +10,7 @@ export type {
   Erc20TokenPeriodicPermission,
   Erc20TokenAllowancePermission,
   Erc20TokenRevocationPermission,
+  TokenApprovalRevocationPermission,
   Rule,
   PermissionRequest,
   PermissionResponse,

packages/7715-permission-types/src/index.ts

@@ -177,6 +177,21 @@ export type Erc20TokenRevocationPermission = BasePermission & {
   data: MetaMaskBasePermissionData;
 };
 
+/**
+ * A permission to revoke token approvals.
+ */
+export type TokenApprovalRevocationPermission = BasePermission & {
+  type: 'token-approval-revocation';
+  data: MetaMaskBasePermissionData & {
+    erc20Approve: boolean;
+    erc721Approve: boolean;
+    erc721SetApprovalForAll: boolean;
+    permit2ApproveZero: boolean;
+    permit2Lockdown: boolean;
+    permit2InvalidateNonces: boolean;
+  };
+};
+
 /**
  * A custom permission.
  *
@@ -198,7 +213,8 @@ export type PermissionTypes =
   | Erc20TokenStreamPermission
   | Erc20TokenPeriodicPermission
   | Erc20TokenAllowancePermission
-  | Erc20TokenRevocationPermission;
+  | Erc20TokenRevocationPermission
+  | TokenApprovalRevocationPermission;
 
 // //////////////////////////////////////////////////
 // Permission Requests

packages/7715-permission-types/src/types.ts

@@ -10,6 +10,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 ### Added
 
 - `CaveatBuilder` for `ApprovalRevocationEnforcer`, deployment address added to `SmartAccountsEnvironment` ([#226](https://github.com/metamask/smart-accounts-kit/pull/226))
+- ERC-7715 `token-approval-revocation` permission type
 
 ## [1.5.0]
 

packages/smart-accounts-kit/CHANGELOG.md

@@ -9,6 +9,7 @@ import type {
   PermissionRequest,
   PermissionTypes as RpcPermissionTypes,
   Rule,
+  TokenApprovalRevocationPermission as RpcTokenApprovalRevocationPermission,
 } from '@metamask/7715-permission-types';
 import { getAddress, hexToNumber, isAddress, toHex, type Hex } from 'viem';
 
@@ -27,6 +28,7 @@ import type {
   PermissionTypes as DeveloperPermissionTypes,
   RpcGetGrantedExecutionPermissionsResult,
   RpcGetSupportedExecutionPermissionsResult,
+  TokenApprovalRevocationPermission,
 } from './erc7715Types';
 
 // =============================================================================
@@ -156,6 +158,11 @@ function getPermissionRequestToRpcConverter(
         erc20TokenRevocationPermissionToRpc(
           permission as Erc20TokenRevocationPermission,
         );
+    case 'token-approval-revocation':
+      return (permission) =>
+        tokenApprovalRevocationPermissionToRpc(
+          permission as TokenApprovalRevocationPermission,
+        );
     default:
       throw new Error(`Unsupported permission type: ${permissionType}`);
   }
@@ -407,6 +414,44 @@ function erc20TokenRevocationPermissionToRpc(
   };
 }
 
+/**
+ * Convert token approval revocation permission to RPC format.
+ *
+ * @param permission the token approval revocation permission
+ * @returns the token approval revocation permission in RPC format
+ */
+function tokenApprovalRevocationPermissionToRpc(
+  permission: TokenApprovalRevocationPermission,
+): RpcTokenApprovalRevocationPermission {
+  const {
+    data: {
+      erc20Approve,
+      erc721Approve,
+      erc721SetApprovalForAll,
+      permit2ApproveZero,
+      permit2Lockdown,
+      permit2InvalidateNonces,
+      justification,
+    },
+    isAdjustmentAllowed,
+  } = permission;
+
+  const data = {
+    erc20Approve,
+    erc721Approve,
+    erc721SetApprovalForAll,
+    permit2ApproveZero,
+    permit2Lockdown,
+    permit2InvalidateNonces,
+    ...(justification ? { justification } : {}),
+  };
+  return {
+    type: 'token-approval-revocation',
+    data,
+    isAdjustmentAllowed,
+  };
+}
+
 // =============================================================================
 // RPC → Developer friendly types (response conversion)
 // =============================================================================

packages/smart-accounts-kit/src/actions/erc7715Mapping.ts

@@ -4,6 +4,7 @@ import type {
   PermissionResponse as RpcPermissionResponse,
   Rule,
 } from '@metamask/7715-permission-types';
+import type { ApprovalRevocationTerms } from '@metamask/delegation-core';
 import type {
   Client,
   Account,
@@ -120,6 +121,16 @@ export type Erc20TokenRevocationPermission = BasePermission & {
   };
 };
 
+/**
+ * Token approval revocation permission.
+ */
+export type TokenApprovalRevocationPermission = BasePermission & {
+  type: 'token-approval-revocation';
+  data: ApprovalRevocationTerms & {
+    justification?: string;
+  };
+};
+
 /**
  * Permission types.
  */
@@ -130,7 +141,8 @@ export type PermissionTypes =
   | Erc20TokenStreamPermission
   | Erc20TokenPeriodicPermission
   | Erc20TokenAllowancePermission
-  | Erc20TokenRevocationPermission;
+  | Erc20TokenRevocationPermission
+  | TokenApprovalRevocationPermission;
 
 /**
  * Parameters for a single permission request (input to requestExecutionPermissions).

packages/smart-accounts-kit/src/actions/erc7715Types.ts

@@ -92,6 +92,7 @@ export {
   type Erc20TokenPeriodicPermission,
   type Erc20TokenAllowancePermission,
   type Erc20TokenRevocationPermission,
+  type TokenApprovalRevocationPermission,
   type RpcGetSupportedExecutionPermissionsResult,
   type RpcGetGrantedExecutionPermissionsResult,
   type RpcSupportedPermissionInfo,

packages/smart-accounts-kit/src/actions/index.ts

@@ -190,6 +190,38 @@ describe('erc7715Mapping', () => {
         },
       });
     });
+
+    it('preserves token-approval-revocation data, including false flags', () => {
+      const rpcPermission = {
+        type: 'token-approval-revocation',
+        isAdjustmentAllowed: true,
+        data: {
+          erc20Approve: true,
+          erc721Approve: false,
+          erc721SetApprovalForAll: true,
+          permit2ApproveZero: false,
+          permit2Lockdown: true,
+          permit2InvalidateNonces: false,
+          justification: 'Revoke token approvals',
+        },
+      } as const;
+
+      const result = permissionTypeFromRpc(rpcPermission);
+
+      expect(result).toStrictEqual({
+        type: 'token-approval-revocation',
+        isAdjustmentAllowed: true,
+        data: {
+          erc20Approve: true,
+          erc721Approve: false,
+          erc721SetApprovalForAll: true,
+          permit2ApproveZero: false,
+          permit2Lockdown: true,
+          permit2InvalidateNonces: false,
+          justification: 'Revoke token approvals',
+        },
+      });
+    });
   });
 
   describe('permissionResponsesFromRpc', () => {
@@ -772,6 +804,47 @@ describe('erc7715Mapping', () => {
       });
     });
 
+    it('converts token-approval-revocation: preserves all flags', () => {
+      const permissionRequest = {
+        chainId: 1,
+        permission: {
+          type: 'token-approval-revocation',
+          data: {
+            erc20Approve: true,
+            erc721Approve: false,
+            erc721SetApprovalForAll: true,
+            permit2ApproveZero: false,
+            permit2Lockdown: true,
+            permit2InvalidateNonces: false,
+            justification: 'Revoke token approvals',
+          },
+          isAdjustmentAllowed: true,
+        },
+        to: '0xabcdefabcdefabcdefabcdefabcdefabcdefabcd',
+      } as const;
+
+      const result = permissionRequestToRpc(permissionRequest);
+
+      expect(result).toStrictEqual({
+        chainId: '0x1',
+        permission: {
+          type: 'token-approval-revocation',
+          data: {
+            erc20Approve: true,
+            erc721Approve: false,
+            erc721SetApprovalForAll: true,
+            permit2ApproveZero: false,
+            permit2Lockdown: true,
+            permit2InvalidateNonces: false,
+            justification: 'Revoke token approvals',
+          },
+          isAdjustmentAllowed: true,
+        },
+        to: '0xabcdefabcdefabcdefabcdefabcdefabcdefabcd',
+        rules: [],
+      });
+    });
+
     it('throws for unsupported permission type', () => {
       const permissionRequest = {
         chainId: 1,