@agoric/inter-protocol 0.16.2-other-dev-fbe72e7.0.fbe72e7 → 0.16.2-other-dev-d15096d.0.d15096d

package/src/clientSupport.d.ts

@@ -1,9 +1,6 @@
-export function lookupOfferIdForVault(vaultId: string, currentP: Promise<import("@agoric/smart-wallet/src/smartWallet.js").CurrentWalletRecord>): Promise<string>;
-export function makeParseAmount(agoricNames: Pick<import("@agoric/vats/tools/board-utils.js").AgoricNamesRemotes, "brand" | "vbankAsset">, makeError?: (msg: string) => Error): (a: string) => Amount<"nat">;
+export function lookupOfferIdForVault(vaultId: string, currentP: Promise<CurrentWalletRecord>): Promise<string>;
+export function makeParseAmount(agoricNames: Pick<AgoricNamesRemotes, "brand" | "vbankAsset">, makeError?: (msg: string) => Error): (a: string) => Amount<"nat">;
 export namespace Offers {
-    namespace auction {
-        export { makeBidOffer as Bid };
-    }
     namespace fluxAggregator {
         export { makePushPriceOffer as PushPrice };
     }
@@ -19,37 +16,9 @@ export namespace Offers {
         export { makeAddCollateralOffer as AddCollateral };
     }
 }
+import type { CurrentWalletRecord } from '@agoric/smart-wallet/src/smartWallet.js';
+import type { AgoricNamesRemotes } from '@agoric/vats/tools/board-utils.js';
 import type { Amount } from '@agoric/ertp';
-/**
- * @param {Pick<
- *   import('@agoric/vats/tools/board-utils.js').AgoricNamesRemotes,
- *   'brand' | 'vbankAsset'
- * >} agoricNames
- * @param {{
- *   offerId: string;
- *   give: string;
- *   maxBuy: string;
- *   wantMinimum?: string;
- * } & (
- *   | {
- *       price: number;
- *     }
- *   | {
- *       discount: number; // -1 to 1. e.g. 0.10 for 10% discount, -0.05 for 5% markup
- *     }
- * )} opts
- * @returns {import('@agoric/smart-wallet/src/offers.js').OfferSpec}
- */
-declare function makeBidOffer(agoricNames: Pick<import("@agoric/vats/tools/board-utils.js").AgoricNamesRemotes, "brand" | "vbankAsset">, opts: {
-    offerId: string;
-    give: string;
-    maxBuy: string;
-    wantMinimum?: string;
-} & ({
-    price: number;
-} | {
-    discount: number;
-})): import("@agoric/smart-wallet/src/offers.js").OfferSpec;
 /**
  * @param {unknown} _agoricNames
  * @param {{
@@ -58,26 +27,23 @@ declare function makeBidOffer(agoricNames: Pick<import("@agoric/vats/tools/board
  *   unitPrice: bigint;
  * }} opts
  * @param {string} previousOffer
- * @returns {import('@agoric/smart-wallet/src/offers.js').OfferSpec}
+ * @returns {OfferSpec}
  */
 declare function makePushPriceOffer(_agoricNames: unknown, opts: {
     offerId: string;
     roundId?: bigint;
     unitPrice: bigint;
-}, previousOffer: string): import("@agoric/smart-wallet/src/offers.js").OfferSpec;
+}, previousOffer: string): OfferSpec;
 /**
- * @param {Pick<
- *   import('@agoric/vats/tools/board-utils.js').AgoricNamesRemotes,
- *   'brand'
- * >} agoricNames
- * @param {Instance} instance
+ * @param {Pick<AgoricNamesRemotes, 'brand'>} agoricNames
+ * @param {Instance<unknown>} instance
  * @param {{ offerId: string; feePct?: number; pair: [string, string] } & (
  *   | { wantMinted: number }
  *   | { giveMinted: number }
  * )} opts
- * @returns {import('@agoric/smart-wallet/src/offers.js').OfferSpec}
+ * @returns {OfferSpec}
  */
-declare function makePsmSwapOffer({ brand }: Pick<import("@agoric/vats/tools/board-utils.js").AgoricNamesRemotes, "brand">, instance: Instance, opts: {
+declare function makePsmSwapOffer({ brand }: Pick<AgoricNamesRemotes, "brand">, instance: Instance<unknown>, opts: {
     offerId: string;
     feePct?: number;
     pair: [string, string];
@@ -85,31 +51,25 @@ declare function makePsmSwapOffer({ brand }: Pick<import("@agoric/vats/tools/boa
     wantMinted: number;
 } | {
     giveMinted: number;
-})): import("@agoric/smart-wallet/src/offers.js").OfferSpec;
+})): OfferSpec;
 /**
- * @param {Pick<
- *   import('@agoric/vats/tools/board-utils.js').AgoricNamesRemotes,
- *   'brand'
- * >} agoricNames
+ * @param {Pick<AgoricNamesRemotes, 'brand'>} agoricNames
  * @param {{
  *   offerId: string;
  *   wantMinted: number;
  *   giveCollateral: number;
  *   collateralBrandKey: string;
  * }} opts
- * @returns {import('@agoric/smart-wallet/src/offers.js').OfferSpec}
+ * @returns {OfferSpec}
  */
-declare function makeOpenOffer({ brand }: Pick<import("@agoric/vats/tools/board-utils.js").AgoricNamesRemotes, "brand">, opts: {
+declare function makeOpenOffer({ brand }: Pick<AgoricNamesRemotes, "brand">, opts: {
     offerId: string;
     wantMinted: number;
     giveCollateral: number;
     collateralBrandKey: string;
-}): import("@agoric/smart-wallet/src/offers.js").OfferSpec;
+}): OfferSpec;
 /**
- * @param {Pick<
- *   import('@agoric/vats/tools/board-utils.js').AgoricNamesRemotes,
- *   'brand'
- * >} agoricNames
+ * @param {Pick<AgoricNamesRemotes, 'brand'>} agoricNames
  * @param {{
  *   offerId: string;
  *   collateralBrandKey?: string;
@@ -119,50 +79,45 @@ declare function makeOpenOffer({ brand }: Pick<import("@agoric/vats/tools/board-
  *   wantMinted?: number;
  * }} opts
  * @param {string} previousOffer
- * @returns {import('@agoric/smart-wallet/src/offers.js').OfferSpec}
+ * @returns {OfferSpec}
  */
-declare function makeAdjustOffer({ brand }: Pick<import("@agoric/vats/tools/board-utils.js").AgoricNamesRemotes, "brand">, opts: {
+declare function makeAdjustOffer({ brand }: Pick<AgoricNamesRemotes, "brand">, opts: {
     offerId: string;
     collateralBrandKey?: string;
     giveCollateral?: number;
     wantCollateral?: number;
     giveMinted?: number;
     wantMinted?: number;
-}, previousOffer: string): import("@agoric/smart-wallet/src/offers.js").OfferSpec;
+}, previousOffer: string): OfferSpec;
 /**
- * @param {Pick<
- *   import('@agoric/vats/tools/board-utils.js').AgoricNamesRemotes,
- *   'brand'
- * >} agoricNames
+ * @param {Pick<AgoricNamesRemotes, 'brand'>} agoricNames
  * @param {{
  *   offerId: string;
  *   collateralBrandKey?: string;
  *   giveMinted: number;
  * }} opts
  * @param {string} previousOffer
- * @returns {import('@agoric/smart-wallet/src/offers.js').OfferSpec}
+ * @returns {OfferSpec}
  */
-declare function makeCloseOffer({ brand }: Pick<import("@agoric/vats/tools/board-utils.js").AgoricNamesRemotes, "brand">, opts: {
+declare function makeCloseOffer({ brand }: Pick<AgoricNamesRemotes, "brand">, opts: {
     offerId: string;
     collateralBrandKey?: string;
     giveMinted: number;
-}, previousOffer: string): import("@agoric/smart-wallet/src/offers.js").OfferSpec;
+}, previousOffer: string): OfferSpec;
 /**
- * @param {Pick<
- *   import('@agoric/vats/tools/board-utils.js').AgoricNamesRemotes,
- *   'brand'
- * >} agoricNames
+ * @param {Pick<AgoricNamesRemotes, 'brand'>} agoricNames
  * @param {{
  *   offerId: string;
  *   give: number;
  *   collateralBrandKey: string;
  * }} opts
- * @returns {import('@agoric/smart-wallet/src/offers.js').OfferSpec}
+ * @returns {OfferSpec}
  */
-declare function makeAddCollateralOffer({ brand }: Pick<import("@agoric/vats/tools/board-utils.js").AgoricNamesRemotes, "brand">, opts: {
+declare function makeAddCollateralOffer({ brand }: Pick<AgoricNamesRemotes, "brand">, opts: {
     offerId: string;
     give: number;
     collateralBrandKey: string;
-}): import("@agoric/smart-wallet/src/offers.js").OfferSpec;
+}): OfferSpec;
+import type { OfferSpec } from '@agoric/smart-wallet/src/offers.js';
 export {};
 //# sourceMappingURL=clientSupport.d.ts.map

package/src/clientSupport.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"clientSupport.d.ts","sourceRoot":"","sources":["clientSupport.js"],"names":[],"mappings":"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"}
+{"version":3,"file":"clientSupport.d.ts","sourceRoot":"","sources":["clientSupport.js"],"names":[],"mappings":"AAgKO,+CAJI,MAAM,YACN,OAAO,CAAC,mBAAmB,CAAC,GAC1B,OAAO,CAAC,MAAM,CAAC,CAW3B;AA0EM,6CAJI,IAAI,CAAC,kBAAkB,EAAE,OAAO,GAAG,YAAY,CAAC,cAChD,CAAC,GAAG,EAAE,MAAM,KAAK,KAAK,GACpB,CAAC,CAAC,EAAE,MAAM,KAAK,OAAO,KAAK,CAAC,CAmCtC;;;;;;;;;;;;;;;;;yCA1QmC,yCAAyC;wCAF1C,mCAAmC;4BAFxB,cAAc;AAgT9D;;;;;;;;;GASG;AACH,kDATW,OAAO,QACP;IACN,OAAO,EAAE,MAAM,CAAC;IAChB,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,SAAS,EAAE,MAAM,CAAC;CACnB,iBACO,MAAM,GACJ,SAAS,CAerB;AApID;;;;;;;;GAQG;AACH,6CARW,IAAI,CAAC,kBAAkB,EAAE,OAAO,CAAC,YACjC,QAAQ,CAAC,OAAO,CAAC,QACjB;IAAE,OAAO,EAAE,MAAM,CAAC;IAAC,MAAM,CAAC,EAAE,MAAM,CAAC;IAAC,IAAI,EAAE,CAAC,MAAM,EAAE,MAAM,CAAC,CAAA;CAAE,GAAG,CACnE;IAAE,UAAU,EAAE,MAAM,CAAA;CAAE,GACtB;IAAE,UAAU,EAAE,MAAM,CAAA;CAAE,CACzB,GACS,SAAS,CA4BrB;AAxKD;;;;;;;;;GASG;AACH,0CATW,IAAI,CAAC,kBAAkB,EAAE,OAAO,CAAC,QACjC;IACN,OAAO,EAAE,MAAM,CAAC;IAChB,UAAU,EAAE,MAAM,CAAC;IACnB,cAAc,EAAE,MAAM,CAAC;IACvB,kBAAkB,EAAE,MAAM,CAAC;CAC5B,GACS,SAAS,CAuBrB;AAED;;;;;;;;;;;;GAYG;AACH,4CAZW,IAAI,CAAC,kBAAkB,EAAE,OAAO,CAAC,QACjC;IACN,OAAO,EAAE,MAAM,CAAC;IAChB,kBAAkB,CAAC,EAAE,MAAM,CAAC;IAC5B,cAAc,CAAC,EAAE,MAAM,CAAC;IACxB,cAAc,CAAC,EAAE,MAAM,CAAC;IACxB,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,UAAU,CAAC,EAAE,MAAM,CAAC;CACrB,iBACO,MAAM,GACJ,SAAS,CAiBrB;AAED;;;;;;;;;GASG;AACH,2CATW,IAAI,CAAC,kBAAkB,EAAE,OAAO,CAAC,QACjC;IACN,OAAO,EAAE,MAAM,CAAC;IAChB,kBAAkB,CAAC,EAAE,MAAM,CAAC;IAC5B,UAAU,EAAE,MAAM,CAAC;CACpB,iBACO,MAAM,GACJ,SAAS,CAcrB;AA6HD;;;;;;;;GAQG;AACH,mDARW,IAAI,CAAC,kBAAkB,EAAE,OAAO,CAAC,QACjC;IACN,OAAO,EAAE,MAAM,CAAC;IAChB,IAAI,EAAE,MAAM,CAAC;IACb,kBAAkB,EAAE,MAAM,CAAC;CAC5B,GACS,SAAS,CAuBrB;+BA3S2B,oCAAoC"}

package/src/clientSupport.js

@@ -1,13 +1,16 @@
 // @ts-check
 
-import { Fail } from '@endo/errors';
 import { AmountMath } from '@agoric/ertp';
-import { assertAllDefined } from '@agoric/internal';
-import { parseRatio } from '@agoric/ertp/src/ratio.js';
+import { Fail } from '@endo/errors';
 
 /**
  * @import {Amount, Brand, Payment, Purse} from '@agoric/ertp';
  * @import {Proposal} from '@agoric/zoe';
+ * @import {AgoricNamesRemotes} from '@agoric/vats/tools/board-utils.js';
+ * @import {OfferSpec} from '@agoric/smart-wallet/src/offers.js';
+ * @import {CurrentWalletRecord} from '@agoric/smart-wallet/src/smartWallet.js';
+ * @import {BoardRemote} from '@agoric/internal/src/marshal/board-client-utils.js';
+ * @import {OfferMaker} from '@agoric/smart-wallet/src/types.js';
  */
 
 // XXX support other decimal places
@@ -20,10 +23,7 @@ const scaleDecimals = num => BigInt(num * Number(COSMOS_UNIT));
 /**
  * Give/want
  *
- * @param {Pick<
- *   import('@agoric/vats/tools/board-utils.js').AgoricNamesRemotes,
- *   'brand'
- * >} agoricNames
+ * @param {Pick<AgoricNamesRemotes, 'brand'>} agoricNames
  * @param {{ giveMinted?: number; wantMinted?: number }
  *   | {
  *       collateralBrandKey: string;
@@ -67,17 +67,14 @@ const makeVaultProposal = ({ brand }, opts) => {
 };
 
 /**
- * @param {Pick<
- *   import('@agoric/vats/tools/board-utils.js').AgoricNamesRemotes,
- *   'brand'
- * >} agoricNames
+ * @param {Pick<AgoricNamesRemotes, 'brand'>} agoricNames
  * @param {{
  *   offerId: string;
  *   wantMinted: number;
  *   giveCollateral: number;
  *   collateralBrandKey: string;
  * }} opts
- * @returns {import('@agoric/smart-wallet/src/offers.js').OfferSpec}
+ * @returns {OfferSpec}
  */
 const makeOpenOffer = ({ brand }, opts) => {
   const proposal = makeVaultProposal({ brand }, opts);
@@ -103,10 +100,7 @@ const makeOpenOffer = ({ brand }, opts) => {
 };
 
 /**
- * @param {Pick<
- *   import('@agoric/vats/tools/board-utils.js').AgoricNamesRemotes,
- *   'brand'
- * >} agoricNames
+ * @param {Pick<AgoricNamesRemotes, 'brand'>} agoricNames
  * @param {{
  *   offerId: string;
  *   collateralBrandKey?: string;
@@ -116,7 +110,7 @@ const makeOpenOffer = ({ brand }, opts) => {
  *   wantMinted?: number;
  * }} opts
  * @param {string} previousOffer
- * @returns {import('@agoric/smart-wallet/src/offers.js').OfferSpec}
+ * @returns {OfferSpec}
  */
 const makeAdjustOffer = ({ brand }, opts, previousOffer) => {
   // NB: not really a Proposal because the brands are not remotes
@@ -136,17 +130,14 @@ const makeAdjustOffer = ({ brand }, opts, previousOffer) => {
 };
 
 /**
- * @param {Pick<
- *   import('@agoric/vats/tools/board-utils.js').AgoricNamesRemotes,
- *   'brand'
- * >} agoricNames
+ * @param {Pick<AgoricNamesRemotes, 'brand'>} agoricNames
  * @param {{
  *   offerId: string;
  *   collateralBrandKey?: string;
  *   giveMinted: number;
  * }} opts
  * @param {string} previousOffer
- * @returns {import('@agoric/smart-wallet/src/offers.js').OfferSpec}
+ * @returns {OfferSpec}
  */
 const makeCloseOffer = ({ brand }, opts, previousOffer) => {
   const proposal = makeVaultProposal({ brand }, opts);
@@ -164,9 +155,7 @@ const makeCloseOffer = ({ brand }, opts, previousOffer) => {
 
 /**
  * @param {string} vaultId
- * @param {Promise<
- *   import('@agoric/smart-wallet/src/smartWallet.js').CurrentWalletRecord
- * >} currentP
+ * @param {Promise<CurrentWalletRecord>} currentP
  * @returns {Promise<string>} offer id in which the vault was made
  */
 export const lookupOfferIdForVault = async (vaultId, currentP) => {
@@ -181,10 +170,7 @@ export const lookupOfferIdForVault = async (vaultId, currentP) => {
 };
 
 /**
- * @param {Record<
- *   string,
- *   import('@agoric/internal/src/marshal.js').BoardRemote
- * >} brands
+ * @param {Record<string, BoardRemote>} brands
  * @param {{ wantMinted: number; giveMinted?: undefined }
  *   | { giveMinted: number; wantMinted?: undefined }} opts
  * @param {number} [fee]
@@ -214,16 +200,13 @@ const makePsmProposal = (brands, opts, fee = 0, anchor = 'AUSD') => {
 };
 
 /**
- * @param {Pick<
- *   import('@agoric/vats/tools/board-utils.js').AgoricNamesRemotes,
- *   'brand'
- * >} agoricNames
- * @param {Instance} instance
+ * @param {Pick<AgoricNamesRemotes, 'brand'>} agoricNames
+ * @param {Instance<unknown>} instance
  * @param {{ offerId: string; feePct?: number; pair: [string, string] } & (
  *   | { wantMinted: number }
  *   | { giveMinted: number }
  * )} opts
- * @returns {import('@agoric/smart-wallet/src/offers.js').OfferSpec}
+ * @returns {OfferSpec}
  */
 const makePsmSwapOffer = ({ brand }, instance, opts) => {
   const method =
@@ -254,10 +237,7 @@ const makePsmSwapOffer = ({ brand }, instance, opts) => {
 };
 
 /**
- * @param {Pick<
- *   import('@agoric/vats/tools/board-utils.js').AgoricNamesRemotes,
- *   'brand' | 'vbankAsset'
- * >} agoricNames
+ * @param {Pick<AgoricNamesRemotes, 'brand' | 'vbankAsset'>} agoricNames
  * @param {(msg: string) => Error} makeError error constructor
  * @returns {(a: string) => Amount<'nat'>}
  */
@@ -297,91 +277,13 @@ export const makeParseAmount =
   };
 
 /**
- * @param {Pick<
- *   import('@agoric/vats/tools/board-utils.js').AgoricNamesRemotes,
- *   'brand' | 'vbankAsset'
- * >} agoricNames
- * @param {{
- *   offerId: string;
- *   give: string;
- *   maxBuy: string;
- *   wantMinimum?: string;
- * } & (
- *   | {
- *       price: number;
- *     }
- *   | {
- *       discount: number; // -1 to 1. e.g. 0.10 for 10% discount, -0.05 for 5% markup
- *     }
- * )} opts
- * @returns {import('@agoric/smart-wallet/src/offers.js').OfferSpec}
- */
-const makeBidOffer = (agoricNames, opts) => {
-  assertAllDefined({
-    offerId: opts.offerId,
-    give: opts.give,
-    maxBuy: opts.maxBuy,
-  });
-  const parseAmount = makeParseAmount(agoricNames);
-  const proposal = {
-    give: { Bid: parseAmount(opts.give) },
-    ...(opts.wantMinimum
-      ? { want: { Collateral: parseAmount(opts.wantMinimum) } }
-      : {}),
-  };
-  const istBrand = proposal.give.Bid.brand;
-  const maxBuy = parseAmount(opts.maxBuy);
-
-  const bounds = (x, lo, hi) => {
-    assert(x >= lo && x <= hi);
-    return x;
-  };
-
-  assert(
-    'price' in opts || 'discount' in opts,
-    'must specify price or discount',
-  );
-  /** @type {import('./auction/auctionBook.js').OfferSpec} */
-  const offerArgs =
-    'price' in opts
-      ? {
-          maxBuy: parseAmount(opts.maxBuy),
-          offerPrice: parseRatio(opts.price, istBrand, maxBuy.brand),
-        }
-      : {
-          maxBuy,
-          offerBidScaling: parseRatio(
-            (1 - bounds(opts.discount, -1, 1)).toFixed(2),
-            istBrand,
-            istBrand,
-          ),
-        };
-
-  /** @type {import('@agoric/smart-wallet/src/offers.js').OfferSpec} */
-  const offerSpec = {
-    id: opts.offerId,
-    invitationSpec: {
-      source: 'agoricContract',
-      instancePath: ['auctioneer'],
-      callPipe: [['makeBidInvitation', [maxBuy.brand]]],
-    },
-    proposal,
-    offerArgs,
-  };
-  return offerSpec;
-};
-
-/**
- * @param {Pick<
- *   import('@agoric/vats/tools/board-utils.js').AgoricNamesRemotes,
- *   'brand'
- * >} agoricNames
+ * @param {Pick<AgoricNamesRemotes, 'brand'>} agoricNames
  * @param {{
  *   offerId: string;
  *   give: number;
  *   collateralBrandKey: string;
  * }} opts
- * @returns {import('@agoric/smart-wallet/src/offers.js').OfferSpec}
+ * @returns {OfferSpec}
  */
 const makeAddCollateralOffer = ({ brand }, opts) => {
   /** @type {AmountKeywordRecord} */
@@ -393,7 +295,7 @@ const makeAddCollateralOffer = ({ brand }, opts) => {
     ),
   };
 
-  /** @type {import('@agoric/smart-wallet/src/offers.js').OfferSpec} */
+  /** @type {OfferSpec} */
   const offerSpec = {
     id: opts.offerId,
     invitationSpec: {
@@ -414,7 +316,7 @@ const makeAddCollateralOffer = ({ brand }, opts) => {
  *   unitPrice: bigint;
  * }} opts
  * @param {string} previousOffer
- * @returns {import('@agoric/smart-wallet/src/offers.js').OfferSpec}
+ * @returns {OfferSpec}
  */
 const makePushPriceOffer = (_agoricNames, opts, previousOffer) => {
   return {
@@ -432,15 +334,9 @@ const makePushPriceOffer = (_agoricNames, opts, previousOffer) => {
 };
 
 /**
- * @satisfies {Record<
- *   string,
- *   Record<string, import('@agoric/smart-wallet/src/types.js').OfferMaker>
- * >}
+ * @satisfies {Record<string, Record<string, OfferMaker>>}
  */
 export const Offers = {
-  auction: {
-    Bid: makeBidOffer,
-  },
   fluxAggregator: {
     PushPrice: makePushPriceOffer,
   },

package/src/econCommitteeCharter.d.ts

@@ -1,5 +1,7 @@
 /**
  * @import {MapStore, SetStore} from '@agoric/store';
+ * @import {Baggage} from '@agoric/vat-data';
+ * @import {TimestampValue} from '@agoric/time';
  */
 /**
  * @file This contract makes it possible for those who govern contracts to call
@@ -12,26 +14,26 @@ export const INVITATION_MAKERS_DESC: "charter member invitation";
 export const meta: ContractMeta<typeof start>;
 export function start(zcf: ZCF<{
     binaryVoteCounterInstallation: Installation;
-}>, privateArgs: undefined, baggage: import("@agoric/vat-data").Baggage): Promise<{
+}>, privateArgs: undefined, baggage: Baggage): Promise<{
     creatorFacet: import("@endo/exo").Guarded<{
         /**
-         * @param {Instance} governedInstance
+         * @param {Instance<unknown>} governedInstance
          * @param {GovernorCreatorFacet<any>} governorFacet
          * @param {string} [label] for diagnostic use only
          */
-        addInstance: (governedInstance: Instance, governorFacet: GovernorCreatorFacet<any>, label?: string) => void;
+        addInstance: (governedInstance: Instance<unknown>, governorFacet: GovernorCreatorFacet<any>, label?: string) => void;
         makeCharterMemberInvitation: () => Promise<globalThis.Invitation<{
             invitationMakers: import("@endo/exo").Guarded<{
                 VoteOnParamChange: () => Promise<globalThis.Invitation<import("@agoric/governance/src/types").ContractGovernanceVoteResult, ParamChangesOfferArgs>>;
                 VoteOnPauseOffers: (instance: any, strings: any, deadline: any) => Promise<globalThis.Invitation<import("@agoric/governance/src/types").ContractGovernanceVoteResult, undefined>>;
-                VoteOnApiCall: (instance: Instance, methodName: string, methodArgs: string[], deadline: import("@agoric/time").TimestampValue) => Promise<globalThis.Invitation<import("@agoric/governance/src/types").ContractGovernanceVoteResult, undefined>>;
+                VoteOnApiCall: (instance: Instance<unknown>, methodName: string, methodArgs: string[], deadline: TimestampValue) => Promise<globalThis.Invitation<import("@agoric/governance/src/types").ContractGovernanceVoteResult, undefined>>;
             }>;
         }, undefined>>;
     }>;
 }>;
 export type ParamChangesOfferArgs = {
     deadline: bigint;
-    instance: Instance;
+    instance: Instance<unknown>;
     params: Record<string, unknown>;
     /**
      * paramPath is determined by contract
@@ -40,4 +42,6 @@ export type ParamChangesOfferArgs = {
         paramPath: unknown;
     } | undefined;
 };
+import type { Baggage } from '@agoric/vat-data';
+import type { TimestampValue } from '@agoric/time';
 //# sourceMappingURL=econCommitteeCharter.d.ts.map

package/src/econCommitteeCharter.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"econCommitteeCharter.d.ts","sourceRoot":"","sources":["econCommitteeCharter.js"],"names":[],"mappings":"AAaA;;GAEG;AAEH;;;;;GAKG;AAEH,qCAAsC,2BAA2B,CAAC;AAoBlE,yCAAyC;AACzC,mBADW,YAAY,CAAC,OAAO,KAAK,CAAC,CAMnC;AAQK,2BAJI,GAAG,CAAC;IAAE,6BAA6B,EAAE,YAAY,CAAA;CAAE,CAAC,eACpD,SAAS,WACT,OAAO,kBAAkB,EAAE,OAAO;;QAsHvC;;;;WAIG;wCAHQ,QAAQ,iBACR,oBAAoB,CAAC,GAAG,CAAC,UACzB,MAAM;;;;;0CAzEV,QAAQ,cACR,MAAM,cACN,MAAM,EAAE,YACR,OAAO,cAAc,EAAE,cAAc;;;;GAkFjD;;cAjKa,MAAM;cACN,QAAQ;YACR,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC;;;;;mBACV,OAAO"}
+{"version":3,"file":"econCommitteeCharter.d.ts","sourceRoot":"","sources":["econCommitteeCharter.js"],"names":[],"mappings":"AAaA;;;;GAIG;AAEH;;;;;GAKG;AAEH,qCAAsC,2BAA2B,CAAC;AAoBlE,yCAAyC;AACzC,mBADW,YAAY,CAAC,OAAO,KAAK,CAAC,CAMnC;AAQK,2BAJI,GAAG,CAAC;IAAE,6BAA6B,EAAE,YAAY,CAAA;CAAE,CAAC,eACpD,SAAS,WACT,OAAO;;QAsHZ;;;;WAIG;wCAHQ,QAAQ,CAAC,OAAO,CAAC,iBACjB,oBAAoB,CAAC,GAAG,CAAC,UACzB,MAAM;;;;;0CAzEV,QAAQ,CAAC,OAAO,CAAC,cACjB,MAAM,cACN,MAAM,EAAE,YACR,cAAc;;;;GAkF1B;;cAjKa,MAAM;cACN,QAAQ,CAAC,OAAO,CAAC;YACjB,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC;;;;;mBACV,OAAO;;;6BAlBR,kBAAkB;oCACX,cAAc"}

package/src/econCommitteeCharter.js

@@ -1,6 +1,6 @@
 // @jessie-check
-/// <reference types="@agoric/governance/exported" />
-/// <reference types="@agoric/zoe/exported" />
+/// <reference types="@agoric/governance/exported.js" />
+/// <reference types="@agoric/zoe/exported.js" />
 
 import { M, mustMatch } from '@agoric/store';
 import { TimestampShape } from '@agoric/time';
@@ -13,6 +13,8 @@ import { E } from '@endo/far';
 
 /**
  * @import {MapStore, SetStore} from '@agoric/store';
+ * @import {Baggage} from '@agoric/vat-data';
+ * @import {TimestampValue} from '@agoric/time';
  */
 
 /**
@@ -27,7 +29,7 @@ export const INVITATION_MAKERS_DESC = 'charter member invitation';
 /**
  * @typedef {object} ParamChangesOfferArgs
  * @property {bigint} deadline
- * @property {Instance} instance
+ * @property {Instance<unknown>} instance
  * @property {Record<string, unknown>} params
  * @property {{ paramPath: unknown }} [path] paramPath is determined by contract
  */
@@ -54,11 +56,11 @@ harden(meta);
 /**
  * @param {ZCF<{ binaryVoteCounterInstallation: Installation }>} zcf
  * @param {undefined} privateArgs
- * @param {import('@agoric/vat-data').Baggage} baggage
+ * @param {Baggage} baggage
  */
 export const start = async (zcf, privateArgs, baggage) => {
   const { binaryVoteCounterInstallation: counter } = zcf.getTerms();
-  /** @type {MapStore<Instance, GovernorCreatorFacet<any>>} */
+  /** @type {MapStore<Instance<unknown>, GovernorCreatorFacet<any>>} */
   const instanceToGovernor = provideDurableMapStore(
     baggage,
     'instanceToGovernor',
@@ -102,10 +104,10 @@ export const start = async (zcf, privateArgs, baggage) => {
   };
 
   /**
-   * @param {Instance} instance
+   * @param {Instance<unknown>} instance
    * @param {string} methodName
    * @param {string[]} methodArgs
-   * @param {import('@agoric/time').TimestampValue} deadline
+   * @param {TimestampValue} deadline
    */
   const makeApiInvocationInvitation = (
     instance,
@@ -173,7 +175,7 @@ export const start = async (zcf, privateArgs, baggage) => {
     CharterCreatorI,
     {
       /**
-       * @param {Instance} governedInstance
+       * @param {Instance<unknown>} governedInstance
        * @param {GovernorCreatorFacet<any>} governorFacet
        * @param {string} [label] for diagnostic use only
        */

package/src/feeDistributor.d.ts

@@ -33,11 +33,9 @@ export function makeFeeDistributor(feeIssuer: ERef<Issuer<"nat">>, terms: {
          */
         startPeriodicCollection: (debugName: string, collectorP: ERef<FeeCollector>) => Promise<PeriodicFeeCollector>;
         /**
-         * @param {import('@endo/far').EOnly<
-         *   import('@agoric/ertp/src/types.js').DepositFacet
-         * >} depositFacet
+         * @param {EOnly<DepositFacet>} depositFacet
          */
-        makeDepositFacetDestination: (depositFacet: import("@endo/far").EOnly<import("@agoric/ertp/src/types.js").DepositFacet>) => {
+        makeDepositFacetDestination: (depositFacet: EOnly<DepositFacet>) => {
             pushPayment: (payment: any, _issuer: any) => Promise<globalThis.Amount>;
         } & RemotableObject<`Alleged: ${string}`> & import("@endo/eventual-send").RemotableBrand<{}, {
             pushPayment: (payment: any, _issuer: any) => Promise<globalThis.Amount>;
@@ -74,11 +72,9 @@ export function makeFeeDistributor(feeIssuer: ERef<Issuer<"nat">>, terms: {
          */
         startPeriodicCollection: (debugName: string, collectorP: ERef<FeeCollector>) => Promise<PeriodicFeeCollector>;
         /**
-         * @param {import('@endo/far').EOnly<
-         *   import('@agoric/ertp/src/types.js').DepositFacet
-         * >} depositFacet
+         * @param {EOnly<DepositFacet>} depositFacet
          */
-        makeDepositFacetDestination: (depositFacet: import("@endo/far").EOnly<import("@agoric/ertp/src/types.js").DepositFacet>) => {
+        makeDepositFacetDestination: (depositFacet: EOnly<DepositFacet>) => {
             pushPayment: (payment: any, _issuer: any) => Promise<globalThis.Amount>;
         } & RemotableObject<`Alleged: ${string}`> & import("@endo/eventual-send").RemotableBrand<{}, {
             pushPayment: (payment: any, _issuer: any) => Promise<globalThis.Amount>;
@@ -125,11 +121,9 @@ export function start(zcf: ZCF<Parameters<typeof makeFeeDistributor>[1]>): Promi
          */
         startPeriodicCollection: (debugName: string, collectorP: ERef<FeeCollector>) => Promise<PeriodicFeeCollector>;
         /**
-         * @param {import('@endo/far').EOnly<
-         *   import('@agoric/ertp/src/types.js').DepositFacet
-         * >} depositFacet
+         * @param {EOnly<DepositFacet>} depositFacet
          */
-        makeDepositFacetDestination: (depositFacet: import("@endo/far").EOnly<import("@agoric/ertp/src/types.js").DepositFacet>) => {
+        makeDepositFacetDestination: (depositFacet: EOnly<DepositFacet>) => {
             pushPayment: (payment: any, _issuer: any) => Promise<globalThis.Amount>;
         } & RemotableObject<`Alleged: ${string}`> & import("@endo/eventual-send").RemotableBrand<{}, {
             pushPayment: (payment: any, _issuer: any) => Promise<globalThis.Amount>;
@@ -166,11 +160,9 @@ export function start(zcf: ZCF<Parameters<typeof makeFeeDistributor>[1]>): Promi
          */
         startPeriodicCollection: (debugName: string, collectorP: ERef<FeeCollector>) => Promise<PeriodicFeeCollector>;
         /**
-         * @param {import('@endo/far').EOnly<
-         *   import('@agoric/ertp/src/types.js').DepositFacet
-         * >} depositFacet
+         * @param {EOnly<DepositFacet>} depositFacet
          */
-        makeDepositFacetDestination: (depositFacet: import("@endo/far").EOnly<import("@agoric/ertp/src/types.js").DepositFacet>) => {
+        makeDepositFacetDestination: (depositFacet: EOnly<DepositFacet>) => {
             pushPayment: (payment: any, _issuer: any) => Promise<globalThis.Amount>;
         } & RemotableObject<`Alleged: ${string}`> & import("@endo/eventual-send").RemotableBrand<{}, {
             pushPayment: (payment: any, _issuer: any) => Promise<globalThis.Amount>;
@@ -221,4 +213,6 @@ export type FeeDistributorCreatorFacet = ReturnType<typeof makeFeeDistributor>["
 export type FeeDistributorPublicFacet = ReturnType<typeof makeFeeDistributor>["publicFacet"];
 import type { TimerService } from '@agoric/time';
 import type { RelativeTime } from '@agoric/time';
+import type { DepositFacet } from '@agoric/ertp/src/types.js';
+import type { EOnly } from '@endo/far';
 //# sourceMappingURL=feeDistributor.d.ts.map

package/src/feeDistributor.d.ts.map

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