@agoric/swingset-vat 0.32.3-dev-cbec0c6.0 → 0.32.3-dev-3573f79.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@agoric/swingset-vat",
-  "version": "0.32.3-dev-cbec0c6.0+cbec0c6",
+  "version": "0.32.3-dev-3573f79.0+3573f79",
   "description": "Vat/Container Launcher",
   "type": "module",
   "main": "src/index.js",
@@ -27,16 +27,16 @@
     "@types/yargs-parser": "^21.0.0"
   },
   "dependencies": {
-    "@agoric/assert": "0.6.1-dev-cbec0c6.0+cbec0c6",
-    "@agoric/internal": "0.3.3-dev-cbec0c6.0+cbec0c6",
-    "@agoric/store": "0.9.3-dev-cbec0c6.0+cbec0c6",
-    "@agoric/swing-store": "0.9.2-dev-cbec0c6.0+cbec0c6",
-    "@agoric/swingset-liveslots": "0.10.3-dev-cbec0c6.0+cbec0c6",
-    "@agoric/swingset-xsnap-supervisor": "0.10.3-dev-cbec0c6.0+cbec0c6",
-    "@agoric/time": "0.3.3-dev-cbec0c6.0+cbec0c6",
-    "@agoric/vat-data": "0.5.3-dev-cbec0c6.0+cbec0c6",
-    "@agoric/xsnap": "0.14.3-dev-cbec0c6.0+cbec0c6",
-    "@agoric/xsnap-lockdown": "0.14.1-dev-cbec0c6.0+cbec0c6",
+    "@agoric/assert": "0.6.1-dev-3573f79.0+3573f79",
+    "@agoric/internal": "0.3.3-dev-3573f79.0+3573f79",
+    "@agoric/store": "0.9.3-dev-3573f79.0+3573f79",
+    "@agoric/swing-store": "0.9.2-dev-3573f79.0+3573f79",
+    "@agoric/swingset-liveslots": "0.10.3-dev-3573f79.0+3573f79",
+    "@agoric/swingset-xsnap-supervisor": "0.10.3-dev-3573f79.0+3573f79",
+    "@agoric/time": "0.3.3-dev-3573f79.0+3573f79",
+    "@agoric/vat-data": "0.5.3-dev-3573f79.0+3573f79",
+    "@agoric/xsnap": "0.14.3-dev-3573f79.0+3573f79",
+    "@agoric/xsnap-lockdown": "0.14.1-dev-3573f79.0+3573f79",
     "@endo/base64": "^0.2.32",
     "@endo/bundle-source": "^2.5.2",
     "@endo/captp": "^3.1.2",
@@ -48,6 +48,7 @@
     "@endo/init": "^0.5.57",
     "@endo/marshal": "^0.8.6",
     "@endo/nat": "^4.1.28",
+    "@endo/patterns": "^0.2.3",
     "@endo/promise-kit": "^0.2.57",
     "@endo/ses-ava": "^0.2.41",
     "@endo/zip": "^0.2.32",
@@ -93,5 +94,5 @@
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "cbec0c67e13056e7ffc7d42c840946e6d5316ad0"
+  "gitHead": "3573f7960954eb22458f812066adcb0888e74363"
 }

package/src/controller/controller.js

@@ -10,10 +10,11 @@ import { tmpName } from 'tmp';
 import anylogger from 'anylogger';
 import microtime from 'microtime';
 
-import { assert, Fail, q } from '@agoric/assert';
+import { assert, Fail } from '@agoric/assert';
 import { importBundle } from '@endo/import-bundle';
 import { initSwingStore } from '@agoric/swing-store';
 
+import { mustMatch, M } from '@endo/patterns';
 import { checkBundle } from '@endo/check-bundle/lite.js';
 import engineGC from '@agoric/internal/src/lib-nodejs/engine-gc.js';
 import { startSubprocessWorker } from '@agoric/internal/src/lib-nodejs/spawnSubprocessWorker.js';
@@ -33,6 +34,12 @@ import {
 import { makeStartXSnap } from './startXSnap.js';
 import { makeStartSubprocessWorkerNode } from './startNodeSubprocess.js';
 
+const endoZipBase64Sha512Shape = harden({
+  moduleFormat: 'endoZipBase64',
+  endoZipBase64: M.string(harden({ stringLengthLimit: Infinity })),
+  endoZipBase64Sha512: M.string(),
+});
+
 /** @param {Uint8Array} bytes */
 export function computeSha512(bytes) {
   const hash = crypto.createHash('sha512');
@@ -258,21 +265,11 @@ export async function makeSwingsetController(
    * @param {BundleID} [allegedBundleID]
    * @returns {Promise<BundleID>}
    */
-  async function validateAndInstallBundle(bundle, allegedBundleID) {
+  async function validateAndInstallBundle(bundle, allegedBundleID = undefined) {
     // TODO The following assertion may be removed when checkBundle subsumes
     // the responsibility to verify the permanence of a bundle's properties.
     // https://github.com/endojs/endo/issues/1106
-
-    Object.values(Object.getOwnPropertyDescriptors(bundle)).every(
-      ({ value, get, writable, configurable }) =>
-        typeof value === 'string' &&
-        get === undefined &&
-        // @ts-ignore `isFake` purposely omitted from type
-        (harden.isFake || (writable === false && configurable === false)),
-    ) ||
-      Fail`Bundle with alleged ID ${q(
-        allegedBundleID,
-      )} must be a frozen object with only string value properties, no accessors`;
+    mustMatch(bundle, endoZipBase64Sha512Shape);
     await checkBundle(bundle, computeSha512, allegedBundleID);
     const { endoZipBase64Sha512 } = bundle;
     assert.typeof(endoZipBase64Sha512, 'string');