@agoric/swingset-liveslots 0.10.3-dev-eb7e9eb.0 → 0.10.3-u11.0

package/CHANGELOG.md

@@ -0,0 +1,61 @@
+# Change Log
+
+All notable changes to this project will be documented in this file.
+See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
+
+### [0.10.3-u11.0](https://github.com/Agoric/agoric-sdk/compare/@agoric/swingset-liveslots@0.10.2...@agoric/swingset-liveslots@0.10.3-u11.0) (2023-08-24)
+
+**Note:** Version bump only for package @agoric/swingset-liveslots
+
+
+
+
+
+### [0.10.2](https://github.com/Agoric/agoric-sdk/compare/@agoric/swingset-liveslots@0.10.1...@agoric/swingset-liveslots@0.10.2) (2023-06-02)
+
+**Note:** Version bump only for package @agoric/swingset-liveslots
+
+
+
+
+
+### [0.10.1](https://github.com/Agoric/agoric-sdk/compare/@agoric/swingset-liveslots@0.10.0...@agoric/swingset-liveslots@0.10.1) (2023-05-24)
+
+**Note:** Version bump only for package @agoric/swingset-liveslots
+
+
+
+
+
+## 0.10.0 (2023-05-19)
+
+
+### Features
+
+* better diagnostic for failed reanimate ([c0c9c94](https://github.com/Agoric/agoric-sdk/commit/c0c9c9433648d520aa2bcdbadbbfe877831567c7)), closes [Error#1](https://github.com/Agoric/Error/issues/1)
+* **swingset-liveslots:** label virtual instances ([4191eb6](https://github.com/Agoric/agoric-sdk/commit/4191eb62d0e64048c3c715e5f71a53a747267350))
+* add APIs for tracking/debugging undesired object retention (aka "leaks") ([0a7221b](https://github.com/Agoric/agoric-sdk/commit/0a7221b3c04f3b2894c30346fa2ea6fb0130c046)), closes [#7318](https://github.com/Agoric/agoric-sdk/issues/7318)
+* move liveslots and specific tests to a new package ([0921a89](https://github.com/Agoric/agoric-sdk/commit/0921a8903b72cfefdf05a5906bcfb826cac1cc2f)), closes [#6596](https://github.com/Agoric/agoric-sdk/issues/6596)
+
+
+### Bug Fixes
+
+* **liveslots:** allow new Kind upgrade to add new facets ([6bc6694](https://github.com/Agoric/agoric-sdk/commit/6bc6694968e6d2f529e7c91ec1efb11fdff2e2d3)), closes [#7437](https://github.com/Agoric/agoric-sdk/issues/7437)
+* **liveslots:** retain WeakRefs to voAware collections ([3935723](https://github.com/Agoric/agoric-sdk/commit/393572396781afd17691e1366abeba696228a24e)), closes [#7371](https://github.com/Agoric/agoric-sdk/issues/7371)
+* **swingset-liveslots:** prevent VOM infinite loop if `globalThis.WeakSet` etc are replaced ([d7b35e2](https://github.com/Agoric/agoric-sdk/commit/d7b35e28715a715ef510f2717e0040fa017caab4))
+* adding dup entries to virtual sets is OK ([c81d367](https://github.com/Agoric/agoric-sdk/commit/c81d3677d8085eb4debe5baa416816ff94d582cf)), closes [#7234](https://github.com/Agoric/agoric-sdk/issues/7234)
+* code updates for new marshal ([292f971](https://github.com/Agoric/agoric-sdk/commit/292f971769db69e61782f96638c2f687c3f95ac2))
+* **SwingSet:** Don't send stopVat during upgrade ([5cc47d2](https://github.com/Agoric/agoric-sdk/commit/5cc47d2d8892690f8c1653630b41dd64cc42d73b)), closes [#6650](https://github.com/Agoric/agoric-sdk/issues/6650)
+* **types:** return value of deleter ([457f576](https://github.com/Agoric/agoric-sdk/commit/457f5765b9fc0a693e6eb5e6644ddf4af3b791db))
+* move many type definitions from swingset to liveslots ([727143d](https://github.com/Agoric/agoric-sdk/commit/727143d5562498e2e3013c34304f229b4dd11da5))
+* move rejectAllPromises from stopVat to kernels-side upgradeVat ([d79623f](https://github.com/Agoric/agoric-sdk/commit/d79623f3fb3b87653dba1c71eb1153711c9d962c)), closes [#6694](https://github.com/Agoric/agoric-sdk/issues/6694)
+* Move upgrade-time abandonExports responsibility into the kernel ([66ac657](https://github.com/Agoric/agoric-sdk/commit/66ac657d51d3d1be61ee4a6e9a621a664086ee57)), closes [#6696](https://github.com/Agoric/agoric-sdk/issues/6696)
+* only the exo api change ([5cf3bf1](https://github.com/Agoric/agoric-sdk/commit/5cf3bf10a71dd02094365a66e87032e5d17d004f))
+* **liveslots:** use Map for vrefStatus, not object ([1456e2a](https://github.com/Agoric/agoric-sdk/commit/1456e2ae006bb1c702383cedda5e5c407968840e))
+* **swingset:** move a bunch of types from swingset to swingset-liveslots ([14f9bb0](https://github.com/Agoric/agoric-sdk/commit/14f9bb00c82c085dc647f23b6c90b26e6a0a6dfd))
+* **swingset-liveslots:** Move promise rejection responsibility into the kernel ([dd29ff3](https://github.com/Agoric/agoric-sdk/commit/dd29ff35c5dc72efbbf7087849182aa7f04b2bb1)), closes [#6694](https://github.com/Agoric/agoric-sdk/issues/6694)
+* add 'v'/'d' virtual/durable annotations to vrefs ([b859e92](https://github.com/Agoric/agoric-sdk/commit/b859e92fe041415d6e34250f672a10ad927aa33e)), closes [#6695](https://github.com/Agoric/agoric-sdk/issues/6695)
+* update description of "FINALIZED" state ([809f366](https://github.com/Agoric/agoric-sdk/commit/809f3660c083467e76deb1487015cb24205a801d))
+* without assertKeyPattern ([#7035](https://github.com/Agoric/agoric-sdk/issues/7035)) ([c9fcd7f](https://github.com/Agoric/agoric-sdk/commit/c9fcd7f82757732435cd96f3377e4fbfb6586ce7))
+* **swingset-liveslots:** copy helper files to new liveslots package ([be7229f](https://github.com/Agoric/agoric-sdk/commit/be7229f7217c1ecc523069a57945a372f4a1e00e))
+* **swingset-liveslots:** update imports of helper files ([0b4b38a](https://github.com/Agoric/agoric-sdk/commit/0b4b38a1f9efbb3e1e860172b0b802548d18ae2e))

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@agoric/swingset-liveslots",
-  "version": "0.10.3-dev-eb7e9eb.0+eb7e9eb",
+  "version": "0.10.3-u11.0",
   "description": "SwingSet ocap support layer",
   "type": "module",
   "main": "src/index.js",
@@ -13,31 +13,32 @@
     "test:xs": "exit 0",
     "lint-fix": "yarn lint:eslint --fix",
     "lint": "run-s --continue-on-error lint:*",
-    "lint:types": "tsc",
+    "lint:types": "tsc -p jsconfig.json",
     "lint:eslint": "eslint ."
   },
   "dependencies": {
-    "@agoric/assert": "0.6.1-dev-eb7e9eb.0+eb7e9eb",
-    "@agoric/internal": "0.3.3-dev-eb7e9eb.0+eb7e9eb",
-    "@agoric/store": "0.9.3-dev-eb7e9eb.0+eb7e9eb",
-    "@endo/eventual-send": "^0.17.3",
-    "@endo/exo": "^0.2.3",
-    "@endo/far": "^0.2.19",
-    "@endo/init": "^0.5.57",
-    "@endo/marshal": "^0.8.6",
-    "@endo/nat": "^4.1.28",
-    "@endo/pass-style": "^0.1.4",
-    "@endo/patterns": "^0.2.3",
-    "@endo/promise-kit": "^0.2.57"
+    "@agoric/assert": "^0.6.0",
+    "@agoric/internal": "^0.3.3-u11.0",
+    "@agoric/store": "^0.9.3-u11.0",
+    "@agoric/vat-data": "^0.5.3-u11.0",
+    "@endo/eventual-send": "^0.17.2",
+    "@endo/exo": "^0.2.2",
+    "@endo/init": "^0.5.56",
+    "@endo/marshal": "^0.8.5",
+    "@endo/nat": "^4.1.27",
+    "@endo/pass-style": "^0.1.3",
+    "@endo/patterns": "^0.2.2",
+    "@endo/promise-kit": "^0.2.56"
   },
-  "devDependencies": {
-    "ava": "^5.3.0"
+  "peerDependencies": {
+    "@endo/far": "^0.2.18",
+    "@endo/ses-ava": "^0.2.40",
+    "ava": "^5.2.0"
   },
   "files": [
     "src/**/*.js",
     "src/**/*.d.ts",
     "test/**/*.js",
-    "tools",
     "exported.js"
   ],
   "repository": {
@@ -60,5 +61,5 @@
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "eb7e9ebe52e78052e5ded601b6658896d257cab4"
+  "gitHead": "92b6cd72484079b0349d8ccfa4510aeb820e8d67"
 }

package/src/collectionManager.js

@@ -15,10 +15,7 @@ import {
   makeCopySet,
   makeCopyMap,
   getRankCover,
-  getCopyMapEntries,
-  getCopySetKeys,
 } from '@endo/patterns';
-import { isCopyMap, isCopySet } from '@agoric/store';
 import { makeBaseRef, parseVatSlot } from './parseVatSlots.js';
 import {
   enumerateKeysStartEnd,
@@ -380,11 +377,11 @@ export function makeCollectionManager(
       currentGenerationNumber += 1;
       assertAcceptableSyscallCapdataSize([serializedValue]);
       if (durable) {
-        for (const [slotIndex, vref] of serializedValue.slots.entries()) {
+        serializedValue.slots.forEach((vref, slotIndex) => {
           if (!vrm.isDurable(vref)) {
             throwNotDurable(value, slotIndex, serializedValue);
           }
-        }
+        });
       }
       if (passStyleOf(key) === 'remotable') {
         /** @type {string} */
@@ -400,9 +397,7 @@ export function makeCollectionManager(
           vrm.addReachableVref(vref);
         }
       }
-      for (const vref of serializedValue.slots) {
-        vrm.addReachableVref(vref);
-      }
+      serializedValue.slots.forEach(vrm.addReachableVref);
       syscall.vatstoreSet(keyToDBKey(key), JSON.stringify(serializedValue));
       updateEntryCount(1);
     };
@@ -421,11 +416,11 @@ export function makeCollectionManager(
       const after = serializeValue(harden(value));
       assertAcceptableSyscallCapdataSize([after]);
       if (durable) {
-        for (const [i, vref] of after.slots.entries()) {
+        after.slots.forEach((vref, i) => {
           if (!vrm.isDurable(vref)) {
             throwNotDurable(value, i, after);
           }
-        }
+        });
       }
       const dbKey = keyToDBKey(key);
       const rawBefore = syscall.vatstoreGet(dbKey);
@@ -629,36 +624,6 @@ export function makeCollectionManager(
     const snapshotMap = (keyPatt, valuePatt) =>
       makeCopyMap(entries(keyPatt, valuePatt));
 
-    const addAllToSet = elems => {
-      if (typeof elems[Symbol.iterator] !== 'function') {
-        if (Object.isFrozen(elems) && isCopySet(elems)) {
-          elems = getCopySetKeys(elems);
-        } else {
-          Fail`provided data source is not iterable: ${elems}`;
-        }
-      }
-      for (const elem of elems) {
-        addToSet(elem);
-      }
-    };
-
-    const addAllToMap = mapEntries => {
-      if (typeof mapEntries[Symbol.iterator] !== 'function') {
-        if (Object.isFrozen(mapEntries) && isCopyMap(mapEntries)) {
-          mapEntries = getCopyMapEntries(mapEntries);
-        } else {
-          Fail`provided data source is not iterable: ${mapEntries}`;
-        }
-      }
-      for (const [key, value] of mapEntries) {
-        if (has(key)) {
-          set(key, value);
-        } else {
-          doInit(key, value, true);
-        }
-      }
-    };
-
     return {
       has,
       get,
@@ -670,8 +635,6 @@ export function makeCollectionManager(
       keys,
       values,
       entries,
-      addAllToSet,
-      addAllToMap,
       snapshotSet,
       snapshotMap,
       sizeInternal,
@@ -684,23 +647,12 @@ export function makeCollectionManager(
     const hasWeakKeys = storeKindInfo[kindName].hasWeakKeys;
     const raw = summonCollectionInternal(initial, collectionID, kindName);
 
-    const {
-      has,
-      get,
-      init,
-      addToSet,
-      addAllToMap,
-      addAllToSet,
-      set,
-      delete: del,
-    } = raw;
+    const { has, get, init, addToSet, set, delete: del } = raw;
     const weakMethods = {
       has,
       get,
       init,
       addToSet,
-      addAllToSet,
-      addAllToMap,
       set,
       delete: del,
     };
@@ -795,15 +747,13 @@ export function makeCollectionManager(
     }
     const schemataCapData = serialize(harden(schemata));
     if (isDurable) {
-      for (const [slotIndex, vref] of schemataCapData.slots.entries()) {
+      schemataCapData.slots.forEach((vref, slotIndex) => {
         if (!vrm.isDurable(vref)) {
           throwNotDurable(vref, slotIndex, schemataCapData);
         }
-      }
-    }
-    for (const vref of schemataCapData.slots) {
-      vrm.addReachableVref(vref);
+      });
     }
+    schemataCapData.slots.forEach(vrm.addReachableVref);
 
     schemaCache.set(
       collectionID,
@@ -814,48 +764,12 @@ export function makeCollectionManager(
   }
 
   function collectionToMapStore(collection) {
-    const {
-      has,
-      get,
-      init,
-      set,
-      delete: del,
-      addAllToMap,
-      keys,
-      values,
-      entries,
-      snapshotMap,
-      getSize,
-      clear,
-    } = collection;
-    const mapStore = {
-      has,
-      get,
-      init,
-      set,
-      delete: del,
-      addAll: addAllToMap,
-      keys,
-      values,
-      entries,
-      snapshot: snapshotMap,
-      getSize,
-      clear,
-    };
-    return Far('mapStore', mapStore);
+    const { snapshotSet: _, snapshotMap, ...rest } = collection;
+    return Far('mapStore', { snapshot: snapshotMap, ...rest });
   }
 
   function collectionToWeakMapStore(collection) {
-    const { has, get, init, set, delete: del, addAllToMap } = collection;
-    const weakMapStore = {
-      has,
-      get,
-      init,
-      set,
-      delete: del,
-      addAll: addAllToMap,
-    };
-    return Far('weakMapStore', weakMapStore);
+    return Far('weakMapStore', collection);
   }
 
   function collectionToSetStore(collection) {
@@ -863,35 +777,50 @@ export function makeCollectionManager(
       has,
       addToSet,
       delete: del,
-      addAllToSet,
       keys,
-      snapshotSet,
       getSize,
+      snapshotSet,
       clear,
     } = collection;
+    function* entries(patt) {
+      for (const k of keys(patt)) {
+        yield [k, k];
+      }
+    }
+    function addAll(elems) {
+      for (const elem of elems) {
+        addToSet(elem, null);
+      }
+    }
 
     const setStore = {
       has,
       add: addToSet,
+      addAll,
       delete: del,
-      addAll: addAllToSet,
       keys: patt => keys(patt),
       values: patt => keys(patt),
-      snapshot: snapshotSet,
+      entries,
       getSize: patt => getSize(patt),
+      snapshot: snapshotSet,
       clear,
     };
     return Far('setStore', setStore);
   }
 
   function collectionToWeakSetStore(collection) {
-    const { has, addToSet, delete: del, addAllToSet } = collection;
+    const { has, addToSet, delete: del } = collection;
+    function addAll(elems) {
+      for (const elem of elems) {
+        addToSet(elem);
+      }
+    }
 
     const weakSetStore = {
       has,
       add: addToSet,
+      addAll,
       delete: del,
-      addAll: addAllToSet,
     };
     return Far('weakSetStore', weakSetStore);
   }
@@ -900,7 +829,7 @@ export function makeCollectionManager(
    * Produce a big map.
    *
    * @template K,V
-   * @param {string} [label] - diagnostic label for the store
+   * @param {string} [label='map'] - diagnostic label for the store
    * @param {StoreOptions} [options]
    * @returns {MapStore<K,V>}
    */
@@ -944,7 +873,7 @@ export function makeCollectionManager(
    * Produce a weak big map.
    *
    * @template K,V
-   * @param {string} [label] - diagnostic label for the store
+   * @param {string} [label='weakMap'] - diagnostic label for the store
    * @param {StoreOptions} [options]
    * @returns {WeakMapStore<K,V>}
    */
@@ -973,7 +902,7 @@ export function makeCollectionManager(
    * Produce a big set.
    *
    * @template K
-   * @param {string} [label] - diagnostic label for the store
+   * @param {string} [label='set'] - diagnostic label for the store
    * @param {StoreOptions} [options]
    * @returns {SetStore<K>}
    */
@@ -1000,7 +929,7 @@ export function makeCollectionManager(
    * Produce a weak big set.
    *
    * @template K
-   * @param {string} [label] - diagnostic label for the store
+   * @param {string} [label='weakSet'] - diagnostic label for the store
    * @param {StoreOptions} [options]
    * @returns {WeakSetStore<K>}
    */
@@ -1077,7 +1006,7 @@ export function makeCollectionManager(
    * remotables.
    *
    * @template K,V
-   * @param {string} [label] - diagnostic label for the store
+   * @param {string} [label='map'] - diagnostic label for the store
    * @param {StoreOptions} [options]
    * @returns {MapStore<K,V>}
    */
@@ -1089,7 +1018,7 @@ export function makeCollectionManager(
    * primitives, or remotables.
    *
    * @template K,V
-   * @param {string} [label] - diagnostic label for the store
+   * @param {string} [label='weakMap'] - diagnostic label for the store
    * @param {StoreOptions} [options]
    * @returns {WeakMapStore<K,V>}
    */
@@ -1101,7 +1030,7 @@ export function makeCollectionManager(
    * remotables.
    *
    * @template K
-   * @param {string} [label] - diagnostic label for the store
+   * @param {string} [label='set'] - diagnostic label for the store
    * @param {StoreOptions} [options]
    * @returns {SetStore<K>}
    */
@@ -1113,7 +1042,7 @@ export function makeCollectionManager(
    * primitives, or remotables.
    *
    * @template K
-   * @param {string} [label] - diagnostic label for the store
+   * @param {string} [label='weakSet'] - diagnostic label for the store
    * @param {StoreOptions} [options]
    * @returns {WeakSetStore<K>}
    */

package/src/index.js

@@ -1,4 +1,3 @@
-/* eslint-disable import/export -- types files have no named runtime exports */
 export { makeLiveSlots, makeMarshaller } from './liveslots.js';
 
 export {
@@ -9,5 +8,5 @@ export {
   insistVatSyscallResult,
 } from './message.js';
 
+// eslint-disable-next-line import/export -- no named exports
 export * from './types.js';
-export * from './vatDataTypes.js';

package/src/liveslots.js

@@ -1,4 +1,3 @@
-/* eslint @typescript-eslint/no-floating-promises: "warn" */
 import {
   Remotable,
   passStyleOf,
@@ -252,10 +251,13 @@ function build(
     const importsToRetire = new Set();
     const exportsToRetire = new Set();
     let doMore;
-    await null;
     do {
       doMore = false;
 
+      // Yes, we know this is an await inside a loop.  Too bad.  (Also, it's a
+      // `do {} while` loop, which means there's no conditional bypass of the
+      // await.)
+      // eslint-disable-next-line no-await-in-loop, @jessie.js/no-nested-await
       await gcTools.gcAndFinalize();
 
       // possiblyDeadSet contains a baseref for everything (Presences,
@@ -498,6 +500,54 @@ function build(
     return Remotable(iface);
   }
 
+  /**
+   * Counters to track the next number for various categories of allocation.
+   * `exportID` starts at 1 because 'o+0' is always automatically
+   * pre-assigned to the root object.
+   * `promiseID` starts at 5 as a very minor aid to debugging: when puzzling
+   * over trace logs and the like, it helps for the numbers in various species
+   * of IDs that are jumbled together to be a little out of sync and thus a
+   * little less similar to each other.
+   */
+  const initialIDCounters = { exportID: 1, collectionID: 1, promiseID: 5 };
+  /** @type {Record<string, number>} */
+  let idCounters;
+  let idCountersAreDirty = false;
+
+  function initializeIDCounters() {
+    if (!idCounters) {
+      // the saved value might be missing, or from an older liveslots
+      // (with fewer counters), so merge it with our initial values
+      const saved = JSON.parse(syscall.vatstoreGet('idCounters') || '{}');
+      idCounters = { ...initialIDCounters, ...saved };
+      idCountersAreDirty = true;
+    }
+  }
+
+  function allocateNextID(name) {
+    if (!idCounters) {
+      // Normally `initializeIDCounters` would be called from startVat, but some
+      // tests bypass that so this is a backstop.  Note that the invocation from
+      // startVat is there to make vatStore access patterns a bit more
+      // consistent from one vat to another, principally as a confusion
+      // reduction measure in service of debugging; it is not a correctness
+      // issue.
+      initializeIDCounters();
+    }
+    const result = idCounters[name];
+    result !== undefined || Fail`unknown idCounters[${name}]`;
+    idCounters[name] += 1;
+    idCountersAreDirty = true;
+    return result;
+  }
+
+  function flushIDCounters() {
+    if (idCountersAreDirty) {
+      syscall.vatstoreSet('idCounters', JSON.stringify(idCounters));
+      idCountersAreDirty = false;
+    }
+  }
+
   // TODO: fix awkward non-orthogonality: allocateExportID() returns a number,
   // allocatePromiseID() returns a slot, registerPromise() uses the slot from
   // allocatePromiseID(), exportPassByPresence() generates a slot itself using
@@ -506,18 +556,15 @@ function build(
   // use a slot from the corresponding allocateX
 
   function allocateExportID() {
-    // eslint-disable-next-line no-use-before-define
-    return vrm.allocateNextID('exportID');
+    return allocateNextID('exportID');
   }
 
   function allocateCollectionID() {
-    // eslint-disable-next-line no-use-before-define
-    return vrm.allocateNextID('collectionID');
+    return allocateNextID('collectionID');
   }
 
   function allocatePromiseID() {
-    // eslint-disable-next-line no-use-before-define
-    const promiseID = vrm.allocateNextID('promiseID');
+    const promiseID = allocateNextID('promiseID');
     return makeVatSlot('promise', true, promiseID);
   }
 
@@ -712,9 +759,9 @@ function build(
       Fail`registerValue(${baseRef} should not receive individual facets`;
     slotToVal.set(baseRef, new WeakRef(val));
     if (valIsCohort) {
-      for (const [index, name] of vrm.getFacetNames(id).entries()) {
+      vrm.getFacetNames(id).forEach((name, index) => {
         valToSlot.set(val[name], `${baseRef}:${index}`);
-      }
+      });
     } else {
       valToSlot.set(val, baseRef);
     }
@@ -936,20 +983,12 @@ function build(
         return null;
       }
       syscall.resolve(resolutions);
-      for (const resolution of resolutions) {
-        const [_xvpid, _isReject, resolutionCD] = resolution;
-        for (const vref of resolutionCD.slots) {
-          maybeNewVPIDs.add(vref);
-        }
-      }
-      for (const resolution of resolutions) {
-        const [xvpid] = resolution;
-        maybeNewVPIDs.delete(xvpid);
-      }
-    }
-    for (const newVPID of Array.from(maybeNewVPIDs).sort()) {
-      maybeExportPromise(newVPID);
+      resolutions.forEach(([_xvpid, _isReject, resolutionCD]) => {
+        resolutionCD.slots.forEach(vref => maybeNewVPIDs.add(vref));
+      });
+      resolutions.forEach(([xvpid]) => maybeNewVPIDs.delete(xvpid));
     }
+    Array.from(maybeNewVPIDs).sort().forEach(maybeExportPromise);
 
     // ideally we'd wait until .then is called on p before subscribing, but
     // the current Promise API doesn't give us a way to discover this, so we
@@ -1151,21 +1190,13 @@ function build(
 
       const maybeNewVPIDs = new Set();
       // if we mention a vpid, we might need to track it
-      for (const resolution of resolutions) {
-        const [_xvpid, _isReject, resolutionCD] = resolution;
-        for (const vref of resolutionCD.slots) {
-          maybeNewVPIDs.add(vref);
-        }
-      }
+      resolutions.forEach(([_xvpid, _isReject, resolutionCD]) => {
+        resolutionCD.slots.forEach(vref => maybeNewVPIDs.add(vref));
+      });
       // but not if we just resolved it (including the primary)
-      for (const resolution of resolutions) {
-        const [xvpid] = resolution;
-        maybeNewVPIDs.delete(xvpid);
-      }
+      resolutions.forEach(([xvpid]) => maybeNewVPIDs.delete(xvpid));
       // track everything that's left
-      for (const newVPID of Array.from(maybeNewVPIDs).sort()) {
-        maybeExportPromise(newVPID);
-      }
+      Array.from(maybeNewVPIDs).sort().forEach(maybeExportPromise);
 
       // only the primary can possibly be newly resolved
       unregisterUnreferencedVPID(vpid);
@@ -1223,11 +1254,11 @@ function build(
     // 'imports' is an exclusively-owned Set that holds all new
     // promise vpids, both resolved and unresolved
     const imports = finishCollectingPromiseImports();
-    for (const vpid of retiredVPIDs) {
+    retiredVPIDs.forEach(vpid => {
       unregisterUnreferencedVPID(vpid); // unregisters if not in vdata
       importedVPIDs.delete(vpid);
       imports.delete(vpid); // resolved, so don't subscribe()
-    }
+    });
     for (const vpid of Array.from(imports).sort()) {
       syscall.subscribe(vpid);
     }
@@ -1267,18 +1298,14 @@ function build(
 
   function retireExports(vrefs) {
     assert(Array.isArray(vrefs));
-    for (const vref of vrefs) {
-      retireOneExport(vref);
-    }
+    vrefs.forEach(retireOneExport);
   }
 
   function retireImports(vrefs) {
     assert(Array.isArray(vrefs));
     vrefs.map(vref => insistVatType('object', vref));
     vrefs.map(vref => assert(!parseVatSlot(vref).allocatedByVat));
-    for (const vref of vrefs) {
-      vrm.ceaseRecognition(vref);
-    }
+    vrefs.forEach(vrm.ceaseRecognition);
   }
 
   // TODO: when we add notifyForward, guard against cycles
@@ -1423,7 +1450,7 @@ function build(
     }
     harden(vpow);
 
-    vrm.initializeIDCounters();
+    initializeIDCounters();
     vom.initializeKindHandleKind();
     collectionManager.initializeStoreKindInfo();
 
@@ -1546,7 +1573,7 @@ function build(
    * dispatch has completed and user code has relinquished agency.
    */
   function afterDispatchActions() {
-    vrm.flushIDCounters();
+    flushIDCounters();
     collectionManager.flushSchemaCache();
     vom.flushStateCache();
   }