diff --git a/package-lock.json b/package-lock.json index e867ef9f..fce98d39 100644 --- a/package-lock.json +++ b/package-lock.json @@ -33510,10 +33510,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": { @@ -34249,23 +34249,6 @@ "url": "https://github.com/sponsors/sindresorhus" } }, - "packages/dapp-toolkit/node_modules/nanoid": { - "version": "5.0.7", - "resolved": "https://registry.npmjs.org/nanoid/-/nanoid-5.0.7.tgz", - "integrity": "sha512-oLxFY2gd2IqnjcYyOXD8XGCftpGtZP2AbHbOkthDkvRywH5ayNtPVy9YlOPcHckXzbLTCHpkb7FB+yuxKV13pQ==", - "funding": [ - { - "type": "github", - "url": "https://github.com/sponsors/ai" - } - ], - "bin": { - "nanoid": "bin/nanoid.js" - }, - "engines": { - "node": "^18 || >=20" - } - }, "packages/dapp-toolkit/node_modules/node-emoji": { "version": "2.1.3", "resolved": "https://registry.npmjs.org/node-emoji/-/node-emoji-2.1.3.tgz", @@ -37356,6 +37339,18 @@ "integrity": "sha512-0JCqzSKnStlRRQfCdowvqy3cy0Dvtlb8xecj/H8JFZuCze4rwjPZQOgvFvn0Ws/usCHQFGpyr+pB9adaGwXn4Q==", "dev": true }, + "packages/dapp-toolkit/node_modules/uuid": { + "version": "10.0.0", + "resolved": "https://registry.npmjs.org/uuid/-/uuid-10.0.0.tgz", + "integrity": "sha512-8XkAphELsDnEGrDxUOHB3RGvXz6TeuYSGEZBOjtTtPm2lwhGBjLgOzLHB63IUWfBpNucQjND6d3AOudO+H3RWQ==", + "funding": [ + "https://github.com/sponsors/broofa", + "https://github.com/sponsors/ctavan" + ], + "bin": { + "uuid": "dist/bin/uuid" + } + }, "packages/eslint-config": { "name": "@repo/eslint-config", "version": "0.0.0", diff --git a/package.json b/package.json index b1fa676c..5d56525b 100644 --- a/package.json +++ b/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" diff --git a/packages/dapp-toolkit/package.json b/packages/dapp-toolkit/package.json index c5f0dbdf..1da59b7a 100644 --- a/packages/dapp-toolkit/package.json +++ b/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": { diff --git a/packages/dapp-toolkit/src/modules/wallet-request/session/session.module.ts b/packages/dapp-toolkit/src/modules/wallet-request/session/session.module.ts index 7c3a3213..bf7686c9 100644 --- a/packages/dapp-toolkit/src/modules/wallet-request/session/session.module.ts +++ b/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 => { - const sessionId = nanoid() + const sessionId = uuidV4() const newSession: PendingSession = { sessionId, status: Status.Pending, diff --git a/packages/dapp-toolkit/src/modules/wallet-request/transport/connector-extension/connector-extension.module.ts b/packages/dapp-toolkit/src/modules/wallet-request/transport/connector-extension/connector-extension.module.ts index 6f765115..cf3824e6 100644 --- a/packages/dapp-toolkit/src/modules/wallet-request/transport/connector-extension/connector-extension.module.ts +++ b/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', }) }), diff --git a/packages/dapp-toolkit/src/modules/wallet-request/wallet-request-sdk.ts b/packages/dapp-toolkit/src/modules/wallet-request/wallet-request-sdk.ts index f6038856..ec9ec97b 100644 --- a/packages/dapp-toolkit/src/modules/wallet-request/wallet-request-sdk.ts +++ b/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 & { interactionId?: string }, callbackFns: Partial = {}, @@ -101,7 +101,7 @@ export const WalletRequestSdk = (input: WalletRequestSdkInput) => { const sendTransaction = ( { - interactionId = nanoid(), + interactionId = uuidV4(), items, }: { interactionId?: string; items: WalletInteraction['items'] }, callbackFns: Partial = {},