@agoric/swingset-vat 0.32.2 → 0.32.3-calypso-dev-84eb287.0

package/README.md

@@ -15,7 +15,7 @@ this is insufficient to provide persistence across restarts.
 
 More docs are in the works. For now, try:
 
-```
+```console
 $ npm install
 $ npm test
 $ bin/vat run demo/encouragementBot
@@ -26,7 +26,7 @@ expected to stabilize for a while.
 
 ## REPL Shell
 
-```
+```console
 $ bin/vat shell demo/encouragementBot
 vat>
 ```

package/package.json

@@ -1,11 +1,11 @@
 {
   "name": "@agoric/swingset-vat",
-  "version": "0.32.2",
+  "version": "0.32.3-calypso-dev-84eb287.0+84eb287",
   "description": "Vat/Container Launcher",
   "type": "module",
   "main": "src/index.js",
   "engines": {
-    "node": ">=14.15.0"
+    "node": "^18.12 || ^20.9"
   },
   "bin": {
     "vat": "bin/vat"
@@ -14,53 +14,57 @@
     "build": "exit 0",
     "test": "ava",
     "test:xs": "SWINGSET_WORKER_TYPE=xs-worker ava",
-    "test:xs-worker": "ava test/workers/test-worker.js -m 'xsnap vat manager'",
+    "test:xs-worker": "ava test/workers -m 'xsnap vat manager'",
     "lint-fix": "yarn lint:eslint --fix",
     "lint": "run-s --continue-on-error lint:*",
-    "lint:types": "tsc -p jsconfig.json",
+    "lint:types": "tsc",
     "lint:eslint": "eslint ."
   },
   "devDependencies": {
-    "@types/better-sqlite3": "^7.5.0",
+    "@types/better-sqlite3": "^7.6.9",
     "@types/microtime": "^2.1.0",
     "@types/tmp": "^0.2.0",
-    "better-sqlite3": "^8.2.0",
-    "yargs-parser": "^21.1.1"
+    "@types/yargs-parser": "^21.0.0"
   },
   "dependencies": {
-    "@agoric/assert": "^0.6.0",
-    "@agoric/internal": "^0.3.2",
-    "@agoric/store": "^0.9.2",
-    "@agoric/swing-store": "^0.9.1",
-    "@agoric/swingset-liveslots": "^0.10.2",
-    "@agoric/swingset-xsnap-supervisor": "^0.10.2",
-    "@agoric/time": "^0.3.2",
-    "@agoric/vat-data": "^0.5.2",
-    "@agoric/xsnap": "^0.14.2",
-    "@agoric/xsnap-lockdown": "^0.14.0",
-    "@endo/base64": "^0.2.31",
-    "@endo/bundle-source": "^2.5.1",
-    "@endo/captp": "^3.1.1",
-    "@endo/check-bundle": "^0.2.18",
-    "@endo/compartment-mapper": "^0.8.4",
-    "@endo/eventual-send": "^0.17.2",
-    "@endo/far": "^0.2.18",
-    "@endo/import-bundle": "^0.3.4",
-    "@endo/init": "^0.5.56",
-    "@endo/marshal": "^0.8.5",
-    "@endo/nat": "^4.1.27",
-    "@endo/promise-kit": "^0.2.56",
-    "@endo/zip": "^0.2.31",
+    "@agoric/assert": "0.6.1-calypso-dev-84eb287.0+84eb287",
+    "@agoric/internal": "0.3.3-calypso-dev-84eb287.0+84eb287",
+    "@agoric/kmarshal": "0.1.1-calypso-dev-84eb287.0+84eb287",
+    "@agoric/store": "0.9.3-calypso-dev-84eb287.0+84eb287",
+    "@agoric/swing-store": "0.9.2-calypso-dev-84eb287.0+84eb287",
+    "@agoric/swingset-liveslots": "0.10.3-calypso-dev-84eb287.0+84eb287",
+    "@agoric/swingset-xsnap-supervisor": "0.10.3-calypso-dev-84eb287.0+84eb287",
+    "@agoric/time": "0.3.3-calypso-dev-84eb287.0+84eb287",
+    "@agoric/vat-data": "0.5.3-calypso-dev-84eb287.0+84eb287",
+    "@agoric/xsnap": "0.14.3-calypso-dev-84eb287.0+84eb287",
+    "@agoric/xsnap-lockdown": "0.14.1-calypso-dev-84eb287.0+84eb287",
+    "@endo/base64": "^1.0.5",
+    "@endo/bundle-source": "^3.2.3",
+    "@endo/captp": "^4.2.0",
+    "@endo/check-bundle": "^1.0.7",
+    "@endo/compartment-mapper": "^1.1.5",
+    "@endo/eventual-send": "^1.2.2",
+    "@endo/far": "^1.1.2",
+    "@endo/import-bundle": "^1.1.2",
+    "@endo/init": "^1.1.2",
+    "@endo/marshal": "^1.5.0",
+    "@endo/nat": "^5.0.7",
+    "@endo/patterns": "^1.4.0",
+    "@endo/promise-kit": "^1.1.2",
+    "@endo/ses-ava": "^1.2.2",
+    "@endo/stream": "^1.2.2",
+    "@endo/zip": "^1.0.5",
     "ansi-styles": "^6.2.1",
     "anylogger": "^0.21.0",
+    "better-sqlite3": "^9.1.1",
     "import-meta-resolve": "^2.2.1",
     "microtime": "^3.1.0",
     "semver": "^6.3.0",
-    "tmp": "^0.2.1"
+    "tmp": "^0.2.1",
+    "yargs-parser": "^21.1.1"
   },
   "peerDependencies": {
-    "@endo/ses-ava": "^0.2.40",
-    "ava": "^5.2.0"
+    "ava": "^5.3.0"
   },
   "files": [
     "bin/vat",
@@ -84,7 +88,10 @@
   },
   "ava": {
     "files": [
-      "test/**/test-*.js"
+      "test/**/*.test.*"
+    ],
+    "require": [
+      "@endo/init/debug.js"
     ],
     "timeout": "20m",
     "workerThreads": false
@@ -92,5 +99,8 @@
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "b66bf7c881ae462fcb617cd6e8d41b5c40ec58ef"
+  "typeCoverage": {
+    "atLeast": 75.02
+  },
+  "gitHead": "84eb287915c8255d68e845a9b6e10c790f0d54cb"
 }

package/src/controller/controller.js

@@ -1,5 +1,4 @@
 /* global globalThis, WeakRef, FinalizationRegistry */
-/* eslint-disable @typescript-eslint/prefer-ts-expect-error -- https://github.com/Agoric/agoric-sdk/issues/4620 */
 
 import process from 'process';
 import crypto from 'crypto';
@@ -10,15 +9,17 @@ import { tmpName } from 'tmp';
 import anylogger from 'anylogger';
 import microtime from 'microtime';
 
-import { assert, Fail, q } from '@agoric/assert';
+import { assert, Fail } from '@agoric/assert';
 import { importBundle } from '@endo/import-bundle';
 import { initSwingStore } from '@agoric/swing-store';
 
+import { mustMatch, M } from '@endo/patterns';
 import { checkBundle } from '@endo/check-bundle/lite.js';
-import engineGC from '../lib-nodejs/engine-gc.js';
-import { waitUntilQuiescent } from '../lib-nodejs/waitUntilQuiescent.js';
-import { makeGcAndFinalize } from '../lib-nodejs/gc-and-finalize.js';
-import { kslot } from '../lib/kmarshal.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';
+import { makeGcAndFinalize } from '@agoric/internal/src/lib-nodejs/gc-and-finalize.js';
+import { kslot, krefOf } from '@agoric/kmarshal';
 import { insistStorageAPI } from '../lib/storageAPI.js';
 import {
   buildKernelBundle,
@@ -30,6 +31,13 @@ import {
   makeXsnapBundleData,
 } from './bundle-handler.js';
 import { makeStartXSnap } from './startXSnap.js';
+import { makeStartSubprocessWorkerNode } from './startNodeSubprocess.js';
+
+const endoZipBase64Sha512Shape = harden({
+  moduleFormat: 'endoZipBase64',
+  endoZipBase64: M.string(harden({ stringLengthLimit: Infinity })),
+  endoZipBase64Sha512: M.string(),
+});
 
 /** @param {Uint8Array} bytes */
 export function computeSha512(bytes) {
@@ -94,6 +102,8 @@ function unhandledRejectionHandler(e, pr) {
  *   kernelBundle?: Bundle
  *   xsnapBundleData?: ReturnType<import('./bundle-handler.js').makeXsnapBundleData>,
  *   bundleHandler?: import('./bundle-handler.js').BundleHandler,
+ *   profileVats?: string[],
+ *   debugVats?: string[],
  * }} runtimeOptions
  */
 export async function makeSwingsetController(
@@ -117,6 +127,8 @@ export async function makeSwingsetController(
     warehousePolicy = {},
     overrideVatManagerOptions = {},
     xsnapBundleData = makeXsnapBundleData(),
+    profileVats = [],
+    debugVats = [],
   } = runtimeOptions;
   const {
     bundleHandler = makeWorkerBundleHandler(
@@ -137,7 +149,14 @@ export async function makeSwingsetController(
     tmpName,
     debug: !!env.XSNAP_DEBUG,
     workerTraceRootPath: env.XSNAP_TEST_RECORD,
+    profileVats,
+    debugVats,
   });
+  const startSubprocessWorkerNode = makeStartSubprocessWorkerNode(
+    startSubprocessWorker,
+    profileVats,
+    debugVats,
+  );
 
   function writeSlogObject(obj) {
     if (!slogSender) {
@@ -157,7 +176,6 @@ export async function makeSwingsetController(
     slogSender(timedObj);
   }
 
-  // eslint-disable-next-line no-shadow
   const console = makeConsole(`${debugPrefix}SwingSet:controller`);
   // We can harden this 'console' because it's new, but if we were using the
   // original 'console' object (which has a unique prototype), we'd have to
@@ -168,7 +186,7 @@ export async function makeSwingsetController(
   writeSlogObject({ type: 'kernel-init-start' });
 
   writeSlogObject({ type: 'bundle-kernel-start' });
-  // eslint-disable-next-line @jessie.js/no-nested-await
+  await null;
   const { kernelBundle = await buildKernelBundle() } = runtimeOptions;
   writeSlogObject({ type: 'bundle-kernel-finish' });
 
@@ -193,7 +211,8 @@ export async function makeSwingsetController(
     filePrefix: 'kernel/...',
     endowments: {
       console: makeConsole(`${debugPrefix}SwingSet:kernel`),
-      assert,
+      // See https://github.com/Agoric/agoric-sdk/issues/9515
+      assert: globalThis.assert,
       require: kernelRequire,
       URL: globalThis.Base64, // Unavailable only on XSnap
       Base64: globalThis.Base64, // Available only on XSnap
@@ -211,6 +230,7 @@ export async function makeSwingsetController(
     debugPrefix,
     vatEndowments,
     makeConsole,
+    startSubprocessWorkerNode,
     startXSnap,
     slogCallbacks,
     writeSlogObject,
@@ -225,7 +245,7 @@ export async function makeSwingsetController(
     warehousePolicy,
     overrideVatManagerOptions,
   };
-  /** @type { ReturnType<typeof import('../kernel').default> } */
+  /** @type { ReturnType<typeof import('../kernel/kernel.js').default> } */
   const kernel = buildKernel(
     kernelEndowments,
     deviceEndowments,
@@ -252,21 +272,11 @@ export async function makeSwingsetController(
    * @param {BundleID} [allegedBundleID]
    * @returns {Promise<BundleID>}
    */
-  async function validateAndInstallBundle(bundle, allegedBundleID) {
+  async function validateAndInstallBundle(bundle, allegedBundleID = undefined) {
     // TODO The following assertion may be removed when checkBundle subsumes
     // the responsibility to verify the permanence of a bundle's properties.
     // https://github.com/endojs/endo/issues/1106
-
-    Object.values(Object.getOwnPropertyDescriptors(bundle)).every(
-      ({ value, get, writable, configurable }) =>
-        typeof value === 'string' &&
-        get === undefined &&
-        // @ts-ignore `isFake` purposely omitted from type
-        (harden.isFake || (writable === false && configurable === false)),
-    ) ||
-      Fail`Bundle with alleged ID ${q(
-        allegedBundleID,
-      )} must be a frozen object with only string value properties, no accessors`;
+    mustMatch(bundle, endoZipBase64Sha512Shape);
     await checkBundle(bundle, computeSha512, allegedBundleID);
     const { endoZipBase64Sha512 } = bundle;
     assert.typeof(endoZipBase64Sha512, 'string');
@@ -316,6 +326,10 @@ export async function makeSwingsetController(
       return kernel.shutdown();
     },
 
+    reapAllVats() {
+      kernel.reapAllVats();
+    },
+
     changeKernelOptions(options) {
       kernel.changeKernelOptions(options);
     },
@@ -357,6 +371,7 @@ export async function makeSwingsetController(
       kernelStorage.emitCrankHashes();
       return result;
     },
+
     vatNameToID(vatName) {
       return kernel.vatNameToID(vatName);
     },
@@ -368,13 +383,15 @@ export async function makeSwingsetController(
      * Queue a method call into the named vat
      *
      * @param {string} vatName
-     * @param {string} method
+     * @param {string|symbol} method
      * @param {unknown[]} args
      * @param {ResolutionPolicy} resultPolicy
      */
     queueToVatRoot(vatName, method, args = [], resultPolicy = 'ignore') {
       const vatID = kernel.vatNameToID(vatName);
-      assert.typeof(method, 'string');
+      if (typeof method !== 'symbol') {
+        assert.typeof(method, 'string');
+      }
       const kref = kernel.getRootObject(vatID);
       const kpid = kernel.queueToKref(kref, method, args, resultPolicy);
       if (kpid) {
@@ -384,6 +401,28 @@ export async function makeSwingsetController(
       return kpid;
     },
 
+    /**
+     * Queue a method call to an object represented by a kmarshal token
+     *
+     * @param {any} target
+     * @param {string|symbol} method
+     * @param {unknown[]} args
+     * @param {ResolutionPolicy} resultPolicy
+     */
+    queueToVatObject(target, method, args = [], resultPolicy = 'ignore') {
+      const targetKref = krefOf(target);
+      assert.typeof(targetKref, 'string');
+      if (typeof method !== 'symbol') {
+        assert.typeof(method, 'string');
+      }
+      const kpid = kernel.queueToKref(targetKref, method, args, resultPolicy);
+      if (kpid) {
+        kernel.kpRegisterInterest(kpid);
+      }
+      kernelStorage.emitCrankHashes();
+      return kpid;
+    },
+
     upgradeStaticVat(vatName, shouldPauseFirst, bundleID, options = {}) {
       const vatID = kernel.vatNameToID(vatName);
       let pauseTarget = null;
@@ -473,8 +512,8 @@ export async function buildVatController(
   };
   const initializationOptions = { verbose, kernelBundles };
   let bootstrapResult;
+  await null;
   if (!swingsetIsInitialized(kernelStorage)) {
-    // eslint-disable-next-line @jessie.js/no-nested-await
     bootstrapResult = await initializeSwingset(
       config,
       argv,

package/src/controller/initializeKernel.js

@@ -3,9 +3,9 @@
 import { makeMarshal } from '@endo/marshal';
 import { Far } from '@endo/far';
 import { assert, Fail } from '@agoric/assert';
+import { kser, kunser } from '@agoric/kmarshal';
 import { assertKnownOptions } from '../lib/assertOptions.js';
 import { insistVatID } from '../lib/id.js';
-import { kser, kunser } from '../lib/kmarshal.js';
 import { makeVatSlot } from '../lib/parseVatSlots.js';
 import { insistStorageAPI } from '../lib/storageAPI.js';
 import { makeVatOptionRecorder } from '../lib/recordVatOptions.js';
@@ -63,6 +63,7 @@ export async function initializeKernel(config, kernelStorage, options = {}) {
   let gotVatAdminRootKref;
 
   // generate the genesis vats
+  await null;
   if (config.vats) {
     for (const name of Object.keys(config.vats)) {
       const {
@@ -85,13 +86,13 @@ export async function initializeKernel(config, kernelStorage, options = {}) {
         'useTranscript',
         'critical',
         'reapInterval',
+        'nodeOptions',
       ]);
       const vatID = kernelKeeper.allocateVatIDForNameIfNeeded(name);
       logStartup(`assigned VatID ${vatID} for genesis vat ${name}`);
 
       const source = { bundleID };
       const staticOptions = { name, ...creationOptions };
-      // eslint-disable-next-line @jessie.js/no-nested-await,no-await-in-loop
       await optionRecorder.recordStatic(vatID, source, staticOptions);
 
       kernelKeeper.addToAcceptanceQueue(
@@ -209,8 +210,9 @@ export async function initializeKernel(config, kernelStorage, options = {}) {
       serializeBodyFormat: 'smallcaps',
       // TODO Temporary hack.
       // See https://github.com/Agoric/agoric-sdk/issues/2780
-      errorIdNum: 60000,
+      errorIdNum: 60_000,
     });
+    // @ts-expect-error xxx
     const args = kunser(m.serialize(harden([vatObj0s, deviceObj0s])));
     const rootKref = exportRootObject(kernelKeeper, bootstrapVatID);
     const resultKpid = queueToKref(rootKref, 'bootstrap', args, 'panic');

package/src/controller/initializeSwingset.js

@@ -34,9 +34,10 @@ const { keys, values, fromEntries } = Object;
  * @returns {Promise<Record<string, V>>}
  * @template V
  */
-const allValues = async obj =>
-  // eslint-disable-next-line @jessie.js/no-nested-await
-  fromEntries(zip(keys(obj), await Promise.all(values(obj))));
+const allValues = async obj => {
+  const vs = await Promise.all(values(obj));
+  return fromEntries(zip(keys(obj), vs));
+};
 
 const bundleRelative = rel =>
   bundleSource(new URL(rel, import.meta.url).pathname);
@@ -127,7 +128,7 @@ export function loadBasedir(basedir, options = {}) {
   const vats = {};
   const subs = fs.readdirSync(basedir, { withFileTypes: true });
   subs.sort(byName);
-  subs.forEach(dirent => {
+  for (const dirent of subs) {
     if (
       dirent.name.startsWith('vat-') &&
       dirent.name.endsWith('.js') &&
@@ -137,7 +138,7 @@ export function loadBasedir(basedir, options = {}) {
       const vatSourcePath = path.resolve(basedir, dirent.name);
       vats[name] = { sourceSpec: vatSourcePath, parameters: {} };
     }
-  });
+  }
   /** @type {string | void} */
   let bootstrapPath = path.resolve(basedir, 'bootstrap.js');
   try {
@@ -172,8 +173,8 @@ export function loadBasedir(basedir, options = {}) {
  *    determined.
  */
 async function resolveSpecFromConfig(referrer, specPath) {
+  await null;
   try {
-    // eslint-disable-next-line @jessie.js/no-nested-await
     return new URL(await resolveModuleSpecifier(specPath, referrer)).pathname;
   } catch (e) {
     if (e.code !== 'MODULE_NOT_FOUND' && e.code !== 'ERR_MODULE_NOT_FOUND') {
@@ -233,15 +234,11 @@ async function normalizeConfigDescriptor(desc, referrer, expectParameters) {
  *    invalid.
  */
 export async function loadSwingsetConfigFile(configPath) {
+  await null;
   try {
     const config = JSON.parse(fs.readFileSync(configPath, 'utf-8'));
-    const referrer = new URL(
-      configPath,
-      `file:///${process.cwd()}/`,
-    ).toString();
-    // eslint-disable-next-line @jessie.js/no-nested-await
+    const referrer = new URL(configPath, `file://${process.cwd()}/`).toString();
     await normalizeConfigDescriptor(config.vats, referrer, true);
-    // eslint-disable-next-line @jessie.js/no-nested-await
     await normalizeConfigDescriptor(config.bundles, referrer, false);
     // await normalizeConfigDescriptor(config.devices, referrer, true); // TODO: represent devices
     config.bootstrap || Fail`no designated bootstrap vat in ${configPath}`;
@@ -249,6 +246,7 @@ export async function loadSwingsetConfigFile(configPath) {
       Fail`bootstrap vat ${config.bootstrap} not found in ${configPath}`;
     return config;
   } catch (e) {
+    console.error(`failed to load ${configPath}`);
     if (e.code === 'ENOENT') {
       return null;
     } else {

package/src/controller/startNodeSubprocess.js

@@ -0,0 +1,35 @@
+import process from 'process';
+
+export function makeStartSubprocessWorkerNode(
+  startSubprocessWorker,
+  profileVats,
+  debugVats,
+) {
+  // launch a worker in a subprocess (which runs Node.js)
+  function startSubprocessWorkerNode(nameDisplayArg, vatID, nodeOptions) {
+    const supervisorCodePath = new URL(
+      '../supervisors/subprocess-node/supervisor-subprocess-node.js',
+      import.meta.url,
+    ).pathname;
+    const args = nodeOptions ? [...nodeOptions] : [];
+    if (profileVats.includes(vatID)) {
+      args.push('--cpu-prof');
+      args.push('--cpu-prof-interval');
+      args.push('1');
+      args.push('--cpu-prof-name');
+      // cf. https://pubs.opengroup.org/onlinepubs/9699919799/basedefs/V1_chap03.html#tag_03_282
+      nameDisplayArg = nameDisplayArg
+        .replaceAll(':', '-')
+        .replaceAll(/[^a-z0-9._-]/gi, '_');
+      args.push(`CPU.${nameDisplayArg}.cpuprofile`);
+    }
+    if (debugVats.includes(vatID)) {
+      args.push('--inspect-brk');
+    }
+    args.push(supervisorCodePath);
+    args.push(nameDisplayArg);
+    return startSubprocessWorker(process.execPath, args);
+  }
+
+  return startSubprocessWorkerNode;
+}

package/src/controller/startXSnap.js

@@ -41,6 +41,8 @@ const NETSTRING_MAX_CHUNK_SIZE = 12_000_000;
  *   debug?: boolean,
  *   workerTraceRootPath?: string,
  *   overrideBundles?: import('../types-external.js').Bundle[],
+ *   profileVats?: string[],
+ *   debugVats?: string[],
  * }} options
  */
 export function makeStartXSnap(options) {
@@ -54,6 +56,8 @@ export function makeStartXSnap(options) {
     snapStore,
     workerTraceRootPath,
     overrideBundles,
+    profileVats = [],
+    debugVats = [],
     debug = false,
   } = options;
 
@@ -77,7 +81,7 @@ export function makeStartXSnap(options) {
     };
   }
 
-  /** @type { import('@agoric/xsnap/src/xsnap').XSnapOptions } */
+  /** @type { import('@agoric/xsnap/src/xsnap.js').XSnapOptions } */
   const xsnapOpts = {
     os: osType(),
     fs: { ...fs, ...fs.promises, tmpName },
@@ -123,6 +127,7 @@ export function makeStartXSnap(options) {
    * @param {string} name
    * @param {object} details
    * @param {import('../types-external.js').BundleID[]} details.bundleIDs
+   * @param {string} details.vatID
    * @param {(request: Uint8Array) => Promise<Uint8Array>} details.handleCommand
    * @param {boolean} [details.metered]
    * @param {StartXSnapInitDetails} [details.init]
@@ -131,15 +136,22 @@ export function makeStartXSnap(options) {
     name,
     {
       bundleIDs,
+      vatID,
       handleCommand,
       metered,
       init: initDetails = { from: 'bundles' },
     },
   ) {
+    if (profileVats.includes(vatID)) {
+      Fail`startXSnap: not yet supporting profiling for vat ${vatID}`;
+    }
+    if (debugVats.includes(vatID)) {
+      Fail`startXSnap: not yet supporting debugging for vat ${vatID}`;
+    }
     const meterOpts = metered ? {} : { meteringLimit: 0 };
     const snapshotLoadOpts = getSnapshotLoadOptions(initDetails);
+    await null;
     if (snapshotLoadOpts) {
-      // eslint-disable-next-line @jessie.js/no-nested-await
       const xs = await doXSnap({
         name,
         handleCommand,
@@ -147,7 +159,6 @@ export function makeStartXSnap(options) {
         ...meterOpts,
         ...xsnapOpts,
       });
-      // eslint-disable-next-line @jessie.js/no-nested-await
       await xs.isReady();
       return xs;
     }
@@ -164,7 +175,6 @@ export function makeStartXSnap(options) {
       bundles = overrideBundles; // ignore the usual bundles
     } else {
       const bundlePs = bundleIDs.map(id => bundleHandler.getBundle(id));
-      // eslint-disable-next-line @jessie.js/no-nested-await
       bundles = await Promise.all(bundlePs);
     }
 
@@ -173,7 +183,6 @@ export function makeStartXSnap(options) {
       if (moduleFormat !== 'getExport' && moduleFormat !== 'nestedEvaluate') {
         throw Fail`unexpected moduleFormat: ${moduleFormat}`;
       }
-      // eslint-disable-next-line no-await-in-loop, @jessie.js/no-nested-await
       await worker.evaluate(`(${bundle.source}\n)()`.trim());
     }
     return worker;

package/src/devices/bundle/device-bundle.js

@@ -103,6 +103,7 @@ export function buildDevice(tools, endowments) {
 
   const dispatch = {
     invoke: (dnid, method, argsCapdata) => {
+      /** @type {any} */
       const args = unserialize(argsCapdata);
 
       if (dnid === ROOT) {

package/src/devices/lib/deviceTools.js

@@ -78,7 +78,7 @@ export function buildSerializationTools(syscall, deviceName) {
     serializeBodyFormat: 'smallcaps',
     // TODO Temporary hack.
     // See https://github.com/Agoric/agoric-sdk/issues/2780
-    errorIdNum: 60000,
+    errorIdNum: 60_000,
   });
 
   // for invoke(), these will unserialize the arguments, and serialize the

package/src/devices/mailbox/device-mailbox.js

@@ -16,10 +16,10 @@ export function buildRootDeviceNode(tools) {
       );
     }
     assert.typeof(peer, 'string');
-    messages.forEach(m => {
+    for (const m of messages) {
       Nat(m[0]);
       assert.typeof(m[1], 'string');
-    });
+    }
     Nat(ack);
     if (messages.length) {
       deliverInboundMessages(peer, harden(messages));

package/src/devices/mailbox/mailbox.js

@@ -74,9 +74,9 @@ import { Fail } from '@agoric/assert';
 
 export function importMailbox(data, inout = {}) {
   const outbox = new Map();
-  data.outbox.forEach(m => {
+  for (const m of data.outbox) {
     outbox.set(Nat(m[0]), m[1]);
-  });
+  }
   inout.ack = Nat(data.ack);
   inout.outbox = outbox;
   return inout;
@@ -84,9 +84,9 @@ export function importMailbox(data, inout = {}) {
 
 export function exportMailbox(inout) {
   const messages = [];
-  inout.outbox.forEach((body, msgnum) => {
+  for (const [msgnum, body] of inout.outbox) {
     messages.push([Number(msgnum), body]);
-  });
+  }
   messages.sort((a, b) => a[0] - b[0]);
   return {
     ack: Number(inout.ack),
@@ -121,13 +121,13 @@ export function buildMailboxStateMap(state = harden(new Map())) {
 
   function exportToData() {
     const data = {};
-    state.forEach((inout, peer) => {
+    for (const [peer, inout] of state.entries()) {
       const exported = exportMailbox(inout);
       data[peer] = {
         inboundAck: exported.ack,
         outbox: exported.outbox,
       };
-    });
+    }
     return harden(data);
   }