@agoric/swingset-vat 0.32.3-dev-7ffae88.0 → 0.32.3-dev-32c4d68.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@agoric/swingset-vat",
-  "version": "0.32.3-dev-7ffae88.0+7ffae88",
+  "version": "0.32.3-dev-32c4d68.0+32c4d68",
   "description": "Vat/Container Launcher",
   "type": "module",
   "main": "src/index.js",
@@ -27,33 +27,33 @@
     "@types/yargs-parser": "^21.0.0"
   },
   "dependencies": {
-    "@agoric/assert": "0.6.1-dev-7ffae88.0+7ffae88",
-    "@agoric/internal": "0.3.3-dev-7ffae88.0+7ffae88",
-    "@agoric/kmarshal": "0.1.1-dev-7ffae88.0+7ffae88",
-    "@agoric/store": "0.9.3-dev-7ffae88.0+7ffae88",
-    "@agoric/swing-store": "0.9.2-dev-7ffae88.0+7ffae88",
-    "@agoric/swingset-liveslots": "0.10.3-dev-7ffae88.0+7ffae88",
-    "@agoric/swingset-xsnap-supervisor": "0.10.3-dev-7ffae88.0+7ffae88",
-    "@agoric/time": "0.3.3-dev-7ffae88.0+7ffae88",
-    "@agoric/vat-data": "0.5.3-dev-7ffae88.0+7ffae88",
-    "@agoric/xsnap": "0.14.3-dev-7ffae88.0+7ffae88",
-    "@agoric/xsnap-lockdown": "0.14.1-dev-7ffae88.0+7ffae88",
-    "@endo/base64": "^1.0.1",
-    "@endo/bundle-source": "^3.0.2",
-    "@endo/captp": "^4.0.2",
-    "@endo/check-bundle": "^1.0.2",
-    "@endo/compartment-mapper": "^1.1.0",
-    "@endo/eventual-send": "^1.1.0",
-    "@endo/far": "^1.0.2",
-    "@endo/import-bundle": "^1.0.2",
-    "@endo/init": "^1.0.2",
-    "@endo/marshal": "^1.1.0",
-    "@endo/nat": "^5.0.2",
-    "@endo/patterns": "^1.1.0",
-    "@endo/promise-kit": "^1.0.2",
-    "@endo/ses-ava": "^1.1.0",
-    "@endo/stream": "^1.0.2",
-    "@endo/zip": "^1.0.1",
+    "@agoric/assert": "0.6.1-dev-32c4d68.0+32c4d68",
+    "@agoric/internal": "0.3.3-dev-32c4d68.0+32c4d68",
+    "@agoric/kmarshal": "0.1.1-dev-32c4d68.0+32c4d68",
+    "@agoric/store": "0.9.3-dev-32c4d68.0+32c4d68",
+    "@agoric/swing-store": "0.9.2-dev-32c4d68.0+32c4d68",
+    "@agoric/swingset-liveslots": "0.10.3-dev-32c4d68.0+32c4d68",
+    "@agoric/swingset-xsnap-supervisor": "0.10.3-dev-32c4d68.0+32c4d68",
+    "@agoric/time": "0.3.3-dev-32c4d68.0+32c4d68",
+    "@agoric/vat-data": "0.5.3-dev-32c4d68.0+32c4d68",
+    "@agoric/xsnap": "0.14.3-dev-32c4d68.0+32c4d68",
+    "@agoric/xsnap-lockdown": "0.14.1-dev-32c4d68.0+32c4d68",
+    "@endo/base64": "^1.0.2",
+    "@endo/bundle-source": "^3.1.0",
+    "@endo/captp": "^4.0.4",
+    "@endo/check-bundle": "^1.0.4",
+    "@endo/compartment-mapper": "^1.1.2",
+    "@endo/eventual-send": "^1.1.2",
+    "@endo/far": "^1.0.4",
+    "@endo/import-bundle": "^1.0.4",
+    "@endo/init": "^1.0.4",
+    "@endo/marshal": "^1.3.0",
+    "@endo/nat": "^5.0.4",
+    "@endo/patterns": "^1.2.0",
+    "@endo/promise-kit": "^1.0.4",
+    "@endo/ses-ava": "^1.1.2",
+    "@endo/stream": "^1.1.0",
+    "@endo/zip": "^1.0.2",
     "ansi-styles": "^6.2.1",
     "anylogger": "^0.21.0",
     "better-sqlite3": "^9.1.1",
@@ -100,7 +100,7 @@
     "access": "public"
   },
   "typeCoverage": {
-    "atLeast": 75.36
+    "atLeast": 75.05
   },
-  "gitHead": "7ffae88ae37df782d5ffe3cf92261a498b0f636c"
+  "gitHead": "32c4d68c5f675f1e8fea1a8bc08621816e7b491e"
 }

package/src/kernel/slogger.js

@@ -138,6 +138,10 @@ export function makeSlogger(slogCallbacks, writeObj) {
       const vc = {};
       for (const level of ['debug', 'log', 'info', 'warn', 'error']) {
         vc[level] = (sourceTag, ...args) => {
+          if (replay) {
+            // Don't duplicate stale console output.
+            return;
+          }
           sourcedConsole[level](sourceTag, ...args);
           const when = { state, crankNum, vatID, deliveryNum };
           const source = sourceTag === 'ls' ? 'liveslots' : sourceTag;

package/src/types-external.js

@@ -134,12 +134,14 @@ export {};
  *                                  dynamic?: boolean,
  *                                  description?: string,
  *                                  name?: string,
- *                                  vatSourceBundle?: *,
+ *                                  vatSourceBundle?: unknown,
  *                                  managerType?: string,
- *                                  vatParameters?: *) => VatSlog,
+ *                                  vatParameters?: unknown) => { vatSlog: VatSlog },
  *              terminateVat: (vatID: string, shouldReject: boolean, info: SwingSetCapData) => void,
  *             } } KernelSlog
- * @typedef { * } VatSlog
+ * @typedef {{
+ *   delivery: (crankNum: bigint, deliveryNum: bigint, kd: KernelDeliveryObject, vd: VatDeliveryObject) => SlogFinishDelivery,
+ * }} VatSlog
  *
  * @typedef { () => Promise<void> } WaitUntilQuiescent
  */

package/src/vats/vat-admin/vat-vat-admin.js

@@ -174,7 +174,7 @@ export function buildRootObject(vatPowers, _vatParameters, baggage) {
 
   function pauseService() {
     if (!quiescentP) {
-      [quiescentP, quiescentRR] = producePRR();
+      void ([quiescentP, quiescentRR] = producePRR());
     }
     checkForQuiescence();
     return quiescentP;

package/tools/run-utils.js

@@ -2,35 +2,30 @@ import { Fail, q } from '@agoric/assert';
 import { kunser } from '@agoric/kmarshal';
 import { makeQueue } from '@endo/stream';
 
-const sink = () => {};
-
 /**
  * @param {import('../src/controller/controller.js').SwingsetController} controller
  */
 export const makeRunUtils = controller => {
   const mutex = makeQueue();
-
-  mutex.put(controller.run());
+  const logRunFailure = reason =>
+    console.log('controller.run() failure', reason);
+  mutex.put(controller.run().catch(logRunFailure));
 
   /**
-   * @template {() => any} T
-   * @param {T} thunk
-   * @returns {Promise<ReturnType<T>>}
+   * Wait for exclusive access to the controller, then before relinquishing that access,
+   * enqueue and process a delivery and return the result.
+   *
+   * @param {() => import('@endo/far').ERef<void | ReturnType<controller['queueToVatObject']>>} deliveryThunk
+   * function for enqueueing a delivery and returning the result kpid (if any)
+   * @param {boolean} [voidResult] whether to ignore the result
+   * @returns {Promise<any>}
    */
-  const runThunk = async thunk => {
-    // this promise for the last lock may fail
-    // sink because the result will resolve for the previous runMethod return
-    await mutex.get().catch(sink);
-
-    const thunkResult = await thunk();
-
-    const result = controller.run().then(() => thunkResult);
-    mutex.put(result.then(sink, sink));
-    return result;
-  };
-
   const queueAndRun = async (deliveryThunk, voidResult = false) => {
-    const kpid = await runThunk(deliveryThunk);
+    await mutex.get();
+    const kpid = await deliveryThunk();
+    const runResultP = controller.run();
+    mutex.put(runResultP.catch(logRunFailure));
+    await runResultP;
 
     if (voidResult) {
       return undefined;
@@ -146,7 +141,7 @@ export const makeRunUtils = controller => {
         }),
     },
   );
-  return harden({ runThunk, EV });
+  return harden({ queueAndRun, EV });
 };
 
 /**