@agoric/swingset-vat 0.32.3-dev-1c730f2.0 → 0.32.3-dev-26cd420.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@agoric/swingset-vat",
-  "version": "0.32.3-dev-1c730f2.0+1c730f2",
+  "version": "0.32.3-dev-26cd420.0+26cd420",
   "description": "Vat/Container Launcher",
   "type": "module",
   "main": "src/index.js",
@@ -27,15 +27,15 @@
     "@types/yargs-parser": "^21.0.0"
   },
   "dependencies": {
-    "@agoric/internal": "0.3.3-dev-1c730f2.0+1c730f2",
-    "@agoric/kmarshal": "0.1.1-dev-1c730f2.0+1c730f2",
-    "@agoric/store": "0.9.3-dev-1c730f2.0+1c730f2",
-    "@agoric/swing-store": "0.9.2-dev-1c730f2.0+1c730f2",
-    "@agoric/swingset-liveslots": "0.10.3-dev-1c730f2.0+1c730f2",
-    "@agoric/swingset-xsnap-supervisor": "0.10.3-dev-1c730f2.0+1c730f2",
-    "@agoric/time": "0.3.3-dev-1c730f2.0+1c730f2",
-    "@agoric/vat-data": "0.5.3-dev-1c730f2.0+1c730f2",
-    "@agoric/xsnap-lockdown": "0.14.1-dev-1c730f2.0+1c730f2",
+    "@agoric/internal": "0.3.3-dev-26cd420.0+26cd420",
+    "@agoric/kmarshal": "0.1.1-dev-26cd420.0+26cd420",
+    "@agoric/store": "0.9.3-dev-26cd420.0+26cd420",
+    "@agoric/swing-store": "0.9.2-dev-26cd420.0+26cd420",
+    "@agoric/swingset-liveslots": "0.10.3-dev-26cd420.0+26cd420",
+    "@agoric/swingset-xsnap-supervisor": "0.10.3-dev-26cd420.0+26cd420",
+    "@agoric/time": "0.3.3-dev-26cd420.0+26cd420",
+    "@agoric/vat-data": "0.5.3-dev-26cd420.0+26cd420",
+    "@agoric/xsnap-lockdown": "0.14.1-dev-26cd420.0+26cd420",
     "@endo/base64": "^1.0.9",
     "@endo/bundle-source": "^4.0.0",
     "@endo/captp": "^4.4.5",
@@ -100,7 +100,7 @@
     "access": "public"
   },
   "typeCoverage": {
-    "atLeast": 76.25
+    "atLeast": 76.47
   },
-  "gitHead": "1c730f2199678c14aec52792a0663d93a63741b1"
+  "gitHead": "26cd420bec244f459c724a5ca83316c2ecc0187e"
 }

package/src/devices/bridge/device-bridge.js

@@ -62,3 +62,5 @@ export function buildRootDeviceNode(tools) {
     },
   });
 }
+
+/** @typedef {import('../../types-external.js').Device<ReturnType<typeof buildRootDeviceNode>>} BridgeDevice */

package/src/devices/timer/device-timer.js

@@ -223,6 +223,7 @@ export function buildRootDeviceNode(tools) {
   // The latest time poll() was called. This might be a block height or it
   // might be a time from Date.now(). The current time is not reflected back
   // to the user.
+  /** @type {bigint} */
   let lastPolled = restart ? restart.lastPolled : 0n;
   let nextRepeater = restart ? restart.nextRepeater : 0;
 
@@ -311,6 +312,7 @@ export function buildRootDeviceNode(tools) {
     },
   });
 }
+/** @typedef {import('../../types-external.js').Device<ReturnType<typeof buildRootDeviceNode>>} TimerDevice */
 
 // exported for testing. Only buildRootDeviceNode is intended for production
 // use.

package/src/types-external.js

@@ -12,6 +12,13 @@ export {};
  * includes standard services which user-provided vat code might interact
  * with, like VatAdminService. */
 
+/**
+ * @template T
+ * @typedef {'Device' & { __deviceType__: T }} Device
+ */
+
+/** @typedef {<T>(target: Device<T>) => T} DProxy (approximately) */
+
 /**
  * @typedef {(extraProps?: SlogDurationProps) => void} FinishSlogDuration
  */

package/src/vats/plugin-manager.js

@@ -7,6 +7,8 @@ import { Far, E } from '@endo/far';
 
 /**
  * @import {ERef} from '@endo/far';
+ * @import {MapStore} from '@agoric/store';
+ * @import {Device, DProxy} from '@agoric/swingset-vat/src/types-external.js';
  */
 
 /** @type {{ onReset: (firstTime: Promise<boolean>) => void}} */
@@ -15,13 +17,6 @@ const DEFAULT_RESETTER = Far('resetter', { onReset: _ => {} });
 /** @type {{ walk: (pluginRootP: any) => any }} */
 const DEFAULT_WALKER = Far('walker', { walk: pluginRootP => pluginRootP });
 
-/**
- * @template T
- * @typedef {'Device' & { __deviceType__: T }} Device
- */
-
-/** @typedef {<T>(target: Device<T>) => T} DProxy (approximately) */
-
 /**
  * @callback LoadPlugin
  * @param {string} specifier

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

@@ -15,9 +15,11 @@ import { TimeMath } from '@agoric/time';
 
 /**
  * @import {LegacyWeakMap, WeakMapStore} from '@agoric/store';
- * @import {MapStore} from '@agoric/swingset-liveslots';
+ * @import {Baggage, MapStore} from '@agoric/swingset-liveslots';
  * @import {Passable, RemotableObject} from '@endo/pass-style';
  * @import {Key} from '@endo/patterns';
+ * @import {TimerDevice} from '../../devices/timer/device-timer.js';
+ * @import {DProxy} from '../../types-external.js';
  */
 
 // This consumes O(N) RAM only for outstanding promises, via wakeAt(),
@@ -237,9 +239,17 @@ const measureInterval = (start, interval, now) => {
   return { latest, next };
 };
 
+/**
+ * @param {{
+ *   D: DProxy;
+ * }} vatPowers
+ * @param {{}} _vatParameters
+ * @param {Baggage} baggage
+ */
 export const buildRootObject = (vatPowers, _vatParameters, baggage) => {
   const { D } = vatPowers;
 
+  /** @type {TimerDevice} */
   let timerDevice;
   const insistDevice = () => {
     assert(timerDevice, 'TimerService used before createTimerService()');
@@ -455,9 +465,6 @@ export const buildRootObject = (vatPowers, _vatParameters, baggage) => {
     },
   };
 
-  /**
-   * @returns { PromiseEvent }
-   */
   const makePromiseEvent = prepareKind(
     baggage,
     'promiseEvent',
@@ -948,7 +955,7 @@ export const buildRootObject = (vatPowers, _vatParameters, baggage) => {
    * device, but we don't prohibit it from being called again (to
    * replace the device), just in case that's useful someday
    *
-   * @param {unknown} timerNode
+   * @param {TimerDevice} timerNode
    * @returns {TimerService}
    */
   const createTimerService = timerNode => {

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

@@ -20,7 +20,7 @@ import {
 
 /**
  * @import {VatAdminRootDeviceNode} from '../../devices/vat-admin/device-vat-admin.js';
- * @import {DProxy} from'../plugin-manager.js';
+ * @import {DProxy} from'../../types-external.js';
  * @import {Baggage} from '@agoric/vat-data';
  */
 
@@ -49,7 +49,7 @@ export function buildRootObject(vatPowers, _vatParameters, baggage) {
   const pendingBundles = new Map();
   const pendingUpgrades = new Map(); // upgradeID -> Promise<UpgradeResults>
 
-  /** @type {import('../plugin-manager.js').Device<VatAdminRootDeviceNode>} */
+  /** @type {import('../../types-external.js').Device<VatAdminRootDeviceNode>} */
   let vatAdminDev;
 
   const runningVats = new Map(); // vatID -> [doneP, { resolve, reject }]

package/tools/manual-timer.js

@@ -34,6 +34,7 @@ const setup = callbacks => {
     currentWakeup: undefined,
     currentHandler: undefined,
   };
+  /** @type {any} */
   const deviceMarker = harden({});
   const timerDeviceFuncs = harden({
     getLastPolled: () => state.now,
@@ -54,6 +55,7 @@ const setup = callbacks => {
       state.currentHandler = undefined;
     },
   });
+  /** @type {any} */
   const D = node => {
     assert.equal(node, deviceMarker, 'fake D only supports devices.timer');
     return timerDeviceFuncs;