@agoric/zoe 0.26.3-dev-a035a67.0 → 0.26.3-dev-3190128.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@agoric/zoe",
-  "version": "0.26.3-dev-a035a67.0+a035a67",
+  "version": "0.26.3-dev-3190128.0+3190128",
   "description": "Zoe: the Smart Contract Framework for Offer Enforcement",
   "type": "module",
   "main": "./src/zoeService/zoe.js",
@@ -43,17 +43,17 @@
   },
   "homepage": "https://github.com/Agoric/agoric-sdk#readme",
   "dependencies": {
-    "@agoric/base-zone": "0.1.1-dev-a035a67.0+a035a67",
-    "@agoric/ertp": "0.16.3-dev-a035a67.0+a035a67",
-    "@agoric/internal": "0.3.3-dev-a035a67.0+a035a67",
-    "@agoric/notifier": "0.6.3-dev-a035a67.0+a035a67",
-    "@agoric/store": "0.9.3-dev-a035a67.0+a035a67",
-    "@agoric/swingset-liveslots": "0.10.3-dev-a035a67.0+a035a67",
-    "@agoric/swingset-vat": "0.32.3-dev-a035a67.0+a035a67",
-    "@agoric/time": "0.3.3-dev-a035a67.0+a035a67",
-    "@agoric/vat-data": "0.5.3-dev-a035a67.0+a035a67",
-    "@agoric/vow": "0.1.1-dev-a035a67.0+a035a67",
-    "@agoric/zone": "0.2.3-dev-a035a67.0+a035a67",
+    "@agoric/base-zone": "0.1.1-dev-3190128.0+3190128",
+    "@agoric/ertp": "0.16.3-dev-3190128.0+3190128",
+    "@agoric/internal": "0.3.3-dev-3190128.0+3190128",
+    "@agoric/notifier": "0.6.3-dev-3190128.0+3190128",
+    "@agoric/store": "0.9.3-dev-3190128.0+3190128",
+    "@agoric/swingset-liveslots": "0.10.3-dev-3190128.0+3190128",
+    "@agoric/swingset-vat": "0.32.3-dev-3190128.0+3190128",
+    "@agoric/time": "0.3.3-dev-3190128.0+3190128",
+    "@agoric/vat-data": "0.5.3-dev-3190128.0+3190128",
+    "@agoric/vow": "0.1.1-dev-3190128.0+3190128",
+    "@agoric/zone": "0.2.3-dev-3190128.0+3190128",
     "@endo/bundle-source": "^4.0.0",
     "@endo/captp": "^4.4.5",
     "@endo/common": "^1.2.10",
@@ -70,7 +70,7 @@
     "yargs-parser": "^21.1.1"
   },
   "devDependencies": {
-    "@agoric/kmarshal": "0.1.1-dev-a035a67.0+a035a67",
+    "@agoric/kmarshal": "0.1.1-dev-3190128.0+3190128",
     "@endo/init": "^1.1.9",
     "ava": "^5.3.0",
     "c8": "^10.1.2",
@@ -100,5 +100,5 @@
   "typeCoverage": {
     "atLeast": 85.15
   },
-  "gitHead": "a035a67d66f974ed4b58ed1024bb5aa665e580d4"
+  "gitHead": "319012817be4498d42ea95c0f8460e1edb2ecb9c"
 }

package/tools/fakeVatAdmin.d.ts

@@ -88,15 +88,22 @@ export function makeFakeVatAdmin(testContextSetter?: (...args: any) => unknown,
         getExitMessage: () => any;
         getHasExited: () => boolean;
         getExitWithFailure: () => any;
-        installBundle: (id: any, bundle: any) => any;
+        /**
+         * @param {string} id
+         * @param {EndoZipBase64Bundle | TestBundle} bundle
+         */
+        installBundle: (id: string, bundle: EndoZipBase64Bundle | TestBundle) => any;
         installNamedBundle: (name: any, id: any, bundle: any) => any;
         getCriticalVatKey: () => {};
         getVatPowers: () => {
             D: (bcap: any) => {
-                getBundle: () => EndoZipBase64Bundle;
+                getBundle: () => EndoZipBase64Bundle | {
+                    moduleFormat: "test";
+                } | undefined;
             };
         };
     };
 };
 import type { EndoZipBase64Bundle } from '@agoric/swingset-vat';
+import type { TestBundle } from '@agoric/swingset-vat';
 //# sourceMappingURL=fakeVatAdmin.d.ts.map

package/tools/fakeVatAdmin.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"fakeVatAdmin.d.ts","sourceRoot":"","sources":["fakeVatAdmin.js"],"names":[],"mappings":"AAyBA,+BAA4C;;wBAJ7B,OAAO,sBAAsB,EAAE,SAAS;AAoJvD;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GAA8C;AA9I9C;;;GAGG;AACH,qDAHW,CAAC,GAAG,IAAI,KAAA,KAAK,OAAO,eACpB,CAAC,CAAC,EAAE,OAAO,KAAK,OAAO;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;EAqIjC;yCAjJ+C,sBAAsB"}
+{"version":3,"file":"fakeVatAdmin.d.ts","sourceRoot":"","sources":["fakeVatAdmin.js"],"names":[],"mappings":"AAyBA,+BAA4C;;wBAJ7B,OAAO,sBAAsB,EAAE,SAAS;AA4JvD;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GAA8C;AAtJ9C;;;GAGG;AACH,qDAHW,CAAC,GAAG,IAAI,KAAA,KAAK,OAAO,eACpB,CAAC,CAAC,EAAE,OAAO,KAAK,OAAO;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;QAgH9B;;;WAGG;4BAFQ,MAAM,UACN,mBAAmB,GAAG,UAAU;;;;;;kCAxGkB,MAAM;;;;;EAmItE;yCAzJ2D,sBAAsB;gCAAtB,sBAAsB"}

package/tools/fakeVatAdmin.js

@@ -1,4 +1,5 @@
-// @jessie-check
+// no jessie-check because this code runs only in Node for testing
+/* eslint-env node */
 
 import { Fail } from '@endo/errors';
 import { E } from '@endo/eventual-send';
@@ -13,9 +14,8 @@ import { makeHandle } from '../src/makeHandle.js';
 import zcfBundle from '../bundles/bundle-contractFacet.js';
 
 /**
- * @import {LegacyWeakMap, WeakMapStore} from '@agoric/store';
  * @import {MapStore} from '@agoric/swingset-liveslots';
- * @import {BundleID, EndoZipBase64Bundle} from '@agoric/swingset-vat';
+ * @import {BundleID, EndoZipBase64Bundle, TestBundle} from '@agoric/swingset-vat';
  */
 
 // this simulates a bundlecap, which is normally a swingset "device node"
@@ -37,8 +37,8 @@ function makeFakeVatAdmin(testContextSetter = undefined, makeRemote = x => x) {
   let exitWithFailure;
   /** @type {MapStore<BundleID, BundleCap>} */
   const idToBundleCap = makeScalarMapStore('idToBundleCap');
-  /** @type {MapStore<BundleCap, EndoZipBase64Bundle>} */
-  const bundleCapToBundle = makeScalarMapStore('bundleCapToBundle');
+  /** @type {Map<BundleCap, EndoZipBase64Bundle | {moduleFormat: 'test'}>} */
+  const bundleCapToBundle = new Map();
   /** @type {MapStore<string, BundleID>} */
   const nameToBundleID = makeScalarMapStore('nameToBundleID');
   const fakeVatPowers = {
@@ -139,17 +139,25 @@ function makeFakeVatAdmin(testContextSetter = undefined, makeRemote = x => x) {
     getExitMessage: () => exitMessage,
     getHasExited: () => hasExited,
     getExitWithFailure: () => exitWithFailure,
+    /**
+     * @param {string} id
+     * @param {EndoZipBase64Bundle | TestBundle} bundle
+     */
     installBundle: (id, bundle) => {
       if (idToBundleCap.has(id)) {
-        assert.equal(
-          bundle.endoZipBase64,
-          bundleCapToBundle.get(idToBundleCap.get(id)).endoZipBase64,
-        );
+        const extant = bundleCapToBundle.get(idToBundleCap.get(id));
+        assert(extant);
+        assert.equal(bundle.moduleFormat, extant.moduleFormat);
+        if (extant.moduleFormat === 'endoZipBase64') {
+          // Narrow bundle.moduleFormat now that extant.moduleFormat is narrowed
+          assert.equal(bundle.moduleFormat, extant.moduleFormat);
+          assert.equal(bundle.endoZipBase64, extant.endoZipBase64);
+        }
         return idToBundleCap.get(id);
       }
       const bundleCap = fakeBundleCap();
       idToBundleCap.init(id, bundleCap);
-      bundleCapToBundle.init(bundleCap, bundle);
+      bundleCapToBundle.set(bundleCap, bundle);
       return bundleCap;
     },
     installNamedBundle: (name, id, bundle) => {

package/tools/setup-zoe.d.ts

@@ -15,22 +15,26 @@ export function setUpZoeForTest<T extends unknown = any>({ setJig, feeIssuerConf
 }): Promise<{
     zoe: import("@endo/exo").Guarded<globalThis.ZoeService>;
     feeMintAccessP: FeeMintAccess;
-    bundleAndInstall: (path: string) => Promise<Installation>;
+    bundleAndInstall: (pathOrExports: object) => Promise<Installation>;
     vatAdminSvc: VatAdminSvc;
     vatAdminState: {
         getExitMessage: () => any;
         getHasExited: () => boolean;
         getExitWithFailure: () => any;
-        installBundle: (id: any, bundle: any) => any;
+        installBundle: (id: string, bundle: EndoZipBase64Bundle | TestBundle) => any;
         installNamedBundle: (name: any, id: any, bundle: any) => any;
         getCriticalVatKey: () => {};
         getVatPowers: () => {
             D: (bcap: any) => {
-                getBundle: () => EndoZipBase64Bundle;
+                getBundle: () => EndoZipBase64Bundle | {
+                    moduleFormat: "test";
+                } | undefined;
             };
         };
     } | undefined;
 }>;
 import type { FeeIssuerConfig } from '../src/types-index.js';
 import type { Installation } from '../src/types-index.js';
+import type { EndoZipBase64Bundle } from '@agoric/swingset-vat';
+import type { TestBundle } from '@agoric/swingset-vat';
 //# sourceMappingURL=setup-zoe.d.ts.map

package/tools/setup-zoe.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"setup-zoe.d.ts","sourceRoot":"","sources":["setup-zoe.js"],"names":[],"mappings":"AAcO,gDAFI,WAAW;;;;;;;EAOrB;AAKM,6CAFI,WAAW,sDAGqB;AAapC,gCAPgB,CAAC,mFAErB;IAAmC,MAAM,UAA3B,CAAC,KAAK,IAAI;IACU,eAAe;IACnB,WAAW;IACf,aAAa;CAAC;;;6BA2B9B,MAAM,KACJ,OAAO,CAAC,YAAY,CAAC;;;;;;;;;;;;;;;GAiBnC;qCAzE+C,uBAAuB;kCAAvB,uBAAuB"}
+{"version":3,"file":"setup-zoe.d.ts","sourceRoot":"","sources":["setup-zoe.js"],"names":[],"mappings":"AAgBO,gDAFI,WAAW;;;;;;;EAOrB;AAKM,6CAFI,WAAW,sDAGqB;AAapC,gCAPgB,CAAC,mFAErB;IAAmC,MAAM,UAA3B,CAAC,KAAK,IAAI;IACU,eAAe;IACnB,WAAW;IACf,aAAa;CAAC;;;sCAmD9B,MAAM,KACJ,OAAO,CAAC,YAAY,CAAC;;;;;;;;;;;;;;;;;GAoBnC;qCApG+C,uBAAuB;kCAAvB,uBAAuB;yCADrB,sBAAsB;gCAAtB,sBAAsB"}

package/tools/setup-zoe.js

@@ -2,10 +2,12 @@ import { E, makeLoopback } from '@endo/captp';
 
 import { makeScalarBigMapStore } from '@agoric/vat-data';
 import bundleSource from '@endo/bundle-source';
+import { bundleTestExports } from '@endo/import-bundle';
 import { makeDurableZoeKit } from '../src/zoeService/zoe.js';
 import fakeVatAdmin, { makeFakeVatAdmin } from './fakeVatAdmin.js';
 
 /**
+ * @import {EndoZipBase64Bundle, TestBundle} from '@agoric/swingset-vat';
  * @import {FeeIssuerConfig, Installation} from '../src/types-index.js';
  */
 
@@ -61,13 +63,40 @@ export const setUpZoeForTest = async ({
   );
 
   /**
-   * @param {string} path
+   * @param {object} pathOrExports
+   * @returns {Promise<EndoZipBase64Bundle | TestBundle>}
+   */
+  const bundleModule = async pathOrExports => {
+    if (typeof pathOrExports === 'string') {
+      const path = pathOrExports;
+      return bundleSource(path);
+    } else {
+      assert.equal(
+        Object.getOwnPropertyDescriptor(pathOrExports, Symbol.toStringTag)
+          ?.value,
+        'Module',
+      );
+      // Copy all the properties so this object can be hardened.
+      const exports = { ...pathOrExports };
+      return bundleTestExports(exports);
+    }
+  };
+
+  /**
+   * Bundle the source module (either as file system path or a Module object)
+   * and return an Installation. The bundleID is random and should not be relied
+   * upon in tests of this variety.
+   *
+   * @param {object} pathOrExports
    * @returns {Promise<Installation>}
    */
-  const bundleAndInstall = async path => {
-    const bundle = await bundleSource(path);
-    const id = `b1-${path}`;
-    assert(vatAdminState, 'installBundle called before vatAdminState defined');
+  const bundleAndInstall = async pathOrExports => {
+    const bundle = await bundleModule(pathOrExports);
+    assert(
+      vatAdminState,
+      'bundleAndInstall called before vatAdminState defined',
+    );
+    const id = `b1-zoe-test-${Math.random()}`;
     vatAdminState.installBundle(id, bundle);
     return E(zoeService).installBundleID(id);
   };