@agoric/zoe 0.26.3-dev-727e4af.0 → 0.26.3-dev-96c9ff5.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@agoric/zoe",
-  "version": "0.26.3-dev-727e4af.0+727e4af",
+  "version": "0.26.3-dev-96c9ff5.0+96c9ff5",
   "description": "Zoe: the Smart Contract Framework for Offer Enforcement",
   "type": "module",
   "main": "./src/zoeService/zoe.js",
@@ -43,33 +43,33 @@
   },
   "homepage": "https://github.com/Agoric/agoric-sdk#readme",
   "dependencies": {
-    "@agoric/assert": "0.6.1-dev-727e4af.0+727e4af",
-    "@agoric/base-zone": "0.1.1-dev-727e4af.0+727e4af",
-    "@agoric/ertp": "0.16.3-dev-727e4af.0+727e4af",
-    "@agoric/internal": "0.3.3-dev-727e4af.0+727e4af",
-    "@agoric/notifier": "0.6.3-dev-727e4af.0+727e4af",
-    "@agoric/store": "0.9.3-dev-727e4af.0+727e4af",
-    "@agoric/swingset-liveslots": "0.10.3-dev-727e4af.0+727e4af",
-    "@agoric/swingset-vat": "0.32.3-dev-727e4af.0+727e4af",
-    "@agoric/time": "0.3.3-dev-727e4af.0+727e4af",
-    "@agoric/vat-data": "0.5.3-dev-727e4af.0+727e4af",
-    "@agoric/zone": "0.2.3-dev-727e4af.0+727e4af",
-    "@endo/bundle-source": "^3.2.2",
-    "@endo/captp": "^4.1.1",
-    "@endo/common": "^1.2.1",
-    "@endo/eventual-send": "^1.2.1",
-    "@endo/exo": "^1.4.0",
-    "@endo/far": "^1.1.1",
-    "@endo/import-bundle": "^1.1.1",
-    "@endo/marshal": "^1.4.1",
-    "@endo/nat": "^5.0.6",
-    "@endo/patterns": "^1.3.1",
-    "@endo/promise-kit": "^1.1.1",
+    "@agoric/assert": "0.6.1-dev-96c9ff5.0+96c9ff5",
+    "@agoric/base-zone": "0.1.1-dev-96c9ff5.0+96c9ff5",
+    "@agoric/ertp": "0.16.3-dev-96c9ff5.0+96c9ff5",
+    "@agoric/internal": "0.3.3-dev-96c9ff5.0+96c9ff5",
+    "@agoric/notifier": "0.6.3-dev-96c9ff5.0+96c9ff5",
+    "@agoric/store": "0.9.3-dev-96c9ff5.0+96c9ff5",
+    "@agoric/swingset-liveslots": "0.10.3-dev-96c9ff5.0+96c9ff5",
+    "@agoric/swingset-vat": "0.32.3-dev-96c9ff5.0+96c9ff5",
+    "@agoric/time": "0.3.3-dev-96c9ff5.0+96c9ff5",
+    "@agoric/vat-data": "0.5.3-dev-96c9ff5.0+96c9ff5",
+    "@agoric/zone": "0.2.3-dev-96c9ff5.0+96c9ff5",
+    "@endo/bundle-source": "^3.2.3",
+    "@endo/captp": "^4.2.0",
+    "@endo/common": "^1.2.2",
+    "@endo/eventual-send": "^1.2.2",
+    "@endo/exo": "^1.5.0",
+    "@endo/far": "^1.1.2",
+    "@endo/import-bundle": "^1.1.2",
+    "@endo/marshal": "^1.5.0",
+    "@endo/nat": "^5.0.7",
+    "@endo/patterns": "^1.4.0",
+    "@endo/promise-kit": "^1.1.2",
     "yargs-parser": "^21.1.1"
   },
   "devDependencies": {
-    "@agoric/kmarshal": "0.1.1-dev-727e4af.0+727e4af",
-    "@endo/init": "^1.1.1",
+    "@agoric/kmarshal": "0.1.1-dev-96c9ff5.0+96c9ff5",
+    "@endo/init": "^1.1.2",
     "ava": "^5.3.0",
     "c8": "^9.1.0",
     "import-meta-resolve": "^2.2.1",
@@ -139,7 +139,7 @@
     "access": "public"
   },
   "typeCoverage": {
-    "atLeast": 84.9
+    "atLeast": 84.91
   },
-  "gitHead": "727e4af514a8e92f400dd1671a788c5d3cbe1b8a"
+  "gitHead": "96c9ff577fe14cebeb5a38543ba7f8598ffcd0c7"
 }

package/src/cleanProposal.d.ts

@@ -4,6 +4,6 @@ export function cleanKeywords(uncleanKeywordRecord: {
     [name: string]: any;
 }): string[];
 export function coerceAmountPatternKeywordRecord(allegedAmountKeywordRecord: any, getAssetKindByBrand: any): Record<string | number | symbol, any>;
-export function coerceAmountKeywordRecord(allegedAmountKeywordRecord: any, getAssetKindByBrand: any): Record<string | number | symbol, any>;
+export function coerceAmountKeywordRecord(allegedAmountKeywordRecord: unknown, getAssetKindByBrand: any): AmountKeywordRecord;
 export function cleanProposal(proposal: Proposal, getAssetKindByBrand: GetAssetKindByBrand): ProposalRecord;
 //# sourceMappingURL=cleanProposal.d.ts.map

package/src/cleanProposal.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"cleanProposal.d.ts","sourceRoot":"","sources":["cleanProposal.js"],"names":[],"mappings":"AAWA,qCAAsC;AAa/B,sDAYN;AAMM,oDAHI;IAAC,CAAC,IAAI,EAAE,MAAM,GAAG,GAAG,CAAA;CAAC,GACnB,MAAM,EAAE,CAYpB;AAEM,mJAqBN;AAEM,4IAUN;AA4CM,wCAJI,QAAQ,uBACR,mBAAmB,GACjB,cAAc,CA6B1B"}
+{"version":3,"file":"cleanProposal.d.ts","sourceRoot":"","sources":["cleanProposal.js"],"names":[],"mappings":"AAWA,qCAAsC;AAa/B,sDAYN;AAMM,oDAHI;IAAC,CAAC,IAAI,EAAE,MAAM,GAAG,GAAG,CAAA;CAAC,GACnB,MAAM,EAAE,CAYpB;AAEM,mJAsBN;AAQM,sEAJI,OAAO,6BAEL,mBAAmB,CAa/B;AA4CM,wCAJI,QAAQ,uBACR,mBAAmB,GACjB,cAAc,CA6B1B"}

package/src/cleanProposal.js

@@ -57,6 +57,7 @@ export const coerceAmountPatternKeywordRecord = (
   getAssetKindByBrand,
 ) => {
   cleanKeywords(allegedAmountKeywordRecord);
+  // FIXME objectMap should constrain the mapping function by the record's type
   return objectMap(allegedAmountKeywordRecord, amount => {
     // Check that each value can be coerced using the AmountMath
     // indicated by brand. `AmountMath.coerce` throws if coercion fails.
@@ -75,6 +76,12 @@ export const coerceAmountPatternKeywordRecord = (
   });
 };
 
+/**
+ *
+ * @param {unknown} allegedAmountKeywordRecord
+ * @param {*} getAssetKindByBrand
+ * @returns {AmountKeywordRecord}
+ */
 export const coerceAmountKeywordRecord = (
   allegedAmountKeywordRecord,
   getAssetKindByBrand,
@@ -84,6 +91,7 @@ export const coerceAmountKeywordRecord = (
     getAssetKindByBrand,
   );
   assertKey(result);
+  // @ts-expect-error checked cast
   return result;
 };
 

package/src/contractFacet/offerHandlerStorage.d.ts

@@ -1,5 +1,8 @@
 export function makeOfferHandlerStorage(zcfBaggage: any): {
-    storeOfferHandler: (offerHandler: OfferHandler) => InvitationHandle;
+    storeOfferHandler: (offerHandler: any) => Handle<"Invitation">;
     takeOfferHandler: (invitationHandle: InvitationHandle, details?: Details) => OfferHandler;
 };
+export type PassableOfferHandler = RemotableBrand<any, any> & RemotableObject & OfferHandler<unknown, never>;
+import type { RemotableBrand } from '@endo/eventual-send';
+import type { RemotableObject } from '@endo/pass-style';
 //# sourceMappingURL=offerHandlerStorage.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"offerHandlerStorage.d.ts","sourceRoot":"","sources":["offerHandlerStorage.js"],"names":[],"mappings":"AAQO;sCAkBqB,YAAY,KAAK,gBAAgB;yCAe9B,gBAAgB,YAAY,OAAO,KAAK,YAAY;EAsBlF"}
+{"version":3,"file":"offerHandlerStorage.d.ts","sourceRoot":"","sources":["offerHandlerStorage.js"],"names":[],"mappings":"AAiBO;;yCAgCwB,gBAAgB,YAAY,OAAO,KAAK,YAAY;EAsBlF;;oCA9DgC,qBAAqB;qCACpB,kBAAkB"}

package/src/contractFacet/offerHandlerStorage.js

@@ -6,9 +6,18 @@ import { canBeDurable, provideDurableWeakMapStore } from '@agoric/vat-data';
 
 import { defineDurableHandle } from '../makeHandle.js';
 
+/**
+ * @import {RemotableBrand} from '@endo/eventual-send';
+ * @import {RemotableObject} from '@endo/pass-style';
+ */
+
+/**
+ * @typedef {RemotableBrand & RemotableObject & OfferHandler} PassableOfferHandler
+ */
+
 export const makeOfferHandlerStorage = zcfBaggage => {
   const makeInvitationHandle = defineDurableHandle(zcfBaggage, 'Invitation');
-  /** @type {WeakMapStore<InvitationHandle, OfferHandler>} */
+  /** @type {WeakMapStore<InvitationHandle, PassableOfferHandler>} */
 
   // ZCF needs to ephemerally hold on to ephemeral handlers, and durably hold
   // onto handlers that are intended to be durable. We keep two stores and store
@@ -18,13 +27,12 @@ export const makeOfferHandlerStorage = zcfBaggage => {
   const invitationHandleToEphemeralHandler = makeScalarWeakMapStore(
     'invitationHandleToEphemeralHandler',
   );
-  /** @type {WeakMapStore<InvitationHandle, OfferHandler>} */
+  /** @type {WeakMapStore<InvitationHandle, PassableOfferHandler>} */
   const invitationHandleToDurableHandler = provideDurableWeakMapStore(
     zcfBaggage,
     'invitationHandleToDurableHandler',
   );
 
-  /** @type {(offerHandler: OfferHandler) => InvitationHandle} */
   const storeOfferHandler = offerHandler => {
     if (typeof offerHandler === 'function') {
       offerHandler = ToFarFunction('offerHandler', offerHandler);

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

@@ -6,6 +6,8 @@ type IssuerOptionsRecord = import('@agoric/ertp').IssuerOptionsRecord;
 type Completion = any;
 type ZCFMakeEmptySeatKit = (exit?: ExitRule | undefined) => ZcfSeatKit;
 
+type InvitationAmount = Amount<'set', InvitationDetails>;
+
 /**
  * Zoe Contract Facet
  *
@@ -38,10 +40,10 @@ type ZCF<CT extends unknown = Record<string, unknown>> = {
    * @returns the AmountMath and brand synchronously accessible after
    * saving
    */
-  saveIssuer: (
-    issuerP: ERef<Issuer>,
+  saveIssuer: <I extends Issuer>(
+    issuerP: ERef<I>,
     keyword: Keyword,
-  ) => Promise<IssuerRecord<any>>;
+  ) => Promise<I extends Issuer<infer K, infer M> ? IssuerRecord<K, M> : never>;
 
   /**
    * Make a credible Zoe invitation for a particular smart contract
@@ -162,7 +164,7 @@ type ZCFMint<K extends AssetKind = AssetKind> = {
  * normally an instanceof Error.
  */
 type ZCFSeatFail = (reason: unknown) => Error;
-type ZCFSeat = {
+type ZCFSeat = import('@endo/pass-style').RemotableObject & {
   exit: (completion?: Completion) => void;
   fail: ZCFSeatFail;
   getSubscriber: () => Promise<Subscriber<Allocation>>;
@@ -243,7 +245,10 @@ type AdminFacet = import('../zoeService/utils').AdminFacet<any>;
 
 declare const OfferReturn: unique symbol;
 declare const OfferArgs: unique symbol;
-type Invitation<R = unknown, A = undefined> = Payment<'set'> & {
+type Invitation<R = unknown, A = undefined> = Payment<
+  'set',
+  InvitationDetails
+> & {
   // because TS is structural, without this the generic is ignored
   [OfferReturn]?: R;
   [OfferArgs]?: A;

package/src/contractFacet/vatRoot.d.ts

@@ -10,5 +10,5 @@ export function buildRootObject(powers: TerminationVatPowers & {
     zoeService: ZoeService;
     invitationIssuer: Issuer<"set">;
     privateArgs?: any;
-}, baggage: import("@agoric/vat-data").Baggage): Promise<import("@endo/eventual-send").RemotableBrand<{}, {}>>;
+}, baggage: import("@agoric/vat-data").Baggage): Promise<import("@endo/marshal").RemotableObject<`Alleged: ${string}`> & import("@endo/eventual-send").RemotableBrand<{}, {}>>;
 //# sourceMappingURL=vatRoot.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"vatRoot.d.ts","sourceRoot":"","sources":["vatRoot.js"],"names":[],"mappings":"AAkBA;;;;GAIG;AACH;mBAJwC,aAAa;;;gBACC,UAAU;sBAAoB,MAAM,CAAC,KAAK,CAAC;kBAAgB,GAAG;YACzG,OAAO,kBAAkB,EAAE,OAAO,iEA+D5C"}
+{"version":3,"file":"vatRoot.d.ts","sourceRoot":"","sources":["vatRoot.js"],"names":[],"mappings":"AAkBA;;;;GAIG;AACH;mBAJwC,aAAa;;;gBACC,UAAU;sBAAoB,MAAM,CAAC,KAAK,CAAC;kBAAgB,GAAG;YACzG,OAAO,kBAAkB,EAAE,OAAO,iIA+D5C"}

package/src/contractFacet/zcfMint.d.ts

@@ -1,4 +1,4 @@
-export function sumAmountKeywordRecord<K extends globalThis.AssetKind>(amr: AmountKeywordRecord, issuerRecord: IssuerRecord<K>): Amount<K>;
+export function sumAmountKeywordRecord(amr: AmountKeywordRecord, issuerRecord: IssuerRecord): Amount;
 export function prepareZcMint(zcfBaggage: import("@agoric/vat-data").Baggage, recordIssuer: {
     (keyword: string, issuerRecord: IssuerRecord): void;
 }, getAssetKindByBrand: GetAssetKindByBrand, makeEmptySeatKit: (exit?: undefined) => {

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

@@ -1 +1 @@
-{"version":3,"file":"zcfMint.d.ts","sourceRoot":"","sources":["zcfMint.js"],"names":[],"mappings":"AAsBO,uCAFa,CAAC,oCAFV,mBAAmB,gBACnB,YAAY,CACH,CAAC,AADI,CAAC,GACb,MAAM,CAAC,CAAC,CAAC,CAYrB;AASM,0CANI,OAAO,kBAAkB,EAAE,OAAO,gBAClC;IAAE,CAAC,OAAO,EAAE,MAAM,EAAE,YAAY,EAAE,YAAY,GAAG,IAAI,CAAA;CAAE,uBACvD,mBAAmB,oBACnB,CAAC,IAAI,CAAC,EAAE,SAAS,KAAK;IAAE,OAAO,EAAE,GAAG,CAAC;IAAC,QAAQ,EAAE,OAAO,CAAC,QAAQ,CAAC,CAAA;CAAE,eACnE,kBAAkB,IAoHE,CAAC,wCAFnB,MAAM,YACN,IAAI,CAAC,OAAO,CACM,CAAC,AADL,CAAC,CAAC,KACd,OAAO,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,CAWjC"}
+{"version":3,"file":"zcfMint.d.ts","sourceRoot":"","sources":["zcfMint.js"],"names":[],"mappings":"AAqBO,4CAJI,mBAAmB,gBACnB,YAAY,GACV,MAAM,CAYlB;AASM,0CANI,OAAO,kBAAkB,EAAE,OAAO,gBAClC;IAAE,CAAC,OAAO,EAAE,MAAM,EAAE,YAAY,EAAE,YAAY,GAAG,IAAI,CAAA;CAAE,uBACvD,mBAAmB,oBACnB,CAAC,IAAI,CAAC,EAAE,SAAS,KAAK;IAAE,OAAO,EAAE,GAAG,CAAC;IAAC,QAAQ,EAAE,OAAO,CAAC,QAAQ,CAAC,CAAA;CAAE,eACnE,kBAAkB,IAoHE,CAAC,wCAFnB,MAAM,YACN,IAAI,CAAC,OAAO,CACM,CAAC,AADL,CAAC,CAAC,KACd,OAAO,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,CAWjC"}

package/src/contractFacet/zcfMint.js

@@ -15,10 +15,9 @@ import './types-ambient.js';
 const { Fail } = assert;
 
 /**
- * @template {AssetKind} K
  * @param {AmountKeywordRecord} amr
- * @param {IssuerRecord<K>} issuerRecord
- * @returns {Amount<K>}
+ * @param {IssuerRecord} issuerRecord
+ * @returns {Amount}
  */
 export const sumAmountKeywordRecord = (amr, issuerRecord) => {
   const empty = AmountMath.makeEmpty(

package/src/contractFacet/zcfSeat.js

@@ -206,7 +206,7 @@ export const createSeatManager = (
         assertActive(self);
         const currentAllocation = getCurrentAllocation(self);
         if (currentAllocation[keyword] !== undefined) {
-          // @ts-expect-error cast
+          // @ts-expect-error never checks brand
           return currentAllocation[keyword];
         }
         if (!brand) {

package/src/contractSupport/durability.d.ts

@@ -1,4 +1,4 @@
-export function makeEphemeraProvider<E extends {}, K extends {} = any>(init: (key: K) => E): (key: K) => E;
+export function makeEphemeraProvider<E extends {}, K extends WeakKey>(init: (key: K) => E): (key: K) => E;
 export function provideEmptySeat(zcf: ZCF, baggage: import("@agoric/swingset-liveslots").Baggage, name: string): ZCFSeat;
 export function provideAll<T extends Record<string, () => ERef<any>>>(baggage: MapStore<string, any>, thunks: T): Promise<{ [K in keyof T]: Awaited<ReturnType<T[K]>>; }>;
 export function provideSingleton<T extends () => ERef<any>>(mapStore: import("@agoric/vat-data").Baggage, key: string, makeValue: T, withValue?: ((value: Awaited<ReturnType<T>>) => void) | undefined): Promise<Awaited<ReturnType<T>>>;

package/src/contractSupport/durability.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"durability.d.ts","sourceRoot":"","sources":["durability.js"],"names":[],"mappings":"AAaO,qCAOiB,CAAC,aATR,CAAC,yBAAP,CAAC,GAAG,EAAE,CAAC,KASM,CAAC,AATD,eASA,CAAC,CAWxB;AAWM,sCALI,GAAG,WACH,OAAO,4BAA4B,EAAE,OAAO,QAC5C,MAAM,GACJ,OAAO,CAInB;AAiCM,2BAFmD,CAAC,8BAHxB,IAAI,CAAC,GAAG,CAAC,YACjC,QAAQ,CAAC,MAAM,EAAE,GAAG,CAAC,UAE0B,CAAC,AAD/C,GACC,OAAO,CAAC,GAAG,CAAC,IAAI,MAA6B,CAAC,AAAvB,GAAG,OAAO,CAAC,UAAU,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,GAAE,CAAC,CAuBlE;AAgBM,iCAFiC,CAAC,eALrB,IAAI,CAAC,GAAG,CAAC,YAClB,OAAO,kBAAkB,EAAE,OAAO,OAClC,MAAM,aAGuB,CAAC,AAF7B,uBACO,OAAO,CAAC,UAAU,CACG,CAAC,AADF,CAAC,CAAC,KAAK,IAAI,gBACrC,OAAO,CAAC,OAAO,CAAC,UAAU,CAAC,CAAC,CAAC,CAAC,CAAC,CAc3C"}
+{"version":3,"file":"durability.d.ts","sourceRoot":"","sources":["durability.js"],"names":[],"mappings":"AAaO,qCAOiB,CAAC,aATR,CAAC,wBAAP,CAAC,GAAG,EAAE,CAAC,KASM,CAAC,AATD,eASA,CAAC,CAWxB;AAWM,sCALI,GAAG,WACH,OAAO,4BAA4B,EAAE,OAAO,QAC5C,MAAM,GACJ,OAAO,CAInB;AAiCM,2BAFmD,CAAC,8BAHxB,IAAI,CAAC,GAAG,CAAC,YACjC,QAAQ,CAAC,MAAM,EAAE,GAAG,CAAC,UAE0B,CAAC,AAD/C,GACC,OAAO,CAAC,GAAG,CAAC,IAAI,MAA6B,CAAC,AAAvB,GAAG,OAAO,CAAC,UAAU,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,GAAE,CAAC,CAuBlE;AAgBM,iCAFiC,CAAC,eALrB,IAAI,CAAC,GAAG,CAAC,YAClB,OAAO,kBAAkB,EAAE,OAAO,OAClC,MAAM,aAGuB,CAAC,AAF7B,uBACO,OAAO,CAAC,UAAU,CACG,CAAC,AADF,CAAC,CAAC,KAAK,IAAI,gBACrC,OAAO,CAAC,OAAO,CAAC,UAAU,CAAC,CAAC,CAAC,CAAC,CAAC,CAc3C"}

package/src/contractSupport/durability.js

@@ -8,7 +8,7 @@ import { E } from '@endo/eventual-send';
  * representative also remains.
  *
  * @template {{}} E Ephemeral state
- * @template {{}} [K=any] key on which to provision
+ * @template {WeakKey} K key on which to provision
  * @param {(key: K) => E} init
  */
 export const makeEphemeraProvider = init => {

package/src/contractSupport/priceAuthority.d.ts

@@ -15,7 +15,7 @@ export const PriceAuthorityI: import("@endo/patterns").InterfaceGuard<{
     mutableQuoteWhenGT: import("@endo/patterns").MethodGuard;
 }>;
 export function makeOnewayPriceAuthorityKit(opts: {
-    quoteIssuer: Issuer<"set">;
+    quoteIssuer: globalThis.Issuer<"set", PriceDescription>;
     notifier: ERef<Notifier<unknown>>;
     timer: ERef<import("@agoric/time").TimerService>;
     createQuote: PriceQuoteCreate;
@@ -24,6 +24,7 @@ export function makeOnewayPriceAuthorityKit(opts: {
 }): PriceAuthorityKit;
 export type CompareAmount = (amount: Amount, amountLimit: Amount) => boolean;
 export type Trigger = (createInstantQuote: PriceQuoteCreate) => Promise<void>;
+import type { PriceDescription } from '@agoric/zoe/tools/types.js';
 import type { PriceQuoteCreate } from '@agoric/zoe/tools/types.js';
 import type { PriceAuthorityKit } from '@agoric/zoe/tools/types.js';
 //# sourceMappingURL=priceAuthority.d.ts.map

package/src/contractSupport/priceAuthority.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"priceAuthority.d.ts","sourceRoot":"","sources":["priceAuthority.js"],"names":[],"mappings":"AA8CA;;;;;;;;;;;;;;;GAiBG;AAYI;iBARI,MAAM,CAAC,KAAK,CAAC;cACb,IAAI,CAAC,QAAQ,CAAC,OAAO,CAAC,CAAC;WACvB,IAAI,CAAC,OAAO,cAAc,EAAE,YAAY,CAAC;;mBAEzC,KAAK,CAAC,KAAK,CAAC;oBACZ,KAAK,CAAC,KAAK,CAAC;sBAyTtB;qCA7WU,MAAM,eACN,MAAM,KACJ,OAAO;gEAkBP,OAAO,CAAC,IAAI,CAAC;sCA7ByI,4BAA4B;uCAA5B,4BAA4B"}
+{"version":3,"file":"priceAuthority.d.ts","sourceRoot":"","sources":["priceAuthority.js"],"names":[],"mappings":"AA8CA;;;;;;;;;;;;;;;GAiBG;AAYI;;cAPI,IAAI,CAAC,QAAQ,CAAC,OAAO,CAAC,CAAC;WACvB,IAAI,CAAC,OAAO,cAAc,EAAE,YAAY,CAAC;;mBAEzC,KAAK,CAAC,KAAK,CAAC;oBACZ,KAAK,CAAC,KAAK,CAAC;sBAyTtB;qCA7WU,MAAM,eACN,MAAM,KACJ,OAAO;gEAkBP,OAAO,CAAC,IAAI,CAAC;sCA7ByI,4BAA4B;sCAA5B,4BAA4B;uCAA5B,4BAA4B"}

package/src/contractSupport/priceAuthority.js

@@ -65,7 +65,7 @@ export const PriceAuthorityI = M.interface('PriceAuthority', {
 
 /**
  * @param {object} opts
- * @param {Issuer<'set'>} opts.quoteIssuer
+ * @param {Issuer<'set', PriceDescription>} opts.quoteIssuer
  * @param {ERef<Notifier<unknown>>} opts.notifier
  * @param {ERef<import('@agoric/time').TimerService>} opts.timer
  * @param {PriceQuoteCreate} opts.createQuote

package/src/contractSupport/priceAuthorityInitial.d.ts

@@ -1,3 +1,4 @@
-export function makeInitialTransform(priceOutPerIn: Ratio, priceAuthority: PriceAuthority, quoteMint: ERef<Mint<"set">>, brandIn: Brand<"nat">, brandOut: Brand<"nat">): PriceAuthority;
+export function makeInitialTransform(priceOutPerIn: Ratio, priceAuthority: PriceAuthority, quoteMint: globalThis.ERef<globalThis.Mint<"set", PriceDescription>>, brandIn: Brand<"nat">, brandOut: Brand<"nat">): PriceAuthority;
 import type { PriceAuthority } from '@agoric/zoe/tools/types.js';
+import type { PriceDescription } from '@agoric/zoe/tools/types.js';
 //# sourceMappingURL=priceAuthorityInitial.d.ts.map

package/src/contractSupport/priceAuthorityInitial.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"priceAuthorityInitial.d.ts","sourceRoot":"","sources":["priceAuthorityInitial.js"],"names":[],"mappings":"AA8BO,oDAPI,KAAK,6CAEL,IAAI,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,WACjB,KAAK,CAAC,KAAK,CAAC,YACZ,KAAK,CAAC,KAAK,CAAC,kBA0FtB;oCAvG4F,4BAA4B"}
+{"version":3,"file":"priceAuthorityInitial.d.ts","sourceRoot":"","sources":["priceAuthorityInitial.js"],"names":[],"mappings":"AA8BO,oDAPI,KAAK,iHAGL,KAAK,CAAC,KAAK,CAAC,YACZ,KAAK,CAAC,KAAK,CAAC,kBA0FtB;oCAvG4F,4BAA4B;sCAA5B,4BAA4B"}

package/src/contractSupport/priceAuthorityInitial.js

@@ -23,7 +23,7 @@ import { mintQuote } from './priceAuthorityTransform.js';
  *
  * @param {Ratio} priceOutPerIn
  * @param {PriceAuthority} priceAuthority
- * @param {ERef<Mint<'set'>>} quoteMint
+ * @param {ERef<Mint<'set', PriceDescription>>} quoteMint
  * @param {Brand<'nat'>} brandIn
  * @param {Brand<'nat'>} brandOut
  * @returns {PriceAuthority}

package/src/contractSupport/priceAuthorityQuoteMint.d.ts

@@ -1,2 +1,3 @@
-export function provideQuoteMint(baggage: import("@agoric/vat-data").Baggage): ERef<Mint<"set">>;
+export function provideQuoteMint(baggage: import("@agoric/vat-data").Baggage): globalThis.ERef<globalThis.Mint<"set", PriceDescription>>;
+import type { PriceDescription } from '@agoric/zoe/tools/types.js';
 //# sourceMappingURL=priceAuthorityQuoteMint.d.ts.map

package/src/contractSupport/priceAuthorityQuoteMint.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"priceAuthorityQuoteMint.d.ts","sourceRoot":"","sources":["priceAuthorityQuoteMint.js"],"names":[],"mappings":"AAQO,0CAHI,OAAO,kBAAkB,EAAE,OAAO,GAChC,IAAI,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,CAgB7B"}
+{"version":3,"file":"priceAuthorityQuoteMint.d.ts","sourceRoot":"","sources":["priceAuthorityQuoteMint.js"],"names":[],"mappings":"AAaO,0CAHI,OAAO,kBAAkB,EAAE,OAAO,6DAmB5C;sCAxB0G,4BAA4B"}

package/src/contractSupport/priceAuthorityQuoteMint.js

@@ -1,16 +1,23 @@
 import { AssetKind, prepareIssuerKit } from '@agoric/ertp';
 import { provideDurableMapStore } from '@agoric/vat-data';
 
+/**
+ * @import {EOnly} from '@endo/eventual-send';
+ * @import {MutableQuote, PriceAuthority, PriceDescription, PriceQuote, PriceQuoteValue, PriceQuery,} from '@agoric/zoe/tools/types.js';
+ */
+
 /**
  *
  * @param {import('@agoric/vat-data').Baggage} baggage
- * @returns {ERef<Mint<'set'>>}
+ * @returns {ERef<Mint<'set', PriceDescription>>}
  */
 export const provideQuoteMint = baggage => {
   const issuerBaggage = provideDurableMapStore(
     baggage,
     'quoteMintIssuerBaggage',
   );
+  /** @type {IssuerKit<'set', PriceDescription>} */
+  // @ts-expect-error cast
   const issuerKit = prepareIssuerKit(
     issuerBaggage,
     'quote',

package/src/contractSupport/priceAuthorityTransform.d.ts

@@ -1,6 +1,6 @@
-export function mintQuote(quoteBrand: Brand<"set">, amountIn: Amount<"nat">, amountOut: Amount<"nat">, timer: ERef<import("@agoric/time").TimerService>, timestamp: import("@agoric/time").Timestamp, quoteMint: ERef<Mint<"set">>): Promise<PriceQuote>;
+export function mintQuote(quoteBrand: Brand<"set">, amountIn: Amount<"nat">, amountOut: Amount<"nat">, timer: import("@agoric/time").TimerService, timestamp: import("@agoric/time").TimestampRecord, quoteMint: globalThis.ERef<globalThis.Mint<"set", PriceDescription>>): Promise<PriceQuote>;
 export function makePriceAuthorityTransform({ quoteMint, sourcePriceAuthority, sourceBrandIn, sourceBrandOut, actualBrandIn, actualBrandOut, makeSourceAmountIn, makeSourceAmountOut, transformSourceAmountIn, transformSourceAmountOut, }: {
-    quoteMint: ERef<Mint<"set">>;
+    quoteMint: globalThis.ERef<globalThis.Mint<"set", PriceDescription>>;
     sourcePriceAuthority: globalThis.ERef<PriceAuthority>;
     sourceBrandIn: Brand<"nat">;
     sourceBrandOut: Brand<"nat">;
@@ -11,6 +11,7 @@ export function makePriceAuthorityTransform({ quoteMint, sourcePriceAuthority, s
     transformSourceAmountIn?: ((sourceAmountIn: Amount<"nat">) => Amount<"nat">) | undefined;
     transformSourceAmountOut?: ((sourceAmountOut: Amount<"nat">) => Amount<"nat">) | undefined;
 }): Promise<PriceAuthority>;
+import type { PriceDescription } from '@agoric/zoe/tools/types.js';
 import type { PriceQuote } from '@agoric/zoe/tools/types.js';
 import type { PriceAuthority } from '@agoric/zoe/tools/types.js';
 //# sourceMappingURL=priceAuthorityTransform.d.ts.map

package/src/contractSupport/priceAuthorityTransform.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"priceAuthorityTransform.d.ts","sourceRoot":"","sources":["priceAuthorityTransform.js"],"names":[],"mappings":"AAoBO,sCARI,KAAK,CAAC,KAAK,CAAC,YACZ,MAAM,CAAC,KAAK,CAAC,aACb,MAAM,CAAC,KAAK,CAAC,SACb,IAAI,CAAC,OAAO,cAAc,EAAE,YAAY,CAAC,aACzC,OAAO,cAAc,EAAE,SAAS,aAChC,IAAI,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,uBAoB3B;AAeM;eAXI,IAAI,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;;mBAEjB,KAAK,CAAC,KAAK,CAAC;oBACZ,KAAK,CAAC,KAAK,CAAC;;;qCAGD,MAAM,CAAC,KAAK,CAAC,KAAK,MAAM,CAAC,KAAK,CAAC;uCAC9B,MAAM,CAAC,KAAK,CAAC,KAAK,MAAM,CAAC,KAAK,CAAC;gDAC1B,MAAM,CAAC,KAAK,CAAC,KAAK,MAAM,CAAC,KAAK,CAAC;kDAC9B,MAAM,CAAC,KAAK,CAAC,KAAK,MAAM,CAAC,KAAK,CAAC;4BA4N3D;gCAtQwF,4BAA4B;oCAA5B,4BAA4B"}
+{"version":3,"file":"priceAuthorityTransform.d.ts","sourceRoot":"","sources":["priceAuthorityTransform.js"],"names":[],"mappings":"AAoBO,sCARI,KAAK,CAAC,KAAK,CAAC,YACZ,MAAM,CAAC,KAAK,CAAC,aACb,MAAM,CAAC,KAAK,CAAC,SACb,OAAO,cAAc,EAAE,YAAY,aACnC,OAAO,cAAc,EAAE,eAAe,6FAqBhD;AAeM;;;mBATI,KAAK,CAAC,KAAK,CAAC;oBACZ,KAAK,CAAC,KAAK,CAAC;;;qCAGD,MAAM,CAAC,KAAK,CAAC,KAAK,MAAM,CAAC,KAAK,CAAC;uCAC9B,MAAM,CAAC,KAAK,CAAC,KAAK,MAAM,CAAC,KAAK,CAAC;gDAC1B,MAAM,CAAC,KAAK,CAAC,KAAK,MAAM,CAAC,KAAK,CAAC;kDAC9B,MAAM,CAAC,KAAK,CAAC,KAAK,MAAM,CAAC,KAAK,CAAC;4BA4N3D;sCAtQ6E,4BAA4B;gCAA5B,4BAA4B;oCAA5B,4BAA4B"}

package/src/contractSupport/priceAuthorityTransform.js

@@ -6,16 +6,16 @@ import { makeNotifier } from '@agoric/notifier';
 
 /**
  * @import {EOnly} from '@endo/eventual-send';
- * @import {MutableQuote, PriceAuthority, PriceQuote, PriceQuoteValue, PriceQuery,} from '@agoric/zoe/tools/types.js';
+ * @import {MutableQuote, PriceAuthority, PriceQuote, PriceDescription,} from '@agoric/zoe/tools/types.js';
  */
 
 /**
  * @param {Brand<'set'>} quoteBrand
  * @param {Amount<'nat'>} amountIn
  * @param {Amount<'nat'>} amountOut
- * @param {ERef<import('@agoric/time').TimerService>} timer
- * @param {import('@agoric/time').Timestamp} timestamp
- * @param {ERef<Mint<'set'>>} quoteMint
+ * @param {import('@agoric/time').TimerService} timer
+ * @param {import('@agoric/time').TimestampRecord} timestamp
+ * @param {ERef<Mint<'set', PriceDescription>>} quoteMint
  * @returns {Promise<PriceQuote>}
  */
 export const mintQuote = async (
@@ -39,7 +39,7 @@ export const mintQuote = async (
 
 /**
  * @param {object} opts
- * @param {ERef<Mint<'set'>>} opts.quoteMint
+ * @param {ERef<Mint<'set', PriceDescription>>} opts.quoteMint
  * @param {ERef<PriceAuthority>} opts.sourcePriceAuthority
  * @param {Brand<'nat'>} opts.sourceBrandIn
  * @param {Brand<'nat'>} opts.sourceBrandOut

package/src/contractSupport/priceQuote.d.ts

@@ -1,9 +1,9 @@
 export function getPriceDescription(quote: PriceQuote): PriceDescription;
-export function getAmountIn(quote: PriceQuote): globalThis.Amount<"nat">;
-export function getAmountOut(quote: PriceQuote): globalThis.Amount<"nat">;
+export function getAmountIn(quote: PriceQuote): import("@agoric/ertp/exported.js").NatAmount;
+export function getAmountOut(quote: PriceQuote): import("@agoric/ertp/exported.js").NatAmount;
 /** @type {(quote: PriceQuote) => import('@agoric/time').Timestamp} */
 export const getTimestamp: (quote: PriceQuote) => import("@agoric/time").Timestamp;
-export function unitAmount(brand: Brand<"nat">): Promise<globalThis.Amount<"nat">>;
+export function unitAmount(brand: Brand<"nat">): Promise<import("@agoric/ertp/exported.js").NatAmount>;
 import type { PriceQuote } from '@agoric/zoe/tools/types.js';
 import type { PriceDescription } from '@agoric/zoe/tools/types.js';
 //# sourceMappingURL=priceQuote.d.ts.map

package/src/contractSupport/priceQuote.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"priceQuote.d.ts","sourceRoot":"","sources":["priceQuote.js"],"names":[],"mappings":"AAqBO,yEAIN;AAGM,yEAAgE;AAEhE,0EAAkE;AACzE,sEAAsE;AACtE,kDADkC,OAAO,cAAc,EAAE,SAAS,CACQ;AAGnE,kCADK,KAAK,CAAC,KAAK,CAAC,qCAMvB;gCAjC4F,4BAA4B;sCAA5B,4BAA4B"}
+{"version":3,"file":"priceQuote.d.ts","sourceRoot":"","sources":["priceQuote.js"],"names":[],"mappings":"AAqBO,yEAIN;AAGM,6FAAgE;AAEhE,8FAAkE;AACzE,sEAAsE;AACtE,kDADkC,OAAO,cAAc,EAAE,SAAS,CACQ;AAGnE,kCADK,KAAK,CAAC,KAAK,CAAC,yDAMvB;gCAjC4F,4BAA4B;sCAA5B,4BAA4B"}

package/src/contractSupport/ratio.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"ratio.d.ts","sourceRoot":"","sources":["ratio.js"],"names":[],"mappings":"AAwCO,gDAcN;AASM,qCANI,MAAM,kBACN,KAAK,sFAGH,KAAK,CAgBjB;AAOM,sDAJI,MAAM,qBACN,MAAM,GACJ,KAAK,CAYjB;AAwBD,0BAA0B;AAC1B,8BADW,WAAW,CAGpB;AAEF,0BAA0B;AAC1B,6BADW,WAAW,CAGpB;AAEF,0BAA0B;AAC1B,yBADW,WAAW,CAGpB;AAwBF,0BAA0B;AAC1B,4BADW,WAAW,CAGpB;AAEF,0BAA0B;AAC1B,2BADW,WAAW,CAGpB;AAEF,0BAA0B;AAC1B,uBADW,WAAW,CAGpB;AAMK,mCAHI,KAAK,GACH,KAAK,CAWjB;AAOM,gCAJI,KAAK,SACL,KAAK,GACH,KAAK,CAwBjB;AAOM,qCAJI,KAAK,SACL,KAAK,GACH,KAAK,CAmBjB;AAOM,qCAJI,KAAK,SACL,KAAK,GACH,KAAK,CA8BjB;AAQM,gCAHI,KAAK,GACH,KAAK,CAcjB;AAOM,+BAJI,KAAK,SACL,KAAK,GACH,OAAO,CAkBnB;AASM,iCAJI,KAAK,SACL,KAAK,GACH,OAAO,CAOnB;AASM,gCAJI,KAAK,UACL,MAAM,GACJ,KAAK,CAajB;AAaM,oCALI,cAAc,kBACd,KAAK,oDAEH,KAAK,CAmBjB;AAMM,+CAHI,OAAO,GACL,OAAO,CAAC,QAAQ,IAAI,cAAc,CAK9C;AAQM,qCAHI,KAAK,GACH,MAAM,CAMlB;6BAhDa,MAAM,GAAG,MAAM,GAAG,MAAM"}
+{"version":3,"file":"ratio.d.ts","sourceRoot":"","sources":["ratio.js"],"names":[],"mappings":"AAwCO,gDAcN;AASM,qCANI,MAAM,kBACN,KAAK,sFAGH,KAAK,CAejB;AAOM,sDAJI,MAAM,qBACN,MAAM,GACJ,KAAK,CAYjB;AA2BD,0BAA0B;AAC1B,8BADW,WAAW,CAGpB;AAEF,0BAA0B;AAC1B,6BADW,WAAW,CAGpB;AAEF,0BAA0B;AAC1B,yBADW,WAAW,CAGpB;AA2BF,0BAA0B;AAC1B,4BADW,WAAW,CAGpB;AAEF,0BAA0B;AAC1B,2BADW,WAAW,CAGpB;AAEF,0BAA0B;AAC1B,uBADW,WAAW,CAGpB;AAMK,mCAHI,KAAK,GACH,KAAK,CAWjB;AAOM,gCAJI,KAAK,SACL,KAAK,GACH,KAAK,CAwBjB;AAOM,qCAJI,KAAK,SACL,KAAK,GACH,KAAK,CAmBjB;AAOM,qCAJI,KAAK,SACL,KAAK,GACH,KAAK,CA8BjB;AAQM,gCAHI,KAAK,GACH,KAAK,CAcjB;AAOM,+BAJI,KAAK,SACL,KAAK,GACH,OAAO,CAkBnB;AASM,iCAJI,KAAK,SACL,KAAK,GACH,OAAO,CAOnB;AASM,gCAJI,KAAK,UACL,MAAM,GACJ,KAAK,CAajB;AAaM,oCALI,cAAc,kBACd,KAAK,oDAEH,KAAK,CAmBjB;AAMM,+CAHI,OAAO,GACL,OAAO,CAAC,QAAQ,IAAI,cAAc,CAK9C;AAQM,qCAHI,KAAK,GACH,MAAM,CAMlB;6BAhDa,MAAM,GAAG,MAAM,GAAG,MAAM"}

package/src/contractSupport/ratio.js

@@ -70,7 +70,6 @@ export const makeRatio = (
   denominator > 0n ||
     Fail`No infinite ratios! Denominator was 0 ${q(denominatorBrand)}`;
 
-  // @ts-expect-error cast to return type because make() ensures
   return harden({
     numerator: AmountMath.make(numeratorBrand, numerator),
     denominator: AmountMath.make(denominatorBrand, denominator),
@@ -98,6 +97,7 @@ export const makeRatioFromAmounts = (numeratorAmount, denominatorAmount) => {
  * @param {Amount<'nat'>} amount
  * @param {Ratio} ratio
  * @param {*} divideOp
+ * @returns {Amount<'nat'>}
  */
 const multiplyHelper = (amount, ratio, divideOp) => {
   AmountMath.coerce(amount.brand, amount);
@@ -107,12 +107,14 @@ const multiplyHelper = (amount, ratio, divideOp) => {
       ratio.denominator.brand,
     )}`;
 
-  return AmountMath.make(
-    ratio.numerator.brand,
-    divideOp(
-      multiply(amount.value, ratio.numerator.value),
-      ratio.denominator.value,
-    ),
+  return /** @type {Amount<'nat'>} */ (
+    AmountMath.make(
+      ratio.numerator.brand,
+      divideOp(
+        multiply(amount.value, ratio.numerator.value),
+        ratio.denominator.value,
+      ),
+    )
   );
 };
 
@@ -135,6 +137,7 @@ export const multiplyBy = (amount, ratio) => {
  * @param {Amount<'nat'>} amount
  * @param {Ratio} ratio
  * @param {*} divideOp
+ * @returns {Amount<'nat'>}
  */
 const divideHelper = (amount, ratio, divideOp) => {
   AmountMath.coerce(amount.brand, amount);
@@ -144,12 +147,14 @@ const divideHelper = (amount, ratio, divideOp) => {
       ratio.numerator.brand,
     )}`;
 
-  return AmountMath.make(
-    ratio.denominator.brand,
-    divideOp(
-      multiply(amount.value, ratio.denominator.value),
-      ratio.numerator.value,
-    ),
+  return /** @type {Amount<'nat'>} */ (
+    AmountMath.make(
+      ratio.denominator.brand,
+      divideOp(
+        multiply(amount.value, ratio.denominator.value),
+        ratio.numerator.value,
+      ),
+    )
   );
 };
 

package/src/contractSupport/recorder.d.ts

@@ -9,17 +9,17 @@ export function prepareRecorder(baggage: import("@agoric/vat-data").Baggage, mar
     /**
      * Marshalls before writing to storage or publisher to help ensure the two streams match.
      *
-     * @param {unknown} value
+     * @param {any} value
      * @returns {Promise<void>}
      */
-    write(value: unknown): Promise<void>;
+    write(value: any): Promise<void>;
     /**
      * Like `write` but prevents future writes and terminates the publisher.
      *
-     * @param {unknown} value
+     * @param {any} value
      * @returns {Promise<void>}
      */
-    writeFinal(value: unknown): Promise<void>;
+    writeFinal(value: any): Promise<void>;
 }>;
 export function defineRecorderKit({ makeRecorder, makeDurablePublishKit }: {
     makeRecorder: MakeRecorder;
@@ -55,17 +55,17 @@ export function prepareRecorderKitMakers(baggage: import("@agoric/vat-data").Bag
         /**
          * Marshalls before writing to storage or publisher to help ensure the two streams match.
          *
-         * @param {unknown} value
+         * @param {any} value
          * @returns {Promise<void>}
          */
-        write(value: unknown): Promise<void>;
+        write(value: any): Promise<void>;
         /**
          * Like `write` but prevents future writes and terminates the publisher.
          *
-         * @param {unknown} value
+         * @param {any} value
          * @returns {Promise<void>}
          */
-        writeFinal(value: unknown): Promise<void>;
+        writeFinal(value: any): Promise<void>;
     }>;
     makeRecorderKit: <T>(storageNode: StorageNode | Awaited<import("@endo/far").FarRef<StorageNode>>, valueShape?: TypedMatcher<T> | undefined) => RecorderKit<T>;
     makeERecorderKit: <T_1>(storageNodeP: ERef<StorageNode>, valueShape?: TypedMatcher<T_1> | undefined) => EventualRecorderKit<T_1>;
@@ -98,17 +98,17 @@ export function prepareMockRecorderKitMakers(): {
         /**
          * Marshalls before writing to storage or publisher to help ensure the two streams match.
          *
-         * @param {unknown} value
+         * @param {any} value
          * @returns {Promise<void>}
          */
-        write(value: unknown): Promise<void>;
+        write(value: any): Promise<void>;
         /**
          * Like `write` but prevents future writes and terminates the publisher.
          *
-         * @param {unknown} value
+         * @param {any} value
          * @returns {Promise<void>}
          */
-        writeFinal(value: unknown): Promise<void>;
+        writeFinal(value: any): Promise<void>;
     }>;
     makeRecorderKit: <T>(storageNode: StorageNode | Awaited<import("@endo/far").FarRef<StorageNode>>, valueShape?: TypedMatcher<T> | undefined) => RecorderKit<T>;
     makeERecorderKit: <T_1>(storageNodeP: ERef<StorageNode>, valueShape?: TypedMatcher<T_1> | undefined) => EventualRecorderKit<T_1>;
@@ -135,7 +135,7 @@ export type MakeERecorderKit = ReturnType<typeof defineERecorderKit>;
  * This is a Pattern but since that's `any`, including in the typedef turns the
  * whole thing to `any`.
  */
-export type TypedMatcher<T> = {
+export type TypedMatcher<T> = import("@endo/patterns").Matcher & {
     validatedType?: T;
 };
 export type MatchedType<TM extends TypedMatcher<any>> = TM extends TypedMatcher<infer T> ? T : never;