cojson 0.18.26 → 0.18.28

package/dist/coValueCore/coValueCore.d.ts

@@ -7,30 +7,39 @@ import { CryptoProvider, Hash, KeyID, KeySecret, Signature, SignerID } from "../
 import { AgentID, RawCoID, SessionID, TransactionID } from "../ids.js";
 import { JsonObject, JsonValue } from "../jsonValue.js";
 import { LocalNode, ResolveAccountAgentError } from "../localNode.js";
-import { CoValueKnownState, NewContentMessage, PeerID } from "../sync.js";
+import { NewContentMessage, PeerID } from "../sync.js";
 import { CoValueHeader, Transaction, VerifiedState } from "./verifiedState.js";
 import { MergeCommit, BranchPointerCommit, BranchStartCommit } from "./branching.js";
 import { type RawAccountID } from "../coValues/account.js";
+import { CoValueKnownState, KnownStateSessions } from "../knownState.js";
 export declare function idforHeader(header: CoValueHeader, crypto: CryptoProvider): RawCoID;
-export type VerifiedTransaction = {
+export declare class VerifiedTransaction {
     author: RawAccountID | AgentID;
-    txID: TransactionID;
+    currentTxID: TransactionID;
+    sourceTxID: TransactionID | undefined;
     tx: Transaction;
-    madeAt: number;
-    isValidated: boolean;
+    currentMadeAt: number;
+    sourceTxMadeAt: number | undefined;
     changes: JsonValue[] | undefined;
     meta: JsonObject | undefined;
     isValid: boolean;
-    hasInvalidChanges: boolean;
-    hasInvalidMeta: boolean;
+    isValidated: boolean;
+    isDecrypted: boolean;
     hasMetaBeenParsed: boolean;
     previous: VerifiedTransaction | undefined;
-};
-export type DecryptedTransaction = {
-    txID: TransactionID;
+    constructor(sessionID: SessionID, txIndex: number, tx: Transaction, branchId: RawCoID | undefined, parsingCache: {
+        changes: JsonValue[];
+        meta: JsonObject | undefined;
+    } | undefined, previous: VerifiedTransaction | undefined);
+    get txID(): TransactionID;
+    get madeAt(): number;
+    isValidTransactionWithChanges(): this is {
+        changes: JsonValue[];
+        isValid: true;
+    };
+}
+export type DecryptedTransaction = Omit<VerifiedTransaction, "changes"> & {
     changes: JsonValue[];
-    madeAt: number;
-    tx: Transaction;
 };
 export type AvailableCoValueCore = CoValueCore & {
     verified: VerifiedState;
@@ -53,27 +62,21 @@ export declare class CoValueCore {
      * In this case, it acts as a centralised entry to keep track of peer loading
      * state and to subscribe to its content when it does become available. */
     get verified(): VerifiedState | null;
-    private readonly peers;
+    private readonly loadingStatuses;
     private _cachedContent?;
     readonly listeners: Set<(core: CoValueCore, unsub: () => void) => void>;
     private counter;
-    private constructor();
-    static fromID(id: RawCoID, node: LocalNode): CoValueCore;
-    static fromHeader(header: CoValueHeader, node: LocalNode): AvailableCoValueCore;
+    constructor(id: RawCoID, node: LocalNode);
     get loadingState(): "unavailable" | "available" | "unknown" | "loading";
     hasMissingDependencies(): boolean;
     isAvailable(): this is AvailableCoValueCore;
     hasVerifiedContent(): this is AvailableCoValueCore;
     isErroredInPeer(peerId: PeerID): boolean;
+    waitFor(callback: (value: CoValueCore) => boolean): Promise<CoValueCore>;
     waitForAvailableOrUnavailable(): Promise<CoValueCore>;
     waitForAvailable(): Promise<CoValueCore>;
     waitForFullStreaming(): Promise<CoValueCore>;
-    getStateForPeer(peerId: PeerID): {
-        type: "unknown" | "pending" | "available" | "unavailable";
-    } | {
-        type: "errored";
-        error: TryAddTransactionsError;
-    } | undefined;
+    getLoadingStateForPeer(peerId: PeerID): "unavailable" | "available" | "unknown" | "pending" | "errored";
     private updateCounter;
     unmount(garbageCollectGroups?: boolean): boolean;
     markNotFoundInPeer(peerId: PeerID): void;
@@ -90,7 +93,7 @@ export declare class CoValueCore {
      */
     addNewContentToQueue(msg: NewContentMessage, from: PeerState | "storage" | "import"): void;
     addDependencyFromHeader(header: CoValueHeader): void;
-    provideHeader(header: CoValueHeader, streamingKnownState?: CoValueKnownState["sessions"], skipVerify?: boolean): boolean;
+    provideHeader(header: CoValueHeader, streamingKnownState?: KnownStateSessions, skipVerify?: boolean): boolean;
     markErrored(peerId: PeerID, error: TryAddTransactionsError): void;
     markPending(peerId: PeerID): void;
     groupInvalidationSubscription?: () => void;
@@ -172,13 +175,14 @@ export declare class CoValueCore {
         ignorePrivateTransactions: boolean;
         knownTransactions?: Set<Transaction>;
     }): DecryptedTransaction[];
-    compareTransactions(a: Pick<DecryptedTransaction, "madeAt" | "txID">, b: Pick<DecryptedTransaction, "madeAt" | "txID">): number;
+    compareTransactions(a: Pick<VerifiedTransaction, "madeAt" | "txID">, b: Pick<VerifiedTransaction, "madeAt" | "txID">): number;
     getCurrentReadKey(): {
         secret: KeySecret | undefined;
         id: KeyID;
     };
     readKeyCache: Map<`key_z${string}`, `keySecret_z${string}`>;
     getReadKey(keyID: KeyID): KeySecret | undefined;
+    safeGetGroup(): RawGroup | undefined;
     getGroup(): RawGroup;
     getTx(txID: TransactionID): Transaction | undefined;
     getDependedOnCoValues(): Set<RawCoID>;
@@ -188,7 +192,7 @@ export declare class CoValueCore {
     load(peers: PeerState[]): void;
     loadFromStorage(done?: (found: boolean) => void): void;
     loadFromPeers(peers: PeerState[]): void;
-    internalLoadFromPeer(peer: PeerState): Promise<void> | undefined;
+    internalLoadFromPeer(peer: PeerState): void;
 }
 export type InvalidHashError = {
     type: "InvalidHash";

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

@@ -1 +1 @@
-{"version":3,"file":"coValueCore.d.ts","sourceRoot":"","sources":["../../src/coValueCore/coValueCore.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,MAAM,EAAW,MAAM,YAAY,CAAC;AAC7C,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,iBAAiB,CAAC;AACjD,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,eAAe,CAAC;AAChD,OAAO,KAAK,EAAE,wBAAwB,EAAE,MAAM,wBAAwB,CAAC;AACvE,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,sBAAsB,CAAC;AAIrD,OAAO,EACL,cAAc,EACd,IAAI,EACJ,KAAK,EACL,SAAS,EACT,SAAS,EACT,QAAQ,EACT,MAAM,qBAAqB,CAAC;AAC7B,OAAO,EAAE,OAAO,EAAE,OAAO,EAAE,SAAS,EAAE,aAAa,EAAE,MAAM,WAAW,CAAC;AACvE,OAAO,EAAE,UAAU,EAAE,SAAS,EAAE,MAAM,iBAAiB,CAAC;AACxD,OAAO,EAAE,SAAS,EAAE,wBAAwB,EAAE,MAAM,iBAAiB,CAAC;AAGtE,OAAO,EACL,iBAAiB,EACjB,iBAAiB,EACjB,MAAM,EAEP,MAAM,YAAY,CAAC;AAQpB,OAAO,EAAE,aAAa,EAAE,WAAW,EAAE,aAAa,EAAE,MAAM,oBAAoB,CAAC;AAE/E,OAAO,EACL,WAAW,EACX,mBAAmB,EAOnB,iBAAiB,EAClB,MAAM,gBAAgB,CAAC;AACxB,OAAO,EAAE,KAAK,YAAY,EAAE,MAAM,wBAAwB,CAAC;AAI3D,wBAAgB,WAAW,CACzB,MAAM,EAAE,aAAa,EACrB,MAAM,EAAE,cAAc,GACrB,OAAO,CAGT;AAED,MAAM,MAAM,mBAAmB,GAAG;IAEhC,MAAM,EAAE,YAAY,GAAG,OAAO,CAAC;IAE/B,IAAI,EAAE,aAAa,CAAC;IACpB,EAAE,EAAE,WAAW,CAAC;IAEhB,MAAM,EAAE,MAAM,CAAC;IAEf,WAAW,EAAE,OAAO,CAAC;IAErB,OAAO,EAAE,SAAS,EAAE,GAAG,SAAS,CAAC;IAEjC,IAAI,EAAE,UAAU,GAAG,SAAS,CAAC;IAG7B,OAAO,EAAE,OAAO,CAAC;IAGjB,iBAAiB,EAAE,OAAO,CAAC;IAE3B,cAAc,EAAE,OAAO,CAAC;IAGxB,iBAAiB,EAAE,OAAO,CAAC;IAG3B,QAAQ,EAAE,mBAAmB,GAAG,SAAS,CAAC;CAC3C,CAAC;AAEF,MAAM,MAAM,oBAAoB,GAAG;IACjC,IAAI,EAAE,aAAa,CAAC;IACpB,OAAO,EAAE,SAAS,EAAE,CAAC;IACrB,MAAM,EAAE,MAAM,CAAC;IACf,EAAE,EAAE,WAAW,CAAC;CACjB,CAAC;AAEF,MAAM,MAAM,oBAAoB,GAAG,WAAW,GAAG;IAAE,QAAQ,EAAE,aAAa,CAAA;CAAE,CAAC;AAE7E,qBAAa,WAAW;;IAEtB,QAAQ,CAAC,IAAI,EAAE,SAAS,CAAC;IACzB,OAAO,CAAC,QAAQ,CAAC,MAAM,CAAiB;IAGxC,EAAE,EAAE,OAAO,CAAC;IACZ,OAAO,CAAC,SAAS,CAAuB;IACxC;;;;;;;;;;8EAU0E;IAC1E,IAAI,QAAQ,yBAEX;IACD,OAAO,CAAC,QAAQ,CAAC,KAAK,CASlB;IAGJ,OAAO,CAAC,cAAc,CAAC,CAAa;IACpC,QAAQ,CAAC,SAAS,EAAE,GAAG,CAAC,CAAC,IAAI,EAAE,WAAW,EAAE,KAAK,EAAE,MAAM,IAAI,KAAK,IAAI,CAAC,CAC3D;IACZ,OAAO,CAAC,OAAO,CAAgB;IAE/B,OAAO;IAyBP,MAAM,CAAC,MAAM,CAAC,EAAE,EAAE,OAAO,EAAE,IAAI,EAAE,SAAS,GAAG,WAAW;IAIxD,MAAM,CAAC,UAAU,CACf,MAAM,EAAE,aAAa,EACrB,IAAI,EAAE,SAAS,GACd,oBAAoB;IAIvB,IAAI,YAAY,wDAgBf;IAED,sBAAsB;IAItB,WAAW,IAAI,IAAI,IAAI,oBAAoB;IAI3C,kBAAkB,IAAI,IAAI,IAAI,oBAAoB;IAIlD,eAAe,CAAC,MAAM,EAAE,MAAM;IAI9B,6BAA6B,IAAI,OAAO,CAAC,WAAW,CAAC;IAcrD,gBAAgB,IAAI,OAAO,CAAC,WAAW,CAAC;IAcxC,oBAAoB,IAAI,OAAO,CAAC,WAAW,CAAC;IAc5C,eAAe,CAAC,MAAM,EAAE,MAAM;cA9HlB,SAAS,GAAG,SAAS,GAAG,WAAW,GAAG,aAAa;;cAGnD,SAAS;eACR,uBAAuB;;IA8HpC,OAAO,CAAC,aAAa;IAWrB,OAAO,CAAC,oBAAoB,UAAQ;IAwBpC,kBAAkB,CAAC,MAAM,EAAE,MAAM;IAOjC,eAAe,CAAC,MAAM,EAAE,MAAM,EAAE,aAAa,EAAE,MAAM;IAMrD,mBAAmB,uBAAsB;IAEzC,2BAA2B,CAAC,UAAU,EAAE,WAAW;IA2BnD,uBAAuB,CAAC,UAAU,EAAE,OAAO;IAQ3C,eAAe,EAAE;QACf,GAAG,EAAE,iBAAiB,CAAC;QACvB,IAAI,EAAE,SAAS,GAAG,SAAS,GAAG,QAAQ,CAAC;KACxC,EAAE,CAAM;IACT;;OAEG;IACH,oBAAoB,CAClB,GAAG,EAAE,iBAAiB,EACtB,IAAI,EAAE,SAAS,GAAG,SAAS,GAAG,QAAQ;IAwBxC,uBAAuB,CAAC,MAAM,EAAE,aAAa;IAM7C,aAAa,CACX,MAAM,EAAE,aAAa,EACrB,mBAAmB,CAAC,EAAE,iBAAiB,CAAC,UAAU,CAAC,EACnD,UAAU,CAAC,EAAE,OAAO;IA4BtB,WAAW,CAAC,MAAM,EAAE,MAAM,EAAE,KAAK,EAAE,uBAAuB;IAO1D,WAAW,CAAC,MAAM,EAAE,MAAM;IAO1B,6BAA6B,CAAC,EAAE,MAAM,IAAI,CAAC;IAE3C,4BAA4B;IA8B5B,uCAAuC,CAAC,OAAO,EAAE,wBAAwB;IAMzE,uBAAuB,IAAI,iBAAiB;IAQ5C,UAAU,IAAI,iBAAiB;IAQ/B,IAAI,IAAI,IAAI,SAAS,CAEpB;IAED,iBAAiB,IAAI,aAAa;IAsBlC,iCAAiC,CAAC,UAAU,EAAE,iBAAiB;IAQ/D,kBAAkB,CAChB,SAAS,EAAE,SAAS,EACpB,eAAe,EAAE,WAAW,EAAE,EAC9B,YAAY,EAAE,SAAS,EACvB,UAAU,GAAE,OAAe,GAC1B,MAAM,CAAC,IAAI,EAAE,uBAAuB,CAAC;IAyCxC,OAAO,CAAC,sBAAsB;IAiB9B,OAAO,CAAC,oBAAoB;IAsB5B,iBAAiB;IAIjB,kBAAkB;IAKlB,OAAO,CAAC,YAAY;IAkBpB,SAAS,CACP,QAAQ,EAAE,CAAC,IAAI,EAAE,WAAW,EAAE,KAAK,EAAE,MAAM,IAAI,KAAK,IAAI,EACxD,eAAe,UAAO,GACrB,MAAM,IAAI;IAcb,eAAe,CACb,OAAO,EAAE,SAAS,EAAE,EACpB,OAAO,EAAE,SAAS,GAAG,UAAU,EAC/B,IAAI,CAAC,EAAE,UAAU,EACjB,MAAM,CAAC,EAAE,MAAM,GACd,OAAO;IA4EV,iCAAiC,CAAC,WAAW,EAAE,WAAW;IAU1D,iBAAiB,CAAC,OAAO,CAAC,EAAE;QAAE,yBAAyB,EAAE,IAAI,CAAA;KAAE,GAAG,UAAU;IAuB5E,WAAW,EAAE,iBAAiB,CAAC,MAAM,CAAC,GAAG,SAAS,CAAC;IAGnD,YAAY,EAAE,WAAW,EAAE,CAAM;IACjC,QAAQ,EAAE,mBAAmB,EAAE,CAAM;IACrC,gBAAgB,EAAE,MAAM,CAA2B;IACnD,cAAc,EAAE,MAAM,CAAK;IAG3B,uBAAuB;IAYvB,oBAAoB,EAAE,mBAAmB,EAAE,CAAM;IACjD,OAAO,CAAC,iCAAiC,CAAqC;IAE9E,OAAO,CAAC,kCAAkC,CAGnC;IAEP,OAAO,CAAC,YAAY,CAGhB;IAEJ;;;;;;;;SAQK;IACL,gCAAgC;IAqEhC;;OAEG;IACH,OAAO,CAAC,0BAA0B;IAIlC;;OAEG;IACH,OAAO,CAAC,oBAAoB;IAgE5B;;;;;OAKG;IACH,OAAO,CAAC,oBAAoB;IAkB5B;;OAEG;IACH,oBAAoB,CAAC,OAAO,CAAC,EAAE;QAC7B,yBAAyB,EAAE,OAAO,CAAC;QAEnC,IAAI,CAAC,EAAE,iBAAiB,CAAC,UAAU,CAAC,CAAC;QACrC,EAAE,CAAC,EAAE,iBAAiB,CAAC,UAAU,CAAC,CAAC;QAGnC,iBAAiB,CAAC,EAAE,GAAG,CAAC,WAAW,CAAC,CAAC;QAGrC,gBAAgB,CAAC,EAAE,OAAO,CAAC;KAC5B,GAAG,oBAAoB,EAAE;IAqD1B,YAAY,EAAE,GAAG,CAAC,OAAO,CAAC,CAAa;IACvC,OAAO,CAAC,aAAa;IAyBrB,YAAY,CAAC,IAAI,EAAE,MAAM,EAAE,OAAO,CAAC,EAAE,OAAO;IAI5C,WAAW;IAIX,SAAS,CAAC,IAAI,EAAE,MAAM,EAAE,OAAO,CAAC,EAAE,OAAO;IAIzC,oBAAoB;IAIpB,wBAAwB;IAIxB,UAAU;IAIV,SAAS,CAAC,IAAI,EAAE,MAAM,EAAE,OAAO,CAAC,EAAE,OAAO;IAyBzC,eAAe;IAIf,0BAA0B,CAAC,OAAO,CAAC,EAAE;QACnC,yBAAyB,EAAE,OAAO,CAAC;QAGnC,iBAAiB,CAAC,EAAE,GAAG,CAAC,WAAW,CAAC,CAAC;KACtC,GAAG,oBAAoB,EAAE;IAQ1B,mBAAmB,CACjB,CAAC,EAAE,IAAI,CAAC,oBAAoB,EAAE,QAAQ,GAAG,MAAM,CAAC,EAChD,CAAC,EAAE,IAAI,CAAC,oBAAoB,EAAE,QAAQ,GAAG,MAAM,CAAC;IAalD,iBAAiB,IAAI;QACnB,MAAM,EAAE,SAAS,GAAG,SAAS,CAAC;QAC9B,EAAE,EAAE,KAAK,CAAC;KACX;IAoBD,YAAY,gDAA+B;IAC3C,UAAU,CAAC,KAAK,EAAE,KAAK,GAAG,SAAS,GAAG,SAAS;IAoC/C,QAAQ,IAAI,QAAQ;IAkBpB,KAAK,CAAC,IAAI,EAAE,aAAa,GAAG,WAAW,GAAG,SAAS;IAMnD,qBAAqB,IAAI,GAAG,CAAC,OAAO,CAAC;IAIrC,WAAW,CAAC,OAAO,CAAC,EAAE;QAAE,OAAO,CAAC,EAAE,MAAM,CAAA;KAAE;IAI1C,IAAI,CAAC,KAAK,EAAE,SAAS,EAAE;IASvB,eAAe,CAAC,IAAI,CAAC,EAAE,CAAC,KAAK,EAAE,OAAO,KAAK,IAAI;IA+B/C,aAAa,CAAC,KAAK,EAAE,SAAS,EAAE;IAehC,oBAAoB,CAAC,IAAI,EAAE,SAAS;CAqDrC;AAED,MAAM,MAAM,gBAAgB,GAAG;IAC7B,IAAI,EAAE,aAAa,CAAC;IACpB,EAAE,EAAE,OAAO,CAAC;IACZ,eAAe,EAAE,IAAI,CAAC;IACtB,oBAAoB,EAAE,IAAI,CAAC;CAC5B,CAAC;AAEF,MAAM,MAAM,qBAAqB,GAAG;IAClC,IAAI,EAAE,kBAAkB,CAAC;IACzB,EAAE,EAAE,OAAO,CAAC;IACZ,YAAY,EAAE,SAAS,CAAC;IACxB,SAAS,EAAE,SAAS,CAAC;IACrB,QAAQ,EAAE,QAAQ,GAAG,SAAS,CAAC;CAChC,CAAC;AAEF,MAAM,MAAM,+CAA+C,GAAG;IAC5D,IAAI,EAAE,4CAA4C,CAAC;IACnD,EAAE,EAAE,OAAO,CAAC;CACb,CAAC;AAEF,MAAM,MAAM,0CAA0C,GAAG;IACvD,IAAI,EAAE,uCAAuC,CAAC;IAC9C,EAAE,EAAE,OAAO,CAAC;IACZ,SAAS,EAAE,SAAS,CAAC;CACtB,CAAC;AAEF,MAAM,MAAM,uBAAuB,GAC/B,+CAA+C,GAC/C,0CAA0C,GAC1C,wBAAwB,GACxB,gBAAgB,GAChB,qBAAqB,CAAC"}
+{"version":3,"file":"coValueCore.d.ts","sourceRoot":"","sources":["../../src/coValueCore/coValueCore.ts"],"names":[],"mappings":"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"}

package/dist/coValueCore/coValueCore.js

@@ -17,19 +17,75 @@ import { validateTxSizeLimitInBytes } from "../coValueContentMessage.js";
 import { coreToCoValue } from "../coreToCoValue.js";
 import { logger } from "../logger.js";
 import { determineValidTransactions } from "../permissions.js";
-import { emptyKnownState, } from "../sync.js";
 import { accountOrAgentIDfromSessionID } from "../typeUtils/accountOrAgentIDfromSessionID.js";
 import { expectGroup } from "../typeUtils/expectGroup.js";
 import { getDependenciesFromContentMessage, getDependenciesFromGroupRawTransactions, getDependenciesFromHeader, } from "./utils.js";
 import { VerifiedState } from "./verifiedState.js";
 import { SessionMap } from "./SessionMap.js";
 import { createBranch, getBranchId, getBranchOwnerId, getBranchSource, mergeBranch, } from "./branching.js";
-import { decodeTransactionChangesAndMeta } from "./decodeTransactionChangesAndMeta.js";
-import { combineKnownStateSessions } from "../knownState.js";
+import { decryptTransactionChangesAndMeta } from "./decryptTransactionChangesAndMeta.js";
+import { combineKnownStateSessions, emptyKnownState, } from "../knownState.js";
+import { safeParseJSON } from "../jsonStringify.js";
 export function idforHeader(header, crypto) {
     const hash = crypto.shortHash(header);
     return `co_z${hash.slice("shortHash_z".length)}`;
 }
+export class VerifiedTransaction {
+    constructor(sessionID, txIndex, tx, branchId, parsingCache, previous) {
+        // Whether the transaction is valid, as per membership rules
+        this.isValid = false;
+        // Whether the transaction has been validated, used to track if determinedValidTransactions needs to check this
+        this.isValidated = false;
+        // True if the transaction has been decrypted
+        this.isDecrypted = false;
+        // True if the meta information has been parsed and loaded in the CoValueCore
+        this.hasMetaBeenParsed = false;
+        this.author = accountOrAgentIDfromSessionID(sessionID);
+        const txID = branchId
+            ? {
+                sessionID,
+                txIndex,
+                branch: branchId,
+            }
+            : {
+                sessionID,
+                txIndex,
+            };
+        this.currentTxID = txID;
+        this.sourceTxID = undefined;
+        this.tx = tx;
+        this.currentMadeAt = tx.madeAt;
+        this.sourceTxMadeAt = undefined;
+        this.isValidated = false;
+        this.previous = previous;
+        if (parsingCache) {
+            this.changes = parsingCache.changes;
+            this.meta = parsingCache.meta;
+        }
+        else {
+            // Decoding the trusting transactions here because they might be useful in the permissions checks
+            if (this.tx.privacy === "trusting") {
+                this.changes = safeParseJSON(this.tx.changes);
+                if (this.tx.meta) {
+                    this.meta = safeParseJSON(this.tx.meta);
+                }
+            }
+        }
+    }
+    // The TxID that refers to the current position in the session map
+    // If this is a merged transaction, the txID is the TxID of the merged transaction
+    get txID() {
+        return this.sourceTxID ?? this.currentTxID;
+    }
+    // The madeAt that refers to the time when the transaction was made
+    // If this is a merged transaction, the madeAt is the time when the transaction has been made in the branch
+    get madeAt() {
+        return this.sourceTxMadeAt ?? this.currentMadeAt;
+    }
+    isValidTransactionWithChanges() {
+        return Boolean(this.isValid && this.changes);
+    }
+}
 export class CoValueCore {
     /** Holds the fundamental syncable content of a CoValue,
      * consisting of the header (verified by hash -> RawCoID)
@@ -45,8 +101,8 @@ export class CoValueCore {
     get verified() {
         return this._verified;
     }
-    constructor(init, node) {
-        this.peers = new Map();
+    constructor(id, node) {
+        this.loadingStatuses = new Map();
         this.listeners = new Set();
         this.missingDependencies = new Set();
         this.newContentQueue = [];
@@ -65,14 +121,8 @@ export class CoValueCore {
         this.dependencies = new Set();
         this.readKeyCache = new Map();
         this.crypto = node.crypto;
-        if ("header" in init) {
-            this.id = idforHeader(init.header, node.crypto);
-            this._verified = new VerifiedState(this.id, node.crypto, init.header);
-        }
-        else {
-            this.id = init.id;
-            this._verified = null;
-        }
+        this.id = id;
+        this._verified = null;
         this.node = node;
         this.counter = metrics
             .getMeter("cojson")
@@ -83,20 +133,14 @@ export class CoValueCore {
         });
         this.updateCounter(null);
     }
-    static fromID(id, node) {
-        return new CoValueCore({ id }, node);
-    }
-    static fromHeader(header, node) {
-        return new CoValueCore({ header }, node);
-    }
     get loadingState() {
         if (this.verified) {
             return "available";
         }
-        else if (this.peers.size === 0) {
+        else if (this.loadingStatuses.size === 0) {
             return "unknown";
         }
-        for (const peer of this.peers.values()) {
+        for (const peer of this.loadingStatuses.values()) {
             if (peer.type === "pending") {
                 return "loading";
             }
@@ -116,46 +160,29 @@ export class CoValueCore {
         return !!this.verified;
     }
     isErroredInPeer(peerId) {
-        return this.peers.get(peerId)?.type === "errored";
+        return this.getLoadingStateForPeer(peerId) === "errored";
     }
-    waitForAvailableOrUnavailable() {
+    waitFor(callback) {
         return new Promise((resolve) => {
-            const listener = (core) => {
-                if (core.isAvailable() || core.loadingState === "unavailable") {
+            this.subscribe((core, unsubscribe) => {
+                if (callback(core)) {
+                    unsubscribe();
                     resolve(core);
-                    this.listeners.delete(listener);
                 }
-            };
-            this.listeners.add(listener);
-            listener(this);
+            }, true);
         });
     }
+    waitForAvailableOrUnavailable() {
+        return this.waitFor((core) => core.isAvailable() || core.loadingState === "unavailable");
+    }
     waitForAvailable() {
-        return new Promise((resolve) => {
-            const listener = (core) => {
-                if (core.isAvailable()) {
-                    resolve(core);
-                    this.listeners.delete(listener);
-                }
-            };
-            this.listeners.add(listener);
-            listener(this);
-        });
+        return this.waitFor((core) => core.isAvailable());
     }
     waitForFullStreaming() {
-        return new Promise((resolve) => {
-            const listener = (core) => {
-                if (core.isAvailable() && !core.verified.isStreaming()) {
-                    resolve(core);
-                    this.listeners.delete(listener);
-                }
-            };
-            this.listeners.add(listener);
-            listener(this);
-        });
+        return this.waitFor((core) => core.isAvailable() && !core.verified.isStreaming());
     }
-    getStateForPeer(peerId) {
-        return this.peers.get(peerId);
+    getLoadingStateForPeer(peerId) {
+        return this.loadingStatuses.get(peerId)?.type ?? "unknown";
     }
     updateCounter(previousState) {
         const newState = this.loadingState;
@@ -184,12 +211,12 @@ export class CoValueCore {
     }
     markNotFoundInPeer(peerId) {
         const previousState = this.loadingState;
-        this.peers.set(peerId, { type: "unavailable" });
+        this.loadingStatuses.set(peerId, { type: "unavailable" });
         this.updateCounter(previousState);
         this.scheduleNotifyUpdate();
     }
     markFoundInPeer(peerId, previousState) {
-        this.peers.set(peerId, { type: "available" });
+        this.loadingStatuses.set(peerId, { type: "available" });
         this.updateCounter(previousState);
         this.scheduleNotifyUpdate();
     }
@@ -255,18 +282,18 @@ export class CoValueCore {
         if (this._verified?.sessions.size) {
             throw new Error("CoValueCore: provideHeader called on coValue with verified sessions present!");
         }
-        this._verified = new VerifiedState(this.id, this.node.crypto, header, new SessionMap(this.id, this.node.crypto), streamingKnownState);
+        this._verified = new VerifiedState(this.id, this.node.crypto, header, new SessionMap(this.id, this.node.crypto, streamingKnownState));
         return true;
     }
     markErrored(peerId, error) {
         const previousState = this.loadingState;
-        this.peers.set(peerId, { type: "errored", error });
+        this.loadingStatuses.set(peerId, { type: "errored", error });
         this.updateCounter(previousState);
         this.scheduleNotifyUpdate();
     }
     markPending(peerId) {
         const previousState = this.loadingState;
-        this.peers.set(peerId, { type: "pending" });
+        this.loadingStatuses.set(peerId, { type: "pending" });
         this.updateCounter(previousState);
         this.scheduleNotifyUpdate();
     }
@@ -518,34 +545,11 @@ export class CoValueCore {
                 if (!tx) {
                     continue;
                 }
-                const txID = isBranched
-                    ? {
-                        sessionID,
-                        txIndex,
-                        branch: this.id,
-                    }
-                    : {
-                        sessionID,
-                        txIndex,
-                    };
                 const cache = this.parsingCache.get(tx);
                 if (cache) {
                     this.parsingCache.delete(tx);
                 }
-                const verifiedTransaction = {
-                    author: accountOrAgentIDfromSessionID(sessionID),
-                    txID,
-                    madeAt: tx.madeAt,
-                    isValidated: false,
-                    isValid: false,
-                    changes: cache?.changes,
-                    meta: cache?.meta,
-                    hasInvalidChanges: false,
-                    hasInvalidMeta: false,
-                    hasMetaBeenParsed: false,
-                    tx,
-                    previous: this.lastVerifiedTransactionBySessionID[sessionID],
-                };
+                const verifiedTransaction = new VerifiedTransaction(sessionID, txIndex, tx, isBranched ? this.id : undefined, cache, this.lastVerifiedTransactionBySessionID[sessionID]);
                 if (verifiedTransaction.madeAt > this.latestTxMadeAt) {
                     this.latestTxMadeAt = verifiedTransaction.madeAt;
                 }
@@ -603,19 +607,30 @@ export class CoValueCore {
         if ("mi" in transaction.meta) {
             const meta = transaction.meta;
             // Check if the transaction is a merge commit
-            const previousTransaction = transaction.previous?.txID;
-            const sessionID = meta.s ?? previousTransaction?.sessionID;
+            const previousTransaction = transaction.previous;
+            const sessionID = meta.s ?? previousTransaction?.txID.sessionID;
+            if (meta.t) {
+                transaction.sourceTxMadeAt = transaction.currentMadeAt - meta.t;
+            }
+            else if (previousTransaction) {
+                transaction.sourceTxMadeAt = previousTransaction.madeAt;
+            }
+            // Check against tampering of the meta.t value to write transaction after the access revocation
+            if (transaction.sourceTxMadeAt &&
+                transaction.sourceTxMadeAt > transaction.currentMadeAt) {
+                transaction.isValid = false;
+            }
             if (sessionID) {
-                transaction.txID = {
+                transaction.sourceTxID = {
                     sessionID,
                     txIndex: meta.mi,
-                    branch: meta.b ?? previousTransaction?.branch,
+                    branch: meta.b ?? previousTransaction?.txID.branch,
                 };
             }
             else {
                 logger.error("Merge commit without session ID", {
                     txID: transaction.txID,
-                    prev: previousTransaction ?? null,
+                    prevTxID: previousTransaction?.txID ?? null,
                 });
             }
         }
@@ -633,7 +648,9 @@ export class CoValueCore {
         this.loadVerifiedTransactionsFromLogs();
         this.determineValidTransactions();
         for (const transaction of this.verifiedTransactions) {
-            decodeTransactionChangesAndMeta(this, transaction, ignorePrivateTransactions);
+            if (!ignorePrivateTransactions) {
+                decryptTransactionChangesAndMeta(this, transaction);
+            }
             this.parseMetaInformation(transaction);
         }
     }
@@ -648,14 +665,15 @@ export class CoValueCore {
         const matchingTransactions = [];
         const source = getBranchSource(this);
         for (const transaction of this.verifiedTransactions) {
-            if (!isValidTransactionWithChanges(transaction)) {
+            if (!transaction.isValidTransactionWithChanges()) {
                 continue;
             }
             if (options?.knownTransactions?.has(transaction.tx)) {
                 continue;
             }
             options?.knownTransactions?.add(transaction.tx);
-            const { txID } = transaction;
+            // Using the currentTxID to filter the transactions, because the TxID is modified by the merge meta
+            const txID = transaction.currentTxID;
             const from = options?.from?.[txID.sessionID] ?? -1;
             // Load the to filter index. Sessions that are not in the to filter will be skipped
             const to = options?.to ? (options.to[txID.sessionID] ?? -1) : Infinity;
@@ -793,17 +811,24 @@ export class CoValueCore {
             throw new Error("Only groups or values owned by groups have read secrets");
         }
     }
-    getGroup() {
+    safeGetGroup() {
         if (!this.verified) {
             throw new Error("CoValueCore: getGroup called on coValue without verified state");
         }
         if (this.verified.header.ruleset.type !== "ownedByGroup") {
-            throw new Error("Only values owned by groups have groups");
+            return undefined;
         }
         return expectGroup(this.node
             .expectCoValueLoaded(this.verified.header.ruleset.group)
             .getCurrentContent());
     }
+    getGroup() {
+        const group = this.safeGetGroup();
+        if (!group) {
+            throw new Error("Only values owned by groups have groups");
+        }
+        return group;
+    }
     getTx(txID) {
         return this.verified?.sessions.get(txID.sessionID)?.transactions[txID.txIndex];
     }
@@ -827,9 +852,29 @@ export class CoValueCore {
             done?.(false);
             return;
         }
-        const currentState = this.peers.get("storage");
-        if (currentState && currentState.type !== "unknown") {
-            done?.(currentState.type === "available");
+        const currentState = this.getLoadingStateForPeer("storage");
+        if (currentState === "pending") {
+            if (!done) {
+                // We don't need to notify the result to anyone, so we can return early
+                return;
+            }
+            // Loading the value
+            this.subscribe((state, unsubscribe) => {
+                const updatedState = state.getLoadingStateForPeer("storage");
+                if (updatedState === "available" || state.isAvailable()) {
+                    unsubscribe();
+                    done(true);
+                }
+                else if (updatedState === "errored" ||
+                    updatedState === "unavailable") {
+                    unsubscribe();
+                    done(false);
+                }
+            });
+            return;
+        }
+        if (currentState !== "unknown") {
+            done?.(currentState === "available");
             return;
         }
         this.markPending("storage");
@@ -847,7 +892,7 @@ export class CoValueCore {
             return;
         }
         for (const peer of peers) {
-            const currentState = this.peers.get(peer.id)?.type ?? "unknown";
+            const currentState = this.getLoadingStateForPeer(peer.id);
             if (currentState === "unknown" || currentState === "unavailable") {
                 this.markPending(peer.id);
                 this.internalLoadFromPeer(peer);
@@ -870,39 +915,31 @@ export class CoValueCore {
             });
             peer.trackLoadRequestSent(this.id);
         }
-        return new Promise((resolve) => {
-            const markNotFound = () => {
-                if (this.peers.get(peer.id)?.type === "pending") {
-                    logger.warn("Timeout waiting for peer to load coValue", {
-                        id: this.id,
-                        peerID: peer.id,
-                    });
-                    this.markNotFoundInPeer(peer.id);
-                }
-            };
-            const timeout = setTimeout(markNotFound, CO_VALUE_LOADING_CONFIG.TIMEOUT);
-            const removeCloseListener = peer.persistent
-                ? undefined
-                : peer.addCloseListener(markNotFound);
-            const listener = (state) => {
-                const peerState = state.peers.get(peer.id);
-                if (state.isAvailable() || // might have become available from another peer e.g. through handleNewContent
-                    peerState?.type === "available" ||
-                    peerState?.type === "errored" ||
-                    peerState?.type === "unavailable") {
-                    this.listeners.delete(listener);
-                    removeCloseListener?.();
-                    clearTimeout(timeout);
-                    resolve();
-                }
-            };
-            this.listeners.add(listener);
-            listener(this);
-        });
+        const markNotFound = () => {
+            if (this.getLoadingStateForPeer(peer.id) === "pending") {
+                logger.warn("Timeout waiting for peer to load coValue", {
+                    id: this.id,
+                    peerID: peer.id,
+                });
+                this.markNotFoundInPeer(peer.id);
+            }
+        };
+        const timeout = setTimeout(markNotFound, CO_VALUE_LOADING_CONFIG.TIMEOUT);
+        const removeCloseListener = peer.persistent
+            ? undefined
+            : peer.addCloseListener(markNotFound);
+        this.subscribe((state, unsubscribe) => {
+            const peerState = state.getLoadingStateForPeer(peer.id);
+            if (state.isAvailable() || // might have become available from another peer e.g. through handleNewContent
+                peerState === "available" ||
+                peerState === "errored" ||
+                peerState === "unavailable") {
+                unsubscribe();
+                removeCloseListener?.();
+                clearTimeout(timeout);
+            }
+        }, true);
     }
 }
 _CoValueCore_isNotificationScheduled = new WeakMap(), _CoValueCore_batchedUpdates = new WeakMap(), _CoValueCore_isNotifyUpdatePaused = new WeakMap();
-function isValidTransactionWithChanges(transaction) {
-    return Boolean(transaction.isValid && transaction.changes);
-}
 //# sourceMappingURL=coValueCore.js.map