@agoric/async-flow 0.1.1-dev-2ca7ea6.0 → 0.1.1-dev-7b2cca2.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@agoric/async-flow",
-  "version": "0.1.1-dev-2ca7ea6.0+2ca7ea6",
+  "version": "0.1.1-dev-7b2cca2.0+7b2cca2",
   "description": "Upgrade async functions at await points by replay",
   "type": "module",
   "repository": "https://github.com/Agoric/agoric-sdk",
@@ -24,10 +24,10 @@
   "author": "Agoric",
   "license": "Apache-2.0",
   "dependencies": {
-    "@agoric/base-zone": "0.1.1-dev-2ca7ea6.0+2ca7ea6",
-    "@agoric/internal": "0.3.3-dev-2ca7ea6.0+2ca7ea6",
-    "@agoric/store": "0.9.3-dev-2ca7ea6.0+2ca7ea6",
-    "@agoric/vow": "0.1.1-dev-2ca7ea6.0+2ca7ea6",
+    "@agoric/base-zone": "0.1.1-dev-7b2cca2.0+7b2cca2",
+    "@agoric/internal": "0.3.3-dev-7b2cca2.0+7b2cca2",
+    "@agoric/store": "0.9.3-dev-7b2cca2.0+7b2cca2",
+    "@agoric/vow": "0.1.1-dev-7b2cca2.0+7b2cca2",
     "@endo/common": "^1.2.6",
     "@endo/errors": "^1.2.6",
     "@endo/eventual-send": "^1.2.6",
@@ -37,8 +37,8 @@
     "@endo/promise-kit": "^1.1.6"
   },
   "devDependencies": {
-    "@agoric/swingset-vat": "0.32.3-dev-2ca7ea6.0+2ca7ea6",
-    "@agoric/zone": "0.2.3-dev-2ca7ea6.0+2ca7ea6",
+    "@agoric/swingset-vat": "0.32.3-dev-7b2cca2.0+7b2cca2",
+    "@agoric/zone": "0.2.3-dev-7b2cca2.0+7b2cca2",
     "@endo/env-options": "^1.1.7",
     "ava": "^5.3.0",
     "tsd": "^0.31.1"
@@ -62,5 +62,5 @@
   "typeCoverage": {
     "atLeast": 76.93
   },
-  "gitHead": "2ca7ea6ff2dfc5f5db4624fb3cdcab1786571e73"
+  "gitHead": "7b2cca28af123fd20507378cbd0a540352a38553"
 }

package/src/async-flow.js

@@ -11,7 +11,7 @@ import { prepareEndowmentTools } from './endowments.js';
 import { LogEntryShape, FlowStateShape } from './type-guards.js';
 
 /**
- * @import {WeakMapStore} from '@agoric/store'
+ * @import {WeakMapStore, MapStore} from '@agoric/store'
  * @import {Zone} from '@agoric/base-zone'
  * @import {FlowState, GuestAsyncFunc, HostAsyncFuncWrapper, HostOf, PreparationOptions} from '../src/types.js'
  * @import {ReplayMembrane} from '../src/replay-membrane.js'
@@ -70,7 +70,7 @@ export const prepareAsyncFlowTools = (outerZone, outerOptions = {}) => {
     keyShape: M.remotable('flow'), // flowState !== 'Done'
   });
 
-  /** @type WeakMapStore<AsyncFlow, ReplayMembrane> */
+  /** @type {WeakMapStore<AsyncFlow, ReplayMembrane>} */
   const membraneMap = makeScalarWeakMapStore('membraneFor', {
     keyShape: M.remotable('flow'),
     valueShape: M.remotable('membrane'),

package/src/log-store.d.ts

@@ -1,24 +1,61 @@
+export function nextGeneration(zone: Zone): number;
 export function prepareLogStore(zone: Zone): () => import("@endo/exo").Guarded<{
     reset(): void;
     dispose(): void;
+    getUnfilteredIndex(): number;
     getIndex(): number;
     getLength(): number;
     isReplaying(): boolean;
+    /**
+     * @returns {LogEntry}
+     */
     peekEntry(): LogEntry;
+    /**
+     * @returns {LogEntry}
+     */
+    nextUnfilteredEntry(): LogEntry;
+    /**
+     * @returns {LogEntry}
+     */
     nextEntry(): LogEntry;
-    pushEntry(entry: any): number;
+    /**
+     * @param {LogEntry} latestEntry
+     */
+    pushEntry(latestEntry: LogEntry): number;
+    /**
+     * @returns {LogEntry[]}
+     */
+    dumpUnfiltered(): LogEntry[];
     dump(): ([op: "doFulfill", vow: import("@agoric/vow").Vow<import("@endo/pass-style").Passable>, fulfillment: import("@endo/pass-style").Passable] | [op: "doReject", vow: import("@agoric/vow").Vow<import("@endo/pass-style").Passable>, reason: import("@endo/pass-style").Passable] | [op: "doReturn", callIndex: number, result: import("@endo/pass-style").Passable] | [op: "doThrow", callIndex: number, problem: import("@endo/pass-style").Passable] | [op: "checkCall", target: import("@endo/pass-style").Passable, optVerb: PropertyKey | undefined, args: import("@endo/pass-style").Passable[], callIndex: number] | [op: "checkSendOnly", target: import("@endo/pass-style").Passable, optVerb: PropertyKey | undefined, args: import("@endo/pass-style").Passable[], callIndex: number] | [op: "checkSend", target: import("@endo/pass-style").Passable, optVerb: PropertyKey | undefined, args: import("@endo/pass-style").Passable[], callIndex: number])[];
     promiseReplayDone(): Promise<undefined>;
 }>;
 export type LogStore = ReturnType<ReturnType<(zone: Zone) => () => import("@endo/exo").Guarded<{
     reset(): void;
     dispose(): void;
+    getUnfilteredIndex(): number;
     getIndex(): number;
     getLength(): number;
     isReplaying(): boolean;
+    /**
+     * @returns {LogEntry}
+     */
     peekEntry(): LogEntry;
+    /**
+     * @returns {LogEntry}
+     */
+    nextUnfilteredEntry(): LogEntry;
+    /**
+     * @returns {LogEntry}
+     */
     nextEntry(): LogEntry;
-    pushEntry(entry: any): number;
+    /**
+     * @param {LogEntry} latestEntry
+     */
+    pushEntry(latestEntry: LogEntry): number;
+    /**
+     * @returns {LogEntry[]}
+     */
+    dumpUnfiltered(): LogEntry[];
     dump(): ([op: "doFulfill", vow: import("@agoric/vow").Vow<import("@endo/pass-style").Passable>, fulfillment: import("@endo/pass-style").Passable] | [op: "doReject", vow: import("@agoric/vow").Vow<import("@endo/pass-style").Passable>, reason: import("@endo/pass-style").Passable] | [op: "doReturn", callIndex: number, result: import("@endo/pass-style").Passable] | [op: "doThrow", callIndex: number, problem: import("@endo/pass-style").Passable] | [op: "checkCall", target: import("@endo/pass-style").Passable, optVerb: PropertyKey | undefined, args: import("@endo/pass-style").Passable[], callIndex: number] | [op: "checkSendOnly", target: import("@endo/pass-style").Passable, optVerb: PropertyKey | undefined, args: import("@endo/pass-style").Passable[], callIndex: number] | [op: "checkSend", target: import("@endo/pass-style").Passable, optVerb: PropertyKey | undefined, args: import("@endo/pass-style").Passable[], callIndex: number])[];
     promiseReplayDone(): Promise<undefined>;
 }>>>;

package/src/log-store.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"log-store.d.ts","sourceRoot":"","sources":["log-store.js"],"names":[],"mappings":"AA+BO,sCAFI,IAAI;;;;;;;;;;;GAuId;uBAGY,UAAU,CAAC,UAAU,QA1IvB,IAAI;;;;;;;;;;;GA0IoC,CAAC;0BA/J7B,mBAAmB;8BAEL,YAAY"}
+{"version":3,"file":"log-store.d.ts","sourceRoot":"","sources":["log-store.js"],"names":[],"mappings":"AAmCO,qCAHI,IAAI,GACF,MAAM,CAgBlB;AAOM,sCAFI,IAAI;;;;;;;IAoGT;;OAEG;iBADU,QAAQ;IAcrB;;OAEG;2BADU,QAAQ;IAgBrB;;OAEG;iBADU,QAAQ;IAWrB;;OAEG;2BADQ,QAAQ;IAuCnB;;OAEG;sBADU,QAAQ,EAAE;;;GAwB5B;uBAGY,UAAU,CAAC,UAAU,QApNvB,IAAI;;;;;;;IAoGT;;OAEG;iBADU,QAAQ;IAcrB;;OAEG;2BADU,QAAQ;IAgBrB;;OAEG;iBADU,QAAQ;IAWrB;;OAEG;2BADQ,QAAQ;IAuCnB;;OAEG;sBADU,QAAQ,EAAE;;;GA2BsB,CAAC;0BAlQ7B,mBAAmB;8BAEL,YAAY"}

package/src/log-store.js

@@ -14,31 +14,76 @@ import { makeEphemera } from './ephemera.js';
 const LogStoreI = M.interface('LogStore', {
   reset: M.call().returns(),
   dispose: M.call().returns(),
+  getUnfilteredIndex: M.call().returns(M.number()),
   getIndex: M.call().returns(M.number()),
   getLength: M.call().returns(M.number()),
   isReplaying: M.call().returns(M.boolean()),
   peekEntry: M.call().returns(LogEntryShape),
   nextEntry: M.call().returns(LogEntryShape),
+  nextUnfilteredEntry: M.call().returns(LogEntryShape),
   pushEntry: M.call(LogEntryShape).returns(M.number()),
+  dumpUnfiltered: M.call().returns(M.arrayOf(LogEntryShape)),
   dump: M.call().returns(M.arrayOf(LogEntryShape)),
   promiseReplayDone: M.call().returns(M.promise()),
 });
 
+/**
+ * Get a generation number to use in `startGeneration` log entries.
+ *
+ * @param {Zone} zone
+ * @returns {number}
+ */
+export const nextGeneration = zone => {
+  /** @type {MapStore<'generation', number>} */
+  const logStoreMetadata = zone.mapStore('LogStoreMetadata');
+  const generationKey = 'generation';
+
+  if (!logStoreMetadata.has(generationKey)) {
+    const firstGen = 0;
+    logStoreMetadata.init(generationKey, firstGen);
+    return firstGen;
+  }
+
+  const nextGen = logStoreMetadata.get(generationKey) + 1;
+  logStoreMetadata.set(generationKey, nextGen);
+  return nextGen;
+};
+
 /**
  * A growable, replayable, sequence of `LogEntry`s.
  *
  * @param {Zone} zone
  */
 export const prepareLogStore = zone => {
+  /**
+   * Ensure that any new or reset LogStore instance that (for a given
+   * incarnation) pushes at least one entry will insert these entries first,
+   * even if the log is reset, replayed, and pushed to in the same incarnation.
+   * @type {LogEntry[]}
+   */
+  const initialPush = harden([['startGeneration', nextGeneration(zone)]]);
+
+  /**
+   * A predicate to indicate whether the entry is normally visible to the
+   * LogStore user, or is a more internal entry that only is visible via the
+   * Unfiltered methods.
+   * @param {LogEntry} entry
+   */
+  const entryIsVisible = entry => entry[0] !== 'startGeneration';
+
   /**
    * @type {Ephemera<LogStore, {
-   *           index: number
-   *           replayDoneKit: PromiseKit<undefined>
+   *           index: number;
+   *           unfilteredIndex: number;
+   *           initialPush: LogEntry[] | undefined;
+   *           replayDoneKit: PromiseKit<undefined>;
    *        }>}
    */
   const tmp = makeEphemera(log => {
     const result = {
       index: 0,
+      unfilteredIndex: 0,
+      initialPush,
       replayDoneKit: makePromiseKit(),
     };
     if (log.getLength() === 0) {
@@ -82,6 +127,12 @@ export const prepareLogStore = zone => {
         tmp.resetFor(self);
         mapStore.clear();
       },
+      getUnfilteredIndex() {
+        const { self } = this;
+        const eph = tmp.for(self);
+
+        return eph.unfilteredIndex;
+      },
       getIndex() {
         const { self } = this;
         const eph = tmp.for(self);
@@ -99,52 +150,96 @@ export const prepareLogStore = zone => {
         const { mapStore } = state;
         const eph = tmp.for(self);
 
-        return eph.index < mapStore.getSize();
+        return eph.unfilteredIndex < mapStore.getSize();
       },
+      /**
+       * @returns {LogEntry}
+       */
       peekEntry() {
         const { state, self } = this;
         const { mapStore } = state;
         const eph = tmp.for(self);
 
         self.isReplaying() ||
-          Fail`No longer replaying: ${q(eph.index)} vs ${q(
+          Fail`No longer replaying: ${q(eph.unfilteredIndex)} vs ${q(
             mapStore.getSize(),
           )}`;
-        const result = mapStore.get(eph.index);
+        const result = mapStore.get(eph.unfilteredIndex);
         return result;
       },
-      nextEntry() {
+      /**
+       * @returns {LogEntry}
+       */
+      nextUnfilteredEntry() {
         const { self } = this;
         const eph = tmp.for(self);
 
         const result = self.peekEntry();
-        eph.index += 1;
+        eph.unfilteredIndex += 1;
+        if (entryIsVisible(result)) {
+          eph.index += 1;
+        }
         if (!self.isReplaying()) {
           eph.replayDoneKit.resolve(undefined);
         }
         return result;
       },
-      pushEntry(entry) {
+      /**
+       * @returns {LogEntry}
+       */
+      nextEntry() {
+        const { self } = this;
+        let result = self.nextUnfilteredEntry();
+        while (!entryIsVisible(result)) {
+          self.isReplaying() || Fail`Unexpected entry at log tail: ${result}`;
+          result = self.nextUnfilteredEntry();
+        }
+        return result;
+      },
+      /**
+       * @param {LogEntry} latestEntry
+       */
+      pushEntry(latestEntry) {
         const { state, self } = this;
+
         const { mapStore } = state;
         const eph = tmp.for(self);
 
         !self.isReplaying() ||
-          Fail`still replaying: ${q(eph.index)} vs ${q(mapStore.getSize())}`;
-        eph.index === mapStore.getSize() ||
-          Fail`internal: index confusion ${q(eph.index)} vs ${q(
-            mapStore.getSize(),
-          )}`;
-        mapStore.init(eph.index, entry);
-        eph.index += 1;
-        eph.index === mapStore.getSize() ||
-          Fail`internal: index confusion ${q(eph.index)} vs ${q(
-            mapStore.getSize(),
-          )}`;
-        // console.log('LOG ENTRY ', eph.index - 1, entry);
-        return eph.index;
+          Fail`still replaying: ${q(eph.unfilteredIndex)} vs ${q(mapStore.getSize())}`;
+
+        const pushOne = entry => {
+          eph.unfilteredIndex === mapStore.getSize() ||
+            Fail`internal: unfilteredIndex confusion ${q(eph.unfilteredIndex)} vs ${q(
+              mapStore.getSize(),
+            )}`;
+          mapStore.init(eph.unfilteredIndex, entry);
+          eph.unfilteredIndex += 1;
+          if (entryIsVisible(entry)) {
+            eph.index += 1;
+          }
+          eph.unfilteredIndex === mapStore.getSize() ||
+            Fail`internal: unfilteredIndex confusion ${q(eph.unfilteredIndex)} vs ${q(
+              mapStore.getSize(),
+            )}`;
+        };
+
+        if (eph.initialPush) {
+          const initialEntries = eph.initialPush;
+          eph.initialPush = undefined;
+          for (const initialEntry of initialEntries) {
+            pushOne(initialEntry);
+          }
+        }
+        pushOne(latestEntry);
+
+        // console.log('LOG ENTRY ', eph.unfilteredIndex - 1, entry);
+        return eph.unfilteredIndex;
       },
-      dump() {
+      /**
+       * @returns {LogEntry[]}
+       */
+      dumpUnfiltered() {
         const { state } = this;
         const { mapStore } = state;
         const len = mapStore.getSize();
@@ -154,6 +249,10 @@ export const prepareLogStore = zone => {
         }
         return harden(result);
       },
+      dump() {
+        const { self } = this;
+        return harden(self.dumpUnfiltered().filter(entryIsVisible));
+      },
       promiseReplayDone() {
         const { self } = this;
         const eph = tmp.for(self);

package/src/replay-membrane.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"replay-membrane.d.ts","sourceRoot":"","sources":["replay-membrane.js"],"names":[],"mappings":"AA+BO,wCANJ;IAAsB,GAAG,EAAjB,QAAQ;IACO,SAAS,EAAxB,SAAS;IACK,QAAQ,EAAtB,QAAQ;IAC6B,SAAS,EAA9C,CAAC,MAAM,EAAE,eAAU,GAAG,KAAK,IAAI;IACA,KAAK,EAApC,CAAC,OAAO,EAAE,KAAK,KAAK,KAAK;CACnC;;;;;;;;;;GAMA;AAWM,wHAPJ;IAAsB,GAAG,EAAjB,QAAQ;IACO,SAAS,EAAxB,SAAS;IACK,QAAQ,EAAtB,QAAQ;IAC6B,SAAS,EAA9C,CAAC,MAAM,EAAE,eAAU,GAAG,KAAK,IAAI;IACA,KAAK,EAApC,CAAC,OAAO,EAAE,KAAK,KAAK,KAAK;IACX,wBAAwB;CAChD;;;;;;;;;;GAmpBA;6BAGa,UAAU,OA3qBrB;IAAsB,GAAG,EAAjB,QAAQ;IACO,SAAS,EAAxB,SAAS;IACK,QAAQ,EAAtB,QAAQ;IAC6B,SAAS,EAA9C,CAAC,MAAM,EAAE,eAAU,GAAG,KAAK,IAAI;IACA,KAAK,EAApC,CAAC,OAAO,EAAE,KAAK,KAAK,KAAK;CACnC;;;;;;;;;;GAsqB2C;8BAprBjB,qBAAqB;+BACpB,qBAAqB;8BAFT,aAAa;yBAAb,aAAa;8BADH,kBAAkB;oCADnC,qBAAqB"}
+{"version":3,"file":"replay-membrane.d.ts","sourceRoot":"","sources":["replay-membrane.js"],"names":[],"mappings":"AA+BO,wCANJ;IAAsB,GAAG,EAAjB,QAAQ;IACO,SAAS,EAAxB,SAAS;IACK,QAAQ,EAAtB,QAAQ;IAC6B,SAAS,EAA9C,CAAC,MAAM,EAAE,eAAU,GAAG,KAAK,IAAI;IACA,KAAK,EAApC,CAAC,OAAO,EAAE,KAAK,KAAK,KAAK;CACnC;;;;;;;;;;GAMA;AAWM,wHAPJ;IAAsB,GAAG,EAAjB,QAAQ;IACO,SAAS,EAAxB,SAAS;IACK,QAAQ,EAAtB,QAAQ;IAC6B,SAAS,EAA9C,CAAC,MAAM,EAAE,eAAU,GAAG,KAAK,IAAI;IACA,KAAK,EAApC,CAAC,OAAO,EAAE,KAAK,KAAK,KAAK;IACX,wBAAwB;CAChD;;;;;;;;;;GA4pBA;6BAGa,UAAU,OAprBrB;IAAsB,GAAG,EAAjB,QAAQ;IACO,SAAS,EAAxB,SAAS;IACK,QAAQ,EAAtB,QAAQ;IAC6B,SAAS,EAA9C,CAAC,MAAM,EAAE,eAAU,GAAG,KAAK,IAAI;IACA,KAAK,EAApC,CAAC,OAAO,EAAE,KAAK,KAAK,KAAK;CACnC;;;;;;;;;;GA+qB2C;8BA7rBjB,qBAAqB;+BACpB,qBAAqB;8BAFT,aAAa;yBAAb,aAAa;8BADH,kBAAkB;oCADnC,qBAAqB"}

package/src/replay-membrane.js

@@ -63,6 +63,13 @@ export const makeReplayMembraneForTesting = ({
 
   const Panic = (template, ...args) => panic(makeError(X(template, ...args)));
 
+  const startGeneration = generation => {
+    Number.isSafeInteger(generation) ||
+      Fail`generation expected integer; got ${generation}`;
+    generation >= 0 ||
+      Fail`generation expected non-negative; got ${generation}`;
+  };
+
   // ////////////// Host or Interpreter to Guest ///////////////////////////////
 
   /**
@@ -278,6 +285,7 @@ export const makeReplayMembraneForTesting = ({
       throw Panic`internal: eventual send synchronously failed ${hostProblem}`;
     }
     try {
+      /** @type {LogEntry} */
       const entry = harden(['doReturn', callIndex, vow]);
       log.pushEntry(entry);
       const guestPromise = makeGuestForHostVow(vow, guestReturnedP);
@@ -602,21 +610,22 @@ export const makeReplayMembraneForTesting = ({
   // /////////////////////////////// Interpreter ///////////////////////////////
 
   /**
-   * These are the only ones that are driven from the interpreter loop
+   * These are the only ones that are driven from the top level interpreter loop
    */
   const topDispatch = harden({
+    startGeneration,
     doFulfill,
     doReject,
     // doCall, // unimplemented in the current plan
   });
 
   /**
-   * These are the only ones that are driven from the interpreter loop
+   * These are the only ones that are driven from the nested interpreter loop
    */
   const nestDispatch = harden({
-    // doCall, // unimplemented in the current plan
     doReturn,
     doThrow,
+    // doCall, // unimplemented in the current plan
   });
 
   const interpretOne = (dispatch, [op, ...args]) => {
@@ -646,7 +655,7 @@ export const makeReplayMembraneForTesting = ({
   const nestInterpreter = callIndex => {
     callStack.push(callIndex);
     while (log.isReplaying() && !stopped) {
-      const entry = log.nextEntry();
+      const entry = log.nextUnfilteredEntry();
       const optOutcome = interpretOne(nestDispatch, entry);
       if (unnestFlag) {
         optOutcome ||
@@ -687,7 +696,7 @@ export const makeReplayMembraneForTesting = ({
       if (!(op in topDispatch)) {
         return;
       }
-      void log.nextEntry();
+      void log.nextUnfilteredEntry();
       interpretOne(topDispatch, entry);
     }
   };

package/src/type-guards.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"type-guards.d.ts","sourceRoot":"","sources":["type-guards.js"],"names":[],"mappings":"AAGA,8DAME;AAEF,gEAA6D;AAE7D,6DAsDE"}
+{"version":3,"file":"type-guards.d.ts","sourceRoot":"","sources":["type-guards.js"],"names":[],"mappings":"AAGA,8DAME;AAEF,gEAA6D;AAE7D,6DAuDE"}

package/src/type-guards.js

@@ -12,6 +12,7 @@ export const FlowStateShape = M.or(
 export const PropertyKeyShape = M.or(M.string(), M.symbol());
 
 export const LogEntryShape = M.or(
+  ['startGeneration', M.number()],
   // ////////////////////////////// From Host to Guest /////////////////////////
   ['doFulfill', VowShape, M.any()],
   ['doReject', VowShape, M.any()],

package/src/types.d.ts

@@ -75,11 +75,7 @@ export type Ephemera<S extends WeakKey = WeakKey, V extends unknown = any> = {
  * @see {FutureLogEntry} below for the full membrane log entry, which we do not
  * yet support.
  */
-export type LogEntry = [
-    op: 'doFulfill',
-    vow: HostVow,
-    fulfillment: Host
-] | [op: 'doReject', vow: HostVow, reason: Host] | [op: 'doReturn', callIndex: number, result: Host] | [op: 'doThrow', callIndex: number, problem: Host] | [
+export type LogEntry = [op: 'startGeneration', generation: number] | [op: 'doFulfill', vow: HostVow, fulfillment: Host] | [op: 'doReject', vow: HostVow, reason: Host] | [op: 'doReturn', callIndex: number, result: Host] | [op: 'doThrow', callIndex: number, problem: Host] | [
     op: 'checkCall',
     target: Host,
     optVerb: PropertyKey | undefined,
@@ -104,11 +100,7 @@ export type LogEntry = [
  * - the guest using `E` to eventual-send to guest wrappers of the host
  *   vows and remotables.
  */
-export type FutureLogEntry = [
-    op: 'doFulfill',
-    vow: HostVow,
-    fulfillment: Host
-] | [op: 'doReject', vow: HostVow, reason: Host] | [
+export type FutureLogEntry = [op: 'startGeneration', generation: number] | [op: 'doFulfill', vow: HostVow, fulfillment: Host] | [op: 'doReject', vow: HostVow, reason: Host] | [
     op: 'doCall',
     target: Host,
     optVerb: PropertyKey | undefined,
@@ -126,11 +118,7 @@ export type FutureLogEntry = [
     optVerb: PropertyKey | undefined,
     args: Host[],
     callIndex: number
-] | [op: 'doReturn', callIndex: number, result: Host] | [op: 'doThrow', callIndex: number, problem: Host] | [
-    op: 'checkFulfill',
-    vow: HostVow,
-    fulfillment: Host
-] | [op: 'checkReject', vow: HostVow, reason: Host] | [
+] | [op: 'doReturn', callIndex: number, result: Host] | [op: 'doThrow', callIndex: number, problem: Host] | [op: 'checkFulfill', vow: HostVow, fulfillment: Host] | [op: 'checkReject', vow: HostVow, reason: Host] | [
     op: 'checkCall',
     target: Host,
     optVerb: PropertyKey | undefined,

package/src/types.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["types.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["types.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,kBAAkB,CAAC;AACjD,OAAO,KAAK,EAAE,GAAG,EAAE,QAAQ,EAAE,MAAM,aAAa,CAAC;AACjD,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,gBAAgB,CAAC;AAC/C,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,gBAAgB,CAAC;AAChD,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,iBAAiB,CAAC;AAEtD,MAAM,MAAM,SAAS,GACjB,SAAS,GACT,UAAU,GACV,WAAW,GACX,QAAQ,GACR,MAAM,CAAC;AAEX;;;;;;GAMG;AACH,MAAM,MAAM,KAAK,CAAC,CAAC,SAAS,OAAO,GAAG,GAAG,IAAI,CAAC,CAAC;AAC/C,MAAM,MAAM,IAAI,CAAC,CAAC,SAAS,QAAQ,GAAG,QAAQ,IAAI,CAAC,CAAC;AAEpD;;;GAGG;AACH,MAAM,MAAM,OAAO,CAAC,CAAC,SAAS,QAAQ,GAAG,QAAQ,IAAI,IAAI,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC;AAElE,MAAM,MAAM,cAAc,GAAG,CAC3B,GAAG,cAAc,EAAE,KAAK,EAAE,KACvB,KAAK,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC,CAAC;AAEzB,MAAM,MAAM,oBAAoB,GAAG,CACjC,GAAG,cAAc,EAAE,IAAI,CAAC,GAAG,CAAC,EAAE,KAC3B,OAAO,CAAC,GAAG,CAAC,CAAC;AAElB;;;;GAIG;AACH,MAAM,MAAM,OAAO,CAAC,CAAC,SAAS,oBAAoB,IAAI,CAAC,SAAS,CAC9D,GAAG,IAAI,EAAE,MAAM,CAAC,KACb,GAAG,CAAC,MAAM,CAAC,CAAC,GACb,CAAC,GAAG,IAAI,EAAE,CAAC,KAAK,OAAO,CAAC,CAAC,CAAC,GAC1B,CAAC,CAAC;AAGN,KAAK,QAAQ,CAAC,CAAC,IAAI;KAAG,OAAO,IAAI,MAAM,CAAC,GAAG,CAAC,CAAC,OAAO,CAAC;CAAE,GAAG,EAAE,CAAC;AAE7D;;GAEG;AACH,MAAM,MAAM,aAAa,CAAC,CAAC,IAAI;KAC5B,CAAC,IAAI,MAAM,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,SAAS,gBAAgB,GACzC,MAAM,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,GACZ,CAAC,CAAC,CAAC,CAAC,SAAS,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,GAC9B,QAAQ,CAAC,aAAa,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,GAC7B,CAAC,CAAC,CAAC,CAAC;CACX,CAAC;AAEF;;GAEG;AACH,MAAM,MAAM,cAAc,CAAC,CAAC,IAAI;KAC7B,CAAC,IAAI,MAAM,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC,GAAG,IAAI,EAAE,GAAG,EAAE,KAAK,GAAG,CAAC,MAAM,CAAC,CAAC,GACzD,CAAC,GAAG,IAAI,EAAE,UAAU,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,KAAK,OAAO,CAAC,CAAC,CAAC,GACzC,CAAC,CAAC,CAAC,CAAC,SAAS,oBAAoB,GAC/B,OAAO,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,GACb,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC,GAAG,IAAI,EAAE,GAAG,EAAE,KAAK,MAAM,CAAC,GACtC,CAAC,CAAC,CAAC,CAAC,GACJ,CAAC,CAAC,CAAC,CAAC,SAAS,MAAM,GACjB,cAAc,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,GACpB,CAAC,CAAC,CAAC,CAAC;CACf,CAAC;AAEF;;;;GAIG;AACH,MAAM,MAAM,MAAM,CAAC,CAAC,SAAS,gBAAgB,IAAI,CAAC,SAAS,CACzD,GAAG,IAAI,EAAE,MAAM,CAAC,KACb,MAAM,CAAC,GACR,CAAC,SAAS,OAAO,CAAC,MAAM,CAAC,CAAC,GACxB,CAAC,GAAG,IAAI,EAAE,CAAC,KAAK,GAAG,CAAC,CAAC,SAAS,QAAQ,GAAG,CAAC,GAAG,aAAa,CAAC,CAAC,CAAC,CAAC,GAC9D,CAAC,GAAG,IAAI,EAAE,CAAC,KAAK,aAAa,CAAC,CAAC,CAAC,GAClC,CAAC,CAAC;AAEN,MAAM,MAAM,QAAQ,CAAC,EAAE,SAAS,GAAG,EAAE,IAAI;KAAG,CAAC,IAAI,MAAM,EAAE,GAAG,MAAM,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC;CAAE,CAAC;AAE5E,MAAM,MAAM,kBAAkB,GAAG;IAC/B,QAAQ,CAAC,EAAE,QAAQ,CAAC;IACpB,YAAY,CAAC,EAAE,CAAC,MAAM,QAAQ,CAAC,GAAG,SAAS,CAAC;IAC5C,aAAa,CAAC,EAAE,CAAC,MAAM,SAAS,CAAC,GAAG,SAAS,CAAC;IAC9C,cAAc,CAAC,EAAE,cAAc,CAAC;IAChC,YAAY,CAAC,EAAE,CAAC,CAAC,EAAE,GAAG,KAAK,IAAI,CAAC;CACjC,CAAC;AACF,MAAM,MAAM,WAAW,GAAG,QAAQ,GAAG,OAAO,CAAC;AAE7C,MAAM,MAAM,OAAO,GACf;IACE,IAAI,EAAE,QAAQ,CAAC;IACf,MAAM,EAAE,GAAG,CAAC;CACb,GACD;IACE,IAAI,EAAE,OAAO,CAAC;IACd,OAAO,EAAE,GAAG,CAAC;CACd,CAAC;AAEN,MAAM,MAAM,QAAQ,CAAC,CAAC,SAAS,OAAO,GAAG,OAAO,EAAE,CAAC,SAAS,OAAO,GAAG,GAAG,IAAI;IAC3E,GAAG,EAAE,CAAC,IAAI,EAAE,CAAC,KAAK,CAAC,CAAC;IACpB,QAAQ,EAAE,CAAC,IAAI,EAAE,CAAC,KAAK,IAAI,CAAC;CAC7B,CAAC;AAEF;;;;;GAKG;AACH,MAAM,MAAM,QAAQ,GAChB,CAAC,EAAE,EAAE,iBAAiB,EAAE,UAAU,EAAE,MAAM,CAAC,GAE3C,CAAC,EAAE,EAAE,WAAW,EAAE,GAAG,EAAE,OAAO,EAAE,WAAW,EAAE,IAAI,CAAC,GAClD,CAAC,EAAE,EAAE,UAAU,EAAE,GAAG,EAAE,OAAO,EAAE,MAAM,EAAE,IAAI,CAAC,GAC5C,CAAC,EAAE,EAAE,UAAU,EAAE,SAAS,EAAE,MAAM,EAAE,MAAM,EAAE,IAAI,CAAC,GACjD,CAAC,EAAE,EAAE,SAAS,EAAE,SAAS,EAAE,MAAM,EAAE,OAAO,EAAE,IAAI,CAAC,GAEjD;IACE,EAAE,EAAE,WAAW;IACf,MAAM,EAAE,IAAI;IACZ,OAAO,EAAE,WAAW,GAAG,SAAS;IAChC,IAAI,EAAE,IAAI,EAAE;IACZ,SAAS,EAAE,MAAM;CAClB,GACD;IACE,EAAE,EAAE,eAAe;IACnB,MAAM,EAAE,IAAI;IACZ,OAAO,EAAE,WAAW,GAAG,SAAS;IAChC,IAAI,EAAE,IAAI,EAAE;IACZ,SAAS,EAAE,MAAM;CAClB,GACD;IACE,EAAE,EAAE,WAAW;IACf,MAAM,EAAE,IAAI;IACZ,OAAO,EAAE,WAAW,GAAG,SAAS;IAChC,IAAI,EAAE,IAAI,EAAE;IACZ,SAAS,EAAE,MAAM;CAClB,CAAC;AAEN;;;;;GAKG;AACH,MAAM,MAAM,cAAc,GACtB,CAAC,EAAE,EAAE,iBAAiB,EAAE,UAAU,EAAE,MAAM,CAAC,GAE3C,CAAC,EAAE,EAAE,WAAW,EAAE,GAAG,EAAE,OAAO,EAAE,WAAW,EAAE,IAAI,CAAC,GAClD,CAAC,EAAE,EAAE,UAAU,EAAE,GAAG,EAAE,OAAO,EAAE,MAAM,EAAE,IAAI,CAAC,GAC5C;IACE,EAAE,EAAE,QAAQ;IACZ,MAAM,EAAE,IAAI;IACZ,OAAO,EAAE,WAAW,GAAG,SAAS;IAChC,IAAI,EAAE,IAAI,EAAE;IACZ,SAAS,EAAE,MAAM;CAClB,GACD;IACE,EAAE,EAAE,YAAY;IAChB,MAAM,EAAE,IAAI;IACZ,OAAO,EAAE,WAAW,GAAG,SAAS;IAChC,IAAI,EAAE,IAAI,EAAE;IACZ,SAAS,EAAE,MAAM;CAClB,GACD;IACE,EAAE,EAAE,QAAQ;IACZ,MAAM,EAAE,IAAI;IACZ,OAAO,EAAE,WAAW,GAAG,SAAS;IAChC,IAAI,EAAE,IAAI,EAAE;IACZ,SAAS,EAAE,MAAM;CAClB,GACD,CAAC,EAAE,EAAE,UAAU,EAAE,SAAS,EAAE,MAAM,EAAE,MAAM,EAAE,IAAI,CAAC,GACjD,CAAC,EAAE,EAAE,SAAS,EAAE,SAAS,EAAE,MAAM,EAAE,OAAO,EAAE,IAAI,CAAC,GAEjD,CAAC,EAAE,EAAE,cAAc,EAAE,GAAG,EAAE,OAAO,EAAE,WAAW,EAAE,IAAI,CAAC,GACrD,CAAC,EAAE,EAAE,aAAa,EAAE,GAAG,EAAE,OAAO,EAAE,MAAM,EAAE,IAAI,CAAC,GAC/C;IACE,EAAE,EAAE,WAAW;IACf,MAAM,EAAE,IAAI;IACZ,OAAO,EAAE,WAAW,GAAG,SAAS;IAChC,IAAI,EAAE,IAAI,EAAE;IACZ,SAAS,EAAE,MAAM;CAClB,GACD;IACE,EAAE,EAAE,eAAe;IACnB,MAAM,EAAE,IAAI;IACZ,OAAO,EAAE,WAAW,GAAG,SAAS;IAChC,IAAI,EAAE,IAAI,EAAE;IACZ,SAAS,EAAE,MAAM;CAClB,GACD;IACE,EAAE,EAAE,WAAW;IACf,MAAM,EAAE,IAAI;IACZ,OAAO,EAAE,WAAW,GAAG,SAAS;IAChC,IAAI,EAAE,IAAI,EAAE;IACZ,SAAS,EAAE,MAAM;CAClB,GACD,CAAC,EAAE,EAAE,aAAa,EAAE,SAAS,EAAE,MAAM,EAAE,MAAM,EAAE,IAAI,CAAC,GACpD,CAAC,EAAE,EAAE,YAAY,EAAE,SAAS,EAAE,MAAM,EAAE,OAAO,EAAE,IAAI,CAAC,CAAC"}

package/src/types.ts

@@ -122,17 +122,14 @@ export type Ephemera<S extends WeakKey = WeakKey, V extends unknown = any> = {
  * yet support.
  */
 export type LogEntry =
-  | [
-      // ///////////////// From Host to Guest /////////////////////////
-      op: 'doFulfill',
-      vow: HostVow,
-      fulfillment: Host,
-    ]
+  | [op: 'startGeneration', generation: number]
+  // ///////////////// From Host to Guest /////////////////////////
+  | [op: 'doFulfill', vow: HostVow, fulfillment: Host]
   | [op: 'doReject', vow: HostVow, reason: Host]
   | [op: 'doReturn', callIndex: number, result: Host]
   | [op: 'doThrow', callIndex: number, problem: Host]
+  // ///////////////////// From Guest to Host /////////////////////////
   | [
-      // ///////////////////// From Guest to Host /////////////////////////
       op: 'checkCall',
       target: Host,
       optVerb: PropertyKey | undefined,
@@ -161,12 +158,9 @@ export type LogEntry =
  *   vows and remotables.
  */
 export type FutureLogEntry =
-  | [
-      // ///////////////// From Host to Guest ///////////////////////
-      op: 'doFulfill',
-      vow: HostVow,
-      fulfillment: Host,
-    ]
+  | [op: 'startGeneration', generation: number]
+  // ///////////////// From Host to Guest ///////////////////////
+  | [op: 'doFulfill', vow: HostVow, fulfillment: Host]
   | [op: 'doReject', vow: HostVow, reason: Host]
   | [
       op: 'doCall',
@@ -191,12 +185,8 @@ export type FutureLogEntry =
     ]
   | [op: 'doReturn', callIndex: number, result: Host]
   | [op: 'doThrow', callIndex: number, problem: Host]
-  | [
-      // ///////////////////// From Guest to Host /////////////////////////
-      op: 'checkFulfill',
-      vow: HostVow,
-      fulfillment: Host,
-    ]
+  // ///////////////////// From Guest to Host /////////////////////////
+  | [op: 'checkFulfill', vow: HostVow, fulfillment: Host]
   | [op: 'checkReject', vow: HostVow, reason: Host]
   | [
       op: 'checkCall',

package/test/log-store.test.js

@@ -15,11 +15,9 @@ import { makeDurableZone } from '@agoric/zone/durable.js';
 import { prepareLogStore } from '../src/log-store.js';
 
 /**
- * @import {PromiseKit} from '@endo/promise-kit'
  * @import {Zone} from '@agoric/base-zone'
- * @import {Vow, VowTools} from '@agoric/vow'
+ * @import {Vow} from '@agoric/vow'
  * @import {LogStore} from '../src/log-store.js';
- * @import {Bijection} from '../src/bijection.js';
  */
 
 /**
@@ -36,15 +34,23 @@ const testLogStorePlay = async (t, zone) => {
 
   t.is(log.getIndex(), 0);
   t.is(log.getLength(), 0);
-  t.throws(() => log.pushEntry(['bogus']), {
-    message:
-      /^In "pushEntry" method of \(LogStore\): arg 0: \["bogus"\] - Must match one of/,
-  });
+  t.throws(
+    () =>
+      // @ts-expect-error testing invalid input
+      log.pushEntry(['bogus']),
+    {
+      message:
+        /^In "pushEntry" method of \(LogStore\): arg 0: \["bogus"\] - Must match one of/,
+    },
+  );
   t.false(log.isReplaying());
   t.is(await log.promiseReplayDone(), undefined);
 
-  t.is(log.pushEntry(harden(['doFulfill', v1, 'x'])), 1);
-  t.is(log.pushEntry(harden(['doReject', v2, 'y'])), 2);
+  const gen0Entries = [['startGeneration', 0]];
+  const gen0 = i => gen0Entries.length + i;
+
+  t.is(log.pushEntry(harden(['doFulfill', v1, 'x'])), gen0(1));
+  t.is(log.pushEntry(harden(['doReject', v2, 'y'])), gen0(2));
   t.deepEqual(log.dump(), [
     ['doFulfill', v1, 'x'],
     ['doReject', v2, 'y'],
@@ -56,7 +62,8 @@ const testLogStorePlay = async (t, zone) => {
   t.is(toPassableCap(log.dump()[1][1]), toPassableCap(v2));
 
   t.is(log.getIndex(), 2);
-  t.is(log.getLength(), 2);
+  t.is(log.getUnfilteredIndex(), gen0(2));
+  t.is(log.getLength(), gen0(2));
   t.false(log.isReplaying());
   t.is(await log.promiseReplayDone(), undefined);
 };
@@ -75,14 +82,26 @@ const testLogStoreReplay = async (t, zone) => {
   const v1 = /** @type {Vow} */ (zone.makeOnce('v1', () => Fail`need v1`));
   const v2 = /** @type {Vow} */ (zone.makeOnce('v2', () => Fail`need v2`));
 
+  const gen0Entries = [['startGeneration', 0]];
+  const gen0 = i => gen0Entries.length + i;
+  const gen1Entries = [['startGeneration', 1]];
+  const gen1 = i => gen1Entries.length + i;
+
   t.is(log.getIndex(), 0);
-  t.is(log.getLength(), 2);
+  t.is(log.getUnfilteredIndex(), 0);
+  t.is(log.getLength(), gen0(2));
   t.true(log.isReplaying());
 
   t.deepEqual(log.dump(), [
     ['doFulfill', v1, 'x'],
     ['doReject', v2, 'y'],
   ]);
+
+  t.deepEqual(log.dumpUnfiltered(), [
+    ...gen0Entries,
+    ['doFulfill', v1, 'x'],
+    ['doReject', v2, 'y'],
+  ]);
   // Because t.deepEqual is too tolerant
   // @ts-expect-error data dependent typing
   t.is(toPassableCap(log.dump()[0][1]), toPassableCap(v1));
@@ -92,8 +111,24 @@ const testLogStoreReplay = async (t, zone) => {
   t.deepEqual(log.nextEntry(), ['doFulfill', v1, 'x']);
   t.deepEqual(log.nextEntry(), ['doReject', v2, 'y']);
   t.is(log.getIndex(), 2);
+  t.is(log.getUnfilteredIndex(), gen0(2));
   t.false(log.isReplaying());
   t.is(await log.promiseReplayDone(), undefined);
+
+  t.is(log.pushEntry(harden(['doFulfill', v1, 'x2'])), gen1(gen0(3)));
+  t.deepEqual(log.dumpUnfiltered(), [
+    ...gen0Entries,
+    ['doFulfill', v1, 'x'],
+    ['doReject', v2, 'y'],
+    ...gen1Entries,
+    ['doFulfill', v1, 'x2'],
+  ]);
+
+  // Check that a disposed log starts from scratch, but the same generation.
+  log.dispose();
+  t.deepEqual(log.dumpUnfiltered(), []);
+  t.is(log.pushEntry(harden(['doFulfill', v1, 'x3'])), gen1(1));
+  t.deepEqual(log.dumpUnfiltered(), [...gen1Entries, ['doFulfill', v1, 'x3']]);
 };
 
 await test.serial('test heap log-store', async t => {