Move crypto functions from cloud-wallet core to edv service

packages/core/src/cloud-wallet.ts

@@ -10,15 +10,11 @@ import {
 } from '@docknetwork/wallet-sdk-data-store/src/types';
 import { logger } from '@docknetwork/wallet-sdk-data-store/src/logger';
 import { edvService, EDVService } from '@docknetwork/wallet-sdk-wasm/src/services/edv/service';
-import hkdf from 'futoin-hkdf';
-import crypto from '@docknetwork/universal-wallet/crypto';
 import { utilCryptoService } from '@docknetwork/wallet-sdk-wasm/src/services/util-crypto';
 
 export const SYNC_MARKER_TYPE = 'SyncMarkerDocument';
 export const MNEMONIC_WORD_COUNT = 12;
 export const KEY_MAPPING_TYPE = 'KeyMappingDocument';
-export const HKDF_LENGTH = 32;
-export const HKDF_HASH = 'SHA-256';
 const MASTER_KEY_SUFFIX = 'master-key';
 
 /**
@@ -31,9 +27,7 @@ export function deriveBiometricKey(
   biometricData: Buffer,
   identifier: string,
 ): Buffer {
-  const salt = identifier;
-
-  return hkdf(biometricData, HKDF_LENGTH, { salt, hash: HKDF_HASH });
+  return edvService.deriveBiometricKey(biometricData, identifier);
 }
 
 /**
@@ -61,15 +55,7 @@ export async function deriveBiometricEncryptionKey(
   biometricData: Buffer,
   identifier: string
 ): Promise<{ key: Buffer; iv: Buffer }> {
-  const key = deriveBiometricKey(biometricData, identifier);
-
-  const randomBytes = crypto.getRandomValues(new Uint8Array(16));
-  const iv = Buffer.from(randomBytes);
-
-  return {
-    key,
-    iv
-  };
+  return edvService.deriveBiometricEncryptionKey(biometricData, identifier);
 }
 
 /**
@@ -84,24 +70,7 @@ export async function encryptMasterKey(
   encryptionKey: Buffer,
   iv: Buffer
 ): Promise<Uint8Array> {
-  const keyData = new Uint8Array(encryptionKey);
-  const ivData = new Uint8Array(iv);
-
-  const key = await crypto.subtle.importKey(
-    'raw',
-    keyData,
-    { name: 'AES-GCM' },
-    false,
-    ['encrypt']
-  );
-
-  const encryptedBuffer = await crypto.subtle.encrypt(
-    { name: 'AES-GCM', iv: ivData },
-    key,
-    masterKey
-  );
-
-  return new Uint8Array(encryptedBuffer);
+  return edvService.encryptMasterKey(masterKey, encryptionKey, iv);
 }
 
 /**
@@ -116,28 +85,7 @@ export async function decryptMasterKey(
   decryptionKey: Buffer,
   iv: Buffer
 ): Promise<Uint8Array> {
-  try {
-    const keyData = new Uint8Array(decryptionKey);
-    const ivData = new Uint8Array(iv);
-
-    const key = await crypto.subtle.importKey(
-      'raw',
-      keyData,
-      { name: 'AES-GCM' },
-      false,
-      ['decrypt']
-    );
-
-    const decryptedBuffer = await crypto.subtle.decrypt(
-      { name: 'AES-GCM', iv: ivData },
-      key,
-      encryptedKey
-    );
-
-    return new Uint8Array(decryptedBuffer);
-  } catch (error) {
-    throw new Error('Decryption failed: Invalid key or corrupted data');
-  }
+  return edvService.decryptMasterKey(encryptedKey, decryptionKey, iv);
 }
 
 /**

packages/react-native/bundler/index.js

@@ -10,6 +10,9 @@ const getWebpackConfig = ({entry, path, filename}) => ({
   },
   resolve: {
     extensions: ['.tsx', '.ts', '.js', '.json', '.mjs', '.cjs'],
+    alias: {
+      '@cheqd/ts-proto': '@cheqd/ts-proto-cjs',
+    },
     fallback: {
       crypto: require.resolve('crypto-browserify'),
       stream: require.resolve('stream-browserify'),
@@ -28,7 +31,9 @@ const getWebpackConfig = ({entry, path, filename}) => ({
     rules: [
       {
         test: /\.(m|c)?(j|t)s$/,
-        exclude: [/\/node_modules\/(?!@docknetwork|@digitalbazaar|@cheqd)/],
+        exclude: [
+          /\/node_modules\/(?!@docknetwork|@digitalbazaar|@cheqd\/ts-proto)/,
+        ],
         use: {
           loader: require.resolve('babel-loader'),
           options: {

packages/wasm/package.json

@@ -18,36 +18,37 @@
         "p-limit": "2.3.0"
     },
     "dependencies": {
-        "p-limit": "2.3.0",
         "@astronautlabs/jsonpath": "^1.1.2",
-        "@docknetwork/universal-wallet": "^2.0.1",
-        "@docknetwork/wallet-sdk-dids": "^1.7.0",
         "@cedar-policy/cedar-wasm": "^4.5.0",
-        "jsonld": "^6.0.0",
-        "@docknetwork/vc-delegation-engine": "1.0.3",
         "@cosmjs/proto-signing": "^0.32.4",
         "@docknetwork/cheqd-blockchain-api": "4.1.1",
         "@docknetwork/cheqd-blockchain-modules": "4.0.8",
-        "@scure/bip39": "^1.6.0",
-        "@noble/hashes": "1.8.0",
         "@docknetwork/credential-sdk": "0.54.16",
-        "@sphereon/oid4vci-client": "^0.16.0",
-        "@sphereon/oid4vci-common": "^0.16.0",
+        "@docknetwork/universal-wallet": "^2.0.1",
+        "@docknetwork/vc-delegation-engine": "1.0.3",
+        "@docknetwork/wallet-sdk-dids": "^1.7.0",
+        "@noble/hashes": "1.8.0",
+        "@scure/bip39": "^1.6.0",
         "@sd-jwt/crypto-nodejs": "^0.15.0",
         "@sd-jwt/sd-jwt-vc": "^0.15.1",
-        "base64url": "^3.0.1",
+        "@sphereon/oid4vci-client": "^0.16.0",
+        "@sphereon/oid4vci-common": "^0.16.0",
+        "@sphereon/pex": "^1.1.4",
         "axios": "^0.25.0",
+        "axios-retry": "^3.2.5",
+        "base64url": "^3.0.1",
+        "cwait": "1.1.2",
+        "futoin-hkdf": "^1.5.3",
         "json-rpc-2.0": "^0.2.16",
+        "jsonld": "^6.0.0",
+        "p-limit": "2.3.0",
         "uuid": "^8.3.2",
-        "winston": "^3.3.3",
-        "cwait": "1.1.2",
-        "axios-retry": "^3.2.5",
-        "@sphereon/pex": "^1.1.4"
+        "winston": "^3.3.3"
     },
     "devDependencies": {
         "@babel/node": "^7.16.0",
-        "sinon": "^12.0.1",
         "jest": "29.6.1",
+        "sinon": "^12.0.1",
         "ts-jest": "29.1.0",
         "typescript": "^5.0.4"
     }