@agoric/swingset-vat 0.32.3-dev-3aa0690.0 → 0.32.3-dev-b5575d3.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@agoric/swingset-vat",
-  "version": "0.32.3-dev-3aa0690.0+3aa0690",
+  "version": "0.32.3-dev-b5575d3.0+b5575d3",
   "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-3aa0690.0+3aa0690",
-    "@agoric/kmarshal": "0.1.1-dev-3aa0690.0+3aa0690",
-    "@agoric/store": "0.9.3-dev-3aa0690.0+3aa0690",
-    "@agoric/swing-store": "0.9.2-dev-3aa0690.0+3aa0690",
-    "@agoric/swingset-liveslots": "0.10.3-dev-3aa0690.0+3aa0690",
-    "@agoric/swingset-xsnap-supervisor": "0.10.3-dev-3aa0690.0+3aa0690",
-    "@agoric/time": "0.3.3-dev-3aa0690.0+3aa0690",
-    "@agoric/vat-data": "0.5.3-dev-3aa0690.0+3aa0690",
-    "@agoric/xsnap": "0.14.3-dev-3aa0690.0+3aa0690",
-    "@agoric/xsnap-lockdown": "0.14.1-dev-3aa0690.0+3aa0690",
+    "@agoric/internal": "0.3.3-dev-b5575d3.0+b5575d3",
+    "@agoric/kmarshal": "0.1.1-dev-b5575d3.0+b5575d3",
+    "@agoric/store": "0.9.3-dev-b5575d3.0+b5575d3",
+    "@agoric/swing-store": "0.9.2-dev-b5575d3.0+b5575d3",
+    "@agoric/swingset-liveslots": "0.10.3-dev-b5575d3.0+b5575d3",
+    "@agoric/swingset-xsnap-supervisor": "0.10.3-dev-b5575d3.0+b5575d3",
+    "@agoric/time": "0.3.3-dev-b5575d3.0+b5575d3",
+    "@agoric/vat-data": "0.5.3-dev-b5575d3.0+b5575d3",
+    "@agoric/xsnap": "0.14.3-dev-b5575d3.0+b5575d3",
+    "@agoric/xsnap-lockdown": "0.14.1-dev-b5575d3.0+b5575d3",
     "@endo/base64": "^1.0.7",
     "@endo/bundle-source": "^3.4.0",
     "@endo/captp": "^4.3.0",
@@ -101,7 +101,7 @@
     "access": "public"
   },
   "typeCoverage": {
-    "atLeast": 75.7
+    "atLeast": 75.81
   },
-  "gitHead": "3aa069075ed1b66c57c8b647c925e0c3cb3c0a25"
+  "gitHead": "b5575d34588db3f4b850fb86ef144dabe7abe99e"
 }

package/src/kernel/deviceTranslator.js

@@ -69,7 +69,7 @@ function makeDRTranslator(deviceID, kernelKeeper) {
  *
  * @param {string} deviceID
  * @param {string} deviceName
- * @param {*} kernelKeeper
+ * @param {KernelKeeper} kernelKeeper
  * @returns {(dsc: DeviceSyscallObject) => KernelSyscallObject}
  */
 export function makeDSTranslator(deviceID, deviceName, kernelKeeper) {

package/src/kernel/gc-actions.js

@@ -45,7 +45,7 @@ function parseAction(s) {
 }
 
 /**
- * @param {*} kernelKeeper
+ * @param {KernelKeeper} kernelKeeper
  * @returns {import('../types-internal.js').RunQueueEvent | undefined}
  */
 export function processGCActionSet(kernelKeeper) {
@@ -86,10 +86,9 @@ export function processGCActionSet(kernelKeeper) {
     const hasCList = vatKeeper.hasCListEntry(kref);
     const isReachable = hasCList ? vatKeeper.getReachableFlag(kref) : undefined;
     const exists = kernelKeeper.kernelObjectExists(kref);
-    // @ts-expect-error xxx
     const { reachable, recognizable } = exists
       ? kernelKeeper.getObjectRefCount(kref)
-      : {};
+      : { reachable: 0, recognizable: 0 };
 
     if (type === 'dropExport') {
       if (!exists) return false; // already, shouldn't happen

package/src/kernel/kernel.js

@@ -39,8 +39,10 @@ import { makeDeviceTranslators } from './deviceTranslator.js';
 import { notifyTermination } from './notifyTermination.js';
 import { makeVatAdminHooks } from './vat-admin-hooks.js';
 
-/** @import * as liveslots from '@agoric/swingset-liveslots' */
-/** @import {PolicyInputCleanupCounts} from '../types-external.js' */
+/**
+ * @import {MeterConsumption, VatDeliveryObject, VatDeliveryResult, VatSyscallObject, VatSyscallResult} from '@agoric/swingset-liveslots';
+ * @import {PolicyInputCleanupCounts} from '../types-external.js';
+ */
 
 function abbreviateReplacer(_, arg) {
   if (typeof arg === 'bigint') {
@@ -56,7 +58,7 @@ function abbreviateReplacer(_, arg) {
 /**
  * Provide the kref of a vat's root object, as if it had been exported.
  *
- * @param {*} kernelKeeper  Kernel keeper managing persistent kernel state.
+ * @param {KernelKeeper} kernelKeeper  Kernel keeper managing persistent kernel state.
  * @param {string} vatID  Vat ID of the vat whose root kref is sought.
  *
  * @returns {string} the kref of the root object of the given vat.
@@ -380,7 +382,6 @@ export default function buildKernel(
 
   /**
    *
-   * @typedef { import('@agoric/swingset-liveslots').MeterConsumption } MeterConsumption
    * @typedef { import('../types-internal.js').MeterID } MeterID
    * @typedef { import('../types-internal.js').Dirt } Dirt
    *
@@ -416,7 +417,7 @@ export default function buildKernel(
    *
    * @param {VatID} vatID
    * @param {KernelDeliveryObject} kd
-   * @param {liveslots.VatDeliveryObject} vd
+   * @param {VatDeliveryObject} vd
    */
   async function deliverAndLogToVat(vatID, kd, vd) {
     vatRequestedTermination = undefined;
@@ -426,7 +427,7 @@ export default function buildKernel(
     const vs = kernelSlog.provideVatSlogger(vatID).vatSlog;
     await null;
     try {
-      /** @type { liveslots.VatDeliveryResult } */
+      /** @type { VatDeliveryResult } */
       const deliveryResult = await vatWarehouse.deliverToVat(vatID, kd, vd, vs);
       insistVatDeliveryResult(deliveryResult);
       // const [ ok, problem, usage ] = deliveryResult;
@@ -1542,8 +1543,8 @@ export default function buildKernel(
     // not
     /**
      *
-     * @param {liveslots.VatSyscallObject} vatSyscallObject
-     * @returns {liveslots.VatSyscallResult}
+     * @param {VatSyscallObject} vatSyscallObject
+     * @returns {VatSyscallResult}
      */
     function vatSyscallHandler(vatSyscallObject) {
       if (!vatWarehouse.lookup(vatID)) {
@@ -1558,7 +1559,7 @@ export default function buildKernel(
       let ksc;
       /** @type { KernelSyscallResult } */
       let kres = harden(['error', 'incomplete']);
-      /** @type { liveslots.VatSyscallResult } */
+      /** @type { VatSyscallResult } */
       let vres = harden(['error', 'incomplete']);
 
       try {

package/src/kernel/state/kernelKeeper.js

@@ -178,6 +178,7 @@ export const CURRENT_SCHEMA_VERSION = 2;
 //   * change `version` to `'2'`
 //   * add `vats.terminated` with `[]` as initial value
 
+/** @type {(s: string) => string[]} s */
 export function commaSplit(s) {
   if (s === '') {
     return [];
@@ -804,6 +805,7 @@ export default function makeKernelKeeper(
           p.decider = undefined;
         }
         p.policy = kvStore.get(`${kernelSlot}.policy`) || 'ignore';
+        // @ts-expect-error get() may fail
         p.subscribers = commaSplit(kvStore.get(`${kernelSlot}.subscribers`));
         p.queue = Array.from(
           getPrefixedValues(kvStore, `${kernelSlot}.queue.`),
@@ -815,6 +817,7 @@ export default function makeKernelKeeper(
         p.refCount = Number(kvStore.get(`${kernelSlot}.refCount`));
         p.data = {
           body: kvStore.get(`${kernelSlot}.data.body`),
+          // @ts-expect-error get() may fail
           slots: commaSplit(kvStore.get(`${kernelSlot}.data.slots`)),
         };
         for (const s of p.data.slots) {
@@ -1981,3 +1984,4 @@ export default function makeKernelKeeper(
     dump,
   });
 }
+/** @typedef {ReturnType<typeof makeKernelKeeper>} KernelKeeper */

package/src/types-external.js

@@ -124,7 +124,7 @@ export {};
  *
  * @typedef { { transcriptCount: number } } VatStats
  * @typedef { ReturnType<typeof import('./kernel/state/vatKeeper.js').makeVatKeeper> } VatKeeper
- * @typedef { ReturnType<typeof import('./kernel/state/kernelKeeper.js').default> } KernelKeeper
+ * @typedef { import('./kernel/state/kernelKeeper.js').KernelKeeper } KernelKeeper
  * @typedef { Awaited<ReturnType<typeof import('@agoric/xsnap').xsnap>> } XSnap
  * @typedef { (dr: VatDeliveryResult) => void } SlogFinishDelivery
  * @typedef { (ksr: KernelSyscallResult, vsr: VatSyscallResult) => void } SlogFinishSyscall