@agoric/swingset-vat 0.33.0-upgrade-19-dev-0754752.0 → 0.33.0-upgrade-18a-dev-4ee0508.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@agoric/swingset-vat",
-  "version": "0.33.0-upgrade-19-dev-0754752.0+0754752",
+  "version": "0.33.0-upgrade-18a-dev-4ee0508.0+4ee0508",
   "description": "Vat/Container Launcher",
   "type": "module",
   "main": "src/index.js",
@@ -27,37 +27,37 @@
     "@types/yargs-parser": "^21.0.0"
   },
   "dependencies": {
-    "@agoric/internal": "0.4.0-upgrade-19-dev-0754752.0+0754752",
-    "@agoric/kmarshal": "0.1.1-upgrade-19-dev-0754752.0+0754752",
-    "@agoric/store": "0.9.3-upgrade-19-dev-0754752.0+0754752",
-    "@agoric/swing-store": "0.10.0-upgrade-19-dev-0754752.0+0754752",
-    "@agoric/swingset-liveslots": "0.10.3-upgrade-19-dev-0754752.0+0754752",
-    "@agoric/swingset-xsnap-supervisor": "0.10.3-upgrade-19-dev-0754752.0+0754752",
-    "@agoric/time": "0.3.3-upgrade-19-dev-0754752.0+0754752",
-    "@agoric/vat-data": "0.5.3-upgrade-19-dev-0754752.0+0754752",
-    "@agoric/xsnap-lockdown": "0.14.1-upgrade-19-dev-0754752.0+0754752",
+    "@agoric/internal": "0.4.0-upgrade-18a-dev-4ee0508.0+4ee0508",
+    "@agoric/kmarshal": "0.1.1-upgrade-18a-dev-4ee0508.0+4ee0508",
+    "@agoric/store": "0.9.3-upgrade-18a-dev-4ee0508.0+4ee0508",
+    "@agoric/swing-store": "0.10.0-upgrade-18a-dev-4ee0508.0+4ee0508",
+    "@agoric/swingset-liveslots": "0.10.3-upgrade-18a-dev-4ee0508.0+4ee0508",
+    "@agoric/swingset-xsnap-supervisor": "0.10.3-upgrade-18a-dev-4ee0508.0+4ee0508",
+    "@agoric/time": "0.3.3-upgrade-18a-dev-4ee0508.0+4ee0508",
+    "@agoric/vat-data": "0.5.3-upgrade-18a-dev-4ee0508.0+4ee0508",
+    "@agoric/xsnap-lockdown": "0.14.1-upgrade-18a-dev-4ee0508.0+4ee0508",
     "@endo/base64": "^1.0.9",
-    "@endo/bundle-source": "^3.5.1",
-    "@endo/captp": "^4.4.4",
-    "@endo/check-bundle": "^1.0.13",
-    "@endo/compartment-mapper": "^1.5.0",
-    "@endo/errors": "^1.2.9",
-    "@endo/eventual-send": "^1.3.0",
-    "@endo/far": "^1.1.10",
-    "@endo/import-bundle": "^1.3.3",
-    "@endo/init": "^1.1.8",
-    "@endo/marshal": "^1.6.3",
-    "@endo/nat": "^5.0.14",
-    "@endo/pass-style": "^1.4.8",
-    "@endo/patterns": "^1.4.8",
-    "@endo/promise-kit": "^1.1.9",
-    "@endo/ses-ava": "^1.2.9",
-    "@endo/stream": "^1.2.9",
+    "@endo/bundle-source": "^3.5.0",
+    "@endo/captp": "^4.4.3",
+    "@endo/check-bundle": "^1.0.12",
+    "@endo/compartment-mapper": "^1.4.0",
+    "@endo/errors": "^1.2.8",
+    "@endo/eventual-send": "^1.2.8",
+    "@endo/far": "^1.1.9",
+    "@endo/import-bundle": "^1.3.2",
+    "@endo/init": "^1.1.7",
+    "@endo/marshal": "^1.6.2",
+    "@endo/nat": "^5.0.13",
+    "@endo/pass-style": "^1.4.7",
+    "@endo/patterns": "^1.4.7",
+    "@endo/promise-kit": "^1.1.8",
+    "@endo/ses-ava": "^1.2.8",
+    "@endo/stream": "^1.2.8",
     "@endo/zip": "^1.0.9",
     "ansi-styles": "^6.2.1",
     "anylogger": "^0.21.0",
     "better-sqlite3": "^9.1.1",
-    "import-meta-resolve": "^4.1.0",
+    "import-meta-resolve": "^2.2.1",
     "microtime": "^3.1.0",
     "semver": "^6.3.0",
     "tmp": "^0.2.1",
@@ -94,7 +94,8 @@
     "require": [
       "@endo/init/debug.js"
     ],
-    "timeout": "20m"
+    "timeout": "20m",
+    "workerThreads": false
   },
   "publishConfig": {
     "access": "public"
@@ -102,5 +103,5 @@
   "typeCoverage": {
     "atLeast": 76.28
   },
-  "gitHead": "07547522e9d8a06692fa5ff12c35230ddb4b252b"
+  "gitHead": "4ee05088e5ada989a866a11ff65838d395505ce6"
 }

package/src/controller/controller.js

@@ -16,7 +16,6 @@ import { initSwingStore } from '@agoric/swing-store';
 import { mustMatch, M } from '@endo/patterns';
 import { checkBundle } from '@endo/check-bundle/lite.js';
 import { deepCopyJsonable } from '@agoric/internal/src/js-utils.js';
-import { makeLimitedConsole } from '@agoric/internal/src/ses-utils.js';
 import engineGC from '@agoric/internal/src/lib-nodejs/engine-gc.js';
 import { startSubprocessWorker } from '@agoric/internal/src/lib-nodejs/spawnSubprocessWorker.js';
 import { waitUntilQuiescent } from '@agoric/internal/src/lib-nodejs/waitUntilQuiescent.js';
@@ -36,10 +35,6 @@ import {
 import { makeStartXSnap } from './startXSnap.js';
 import { makeStartSubprocessWorkerNode } from './startNodeSubprocess.js';
 
-/**
- * @import {EReturn} from '@endo/far';
- */
-
 /**
  * @typedef { import('../types-internal.js').VatID } VatID
  */
@@ -57,32 +52,34 @@ export function computeSha512(bytes) {
   return hash.digest().toString('hex');
 }
 
-/**
- * Make logger functions from either a prefix string or a function that receives
- * the first argument of a log-method invocation and returns a replacement that
- * provides more detail for source identification.
- *
- * @param {string | ((originalSource: unknown) => string)} prefixer
- */
-function makeConsole(prefixer) {
-  if (typeof prefixer !== 'function') {
-    const logger = anylogger(prefixer);
-    return makeLimitedConsole(level => logger[level]);
+/** @param {string | ((args: unknown[]) => string)} tagOrTagCreator */
+function makeConsole(tagOrTagCreator) {
+  /** @type {(level: string) => (args: unknown[]) => void} */
+  let makeLoggerForLevel;
+  if (typeof tagOrTagCreator === 'function') {
+    const tagToLogger = new Map();
+    makeLoggerForLevel =
+      level =>
+      (...args) => {
+        // Retrieve the logger from cache.
+        const tag = tagOrTagCreator(args);
+        let logger = tagToLogger.get(tag);
+        if (!logger) {
+          logger = anylogger(tag);
+          tagToLogger.set(tag, logger);
+        }
+        // Actually log the message.
+        return logger[level](...args);
+      };
+  } else {
+    const logger = anylogger(tagOrTagCreator);
+    makeLoggerForLevel = level => logger[level];
   }
-
-  const prefixToLogger = new Map();
-  return makeLimitedConsole(level => {
-    return (source, ...args) => {
-      const prefix = prefixer(source);
-      let logger = prefixToLogger.get(prefix);
-      if (!logger) {
-        logger = anylogger(prefix);
-        prefixToLogger.set(prefix, logger);
-      }
-
-      return logger[level](...args);
-    };
-  });
+  const cons = {};
+  for (const level of ['debug', 'log', 'info', 'warn', 'error']) {
+    cons[level] = makeLoggerForLevel(level);
+  }
+  return harden(cons);
 }
 
 /**
@@ -212,23 +209,17 @@ export async function makeSwingsetController(
     process.on('unhandledRejection', unhandledRejectionHandler);
   }
 
-  const kernelConsole = makeConsole(`${debugPrefix}SwingSet:kernel`);
-  const sloggingKernelConsole = makeLimitedConsole(level => {
-    return (...args) => {
-      kernelConsole[level](...args);
-      writeSlogObject({ type: 'console', source: 'kernel', args });
-    };
-  });
+  function kernelRequire(what) {
+    Fail`kernelRequire unprepared to satisfy require(${what})`;
+  }
   writeSlogObject({ type: 'import-kernel-start' });
   const kernelNS = await importBundle(kernelBundle, {
     filePrefix: 'kernel/...',
     endowments: {
-      console: sloggingKernelConsole,
+      console: makeConsole(`${debugPrefix}SwingSet:kernel`),
       // See https://github.com/Agoric/agoric-sdk/issues/9515
       assert: globalThis.assert,
-      require: harden(
-        what => Fail`kernelRequire unprepared to satisfy require(${what})`,
-      ),
+      require: kernelRequire,
       URL: globalThis.Base64, // Unavailable only on XSnap
       Base64: globalThis.Base64, // Available only on XSnap
     },
@@ -486,7 +477,7 @@ export async function makeSwingsetController(
      *
      * The first `controller.run()` after this call will delete all
      * the old vat's state at once, unless you use a
-     * [`runPolicy`](../../docs/run-policy.md) to rate-limit cleanups.
+     * [`runPolicy`](../docs/run-policy.md) to rate-limit cleanups.
      *
      * @param {VatID} vatID
      * @param {SwingSetCapData} reasonCD
@@ -503,7 +494,7 @@ export async function makeSwingsetController(
 
   return controller;
 }
-/** @typedef {EReturn<typeof makeSwingsetController>} SwingsetController */
+/** @typedef {Awaited<ReturnType<typeof makeSwingsetController>>} SwingsetController */
 
 /**
  * NB: To be used only in tests. An app with this may not survive a reboot.

package/src/controller/initializeKernel.js

@@ -100,6 +100,7 @@ export async function initializeKernel(config, kernelStorage, options = {}) {
       // the VatManager, since it isn't available until the bundle is evaluated
       assertKnownOptions(creationOptions, [
         'enablePipelining',
+        'metered',
         'managerType',
         'enableDisavow',
         'enableSetup',

package/src/controller/initializeSwingset.js

@@ -442,24 +442,26 @@ export async function initializeSwingset(
    * The host application gives us
    * config.[vats|devices].NAME.[bundle|bundleSpec|sourceSpec|bundleName] .
    * The 'bundleName' option points into
-   * config.bundles.BUNDLENAME.[bundle|bundleSpec|sourceSpec], which can
+   * config.bundles.BUNDLENAME.[bundle|bundleSpec|sourceSpec] , which can
    * also include arbitrary named bundles that will be made available to
-   * E(vatAdminService).getNamedBundleCap(bundleName), and temporarily as
+   * E(vatAdminService).getNamedBundleCap(bundleName) ,and temporarily as
    * E(vatAdminService).createVatByName(bundleName)
    *
    * The 'kconfig' we pass through to initializeKernel has
    * kconfig.[vats|devices].NAME.bundleID and
-   * kconfig.namedBundleIDs.BUNDLENAME=bundleID, which both point into
+   * kconfig.namedBundleIDs.BUNDLENAME=bundleID , which both point into
    * kconfig.idToBundle.BUNDLEID=bundle
    *
-   * @param {SwingSetConfigProperties} desc
+   * @param {SwingSetConfigProperties | { bundleName: string }} desc
    * @param {Record<string, *>} [nameToBundle]
    */
   async function getBundle(desc, nameToBundle) {
     trace(
       'getBundle',
       Object.keys(desc),
+      // @ts-expect-error optional
       desc.moduleFormat,
+      // @ts-expect-error optional
       desc.endoZipBase64Sha512 || desc.sourceSpec,
     );
 
@@ -487,9 +489,8 @@ export async function initializeSwingset(
     throw Error(`unknown mode in desc`, desc);
   }
 
+  // fires with BundleWithID: { ...bundle, id }
   /**
-   * Returns a bundle record with an "id" property from an input that might be missing it.
-   *
    * @param {EndoZipBase64Bundle & {id?: string}} bundle
    * @returns {Promise<EndoZipBase64Bundle & {id: string}>} bundle
    */
@@ -507,9 +508,11 @@ export async function initializeSwingset(
     };
   }
 
+  // fires with BundleWithID: { ...bundle, id }
+
   /**
    *
-   * @param {SwingSetConfigProperties & {bundleID?: string}} desc
+   * @param {(SwingSetConfigProperties | { bundleName: string }) & {bundleID?: string }} desc
    * @param {Record<string, EndoZipBase64Bundle>} [nameToBundle]
    */
   async function processDesc(desc, nameToBundle) {
@@ -523,14 +526,14 @@ export async function initializeSwingset(
     modes.length === 1 ||
       Fail`need =1 of bundle/bundleSpec/sourceSpec/bundleName, got ${modes}`;
     const mode = modes[0];
-
-    // Remove the original mode in favor of a uniform "bundleID" property.
-    const bundle = await getBundle(desc, nameToBundle);
-    const bundleWithID = await addBundleID(bundle);
-    delete desc[mode];
-    desc.bundleID = bundleWithID.id;
-
-    return bundleWithID;
+    return getBundle(desc, nameToBundle)
+      .then(addBundleID)
+      .then(bundleWithID => {
+        // replace original .sourceSpec/etc with a uniform .bundleID
+        delete desc[mode];
+        desc.bundleID = bundleWithID.id;
+        return bundleWithID;
+      });
   }
 
   /**

package/src/kernel/kernel.js

@@ -9,7 +9,7 @@ import { makeUpgradeDisconnection } from '@agoric/internal/src/upgrade-api.js';
 import { kser, kslot, makeError } from '@agoric/kmarshal';
 import { assertKnownOptions } from '../lib/assertOptions.js';
 import { foreverPolicy } from '../lib/runPolicies.js';
-import { makeVatManagerMaker } from './vat-loader/manager-factory.js';
+import { makeVatManagerFactory } from './vat-loader/manager-factory.js';
 import { makeVatWarehouse } from './vat-warehouse.js';
 import makeDeviceManager from './deviceManager.js';
 import makeKernelKeeper, {
@@ -110,10 +110,11 @@ export default function buildKernel(
     warehousePolicy,
     overrideVatManagerOptions = {},
   } = kernelRuntimeOptions;
-  const logStartup = verbose ? console.debug : () => {};
+  const logStartup = verbose ? console.debug : () => 0;
 
   const vatAdminRootKref = kernelStorage.kvStore.get('vatAdminRootKref');
 
+  /** @type { KernelSlog } */
   const kernelSlog = writeSlogObject
     ? makeSlogger(slogCallbacks, writeSlogObject)
     : makeDummySlogger(slogCallbacks, makeConsole('disabled slogger'));
@@ -166,9 +167,10 @@ export default function buildKernel(
   harden(testLog);
 
   function makeSourcedConsole(vatID) {
-    const origConsole = makeConsole(
-      source => `${debugPrefix}SwingSet:${source}:${vatID}`,
-    );
+    const origConsole = makeConsole(args => {
+      const source = args.shift();
+      return `${debugPrefix}SwingSet:${source}:${vatID}`;
+    });
     return kernelSlog.vatConsole(vatID, origConsole);
   }
 
@@ -1555,7 +1557,7 @@ export default function buildKernel(
     gcAndFinalize,
     meterControl: makeDummyMeterControl(),
   });
-  const makeVatManager = makeVatManagerMaker({
+  const vatManagerFactory = makeVatManagerFactory({
     allVatPowers,
     kernelKeeper,
     vatEndowments,
@@ -1650,7 +1652,7 @@ export default function buildKernel(
   }
 
   const vatLoader = makeVatLoader({
-    makeVatManager,
+    vatManagerFactory,
     kernelSlog,
     makeSourcedConsole,
     kernelKeeper,