Include wallet type

secretkeylabs · Jul 9, 2024 · 63ca21b · 63ca21b
1 parent a5593ec
commit 63ca21b
Show file tree

Hide file tree

Showing 4 changed files with 43 additions and 10 deletions.
diff --git a/src/request/types/btcMethods.ts b/src/request/types/btcMethods.ts
@@ -5,6 +5,7 @@
 import { AddressPurpose, addressSchema } from '../../addresses';
 import { MethodParamsAndResult, rpcRequestMessageSchema } from '../../types';
 import * as v from 'valibot';
+import { walletTypeSchema } from './common';
 
 export const getInfoMethodName = 'getInfo';
 export const getInfoParamsSchema = v.nullish(v.null());
@@ -188,13 +189,17 @@ export const getAccountsParamsSchema = v.object({
    * A message to be displayed to the user in the request prompt.
    */
   message: v.optional(v.string()),
-  /**
-   * Includes wallet type (software / ledger) info in the response.
-   */
-  includeWalletType: v.optional(v.boolean()),
 });
 export type GetAccountsParams = v.InferOutput<typeof getAccountsParamsSchema>;
-export const getAccountsResultSchema = v.array(addressSchema);
+
+export const getAccountsResultSchema = v.array(
+  v.object({
+    ...addressSchema.entries,
+    ...v.object({
+      walletType: walletTypeSchema,
+    }).entries,
+  })
+);
 export type GetAccountsResult = v.InferOutput<typeof getAccountsResultSchema>;
 export const getAccountsRequestMessageSchema = v.object({
   ...rpcRequestMessageSchema.entries,

diff --git a/src/request/types/common.ts b/src/request/types/common.ts
@@ -0,0 +1,5 @@
+import * as v from 'valibot';
+
+export const walletTypes = ['software', 'ledger'] as const;
+export const walletTypeSchema = v.picklist(walletTypes);
+export type WalletType = v.InferOutput<typeof walletTypeSchema>;
diff --git a/src/request/types/index.ts b/src/request/types/index.ts
@@ -2,7 +2,7 @@ import type * as BtcMethods from './btcMethods';
 import { GetInscriptions } from './ordinalsMethods';
 import type * as RunesMethods from './runesMethods';
 import type * as StxMethods from './stxMethods';
-import { RequestPermissions, RenouncePermissions } from './walletMethods';
+import type * as WalletMethods from './walletMethods';
 
 export interface StxRequests {
   stx_callContract: StxMethods.StxCallContract;
@@ -48,12 +48,17 @@ export interface OrdinalsRequests {
 
 export type OrdinalsRequestMethod = keyof OrdinalsRequests;
 
-export interface WalletMethods {
-  wallet_requestPermissions: RequestPermissions;
-  wallet_renouncePermissions: RenouncePermissions;
+export interface WalletRequests {
+  wallet_requestPermissions: WalletMethods.RequestPermissions;
+  wallet_renouncePermissions: WalletMethods.RenouncePermissions;
+  wallet_getWalletType: WalletMethods.GetWalletType;
 }
 
-export type Requests = BtcRequests & StxRequests & RunesRequests & WalletMethods & OrdinalsRequests;
+export type Requests = BtcRequests &
+  StxRequests &
+  RunesRequests &
+  WalletRequests &
+  OrdinalsRequests;
 
 export type Return<Method> = Method extends keyof Requests ? Requests[Method]['result'] : never;
 export type Params<Method> = Method extends keyof Requests ? Requests[Method]['params'] : never;
@@ -63,3 +68,4 @@ export * from './btcMethods';
 export * from './walletMethods';
 export * from './runesMethods';
 export * from './ordinalsMethods';
+export * from './common';
diff --git a/src/request/types/walletMethods.ts b/src/request/types/walletMethods.ts
@@ -1,5 +1,6 @@
 import { MethodParamsAndResult, rpcRequestMessageSchema } from '../../types';
 import * as v from 'valibot';
+import { walletTypeSchema } from './common';
 
 export const requestPermissionsMethodName = 'wallet_requestPermissions';
 export const requestPermissionsParamsSchema = v.undefined();
@@ -32,3 +33,19 @@ export type RenouncePermissions = MethodParamsAndResult<
   v.InferOutput<typeof renouncePermissionsParamsSchema>,
   v.InferOutput<typeof renouncePermissionsResultSchema>
 >;
+
+// Get the wallet type of the current account
+export const getWalletTypeMethodName = 'wallet_getWalletType';
+export const getWalletTypeParamsSchema = v.nullish(v.null());
+export const getWalletTypeResultSchema = walletTypeSchema;
+export const getWalletTypeRequestMessageSchema = v.object({
+  ...rpcRequestMessageSchema.entries,
+  ...v.object({
+    method: v.literal(getWalletTypeMethodName),
+    id: v.string(),
+  }).entries,
+});
+export type GetWalletType = MethodParamsAndResult<
+  v.InferOutput<typeof getWalletTypeParamsSchema>,
+  v.InferOutput<typeof getWalletTypeResultSchema>
+>;