@agoric/zoe 0.27.0-upgrade-20-dev-ef71cfd.0 → 0.27.0-upgrade-19-devnet-dev-5428c4d.0

package/src/zoeService/utils.d.ts

@@ -1,10 +1,13 @@
+// Ambient types
+import '../types-ambient.js';
+import '../contractFacet/types-ambient.js';
+
 import type { Issuer } from '@agoric/ertp/src/types.js';
 import type { TagContainer } from '@agoric/internal/src/tagged.js';
 import type { Baggage } from '@agoric/swingset-liveslots';
 import type { VatUpgradeResults } from '@agoric/swingset-vat';
 import type { RemotableObject } from '@endo/marshal';
 import type { FarRef } from '@endo/far';
-import type { AnyTerms, Handle, Keyword, ZCF } from '../types-index.js';
 
 // XXX https://github.com/Agoric/agoric-sdk/issues/4565
 type SourceBundle = Record<string, any>;
@@ -26,7 +29,7 @@ export type InstallationStart<I> =
   I extends Installation<infer SF> ? SF : never;
 
 export type ContractStartFunction = (
-  zcf?: ZCF<any>,
+  zcf?: ZCF,
   privateArgs?: object,
   baggage?: Baggage,
 ) => ERef<{ creatorFacet?: object; publicFacet?: object }>;
@@ -63,8 +66,6 @@ type ZcfOf<SF extends ContractStartFunction> = Parameters<SF>[0] extends ZCF
   : ZCF<any>;
 
 /**
- * @deprecated use the SF to pass the type
- *
  * Convenience record for contract start function, merging its result with params.
  */
 export type ContractOf<S extends (...args: any) => any> = StartParams<S> &
@@ -124,12 +125,3 @@ export type GetTerms = <SF>(instance: Instance<SF>) => Promise<
     : // XXX returning `any` in this case
       any
 >;
-
-export type InstanceRecord = {
-  installation: Installation<any>;
-  instance: Instance<any>;
-  /**
-   * - contract parameters
-   */
-  terms: AnyTerms;
-};

package/src/zoeService/utils.test-d.ts

@@ -1,6 +1,5 @@
 import { E } from '@endo/far';
 import type { StartedInstanceKit } from './utils.js';
-import type { ZCF } from '../types-index.js';
 
 const someContractStartFn = (
   zcf: ZCF,

package/src/zoeService/zoe.d.ts

@@ -1,10 +1,5 @@
-export * from "../types-index.js";
 export type ZoeKit = ReturnType<typeof makeDurableZoeKit>;
-/**
- * @import {VatAdminSvc} from '@agoric/swingset-vat';
- * @import {Baggage} from '@agoric/vat-data';
- * @import {FeeIssuerConfig, FeeMintAccess, ZCFSpec, ZoeService} from './types.js';
- */
+/** @import {Baggage} from '@agoric/vat-data' */
 /**
  * Create a durable instance of Zoe.
  *
@@ -60,9 +55,4 @@ export function makeZoeKit(vatAdminSvc?: Promise<VatAdminSvc> | VatAdminSvc, shu
     setVatAdminService: ((lateVatAdminSvc: any) => void) & import("@endo/pass-style").RemotableObject<`Alleged: ${string}`> & import("@endo/eventual-send").RemotableBrand<{}, (lateVatAdminSvc: any) => void>;
 };
 import type { Baggage } from '@agoric/vat-data';
-import type { VatAdminSvc } from '@agoric/swingset-vat';
-import type { FeeIssuerConfig } from './types.js';
-import type { ZCFSpec } from './types.js';
-import type { ZoeService } from './types.js';
-import type { FeeMintAccess } from './types.js';
 //# sourceMappingURL=zoe.d.ts.map

package/src/zoeService/zoe.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"zoe.d.ts","sourceRoot":"","sources":["zoe.js"],"names":[],"mappings":";qBAqSa,UAAU,CAAC,OAAO,iBAAiB,CAAC;AAvQjD;;;;GAIG;AAEH;;;;;;;;;;;;;GAaG;AACH,0GAVG;IAAyB,UAAU,EAA3B,OAAO;IACsC,WAAW;IAGK,cAAc;IAGjD,eAAe;IACvB,OAAO;CACnC;;;;;IAgNG,4BAA4B;mBAAjB,aAAa;;EAK3B;AAED;;;;;;;;;;;;;;;GAeG;AACH,yCATW,OAAO,CAAC,WAAW,CAAC,GAAG,WAAW,mBAGlC,OAAO,sBAAsB,EAAE,mBAAmB,oBAGlD,eAAe,YACf,OAAO;;;;;IArBd,4BAA4B;mBAAjB,aAAa;;EA8BxB;6BA/PsB,kBAAkB;iCADd,sBAAsB;qCAEkB,YAAY;6BAAZ,YAAY;gCAAZ,YAAY;mCAAZ,YAAY"}
+{"version":3,"file":"zoe.d.ts","sourceRoot":"","sources":["zoe.js"],"names":[],"mappings":"qBAiSa,UAAU,CAAC,OAAO,iBAAiB,CAAC;AAnQjD,gDAAgD;AAEhD;;;;;;;;;;;;;GAaG;AACH,0GAVG;IAAyB,UAAU,EAA3B,OAAO;IACsC,WAAW;IAGK,cAAc;IAGjD,eAAe;IACvB,OAAO;CACnC;;;;;IAgNG,4BAA4B;mBAAjB,aAAa;;EAK3B;AAED;;;;;;;;;;;;;;;GAeG;AACH,yCATW,OAAO,CAAC,WAAW,CAAC,GAAG,WAAW,mBAGlC,OAAO,sBAAsB,EAAE,mBAAmB,oBAGlD,eAAe,YACf,OAAO;;;;;IArBd,4BAA4B;mBAAjB,aAAa;;EA8BxB;6BA7PuB,kBAAkB"}

package/src/zoeService/zoe.js

@@ -28,11 +28,7 @@ import { getZcfBundleCap } from './createZCFVat.js';
 import { defaultFeeIssuerConfig, prepareFeeMint } from './feeMint.js';
 import { ZoeServiceI } from '../typeGuards.js';
 
-/**
- * @import {VatAdminSvc} from '@agoric/swingset-vat';
- * @import {Baggage} from '@agoric/vat-data';
- * @import {FeeIssuerConfig, FeeMintAccess, ZCFSpec, ZoeService} from './types.js';
- */
+/** @import {Baggage} from '@agoric/vat-data' */
 
 /**
  * Create a durable instance of Zoe.
@@ -293,6 +289,3 @@ export { makeDurableZoeKit, makeZoeKit };
 /**
  * @typedef {ReturnType<typeof makeDurableZoeKit>} ZoeKit
  */
-
-// eslint-disable-next-line import/export -- no named value exports; only types
-export * from '../types-index.js';

package/src/zoeService/zoeSeat.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"zoeSeat.d.ts","sourceRoot":"","sources":["zoeSeat.js"],"names":[],"mappings":"AAkDO,iDAFI,OAAO,kBAAkB,EAAE,OAAO,uBA0WhC,UAAU,YACV,cAAc,uBACd,mBAAmB,iBACnB,aAAa,YACb,IAAI,CAAC,OAAO,CAAC,2BACb,OAAO;;;;;;;;;;;;;;;;QA3IZ,wCAAwC;8DAA5B,iBAAiB;;;;EAoKpC"}
+{"version":3,"file":"zoeSeat.d.ts","sourceRoot":"","sources":["zoeSeat.js"],"names":[],"mappings":"AAmDO,iDAFI,OAAO,kBAAkB,EAAE,OAAO,uBA0WhC,UAAU,YACV,cAAc,uBACd,mBAAmB,iBACnB,aAAa,YACb,IAAI,CAAC,OAAO,CAAC,2BACb,OAAO;;;;;;;;;;;;;;;;QA3IZ,wCAAwC;8DAA5B,iBAAiB;;;;EAoKpC"}

package/src/zoeService/zoeSeat.js

@@ -7,7 +7,8 @@ import { makePromiseKit } from '@endo/promise-kit';
 import { NonNullish } from '@agoric/internal';
 
 import { satisfiesWant } from '../contractFacet/offerSafety.js';
-
+import '../types-ambient.js';
+import '../internal-types.js';
 import {
   declareOldZoeSeatAdminKind,
   OriginalZoeSeatIKit,

package/src/zoeService/zoeStorageManager.d.ts

@@ -4,7 +4,7 @@ export function makeZoeStorageManager(createZCFVat: CreateZCFVat, getBundleCapFo
     getFeeBrand: () => Brand;
 }, zoeBaggage: Baggage): import("@endo/exo").GuardedKit<{
     zoeServiceDataAccess: {
-        getInvitationIssuer: () => globalThis.Issuer<"set", import("@agoric/zoe").InvitationDetails>;
+        getInvitationIssuer: () => globalThis.Issuer<"set", InvitationDetails>;
         getBundleIDFromInstallation(allegedInstallation: any): Promise<string | undefined>;
         getPublicFacet(instance: any): any;
         getBrands(instance: any): any;
@@ -13,14 +13,14 @@ export function makeZoeStorageManager(createZCFVat: CreateZCFVat, getBundleCapFo
         getTerms(instance: any): any;
         getInstallation(instance: any): any;
         getProposalShapeForInvitation: (invitationHandle: any) => any;
-        installBundle: (allegedBundle: any, bundleLabel: any) => Promise<globalThis.Installation>;
-        installBundleID(bundleID: any, bundleLabel: any): Promise<globalThis.Installation<unknown>>;
+        installBundle: (allegedBundle: any, bundleLabel: any) => Promise<Installation<any>>;
+        installBundleID(bundleID: any, bundleLabel: any): Promise<Installation<unknown>>;
     };
     makeOfferAccess: {
         getAssetKindByBrand: GetAssetKindByBrand;
         getInstanceAdmin(instance: any): any;
         getProposalShapeForInvitation: (invitationHandle: any) => any;
-        getInvitationIssuer: () => globalThis.Issuer<"set", import("@agoric/zoe").InvitationDetails>;
+        getInvitationIssuer: () => globalThis.Issuer<"set", InvitationDetails>;
         depositPayments(proposal: any, payments: any): Promise<Allocation>;
     };
     startInstanceAccess: {
@@ -33,7 +33,7 @@ export function makeZoeStorageManager(createZCFVat: CreateZCFVat, getBundleCapFo
         }>;
     };
     invitationIssuerAccess: {
-        getInvitationIssuer: () => globalThis.Issuer<"set", import("@agoric/zoe").InvitationDetails>;
+        getInvitationIssuer: () => globalThis.Issuer<"set", InvitationDetails>;
     };
 }>;
 import type { Baggage } from '@agoric/vat-data';

package/src/zoeService/zoeStorageManager.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"zoeStorageManager.d.ts","sourceRoot":"","sources":["zoeStorageManager.js"],"names":[],"mappings":"AAyDO,oDAXI,YAAY,qBAEZ,iBAAiB,kBACjB,OAAO,sBAAsB,EAAE,mBAAmB,WAClD;IACL,eAAe,EAAE,eAAe,CAAC;IACjC,YAAY,EAAE,MAAM,MAAM,CAAC;IAC3B,WAAW,EAAE,MAAM,KAAK,CAAC;CAC3B,cACO,OAAO;;;;;;;;;;;;;;;;;;;;;;;;kBANgC,CAAC;qBAChD,CAAC;oBACa,CAAC;;;;;;;GA+ajB;6BApcyB,kBAAkB"}
+{"version":3,"file":"zoeStorageManager.d.ts","sourceRoot":"","sources":["zoeStorageManager.js"],"names":[],"mappings":"AAwDO,oDAXI,YAAY,qBAEZ,iBAAiB,kBACjB,OAAO,sBAAsB,EAAE,mBAAmB,WAClD;IACL,eAAe,EAAE,eAAe,CAAC;IACjC,YAAY,EAAE,MAAM,MAAM,CAAC;IAC3B,WAAW,EAAE,MAAM,KAAK,CAAC;CAC3B,cACO,OAAO;;;;;;;;;;;;;;;;;;;;;;;;kBAZkC,CAAC;qBAC3B,CAAC;oBAA0B,CAAC;;;;;;;GAsbrD;6BAlc0B,kBAAkB"}

package/src/zoeService/zoeStorageManager.js

@@ -21,16 +21,15 @@ import { prepareInvitationKit } from './makeInvitation.js';
 import { makeInstanceAdminStorage } from './instanceAdminStorage.js';
 import { makeInstallationStorage } from './installationStorage.js';
 
+/// <reference path="./types.js" />
+import './internal-types.js';
 import {
   InstanceStorageManagerIKit,
   ZoeMintI,
   ZoeStorageManagerIKit,
 } from '../typeGuards.js';
 
-/**
- * @import {Baggage} from '@agoric/vat-data';
- * @import {InvitationAmount} from '@agoric/zoe';
- */
+/** @import {Baggage} from '@agoric/vat-data' */
 
 const { ownKeys } = Reflect;
 

package/tools/fakeVatAdmin.d.ts

@@ -88,22 +88,15 @@ export function makeFakeVatAdmin(testContextSetter?: (...args: any) => unknown,
         getExitMessage: () => any;
         getHasExited: () => boolean;
         getExitWithFailure: () => any;
-        /**
-         * @param {string} id
-         * @param {EndoZipBase64Bundle | TestBundle} bundle
-         */
-        installBundle: (id: string, bundle: EndoZipBase64Bundle | TestBundle) => any;
+        installBundle: (id: any, bundle: any) => any;
         installNamedBundle: (name: any, id: any, bundle: any) => any;
         getCriticalVatKey: () => {};
         getVatPowers: () => {
             D: (bcap: any) => {
-                getBundle: () => EndoZipBase64Bundle | {
-                    moduleFormat: "test";
-                } | undefined;
+                getBundle: () => EndoZipBase64Bundle;
             };
         };
     };
 };
 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;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"}
+{"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"}

package/tools/fakeVatAdmin.js

@@ -1,5 +1,4 @@
-// no jessie-check because this code runs only in Node for testing
-/* eslint-env node */
+// @jessie-check
 
 import { Fail } from '@endo/errors';
 import { E } from '@endo/eventual-send';
@@ -14,8 +13,9 @@ 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, TestBundle} from '@agoric/swingset-vat';
+ * @import {BundleID, EndoZipBase64Bundle} 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 {Map<BundleCap, EndoZipBase64Bundle | {moduleFormat: 'test'}>} */
-  const bundleCapToBundle = new Map();
+  /** @type {MapStore<BundleCap, EndoZipBase64Bundle>} */
+  const bundleCapToBundle = makeScalarMapStore('bundleCapToBundle');
   /** @type {MapStore<string, BundleID>} */
   const nameToBundleID = makeScalarMapStore('nameToBundleID');
   const fakeVatPowers = {
@@ -139,25 +139,17 @@ 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)) {
-        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);
-        }
+        assert.equal(
+          bundle.endoZipBase64,
+          bundleCapToBundle.get(idToBundleCap.get(id)).endoZipBase64,
+        );
         return idToBundleCap.get(id);
       }
       const bundleCap = fakeBundleCap();
       idToBundleCap.init(id, bundleCap);
-      bundleCapToBundle.set(bundleCap, bundle);
+      bundleCapToBundle.init(bundleCap, bundle);
       return bundleCap;
     },
     installNamedBundle: (name, id, bundle) => {

package/tools/manualPriceAuthority.d.ts

@@ -1,5 +1,4 @@
 /**
- * @import {Amount, Brand, Issuer, IssuerKit, Payment, Purse} from '@agoric/ertp';
  * @import {PriceAuthority, PriceDescription, PriceQuote, PriceQuoteValue, PriceQuery,} from '@agoric/zoe/tools/types.js';
  */
 /**
@@ -16,14 +15,12 @@ export function makeManualPriceAuthority(options: {
     actualBrandOut: Brand<"nat">;
     initialPrice: Ratio;
     timer: import("@agoric/time").TimerService;
-    quoteIssuerKit?: IssuerKit<"set", PriceDescription> | undefined;
+    quoteIssuerKit?: globalThis.IssuerKit<"set", PriceDescription> | undefined;
 }): PriceAuthority & {
     setPrice: (Ratio: any) => void;
     disable: () => void;
 };
 export type ManualPriceAuthority = ReturnType<typeof makeManualPriceAuthority>;
-import type { Brand } from '@agoric/ertp';
 import type { PriceDescription } from '@agoric/zoe/tools/types.js';
-import type { IssuerKit } from '@agoric/ertp';
 import type { PriceAuthority } from '@agoric/zoe/tools/types.js';
 //# sourceMappingURL=manualPriceAuthority.d.ts.map

package/tools/manualPriceAuthority.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"manualPriceAuthority.d.ts","sourceRoot":"","sources":["manualPriceAuthority.js"],"names":[],"mappings":"AAaA;;;GAGG;AAEH;;;;;;;;GAQG;AACH,kDAPG;IAA8B,aAAa,EAAnC,MAAM,KAAK,CAAC;IACU,cAAc,EAApC,MAAM,KAAK,CAAC;IACG,YAAY,EAA3B,KAAK;IACwC,KAAK,EAAlD,OAAO,cAAc,EAAE,YAAY;IACU,cAAc;CACnE,GAAU,cAAc,GAAG;IAAE,QAAQ,EAAE,CAAC,KAAK,KAAA,KAAK,IAAI,CAAC;IAAC,OAAO,EAAE,MAAM,IAAI,CAAA;CAAE,CA8E/E;mCACa,UAAU,CAAC,OAAO,wBAAwB,CAAC;2BA1FU,cAAc;sCACY,4BAA4B;+BADtD,cAAc;oCACY,4BAA4B"}
+{"version":3,"file":"manualPriceAuthority.d.ts","sourceRoot":"","sources":["manualPriceAuthority.js"],"names":[],"mappings":"AAaA;;GAEG;AAEH;;;;;;;;GAQG;AACH,kDAPG;IAA8B,aAAa,EAAnC,KAAK,CAAC,KAAK,CAAC;IACU,cAAc,EAApC,KAAK,CAAC,KAAK,CAAC;IACG,YAAY,EAA3B,KAAK;IACwC,KAAK,EAAlD,OAAO,cAAc,EAAE,YAAY;IACU,cAAc;CACnE,GAAU,cAAc,GAAG;IAAE,QAAQ,EAAE,CAAC,KAAK,KAAA,KAAK,IAAI,CAAC;IAAC,OAAO,EAAE,MAAM,IAAI,CAAA;CAAE,CA8E/E;mCACa,UAAU,CAAC,OAAO,wBAAwB,CAAC;sCAzFoC,4BAA4B;oCAA5B,4BAA4B"}

package/tools/manualPriceAuthority.js

@@ -12,7 +12,6 @@ import {
 } from '../src/contractSupport/index.js';
 
 /**
- * @import {Amount, Brand, Issuer, IssuerKit, Payment, Purse} from '@agoric/ertp';
  * @import {PriceAuthority, PriceDescription, PriceQuote, PriceQuoteValue, PriceQuery,} from '@agoric/zoe/tools/types.js';
  */
 

package/tools/scriptedOracle.d.ts

@@ -1,6 +1,3 @@
-/**
- * @import {ZoeService} from '../src/types-index.js';
- */
 /**
  * Start an instance of an Oracle that follows a script. The Oracle has access
  * to a timer, and looks in the script for events indexed by the current time.
@@ -20,12 +17,11 @@
 export function makeScriptedOracle(script: Record<string, any>, oracleInstallation: Installation<import("../src/contracts/oracle.js").OracleStart>, timer: import("@agoric/time").TimerService, zoe: ZoeService, feeIssuer: Issuer): Promise<{
     publicFacet: object & {
         query(query: OracleQuery): Promise<unknown>;
-        makeQueryInvitation(query: OracleQuery): Promise<globalThis.Invitation<unknown, never>>;
+        makeQueryInvitation(query: OracleQuery): Promise<Invitation<unknown, never>>;
     } & import("@endo/pass-style").RemotableObject<`Alleged: ${string}`> & import("@endo/eventual-send").RemotableBrand<{}, {
         query(query: OracleQuery): Promise<unknown>;
-        makeQueryInvitation(query: OracleQuery): Promise<globalThis.Invitation<unknown, never>>;
+        makeQueryInvitation(query: OracleQuery): Promise<Invitation<unknown, never>>;
     }>;
     creatorFacet: OracleCreatorFacet;
 }>;
-import type { ZoeService } from '../src/types-index.js';
 //# sourceMappingURL=scriptedOracle.d.ts.map

package/tools/scriptedOracle.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"scriptedOracle.d.ts","sourceRoot":"","sources":["scriptedOracle.js"],"names":[],"mappings":"AAIA;;GAEG;AAEH;;;;;;;;;;;;;;;GAeG;AACH,2CANW,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,sBACnB,YAAY,CAAC,OAAO,4BAA4B,EAAE,WAAW,CAAC,SAC9D,OAAO,cAAc,EAAE,YAAY,OACnC,UAAU,aACV,MAAM;;;;;;;;;GAqChB;gCAtD4B,uBAAuB"}
+{"version":3,"file":"scriptedOracle.d.ts","sourceRoot":"","sources":["scriptedOracle.js"],"names":[],"mappings":"AAIA;;;;;;;;;;;;;;;GAeG;AACH,2CANW,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,sBACnB,YAAY,CAAC,OAAO,4BAA4B,EAAE,WAAW,CAAC,SAC9D,OAAO,cAAc,EAAE,YAAY,OACnC,UAAU,aACV,MAAM;;;;;;;;;GAqChB"}

package/tools/scriptedOracle.js

@@ -2,10 +2,6 @@ import { TimeMath } from '@agoric/time';
 import { E } from '@endo/eventual-send';
 import { Far } from '@endo/marshal';
 
-/**
- * @import {ZoeService} from '../src/types-index.js';
- */
-
 /**
  * Start an instance of an Oracle that follows a script. The Oracle has access
  * to a timer, and looks in the script for events indexed by the current time.

package/tools/setup-zoe.d.ts

@@ -1,40 +1,34 @@
 export function makeZoeKitForTest(vatAdminSvc?: VatAdminSvc): {
-    zoeService: import("@endo/exo").Guarded<globalThis.ZoeService>;
+    zoeService: import("@endo/exo").Guarded<ZoeService>;
     zoeConfigFacet: import("@endo/exo").Guarded<{
         updateZcfBundleId(bundleId: any): void;
     }>;
     feeMintAccess: FeeMintAccess;
     setVatAdminService: ((lateVatAdminSvc: any) => void) & import("@endo/pass-style").RemotableObject<`Alleged: ${string}`> & import("@endo/eventual-send").RemotableBrand<{}, (lateVatAdminSvc: any) => void>;
 };
-export function makeZoeForTest(vatAdminSvc?: VatAdminSvc): import("@endo/exo").Guarded<globalThis.ZoeService>;
+export function makeZoeForTest(vatAdminSvc?: VatAdminSvc): import("@endo/exo").Guarded<ZoeService>;
 export function setUpZoeForTest<T extends unknown = any>({ setJig, feeIssuerConfig, vatAdminSvc, useNearRemote, }?: {
     setJig?: ((jig: T) => void) | undefined;
     feeIssuerConfig?: FeeIssuerConfig | undefined;
     vatAdminSvc?: VatAdminSvc | undefined;
     useNearRemote?: boolean | undefined;
 }): Promise<{
-    zoe: import("@endo/exo").Guarded<globalThis.ZoeService>;
+    zoe: import("@endo/exo").Guarded<ZoeService>;
     feeMintAccessP: FeeMintAccess;
-    bundleAndInstall: (pathOrExports: object) => Promise<Installation>;
+    bundleAndInstall: (path: string) => Promise<Installation>;
     vatAdminSvc: VatAdminSvc;
     vatAdminState: {
         getExitMessage: () => any;
         getHasExited: () => boolean;
         getExitWithFailure: () => any;
-        installBundle: (id: string, bundle: EndoZipBase64Bundle | TestBundle) => any;
+        installBundle: (id: any, bundle: any) => any;
         installNamedBundle: (name: any, id: any, bundle: any) => any;
         getCriticalVatKey: () => {};
         getVatPowers: () => {
             D: (bcap: any) => {
-                getBundle: () => EndoZipBase64Bundle | {
-                    moduleFormat: "test";
-                } | undefined;
+                getBundle: () => EndoZipBase64Bundle;
             };
         };
     } | 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":"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"}
+{"version":3,"file":"setup-zoe.d.ts","sourceRoot":"","sources":["setup-zoe.js"],"names":[],"mappings":"AAUO,gDAFI,WAAW;;;;;;;EAOrB;AAKM,6CAFI,WAAW,2CAGqB;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"}

package/tools/setup-zoe.js

@@ -2,15 +2,9 @@ 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';
- */
-
 /**
  * @param {VatAdminSvc} [vatAdminSvc]
  */
@@ -63,40 +57,13 @@ export const setUpZoeForTest = async ({
   );
 
   /**
-   * @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
+   * @param {string} path
    * @returns {Promise<Installation>}
    */
-  const bundleAndInstall = async pathOrExports => {
-    const bundle = await bundleModule(pathOrExports);
-    assert(
-      vatAdminState,
-      'bundleAndInstall called before vatAdminState defined',
-    );
-    const id = `b1-zoe-test-${Math.random()}`;
+  const bundleAndInstall = async path => {
+    const bundle = await bundleSource(path);
+    const id = `b1-${path}`;
+    assert(vatAdminState, 'installBundle called before vatAdminState defined');
     vatAdminState.installBundle(id, bundle);
     return E(zoeService).installBundleID(id);
   };

package/tools/test-utils.d.ts

@@ -6,7 +6,7 @@ export function withAmountUtils(kit: Pick<IssuerKit<"nat", any>, "brand" | "issu
      * @param {NatValue} n
      * @param {NatValue} [d]
      */
-    makeRatio: (n: NatValue, d?: NatValue) => import("@agoric/ertp/src/ratio.js").Ratio;
+    makeRatio: (n: NatValue, d?: NatValue) => Ratio;
     /** @param {number} n */
     units: (n: number) => import("@agoric/ertp").NatAmount;
     /** The intact Exo remotable */

package/tools/test-utils.js

@@ -1,5 +1,5 @@
 import { AmountMath } from '@agoric/ertp';
-import { makeRatio } from '../src/contractSupport/index.js';
+import { makeRatio } from '../src/contractSupport/ratio.js';
 
 /**
  * @import {Amount, Brand, DepositFacet, Issuer, IssuerKit, NatValue} from '@agoric/ertp';

package/tools/types.d.ts

@@ -143,5 +143,4 @@ import type { Amount } from '@agoric/ertp';
 import type { Payment } from '@agoric/ertp';
 import type { Brand } from '@agoric/ertp';
 import type { Issuer } from '@agoric/ertp';
-import type { Notifier } from '@agoric/notifier';
 //# sourceMappingURL=types.d.ts.map

package/tools/types.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["types.js"],"names":[],"mappings":"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"}
+{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["types.js"],"names":[],"mappings":"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"}

package/tools/types.js

@@ -3,7 +3,6 @@ export {};
 
 /**
  * @import {Amount, Brand, DepositFacet, Issuer, IssuerKit, Payment} from '@agoric/ertp';
- * @import {Notifier} from '@agoric/notifier';
  */
 
 /**