cojson 0.13.17 → 0.13.18

package/src/tests/coMap.test.ts

@@ -2,12 +2,11 @@ import { beforeEach, expect, test } from "vitest";
 import { expectMap } from "../coValue.js";
 import { operationToEditEntry } from "../coValues/coMap.js";
 import { WasmCrypto } from "../crypto/WasmCrypto.js";
-import { LocalNode } from "../localNode.js";
 import { accountOrAgentIDfromSessionID } from "../typeUtils/accountOrAgentIDfromSessionID.js";
 import {
   hotSleep,
   loadCoValueOrFail,
-  randomAnonymousAccountAndSessionID,
+  nodeWithRandomAgentAndSessionID,
   setupTestNode,
   waitFor,
 } from "./testUtils.js";
@@ -19,7 +18,7 @@ beforeEach(async () => {
 });
 
 test("Empty CoMap works", () => {
-  const node = new LocalNode(...randomAnonymousAccountAndSessionID(), Crypto);
+  const node = nodeWithRandomAgentAndSessionID();
 
   const coValue = node.createCoValue({
     type: "comap",
@@ -36,7 +35,7 @@ test("Empty CoMap works", () => {
 });
 
 test("Can insert and delete CoMap entries in edit()", () => {
-  const node = new LocalNode(...randomAnonymousAccountAndSessionID(), Crypto);
+  const node = nodeWithRandomAgentAndSessionID();
 
   const coValue = node.createCoValue({
     type: "comap",
@@ -60,7 +59,7 @@ test("Can insert and delete CoMap entries in edit()", () => {
 });
 
 test("Can get CoMap entry values at different points in time", () => {
-  const node = new LocalNode(...randomAnonymousAccountAndSessionID(), Crypto);
+  const node = nodeWithRandomAgentAndSessionID();
 
   const coValue = node.createCoValue({
     type: "comap",
@@ -110,7 +109,7 @@ test("Can get CoMap entry values at different points in time", () => {
 });
 
 test("Can get all historic values of key in CoMap", () => {
-  const node = new LocalNode(...randomAnonymousAccountAndSessionID(), Crypto);
+  const node = nodeWithRandomAgentAndSessionID();
 
   const coValue = node.createCoValue({
     type: "comap",
@@ -134,25 +133,25 @@ test("Can get all historic values of key in CoMap", () => {
   expect([...content.editsAt("hello")]).toEqual([
     {
       tx: editA!.tx,
-      by: node.account.id,
+      by: node.getCurrentAgent().id,
       value: "A",
       at: editA?.at,
     },
     {
       tx: editB!.tx,
-      by: node.account.id,
+      by: node.getCurrentAgent().id,
       value: "B",
       at: editB?.at,
     },
     {
       tx: editDel!.tx,
-      by: node.account.id,
+      by: node.getCurrentAgent().id,
       value: undefined,
       at: editDel?.at,
     },
     {
       tx: editC!.tx,
-      by: node.account.id,
+      by: node.getCurrentAgent().id,
       value: "C",
       at: editC?.at,
     },
@@ -160,7 +159,7 @@ test("Can get all historic values of key in CoMap", () => {
 });
 
 test("Can get last tx ID for a key in CoMap", () => {
-  const node = new LocalNode(...randomAnonymousAccountAndSessionID(), Crypto);
+  const node = nodeWithRandomAgentAndSessionID();
 
   const coValue = node.createCoValue({
     type: "comap",
@@ -177,7 +176,7 @@ test("Can get last tx ID for a key in CoMap", () => {
   content.set("hello", "A", "trusting");
   const sessionID = content.lastEditAt("hello")?.tx.sessionID;
   expect(sessionID && accountOrAgentIDfromSessionID(sessionID)).toEqual(
-    node.account.id,
+    node.getCurrentAgent().id,
   );
   expect(content.lastEditAt("hello")?.tx.txIndex).toEqual(0);
   content.set("hello", "B", "trusting");
@@ -187,7 +186,7 @@ test("Can get last tx ID for a key in CoMap", () => {
 });
 
 test("Can set items in bulk with assign", () => {
-  const node = new LocalNode(...randomAnonymousAccountAndSessionID(), Crypto);
+  const node = nodeWithRandomAgentAndSessionID();
 
   const coValue = node.createCoValue({
     type: "comap",

package/src/tests/coPlainText.test.ts

@@ -2,7 +2,10 @@ import { afterEach, expect, test, vi } from "vitest";
 import { expectPlainText } from "../coValue.js";
 import { WasmCrypto } from "../crypto/WasmCrypto.js";
 import { LocalNode } from "../localNode.js";
-import { randomAnonymousAccountAndSessionID } from "./testUtils.js";
+import {
+  nodeWithRandomAgentAndSessionID,
+  randomAgentAndSessionID,
+} from "./testUtils.js";
 
 const Crypto = await WasmCrypto.create();
 
@@ -13,7 +16,7 @@ test("should throw on creation if Intl.Segmenter is not available", () => {
     Segmenter: undefined,
   });
 
-  const node = new LocalNode(...randomAnonymousAccountAndSessionID(), Crypto);
+  const node = nodeWithRandomAgentAndSessionID();
   const group = node.createGroup();
   expect(() => group.createPlainText()).toThrow(
     "Intl.Segmenter is not supported. Use a polyfill to get coPlainText support in Jazz. (eg. https://formatjs.github.io/docs/polyfills/intl-segmenter/)",
@@ -21,7 +24,7 @@ test("should throw on creation if Intl.Segmenter is not available", () => {
 });
 
 test("Empty CoPlainText works", () => {
-  const node = new LocalNode(...randomAnonymousAccountAndSessionID(), Crypto);
+  const node = nodeWithRandomAgentAndSessionID();
 
   const coValue = node.createCoValue({
     type: "coplaintext",
@@ -37,7 +40,7 @@ test("Empty CoPlainText works", () => {
 });
 
 test("Can insert into empty CoPlainText", () => {
-  const node = new LocalNode(...randomAnonymousAccountAndSessionID(), Crypto);
+  const node = nodeWithRandomAgentAndSessionID();
 
   const coValue = node.createCoValue({
     type: "coplaintext",
@@ -55,7 +58,7 @@ test("Can insert into empty CoPlainText", () => {
 });
 
 test("Can insert and delete in CoPlainText", () => {
-  const node = new LocalNode(...randomAnonymousAccountAndSessionID(), Crypto);
+  const node = nodeWithRandomAgentAndSessionID();
 
   const coValue = node.createCoValue({
     type: "coplaintext",
@@ -88,7 +91,7 @@ test("Can insert and delete in CoPlainText", () => {
 });
 
 test("Multiple items inserted appear in correct order", () => {
-  const node = new LocalNode(...randomAnonymousAccountAndSessionID(), Crypto);
+  const node = nodeWithRandomAgentAndSessionID();
 
   const coValue = node.createCoValue({
     type: "coplaintext",
@@ -109,7 +112,7 @@ test("Multiple items inserted appear in correct order", () => {
 });
 
 test("Items inserted at start appear with latest first", () => {
-  const node = new LocalNode(...randomAnonymousAccountAndSessionID(), Crypto);
+  const node = nodeWithRandomAgentAndSessionID();
 
   const coValue = node.createCoValue({
     type: "coplaintext",
@@ -131,7 +134,7 @@ test("Items inserted at start appear with latest first", () => {
 });
 
 test("Handles different locales correctly", () => {
-  const node = new LocalNode(...randomAnonymousAccountAndSessionID(), Crypto);
+  const node = nodeWithRandomAgentAndSessionID();
 
   // Test with explicit locale in meta
   const coValueJa = node.createCoValue({
@@ -175,7 +178,7 @@ test("Handles different locales correctly", () => {
 });
 
 test("insertBefore and insertAfter work as expected", () => {
-  const node = new LocalNode(...randomAnonymousAccountAndSessionID(), Crypto);
+  const node = nodeWithRandomAgentAndSessionID();
   const coValue = node.createCoValue({
     type: "coplaintext",
     ruleset: { type: "unsafeAllowAll" },

package/src/tests/coStream.test.ts

@@ -1,6 +1,6 @@
 import { beforeEach, describe, expect, test } from "vitest";
 import { expectStream } from "../coValue.js";
-import { MAX_RECOMMENDED_TX_SIZE } from "../coValueCore.js";
+import { MAX_RECOMMENDED_TX_SIZE } from "../coValueCore/coValueCore.js";
 import {
   BinaryStreamItem,
   CoStreamItem,
@@ -12,7 +12,8 @@ import { SessionID } from "../ids.js";
 import { LocalNode } from "../localNode.js";
 import {
   loadCoValueOrFail,
-  randomAnonymousAccountAndSessionID,
+  nodeWithRandomAgentAndSessionID,
+  randomAgentAndSessionID,
   setupTestNode,
   waitFor,
 } from "./testUtils.js";
@@ -24,7 +25,7 @@ beforeEach(async () => {
 });
 
 test("Empty CoStream works", () => {
-  const node = new LocalNode(...randomAnonymousAccountAndSessionID(), Crypto);
+  const node = nodeWithRandomAgentAndSessionID();
 
   const coValue = node.createCoValue({
     type: "costream",
@@ -41,7 +42,7 @@ test("Empty CoStream works", () => {
 });
 
 test("Can push into CoStream", () => {
-  const node = new LocalNode(...randomAnonymousAccountAndSessionID(), Crypto);
+  const node = nodeWithRandomAgentAndSessionID();
 
   const coValue = node.createCoValue({
     type: "costream",
@@ -67,7 +68,7 @@ test("Can push into CoStream", () => {
 });
 
 test("Empty RawBinaryCoStream works", () => {
-  const node = new LocalNode(...randomAnonymousAccountAndSessionID(), Crypto);
+  const node = nodeWithRandomAgentAndSessionID();
 
   const coValue = node.createCoValue({
     type: "costream",
@@ -93,7 +94,7 @@ test("Empty RawBinaryCoStream works", () => {
 });
 
 test("Can push into RawBinaryCoStream", () => {
-  const node = new LocalNode(...randomAnonymousAccountAndSessionID(), Crypto);
+  const node = nodeWithRandomAgentAndSessionID();
 
   const coValue = node.createCoValue({
     type: "costream",
@@ -129,7 +130,7 @@ 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(), Crypto);
+  const node = nodeWithRandomAgentAndSessionID();
 
   const coValue = node.createCoValue({
     type: "costream",
@@ -161,7 +162,11 @@ test("When adding large transactions (small fraction of MAX_RECOMMENDED_TX_SIZE)
 
   content.endBinaryStream("trusting");
 
-  const sessionEntry = coValue.sessionLogs.get(node.currentSessionID)!;
+  if (!coValue.isAvailable()) {
+    throw new Error("CoValue is not available");
+  }
+
+  const sessionEntry = coValue.verified.sessions.get(node.currentSessionID)!;
   expect(sessionEntry.transactions.length).toEqual(12);
   expect(sessionEntry.signatureAfter[0]).not.toBeDefined();
   expect(sessionEntry.signatureAfter[1]).not.toBeDefined();
@@ -176,7 +181,7 @@ test("When adding large transactions (small fraction of MAX_RECOMMENDED_TX_SIZE)
   expect(sessionEntry.signatureAfter[10]).not.toBeDefined();
   expect(sessionEntry.signatureAfter[11]).not.toBeDefined();
 
-  const newContent = coValue.newContentSince({
+  const newContent = coValue.verified.newContentSince({
     id: coValue.id,
     header: false,
     sessions: {},
@@ -199,7 +204,7 @@ test("When adding large transactions (small fraction of MAX_RECOMMENDED_TX_SIZE)
 });
 
 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(), Crypto);
+  const node = nodeWithRandomAgentAndSessionID();
 
   const coValue = node.createCoValue({
     type: "costream",
@@ -231,7 +236,11 @@ test("When adding large transactions (bigger than MAX_RECOMMENDED_TX_SIZE), we s
 
   content.endBinaryStream("trusting");
 
-  const sessionEntry = coValue.sessionLogs.get(node.currentSessionID)!;
+  if (!coValue.isAvailable()) {
+    throw new Error("CoValue is not available");
+  }
+
+  const sessionEntry = coValue.verified.sessions.get(node.currentSessionID)!;
   expect(sessionEntry.transactions.length).toEqual(5);
   expect(sessionEntry.signatureAfter[0]).not.toBeDefined();
   expect(sessionEntry.signatureAfter[1]).toBeDefined();
@@ -239,7 +248,7 @@ test("When adding large transactions (bigger than MAX_RECOMMENDED_TX_SIZE), we s
   expect(sessionEntry.signatureAfter[3]).toBeDefined();
   expect(sessionEntry.signatureAfter[4]).not.toBeDefined();
 
-  const newContent = coValue.newContentSince({
+  const newContent = coValue.verified.newContentSince({
     id: coValue.id,
     header: false,
     sessions: {},
@@ -308,7 +317,7 @@ test("totalValidTransactions should return the number of valid transactions proc
 
 describe("isBinaryStreamEnded", () => {
   function setup() {
-    const node = new LocalNode(...randomAnonymousAccountAndSessionID(), Crypto);
+    const node = nodeWithRandomAgentAndSessionID();
 
     const coValue = node.createCoValue({
       type: "costream",
@@ -371,7 +380,7 @@ describe("Binary stream order", () => {
   }
 
   test("sorts by madeAt timestamp first", () => {
-    const node = new LocalNode(...randomAnonymousAccountAndSessionID(), Crypto);
+    const node = nodeWithRandomAgentAndSessionID();
     const coValue = node.createCoValue({
       type: "costream",
       ruleset: { type: "unsafeAllowAll" },
@@ -403,7 +412,7 @@ describe("Binary stream order", () => {
   });
 
   test("sorts by sessionID when timestamps are equal", () => {
-    const node = new LocalNode(...randomAnonymousAccountAndSessionID(), Crypto);
+    const node = nodeWithRandomAgentAndSessionID();
     const coValue = node.createCoValue({
       type: "costream",
       ruleset: { type: "unsafeAllowAll" },
@@ -436,7 +445,7 @@ describe("Binary stream order", () => {
   });
 
   test("sorts by txIndex when timestamps and sessionIDs are equal", () => {
-    const node = new LocalNode(...randomAnonymousAccountAndSessionID(), Crypto);
+    const node = nodeWithRandomAgentAndSessionID();
     const coValue = node.createCoValue({
       type: "costream",
       ruleset: { type: "unsafeAllowAll" },

package/src/tests/coValueCore.test.ts

@@ -1,5 +1,6 @@
 import { assert, afterEach, beforeEach, expect, test, vi } from "vitest";
-import { CoValueCore, Transaction } from "../coValueCore.js";
+import { CoValueCore } from "../coValueCore/coValueCore.js";
+import { Transaction } from "../coValueCore/verifiedState.js";
 import { MapOpPayload } from "../coValues/coMap.js";
 import { WasmCrypto } from "../crypto/WasmCrypto.js";
 import { stableStringify } from "../jsonStringify.js";
@@ -10,7 +11,8 @@ import {
   createTestNode,
   createTwoConnectedNodes,
   loadCoValueOrFail,
-  randomAnonymousAccountAndSessionID,
+  nodeWithRandomAgentAndSessionID,
+  randomAgentAndSessionID,
   tearDownTestMetricReader,
 } from "./testUtils.js";
 
@@ -27,8 +29,8 @@ afterEach(() => {
 });
 
 test("Can create coValue with new agent credentials and add transaction to it", () => {
-  const [account, sessionID] = randomAnonymousAccountAndSessionID();
-  const node = new LocalNode(account, sessionID, Crypto);
+  const [agent, sessionID] = randomAgentAndSessionID();
+  const node = new LocalNode(agent.agentSecret, sessionID, Crypto);
 
   const coValue = node.createCoValue({
     type: "costream",
@@ -47,7 +49,7 @@ test("Can create coValue with new agent credentials and add transaction to it",
     ]),
   };
 
-  const { expectedNewHash } = coValue.expectedNewHashAfter(
+  const { expectedNewHash } = coValue.verified.expectedNewHashAfter(
     node.currentSessionID,
     [transaction],
   );
@@ -58,7 +60,8 @@ test("Can create coValue with new agent credentials and add transaction to it",
         node.currentSessionID,
         [transaction],
         expectedNewHash,
-        Crypto.sign(account.currentSignerSecret(), expectedNewHash),
+        Crypto.sign(agent.currentSignerSecret(), expectedNewHash),
+        "immediate",
       )
       ._unsafeUnwrap(),
   ).toBe(true);
@@ -66,8 +69,7 @@ test("Can create coValue with new agent credentials and add transaction to it",
 
 test("transactions with wrong signature are rejected", () => {
   const wrongAgent = Crypto.newRandomAgentSecret();
-  const [agentSecret, sessionID] = randomAnonymousAccountAndSessionID();
-  const node = new LocalNode(agentSecret, sessionID, Crypto);
+  const node = nodeWithRandomAgentAndSessionID();
 
   const coValue = node.createCoValue({
     type: "costream",
@@ -86,7 +88,7 @@ test("transactions with wrong signature are rejected", () => {
     ]),
   };
 
-  const { expectedNewHash } = coValue.expectedNewHashAfter(
+  const { expectedNewHash } = coValue.verified.expectedNewHashAfter(
     node.currentSessionID,
     [transaction],
   );
@@ -98,13 +100,14 @@ test("transactions with wrong signature are rejected", () => {
       [transaction],
       expectedNewHash,
       Crypto.sign(Crypto.getAgentSignerSecret(wrongAgent), expectedNewHash),
+      "immediate",
     )
     ._unsafeUnwrapErr({ withStackTrace: true });
 });
 
 test("transactions with correctly signed, but wrong hash are rejected", () => {
-  const [account, sessionID] = randomAnonymousAccountAndSessionID();
-  const node = new LocalNode(account, sessionID, Crypto);
+  const [agent, sessionID] = randomAgentAndSessionID();
+  const node = new LocalNode(agent.agentSecret, sessionID, Crypto);
 
   const coValue = node.createCoValue({
     type: "costream",
@@ -123,7 +126,7 @@ test("transactions with correctly signed, but wrong hash are rejected", () => {
     ]),
   };
 
-  const { expectedNewHash } = coValue.expectedNewHashAfter(
+  const { expectedNewHash } = coValue.verified.expectedNewHashAfter(
     node.currentSessionID,
     [
       {
@@ -144,14 +147,15 @@ test("transactions with correctly signed, but wrong hash are rejected", () => {
       node.currentSessionID,
       [transaction],
       expectedNewHash,
-      Crypto.sign(account.currentSignerSecret(), expectedNewHash),
+      Crypto.sign(agent.currentSignerSecret(), expectedNewHash),
+      "immediate",
     )
     ._unsafeUnwrapErr({ withStackTrace: true });
 });
 
 test("New transactions in a group correctly update owned values, including subscriptions", async () => {
-  const [account, sessionID] = randomAnonymousAccountAndSessionID();
-  const node = new LocalNode(account, sessionID, Crypto);
+  const [agent, sessionID] = randomAgentAndSessionID();
+  const node = new LocalNode(agent.agentSecret, sessionID, Crypto);
 
   const group = node.createGroup();
 
@@ -175,18 +179,19 @@ test("New transactions in a group correctly update owned values, including subsc
     changes: stableStringify([
       {
         op: "set",
-        key: account.id,
+        key: agent.id,
         value: "revoked",
-      } satisfies MapOpPayload<typeof account.id, Role>,
+      } satisfies MapOpPayload<typeof agent.id, Role>,
     ]),
   } satisfies Transaction;
 
-  const { expectedNewHash } = group.core.expectedNewHashAfter(sessionID, [
-    resignationThatWeJustLearnedAbout,
-  ]);
+  const { expectedNewHash } = group.core.verified.expectedNewHashAfter(
+    sessionID,
+    [resignationThatWeJustLearnedAbout],
+  );
 
   const signature = Crypto.sign(
-    node.account.currentSignerSecret(),
+    node.getCurrentAgent().currentSignerSecret(),
     expectedNewHash,
   );
 
@@ -198,6 +203,7 @@ test("New transactions in a group correctly update owned values, including subsc
       [resignationThatWeJustLearnedAbout],
       expectedNewHash,
       signature,
+      "immediate",
     )
     ._unsafeUnwrap({ withStackTrace: true });
 
@@ -210,8 +216,7 @@ test("New transactions in a group correctly update owned values, including subsc
 });
 
 test("correctly records transactions", async () => {
-  const [account, sessionID] = randomAnonymousAccountAndSessionID();
-  const node = new LocalNode(account, sessionID, Crypto);
+  const node = nodeWithRandomAgentAndSessionID();
 
   const changes1 = stableStringify([{ hello: "world" }]);
   node.syncManager.recordTransactionsSize(
@@ -253,8 +258,7 @@ test("correctly records transactions", async () => {
 });
 
 test("(smoke test) records transactions from local node", async () => {
-  const [account, sessionID] = randomAnonymousAccountAndSessionID();
-  const node = new LocalNode(account, sessionID, Crypto);
+  const node = nodeWithRandomAgentAndSessionID();
 
   node.createGroup();
 
@@ -294,8 +298,7 @@ test("creating a coValue with a group should't trigger automatically a content c
 });
 
 test("loading a coValue core without having the owner group available doesn't crash", () => {
-  const [account, sessionID] = randomAnonymousAccountAndSessionID();
-  const node = new LocalNode(account, sessionID, Crypto);
+  const node = nodeWithRandomAgentAndSessionID();
 
   const otherNode = createTestNode();