cojson 0.18.32 → 0.18.34

package/src/tests/knownState.test.ts

@@ -7,9 +7,10 @@ import {
   setSessionCounter,
   updateSessionCounter,
   cloneKnownState,
-  areLocalSessionsUploaded,
+  isKnownStateSubsetOf,
   type CoValueKnownState,
   type KnownStateSessions,
+  areCurrentSessionsInSyncWith,
 } from "../knownState.js";
 import { RawCoID, SessionID } from "../ids.js";
 
@@ -547,14 +548,14 @@ describe("knownState", () => {
     });
   });
 
-  describe("areLocalSessionsUploaded", () => {
+  describe("areCurrentSessionsInSyncWith", () => {
     test("should return true when all counters match", () => {
       const session1 = "session-1" as SessionID;
       const session2 = "session-2" as SessionID;
       const from = { [session1]: 5, [session2]: 10 };
       const to = { [session1]: 5, [session2]: 10 };
 
-      const result = areLocalSessionsUploaded(from, to);
+      const result = areCurrentSessionsInSyncWith(from, to);
 
       expect(result).toBe(true);
     });
@@ -564,7 +565,7 @@ describe("knownState", () => {
       const from = { [session1]: 5 };
       const to = { [session1]: 3 };
 
-      const result = areLocalSessionsUploaded(from, to);
+      const result = areCurrentSessionsInSyncWith(from, to);
 
       expect(result).toBe(false);
     });
@@ -574,7 +575,7 @@ describe("knownState", () => {
       const from = { [session1]: 5 };
       const to = {};
 
-      const result = areLocalSessionsUploaded(from, to);
+      const result = areCurrentSessionsInSyncWith(from, to);
 
       expect(result).toBe(false);
     });
@@ -584,7 +585,7 @@ describe("knownState", () => {
       const from = {};
       const to = { [session1]: 5 };
 
-      const result = areLocalSessionsUploaded(from, to);
+      const result = areCurrentSessionsInSyncWith(from, to);
 
       expect(result).toBe(true);
     });
@@ -593,7 +594,7 @@ describe("knownState", () => {
       const from = {};
       const to = {};
 
-      const result = areLocalSessionsUploaded(from, to);
+      const result = areCurrentSessionsInSyncWith(from, to);
 
       expect(result).toBe(true);
     });
@@ -613,7 +614,7 @@ describe("knownState", () => {
         [session3]: 15,
       };
 
-      const result = areLocalSessionsUploaded(from, to);
+      const result = areCurrentSessionsInSyncWith(from, to);
 
       expect(result).toBe(true);
     });
@@ -633,7 +634,7 @@ describe("knownState", () => {
         [session3]: 15,
       };
 
-      const result = areLocalSessionsUploaded(from, to);
+      const result = areCurrentSessionsInSyncWith(from, to);
 
       expect(result).toBe(false);
     });
@@ -647,7 +648,7 @@ describe("knownState", () => {
         [session2]: 10,
       };
 
-      const result = areLocalSessionsUploaded(from, to);
+      const result = areCurrentSessionsInSyncWith(from, to);
 
       expect(result).toBe(true);
     });
@@ -657,9 +658,105 @@ describe("knownState", () => {
       const from = { [session1]: 5 };
       const to = { [session1]: 10 };
 
-      const result = areLocalSessionsUploaded(from, to);
+      const result = areCurrentSessionsInSyncWith(from, to);
 
       expect(result).toBe(false);
     });
   });
+
+  describe("isKnownStateSubsetOf", () => {
+    test("should return true when all counters match", () => {
+      const session1 = "session-1" as SessionID;
+      const session2 = "session-2" as SessionID;
+      const from = { [session1]: 5, [session2]: 10 };
+      const to = { [session1]: 5, [session2]: 10 };
+
+      const result = isKnownStateSubsetOf(from, to);
+
+      expect(result).toBe(true);
+    });
+
+    test("should return false when the current session counter is higher than the target", () => {
+      const session1 = "session-1" as SessionID;
+      const from = { [session1]: 5 };
+      const to = { [session1]: 3 };
+
+      const result = isKnownStateSubsetOf(from, to);
+
+      expect(result).toBe(false);
+    });
+
+    test("should return true when the target session counter is higher than the target", () => {
+      const session1 = "session-1" as SessionID;
+      const from = { [session1]: 5 };
+      const to = { [session1]: 10 };
+
+      const result = isKnownStateSubsetOf(from, to);
+
+      expect(result).toBe(true);
+    });
+
+    test("should return false when session is missing in to", () => {
+      const session1 = "session-1" as SessionID;
+      const from = { [session1]: 5 };
+      const to = {};
+
+      const result = isKnownStateSubsetOf(from, to);
+
+      expect(result).toBe(false);
+    });
+
+    test("should return true when from is empty", () => {
+      const session1 = "session-1" as SessionID;
+      const from = {};
+      const to = { [session1]: 5 };
+
+      const result = isKnownStateSubsetOf(from, to);
+
+      expect(result).toBe(true);
+    });
+
+    test("should return true when both are empty", () => {
+      const from = {};
+      const to = {};
+
+      const result = isKnownStateSubsetOf(from, to);
+
+      expect(result).toBe(true);
+    });
+
+    test("should handle multiple sessions", () => {
+      const session1 = "session-1" as SessionID;
+      const session2 = "session-2" as SessionID;
+      const session3 = "session-3" as SessionID;
+      const from = {
+        [session1]: 5,
+        [session2]: 10,
+        [session3]: 15,
+      };
+      const to = {
+        [session1]: 5,
+        [session2]: 10,
+        [session3]: 15,
+      };
+
+      const result = isKnownStateSubsetOf(from, to);
+
+      expect(result).toBe(true);
+    });
+
+    test("should not check sessions in to that are not in from", () => {
+      const session1 = "session-1" as SessionID;
+      const session2 = "session-2" as SessionID;
+      const from = { [session1]: 5 };
+      const to = {
+        [session1]: 5,
+        [session2]: 10,
+      };
+
+      const result = isKnownStateSubsetOf(from, to);
+
+      expect(result).toBe(true);
+    });
+  });
 });

package/src/tests/sync.auth.test.ts

@@ -53,7 +53,7 @@ describe("LocalNode auth sync", () => {
       }),
     ).toMatchInlineSnapshot(`
       [
-        "client -> server | CONTENT Account header: true new: After: 0 New: 3",
+        "client -> server | CONTENT Account header: true new: After: 0 New: 3 expectContentUntil: header/4",
         "client -> server | CONTENT ProfileGroup header: true new: After: 0 New: 5",
         "client -> server | CONTENT Profile header: true new: After: 0 New: 1",
         "client -> server | CONTENT Account header: false new: After: 3 New: 1",
@@ -116,9 +116,9 @@ describe("LocalNode auth sync", () => {
       }),
     ).toMatchInlineSnapshot(`
       [
-        "client -> server | CONTENT Account header: true new: After: 0 New: 3",
-        "client -> server | CONTENT Root header: true new: ",
-        "client -> server | CONTENT Profile header: true new: ",
+        "client -> server | CONTENT Account header: true new: After: 0 New: 3 expectContentUntil: header/5",
+        "client -> server | CONTENT Root header: true new:  expectContentUntil: header/1",
+        "client -> server | CONTENT Profile header: true new:  expectContentUntil: header/1",
         "client -> server | CONTENT Root header: false new: After: 0 New: 1",
         "client -> server | CONTENT Profile header: false new: After: 0 New: 1",
         "client -> server | CONTENT Account header: false new: After: 3 New: 2",
@@ -176,7 +176,7 @@ describe("LocalNode auth sync", () => {
       }),
     ).toMatchInlineSnapshot(`
       [
-        "creation-node -> server | CONTENT Account header: true new: After: 0 New: 3",
+        "creation-node -> server | CONTENT Account header: true new: After: 0 New: 3 expectContentUntil: header/4",
         "creation-node -> server | CONTENT ProfileGroup header: true new: After: 0 New: 5",
         "creation-node -> server | CONTENT Profile header: true new: After: 0 New: 1",
         "creation-node -> server | CONTENT Account header: false new: After: 3 New: 1",
@@ -246,7 +246,7 @@ describe("LocalNode auth sync", () => {
       }),
     ).toMatchInlineSnapshot(`
       [
-        "creation-node -> server | CONTENT Account header: true new: After: 0 New: 3",
+        "creation-node -> server | CONTENT Account header: true new: After: 0 New: 3 expectContentUntil: header/4",
         "creation-node -> server | CONTENT ProfileGroup header: true new: After: 0 New: 5",
         "creation-node -> server | CONTENT Profile header: true new: After: 0 New: 1",
         "creation-node -> server | CONTENT Account header: false new: After: 3 New: 1",

package/src/tests/sync.load.test.ts

@@ -576,8 +576,7 @@ describe("loading coValues from server", () => {
       [
         "client -> server | LOAD Map sessions: empty",
         "server -> client | CONTENT Group header: true new: After: 0 New: 5",
-        "server -> client | CONTENT Map header: true new:  expectContentUntil: header/1024",
-        "server -> client | CONTENT Map header: false new: After: 0 New: 73",
+        "server -> client | CONTENT Map header: true new: After: 0 New: 73 expectContentUntil: header/1024",
         "server -> client | CONTENT Map header: false new: After: 73 New: 73",
         "server -> client | CONTENT Map header: false new: After: 146 New: 73",
         "server -> client | CONTENT Map header: false new: After: 219 New: 73",
@@ -593,7 +592,83 @@ describe("loading coValues from server", () => {
         "server -> client | CONTENT Map header: false new: After: 949 New: 73",
         "server -> client | CONTENT Map header: false new: After: 1022 New: 2",
         "client -> server | KNOWN Group sessions: header/5",
+        "client -> server | KNOWN Map sessions: header/73",
+        "client -> server | KNOWN Map sessions: header/146",
+        "client -> server | KNOWN Map sessions: header/219",
+        "client -> server | KNOWN Map sessions: header/292",
+        "client -> server | KNOWN Map sessions: header/365",
+        "client -> server | KNOWN Map sessions: header/438",
+        "client -> server | KNOWN Map sessions: header/511",
+        "client -> server | KNOWN Map sessions: header/584",
+        "client -> server | KNOWN Map sessions: header/657",
+        "client -> server | KNOWN Map sessions: header/730",
+        "client -> server | KNOWN Map sessions: header/803",
+        "client -> server | KNOWN Map sessions: header/876",
+        "client -> server | KNOWN Map sessions: header/949",
+        "client -> server | KNOWN Map sessions: header/1022",
+        "client -> server | KNOWN Map sessions: header/1024",
+      ]
+    `);
+  });
+
+  test("streaming a large update", async () => {
+    const group = jazzCloud.node.createGroup();
+    group.addMember("everyone", "writer");
+
+    const largeMap = group.createMap();
+
+    await largeMap.core.waitForSync();
+
+    const client = setupTestNode({
+      connected: true,
+    });
+    const mapOnClient = await loadCoValueOrFail(client.node, largeMap.id);
+
+    // Generate a large amount of data (about 100MB)
+    const dataSize = 1 * 1024 * 1024;
+    const chunkSize = 1024; // 1KB chunks
+    const chunks = dataSize / chunkSize;
+
+    const value = Buffer.alloc(chunkSize, `value$`).toString("base64");
+
+    for (let i = 0; i < chunks; i++) {
+      const key = `key${i}`;
+      largeMap.set(key, value, "trusting");
+    }
+
+    await waitFor(() => {
+      expect(mapOnClient.core.knownState()).toEqual(largeMap.core.knownState());
+    });
+
+    expect(mapOnClient.get(`key${chunks - 1}`)).toEqual(value);
+
+    expect(
+      SyncMessagesLog.getMessages({
+        Group: group.core,
+        Map: largeMap.core,
+      }),
+    ).toMatchInlineSnapshot(`
+      [
+        "client -> server | LOAD Map sessions: empty",
+        "server -> client | CONTENT Group header: true new: After: 0 New: 5",
+        "server -> client | CONTENT Map header: true new: ",
+        "client -> server | KNOWN Group sessions: header/5",
         "client -> server | KNOWN Map sessions: header/0",
+        "server -> client | CONTENT Map header: false new: After: 0 New: 73 expectContentUntil: header/1024",
+        "server -> client | CONTENT Map header: false new: After: 73 New: 73",
+        "server -> client | CONTENT Map header: false new: After: 146 New: 73",
+        "server -> client | CONTENT Map header: false new: After: 219 New: 73",
+        "server -> client | CONTENT Map header: false new: After: 292 New: 73",
+        "server -> client | CONTENT Map header: false new: After: 365 New: 73",
+        "server -> client | CONTENT Map header: false new: After: 438 New: 73",
+        "server -> client | CONTENT Map header: false new: After: 511 New: 73",
+        "server -> client | CONTENT Map header: false new: After: 584 New: 73",
+        "server -> client | CONTENT Map header: false new: After: 657 New: 73",
+        "server -> client | CONTENT Map header: false new: After: 730 New: 73",
+        "server -> client | CONTENT Map header: false new: After: 803 New: 73",
+        "server -> client | CONTENT Map header: false new: After: 876 New: 73",
+        "server -> client | CONTENT Map header: false new: After: 949 New: 73",
+        "server -> client | CONTENT Map header: false new: After: 1022 New: 2",
         "client -> server | KNOWN Map sessions: header/73",
         "client -> server | KNOWN Map sessions: header/146",
         "client -> server | KNOWN Map sessions: header/219",
@@ -1311,8 +1386,8 @@ describe("loading coValues from server", () => {
       }),
     ).toMatchInlineSnapshot(`
       [
-        "client -> server | CONTENT Group header: true new: After: 0 New: 3",
-        "client -> server | CONTENT ParentGroup header: true new: After: 0 New: 5",
+        "client -> server | CONTENT Group header: true new: After: 0 New: 3 expectContentUntil: header/5",
+        "client -> server | CONTENT ParentGroup header: true new: After: 0 New: 5 expectContentUntil: header/7",
         "client -> server | CONTENT Group header: false new: After: 3 New: 2",
         "client -> server | CONTENT ParentGroup header: false new: After: 5 New: 2",
         "client -> server | CONTENT Map header: true new: After: 0 New: 1",

package/src/tests/sync.mesh.test.ts

@@ -152,8 +152,8 @@ describe("multiple clients syncing with the a cloud-like server mesh", () => {
       }),
     ).toMatchInlineSnapshot(`
       [
-        "edge-france -> storage | CONTENT Group header: true new: After: 0 New: 3",
-        "edge-france -> core | CONTENT Group header: true new: After: 0 New: 3",
+        "edge-france -> storage | CONTENT Group header: true new: After: 0 New: 3 expectContentUntil: header/5",
+        "edge-france -> core | CONTENT Group header: true new: After: 0 New: 3 expectContentUntil: header/5",
         "edge-france -> storage | CONTENT ParentGroup header: true new: After: 0 New: 5",
         "edge-france -> core | CONTENT ParentGroup header: true new: After: 0 New: 5",
         "edge-france -> storage | CONTENT Group header: false new: After: 3 New: 2",
@@ -320,7 +320,7 @@ describe("multiple clients syncing with the a cloud-like server mesh", () => {
     expect(mapOnItalianClient.get("hello")).toEqual("world");
     expect(mapOnFrenchClient.get("hello")).toEqual("world");
 
-    const msg = map.core.verified.newContentSince(undefined)?.[0];
+    const msg = map.core.newContentSince(undefined)?.[0];
     assert(msg);
 
     msg.new[mesh.edgeFrance.node.currentSessionID]!.newTransactions.push({
@@ -498,11 +498,11 @@ describe("multiple clients syncing with the a cloud-like server mesh", () => {
     ).toMatchInlineSnapshot(`
       [
         "edge -> storage | CONTENT Group header: true new: After: 0 New: 5",
-        "edge -> storage | CONTENT Map header: true new: After: 0 New: 20",
-        "edge -> storage | CONTENT Map header: false new: After: 20 New: 21",
-        "edge -> storage | CONTENT Map header: false new: After: 41 New: 21",
-        "edge -> storage | CONTENT Map header: false new: After: 62 New: 21",
-        "edge -> storage | CONTENT Map header: false new: After: 83 New: 17",
+        "edge -> storage | CONTENT Map header: true new: After: 0 New: 21 expectContentUntil: header/100",
+        "edge -> storage | CONTENT Map header: false new: After: 21 New: 21",
+        "edge -> storage | CONTENT Map header: false new: After: 42 New: 21",
+        "edge -> storage | CONTENT Map header: false new: After: 63 New: 21",
+        "edge -> storage | CONTENT Map header: false new: After: 84 New: 16",
       ]
     `);
 
@@ -549,11 +549,10 @@ describe("multiple clients syncing with the a cloud-like server mesh", () => {
         "edge -> storage | LOAD Map sessions: empty",
         "storage -> edge | CONTENT Group header: true new: After: 0 New: 5",
         "edge -> core | LOAD Group sessions: header/5",
-        "storage -> edge | CONTENT Map header: true new: After: 0 New: 41 expectContentUntil: header/100",
+        "storage -> edge | CONTENT Map header: true new: After: 0 New: 21 expectContentUntil: header/100",
         "edge -> core | LOAD Map sessions: header/100",
         "edge -> client | CONTENT Group header: true new: After: 0 New: 5",
-        "edge -> client | CONTENT Map header: true new:  expectContentUntil: header/100",
-        "edge -> client | CONTENT Map header: false new: After: 0 New: 41",
+        "edge -> client | CONTENT Map header: true new: After: 0 New: 21 expectContentUntil: header/100",
         "core -> storage | LOAD Group sessions: empty",
         "storage -> core | KNOWN Group sessions: empty",
         "core -> edge | KNOWN Group sessions: empty",
@@ -562,40 +561,42 @@ describe("multiple clients syncing with the a cloud-like server mesh", () => {
         "core -> edge | KNOWN Map sessions: empty",
         "client -> edge | KNOWN Group sessions: header/5",
         "client -> storage | CONTENT Group header: true new: After: 0 New: 5",
-        "client -> edge | KNOWN Map sessions: header/0",
-        "client -> storage | CONTENT Map header: true new: ",
-        "client -> edge | KNOWN Map sessions: header/41",
-        "client -> storage | CONTENT Map header: false new: After: 0 New: 41",
-        "storage -> edge | CONTENT Map header: true new: After: 41 New: 21",
-        "edge -> client | CONTENT Map header: false new: After: 41 New: 21",
+        "client -> edge | KNOWN Map sessions: header/21",
+        "client -> storage | CONTENT Map header: true new: After: 0 New: 21",
+        "storage -> edge | CONTENT Map header: true new: After: 21 New: 21",
+        "edge -> client | CONTENT Map header: false new: After: 21 New: 21 expectContentUntil: header/100",
         "edge -> core | CONTENT Group header: true new: After: 0 New: 5",
-        "edge -> core | CONTENT Map header: true new:  expectContentUntil: header/100",
-        "edge -> core | CONTENT Map header: false new: After: 0 New: 41",
-        "edge -> core | CONTENT Map header: false new: After: 41 New: 21",
-        "client -> edge | KNOWN Map sessions: header/62",
-        "client -> storage | CONTENT Map header: false new: After: 41 New: 21",
-        "storage -> edge | CONTENT Map header: true new: After: 62 New: 21",
-        "edge -> core | CONTENT Map header: false new: After: 62 New: 21",
-        "edge -> client | CONTENT Map header: false new: After: 62 New: 21",
+        "edge -> core | CONTENT Map header: true new: After: 0 New: 21 expectContentUntil: header/100",
+        "edge -> core | CONTENT Map header: false new: After: 21 New: 21",
+        "client -> edge | KNOWN Map sessions: header/42",
+        "client -> storage | CONTENT Map header: false new: After: 21 New: 21",
+        "storage -> edge | CONTENT Map header: true new: After: 42 New: 21",
+        "edge -> core | CONTENT Map header: false new: After: 42 New: 21 expectContentUntil: header/100",
+        "edge -> client | CONTENT Map header: false new: After: 42 New: 21 expectContentUntil: header/100",
         "core -> edge | KNOWN Group sessions: header/5",
         "core -> storage | CONTENT Group header: true new: After: 0 New: 5",
-        "core -> edge | KNOWN Map sessions: header/0",
-        "core -> storage | CONTENT Map header: true new: ",
-        "core -> edge | KNOWN Map sessions: header/41",
-        "core -> storage | CONTENT Map header: false new: After: 0 New: 41",
-        "core -> edge | KNOWN Map sessions: header/62",
-        "core -> storage | CONTENT Map header: false new: After: 41 New: 21",
-        "core -> edge | KNOWN Map sessions: header/83",
-        "core -> storage | CONTENT Map header: false new: After: 62 New: 21",
-        "client -> edge | KNOWN Map sessions: header/83",
-        "client -> storage | CONTENT Map header: false new: After: 62 New: 21",
-        "storage -> edge | CONTENT Map header: true new: After: 83 New: 17",
-        "edge -> core | CONTENT Map header: false new: After: 83 New: 17",
-        "edge -> client | CONTENT Map header: false new: After: 83 New: 17",
+        "core -> edge | KNOWN Map sessions: header/21",
+        "core -> storage | CONTENT Map header: true new: After: 0 New: 21",
+        "core -> edge | KNOWN Map sessions: header/42",
+        "core -> storage | CONTENT Map header: false new: After: 21 New: 21",
+        "core -> edge | KNOWN Map sessions: header/63",
+        "core -> storage | CONTENT Map header: false new: After: 42 New: 21",
+        "client -> edge | KNOWN Map sessions: header/63",
+        "client -> storage | CONTENT Map header: false new: After: 42 New: 21",
+        "storage -> edge | CONTENT Map header: true new: After: 63 New: 21",
+        "edge -> core | CONTENT Map header: false new: After: 63 New: 21 expectContentUntil: header/100",
+        "edge -> client | CONTENT Map header: false new: After: 63 New: 21 expectContentUntil: header/100",
+        "core -> edge | KNOWN Map sessions: header/84",
+        "core -> storage | CONTENT Map header: false new: After: 63 New: 21",
+        "client -> edge | KNOWN Map sessions: header/84",
+        "client -> storage | CONTENT Map header: false new: After: 63 New: 21",
+        "storage -> edge | CONTENT Map header: true new: After: 84 New: 16",
+        "edge -> core | CONTENT Map header: false new: After: 84 New: 16",
+        "edge -> client | CONTENT Map header: false new: After: 84 New: 16",
         "core -> edge | KNOWN Map sessions: header/100",
-        "core -> storage | CONTENT Map header: false new: After: 83 New: 17",
+        "core -> storage | CONTENT Map header: false new: After: 84 New: 16",
         "client -> edge | KNOWN Map sessions: header/100",
-        "client -> storage | CONTENT Map header: false new: After: 83 New: 17",
+        "client -> storage | CONTENT Map header: false new: After: 84 New: 16",
       ]
     `);
 

package/src/tests/sync.peerReconciliation.test.ts

@@ -281,8 +281,8 @@ describe("peer reconciliation", () => {
         "client -> server | CONTENT ProfileGroup header: true new: After: 0 New: 5",
         "server -> client | KNOWN Account sessions: header/4",
         "server -> client | KNOWN ProfileGroup sessions: header/5",
-        "server -> client | KNOWN CORRECTION Map sessions: empty",
         "server -> client | KNOWN Profile sessions: header/1",
+        "server -> client | KNOWN CORRECTION Map sessions: empty",
         "server -> client | KNOWN ProfileGroup sessions: header/5",
         "client -> server | CONTENT Map header: true new: After: 0 New: 2",
         "server -> client | LOAD Group sessions: empty",

package/src/tests/sync.storage.test.ts

@@ -382,28 +382,28 @@ describe("client syncs with a server with storage", () => {
       [
         "client -> storage | CONTENT Group header: true new: After: 0 New: 5",
         "client -> server | CONTENT Group header: true new: After: 0 New: 5",
-        "client -> storage | CONTENT Map header: true new: After: 0 New: 20",
-        "client -> server | CONTENT Map header: true new: After: 0 New: 20",
-        "client -> storage | CONTENT Map header: false new: After: 20 New: 21",
-        "client -> server | CONTENT Map header: false new: After: 20 New: 21",
-        "client -> storage | CONTENT Map header: false new: After: 41 New: 21",
-        "client -> server | CONTENT Map header: false new: After: 41 New: 21",
-        "client -> storage | CONTENT Map header: false new: After: 62 New: 21",
-        "client -> server | CONTENT Map header: false new: After: 62 New: 21",
-        "client -> storage | CONTENT Map header: false new: After: 83 New: 17",
-        "client -> server | CONTENT Map header: false new: After: 83 New: 17",
+        "client -> storage | CONTENT Map header: true new: After: 0 New: 21 expectContentUntil: header/100",
+        "client -> server | CONTENT Map header: true new: After: 0 New: 21 expectContentUntil: header/100",
+        "client -> storage | CONTENT Map header: false new: After: 21 New: 21",
+        "client -> server | CONTENT Map header: false new: After: 21 New: 21",
+        "client -> storage | CONTENT Map header: false new: After: 42 New: 21",
+        "client -> server | CONTENT Map header: false new: After: 42 New: 21",
+        "client -> storage | CONTENT Map header: false new: After: 63 New: 21",
+        "client -> server | CONTENT Map header: false new: After: 63 New: 21",
+        "client -> storage | CONTENT Map header: false new: After: 84 New: 16",
+        "client -> server | CONTENT Map header: false new: After: 84 New: 16",
         "server -> client | KNOWN Group sessions: header/5",
         "server -> storage | CONTENT Group header: true new: After: 0 New: 5",
-        "server -> client | KNOWN Map sessions: header/20",
-        "server -> storage | CONTENT Map header: true new: After: 0 New: 20",
-        "server -> client | KNOWN Map sessions: header/41",
-        "server -> storage | CONTENT Map header: false new: After: 20 New: 21",
-        "server -> client | KNOWN Map sessions: header/62",
-        "server -> storage | CONTENT Map header: false new: After: 41 New: 21",
-        "server -> client | KNOWN Map sessions: header/83",
-        "server -> storage | CONTENT Map header: false new: After: 62 New: 21",
+        "server -> client | KNOWN Map sessions: header/21",
+        "server -> storage | CONTENT Map header: true new: After: 0 New: 21",
+        "server -> client | KNOWN Map sessions: header/42",
+        "server -> storage | CONTENT Map header: false new: After: 21 New: 21",
+        "server -> client | KNOWN Map sessions: header/63",
+        "server -> storage | CONTENT Map header: false new: After: 42 New: 21",
+        "server -> client | KNOWN Map sessions: header/84",
+        "server -> storage | CONTENT Map header: false new: After: 63 New: 21",
         "server -> client | KNOWN Map sessions: header/100",
-        "server -> storage | CONTENT Map header: false new: After: 83 New: 17",
+        "server -> storage | CONTENT Map header: false new: After: 84 New: 16",
       ]
     `);
 
@@ -456,13 +456,14 @@ describe("client syncs with a server with storage", () => {
         "client -> storage | LOAD Map sessions: empty",
         "storage -> client | CONTENT Group header: true new: After: 0 New: 5",
         "client -> server | LOAD Group sessions: header/5",
-        "storage -> client | CONTENT Map header: true new: After: 0 New: 41 expectContentUntil: header/100",
+        "storage -> client | CONTENT Map header: true new: After: 0 New: 21 expectContentUntil: header/100",
         "client -> server | LOAD Map sessions: header/100",
         "server -> client | KNOWN Group sessions: header/5",
         "server -> client | KNOWN Map sessions: header/100",
-        "storage -> client | CONTENT Map header: true new: After: 41 New: 21",
-        "storage -> client | CONTENT Map header: true new: After: 62 New: 21",
-        "storage -> client | CONTENT Map header: true new: After: 83 New: 17",
+        "storage -> client | CONTENT Map header: true new: After: 21 New: 21",
+        "storage -> client | CONTENT Map header: true new: After: 42 New: 21",
+        "storage -> client | CONTENT Map header: true new: After: 63 New: 21",
+        "storage -> client | CONTENT Map header: true new: After: 84 New: 16",
       ]
     `);
   });
@@ -497,7 +498,7 @@ describe("client syncs with a server with storage", () => {
 
     await largeMap.core.waitForSync();
 
-    const newContentChunks = largeMap.core.verified.newContentSince(
+    const newContentChunks = largeMap.core.newContentSince(
       emptyKnownState(largeMap.id),
     );
 
@@ -610,7 +611,7 @@ describe("client syncs with a server with storage", () => {
     SyncMessagesLog.clear(); // We want to focus on the sync messages happening from now
 
     // Import the group in the client, to have the dependencies availble and test that the import persists on storage
-    const groupContent = group.core.verified.newContentSince(undefined)?.[0];
+    const groupContent = group.core.newContentSince(undefined)?.[0];
     assert(groupContent);
     client.node.syncManager.handleNewContent(groupContent, "import");
     expect(storage.getKnownState(groupContent.id)).toEqual(
@@ -618,7 +619,7 @@ describe("client syncs with a server with storage", () => {
     );
 
     // Export the map content with the two sessions
-    const mapContent = mapOnBob.core.verified.newContentSince(undefined)?.[0];
+    const mapContent = mapOnBob.core.newContentSince(undefined)?.[0];
     assert(mapContent);
 
     // Tamper Bob's session
@@ -737,8 +738,8 @@ describe("client syncs with a server with storage", () => {
       }),
     ).toMatchInlineSnapshot(`
       [
-        "client -> server | CONTENT Group header: true new: After: 0 New: 3",
-        "client -> server | CONTENT Map header: true new: ",
+        "client -> server | CONTENT Group header: true new: After: 0 New: 3 expectContentUntil: header/5",
+        "client -> server | CONTENT Map header: true new:  expectContentUntil: header/1",
         "client -> server | CONTENT Group header: false new: After: 3 New: 2",
         "client -> server | CONTENT Map header: false new: After: 0 New: 1",
         "server -> client | KNOWN Group sessions: header/3",