cojson 0.7.0-alpha.37 → 0.7.0-alpha.38

package/src/tests/coStream.test.ts

@@ -1,30 +1,20 @@
-import { expect, test, beforeEach } from "vitest";
-import { expectList, expectMap, expectStream } from "../coValue.js";
+import { expect, test } from "vitest";
+import { expectStream } from "../coValue.js";
 import { RawBinaryCoStream } from "../coValues/coStream.js";
-import { createdNowUnique } from "../crypto.js";
-import { MAX_RECOMMENDED_TX_SIZE, cojsonReady } from "../index.js";
+import { MAX_RECOMMENDED_TX_SIZE, WasmCrypto } from "../index.js";
 import { LocalNode } from "../localNode.js";
-import { accountOrAgentIDfromSessionID } from "../typeUtils/accountOrAgentIDfromSessionID.js";
 import { randomAnonymousAccountAndSessionID } from "./testUtils.js";
 
-import { webcrypto } from "node:crypto";
-if (!("crypto" in globalThis)) {
-    // eslint-disable-next-line @typescript-eslint/no-explicit-any
-    (globalThis as any).crypto = webcrypto;
-}
-
-beforeEach(async () => {
-    await cojsonReady;
-});
+const Crypto = await WasmCrypto.create();
 
 test("Empty CoStream works", () => {
-    const node = new LocalNode(...randomAnonymousAccountAndSessionID());
+    const node = new LocalNode(...randomAnonymousAccountAndSessionID(), Crypto);
 
     const coValue = node.createCoValue({
         type: "costream",
         ruleset: { type: "unsafeAllowAll" },
         meta: null,
-        ...createdNowUnique(),
+        ...Crypto.createdNowUnique(),
     });
 
     const content = expectStream(coValue.getCurrentContent());
@@ -35,13 +25,13 @@ test("Empty CoStream works", () => {
 });
 
 test("Can push into CoStream", () => {
-    const node = new LocalNode(...randomAnonymousAccountAndSessionID());
+    const node = new LocalNode(...randomAnonymousAccountAndSessionID(), Crypto);
 
     const coValue = node.createCoValue({
         type: "costream",
         ruleset: { type: "unsafeAllowAll" },
         meta: null,
-        ...createdNowUnique(),
+        ...Crypto.createdNowUnique(),
     });
 
     const content = expectStream(coValue.getCurrentContent());
@@ -61,13 +51,13 @@ test("Can push into CoStream", () => {
 });
 
 test("Empty RawBinaryCoStream works", () => {
-    const node = new LocalNode(...randomAnonymousAccountAndSessionID());
+    const node = new LocalNode(...randomAnonymousAccountAndSessionID(), Crypto);
 
     const coValue = node.createCoValue({
         type: "costream",
         ruleset: { type: "unsafeAllowAll" },
         meta: { type: "binary" },
-        ...createdNowUnique(),
+        ...Crypto.createdNowUnique(),
     });
 
     const content = coValue.getCurrentContent();
@@ -87,13 +77,13 @@ test("Empty RawBinaryCoStream works", () => {
 });
 
 test("Can push into RawBinaryCoStream", () => {
-    const node = new LocalNode(...randomAnonymousAccountAndSessionID());
+    const node = new LocalNode(...randomAnonymousAccountAndSessionID(), Crypto);
 
     const coValue = node.createCoValue({
         type: "costream",
         ruleset: { type: "unsafeAllowAll" },
         meta: { type: "binary" },
-        ...createdNowUnique(),
+        ...Crypto.createdNowUnique(),
     });
 
     const content = coValue.getCurrentContent();
@@ -108,7 +98,7 @@ test("Can push into RawBinaryCoStream", () => {
 
     content.startBinaryStream(
         { mimeType: "text/plain", fileName: "test.txt" },
-        "trusting"
+        "trusting",
     );
     content.pushBinaryStreamChunk(new Uint8Array([1, 2, 3]), "trusting");
     content.pushBinaryStreamChunk(new Uint8Array([4, 5, 6]), "trusting");
@@ -123,13 +113,13 @@ test("Can push into RawBinaryCoStream", () => {
 });
 
 test("When adding large transactions (small fraction of MAX_RECOMMENDED_TX_SIZE), we store an inbetween signature every time we reach MAX_RECOMMENDED_TX_SIZE and split up newContentSince accordingly", () => {
-    const node = new LocalNode(...randomAnonymousAccountAndSessionID());
+    const node = new LocalNode(...randomAnonymousAccountAndSessionID(), Crypto);
 
     const coValue = node.createCoValue({
         type: "costream",
         ruleset: { type: "unsafeAllowAll" },
         meta: { type: "binary" },
-        ...createdNowUnique(),
+        ...Crypto.createdNowUnique(),
     });
 
     const content = coValue.getCurrentContent();
@@ -144,7 +134,7 @@ test("When adding large transactions (small fraction of MAX_RECOMMENDED_TX_SIZE)
 
     content.startBinaryStream(
         { mimeType: "text/plain", fileName: "test.txt" },
-        "trusting"
+        "trusting",
     );
 
     for (let i = 0; i < 10; i++) {
@@ -179,27 +169,27 @@ test("When adding large transactions (small fraction of MAX_RECOMMENDED_TX_SIZE)
     expect(newContent.length).toEqual(5);
     expect(newContent[0]!.header).toBeDefined();
     expect(newContent[1]!.new[node.currentSessionID]!.lastSignature).toEqual(
-        sessionEntry.signatureAfter[3]
+        sessionEntry.signatureAfter[3],
     );
     expect(newContent[2]!.new[node.currentSessionID]!.lastSignature).toEqual(
-        sessionEntry.signatureAfter[6]
+        sessionEntry.signatureAfter[6],
     );
     expect(newContent[3]!.new[node.currentSessionID]!.lastSignature).toEqual(
-        sessionEntry.signatureAfter[9]
+        sessionEntry.signatureAfter[9],
     );
     expect(newContent[4]!.new[node.currentSessionID]!.lastSignature).toEqual(
-        sessionEntry.lastSignature
+        sessionEntry.lastSignature,
     );
 });
 
 test("When adding large transactions (bigger than MAX_RECOMMENDED_TX_SIZE), we store an inbetween signature after every large transaction and split up newContentSince accordingly", () => {
-    const node = new LocalNode(...randomAnonymousAccountAndSessionID());
+    const node = new LocalNode(...randomAnonymousAccountAndSessionID(), Crypto);
 
     const coValue = node.createCoValue({
         type: "costream",
         ruleset: { type: "unsafeAllowAll" },
         meta: { type: "binary" },
-        ...createdNowUnique(),
+        ...Crypto.createdNowUnique(),
     });
 
     const content = coValue.getCurrentContent();
@@ -214,7 +204,7 @@ test("When adding large transactions (bigger than MAX_RECOMMENDED_TX_SIZE), we s
 
     content.startBinaryStream(
         { mimeType: "text/plain", fileName: "test.txt" },
-        "trusting"
+        "trusting",
     );
 
     const chunk = new Uint8Array(MAX_RECOMMENDED_TX_SIZE + 100);
@@ -242,15 +232,15 @@ test("When adding large transactions (bigger than MAX_RECOMMENDED_TX_SIZE), we s
     expect(newContent.length).toEqual(5);
     expect(newContent[0]!.header).toBeDefined();
     expect(newContent[1]!.new[node.currentSessionID]!.lastSignature).toEqual(
-        sessionEntry.signatureAfter[1]
+        sessionEntry.signatureAfter[1],
     );
     expect(newContent[2]!.new[node.currentSessionID]!.lastSignature).toEqual(
-        sessionEntry.signatureAfter[2]
+        sessionEntry.signatureAfter[2],
     );
     expect(newContent[3]!.new[node.currentSessionID]!.lastSignature).toEqual(
-        sessionEntry.signatureAfter[3]
+        sessionEntry.signatureAfter[3],
     );
     expect(newContent[4]!.new[node.currentSessionID]!.lastSignature).toEqual(
-        sessionEntry.lastSignature
+        sessionEntry.lastSignature,
     );
-});
+});

package/src/tests/coValueCore.test.ts

@@ -1,32 +1,23 @@
-import { expect, test, beforeEach, vi } from "vitest";
+import { expect, test, vi } from "vitest";
 import { Transaction } from "../coValueCore.js";
 import { LocalNode } from "../localNode.js";
-import { createdNowUnique, getAgentSignerSecret, newRandomAgentSecret, sign } from "../crypto.js";
 import { randomAnonymousAccountAndSessionID } from "./testUtils.js";
 import { MapOpPayload } from "../coValues/coMap.js";
 import { Role } from "../permissions.js";
-import { cojsonReady } from "../index.js";
 import { stableStringify } from "../jsonStringify.js";
+import { WasmCrypto } from "../crypto/WasmCrypto.js";
 
-import { webcrypto } from "node:crypto";
-if (!("crypto" in globalThis)) {
-    // eslint-disable-next-line @typescript-eslint/no-explicit-any
-    (globalThis as any).crypto = webcrypto;
-}
-
-beforeEach(async () => {
-    await cojsonReady;
-});
+const Crypto = await WasmCrypto.create();
 
 test("Can create coValue with new agent credentials and add transaction to it", () => {
     const [account, sessionID] = randomAnonymousAccountAndSessionID();
-    const node = new LocalNode(account, sessionID);
+    const node = new LocalNode(account, sessionID, Crypto);
 
     const coValue = node.createCoValue({
         type: "costream",
         ruleset: { type: "unsafeAllowAll" },
         meta: null,
-        ...createdNowUnique(),
+        ...Crypto.createdNowUnique(),
     });
 
     const transaction: Transaction = {
@@ -41,7 +32,7 @@ test("Can create coValue with new agent credentials and add transaction to it",
 
     const { expectedNewHash } = coValue.expectedNewHashAfter(
         node.currentSessionID,
-        [transaction]
+        [transaction],
     );
 
     expect(
@@ -49,21 +40,21 @@ test("Can create coValue with new agent credentials and add transaction to it",
             node.currentSessionID,
             [transaction],
             expectedNewHash,
-            sign(account.currentSignerSecret(), expectedNewHash)
-        )
+            Crypto.sign(account.currentSignerSecret(), expectedNewHash),
+        ),
     ).toBe(true);
 });
 
 test("transactions with wrong signature are rejected", () => {
-    const wrongAgent = newRandomAgentSecret();
+    const wrongAgent = Crypto.newRandomAgentSecret();
     const [agentSecret, sessionID] = randomAnonymousAccountAndSessionID();
-    const node = new LocalNode(agentSecret, sessionID);
+    const node = new LocalNode(agentSecret, sessionID, Crypto);
 
     const coValue = node.createCoValue({
         type: "costream",
         ruleset: { type: "unsafeAllowAll" },
         meta: null,
-        ...createdNowUnique(),
+        ...Crypto.createdNowUnique(),
     });
 
     const transaction: Transaction = {
@@ -78,7 +69,7 @@ test("transactions with wrong signature are rejected", () => {
 
     const { expectedNewHash } = coValue.expectedNewHashAfter(
         node.currentSessionID,
-        [transaction]
+        [transaction],
     );
 
     expect(
@@ -86,20 +77,23 @@ test("transactions with wrong signature are rejected", () => {
             node.currentSessionID,
             [transaction],
             expectedNewHash,
-            sign(getAgentSignerSecret(wrongAgent), expectedNewHash)
-        )
+            Crypto.sign(
+                Crypto.getAgentSignerSecret(wrongAgent),
+                expectedNewHash,
+            ),
+        ),
     ).toBe(false);
 });
 
 test("transactions with correctly signed, but wrong hash are rejected", () => {
     const [account, sessionID] = randomAnonymousAccountAndSessionID();
-    const node = new LocalNode(account, sessionID);
+    const node = new LocalNode(account, sessionID, Crypto);
 
     const coValue = node.createCoValue({
         type: "costream",
         ruleset: { type: "unsafeAllowAll" },
         meta: null,
-        ...createdNowUnique(),
+        ...Crypto.createdNowUnique(),
     });
 
     const transaction: Transaction = {
@@ -124,7 +118,7 @@ test("transactions with correctly signed, but wrong hash are rejected", () => {
                     },
                 ]),
             },
-        ]
+        ],
     );
 
     expect(
@@ -132,14 +126,14 @@ test("transactions with correctly signed, but wrong hash are rejected", () => {
             node.currentSessionID,
             [transaction],
             expectedNewHash,
-            sign(account.currentSignerSecret(), expectedNewHash)
-        )
+            Crypto.sign(account.currentSignerSecret(), expectedNewHash),
+        ),
     ).toBe(false);
 });
 
 test("New transactions in a group correctly update owned values, including subscriptions", async () => {
     const [account, sessionID] = randomAnonymousAccountAndSessionID();
-    const node = new LocalNode(account, sessionID);
+    const node = new LocalNode(account, sessionID, Crypto);
 
     const group = node.createGroup();
 
@@ -147,7 +141,7 @@ test("New transactions in a group correctly update owned values, including subsc
 
     await new Promise((resolve) => setTimeout(resolve, 10));
 
-    let map = group.createMap();
+    const map = group.createMap();
 
     map.set("hello", "world");
 
@@ -164,23 +158,28 @@ test("New transactions in a group correctly update owned values, including subsc
             {
                 op: "set",
                 key: account.id,
-                value: "revoked"
-            } satisfies MapOpPayload<typeof account.id, Role>
-        ])
+                value: "revoked",
+            } satisfies MapOpPayload<typeof account.id, Role>,
+        ]),
     } satisfies Transaction;
 
     const { expectedNewHash } = group.core.expectedNewHashAfter(sessionID, [
         resignationThatWeJustLearnedAbout,
     ]);
 
-    const signature = sign(
+    const signature = Crypto.sign(
         node.account.currentSignerSecret(),
-        expectedNewHash
+        expectedNewHash,
     );
 
     expect(map.core.getValidSortedTransactions().length).toBe(1);
 
-    const manuallyAdddedTxSuccess = group.core.tryAddTransactions(node.currentSessionID, [resignationThatWeJustLearnedAbout], expectedNewHash, signature);
+    const manuallyAdddedTxSuccess = group.core.tryAddTransactions(
+        node.currentSessionID,
+        [resignationThatWeJustLearnedAbout],
+        expectedNewHash,
+        signature,
+    );
 
     expect(manuallyAdddedTxSuccess).toBe(true);
 

package/src/tests/crypto.test.ts

@@ -1,93 +1,84 @@
-import { expect, test, beforeEach } from "vitest";
-import {
-    getSealerID,
-    getSignerID,
-    secureHash,
-    newRandomSealer,
-    newRandomSigner,
-    seal,
-    sign,
-    unseal,
-    verify,
-    shortHash,
-    newRandomKeySecret,
-    encryptForTransaction,
-    decryptForTransaction,
-    encryptKeySecret,
-    decryptKeySecret,
-} from "../crypto.js";
+import { expect, test } from "vitest";
+import { WasmCrypto } from "../crypto/WasmCrypto.js";
 import { base58, base64url } from "@scure/base";
 import { x25519 } from "@noble/curves/ed25519";
 import { xsalsa20_poly1305 } from "@noble/ciphers/salsa";
 import { blake3 } from "@noble/hashes/blake3";
-import stableStringify from "fast-json-stable-stringify";
 import { SessionID } from "../ids.js";
-import { cojsonReady } from "../index.js";
+import { stableStringify } from "../jsonStringify.js";
 
-import { webcrypto } from "node:crypto";
-if (!("crypto" in globalThis)) {
-    // eslint-disable-next-line @typescript-eslint/no-explicit-any
-    (globalThis as any).crypto = webcrypto;
-}
-
-beforeEach(async () => {
-    await cojsonReady;
-});
+const Crypto = await WasmCrypto.create();
 
 test("Signatures round-trip and use stable stringify", () => {
     const data = { b: "world", a: "hello" };
-    const signer = newRandomSigner();
-    const signature = sign(signer, data);
+    const signer = Crypto.newRandomSigner();
+    const signature = Crypto.sign(signer, data);
 
     expect(signature).toMatch(/^signature_z/);
     expect(
-        verify(signature, { a: "hello", b: "world" }, getSignerID(signer))
+        Crypto.verify(
+            signature,
+            { a: "hello", b: "world" },
+            Crypto.getSignerID(signer),
+        ),
     ).toBe(true);
 });
 
 test("Invalid signatures don't verify", () => {
     const data = { b: "world", a: "hello" };
-    const signer = newRandomSigner();
-    const signer2 = newRandomSigner();
-    const wrongSignature = sign(signer2, data);
+    const signer = Crypto.newRandomSigner();
+    const signer2 = Crypto.newRandomSigner();
+    const wrongSignature = Crypto.sign(signer2, data);
 
-    expect(verify(wrongSignature, data, getSignerID(signer))).toBe(false);
+    expect(
+        Crypto.verify(wrongSignature, data, Crypto.getSignerID(signer)),
+    ).toBe(false);
 });
 
 test("encrypting round-trips, but invalid receiver can't unseal", () => {
     const data = { b: "world", a: "hello" };
-    const sender = newRandomSealer();
-    const sealer = newRandomSealer();
-    const wrongSealer = newRandomSealer();
+    const sender = Crypto.newRandomSealer();
+    const sealer = Crypto.newRandomSealer();
+    const wrongSealer = Crypto.newRandomSealer();
 
     const nOnceMaterial = {
         in: "co_zTEST",
         tx: { sessionID: "co_zTEST_session_zTEST" as SessionID, txIndex: 0 },
     } as const;
 
-    const sealed = seal({
+    const sealed = Crypto.seal({
         message: data,
         from: sender,
-        to: getSealerID(sealer),
+        to: Crypto.getSealerID(sealer),
         nOnceMaterial,
     });
 
-    expect(unseal(sealed, sealer, getSealerID(sender), nOnceMaterial)).toEqual(
-        data
-    );
+    expect(
+        Crypto.unseal(
+            sealed,
+            sealer,
+            Crypto.getSealerID(sender),
+            nOnceMaterial,
+        ),
+    ).toEqual(data);
     expect(() =>
-        unseal(sealed, wrongSealer, getSealerID(sender), nOnceMaterial)
+        Crypto.unseal(
+            sealed,
+            wrongSealer,
+            Crypto.getSealerID(sender),
+            nOnceMaterial,
+        ),
     ).toThrow(/Wrong tag/);
 
     // trying with wrong sealer secret, by hand
     const nOnce = blake3(
-        new TextEncoder().encode(stableStringify(nOnceMaterial))
+        new TextEncoder().encode(stableStringify(nOnceMaterial)),
     ).slice(0, 24);
     const sealer3priv = base58.decode(
-        wrongSealer.substring("sealerSecret_z".length)
+        wrongSealer.substring("sealerSecret_z".length),
     );
     const senderPub = base58.decode(
-        getSealerID(sender).substring("sealer_z".length)
+        Crypto.getSealerID(sender).substring("sealer_z".length),
     );
     const sealedBytes = base64url.decode(sealed.substring("sealed_U".length));
     const sharedSecret = x25519.getSharedSecret(sealer3priv, senderPub);
@@ -98,34 +89,34 @@ test("encrypting round-trips, but invalid receiver can't unseal", () => {
 });
 
 test("Hashing is deterministic", () => {
-    expect(secureHash({ b: "world", a: "hello" })).toEqual(
-        secureHash({ a: "hello", b: "world" })
+    expect(Crypto.secureHash({ b: "world", a: "hello" })).toEqual(
+        Crypto.secureHash({ a: "hello", b: "world" }),
     );
 
-    expect(shortHash({ b: "world", a: "hello" })).toEqual(
-        shortHash({ a: "hello", b: "world" })
+    expect(Crypto.shortHash({ b: "world", a: "hello" })).toEqual(
+        Crypto.shortHash({ a: "hello", b: "world" }),
     );
 });
 
 test("Encryption for transactions round-trips", () => {
-    const { secret } = newRandomKeySecret();
+    const { secret } = Crypto.newRandomKeySecret();
 
-    const encrypted1 = encryptForTransaction({ a: "hello" }, secret, {
+    const encrypted1 = Crypto.encryptForTransaction({ a: "hello" }, secret, {
         in: "co_zTEST",
         tx: { sessionID: "co_zTEST_session_zTEST" as SessionID, txIndex: 0 },
     });
 
-    const encrypted2 = encryptForTransaction({ b: "world" }, secret, {
+    const encrypted2 = Crypto.encryptForTransaction({ b: "world" }, secret, {
         in: "co_zTEST",
         tx: { sessionID: "co_zTEST_session_zTEST" as SessionID, txIndex: 1 },
     });
 
-    const decrypted1 = decryptForTransaction(encrypted1, secret, {
+    const decrypted1 = Crypto.decryptForTransaction(encrypted1, secret, {
         in: "co_zTEST",
         tx: { sessionID: "co_zTEST_session_zTEST" as SessionID, txIndex: 0 },
     });
 
-    const decrypted2 = decryptForTransaction(encrypted2, secret, {
+    const decrypted2 = Crypto.decryptForTransaction(encrypted2, secret, {
         in: "co_zTEST",
         tx: { sessionID: "co_zTEST_session_zTEST" as SessionID, txIndex: 1 },
     });
@@ -134,25 +125,25 @@ test("Encryption for transactions round-trips", () => {
 });
 
 test("Encryption for transactions doesn't decrypt with a wrong key", () => {
-    const { secret } = newRandomKeySecret();
-    const { secret: secret2 } = newRandomKeySecret();
+    const { secret } = Crypto.newRandomKeySecret();
+    const { secret: secret2 } = Crypto.newRandomKeySecret();
 
-    const encrypted1 = encryptForTransaction({ a: "hello" }, secret, {
+    const encrypted1 = Crypto.encryptForTransaction({ a: "hello" }, secret, {
         in: "co_zTEST",
         tx: { sessionID: "co_zTEST_session_zTEST" as SessionID, txIndex: 0 },
     });
 
-    const encrypted2 = encryptForTransaction({ b: "world" }, secret, {
+    const encrypted2 = Crypto.encryptForTransaction({ b: "world" }, secret, {
         in: "co_zTEST",
         tx: { sessionID: "co_zTEST_session_zTEST" as SessionID, txIndex: 1 },
     });
 
-    const decrypted1 = decryptForTransaction(encrypted1, secret2, {
+    const decrypted1 = Crypto.decryptForTransaction(encrypted1, secret2, {
         in: "co_zTEST",
         tx: { sessionID: "co_zTEST_session_zTEST" as SessionID, txIndex: 0 },
     });
 
-    const decrypted2 = decryptForTransaction(encrypted2, secret2, {
+    const decrypted2 = Crypto.decryptForTransaction(encrypted2, secret2, {
         in: "co_zTEST",
         tx: { sessionID: "co_zTEST_session_zTEST" as SessionID, txIndex: 1 },
     });
@@ -161,34 +152,37 @@ test("Encryption for transactions doesn't decrypt with a wrong key", () => {
 });
 
 test("Encryption of keySecrets round-trips", () => {
-    const toEncrypt = newRandomKeySecret();
-    const encrypting = newRandomKeySecret();
+    const toEncrypt = Crypto.newRandomKeySecret();
+    const encrypting = Crypto.newRandomKeySecret();
 
     const keys = {
         toEncrypt,
         encrypting,
     };
 
-    const encrypted = encryptKeySecret(keys);
+    const encrypted = Crypto.encryptKeySecret(keys);
 
-    const decrypted = decryptKeySecret(encrypted, encrypting.secret);
+    const decrypted = Crypto.decryptKeySecret(encrypted, encrypting.secret);
 
     expect(decrypted).toEqual(toEncrypt.secret);
 });
 
 test("Encryption of keySecrets doesn't decrypt with a wrong key", () => {
-    const toEncrypt = newRandomKeySecret();
-    const encrypting = newRandomKeySecret();
-    const encryptingWrong = newRandomKeySecret();
+    const toEncrypt = Crypto.newRandomKeySecret();
+    const encrypting = Crypto.newRandomKeySecret();
+    const encryptingWrong = Crypto.newRandomKeySecret();
 
     const keys = {
         toEncrypt,
         encrypting,
     };
 
-    const encrypted = encryptKeySecret(keys);
+    const encrypted = Crypto.encryptKeySecret(keys);
 
-    const decrypted = decryptKeySecret(encrypted, encryptingWrong.secret);
+    const decrypted = Crypto.decryptKeySecret(
+        encrypted,
+        encryptingWrong.secret,
+    );
 
     expect(decrypted).toBeUndefined();
 });