cojson 0.18.32 → 0.18.34

package/src/knownState.ts

@@ -109,15 +109,59 @@ export function cloneKnownState(knownState: CoValueKnownState) {
 /**
  * Checks if all the local sessions have the same counters as in remote.
  */
-export function areLocalSessionsUploaded(
-  local: Record<string, number>,
-  remote: Record<string, number>,
+export function areCurrentSessionsInSyncWith(
+  current: Record<string, number>,
+  target: Record<string, number>,
 ) {
-  for (const sessionId of Object.keys(local)) {
-    if (local[sessionId] !== remote[sessionId]) {
+  for (const [sessionId, currentCount] of Object.entries(current) as [
+    SessionID,
+    number,
+  ][]) {
+    const targetCount = target[sessionId] ?? 0;
+    if (currentCount !== targetCount) {
       return false;
     }
   }
 
   return true;
 }
+
+/**
+ * Checks if all the local sessions have the same counters as in remote.
+ */
+export function isKnownStateSubsetOf(
+  current: Record<string, number>,
+  target: Record<string, number>,
+) {
+  for (const [sessionId, currentCount] of Object.entries(current) as [
+    SessionID,
+    number,
+  ][]) {
+    const targetCount = target[sessionId] ?? 0;
+    if (currentCount > targetCount) {
+      return false;
+    }
+  }
+
+  return true;
+}
+
+/**
+ * Returns the record with the sessions that need to be sent to the target
+ */
+export function getKnownStateToSend(
+  current: Record<string, number>,
+  target: Record<string, number>,
+) {
+  const toSend: Record<string, number> = {};
+  for (const [sessionId, currentCount] of Object.entries(current) as [
+    SessionID,
+    number,
+  ][]) {
+    const targetCount = target[sessionId] ?? 0;
+    if (currentCount > targetCount) {
+      toSend[sessionId] = currentCount;
+    }
+  }
+  return toSend;
+}

package/src/localNode.ts

@@ -10,7 +10,6 @@ import {
 import {
   type CoValueHeader,
   type CoValueUniqueness,
-  VerifiedState,
 } from "./coValueCore/verifiedState.js";
 import {
   AccountMeta,
@@ -31,7 +30,7 @@ import {
   type RawGroup,
   secretSeedFromInviteSecret,
 } from "./coValues/group.js";
-import { CO_VALUE_LOADING_CONFIG, GARBAGE_COLLECTOR_CONFIG } from "./config.js";
+import { CO_VALUE_LOADING_CONFIG } from "./config.js";
 import { AgentSecret, CryptoProvider } from "./crypto/crypto.js";
 import { AgentID, RawCoID, SessionID, isAgentID } from "./ids.js";
 import { logger } from "./logger.js";
@@ -41,6 +40,7 @@ import { accountOrAgentIDfromSessionID } from "./typeUtils/accountOrAgentIDfromS
 import { expectGroup } from "./typeUtils/expectGroup.js";
 import { canBeBranched } from "./coValueCore/branching.js";
 import { connectedPeers } from "./streamUtils.js";
+import { emptyKnownState } from "./knownState.js";
 
 /** A `LocalNode` represents a local view of a set of loaded `CoValue`s, from the perspective of a particular account (or primitive cryptographic agent).
 
@@ -380,7 +380,10 @@ export class LocalNode {
     }
 
     this.garbageCollector?.trackCoValueAccess(coValue);
-    this.syncManager.syncHeader(coValue.verified);
+    this.syncManager.syncLocalTransaction(
+      coValue.verified,
+      emptyKnownState(id),
+    );
 
     return coValue;
   }
@@ -650,8 +653,7 @@ export class LocalNode {
     );
 
     const contentPieces =
-      groupAsInvite.core.verified.newContentSince(group.core.knownState()) ??
-      [];
+      groupAsInvite.core.newContentSince(group.core.knownState()) ?? [];
 
     // Import the new transactions to the current localNode
     for (const contentPiece of contentPieces) {

package/src/queue/LocalTransactionsSyncQueue.ts

@@ -1,12 +1,8 @@
-import {
-  addTransactionToContentMessage,
-  createContentMessage,
-} from "../coValueContentMessage.js";
-import { Transaction, VerifiedState } from "../coValueCore/verifiedState.js";
-import { Signature } from "../crypto/crypto.js";
-import { RawCoID, SessionID } from "../ids.js";
+import { knownStateFromContent } from "../coValueContentMessage.js";
+import { VerifiedState } from "../coValueCore/verifiedState.js";
+import { RawCoID } from "../ids.js";
+import { combineKnownStateSessions, CoValueKnownState } from "../knownState.js";
 import { NewContentMessage } from "../sync.js";
-import { LinkedList } from "./LinkedList.js";
 
 /**
  * This queue is used to batch the sync of local transactions while preserving the order of updates between CoValues.
@@ -18,65 +14,97 @@ import { LinkedList } from "./LinkedList.js";
  * 2. If we do multiple updates on the same CoMap, the updates will be batched because it's safe to do so.
  */
 export class LocalTransactionsSyncQueue {
-  private readonly queue = new LinkedList<NewContentMessage>();
+  private batch: NewContentMessage[] = [];
+  private firstChunks = new Map<RawCoID, NewContentMessage>();
+  private lastUpdatedValue: VerifiedState | undefined;
+  private lastUpdatedValueKnownState: CoValueKnownState | undefined;
 
   constructor(private readonly sync: (content: NewContentMessage) => void) {}
 
-  syncHeader = (coValue: VerifiedState) => {
-    const lastPendingSync = this.queue.tail?.value;
+  syncTransaction = (
+    coValue: VerifiedState,
+    knownStateBefore: CoValueKnownState,
+  ) => {
+    const lastUpdatedValue = this.lastUpdatedValue;
+    const lastUpdatedValueKnownState = this.lastUpdatedValueKnownState;
 
-    if (lastPendingSync?.id === coValue.id) {
-      return;
+    if (lastUpdatedValue && lastUpdatedValueKnownState) {
+      if (lastUpdatedValue.id === coValue.id) {
+        return;
+      }
+
+      this.addContentToBatch(lastUpdatedValue, lastUpdatedValueKnownState);
+    }
+
+    this.lastUpdatedValue = coValue;
+    this.lastUpdatedValueKnownState = knownStateBefore;
+
+    for (const trackingSet of this.dirtyCoValuesTrackingSets) {
+      trackingSet.add(coValue.id);
     }
 
-    this.enqueue(createContentMessage(coValue.id, coValue.header));
+    this.scheduleNextBatch();
   };
 
-  syncTransaction = (
+  private addContentToBatch(
     coValue: VerifiedState,
-    transaction: Transaction,
-    sessionID: SessionID,
-    signature: Signature,
-    txIdx: number,
-  ) => {
-    const lastPendingSync = this.queue.tail?.value;
-    const lastSignatureIdx = coValue.getLastSignatureCheckpoint(sessionID);
-    const isSignatureCheckpoint =
-      lastSignatureIdx > -1 && lastSignatureIdx === txIdx;
-
-    if (lastPendingSync?.id === coValue.id && !isSignatureCheckpoint) {
-      addTransactionToContentMessage(
-        lastPendingSync,
-        transaction,
-        sessionID,
-        signature,
-        txIdx,
-      );
+    knownStateBefore: CoValueKnownState,
+  ) {
+    const content = coValue.newContentSince(knownStateBefore, {
+      skipExpectContentUntil: true, // we need to calculate the streaming header considering the current batch
+    });
 
+    if (!content) {
       return;
     }
 
-    const content = createContentMessage(coValue.id, coValue.header, false);
+    let firstChunk = this.firstChunks.get(coValue.id);
+
+    for (const piece of content) {
+      this.batch.push(piece);
+
+      // Check if the local content updates are in streaming, if so we need to add the info to the first chunk
+      if (firstChunk) {
+        if (!firstChunk.expectContentUntil) {
+          firstChunk.expectContentUntil =
+            knownStateFromContent(firstChunk).sessions;
+        }
+        combineKnownStateSessions(
+          firstChunk.expectContentUntil,
+          knownStateFromContent(piece).sessions,
+        );
+      } else {
+        firstChunk = piece;
+        this.firstChunks.set(coValue.id, firstChunk);
+      }
+    }
+  }
 
-    addTransactionToContentMessage(
-      content,
-      transaction,
-      sessionID,
-      signature,
-      txIdx,
-    );
+  private nextBatchScheduled = false;
+  scheduleNextBatch() {
+    if (this.nextBatchScheduled) return;
 
-    this.enqueue(content);
-  };
+    this.nextBatchScheduled = true;
 
-  enqueue(content: NewContentMessage) {
-    this.queue.push(content);
+    queueMicrotask(() => {
+      if (this.lastUpdatedValue && this.lastUpdatedValueKnownState) {
+        this.addContentToBatch(
+          this.lastUpdatedValue,
+          this.lastUpdatedValueKnownState,
+        );
+      }
+      const batch = this.batch;
 
-    this.processPendingSyncs();
+      this.lastUpdatedValue = undefined;
+      this.lastUpdatedValueKnownState = undefined;
+      this.firstChunks = new Map();
+      this.batch = [];
+      this.nextBatchScheduled = false;
 
-    for (const trackingSet of this.dirtyCoValuesTrackingSets) {
-      trackingSet.add(content.id);
-    }
+      for (const content of batch) {
+        this.sync(content);
+      }
+    });
   }
 
   private dirtyCoValuesTrackingSets: Set<Set<RawCoID>> = new Set();
@@ -105,23 +133,4 @@ export class LocalTransactionsSyncQueue {
       },
     };
   };
-
-  private processingSyncs = false;
-  processPendingSyncs() {
-    if (this.processingSyncs) return;
-
-    this.processingSyncs = true;
-
-    queueMicrotask(() => {
-      while (this.queue.head) {
-        const content = this.queue.head.value;
-
-        this.sync(content);
-
-        this.queue.shift();
-      }
-
-      this.processingSyncs = false;
-    });
-  }
 }

package/src/storage/knownState.ts

@@ -3,7 +3,7 @@ import { RawCoID } from "../ids.js";
 import {
   CoValueKnownState,
   emptyKnownState,
-  areLocalSessionsUploaded,
+  areCurrentSessionsInSyncWith,
 } from "../knownState.js";
 
 /**
@@ -87,7 +87,7 @@ function isInSync(
     return false;
   }
 
-  return areLocalSessionsUploaded(
+  return areCurrentSessionsInSyncWith(
     knownState.sessions,
     knownStateFromStorage.sessions,
   );

package/src/sync.ts

@@ -228,7 +228,7 @@ export class SyncManager {
       }
     }
 
-    const newContentPieces = coValue.verified.newContentSince(
+    const newContentPieces = coValue.newContentSince(
       peer.getOptimisticKnownState(id),
     );
 
@@ -585,6 +585,8 @@ export class SyncManager {
           sessions: msg.expectContentUntil,
         });
       }
+    } else if (msg.expectContentUntil) {
+      coValue.verified.setStreamingKnownState(msg.expectContentUntil);
     }
 
     // At this point the CoValue must be in memory, if not we have a bug
@@ -647,6 +649,9 @@ export class SyncManager {
             peerRole: peer.role,
             id: msg.id,
             err: result.error,
+            msgKnownState: knownStateFromContent(msg).sessions,
+            knownState: coValue.knownState().sessions,
+            newContent: validNewContent.new,
           });
           // TODO Mark only the session as errored, not the whole coValue
           coValue.markErrored(peer.id, result.error);
@@ -766,7 +771,6 @@ export class SyncManager {
   private syncQueue = new LocalTransactionsSyncQueue((content) =>
     this.syncContent(content),
   );
-  syncHeader = this.syncQueue.syncHeader;
   syncLocalTransaction = this.syncQueue.syncTransaction;
   trackDirtyCoValues = this.syncQueue.trackDirtyCoValues;
 
@@ -822,7 +826,7 @@ export class SyncManager {
         return undefined;
       }
 
-      return value.verified.newContentSince(correction);
+      return value.newContentSince(correction);
     });
   }
 

package/src/tests/PureJSCrypto.test.ts

@@ -117,8 +117,7 @@ describe("PureJSCrypto", () => {
       true,
     );
 
-    const content =
-      mapInOtherSession.core.verified.newContentSince(undefined)?.[0];
+    const content = mapInOtherSession.core.newContentSince(undefined)?.[0];
     assert(content);
 
     client.node.syncManager.handleNewContent(content, "storage");

package/src/tests/StorageApiAsync.test.ts

@@ -31,7 +31,7 @@ function getNewContentSince(
     throw new Error(`CoValue ${coValue.id} is not verified`);
   }
 
-  const contentMessage = coValue.verified.newContentSince(knownState)?.[0];
+  const contentMessage = coValue.newContentSince(knownState)?.[0];
 
   if (!contentMessage) {
     throw new Error(`No new content available for coValue ${coValue.id}`);
@@ -295,7 +295,7 @@ describe("StorageApiAsync", () => {
       const contentMessage = getNewContentSince(group.core, knownState);
       const correctionCallback = vi.fn((known) => {
         expect(known).toEqual(emptyKnownState(group.id));
-        return group.core.verified.newContentSince(known);
+        return group.core.newContentSince(known);
       });
 
       // Get initial known state
@@ -339,7 +339,7 @@ describe("StorageApiAsync", () => {
       const contentMessage = getNewContentSince(group.core, knownState);
       const correctionCallback = vi.fn((known) => {
         expect(known).toEqual(initialKnownState);
-        return group.core.verified.newContentSince(known);
+        return group.core.newContentSince(known);
       });
 
       // Get initial storage known state
@@ -539,16 +539,16 @@ describe("StorageApiAsync", () => {
         }),
       ).toMatchInlineSnapshot(`
         [
-          "test -> test-storage | CONTENT Core header: false new: After: 1 New: 1",
-          "test -> test-storage | CONTENT Core2 header: false new: After: 1 New: 1",
+          "test -> test-storage | CONTENT Core header: false new: After: 1 New: 1 expectContentUntil: header/3",
+          "test -> test-storage | CONTENT Core2 header: false new: After: 1 New: 1 expectContentUntil: header/3",
           "test -> test-storage | CONTENT Core header: false new: After: 2 New: 1",
           "test -> test-storage | CONTENT Core2 header: false new: After: 2 New: 1",
           "test-storage -> test | KNOWN CORRECTION Core sessions: empty",
           "test -> test-storage | CONTENT Core header: true new: After: 0 New: 3",
           "test-storage -> test | KNOWN CORRECTION Core2 sessions: empty",
           "test -> test-storage | CONTENT Core2 header: true new: After: 0 New: 3",
-          "test -> test-storage | CONTENT Core header: false new: After: 3 New: 1",
-          "test -> test-storage | CONTENT Core2 header: false new: After: 3 New: 1",
+          "test -> test-storage | CONTENT Core header: false new: After: 3 New: 1 expectContentUntil: header/5",
+          "test -> test-storage | CONTENT Core2 header: false new: After: 3 New: 1 expectContentUntil: header/5",
           "test -> test-storage | CONTENT Core header: false new: After: 4 New: 1",
           "test -> test-storage | CONTENT Core2 header: false new: After: 4 New: 1",
         ]
@@ -606,14 +606,14 @@ describe("StorageApiAsync", () => {
         }),
       ).toMatchInlineSnapshot(`
         [
-          "test -> test-storage | CONTENT Core header: false new: After: 1 New: 1",
-          "test -> test-storage | CONTENT Core2 header: false new: After: 1 New: 1",
+          "test -> test-storage | CONTENT Core header: false new: After: 1 New: 1 expectContentUntil: header/3",
+          "test -> test-storage | CONTENT Core2 header: false new: After: 1 New: 1 expectContentUntil: header/3",
           "test -> test-storage | CONTENT Core header: false new: After: 2 New: 1",
           "test -> test-storage | CONTENT Core2 header: false new: After: 2 New: 1",
           "test-storage -> test | KNOWN CORRECTION Core sessions: empty",
           "test -> test-storage | CONTENT Core header: true new: After: 0 New: 3",
-          "test -> test-storage | CONTENT Core header: false new: After: 3 New: 1",
-          "test -> test-storage | CONTENT Core2 header: false new: After: 3 New: 1",
+          "test -> test-storage | CONTENT Core header: false new: After: 3 New: 1 expectContentUntil: header/5",
+          "test -> test-storage | CONTENT Core2 header: false new: After: 3 New: 1 expectContentUntil: header/5",
           "test -> test-storage | CONTENT Core header: false new: After: 4 New: 1",
           "test -> test-storage | CONTENT Core2 header: false new: After: 4 New: 1",
         ]

package/src/tests/StorageApiSync.test.ts

@@ -26,7 +26,7 @@ function getNewContentSince(
     throw new Error(`CoValue ${coValue.id} is not verified`);
   }
 
-  const contentMessage = coValue.verified.newContentSince(knownState)?.[0];
+  const contentMessage = coValue.newContentSince(knownState)?.[0];
 
   if (!contentMessage) {
     throw new Error(`No new content available for coValue ${coValue.id}`);
@@ -274,7 +274,7 @@ describe("StorageApiSync", () => {
       const contentMessage = getNewContentSince(group.core, knownState);
       const correctionCallback = vi.fn((known) => {
         expect(known).toEqual(emptyKnownState(group.id));
-        return group.core.verified.newContentSince(known);
+        return group.core.newContentSince(known);
       });
 
       // Get initial known state
@@ -318,7 +318,7 @@ describe("StorageApiSync", () => {
       const contentMessage = getNewContentSince(group.core, knownState);
       const correctionCallback = vi.fn((known) => {
         expect(known).toEqual(initialKnownState);
-        return group.core.verified.newContentSince(known);
+        return group.core.newContentSince(known);
       });
 
       // Get initial storage known state

package/src/tests/WasmCrypto.test.ts

@@ -117,8 +117,7 @@ describe("WasmCrypto", () => {
       true,
     );
 
-    const content =
-      mapInOtherSession.core.verified.newContentSince(undefined)?.[0];
+    const content = mapInOtherSession.core.newContentSince(undefined)?.[0];
     assert(content);
 
     client.node.syncManager.handleNewContent(content, "storage");

package/src/tests/coPlainText.test.ts

@@ -371,13 +371,12 @@ test("chunks transactions when when the chars are longer than MAX_RECOMMENDED_TX
     }),
   ).toMatchInlineSnapshot(`
     [
-      "client -> storage | CONTENT CoPlainText header: true new: After: 0 New: 1",
-      "client -> storage | CONTENT CoPlainText header: false new: After: 1 New: 1",
+      "client -> storage | CONTENT CoPlainText header: true new: After: 0 New: 2 expectContentUntil: header/42",
       "client -> storage | CONTENT CoPlainText header: false new: After: 2 New: 1",
       "client -> storage | CONTENT CoPlainText header: false new: After: 3 New: 1",
       "client -> storage | CONTENT CoPlainText header: false new: After: 4 New: 1",
-      "client -> storage | CONTENT CoPlainText header: false new: After: 5 New: 2",
-      "client -> storage | CONTENT CoPlainText header: false new: After: 7 New: 1",
+      "client -> storage | CONTENT CoPlainText header: false new: After: 5 New: 1",
+      "client -> storage | CONTENT CoPlainText header: false new: After: 6 New: 2",
       "client -> storage | CONTENT CoPlainText header: false new: After: 8 New: 1",
       "client -> storage | CONTENT CoPlainText header: false new: After: 9 New: 1",
       "client -> storage | CONTENT CoPlainText header: false new: After: 10 New: 1",
@@ -389,8 +388,8 @@ test("chunks transactions when when the chars are longer than MAX_RECOMMENDED_TX
       "client -> storage | CONTENT CoPlainText header: false new: After: 16 New: 1",
       "client -> storage | CONTENT CoPlainText header: false new: After: 17 New: 1",
       "client -> storage | CONTENT CoPlainText header: false new: After: 18 New: 1",
-      "client -> storage | CONTENT CoPlainText header: false new: After: 19 New: 2",
-      "client -> storage | CONTENT CoPlainText header: false new: After: 21 New: 1",
+      "client -> storage | CONTENT CoPlainText header: false new: After: 19 New: 1",
+      "client -> storage | CONTENT CoPlainText header: false new: After: 20 New: 2",
       "client -> storage | CONTENT CoPlainText header: false new: After: 22 New: 1",
       "client -> storage | CONTENT CoPlainText header: false new: After: 23 New: 1",
       "client -> storage | CONTENT CoPlainText header: false new: After: 24 New: 1",
@@ -406,16 +405,16 @@ test("chunks transactions when when the chars are longer than MAX_RECOMMENDED_TX
       "client -> storage | CONTENT CoPlainText header: false new: After: 34 New: 1",
       "client -> storage | CONTENT CoPlainText header: false new: After: 35 New: 1",
       "client -> storage | CONTENT CoPlainText header: false new: After: 36 New: 1",
-      "client -> storage | CONTENT CoPlainText header: false new: After: 37 New: 3",
-      "client -> storage | CONTENT CoPlainText header: false new: After: 40 New: 1",
+      "client -> storage | CONTENT CoPlainText header: false new: After: 37 New: 1",
+      "client -> storage | CONTENT CoPlainText header: false new: After: 38 New: 3",
       "client -> storage | CONTENT CoPlainText header: false new: After: 41 New: 1",
       "client -> storage | LOAD CoPlainText sessions: empty",
       "storage -> client | CONTENT CoPlainText header: true new: After: 0 New: 2 expectContentUntil: header/42",
       "storage -> client | CONTENT CoPlainText header: true new: After: 2 New: 1",
       "storage -> client | CONTENT CoPlainText header: true new: After: 3 New: 1",
       "storage -> client | CONTENT CoPlainText header: true new: After: 4 New: 1",
-      "storage -> client | CONTENT CoPlainText header: true new: After: 5 New: 2",
-      "storage -> client | CONTENT CoPlainText header: true new: After: 7 New: 1",
+      "storage -> client | CONTENT CoPlainText header: true new: After: 5 New: 1",
+      "storage -> client | CONTENT CoPlainText header: true new: After: 6 New: 2",
       "storage -> client | CONTENT CoPlainText header: true new: After: 8 New: 1",
       "storage -> client | CONTENT CoPlainText header: true new: After: 9 New: 1",
       "storage -> client | CONTENT CoPlainText header: true new: After: 10 New: 1",
@@ -427,8 +426,8 @@ test("chunks transactions when when the chars are longer than MAX_RECOMMENDED_TX
       "storage -> client | CONTENT CoPlainText header: true new: After: 16 New: 1",
       "storage -> client | CONTENT CoPlainText header: true new: After: 17 New: 1",
       "storage -> client | CONTENT CoPlainText header: true new: After: 18 New: 1",
-      "storage -> client | CONTENT CoPlainText header: true new: After: 19 New: 2",
-      "storage -> client | CONTENT CoPlainText header: true new: After: 21 New: 1",
+      "storage -> client | CONTENT CoPlainText header: true new: After: 19 New: 1",
+      "storage -> client | CONTENT CoPlainText header: true new: After: 20 New: 2",
       "storage -> client | CONTENT CoPlainText header: true new: After: 22 New: 1",
       "storage -> client | CONTENT CoPlainText header: true new: After: 23 New: 1",
       "storage -> client | CONTENT CoPlainText header: true new: After: 24 New: 1",
@@ -444,8 +443,8 @@ test("chunks transactions when when the chars are longer than MAX_RECOMMENDED_TX
       "storage -> client | CONTENT CoPlainText header: true new: After: 34 New: 1",
       "storage -> client | CONTENT CoPlainText header: true new: After: 35 New: 1",
       "storage -> client | CONTENT CoPlainText header: true new: After: 36 New: 1",
-      "storage -> client | CONTENT CoPlainText header: true new: After: 37 New: 3",
-      "storage -> client | CONTENT CoPlainText header: true new: After: 40 New: 1",
+      "storage -> client | CONTENT CoPlainText header: true new: After: 37 New: 1",
+      "storage -> client | CONTENT CoPlainText header: true new: After: 38 New: 3",
       "storage -> client | CONTENT CoPlainText header: true new: After: 41 New: 1",
     ]
   `);

package/src/tests/coStream.test.ts

@@ -217,24 +217,24 @@ 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.verified.newContentSince({
+  const newContent = coValue.newContentSince({
     id: coValue.id,
     header: false,
     sessions: {},
   })!;
 
-  expect(newContent.length).toEqual(5);
+  expect(newContent.length).toEqual(4);
   expect(newContent[0]!.header).toBeDefined();
-  expect(newContent[1]!.new[node.currentSessionID]!.lastSignature).toEqual(
+  expect(newContent[0]!.new[node.currentSessionID]!.lastSignature).toEqual(
     sessionEntry.signatureAfter[3],
   );
-  expect(newContent[2]!.new[node.currentSessionID]!.lastSignature).toEqual(
+  expect(newContent[1]!.new[node.currentSessionID]!.lastSignature).toEqual(
     sessionEntry.signatureAfter[6],
   );
-  expect(newContent[3]!.new[node.currentSessionID]!.lastSignature).toEqual(
+  expect(newContent[2]!.new[node.currentSessionID]!.lastSignature).toEqual(
     sessionEntry.signatureAfter[9],
   );
-  expect(newContent[4]!.new[node.currentSessionID]!.lastSignature).toEqual(
+  expect(newContent[3]!.new[node.currentSessionID]!.lastSignature).toEqual(
     sessionEntry.lastSignature,
   );
 });
@@ -286,24 +286,24 @@ 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.verified.newContentSince({
+  const newContent = coValue.newContentSince({
     id: coValue.id,
     header: false,
     sessions: {},
   })!;
 
-  expect(newContent.length).toEqual(5);
+  expect(newContent.length).toEqual(4);
   expect(newContent[0]!.header).toBeDefined();
-  expect(newContent[1]!.new[node.currentSessionID]!.lastSignature).toEqual(
+  expect(newContent[0]!.new[node.currentSessionID]!.lastSignature).toEqual(
     sessionEntry.signatureAfter[1],
   );
-  expect(newContent[2]!.new[node.currentSessionID]!.lastSignature).toEqual(
+  expect(newContent[1]!.new[node.currentSessionID]!.lastSignature).toEqual(
     sessionEntry.signatureAfter[2],
   );
-  expect(newContent[3]!.new[node.currentSessionID]!.lastSignature).toEqual(
+  expect(newContent[2]!.new[node.currentSessionID]!.lastSignature).toEqual(
     sessionEntry.signatureAfter[3],
   );
-  expect(newContent[4]!.new[node.currentSessionID]!.lastSignature).toEqual(
+  expect(newContent[3]!.new[node.currentSessionID]!.lastSignature).toEqual(
     sessionEntry.lastSignature,
   );
 });