From e61b8fd80e3723fc5ce6f2cb19da4db2673e60ea Mon Sep 17 00:00:00 2001
From: Daniel Rocha <68558152+danroc@users.noreply.github.com>
Date: Mon, 16 Oct 2023 22:23:28 +0200
Subject: [PATCH] fix: use `UuidStruct` for IDs

---
 src/internal/api.ts     | 14 +++++++-------
 src/rpc-handler.test.ts | 19 +++++++++++++------
 2 files changed, 20 insertions(+), 13 deletions(-)

diff --git a/src/internal/api.ts b/src/internal/api.ts
index 058940f66..8dcabb01a 100644
--- a/src/internal/api.ts
+++ b/src/internal/api.ts
@@ -36,7 +36,7 @@ export const GetAccountRequestStruct = object({
   ...CommonHeader,
   method: literal('keyring_getAccount'),
   params: object({
-    id: string(),
+    id: UuidStruct,
   }),
 });
 
@@ -70,7 +70,7 @@ export const FilterAccountChainsStruct = object({
   ...CommonHeader,
   method: literal('keyring_filterAccountChains'),
   params: object({
-    id: string(),
+    id: UuidStruct,
     chains: array(string()),
   }),
 });
@@ -109,7 +109,7 @@ export const DeleteAccountRequestStruct = object({
   ...CommonHeader,
   method: literal('keyring_deleteAccount'),
   params: object({
-    id: string(),
+    id: UuidStruct,
   }),
 });
 
@@ -126,7 +126,7 @@ export const ExportAccountRequestStruct = object({
   ...CommonHeader,
   method: literal('keyring_exportAccount'),
   params: object({
-    id: string(),
+    id: UuidStruct,
   }),
 });
 
@@ -157,7 +157,7 @@ export const GetRequestRequestStruct = object({
   ...CommonHeader,
   method: literal('keyring_getRequest'),
   params: object({
-    id: string(),
+    id: UuidStruct,
   }),
 });
 
@@ -189,7 +189,7 @@ export const ApproveRequestRequestStruct = object({
   ...CommonHeader,
   method: literal('keyring_approveRequest'),
   params: object({
-    id: string(),
+    id: UuidStruct,
     data: record(string(), JsonStruct),
   }),
 });
@@ -207,7 +207,7 @@ export const RejectRequestRequestStruct = object({
   ...CommonHeader,
   method: literal('keyring_rejectRequest'),
   params: object({
-    id: string(),
+    id: UuidStruct,
   }),
 });
 
diff --git a/src/rpc-handler.test.ts b/src/rpc-handler.test.ts
index 2e49e2417..e11e8c5a5 100644
--- a/src/rpc-handler.test.ts
+++ b/src/rpc-handler.test.ts
@@ -255,13 +255,15 @@ describe('keyringRpcDispatcher', () => {
       jsonrpc: '2.0',
       id: '7c507ff0-365f-4de0-8cd5-eb83c30ebda4',
       method: 'keyring_getRequest',
-      params: { id: 'request_id' },
+      params: { id: '523713e3-f751-4a20-8788-c7a0ea92bef5' },
     };
 
     keyring.getRequest.mockResolvedValue('GetRequest result');
     const result = await handleKeyringRequest(keyring, request);
 
-    expect(keyring.getRequest).toHaveBeenCalledWith('request_id');
+    expect(keyring.getRequest).toHaveBeenCalledWith(
+      '523713e3-f751-4a20-8788-c7a0ea92bef5',
+    );
     expect(result).toBe('GetRequest result');
   });
 
@@ -270,7 +272,7 @@ describe('keyringRpcDispatcher', () => {
       jsonrpc: '2.0',
       id: '7c507ff0-365f-4de0-8cd5-eb83c30ebda4',
       method: 'keyring_getRequest',
-      params: { id: 'request_id' },
+      params: { id: '0cea396f-54e4-4fa9-bf33-8419da668add' },
     };
 
     const partialKeyring: Keyring = {
@@ -309,7 +311,10 @@ describe('keyringRpcDispatcher', () => {
   });
 
   it('should call keyring_approveRequest', async () => {
-    const payload = { id: 'request_id', data: { signature: '0x0123' } };
+    const payload = {
+      id: '59db4ff8-8eb3-4a75-8ef3-b80aff8fa780',
+      data: { signature: '0x0123' },
+    };
     const request: JsonRpcRequest = {
       jsonrpc: '2.0',
       id: '7c507ff0-365f-4de0-8cd5-eb83c30ebda4',
@@ -362,13 +367,15 @@ describe('keyringRpcDispatcher', () => {
       jsonrpc: '2.0',
       id: '7c507ff0-365f-4de0-8cd5-eb83c30ebda4',
       method: 'keyring_rejectRequest',
-      params: { id: 'request_id' },
+      params: { id: 'e5efe6d2-b703-4740-baf5-eb0fc47ba4ad' },
     };
 
     keyring.rejectRequest.mockResolvedValue('RejectRequest result');
     const result = await handleKeyringRequest(keyring, request);
 
-    expect(keyring.rejectRequest).toHaveBeenCalledWith('request_id');
+    expect(keyring.rejectRequest).toHaveBeenCalledWith(
+      'e5efe6d2-b703-4740-baf5-eb0fc47ba4ad',
+    );
     expect(result).toBe('RejectRequest result');
   });