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

package/src/typeGuards.js

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

package/src/types-ambient.d.ts

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

package/src/types-ambient.js

@@ -1,43 +1,5 @@
-// @jessie-check
+/** @file @deprecated */
 
-/**
- * @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
- */
+console.error(
+  'NOTICE: src/types-ambient.js no longer provides types; use explicit imports or the top level `/exported.js`',
+);

package/src/types-index.d.ts

@@ -0,0 +1,4 @@
+// Export all the types this package provides
+export type * from './contractFacet/types.js';
+export type * from './zoeService/types.js';
+export type * from './types.js';

package/src/types-index.js

@@ -0,0 +1,2 @@
+// Empty JS file to correspond with its .d.ts twin
+export {};

package/src/types.d.ts

@@ -0,0 +1,29 @@
+import type { Issuer, Brand } from '@agoric/ertp';
+import type { RemotableObject } from '@endo/pass-style';
+/**
+ * Alias for RemotableObject
+ */
+export type Handle<H extends string> = RemotableObject<H>;
+/** Must start with a capital letter. */
+export type Keyword = string;
+/**
+ * - an opaque handle for an invitation
+ */
+export type InvitationHandle = Handle<'Invitation'>;
+export type IssuerKeywordRecord = Record<Keyword, Issuer<any>>;
+export type IssuerPKeywordRecord = Record<Keyword, import('@endo/far').ERef<Issuer<any>>>;
+export type BrandKeywordRecord = Record<Keyword, Brand<any>>;
+export type StandardTerms = {
+    /**
+     * - record with
+     * keywords keys, issuer values
+     */
+    issuers: IssuerKeywordRecord;
+    /**
+     * - record with keywords
+     * keys, brand values
+     */
+    brands: BrandKeywordRecord;
+};
+export type AnyTerms = StandardTerms & Record<string, any>;
+//# sourceMappingURL=types.d.ts.map

package/src/types.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["types.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EACV,MAAM,EACN,KAAK,EAIN,MAAM,cAAc,CAAC;AACtB,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,kBAAkB,CAAC;AAGxD;;GAEG;AACH,MAAM,MAAM,MAAM,CAAC,CAAC,SAAS,MAAM,IAAI,eAAe,CAAC,CAAC,CAAC,CAAC;AAK1D,wCAAwC;AACxC,MAAM,MAAM,OAAO,GAAG,MAAM,CAAC;AAE7B;;GAEG;AACH,MAAM,MAAM,gBAAgB,GAAG,MAAM,CAAC,YAAY,CAAC,CAAC;AACpD,MAAM,MAAM,mBAAmB,GAAG,MAAM,CAAC,OAAO,EAAE,MAAM,CAAC,GAAG,CAAC,CAAC,CAAC;AAC/D,MAAM,MAAM,oBAAoB,GAAG,MAAM,CACvC,OAAO,EACP,OAAO,WAAW,EAAE,IAAI,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,CACtC,CAAC;AACF,MAAM,MAAM,kBAAkB,GAAG,MAAM,CAAC,OAAO,EAAE,KAAK,CAAC,GAAG,CAAC,CAAC,CAAC;AAC7D,MAAM,MAAM,aAAa,GAAG;IAC1B;;;OAGG;IACH,OAAO,EAAE,mBAAmB,CAAC;IAC7B;;;OAGG;IACH,MAAM,EAAE,kBAAkB,CAAC;CAC5B,CAAC;AACF,MAAM,MAAM,QAAQ,GAAG,aAAa,GAAG,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,CAAC"}

package/src/types.ts

@@ -0,0 +1,44 @@
+import type {
+  Issuer,
+  Brand,
+  AssetKind,
+  DisplayInfo,
+  AnyAmount,
+} from '@agoric/ertp';
+import type { RemotableObject } from '@endo/pass-style';
+import type { Key } from '@endo/patterns';
+
+/**
+ * Alias for RemotableObject
+ */
+export type Handle<H extends string> = RemotableObject<H>;
+
+// Typing this as Capitalize<string> would be more accurate but requires
+// frequent casting. Revisit once .ts syntax is more common. Even then,
+// may not be worth the effort since Zoe 2 probably will not have keywords.
+/** Must start with a capital letter. */
+export type Keyword = string;
+
+/**
+ * - an opaque handle for an invitation
+ */
+export type InvitationHandle = Handle<'Invitation'>;
+export type IssuerKeywordRecord = Record<Keyword, Issuer<any>>;
+export type IssuerPKeywordRecord = Record<
+  Keyword,
+  import('@endo/far').ERef<Issuer<any>>
+>;
+export type BrandKeywordRecord = Record<Keyword, Brand<any>>;
+export type StandardTerms = {
+  /**
+   * - record with
+   * keywords keys, issuer values
+   */
+  issuers: IssuerKeywordRecord;
+  /**
+   * - record with keywords
+   * keys, brand values
+   */
+  brands: BrandKeywordRecord;
+};
+export type AnyTerms = StandardTerms & Record<string, any>;

package/src/zoeService/feeMint.d.ts

@@ -20,4 +20,5 @@ 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":";;;;;;;;;AA2BA;;;;GAIG;AACH,2CAJW,OAAO,kBAAkB,EAAE,OAAO,mBAClC,eAAe,kBACf,OAAO,sBAAsB,EAAE,mBAAmB;;;;;;;GA2D5D"}
+{"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"}

package/src/zoeService/feeMint.js

@@ -14,6 +14,10 @@ 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<Installation<any>>;
-    installBundleID(bundleID: any, bundleLabel?: any): Promise<Installation<unknown>>;
+    installBundle(allegedBundle: any, bundleLabel: any): Promise<globalThis.Installation>;
+    installBundleID(bundleID: any, bundleLabel?: any): Promise<globalThis.Installation<unknown>>;
     unwrapInstallation(installation: any): {
         bundleCap: any;
         bundleID: string;
@@ -15,4 +15,5 @@ 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;;;;;;;;;;;;;;;GA6IjB;6BArJyB,4BAA4B"}
+{"version":3,"file":"installationStorage.d.ts","sourceRoot":"","sources":["installationStorage.js"],"names":[],"mappings":"AAwBO,2DAHI,iBAAiB,cACjB,OAAO;;;;;;;;;;;;;;;GA0IjB;6BAnJyB,4BAA4B;kCAIvB,aAAa"}

package/src/zoeService/installationStorage.js

@@ -7,7 +7,6 @@ import {
 } from '@agoric/vat-data';
 import {
   InstallationShape,
-  InstanceHandleShape,
   UnwrappedInstallationShape,
 } from '../typeGuards.js';
 
@@ -16,6 +15,7 @@ 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,10 +80,7 @@ export const makeInstallationStorage = (getBundleCapForID, zoeBaggage) => {
 
   const InstallationStorageI = M.interface('InstallationStorage', {
     installBundle: M.call(
-      M.or(
-        InstanceHandleShape,
-        M.recordOf(M.string(), M.string({ stringLengthLimit: Infinity })),
-      ),
+      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: GetOfferFilter;
-    setOfferFilter: SetOfferFilter;
-    getInstallationForInstance: GetInstallationForInstance;
+    getOfferFilter: (instance: import("./utils.js").Instance<any>) => string[];
+    setOfferFilter: (instance: Instance, strings: string[]) => any;
+    getInstallationForInstance: (instance: import("./utils.js").Instance<any>) => Promise<Installation>;
     getInstanceAdmin: GetInstanceAdmin;
     unwrapInstallation: UnwrapInstallation;
     getProposalShapeForInvitation: (invitationHandle: InvitationHandle) => import("@endo/patterns").Pattern | undefined;
@@ -86,4 +86,12 @@ 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":";;;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"}
+{"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"}

package/src/zoeService/internal-types.js

@@ -1,4 +1,10 @@
 // @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
@@ -127,9 +133,9 @@
  * @property {GetBrands} getBrands
  * @property {GetIssuers} getIssuers
  * @property {import('./utils.js').GetTerms} getTerms
- * @property {GetOfferFilter} getOfferFilter
- * @property {SetOfferFilter} setOfferFilter
- * @property {GetInstallationForInstance} getInstallationForInstance
+ * @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 {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: GetInstance;
-    getInstallation: GetInstallation;
-    getInvitationDetails: GetInvitationDetails;
+    getInstance: import("./types.ts").GetInstance;
+    getInstallation: import("./types.ts").GetInstallation;
+    getInvitationDetails: import("./types.ts").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 {GetInvitationDetails} */
+  /** @type {import('./types.ts').GetInvitationDetails} */
   const getInvitationDetails = async invitationP => {
     const onRejected = reason => {
       const err = makeError(
@@ -21,11 +21,11 @@ export const makeInvitationQueryFns = invitationIssuer => {
     return invAmount.value[0];
   };
 
-  /** @type {GetInstance} */
+  /** @type {import('./types.ts').GetInstance} */
   const getInstance = invitation =>
     E.get(getInvitationDetails(invitation)).instance;
 
-  /** @type {GetInstallation} */
+  /** @type {import('./types.ts').GetInstallation} */
   const getInstallation = invitation =>
     E.get(getInvitationDetails(invitation)).installation;
 

package/src/zoeService/makeInvitation.d.ts

@@ -2,4 +2,5 @@ export function prepareInvitationKit(baggage: import("@agoric/vat-data").Baggage
     invitationIssuer: globalThis.Issuer<"set", InvitationDetails>;
     invitationKit: globalThis.IssuerKit<"set", InvitationDetails>;
 };
+import type { InvitationDetails } from '@agoric/zoe';
 //# sourceMappingURL=makeInvitation.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"makeInvitation.d.ts","sourceRoot":"","sources":["makeInvitation.js"],"names":[],"mappings":"AAgBO,8CAHI,OAAO,kBAAkB,EAAE,OAAO,mBAClC,OAAO,sBAAsB,EAAE,mBAAmB,GAAG,SAAS;;;EA+BxE"}
+{"version":3,"file":"makeInvitation.d.ts","sourceRoot":"","sources":["makeInvitation.js"],"names":[],"mappings":"AAmBO,8CAHI,OAAO,kBAAkB,EAAE,OAAO,mBAClC,OAAO,sBAAsB,EAAE,mBAAmB,GAAG,SAAS;;;EA+BxE;uCAzCoD,aAAa"}

package/src/zoeService/makeInvitation.js

@@ -4,6 +4,9 @@ import { Fail, q } from '@endo/errors';
 import { provideDurableMapStore } from '@agoric/vat-data';
 import { AssetKind, hasIssuer, prepareIssuerKit } from '@agoric/ertp';
 import { InvitationElementShape } from '../typeGuards.js';
+/**
+ * @import {FeeIssuerConfig, InvitationDetails} from '@agoric/zoe';
+ */
 
 /**
  * Not deprecated because the first use below is still correct.

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

@@ -1,2 +1,3 @@
 export function makeOfferMethod(offerDataAccess: any): Offer;
+import type { Offer } from '@agoric/zoe';
 //# sourceMappingURL=offer.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"offer.d.ts","sourceRoot":"","sources":["offer.js"],"names":[],"mappings":"AAaO,6DA0DN"}
+{"version":3,"file":"offer.d.ts","sourceRoot":"","sources":["offer.js"],"names":[],"mappings":"AAeO,6DA0DN;2BA7DuB,aAAa"}

package/src/zoeService/offer/offer.js

@@ -9,7 +9,9 @@ import { cleanProposal } from '../../cleanProposal.js';
 import { burnInvitation } from './burnInvitation.js';
 import { makeInvitationQueryFns } from '../invitationQueries.js';
 
-import '../internal-types.js';
+/**
+ * @import {Offer} from '@agoric/zoe';
+ */
 
 export const makeOfferMethod = offerDataAccess => {
   /** @type {Offer} */

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

@@ -1 +1 @@
-{"version":3,"file":"originalZoeSeat.d.ts","sourceRoot":"","sources":["originalZoeSeat.js"],"names":[],"mappings":";;;;;;;;;;AA6BA;;;;;;;;;;GAGG;;;;;;;;;;;;AA+CI,oDAHI,OAAO,kBAAkB,EAAE,OAAO,yBAClC,MAAM,UAAU,CAAC,GAAG,CAAC,QAoR/B"}
+{"version":3,"file":"originalZoeSeat.d.ts","sourceRoot":"","sources":["originalZoeSeat.js"],"names":[],"mappings":";;;;;;;;;;AA4BA;;;;;;;;;;GAGG;;;;;;;;;;;;AA+CI,oDAHI,OAAO,kBAAkB,EAAE,OAAO,yBAClC,MAAM,UAAU,CAAC,GAAG,CAAC,QAoR/B"}

package/src/zoeService/originalZoeSeat.js

@@ -7,7 +7,6 @@ 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 {
   AmountKeywordRecordShape,

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

@@ -1 +1 @@
-{"version":3,"file":"startInstance.d.ts","sourceRoot":"","sources":["startInstance.js"],"names":[],"mappings":"AAoCO,uDANI,IAAI,CAAC,iBAAiB,EAAE,+BAA+B,GAAG,oBAAoB,CAAC,oBAC/E,MAAM,IAAI,CAAC,SAAS,CAAC,uBACrB,CAAC,EAAE,EAAE,MAAM,KAAK,SAAS,cACzB,OAAO,GACL,OAAO,YAAY,EAAE,aAAa,CAqW9C;+BA7WgD,sBAAsB;6BAF7C,kBAAkB"}
+{"version":3,"file":"startInstance.d.ts","sourceRoot":"","sources":["startInstance.js"],"names":[],"mappings":"AAkCO,uDANI,IAAI,CAAC,iBAAiB,EAAE,+BAA+B,GAAG,oBAAoB,CAAC,oBAC/E,MAAM,IAAI,CAAC,SAAS,CAAC,uBACrB,CAAC,EAAE,EAAE,MAAM,KAAK,SAAS,cACzB,OAAO,GACL,OAAO,YAAY,EAAE,aAAa,CAqW9C;+BA7WgD,sBAAsB;6BAF7C,kBAAkB"}

package/src/zoeService/startInstance.js

@@ -19,8 +19,6 @@ import {
   InstanceAdminShape,
 } from '../typeGuards.js';
 
-// import '../internal-types.js';
-
 /**
  * @import {Baggage} from '@agoric/vat-data';
  * @import {LegacyWeakMap, WeakMapStore} from '@agoric/store';