@agoric/swingset-vat 0.33.0-u21.0 → 0.33.0-u22.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@agoric/swingset-vat",
-  "version": "0.33.0-u21.0",
+  "version": "0.33.0-u22.0",
   "description": "Vat/Container Launcher",
   "type": "module",
   "main": "src/index.js",
@@ -13,7 +13,7 @@
   "scripts": {
     "build": "exit 0",
     "test": "ava",
-    "test:c8": "c8 --all $C8_OPTIONS ava",
+    "test:c8": "c8 --all ${C8_OPTIONS:-} ava",
     "test:xs": "SWINGSET_WORKER_TYPE=xs-worker ava",
     "test:xs-worker": "ava test/workers -m 'xsnap vat manager'",
     "lint-fix": "yarn lint:eslint --fix",
@@ -22,6 +22,7 @@
     "lint:eslint": "yarn run -T eslint ."
   },
   "devDependencies": {
+    "@agoric/xsnap": "0.15.0-u22.0",
     "@types/better-sqlite3": "^7.6.13",
     "@types/microtime": "^2.1.0",
     "@types/tmp": "^0.2.0",
@@ -29,33 +30,33 @@
     "ava": "^5.3.0"
   },
   "dependencies": {
-    "@agoric/internal": "workspace:*",
-    "@agoric/kmarshal": "workspace:*",
-    "@agoric/store": "workspace:*",
-    "@agoric/swing-store": "workspace:*",
-    "@agoric/swingset-liveslots": "workspace:*",
-    "@agoric/swingset-xsnap-supervisor": "workspace:*",
-    "@agoric/time": "workspace:*",
-    "@agoric/vat-data": "workspace:*",
-    "@agoric/xsnap-lockdown": "workspace:*",
-    "@endo/base64": "^1.0.9",
-    "@endo/bundle-source": "^4.0.0",
-    "@endo/captp": "^4.4.5",
-    "@endo/check-bundle": "^1.0.14",
-    "@endo/compartment-mapper": "^1.6.0",
-    "@endo/errors": "^1.2.10",
-    "@endo/eventual-send": "^1.3.1",
-    "@endo/far": "^1.1.11",
-    "@endo/import-bundle": "^1.4.0",
-    "@endo/init": "^1.1.9",
-    "@endo/marshal": "^1.6.4",
-    "@endo/nat": "^5.1.0",
-    "@endo/pass-style": "^1.5.0",
-    "@endo/patterns": "^1.5.0",
-    "@endo/promise-kit": "^1.1.10",
-    "@endo/ses-ava": "^1.2.10",
-    "@endo/stream": "^1.2.10",
-    "@endo/zip": "^1.0.9",
+    "@agoric/internal": "0.4.0-u22.0",
+    "@agoric/kmarshal": "0.2.0-u22.0",
+    "@agoric/store": "0.10.0-u22.0",
+    "@agoric/swing-store": "0.10.0-u22.0",
+    "@agoric/swingset-liveslots": "0.11.0-u22.0",
+    "@agoric/swingset-xsnap-supervisor": "0.11.0-u22.0",
+    "@agoric/time": "0.4.0-u22.0",
+    "@agoric/vat-data": "0.6.0-u22.0",
+    "@agoric/xsnap-lockdown": "0.14.1-u22.0",
+    "@endo/base64": "^1.0.12",
+    "@endo/bundle-source": "^4.1.2",
+    "@endo/captp": "^4.4.8",
+    "@endo/check-bundle": "^1.0.17",
+    "@endo/compartment-mapper": "^1.6.3",
+    "@endo/errors": "^1.2.13",
+    "@endo/eventual-send": "^1.3.4",
+    "@endo/far": "^1.1.14",
+    "@endo/import-bundle": "^1.5.2",
+    "@endo/init": "^1.1.12",
+    "@endo/marshal": "^1.8.0",
+    "@endo/nat": "^5.1.3",
+    "@endo/pass-style": "^1.6.3",
+    "@endo/patterns": "^1.7.0",
+    "@endo/promise-kit": "^1.1.13",
+    "@endo/ses-ava": "^1.3.2",
+    "@endo/stream": "^1.2.13",
+    "@endo/zip": "^1.0.11",
     "ansi-styles": "^6.2.1",
     "anylogger": "^0.21.0",
     "better-sqlite3": "^10.1.0",
@@ -66,7 +67,7 @@
     "yargs-parser": "^21.1.1"
   },
   "peerDependencies": {
-    "@agoric/xsnap": "workspace:*",
+    "@agoric/xsnap": "*",
     "ava": "^5.3.0"
   },
   "files": [
@@ -102,7 +103,7 @@
     "access": "public"
   },
   "typeCoverage": {
-    "atLeast": 76.47
+    "atLeast": 76.59
   },
-  "gitHead": "e4dd46857133403d584bcf822a81817b355532f9"
+  "gitHead": "dbf78c32d14bf4a38bfd7a10d061011a0ff368e6"
 }

package/src/kernel/state/vatKeeper.js

@@ -3,7 +3,7 @@
  */
 import { Nat } from '@endo/nat';
 import { assert, q, Fail } from '@endo/errors';
-import { isObject } from '@endo/marshal';
+import { isPrimitive } from '@endo/pass-style';
 import { parseKernelSlot } from '../parseKernelSlots.js';
 import { makeVatSlot, parseVatSlot } from '../../lib/parseVatSlots.js';
 import { insistVatID } from '../../lib/id.js';
@@ -45,8 +45,8 @@ export const DEFAULT_REAP_DIRT_THRESHOLD_KEY =
 
 const isBundleSource = source => {
   return (
-    isObject(source) &&
-    (isObject(source.bundle) ||
+    !isPrimitive(source) &&
+    (!isPrimitive(source.bundle) ||
       typeof source.bundleName === 'string' ||
       typeof source.bundleID === 'string')
   );
@@ -70,7 +70,7 @@ export function initializeVatState(
 ) {
   assert(isBundleSource(source), `vat ${vatID} source has wrong shape`);
   assert(
-    isObject(options) && isObject(options.workerOptions),
+    !isPrimitive(options) && !isPrimitive(options.workerOptions),
     `vat ${vatID} options is missing workerOptions`,
   );
 

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

@@ -9,6 +9,10 @@ import {
 } from '@agoric/vat-data';
 import { Far, E } from '@endo/far';
 
+/**
+ * @import {MapStore, SetStore} from '@agoric/store';
+ */
+
 // See ../../docs/delivery.md for a description of the architecture of the
 // comms system.