@agoric/swingset-vat 0.32.3-dev-4989f26.0 → 0.32.3-dev-779b73d.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@agoric/swingset-vat",
-  "version": "0.32.3-dev-4989f26.0+4989f26",
+  "version": "0.32.3-dev-779b73d.0+779b73d",
   "description": "Vat/Container Launcher",
   "type": "module",
   "main": "src/index.js",
@@ -28,16 +28,16 @@
     "yargs-parser": "^21.1.1"
   },
   "dependencies": {
-    "@agoric/assert": "0.6.1-dev-4989f26.0+4989f26",
-    "@agoric/internal": "0.3.3-dev-4989f26.0+4989f26",
-    "@agoric/store": "0.9.3-dev-4989f26.0+4989f26",
-    "@agoric/swing-store": "0.9.2-dev-4989f26.0+4989f26",
-    "@agoric/swingset-liveslots": "0.10.3-dev-4989f26.0+4989f26",
-    "@agoric/swingset-xsnap-supervisor": "0.10.3-dev-4989f26.0+4989f26",
-    "@agoric/time": "0.3.3-dev-4989f26.0+4989f26",
-    "@agoric/vat-data": "0.5.3-dev-4989f26.0+4989f26",
-    "@agoric/xsnap": "0.14.3-dev-4989f26.0+4989f26",
-    "@agoric/xsnap-lockdown": "0.14.1-dev-4989f26.0+4989f26",
+    "@agoric/assert": "0.6.1-dev-779b73d.0+779b73d",
+    "@agoric/internal": "0.3.3-dev-779b73d.0+779b73d",
+    "@agoric/store": "0.9.3-dev-779b73d.0+779b73d",
+    "@agoric/swing-store": "0.9.2-dev-779b73d.0+779b73d",
+    "@agoric/swingset-liveslots": "0.10.3-dev-779b73d.0+779b73d",
+    "@agoric/swingset-xsnap-supervisor": "0.10.3-dev-779b73d.0+779b73d",
+    "@agoric/time": "0.3.3-dev-779b73d.0+779b73d",
+    "@agoric/vat-data": "0.5.3-dev-779b73d.0+779b73d",
+    "@agoric/xsnap": "0.14.3-dev-779b73d.0+779b73d",
+    "@agoric/xsnap-lockdown": "0.14.1-dev-779b73d.0+779b73d",
     "@endo/base64": "^0.2.31",
     "@endo/bundle-source": "^2.5.1",
     "@endo/captp": "^3.1.1",
@@ -92,5 +92,5 @@
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "4989f26753580251326c40fd6a7a7e3b853aff01"
+  "gitHead": "779b73d11992c1e00cfe99bfe3444081107a34a1"
 }

package/src/controller/controller.js

@@ -168,7 +168,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' });
 
@@ -473,8 +473,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

@@ -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 {
@@ -91,7 +92,6 @@ export async function initializeKernel(config, kernelStorage, options = {}) {
 
       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(

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);
@@ -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,14 @@ 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
     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}`;

package/src/controller/startXSnap.js

@@ -138,8 +138,8 @@ export function makeStartXSnap(options) {
   ) {
     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 +147,6 @@ export function makeStartXSnap(options) {
         ...meterOpts,
         ...xsnapOpts,
       });
-      // eslint-disable-next-line @jessie.js/no-nested-await
       await xs.isReady();
       return xs;
     }
@@ -164,7 +163,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 +171,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/kernel/kernel.js

@@ -397,9 +397,9 @@ export default function buildKernel(
     assert(vatWarehouse.lookup(vatID));
     // Ensure that the vatSlogger is available before clist translation.
     const vs = kernelSlog.provideVatSlogger(vatID).vatSlog;
+    await null;
     try {
       /** @type { VatDeliveryResult } */
-      // eslint-disable-next-line @jessie.js/no-nested-await
       const deliveryResult = await vatWarehouse.deliverToVat(vatID, kd, vd, vs);
       insistVatDeliveryResult(deliveryResult);
       // const [ ok, problem, usage ] = deliveryResult;
@@ -424,7 +424,6 @@ export default function buildKernel(
         //   Kinds, and we're not going to use the worker
         //
         // So in all cases, our caller should abandon the worker.
-        // eslint-disable-next-line @jessie.js/no-nested-await
         await vatWarehouse.stopWorker(vatID);
         // TODO: does stopWorker work if the worker process just died?
         status.deliveryError = deliveryResult[1];
@@ -696,7 +695,6 @@ export default function buildKernel(
     // supervisor bundles are bad.
 
     try {
-      // eslint-disable-next-line @jessie.js/no-nested-await
       await vatWarehouse.createDynamicVat(vatID);
     } catch (err) {
       console.log('error during createDynamicVat', err);
@@ -834,7 +832,6 @@ export default function buildKernel(
     const abortUpgrade = async (badDeliveryResults, errorCapData) => {
       // get rid of the worker, so the next delivery to this vat will
       // re-create one from the previous state
-      // eslint-disable-next-line @jessie.js/no-nested-await
       await vatWarehouse.stopWorker(vatID);
 
       // notify vat-admin of the failed upgrade without revealing error details
@@ -897,7 +894,6 @@ export default function buildKernel(
         `WARNING: vat ${vatID} failed to upgrade from incarnation ${oldIncarnation} (BOYD)`,
       );
       const { info: errorCapData } = boydResults.terminate;
-      // eslint-disable-next-line @jessie.js/no-nested-await
       const results = await abortUpgrade(boydResults, errorCapData);
       return results;
     }
@@ -961,7 +957,6 @@ export default function buildKernel(
         `WARNING: vat ${vatID} failed to upgrade from incarnation ${oldIncarnation} (startVat)`,
       );
       const { info: errorCapData } = startVatResults.terminate;
-      // eslint-disable-next-line @jessie.js/no-nested-await
       const results = await abortUpgrade(startVatResults, errorCapData);
       return results;
     }
@@ -1279,7 +1274,6 @@ export default function buildKernel(
     } else {
       const vatID = crankResults.didDelivery;
       if (vatID) {
-        // eslint-disable-next-line @jessie.js/no-nested-await
         await vatWarehouse.maybeSaveSnapshot(vatID);
       }
     }
@@ -1312,7 +1306,6 @@ export default function buildKernel(
       kdebug(`vat terminated: ${JSON.stringify(info)}`);
       kernelSlog.terminateVat(vatID, reject, info);
       // this deletes state, rejects promises, notifies vat-admin
-      // eslint-disable-next-line @jessie.js/no-nested-await
       await terminateVat(vatID, reject, info);
     }
 
@@ -1348,8 +1341,8 @@ export default function buildKernel(
       Fail`Kernel reentrancy is forbidden`;
     }
     processQueueRunning = Error('here');
+    await null;
     try {
-      // eslint-disable-next-line @jessie.js/no-nested-await
       const result = await processor(message);
       processQueueRunning = undefined;
       return result;
@@ -1650,7 +1643,6 @@ export default function buildKernel(
 
       const bundle = kernelKeeper.getBundle(source.bundleID);
       assert(bundle);
-      // eslint-disable-next-line no-await-in-loop, @jessie.js/no-nested-await
       const NS = await importBundle(bundle, {
         filePrefix: `dev-${name}/...`,
         endowments: harden({ ...vatEndowments, console: devConsole, assert }),
@@ -1762,12 +1754,12 @@ export default function buildKernel(
       throw Error('must do kernel.start() before step()');
     }
     kernelKeeper.startCrank();
+    await null;
     try {
       kernelKeeper.establishCrankSavepoint('start');
       const { processor, message } = getNextMessageAndProcessor();
       // process a single message
       if (message) {
-        // eslint-disable-next-line @jessie.js/no-nested-await
         await tryProcessMessage(processor, message);
         if (kernelPanic) {
           throw kernelPanic;
@@ -1796,6 +1788,7 @@ export default function buildKernel(
       throw Error('must do kernel.start() before run()');
     }
     let count = 0;
+    await null;
     for (;;) {
       kernelKeeper.startCrank();
       try {
@@ -1806,7 +1799,6 @@ export default function buildKernel(
         }
         count += 1;
         /** @type { PolicyInput } */
-        // eslint-disable-next-line no-await-in-loop, @jessie.js/no-nested-await
         const policyInput = await tryProcessMessage(processor, message);
         if (kernelPanic) {
           throw kernelPanic;

package/src/kernel/vat-loader/manager-local.js

@@ -93,8 +93,8 @@ export function makeLocalVatManagerFactory({
       return vatNS;
     }
 
+    await null;
     if (enableSetup) {
-      // eslint-disable-next-line @jessie.js/no-nested-await
       const vatNS = await buildVatNamespace({}, {});
       const setup = vatNS.default;
       setup || Fail`vat source bundle lacks (default) setup() function`;

package/src/kernel/vat-loader/manager-subprocess-xsnap.js

@@ -165,7 +165,6 @@ export function makeXsSubprocessFactory({
       parentLog(vatID, `snapshot loaded. dispatch ready.`);
     } else {
       parentLog(vatID, `instructing worker to load bundle..`);
-      // eslint-disable-next-line @jessie.js/no-nested-await
       const { reply: bundleReply } = await issueTagged([
         'setBundle',
         vatID,
@@ -188,8 +187,8 @@ export function makeXsSubprocessFactory({
       parentLog(vatID, `sending delivery`, delivery);
       /** @type { WorkerResults } */
       let result;
+      await null;
       try {
-        // eslint-disable-next-line @jessie.js/no-nested-await
         result = await issueTagged(['deliver', delivery]);
       } catch (err) {
         parentLog('issueTagged error:', err.code, err.message);

package/src/kernel/vat-warehouse.js

@@ -371,7 +371,6 @@ export function makeVatWarehouse({
     const { enablePipelining = false } = options;
 
     if (options.useTranscript) {
-      // eslint-disable-next-line @jessie.js/no-nested-await
       await replayTranscript(vatID, vatKeeper, manager);
     }
 
@@ -419,7 +418,6 @@ export function makeVatWarehouse({
         break;
       }
       logStartup(`provideVatKeeper for vat ${name} as vat ${vatID}`);
-      // eslint-disable-next-line no-await-in-loop
       await ensureVatOnline(vatID, recreate);
       numPreloaded += 1;
     }
@@ -431,7 +429,6 @@ export function makeVatWarehouse({
         break;
       }
       logStartup(`provideVatKeeper for dynamic vat ${vatID}`);
-      // eslint-disable-next-line no-await-in-loop
       await ensureVatOnline(vatID, recreate);
       numPreloaded += 1;
     }
@@ -668,9 +665,9 @@ export function makeVatWarehouse({
    */
   async function stopWorker(vatID) {
     // worker may or may not be online
+    await null;
     if (ephemeral.vats.has(vatID)) {
       try {
-        // eslint-disable-next-line @jessie.js/no-nested-await
         await evict(vatID);
       } catch (err) {
         console.debug('vat termination was already reported; ignoring:', err);

package/src/lib/workerOptions.js

@@ -4,10 +4,10 @@
  * @returns {Promise<import("../types-internal").WorkerOptions>}
  */
 export async function makeWorkerOptions(managerType, bundleHandler) {
+  await null;
   if (managerType === 'local') {
     return harden({ type: 'local' });
   } else if (managerType === 'xsnap' || managerType === 'xs-worker') {
-    // eslint-disable-next-line @jessie.js/no-nested-await, no-await-in-loop
     const bundleIDs = await bundleHandler.getCurrentBundleIDs();
     return harden({ type: 'xsnap', bundleIDs });
   }
@@ -24,10 +24,10 @@ export async function updateWorkerOptions(
   { bundleHandler },
 ) {
   const { type } = origWorkerOptions;
+  await null;
   if (type === 'local') {
     return origWorkerOptions;
   } else if (type === 'xsnap') {
-    // eslint-disable-next-line @jessie.js/no-nested-await, no-await-in-loop
     const bundleIDs = await bundleHandler.getCurrentBundleIDs();
     return harden({ ...origWorkerOptions, bundleIDs });
   }

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

@@ -228,19 +228,17 @@ export function buildRootObject(vatPowers, _vatParameters, baggage) {
   }
 
   async function upgradeStaticVat(vatID, pauseTarget, bundleID, options) {
+    await null;
     if (pauseTarget) {
-      // eslint-disable-next-line @jessie.js/no-nested-await
       await E(pauseTarget)
         .pauseService()
         .catch(() => true);
     }
     let status;
     try {
-      // eslint-disable-next-line @jessie.js/no-nested-await
       status = await upgradeVat(vatID, bundleID, options);
     } catch (e) {
       if (pauseTarget) {
-        // eslint-disable-next-line @jessie.js/no-nested-await
         await E(pauseTarget)
           .resumeService()
           .catch(() => true);