@agoric/swingset-vat 0.32.3-dev-5c28f49.0 → 0.32.3-dev-3c1b9a2.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@agoric/swingset-vat",
-  "version": "0.32.3-dev-5c28f49.0+5c28f49",
+  "version": "0.32.3-dev-3c1b9a2.0+3c1b9a2",
   "description": "Vat/Container Launcher",
   "type": "module",
   "main": "src/index.js",
@@ -27,17 +27,17 @@
     "@types/yargs-parser": "^21.0.0"
   },
   "dependencies": {
-    "@agoric/assert": "0.6.1-dev-5c28f49.0+5c28f49",
-    "@agoric/internal": "0.3.3-dev-5c28f49.0+5c28f49",
-    "@agoric/kmarshal": "0.1.1-dev-5c28f49.0+5c28f49",
-    "@agoric/store": "0.9.3-dev-5c28f49.0+5c28f49",
-    "@agoric/swing-store": "0.9.2-dev-5c28f49.0+5c28f49",
-    "@agoric/swingset-liveslots": "0.10.3-dev-5c28f49.0+5c28f49",
-    "@agoric/swingset-xsnap-supervisor": "0.10.3-dev-5c28f49.0+5c28f49",
-    "@agoric/time": "0.3.3-dev-5c28f49.0+5c28f49",
-    "@agoric/vat-data": "0.5.3-dev-5c28f49.0+5c28f49",
-    "@agoric/xsnap": "0.14.3-dev-5c28f49.0+5c28f49",
-    "@agoric/xsnap-lockdown": "0.14.1-dev-5c28f49.0+5c28f49",
+    "@agoric/assert": "0.6.1-dev-3c1b9a2.0+3c1b9a2",
+    "@agoric/internal": "0.3.3-dev-3c1b9a2.0+3c1b9a2",
+    "@agoric/kmarshal": "0.1.1-dev-3c1b9a2.0+3c1b9a2",
+    "@agoric/store": "0.9.3-dev-3c1b9a2.0+3c1b9a2",
+    "@agoric/swing-store": "0.9.2-dev-3c1b9a2.0+3c1b9a2",
+    "@agoric/swingset-liveslots": "0.10.3-dev-3c1b9a2.0+3c1b9a2",
+    "@agoric/swingset-xsnap-supervisor": "0.10.3-dev-3c1b9a2.0+3c1b9a2",
+    "@agoric/time": "0.3.3-dev-3c1b9a2.0+3c1b9a2",
+    "@agoric/vat-data": "0.5.3-dev-3c1b9a2.0+3c1b9a2",
+    "@agoric/xsnap": "0.14.3-dev-3c1b9a2.0+3c1b9a2",
+    "@agoric/xsnap-lockdown": "0.14.1-dev-3c1b9a2.0+3c1b9a2",
     "@endo/base64": "^1.0.3",
     "@endo/bundle-source": "^3.2.1",
     "@endo/captp": "^4.1.0",
@@ -102,5 +102,5 @@
   "typeCoverage": {
     "atLeast": 75.02
   },
-  "gitHead": "5c28f496976128e59e0e5a8f1a8c24f7b496527d"
+  "gitHead": "3c1b9a228963557eda54de21ef1db9cecff08c6f"
 }

package/src/kernel/kernel.js

@@ -33,12 +33,7 @@ import { makeDeviceTranslators } from './deviceTranslator.js';
 import { notifyTermination } from './notifyTermination.js';
 import { makeVatAdminHooks } from './vat-admin-hooks.js';
 
-/**
- * @typedef {import('@agoric/swingset-liveslots').VatDeliveryObject} VatDeliveryObject
- * @typedef {import('@agoric/swingset-liveslots').VatDeliveryResult} VatDeliveryResult
- * @typedef {import('@agoric/swingset-liveslots').VatSyscallObject} VatSyscallObject
- * @typedef {import('@agoric/swingset-liveslots').VatSyscallResult} VatSyscallResult
- */
+/** @import * as liveslots from '@agoric/swingset-liveslots' */
 
 function abbreviateReplacer(_, arg) {
   if (typeof arg === 'bigint') {
@@ -390,7 +385,7 @@ export default function buildKernel(
    *
    * @param {VatID} vatID
    * @param {KernelDeliveryObject} kd
-   * @param {VatDeliveryObject} vd
+   * @param {liveslots.VatDeliveryObject} vd
    */
   async function deliverAndLogToVat(vatID, kd, vd) {
     vatRequestedTermination = undefined;
@@ -400,7 +395,7 @@ export default function buildKernel(
     const vs = kernelSlog.provideVatSlogger(vatID).vatSlog;
     await null;
     try {
-      /** @type { VatDeliveryResult } */
+      /** @type { liveslots.VatDeliveryResult } */
       const deliveryResult = await vatWarehouse.deliverToVat(vatID, kd, vd, vs);
       insistVatDeliveryResult(deliveryResult);
       // const [ ok, problem, usage ] = deliveryResult;
@@ -1447,8 +1442,8 @@ export default function buildKernel(
     // not
     /**
      *
-     * @param {VatSyscallObject} vatSyscallObject
-     * @returns {VatSyscallResult}
+     * @param {liveslots.VatSyscallObject} vatSyscallObject
+     * @returns {liveslots.VatSyscallResult}
      */
     function vatSyscallHandler(vatSyscallObject) {
       if (!vatWarehouse.lookup(vatID)) {
@@ -1463,7 +1458,7 @@ export default function buildKernel(
       let ksc;
       /** @type { KernelSyscallResult } */
       let kres = harden(['error', 'incomplete']);
-      /** @type { VatSyscallResult } */
+      /** @type { liveslots.VatSyscallResult } */
       let vres = harden(['error', 'incomplete']);
 
       try {

package/src/types-external.js

@@ -1,3 +1,5 @@
+/** @import { ERef } from '@endo/far' */
+
 export {};
 
 /* This file defines types that part of the external API of swingset. That
@@ -353,10 +355,10 @@ export {};
  * @property {VatAdminFacet} adminNode
  *
  * @typedef {object} VatAdminSvc
- * @property {(id: BundleID) => import('@endo/far').ERef<BundleCap>} waitForBundleCap
- * @property {(id: BundleID) => import('@endo/far').ERef<BundleCap>} getBundleCap
- * @property {(name: string) => import('@endo/far').ERef<BundleCap>} getNamedBundleCap
- * @property {(name: string) => import('@endo/far').ERef<BundleID>} getBundleIDByName
- * @property {(bundleCap: BundleCap, options?: DynamicVatOptions) => import('@endo/far').ERef<CreateVatResults>} createVat
+ * @property {(id: BundleID) => ERef<BundleCap>} waitForBundleCap
+ * @property {(id: BundleID) => ERef<BundleCap>} getBundleCap
+ * @property {(name: string) => ERef<BundleCap>} getNamedBundleCap
+ * @property {(name: string) => ERef<BundleID>} getBundleIDByName
+ * @property {(bundleCap: BundleCap, options?: DynamicVatOptions) => ERef<CreateVatResults>} createVat
  *
  */

package/tools/run-utils.js

@@ -2,6 +2,8 @@ import { Fail, q } from '@agoric/assert';
 import { kunser } from '@agoric/kmarshal';
 import { makeQueue } from '@endo/stream';
 
+/** @import { ERef } from '@endo/far' */
+
 /**
  * @param {import('../src/controller/controller.js').SwingsetController} controller
  */
@@ -15,7 +17,7 @@ export const makeRunUtils = controller => {
    * Wait for exclusive access to the controller, then before relinquishing that access,
    * enqueue and process a delivery and return the result.
    *
-   * @param {() => import('@endo/far').ERef<void | ReturnType<controller['queueToVatObject']>>} deliveryThunk
+   * @param {() => ERef<void | ReturnType<controller['queueToVatObject']>>} deliveryThunk
    * function for enqueueing a delivery and returning the result kpid (if any)
    * @param {boolean} [voidResult] whether to ignore the result
    * @returns {Promise<any>}