@agoric/swingset-vat 0.32.3-dev-ad7ac3c.0 → 0.32.3-dev-d122756.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@agoric/swingset-vat",
-  "version": "0.32.3-dev-ad7ac3c.0+ad7ac3c",
+  "version": "0.32.3-dev-d122756.0+d122756",
   "description": "Vat/Container Launcher",
   "type": "module",
   "main": "src/index.js",
@@ -27,16 +27,16 @@
     "@types/yargs-parser": "^21.0.0"
   },
   "dependencies": {
-    "@agoric/internal": "0.3.3-dev-ad7ac3c.0+ad7ac3c",
-    "@agoric/kmarshal": "0.1.1-dev-ad7ac3c.0+ad7ac3c",
-    "@agoric/store": "0.9.3-dev-ad7ac3c.0+ad7ac3c",
-    "@agoric/swing-store": "0.9.2-dev-ad7ac3c.0+ad7ac3c",
-    "@agoric/swingset-liveslots": "0.10.3-dev-ad7ac3c.0+ad7ac3c",
-    "@agoric/swingset-xsnap-supervisor": "0.10.3-dev-ad7ac3c.0+ad7ac3c",
-    "@agoric/time": "0.3.3-dev-ad7ac3c.0+ad7ac3c",
-    "@agoric/vat-data": "0.5.3-dev-ad7ac3c.0+ad7ac3c",
-    "@agoric/xsnap": "0.14.3-dev-ad7ac3c.0+ad7ac3c",
-    "@agoric/xsnap-lockdown": "0.14.1-dev-ad7ac3c.0+ad7ac3c",
+    "@agoric/internal": "0.3.3-dev-d122756.0+d122756",
+    "@agoric/kmarshal": "0.1.1-dev-d122756.0+d122756",
+    "@agoric/store": "0.9.3-dev-d122756.0+d122756",
+    "@agoric/swing-store": "0.9.2-dev-d122756.0+d122756",
+    "@agoric/swingset-liveslots": "0.10.3-dev-d122756.0+d122756",
+    "@agoric/swingset-xsnap-supervisor": "0.10.3-dev-d122756.0+d122756",
+    "@agoric/time": "0.3.3-dev-d122756.0+d122756",
+    "@agoric/vat-data": "0.5.3-dev-d122756.0+d122756",
+    "@agoric/xsnap": "0.14.3-dev-d122756.0+d122756",
+    "@agoric/xsnap-lockdown": "0.14.1-dev-d122756.0+d122756",
     "@endo/base64": "^1.0.8",
     "@endo/bundle-source": "^3.4.2",
     "@endo/captp": "^4.4.2",
@@ -103,5 +103,5 @@
   "typeCoverage": {
     "atLeast": 75.82
   },
-  "gitHead": "ad7ac3c0b5722cecd8bed5c3c554499a39a1d519"
+  "gitHead": "d122756b667949664b0259f0a58f61d1d1f14d03"
 }

package/src/kernel/kernel.js

@@ -710,6 +710,7 @@ export default function buildKernel(
       total:
         work.exports +
         work.imports +
+        work.promises +
         work.kv +
         work.snapshots +
         work.transcripts,
@@ -751,6 +752,8 @@ export default function buildKernel(
       kdebug(`vat ${vatID} terminated before startVat delivered`);
       return NO_DELIVERY_CRANK_RESULTS;
     }
+    const vatKeeper = kernelKeeper.provideVatKeeper(vatID);
+    vatKeeper.setVatParameters(vatParameters);
     const { meterID } = vatInfo;
     /** @type { KernelDeliveryStartVat } */
     const kd = harden(['startVat', vatParameters]);
@@ -1051,6 +1054,7 @@ export default function buildKernel(
     });
     const vatOptions = harden({ ...origOptions, workerOptions });
     vatKeeper.setSourceAndOptions(source, vatOptions);
+    vatKeeper.setVatParameters(vatParameters);
     // TODO: decref the bundleID once setSourceAndOptions increfs it
 
     // pause, take a deep breath, appreciate this moment of silence
@@ -1851,6 +1855,7 @@ export default function buildKernel(
       {
         exports: M.number(),
         imports: M.number(),
+        promises: M.number(),
         kv: M.number(),
         snapshots: M.number(),
         transcripts: M.number(),

package/src/kernel/state/kernelKeeper.js

@@ -119,6 +119,8 @@ export const CURRENT_SCHEMA_VERSION = 3;
 // old (v0): v$NN.reapCountdown = $NN or 'never'
 // v$NN.reapDirt = JSON({ deliveries, gcKrefs, computrons }) // missing keys treated as zero
 // (leave room for v$NN.snapshotDirt and options.snapshotDirtThreshold for #6786)
+// v$NN.vatParameters = JSON(capdata) // missing for vats created/upgraded before #8947
+//
 // exclude from consensus
 // local.*
 
@@ -1021,6 +1023,7 @@ export default function makeKernelKeeper(
     const work = {
       exports: 0,
       imports: 0,
+      promises: 0,
       kv: 0,
       snapshots: 0,
       transcripts: 0,
@@ -1045,6 +1048,7 @@ export default function makeKernelKeeper(
     const clistPrefix = `${vatID}.c.`;
     const exportPrefix = `${clistPrefix}o+`;
     const importPrefix = `${clistPrefix}o-`;
+    const promisePrefix = `${clistPrefix}p`;
 
     // Note: ASCII order is "+,-./", and we rely upon this to split the
     // keyspace into the various o+NN/o-NN/etc spaces. If we were using a
@@ -1097,8 +1101,22 @@ export default function makeKernelKeeper(
       }
     }
 
-    // the caller used enumeratePromisesByDecider() before calling us,
-    // so they already know the orphaned promises to reject
+    // The caller used enumeratePromisesByDecider() before calling us,
+    // so they have already rejected the orphan promises, but those
+    // kpids are still present in the dead vat's c-list. Clean those
+    // up now.
+    remaining = budget.promises ?? budget.default;
+    for (const k of enumeratePrefixedKeys(kvStore, promisePrefix)) {
+      const kref = kvStore.get(k) || Fail`getNextKey ensures get`;
+      const vref = stripPrefix(clistPrefix, k);
+      vatKeeper.deleteCListEntry(kref, vref);
+      // that will also delete both db keys
+      work.promises += 1;
+      remaining -= 1;
+      if (remaining <= 0) {
+        return { done: false, work };
+      }
+    }
 
     // now loop back through everything and delete it all
     remaining = budget.kv ?? budget.default;

package/src/kernel/state/vatKeeper.js

@@ -7,6 +7,7 @@ import { isObject } from '@endo/marshal';
 import { parseKernelSlot } from '../parseKernelSlots.js';
 import { makeVatSlot, parseVatSlot } from '../../lib/parseVatSlots.js';
 import { insistVatID } from '../../lib/id.js';
+import { insistCapData } from '../../lib/capdata.js';
 import { kdebug } from '../../lib/kdebug.js';
 import {
   parseReachableAndVatSlot,
@@ -173,6 +174,35 @@ export function makeVatKeeper(
     return harden(options);
   }
 
+  /**
+   * @param {SwingSetCapData} newVPCD
+   */
+  function setVatParameters(newVPCD) {
+    insistCapData(newVPCD);
+    const key = `${vatID}.vatParameters`;
+    // increment-before-decrement to minimize spurious rc=0 checks
+    for (const kref of newVPCD.slots) {
+      incrementRefCount(kref, `${vatID}.vatParameters`);
+    }
+    const old = kvStore.get(key) || '{"slots":[]}';
+    for (const kref of JSON.parse(old).slots) {
+      decrementRefCount(kref, `${vatID}.vatParameters`);
+    }
+    kvStore.set(key, JSON.stringify(newVPCD));
+  }
+
+  /**
+   * @returns {SwingSetCapData | undefined} vpcd
+   */
+  function getVatParameters() {
+    const key = `${vatID}.vatParameters`;
+    const old = kvStore.get(key);
+    if (old) {
+      return JSON.parse(old);
+    }
+    return undefined;
+  }
+
   // This is named "addDirt" because it should increment all dirt
   // counters (both for reap/BOYD and for heap snapshotting). We don't
   // have `heapSnapshotDirt` yet, but when we do, it should get
@@ -768,6 +798,8 @@ export function makeVatKeeper(
     setSourceAndOptions,
     getSourceAndOptions,
     getOptions,
+    setVatParameters,
+    getVatParameters,
     addDirt,
     getReapDirt,
     clearReapDirt,

package/src/types-external.js

@@ -227,6 +227,7 @@ export {};
  *
  * @typedef { { exports: number,
  *              imports: number,
+ *              promises: number,
  *              kv: number,
  *              snapshots: number,
  *              transcripts: number,