Merge pull request #212 from radixdlt/uuid

refactor: use uuidv4 for wallet interaction id

package.json

@@ -12,11 +12,11 @@
     "deploy:simple-dapp": "turbo deploy --filter simple-dapp"
   },
   "devDependencies": {
-    "prettier": "^3.2.5",
-    "turbo": "latest",
-    "husky": "^8.0.3",
     "@commitlint/cli": "^17.4.2",
-    "@commitlint/config-conventional": "^17.4.2"
+    "@commitlint/config-conventional": "^17.4.2",
+    "husky": "^8.0.3",
+    "prettier": "^3.2.5",
+    "turbo": "latest"
   },
   "engines": {
     "node": ">=18"

packages/dapp-toolkit/package.json

@@ -65,10 +65,10 @@
     "immer": "^10.0.4",
     "lit": "^3.1.2",
     "lit-html": "^3.1.2",
-    "nanoid": "^5.0.7",
     "neverthrow": "^6.1.0",
     "rxjs": "^7.8.1",
     "tslog": ">=4.8.0",
+    "uuid": "^10.0.0",
     "valibot": "^0.30.0"
   },
   "devDependencies": {

packages/dapp-toolkit/src/modules/wallet-request/session/session.module.ts

@@ -2,7 +2,7 @@ import type { ResultAsync } from 'neverthrow'
 import { errAsync, okAsync } from 'neverthrow'
 import type { IdentityModule } from '../identity/identity.module'
 import { StorageModule } from '../../storage/local-storage.module'
-import { nanoid } from 'nanoid'
+import { v4 as uuidV4 } from 'uuid'
 
 type Status = (typeof Status)[keyof typeof Status]
 const Status = { Pending: 'Pending', Active: 'Active' } as const
@@ -53,7 +53,7 @@ export const SessionModule = (input: {
     storageModule.getItemById(sessionId)
 
   const createSession = (): ResultAsync<PendingSession, Error> => {
-    const sessionId = nanoid()
+    const sessionId = uuidV4()
     const newSession: PendingSession = {
       sessionId,
       status: Status.Pending,

packages/dapp-toolkit/src/modules/wallet-request/transport/connector-extension/connector-extension.module.ts

@@ -33,7 +33,7 @@ import { RequestItemModule } from '../../request-items'
 import { StorageModule } from '../../../storage'
 import { SdkError } from '../../../../error'
 import { TransportProvider } from '../../../../_types'
-import { nanoid } from 'nanoid'
+import { v4 as uuidV4 } from 'uuid'
 
 export type ConnectorExtensionModule = ReturnType<
   typeof ConnectorExtensionModule
@@ -109,7 +109,7 @@ export const ConnectorExtensionModule = (input: {
         interaction.items.discriminator === 'authorizedRequest'
 
       const sessionId = isAuthorizedRequest
-        ? state?.sessionId || nanoid()
+        ? state?.sessionId || uuidV4()
         : state?.sessionId
 
       const wrappedRequest = {
@@ -273,7 +273,7 @@ export const ConnectorExtensionModule = (input: {
   const extensionStatus$ = of(true).pipe(
     tap(() => {
       subjects.outgoingMessageSubject.next({
-        interactionId: nanoid(),
+        interactionId: uuidV4(),
         discriminator: 'extensionStatus',
       })
     }),

packages/dapp-toolkit/src/modules/wallet-request/wallet-request-sdk.ts

@@ -10,7 +10,7 @@ import {
 } from '../../schemas'
 import { parse } from 'valibot'
 import { SdkError } from '../../error'
-import { nanoid } from 'nanoid'
+import { v4 as uuidV4 } from 'uuid'
 
 export type WalletRequestSdkInput = {
   networkId: number
@@ -50,7 +50,7 @@ export const WalletRequestSdk = (input: WalletRequestSdkInput) => {
 
   const createWalletInteraction = (
     items: WalletInteractionItems,
-    interactionId = nanoid(),
+    interactionId = uuidV4(),
   ): WalletInteraction => ({
     items,
     interactionId,
@@ -82,7 +82,7 @@ export const WalletRequestSdk = (input: WalletRequestSdkInput) => {
 
   const request = (
     {
-      interactionId = nanoid(),
+      interactionId = uuidV4(),
       items,
     }: Pick<WalletInteraction, 'items'> & { interactionId?: string },
     callbackFns: Partial<CallbackFns> = {},
@@ -101,7 +101,7 @@ export const WalletRequestSdk = (input: WalletRequestSdkInput) => {
 
   const sendTransaction = (
     {
-      interactionId = nanoid(),
+      interactionId = uuidV4(),
       items,
     }: { interactionId?: string; items: WalletInteraction['items'] },
     callbackFns: Partial<CallbackFns> = {},