@agoric/zoe 0.26.3-dev-ecf2d8e.0 → 0.26.3-other-dev-70beeb7.0

package/src/zoeService/internal-types.d.ts

@@ -35,7 +35,7 @@ type ZoeInstanceStorageManager = {
     getTerms: InstanceStateGetTerms;
     getIssuers: InstanceRecordGetIssuers;
     getBrands: InstanceRecordGetBrands;
-    saveIssuer: ZCF['saveIssuer'];
+    saveIssuer: SaveIssuer;
     makeZoeMint: MakeZoeMint;
     registerFeeMint: RegisterFeeMint;
     getInstanceRecord: GetInstanceRecord;
@@ -59,7 +59,7 @@ type ZoeInstanceStorageManager = {
  * issuerStorage and escrowStorage from Zoe, and stores the
  * instance-specific terms
  */
-type MakeZoeInstanceStorageManager = (instanceBaggage: MapStore<string, any>, installation: Installation, customTerms: object, uncleanIssuerKeywordRecord: IssuerKeywordRecord, instance: Instance, contractBundleCap: BundleCap, instanceLabel: string) => Promise<ZoeInstanceStorageManager>;
+type MakeZoeInstanceStorageManager = (instanceBaggage: MapStore<string, unknown>, installation: Installation, customTerms: object, uncleanIssuerKeywordRecord: IssuerKeywordRecord, instance: Instance, contractBundleCap: BundleCap, instanceLabel: string) => Promise<ZoeInstanceStorageManager>;
 type GetBundleCapForID = (id: BundleID) => Promise<BundleCap>;
 type GetProposalShapeForInvitation = (invitationHandle: InvitationHandle) => Pattern | undefined;
 type ZoeStorageManager = {

package/src/zoeService/internal-types.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"internal-types.d.ts","sourceRoot":"","sources":["internal-types.js"],"names":[],"mappings":";;;4BAMW,MAAM,SACN,KAAK,KACH,KAAK,IAAI,CAAC;;;;;;;;kCAWZ,MAAM,SACN,KAAK,KACH,KAAK;;;;;;;kCAUP,cAAc,YACd,qBAAqB,KACnB,QAAQ,UAAU,CAAC;oCAKrB,QAAQ,iBACR,aAAa,KACX,IAAI;mCAKN,QAAQ,KACN,aAAa;sCAKf,QAAQ,KACN,IAAI;;;;;0CASN,KAAK,YAAY,CAAC,KAChB,KAAK;IACjB,MAAU,CAAC,EAAE,YAAY,CAAC;IAC1B,SAAa,CAAC,EAAE,SAAS,CAAC;IAC1B,QAAY,CAAC,EAAE,QAAQ,CAAC;IACxB,YAAgB,EAAC,YAAY,CAAA;CAC1B,CAAC;;;cAWS,qBAAqB;gBACrB,wBAAwB;eACxB,uBAAuB;gBACvB,GAAG,CAAC,YAAY,CAAC;iBACjB,WAAW;qBACX,eAAe;uBACf,iBAAiB;sBACjB,gBAAgB;uBAChB,iBAAiB;yBACjB,mBAAmB;oBACnB,8BAA8B;yBAC9B,MAAM,MAAM;;;;aACZ,MAAM,MAAM;;;;kBACZ,MAAM,OAAO,sBAAsB,EAAE,aAAa;;;;;;;;4FAWrD,YAAY,eACZ,MAAM,8BACN,mBAAmB,YACnB,QAAQ,qBACR,SAAS,iBACT,MAAM,KACJ,QAAQ,yBAAyB,CAAC;8BAKpC,QAAQ,KACN,QAAQ,SAAS,CAAC;wDAKpB,gBAAgB,KACd,OAAO,GAAG,SAAS;;mCAKlB,6BAA6B;yBAC7B,mBAAmB;qBACnB,eAAe;sBACf,OAAO,KAAK,CAAC;mBACb,aAAa;qBACb,eAAe;iCACf,2BAA2B;oBAC3B,OAAO,YAAY,EAAE,cAAc;eACnC,SAAS;gBACT,UAAU;cACV,OAAO,SAAS,EAAE,QAAQ;oBAC1B,cAAc;oBACd,cAAc;gCACd,0BAA0B;sBAC1B,gBAAgB;wBAChB,kBAAkB;mCAClB,6BAA6B;;;;;;wCAQhC,SAAS,iBACT,MAAM,KACJ,QAAQ,OAAO,sBAAsB,EAAE,gBAAgB,CAAC;uCAK1D,aAAa,KACX,UAAU,KAAK,CAAC"}
+{"version":3,"file":"internal-types.d.ts","sourceRoot":"","sources":["internal-types.js"],"names":[],"mappings":";;;4BAMW,MAAM,SACN,KAAK,KACH,KAAK,IAAI,CAAC;;;;;;;;kCAWZ,MAAM,SACN,KAAK,KACH,KAAK;;;;;;;kCAUP,cAAc,YACd,qBAAqB,KACnB,QAAQ,UAAU,CAAC;oCAKrB,QAAQ,iBACR,aAAa,KACX,IAAI;mCAKN,QAAQ,KACN,aAAa;sCAKf,QAAQ,KACN,IAAI;;;;;0CASN,KAAK,YAAY,CAAC,KAChB,KAAK;IACjB,MAAU,CAAC,EAAE,YAAY,CAAC;IAC1B,SAAa,CAAC,EAAE,SAAS,CAAC;IAC1B,QAAY,CAAC,EAAE,QAAQ,CAAC;IACxB,YAAgB,EAAC,YAAY,CAAA;CAC1B,CAAC;;;cAWS,qBAAqB;gBACrB,wBAAwB;eACxB,uBAAuB;gBACvB,UAAU;iBACV,WAAW;qBACX,eAAe;uBACf,iBAAiB;sBACjB,gBAAgB;uBAChB,iBAAiB;yBACjB,mBAAmB;oBACnB,8BAA8B;yBAC9B,MAAM,MAAM;;;;aACZ,MAAM,MAAM;;;;kBACZ,MAAM,OAAO,sBAAsB,EAAE,aAAa;;;;;;;;gGAWrD,YAAY,eACZ,MAAM,8BACN,mBAAmB,YACnB,QAAQ,qBACR,SAAS,iBACT,MAAM,KACJ,QAAQ,yBAAyB,CAAC;8BAKpC,QAAQ,KACN,QAAQ,SAAS,CAAC;wDAKpB,gBAAgB,KACd,OAAO,GAAG,SAAS;;mCAKlB,6BAA6B;yBAC7B,mBAAmB;qBACnB,eAAe;sBACf,OAAO,KAAK,CAAC;mBACb,aAAa;qBACb,eAAe;iCACf,2BAA2B;oBAC3B,OAAO,YAAY,EAAE,cAAc;eACnC,SAAS;gBACT,UAAU;cACV,OAAO,SAAS,EAAE,QAAQ;oBAC1B,cAAc;oBACd,cAAc;gCACd,0BAA0B;sBAC1B,gBAAgB;wBAChB,kBAAkB;mCAClB,6BAA6B;;;;;;wCAQhC,SAAS,iBACT,MAAM,KACJ,QAAQ,OAAO,sBAAsB,EAAE,gBAAgB,CAAC;uCAK1D,aAAa,KACX,UAAU,KAAK,CAAC"}

package/src/zoeService/internal-types.js

@@ -79,7 +79,7 @@
  * @property {InstanceStateGetTerms} getTerms
  * @property {InstanceRecordGetIssuers} getIssuers
  * @property {InstanceRecordGetBrands} getBrands
- * @property {ZCF['saveIssuer']} saveIssuer
+ * @property {SaveIssuer} saveIssuer
  * @property {MakeZoeMint} makeZoeMint
  * @property {RegisterFeeMint} registerFeeMint
  * @property {GetInstanceRecord} getInstanceRecord

package/src/zoeService/makeInvitation.d.ts

@@ -1,4 +1,4 @@
-export function prepareInvitationKit(baggage: MapStore<string, any>, shutdownZoeVat?: ShutdownWithFailure | undefined): {
+export function prepareInvitationKit(baggage: MapStore<string, unknown>, shutdownZoeVat?: ShutdownWithFailure | undefined): {
     invitationIssuer: Issuer<"set">;
     invitationKit: IssuerKit<"set">;
 };

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

@@ -1 +1 @@
-{"version":3,"file":"makeInvitation.d.ts","sourceRoot":"","sources":["makeInvitation.js"],"names":[],"mappings":"AAgBO,sFAFI,mBAAmB,GAAG,SAAS;;;EA4BzC"}
+{"version":3,"file":"makeInvitation.d.ts","sourceRoot":"","sources":["makeInvitation.js"],"names":[],"mappings":"AAgBO,0FAFI,mBAAmB,GAAG,SAAS;;;EA4BzC"}

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

@@ -1 +1 @@
-{"version":3,"file":"offer.d.ts","sourceRoot":"","sources":["offer.js"],"names":[],"mappings":"AAgBO,6DA0DN"}
+{"version":3,"file":"offer.d.ts","sourceRoot":"","sources":["offer.js"],"names":[],"mappings":"AAgBO,6DA2DN"}

package/src/zoeService/offer/offer.js

@@ -24,8 +24,9 @@ export const makeOfferMethod = offerDataAccess => {
   ) => {
     const invitationIssuer = offerDataAccess.getInvitationIssuer();
     const query = makeInvitationQueryFns(invitationIssuer);
-    const { instance, description } =
-      await query.getInvitationDetails(invitation);
+    const { instance, description } = await query.getInvitationDetails(
+      invitation,
+    );
     // AWAIT ///
 
     const instanceAdmin = await offerDataAccess.getInstanceAdmin(instance);

package/src/zoeService/startInstance.d.ts

@@ -1,4 +1,4 @@
-export function makeStartInstance(startInstanceAccess: Pick<ZoeStorageManager, 'makeZoeInstanceStorageManager' | 'unwrapInstallation'>, getZcfBundleCapP: () => ERef<BundleCap>, getBundleCapByIdNow: (id: string) => BundleCap, zoeBaggage: MapStore<string, any>): import('./utils').StartInstance;
+export function makeStartInstance(startInstanceAccess: Pick<ZoeStorageManager, 'makeZoeInstanceStorageManager' | 'unwrapInstallation'>, getZcfBundleCapP: () => ERef<BundleCap>, getBundleCapByIdNow: (id: string) => BundleCap, zoeBaggage: MapStore<string, unknown>): import('./utils').StartInstance;
 export type Baggage = import('@agoric/vat-data').Baggage;
 export type BundleCap = import('@agoric/swingset-vat').BundleCap;
 //# sourceMappingURL=startInstance.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"startInstance.d.ts","sourceRoot":"","sources":["startInstance.js"],"names":[],"mappings":"AA2BO,uDANI,KAAK,iBAAiB,EAAE,+BAA+B,GAAG,oBAAoB,CAAC,oBAC/E,MAAM,KAAK,SAAS,CAAC,4BAChB,MAAM,KAAK,SAAS,sCAEvB,OAAO,SAAS,EAAE,aAAa,CA+T3C;sBAzUa,OAAO,kBAAkB,EAAE,OAAO;wBACjC,OAAO,sBAAsB,EAAE,SAAS"}
+{"version":3,"file":"startInstance.d.ts","sourceRoot":"","sources":["startInstance.js"],"names":[],"mappings":"AA0BO,uDANI,KAAK,iBAAiB,EAAE,+BAA+B,GAAG,oBAAoB,CAAC,oBAC/E,MAAM,KAAK,SAAS,CAAC,4BAChB,MAAM,KAAK,SAAS,0CAEvB,OAAO,SAAS,EAAE,aAAa,CAmU3C;sBA7Ua,OAAO,kBAAkB,EAAE,OAAO;wBACjC,OAAO,sBAAsB,EAAE,SAAS"}

package/src/zoeService/startInstance.js

@@ -1,4 +1,3 @@
-/* eslint @typescript-eslint/no-floating-promises: "warn" */
 import { E } from '@endo/eventual-send';
 import { passStyleOf } from '@endo/marshal';
 import {
@@ -44,12 +43,6 @@ export const makeStartInstance = (
     seatHandleToZoeSeatAdmin,
   );
 
-  const getFreshZcfBundleCap = async () => {
-    const settledBundleCap = await getZcfBundleCapP();
-    settledBundleCap !== undefined || Fail`the ZCF bundle cap was broken`;
-    return settledBundleCap;
-  };
-
   const InstanceAdminStateShape = harden({
     instanceStorage: M.remotable('ZoeInstanceStorageManager'),
     instanceAdmin: M.remotable('InstanceAdmin'),
@@ -185,10 +178,12 @@ export const makeStartInstance = (
     /**
      *
      * @param {import('@agoric/swingset-vat').VatAdminFacet} adminNode
+     * @param {*} zcfBundleCap
      * @param {*} contractBundleCap
      */
-    (adminNode, contractBundleCap) => ({
+    (adminNode, zcfBundleCap, contractBundleCap) => ({
       adminNode,
+      zcfBundleCap,
       contractBundleCap,
     }),
     {
@@ -205,22 +200,22 @@ export const makeStartInstance = (
           privateArgs: newPrivateArgs,
         };
 
-        return E.when(getFreshZcfBundleCap(), bCap =>
-          E(state.adminNode).upgrade(bCap, { vatParameters }),
-        );
+        return E(state.adminNode).upgrade(state.zcfBundleCap, {
+          vatParameters,
+        });
       },
       async upgradeContract(contractBundleId, newPrivateArgs = undefined) {
         const { state } = this;
-
-        const newContractBundleCap =
-          await getBundleCapByIdNow(contractBundleId);
+        const newContractBundleCap = await getBundleCapByIdNow(
+          contractBundleId,
+        );
         const vatParameters = {
           contractBundleCap: newContractBundleCap,
           privateArgs: newPrivateArgs,
         };
-        return E.when(getFreshZcfBundleCap(), bCap =>
-          E(state.adminNode).upgrade(bCap, { vatParameters }),
-        );
+        return E(state.adminNode).upgrade(state.zcfBundleCap, {
+          vatParameters,
+        });
       },
     },
   );
@@ -232,8 +227,9 @@ export const makeStartInstance = (
     privateArgs = undefined,
     instanceLabel = '',
   ) => {
-    const { installation, bundle, bundleCap } =
-      await E(startInstanceAccess).unwrapInstallation(installationP);
+    const { installation, bundle, bundleCap } = await E(
+      startInstanceAccess,
+    ).unwrapInstallation(installationP);
     // AWAIT ///
 
     const contractBundleCap = bundle || bundleCap;
@@ -310,6 +306,9 @@ export const makeStartInstance = (
 
     instanceAdmin.initDelayedState(handleOfferObj, publicFacet);
 
+    const settledBundleCap = await getZcfBundleCapP();
+    settledBundleCap !== undefined || Fail`the bundle cap was broken`;
+
     // creatorInvitation can be undefined, but if it is defined,
     // let's make sure it is an invitation.
     return E.when(
@@ -325,7 +324,11 @@ export const makeStartInstance = (
           isLiveResult ||
           Fail`The contract did not correctly return a creatorInvitation`;
 
-        const adminFacet = makeAdminFacet(adminNode, contractBundleCap);
+        const adminFacet = makeAdminFacet(
+          adminNode,
+          harden(settledBundleCap),
+          contractBundleCap,
+        );
 
         // Actually returned to the user.
         return harden({

package/src/zoeService/types.d.ts

@@ -85,7 +85,7 @@ type GetBundleIDFromInstallation = (allegedInstallation: ERef<Installation>) =>
  * values are the actual payments to be escrowed. A payment is
  * expected for every rule under `give`.
  */
-type Offer = <Args, Result>(invitation: ERef<Invitation<R, A>>, proposal?: Proposal, paymentKeywordRecord?: PaymentPKeywordRecord, offerArgs?: Args | undefined) => Promise<UserSeat<Result>>;
+type Offer = <Args, Result>(invitation: ERef<Invitation<Result, Args>>, proposal?: Proposal, paymentKeywordRecord?: PaymentPKeywordRecord, offerArgs?: Args | undefined) => Promise<UserSeat<Result>>;
 /**
  * Zoe uses seats to access or manipulate offers. They let contracts and users
  * interact with them. Zoe has two kinds of seats. ZCFSeats are used within

package/src/zoeService/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/src/zoeService/utils.d.ts

@@ -1,6 +1,6 @@
 import type { Callable } from '@agoric/internal/src/utils.js';
-import type { VatUpgradeResults } from '@agoric/swingset-vat';
-import type { Baggage } from '@agoric/swingset-liveslots';
+import { VatUpgradeResults } from '@agoric/swingset-vat';
+import { Baggage } from '@agoric/vat-data';
 
 import type { IssuerKeywordRecord, Payment } from './types.js';
 

package/src/zoeService/zoe.d.ts

@@ -1,7 +1,7 @@
 export type Baggage = import('@agoric/vat-data').Baggage;
 export type ZoeKit = ReturnType<typeof makeDurableZoeKit>;
 /**
- * Create a durable instance of Zoe.
+ * Create an durable instance of Zoe.
  *
  * @param {object} options
  * @param {Baggage} options.zoeBaggage - the baggage for Zoe durability. Must be provided by caller
@@ -22,11 +22,6 @@ export function makeDurableZoeKit({ zoeBaggage, vatAdminSvc, shutdownZoeVat, fee
     zcfSpec?: ZCFSpec | undefined;
 }): {
     zoeService: ZoeService;
-    zoeConfigFacet: {
-        updateZcfBundleId(bundleId: any): void;
-    } & import("@endo/eventual-send").RemotableBrand<{}, {
-        updateZcfBundleId(bundleId: any): void;
-    }>;
     /** @type {FeeMintAccess} */
     feeMintAccess: FeeMintAccess;
     setVatAdminService: ((lateVatAdminSvc: any) => void) & import("@endo/eventual-send").RemotableBrand<{}, (lateVatAdminSvc: any) => void>;
@@ -49,11 +44,6 @@ export function makeDurableZoeKit({ zoeBaggage, vatAdminSvc, shutdownZoeVat, fee
  */
 export function makeZoeKit(vatAdminSvc?: import("@agoric/swingset-vat").VatAdminSvc | Promise<import("@agoric/swingset-vat").VatAdminSvc> | undefined, shutdownZoeVat?: import("@agoric/swingset-vat").ShutdownWithFailure | undefined, feeIssuerConfig?: FeeIssuerConfig | undefined, zcfSpec?: ZCFSpec | undefined): {
     zoeService: ZoeService;
-    zoeConfigFacet: {
-        updateZcfBundleId(bundleId: any): void;
-    } & import("@endo/eventual-send").RemotableBrand<{}, {
-        updateZcfBundleId(bundleId: any): void;
-    }>;
     /** @type {FeeMintAccess} */
     feeMintAccess: FeeMintAccess;
     setVatAdminService: ((lateVatAdminSvc: any) => void) & import("@endo/eventual-send").RemotableBrand<{}, (lateVatAdminSvc: any) => void>;

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

@@ -1 +1 @@
-{"version":3,"file":"zoe.d.ts","sourceRoot":"","sources":["zoe.js"],"names":[],"mappings":"sBA+Bc,OAAO,kBAAkB,EAAE,OAAO;qBA6PnC,WAAW,wBAAwB,CAAC;AAzPjD;;;;;;;;;;;;;GAaG;AACH;IAV4B,UAAU,EAA3B,OAAO;IACsC,WAAW;IAG1B,cAAc;IAGlB,eAAe;IACvB,OAAO;;;;;;;;IAyMhC,4BAA4B;mBAAjB,aAAa;;EAK3B;AAED;;;;;;;;;;;;;;;GAeG;AACH;;;;;;;IAvBI,4BAA4B;mBAAjB,aAAa;;EA8BxB"}
+{"version":3,"file":"zoe.d.ts","sourceRoot":"","sources":["zoe.js"],"names":[],"mappings":"sBA6Bc,OAAO,kBAAkB,EAAE,OAAO;qBAwOnC,WAAW,wBAAwB,CAAC;AApOjD;;;;;;;;;;;;;GAaG;AACH;IAV4B,UAAU,EAA3B,OAAO;IACsC,WAAW;IAG1B,cAAc;IAGlB,eAAe;IACvB,OAAO;;;IAoLhC,4BAA4B;mBAAjB,aAAa;;EAK3B;AAED;;;;;;;;;;;;;;;GAeG;AACH;;IAvBI,4BAA4B;mBAAjB,aAAa;;EA8BxB"}

package/src/zoeService/zoe.js

@@ -1,5 +1,4 @@
 // @jessie-check
-/* eslint @typescript-eslint/no-floating-promises: "warn" */
 
 /**
  * Zoe uses ERTP, the Electronic Rights Transfer Protocol
@@ -19,7 +18,6 @@ import '../internal-types.js';
 import { E } from '@endo/eventual-send';
 import { Far } from '@endo/marshal';
 import { makeScalarBigMapStore, prepareExo } from '@agoric/vat-data';
-import { M } from '@agoric/store';
 
 import { makeZoeStorageManager } from './zoeStorageManager.js';
 import { makeStartInstance } from './startInstance.js';
@@ -34,7 +32,7 @@ import { ZoeServiceI } from '../typeGuards.js';
 const { Fail } = assert;
 
 /**
- * Create a durable instance of Zoe.
+ * Create an durable instance of Zoe.
  *
  * @param {object} options
  * @param {Baggage} options.zoeBaggage - the baggage for Zoe durability. Must be provided by caller
@@ -54,7 +52,6 @@ const makeDurableZoeKit = ({
   feeIssuerConfig = defaultFeeIssuerConfig,
   zcfSpec = { name: 'zcf' },
 }) => {
-  /** @type {BundleCap} */
   let zcfBundleCap;
 
   const saveBundleCap = () => {
@@ -171,25 +168,6 @@ const makeDurableZoeKit = ({
     });
   };
 
-  const ZoeConfigI = M.interface('ZoeConfigFacet', {
-    updateZcfBundleId: M.call(M.string()).returns(),
-  });
-
-  const zoeConfigFacet = prepareExo(zoeBaggage, 'ZoeConfigFacet', ZoeConfigI, {
-    updateZcfBundleId(bundleId) {
-      E.when(
-        getZcfBundleCap({ id: bundleId }, vatAdminSvc),
-        bundleCap => {
-          zcfBundleCap = bundleCap;
-        },
-        e => {
-          console.error(`'🚨 unable to update ZCF Bundle: `, e);
-          throw e;
-        },
-      );
-    },
-  });
-
   /** @type {ZoeService} */
   const zoeService = prepareExo(zoeBaggage, 'ZoeService', ZoeServiceI, {
     install(bundleId, bundleLabel) {
@@ -245,7 +223,6 @@ const makeDurableZoeKit = ({
 
   return harden({
     zoeService,
-    zoeConfigFacet,
     /** @type {FeeMintAccess} */
     // @ts-expect-error cast
     feeMintAccess: feeMintKit.feeMintAccess,

package/src/zoeService/zoeSeat.d.ts

@@ -1,4 +1,4 @@
-export function makeZoeSeatAdminFactory(baggage: MapStore<string, any>): (initialAllocation: AmountKeywordRecord, proposal: ProposalRecord, instanceAdminHelper: InstanceAdminHelper, withdrawFacet: WithdrawFacet, exitObj?: ERef<ExitObj> | undefined, offerResultIsUndefined?: boolean | undefined) => {
+export function makeZoeSeatAdminFactory(baggage: MapStore<string, unknown>): (initialAllocation: AmountKeywordRecord, proposal: ProposalRecord, instanceAdminHelper: InstanceAdminHelper, withdrawFacet: WithdrawFacet, exitObj?: ERef<ExitObj> | undefined, offerResultIsUndefined?: boolean | undefined) => {
     zoeSeatAdmin: {
         replaceAllocation(replacementAllocation: any): void;
         exit(completion: any): void;

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

@@ -1 +1 @@
-{"version":3,"file":"zoeSeat.d.ts","sourceRoot":"","sources":["zoeSeat.js"],"names":[],"mappings":"AAkEO;;;;;QAgIC,wCAAwC;8DAA5B,iBAAiB;;;;;;;;;;;;;;;;;;;;;;;;;;QAA7B,wCAAwC;8DAA5B,iBAAiB;;;;;;;;;;;;;;;;;;;;;GAmJpC"}
+{"version":3,"file":"zoeSeat.d.ts","sourceRoot":"","sources":["zoeSeat.js"],"names":[],"mappings":"AAiEO;;;;;QAgIC,wCAAwC;8DAA5B,iBAAiB;;;;;;;;;;;;;;;;;;;;;;;;;;QAA7B,wCAAwC;8DAA5B,iBAAiB;;;;;;;;;;;;;;;;;;;;;GAmJpC"}

package/src/zoeService/zoeSeat.js

@@ -1,4 +1,3 @@
-/* eslint @typescript-eslint/no-floating-promises: "warn" */
 import { prepareDurablePublishKit, SubscriberShape } from '@agoric/notifier';
 import { E } from '@endo/eventual-send';
 import { M, prepareExoClassKit } from '@agoric/vat-data';

package/src/zoeService/zoeStorageManager.d.ts

@@ -2,7 +2,7 @@ export function makeZoeStorageManager(createZCFVat: CreateZCFVat, getBundleCapFo
     getFeeIssuerKit: GetFeeIssuerKit;
     getFeeIssuer: () => Issuer;
     getFeeBrand: () => Brand;
-}, zoeBaggage: MapStore<string, any>): {
+}, zoeBaggage: MapStore<string, unknown>): {
     zoeServiceDataAccess: {
         getInvitationIssuer: () => Issuer<"set">;
         getBundleIDFromInstallation(allegedInstallation: any): any;

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

@@ -1 +1 @@
-{"version":3,"file":"zoeStorageManager.d.ts","sourceRoot":"","sources":["zoeStorageManager.js"],"names":[],"mappings":"AAwDO,oDAXI,YAAY,qBAEZ,iBAAiB,kBACjB,mBAAmB,WACnB;IACV,eAAoB,EAAE,eAAe,CAAC;IACtC,YAAiB,EAAE,MAAM,MAAM,CAAC;IAChC,WAAgB,EAAE,MAAM,KAAK,CAAC;CAC3B;;;;;;;;;;;;;;;;;;;;;;;QA+ZI,iCAAiC;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;QAAjC,iCAAiC;;;;;;;;;;;GAYxC;sBAjca,OAAO,kBAAkB,EAAE,OAAO"}
+{"version":3,"file":"zoeStorageManager.d.ts","sourceRoot":"","sources":["zoeStorageManager.js"],"names":[],"mappings":"AAmDO,oDAXI,YAAY,qBAEZ,iBAAiB,kBACjB,mBAAmB,WACnB;IACV,eAAoB,EAAE,eAAe,CAAC;IACtC,YAAiB,EAAE,MAAM,MAAM,CAAC;IAChC,WAAgB,EAAE,MAAM,KAAK,CAAC;CAC3B;;;;;;;;;;;;;;;;;;;;;;;QA+ZI,iCAAiC;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;QAAjC,iCAAiC;;;;;;;;;;;GAYxC;sBAjca,OAAO,kBAAkB,EAAE,OAAO"}

package/src/zoeService/zoeStorageManager.js

@@ -1,10 +1,5 @@
 import { E } from '@endo/far';
-import {
-  AssetKind,
-  makeDurableIssuerKit,
-  AmountMath,
-  prepareIssuerKit,
-} from '@agoric/ertp';
+import { AssetKind, makeDurableIssuerKit, AmountMath } from '@agoric/ertp';
 import {
   makeScalarBigMapStore,
   provideDurableWeakMapStore,
@@ -122,7 +117,7 @@ export const makeZoeStorageManager = (
     'zoeMintBaggageSet',
   );
   for (const issuerBaggage of zoeMintBaggageSet.values()) {
-    prepareIssuerKit(issuerBaggage);
+    zoeMintBaggageSet(issuerBaggage);
   }
 
   const makeZoeMint = prepareExoClass(

package/tools/fakePriceAuthority.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"fakePriceAuthority.d.ts","sourceRoot":"","sources":["fakePriceAuthority.js"],"names":[],"mappings":"AAsBA;;;;;;;;;;GAUG;AAEH;;;;;;GAMG;AACH,gDAHW,yBAAyB,GACvB,QAAQ,cAAc,CAAC,CAoSnC;;mBAnTa,MAAM,KAAK,CAAC;oBACZ,MAAM,KAAK,CAAC;;;WAGZ,KAAK,OAAO,wBAAwB,EAAE,YAAY,CAAC"}
+{"version":3,"file":"fakePriceAuthority.d.ts","sourceRoot":"","sources":["fakePriceAuthority.js"],"names":[],"mappings":"AAsBA;;;;;;;;;;GAUG;AAEH;;;;;;GAMG;AACH,gDAHW,yBAAyB,GACvB,QAAQ,cAAc,CAAC,CAsSnC;;mBArTa,MAAM,KAAK,CAAC;oBACZ,MAAM,KAAK,CAAC;;;WAGZ,KAAK,OAAO,wBAAwB,EAAE,YAAY,CAAC"}

package/tools/fakePriceAuthority.js

@@ -254,8 +254,10 @@ export async function makeFakePriceAuthority(options) {
   async function* generateQuotes(amountIn, brandOut) {
     let record = await ticker.getUpdateSince();
     while (record.updateCount !== undefined) {
+      // eslint-disable-next-line no-await-in-loop
       const { value: timestamp } = record; // = await E(timer).getCurrentTimestamp();
       yield priceInQuote(amountIn, brandOut, timestamp);
+      // eslint-disable-next-line no-await-in-loop
       record = await ticker.getUpdateSince(record.updateCount);
     }
   }

package/tools/manualPriceAuthority.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"manualPriceAuthority.d.ts","sourceRoot":"","sources":["manualPriceAuthority.js"],"names":[],"mappings":"AAaA;;;;;;;;GAQG;AACH;IAPiC,aAAa,EAAnC,MAAM,KAAK,CAAC;IACU,cAAc,EAApC,MAAM,KAAK,CAAC;IACG,YAAY,EAA3B,KAAK;IACkD,KAAK,EAA5D,OAAO,wBAAwB,EAAE,YAAY;IAClB,cAAc;;8BACC,IAAI;EAsExD;mCACa,WAAW,+BAA+B,CAAC"}
+{"version":3,"file":"manualPriceAuthority.d.ts","sourceRoot":"","sources":["manualPriceAuthority.js"],"names":[],"mappings":"AAYA;;;;;;;;GAQG;AACH;IAPiC,aAAa,EAAnC,MAAM,KAAK,CAAC;IACU,cAAc,EAApC,MAAM,KAAK,CAAC;IACG,YAAY,EAA3B,KAAK;IACkD,KAAK,EAA5D,OAAO,wBAAwB,EAAE,YAAY;IAClB,cAAc;;8BACC,IAAI;EAsExD;mCACa,WAAW,+BAA+B,CAAC"}

package/tools/manualPriceAuthority.js

@@ -1,5 +1,4 @@
 // @jessie-check
-/* eslint @typescript-eslint/no-floating-promises: "warn" */
 
 import { AmountMath, makeIssuerKit, AssetKind } from '@agoric/ertp';
 import { E } from '@endo/eventual-send';

package/tools/manualTimer.js

@@ -94,8 +94,8 @@ const buildManualTimer = (log = nolog, startValue = 0n, options = {}) => {
 
   const tickN = async (nTimes, msg) => {
     nTimes >= 1 || Fail`invariant nTimes >= 1`;
-    await null;
     for (let i = 0; i < nTimes; i += 1) {
+      // eslint-disable-next-line no-await-in-loop
       await tick(msg);
     }
   };

package/tools/prepare-test-env.js

@@ -7,4 +7,4 @@
  * the same as the SwingSet vat environment.
  */
 
-import '@agoric/swingset-liveslots/tools/prepare-test-env.js';
+import '@agoric/swingset-vat/tools/prepare-test-env.js';

package/tools/priceAuthorityRegistry.d.ts

@@ -1,4 +1,4 @@
-export function providePriceAuthorityRegistry(baggage: MapStore<string, any>): PriceAuthorityRegistry;
+export function providePriceAuthorityRegistry(baggage: MapStore<string, unknown>): PriceAuthorityRegistry;
 export type Deleter = {
     delete: () => void;
 };

package/tools/priceAuthorityRegistry.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"priceAuthorityRegistry.d.ts","sourceRoot":"","sources":["priceAuthorityRegistry.js"],"names":[],"mappings":"AA0CO,+EAFM,sBAAsB,CAwKlC;;YAhMa,MAAM,IAAI;;;;;;iCAKL,KAAK,cAAc,CAAC,WACf,KAAK,YACJ,KAAK,UACP,OAAO,KAAK,QAAQ,OAAO,CAAC;;;;;;;;oBAQrC,cAAc;gBACd,2BAA2B"}
+{"version":3,"file":"priceAuthorityRegistry.d.ts","sourceRoot":"","sources":["priceAuthorityRegistry.js"],"names":[],"mappings":"AA0CO,mFAFM,sBAAsB,CAwKlC;;YAhMa,MAAM,IAAI;;;;;;iCAKL,KAAK,cAAc,CAAC,WACf,KAAK,YACJ,KAAK,UACP,OAAO,KAAK,QAAQ,OAAO,CAAC;;;;;;;;oBAQrC,cAAc;gBACd,2BAA2B"}

package/tools/scriptedOracle.d.ts

@@ -17,10 +17,10 @@
 export function makeScriptedOracle(script: Record<string, any>, oracleInstallation: Installation<import('../src/contracts/oracle.js').OracleStart>, timer: import('@agoric/time/src/types').TimerService, zoe: ZoeService, feeIssuer: Issuer): Promise<{
     publicFacet: {
         query(query: OracleQuery): Promise<unknown>;
-        makeQueryInvitation(query: OracleQuery): Promise<Invitation<R, A>>;
+        makeQueryInvitation(query: OracleQuery): Promise<Invitation<unknown, never>>;
     } & import("@endo/eventual-send").RemotableBrand<{}, {
         query(query: OracleQuery): Promise<unknown>;
-        makeQueryInvitation(query: OracleQuery): Promise<Invitation<R, A>>;
+        makeQueryInvitation(query: OracleQuery): Promise<Invitation<unknown, never>>;
     }>;
     creatorFacet: OracleCreatorFacet;
 }>;

package/tools/scriptedPriceAuthority.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"scriptedPriceAuthority.d.ts","sourceRoot":"","sources":["scriptedPriceAuthority.js"],"names":[],"mappings":"AAWA,yEAoFC"}
+{"version":3,"file":"scriptedPriceAuthority.d.ts","sourceRoot":"","sources":["scriptedPriceAuthority.js"],"names":[],"mappings":"AAUA,yEAoFC"}

package/tools/scriptedPriceAuthority.js

@@ -1,4 +1,3 @@
-/* eslint @typescript-eslint/no-floating-promises: "warn" */
 import { AmountMath, makeIssuerKit, AssetKind } from '@agoric/ertp';
 import { E } from '@endo/eventual-send';
 import { Far } from '@endo/marshal';

package/tools/setup-zoe.d.ts

@@ -1,10 +1,5 @@
 export function makeZoeKitForTest(vatAdminSvc?: import("@agoric/swingset-vat").VatAdminSvc | undefined): {
     zoeService: ZoeService;
-    zoeConfigFacet: {
-        updateZcfBundleId(bundleId: any): void;
-    } & import("@endo/eventual-send").RemotableBrand<{}, {
-        updateZcfBundleId(bundleId: any): void;
-    }>;
     feeMintAccess: FeeMintAccess;
     setVatAdminService: ((lateVatAdminSvc: any) => void) & import("@endo/eventual-send").RemotableBrand<{}, (lateVatAdminSvc: any) => void>;
 };

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

@@ -1 +1 @@
-{"version":3,"file":"setup-zoe.d.ts","sourceRoot":"","sources":["setup-zoe.js"],"names":[],"mappings":"AASO;;;;;;;;;EAKN;AAKM,iHACoC;AAYpC;IAL+B,MAAM,gBAArB,IAAI;IACU,eAAe;IACnB,WAAW;IACf,aAAa;;;;;;;;;;;;;;;;;;GA+BzC"}
+{"version":3,"file":"setup-zoe.d.ts","sourceRoot":"","sources":["setup-zoe.js"],"names":[],"mappings":"AASO;;;;EAKN;AAKM,iHACoC;AAYpC;IAL+B,MAAM,gBAArB,IAAI;IACU,eAAe;IACnB,WAAW;IACf,aAAa;;;;;;;;;;;;;;;;;;GA+BzC"}

package/src/contractFacet/reallocate.d.ts

@@ -1,3 +0,0 @@
-export function makeAllocationMap(transfers: Array<TransferPart>): [ZCFSeat, AmountKeywordRecord][];
-export type TransactionList = Array<AmountKeywordRecord>;
-//# sourceMappingURL=reallocate.d.ts.map

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

@@ -1 +0,0 @@
-{"version":3,"file":"reallocate.d.ts","sourceRoot":"","sources":["reallocate.js"],"names":[],"mappings":"AAiBO,6CAHI,mBAAmB,GACjB,CAAC,OAAO,EAAE,mBAAmB,CAAC,EAAE,CA8E5C;8BAtFa,MAAM,mBAAmB,CAAC"}

package/src/contractFacet/reallocate.js

@@ -1,94 +0,0 @@
-import { makeScalarMapStore } from '@agoric/vat-data';
-
-import { assertRightsConserved } from './rightsConservation.js';
-import { addToAllocation, subtractFromAllocation } from './allocationMath.js';
-
-const { Fail } = assert;
-
-/** @typedef {Array<AmountKeywordRecord>} TransactionList */
-
-/**
- * Convert from a list of transfer descriptions ([fromSeat, toSeat, fromAmount,
- * toAmount], with many parts optional) to a list of resulting allocations for
- * each of the seats mentioned.
- *
- * @param {Array<TransferPart>} transfers
- * @returns {[ZCFSeat, AmountKeywordRecord][]}
- */
-export const makeAllocationMap = transfers => {
-  /** @type {MapStore<ZCFSeat, [TransactionList, TransactionList]>} */
-  const allocations = makeScalarMapStore();
-
-  const getAllocations = seat => {
-    if (allocations.has(seat)) {
-      return allocations.get(seat);
-    }
-
-    /** @type {[TransactionList, TransactionList]} */
-    const pair = [[], []];
-    allocations.init(seat, pair);
-    return pair;
-  };
-
-  const decrementAllocation = (seat, decrement) => {
-    const [incr, decr] = getAllocations(seat);
-
-    const newDecr = [...decr, decrement];
-    allocations.set(seat, [incr, newDecr]);
-  };
-
-  const incrementAllocation = (seat, increment) => {
-    const [incr, decr] = getAllocations(seat);
-
-    const newIncr = [...incr, increment];
-    allocations.set(seat, [newIncr, decr]);
-  };
-
-  for (const [fromSeat, toSeat, fromAmounts, toAmounts] of transfers) {
-    if (fromSeat) {
-      if (!fromAmounts) {
-        throw Fail`Transfer from ${fromSeat} must say how much`;
-      }
-      decrementAllocation(fromSeat, fromAmounts);
-      if (toSeat) {
-        // Conserved transfer between seats
-        if (toAmounts) {
-          // distinct amounts, so we check conservation.
-          assertRightsConserved(
-            Object.values(fromAmounts),
-            Object.values(toAmounts),
-          );
-          incrementAllocation(toSeat, toAmounts);
-        } else {
-          // fromAmounts will be used for toAmounts as well
-          incrementAllocation(toSeat, fromAmounts);
-        }
-      } else {
-        // Transfer only from fromSeat
-        !toAmounts ||
-          Fail`Transfer without toSeat cannot have toAmounts ${toAmounts}`;
-      }
-    } else {
-      toSeat || Fail`Transfer must have at least one of fromSeat or toSeat`;
-      // Transfer only to toSeat
-      !fromAmounts ||
-        Fail`Transfer without fromSeat cannot have fromAmounts ${fromAmounts}`;
-      toAmounts || Fail`Transfer to ${toSeat} must say how much`;
-      incrementAllocation(toSeat, toAmounts);
-    }
-  }
-
-  /** @type {[ZCFSeat,AmountKeywordRecord][]} */
-  const resultingAllocations = [];
-  for (const [seat, [incrList, decrList]] of allocations.entries()) {
-    let newAlloc = seat.getCurrentAllocation();
-    for (const incr of incrList) {
-      newAlloc = addToAllocation(newAlloc, incr);
-    }
-    for (const decr of decrList) {
-      newAlloc = subtractFromAllocation(newAlloc, decr);
-    }
-    resultingAllocations.push([seat, newAlloc]);
-  }
-  return resultingAllocations;
-};