cojson 0.7.34 → 0.7.35-guest-auth.5

package/src/localNode.ts

@@ -2,7 +2,7 @@ import { AgentSecret, CryptoProvider } from "./crypto/crypto.js";
 import {
     CoValueCore,
     CoValueHeader,
-    newRandomSessionID,
+    CoValueUniqueness,
 } from "./coValueCore.js";
 import {
     InviteSecret,
@@ -19,7 +19,7 @@ import {
     ControlledAccountOrAgent,
     RawControlledAccount,
     ControlledAgent,
-    AccountID,
+    RawAccountID,
     RawProfile,
     RawAccountMigration,
     InvalidAccountAgentIDError,
@@ -81,14 +81,14 @@ export class LocalNode {
         initialAgentSecret?: AgentSecret;
     }): Promise<{
         node: LocalNode;
-        accountID: AccountID;
+        accountID: RawAccountID;
         accountSecret: AgentSecret;
         sessionID: SessionID;
     }> {
         const throwawayAgent = crypto.newRandomAgentSecret();
         const setupNode = new LocalNode(
             new ControlledAgent(throwawayAgent, crypto),
-            newRandomSessionID(crypto.getAgentID(throwawayAgent)),
+            crypto.newRandomSessionID(crypto.getAgentID(throwawayAgent)),
             crypto,
         );
 
@@ -96,7 +96,7 @@ export class LocalNode {
 
         const nodeWithAccount = account.core.node.testWithDifferentAccount(
             account,
-            newRandomSessionID(account.id),
+            crypto.newRandomSessionID(account.id),
         );
 
         const accountOnNodeWithAccount =
@@ -173,7 +173,7 @@ export class LocalNode {
         crypto,
         migration,
     }: {
-        accountID: AccountID;
+        accountID: RawAccountID;
         accountSecret: AgentSecret;
         sessionID: SessionID | undefined;
         peersToLoadFrom: Peer[];
@@ -182,7 +182,7 @@ export class LocalNode {
     }): Promise<LocalNode> {
         const loadingNode = new LocalNode(
             new ControlledAgent(accountSecret, crypto),
-            newRandomSessionID(accountID),
+            crypto.newRandomSessionID(accountID),
             crypto,
         );
 
@@ -206,7 +206,7 @@ export class LocalNode {
         // since this is all synchronous, we can just swap out nodes for the SyncManager
         const node = loadingNode.testWithDifferentAccount(
             controlledAccount,
-            sessionID || newRandomSessionID(accountID),
+            sessionID || crypto.newRandomSessionID(accountID),
         );
         node.syncManager = loadingNode.syncManager;
         node.syncManager.local = node;
@@ -429,7 +429,7 @@ export class LocalNode {
             group.core
                 .testWithDifferentAccount(
                     new ControlledAgent(inviteAgentSecret, this.crypto),
-                    newRandomSessionID(inviteAgentID),
+                    this.crypto.newRandomSessionID(inviteAgentID),
                 )
                 .getCurrentContent(),
         );
@@ -470,7 +470,7 @@ export class LocalNode {
     }
 
     /** @internal */
-    expectProfileLoaded(id: AccountID, expectation?: string): RawProfile {
+    expectProfileLoaded(id: RawAccountID, expectation?: string): RawProfile {
         const account = this.expectCoValueLoaded(id, expectation);
         const profileID = expectGroup(account.getCurrentContent()).get(
             "profile",
@@ -499,7 +499,7 @@ export class LocalNode {
             )
                 .testWithDifferentAccount(
                     new ControlledAgent(agentSecret, this.crypto),
-                    newRandomSessionID(accountAgentID),
+                    this.crypto.newRandomSessionID(accountAgentID),
                 )
                 .getCurrentContent(),
         );
@@ -533,7 +533,7 @@ export class LocalNode {
 
     /** @internal */
     resolveAccountAgent(
-        id: AccountID | AgentID,
+        id: RawAccountID | AgentID,
         expectation?: string,
     ): Result<AgentID, ResolveAccountAgentError> {
         if (isAgentID(id)) {
@@ -560,7 +560,7 @@ export class LocalNode {
     }
 
     resolveAccountAgentAsync(
-        id: AccountID | AgentID,
+        id: RawAccountID | AgentID,
         expectation?: string,
     ): ResultAsync<AgentID, ResolveAccountAgentError> {
         if (isAgentID(id)) {
@@ -606,12 +606,12 @@ export class LocalNode {
     /**
      * @deprecated use Account.createGroup() instead
      */
-    createGroup(): RawGroup {
+    createGroup(uniqueness: CoValueUniqueness = this.crypto.createdNowUnique()): RawGroup {
         const groupCoValue = this.createCoValue({
             type: "comap",
             ruleset: { type: "group", initialAdmin: this.account.id },
             meta: null,
-            ...this.crypto.createdNowUnique(),
+            ...uniqueness
         });
 
         const group = expectGroup(groupCoValue.getCurrentContent());
@@ -731,19 +731,19 @@ export type LoadCoValueCoreError = {
     type: "ErrorLoadingCoValueCore";
     error: unknown;
     expectation?: string;
-    id: AccountID;
+    id: RawAccountID;
 };
 
 export type AccountUnavailableFromAllPeersError = {
     type: "AccountUnavailableFromAllPeers";
     expectation?: string;
-    id: AccountID;
+    id: RawAccountID;
 };
 
 export type UnexpectedlyNotAccountError = {
     type: "UnexpectedlyNotAccount";
     expectation?: string;
-    id: AccountID;
+    id: RawAccountID;
 };
 
 export type ResolveAccountAgentError =

package/src/permissions.ts

@@ -5,13 +5,13 @@ import { KeyID } from "./crypto/crypto.js";
 import { CoValueCore, Transaction } from "./coValueCore.js";
 import { accountOrAgentIDfromSessionID } from "./typeUtils/accountOrAgentIDfromSessionID.js";
 import { AgentID, RawCoID, SessionID, TransactionID } from "./ids.js";
-import { RawAccount, AccountID, RawProfile } from "./coValues/account.js";
+import { RawAccount, RawAccountID, RawProfile } from "./coValues/account.js";
 import { parseJSON } from "./jsonStringify.js";
 import { EVERYONE, Everyone } from "./coValues/group.js";
 import { expectGroup } from "./typeUtils/expectGroup.js";
 
 export type PermissionsDef =
-    | { type: "group"; initialAdmin: AccountID | AgentID }
+    | { type: "group"; initialAdmin: RawAccountID | AgentID }
     | { type: "ownedByGroup"; group: RawCoID }
     | { type: "unsafeAllowAll" };
 
@@ -53,7 +53,7 @@ export function determineValidTransactions(
         }
 
         const memberState: {
-            [agent: AccountID | AgentID]: Role;
+            [agent: RawAccountID | AgentID]: Role;
             [EVERYONE]?: Role;
         } = {};
 
@@ -99,7 +99,7 @@ export function determineValidTransactions(
             }
 
             const change = changes[0] as
-                | MapOpPayload<AccountID | AgentID | Everyone, Role>
+                | MapOpPayload<RawAccountID | AgentID | Everyone, Role>
                 | MapOpPayload<"readKey", JsonValue>
                 | MapOpPayload<"profile", CoID<RawProfile>>;
             if (changes.length !== 1) {
@@ -303,7 +303,7 @@ export function isKeyForKeyField(co: string): co is `${KeyID}_for_${KeyID}` {
 
 export function isKeyForAccountField(
     co: string,
-): co is `${KeyID}_for_${AccountID | AgentID}` {
+): co is `${KeyID}_for_${RawAccountID | AgentID}` {
     return (
         (co.startsWith("key_") &&
             (co.includes("_for_sealer") || co.includes("_for_co"))) ||

package/src/tests/account.test.ts

@@ -1,5 +1,4 @@
 import { expect, test } from "vitest";
-import { newRandomSessionID } from "../coValueCore.js";
 import { LocalNode } from "../localNode.js";
 import { connectedPeers } from "../streamUtils.js";
 import { WasmCrypto } from "../crypto/WasmCrypto.js";
@@ -65,7 +64,7 @@ test("Can create account with one node, and then load it on another", async () =
     const node2 = await LocalNode.withLoadedAccount({
         accountID,
         accountSecret,
-        sessionID: newRandomSessionID(accountID),
+        sessionID: Crypto.newRandomSessionID(accountID),
         peersToLoadFrom: [node1asPeer],
         crypto: Crypto,
     });

package/src/tests/permissions.test.ts

@@ -1,5 +1,4 @@
 import { expect, test } from "vitest";
-import { newRandomSessionID } from "../coValueCore.js";
 import { expectMap } from "../coValue.js";
 import {
     newGroup,
@@ -27,7 +26,7 @@ test("Added admin can add a third admin to a group", () => {
         groupCore
             .testWithDifferentAccount(
                 otherAdmin,
-                newRandomSessionID(otherAdmin.id),
+                Crypto.newRandomSessionID(otherAdmin.id),
             )
             .getCurrentContent(),
     );
@@ -47,7 +46,7 @@ test("Added adming can add a third admin to a group (high level)", () => {
         group.core
             .testWithDifferentAccount(
                 otherAdmin,
-                newRandomSessionID(otherAdmin.id),
+                Crypto.newRandomSessionID(otherAdmin.id),
             )
             .getCurrentContent(),
     );
@@ -73,7 +72,7 @@ test("Admins can't demote other admins in a group", () => {
         groupCore
             .testWithDifferentAccount(
                 otherAdmin,
-                newRandomSessionID(otherAdmin.id),
+                Crypto.newRandomSessionID(otherAdmin.id),
             )
             .getCurrentContent(),
     );
@@ -89,7 +88,7 @@ test("Admins can't demote other admins in a group (high level)", () => {
         group.core
             .testWithDifferentAccount(
                 otherAdmin,
-                newRandomSessionID(otherAdmin.id),
+                Crypto.newRandomSessionID(otherAdmin.id),
             )
             .getCurrentContent(),
     );
@@ -114,7 +113,7 @@ test("Admins an add writers to a group, who can't add admins, writers, or reader
 
     const groupAsWriter = expectGroup(
         groupCore
-            .testWithDifferentAccount(writer, newRandomSessionID(writer.id))
+            .testWithDifferentAccount(writer, Crypto.newRandomSessionID(writer.id))
             .getCurrentContent(),
     );
 
@@ -142,7 +141,7 @@ test("Admins an add writers to a group, who can't add admins, writers, or reader
 
     const groupAsWriter = expectGroup(
         group.core
-            .testWithDifferentAccount(writer, newRandomSessionID(writer.id))
+            .testWithDifferentAccount(writer, Crypto.newRandomSessionID(writer.id))
             .getCurrentContent(),
     );
 
@@ -174,7 +173,7 @@ test("Admins can add readers to a group, who can't add admins, writers, or reade
 
     const groupAsReader = expectGroup(
         groupCore
-            .testWithDifferentAccount(reader, newRandomSessionID(reader.id))
+            .testWithDifferentAccount(reader, Crypto.newRandomSessionID(reader.id))
             .getCurrentContent(),
     );
 
@@ -203,7 +202,7 @@ test("Admins can add readers to a group, who can't add admins, writers, or reade
 
     const groupAsReader = expectGroup(
         group.core
-            .testWithDifferentAccount(reader, newRandomSessionID(reader.id))
+            .testWithDifferentAccount(reader, Crypto.newRandomSessionID(reader.id))
             .getCurrentContent(),
     );
 
@@ -267,7 +266,7 @@ test("Writers can write to an object that is owned by their group", () => {
 
     const childObjectAsWriter = childObject.testWithDifferentAccount(
         writer,
-        newRandomSessionID(writer.id),
+        Crypto.newRandomSessionID(writer.id),
     );
 
     const childContentAsWriter = expectMap(
@@ -289,7 +288,7 @@ test("Writers can write to an object that is owned by their group (high level)",
 
     const childObjectAsWriter = expectMap(
         childObject.core
-            .testWithDifferentAccount(writer, newRandomSessionID(writer.id))
+            .testWithDifferentAccount(writer, Crypto.newRandomSessionID(writer.id))
             .getCurrentContent(),
     );
 
@@ -315,7 +314,7 @@ test("Readers can not write to an object that is owned by their group", () => {
 
     const childObjectAsReader = childObject.testWithDifferentAccount(
         reader,
-        newRandomSessionID(reader.id),
+        Crypto.newRandomSessionID(reader.id),
     );
 
     const childContentAsReader = expectMap(
@@ -337,7 +336,7 @@ test("Readers can not write to an object that is owned by their group (high leve
 
     const childObjectAsReader = expectMap(
         childObject.core
-            .testWithDifferentAccount(reader, newRandomSessionID(reader.id))
+            .testWithDifferentAccount(reader, Crypto.newRandomSessionID(reader.id))
             .getCurrentContent(),
     );
 
@@ -442,7 +441,7 @@ test("Admins can set group read key and then writers can use it to create and re
 
     const childObjectAsWriter = childObject.testWithDifferentAccount(
         writer,
-        newRandomSessionID(writer.id),
+        Crypto.newRandomSessionID(writer.id),
     );
 
     expect(childObject.getCurrentReadKey().secret).toEqual(readKey);
@@ -466,7 +465,7 @@ test("Admins can set group read key and then writers can use it to create and re
 
     const childObjectAsWriter = expectMap(
         childObject.core
-            .testWithDifferentAccount(writer, newRandomSessionID(writer.id))
+            .testWithDifferentAccount(writer, Crypto.newRandomSessionID(writer.id))
             .getCurrentContent(),
     );
 
@@ -526,7 +525,7 @@ test("Admins can set group read key and then use it to create private transactio
 
     const childObjectAsReader = childObject.testWithDifferentAccount(
         reader,
-        newRandomSessionID(reader.id),
+        Crypto.newRandomSessionID(reader.id),
     );
 
     expect(childObjectAsReader.getCurrentReadKey().secret).toEqual(readKey);
@@ -552,7 +551,7 @@ test("Admins can set group read key and then use it to create private transactio
 
     const childContentAsReader = expectMap(
         childObject.core
-            .testWithDifferentAccount(reader, newRandomSessionID(reader.id))
+            .testWithDifferentAccount(reader, Crypto.newRandomSessionID(reader.id))
             .getCurrentContent(),
     );
 
@@ -613,7 +612,7 @@ test("Admins can set group read key and then use it to create private transactio
 
     const childObjectAsReader1 = childObject.testWithDifferentAccount(
         reader1,
-        newRandomSessionID(reader1.id),
+        Crypto.newRandomSessionID(reader1.id),
     );
 
     expect(childObjectAsReader1.getCurrentReadKey().secret).toEqual(readKey);
@@ -638,7 +637,7 @@ test("Admins can set group read key and then use it to create private transactio
 
     const childObjectAsReader2 = childObject.testWithDifferentAccount(
         reader2,
-        newRandomSessionID(reader2.id),
+        Crypto.newRandomSessionID(reader2.id),
     );
 
     expect(childObjectAsReader2.getCurrentReadKey().secret).toEqual(readKey);
@@ -666,7 +665,7 @@ test("Admins can set group read key and then use it to create private transactio
 
     const childContentAsReader1 = expectMap(
         childObject.core
-            .testWithDifferentAccount(reader1, newRandomSessionID(reader1.id))
+            .testWithDifferentAccount(reader1, Crypto.newRandomSessionID(reader1.id))
             .getCurrentContent(),
     );
 
@@ -676,7 +675,7 @@ test("Admins can set group read key and then use it to create private transactio
 
     const childContentAsReader2 = expectMap(
         childObject.core
-            .testWithDifferentAccount(reader2, newRandomSessionID(reader2.id))
+            .testWithDifferentAccount(reader2, Crypto.newRandomSessionID(reader2.id))
             .getCurrentContent(),
     );
 
@@ -845,7 +844,7 @@ test("Admins can set group read key, make a private transaction in an owned obje
 
     const childObjectAsReader = childObject.testWithDifferentAccount(
         reader,
-        newRandomSessionID(reader.id),
+        Crypto.newRandomSessionID(reader.id),
     );
 
     expect(childObjectAsReader.getCurrentReadKey().secret).toEqual(readKey2);
@@ -883,7 +882,7 @@ test("Admins can set group read key, make a private transaction in an owned obje
 
     const childContentAsReader = expectMap(
         childObject.core
-            .testWithDifferentAccount(reader, newRandomSessionID(reader.id))
+            .testWithDifferentAccount(reader, Crypto.newRandomSessionID(reader.id))
             .getCurrentContent(),
     );
 
@@ -959,7 +958,7 @@ test("Admins can set group read rey, make a private transaction in an owned obje
 
     let childObjectAsReader = childObject.testWithDifferentAccount(
         reader,
-        newRandomSessionID(reader.id),
+        Crypto.newRandomSessionID(reader.id),
     );
 
     expect(
@@ -968,7 +967,7 @@ test("Admins can set group read rey, make a private transaction in an owned obje
 
     let childObjectAsReader2 = childObject.testWithDifferentAccount(
         reader,
-        newRandomSessionID(reader.id),
+        Crypto.newRandomSessionID(reader.id),
     );
 
     expect(
@@ -1024,11 +1023,11 @@ test("Admins can set group read rey, make a private transaction in an owned obje
     // TODO: make sure these instances of coValues sync between each other so this isn't necessary?
     childObjectAsReader = childObject.testWithDifferentAccount(
         reader,
-        newRandomSessionID(reader.id),
+        Crypto.newRandomSessionID(reader.id),
     );
     childObjectAsReader2 = childObject.testWithDifferentAccount(
         reader2,
-        newRandomSessionID(reader2.id),
+        Crypto.newRandomSessionID(reader2.id),
     );
 
     expect(
@@ -1072,7 +1071,7 @@ test("Admins can set group read rey, make a private transaction in an owned obje
 
     const childContentAsReader2 = expectMap(
         childObject.core
-            .testWithDifferentAccount(reader2, newRandomSessionID(reader2.id))
+            .testWithDifferentAccount(reader2, Crypto.newRandomSessionID(reader2.id))
             .getCurrentContent(),
     );
 
@@ -1083,7 +1082,7 @@ test("Admins can set group read rey, make a private transaction in an owned obje
     expect(
         expectMap(
             childObject.core
-                .testWithDifferentAccount(reader, newRandomSessionID(reader.id))
+                .testWithDifferentAccount(reader, Crypto.newRandomSessionID(reader.id))
                 .getCurrentContent(),
         ).get("foo3"),
     ).toBeUndefined();
@@ -1151,7 +1150,7 @@ test("Admins can create an adminInvite, which can add an admin", () => {
         groupCore
             .testWithDifferentAccount(
                 new ControlledAgent(inviteSecret, Crypto),
-                newRandomSessionID(inviteID),
+                Crypto.newRandomSessionID(inviteID),
             )
             .getCurrentContent(),
     );
@@ -1198,7 +1197,7 @@ test("Admins can create an adminInvite, which can add an admin (high-level)", as
 
     const nodeAsInvitedAdmin = node.testWithDifferentAccount(
         new ControlledAgent(invitedAdminSecret, Crypto),
-        newRandomSessionID(invitedAdminID),
+        Crypto.newRandomSessionID(invitedAdminID),
     );
 
     await nodeAsInvitedAdmin.acceptInvite(group.id, inviteSecret);
@@ -1261,7 +1260,7 @@ test("Admins can create a writerInvite, which can add a writer", () => {
         groupCore
             .testWithDifferentAccount(
                 new ControlledAgent(inviteSecret, Crypto),
-                newRandomSessionID(inviteID),
+                Crypto.newRandomSessionID(inviteID),
             )
             .getCurrentContent(),
     );
@@ -1308,7 +1307,7 @@ test("Admins can create a writerInvite, which can add a writer (high-level)", as
 
     const nodeAsInvitedWriter = node.testWithDifferentAccount(
         new ControlledAgent(invitedWriterSecret, Crypto),
-        newRandomSessionID(invitedWriterID),
+        Crypto.newRandomSessionID(invitedWriterID),
     );
 
     await nodeAsInvitedWriter.acceptInvite(group.id, inviteSecret);
@@ -1364,7 +1363,7 @@ test("Admins can create a readerInvite, which can add a reader", () => {
         groupCore
             .testWithDifferentAccount(
                 new ControlledAgent(inviteSecret, Crypto),
-                newRandomSessionID(inviteID),
+                Crypto.newRandomSessionID(inviteID),
             )
             .getCurrentContent(),
     );
@@ -1401,7 +1400,7 @@ test("Admins can create a readerInvite, which can add a reader (high-level)", as
 
     const nodeAsInvitedReader = node.testWithDifferentAccount(
         new ControlledAgent(invitedReaderSecret, Crypto),
-        newRandomSessionID(invitedReaderID),
+        Crypto.newRandomSessionID(invitedReaderID),
     );
 
     await nodeAsInvitedReader.acceptInvite(group.id, inviteSecret);
@@ -1457,7 +1456,7 @@ test("WriterInvites can not invite admins", () => {
         groupCore
             .testWithDifferentAccount(
                 new ControlledAgent(inviteSecret, Crypto),
-                newRandomSessionID(inviteID),
+                Crypto.newRandomSessionID(inviteID),
             )
             .getCurrentContent(),
     );
@@ -1511,7 +1510,7 @@ test("ReaderInvites can not invite admins", () => {
         groupCore
             .testWithDifferentAccount(
                 new ControlledAgent(inviteSecret, Crypto),
-                newRandomSessionID(inviteID),
+                Crypto.newRandomSessionID(inviteID),
             )
             .getCurrentContent(),
     );
@@ -1565,7 +1564,7 @@ test("ReaderInvites can not invite writers", () => {
         groupCore
             .testWithDifferentAccount(
                 new ControlledAgent(inviteSecret, Crypto),
-                newRandomSessionID(inviteID),
+                Crypto.newRandomSessionID(inviteID),
             )
             .getCurrentContent(),
     );
@@ -1610,7 +1609,7 @@ test("Can give read permission to 'everyone'", () => {
         childObject
             .testWithDifferentAccount(
                 newAccount,
-                newRandomSessionID(newAccount.currentAgentID()._unsafeUnwrap()),
+                Crypto.newRandomSessionID(newAccount.currentAgentID()._unsafeUnwrap()),
             )
             .getCurrentContent(),
     );
@@ -1639,7 +1638,7 @@ test("Can give read permissions to 'everyone' (high-level)", async () => {
         childObject.core
             .testWithDifferentAccount(
                 new ControlledAgent(Crypto.newRandomAgentSecret(), Crypto),
-                newRandomSessionID(newAccount.currentAgentID()._unsafeUnwrap()),
+                Crypto.newRandomSessionID(newAccount.currentAgentID()._unsafeUnwrap()),
             )
             .getCurrentContent(),
     );
@@ -1680,7 +1679,7 @@ test("Can give write permission to 'everyone'", async () => {
         childObject
             .testWithDifferentAccount(
                 newAccount,
-                newRandomSessionID(newAccount.currentAgentID()._unsafeUnwrap()),
+                Crypto.newRandomSessionID(newAccount.currentAgentID()._unsafeUnwrap()),
             )
             .getCurrentContent(),
     );
@@ -1715,7 +1714,7 @@ test("Can give write permissions to 'everyone' (high-level)", async () => {
         childObject.core
             .testWithDifferentAccount(
                 newAccount,
-                newRandomSessionID(newAccount.currentAgentID()._unsafeUnwrap()),
+                Crypto.newRandomSessionID(newAccount.currentAgentID()._unsafeUnwrap()),
             )
             .getCurrentContent(),
     );

package/src/tests/sync.test.ts

@@ -5,11 +5,10 @@ import { MapOpPayload } from "../coValues/coMap.js";
 import { RawGroup } from "../coValues/group.js";
 import { randomAnonymousAccountAndSessionID } from "./testUtils.js";
 import { connectedPeers, newQueuePair } from "../streamUtils.js";
-import { AccountID } from "../coValues/account.js";
+import { RawAccountID } from "../coValues/account.js";
 import { stableStringify } from "../jsonStringify.js";
 import { WasmCrypto } from "../crypto/WasmCrypto.js";
 import { expectMap } from "../coValue.js";
-import { newRandomSessionID } from "../coValueCore.js";
 
 const Crypto = await WasmCrypto.create();
 
@@ -713,7 +712,7 @@ test.skip("When replaying creation and transactions of a coValue as new content,
         crashOnClose: true,
     });
 
-    const node2 = new LocalNode(admin, newRandomSessionID(admin.id), Crypto);
+    const node2 = new LocalNode(admin, Crypto.newRandomSessionID(admin.id), Crypto);
 
     const [inRx2, inTx2] = newQueuePair();
     const [outRx2, outTx2] = newQueuePair();
@@ -864,7 +863,7 @@ test("Can sync a coValue through a server to another client", async () => {
     client1.syncManager.addPeer(serverAsPeerForClient1);
     server.syncManager.addPeer(client1AsPeer);
 
-    const client2 = new LocalNode(admin, newRandomSessionID(admin.id), Crypto);
+    const client2 = new LocalNode(admin, Crypto.newRandomSessionID(admin.id), Crypto);
 
     const [serverAsPeerForClient2, client2AsPeer] = connectedPeers(
         "serverFor2",
@@ -916,7 +915,7 @@ test("Can sync a coValue with private transactions through a server to another c
     client1.syncManager.addPeer(serverAsPeer);
     server.syncManager.addPeer(client1AsPeer);
 
-    const client2 = new LocalNode(admin, newRandomSessionID(admin.id), Crypto);
+    const client2 = new LocalNode(admin, client1.crypto.newRandomSessionID(admin.id), Crypto);
 
     const [serverAsOtherPeer, client2AsPeer] = await connectedPeers(
         "server",
@@ -1064,7 +1063,7 @@ test("If we start loading a coValue before connecting to a peer that has it, it
     const map = group.createMap();
     map.set("hello", "world", "trusting");
 
-    const node2 = new LocalNode(admin, newRandomSessionID(admin.id), Crypto);
+    const node2 = new LocalNode(admin, Crypto.newRandomSessionID(admin.id), Crypto);
 
     const [node1asPeer, node2asPeer] = await connectedPeers("peer1", "peer2", {
         peer1role: "server",
@@ -1097,7 +1096,7 @@ function groupContentEx(group: RawGroup) {
     };
 }
 
-function _admContEx(adminID: AccountID) {
+function _admContEx(adminID: RawAccountID) {
     return {
         action: "content",
         id: adminID,
@@ -1111,7 +1110,7 @@ function groupStateEx(group: RawGroup) {
     };
 }
 
-function _admStateEx(adminID: AccountID) {
+function _admStateEx(adminID: RawAccountID) {
     return {
         action: "known",
         id: adminID,

package/src/tests/testUtils.ts

@@ -1,5 +1,4 @@
 import { expect } from "vitest";
-import { newRandomSessionID } from "../coValueCore.js";
 import { LocalNode } from "../localNode.js";
 import { expectGroup } from "../typeUtils/expectGroup.js";
 import { ControlledAgent } from "../coValues/account.js";
@@ -14,7 +13,7 @@ export function randomAnonymousAccountAndSessionID(): [
 ] {
     const agentSecret = Crypto.newRandomAgentSecret();
 
-    const sessionID = newRandomSessionID(Crypto.getAgentID(agentSecret));
+    const sessionID = Crypto.newRandomSessionID(Crypto.getAgentID(agentSecret));
 
     return [new ControlledAgent(agentSecret, Crypto), sessionID];
 }

package/src/typeUtils/accountOrAgentIDfromSessionID.ts

@@ -1,9 +1,9 @@
 import { AgentID, SessionID } from "../ids.js";
-import { AccountID } from "../coValues/account.js";
+import { RawAccountID } from "../coValues/account.js";
 
 export function accountOrAgentIDfromSessionID(
     sessionID: SessionID,
-): AccountID | AgentID {
+): RawAccountID | AgentID {
     const until = sessionID.indexOf("_session");
-    return sessionID.slice(0, until) as AccountID | AgentID;
+    return sessionID.slice(0, until) as RawAccountID | AgentID;
 }

package/src/typeUtils/isAccountID.ts

@@ -1,6 +1,6 @@
-import type { AccountID } from "../coValues/account.js";
+import type { RawAccountID } from "../coValues/account.js";
 import type { AgentID } from "../ids.js";
 
-export function isAccountID(id: AccountID | AgentID): id is AccountID {
+export function isAccountID(id: RawAccountID | AgentID): id is RawAccountID {
     return id.startsWith("co_");
 }