cojson 0.18.0 → 0.18.1

package/.turbo/turbo-build.log

@@ -1,4 +1,4 @@
 
-> cojson@0.18.0 build /home/runner/_work/jazz/jazz/packages/cojson
+> cojson@0.18.1 build /home/runner/_work/jazz/jazz/packages/cojson
 > rm -rf ./dist && tsc --sourceMap --outDir dist
 

package/CHANGELOG.md

@@ -1,5 +1,11 @@
 # cojson
 
+## 0.18.1
+
+### Patch Changes
+
+- cojson-core-wasm@0.18.1
+
 ## 0.18.0
 
 ### Minor Changes

package/dist/coValueCore/branching.d.ts

@@ -0,0 +1,36 @@
+import { CoValueCore } from "../exports.js";
+import { RawCoID } from "../ids.js";
+import { AvailableCoValueCore } from "./coValueCore.js";
+import { CoValueHeader } from "./verifiedState.js";
+import { CoValueKnownState } from "../sync.js";
+export declare function getBranchHeader({ type, branchName, ownerId, sourceId, }: {
+    type: CoValueHeader["type"];
+    branchName: string;
+    ownerId: RawCoID;
+    sourceId: RawCoID;
+}): CoValueHeader;
+/**
+ * Given a coValue, a branch name and an owner id, returns the id for the branch
+ */
+export declare function getBranchId(coValue: CoValueCore, name: string, ownerId: RawCoID): RawCoID;
+export type BranchCommit = {
+    branch: CoValueKnownState["sessions"];
+};
+/**
+ * Given a coValue, a branch name and an owner id, creates a new branch CoValue
+ */
+export declare function createBranch(coValue: CoValueCore, name: string, ownerId: RawCoID): CoValueCore;
+/**
+ * Given a branch coValue, returns the source coValue if available
+ */
+export declare function getBranchSource(coValue: CoValueCore): AvailableCoValueCore | undefined;
+export type MergeCommit = {
+    merge: CoValueKnownState["sessions"];
+    id: RawCoID;
+    count: number;
+};
+/**
+ * Given a branch coValue, merges the branch into the source coValue
+ */
+export declare function mergeBranch(branch: CoValueCore): CoValueCore;
+//# sourceMappingURL=branching.d.ts.map

package/dist/coValueCore/branching.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"branching.d.ts","sourceRoot":"","sources":["../../src/coValueCore/branching.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,WAAW,EAAE,MAAM,eAAe,CAAC;AAC5C,OAAO,EAAE,OAAO,EAAa,MAAM,WAAW,CAAC;AAC/C,OAAO,EAAE,oBAAoB,EAAe,MAAM,kBAAkB,CAAC;AACrE,OAAO,EAAE,aAAa,EAAE,MAAM,oBAAoB,CAAC;AACnD,OAAO,EAAE,iBAAiB,EAAE,MAAM,YAAY,CAAC;AAE/C,wBAAgB,eAAe,CAAC,EAC9B,IAAI,EACJ,UAAU,EACV,OAAO,EACP,QAAQ,GACT,EAAE;IACD,IAAI,EAAE,aAAa,CAAC,MAAM,CAAC,CAAC;IAC5B,UAAU,EAAE,MAAM,CAAC;IACnB,OAAO,EAAE,OAAO,CAAC;IACjB,QAAQ,EAAE,OAAO,CAAC;CACnB,GAAG,aAAa,CAkBhB;AAED;;GAEG;AACH,wBAAgB,WAAW,CACzB,OAAO,EAAE,WAAW,EACpB,IAAI,EAAE,MAAM,EACZ,OAAO,EAAE,OAAO,GACf,OAAO,CAeT;AAED,MAAM,MAAM,YAAY,GAAG;IACzB,MAAM,EAAE,iBAAiB,CAAC,UAAU,CAAC,CAAC;CACvC,CAAC;AAEF;;GAEG;AACH,wBAAgB,YAAY,CAC1B,OAAO,EAAE,WAAW,EACpB,IAAI,EAAE,MAAM,EACZ,OAAO,EAAE,OAAO,GACf,WAAW,CAsBb;AAED;;GAEG;AACH,wBAAgB,eAAe,CAC7B,OAAO,EAAE,WAAW,GACnB,oBAAoB,GAAG,SAAS,CAkBlC;AAED,MAAM,MAAM,WAAW,GAAG;IAExB,KAAK,EAAE,iBAAiB,CAAC,UAAU,CAAC,CAAC;IAErC,EAAE,EAAE,OAAO,CAAC;IAEZ,KAAK,EAAE,MAAM,CAAC;CACf,CAAC;AAEF;;GAEG;AACH,wBAAgB,WAAW,CAAC,MAAM,EAAE,WAAW,GAAG,WAAW,CAiE5D"}

package/dist/coValueCore/branching.js

@@ -0,0 +1,122 @@
+import { idforHeader } from "./coValueCore.js";
+export function getBranchHeader({ type, branchName, ownerId, sourceId, }) {
+    return {
+        type,
+        // Branch name and source id are stored in the meta field
+        // and used to generate the unique id for the branch
+        meta: {
+            branch: branchName,
+            source: sourceId,
+        },
+        ruleset: {
+            type: "ownedByGroup",
+            // The owner is part of the id generation, making it possible to have multiple branches with the same name
+            // but different owners
+            group: ownerId,
+        },
+        // The meta is enough to have reproducible unique id for the branch
+        uniqueness: "",
+    };
+}
+/**
+ * Given a coValue, a branch name and an owner id, returns the id for the branch
+ */
+export function getBranchId(coValue, name, ownerId) {
+    if (!coValue.verified) {
+        throw new Error("CoValueCore: getBranchId called on coValue without verified state");
+    }
+    const header = getBranchHeader({
+        type: coValue.verified.header.type,
+        branchName: name,
+        ownerId,
+        sourceId: coValue.id,
+    });
+    return idforHeader(header, coValue.node.crypto);
+}
+/**
+ * Given a coValue, a branch name and an owner id, creates a new branch CoValue
+ */
+export function createBranch(coValue, name, ownerId) {
+    if (!coValue.verified) {
+        throw new Error("CoValueCore: createBranch called on coValue without verified state");
+    }
+    const header = getBranchHeader({
+        type: coValue.verified.header.type,
+        branchName: name,
+        ownerId,
+        sourceId: coValue.id,
+    });
+    const value = coValue.node.createCoValue(header);
+    // Create a branch commit to identify the starting point of the branch
+    value.makeTransaction([], "private", {
+        branch: coValue.knownState().sessions,
+    });
+    return value;
+}
+/**
+ * Given a branch coValue, returns the source coValue if available
+ */
+export function getBranchSource(coValue) {
+    if (!coValue.verified) {
+        return undefined;
+    }
+    const sourceId = coValue.verified.header.meta?.source;
+    if (!sourceId) {
+        return undefined;
+    }
+    const source = coValue.node.getCoValue(sourceId);
+    if (!source.isAvailable()) {
+        return undefined;
+    }
+    return source;
+}
+/**
+ * Given a branch coValue, merges the branch into the source coValue
+ */
+export function mergeBranch(branch) {
+    if (!branch.verified) {
+        throw new Error("CoValueCore: mergeBranch called on coValue without verified state");
+    }
+    const sourceId = branch.verified.header.meta?.source;
+    if (!sourceId) {
+        throw new Error("CoValueCore: mergeBranch called on a non-branch coValue");
+    }
+    const target = getBranchSource(branch);
+    if (!target) {
+        throw new Error("CoValueCore: unable to find source branch");
+    }
+    // Look for previous merge commits, to see which transactions needs to be merged
+    // Done mostly for performance reasons, as we could merge all the transactions every time and nothing would change
+    const mergedTransactions = target.mergeCommits.reduce((acc, { commit }) => {
+        if (commit.id !== branch.id) {
+            return acc;
+        }
+        for (const [sessionID, count] of Object.entries(commit.merge)) {
+            acc[sessionID] = Math.max(acc[sessionID] ?? 0, count);
+        }
+        return acc;
+    }, {});
+    // Get the valid transactions from the branch, skipping the branch source and the previously merged transactions
+    const branchValidTransactions = branch
+        .getValidTransactions({
+        from: mergedTransactions,
+        ignorePrivateTransactions: false,
+        skipBranchSource: true,
+    })
+        .filter((tx) => tx.changes.length > 0);
+    // If there are no valid transactions to merge, we don't want to create a merge commit
+    if (branchValidTransactions.length === 0) {
+        return target;
+    }
+    // Create a merge commit to identify the merge point
+    target.makeTransaction([], "private", {
+        merge: { ...branch.knownState().sessions },
+        id: branch.id,
+        count: branchValidTransactions.length,
+    });
+    for (const { tx, changes } of branchValidTransactions) {
+        target.makeTransaction(changes, tx.privacy);
+    }
+    return target;
+}
+//# sourceMappingURL=branching.js.map

package/dist/coValueCore/branching.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"branching.js","sourceRoot":"","sources":["../../src/coValueCore/branching.ts"],"names":[],"mappings":"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"}

package/dist/coValueCore/coValueCore.d.ts

@@ -4,17 +4,32 @@ import type { RawCoValue } from "../coValue.js";
 import type { ControlledAccountOrAgent } from "../coValues/account.js";
 import type { RawGroup } from "../coValues/group.js";
 import { CryptoProvider, Hash, KeyID, KeySecret, Signature, SignerID } from "../crypto/crypto.js";
-import { RawCoID, SessionID, TransactionID } from "../ids.js";
+import { AgentID, RawCoID, SessionID, TransactionID } from "../ids.js";
 import { JsonObject, JsonValue } from "../jsonValue.js";
 import { LocalNode, ResolveAccountAgentError } from "../localNode.js";
 import { CoValueKnownState, PeerID } from "../sync.js";
 import { CoValueHeader, Transaction, VerifiedState } from "./verifiedState.js";
+import { MergeCommit } from "./branching.js";
+import { type RawAccountID } from "../coValues/account.js";
 export declare function idforHeader(header: CoValueHeader, crypto: CryptoProvider): RawCoID;
+export type VerifiedTransaction = {
+    author: RawAccountID | AgentID;
+    txID: TransactionID;
+    tx: Transaction;
+    madeAt: number;
+    isValidated: boolean;
+    changes: JsonValue[] | undefined;
+    meta: JsonObject | undefined;
+    isValid: boolean;
+    hasInvalidChanges: boolean;
+    hasInvalidMeta: boolean;
+    hasMetaBeenParsed: boolean;
+};
 export type DecryptedTransaction = {
     txID: TransactionID;
     changes: JsonValue[];
     madeAt: number;
-    trusting?: boolean;
+    tx: Transaction;
 };
 export type AvailableCoValueCore = CoValueCore & {
     verified: VerifiedState;
@@ -39,7 +54,6 @@ export declare class CoValueCore {
     private readonly peers;
     private _cachedContent?;
     readonly listeners: Set<(core: CoValueCore, unsub: () => void) => void>;
-    private readonly _decryptionCache;
     private _cachedDependentOn?;
     private counter;
     private constructor();
@@ -90,13 +104,65 @@ export declare class CoValueCore {
     getCurrentContent(options?: {
         ignorePrivateTransactions: true;
     }): RawCoValue;
+    branchStart: {
+        branch: CoValueKnownState["sessions"];
+        madeAt: number;
+    } | undefined;
+    mergeCommits: {
+        commit: MergeCommit;
+        madeAt: number;
+    }[];
+    resetParsedTransactions(): void;
+    verifiedTransactions: VerifiedTransaction[];
+    private verifiedTransactionsKnownSessions;
+    /**
+     * Loads the new transaction from the SessionMap into verifiedTransactions as a VerifiedTransaction.
+     *
+     * If the transaction is already loaded from the SessionMap in the past, it will not be loaded again.
+     *
+     * Used to have a fast way to iterate over the CoValue transactions, and track their validation/decoding state.
+     *
+     * @param preload - Optional preload object containing the transaction, changes, and meta.
+     * If provided, the transaction will be preloaded with the given changes and meta.
+     *
+     * @internal
+     * */
+    loadVerifiedTransactionsFromLogs(preload?: {
+        transaction: Transaction;
+        changes: JsonValue[];
+        meta: JsonObject | undefined;
+    }): void;
+    /**
+     * Iterates over the verifiedTransactions and marks them as valid or invalid, based on the group membership of the authors of the transactions  .
+     */
+    private determineValidTransactions;
+    /**
+     * Parses the meta information of a transaction, and set the branchStart and mergeCommits.
+     */
+    private parseMetaInformation;
+    /**
+     * Loads the new transactions from SessionMap and:
+     * - Validates each transaction based on the group membership of the authors
+     * - Decodes the changes & meta for each transaction
+     * - Parses the meta information of the transaction
+     */
+    private parseNewTransactions;
+    /**
+     * Returns the valid transactions matching the criteria specified in the options
+     */
     getValidTransactions(options?: {
         ignorePrivateTransactions: boolean;
-        knownTransactions?: CoValueKnownState["sessions"];
+        from?: CoValueKnownState["sessions"];
+        to?: CoValueKnownState["sessions"];
+        knownTransactions?: Set<Transaction>;
+        skipBranchSource?: boolean;
     }): DecryptedTransaction[];
+    createBranch(name: string, ownerId: RawCoID): CoValueCore;
+    mergeBranch(): CoValueCore;
+    getBranchId(name: string, ownerId: RawCoID): `co_z${string}`;
     getValidSortedTransactions(options?: {
         ignorePrivateTransactions: boolean;
-        knownTransactions: CoValueKnownState["sessions"];
+        knownTransactions?: Set<Transaction>;
     }): DecryptedTransaction[];
     compareTransactions(a: Pick<DecryptedTransaction, "madeAt" | "txID">, b: Pick<DecryptedTransaction, "madeAt" | "txID">): number;
     getCurrentReadKey(): {

package/dist/coValueCore/coValueCore.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"coValueCore.d.ts","sourceRoot":"","sources":["../../src/coValueCore/coValueCore.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"coValueCore.d.ts","sourceRoot":"","sources":["../../src/coValueCore/coValueCore.ts"],"names":[],"mappings":"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"}

package/dist/coValueCore/coValueCore.js

@@ -2,7 +2,6 @@ import { ValueType, metrics } from "@opentelemetry/api";
 import { err, ok } from "neverthrow";
 import { CO_VALUE_LOADING_CONFIG } from "../config.js";
 import { coreToCoValue } from "../coreToCoValue.js";
-import { parseJSON } from "../jsonStringify.js";
 import { logger } from "../logger.js";
 import { determineValidTransactions } from "../permissions.js";
 import { emptyKnownState } from "../sync.js";
@@ -11,6 +10,8 @@ import { expectGroup } from "../typeUtils/expectGroup.js";
 import { getDependedOnCoValuesFromRawData } from "./utils.js";
 import { VerifiedState } from "./verifiedState.js";
 import { SessionMap } from "./SessionMap.js";
+import { createBranch, getBranchId, getBranchSource, mergeBranch, } from "./branching.js";
+import { decodeTransactionChangesAndMeta } from "./decodeTransactionChangesAndMeta.js";
 export function idforHeader(header, crypto) {
     const hash = crypto.shortHash(header);
     return `co_z${hash.slice("shortHash_z".length)}`;
@@ -33,9 +34,12 @@ export class CoValueCore {
     constructor(init, node) {
         this.peers = new Map();
         this.listeners = new Set();
-        this._decryptionCache = {};
         this.missingDependencies = new Set();
         this.deferredUpdates = 0;
+        // The list of merge commits that have been made
+        this.mergeCommits = [];
+        this.verifiedTransactions = [];
+        this.verifiedTransactionsKnownSessions = {};
         this.readKeyCache = new Map();
         this.crypto = node.crypto;
         if ("header" in init) {
@@ -220,12 +224,12 @@ export class CoValueCore {
             throw new Error("CoValueCore: internalShamefullyCloneVerifiedStateFrom called on coValue with verified sessions present!");
         }
         this._verified = state.clone();
-        this._cachedContent = undefined;
-        this._cachedDependentOn = undefined;
+        this.internalShamefullyResetCachedContent();
     }
     internalShamefullyResetCachedContent() {
         this._cachedContent = undefined;
         this._cachedDependentOn = undefined;
+        this.resetParsedTransactions();
     }
     subscribeToGroupInvalidation() {
         if (!this.verified) {
@@ -240,7 +244,8 @@ export class CoValueCore {
             const entry = this.node.getCoValue(groupId);
             if (entry.isAvailable()) {
                 this.groupInvalidationSubscription = entry.subscribe((_groupUpdate) => {
-                    this._cachedContent = undefined;
+                    // When the group is updated, we need to reset the cached content because the transactions validity might have changed
+                    this.internalShamefullyResetCachedContent();
                     this.notifyUpdate("immediate");
                 }, false);
             }
@@ -395,18 +400,14 @@ export class CoValueCore {
                 throw new Error("Can't make transaction without read key secret");
             }
             result = this.verified.makeNewPrivateTransaction(sessionID, signerAgent, changes, keyID, keySecret, meta);
-            if (result.transaction.privacy === "private") {
-                this._decryptionCache[result.transaction.encryptedChanges] = changes;
-                if (result.transaction.meta) {
-                    this._decryptionCache[result.transaction.meta] = meta;
-                }
-            }
         }
         else {
             result = this.verified.makeNewTrustingTransaction(sessionID, signerAgent, changes, meta);
         }
         const { transaction, signature } = result;
         this.node.syncManager.recordTransactionsSize([transaction], "local");
+        // We pre-populate the parsed transactions and meta for the new transaction, to skip the parsing step later
+        this.loadVerifiedTransactionsFromLogs({ transaction, changes, meta });
         const session = this.verified.sessions.get(sessionID);
         const txIdx = session ? session.transactions.length - 1 : 0;
         this.updateContentAndNotifyUpdate("immediate");
@@ -427,57 +428,162 @@ export class CoValueCore {
         }
         return newContent;
     }
+    // Reset the parsed transactions and branches, to validate them again from scratch when the group is updated
+    resetParsedTransactions() {
+        this.branchStart = undefined;
+        this.mergeCommits = [];
+        for (const transaction of this.verifiedTransactions) {
+            transaction.isValidated = false;
+            transaction.hasMetaBeenParsed = false;
+        }
+    }
+    /**
+     * Loads the new transaction from the SessionMap into verifiedTransactions as a VerifiedTransaction.
+     *
+     * If the transaction is already loaded from the SessionMap in the past, it will not be loaded again.
+     *
+     * Used to have a fast way to iterate over the CoValue transactions, and track their validation/decoding state.
+     *
+     * @param preload - Optional preload object containing the transaction, changes, and meta.
+     * If provided, the transaction will be preloaded with the given changes and meta.
+     *
+     * @internal
+     * */
+    loadVerifiedTransactionsFromLogs(preload) {
+        if (!this.verified) {
+            return;
+        }
+        for (const [sessionID, sessionLog] of this.verified.sessions.entries()) {
+            const count = this.verifiedTransactionsKnownSessions[sessionID] ?? 0;
+            sessionLog.transactions.forEach((tx, txIndex) => {
+                if (txIndex < count) {
+                    return;
+                }
+                this.verifiedTransactions.push({
+                    author: accountOrAgentIDfromSessionID(sessionID),
+                    txID: {
+                        sessionID,
+                        txIndex,
+                    },
+                    madeAt: tx.madeAt,
+                    isValidated: false,
+                    isValid: false,
+                    changes: tx === preload?.transaction ? preload.changes : undefined,
+                    meta: tx === preload?.transaction ? preload.meta : undefined,
+                    hasInvalidChanges: false,
+                    hasInvalidMeta: false,
+                    hasMetaBeenParsed: false,
+                    tx,
+                });
+            });
+            this.verifiedTransactionsKnownSessions[sessionID] =
+                sessionLog.transactions.length;
+        }
+    }
+    /**
+     * Iterates over the verifiedTransactions and marks them as valid or invalid, based on the group membership of the authors of the transactions  .
+     */
+    determineValidTransactions() {
+        determineValidTransactions(this);
+    }
+    /**
+     * Parses the meta information of a transaction, and set the branchStart and mergeCommits.
+     */
+    parseMetaInformation(transaction) {
+        if (!transaction.meta ||
+            !transaction.isValid ||
+            transaction.hasMetaBeenParsed) {
+            return;
+        }
+        transaction.hasMetaBeenParsed = true;
+        if (transaction.meta?.["branch"] &&
+            (!this.branchStart || transaction.madeAt < this.branchStart.madeAt)) {
+            this.branchStart = {
+                branch: transaction.meta.branch,
+                madeAt: transaction.madeAt,
+            };
+        }
+        if (transaction.meta?.["merge"]) {
+            const mergeCommit = transaction.meta;
+            this.mergeCommits.push({
+                commit: mergeCommit,
+                madeAt: transaction.madeAt,
+            });
+        }
+    }
+    /**
+     * Loads the new transactions from SessionMap and:
+     * - Validates each transaction based on the group membership of the authors
+     * - Decodes the changes & meta for each transaction
+     * - Parses the meta information of the transaction
+     */
+    parseNewTransactions(ignorePrivateTransactions) {
+        if (!this.isAvailable()) {
+            return;
+        }
+        this.loadVerifiedTransactionsFromLogs();
+        this.determineValidTransactions();
+        for (const transaction of this.verifiedTransactions) {
+            decodeTransactionChangesAndMeta(this, transaction, ignorePrivateTransactions);
+            this.parseMetaInformation(transaction);
+        }
+    }
+    /**
+     * Returns the valid transactions matching the criteria specified in the options
+     */
     getValidTransactions(options) {
         if (!this.verified) {
-            throw new Error("CoValueCore: getValidTransactions called on coValue without verified state");
+            return [];
         }
-        const validTransactions = determineValidTransactions(this, options?.knownTransactions);
-        const allTransactions = [];
-        for (const { txID, tx } of validTransactions) {
-            if (options?.knownTransactions?.[txID.sessionID] >= txID.txIndex) {
+        this.parseNewTransactions(options?.ignorePrivateTransactions ?? false);
+        const matchingTransactions = [];
+        for (const transaction of this.verifiedTransactions) {
+            if (!isValidTransactionWithChanges(transaction)) {
                 continue;
             }
-            let changes;
-            if (tx.privacy === "private") {
-                if (options?.ignorePrivateTransactions) {
-                    continue;
-                }
-                const readKey = this.getReadKey(tx.keyUsed);
-                if (!readKey) {
-                    continue;
-                }
-                let decryptedChanges = this._decryptionCache[tx.encryptedChanges];
-                if (!decryptedChanges) {
-                    decryptedChanges = this.verified.decryptTransaction(txID.sessionID, txID.txIndex, readKey);
-                    this._decryptionCache[tx.encryptedChanges] = decryptedChanges;
-                }
-                if (!decryptedChanges) {
-                    logger.error("Failed to decrypt transaction despite having key", {
-                        err: new Error("Failed to decrypt transaction despite having key"),
-                    });
-                    continue;
-                }
-                changes = decryptedChanges;
+            if (options?.knownTransactions?.has(transaction.tx)) {
+                continue;
             }
-            else {
-                try {
-                    changes = parseJSON(tx.changes);
-                }
-                catch (e) {
-                    logger.error("Failed to parse trusting transaction on " + this.id, {
-                        err: e,
-                    });
-                    continue;
-                }
+            options?.knownTransactions?.add(transaction.tx);
+            const { txID, madeAt } = transaction;
+            const from = options?.from?.[txID.sessionID] ?? -1;
+            const to = options?.to?.[txID.sessionID] ?? Infinity;
+            // The txIndex starts at 0 and from/to are referring to the count of transactions
+            if (from > txID.txIndex || to < txID.txIndex) {
+                continue;
             }
-            allTransactions.push({
-                txID,
-                madeAt: tx.madeAt,
-                changes,
-                trusting: tx.privacy === "trusting",
+            matchingTransactions.push(transaction);
+        }
+        const source = getBranchSource(this);
+        // If this is a branch, we load the valid transactions from the source
+        if (source && this.branchStart && !options?.skipBranchSource) {
+            const sourceTransactions = source.getValidTransactions({
+                to: this.branchStart.branch,
+                ignorePrivateTransactions: options?.ignorePrivateTransactions ?? false,
+                knownTransactions: options?.knownTransactions,
             });
+            for (const { changes, tx, madeAt, txID } of sourceTransactions) {
+                matchingTransactions.push({
+                    txID: {
+                        sessionID: `${txID.sessionID}_branch_${source.id}`,
+                        txIndex: txID.txIndex,
+                    },
+                    madeAt,
+                    changes,
+                    tx,
+                });
+            }
         }
-        return allTransactions;
+        return matchingTransactions;
+    }
+    createBranch(name, ownerId) {
+        return createBranch(this, name, ownerId);
+    }
+    mergeBranch() {
+        return mergeBranch(this);
+    }
+    getBranchId(name, ownerId) {
+        return getBranchId(this, name, ownerId);
     }
     getValidSortedTransactions(options) {
         const allTransactions = this.getValidTransactions(options);
@@ -653,4 +759,7 @@ export class CoValueCore {
         });
     }
 }
+function isValidTransactionWithChanges(transaction) {
+    return Boolean(transaction.isValid && transaction.changes);
+}
 //# sourceMappingURL=coValueCore.js.map