@xyo-network/event-kit-statement-graph 2.2.0 → 2.2.1

package/README.md

@@ -60,11 +60,20 @@ already resolved.
 Published Statement Graph `0.5.3` admits consensus-elevated, subject-bearing
 Claims and decodes Claim bodies from finalized block carriers while resolving
 claimed objects and acceptance attachments through the datalake. The Gate 2
-live rerun against that release remains the acceptance boundary.
-
-Statement Graph `0.5.x` uses fold version 4 and scan-checkpoint format 2. Event
-Kit's publisher-scoped outer checkpoint is format 3 and binds
-`indexedThrough` to the exact canonical XL1 root hash. Only the exact
+live rerun against that release remains historical acceptance evidence.
+
+The package depends on Statement Graph `~0.7.1` (peers `^0.7`), resolved to
+`0.7.1`. Finalized replay declares gate profile
+`{ rejectAmbiguousSchemaDeclarations: true, requireBodySchemaEquality: false, revision: 1 }`.
+A checkpoint saved before gate profiles resume without a rescan; the next
+committed range seals that profile. Instances that share a checkpoint store
+upgrade together and must not roll back past a profile-bearing checkpoint: an
+older release loads that checkpoint as corrupt, and recovery discards it and
+rebuilds from the floor.
+
+Statement Graph fold version 4 and scan-checkpoint format 2 remain the embedded
+scan contract. Event Kit's publisher-scoped outer checkpoint is format 3 and
+binds `indexedThrough` to the exact canonical XL1 root hash. Only the exact
 current checkpoint and ordered Event Kit schema policy are accepted. Missing,
 additional, reordered, or version-suffixed policy entries fail closed as
 invalid content; no alternative-policy reader or in-place migration exists.
@@ -158,7 +167,9 @@ Statement Graph owns Claim only: it provides structural
 `{source, subject, hashes}`, no `target`, and no revoke verb. The admission
 adapter requires Claim `subject` to equal the grant body's publisher. Event Kit
 negation is an ordinary revocation object under that same publisher subject,
-claimed by the authorized controller. See
+claimed by the authorized controller and recognized by the recomputed canonical
+hash, including when the body is missing or the declaration names another
+schema. See
 [D-003](../../docs/decisions/D-003-STATEMENT-GRAPH-V2-GRANTS.md).
 
 ## Evidence boundary
@@ -214,9 +225,10 @@ with `MemoryStatementDataLake`. It is superseded by the passing Statement Graph
   block after a required body is restored.
 
 `pnpm test:live` runs this handshake alongside the existing local-chain head,
-admission, and Statement Graph fold specs. All 14 tests pass against xyo-chain
-and `apiLocal` `5.3.0`, XL1 SDK/protocol `5.4.0`, and Statement Graph `0.5.0`:
-the chain validates elevated Claims and Statement Graph reads each Claim from
-its finalized block carrier. The REST service is a test-owned loopback fixture,
+admission, and Statement Graph fold specs. The historical Gate 2 run passed
+14 tests against xyo-chain and `apiLocal` `5.3.0`, XL1 SDK/protocol `5.4.0`,
+and Statement Graph `0.5.0`: the chain validates elevated Claims and Statement
+Graph reads each Claim from its finalized block carrier. The current pin is
+`0.7.1`. The REST service is a test-owned loopback fixture,
 not the hosted shared public datalake, so this is not public-stack, Sequence,
 Mainnet, Proxmox, multi-VM, or production qualification.

package/dist/neutral/finalizedReplayController.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"finalizedReplayController.d.ts","sourceRoot":"","sources":["../../src/finalizedReplayController.ts"],"names":[],"mappings":"AAQA,OAAO,KAAK,EAAE,oBAAoB,EAAE,MAAM,yCAAyC,CAAA;AAMnF,OAAO,KAAK,EACV,UAAU,EAEX,MAAM,sCAAsC,CAAA;AAQ7C,OAAO,KAAK,EAAE,4BAA4B,EAAE,MAAM,2BAA2B,CAAA;AAM7E,OAAO,KAAK,EACV,wBAAwB,EACxB,gCAAgC,EAChC,kBAAkB,EAGnB,MAAM,uBAAuB,CAAA;AAO9B,MAAM,WAAW,6BAA6B;IAC5C,yEAAyE;IACzE,IAAI,IAAI,OAAO,CAAC,OAAO,CAAC,CAAA;IACxB,oFAAoF;IACpF,IAAI,CAAC,UAAU,EAAE,wBAAwB,GAAG,OAAO,CAAC,IAAI,CAAC,CAAA;CAC1D;AAED,MAAM,WAAW,8BAA+B,SAAQ,gCAAgC;IACtF,QAAQ,CAAC,MAAM,EAAE,UAAU,CAAA;IAC3B,QAAQ,CAAC,KAAK,EAAE,4BAA4B,CAAA;IAC5C,0EAA0E;IAC1E,QAAQ,CAAC,mBAAmB,CAAC,EAAE,MAAM,CAAA;IACrC,QAAQ,CAAC,eAAe,EAAE,6BAA6B,CAAA;IACvD,kEAAkE;IAClE,QAAQ,CAAC,aAAa,CAAC,EAAE,MAAM,CAAA;CAChC;AAED,MAAM,WAAW,6BAA6B;IAC5C,QAAQ,CAAC,OAAO,CAAC,EAAE,kBAAkB,CAAA;IACrC,QAAQ,CAAC,aAAa,EAAE,MAAM,CAAA;IAC9B,QAAQ,CAAC,cAAc,EAAE,MAAM,GAAG,IAAI,CAAA;CACvC;AAED,MAAM,WAAW,6BAA6B;IAC5C,QAAQ,CAAC,KAAK,EAAE,MAAM,CAAA;IACtB,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAA;CACtB;AAED,MAAM,WAAW,kCAAkC;IACjD,+FAA+F;IAC/F,QAAQ,CAAC,SAAS,CAAC,EAAE,MAAM,CAAA;IAC3B,QAAQ,CAAC,MAAM,CAAC,EAAE,WAAW,CAAA;CAC9B;AAED,MAAM,WAAW,iCAAiC;IAChD,6EAA6E;IAC7E,MAAM,IAAI,QAAQ,CAAC,6BAA6B,CAAC,GAAG,IAAI,CAAA;IACxD,8FAA8F;IAC9F,IAAI,CAAC,IAAI,EAAE,MAAM,GAAG,QAAQ,CAAC,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC,GAAG,SAAS,CAAA;IACjE,QAAQ,IAAI,QAAQ,CAAC,wBAAwB,CAAC,CAAA;IAC9C,MAAM,IAAI,6BAA6B,CAAA;IACvC,yFAAyF;IACzF,IAAI,CAAC,OAAO,CAAC,EAAE,kCAAkC,GAAG,OAAO,CAAC,6BAA6B,CAAC,CAAA;IAC1F,sFAAsF;IACtF,MAAM,IAAI,oBAAoB,CAAA;CAC/B;AA+ZD,wBAAsB,uCAAuC,CAC3D,UAAU,EAAE,8BAA8B,GACzC,OAAO,CAAC,iCAAiC,CAAC,CAqC5C;AAED,uFAAuF;AACvF,wBAAgB,yCAAyC,CACvD,OAAO,CAAC,EAAE,OAAO,GAChB,6BAA6B,GAAG;IAAE,QAAQ,CAAC,KAAK,EAAE,SAAS,wBAAwB,EAAE,CAAA;CAAE,CAWzF"}
+{"version":3,"file":"finalizedReplayController.d.ts","sourceRoot":"","sources":["../../src/finalizedReplayController.ts"],"names":[],"mappings":"AASA,OAAO,KAAK,EAAE,oBAAoB,EAAE,MAAM,yCAAyC,CAAA;AAMnF,OAAO,KAAK,EACV,UAAU,EAEX,MAAM,sCAAsC,CAAA;AAQ7C,OAAO,KAAK,EAAE,4BAA4B,EAAE,MAAM,2BAA2B,CAAA;AAa7E,OAAO,KAAK,EACV,wBAAwB,EACxB,gCAAgC,EAChC,kBAAkB,EAGnB,MAAM,uBAAuB,CAAA;AAQ9B,MAAM,WAAW,6BAA6B;IAC5C,yEAAyE;IACzE,IAAI,IAAI,OAAO,CAAC,OAAO,CAAC,CAAA;IACxB,oFAAoF;IACpF,IAAI,CAAC,UAAU,EAAE,wBAAwB,GAAG,OAAO,CAAC,IAAI,CAAC,CAAA;CAC1D;AAED,MAAM,WAAW,8BAA+B,SAAQ,gCAAgC;IACtF,QAAQ,CAAC,MAAM,EAAE,UAAU,CAAA;IAC3B,QAAQ,CAAC,KAAK,EAAE,4BAA4B,CAAA;IAC5C,0EAA0E;IAC1E,QAAQ,CAAC,mBAAmB,CAAC,EAAE,MAAM,CAAA;IACrC,QAAQ,CAAC,eAAe,EAAE,6BAA6B,CAAA;IACvD,kEAAkE;IAClE,QAAQ,CAAC,aAAa,CAAC,EAAE,MAAM,CAAA;CAChC;AAED,MAAM,WAAW,6BAA6B;IAC5C,QAAQ,CAAC,OAAO,CAAC,EAAE,kBAAkB,CAAA;IACrC,QAAQ,CAAC,aAAa,EAAE,MAAM,CAAA;IAC9B,QAAQ,CAAC,cAAc,EAAE,MAAM,GAAG,IAAI,CAAA;CACvC;AAED,MAAM,WAAW,6BAA6B;IAC5C,QAAQ,CAAC,KAAK,EAAE,MAAM,CAAA;IACtB,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAA;CACtB;AAED,MAAM,WAAW,kCAAkC;IACjD,+FAA+F;IAC/F,QAAQ,CAAC,SAAS,CAAC,EAAE,MAAM,CAAA;IAC3B,QAAQ,CAAC,MAAM,CAAC,EAAE,WAAW,CAAA;CAC9B;AAED,MAAM,WAAW,iCAAiC;IAChD,6EAA6E;IAC7E,MAAM,IAAI,QAAQ,CAAC,6BAA6B,CAAC,GAAG,IAAI,CAAA;IACxD,8FAA8F;IAC9F,IAAI,CAAC,IAAI,EAAE,MAAM,GAAG,QAAQ,CAAC,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC,GAAG,SAAS,CAAA;IACjE,QAAQ,IAAI,QAAQ,CAAC,wBAAwB,CAAC,CAAA;IAC9C,MAAM,IAAI,6BAA6B,CAAA;IACvC,yFAAyF;IACzF,IAAI,CAAC,OAAO,CAAC,EAAE,kCAAkC,GAAG,OAAO,CAAC,6BAA6B,CAAC,CAAA;IAC1F,sFAAsF;IACtF,MAAM,IAAI,oBAAoB,CAAA;CAC/B;AAqaD,wBAAsB,uCAAuC,CAC3D,UAAU,EAAE,8BAA8B,GACzC,OAAO,CAAC,iCAAiC,CAAC,CAqC5C;AAED,uFAAuF;AACvF,wBAAgB,yCAAyC,CACvD,OAAO,CAAC,EAAE,OAAO,GAChB,6BAA6B,GAAG;IAAE,QAAQ,CAAC,KAAK,EAAE,SAAS,wBAAwB,EAAE,CAAA;CAAE,CAWzF"}

package/dist/neutral/handshakeCatalog.d.ts

@@ -1,4 +1,4 @@
-import type { PublisherEncryptionKeyLifecycle, PublisherServiceLifecycleRevision } from '@xyo-network/event-kit-protocol';
+import type { PublisherEncryptionKeyLifecycle, PublisherServiceLifecycleRevision, RecomputableRevocationKind } from '@xyo-network/event-kit-protocol';
 import type { PublisherEncryptionKey, PublisherService } from '@xyo-network/event-kit-schemas';
 import type { StatementGraphViewer } from '@xyo-network/xl1-statement-graph-engine';
 import type { AppliedEventRecord } from '@xyo-network/xl1-statement-graph-schemas';
@@ -29,12 +29,12 @@ export declare function parsedHandshakeObjects<T>(viewer: StatementGraphViewer,
 } | {
     readonly success: false;
 }): Promise<ClaimedHandshakeObject<T>[]>;
-export declare function handshakeRevocations(viewer: StatementGraphViewer, records: readonly AppliedEventRecord[], parse: (value: unknown) => {
-    readonly data: Record<string, string>;
-    readonly success: true;
-} | {
-    readonly success: false;
-}, field: string): Promise<{
+/**
+ * Revocations recognized by Claim membership of the recomputed canonical hash.
+ * Declared schema and body resolution are not consulted. `source` is the only
+ * party allowed to negate these targets.
+ */
+export declare function hashMatchedRevocations(viewer: StatementGraphViewer, source: string, subject: string, kind: RecomputableRevocationKind, targets: readonly string[]): Promise<{
     block: number;
     target: string;
 }[]>;

package/dist/neutral/handshakeCatalog.d.ts.map

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

package/dist/neutral/handshakeReadModel.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"handshakeReadModel.d.ts","sourceRoot":"","sources":["../../src/handshakeReadModel.ts"],"names":[],"mappings":"AAiDA,OAAO,KAAK,EAEV,0BAA0B,EAC1B,iCAAiC,EAWlC,MAAM,8BAA8B,CAAA;AAwZrC,wBAAgB,gCAAgC,CAC9C,OAAO,EAAE,iCAAiC,GACzC,0BAA0B,CA2D5B"}
+{"version":3,"file":"handshakeReadModel.d.ts","sourceRoot":"","sources":["../../src/handshakeReadModel.ts"],"names":[],"mappings":"AA2CA,OAAO,KAAK,EAEV,0BAA0B,EAC1B,iCAAiC,EAWlC,MAAM,8BAA8B,CAAA;AAyYrC,wBAAgB,gCAAgC,CAC9C,OAAO,EAAE,iCAAiC,GACzC,0BAA0B,CA2D5B"}

package/dist/neutral/index.mjs

@@ -223,7 +223,7 @@ import {
   ChainIdZod as ChainIdZod3,
   normalizeAddress as normalizeAddress3,
   NormalizedAddressZod as NormalizedAddressZod3,
-  WakeSubscriptionAcceptanceSchema as WakeSubscriptionAcceptanceSchema2,
+  WakeSubscriptionAcceptanceSchema as WakeSubscriptionAcceptanceSchema3,
   WakeSubscriptionAcceptanceZod
 } from "@xyo-network/event-kit-schemas";
 import { STATEMENT_FOLD_VERSION as STATEMENT_FOLD_VERSION2 } from "@xyo-network/xl1-statement-graph-schemas";
@@ -295,6 +295,74 @@ async function requireCurrentReplayChain(chain, finalizedHead, chainId) {
   }
 }
 
+// src/recomputableRevocation.ts
+import {
+  recomputableRevocationHash
+} from "@xyo-network/event-kit-protocol";
+import {
+  EncryptedWakeSubscriptionSchema as EncryptedWakeSubscriptionSchema2,
+  PublisherEncryptionKeySchema as PublisherEncryptionKeySchema2,
+  PublisherServiceSchema as PublisherServiceSchema2,
+  WakeGrantObjectSchema as WakeGrantObjectSchema2,
+  WakeSubscriptionAcceptanceSchema as WakeSubscriptionAcceptanceSchema2
+} from "@xyo-network/event-kit-schemas";
+var targetKindBySchema = {
+  [EncryptedWakeSubscriptionSchema2]: "subscription",
+  [PublisherEncryptionKeySchema2]: "key",
+  [PublisherServiceSchema2]: "service",
+  [WakeGrantObjectSchema2]: "grant",
+  [WakeSubscriptionAcceptanceSchema2]: "acceptance"
+};
+function knownRevocationTargets(records, bodyFor) {
+  const targets = /* @__PURE__ */ new Map();
+  for (const record of records) {
+    const body = bodyFor(record.objectHash);
+    if (body === void 0 || typeof body.schema !== "string" || body.schema !== record.objectSchema) continue;
+    const kind = targetKindBySchema[body.schema];
+    if (kind === void 0) continue;
+    const hashes = targets.get(kind) ?? /* @__PURE__ */ new Set();
+    hashes.add(record.objectHash);
+    targets.set(kind, hashes);
+  }
+  return targets;
+}
+function mergedRevocationTargets(prior, block) {
+  const merged = /* @__PURE__ */ new Map();
+  absorbRevocationTargets(merged, prior);
+  absorbRevocationTargets(merged, block);
+  return merged;
+}
+function absorbRevocationTargets(into, from) {
+  for (const [kind, hashes] of from) {
+    const existing = into.get(kind) ?? /* @__PURE__ */ new Set();
+    for (const hash of hashes) existing.add(hash);
+    into.set(kind, existing);
+  }
+}
+function objectHashesBlockingReplay(applied, bodyFor, allowedRevocations) {
+  const mismatched = [];
+  const missing = [];
+  const seen = /* @__PURE__ */ new Set();
+  for (const record of applied) {
+    if (seen.has(record.objectHash)) continue;
+    seen.add(record.objectHash);
+    if (allowedRevocations.has(record.objectHash)) continue;
+    const body = bodyFor(record.objectHash);
+    if (body === void 0) missing.push(record.objectHash);
+    else if (body.schema !== record.objectSchema) mismatched.push(record.objectHash);
+  }
+  return { mismatched, missing };
+}
+async function knownRevocationHashes(targets) {
+  const hashes = /* @__PURE__ */ new Set();
+  for (const [kind, objectHashes] of targets) {
+    for (const objectHash of objectHashes) {
+      hashes.add(await recomputableRevocationHash(kind, objectHash));
+    }
+  }
+  return hashes;
+}
+
 // src/replayCheckpoint.ts
 import { HashZod as HashZod3 } from "@ariestools/sdk";
 import {
@@ -306,14 +374,21 @@ import {
   AppliedEventRecordZod,
   BlockNumberZod,
   STATEMENT_FOLD_VERSION,
+  STRICT_GATE_REVISION,
   UnresolvedEventReferenceZod
 } from "@xyo-network/xl1-statement-graph-schemas";
 import {
   assembleCheckpointRecords,
+  gateProfileMismatch,
   StatementScanCheckpointZod
 } from "@xyo-network/xl1-statement-graph-sdk";
 import { z } from "zod";
 var EVENT_KIT_REPLAY_CHECKPOINT_VERSION = 3;
+var EVENT_KIT_REPLAY_GATE_PROFILE = Object.freeze({
+  rejectAmbiguousSchemaDeclarations: true,
+  requireBodySchemaEquality: false,
+  revision: STRICT_GATE_REVISION
+});
 var ResolvedReplayBodyZod = z.strictObject({
   body: z.record(z.string(), z.unknown()),
   hash: HashZod3
@@ -453,7 +528,7 @@ function bodySetIntegrityError(checkpoint) {
   }
   return void 0;
 }
-function appliedIntegrityError(checkpoint) {
+function appliedIntegrityError(checkpoint, allowedRevocations) {
   const { indexedThrough } = checkpoint;
   const bodyByHash = new Map(checkpoint.bodies.map((entry) => [entry.hash, entry]));
   const appliedIdentities = /* @__PURE__ */ new Set();
@@ -489,8 +564,10 @@ function appliedIntegrityError(checkpoint) {
     }
     eventLocations.set(eventKey3, location);
     const body = bodyByHash.get(event.objectHash)?.body;
-    if (body === void 0) return `applied object body ${event.objectHash} is missing`;
-    if (body.schema !== event.objectSchema) {
+    const recomputableRevocation = allowedRevocations.has(event.objectHash);
+    if (body === void 0) {
+      if (!recomputableRevocation) return `applied object body ${event.objectHash} is missing`;
+    } else if (body.schema !== event.objectSchema && !recomputableRevocation) {
       return `applied object ${event.objectHash} schema ${String(body.schema)} != ${event.objectSchema}`;
     }
   }
@@ -539,15 +616,16 @@ function scanIntegrityError(checkpoint) {
   if (!sameClaimRecords(actualRecords, expectedClaimRecords(checkpoint.applied))) {
     return "scan claim records differ from applied-event history";
   }
-  return scan.watermark !== void 0 && scan.watermark.block > indexedThrough ? `scan watermark block ${scan.watermark.block} exceeds indexedThrough ${indexedThrough}` : watermarkIntegrityError(checkpoint);
+  return scan.watermark !== void 0 && scan.watermark.block > indexedThrough ? `scan watermark block ${scan.watermark.block} exceeds indexedThrough ${indexedThrough}` : watermarkIntegrityError(checkpoint, assembled.records);
 }
-function watermarkIntegrityError(checkpoint) {
+function watermarkIntegrityError(checkpoint, records) {
   const scan = checkpoint.scan;
   if (scan === null) return void 0;
   const { watermark, watermarkGroupEventKeys } = scan;
   if (watermark === void 0) {
     if (checkpoint.applied.length > 0) return "scan watermark is missing for applied-event history";
-    return watermarkGroupEventKeys.length === 0 ? void 0 : "scan has group event keys without a watermark";
+    if (watermarkGroupEventKeys.length > 0) return "scan has group event keys without a watermark";
+    return records.length === 0 ? void 0 : "scan has claim records without a watermark";
   }
   if (watermark.block < checkpoint.floorBlock) {
     return `scan watermark block ${watermark.block} precedes floorBlock ${checkpoint.floorBlock}`;
@@ -579,8 +657,18 @@ function blockedIntegrityError(checkpoint) {
   }
   return blocked.unresolvedEvents.some((event) => event.block !== blocked.atBlock) ? "blocked unresolved event does not belong to blocked block" : void 0;
 }
-function checkpointIntegrityError(checkpoint) {
-  return progressIntegrityError(checkpoint) ?? bodySetIntegrityError(checkpoint) ?? appliedIntegrityError(checkpoint) ?? scanIntegrityError(checkpoint) ?? blockedIntegrityError(checkpoint);
+function checkpointIntegrityError(checkpoint, allowedRevocations) {
+  return progressIntegrityError(checkpoint) ?? bodySetIntegrityError(checkpoint) ?? appliedIntegrityError(checkpoint, allowedRevocations) ?? scanIntegrityError(checkpoint) ?? blockedIntegrityError(checkpoint);
+}
+async function allowedRevocationHashes(checkpoint) {
+  const bodies = new Map(checkpoint.bodies.map((entry) => [entry.hash, entry.body]));
+  return await knownRevocationHashes(knownRevocationTargets(
+    checkpoint.applied,
+    (hash) => bodies.get(hash)
+  ));
+}
+function gateProfileIdentityError(checkpoint) {
+  return checkpoint.scan === null ? void 0 : gateProfileMismatch(checkpoint.scan.contract.gateProfile, EVENT_KIT_REPLAY_GATE_PROFILE);
 }
 async function persistedBodyIntegrityError(checkpoint) {
   for (const entry of checkpoint.bodies) {
@@ -615,8 +703,10 @@ async function loadEventKitReplayCheckpoint(value, identity) {
   if (mismatch !== void 0) return { detail: mismatch, status: "identity-mismatch" };
   const bodyIntegrityError = await persistedBodyIntegrityError(checkpoint);
   if (bodyIntegrityError !== void 0) return { detail: bodyIntegrityError, status: "corrupt" };
-  const integrityError = checkpointIntegrityError(checkpoint);
-  return integrityError === void 0 ? { checkpoint, status: "valid" } : { detail: integrityError, status: "corrupt" };
+  const integrityError = checkpointIntegrityError(checkpoint, await allowedRevocationHashes(checkpoint));
+  if (integrityError !== void 0) return { detail: integrityError, status: "corrupt" };
+  const profileError = gateProfileIdentityError(checkpoint);
+  return profileError === void 0 ? { checkpoint, status: "valid" } : { detail: profileError, status: "identity-mismatch" };
 }
 
 // src/finalizedReplayController.ts
@@ -653,6 +743,7 @@ function replayContract(options, throughBlock) {
     eventBodyCorpus: { sourceId: options.sourceId },
     floorBlock: options.floorBlock,
     foldVersion: STATEMENT_FOLD_VERSION2,
+    gateProfile: EVENT_KIT_REPLAY_GATE_PROFILE,
     indexedSchemaPolicy: { foldedObjectSchemas: [...EventKitClaimedObjectSchemas] },
     network: options.network,
     throughBlock
@@ -714,17 +805,17 @@ function mergeBodies(existing, additions) {
   }
   return merged.entries().map(([hash, body]) => ({ body, hash: HashZod4.parse(hash) })).toArray().toSorted((left, right) => left.hash.localeCompare(right.hash));
 }
-async function stageAppliedBlock(options, applied) {
+async function stageAppliedBlock(options, priorTargets, applied) {
   const appliedObjectHashes = uniqueStrings(applied.map((record) => record.objectHash));
   const objects = await resolveVerifiedBodies(options.bodies, appliedObjectHashes);
-  const missingObjects = appliedObjectHashes.filter((hash) => !objects.bodies.has(hash));
-  const schemaMismatchedObjects = uniqueStrings(applied.flatMap((record) => {
-    const body = objects.bodies.get(record.objectHash);
-    return body !== void 0 && body.schema !== record.objectSchema ? [record.objectHash] : [];
-  }));
+  const allowedRevocations = await knownRevocationHashes(mergedRevocationTargets(
+    priorTargets,
+    knownRevocationTargets(applied, (hash) => objects.bodies.get(hash))
+  ));
+  const blocking = objectHashesBlockingReplay(applied, (hash) => objects.bodies.get(hash), allowedRevocations);
   const acceptanceAttachments = [];
   for (const record of applied) {
-    if (normalizeAddress3(record.source) !== options.publisher || record.objectSchema !== WakeSubscriptionAcceptanceSchema2) continue;
+    if (normalizeAddress3(record.source) !== options.publisher || record.objectSchema !== WakeSubscriptionAcceptanceSchema3) continue;
     const acceptance = WakeSubscriptionAcceptanceZod.safeParse(objects.bodies.get(record.objectHash));
     if (acceptance.success) acceptanceAttachments.push(acceptance.data.challenge, acceptance.data.response);
   }
@@ -736,8 +827,8 @@ async function stageAppliedBlock(options, applied) {
     ...attachments.corrupt
   ]);
   const objectHashes = uniqueStrings([
-    ...missingObjects,
-    ...schemaMismatchedObjects,
+    ...blocking.missing,
+    ...blocking.mismatched,
     ...missingAttachments
   ]).map((hash) => HashZod4.parse(hash));
   return {
@@ -787,10 +878,13 @@ async function stageRange(options, prior, fromBlock, throughBlock, signal) {
     ...unresolvedByBlock.keys()
   ]);
   const relevantBlocks = relevant.values().toArray().toSorted((left, right) => left - right);
+  const priorBodies = new Map(prior.bodies.map((entry) => [entry.hash, entry.body]));
+  const knownTargets = knownRevocationTargets(prior.applied, (hash) => priorBodies.get(hash));
   const bodies = /* @__PURE__ */ new Map();
   for (const block of relevantBlocks) {
     signal?.throwIfAborted();
-    const staged = await stageAppliedBlock(options, appliedByBlock.get(block) ?? []);
+    const blockApplied = appliedByBlock.get(block) ?? [];
+    const staged = await stageAppliedBlock(options, knownTargets, blockApplied);
     for (const [hash, body] of staged.bodies) bodies.set(hash, body);
     const unresolvedEvents = unresolvedByBlock.get(block) ?? [];
     if (unresolvedEvents.length > 0 || staged.objectHashes.length > 0 || staged.corrupt.length > 0) {
@@ -807,6 +901,7 @@ async function stageRange(options, prior, fromBlock, throughBlock, signal) {
         throughHash
       };
     }
+    absorbRevocationTargets(knownTargets, knownRevocationTargets(blockApplied, (hash) => staged.bodies.get(hash)));
   }
   return {
     applied,
@@ -1042,42 +1137,34 @@ function toGrantObject(record) {
 
 // src/handshakeReadModel.ts
 import {
-  EncryptedWakeSubscriptionSchema as EncryptedWakeSubscriptionSchema2,
+  EncryptedWakeSubscriptionSchema as EncryptedWakeSubscriptionSchema3,
   EncryptedWakeSubscriptionZod,
   EndpointChallengeResponseZod,
   EndpointChallengeZod,
   HandshakeIdZod,
   hasMatchingHandshakeProfile,
   NormalizedAddressZod as NormalizedAddressZod5,
-  PublisherServiceSchema as PublisherServiceSchema3,
-  WakeGrantObjectSchema as WakeGrantObjectSchema2,
+  PublisherServiceSchema as PublisherServiceSchema4,
+  WakeGrantObjectSchema as WakeGrantObjectSchema3,
   WakeGrantObjectZod,
-  WakeGrantRevocationSchema as WakeGrantRevocationSchema2,
-  WakeGrantRevocationZod,
-  WakeSubscriptionAcceptanceRevocationSchema as WakeSubscriptionAcceptanceRevocationSchema2,
-  WakeSubscriptionAcceptanceRevocationZod,
-  WakeSubscriptionAcceptanceSchema as WakeSubscriptionAcceptanceSchema3,
-  WakeSubscriptionAcceptanceZod as WakeSubscriptionAcceptanceZod2,
-  WakeSubscriptionRevocationSchema as WakeSubscriptionRevocationSchema2,
-  WakeSubscriptionRevocationZod
+  WakeSubscriptionAcceptanceSchema as WakeSubscriptionAcceptanceSchema4,
+  WakeSubscriptionAcceptanceZod as WakeSubscriptionAcceptanceZod2
 } from "@xyo-network/event-kit-schemas";
 import { XyoAddressZod as XyoAddressZod3 } from "@xyo-network/sdk-protocol/address";
 
 // src/handshakeCatalog.ts
+import { HashZod as HashZod6 } from "@ariestools/sdk";
 import {
+  recomputableRevocationHash as recomputableRevocationHash2,
   resolvePreferredEncryptionKey,
   selectPublisherService
 } from "@xyo-network/event-kit-protocol";
 import {
   ChainIdZod as ChainIdZod4,
   NormalizedAddressZod as NormalizedAddressZod4,
-  PublisherEncryptionKeyRevocationSchema as PublisherEncryptionKeyRevocationSchema2,
-  PublisherEncryptionKeyRevocationZod,
-  PublisherEncryptionKeySchema as PublisherEncryptionKeySchema2,
+  PublisherEncryptionKeySchema as PublisherEncryptionKeySchema3,
   PublisherEncryptionKeyZod,
-  PublisherServiceRevocationSchema as PublisherServiceRevocationSchema2,
-  PublisherServiceRevocationZod,
-  PublisherServiceSchema as PublisherServiceSchema2,
+  PublisherServiceSchema as PublisherServiceSchema3,
   PublisherServiceZod,
   SOURCE_WAKE_EVENT_KIND as SOURCE_WAKE_EVENT_KIND2
 } from "@xyo-network/event-kit-schemas";
@@ -1146,39 +1233,53 @@ async function parsedHandshakeObjects(viewer, records, parse) {
   }
   return objects;
 }
-async function handshakeRevocations(viewer, records, parse, field) {
+var LegacyHexAddress3 = /^[A-Fa-f0-9]{40}$/;
+function sameAddress(left, right) {
+  const normalizedLeft = LegacyHexAddress3.test(left) ? left.toLowerCase() : left;
+  const normalizedRight = LegacyHexAddress3.test(right) ? right.toLowerCase() : right;
+  return normalizedLeft === normalizedRight;
+}
+async function hashMatchedRevocations(viewer, source, subject, kind, targets) {
+  const sourceAddress = XyoAddressZod2.parse(source);
+  const subjectAddress = XyoAddressZod2.parse(subject);
   const result = [];
-  for (const record of earliestByHash(records)) {
-    const parsed = parse(await verifiedHandshakeObjectBody(viewer, record));
-    if (parsed.success && typeof parsed.data[field] === "string") {
-      result.push({ block: record.block, target: parsed.data[field] });
-    }
+  for (const target of targets) {
+    const block = await revocationClaimBlock(viewer, sourceAddress, subjectAddress, kind, target);
+    if (block !== void 0) result.push({ block, target });
   }
   return result;
 }
+async function revocationClaimBlock(viewer, source, subject, kind, target) {
+  const objectHash = HashZod6.parse(await recomputableRevocationHash2(kind, target));
+  const claims = await viewer.claims(source, { objectHash, subject });
+  const blocks = claims.filter((claim) => claim.objectHash === objectHash && sameAddress(claim.source, source) && sameAddress(claim.subject, subject) && Number.isSafeInteger(claim.firstBlock) && claim.firstBlock >= 0).map((claim) => claim.firstBlock);
+  return blocks.length === 0 ? void 0 : Math.min(...blocks);
+}
 async function buildHandshakeCatalogs(viewer, publisher) {
   const events = await viewer.events(XyoAddressZod2.parse(publisher));
   const services = await parsedHandshakeObjects(
     viewer,
-    events.filter((record) => record.objectSchema === PublisherServiceSchema2 || record.objectSchema === PublisherServiceSchema2),
+    events.filter((record) => record.objectSchema === PublisherServiceSchema3 || record.objectSchema === PublisherServiceSchema3),
     (value) => PublisherServiceZod.safeParse(value)
   );
   const keys = await parsedHandshakeObjects(
     viewer,
-    events.filter((record) => record.objectSchema === PublisherEncryptionKeySchema2),
+    events.filter((record) => record.objectSchema === PublisherEncryptionKeySchema3),
     (value) => PublisherEncryptionKeyZod.safeParse(value)
   );
-  const serviceRevocations = await handshakeRevocations(
+  const serviceRevocations = await hashMatchedRevocations(
     viewer,
-    events.filter((record) => record.objectSchema === PublisherServiceRevocationSchema2),
-    (value) => PublisherServiceRevocationZod.safeParse(value),
-    "service"
+    publisher,
+    publisher,
+    "service",
+    services.map((service) => service.objectHash)
   );
-  const keyRevocations = await handshakeRevocations(
+  const keyRevocations = await hashMatchedRevocations(
     viewer,
-    events.filter((record) => record.objectSchema === PublisherEncryptionKeyRevocationSchema2),
-    (value) => PublisherEncryptionKeyRevocationZod.safeParse(value),
-    "key"
+    publisher,
+    publisher,
+    "key",
+    keys.map((key) => key.objectHash)
   );
   const serviceByHash = new Map(services.map((service) => {
     const revokedAtBlock = firstHandshakeRevocation(serviceRevocations, service.objectHash);
@@ -1351,9 +1452,9 @@ async function discoverHandshakeService(options, rawQuery) {
 }
 
 // src/publisherSubjectViewer.ts
-var LegacyHexAddress3 = /^[A-Fa-f0-9]{40}$/;
+var LegacyHexAddress4 = /^[A-Fa-f0-9]{40}$/;
 function normalizeAddress4(value) {
-  return LegacyHexAddress3.test(value) ? value.toLowerCase() : value;
+  return LegacyHexAddress4.test(value) ? value.toLowerCase() : value;
 }
 function isPublisherSubject(subject, publisher) {
   return normalizeAddress4(subject) === normalizeAddress4(publisher);
@@ -1502,26 +1603,10 @@ function hasExactKeyBinding(subscription, service, catalogs, tupleBlock) {
 function expiryIsInsideServicePolicy(subscription, service, tupleBlock) {
   return subscription.expiresAtBlock > tupleBlock && subscription.expiresAtBlock <= tupleBlock + service.limits.maxSubscriptionLifetimeBlocks;
 }
-async function tupleRevocations(viewer, records) {
-  return {
-    grants: await handshakeRevocations(
-      viewer,
-      records.filter((record) => record.objectSchema === WakeGrantRevocationSchema2),
-      (value) => WakeGrantRevocationZod.safeParse(value),
-      "grant"
-    ),
-    subscriptions: await handshakeRevocations(
-      viewer,
-      records.filter((record) => record.objectSchema === WakeSubscriptionRevocationSchema2),
-      (value) => WakeSubscriptionRevocationZod.safeParse(value),
-      "subscription"
-    )
-  };
-}
-async function validateTuple(viewer, records, subscriber, service, catalogs, chainId, publisher, sourceEvents) {
-  const serviceEntries = records.filter((record) => record.objectSchema === PublisherServiceSchema3 || record.objectSchema === PublisherServiceSchema3);
-  const grantEntries = records.filter((record) => record.objectSchema === WakeGrantObjectSchema2);
-  const subscriptionEntries = records.filter((record) => record.objectSchema === EncryptedWakeSubscriptionSchema2 || record.objectSchema === EncryptedWakeSubscriptionSchema2);
+async function validateTuple(viewer, records, subscriber, service, catalogs, chainId, publisher) {
+  const serviceEntries = records.filter((record) => record.objectSchema === PublisherServiceSchema4 || record.objectSchema === PublisherServiceSchema4);
+  const grantEntries = records.filter((record) => record.objectSchema === WakeGrantObjectSchema3);
+  const subscriptionEntries = records.filter((record) => record.objectSchema === EncryptedWakeSubscriptionSchema3 || record.objectSchema === EncryptedWakeSubscriptionSchema3);
   const baseEvidence = handshakeEventEvidence(records[0]);
   const reject = (reason) => ({
     rejection: {
@@ -1555,7 +1640,16 @@ async function validateTuple(viewer, records, subscriber, service, catalogs, cha
   if (!exactHandshakeServiceAt(catalogs, service, publisher, tupleBlock)) return reject("service-inactive-at-claim");
   if (!hasExactKeyBinding(subscription, service, catalogs, tupleBlock)) return reject("key-binding-invalid");
   if (!expiryIsInsideServicePolicy(subscription, service.body, tupleBlock)) return reject("expiry-out-of-policy");
-  const revoked = await tupleRevocations(viewer, sourceEvents);
+  const revoked = {
+    grants: await hashMatchedRevocations(viewer, subscriber, publisher, "grant", [grantRecord.objectHash]),
+    subscriptions: await hashMatchedRevocations(
+      viewer,
+      subscriber,
+      publisher,
+      "subscription",
+      [subscriptionRecord.objectHash]
+    )
+  };
   const subscriptionRevokedAtBlock = firstHandshakeRevocation(revoked.subscriptions, subscriptionRecord.objectHash);
   const grantRevokedAtBlock = firstHandshakeRevocation(revoked.grants, grantRecord.objectHash);
   return {
@@ -1614,8 +1708,7 @@ async function discoverTuples(viewer, services, catalogs, query, candidateSource
           service,
           catalogs,
           query.chainId,
-          query.publisher,
-          events
+          query.publisher
         );
         if (result.rejection !== void 0) rejections.push(result.rejection);
         if (result.tuple !== void 0) {
@@ -1638,14 +1731,15 @@ async function validatedAcceptances(options, catalogs, tuples, chainId, publishe
   const events = (await options.viewer.events(publisherAddress, { subject: publisherAddress })).filter((record) => isPublisherSubject(record.source, publisherAddress) && isPublisherSubject(record.subject, publisherAddress));
   const acceptances = await parsedHandshakeObjects(
     options.viewer,
-    events.filter((record) => record.objectSchema === WakeSubscriptionAcceptanceSchema3),
+    events.filter((record) => record.objectSchema === WakeSubscriptionAcceptanceSchema4),
     (value) => WakeSubscriptionAcceptanceZod2.safeParse(value)
   );
-  const acceptanceRevocations = await handshakeRevocations(
+  const acceptanceRevocations = await hashMatchedRevocations(
     options.viewer,
-    events.filter((record) => record.objectSchema === WakeSubscriptionAcceptanceRevocationSchema2),
-    (value) => WakeSubscriptionAcceptanceRevocationZod.safeParse(value),
-    "acceptance"
+    publisher,
+    publisher,
+    "acceptance",
+    acceptances.map((claimed) => claimed.objectHash)
   );
   const result = [];
   for (const claimed of acceptances) {