@agoric/zoe 0.26.3-dev-aa68d8f.0 → 0.26.3-dev-651b051.0

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

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

package/src/contractSupport/recorder.js

@@ -94,7 +94,7 @@ export const prepareRecorder = (baggage, marshaller) => {
       /**
        * Marshalls before writing to storage or publisher to help ensure the two streams match.
        *
-       * @param {unknown} value
+       * @param {any} value
        * @returns {Promise<void>}
        */
       async write(value) {
@@ -111,7 +111,7 @@ export const prepareRecorder = (baggage, marshaller) => {
       /**
        * Like `write` but prevents future writes and terminates the publisher.
        *
-       * @param {unknown} value
+       * @param {any} value
        * @returns {Promise<void>}
        */
       async writeFinal(value) {
@@ -267,7 +267,7 @@ export const prepareMockRecorderKitMakers = () => {
  * whole thing to `any`.
  *
  * @template T
- * @typedef {{ validatedType?: T }} TypedMatcher
+ * @typedef {import('@endo/patterns').Matcher & { validatedType?: T }} TypedMatcher
  */
 
 /**

package/src/contractSupport/zoeHelpers.d.ts

@@ -11,7 +11,7 @@ export function assertNatAssetKind(zcf: any, brand: any): void;
 export const depositToSeatSuccessMsg: "Deposit and reallocation successful.";
 export function depositToSeat(zcf: ZCF, recipientSeat: ZCFSeat, amounts: AmountKeywordRecord, payments: PaymentPKeywordRecord): Promise<string>;
 export function withdrawFromSeat(zcf: ZCF, seat: ZCFSeat, amounts: AmountKeywordRecord): Promise<PaymentPKeywordRecord>;
-export function saveAllIssuers(zcf: ZCF, issuerKeywordRecord?: IssuerKeywordRecord): Promise<(IssuerRecord<any> | undefined)[]>;
+export function saveAllIssuers(zcf: ZCF, issuerKeywordRecord?: IssuerKeywordRecord): Promise<(IssuerRecord<any, import("@endo/patterns").Key> | undefined)[]>;
 /** @type {MapKeywords} */
 export const mapKeywords: MapKeywords;
 export function offerTo<Args extends unknown, Result extends unknown>(zcf: ZCF, invitation: ERef<Invitation<Result, Args>>, keywordMapping: KeywordKeywordRecord | undefined, proposal: Proposal, fromSeat: ZCFSeat, toSeat?: ZCFSeat | undefined, offerArgs?: Args | undefined): Promise<{

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

@@ -1 +1 @@
-{"version":3,"file":"zoeHelpers.d.ts","sourceRoot":"","sources":["zoeHelpers.js"],"names":[],"mappings":"AASA,iIAAkI;AAM3H,oEAON;AAuBM,+BALI,GAAG,QACH,cAAc,UACd,mBAAmB,GACjB,CAAC,GAAC,CAAC,CAOf;AAED,mBAAmB;AACnB,mBADW,IAAI,CAkBb;AAEF,wBAAwB;AACxB,wBADW,SAAS,CAqBlB;AAiBK,uCAHI,OAAO,iBACP,OAAO,QAIgD;AAsB3D,0CAHI,OAAO,YACP,cAAc,QA+BxB;AAGM,+DAGN;AAED,6EAA8E;AAavE,mCANI,GAAG,iBACH,OAAO,WACP,mBAAmB,YACnB,qBAAqB,GACnB,OAAO,CAAC,MAAM,CAAC,CA8B3B;AAYM,sCALI,GAAG,QACH,OAAO,WACP,mBAAmB,GACjB,OAAO,CAAC,qBAAqB,CAAC,CAQ1C;AAWM,oCAJI,GAAG,wBACH,mBAAmB,8CAgB7B;AAED,0BAA0B;AAC1B,0BADW,WAAW,CAYpB;AAiDK,wBA9B4B,IAAI,kBAqBiB,MAAM,uBAxBnD,GAAG,cAGH,IAAI,CAAC,UAAU,CAqB8B,MAAM,AArB7B,EAAE,IAAI,CAAC,CAAC,kBAG9B,oBAAoB,GAAG,SAAS,YAKhC,QAAQ,YAGR,OAAO,+DAUL,OAAO,CAAC;IAAC,eAAe,EAAE,OAAO,CAAC,QAAQ,CAAC,MAAM,CAAC,CAAC,CAAC;IAAC,SAAS,EAAE,OAAO,CAAC,mBAAmB,CAAC,CAAA;CAAC,CAAC,CA+D1G;;iBAzVa,MAAM,cAAc;0BACpB,MAAM,UAAU"}
+{"version":3,"file":"zoeHelpers.d.ts","sourceRoot":"","sources":["zoeHelpers.js"],"names":[],"mappings":"AASA,iIAAkI;AAM3H,oEAON;AAuBM,+BALI,GAAG,QACH,cAAc,UACd,mBAAmB,GACjB,CAAC,GAAC,CAAC,CAOf;AAED,mBAAmB;AACnB,mBADW,IAAI,CAkBb;AAEF,wBAAwB;AACxB,wBADW,SAAS,CAqBlB;AAiBK,uCAHI,OAAO,iBACP,OAAO,QAIgD;AAsB3D,0CAHI,OAAO,YACP,cAAc,QA+BxB;AAGM,+DAGN;AAED,6EAA8E;AAavE,mCANI,GAAG,iBACH,OAAO,WACP,mBAAmB,YACnB,qBAAqB,GACnB,OAAO,CAAC,MAAM,CAAC,CA8B3B;AAYM,sCALI,GAAG,QACH,OAAO,WACP,mBAAmB,GACjB,OAAO,CAAC,qBAAqB,CAAC,CAQ1C;AAWM,oCAJI,GAAG,wBACH,mBAAmB,4EAgB7B;AAED,0BAA0B;AAC1B,0BADW,WAAW,CAYpB;AAiDK,wBA9B4B,IAAI,kBAqBiB,MAAM,uBAxBnD,GAAG,cAGH,IAAI,CAAC,UAAU,CAqB8B,MAAM,AArB7B,EAAE,IAAI,CAAC,CAAC,kBAG9B,oBAAoB,GAAG,SAAS,YAKhC,QAAQ,YAGR,OAAO,+DAUL,OAAO,CAAC;IAAC,eAAe,EAAE,OAAO,CAAC,QAAQ,CAAC,MAAM,CAAC,CAAC,CAAC;IAAC,SAAS,EAAE,OAAO,CAAC,mBAAmB,CAAC,CAAA;CAAC,CAAC,CA+D1G;;iBAzVa,MAAM,cAAc;0BACpB,MAAM,UAAU"}

package/src/contracts/auction/index.d.ts

@@ -37,7 +37,7 @@ export function start(zcf: ZCF<{
             timeAuthority: import("@agoric/time").TimerService;
             bids: string | any[];
         };
-    } & import("@endo/eventual-send").RemotableBrand<{}, {
+    } & import("@endo/marshal").RemotableObject<`Alleged: ${string}`> & import("@endo/eventual-send").RemotableBrand<{}, {
         makeBidInvitation: () => Promise<Invitation<unknown, never>>;
         getSessionDetails: () => {
             auctionedAssets: any;
@@ -60,7 +60,7 @@ export function start(zcf: ZCF<{
             timeAuthority: import("@agoric/time").TimerService;
             bids: string | any[];
         };
-    } & import("@endo/eventual-send").RemotableBrand<{}, {
+    } & import("@endo/marshal").RemotableObject<`Alleged: ${string}`> & import("@endo/eventual-send").RemotableBrand<{}, {
         getCurrentBids: () => any[] | "Bids are hidden for \"second price\" auctions";
         getSessionDetails: () => {
             auctionedAssets: any;

package/src/contracts/automaticRefund.d.ts

@@ -17,7 +17,7 @@ export function start(zcf: ZCF<{}>): {
     publicFacet: {
         getOffersCount: () => bigint;
         makeInvitation: () => Promise<Invitation<unknown, never>>;
-    } & import("@endo/eventual-send").RemotableBrand<{}, {
+    } & import("@endo/marshal").RemotableObject<`Alleged: ${string}`> & import("@endo/eventual-send").RemotableBrand<{}, {
         getOffersCount: () => bigint;
         makeInvitation: () => Promise<Invitation<unknown, never>>;
     }>;

package/src/contracts/autoswap.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"autoswap.d.ts","sourceRoot":"","sources":["autoswap.js"],"names":[],"mappings":"AAeA;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GAsCG;AACH,2BAFW,GAAG;;GAoVb"}
+{"version":3,"file":"autoswap.d.ts","sourceRoot":"","sources":["autoswap.js"],"names":[],"mappings":"AAeA;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GAsCG;AACH,2BAFW,GAAG;;GAsVb"}

package/src/contracts/autoswap.js

@@ -274,8 +274,10 @@ const start = async zcf => {
     });
 
     // TODO (hibbert) should we burn tokens?
-    const userAllocation = removeLiqSeat.getCurrentAllocation();
-    /** @type {Amount<'nat'>} */
+
+    const userAllocation = /** @type {{Liquidity: Amount<'nat'>}} */ (
+      removeLiqSeat.getCurrentAllocation()
+    );
     const liquidityIn = userAllocation.Liquidity;
     assert(!AmountMath.isEmpty(liquidityIn), 'Pool is empty');
     const liquidityValueIn = liquidityIn.value;

package/src/contracts/barterExchange.d.ts

@@ -15,7 +15,7 @@
 export function start(zcf: ZCF): {
     publicFacet: {
         makeInvitation: () => Promise<Invitation<unknown, never>>;
-    } & import("@endo/eventual-send").RemotableBrand<{}, {
+    } & import("@endo/marshal").RemotableObject<`Alleged: ${string}`> & import("@endo/eventual-send").RemotableBrand<{}, {
         makeInvitation: () => Promise<Invitation<unknown, never>>;
     }>;
 };

package/src/contracts/callSpread/pricedCallSpread.d.ts

@@ -56,7 +56,7 @@ export function start(zcf: ZCF<{
             longInvitation: Promise<Invitation<unknown, never>>;
             shortInvitation: Promise<Invitation<unknown, never>>;
         };
-    } & import("@endo/eventual-send").RemotableBrand<{}, {
+    } & import("@endo/marshal").RemotableObject<`Alleged: ${string}`> & import("@endo/eventual-send").RemotableBrand<{}, {
         makeInvitationPair: (longCollateralShare: any) => {
             longInvitation: Promise<Invitation<unknown, never>>;
             shortInvitation: Promise<Invitation<unknown, never>>;

package/src/contracts/callSpread/pricedCallSpread.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"pricedCallSpread.d.ts","sourceRoot":"","sources":["pricedCallSpread.js"],"names":[],"mappings":"AA0BA;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GA4CG;AACH;kBARiB,MAAM,CAAC,KAAK,CAAC;kBACb,MAAM,CAAC,KAAK,CAAC;sBACT,MAAM,CAAC,KAAK,CAAC;;gBAEnB,MAAM;sBACA,MAAM,CAAC,KAAK,CAAC;;;;;;;;;;;;;EA0GjC;oCA5J4F,4BAA4B"}
+{"version":3,"file":"pricedCallSpread.d.ts","sourceRoot":"","sources":["pricedCallSpread.js"],"names":[],"mappings":"AA0BA;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GA4CG;AACH;kBARiB,MAAM,CAAC,KAAK,CAAC;kBACb,MAAM,CAAC,KAAK,CAAC;sBACT,MAAM,CAAC,KAAK,CAAC;;gBAEnB,MAAM;sBACA,MAAM,CAAC,KAAK,CAAC;;;;;;;;;;;;;EA2GjC;oCA7J4F,4BAA4B"}

package/src/contracts/callSpread/pricedCallSpread.js

@@ -104,6 +104,7 @@ const start = zcf => {
     const invitationIssuer = zcf.getInvitationIssuer();
     const payment = harden({ Option: option });
     const Option = await E(invitationIssuer).getAmountOf(option);
+    /** @type {any} */
     const spreadAmount = harden({
       Option,
     });

package/src/contracts/loan/borrow.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"borrow.d.ts","sourceRoot":"","sources":["borrow.js"],"names":[],"mappings":"AAkBA,mCAAmC;AACnC,mCADW,oBAAoB,CAoI7B"}
+{"version":3,"file":"borrow.d.ts","sourceRoot":"","sources":["borrow.js"],"names":[],"mappings":"AAkBA,mCAAmC;AACnC,mCADW,oBAAoB,CAsI7B"}

package/src/contracts/loan/borrow.js

@@ -39,7 +39,9 @@ export const makeBorrowInvitation = (zcf, config) => {
 
     const collateralGiven = borrowerSeat.getAmountAllocated(
       'Collateral',
-      borrowerSeat.getProposal().give.Collateral.brand,
+      /** @type {Brand<'nat'>} */ (
+        borrowerSeat.getProposal().give.Collateral.brand
+      ),
     );
     const loanWanted = borrowerSeat.getProposal().want.Loan;
     const loanBrand = zcf.getTerms().brands.Loan;

package/src/contracts/mintPayments.d.ts

@@ -16,15 +16,15 @@
 export function start(zcf: ZCF): Promise<{
     creatorFacet: {
         makeInvitation: (value?: bigint) => Promise<Invitation<string, undefined>>;
-        getTokenIssuer: () => globalThis.Issuer<"nat">;
-    } & import("@endo/eventual-send").RemotableBrand<{}, {
+        getTokenIssuer: () => globalThis.Issuer<"nat", import("@endo/patterns").Key>;
+    } & import("@endo/marshal").RemotableObject<`Alleged: ${string}`> & import("@endo/eventual-send").RemotableBrand<{}, {
         makeInvitation: (value?: bigint) => Promise<Invitation<string, undefined>>;
-        getTokenIssuer: () => globalThis.Issuer<"nat">;
+        getTokenIssuer: () => globalThis.Issuer<"nat", import("@endo/patterns").Key>;
     }>;
     publicFacet: {
-        getTokenIssuer: () => globalThis.Issuer<"nat">;
-    } & import("@endo/eventual-send").RemotableBrand<{}, {
-        getTokenIssuer: () => globalThis.Issuer<"nat">;
+        getTokenIssuer: () => globalThis.Issuer<"nat", import("@endo/patterns").Key>;
+    } & import("@endo/marshal").RemotableObject<`Alleged: ${string}`> & import("@endo/eventual-send").RemotableBrand<{}, {
+        getTokenIssuer: () => globalThis.Issuer<"nat", import("@endo/patterns").Key>;
     }>;
 }>;
 //# sourceMappingURL=mintPayments.d.ts.map

package/src/contracts/oracle.d.ts

@@ -8,7 +8,7 @@ export type OracleStart = typeof start;
 export function start(zcf: ZCF): Promise<{
     creatorFacet: {
         initialize(privateParams: any): OracleCreatorFacet;
-    } & import("@endo/eventual-send").RemotableBrand<{}, {
+    } & import("@endo/marshal").RemotableObject<`Alleged: ${string}`> & import("@endo/eventual-send").RemotableBrand<{}, {
         initialize(privateParams: any): OracleCreatorFacet;
     }>;
     publicFacet: {
@@ -16,7 +16,7 @@ export function start(zcf: ZCF): Promise<{
         query(query: OracleQuery): Promise<unknown>;
         /** @param {OracleQuery} query */
         makeQueryInvitation(query: OracleQuery): Promise<Invitation<unknown, never>>;
-    } & import("@endo/eventual-send").RemotableBrand<{}, {
+    } & import("@endo/marshal").RemotableObject<`Alleged: ${string}`> & import("@endo/eventual-send").RemotableBrand<{}, {
         /** @param {OracleQuery} query */
         query(query: OracleQuery): Promise<unknown>;
         /** @param {OracleQuery} query */

package/src/contracts/otcDesk.d.ts

@@ -56,7 +56,7 @@ export function start(zcf: ZCF<Record<string, any>>): {
          */
         makeRemoveInventoryInvitation: () => Promise<Payment>;
         makeQuote: (price: AmountKeywordRecord, assets: AmountKeywordRecord, timeAuthority: import("@agoric/time").TimerService, deadline: any) => Promise<Payment>;
-    } & import("@endo/eventual-send").RemotableBrand<{}, {
+    } & import("@endo/marshal").RemotableObject<`Alleged: ${string}`> & import("@endo/eventual-send").RemotableBrand<{}, {
         /**
          * The inventory can be added in bulk before any quotes are made
          * or can be added immediately before a quote.

package/src/contracts/priceAggregator.d.ts

@@ -20,7 +20,7 @@ export type PriceAggregatorContract = ContractOf<typeof start>;
  * }>} zcf
  * @param {{
  * marshaller: Marshaller,
- * quoteMint?: ERef<Mint<'set'>>,
+ * quoteMint?: ERef<Mint<'set', PriceDescription>>,
  * storageNode: ERef<StorageNode>,
  * }} privateArgs
  */
@@ -32,7 +32,7 @@ export function start(zcf: ZCF<{
     unitAmountIn: Amount<"nat">;
 }>, privateArgs: {
     marshaller: Marshaller;
-    quoteMint?: ERef<Mint<"set">>;
+    quoteMint?: globalThis.ERef<globalThis.Mint<"set", PriceDescription>> | undefined;
     storageNode: ERef<StorageNode>;
 }): Promise<{
     creatorFacet: {
@@ -63,7 +63,7 @@ export function start(zcf: ZCF<{
          * @returns {Promise<OracleAdmin<Price>>}
          */
         initOracle: (oracleInstance?: string | Instance | undefined, query?: OracleQuery | undefined) => Promise<OracleAdmin<Price>>;
-    } & import("@endo/eventual-send").RemotableBrand<{}, {
+    } & import("@endo/marshal").RemotableObject<`Alleged: ${string}`> & import("@endo/eventual-send").RemotableBrand<{}, {
         /**
          * An "oracle invitation" is an invitation to be able to submit data to
          * include in the priceAggregator's results.
@@ -97,11 +97,12 @@ export function start(zcf: ZCF<{
         getSubscriber: () => globalThis.StoredSubscriber<unknown>;
         /** Diagnostic tool */
         getRoundCompleteNotifier(): Promise<globalThis.Notifier<any>>;
-    } & import("@endo/eventual-send").RemotableBrand<{}, {
+    } & import("@endo/marshal").RemotableObject<`Alleged: ${string}`> & import("@endo/eventual-send").RemotableBrand<{}, {
         getPriceAuthority(): import("@agoric/zoe/tools/types.js").PriceAuthority;
         getSubscriber: () => globalThis.StoredSubscriber<unknown>;
         /** Diagnostic tool */
         getRoundCompleteNotifier(): Promise<globalThis.Notifier<any>>;
     }>;
 }>;
+import type { PriceDescription } from '@agoric/zoe/tools/types.js';
 //# sourceMappingURL=priceAggregator.d.ts.map

package/src/contracts/priceAggregator.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"priceAggregator.d.ts","sourceRoot":"","sources":["priceAggregator.js"],"names":[],"mappings":"6BAoCc,MAAM,GAAG,MAAM,GAAG,MAAM;oCAEzB,QAAQ,CAAC,cAAc,GAAG;IAAE,IAAI,EAAE,cAAc,CAAA;CAAE,CAAC;oBAGlD,cAAc,GAAG,KAAK;sCAmlBtB,UAAU,CAAC,OAAO,KAAK,CAAC;AA9kBtC;;;;;;;;;;;;;;;;;;;GAmBG;AACH,2BAbW,GAAG,CAAC;IACd,KAAO,EAAE,OAAO,cAAc,EAAE,YAAY,CAAC;IAC7C,aAAe,EAAE,MAAM,CAAC;IACxB,OAAS,EAAE,KAAK,CAAC,KAAK,CAAC,CAAC;IACxB,QAAU,EAAE,KAAK,CAAC,KAAK,CAAC,CAAC;IACzB,YAAc,EAAE,MAAM,CAAC,KAAK,CAAC,CAAC;CAC3B,CAAC,eACM;IACV,UAAY,EAAE,UAAU,CAAC;IACzB,SAAW,CAAC,EAAE,IAAI,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,CAAC;IAChC,WAAa,EAAE,IAAI,CAAC,WAAW,CAAC,CAAC;CAC9B;;QAgXA;;;;;;;;;WASG;;mBAY4B,WAAW,CAAC,KAAK,CAAC;8BAAoB;gBAAC,SAAS,EAAE,CAAC,KAAK,EAAE,cAAc,KAAK,OAAO,CAAC,UAAU,CAAC,IAAI,CAAC,CAAC,CAAA;aAAC;;;;;QA0CtI,mCAAmC;kCAAvB,SAAS;QAarB;;;;WAIG;yGADU,OAAO,CAAC,WAAW,CAAC,KAAK,CAAC,CAAC;;QA/ExC;;;;;;;;;WASG;;mBAY4B,WAAW,CAAC,KAAK,CAAC;8BAAoB;gBAAC,SAAS,EAAE,CAAC,KAAK,EAAE,cAAc,KAAK,OAAO,CAAC,UAAU,CAAC,IAAI,CAAC,CAAC,CAAA;aAAC;;;;;QA0CtI,mCAAmC;kCAAvB,SAAS;QAarB;;;;WAIG;yGADU,OAAO,CAAC,WAAW,CAAC,KAAK,CAAC,CAAC;;;;;QAmHxC,sBAAsB;;;;;QAAtB,sBAAsB;;;GAOzB"}
+{"version":3,"file":"priceAggregator.d.ts","sourceRoot":"","sources":["priceAggregator.js"],"names":[],"mappings":"6BAoCc,MAAM,GAAG,MAAM,GAAG,MAAM;oCAEzB,QAAQ,CAAC,cAAc,GAAG;IAAE,IAAI,EAAE,cAAc,CAAA;CAAE,CAAC;oBAGlD,cAAc,GAAG,KAAK;sCAglBtB,UAAU,CAAC,OAAO,KAAK,CAAC;AA3kBtC;;;;;;;;;;;;;;;;;;;GAmBG;AACH,2BAbW,GAAG,CAAC;IACd,KAAO,EAAE,OAAO,cAAc,EAAE,YAAY,CAAC;IAC7C,aAAe,EAAE,MAAM,CAAC;IACxB,OAAS,EAAE,KAAK,CAAC,KAAK,CAAC,CAAC;IACxB,QAAU,EAAE,KAAK,CAAC,KAAK,CAAC,CAAC;IACzB,YAAc,EAAE,MAAM,CAAC,KAAK,CAAC,CAAC;CAC3B,CAAC;gBAEU,UAAU;;iBAET,IAAI,CAAC,WAAW,CAAC;;;QA8W7B;;;;;;;;;WASG;;mBAY4B,WAAW,CAAC,KAAK,CAAC;8BAAoB;gBAAC,SAAS,EAAE,CAAC,KAAK,EAAE,cAAc,KAAK,OAAO,CAAC,UAAU,CAAC,IAAI,CAAC,CAAC,CAAA;aAAC;;;;;QA0CtI,mCAAmC;kCAAvB,SAAS;QAarB;;;;WAIG;yGADU,OAAO,CAAC,WAAW,CAAC,KAAK,CAAC,CAAC;;QA/ExC;;;;;;;;;WASG;;mBAY4B,WAAW,CAAC,KAAK,CAAC;8BAAoB;gBAAC,SAAS,EAAE,CAAC,KAAK,EAAE,cAAc,KAAK,OAAO,CAAC,UAAU,CAAC,IAAI,CAAC,CAAC,CAAA;aAAC;;;;;QA0CtI,mCAAmC;kCAAvB,SAAS;QAarB;;;;WAIG;yGADU,OAAO,CAAC,WAAW,CAAC,KAAK,CAAC,CAAC;;;;;QAmHxC,sBAAsB;;;;;QAAtB,sBAAsB;;;GAOzB;sCAplB4E,4BAA4B"}

package/src/contracts/priceAggregator.js

@@ -60,7 +60,7 @@ const priceDescriptionFromQuote = quote => quote.quoteAmount.value[0];
  * }>} zcf
  * @param {{
  * marshaller: Marshaller,
- * quoteMint?: ERef<Mint<'set'>>,
+ * quoteMint?: ERef<Mint<'set', PriceDescription>>,
  * storageNode: ERef<StorageNode>,
  * }} privateArgs
  */
@@ -78,12 +78,11 @@ const start = async (zcf, privateArgs) => {
   const { marshaller, storageNode } = privateArgs;
   assertAllDefined({ marshaller, storageNode });
 
+  /** @type {ERef<Mint<'set', PriceDescription>>} */
   const quoteMint =
     privateArgs.quoteMint ||
     // makeIssuerKit fails upgrade, this contract is for demo only
     makeIssuerKit('quote', AssetKind.SET).mint;
-  /** @type {IssuerRecord<'set'>} */
-  // xxx saveIssuer not generic
   const quoteIssuerRecord = await zcf.saveIssuer(
     E(quoteMint).getIssuer(),
     'Quote',
@@ -101,8 +100,6 @@ const start = async (zcf, privateArgs) => {
    * @param {PriceQuoteValue} quote
    */
   const authenticateQuote = async quote => {
-    /** @type {Amount<'set'>} */
-    // xxx type should be inferred from brand and value
     const quoteAmount = AmountMath.make(quoteKit.brand, harden(quote));
     const quotePayment = await E(quoteKit.mint).mintPayment(quoteAmount);
     return harden({ quoteAmount, quotePayment });

package/src/contracts/simpleExchange.d.ts

@@ -26,7 +26,7 @@ export function start(zcf: ZCF): {
             buys: any;
             sells: any;
         }>;
-    } & import("@endo/eventual-send").RemotableBrand<{}, {
+    } & import("@endo/marshal").RemotableObject<`Alleged: ${string}`> & import("@endo/eventual-send").RemotableBrand<{}, {
         makeInvitation: () => Promise<Invitation<unknown, never>>;
         getNotifier: () => globalThis.Notifier<{
             buys: any;

package/src/internal-types.d.ts

@@ -24,7 +24,7 @@ type ZoeSeatAdminKit = {
  */
 type MakeZoeSeatAdminKit = (initialAllocation: Allocation, instanceAdminHelper: InstanceAdminHelper, proposal: ProposalRecord, withdrawFacet: WithdrawFacet, exitObj: ERef<ExitObj>, offerResult?: ERef<unknown>, baggage: import("@agoric/vat-data").Baggage) => ZoeSeatAdminKit;
 type ZoeSeatAdminExit = (completion?: Completion) => void;
-type ZoeSeatAdmin = {
+type ZoeSeatAdminMethods = {
     replaceAllocation: (allocation: Allocation) => void;
     exit: ZoeSeatAdminExit;
     /**
@@ -34,8 +34,9 @@ type ZoeSeatAdmin = {
     fail: import("@agoric/swingset-vat").ShutdownWithFailure;
     getExitSubscriber: () => Subscriber<AmountKeywordRecord>;
 };
+type ZoeSeatAdmin = import("@endo/marshal").RemotableObject & ZoeSeatAdminMethods;
 type HandleOfferResult = {
-    offerResultPromise: Promise<unknown>;
+    offerResultPromise: Promise<import("@endo/marshal").Passable>;
     exitObj: ExitObj;
 };
 /**
@@ -72,7 +73,7 @@ type HandleOfferObj = {
 type ZoeInstanceAdminMakeInvitation = (invitationHandle: InvitationHandle, description: string, customDetails?: Record<string, any> | undefined, proposalShape?: Pattern) => Invitation;
 type ZoeInstanceAdmin = {
     makeInvitation: ZoeInstanceAdminMakeInvitation;
-    saveIssuer: (issuerP: ERef<Issuer>, keyword: Keyword) => Promise<IssuerRecord>;
+    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;
@@ -90,7 +91,7 @@ type ZoeInstanceAdmin = {
 type RegisterFeeMint = (keyword: Keyword, allegedFeeMintAccess: FeeMintAccess) => ZoeMint<"nat">;
 type WrapIssuerKitWithZoeMint = (keyword: Keyword, localIssuerKit: IssuerKit) => any;
 type MakeZoeMint = (keyword: Keyword, assetKind?: globalThis.AssetKind | undefined, displayInfo?: globalThis.AdditionalDisplayInfo | undefined, options?: Partial<{
-    elementShape: any;
+    elementShape: globalThis.Pattern;
     recoverySetsOption: import("@agoric/ertp/exported.js").RecoverySetsOption;
 }> | undefined) => ZoeMint;
 type MakeNoEscrowSeat = (initialAllocation: Allocation, proposal: ProposalRecord, exitObj: ExitObj, seatHandle: SeatHandle) => UserSeat;

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

@@ -53,13 +53,16 @@
  */
 
 /**
- * @typedef {object} ZoeSeatAdmin
+ * @typedef ZoeSeatAdminMethods
  * @property {(allocation: Allocation) => void} replaceAllocation
  * @property {ZoeSeatAdminExit} exit
  * @property {import('@agoric/swingset-vat').ShutdownWithFailure} fail called with the reason
  * for calling fail on this seat, where reason is normally an instanceof Error.
  * @property {() => Subscriber<AmountKeywordRecord>} getExitSubscriber
  */
+/**
+ * @typedef {import('@endo/marshal').RemotableObject & ZoeSeatAdminMethods} ZoeSeatAdmin
+ */
 
 /**
  * @callback {(brand: Brand) => AssetKind} GetAssetKind
@@ -67,7 +70,7 @@
 
 /**
  * @typedef {object} HandleOfferResult
- * @property {Promise<unknown>} offerResultPromise
+ * @property {Promise<import('@endo/marshal').Passable>} offerResultPromise
  * @property {ExitObj} exitObj
  */
 
@@ -122,9 +125,9 @@
 /**
  * @typedef {object} ZoeInstanceAdmin
  * @property {ZoeInstanceAdminMakeInvitation} makeInvitation
- * @property {(issuerP: ERef<Issuer>,
+ * @property {<I extends Issuer>(issuerP: ERef<I>,
  *             keyword: Keyword
- *            ) => Promise<IssuerRecord>} saveIssuer
+ *            ) => Promise<I extends Issuer<infer K, infer M> ? IssuerRecord<K, M> : never>} saveIssuer
  * @property {MakeZoeMint} makeZoeMint
  * @property {RegisterFeeMint} registerFeeMint
  * @property {MakeNoEscrowSeat} makeNoEscrowSeat

package/src/typeGuards.d.ts

@@ -163,7 +163,7 @@ export const HandleOfferI: import("@endo/patterns").InterfaceGuard<{
 }>;
 export namespace PriceQuoteShape {
     export { AmountShape as quoteAmount };
-    export let quotePayment: any;
+    export let quotePayment: globalThis.Pattern;
 }
 import { AmountShape } from '@agoric/ertp';
 //# sourceMappingURL=typeGuards.d.ts.map

package/src/types-ambient.d.ts

@@ -1,10 +1,7 @@
 /**
- * A type constructor for an opaque type
- * identified by the H string. This uses an intersection type
- * ('MyHandle' & {}) to tag the handle's type even though the actual
- * value is just an empty object.
+ * Alias for RemotableObject
  */
-type Handle<H extends string> = H & typeof import("@endo/marshal").Remotable;
+type Handle<H extends string> = import("@endo/marshal").RemotableObject<H>;
 type Keyword = string;
 /**
  * - an opaque handle for an invitation
@@ -34,11 +31,11 @@ type InstanceRecord = {
      */
     terms: AnyTerms;
 };
-type IssuerRecord<K extends globalThis.AssetKind = globalThis.AssetKind> = {
+type IssuerRecord<K extends globalThis.AssetKind = globalThis.AssetKind, M extends import("@endo/patterns").Key = import("@endo/patterns").Key> = {
     brand: Brand<K>;
-    issuer: Issuer<K>;
+    issuer: Issuer<K, M>;
     assetKind: K;
     displayInfo?: globalThis.DisplayInfo<K> | undefined;
 };
-type Allocation<K extends globalThis.AssetKind = globalThis.AssetKind> = AmountKeywordRecord;
+type Allocation<K extends globalThis.AssetKind = globalThis.AssetKind, M extends import("@endo/patterns").Key = import("@endo/patterns").Key> = AmountKeywordRecord;
 //# 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":";;;;;;YAMa,CAAC,mBAAD,CAAC,2CAAoC;eAOrC,MAAM;;;;wBACN,MAAM,CAAC,YAAY,CAAC;2BACpB,MAAM,CAAC,OAAO,EAAE,MAAM,CAAC,GAAG,CAAC,CAAC;4BAC5B,MAAM,CAAC,OAAO,EAAE,IAAI,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,CAAC;0BAClC,MAAM,CAAC,OAAO,EAAE,KAAK,CAAC,GAAG,CAAC,CAAC;;;;;;aAK1B,mBAAmB;;;;;YAEnB,kBAAkB;;gBAGnB,aAAa,GAAG,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC;;kBAGlC,YAAY;cACZ,OAAO,uBAAuB,EAAE,QAAQ,CAAC,GAAG,CAAC;;;;WAC7C,QAAQ;;kBAQR,CAAC;WAFD,KAAK,CAEL,CAAC,AAFM,CAAC;YACR,MAAM,CACN,CAAC,AADO,CAAC;eACT,CAAC;;;yEAGF,mBAAmB"}
+{"version":3,"file":"types-ambient.d.ts","sourceRoot":"","sources":["types-ambient.js"],"names":[],"mappings":";;;YAMqD,CAAC,mBAAzC,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,IAAI,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,CAAC;0BAClC,MAAM,CAAC,OAAO,EAAE,KAAK,CAAC,GAAG,CAAC,CAAC;;;;;;aAK1B,mBAAmB;;;;;YAEnB,kBAAkB;;gBAGnB,aAAa,GAAG,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC;;kBAGlC,YAAY;cACZ,OAAO,uBAAuB,EAAE,QAAQ,CAAC,GAAG,CAAC;;;;WAC7C,QAAQ;;kBASR,CAAC,sDADS,CAAC;WADX,KAAK,CAEL,CAAC,AAFM,CAAC;YACR,MAAM,CACN,CAAC,AADO,EAAE,CAAC,CAAC;eACZ,CAAC;;;gJAGF,mBAAmB"}

package/src/types-ambient.js

@@ -4,10 +4,7 @@
 
 /**
  * @template {string} H - the name of the handle
- * @typedef {H & import("@endo/marshal").Remotable} Handle A type constructor for an opaque type
- * identified by the H string. This uses an intersection type
- * ('MyHandle' & {}) to tag the handle's type even though the actual
- * value is just an empty object.
+ * @typedef {import("@endo/marshal").RemotableObject<H>} Handle Alias for RemotableObject
  */
 
 /**
@@ -35,9 +32,10 @@
 
 /**
  * @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>} issuer
+ * @property {Issuer<K, M>} issuer
  * @property {K} assetKind
  * @property {DisplayInfo<K>} [displayInfo]
  *

package/src/zoeService/escrowStorage.js

@@ -16,7 +16,7 @@ import { cleanKeywords } from '../cleanProposal.js';
  * @param {import('@agoric/vat-data').Baggage} baggage
  */
 export const provideEscrowStorage = baggage => {
-  /** @type {WeakMapStore<Brand, ERef<Purse>>} */
+  /** @type {WeakMapStore<Brand, Purse>} */
   const brandToPurse = provideDurableWeakMapStore(baggage, 'brandToPurse');
 
   /** @type {CreatePurse} */

package/src/zoeService/feeMint.d.ts

@@ -15,7 +15,7 @@ export namespace defaultFeeIssuerConfig {
 export function prepareFeeMint(zoeBaggage: import("@agoric/vat-data").Baggage, feeIssuerConfig: FeeIssuerConfig, shutdownZoeVat: import("@agoric/swingset-vat").ShutdownWithFailure): import("@endo/exo").GuardedKit<{
     feeMint: {
         getFeeIssuerKit(allegedFeeMintAccess: any): globalThis.IssuerKit<"nat">;
-        getFeeIssuer(): globalThis.Issuer<"nat">;
+        getFeeIssuer(): globalThis.Issuer<"nat", import("@endo/patterns").Key>;
         getFeeBrand(): globalThis.Brand<"nat">;
     };
     feeMintAccess: {};

package/src/zoeService/makeInvitation.d.ts

@@ -1,5 +1,5 @@
 export function prepareInvitationKit(baggage: import("@agoric/vat-data").Baggage, shutdownZoeVat?: import("@agoric/swingset-vat").ShutdownWithFailure | undefined): {
-    invitationIssuer: globalThis.Issuer<"set">;
-    invitationKit: globalThis.IssuerKit<"set">;
+    invitationIssuer: globalThis.Issuer<"set", InvitationDetails>;
+    invitationKit: globalThis.IssuerKit<"set", InvitationDetails>;
 };
 //# 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;;;EA6BxE"}
+{"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;;;EAgCxE"}

package/src/zoeService/makeInvitation.js

@@ -28,6 +28,9 @@ export const prepareInvitationKit = (baggage, shutdownZoeVat = undefined) => {
     // Upgrade this legacy state by simply deleting it.
     invitationKitBaggage.delete(ZOE_INVITATION_KIT);
   }
+
+  /** @type {IssuerKit<'set', InvitationDetails>} */
+  // @ts-expect-error cast
   const invitationKit = prepareIssuerKit(
     invitationKitBaggage,
     'Zoe Invitation',

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

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

package/src/zoeService/originalZoeSeat.js

@@ -135,7 +135,7 @@ export const declareOldZoeSeatAdminKind = (baggage, makeDurablePublishKit) => {
         currentAllocation: initialAllocation,
         proposal,
         exitObj,
-        offerResult: undefined,
+        offerResult: /** @type {any} */ (undefined),
         offerResultStored: offerResultIsUndefined,
         instanceAdminHelper,
         withdrawFacet,
@@ -217,7 +217,7 @@ export const declareOldZoeSeatAdminKind = (baggage, makeDurablePublishKit) => {
           }
 
           const pKit = ephemeralOfferResultStore.get(facets.userSeat);
-          E.when(
+          void E.when(
             offerResultPromise,
             offerResult => {
               // Resolve the ephemeral promise for offerResult
@@ -240,7 +240,8 @@ export const declareOldZoeSeatAdminKind = (baggage, makeDurablePublishKit) => {
                     ephemeralOfferResultStore.delete(facets.userSeat);
                   } catch (err) {
                     console.warn(
-                      `non-durable offer result will be lost upon zoe vat termination: ${offerResult}`,
+                      'non-durable offer result will be lost upon zoe vat termination:',
+                      offerResult,
                     );
                   }
                 },

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,wBAEvB,OAAO,YAAY,EAAE,aAAa,CAiW9C;wBA1Wc,OAAO,sBAAsB,EAAE,SAAS;6BAD5B,kBAAkB"}
+{"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,wBAEvB,OAAO,YAAY,EAAE,aAAa,CAsW9C;wBA/Wc,OAAO,sBAAsB,EAAE,SAAS;6BAD5B,kBAAkB"}

package/src/zoeService/startInstance.js

@@ -274,9 +274,13 @@ export const makeStartInstance = (
     },
   );
 
+  /**
+   * @type {import('./utils.js').StartInstance}
+   */
   const startInstance = async (
     installationP,
     uncleanIssuerKeywordRecord = harden({}),
+    // @ts-expect-error FIXME may not match the expected terms of SF
     customTerms = harden({}),
     privateArgs = undefined,
     instanceLabel = '',
@@ -330,6 +334,7 @@ export const makeStartInstance = (
     void watchForAdminNodeDone(adminNode, instanceAdmin);
 
     /** @type {ZoeInstanceAdmin} */
+    // @ts-expect-error XXX saveIssuer
     const zoeInstanceAdminForZcf = makeZoeInstanceAdmin(
       zoeInstanceStorageManager,
       instanceAdmin,
@@ -355,6 +360,7 @@ export const makeStartInstance = (
 
     // creatorInvitation can be undefined, but if it is defined,
     // let's make sure it is an invitation.
+    // @ts-expect-error cast
     return E.when(
       Promise.all([
         creatorInvitationP,
@@ -383,6 +389,5 @@ export const makeStartInstance = (
       },
     );
   };
-  // @ts-expect-error cast
   return harden(startInstance);
 };

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

@@ -43,7 +43,7 @@ type ZoeService = {
     getBundleIDFromInstallation: GetBundleIDFromInstallation;
     getProposalShapeForInvitation: (invitationHandle: InvitationHandle) => Pattern | undefined;
 };
-type GetInvitationIssuer = () => Promise<Issuer<"set">>;
+type GetInvitationIssuer = () => Promise<Issuer<"set", InvitationDetails>>;
 type GetFeeIssuer = () => Promise<Issuer<"nat">>;
 type GetConfiguration = () => {
     feeIssuerConfig: FeeIssuerConfig;
@@ -161,7 +161,7 @@ type ProposalRecord = {
  * { Asset: AmountMath.make(assetBrand, 5n), Price:
  * AmountMath.make(priceBrand, 9n) }
  */
-type AmountKeywordRecord = Record<Keyword, Amount<any>>;
+type AmountKeywordRecord = Record<Keyword, import("@agoric/ertp/exported.js").AnyAmount>;
 type Waker = {
     wake: () => void;
 };