Remove usage of named exports until React Native supports

Signed-off-by: Frank Hinek <[email protected]>

packages/agent/src/app-data-store.ts

@@ -6,10 +6,9 @@ import { DidKeyMethod } from '@web5/dids';
 import { hkdf } from '@noble/hashes/hkdf';
 import { sha256 } from '@noble/hashes/sha256';
 import { sha512 } from '@noble/hashes/sha512';
-import { randomBytes } from '@web5/crypto/utils';
 import { pbkdf2Async } from '@noble/hashes/pbkdf2';
 import { Convert, MemoryStore } from '@web5/common';
-import { CryptoKey, Jose, XChaCha20Poly1305 } from '@web5/crypto';
+import { CryptoKey, Jose, utils as cryptoUtils, XChaCha20Poly1305 } from '@web5/crypto';
 
 export type AppDataBackup = {
   /**
@@ -295,7 +294,7 @@ export class AppDataVault implements AppDataStore {
 
     /** 6. Encrypt the Identity Agent's private key with the derived VUK
      *  using XChaCha20-Poly1305 */
-    const nonce = randomBytes(24);
+    const nonce = cryptoUtils.randomBytes(24);
     const privateKey = keyPair.privateKey.material;
     const {
       ciphertext: privateKeyCiphertext,

packages/agent/src/dwn-manager.ts

@@ -9,10 +9,10 @@ import {
 } from '@tbd54566975/dwn-sdk-js';
 
 import { Jose } from '@web5/crypto';
+import { Convert } from '@web5/common';
 import { DidResolver } from '@web5/dids';
 import { Readable } from 'readable-stream';
-import * as didUtils from '@web5/dids/utils';
-import { Convert } from '@web5/common';
+import { utils as didUtils } from '@web5/dids';
 
 import {
   Cid,

packages/agent/src/kms-local.ts

@@ -1,7 +1,7 @@
 import type { Web5Crypto } from '@web5/crypto';
 import type { RequireOnly } from '@web5/common';
 
-import { isCryptoKeyPair, checkRequiredProperty } from '@web5/crypto/utils';
+import { utils as cryptoUtils } from '@web5/crypto';
 import {
   EcdhAlgorithm,
   EcdsaAlgorithm,
@@ -196,7 +196,7 @@ export class LocalKms implements KeyManagementSystem {
 
     // Create a ManagedKey or ManagedKeyPair using the generated key and store the private key material.
     let managedKeyOrKeyPair: GenerateKeyType<T>;
-    if (isCryptoKeyPair(cryptoKey)) {
+    if (cryptoUtils.isCryptoKeyPair(cryptoKey)) {
       const privateKeyType = cryptoKey.privateKey.type as Web5Crypto.PrivateKeyType;
       const id = await this._privateKeyStore.importKey({
         key   : { material: cryptoKey.privateKey.material, type: privateKeyType},
@@ -360,7 +360,7 @@ export class LocalKms implements KeyManagementSystem {
   }
 
   private getAlgorithm(algorithmIdentifier: Web5Crypto.AlgorithmIdentifier): CryptoAlgorithm {
-    checkRequiredProperty({ property: 'name', inObject: algorithmIdentifier });
+    cryptoUtils.checkRequiredProperty({ property: 'name', inObject: algorithmIdentifier });
     const algorithm = this._supportedAlgorithms.get(algorithmIdentifier.name.toUpperCase());
 
     if (algorithm === undefined) {

packages/agent/src/rpc-client.ts

@@ -1,8 +1,8 @@
+import { utils as cryptoUtils } from '@web5/crypto';
+
 import type { JsonRpcResponse } from './json-rpc.js';
 import type { DwnRpc, DwnRpcRequest, DwnRpcResponse } from './types/agent.js';
 
-import { randomUuid } from '@web5/crypto/utils';
-
 import { createJsonRpcRequest, parseJson } from './json-rpc.js';
 
 /**
@@ -54,7 +54,7 @@ class HttpDwnRpcClient implements DwnRpc {
   get transportProtocols() { return ['http:', 'https:']; }
 
   async sendDwnRequest(request: DwnRpcRequest): Promise<DwnRpcResponse> {
-    const requestId = randomUuid();
+    const requestId = cryptoUtils.randomUuid();
     const jsonRpcRequest = createJsonRpcRequest(requestId, 'dwn.processMessage', {
       target  : request.targetDid,
       message : request.message

packages/agent/src/store-managed-key.ts

@@ -1,13 +1,17 @@
 import type { RecordsWriteMessage, RecordsWriteOptions } from '@tbd54566975/dwn-sdk-js';
 
-import { randomUuid } from '@web5/crypto/utils';
+import { utils as cryptoUtils } from '@web5/crypto';
 import { Convert, removeEmptyObjects, removeUndefinedProperties } from '@web5/common';
 
-import type { ManagedKeyPair, ManagedKeyStore, ManagedPrivateKey } from './types/managed-key.js';
+import type { DwnResponse, Web5ManagedAgent } from './types/agent.js';
+import type {
+  ManagedKey,
+  ManagedKeyPair,
+  ManagedKeyStore,
+  ManagedPrivateKey
+} from './types/managed-key.js';
 
-import { DwnResponse, Web5ManagedAgent } from './types/agent.js';
 import { isManagedKeyPair } from './utils.js';
-import { ManagedKey } from './types/managed-key.js';
 
 type EncodedPrivateKey = Omit<ManagedPrivateKey, 'material'> & {
   // Key material, encoded as Base64Url.
@@ -152,7 +156,7 @@ export class KeyStoreDwn implements ManagedKeyStore<string, ManagedKey | Managed
     } else {
       // If an ID wasn't specified, generate one.
       if (!key.id) {
-        key.id = randomUuid();
+        key.id = cryptoUtils.randomUuid();
       }
       keyId = key.id;
     }
@@ -430,7 +434,7 @@ export class KeyStoreMemory implements ManagedKeyStore<string, ManagedKey | Mana
     } else {
       // If an ID wasn't specified, generate one.
       if (!key.id) {
-        key.id = randomUuid();
+        key.id = cryptoUtils.randomUuid();
       }
       id = key.id;
     }
@@ -584,7 +588,7 @@ export class PrivateKeyStoreDwn implements ManagedKeyStore<string, ManagedPrivat
     const authorDid = await this.getAuthor({ agent, context });
 
     // Encode the managed key or key pair as bytes.
-    const id = randomUuid(); // Generate a random ID.
+    const id = cryptoUtils.randomUuid(); // Generate a random ID.
     const encodedPrivateKey = this.encodeKey({...key, id });
 
     const { reply: { status } } = await agent.dwnManager.processRequest({
@@ -723,7 +727,7 @@ export class PrivateKeyStoreMemory implements ManagedKeyStore<string, ManagedPri
     // The private key material is transferred to the new object, making the original obj.material unusable.
     const clonedKey = structuredClone(key, { transfer: [key.material.buffer] }) as ManagedPrivateKey;
 
-    clonedKey.id = randomUuid();
+    clonedKey.id = cryptoUtils.randomUuid();
     this.store.set(clonedKey.id, clonedKey);
 
     return clonedKey.id;

packages/api/src/tech-preview.ts

@@ -1,4 +1,4 @@
-import * as didUtils from '@web5/dids/utils';
+import { utils as didUtils } from '@web5/dids';
 
 /**
  * Dynamically selects up to 2 DWN endpoints that are provided

packages/api/tests/record.spec.ts

@@ -9,7 +9,7 @@ import type {
 
 import chai, { expect } from 'chai';
 import chaiAsPromised from 'chai-as-promised';
-import * as didUtils from '@web5/dids/utils';
+import { utils as didUtils } from '@web5/dids';
 import { TestManagedAgent } from '@web5/agent';
 import {
   RecordsWrite,

packages/api/tests/utils/test-data-generator.ts

@@ -1,11 +1,11 @@
-import { randomBytes } from '@web5/crypto/utils';
+import { utils as cryptoUtils } from '@web5/crypto';
 
 export class TestDataGenerator {
   /**
    * Generates a random byte array of given length.
    */
   static randomBytes(length: number): Uint8Array {
-    return randomBytes(length);
+    return cryptoUtils.randomBytes(length);
   }
 
   /**

packages/dids/src/did-key.ts

@@ -1,13 +1,13 @@
 import type { PrivateKeyJwk, PublicKeyJwk, Web5Crypto } from '@web5/crypto';
 
 import { universalTypeOf } from '@web5/common';
-import { keyToMultibaseId, multibaseIdToKey } from '@web5/crypto/utils';
 import {
   Jose,
   Ed25519,
   Secp256k1,
   EcdsaAlgorithm,
   EdDsaAlgorithm,
+  utils as cryptoUtils,
 } from '@web5/crypto';
 
 import type {
@@ -17,9 +17,9 @@ import type {
   VerificationMethod,
   DidResolutionResult,
   DidResolutionOptions,
+  DidKeySetVerificationMethodKey,
 } from './types.js';
 
-import { DidKeySetVerificationMethodKey } from './types.js';
 import { getVerificationMethodTypes, parseDid } from './utils.js';
 
 const SupportedCryptoAlgorithms = [
@@ -340,7 +340,7 @@ export class DidKeyMethod implements DidMethod {
      * base58-btc encoding of the concatenation of the multicodecValue and
      * the rawPublicKeyBytes.
      */
-    const kemMultibaseValue = keyToMultibaseId({
+    const kemMultibaseValue = cryptoUtils.keyToMultibaseId({
       key            : rawPublicKeyBytes,
       multicodecCode : multicodecValue
     });
@@ -457,7 +457,7 @@ export class DidKeyMethod implements DidMethod {
     const {
       key: rawPublicKeyBytes,
       multicodecCode: multicodecValue
-    } = multibaseIdToKey({ multibaseKeyId: multibaseValue });
+    } = cryptoUtils.multibaseIdToKey({ multibaseKeyId: multibaseValue });
 
     /**
      * 4. If the multicodecValue is 0xed, derive a public X25519 encryption key
@@ -516,7 +516,7 @@ export class DidKeyMethod implements DidMethod {
       key: rawPublicKeyBytes,
       multicodecCode: multicodecValue,
       multicodecName
-    } = multibaseIdToKey({ multibaseKeyId: multibaseValue });
+    } = cryptoUtils.multibaseIdToKey({ multibaseKeyId: multibaseValue });
 
     /**
      * 3. Ensure the proper key length of rawPublicKeyBytes based on the