@agoric/zoe 0.26.3-dev-5ec590e.0.5ec590e → 0.26.3-dev-d1bb9cd.0.d1bb9cd

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@agoric/zoe",
-  "version": "0.26.3-dev-5ec590e.0.5ec590e",
+  "version": "0.26.3-dev-d1bb9cd.0.d1bb9cd",
   "description": "Zoe: the Smart Contract Framework for Offer Enforcement",
   "type": "module",
   "main": "./src/zoeService/zoe.js",
@@ -40,17 +40,17 @@
   },
   "homepage": "https://github.com/Agoric/agoric-sdk#readme",
   "dependencies": {
-    "@agoric/base-zone": "0.1.1-dev-5ec590e.0.5ec590e",
-    "@agoric/ertp": "0.16.3-dev-5ec590e.0.5ec590e",
-    "@agoric/internal": "0.3.3-dev-5ec590e.0.5ec590e",
-    "@agoric/notifier": "0.6.3-dev-5ec590e.0.5ec590e",
-    "@agoric/store": "0.9.3-dev-5ec590e.0.5ec590e",
-    "@agoric/swingset-liveslots": "0.10.3-dev-5ec590e.0.5ec590e",
-    "@agoric/swingset-vat": "0.32.3-dev-5ec590e.0.5ec590e",
-    "@agoric/time": "0.3.3-dev-5ec590e.0.5ec590e",
-    "@agoric/vat-data": "0.5.3-dev-5ec590e.0.5ec590e",
-    "@agoric/vow": "0.1.1-dev-5ec590e.0.5ec590e",
-    "@agoric/zone": "0.2.3-dev-5ec590e.0.5ec590e",
+    "@agoric/base-zone": "0.1.1-dev-d1bb9cd.0.d1bb9cd",
+    "@agoric/ertp": "0.16.3-dev-d1bb9cd.0.d1bb9cd",
+    "@agoric/internal": "0.3.3-dev-d1bb9cd.0.d1bb9cd",
+    "@agoric/notifier": "0.6.3-dev-d1bb9cd.0.d1bb9cd",
+    "@agoric/store": "0.9.3-dev-d1bb9cd.0.d1bb9cd",
+    "@agoric/swingset-liveslots": "0.10.3-dev-d1bb9cd.0.d1bb9cd",
+    "@agoric/swingset-vat": "0.32.3-dev-d1bb9cd.0.d1bb9cd",
+    "@agoric/time": "0.3.3-dev-d1bb9cd.0.d1bb9cd",
+    "@agoric/vat-data": "0.5.3-dev-d1bb9cd.0.d1bb9cd",
+    "@agoric/vow": "0.1.1-dev-d1bb9cd.0.d1bb9cd",
+    "@agoric/zone": "0.2.3-dev-d1bb9cd.0.d1bb9cd",
     "@endo/bundle-source": "^4.1.2",
     "@endo/captp": "^4.4.8",
     "@endo/common": "^1.2.13",
@@ -67,7 +67,7 @@
     "yargs-parser": "^21.1.1"
   },
   "devDependencies": {
-    "@agoric/kmarshal": "0.1.1-dev-5ec590e.0.5ec590e",
+    "@agoric/kmarshal": "0.1.1-dev-d1bb9cd.0.d1bb9cd",
     "@endo/init": "^1.1.12",
     "ava": "^6.4.1",
     "c8": "^10.1.3",
@@ -97,5 +97,5 @@
   "typeCoverage": {
     "atLeast": 84.84
   },
-  "gitHead": "5ec590e7aa787c5d8fb778a7cf14ec68f252fb83"
+  "gitHead": "d1bb9cd8ec3f764f64cda4b331c66e37ad179a73"
 }

package/src/contractFacet/buildRootObject.d.ts

@@ -0,0 +1,14 @@
+export function makeBuildRootObject(makeZCFZygote: (powers: any, zoeService: ZoeService, invitationIssuer: Issuer<"set">, testJigSetter: ({ zcf }: {
+    zcf: ZCF;
+}) => void, contractBundleCap: BundleCap, baggage: Baggage) => Promise<any>): (powers: any, vatParameters: {
+    contractBundleCap: BundleCap;
+    zoeService: ZoeService;
+    invitationIssuer: Issuer<"set">;
+    privateArgs?: any;
+}, baggage: Baggage) => Promise<import("@endo/marshal").RemotableObject<`Alleged: ${string}`> & import("@endo/eventual-send").RemotableBrand<{}, {}>>;
+import type { ZoeService } from '@agoric/zoe';
+import type { Issuer } from '@agoric/ertp';
+import type { ZCF } from '@agoric/zoe';
+import type { BundleCap } from '@agoric/swingset-vat';
+import type { Baggage } from '@agoric/vat-data';
+//# sourceMappingURL=buildRootObject.d.ts.map

package/src/contractFacet/buildRootObject.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"buildRootObject.d.ts","sourceRoot":"","sources":["buildRootObject.js"],"names":[],"mappings":"AAqBO,mDAJI,CAAC,MAAM,EAAE,GAAG,EAAE,UAAU,EAAE,UAAU,EAAE,gBAAgB,EAAE,OAAO,KAAK,CAAC,EAC3E,aAAa,EAAE,CAAC,EAAE,GAAG,EAAE,EAAE;IAAE,GAAG,EAAE,GAAG,CAAA;CAAE,KAAK,IAAI,EAC9C,iBAAiB,EAAE,SAAS,EAAE,OAAO,EAAE,OAAO,KAAK,OAAO,CAAC,GAAG,CAAC,YAIvD,GAAG,iBACH;IACN,iBAAiB,EAAE,SAAS,CAAC;IAC7B,UAAU,EAAE,UAAU,CAAC;IACvB,gBAAgB,EAAE,OAAO,KAAK,CAAC,CAAC;IAChC,WAAW,CAAC,EAAE,GAAG,CAAC;CACnB,WACO,OAAO,mIAyDnB;gCAhFiC,aAAa;4BAGtB,cAAc;yBAHL,aAAa;+BAEnB,sBAAsB;6BADxB,kBAAkB"}

package/src/contractFacet/buildRootObject.js

@@ -0,0 +1,89 @@
+// @jessie-check
+
+import { Fail } from '@endo/errors';
+import { E } from '@endo/far';
+import { Far } from '@endo/marshal';
+
+/**
+ * @import {ZCF, ZoeService} from '@agoric/zoe';
+ * @import {Baggage} from '@agoric/vat-data';
+ * @import {BundleCap} from '@agoric/swingset-vat';
+ * @import {Issuer} from '@agoric/ertp';
+ * @import {StartZcf} from '../internal-types.js';
+ */
+
+/**
+ * Shared implementation for production and test contract-vat roots.
+ *
+ * @param {(powers: any, zoeService: ZoeService, invitationIssuer: Issuer<'set'>,
+ *   testJigSetter: ({ zcf }: { zcf: ZCF }) => void,
+ *   contractBundleCap: BundleCap, baggage: Baggage) => Promise<any>} makeZCFZygote
+ */
+export const makeBuildRootObject = makeZCFZygote => {
+  /**
+   * @param {any} powers
+   * @param {{
+   *   contractBundleCap: BundleCap,
+   *   zoeService: ZoeService,
+   *   invitationIssuer: Issuer<'set'>,
+   *   privateArgs?: any,
+   * }} vatParameters
+   * @param {Baggage} baggage
+   */
+  const buildRootObject = async (powers, vatParameters, baggage) => {
+    const { testJigSetter } = powers;
+    const { contractBundleCap } = vatParameters;
+    contractBundleCap ||
+      Fail`expected vatParameters.contractBundleCap ${vatParameters}`;
+    let { zoeService, invitationIssuer } = vatParameters;
+    const firstTime = !baggage.has('DidStart');
+    if (firstTime) {
+      baggage.init('DidStart', 'DidStart');
+      baggage.init('zoeService', zoeService);
+      baggage.init('invitationIssuer', invitationIssuer);
+    } else {
+      !zoeService || Fail`On restart zoeService must not be in vatParameters`;
+      zoeService = baggage.get('zoeService');
+
+      !invitationIssuer ||
+        Fail`On restart invitationIssuer must not be in vatParameters`;
+      invitationIssuer = baggage.get('invitationIssuer');
+    }
+
+    const zcfZygote = await makeZCFZygote(
+      powers,
+      zoeService,
+      invitationIssuer,
+      testJigSetter,
+      contractBundleCap,
+      baggage,
+    );
+
+    if (!firstTime) {
+      return E.when(
+        E(zcfZygote).restartContract(vatParameters.privateArgs),
+        () => Far('upgraded contractRunner', {}),
+      );
+    }
+
+    return Far('contractRunner', {
+      /** @type {StartZcf} */
+      startZcf: (
+        zoeInstanceAdmin,
+        instanceRecordFromZoe,
+        issuerStorageFromZoe,
+        privateArgs = undefined,
+      ) => {
+        return E(zcfZygote).startContract(
+          zoeInstanceAdmin,
+          instanceRecordFromZoe,
+          issuerStorageFromZoe,
+          privateArgs,
+        );
+      },
+    });
+  };
+
+  return harden(buildRootObject);
+};
+harden(makeBuildRootObject);

package/src/contractFacet/vatRoot.d.ts

@@ -1,30 +1,7 @@
-/**
- * @import {ZCF, ZoeService} from '@agoric/zoe';
- * @import {Baggage} from '@agoric/vat-data';
- * @import {VatPowers} from '@agoric/swingset-vat';
- * @import {BundleCap} from '@agoric/swingset-vat';
- * @import {StartZcf} from '../internal-types.js';
- * @import {Issuer} from '@agoric/ertp';
- */
-/**
- * @param {VatPowers & { testJigSetter: ( {zcf}: {zcf: ZCF} ) => void }} powers
- * @param {{contractBundleCap: BundleCap, zoeService: ZoeService, invitationIssuer: Issuer<'set'>, privateArgs?: any}} vatParameters
- * @param {Baggage} baggage
- */
-export function buildRootObject(powers: VatPowers & {
-    testJigSetter: ({ zcf }: {
-        zcf: ZCF;
-    }) => void;
-}, vatParameters: {
-    contractBundleCap: BundleCap;
-    zoeService: ZoeService;
-    invitationIssuer: Issuer<"set">;
+export const buildRootObject: (powers: any, vatParameters: {
+    contractBundleCap: import("@agoric/swingset-vat").BundleCap;
+    zoeService: import("../types-index.js").ZoeService;
+    invitationIssuer: import("@agoric/ertp").Issuer<"set">;
     privateArgs?: any;
-}, baggage: Baggage): Promise<import("@endo/marshal").RemotableObject<`Alleged: ${string}`> & import("@endo/eventual-send").RemotableBrand<{}, {}>>;
-import type { VatPowers } from '@agoric/swingset-vat';
-import type { ZCF } from '@agoric/zoe';
-import type { BundleCap } from '@agoric/swingset-vat';
-import type { ZoeService } from '@agoric/zoe';
-import type { Issuer } from '@agoric/ertp';
-import type { Baggage } from '@agoric/vat-data';
+}, baggage: import("@agoric/vat-data").Baggage) => Promise<import("@endo/pass-style").RemotableObject<`Alleged: ${string}`> & import("@endo/eventual-send").RemotableBrand<{}, {}>>;
 //# sourceMappingURL=vatRoot.d.ts.map

package/src/contractFacet/vatRoot.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"vatRoot.d.ts","sourceRoot":"","sources":["vatRoot.js"],"names":[],"mappings":"AAaA;;;;;;;GAOG;AAEH;;;;GAIG;AACH,wCAJW,SAAS,GAAG;IAAE,aAAa,EAAE,CAAE,EAAC,GAAG,EAAC,EAAE;QAAC,GAAG,EAAE,GAAG,CAAA;KAAC,KAAM,IAAI,CAAA;CAAE,iBAC5D;IAAC,iBAAiB,EAAE,SAAS,CAAC;IAAC,UAAU,EAAE,UAAU,CAAC;IAAC,gBAAgB,EAAE,OAAO,KAAK,CAAC,CAAC;IAAC,WAAW,CAAC,EAAE,GAAG,CAAA;CAAC,WAC1G,OAAO,iIA8DjB;+BAvE2B,sBAAsB;yBAFhB,aAAa;+BAGnB,sBAAsB;gCAHhB,aAAa;4BAKtB,cAAc;6BAJb,kBAAkB"}
+{"version":3,"file":"vatRoot.d.ts","sourceRoot":"","sources":["vatRoot.js"],"names":[],"mappings":"AAUA;;;;eAG6R,CAAC;oLAH5N"}

package/src/contractFacet/vatRoot.js

@@ -5,86 +5,9 @@
 // time this file is edited, the bundle must be manually rebuilt with
 // `yarn build-zcfBundle`.
 
-import { Fail } from '@endo/errors';
-import { E } from '@endo/far';
-import { Far } from '@endo/marshal';
-
+import { makeBuildRootObject } from './buildRootObject.js';
 import { makeZCFZygote } from './zcfZygote.js';
 
-/**
- * @import {ZCF, ZoeService} from '@agoric/zoe';
- * @import {Baggage} from '@agoric/vat-data';
- * @import {VatPowers} from '@agoric/swingset-vat';
- * @import {BundleCap} from '@agoric/swingset-vat';
- * @import {StartZcf} from '../internal-types.js';
- * @import {Issuer} from '@agoric/ertp';
- */
-
-/**
- * @param {VatPowers & { testJigSetter: ( {zcf}: {zcf: ZCF} ) => void }} powers
- * @param {{contractBundleCap: BundleCap, zoeService: ZoeService, invitationIssuer: Issuer<'set'>, privateArgs?: any}} vatParameters
- * @param {Baggage} baggage
- */
-export async function buildRootObject(powers, vatParameters, baggage) {
-  // Currently, there is only one function, `executeContract` called
-  // by the Zoe Service. However, when there is kernel support for
-  // zygote vats (essentially freezing and then creating copies of
-  // vats), `makeZCFZygote`, `zcfZygote.evaluateContract` and
-  // `zcfZygote.startContract` should exposed separately.
-  const { testJigSetter } = powers;
-  const { contractBundleCap } = vatParameters;
-  contractBundleCap ||
-    Fail`expected vatParameters.contractBundleCap ${vatParameters}`;
-  let { zoeService, invitationIssuer } = vatParameters;
-  const firstTime = !baggage.has('DidStart');
-  if (firstTime) {
-    baggage.init('DidStart', 'DidStart');
-    baggage.init('zoeService', zoeService);
-    baggage.init('invitationIssuer', invitationIssuer);
-  } else {
-    !zoeService || Fail`On restart zoeService must not be in vatParameters`;
-    zoeService = baggage.get('zoeService');
-
-    !invitationIssuer ||
-      Fail`On restart invitationIssuer must not be in vatParameters`;
-    invitationIssuer = baggage.get('invitationIssuer');
-  }
-
-  // make zcfZygote with contract-general state and kinds initialized
-  const zcfZygote = await makeZCFZygote(
-    powers,
-    zoeService,
-    invitationIssuer,
-    testJigSetter,
-    contractBundleCap,
-    baggage,
-  );
-
-  // snapshot zygote here //////////////////
-
-  if (!firstTime) {
-    return E.when(E(zcfZygote).restartContract(vatParameters.privateArgs), () =>
-      Far('upgraded contractRunner', {}),
-    );
-  }
-
-  return Far('contractRunner', {
-    // initialize instance-specific state of the contract
-    /** @type {StartZcf} */
-    startZcf: (
-      zoeInstanceAdmin,
-      instanceRecordFromZoe,
-      issuerStorageFromZoe,
-      privateArgs = undefined,
-    ) => {
-      return E(zcfZygote).startContract(
-        zoeInstanceAdmin,
-        instanceRecordFromZoe,
-        issuerStorageFromZoe,
-        privateArgs,
-      );
-    },
-  });
-}
+export const buildRootObject = makeBuildRootObject(makeZCFZygote);
 
 harden(buildRootObject);

package/tools/fakeVatAdmin.d.ts

@@ -5,39 +5,15 @@ declare const fakeVatAdmin: {
     waitForBundleCap: (bundleID: any) => Promise<any>;
     getNamedBundleCap: (name: any) => Promise<any>;
     getBundleIDByName: (name: any) => Promise<string>;
-    createVat: (bundleCap: any, { vatParameters }?: {
-        vatParameters?: {} | undefined;
-    }) => Promise<{
-        root: unknown;
-        adminNode: {
-            done: () => Promise<any>;
-            terminateWithFailure: () => void;
-            upgrade: (_bundleCap: any, _options: any) => never;
-        } & import("@endo/marshal").RemotableObject<`Alleged: ${string}`> & import("@endo/eventual-send").RemotableBrand<{}, {
-            done: () => Promise<any>;
-            terminateWithFailure: () => void;
-            upgrade: (_bundleCap: any, _options: any) => never;
-        }>;
-    }>;
+    /** @type {(bundleCap: BundleCap, options?: Partial<DynamicVatOptions>) => Promise<CreateVatResults>} */
+    createVat: (bundleCap: BundleCap, options?: Partial<DynamicVatOptions>) => Promise<CreateVatResults>;
 } & import("@endo/marshal").RemotableObject<`Alleged: ${string}`> & import("@endo/eventual-send").RemotableBrand<{}, {
     getBundleCap: (bundleID: any) => Promise<any>;
     waitForBundleCap: (bundleID: any) => Promise<any>;
     getNamedBundleCap: (name: any) => Promise<any>;
     getBundleIDByName: (name: any) => Promise<string>;
-    createVat: (bundleCap: any, { vatParameters }?: {
-        vatParameters?: {} | undefined;
-    }) => Promise<{
-        root: unknown;
-        adminNode: {
-            done: () => Promise<any>;
-            terminateWithFailure: () => void;
-            upgrade: (_bundleCap: any, _options: any) => never;
-        } & import("@endo/marshal").RemotableObject<`Alleged: ${string}`> & import("@endo/eventual-send").RemotableBrand<{}, {
-            done: () => Promise<any>;
-            terminateWithFailure: () => void;
-            upgrade: (_bundleCap: any, _options: any) => never;
-        }>;
-    }>;
+    /** @type {(bundleCap: BundleCap, options?: Partial<DynamicVatOptions>) => Promise<CreateVatResults>} */
+    createVat: (bundleCap: BundleCap, options?: Partial<DynamicVatOptions>) => Promise<CreateVatResults>;
 }>;
 /**
  * @param {(...args) => unknown} [testContextSetter]
@@ -49,39 +25,15 @@ export function makeFakeVatAdmin(testContextSetter?: (...args: any) => unknown,
         waitForBundleCap: (bundleID: any) => Promise<any>;
         getNamedBundleCap: (name: any) => Promise<any>;
         getBundleIDByName: (name: any) => Promise<string>;
-        createVat: (bundleCap: any, { vatParameters }?: {
-            vatParameters?: {} | undefined;
-        }) => Promise<{
-            root: unknown;
-            adminNode: {
-                done: () => Promise<any>;
-                terminateWithFailure: () => void;
-                upgrade: (_bundleCap: any, _options: any) => never;
-            } & import("@endo/marshal").RemotableObject<`Alleged: ${string}`> & import("@endo/eventual-send").RemotableBrand<{}, {
-                done: () => Promise<any>;
-                terminateWithFailure: () => void;
-                upgrade: (_bundleCap: any, _options: any) => never;
-            }>;
-        }>;
+        /** @type {(bundleCap: BundleCap, options?: Partial<DynamicVatOptions>) => Promise<CreateVatResults>} */
+        createVat: (bundleCap: BundleCap, options?: Partial<DynamicVatOptions>) => Promise<CreateVatResults>;
     } & import("@endo/marshal").RemotableObject<`Alleged: ${string}`> & import("@endo/eventual-send").RemotableBrand<{}, {
         getBundleCap: (bundleID: any) => Promise<any>;
         waitForBundleCap: (bundleID: any) => Promise<any>;
         getNamedBundleCap: (name: any) => Promise<any>;
         getBundleIDByName: (name: any) => Promise<string>;
-        createVat: (bundleCap: any, { vatParameters }?: {
-            vatParameters?: {} | undefined;
-        }) => Promise<{
-            root: unknown;
-            adminNode: {
-                done: () => Promise<any>;
-                terminateWithFailure: () => void;
-                upgrade: (_bundleCap: any, _options: any) => never;
-            } & import("@endo/marshal").RemotableObject<`Alleged: ${string}`> & import("@endo/eventual-send").RemotableBrand<{}, {
-                done: () => Promise<any>;
-                terminateWithFailure: () => void;
-                upgrade: (_bundleCap: any, _options: any) => never;
-            }>;
-        }>;
+        /** @type {(bundleCap: BundleCap, options?: Partial<DynamicVatOptions>) => Promise<CreateVatResults>} */
+        createVat: (bundleCap: BundleCap, options?: Partial<DynamicVatOptions>) => Promise<CreateVatResults>;
     }>;
     vatAdminState: {
         getExitMessage: () => any;
@@ -97,6 +49,7 @@ export function makeFakeVatAdmin(testContextSetter?: (...args: any) => unknown,
          * @param {EndoZipBase64Bundle | TestBundle} bundle
          */
         registerBundle: (base: string, bundle: EndoZipBase64Bundle | TestBundle) => string;
+        prepareJig: () => Promise<any>;
         /**
          * @param {string} id
          * @param {EndoZipBase64Bundle | TestBundle} bundle
@@ -113,6 +66,9 @@ export function makeFakeVatAdmin(testContextSetter?: (...args: any) => unknown,
         };
     };
 };
+import type { BundleCap } from '@agoric/swingset-vat';
+import type { DynamicVatOptions } from '@agoric/swingset-vat';
+import type { CreateVatResults } from '@agoric/swingset-vat';
 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":"AA2BA,+BAA4C;;AAqL5C;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GAA8C;AAnL9C;;;GAGG;AACH,qDAHW,CAAC,GAAG,IAAI,KAAA,KAAK,OAAO,eACpB,CAAC,CAAC,EAAE,OAAO,KAAK,OAAO;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;QAgH9B;;;WAGG;4BAFQ,MAAM,UACN,mBAAmB,GAAG,UAAU;QAW3C;;;WAGG;+BAFQ,MAAM,UACN,mBAAmB,GAAG,UAAU;QAO3C;;;WAGG;4BAFQ,MAAM,UACN,mBAAmB,GAAG,UAAU;;;;;;kCA9HkB,MAAM;;;;;EAgKtE;yCAxLsE,sBAAsB;gCAAtB,sBAAsB"}
+{"version":3,"file":"fakeVatAdmin.d.ts","sourceRoot":"","sources":["fakeVatAdmin.js"],"names":[],"mappings":"AAuBA,+BAA4C;;AAgM5C;;;;;IAtII,wGAAwG;eAA7F,CAAC,SAAS,EAAE,SAAS,EAAE,OAAO,CAAC,EAAE,OAAO,CAAC,iBAAiB,CAAC,KAAK,OAAO,CAAC,gBAAgB,CAAC;;;;;;IAApG,wGAAwG;eAA7F,CAAC,SAAS,EAAE,SAAS,EAAE,OAAO,CAAC,EAAE,OAAO,CAAC,iBAAiB,CAAC,KAAK,OAAO,CAAC,gBAAgB,CAAC;GAsI1D;AA9L9C;;;GAGG;AACH,qDAHW,CAAC,GAAG,IAAI,KAAA,KAAK,OAAO,eACpB,CAAC,CAAC,EAAE,OAAO,KAAK,OAAO;;;;;;QAsD9B,wGAAwG;mBAA7F,CAAC,SAAS,EAAE,SAAS,EAAE,OAAO,CAAC,EAAE,OAAO,CAAC,iBAAiB,CAAC,KAAK,OAAO,CAAC,gBAAgB,CAAC;;;;;;QAApG,wGAAwG;mBAA7F,CAAC,SAAS,EAAE,SAAS,EAAE,OAAO,CAAC,EAAE,OAAO,CAAC,iBAAiB,CAAC,KAAK,OAAO,CAAC,gBAAgB,CAAC;;;;;;QA+DpG;;;WAGG;4BAFQ,MAAM,UACN,mBAAmB,GAAG,UAAU;QAW3C;;;WAGG;+BAFQ,MAAM,UACN,mBAAmB,GAAG,UAAU;;QAa3C;;;WAGG;4BAFQ,MAAM,UACN,mBAAmB,GAAG,UAAU;;;;;;kCAzIkB,MAAM;;;;;EA2KtE;+BAlMsE,sBAAsB;uCACzD,sBAAsB;sCACvB,sBAAsB;yCAFc,sBAAsB;gCAAtB,sBAAsB"}

package/tools/fakeVatAdmin.js

@@ -6,21 +6,17 @@ import { makePromiseKit } from '@endo/promise-kit';
 import { Far } from '@endo/marshal';
 import { makeScalarMapStore } from '@agoric/store';
 import { makeScalarBigMapStore } from '@agoric/vat-data';
-import { unsafeSharedBundleCache } from '@agoric/swingset-vat/tools/bundleTool.js';
-import { zoeSourceSpecRegistry } from '../source-spec-registry.js';
-
-import { evalContractBundle } from '../src/contractFacet/evalContractCode.js';
 import { handlePKitWarning } from '../src/handleWarning.js';
 import { makeHandle } from '../src/makeHandle.js';
+import { buildTestRootObject } from './testVatRoot.js';
 
 /**
  * @import {MapStore} from '@agoric/swingset-liveslots';
  * @import {BundleCap, BundleID, EndoZipBase64Bundle, TestBundle} from '@agoric/swingset-vat';
+ * @import {DynamicVatOptions} from '@agoric/swingset-vat';
+ * @import {CreateVatResults} from '@agoric/swingset-vat';
  */
 
-const bundleCache = await unsafeSharedBundleCache;
-const { zcfBundle } = await bundleCache.loadRegistry(zoeSourceSpecRegistry);
-
 // this simulates a bundlecap, which is normally a swingset "device node"
 /** @type {() => BundleCap} */
 const fakeBundleCap = () => makeHandle('FakeBundleCap');
@@ -54,6 +50,8 @@ function makeFakeVatAdmin(testContextSetter = undefined, makeRemote = x => x) {
     }),
     testJigSetter: testContextSetter,
   };
+  /** @type {Array<ReturnType<typeof makePromiseKit>>} */
+  const reservedTestJigs = [];
 
   // This is explicitly intended to be mutable so that
   // test-only state can be provided from contracts
@@ -81,8 +79,11 @@ function makeFakeVatAdmin(testContextSetter = undefined, makeRemote = x => x) {
     getBundleIDByName: name => {
       return Promise.resolve().then(() => nameToBundleID.get(name));
     },
+    /** @type {(bundleCap: BundleCap, options?: Partial<DynamicVatOptions>) => Promise<CreateVatResults>} */
     createVat: (bundleCap, { vatParameters = {} } = {}) => {
       bundleCap === zcfBundleCap || Fail`fakeVatAdmin only knows ZCF`;
+      const testJigKit = reservedTestJigs.shift() || makePromiseKit();
+      handlePKitWarning(testJigKit);
       const exitKit = makePromiseKit();
       handlePKitWarning(exitKit);
       const exitVat = completion => {
@@ -93,6 +94,10 @@ function makeFakeVatAdmin(testContextSetter = undefined, makeRemote = x => x) {
       };
       const vpow = harden({
         ...fakeVatPowers,
+        testJigSetter: jig => {
+          testContextSetter?.(jig);
+          testJigKit.resolve(jig);
+        },
         exitVat,
       });
       const vatBaggage = makeScalarBigMapStore('fake vat baggage', {
@@ -109,11 +114,7 @@ function makeFakeVatAdmin(testContextSetter = undefined, makeRemote = x => x) {
       //   }),
       // );
       const rootP = makeRemote(
-        E(evalContractBundle(zcfBundle)).buildRootObject(
-          vpow,
-          vatParameters,
-          vatBaggage,
-        ),
+        buildTestRootObject(vpow, vatParameters, vatBaggage),
       );
       return E.when(rootP, root =>
         harden({
@@ -163,6 +164,12 @@ function makeFakeVatAdmin(testContextSetter = undefined, makeRemote = x => x) {
       vatAdminState.installBundle(bid, bundle);
       return bid;
     },
+    prepareJig: () => {
+      const jigKit = makePromiseKit();
+      handlePKitWarning(jigKit);
+      reservedTestJigs.push(jigKit);
+      return jigKit.promise;
+    },
     /**
      * @param {string} id
      * @param {EndoZipBase64Bundle | TestBundle} bundle

package/tools/setup-zoe.d.ts

@@ -23,6 +23,7 @@ export function setUpZoeForTest<T extends unknown = any>({ setJig, feeIssuerConf
         getExitWithFailure: () => any;
         getBundleID: (base: string, bundle: EndoZipBase64Bundle | TestBundle) => string;
         registerBundle: (base: string, bundle: EndoZipBase64Bundle | TestBundle) => string;
+        prepareJig: () => Promise<any>;
         installBundle: (id: string, bundle: EndoZipBase64Bundle | TestBundle) => any;
         installNamedBundle: (name: any, id: any, bundle: any) => any;
         getCriticalVatKey: () => {};

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

@@ -1 +1 @@
-{"version":3,"file":"setup-zoe.d.ts","sourceRoot":"","sources":["setup-zoe.js"],"names":[],"mappings":"AAgBO,gDAFI,WAAW;;;;;;;EAOrB;AAKM,6CAFI,WAAW,2EAGqB;AAapC,gCAPgB,CAAC,mFAErB;IAAmC,MAAM,UAA3B,CAAC,KAAK,IAAI;IACU,eAAe;IACnB,WAAW;IACf,aAAa;CAAC;;;sCAoD9B,MAAM,aACN,MAAM,KACJ,OAAO,CAAC,YAAY,CAAC;;;;;;;;;;;;;;;;;;;GAoBnC;iCAvG8D,sBAAsB;qCACrC,uBAAuB;kCAAvB,uBAAuB;yCADR,sBAAsB;gCAAtB,sBAAsB"}
+{"version":3,"file":"setup-zoe.d.ts","sourceRoot":"","sources":["setup-zoe.js"],"names":[],"mappings":"AAgBO,gDAFI,WAAW;;;;;;;EAOrB;AAKM,6CAFI,WAAW,2EAGqB;AAapC,gCAPgB,CAAC,mFAErB;IAAmC,MAAM,UAA3B,CAAC,KAAK,IAAI;IACU,eAAe;IACnB,WAAW;IACf,aAAa;CAAC;;;sCAoD9B,MAAM,aACN,MAAM,KACJ,OAAO,CAAC,YAAY,CAAC;;;;;;;;;;;;;;;;;;;;GAoBnC;iCAvG8D,sBAAsB;qCACrC,uBAAuB;kCAAvB,uBAAuB;yCADR,sBAAsB;gCAAtB,sBAAsB"}

package/tools/testVatRoot.d.ts

@@ -0,0 +1,7 @@
+export const buildTestRootObject: (powers: any, vatParameters: {
+    contractBundleCap: import("@agoric/swingset-vat").BundleCap;
+    zoeService: import("../src/types-index.js").ZoeService;
+    invitationIssuer: import("@agoric/ertp").Issuer<"set">;
+    privateArgs?: any;
+}, baggage: import("@agoric/vat-data").Baggage) => Promise<import("@endo/pass-style").RemotableObject<`Alleged: ${string}`> & import("@endo/eventual-send").RemotableBrand<{}, {}>>;
+//# sourceMappingURL=testVatRoot.d.ts.map

package/tools/testVatRoot.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"testVatRoot.d.ts","sourceRoot":"","sources":["testVatRoot.js"],"names":[],"mappings":"AAKA;;;;eAEwf,CAAC;oLAFnb"}

package/tools/testVatRoot.js

@@ -0,0 +1,7 @@
+import { makeBuildRootObject } from '../src/contractFacet/buildRootObject.js';
+import { makeZCFZygote } from '../src/contractFacet/zcfZygote.js';
+
+// Tests can use a source-level vat root directly instead of re-evaluating the
+// bundled ZCF vat code through fakeVatAdmin on every createVat().
+export const buildTestRootObject = makeBuildRootObject(makeZCFZygote);
+harden(buildTestRootObject);

package/source-spec-registry.d.ts

@@ -1,25 +0,0 @@
-export namespace zoeSourceSpecRegistry {
-    namespace zcf {
-        let bundleName: string;
-        let packagePath: string;
-        let sourceSpec: string;
-    }
-    namespace automaticRefund {
-        let bundleName_1: string;
-        export { bundleName_1 as bundleName };
-        let packagePath_1: string;
-        export { packagePath_1 as packagePath };
-        let sourceSpec_1: string;
-        export { sourceSpec_1 as sourceSpec };
-    }
-}
-export function getZoeSourceSpec(name: keyof typeof zoeSourceSpecRegistry): {
-    bundleName: string;
-    packagePath: string;
-    sourceSpec: string;
-} | {
-    bundleName: string;
-    packagePath: string;
-    sourceSpec: string;
-};
-//# sourceMappingURL=source-spec-registry.d.ts.map

package/source-spec-registry.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"source-spec-registry.d.ts","sourceRoot":"","sources":["source-spec-registry.js"],"names":[],"mappings":";;;;;;;;;;;;;;;AAsBO,uCADK,MAAM,OAAO,qBAAqB;;;;;;;;EACqB"}