chore: Implement erc-7715 type scheme revisions across packages (#128)

* Implement erc-7715 type scheme revisions across packages

* Update failing test cases

* Update comments

Author: V00D00-child

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

@@ -1,12 +1,6 @@
 // Export all types from types.ts
 export type {
   Hex,
-  WalletSigner,
-  KeyType,
-  KeySigner,
-  MultiKeySigner,
-  AccountSigner,
-  Signer,
   BasePermission,
   PermissionTypes,
   NativeTokenStreamPermission,

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

@@ -7,62 +7,6 @@
  */
 export type Hex = `0x${string}`;
 
-/**
- * The types of keys that are supported for the following `key` and `keys` signer types.
- */
-export type KeyType = 'secp256r1' | 'secp256k1' | 'ed25519' | 'schnorr';
-
-// //////////////////////////////////////////////////
-// Signer Types
-// //////////////////////////////////////////////////
-
-/**
- * A wallet is the signer for these permissions
- * `data` is not necessary for this signer type as the wallet is both the signer and grantor of these permissions
- */
-export type WalletSigner = {
-  type: 'wallet';
-  data: object;
-};
-
-/**
- * A signer representing a single key.
- * "Key" types are explicitly secp256r1 (p256) or secp256k1, and the public keys are hex-encoded.
- */
-export type KeySigner = {
-  type: 'key';
-  data: {
-    type: KeyType;
-    publicKey: Hex;
-  };
-};
-
-/**
- * A signer representing a multisig signer.
- * Each element of `publicKeys` are all explicitly the same `KeyType`, and the public keys are hex-encoded.
- */
-export type MultiKeySigner = {
-  type: 'keys';
-  data: {
-    keys: {
-      type: KeyType;
-      publicKey: Hex;
-    }[];
-  };
-};
-
-/**
- * An account that can be granted with permissions as in ERC-7710.
- */
-export type AccountSigner = {
-  type: 'account';
-  data: {
-    address: Hex;
-  };
-};
-
-export type Signer = WalletSigner | KeySigner | MultiKeySigner | AccountSigner;
-
 // //////////////////////////////////////////////////
 // Permission Types
 // //////////////////////////////////////////////////
@@ -85,17 +29,13 @@ export type BasePermission = {
 
 /**
  * A base rule type that all rules must extend.
- * `isAdjustmentAllowed` defines a boolean value that allows DApp to define whether the "rule" can be attenuated–adjusted to meet the user's terms.
  *
  * type - is an enum defined by the ERCs
  *
- * isAdjustmentAllowed - is a boolean that indicates whether the rule can be adjusted.
- *
  * data - is a record of the data that is associated with the rule, and the structure is defined by the ERCs.
  */
 export type Rule = {
   type: string;
-  isAdjustmentAllowed: boolean;
   data: Record<string, any>;
 };
 
@@ -236,19 +176,16 @@ export type PermissionTypes =
  *
  * address - address identifies the account being targetted for this permission request which is useful when a connection has been established and multiple accounts have been exposed. It is optional to let the user choose which account to grant permission for.
  *
- * signer - signer is a field that identifies the key or account associated with the permission or alternatively the wallet will manage the session. See the "Signers" section for details.
+ * to - is a field that identifies the DApp session account associated with the permission.
  *
  * permission - permission defines the allowed behavior the signer can do on behalf of the account. See the "Permission" section for details.
  *
  * rules - rules defined the restrictions or conditions that a signer MUST abide by when using a permission to act on behalf of an account. See the "Rule" section for details.
  */
-export type PermissionRequest<
-  TSigner extends Signer,
-  TPermission extends PermissionTypes,
-> = {
+export type PermissionRequest<TPermission extends PermissionTypes> = {
   chainId: Hex; // hex-encoding of uint256
-  address?: Hex;
-  signer: TSigner;
+  from?: Hex;
+  to: Hex;
   permission: TPermission;
   rules?: Rule[] | null;
 };
@@ -259,26 +196,19 @@ export type PermissionRequest<
  *
  * context - is a catch-all to identify a permission for revoking permissions or submitting userOps, and can contain non-identifying data as well. It MAY be the `context` as defined in ERC-7679 and ERC-7710.
  *
- * dependencyInfo - is an array of objects, each containing fields for `factory` and `factoryData` as defined in ERC-4337. Either both `factory` and `factoryData` must be specified in an entry, or neither. This array is used describe accounts that are not yet deployed but MUST be deployed in order for a permission to be successfully redeemed.
+ * dependencies - is an array of objects, each containing fields for `factory` and `factoryData` as defined in ERC-4337. Either both `factory` and `factoryData` must be specified in an entry, or neither. This array is used describe accounts that are not yet deployed but MUST be deployed in order for a permission to be successfully redeemed.
  *
- * signerMeta - is dependent on the account type. If the signer type is `wallet` then it's not required. If the signer type is `key` or `keys` then `userOpBuilder` is required as defined in ERC-7679. If the signer type is `account` then `delegationManager` is required as defined in ERC-7710.
+ * delegationManager - is required as defined in ERC-7710.
  */
-export type PermissionResponse<
-  TSigner extends Signer,
-  TPermission extends PermissionTypes,
-> = PermissionRequest<TSigner, TPermission> & {
-  context: Hex;
-  dependencyInfo: {
-    factory: Hex;
-    factoryData: Hex;
-  }[];
-  signerMeta?: {
-    // 7679 userOp building
-    userOpBuilder?: Hex;
-    // 7710 delegation
-    delegationManager?: Hex;
+export type PermissionResponse<TPermission extends PermissionTypes> =
+  PermissionRequest<TPermission> & {
+    context: Hex;
+    dependencies: {
+      factory: Hex;
+      factoryData: Hex;
+    }[];
+    delegationManager: Hex;
   };
-};
 
 /**
  * Parameters for the `wallet_revokeExecutionPermission` JSON-RPC method.

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

@@ -1,5 +1,4 @@
 import type {
-  AccountSigner,
   Erc20TokenPeriodicPermission,
   Erc20TokenStreamPermission,
   Erc20TokenRevocationPermission,
@@ -9,6 +8,7 @@ import type {
   PermissionResponse,
   PermissionTypes,
   Rule,
+  Hex,
 } from '@metamask/7715-permission-types';
 import { isHex, toHex } from 'viem';
 import type {
@@ -32,9 +32,9 @@ export type MetaMaskExtensionSchema = RpcSchema &
       // eslint-disable-next-line @typescript-eslint/naming-convention
       Method: 'wallet_requestExecutionPermissions';
       // eslint-disable-next-line @typescript-eslint/naming-convention
-      Params: PermissionRequest<AccountSigner, PermissionTypes>[];
+      Params: PermissionRequest<PermissionTypes>[];
       // eslint-disable-next-line @typescript-eslint/naming-convention
-      ReturnType: PermissionResponse<AccountSigner, PermissionTypes>[];
+      ReturnType: PermissionResponse<PermissionTypes>[];
     },
   ];
 
@@ -135,8 +135,6 @@ export type SupportedPermissionParams =
   | Erc20TokenPeriodicPermissionParameter
   | Erc20TokenRevocationPermissionParameter;
 
-export type SignerParam = Address | AccountSigner;
-
 /**
  * Represents a single permission request.
  */
@@ -147,9 +145,9 @@ export type PermissionRequestParameter = {
   // Whether the caller allows the permission to be adjusted.
   isAdjustmentAllowed: boolean;
   // Account to assign the permission to.
-  signer: SignerParam;
+  to: Hex;
   // address from which the permission should be granted.
-  address?: Address | undefined | null;
+  from?: Address | undefined | null;
   // Timestamp (in seconds) that specifies the time by which this permission MUST expire.
   expiry?: number | undefined | null;
 };
@@ -165,10 +163,8 @@ export type RequestExecutionPermissionsParameters =
 /**
  * Return type for the request execution permissions action.
  */
-export type RequestExecutionPermissionsReturnType = PermissionResponse<
-  AccountSigner,
-  PermissionTypes
->[];
+export type RequestExecutionPermissionsReturnType =
+  PermissionResponse<PermissionTypes>[];
 
 /**
  * Grants permissions according to EIP-7715 specification.
@@ -211,23 +207,17 @@ export async function erc7715RequestExecutionPermissionsAction(
  */
 function formatPermissionsRequest(
   parameters: PermissionRequestParameter,
-): PermissionRequest<AccountSigner, PermissionTypes> {
-  const { chainId, address, expiry, isAdjustmentAllowed } = parameters;
+): PermissionRequest<PermissionTypes> {
+  const { chainId, from, expiry, isAdjustmentAllowed } = parameters;
 
   const permissionFormatter = getPermissionFormatter(
     parameters.permission.type,
   );
 
-  const signerAddress =
-    typeof parameters.signer === 'string'
-      ? parameters.signer
-      : parameters.signer.data.address;
-
   const rules: Rule[] = isDefined(expiry)
     ? [
         {
           type: 'expiry',
-          isAdjustmentAllowed,
           data: {
             timestamp: expiry,
           },
@@ -236,7 +226,7 @@ function formatPermissionsRequest(
     : [];
 
   const optionalFields = {
-    ...(address ? { address } : {}),
+    ...(from ? { from } : {}),
   };
 
   return {
@@ -246,13 +236,7 @@ function formatPermissionsRequest(
       permission: parameters.permission,
       isAdjustmentAllowed,
     }),
-    signer: {
-      // MetaMask 7715 implementation only supports AccountSigner
-      type: 'account',
-      data: {
-        address: signerAddress,
-      },
-    },
+    to: parameters.to,
     rules,
   };
 }

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

@@ -1,5 +1,4 @@
 import type {
-  AccountSigner,
   PermissionRequest,
   PermissionResponse,
   PermissionTypes,
@@ -18,9 +17,9 @@ export type MetaMaskExtensionSchema = RpcSchema &
       // eslint-disable-next-line @typescript-eslint/naming-convention
       Method: 'wallet_requestExecutionPermissions';
       // eslint-disable-next-line @typescript-eslint/naming-convention
-      Params: PermissionRequest<AccountSigner, PermissionTypes>[];
+      Params: PermissionRequest<PermissionTypes>[];
       // eslint-disable-next-line @typescript-eslint/naming-convention
-      ReturnType: PermissionResponse<AccountSigner, PermissionTypes>[];
+      ReturnType: PermissionResponse<PermissionTypes>[];
     },
   ];