feat: add randomUUID into fuel-ts/crypto (#2903)

.changeset/wet-camels-tell.md

@@ -0,0 +1,6 @@
+---
+"@fuel-ts/account": patch
+"@fuel-ts/crypto": patch
+---
+
+feat: add randomUUID into `fuel-ts/crypto`

packages/account/package.json

@@ -66,8 +66,7 @@
     "graphql-request": "5.0.0",
     "graphql-tag": "^2.12.6",
     "portfinder": "^1.0.32",
-    "ramda": "^0.30.1",
-    "uuid": "^10.0.0"
+    "ramda": "^0.30.1"
   },
   "devDependencies": {
     "type-fest": "^4.6.0",
@@ -79,7 +78,6 @@
     "@graphql-codegen/typescript-generic-sdk": "^4.0.1",
     "@graphql-codegen/typescript-operations": "^4.2.3",
     "@types/ramda": "^0.30.1",
-    "@types/uuid": "^9.0.1",
     "get-graphql-schema": "^2.1.2"
   }
 }

packages/account/src/test-utils/launchNode.ts

@@ -1,9 +1,8 @@
 import { BYTES_32 } from '@fuel-ts/abi-coder';
-import { randomBytes } from '@fuel-ts/crypto';
+import { randomBytes, randomUUID } from '@fuel-ts/crypto';
 import { FuelError } from '@fuel-ts/errors';
 import type { SnapshotConfigs } from '@fuel-ts/utils';
 import { defaultConsensusKey, hexlify, defaultSnapshotConfigs } from '@fuel-ts/utils';
-import { randomUUID } from 'crypto';
 import { existsSync, mkdirSync, rmSync, writeFileSync } from 'fs';
 import os from 'os';
 import path from 'path';

packages/account/src/wallet/keystore-wallet.ts

@@ -7,11 +7,11 @@ import {
   stringFromBuffer,
   decryptJsonWalletData,
   encryptJsonWalletData,
+  randomUUID,
 } from '@fuel-ts/crypto';
 import { ErrorCode, FuelError } from '@fuel-ts/errors';
 import type { AbstractAddress } from '@fuel-ts/interfaces';
 import { hexlify } from '@fuel-ts/utils';
-import { v4 as uuidv4 } from 'uuid';
 
 export type KeystoreWallet = {
   id: string;
@@ -90,7 +90,7 @@ export async function encryptKeystoreWallet(
 
   // Construct keystore.
   const keystore: KeystoreWallet = {
-    id: uuidv4(),
+    id: randomUUID(),
     version: 3,
     address: removeHexPrefix(ownerAddress.toHexString()),
     crypto: {

packages/contract/src/test-utils/launch-test-node.test.ts

@@ -1,11 +1,11 @@
 import type { JsonAbi } from '@fuel-ts/abi-coder';
 import { Provider } from '@fuel-ts/account';
 import * as setupTestProviderAndWalletsMod from '@fuel-ts/account/test-utils';
+import { randomBytes, randomUUID } from '@fuel-ts/crypto';
 import { FuelError } from '@fuel-ts/errors';
 import { expectToThrowFuelError, safeExec } from '@fuel-ts/errors/test-utils';
 import { hexlify, type SnapshotConfigs } from '@fuel-ts/utils';
 import { getForcProject, waitUntilUnreachable } from '@fuel-ts/utils/test-utils';
-import { randomBytes, randomUUID } from 'crypto';
 import { existsSync, mkdirSync, readFileSync, rmSync } from 'fs';
 import { writeFile, copyFile } from 'fs/promises';
 import os from 'os';

packages/crypto/src/browser/index.ts

@@ -7,6 +7,7 @@ import { decryptJsonWalletData, encryptJsonWalletData } from './encryptJsonWalle
 import { computeHmac } from './hmac';
 import { pbkdf2 } from './pbkdf2';
 import { randomBytes } from './randomBytes';
+import { randomUUID } from './randomUUID';
 import { stringFromBuffer } from './stringFromBuffer';
 
 const api: CryptoApi = {
@@ -23,6 +24,7 @@ const api: CryptoApi = {
   computeHmac,
   pbkdf2,
   ripemd160,
+  randomUUID,
 };
 
 export default api;

packages/crypto/src/browser/randomUUID.ts

@@ -0,0 +1,5 @@
+import type { CryptoApi } from '../types';
+
+import { crypto } from './crypto';
+
+export const randomUUID: CryptoApi['randomUUID'] = () => crypto.randomUUID();

packages/crypto/src/index.browser.ts

@@ -16,4 +16,5 @@ export const {
   pbkdf2,
   computeHmac,
   ripemd160,
+  randomUUID,
 } = cryptoApi;

packages/crypto/src/index.ts

@@ -16,4 +16,5 @@ export const {
   computeHmac,
   pbkdf2,
   ripemd160,
+  randomUUID,
 } = cryptoApi;

packages/crypto/src/node/index.ts

@@ -7,6 +7,7 @@ import { decryptJsonWalletData, encryptJsonWalletData } from './encryptJsonWalle
 import { computeHmac } from './hmac';
 import { pbkdf2 } from './pbkdf2';
 import { randomBytes } from './randomBytes';
+import { randomUUID } from './randomUUID';
 import { stringFromBuffer } from './stringFromBuffer';
 
 const api: CryptoApi = {
@@ -23,6 +24,7 @@ const api: CryptoApi = {
   computeHmac,
   pbkdf2,
   ripemd160,
+  randomUUID,
 };
 
 export default api;

packages/crypto/src/node/randomUUID.ts

@@ -0,0 +1,5 @@
+import { randomUUID as UUID } from 'crypto';
+
+import type { CryptoApi } from '../types';
+
+export const randomUUID: CryptoApi['randomUUID'] = () => UUID();

packages/crypto/src/types.ts

@@ -29,6 +29,7 @@ export interface CryptoApi {
   encryptJsonWalletData(data: Uint8Array, key: Uint8Array, iv: Uint8Array): Promise<Uint8Array>;
   decryptJsonWalletData(data: Uint8Array, key: Uint8Array, iv: Uint8Array): Promise<Uint8Array>;
   computeHmac(algorithm: 'sha256' | 'sha512', key: BytesLike, data: BytesLike): string;
+  randomUUID(): string;
   pbkdf2(
     password: BytesLike,
     salt: BytesLike,

packages/crypto/test/randomUUID.test.ts

@@ -0,0 +1,15 @@
+import { randomUUID } from '..';
+
+/**
+ * @group node
+ * @group browser
+ */
+describe('randomUUID', () => {
+  const UUID_V4_REGEX =
+    /^[0-9a-fA-F]{8}\b-[0-9a-fA-F]{4}\b-4[0-9a-fA-F]{3}\b-[89ABab][0-9a-fA-F]{3}\b-[0-9a-fA-F]{12}$/;
+
+  it('generates a V4 UUID', () => {
+    const uuidV4 = randomUUID();
+    expect(uuidV4).toMatch(UUID_V4_REGEX);
+  });
+});

packages/crypto/tsconfig.json

@@ -3,5 +3,5 @@
   "compilerOptions": {
     "outDir": "./dist"
   },
-  "include": ["src"]
+  "include": ["src", "test"]
 }