implement only necessary types

secretkeylabs · Oct 28, 2024 · 005a0fb · 005a0fb
1 parent 3f8e822
commit 005a0fb
Show file tree

Hide file tree

Showing 9 changed files with 31 additions and 315 deletions.
diff --git a/src/request/types/permissions/index.ts b/src/request/types/permissions/index.ts
diff --git a/src/request/types/permissions/resources/account.ts b/src/request/types/permissions/resources/account.ts
diff --git a/src/request/types/permissions/resources/common.ts b/src/request/types/permissions/resources/common.ts
diff --git a/src/request/types/permissions/resources/index.ts b/src/request/types/permissions/resources/index.ts
diff --git a/src/request/types/permissions/resources/wallet.ts b/src/request/types/permissions/resources/wallet.ts
diff --git a/src/request/types/permissions/store.ts b/src/request/types/permissions/store.ts
diff --git a/src/request/types/permissions/utils/account-id.ts b/src/request/types/permissions/utils/account-id.ts
diff --git a/src/request/types/permissions/utils/index.ts b/src/request/types/permissions/utils/index.ts
diff --git a/src/request/types/walletMethods.ts b/src/request/types/walletMethods.ts
@@ -1,27 +1,49 @@
 import { MethodParamsAndResult, rpcRequestMessageSchema } from '../../types';
 import * as v from 'valibot';
 import { walletTypeSchema } from './common';
-import { permissions } from './permissions';
 import { AddressPurpose, addressSchema } from '../../addresses';
 
+export const accountActionsSchema = v.object({
+  read: v.optional(v.boolean()),
+});
+
+export const walletActionsSchema = v.object({});
+
+export const accountPermissionSchema = v.object({
+  type: v.literal('account'),
+  resourceId: v.string(),
+  clientId: v.string(),
+  actions: accountActionsSchema,
+});
+
+export const walletPermissionSchema = v.object({
+  type: v.literal('wallet'),
+  resourceId: v.string(),
+  clientId: v.string(),
+  actions: walletActionsSchema,
+});
+
 /**
  * Permissions with the clientId field omitted and optional actions. Used for
  * permission requests, since the wallet performs authentication based on the
  * client's tab origin and should not rely on the client authenticating
  * themselves.
  */
-export const permissionTemplate = v.variant('type', [
+export const PermissionRequestParams = v.variant('type', [
   v.object({
-    ...v.omit(permissions.resources.account.accountPermissionSchema, ['clientId']).entries,
+    ...v.omit(accountPermissionSchema, ['clientId']).entries,
   }),
   v.object({
-    ...v.omit(permissions.resources.wallet.walletPermissionSchema, ['clientId']).entries,
+    ...v.omit(walletPermissionSchema, ['clientId']).entries,
   }),
 ]);
-export type PermissionWithoutClientId = v.InferOutput<typeof permissionTemplate>;
+
+export const permission = v.variant('type', [accountPermissionSchema, walletPermissionSchema]);
+
+export type PermissionWithoutClientId = v.InferOutput<typeof PermissionRequestParams>;
 
 export const requestPermissionsMethodName = 'wallet_requestPermissions';
-export const requestPermissionsParamsSchema = v.nullish(v.array(permissionTemplate));
+export const requestPermissionsParamsSchema = v.nullish(v.array(PermissionRequestParams));
 export type RequestPermissionsParams = v.InferOutput<typeof requestPermissionsParamsSchema>;
 export const requestPermissionsResultSchema = v.literal(true);
 export type RequestPermissionsResult = v.InferOutput<typeof requestPermissionsResultSchema>;
@@ -102,7 +124,7 @@ export type GetWalletType = MethodParamsAndResult<GetWalletTypeParams, GetWallet
 export const getCurrentPermissionsMethodName = 'wallet_getCurrentPermissions';
 export const getCurrentPermissionsParamsSchema = v.nullish(v.null());
 export type GetCurrentPermissionsParams = v.InferOutput<typeof getCurrentPermissionsParamsSchema>;
-export const getCurrentPermissionsResultSchema = v.array(permissions.store.permission);
+export const getCurrentPermissionsResultSchema = v.array(permission);
 export type GetCurrentPermissionsResult = v.InferOutput<typeof getCurrentPermissionsResultSchema>;
 export const getCurrentPermissionsRequestMessageSchema = v.object({
   ...rpcRequestMessageSchema.entries,
@@ -124,7 +146,7 @@ export const getAccountMethodName = 'wallet_getAccount';
 export const getAccountParamsSchema = v.nullish(v.null());
 export type GetAccountParams = v.InferOutput<typeof getAccountParamsSchema>;
 export const getAccountResultSchema = v.object({
-  id: permissions.utils.account.accountIdSchema,
+  id: v.string(),
   addresses: v.array(addressSchema),
   walletType: walletTypeSchema,
 });
@@ -143,7 +165,7 @@ export type GetAccount = MethodParamsAndResult<GetAccountParams, GetAccountResul
 export const connectMethodName = 'wallet_connect';
 export const connectParamsSchema = v.nullish(
   v.object({
-    permissions: v.optional(v.array(permissionTemplate)),
+    permissions: v.optional(v.array(PermissionRequestParams)),
     addresses: v.optional(v.array(v.enum(AddressPurpose))),
     message: v.optional(
       v.pipe(v.string(), v.maxLength(80, 'The message must not exceed 80 characters.'))