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

package/src/contracts/valueVow.contract.js

@@ -2,7 +2,6 @@ import { prepareVowTools } from '@agoric/vow';
 import { makeDurableZone } from '@agoric/zone/durable.js';
 
 /**
- * @import {ContractMeta, HandleOffer, ZCF} from '@agoric/zoe';
  * @import { Baggage } from '@agoric/vat-data';
  */
 

package/src/instanceRecordStorage.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"instanceRecordStorage.d.ts","sourceRoot":"","sources":["instanceRecordStorage.js"],"names":[],"mappings":"AA6BO,mDAHI,OAAO,kBAAkB,EAAE,OAAO,GAChC,CAAC,EAAE,EAAE,cAAc,KAAK,aAAa,CAqFjD"}
+{"version":3,"file":"instanceRecordStorage.d.ts","sourceRoot":"","sources":["instanceRecordStorage.js"],"names":[],"mappings":"AA6BO,mDAHI,OAAO,kBAAkB,EAAE,OAAO,GAChC,CAAC,EAAE,EAAE,cAAc,KAAK,aAAa,CAmFjD"}

package/src/instanceRecordStorage.js

@@ -47,10 +47,8 @@ export const makeInstanceRecordStorage = baggage => {
     baggage,
     'InstanceRecord',
     InstanceRecordI,
-    /** @type {(ir: InstanceRecord) => {instanceRecord: InstanceRecord}} */
-    ir => harden({ instanceRecord: ir }),
+    record => harden({ instanceRecord: record }),
     {
-      /** @type {(keyword: Keyword, issuerRecord: ZoeIssuerRecord) => void} */
       addIssuer(keyword, issuerRecord) {
         const { state } = this;
         !ownKeys(issuerRecord).includes(keyword) ||

package/src/internal-types.d.ts

@@ -73,7 +73,7 @@ type HandleOfferObj = {
 type ZoeInstanceAdminMakeInvitation = (invitationHandle: InvitationHandle, description: string, customDetails?: Record<string, any> | undefined, proposalShape?: Pattern) => Invitation;
 type ZoeInstanceAdmin = {
     makeInvitation: ZoeInstanceAdminMakeInvitation;
-    saveIssuer: <I extends Issuer>(issuerP: ERef<I>, keyword: Keyword) => Promise<I extends Issuer<infer K, infer M> ? ZoeIssuerRecord<K, M> : never>;
+    saveIssuer: <I extends Issuer>(issuerP: ERef<I>, keyword: Keyword) => Promise<I extends Issuer<infer K, infer M> ? IssuerRecord<K, M> : never>;
     makeZoeMint: MakeZoeMint;
     registerFeeMint: RegisterFeeMint;
     makeNoEscrowSeat: MakeNoEscrowSeat;
@@ -101,7 +101,7 @@ type SeatHandleAllocation = {
     allocation: Allocation;
 };
 type ZoeMint<K extends AssetKind = globalThis.AssetKind> = {
-    getIssuerRecord: () => import("@agoric/ertp").IssuerRecord<K>;
+    getIssuerRecord: () => IssuerRecord<K>;
     mintAndEscrow: (totalToMint: Amount<K>) => void;
     /**
      * Note that the burning is asynchronous, and so may not have happened by
@@ -117,7 +117,7 @@ type ZCFRoot = {
 };
 type ExecuteContractResult = {
     creatorFacet: object;
-    creatorInvitation?: Promise<globalThis.Invitation> | undefined;
+    creatorInvitation?: Promise<Invitation<unknown, undefined>> | undefined;
     publicFacet: object;
     handleOfferObj: HandleOfferObj;
 };
@@ -134,7 +134,7 @@ type SeatHandle = Handle<"Seat">;
  * To be deleted when brands have a property for assetKind
  */
 type GetAssetKindByBrand = (brand: Brand) => AssetKind;
-type IssuerRecords = Array<ZoeIssuerRecord>;
+type IssuerRecords = Array<IssuerRecord>;
 type MakeZCFSeat = (seatData: SeatData) => ZCFSeat;
 /**
  * Drops all of the references in the seat-related weakStores by
@@ -152,7 +152,7 @@ type ZcfMintReallocator = {
  * Add an issuer and its keyword to the instanceRecord for the
  * contract instance
  */
-type InstanceStateAddIssuer = (keyword: Keyword, issuerRecord: ZoeIssuerRecord) => void;
+type InstanceStateAddIssuer = (keyword: Keyword, issuerRecord: IssuerRecord) => void;
 type InstanceState = {
     addIssuer: InstanceStateAddIssuer;
     getInstanceRecord: () => InstanceRecord;
@@ -162,14 +162,4 @@ type InstanceState = {
     getBrands: () => BrandKeywordRecord;
     assertUniqueKeyword: (keyword: Keyword) => void;
 };
-import type { Allocation } from '@agoric/zoe';
-import type { AnyTerms } from '@agoric/zoe';
-import type { BrandKeywordRecord } from '@agoric/zoe';
-import type { Completion } from '@agoric/zoe';
-import type { ContractStartFn } from '@agoric/zoe';
-import type { InvitationHandle } from '@agoric/zoe';
-import type { PaymentPKeywordRecord } from '@agoric/zoe';
-import type { UserSeat } from '@agoric/zoe';
-import type { ZoeIssuerRecord } from '@agoric/zoe';
-import type { Pattern } from '@endo/patterns';
 //# sourceMappingURL=internal-types.d.ts.map

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

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

package/src/internal-types.js

@@ -1,11 +1,6 @@
 // @jessie-check
 /// <reference types="@agoric/ertp/exported" />
 
-/**
- * @import {Allocation, AnyTerms, BrandKeywordRecord, Completion, ContractStartFn, InvitationHandle, PaymentPKeywordRecord, UserSeat, ZoeIssuerRecord} from '@agoric/zoe';
- * @import {Pattern} from '@endo/patterns';
- */
-
 /**
  * @typedef {object} SeatData
  * @property {ProposalRecord} proposal
@@ -133,7 +128,7 @@
  * @property {ZoeInstanceAdminMakeInvitation} makeInvitation
  * @property {<I extends Issuer>(issuerP: ERef<I>,
  *             keyword: Keyword
- *            ) => Promise<I extends Issuer<infer K, infer M> ? ZoeIssuerRecord<K, M> : never>} saveIssuer
+ *            ) => Promise<I extends Issuer<infer K, infer M> ? IssuerRecord<K, M> : never>} saveIssuer
  * @property {MakeZoeMint} makeZoeMint
  * @property {RegisterFeeMint} registerFeeMint
  * @property {MakeNoEscrowSeat} makeNoEscrowSeat
@@ -196,7 +191,7 @@
 /**
  * @template {AssetKind} [K=AssetKind]
  * @typedef {object} ZoeMint
- * @property {() => import('@agoric/ertp').IssuerRecord<K>} getIssuerRecord
+ * @property {() => IssuerRecord<K>} getIssuerRecord
  * @property {(totalToMint: Amount<K>) => void} mintAndEscrow
  * @property {(totalToBurn: Amount<K>) => void} withdrawAndBurn
  * Note that the burning is asynchronous, and so may not have happened by
@@ -261,7 +256,7 @@
  */
 
 /**
- * @typedef {Array<ZoeIssuerRecord>} IssuerRecords
+ * @typedef {Array<IssuerRecord>} IssuerRecords
  */
 
 /**
@@ -296,7 +291,7 @@
  * contract instance
  *
  * @param {Keyword} keyword
- * @param {ZoeIssuerRecord} issuerRecord
+ * @param {IssuerRecord} issuerRecord
  * @returns {void}
  */
 

package/src/issuerRecord.d.ts

@@ -1,4 +1,3 @@
-export function makeIssuerRecord<K extends AssetKind>(brand: Brand<K>, issuer: Issuer<K>, displayInfo: DisplayInfo<K>): ZoeIssuerRecord<K>;
-export function assertFullIssuerRecord(issuerRecord: IssuerRecord<any>): asserts issuerRecord is Required<IssuerRecord>;
-import type { IssuerRecord } from '@agoric/ertp';
+export function makeIssuerRecord<K extends AssetKind>(brand: Brand<K>, issuer: Issuer<K>, displayInfo: DisplayInfo<K>): IssuerRecord<K>;
+export function assertFullIssuerRecord(issuerRecord: IssuerRecord): asserts issuerRecord is Required<IssuerRecord>;
 //# sourceMappingURL=issuerRecord.d.ts.map

package/src/issuerRecord.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"issuerRecord.d.ts","sourceRoot":"","sources":["issuerRecord.js"],"names":[],"mappings":"AAiBO,iCANkB,CAAC,SAAZ,SAAU,SACb,KAAK,CAAC,CAAC,CAAC,UACR,MAAM,CAAC,CAAC,CAAC,eACT,WAAW,CAAC,CAAC,CAAC,GACZ,gBAAgB,CAAC,CAAC,CAQ3B;AAMG,qDAHI,aAAa,GAAG,CAAC,GACf,QAAQ,YAAY,IAAI,QAAQ,CAAC,YAAY,CAAC,CAM1D;kCA7B8B,cAAc"}
+{"version":3,"file":"issuerRecord.d.ts","sourceRoot":"","sources":["issuerRecord.js"],"names":[],"mappings":"AAaO,iCANkB,CAAC,SAAZ,SAAU,SACb,KAAK,CAAC,CAAC,CAAC,UACR,MAAM,CAAC,CAAC,CAAC,eACT,WAAW,CAAC,CAAC,CAAC,GACZ,YAAY,CAAC,CAAC,CAAC,CAQxB;AAMG,qDAHI,YAAY,GACV,QAAQ,YAAY,IAAI,QAAQ,CAAC,YAAY,CAAC,CAM1D"}

package/src/issuerRecord.js

@@ -1,10 +1,6 @@
 // @jessie-check
 import { Fail } from '@endo/errors';
 
-/**
- * @import {IssuerRecord} from '@agoric/ertp';
- */
-
 /**
  * Put together information about the issuer in a standard format that
  * is synchronously accessible.
@@ -13,7 +9,7 @@ import { Fail } from '@endo/errors';
  * @param {Brand<K>} brand
  * @param {Issuer<K>} issuer
  * @param {DisplayInfo<K>} displayInfo
- * @returns {ZoeIssuerRecord<K>}
+ * @returns {IssuerRecord<K>}
  */
 export const makeIssuerRecord = (brand, issuer, displayInfo) =>
   harden({
@@ -24,7 +20,7 @@ export const makeIssuerRecord = (brand, issuer, displayInfo) =>
   });
 
 /**
- * @param {IssuerRecord<any>} issuerRecord
+ * @param {IssuerRecord} issuerRecord
  * @returns {asserts issuerRecord is Required<IssuerRecord>}
  */
 export const assertFullIssuerRecord = issuerRecord => {

package/src/issuerStorage.d.ts

@@ -3,13 +3,12 @@ export function provideIssuerStorage(zcfBaggage: import("@agoric/vat-data").Bagg
         issuers: IssuerKeywordRecord;
         brands: BrandKeywordRecord;
     }>;
-    storeIssuer: (issuerP: ERef<Issuer>) => Promise<ZoeIssuerRecord>;
-    storeIssuerRecord: (issuerRecord: ZoeIssuerRecord) => ZoeIssuerRecord;
+    storeIssuer: (issuerP: ERef<Issuer>) => Promise<IssuerRecord>;
+    storeIssuerRecord: (issuerRecord: IssuerRecord) => IssuerRecord;
     getAssetKindByBrand: GetAssetKindByBrand;
     getBrandForIssuer: <K extends AssetKind>(issuer: Issuer<K>) => Brand<K>;
     getIssuerForBrand: <K extends AssetKind>(brand: Brand<K>) => Issuer<K>;
     getIssuerRecords: (issuers: Issuer[]) => IssuerRecords;
     instantiate: (issuerRecords?: any[]) => void;
 };
-import type { ZoeIssuerRecord } from '@agoric/zoe';
 //# sourceMappingURL=issuerStorage.d.ts.map

package/src/issuerStorage.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"issuerStorage.d.ts","sourceRoot":"","sources":["issuerStorage.js"],"names":[],"mappings":"AAoBO,iDAFI,OAAO,kBAAkB,EAAE,OAAO;2DAwHhC,mBAAmB,KACjB,OAAO,CAAC;QAAE,OAAO,EAAE,mBAAmB,CAAC;QAC7B,MAAM,EAAE,kBAAkB,CAAA;KAAE,CAAC;2BAnDzC,IAAI,CAAC,MAAM,CAAC,KACV,OAAO,CAAE,eAAe,CAAC;sCAzB3B,eAAe,KACb,eAAe;;wBAyFH,CAAC,SAAZ,SAAU,UACb,MAAM,CAAC,CAAC,CAAC,KACP,KAAK,CAAC,CAAC,CAAC;wBASI,CAAC,SAAZ,SAAU,SACb,KAAK,CAAC,CAAC,CAAC,KACN,MAAM,CAAC,CAAC,CAAC;gCASX,MAAM,EAAE,KACN,aAAa;;EA2B3B;qCAjMiC,aAAa"}
+{"version":3,"file":"issuerStorage.d.ts","sourceRoot":"","sources":["issuerStorage.js"],"names":[],"mappings":"AAmBO,iDAFI,OAAO,kBAAkB,EAAE,OAAO;2DAwHhC,mBAAmB,KACjB,OAAO,CAAC;QAAE,OAAO,EAAE,mBAAmB,CAAC;QAC7B,MAAM,EAAE,kBAAkB,CAAA;KAAE,CAAC;2BAnDzC,IAAI,CAAC,MAAM,CAAC,KACV,OAAO,CAAC,YAAY,CAAC;sCAzBvB,YAAY,KACV,YAAY;;wBAyFA,CAAC,SAAZ,SAAU,UACb,MAAM,CAAC,CAAC,CAAC,KACP,KAAK,CAAC,CAAC,CAAC;wBASI,CAAC,SAAZ,SAAU,SACb,KAAK,CAAC,CAAC,CAAC,KACN,MAAM,CAAC,CAAC,CAAC;gCASX,MAAM,EAAE,KACN,aAAa;;EA2B3B"}

package/src/issuerStorage.js

@@ -10,7 +10,6 @@ const STORAGE_INSTANTIATED_KEY = 'IssuerStorageInstantiated';
 
 /**
  * @import {LegacyWeakMap, WeakMapStore} from '@agoric/store';
- * @import {ZoeIssuerRecord} from '@agoric/zoe';
  */
 
 /**
@@ -19,12 +18,12 @@ const STORAGE_INSTANTIATED_KEY = 'IssuerStorageInstantiated';
  * @param {import('@agoric/vat-data').Baggage} zcfBaggage
  */
 export const provideIssuerStorage = zcfBaggage => {
-  /** @type {WeakMapStore<Brand, ZoeIssuerRecord>} */
+  /** @type {WeakMapStore<Brand,IssuerRecord>} */
   const brandToIssuerRecord = provideDurableWeakMapStore(
     zcfBaggage,
     'brandToIssuerRecord',
   );
-  /** @type {WeakMapStore<Issuer, ZoeIssuerRecord>} */
+  /** @type {WeakMapStore<Issuer,IssuerRecord>} */
   const issuerToIssuerRecord = provideDurableWeakMapStore(
     zcfBaggage,
     'issuerToIssuerRecord',
@@ -63,8 +62,8 @@ export const provideIssuerStorage = zcfBaggage => {
    * to add the issuer again in ZCF.
    *
    *
-   * @param {ZoeIssuerRecord} issuerRecord
-   * @returns {ZoeIssuerRecord}
+   * @param {IssuerRecord} issuerRecord
+   * @returns {IssuerRecord}
    */
   const storeIssuerRecord = issuerRecord => {
     assertInstantiated();
@@ -88,7 +87,7 @@ export const provideIssuerStorage = zcfBaggage => {
    * Otherwise, make and save the issuerRecord.
    *
    * @param {ERef<Issuer>} issuerP
-   * @returns {Promise< ZoeIssuerRecord>}
+   * @returns {Promise<IssuerRecord>}
    */
   const storeIssuer = async issuerP => {
     assertInstantiated();

package/src/typeGuards.d.ts

@@ -1,6 +1,5 @@
 /**
  * @import {TypedPattern} from '@agoric/internal';
- * @import {AfterDeadlineExitRule, ZoeIssuerRecord} from '@agoric/zoe';
  */
 export const KeywordShape: import("@endo/patterns").Matcher;
 /** @type {TypedPattern<InvitationHandle>} */
@@ -17,8 +16,7 @@ export const PaymentPKeywordRecordShape: import("@endo/patterns").Matcher;
 export const IssuerKeywordRecordShape: import("@endo/patterns").Matcher;
 export const IssuerPKeywordRecordShape: import("@endo/patterns").Matcher;
 export const BrandKeywordRecordShape: import("@endo/patterns").Matcher;
-/** @type {TypedPattern<ZoeIssuerRecord>} */
-export const IssuerRecordShape: TypedPattern<ZoeIssuerRecord>;
+export const IssuerRecordShape: import("@endo/patterns").Matcher;
 export namespace TermsShape {
     export { IssuerKeywordRecordShape as issuers };
     export { BrandKeywordRecordShape as brands };
@@ -40,10 +38,10 @@ export namespace FullProposalShape {
 export const ProposalShape: import("@endo/patterns").Matcher;
 export const EmptyProposalShape: import("@endo/patterns").Matcher;
 export function isOnDemandExitRule(exit: any): boolean;
-export function isWaivedExitRule(exit: import("./types-index").ExitRule): exit is WaivedExitRule;
-export function isAfterDeadlineExitRule(exit: import("./types-index").ExitRule): exit is AfterDeadlineExitRule;
-/** @type {TypedPattern<import('./types-index').InvitationDetails>} */
-export const InvitationElementShape: TypedPattern<import("./types-index").InvitationDetails>;
+export function isWaivedExitRule(exit: ExitRule): exit is WaivedExitRule;
+export function isAfterDeadlineExitRule(exit: ExitRule): exit is AfterDeadlineExitRule;
+/** @type {TypedPattern<InvitationDetails>} */
+export const InvitationElementShape: TypedPattern<InvitationDetails>;
 export const OfferHandlerI: import("@endo/patterns").InterfaceGuard<{
     handle: import("@endo/patterns").MethodGuard;
 }>;
@@ -168,10 +166,8 @@ export const HandleOfferI: import("@endo/patterns").InterfaceGuard<{
 }>;
 export namespace PriceQuoteShape {
     export { AmountShape as quoteAmount };
-    export let quotePayment: Pattern;
+    export let quotePayment: globalThis.Pattern;
 }
 import type { TypedPattern } from '@agoric/internal';
-import type { ZoeIssuerRecord } from '@agoric/zoe';
-import type { AfterDeadlineExitRule } from '@agoric/zoe';
 import { AmountShape } from '@agoric/ertp';
 //# sourceMappingURL=typeGuards.d.ts.map

package/src/typeGuards.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"typeGuards.d.ts","sourceRoot":"","sources":["typeGuards.js"],"names":[],"mappings":"AAeA;;;GAGG;AAGH,4DAAuC;AAEvC,6CAA6C;AAC7C,oCADW,aAAa,gBAAgB,CAAC,CAC4B;AACrE,uCAAuC;AACvC,8BADW,aAAa,UAAU,CAAC,CACsB;AACzD,mEAAiE;AACjE,yCAAyC;AACzC,gCADW,aAAa,YAAY,CAAC,CACwB;AAC7D,yDAA6C;AAE7C,wEAA8E;AAC9E,+EAGE;AACF,0EAGE;AACF,wEAA8E;AAC9E,yEAGE;AACF,uEAA4E;AAE5E,4CAA4C;AAC5C,gCADW,aAAa,eAAe,CAAC,CAQtC;;;;;;;;;;AAeF,kEAAiD;AAE1C,6EAA4D;AACnE,0DAAmD;;;;;;AA4BnD,2BAA2B;AAC3B,6DAAsE;AAEtE,kEAIG;AAEI,uDAGN;AAOM,uCAHI,OAAO,eAAe,EAAE,QAAQ,GAC9B,IAAI,IAAI,cAAc,CAKlC;AAOM,8CAHI,OAAO,eAAe,EAAE,QAAQ,GAC9B,IAAI,IAAI,qBAAqB,CAKzC;AAGD,sEAAsE;AACtE,qCADW,aAAa,OAAO,eAAe,EAAE,iBAAiB,CAAC,CAM/D;AAEH;;GAEG;AAEH,0EAGG;AAEH,4DAAmD;AACnD;;;;GAIG;AAEH,kEAA+D;AAE/D;;GAEG;AAEH,+DAAsD;AACtD,kEAA+D;AAC/D;;;;;;;;;;;;;;;;;GAkCG;;;;;;;;;;;;;;;;;;;;;;;;;;;AAkDH,8DAAuD;AACvD,2DAGE;AAEF,0EAQE;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AA8DF;;;;;;;;;;;;;;;;;;;GA6CG;AAEH;;;;;GAKG;AAEH,6DASE;AAEF;;GAKG;;;;;kCA/X4B,kBAAkB;qCACQ,aAAa;2CAAb,aAAa;4BAP/D,cAAc"}
+{"version":3,"file":"typeGuards.d.ts","sourceRoot":"","sources":["typeGuards.js"],"names":[],"mappings":"AAeA;;GAEG;AAGH,4DAAuC;AAEvC,6CAA6C;AAC7C,oCADW,aAAa,gBAAgB,CAAC,CAC4B;AACrE,uCAAuC;AACvC,8BADW,aAAa,UAAU,CAAC,CACsB;AACzD,mEAAiE;AACjE,yCAAyC;AACzC,gCADW,aAAa,YAAY,CAAC,CACwB;AAC7D,yDAA6C;AAE7C,wEAA8E;AAC9E,+EAGE;AACF,0EAGE;AACF,wEAA8E;AAC9E,yEAGE;AACF,uEAA4E;AAE5E,iEAOE;;;;;;;;;;AAeF,kEAAiD;AAE1C,6EAA4D;AACnE,0DAAmD;;;;;;AA4BnD,2BAA2B;AAC3B,6DAAsE;AAEtE,kEAIG;AAEI,uDAGN;AAOM,uCAHI,QAAQ,GACN,IAAI,IAAI,cAAc,CAKlC;AAOM,8CAHI,QAAQ,GACN,IAAI,IAAI,qBAAqB,CAKzC;AAGD,8CAA8C;AAC9C,qCADW,aAAa,iBAAiB,CAAC,CAMvC;AAEH;;GAEG;AAEH,0EAGG;AAEH,4DAAmD;AACnD;;;;GAIG;AAEH,kEAA+D;AAE/D;;GAEG;AAEH,+DAAsD;AACtD,kEAA+D;AAC/D;;;;;;;;;;;;;;;;;GAkCG;;;;;;;;;;;;;;;;;;;;;;;;;;;AAkDH,8DAAuD;AACvD,2DAGE;AAEF,0EAQE;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AA8DF;;;;;;;;;;;;;;;;;;;GA6CG;AAEH;;;;;GAKG;AAEH,6DASE;AAEF;;GAKG;;;;;kCA7X4B,kBAAkB;4BAN1C,cAAc"}

package/src/typeGuards.js

@@ -15,7 +15,6 @@ import { TimestampShape } from '@agoric/time';
 
 /**
  * @import {TypedPattern} from '@agoric/internal';
- * @import {AfterDeadlineExitRule, ZoeIssuerRecord} from '@agoric/zoe';
  */
 
 // keywords have an initial cap
@@ -46,7 +45,6 @@ export const IssuerPKeywordRecordShape = M.recordOf(
 );
 export const BrandKeywordRecordShape = M.recordOf(KeywordShape, BrandShape);
 
-/** @type {TypedPattern<ZoeIssuerRecord>} */
 export const IssuerRecordShape = M.splitRecord(
   {
     brand: BrandShape,
@@ -116,7 +114,7 @@ export const isOnDemandExitRule = exit => {
 harden(isOnDemandExitRule);
 
 /**
- * @param {import('./types-index').ExitRule} exit
+ * @param {ExitRule} exit
  * @returns {exit is WaivedExitRule}
  */
 export const isWaivedExitRule = exit => {
@@ -126,7 +124,7 @@ export const isWaivedExitRule = exit => {
 harden(isWaivedExitRule);
 
 /**
- * @param {import('./types-index').ExitRule} exit
+ * @param {ExitRule} exit
  * @returns {exit is AfterDeadlineExitRule}
  */
 export const isAfterDeadlineExitRule = exit => {
@@ -135,7 +133,7 @@ export const isAfterDeadlineExitRule = exit => {
 };
 harden(isAfterDeadlineExitRule);
 
-/** @type {TypedPattern<import('./types-index').InvitationDetails>} */
+/** @type {TypedPattern<InvitationDetails>} */
 export const InvitationElementShape = M.splitRecord({
   description: M.string(),
   handle: InvitationHandleShape,
@@ -280,7 +278,7 @@ export const ZoeStorageManagerIKit = {
     getBundleIDFromInstallation: M.call(InstallationShape).returns(
       M.eref(M.string()),
     ),
-    installBundle: M.call(BundleShape)
+    installBundle: M.call(M.or(InstanceHandleShape, BundleShape))
       .optional(M.string())
       .returns(M.promise()),
     installBundleID: M.call(M.string())
@@ -313,7 +311,7 @@ export const ZoeStorageManagerIKit = {
       InstallationShape,
       M.any(),
       IssuerPKeywordRecordShape,
-      InstanceHandleShape,
+      M.or(InstanceHandleShape, BundleShape),
       M.or(BundleCapShape, BundleShape),
       M.string(),
     ).returns(M.promise()),

package/src/types-ambient.d.ts

@@ -1 +1,41 @@
+/**
+ * Alias for RemotableObject
+ */
+type Handle<H extends string> = import("@endo/marshal").RemotableObject<H>;
+type Keyword = string;
+/**
+ * - an opaque handle for an invitation
+ */
+type InvitationHandle = Handle<"Invitation">;
+type IssuerKeywordRecord = Record<Keyword, Issuer<any>>;
+type IssuerPKeywordRecord = Record<Keyword, import("@endo/far").ERef<Issuer<any>>>;
+type BrandKeywordRecord = Record<Keyword, Brand<any>>;
+type StandardTerms = {
+    /**
+     * - record with
+     * keywords keys, issuer values
+     */
+    issuers: IssuerKeywordRecord;
+    /**
+     * - record with keywords
+     * keys, brand values
+     */
+    brands: BrandKeywordRecord;
+};
+type AnyTerms = StandardTerms & Record<string, any>;
+type InstanceRecord = {
+    installation: import("./zoeService/utils.js").Installation<any>;
+    instance: import("./zoeService/utils.js").Instance<any>;
+    /**
+     * - contract parameters
+     */
+    terms: AnyTerms;
+};
+type IssuerRecord<K extends AssetKind = globalThis.AssetKind, M extends import("@endo/patterns").Key = import("@endo/patterns").Key> = {
+    brand: Brand<K>;
+    issuer: Issuer<K, M>;
+    assetKind: K;
+    displayInfo?: globalThis.DisplayInfo<K> | undefined;
+};
+type Allocation = Record<Keyword, import("@agoric/ertp/src/types.js").AnyAmount>;
 //# sourceMappingURL=types-ambient.d.ts.map

package/src/types-ambient.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"types-ambient.d.ts","sourceRoot":"","sources":["types-ambient.js"],"names":[],"mappings":""}
+{"version":3,"file":"types-ambient.d.ts","sourceRoot":"","sources":["types-ambient.js"],"names":[],"mappings":";;;YAGsB,CAAC,SAAV,MAAQ,IACR,OAAO,eAAe,EAAE,eAAe,CAAC,CAAC,CAAC;eAI1C,MAAM;;;;wBACN,MAAM,CAAC,YAAY,CAAC;2BACpB,MAAM,CAAC,OAAO,EAAE,MAAM,CAAC,GAAG,CAAC,CAAC;4BAC5B,MAAM,CAAC,OAAO,EAAE,OAAO,WAAW,EAAE,IAAI,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,CAAC;0BACtD,MAAM,CAAC,OAAO,EAAE,KAAK,CAAC,GAAG,CAAC,CAAC;;;;;;aAK1B,mBAAmB;;;;;YAEnB,kBAAkB;;gBAGnB,aAAa,GAAG,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC;;kBAGlC,OAAO,uBAAuB,EAAE,YAAY,CAAC,GAAG,CAAC;cACjD,OAAO,uBAAuB,EAAE,QAAQ,CAAC,GAAG,CAAC;;;;WAC7C,QAAQ;;kBAII,CAAC,SAAb,SAAU,yBACqB,CAAC,SAAjC,OAAQ,gBAAgB,EAAE,GAAI;WAE7B,KAAK,CAAC,CAAC,CAAC;YACR,MAAM,CAAC,CAAC,EAAE,CAAC,CAAC;eACZ,CAAC;;;kBAKF,MAAM,CAAC,OAAO,EAAE,OAAO,2BAA2B,EAAE,SAAS,CAAC"}

package/src/types-ambient.js

@@ -1,5 +1,43 @@
-/** @file @deprecated */
+// @jessie-check
 
-console.error(
-  'NOTICE: src/types-ambient.js no longer provides types; use explicit imports or the top level `/exported.js`',
-);
+/**
+ * @template {string} H - the name of the handle
+ * @typedef {import('@endo/marshal').RemotableObject<H>} Handle Alias for RemotableObject
+ */
+
+/**
+ * @typedef {string} Keyword
+ * @typedef {Handle<'Invitation'>} InvitationHandle - an opaque handle for an invitation
+ * @typedef {Record<Keyword, Issuer<any>>} IssuerKeywordRecord
+ * @typedef {Record<Keyword, import('@endo/far').ERef<Issuer<any>>>} IssuerPKeywordRecord
+ * @typedef {Record<Keyword, Brand<any>>} BrandKeywordRecord
+ */
+
+/**
+ * @typedef {object} StandardTerms
+ * @property {IssuerKeywordRecord} issuers - record with
+ * keywords keys, issuer values
+ * @property {BrandKeywordRecord} brands - record with keywords
+ * keys, brand values
+ *
+ * @typedef {StandardTerms & Record<string, any>} AnyTerms
+ *
+ * @typedef {object} InstanceRecord
+ * @property {import('./zoeService/utils.js').Installation<any>} installation
+ * @property {import('./zoeService/utils.js').Instance<any>} instance
+ * @property {AnyTerms} terms - contract parameters
+ */
+
+/**
+ * @template {AssetKind} [K=AssetKind]
+ * @template {import('@endo/patterns').Key} [M=import('@endo/patterns').Key] member kind, for Amounts that have member values
+ * @typedef {object} IssuerRecord
+ * @property {Brand<K>} brand
+ * @property {Issuer<K, M>} issuer
+ * @property {K} assetKind
+ * @property {DisplayInfo<K>} [displayInfo]
+ */
+
+/**
+ * @typedef {Record<Keyword, import('@agoric/ertp/src/types.js').AnyAmount>} Allocation
+ */

package/src/zoeService/feeMint.d.ts

@@ -20,5 +20,4 @@ export function prepareFeeMint(zoeBaggage: import("@agoric/vat-data").Baggage, f
     };
     feeMintAccess: {};
 }>;
-import type { FeeIssuerConfig } from '@agoric/zoe';
 //# sourceMappingURL=feeMint.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"feeMint.d.ts","sourceRoot":"","sources":["feeMint.js"],"names":[],"mappings":";;;;;;;;;AA+BA;;;;GAIG;AACH,2CAJW,OAAO,kBAAkB,EAAE,OAAO,mBAClC,eAAe,kBACf,OAAO,sBAAsB,EAAE,mBAAmB;;;;;;;GA2D5D;qCA5E6C,aAAa"}
+{"version":3,"file":"feeMint.d.ts","sourceRoot":"","sources":["feeMint.js"],"names":[],"mappings":";;;;;;;;;AA2BA;;;;GAIG;AACH,2CAJW,OAAO,kBAAkB,EAAE,OAAO,mBAClC,eAAe,kBACf,OAAO,sBAAsB,EAAE,mBAAmB;;;;;;;GA2D5D"}

package/src/zoeService/feeMint.js

@@ -14,10 +14,6 @@ import {
 import { Fail, q } from '@endo/errors';
 import { FeeMintAccessShape } from '../typeGuards.js';
 
-/**
- * @import {FeeIssuerConfig, ZoeService} from '@agoric/zoe';
- */
-
 /** @deprecated Redundant. Just omit it. */
 const FEE_MINT_KIT = 'FeeMintKit';
 

package/src/zoeService/installationStorage.d.ts

@@ -1,6 +1,6 @@
 export function makeInstallationStorage(getBundleCapForID: GetBundleCapForID, zoeBaggage: Baggage): import("@endo/exo").Guarded<{
-    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>>;
     unwrapInstallation(installation: any): {
         bundleCap: any;
         bundleID: string;
@@ -15,5 +15,4 @@ export function makeInstallationStorage(getBundleCapForID: GetBundleCapForID, zo
     getBundleIDFromInstallation(allegedInstallation: any): Promise<string | undefined>;
 }>;
 import type { Baggage } from '@agoric/swingset-liveslots';
-import type { SourceBundle } from '@agoric/zoe';
 //# sourceMappingURL=installationStorage.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"installationStorage.d.ts","sourceRoot":"","sources":["installationStorage.js"],"names":[],"mappings":"AAwBO,2DAHI,iBAAiB,cACjB,OAAO;;;;;;;;;;;;;;;GA0IjB;6BAnJyB,4BAA4B;kCAIvB,aAAa"}
+{"version":3,"file":"installationStorage.d.ts","sourceRoot":"","sources":["installationStorage.js"],"names":[],"mappings":"AAwBO,2DAHI,iBAAiB,cACjB,OAAO;;;;;;;;;;;;;;;GA6IjB;6BArJyB,4BAA4B"}

package/src/zoeService/installationStorage.js

@@ -7,6 +7,7 @@ import {
 } from '@agoric/vat-data';
 import {
   InstallationShape,
+  InstanceHandleShape,
   UnwrappedInstallationShape,
 } from '../typeGuards.js';
 
@@ -15,7 +16,6 @@ import {
  * @import {LegacyWeakMap, WeakMapStore} from '@agoric/store';
  * @import {MapStore} from '@agoric/swingset-liveslots';
  * @import {BundleID, BundleCap} from '@agoric/swingset-vat';
- * @import {SourceBundle} from '@agoric/zoe';
  */
 
 /**
@@ -80,7 +80,10 @@ export const makeInstallationStorage = (getBundleCapForID, zoeBaggage) => {
 
   const InstallationStorageI = M.interface('InstallationStorage', {
     installBundle: M.call(
-      M.recordOf(M.string(), M.string({ stringLengthLimit: Infinity })),
+      M.or(
+        InstanceHandleShape,
+        M.recordOf(M.string(), M.string({ stringLengthLimit: Infinity })),
+      ),
     )
       .optional(M.string())
       .returns(M.promise()),

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

@@ -73,9 +73,9 @@ type ZoeStorageManager = {
     getBrands: GetBrands;
     getIssuers: GetIssuers;
     getTerms: import("./utils.js").GetTerms;
-    getOfferFilter: (instance: import("./utils.js").Instance<any>) => string[];
-    setOfferFilter: (instance: Instance, strings: string[]) => any;
-    getInstallationForInstance: (instance: import("./utils.js").Instance<any>) => Promise<Installation>;
+    getOfferFilter: GetOfferFilter;
+    setOfferFilter: SetOfferFilter;
+    getInstallationForInstance: GetInstallationForInstance;
     getInstanceAdmin: GetInstanceAdmin;
     unwrapInstallation: UnwrapInstallation;
     getProposalShapeForInvitation: (invitationHandle: InvitationHandle) => import("@endo/patterns").Pattern | undefined;
@@ -86,12 +86,4 @@ type ZoeStorageManager = {
  */
 type CreateZCFVat = (contractBundleCap: BundleCap, contractLabel: string) => Promise<import("@agoric/swingset-vat").CreateVatResults>;
 type GetFeeIssuerKit = (feeMintAccess: FeeMintAccess) => IssuerKit<"nat">;
-import type { FeeMintAccess } from './types.js';
-import type { GetBrands } from './types.js';
-import type { GetBundleIDFromInstallation } from './types.js';
-import type { GetIssuers } from './types.js';
-import type { InstallBundle } from './types.js';
-import type { InstallBundleID } from './types.js';
-import type { SourceBundle } from './types.js';
-import type { InstanceRecord } from './utils.js';
 //# sourceMappingURL=internal-types.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"internal-types.d.ts","sourceRoot":"","sources":["internal-types.js"],"names":[],"mappings":";;;4BAYW,MAAM,SACN,KAAK,KACH,IAAI,CAAC,IAAI,CAAC;;;;;;;;kCAWZ,MAAM,SACN,KAAK,KACH,KAAK;;;;;;;kCAUP,cAAc,YACd,qBAAqB,KACnB,OAAO,CAAC,UAAU,CAAC;oCAKrB,QAAQ,iBACR,aAAa,KACX,IAAI;mCAKN,QAAQ,KACN,aAAa;sCAKf,QAAQ,KACN,IAAI;;;;;0CASN,IAAI,CAAC,YAAY,CAAC,KAChB,IAAI,CAAC;IACb,MAAM,CAAC,EAAE,YAAY,CAAC;IACtB,SAAS,CAAC,EAAE,SAAS,CAAC;IACtB,QAAQ,CAAC,EAAE,QAAQ,CAAC;IACpB,YAAY,EAAC,YAAY,CAAA;CAC1B,CAAC;8BAMQ,aAAa;;cAKZ,MAAM,QAAQ;gBACd,MAAM,mBAAmB;eACzB,MAAM,kBAAkB;gBACxB,GAAG,CAAC,YAAY,CAAC;iBACjB,WAAW;qBACX,eAAe;uBACf,MAAM,cAAc;sBACpB,gBAAgB;uBAChB,iBAAiB;yBACjB,mBAAmB;oBACnB,8BAA8B;yBAC9B,MAAM,MAAM;;;;aACZ,MAAM,MAAM;;;;kBACZ,MAAM,OAAO,sBAAsB,EAAE,aAAa;;;;;;;;oDAUrD,YAAY,eACZ,MAAM,8BACN,mBAAmB,YACnB,QAAQ,qBACR,SAAS,iBACT,MAAM,KACJ,OAAO,CAAC,yBAAyB,CAAC;8BAKpC,QAAQ,KACN,OAAO,CAAC,SAAS,CAAC;;mCAKjB,6BAA6B;yBAC7B,mBAAmB;qBACnB,eAAe;sBACf,MAAM,CAAC,KAAK,CAAC;mBACb,aAAa;qBACb,eAAe;iCACf,2BAA2B;oBAC3B,OAAO,YAAY,EAAE,cAAc;eACnC,SAAS;gBACT,UAAU;cACV,OAAO,YAAY,EAAE,QAAQ;oBAC7B,CAAC,QAAQ,EAAE,OAAO,YAAY,EAAE,QAAQ,CAAC,GAAG,CAAC,KAAK,MAAM,EAAE;oBAC1D,CAAC,QAAQ,EAAE,QAAQ,EAAE,OAAO,EAAE,MAAM,EAAE,KAAK,GAAG;gCAC9C,CAAC,QAAQ,EAAE,OAAO,YAAY,EAAE,QAAQ,CAAC,GAAG,CAAC,KAAK,OAAO,CAAC,YAAY,CAAC;sBACvE,gBAAgB;wBAChB,kBAAkB;mCAClB,CAAC,gBAAgB,EAAE,gBAAgB,KAAK,OAAO,gBAAgB,EAAE,OAAO,GAAG,SAAS;;;;;;wCAQvF,SAAS,iBACT,MAAM,KACJ,OAAO,CAAC,OAAO,sBAAsB,EAAE,gBAAgB,CAAC;uCAK1D,aAAa,KACX,SAAS,CAAC,KAAK,CAAC;mCAxJqG,YAAY;+BAAZ,YAAY;iDAAZ,YAAY;gCAAZ,YAAY;mCAAZ,YAAY;qCAAZ,YAAY;kCAAZ,YAAY;oCAC7G,YAAY"}
+{"version":3,"file":"internal-types.d.ts","sourceRoot":"","sources":["internal-types.js"],"names":[],"mappings":";;;4BAMW,MAAM,SACN,KAAK,KACH,IAAI,CAAC,IAAI,CAAC;;;;;;;;kCAWZ,MAAM,SACN,KAAK,KACH,KAAK;;;;;;;kCAUP,cAAc,YACd,qBAAqB,KACnB,OAAO,CAAC,UAAU,CAAC;oCAKrB,QAAQ,iBACR,aAAa,KACX,IAAI;mCAKN,QAAQ,KACN,aAAa;sCAKf,QAAQ,KACN,IAAI;;;;;0CASN,IAAI,CAAC,YAAY,CAAC,KAChB,IAAI,CAAC;IACb,MAAM,CAAC,EAAE,YAAY,CAAC;IACtB,SAAS,CAAC,EAAE,SAAS,CAAC;IACtB,QAAQ,CAAC,EAAE,QAAQ,CAAC;IACpB,YAAY,EAAC,YAAY,CAAA;CAC1B,CAAC;8BAMQ,aAAa;;cAKZ,MAAM,QAAQ;gBACd,MAAM,mBAAmB;eACzB,MAAM,kBAAkB;gBACxB,GAAG,CAAC,YAAY,CAAC;iBACjB,WAAW;qBACX,eAAe;uBACf,MAAM,cAAc;sBACpB,gBAAgB;uBAChB,iBAAiB;yBACjB,mBAAmB;oBACnB,8BAA8B;yBAC9B,MAAM,MAAM;;;;aACZ,MAAM,MAAM;;;;kBACZ,MAAM,OAAO,sBAAsB,EAAE,aAAa;;;;;;;;oDAUrD,YAAY,eACZ,MAAM,8BACN,mBAAmB,YACnB,QAAQ,qBACR,SAAS,iBACT,MAAM,KACJ,OAAO,CAAC,yBAAyB,CAAC;8BAKpC,QAAQ,KACN,OAAO,CAAC,SAAS,CAAC;;mCAKjB,6BAA6B;yBAC7B,mBAAmB;qBACnB,eAAe;sBACf,MAAM,CAAC,KAAK,CAAC;mBACb,aAAa;qBACb,eAAe;iCACf,2BAA2B;oBAC3B,OAAO,YAAY,EAAE,cAAc;eACnC,SAAS;gBACT,UAAU;cACV,OAAO,YAAY,EAAE,QAAQ;oBAC7B,cAAc;oBACd,cAAc;gCACd,0BAA0B;sBAC1B,gBAAgB;wBAChB,kBAAkB;mCAClB,CAAC,gBAAgB,EAAE,gBAAgB,KAAK,OAAO,gBAAgB,EAAE,OAAO,GAAG,SAAS;;;;;;wCAQvF,SAAS,iBACT,MAAM,KACJ,OAAO,CAAC,OAAO,sBAAsB,EAAE,gBAAgB,CAAC;uCAK1D,aAAa,KACX,SAAS,CAAC,KAAK,CAAC"}

package/src/zoeService/internal-types.js

@@ -1,10 +1,4 @@
 // @jessie-check
-/// <reference types="@agoric/zoe/exported" />
-
-/**
- * @import {FeeMintAccess, GetBrands, GetBundleIDFromInstallation, GetIssuers, InstallBundle, InstallBundleID, SourceBundle} from './types.js';
- * @import {InstanceRecord} from './utils.js';
- */
 
 /**
  * Create a purse for a new issuer
@@ -133,9 +127,9 @@
  * @property {GetBrands} getBrands
  * @property {GetIssuers} getIssuers
  * @property {import('./utils.js').GetTerms} getTerms
- * @property {(instance: import('./utils.js').Instance<any>) => string[]} getOfferFilter
- * @property {(instance: Instance, strings: string[]) => any} setOfferFilter
- * @property {(instance: import('./utils.js').Instance<any>) => Promise<Installation>} getInstallationForInstance
+ * @property {GetOfferFilter} getOfferFilter
+ * @property {SetOfferFilter} setOfferFilter
+ * @property {GetInstallationForInstance} getInstallationForInstance
  * @property {GetInstanceAdmin} getInstanceAdmin
  * @property {UnwrapInstallation} unwrapInstallation
  * @property {(invitationHandle: InvitationHandle) => import('@endo/patterns').Pattern | undefined} getProposalShapeForInvitation

package/src/zoeService/invitationQueries.d.ts

@@ -1,6 +1,6 @@
 export function makeInvitationQueryFns(invitationIssuer: any): {
-    getInstance: import("./types.ts").GetInstance;
-    getInstallation: import("./types.ts").GetInstallation;
-    getInvitationDetails: import("./types.ts").GetInvitationDetails;
+    getInstance: GetInstance;
+    getInstallation: GetInstallation;
+    getInvitationDetails: GetInvitationDetails;
 };
 //# sourceMappingURL=invitationQueries.d.ts.map

package/src/zoeService/invitationQueries.js

@@ -4,7 +4,7 @@ import { X, Fail, q, makeError, annotateError } from '@endo/errors';
 import { E } from '@endo/eventual-send';
 
 export const makeInvitationQueryFns = invitationIssuer => {
-  /** @type {import('./types.ts').GetInvitationDetails} */
+  /** @type {GetInvitationDetails} */
   const getInvitationDetails = async invitationP => {
     const onRejected = reason => {
       const err = makeError(
@@ -21,11 +21,11 @@ export const makeInvitationQueryFns = invitationIssuer => {
     return invAmount.value[0];
   };
 
-  /** @type {import('./types.ts').GetInstance} */
+  /** @type {GetInstance} */
   const getInstance = invitation =>
     E.get(getInvitationDetails(invitation)).instance;
 
-  /** @type {import('./types.ts').GetInstallation} */
+  /** @type {GetInstallation} */
   const getInstallation = invitation =>
     E.get(getInvitationDetails(invitation)).installation;